refs #628 Use the metaclass mixins in all value classes.

This commit is contained in:
Mathew Sutcliffe
2016-04-02 17:34:18 +01:00
parent 4f3637a046
commit 4bd4baa535
82 changed files with 629 additions and 560 deletions

View File

@@ -73,17 +73,17 @@ namespace BlackMisc
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CHotkeyCombination)
CKeyboardKeyList m_keyboardKeys;
CJoystickButtonList m_joystickButtons;
BLACK_METACLASS(CHotkeyCombination,
BLACK_METAMEMBER(keyboardKeys),
BLACK_METAMEMBER(joystickButtons)
);
};
}
}
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Input::CHotkeyCombination, (
attr(o.m_keyboardKeys),
attr(o.m_joystickButtons)
))
Q_DECLARE_METATYPE(BlackMisc::Input::CHotkeyCombination)
#endif // guard