diff --git a/src/blackcore/network.h b/src/blackcore/network.h index a9d9f705a..641e4a24a 100644 --- a/src/blackcore/network.h +++ b/src/blackcore/network.h @@ -55,7 +55,6 @@ namespace BlackCore class BLACKCORE_EXPORT INetwork : public QObject { Q_OBJECT - Q_ENUMS(ConnectionStatus) protected: /*! @@ -103,6 +102,7 @@ namespace BlackCore Connecting, //!< Connection initiated but not established Connected //!< Connection established }; + Q_ENUM(ConnectionStatus) /*! * Convert a ConnectionStatus to a string. diff --git a/src/blackcore/voicechannel.h b/src/blackcore/voicechannel.h index 4fef228b9..ac72d749f 100644 --- a/src/blackcore/voicechannel.h +++ b/src/blackcore/voicechannel.h @@ -26,7 +26,6 @@ namespace BlackCore class BLACKCORE_EXPORT IVoiceChannel : public QObject { Q_OBJECT - Q_ENUMS(ConnectionStatus) public: //! Com status @@ -39,6 +38,7 @@ namespace BlackCore Connected, //!< Connection established ConnectingFailed //!< Failed to connect }; + Q_ENUM(ConnectionStatus) //! Constructor IVoiceChannel(QObject *parent = nullptr) : QObject(parent) {} diff --git a/src/blackgui/led.h b/src/blackgui/led.h index 20de9737f..02fc38af7 100644 --- a/src/blackgui/led.h +++ b/src/blackgui/led.h @@ -36,16 +36,16 @@ namespace BlackGui class BLACKGUI_EXPORT CLedWidget : public QWidget { Q_OBJECT - Q_ENUMS(LedColor) - Q_ENUMS(LedShape) public: //! Colors //! \remarks NoColor has to be last entry enum LedColor { Red = 0, Green, Yellow, Grey, Orange, Purple, Blue, Black, NoColor}; + Q_ENUM(LedColor) //! Shapes enum LedShape { Circle = 0, Square, Triangle, Rounded}; + Q_ENUM(LedShape) //! States enum State { On, Off, TriState }; diff --git a/src/blackmisc/simulation/fsx/simconnectutilities.h b/src/blackmisc/simulation/fsx/simconnectutilities.h index 1c4235315..6be9917d9 100644 --- a/src/blackmisc/simulation/fsx/simconnectutilities.h +++ b/src/blackmisc/simulation/fsx/simconnectutilities.h @@ -45,8 +45,6 @@ namespace BlackMisc class BLACKMISC_EXPORT CSimConnectUtilities : public QObject { Q_OBJECT - Q_ENUMS(SIMCONNECT_EXCEPTION) - Q_ENUMS(SIMCONNECT_SURFACE) public: //! Filename of the file @@ -121,6 +119,7 @@ namespace BlackMisc Tarmac, Wright_flyer_track }; + Q_ENUM(SIMCONNECT_SURFACE) //! SimConnect exceptions. enum SIMCONNECT_EXCEPTION @@ -164,6 +163,7 @@ namespace BlackMisc SIMCONNECT_EXCEPTION_OBJECT_ATC, SIMCONNECT_EXCEPTION_OBJECT_SCHEDULE }; + Q_ENUM(SIMCONNECT_EXCEPTION) //! Lights for FSX/P3D "LIGHT ON STATES" //! \sa http://www.prepar3d.com/SDKv2/LearningCenter/utilities/variables/simulation_variables.html