flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 06:35:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #275, own info window component

Browse Source 
* added to CVariant for value object
* signal in text message to indicate overlay messages
* info window component (currently not runtme aware, maybe changed in future)
* removed old window, adjusted GUI
This commit is contained in:
Klaus Basan
2014-06-17 17:59:14 +02:00
parent ab77f19544
commit 0547b2847e
13 changed files with 435 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackmisc/valueobject.h
View File

@@ -4,6 +4,7 @@
#include "dbus.h"
#include "tuple.h"
#include "json.h"
#include "variant.h"
#include <QtDBus/QDBusMetaType>
#include <QString>
#include <QtGlobal>
@@ -36,7 +37,7 @@ namespace BlackMisc
public:
//! True if and only if T is derived from CPhysicalQuantity.
static const bool value = sizeof(test(*(T*)0)) == sizeof(yes);
static const bool value = sizeof(test(*(T *)0)) == sizeof(yes);
};
}
@@ -101,7 +102,7 @@ namespace BlackMisc
friend bool operator!=(const CValueObject &valueObject, const CIndexVariantMap &valueMap);
//! Comparison operator to allow valueobjects be used as keys in QMap and std::set.
template <class T> friend typename std::enable_if<std::is_base_of<CValueObject, T>::value && ! PhysicalQuantities::IsQuantity<T>::value, bool>::type
template <class T> friend typename std::enable_if < std::is_base_of<CValueObject, T>::value &&! PhysicalQuantities::IsQuantity<T>::value, bool >::type
operator<(const T &lhs, const T &rhs)
{
const auto &lhsBase = static_cast<const CValueObject &>(lhs);
@@ -110,7 +111,7 @@ namespace BlackMisc
}
//! Comparison for symmetry with operator<.
template <class T> friend typename std::enable_if<std::is_base_of<CValueObject, T>::value && ! PhysicalQuantities::IsQuantity<T>::value, bool>::type
template <class T> friend typename std::enable_if < std::is_base_of<CValueObject, T>::value &&! PhysicalQuantities::IsQuantity<T>::value, bool >::type
operator>(const T &lhs, const T &rhs)
{
const auto &lhsBase = static_cast<const CValueObject &>(lhs);
@@ -119,7 +120,7 @@ namespace BlackMisc
}
//! Comparison for symmetry with operator<.
template <class T> friend typename std::enable_if<std::is_base_of<CValueObject, T>::value && ! PhysicalQuantities::IsQuantity<T>::value, bool>::type
template <class T> friend typename std::enable_if < std::is_base_of<CValueObject, T>::value &&! PhysicalQuantities::IsQuantity<T>::value, bool >::type
operator<=(const T &lhs, const T &rhs)
{
const auto &lhsBase = static_cast<const CValueObject &>(lhs);
@@ -128,7 +129,7 @@ namespace BlackMisc
}
//! Comparison for symmetry with operator<.
template <class T> friend typename std::enable_if<std::is_base_of<CValueObject, T>::value && ! PhysicalQuantities::IsQuantity<T>::value, bool>::type
template <class T> friend typename std::enable_if < std::is_base_of<CValueObject, T>::value &&! PhysicalQuantities::IsQuantity<T>::value, bool >::type
operator>=(const T &lhs, const T &rhs)
{
const auto &lhsBase = static_cast<const CValueObject &>(lhs);
@@ -167,6 +168,9 @@ namespace BlackMisc
//! Virtual method to return QVariant, used with DBus QVariant lists
virtual QVariant toQVariant() const = 0;
//! Virtual method to return CVariant
virtual CVariant toCVariant() const { return CVariant(this->toQVariant()); }
//! Contribute to JSON object
virtual QJsonObject toJson() const { QJsonObject json; return json;}