refs #140, removed MACRO DBUS_ENUM_MARSHALLING, changed to template

discussed in https://dev.vatsim-germany.org/issues/140#change-864
This commit is contained in:
Klaus Basan
2014-03-11 21:08:59 +01:00
parent ffc03e46f5
commit 0d306861f0
13 changed files with 21 additions and 38 deletions

View File

@@ -10,7 +10,6 @@
#ifndef BLACKMISC_KEYBOARDKEY_H
#define BLACKMISC_KEYBOARDKEY_H
#include "blackmiscfreefunctions.h"
#include "valueobject.h"
#include <QStringList>
#include <QKeySequence>
@@ -257,8 +256,6 @@ namespace BlackMisc
} // class
} // BlackMisc
BLACK_DBUS_ENUM_MARSHALLING(BlackMisc::Hardware::CKeyboardKey::Modifier)
BLACK_DBUS_ENUM_MARSHALLING(BlackMisc::Hardware::CKeyboardKey::HotkeyFunction)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Hardware::CKeyboardKey, (o.m_qtKey, o.m_nativeScanCode, o.m_nativeVirtualKey, o.m_modifier1, o.m_modifier2, o.m_function, o.m_pressed))
Q_DECLARE_METATYPE(BlackMisc::Hardware::CKeyboardKey)