diff --git a/src/AutoPilotPlugins/Common/RadioComponentController.h b/src/AutoPilotPlugins/Common/RadioComponentController.h index a152608a26678030d66d150cb6ae8ef0b8f7cfae..e5e94e5aa3417e45c45477d03ef8a7c58dfe9c65 100644 --- a/src/AutoPilotPlugins/Common/RadioComponentController.h +++ b/src/AutoPilotPlugins/Common/RadioComponentController.h @@ -68,14 +68,14 @@ public: Q_PROPERTY(int transmitterMode READ transmitterMode WRITE setTransmitterMode NOTIFY transmitterModeChanged) Q_PROPERTY(QString imageHelp MEMBER _imageHelp NOTIFY imageHelpChanged) - - Q_ENUMS(BindModes) + enum BindModes { DSM2, DSMX7, DSMX8 }; - + Q_ENUM(BindModes) + Q_INVOKABLE void spektrumBindMode(int mode); Q_INVOKABLE void cancelButtonClicked(void); Q_INVOKABLE void skipButtonClicked(void); diff --git a/src/Camera/QGCCameraControl.h b/src/Camera/QGCCameraControl.h index c4f93152b4787797b033a07bdd1f39dd498ff436..99bc34beb8d22b671cc9d26300d961654c4d9397 100644 --- a/src/Camera/QGCCameraControl.h +++ b/src/Camera/QGCCameraControl.h @@ -97,10 +97,10 @@ public: PHOTO_CAPTURE_TIMELAPSE, }; - Q_ENUMS(CameraMode) - Q_ENUMS(VideoStatus) - Q_ENUMS(PhotoStatus) - Q_ENUMS(PhotoMode) + Q_ENUM(CameraMode) + Q_ENUM(VideoStatus) + Q_ENUM(PhotoStatus) + Q_ENUM(PhotoMode) Q_PROPERTY(int version READ version NOTIFY infoChanged) Q_PROPERTY(QString modelName READ modelName NOTIFY infoChanged) diff --git a/src/MissionManager/CameraSection.h b/src/MissionManager/CameraSection.h index 9b105eaa9dc46095a2425211f51412c352204876..c57b2a028aad2c3c50faa8587eac47e1de3ac0b5 100644 --- a/src/MissionManager/CameraSection.h +++ b/src/MissionManager/CameraSection.h @@ -33,8 +33,8 @@ public: TakeVideo, StopTakingVideo, TakePhoto - }; - Q_ENUMS(CameraAction) + }; + Q_ENUM(CameraAction) Q_PROPERTY(bool specifyGimbal READ specifyGimbal WRITE setSpecifyGimbal NOTIFY specifyGimbalChanged) Q_PROPERTY(Fact* gimbalPitch READ gimbalPitch CONSTANT) diff --git a/src/QGCPalette.h b/src/QGCPalette.h index 03a9f04b301e5a54d055b1f63c198799178c136c..83f412bf05be8373c6526262feba7463179a3227 100644 --- a/src/QGCPalette.h +++ b/src/QGCPalette.h @@ -54,8 +54,6 @@ class QGCPalette : public QObject { Q_OBJECT - Q_ENUMS(Theme) - public: enum ColorGroup { ColorGroupDisabled = 0, @@ -68,6 +66,7 @@ public: Dark, cMaxTheme }; + Q_ENUM(Theme) typedef QColor PaletteColorInfo_t[cMaxTheme][cMaxColorGroup]; diff --git a/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h b/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h index 3a5d283d9e0d0e855a6f44e7ef768ceabcbf73cd..7c03166662fd928f7586498f04bfce8f67ce74c6 100644 --- a/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h +++ b/src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h @@ -35,7 +35,7 @@ public: ActionExporting, ActionDone, }; - Q_ENUMS(ImportAction) + Q_ENUM(ImportAction) Q_PROPERTY(int tileX0 READ tileX0 NOTIFY tileX0Changed) Q_PROPERTY(int tileX1 READ tileX1 NOTIFY tileX1Changed) diff --git a/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoserviceprovider.h b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoserviceprovider.h index ea8c2b6173c0bda4be99ec1323c20e8343f517e0..69a98384719713bb3dab9befdbcc225dd0097815 100644 --- a/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoserviceprovider.h +++ b/src/QtLocationPlugin/qtlocation/src/location/maps/qgeoserviceprovider.h @@ -59,7 +59,7 @@ class QGeoServiceProviderPrivate; class Q_LOCATION_EXPORT QGeoServiceProvider : public QObject { Q_OBJECT - Q_ENUMS(Error) + Q_ENUM(Error) public: enum Error { NoError, diff --git a/src/QtLocationPlugin/qtlocation/src/positioning/qgeoareamonitorsource.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeoareamonitorsource.h index 4adf06662fd9c338b82228aaa3399368e1e8114c..1d9aa692a54d12b358bc2fb81f91207fb787f0f0 100644 --- a/src/QtLocationPlugin/qtlocation/src/positioning/qgeoareamonitorsource.h +++ b/src/QtLocationPlugin/qtlocation/src/positioning/qgeoareamonitorsource.h @@ -55,7 +55,7 @@ public: UnknownSourceError = 2, NoError = 3 }; - Q_ENUMS(Error) + Q_ENUM(Error) enum AreaMonitorFeature { PersistentAreaMonitorFeature = 0x00000001, diff --git a/src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfosource.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfosource.h index bf6f49904e5a92153ac92ea9b69d7f5007865b25..18f2fb0c0228bdf7d44c6ebafa834e1d5928bc38 100644 --- a/src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfosource.h +++ b/src/QtLocationPlugin/qtlocation/src/positioning/qgeopositioninfosource.h @@ -54,7 +54,7 @@ public: UnknownSourceError = 2, NoError = 3 }; - Q_ENUMS(Error) + Q_ENUM(Error) enum PositioningMethod { NoPositioningMethods = 0x00000000, diff --git a/src/QtLocationPlugin/qtlocation/src/positioning/qgeosatelliteinfosource.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeosatelliteinfosource.h index 6066b7d06817f1f5ef1c730bf41c773cf9842daf..07121c73e86bf606e0f279748e8058c5f6bf0fd4 100644 --- a/src/QtLocationPlugin/qtlocation/src/positioning/qgeosatelliteinfosource.h +++ b/src/QtLocationPlugin/qtlocation/src/positioning/qgeosatelliteinfosource.h @@ -54,7 +54,7 @@ public: NoError = 2, UnknownSourceError = -1 }; - Q_ENUMS(Error) + Q_ENUM(Error) explicit QGeoSatelliteInfoSource(QObject *parent); virtual ~QGeoSatelliteInfoSource(); diff --git a/src/QtLocationPlugin/qtlocation/src/positioning/qgeoshape.h b/src/QtLocationPlugin/qtlocation/src/positioning/qgeoshape.h index 32f852b3c5c7a6297f0b1c6b0ffd14d348bd8e2d..23d9de2655c0648f0ceaf8658427f18507faad66 100644 --- a/src/QtLocationPlugin/qtlocation/src/positioning/qgeoshape.h +++ b/src/QtLocationPlugin/qtlocation/src/positioning/qgeoshape.h @@ -48,7 +48,7 @@ class Q_POSITIONING_EXPORT QGeoShape Q_PROPERTY(ShapeType type READ type) Q_PROPERTY(bool isValid READ isValid) Q_PROPERTY(bool isEmpty READ isEmpty) - Q_ENUMS(ShapeType) + Q_ENUM(ShapeType) public: QGeoShape(); diff --git a/src/Settings/UnitsSettings.h b/src/Settings/UnitsSettings.h index 28c3d3dc93a08e15c2a9103dcaa563bc8a6e3c18..84e49e2f0270ea7cd168aef42be948cdbeeeca48 100644 --- a/src/Settings/UnitsSettings.h +++ b/src/Settings/UnitsSettings.h @@ -46,10 +46,10 @@ public: TemperatureUnitsFarenheit, }; - Q_ENUMS(DistanceUnits) - Q_ENUMS(AreaUnits) - Q_ENUMS(SpeedUnits) - Q_ENUMS(TemperatureUnits) + Q_ENUM(DistanceUnits) + Q_ENUM(AreaUnits) + Q_ENUM(SpeedUnits) + Q_ENUM(TemperatureUnits) Q_PROPERTY(Fact* distanceUnits READ distanceUnits CONSTANT) Q_PROPERTY(Fact* areaUnits READ areaUnits CONSTANT) diff --git a/src/VehicleSetup/FirmwareUpgradeController.h b/src/VehicleSetup/FirmwareUpgradeController.h index 7b99a86cee51f298f361bb9e173ff2a1d998b117..012aff91aeae7f2b1f53c89da91edcc4cf76c01f 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.h +++ b/src/VehicleSetup/FirmwareUpgradeController.h @@ -67,9 +67,9 @@ public: DefaultVehicleFirmware } FirmwareVehicleType_t; - Q_ENUMS(AutoPilotStackType_t) - Q_ENUMS(FirmwareType_t) - Q_ENUMS(FirmwareVehicleType_t) + Q_ENUM(AutoPilotStackType_t) + Q_ENUM(FirmwareType_t) + Q_ENUM(FirmwareVehicleType_t) class FirmwareIdentifier { diff --git a/src/api/QGCOptions.h b/src/api/QGCOptions.h index 2431105ef1b0b13a9e526cfdc018522cea888035..47a1b963459f0036c4f68ecb03768e38e01422be 100644 --- a/src/api/QGCOptions.h +++ b/src/api/QGCOptions.h @@ -146,7 +146,7 @@ public: POS_CENTER_LEFT, POS_BOTTOM_LEFT }; - Q_ENUMS(Pos) + Q_ENUM(Pos) CustomInstrumentWidget(QObject* parent = NULL); Q_PROPERTY(QUrl source READ source CONSTANT) Q_PROPERTY(Pos widgetPosition READ widgetPosition NOTIFY widgetPositionChanged) diff --git a/src/comm/LinkConfiguration.h b/src/comm/LinkConfiguration.h index 8feda594d11c4cc3731a6354f733a6a28923cc30..e4027313b498f80a58ad0137afcfc0e3d5cd10e1 100644 --- a/src/comm/LinkConfiguration.h +++ b/src/comm/LinkConfiguration.h @@ -19,7 +19,6 @@ class LinkInterface; class LinkConfiguration : public QObject { Q_OBJECT - Q_ENUMS(LinkType) public: LinkConfiguration(const QString& name); @@ -63,6 +62,7 @@ public: #endif TypeLast // Last type value (type >= TypeLast == invalid) }; + Q_ENUM(LinkType) /*! *