From d6191e97a045549c74bc6968d534d398e4643d0b Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 1 Apr 2014 11:12:12 +0200 Subject: [PATCH] refs #199 , moved operator for enum/DBus to own file. This operator is not CValueObject specific. --- src/blackmisc/dbus.h | 23 +++++++++++++++++++++++ src/blackmisc/valueobject.h | 19 +------------------ 2 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 src/blackmisc/dbus.h diff --git a/src/blackmisc/dbus.h b/src/blackmisc/dbus.h new file mode 100644 index 000000000..7e2acd737 --- /dev/null +++ b/src/blackmisc/dbus.h @@ -0,0 +1,23 @@ +#ifndef BLACKMISC_DBUS_H +#define BLACKMISC_DBUS_H + +#include +#include + +/*! + * Non-member non-friend operator for streaming enums to QDBusArgument. + * + * \param argument + * \param enumType + * \return + * \remarks Currently outside namespace for OSX build, see https://dev.vatsim-germany.org/issues/184 + */ +template typename std::enable_if::value, QDBusArgument>::type const & +operator>>(const QDBusArgument &argument, ENUM &enumType) +{ + uint e; + argument >> e; + enumType = static_cast(e); + return argument; +} +#endif // guard diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index 7b312d6bb..ac2a37c6b 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -1,6 +1,7 @@ #ifndef BLACKMISC_VALUEOBJECT_H #define BLACKMISC_VALUEOBJECT_H +#include "dbus.h" #include "tuple.h" #include "json.h" #include @@ -15,24 +16,6 @@ #include #include - -/*! - * Non-member non-friend operator for streaming enums to QDBusArgument. - * - * \param argument - * \param enumType - * \return - * \remarks Currently outside namespace for OSX build, see https://dev.vatsim-germany.org/issues/184 - */ -template typename std::enable_if::value, QDBusArgument>::type const & -operator>>(const QDBusArgument &argument, ENUM &enumType) -{ - uint e; - argument >> e; - enumType = static_cast(e); - return argument; -} - namespace BlackMisc { // forward declaration