From 9d2d90e44d38087c6272700055de27c84d384d11 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Thu, 21 Jan 2016 01:03:14 +0100 Subject: [PATCH] remove global widgets dependency from plugins.pri cleanup related pro files and includes --- ground/gcs/gcs.pri | 1 - .../src/mapwidget/mapgraphicitem.h | 7 +- ground/gcs/src/plugin.pri | 5 +- .../src/plugins/antennatrack/antennatrack.pro | 45 +++-- .../cfg_vehicletypes/configccpmwidget.cpp | 6 + .../cfg_vehicletypes/configccpmwidget.h | 17 +- .../cfg_vehicletypes/configcustomwidget.cpp | 3 + .../cfg_vehicletypes/configcustomwidget.h | 4 +- .../configfixedwingwidget.cpp | 3 + .../cfg_vehicletypes/configfixedwingwidget.h | 9 +- .../configgroundvehiclewidget.cpp | 3 + .../configgroundvehiclewidget.h | 9 +- .../configmultirotorwidget.cpp | 3 + .../cfg_vehicletypes/configmultirotorwidget.h | 11 +- .../config/cfg_vehicletypes/vehicleconfig.cpp | 9 +- ground/gcs/src/plugins/config/config.pro | 10 +- .../plugins/config/config_cc_hw_widget.cpp | 11 +- .../src/plugins/config/config_cc_hw_widget.h | 7 +- .../plugins/config/configautotunewidget.cpp | 21 +- .../src/plugins/config/configautotunewidget.h | 7 +- .../configcamerastabilizationwidget.cpp | 8 +- .../config/configcamerastabilizationwidget.h | 4 +- .../plugins/config/configccattitudewidget.cpp | 17 +- .../plugins/config/configccattitudewidget.h | 4 +- .../src/plugins/config/configinputwidget.cpp | 28 ++- .../src/plugins/config/configinputwidget.h | 23 ++- .../src/plugins/config/configoplinkwidget.cpp | 6 + .../src/plugins/config/configoplinkwidget.h | 7 +- .../src/plugins/config/configoutputwidget.cpp | 21 +- .../src/plugins/config/configoutputwidget.h | 14 +- .../src/plugins/config/configrevohwwidget.cpp | 7 +- .../src/plugins/config/configrevohwwidget.h | 13 +- .../plugins/config/configrevonanohwwidget.cpp | 7 +- .../plugins/config/configrevonanohwwidget.h | 13 +- .../src/plugins/config/configrevowidget.cpp | 2 + .../gcs/src/plugins/config/configrevowidget.h | 16 +- .../config/configstabilizationwidget.cpp | 25 ++- .../config/configstabilizationwidget.h | 14 +- .../src/plugins/config/configtxpidwidget.cpp | 8 +- .../src/plugins/config/configtxpidwidget.h | 3 +- .../config/configvehicletypewidget.cpp | 11 +- .../plugins/config/configvehicletypewidget.h | 9 +- .../plugins/config/defaultattitudewidget.cpp | 2 + .../plugins/config/defaultattitudewidget.h | 9 +- .../config/defaulthwsettingswidget.cpp | 4 +- .../plugins/config/defaulthwsettingswidget.h | 9 +- ground/gcs/src/plugins/config/mixercurve.cpp | 8 +- ground/gcs/src/plugins/config/mixercurve.h | 11 +- .../src/plugins/config/outputchannelform.cpp | 188 +++++++++--------- .../src/plugins/config/outputchannelform.h | 9 +- .../plugins/consolegadget/consolegadget.pro | 26 ++- .../gcs/src/plugins/coreplugin/coreplugin.pro | 29 +-- .../plugins/coreplugin/generalsettings.cpp | 12 +- .../src/plugins/coreplugin/generalsettings.h | 3 +- .../gcs/src/plugins/coreplugin/iuavgadget.h | 3 +- .../src/plugins/debuggadget/debuggadget.pro | 26 ++- ground/gcs/src/plugins/dial/dial.pro | 36 ++-- .../gcs/src/plugins/donothing/donothing.pro | 8 +- .../src/plugins/emptygadget/emptygadget.pro | 21 +- .../gcs/src/plugins/flightlog/flightlog.pro | 12 +- .../gcs/src/plugins/gpsdisplay/gpsdisplay.pro | 65 +++--- .../plugins/hitl/aerosimrc/src/udptest.pro | 6 +- ground/gcs/src/plugins/hitl/hitlwidget.cpp | 11 +- ground/gcs/src/plugins/hitl/hitlwidget.h | 4 +- ground/gcs/src/plugins/hitl/plugin.pro | 16 +- .../src/plugins/importexport/importexport.pro | 18 +- .../src/plugins/ipconnection/ipconnection.pro | 18 +- .../gcs/src/plugins/lineardial/lineardial.pro | 36 ++-- ground/gcs/src/plugins/logging/logging.pro | 10 +- .../plugins/magicwaypoint/magicwaypoint.pro | 23 ++- ground/gcs/src/plugins/notify/notify.pro | 13 +- .../notify/notifyplugin_dependencies.pri | 1 - ground/gcs/src/plugins/ophid/ophid.pro | 4 + ground/gcs/src/plugins/opmap/opmap.pro | 15 +- .../pathactioneditor/pathactioneditor.pro | 39 ++-- .../pathactioneditorgadgetwidget.h | 8 +- ground/gcs/src/plugins/plugins.pro | 9 +- ground/gcs/src/plugins/qmlview/qmlview.pro | 5 +- ground/gcs/src/plugins/scope/scope.pro | 2 + .../serialconnection/serialconnection.pro | 23 ++- .../plugins/serialconnection/serialplugin.cpp | 4 - .../setupwizard/outputcalibrationutil.cpp | 4 + .../setupwizard/outputcalibrationutil.h | 2 +- .../plugins/setupwizard/pages/savepage.cpp | 3 + .../src/plugins/setupwizard/setupwizard.pro | 10 +- .../vehicleconfigurationhelper.cpp | 10 +- .../setupwizard/vehicleconfigurationhelper.h | 9 +- .../src/plugins/systemhealth/systemhealth.pro | 32 +-- .../gcs/src/plugins/telemetry/telemetry.pro | 6 +- .../uavobjectbrowser/uavobjectbrowser.pro | 16 +- .../gcs/src/plugins/uavobjects/uavobject.cpp | 5 +- .../plugins/uavobjects/uavobjectmanager.cpp | 3 +- .../gcs/src/plugins/uavobjects/uavobjects.pro | 1 + .../plugins/uavobjectutil/uavobjectutil.pro | 12 +- .../uavobjectutil/uavobjectutilmanager.cpp | 10 +- .../uavobjectutil/uavobjectutilmanager.h | 7 +- .../uavobjectwidgetutils/configtaskwidget.cpp | 16 +- .../uavobjectwidgetutils/configtaskwidget.h | 30 ++- .../uavobjectwidgetutils.pro | 10 +- .../uavsettingsimportexport/importsummary.cpp | 4 + .../uavsettingsimportexport/importsummary.h | 5 +- .../uavsettingsimportexport.cpp | 16 +- .../uavsettingsimportexport.pro | 14 +- ground/gcs/src/plugins/uavtalk/uavtalk.pro | 2 +- ground/gcs/src/plugins/uploader/uploader.pro | 7 +- .../src/plugins/usagetracker/usagetracker.pro | 11 +- ground/gcs/src/plugins/welcome/welcome.pro | 2 + 107 files changed, 846 insertions(+), 598 deletions(-) diff --git a/ground/gcs/gcs.pri b/ground/gcs/gcs.pri index 3b6d19ab3..88e66bfac 100644 --- a/ground/gcs/gcs.pri +++ b/ground/gcs/gcs.pri @@ -193,7 +193,6 @@ macx { } } - INCLUDEPATH += \ $$GCS_SOURCE_TREE/src/libs diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.h b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.h index 463800fb1..f14c43fbc 100644 --- a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.h +++ b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.h @@ -27,19 +27,18 @@ #ifndef MAPGRAPHICITEM_H #define MAPGRAPHICITEM_H -#include #include "../internals/core.h" -// #include "../internals/point.h" #include "../core/diagnostics.h" #include "configuration.h" +#include "waypointitem.h" + +#include #include #include #include #include #include #include -#include "waypointitem.h" -// #include "uavitem.h" namespace mapcontrol { class WayPointItem; diff --git a/ground/gcs/src/plugin.pri b/ground/gcs/src/plugin.pri index ea4764a9e..88d8f2bce 100644 --- a/ground/gcs/src/plugin.pri +++ b/ground/gcs/src/plugin.pri @@ -7,8 +7,6 @@ LIBS += -L$$DESTDIR INCLUDEPATH += $$GCS_SOURCE_TREE/src/plugins DEPENDPATH += $$GCS_SOURCE_TREE/src/plugins -QT += widgets - # copy the plugin spec isEmpty(TARGET) { error("qtcreatorplugin.pri: You must provide a TARGET") @@ -26,7 +24,7 @@ QMAKE_EXTRA_COMPILERS += copy2build TARGET = $$qtLibraryName($$TARGET) macx { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Plugins/$${PROVIDER}/ + QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Plugins/$${PROVIDER}/ } else:linux-* { QMAKE_RPATHDIR = $$shell_quote(\$$ORIGIN) QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_LIBRARY_PATH, $$DESTDIR)) @@ -34,7 +32,6 @@ macx { include(rpath.pri) } - contains(QT_CONFIG, reduce_exports):CONFIG += hGCS_symbols CONFIG += plugin plugin_with_soname diff --git a/ground/gcs/src/plugins/antennatrack/antennatrack.pro b/ground/gcs/src/plugins/antennatrack/antennatrack.pro index e1bc56d56..b78b029e4 100644 --- a/ground/gcs/src/plugins/antennatrack/antennatrack.pro +++ b/ground/gcs/src/plugins/antennatrack/antennatrack.pro @@ -1,26 +1,35 @@ TEMPLATE = lib TARGET = AntennaTrack + QT += serialport + include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(antennatrack_dependencies.pri) include(../../libs/qwt/qwt.pri) -HEADERS += antennatrackplugin.h -HEADERS += gpsparser.h -HEADERS += telemetryparser.h -HEADERS += antennatrackgadget.h -HEADERS += antennatrackwidget.h -HEADERS += antennatrackgadgetfactory.h -HEADERS += antennatrackgadgetconfiguration.h -HEADERS += antennatrackgadgetoptionspage.h -SOURCES += antennatrackplugin.cpp -SOURCES += gpsparser.cpp -SOURCES += telemetryparser.cpp -SOURCES += antennatrackgadget.cpp -SOURCES += antennatrackgadgetfactory.cpp -SOURCES += antennatrackwidget.cpp -SOURCES += antennatrackgadgetconfiguration.cpp -SOURCES += antennatrackgadgetoptionspage.cpp + +HEADERS += \ + antennatrackplugin.h \ + gpsparser.h \ + telemetryparser.h \ + antennatrackgadget.h \ + antennatrackwidget.h \ + antennatrackgadgetfactory.h \ + antennatrackgadgetconfiguration.h \ + antennatrackgadgetoptionspage.h + +SOURCES += \ + antennatrackplugin.cpp \ + gpsparser.cpp \ + telemetryparser.cpp \ + antennatrackgadget.cpp \ + antennatrackgadgetfactory.cpp \ + antennatrackwidget.cpp \ + antennatrackgadgetconfiguration.cpp \ + antennatrackgadgetoptionspage.cpp + OTHER_FILES += AntennaTrack.pluginspec -FORMS += antennatrackgadgetoptionspage.ui -FORMS += antennatrackwidget.ui + +FORMS += \ + antennatrackgadgetoptionspage.ui \ + antennatrackwidget.ui diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp index 272702fed..0f10227f8 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp @@ -26,6 +26,9 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "configccpmwidget.h" + +#include "ui_airframe_ccpm.h" + #include "mixersettings.h" #include "systemsettings.h" #include "actuatorcommand.h" @@ -38,6 +41,9 @@ #include #include #include +#include +#include +#include #include diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.h b/ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.h index 09a412030..c302d5392 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.h +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.h @@ -29,22 +29,23 @@ #define CONFIGccpmWIDGET_H #include "cfg_vehicletypes/vehicleconfig.h" -#include "ui_airframe_ccpm.h" + #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" -#include -#include -#include -#include -#include +class Ui_CcpmConfigWidget; + +class QWidget; +class QSpinBox; +class QGraphicsSvgItem; +class QGraphicsEllipseItem; +class QGraphicsLineItem; +class QGraphicsTextItem; #define CCPM_MAX_SWASH_SERVOS 4 -class Ui_Widget; - typedef struct { int ServoChannels[CCPM_MAX_SWASH_SERVOS]; int Used[CCPM_MAX_SWASH_SERVOS]; diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.cpp index 714f66038..a5307282b 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.cpp +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.cpp @@ -26,6 +26,9 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "configcustomwidget.h" + +#include "ui_airframe_custom.h" + #include "mixersettings.h" #include diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.h b/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.h index 88392c4e0..4b55835bd 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.h +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configcustomwidget.h @@ -28,7 +28,7 @@ #define CONFIGCUSTOMWIDGET_H #include "cfg_vehicletypes/vehicleconfig.h" -#include "ui_airframe_custom.h" + #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" @@ -38,7 +38,7 @@ #include #include -class Ui_Widget; +class Ui_CustomConfigWidget; class ConfigCustomWidget : public VehicleConfig { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp index 0edbc616c..deb78b166 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp @@ -26,6 +26,9 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "configfixedwingwidget.h" + +#include "ui_airframe_fixedwing.h" + #include "mixersettings.h" #include "systemsettings.h" #include "actuatorsettings.h" diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.h b/ground/gcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.h index e61add426..bd7513cce 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.h +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.h @@ -28,17 +28,18 @@ #define CONFIGFIXEDWINGWIDGET_H #include "cfg_vehicletypes/vehicleconfig.h" -#include "ui_airframe_fixedwing.h" + #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" -#include #include -#include -class Ui_Widget; +class Ui_FixedWingConfigWidget; + +class QWidget; +class QGraphicsSvgItem; class ConfigFixedWingWidget : public VehicleConfig { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp index ec94ba07b..452a7d2cc 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp @@ -26,6 +26,9 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "configgroundvehiclewidget.h" + +#include "ui_airframe_ground.h" + #include "mixersettings.h" #include "systemsettings.h" #include "actuatorsettings.h" diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.h b/ground/gcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.h index ff2b6c796..b9216665b 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.h +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.h @@ -28,17 +28,16 @@ #define CONFIGGROUNDVEHICLEWIDGET_H #include "cfg_vehicletypes/vehicleconfig.h" -#include "ui_airframe_ground.h" + #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" -#include -#include -#include +class Ui_GroundConfigWidget; -class Ui_Widget; +class QWidget; +class QGraphicsSvgItem; class ConfigGroundVehicleWidget : public VehicleConfig { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp index 751f7c36d..8a31ed61d 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp @@ -26,6 +26,9 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "configmultirotorwidget.h" + +#include "ui_airframe_multirotor.h" + #include "mixersettings.h" #include "systemsettings.h" #include "actuatorsettings.h" diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.h b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.h index df44c73f6..dc8f1cf3a 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.h +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.h @@ -28,17 +28,18 @@ #define CONFIGMULTIROTORWIDGET_H #include "cfg_vehicletypes/vehicleconfig.h" -#include "ui_airframe_multirotor.h" + #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" -#include -#include -#include +#include -class Ui_Widget; +class Ui_MultiRotorConfigWidget; + +class QWidget; +class QGraphicsSvgItem; class ConfigMultiRotorWidget : public VehicleConfig { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp index bbea43bb9..26f734fba 100644 --- a/ground/gcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp +++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp @@ -25,13 +25,18 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "cfg_vehicletypes/vehicleconfig.h" + #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" -#include "systemsettings.h" -#include +#include "systemsettings.h" + +#include #include +#include +#include +#include VehicleConfig::VehicleConfig(QWidget *parent) : ConfigTaskWidget(parent) { diff --git a/ground/gcs/src/plugins/config/config.pro b/ground/gcs/src/plugins/config/config.pro index 97920995c..29b8b3375 100644 --- a/ground/gcs/src/plugins/config/config.pro +++ b/ground/gcs/src/plugins/config/config.pro @@ -2,16 +2,12 @@ TEMPLATE = lib TARGET = Config DEFINES += CONFIG_LIBRARY -QT += svg opengl qml quick +QT += widgets svg opengl qml quick include(config_dependencies.pri) INCLUDEPATH += ../../libs/eigen -OTHER_FILES += \ - Config.pluginspec \ - calibration/WizardStepIndicator.qml - HEADERS += \ configplugin.h \ configgadgetwidget.h \ @@ -129,4 +125,8 @@ FORMS += \ configrevonanohwwidget.ui \ failsafechannelform.ui +OTHER_FILES += \ + Config.pluginspec \ + calibration/WizardStepIndicator.qml + RESOURCES += configgadget.qrc diff --git a/ground/gcs/src/plugins/config/config_cc_hw_widget.cpp b/ground/gcs/src/plugins/config/config_cc_hw_widget.cpp index fc59ddc27..fc827bb00 100644 --- a/ground/gcs/src/plugins/config/config_cc_hw_widget.cpp +++ b/ground/gcs/src/plugins/config/config_cc_hw_widget.cpp @@ -25,8 +25,16 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include "config_cc_hw_widget.h" + +#include "ui_cc_hw_settings.h" + +#include +#include + #include "hwsettings.h" + #include #include #include @@ -35,9 +43,6 @@ #include #include #include -#include -#include - ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent) { diff --git a/ground/gcs/src/plugins/config/config_cc_hw_widget.h b/ground/gcs/src/plugins/config/config_cc_hw_widget.h index 313231382..aaf835935 100644 --- a/ground/gcs/src/plugins/config/config_cc_hw_widget.h +++ b/ground/gcs/src/plugins/config/config_cc_hw_widget.h @@ -27,14 +27,17 @@ #ifndef CONFIGCCHWWIDGET_H #define CONFIGCCHWWIDGET_H -#include "ui_cc_hw_settings.h" #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" +#include "smartsavebutton.h" + #include #include -#include "smartsavebutton.h" +#include + +class Ui_CC_HW_Widget; class ConfigCCHWWidget : public ConfigTaskWidget { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/configautotunewidget.cpp b/ground/gcs/src/plugins/config/configautotunewidget.cpp index fea26b73f..88b232c3a 100644 --- a/ground/gcs/src/plugins/config/configautotunewidget.cpp +++ b/ground/gcs/src/plugins/config/configautotunewidget.cpp @@ -1,19 +1,22 @@ #include "configautotunewidget.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ui_autotune.h" + #include "relaytuningsettings.h" #include "relaytuning.h" #include "stabilizationsettings.h" #include "hwsettings.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + ConfigAutotuneWidget::ConfigAutotuneWidget(QWidget *parent) : ConfigTaskWidget(parent) { diff --git a/ground/gcs/src/plugins/config/configautotunewidget.h b/ground/gcs/src/plugins/config/configautotunewidget.h index 38f2df1fc..7fffc764a 100644 --- a/ground/gcs/src/plugins/config/configautotunewidget.h +++ b/ground/gcs/src/plugins/config/configautotunewidget.h @@ -27,17 +27,20 @@ #ifndef CONFIGAUTOTUNE_H #define CONFIGAUTOTUNE_H -#include "ui_autotune.h" #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" + #include "stabilizationsettings.h" #include "relaytuningsettings.h" #include "relaytuning.h" -#include + +#include #include +class Ui_AutotuneWidget; + class ConfigAutotuneWidget : public ConfigTaskWidget { Q_OBJECT public: diff --git a/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp b/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp index 801d1f935..c6ace5728 100644 --- a/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp +++ b/ground/gcs/src/plugins/config/configcamerastabilizationwidget.cpp @@ -35,12 +35,16 @@ */ #include "configcamerastabilizationwidget.h" + +#include "ui_camerastabilization.h" + +#include +#include + #include "camerastabsettings.h" #include "hwsettings.h" #include "mixersettings.h" #include "actuatorcommand.h" -#include -#include ConfigCameraStabilizationWidget::ConfigCameraStabilizationWidget(QWidget *parent) : ConfigTaskWidget(parent) { diff --git a/ground/gcs/src/plugins/config/configcamerastabilizationwidget.h b/ground/gcs/src/plugins/config/configcamerastabilizationwidget.h index 8c656f8ff..e4384f082 100644 --- a/ground/gcs/src/plugins/config/configcamerastabilizationwidget.h +++ b/ground/gcs/src/plugins/config/configcamerastabilizationwidget.h @@ -27,13 +27,15 @@ #ifndef CONFIGCAMERASTABILIZATIONWIDGET_H #define CONFIGCAMERASTABILIZATIONWIDGET_H -#include "ui_camerastabilization.h" #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" + #include "camerastabsettings.h" +class Ui_CameraStabilizationWidget; + class ConfigCameraStabilizationWidget : public ConfigTaskWidget { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/configccattitudewidget.cpp b/ground/gcs/src/plugins/config/configccattitudewidget.cpp index b14f98302..2934b8b00 100644 --- a/ground/gcs/src/plugins/config/configccattitudewidget.cpp +++ b/ground/gcs/src/plugins/config/configccattitudewidget.cpp @@ -26,20 +26,25 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "configccattitudewidget.h" + #include "ui_ccattitude.h" + #include "utils/coordinateconversions.h" +#include +#include +#include + #include "attitudesettings.h" +#include "accelstate.h" +#include "accelgyrosettings.h" +#include "gyrostate.h" + #include #include #include #include #include -#include "accelstate.h" -#include "accelgyrosettings.h" -#include "gyrostate.h" -#include -#include -#include + ConfigCCAttitudeWidget::ConfigCCAttitudeWidget(QWidget *parent) : ConfigTaskWidget(parent), ui(new Ui_ccattitude) diff --git a/ground/gcs/src/plugins/config/configccattitudewidget.h b/ground/gcs/src/plugins/config/configccattitudewidget.h index 658d3d6bb..091434350 100644 --- a/ground/gcs/src/plugins/config/configccattitudewidget.h +++ b/ground/gcs/src/plugins/config/configccattitudewidget.h @@ -27,15 +27,15 @@ #ifndef CCATTITUDEWIDGET_H #define CCATTITUDEWIDGET_H -#include "ui_ccattitude.h" #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" + #include #include -class Ui_Widget; +class Ui_ccattitude; class ConfigCCAttitudeWidget : public ConfigTaskWidget { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/configinputwidget.cpp b/ground/gcs/src/plugins/config/configinputwidget.cpp index 2bcf543a2..9eb272af0 100644 --- a/ground/gcs/src/plugins/config/configinputwidget.cpp +++ b/ground/gcs/src/plugins/config/configinputwidget.cpp @@ -30,6 +30,17 @@ #include #include +#include + +#include "ui_input.h" +#include "ui_input_wizard.h" + +#include "inputchannelform.h" +#include "ui_inputchannelform.h" + +#include "failsafechannelform.h" +#include "ui_failsafechannelform.h" + #include #include @@ -41,12 +52,9 @@ #include #include #include -#include -#include -#include "inputchannelform.h" -#include "ui_inputchannelform.h" -#include "failsafechannelform.h" -#include "ui_failsafechannelform.h" +#include +#include +#include #define ACCESS_MIN_MOVE -3 #define ACCESS_MAX_MOVE 3 @@ -170,7 +178,7 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) : addWidgetBinding("ManualControlSettings", "FailsafeFlightModeSwitchPosition", ui->failsafeFlightMode, 0, 1, true, new QList(failsafeReloadGroup)); // Generate the rows for the failsafe channel form GUI - index = 0; + index = 0; foreach(QString name, manualSettingsObj->getField("FailsafeChannel")->getElementNames()) { Q_ASSERT(index < ManualControlSettings::FAILSAFECHANNEL_NUMELEM); @@ -196,10 +204,10 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) : connect(wizardUi->wzBack, SIGNAL(clicked()), this, SLOT(wzBack())); ui->stackedWidget->setCurrentIndex(0); - QList widgets = QList() << ui->fmsModePos1 << ui->fmsModePos2 << ui->fmsModePos3 << - ui->fmsModePos4 << ui->fmsModePos5 << ui->fmsModePos6; + QList widgets = QList() << ui->fmsModePos1 << ui->fmsModePos2 << ui->fmsModePos3 << + ui->fmsModePos4 << ui->fmsModePos5 << ui->fmsModePos6; index = 0; - foreach(QWidget* widget, widgets) { + foreach(QWidget * widget, widgets) { addWidgetBinding("FlightModeSettings", "FlightModePosition", widget, index++, 1, true); } diff --git a/ground/gcs/src/plugins/config/configinputwidget.h b/ground/gcs/src/plugins/config/configinputwidget.h index 08e79fbf4..74b5f7611 100644 --- a/ground/gcs/src/plugins/config/configinputwidget.h +++ b/ground/gcs/src/plugins/config/configinputwidget.h @@ -28,30 +28,33 @@ #ifndef CONFIGINPUTWIDGET_H #define CONFIGINPUTWIDGET_H -#include "ui_input.h" -#include "ui_input_wizard.h" -#include "../uavobjectwidgetutils/configtaskwidget.h" +#include "uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" -#include -#include -#include + #include "manualcontrolcommand.h" #include "manualcontrolsettings.h" #include "actuatorsettings.h" #include "mixersettings.h" #include "flightmodesettings.h" #include "receiveractivity.h" -#include -#include -#include #include "flightstatus.h" #include "accessorydesired.h" -#include #include "systemsettings.h" +#include +#include +#include +#include + class Ui_InputWidget; +class Ui_InputWizardWidget; + +class QEventLoop; +class QSvgRenderer; +class QGraphicsSvgItem; +class QGraphicsSimpleTextItem; class ConfigInputWidget : public ConfigTaskWidget { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/configoplinkwidget.cpp b/ground/gcs/src/plugins/config/configoplinkwidget.cpp index f1c7a3d10..3a9e4de98 100644 --- a/ground/gcs/src/plugins/config/configoplinkwidget.cpp +++ b/ground/gcs/src/plugins/config/configoplinkwidget.cpp @@ -28,10 +28,16 @@ #include "configoplinkwidget.h" +#include "ui_oplink.h" + #include +#include + #include #include + #include +#include // Channel range and Frequency display static const int MAX_CHANNEL_NUM = 250; diff --git a/ground/gcs/src/plugins/config/configoplinkwidget.h b/ground/gcs/src/plugins/config/configoplinkwidget.h index bda71c46e..032722099 100644 --- a/ground/gcs/src/plugins/config/configoplinkwidget.h +++ b/ground/gcs/src/plugins/config/configoplinkwidget.h @@ -27,11 +27,12 @@ #ifndef CONFIGPIPXTREMEWIDGET_H #define CONFIGPIPXTREMEWIDGET_H -#include - -#include "ui_oplink.h" #include "configtaskwidget.h" +#include "oplinksettings.h" + +class Ui_OPLinkWidget; + class ConfigOPLinkWidget : public ConfigTaskWidget { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/configoutputwidget.cpp b/ground/gcs/src/plugins/config/configoutputwidget.cpp index 7da880e85..60b925017 100644 --- a/ground/gcs/src/plugins/config/configoutputwidget.cpp +++ b/ground/gcs/src/plugins/config/configoutputwidget.cpp @@ -27,16 +27,21 @@ */ #include "configoutputwidget.h" + +#include "ui_output.h" +#include "ui_outputchannelform.h" + #include "outputchannelform.h" #include "configvehicletypewidget.h" +#include "uavsettingsimportexport/uavsettingsimportexportfactory.h" +#include +#include + #include "mixersettings.h" #include "actuatorcommand.h" #include "actuatorsettings.h" #include "systemsettings.h" -#include "uavsettingsimportexport/uavsettingsimportexportfactory.h" -#include -#include #include #include @@ -84,11 +89,11 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren connect(m_ui->channelOutTest, SIGNAL(toggled(bool)), form, SLOT(enableChannelTest(bool))); connect(form, SIGNAL(channelChanged(int, int)), this, SLOT(sendChannelTest(int, int))); - addWidget(form->ui.actuatorMin); - addWidget(form->ui.actuatorNeutral); - addWidget(form->ui.actuatorMax); - addWidget(form->ui.actuatorRev); - addWidget(form->ui.actuatorLink); + addWidget(form->ui->actuatorMin); + addWidget(form->ui->actuatorNeutral); + addWidget(form->ui->actuatorMax); + addWidget(form->ui->actuatorRev); + addWidget(form->ui->actuatorLink); } diff --git a/ground/gcs/src/plugins/config/configoutputwidget.h b/ground/gcs/src/plugins/config/configoutputwidget.h index d64762833..2663f060c 100644 --- a/ground/gcs/src/plugins/config/configoutputwidget.h +++ b/ground/gcs/src/plugins/config/configoutputwidget.h @@ -27,23 +27,27 @@ #ifndef CONFIGOUTPUTWIDGET_H #define CONFIGOUTPUTWIDGET_H -#include "ui_output.h" +#include "cfg_vehicletypes/vehicleconfig.h" + #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" #include "uavobjectutilmanager.h" -#include "cfg_vehicletypes/vehicleconfig.h" -#include -#include -#include #include "systemalarms.h" +#include +#include + class Ui_OutputWidget; class OutputChannelForm; class MixerSettings; +class QLabel; +class QCheckBox; +class QWidget; + class OutputBankControls { public: OutputBankControls(MixerSettings *mixer, QLabel *label, QColor color, QComboBox *rateCombo, QComboBox *modeCombo); diff --git a/ground/gcs/src/plugins/config/configrevohwwidget.cpp b/ground/gcs/src/plugins/config/configrevohwwidget.cpp index d58bc659e..7519c7300 100644 --- a/ground/gcs/src/plugins/config/configrevohwwidget.cpp +++ b/ground/gcs/src/plugins/config/configrevohwwidget.cpp @@ -27,15 +27,18 @@ */ #include "configrevohwwidget.h" -#include +#include "ui_configrevohwwidget.h" + #include #include + #include "hwsettings.h" + +#include #include #include #include - ConfigRevoHWWidget::ConfigRevoHWWidget(QWidget *parent) : ConfigTaskWidget(parent), m_refreshing(true) { m_ui = new Ui_RevoHWWidget(); diff --git a/ground/gcs/src/plugins/config/configrevohwwidget.h b/ground/gcs/src/plugins/config/configrevohwwidget.h index 436982fef..b8119037d 100644 --- a/ground/gcs/src/plugins/config/configrevohwwidget.h +++ b/ground/gcs/src/plugins/config/configrevohwwidget.h @@ -27,14 +27,13 @@ #ifndef CONFIGREVOHWWIDGET_H #define CONFIGREVOHWWIDGET_H -#include "ui_configrevohwwidget.h" #include "../uavobjectwidgetutils/configtaskwidget.h" -#include "extensionsystem/pluginmanager.h" -#include "uavobjectmanager.h" -#include "uavobject.h" -#include -#include +class Ui_RevoHWWidget; + +class UAVObject; + +class QWidget; class ConfigRevoHWWidget : public ConfigTaskWidget { Q_OBJECT @@ -44,8 +43,8 @@ public: ~ConfigRevoHWWidget(); private: - bool m_refreshing; Ui_RevoHWWidget *m_ui; + bool m_refreshing; void setupCustomCombos(); protected slots: diff --git a/ground/gcs/src/plugins/config/configrevonanohwwidget.cpp b/ground/gcs/src/plugins/config/configrevonanohwwidget.cpp index 218880e6f..b1d1ba6c7 100644 --- a/ground/gcs/src/plugins/config/configrevonanohwwidget.cpp +++ b/ground/gcs/src/plugins/config/configrevonanohwwidget.cpp @@ -27,15 +27,18 @@ */ #include "configrevonanohwwidget.h" -#include +#include "ui_configrevonanohwwidget.h" + #include #include + #include "hwsettings.h" + +#include #include #include #include - ConfigRevoNanoHWWidget::ConfigRevoNanoHWWidget(QWidget *parent) : ConfigTaskWidget(parent), m_refreshing(true) { m_ui = new Ui_RevoNanoHWWidget(); diff --git a/ground/gcs/src/plugins/config/configrevonanohwwidget.h b/ground/gcs/src/plugins/config/configrevonanohwwidget.h index 7efebd326..9e25ffa32 100644 --- a/ground/gcs/src/plugins/config/configrevonanohwwidget.h +++ b/ground/gcs/src/plugins/config/configrevonanohwwidget.h @@ -27,14 +27,13 @@ #ifndef CONFIGREVONANOHWWIDGET_H #define CONFIGREVONANOHWWIDGET_H -#include "ui_configrevonanohwwidget.h" #include "../uavobjectwidgetutils/configtaskwidget.h" -#include "extensionsystem/pluginmanager.h" -#include "uavobjectmanager.h" -#include "uavobject.h" -#include -#include +class Ui_RevoNanoHWWidget; + +class UAVObject; + +class QWidget; class ConfigRevoNanoHWWidget : public ConfigTaskWidget { Q_OBJECT @@ -44,8 +43,8 @@ public: ~ConfigRevoNanoHWWidget(); private: - bool m_refreshing; Ui_RevoNanoHWWidget *m_ui; + bool m_refreshing; void setupCustomCombos(); protected slots: diff --git a/ground/gcs/src/plugins/config/configrevowidget.cpp b/ground/gcs/src/plugins/config/configrevowidget.cpp index 8216145fa..cb85a6fc3 100644 --- a/ground/gcs/src/plugins/config/configrevowidget.cpp +++ b/ground/gcs/src/plugins/config/configrevowidget.cpp @@ -26,6 +26,8 @@ */ #include "configrevowidget.h" +#include "ui_revosensors.h" + #include #include #include diff --git a/ground/gcs/src/plugins/config/configrevowidget.h b/ground/gcs/src/plugins/config/configrevowidget.h index c4c810b06..9d826a1ae 100644 --- a/ground/gcs/src/plugins/config/configrevowidget.h +++ b/ground/gcs/src/plugins/config/configrevowidget.h @@ -27,29 +27,19 @@ #ifndef CONFIGREVOWIDGET_H #define CONFIGREVOWIDGET_H -#include "ui_revosensors.h" #include "configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" + #include "calibration/thermal/thermalcalibrationmodel.h" #include "calibration/sixpointcalibrationmodel.h" #include "calibration/levelcalibrationmodel.h" #include "calibration/gyrobiascalibrationmodel.h" -#include -#include -#include -#include +class Ui_RevoSensorsWidget; -#include -#include -#include -#include -#include -#include - -class Ui_Widget; +class QWidget; class ConfigRevoWidget : public ConfigTaskWidget { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/configstabilizationwidget.cpp b/ground/gcs/src/plugins/config/configstabilizationwidget.cpp index ec73b62ca..0fcb9f116 100644 --- a/ground/gcs/src/plugins/config/configstabilizationwidget.cpp +++ b/ground/gcs/src/plugins/config/configstabilizationwidget.cpp @@ -27,6 +27,21 @@ */ #include "configstabilizationwidget.h" +#include "ui_stabilization.h" + +#include +#include +#include "uavobjectutilmanager.h" + +#include "objectpersistence.h" +#include "altitudeholdsettings.h" +#include "stabilizationsettings.h" + +#include "qwt/src/qwt.h" +#include "qwt/src/qwt_plot.h" +#include "qwt/src/qwt_plot_canvas.h" +#include "qwt/src/qwt_scale_widget.h" + #include #include #include @@ -42,16 +57,6 @@ #include #include -#include -#include -#include "altitudeholdsettings.h" -#include "stabilizationsettings.h" - -#include "qwt/src/qwt.h" -#include "qwt/src/qwt_plot.h" -#include "qwt/src/qwt_plot_canvas.h" -#include "qwt/src/qwt_scale_widget.h" - ConfigStabilizationWidget::ConfigStabilizationWidget(QWidget *parent) : ConfigTaskWidget(parent), boardModel(0), m_stabSettingsBankCount(0), m_currentStabSettingsBank(0) { diff --git a/ground/gcs/src/plugins/config/configstabilizationwidget.h b/ground/gcs/src/plugins/config/configstabilizationwidget.h index 1698af188..e9a30938c 100644 --- a/ground/gcs/src/plugins/config/configstabilizationwidget.h +++ b/ground/gcs/src/plugins/config/configstabilizationwidget.h @@ -27,18 +27,24 @@ #ifndef CONFIGSTABILIZATIONWIDGET_H #define CONFIGSTABILIZATIONWIDGET_H -#include "ui_stabilization.h" #include "../uavobjectwidgetutils/configtaskwidget.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" + #include "stabilizationsettings.h" -#include -#include -#include + #include "qwt/src/qwt_plot_curve.h" #include "qwt/src/qwt_plot_grid.h" +#include +#include + +class Ui_StabilizationWidget; + +class QWidget; +class QTabBar; + class ConfigStabilizationWidget : public ConfigTaskWidget { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/configtxpidwidget.cpp b/ground/gcs/src/plugins/config/configtxpidwidget.cpp index 3ab805cdf..a84644094 100644 --- a/ground/gcs/src/plugins/config/configtxpidwidget.cpp +++ b/ground/gcs/src/plugins/config/configtxpidwidget.cpp @@ -27,6 +27,12 @@ */ #include "configtxpidwidget.h" + +#include "ui_txpid.h" + +#include +#include + #include "txpidsettings.h" #include "hwsettings.h" #include "attitudesettings.h" @@ -34,8 +40,6 @@ #include "stabilizationsettingsbank1.h" #include "stabilizationsettingsbank2.h" #include "stabilizationsettingsbank3.h" -#include -#include ConfigTxPIDWidget::ConfigTxPIDWidget(QWidget *parent) : ConfigTaskWidget(parent) { diff --git a/ground/gcs/src/plugins/config/configtxpidwidget.h b/ground/gcs/src/plugins/config/configtxpidwidget.h index 2073fd438..f1dd40315 100644 --- a/ground/gcs/src/plugins/config/configtxpidwidget.h +++ b/ground/gcs/src/plugins/config/configtxpidwidget.h @@ -27,9 +27,10 @@ #ifndef CONFIGTXPIDWIDGET_H #define CONFIGTXPIDWIDGET_H -#include "ui_txpid.h" #include "configtaskwidget.h" +class Ui_TxPIDWidget; + class ConfigTxPIDWidget : public ConfigTaskWidget { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/configvehicletypewidget.cpp b/ground/gcs/src/plugins/config/configvehicletypewidget.cpp index 8d2e15cca..e5a80d3fe 100644 --- a/ground/gcs/src/plugins/config/configvehicletypewidget.cpp +++ b/ground/gcs/src/plugins/config/configvehicletypewidget.cpp @@ -26,9 +26,15 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "configvehicletypewidget.h" + +#include "ui_airframe.h" + +#include "configgadgetfactory.h" +#include +#include + #include "systemsettings.h" #include "actuatorsettings.h" -#include "configgadgetfactory.h" #include "cfg_vehicletypes/configccpmwidget.h" #include "cfg_vehicletypes/configfixedwingwidget.h" @@ -47,9 +53,6 @@ #include #include -#include -#include - /** Static function to get currently assigned channelDescriptions for all known vehicle types; instantiates the appropriate object diff --git a/ground/gcs/src/plugins/config/configvehicletypewidget.h b/ground/gcs/src/plugins/config/configvehicletypewidget.h index 28e8beaf7..fbe825567 100644 --- a/ground/gcs/src/plugins/config/configvehicletypewidget.h +++ b/ground/gcs/src/plugins/config/configvehicletypewidget.h @@ -28,22 +28,17 @@ #ifndef CONFIGVEHICLETYPEWIDGET_H #define CONFIGVEHICLETYPEWIDGET_H -#include "ui_airframe.h" #include "cfg_vehicletypes/vehicleconfig.h" #include "uavobject.h" #include "../uavobjectwidgetutils/configtaskwidget.h" -#include #include #include #include -#include -#include -#include -#include +class Ui_AircraftWidget; -class Ui_Widget; +class QWidget; /* * This class derives from ConfigTaskWidget and overrides its default "binding" mechanism. diff --git a/ground/gcs/src/plugins/config/defaultattitudewidget.cpp b/ground/gcs/src/plugins/config/defaultattitudewidget.cpp index e221aebe2..59ef9ba52 100644 --- a/ground/gcs/src/plugins/config/defaultattitudewidget.cpp +++ b/ground/gcs/src/plugins/config/defaultattitudewidget.cpp @@ -25,7 +25,9 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "defaultattitudewidget.h" + #include "ui_defaultattitude.h" + #include #include #include diff --git a/ground/gcs/src/plugins/config/defaultattitudewidget.h b/ground/gcs/src/plugins/config/defaultattitudewidget.h index 5703e4498..c98ccad15 100644 --- a/ground/gcs/src/plugins/config/defaultattitudewidget.h +++ b/ground/gcs/src/plugins/config/defaultattitudewidget.h @@ -27,16 +27,9 @@ #ifndef DEFAULTATTITUDEWIDGET_H #define DEFAULTATTITUDEWIDGET_H -#include "ui_defaultattitude.h" -#include "../uavobjectwidgetutils/configtaskwidget.h" -#include "extensionsystem/pluginmanager.h" -#include "uavobjectmanager.h" -#include "uavobject.h" #include -#include -#include -class Ui_Widget; +class Ui_defaultattitude; class DefaultAttitudeWidget : public QWidget { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/defaulthwsettingswidget.cpp b/ground/gcs/src/plugins/config/defaulthwsettingswidget.cpp index 21b9274e4..8bc35228c 100644 --- a/ground/gcs/src/plugins/config/defaulthwsettingswidget.cpp +++ b/ground/gcs/src/plugins/config/defaulthwsettingswidget.cpp @@ -25,7 +25,9 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "defaulthwsettingswidget.h" -#include "ui_defaultattitude.h" + +#include "ui_defaulthwsettings.h" + #include #include #include diff --git a/ground/gcs/src/plugins/config/defaulthwsettingswidget.h b/ground/gcs/src/plugins/config/defaulthwsettingswidget.h index 7d0cbceba..9294e455e 100644 --- a/ground/gcs/src/plugins/config/defaulthwsettingswidget.h +++ b/ground/gcs/src/plugins/config/defaulthwsettingswidget.h @@ -27,16 +27,9 @@ #ifndef DEFAULTHWSETTINGSt_H #define DEFAULTHWSETTINGSt_H -#include "ui_defaulthwsettings.h" -#include "../uavobjectwidgetutils/configtaskwidget.h" -#include "extensionsystem/pluginmanager.h" -#include "uavobjectmanager.h" -#include "uavobject.h" #include -#include -#include -class Ui_Widget; +class Ui_defaulthwsettings; class DefaultHwSettingsWidget : public QWidget { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/mixercurve.cpp b/ground/gcs/src/plugins/config/mixercurve.cpp index b2cc03a64..ce93206b0 100644 --- a/ground/gcs/src/plugins/config/mixercurve.cpp +++ b/ground/gcs/src/plugins/config/mixercurve.cpp @@ -25,11 +25,15 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "mixercurve.h" + +#include "ui_mixercurve.h" + +#include "dblspindelegate.h" + #include #include #include -#include "mixercurve.h" -#include "dblspindelegate.h" MixerCurve::MixerCurve(QWidget *parent) : QFrame(parent), diff --git a/ground/gcs/src/plugins/config/mixercurve.h b/ground/gcs/src/plugins/config/mixercurve.h index faa581fcc..3c578a92c 100644 --- a/ground/gcs/src/plugins/config/mixercurve.h +++ b/ground/gcs/src/plugins/config/mixercurve.h @@ -27,22 +27,21 @@ #ifndef MIXERCURVE_H #define MIXERCURVE_H -#include -#include -#include -#include - -#include "ui_mixercurve.h" #include "mixercurvewidget.h" #include "dblspindelegate.h" #include "uavobjectwidgetutils_global.h" #include "uavobjectwidgetutils/popupwidget.h" +#include +#include namespace Ui { class MixerCurve; } +class QWidget; +class QTableWidget; + class MixerCurve : public QFrame { Q_OBJECT diff --git a/ground/gcs/src/plugins/config/outputchannelform.cpp b/ground/gcs/src/plugins/config/outputchannelform.cpp index ea8636250..b093956a1 100644 --- a/ground/gcs/src/plugins/config/outputchannelform.cpp +++ b/ground/gcs/src/plugins/config/outputchannelform.cpp @@ -27,34 +27,36 @@ #include "outputchannelform.h" +#include "ui_outputchannelform.h" + #define MAXOUTPUT_VALUE 2500 #define MINOUTPUT_VALUE 500 OutputChannelForm::OutputChannelForm(const int index, QWidget *parent) : - ChannelForm(index, parent), ui(), m_inChannelTest(false) + ChannelForm(index, parent), ui(new Ui::outputChannelForm), m_inChannelTest(false) { - ui.setupUi(this); + ui->setupUi(this); // The convention for OP is Channel 1 to Channel 10. - ui.actuatorNumber->setText(QString("%1").arg(index + 1)); + ui->actuatorNumber->setText(QString("%1").arg(index + 1)); setBank("-"); // Register for ActuatorSettings changes: - connect(ui.actuatorMin, SIGNAL(editingFinished()), this, SLOT(setChannelRange())); - connect(ui.actuatorMax, SIGNAL(editingFinished()), this, SLOT(setChannelRange())); - connect(ui.actuatorRev, SIGNAL(toggled(bool)), this, SLOT(reverseChannel(bool))); + connect(ui->actuatorMin, SIGNAL(editingFinished()), this, SLOT(setChannelRange())); + connect(ui->actuatorMax, SIGNAL(editingFinished()), this, SLOT(setChannelRange())); + connect(ui->actuatorRev, SIGNAL(toggled(bool)), this, SLOT(reverseChannel(bool))); // Now connect the channel out sliders to our signal to send updates in test mode - connect(ui.actuatorNeutral, SIGNAL(valueChanged(int)), this, SLOT(sendChannelTest(int))); + connect(ui->actuatorNeutral, SIGNAL(valueChanged(int)), this, SLOT(sendChannelTest(int))); - ui.actuatorLink->setChecked(false); - connect(ui.actuatorLink, SIGNAL(toggled(bool)), this, SLOT(linkToggled(bool))); + ui->actuatorLink->setChecked(false); + connect(ui->actuatorLink, SIGNAL(toggled(bool)), this, SLOT(linkToggled(bool))); // Set limits - ui.actuatorMin->setMaximum(MAXOUTPUT_VALUE); - ui.actuatorMax->setMaximum(MAXOUTPUT_VALUE); - ui.actuatorValue->setMaximum(MAXOUTPUT_VALUE); - ui.actuatorMin->setMinimum(MINOUTPUT_VALUE); - ui.actuatorMax->setMinimum(MINOUTPUT_VALUE); - ui.actuatorValue->setMinimum(MINOUTPUT_VALUE); + ui->actuatorMin->setMaximum(MAXOUTPUT_VALUE); + ui->actuatorMax->setMaximum(MAXOUTPUT_VALUE); + ui->actuatorValue->setMaximum(MAXOUTPUT_VALUE); + ui->actuatorMin->setMinimum(MINOUTPUT_VALUE); + ui->actuatorMax->setMinimum(MINOUTPUT_VALUE); + ui->actuatorValue->setMinimum(MINOUTPUT_VALUE); setChannelRange(); @@ -63,17 +65,17 @@ OutputChannelForm::OutputChannelForm(const int index, QWidget *parent) : OutputChannelForm::~OutputChannelForm() { - // Do nothing + delete ui; } QString OutputChannelForm::name() { - return ui.actuatorName->text(); + return ui->actuatorName->text(); } QString OutputChannelForm::bank() { - return ui.actuatorBankNumber->text(); + return ui->actuatorBankNumber->text(); } /** @@ -81,18 +83,18 @@ QString OutputChannelForm::bank() */ void OutputChannelForm::setName(const QString &name) { - ui.actuatorName->setText(name); + ui->actuatorName->setText(name); } void OutputChannelForm::setColor(const QColor &color) { - QString stylesheet = ui.actuatorNumberFrame->styleSheet(); + QString stylesheet = ui->actuatorNumberFrame->styleSheet(); stylesheet = stylesheet.split("background-color").first(); stylesheet.append( QString("background-color: rgb(%1, %2, %3)") .arg(color.red()).arg(color.green()).arg(color.blue())); - ui.actuatorNumberFrame->setStyleSheet(stylesheet); + ui->actuatorNumberFrame->setStyleSheet(stylesheet); } /** @@ -100,7 +102,7 @@ void OutputChannelForm::setColor(const QColor &color) */ void OutputChannelForm::setBank(const QString &bank) { - ui.actuatorBankNumber->setText(bank); + ui->actuatorBankNumber->setText(bank); } /** @@ -116,14 +118,14 @@ void OutputChannelForm::enableChannelTest(bool state) if (m_inChannelTest) { // Prevent stupid users from touching the minimum & maximum ranges while // moving the sliders. Thanks Ivan for the tip :) - ui.actuatorMin->setEnabled(false); - ui.actuatorMax->setEnabled(false); - ui.actuatorRev->setEnabled(false); + ui->actuatorMin->setEnabled(false); + ui->actuatorMax->setEnabled(false); + ui->actuatorRev->setEnabled(false); } else if (m_mixerType != "Disabled") { - ui.actuatorMin->setEnabled(true); - ui.actuatorMax->setEnabled(true); + ui->actuatorMin->setEnabled(true); + ui->actuatorMax->setEnabled(true); if (m_mixerType != "Motor") { - ui.actuatorRev->setEnabled(true); + ui->actuatorRev->setEnabled(true); } } } @@ -147,13 +149,13 @@ void OutputChannelForm::linkToggled(bool state) QList outputChannelForms = parent()->findChildren(); // set the linked channels of the parent widget to the same value foreach(OutputChannelForm * outputChannelForm, outputChannelForms) { - if (!outputChannelForm->ui.actuatorLink->checkState()) { + if (!outputChannelForm->ui->actuatorLink->checkState()) { continue; } if (this == outputChannelForm) { continue; } - int value = outputChannelForm->ui.actuatorNeutral->value(); + int value = outputChannelForm->ui->actuatorNeutral->value(); if (min > value) { min = value; } @@ -165,16 +167,16 @@ void OutputChannelForm::linkToggled(bool state) } // set the linked channels to the same value foreach(OutputChannelForm * outputChannelForm, outputChannelForms) { - if (!outputChannelForm->ui.actuatorLink->checkState()) { + if (!outputChannelForm->ui->actuatorLink->checkState()) { continue; } - outputChannelForm->ui.actuatorNeutral->setValue(min); + outputChannelForm->ui->actuatorNeutral->setValue(min); } } int OutputChannelForm::max() const { - return ui.actuatorMax->value(); + return ui->actuatorMax->value(); } /** @@ -182,12 +184,12 @@ int OutputChannelForm::max() const */ void OutputChannelForm::setMax(int maximum) { - setRange(ui.actuatorMax->value(), maximum); + setRange(ui->actuatorMax->value(), maximum); } int OutputChannelForm::min() const { - return ui.actuatorMin->value(); + return ui->actuatorMin->value(); } /** @@ -195,12 +197,12 @@ int OutputChannelForm::min() const */ void OutputChannelForm::setMin(int minimum) { - setRange(minimum, ui.actuatorMin->value()); + setRange(minimum, ui->actuatorMin->value()); } int OutputChannelForm::neutral() const { - return ui.actuatorNeutral->value(); + return ui->actuatorNeutral->value(); } /** @@ -208,7 +210,7 @@ int OutputChannelForm::neutral() const */ void OutputChannelForm::setNeutral(int value) { - ui.actuatorNeutral->setValue(value); + ui->actuatorNeutral->setValue(value); } /** @@ -216,8 +218,8 @@ void OutputChannelForm::setNeutral(int value) */ void OutputChannelForm::setRange(int minimum, int maximum) { - ui.actuatorMin->setValue(minimum); - ui.actuatorMax->setValue(maximum); + ui->actuatorMin->setValue(minimum); + ui->actuatorMax->setValue(maximum); setChannelRange(); } @@ -230,70 +232,70 @@ void OutputChannelForm::setRange(int minimum, int maximum) */ void OutputChannelForm::setChannelRange() { - int minValue = ui.actuatorMin->value(); - int maxValue = ui.actuatorMax->value(); + int minValue = ui->actuatorMin->value(); + int maxValue = ui->actuatorMax->value(); - int oldMini = ui.actuatorNeutral->minimum(); - int oldMaxi = ui.actuatorNeutral->maximum(); + int oldMini = ui->actuatorNeutral->minimum(); + int oldMaxi = ui->actuatorNeutral->maximum(); m_mixerType = outputMixerType(); // Red handle for Motors if ((m_mixerType == "Motor") || (m_mixerType == "ReversableMotor")) { - ui.actuatorNeutral->setStyleSheet("QSlider::handle:horizontal { background: rgb(255, 100, 100); width: 18px; height: 28px;" - "margin: -3px 0; border-radius: 3px; border: 1px solid #777; }"); + ui->actuatorNeutral->setStyleSheet("QSlider::handle:horizontal { background: rgb(255, 100, 100); width: 18px; height: 28px;" + "margin: -3px 0; border-radius: 3px; border: 1px solid #777; }"); } else { - ui.actuatorNeutral->setStyleSheet("QSlider::handle:horizontal { background: rgb(196, 196, 196); width: 18px; height: 28px;" - "margin: -3px 0; border-radius: 3px; border: 1px solid #777; }"); + ui->actuatorNeutral->setStyleSheet("QSlider::handle:horizontal { background: rgb(196, 196, 196); width: 18px; height: 28px;" + "margin: -3px 0; border-radius: 3px; border: 1px solid #777; }"); } // Normal motor will be *** never *** reversed : without arming a "Min" value (like 1900) can be applied ! if (m_mixerType == "Motor") { if (minValue >= maxValue) { // Keep old values - ui.actuatorMin->setValue(oldMini); - ui.actuatorMax->setValue(oldMaxi); + ui->actuatorMin->setValue(oldMini); + ui->actuatorMax->setValue(oldMaxi); } - ui.actuatorRev->setChecked(false); - ui.actuatorRev->setEnabled(false); - ui.actuatorNeutral->setInvertedAppearance(false); - ui.actuatorNeutral->setRange(ui.actuatorMin->value(), ui.actuatorMax->value()); + ui->actuatorRev->setChecked(false); + ui->actuatorRev->setEnabled(false); + ui->actuatorNeutral->setInvertedAppearance(false); + ui->actuatorNeutral->setRange(ui->actuatorMin->value(), ui->actuatorMax->value()); } else { // Others output (!Motor) // Auto check reverse checkbox SpinBox Min/Max changes - ui.actuatorRev->setEnabled(true); + ui->actuatorRev->setEnabled(true); if (minValue <= maxValue) { - ui.actuatorRev->setChecked(false); - ui.actuatorNeutral->setInvertedAppearance(false); - ui.actuatorNeutral->setRange(minValue, maxValue); + ui->actuatorRev->setChecked(false); + ui->actuatorNeutral->setInvertedAppearance(false); + ui->actuatorNeutral->setRange(minValue, maxValue); } else { - ui.actuatorRev->setChecked(true); - ui.actuatorNeutral->setInvertedAppearance(true); - ui.actuatorNeutral->setRange(maxValue, minValue); + ui->actuatorRev->setChecked(true); + ui->actuatorNeutral->setInvertedAppearance(true); + ui->actuatorNeutral->setRange(maxValue, minValue); } } // If old neutral was Min, stay Min - if (ui.actuatorNeutral->value() == oldMini) { - ui.actuatorNeutral->setValue(ui.actuatorNeutral->minimum()); + if (ui->actuatorNeutral->value() == oldMini) { + ui->actuatorNeutral->setValue(ui->actuatorNeutral->minimum()); } // Enable only outputs already set in mixer if (m_mixerType != "Disabled") { - ui.actuatorMin->setEnabled(true); - ui.actuatorMax->setEnabled(true); - ui.actuatorNeutral->setEnabled(true); - ui.actuatorValue->setEnabled(true); - ui.actuatorLink->setEnabled(true); + ui->actuatorMin->setEnabled(true); + ui->actuatorMax->setEnabled(true); + ui->actuatorNeutral->setEnabled(true); + ui->actuatorValue->setEnabled(true); + ui->actuatorLink->setEnabled(true); } else { - ui.actuatorMin->setEnabled(false); - ui.actuatorMax->setEnabled(false); - ui.actuatorRev->setEnabled(false); - ui.actuatorLink->setEnabled(false); - ui.actuatorMin->setValue(1000); - ui.actuatorMax->setValue(1000); - ui.actuatorNeutral->setRange(minValue, maxValue); - ui.actuatorNeutral->setValue(minValue); - ui.actuatorValue->setEnabled(false); + ui->actuatorMin->setEnabled(false); + ui->actuatorMax->setEnabled(false); + ui->actuatorRev->setEnabled(false); + ui->actuatorLink->setEnabled(false); + ui->actuatorMin->setValue(1000); + ui->actuatorMax->setValue(1000); + ui->actuatorNeutral->setRange(minValue, maxValue); + ui->actuatorNeutral->setValue(minValue); + ui->actuatorValue->setEnabled(false); } } @@ -303,13 +305,13 @@ void OutputChannelForm::setChannelRange() void OutputChannelForm::reverseChannel(bool state) { // if 'state' (reverse channel requested) apply only if not already reversed - if ((state && (ui.actuatorMax->value() > ui.actuatorMin->value())) - || (!state && (ui.actuatorMax->value() < ui.actuatorMin->value()))) { + if ((state && (ui->actuatorMax->value() > ui->actuatorMin->value())) + || (!state && (ui->actuatorMax->value() < ui->actuatorMin->value()))) { // Now, swap the min & max values (spin boxes) - int temp = ui.actuatorMax->value(); - ui.actuatorMax->setValue(ui.actuatorMin->value()); - ui.actuatorMin->setValue(temp); - ui.actuatorNeutral->setInvertedAppearance(state); + int temp = ui->actuatorMax->value(); + ui->actuatorMax->setValue(ui->actuatorMin->value()); + ui->actuatorMin->setValue(temp); + ui->actuatorNeutral->setInvertedAppearance(state); setChannelRange(); return; @@ -331,9 +333,9 @@ void OutputChannelForm::sendChannelTest(int value) } // update the label - ui.actuatorValue->setValue(value); + ui->actuatorValue->setValue(value); - if (ui.actuatorLink->checkState() && parent()) { + if (ui->actuatorLink->checkState() && parent()) { // the channel is linked to other channels QList outputChannelForms = parent()->findChildren(); // set the linked channels of the parent widget to the same value @@ -341,24 +343,24 @@ void OutputChannelForm::sendChannelTest(int value) if (this == outputChannelForm) { continue; } - if (!outputChannelForm->ui.actuatorLink->checkState()) { + if (!outputChannelForm->ui->actuatorLink->checkState()) { continue; } int val = in_value; - if (val < outputChannelForm->ui.actuatorNeutral->minimum()) { - val = outputChannelForm->ui.actuatorNeutral->minimum(); + if (val < outputChannelForm->ui->actuatorNeutral->minimum()) { + val = outputChannelForm->ui->actuatorNeutral->minimum(); } - if (val > outputChannelForm->ui.actuatorNeutral->maximum()) { - val = outputChannelForm->ui.actuatorNeutral->maximum(); + if (val > outputChannelForm->ui->actuatorNeutral->maximum()) { + val = outputChannelForm->ui->actuatorNeutral->maximum(); } - if (outputChannelForm->ui.actuatorNeutral->value() == val) { + if (outputChannelForm->ui->actuatorNeutral->value() == val) { continue; } - outputChannelForm->ui.actuatorNeutral->setValue(val); - outputChannelForm->ui.actuatorValue->setValue(val); + outputChannelForm->ui->actuatorNeutral->setValue(val); + outputChannelForm->ui->actuatorValue->setValue(val); } } diff --git a/ground/gcs/src/plugins/config/outputchannelform.h b/ground/gcs/src/plugins/config/outputchannelform.h index e10891c2a..25cd5375a 100644 --- a/ground/gcs/src/plugins/config/outputchannelform.h +++ b/ground/gcs/src/plugins/config/outputchannelform.h @@ -29,9 +29,12 @@ #include "channelform.h" #include "configoutputwidget.h" -#include "ui_outputchannelform.h" -#include +namespace Ui { +class outputChannelForm; +} + +class QWidget; class OutputChannelForm : public ChannelForm { Q_OBJECT @@ -64,7 +67,7 @@ signals: void channelChanged(int index, int value); private: - Ui::outputChannelForm ui; + Ui::outputChannelForm *ui; bool m_inChannelTest; QString m_mixerType; diff --git a/ground/gcs/src/plugins/consolegadget/consolegadget.pro b/ground/gcs/src/plugins/consolegadget/consolegadget.pro index 6662fafaf..fd8a2e0a3 100644 --- a/ground/gcs/src/plugins/consolegadget/consolegadget.pro +++ b/ground/gcs/src/plugins/consolegadget/consolegadget.pro @@ -1,15 +1,21 @@ TEMPLATE = lib TARGET = ConsoleGadget + include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) -HEADERS += consoleplugin.h \ - texteditloggerengine.h -HEADERS += consolegadget.h -HEADERS += consolegadgetwidget.h -HEADERS += consolegadgetfactory.h -SOURCES += consoleplugin.cpp \ - texteditloggerengine.cpp -SOURCES += consolegadget.cpp -SOURCES += consolegadgetfactory.cpp -SOURCES += consolegadgetwidget.cpp + +HEADERS += \ + consoleplugin.h \ + texteditloggerengine.h \ + consolegadget.h \ + consolegadgetwidget.h \ + consolegadgetfactory.h + +SOURCES += \ + consoleplugin.cpp \ + texteditloggerengine.cpp \ + consolegadget.cpp \ + consolegadgetfactory.cpp \ + consolegadgetwidget.cpp + OTHER_FILES += ConsoleGadget.pluginspec diff --git a/ground/gcs/src/plugins/coreplugin/coreplugin.pro b/ground/gcs/src/plugins/coreplugin/coreplugin.pro index 78433edc0..427565091 100644 --- a/ground/gcs/src/plugins/coreplugin/coreplugin.pro +++ b/ground/gcs/src/plugins/coreplugin/coreplugin.pro @@ -1,14 +1,9 @@ TEMPLATE = lib TARGET = Core + DEFINES += CORE_LIBRARY - -QT += qml \ - quick \ - xml \ - network \ - script \ - svg \ - sql + +QT += widgets qml quick xml network script svg sql include(../../plugin.pri) include(../../libs/utils/utils.pri) @@ -17,15 +12,18 @@ include(../../shared/scriptwrapper/scriptwrapper.pri) include(coreplugin_dependencies.pri) include(authorsdialog.pri) -INCLUDEPATH += dialogs \ +INCLUDEPATH += \ + dialogs \ uavgadgetmanager \ actionmanager -DEPENDPATH += dialogs \ +DEPENDPATH += \ + dialogs \ uavgadgetmanager \ actionmanager -SOURCES += mainwindow.cpp \ +SOURCES += \ + mainwindow.cpp \ tabpositionindicator.cpp \ fancyactionbar.cpp \ fancytabwidget.cpp \ @@ -72,7 +70,8 @@ SOURCES += mainwindow.cpp \ uavconfiginfo.cpp \ aboutdialog.cpp \ -HEADERS += mainwindow.h \ +HEADERS += \ + mainwindow.h \ tabpositionindicator.h \ fancyactionbar.h \ fancytabwidget.h \ @@ -132,13 +131,15 @@ HEADERS += mainwindow.h \ iconfigurableplugin.h \ aboutdialog.h -FORMS += dialogs/settingsdialog.ui \ +FORMS += \ + dialogs/settingsdialog.ui \ dialogs/shortcutsettings.ui \ generalsettings.ui \ uavgadgetoptionspage.ui \ workspacesettings.ui -RESOURCES += core.qrc \ +RESOURCES += \ + core.qrc \ fancyactionbar.qrc unix:!macx { diff --git a/ground/gcs/src/plugins/coreplugin/generalsettings.cpp b/ground/gcs/src/plugins/coreplugin/generalsettings.cpp index 436692f84..b3b276729 100644 --- a/ground/gcs/src/plugins/coreplugin/generalsettings.cpp +++ b/ground/gcs/src/plugins/coreplugin/generalsettings.cpp @@ -29,17 +29,17 @@ #include "generalsettings.h" +#include "ui_generalsettings.h" + #include #include #include #include + #include -#include - -#include -#include - -#include "ui_generalsettings.h" +#include +#include +#include using namespace Utils; using namespace Core::Internal; diff --git a/ground/gcs/src/plugins/coreplugin/generalsettings.h b/ground/gcs/src/plugins/coreplugin/generalsettings.h index d6828704c..c07b234df 100644 --- a/ground/gcs/src/plugins/coreplugin/generalsettings.h +++ b/ground/gcs/src/plugins/coreplugin/generalsettings.h @@ -30,7 +30,8 @@ #define GENERALSETTINGS_H #include -#include + +#include #include #include diff --git a/ground/gcs/src/plugins/coreplugin/iuavgadget.h b/ground/gcs/src/plugins/coreplugin/iuavgadget.h index 46cd22146..5ea7c0af9 100644 --- a/ground/gcs/src/plugins/coreplugin/iuavgadget.h +++ b/ground/gcs/src/plugins/coreplugin/iuavgadget.h @@ -31,12 +31,11 @@ #include #include -#include -#include QT_BEGIN_NAMESPACE class QWidget; class QComboBox; +class QSettings; QT_END_NAMESPACE namespace Core { diff --git a/ground/gcs/src/plugins/debuggadget/debuggadget.pro b/ground/gcs/src/plugins/debuggadget/debuggadget.pro index 32cd8bab9..6c9fb4419 100644 --- a/ground/gcs/src/plugins/debuggadget/debuggadget.pro +++ b/ground/gcs/src/plugins/debuggadget/debuggadget.pro @@ -1,18 +1,24 @@ TEMPLATE = lib TARGET = DebugGadget +QT += widgets + include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) -HEADERS += debugplugin.h \ - debugengine.h -HEADERS += debuggadget.h -HEADERS += debuggadgetwidget.h -HEADERS += debuggadgetfactory.h -SOURCES += debugplugin.cpp \ - debugengine.cpp -SOURCES += debuggadget.cpp -SOURCES += debuggadgetfactory.cpp -SOURCES += debuggadgetwidget.cpp + +HEADERS += \ + debugplugin.h \ + debugengine.h \ + debuggadget.h \ + debuggadgetwidget.h \ + debuggadgetfactory.h + +SOURCES += \ + debugplugin.cpp \ + debugengine.cpp \ + debuggadget.cpp \ + debuggadgetfactory.cpp \ + debuggadgetwidget.cpp OTHER_FILES += DebugGadget.pluginspec diff --git a/ground/gcs/src/plugins/dial/dial.pro b/ground/gcs/src/plugins/dial/dial.pro index 73cd4606d..aec83d8d7 100644 --- a/ground/gcs/src/plugins/dial/dial.pro +++ b/ground/gcs/src/plugins/dial/dial.pro @@ -1,22 +1,30 @@ TEMPLATE = lib TARGET = DialGadget -QT += svg -QT += opengl + +QT += svg opengl + include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(dial_dependencies.pri) -HEADERS += dialplugin.h -HEADERS += dialgadget.h -HEADERS += dialgadgetwidget.h -HEADERS += dialgadgetfactory.h -HEADERS += dialgadgetconfiguration.h -HEADERS += dialgadgetoptionspage.h -SOURCES += dialplugin.cpp -SOURCES += dialgadget.cpp -SOURCES += dialgadgetfactory.cpp -SOURCES += dialgadgetwidget.cpp -SOURCES += dialgadgetconfiguration.cpp -SOURCES += dialgadgetoptionspage.cpp + +HEADERS += \ + dialplugin.h \ + dialgadget.h \ + dialgadgetwidget.h \ + dialgadgetfactory.h \ + dialgadgetconfiguration.h \ + dialgadgetoptionspage.h + +SOURCES += \ + dialplugin.cpp \ + dialgadget.cpp \ + dialgadgetfactory.cpp \ + dialgadgetwidget.cpp \ + dialgadgetconfiguration.cpp \ + dialgadgetoptionspage.cpp + OTHER_FILES += DialGadget.pluginspec + FORMS += dialgadgetoptionspage.ui + RESOURCES += dial.qrc diff --git a/ground/gcs/src/plugins/donothing/donothing.pro b/ground/gcs/src/plugins/donothing/donothing.pro index 0acdc385a..57e2ce16f 100644 --- a/ground/gcs/src/plugins/donothing/donothing.pro +++ b/ground/gcs/src/plugins/donothing/donothing.pro @@ -1,11 +1,13 @@ - TEMPLATE = lib TARGET = DoNothing include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) -HEADERS += donothingplugin.h -SOURCES += donothingplugin.cpp +HEADERS += \ + donothingplugin.h +SOURCES += \ + donothingplugin.cpp + OTHER_FILES += DoNothing.pluginspec \ No newline at end of file diff --git a/ground/gcs/src/plugins/emptygadget/emptygadget.pro b/ground/gcs/src/plugins/emptygadget/emptygadget.pro index 050141d34..b5ec37f4d 100644 --- a/ground/gcs/src/plugins/emptygadget/emptygadget.pro +++ b/ground/gcs/src/plugins/emptygadget/emptygadget.pro @@ -1,16 +1,21 @@ TEMPLATE = lib TARGET = EmptyGadget +QT += widgets + include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) -HEADERS += emptyplugin.h -HEADERS += emptygadget.h -HEADERS += emptygadgetwidget.h -HEADERS += emptygadgetfactory.h -SOURCES += emptyplugin.cpp -SOURCES += emptygadget.cpp -SOURCES += emptygadgetfactory.cpp -SOURCES += emptygadgetwidget.cpp +HEADERS += \ + emptyplugin.h \ + emptygadget.h \ + emptygadgetwidget.h \ + emptygadgetfactory.h + +SOURCES += \ + emptyplugin.cpp \ + emptygadget.cpp \ + emptygadgetfactory.cpp \ + emptygadgetwidget.cpp OTHER_FILES += EmptyGadget.pluginspec diff --git a/ground/gcs/src/plugins/flightlog/flightlog.pro b/ground/gcs/src/plugins/flightlog/flightlog.pro index ac2d6d88f..34c362f9e 100644 --- a/ground/gcs/src/plugins/flightlog/flightlog.pro +++ b/ground/gcs/src/plugins/flightlog/flightlog.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = FlightLog -QT += qml quick +QT += widgets qml quick include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) @@ -9,12 +9,16 @@ include(../../plugins/uavobjects/uavobjects.pri) include(../../plugins/uavobjectutil/uavobjectutil.pri) include(../../plugins/uavtalk/uavtalk.pri) -HEADERS += flightlogplugin.h \ +HEADERS += \ + flightlogplugin.h \ flightlogmanager.h -SOURCES += flightlogplugin.cpp \ + +SOURCES += \ + flightlogplugin.cpp \ flightlogmanager.cpp -OTHER_FILES += Flightlog.pluginspec \ +OTHER_FILES += \ + Flightlog.pluginspec \ FlightLogDialog.qml \ functions.js diff --git a/ground/gcs/src/plugins/gpsdisplay/gpsdisplay.pro b/ground/gcs/src/plugins/gpsdisplay/gpsdisplay.pro index 10d8f5e53..31b1218d5 100644 --- a/ground/gcs/src/plugins/gpsdisplay/gpsdisplay.pro +++ b/ground/gcs/src/plugins/gpsdisplay/gpsdisplay.pro @@ -1,36 +1,45 @@ TEMPLATE = lib TARGET = GpsDisplayGadget -QT += svg -QT += serialport + +QT += svg serialport + include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(gpsdisplay_dependencies.pri) include(../../libs/qwt/qwt.pri) -HEADERS += gpsdisplayplugin.h -HEADERS += gpsconstellationwidget.h -HEADERS += gpsparser.h -HEADERS += telemetryparser.h -HEADERS += gpssnrwidget.h -HEADERS += buffer.h -HEADERS += nmeaparser.h -HEADERS += gpsdisplaygadget.h -HEADERS += gpsdisplaywidget.h -HEADERS += gpsdisplaygadgetfactory.h -HEADERS += gpsdisplaygadgetconfiguration.h -HEADERS += gpsdisplaygadgetoptionspage.h -SOURCES += gpsdisplayplugin.cpp -SOURCES += gpsconstellationwidget.cpp -SOURCES += gpsparser.cpp -SOURCES += telemetryparser.cpp -SOURCES += gpssnrwidget.cpp -SOURCES += buffer.cpp -SOURCES += nmeaparser.cpp -SOURCES += gpsdisplaygadget.cpp -SOURCES += gpsdisplaygadgetfactory.cpp -SOURCES += gpsdisplaywidget.cpp -SOURCES += gpsdisplaygadgetconfiguration.cpp -SOURCES += gpsdisplaygadgetoptionspage.cpp + +HEADERS += \ + gpsdisplayplugin.h \ + gpsconstellationwidget.h \ + gpsparser.h \ + telemetryparser.h \ + gpssnrwidget.h \ + buffer.h \ + nmeaparser.h \ + gpsdisplaygadget.h \ + gpsdisplaywidget.h \ + gpsdisplaygadgetfactory.h \ + gpsdisplaygadgetconfiguration.h \ + gpsdisplaygadgetoptionspage.h + +SOURCES += \ + gpsdisplayplugin.cpp \ + gpsconstellationwidget.cpp \ + gpsparser.cpp \ + telemetryparser.cpp \ + gpssnrwidget.cpp \ + buffer.cpp \ + nmeaparser.cpp \ + gpsdisplaygadget.cpp \ + gpsdisplaygadgetfactory.cpp \ + gpsdisplaywidget.cpp \ + gpsdisplaygadgetconfiguration.cpp \ + gpsdisplaygadgetoptionspage.cpp + OTHER_FILES += GpsDisplayGadget.pluginspec -FORMS += gpsdisplaygadgetoptionspage.ui -FORMS += gpsdisplaywidget.ui + +FORMS += \ + gpsdisplaygadgetoptionspage.ui \ + gpsdisplaywidget.ui + RESOURCES += widgetresources.qrc diff --git a/ground/gcs/src/plugins/hitl/aerosimrc/src/udptest.pro b/ground/gcs/src/plugins/hitl/aerosimrc/src/udptest.pro index 6bb532455..c3520302c 100644 --- a/ground/gcs/src/plugins/hitl/aerosimrc/src/udptest.pro +++ b/ground/gcs/src/plugins/hitl/aerosimrc/src/udptest.pro @@ -1,9 +1,9 @@ -include(../../../../../gcs.pri) +TEMPLATE = app +TARGET = udp_test QT += core gui network widgets -TEMPLATE = app -TARGET = udp_test +include(../../../../../gcs.pri) HEADERS += \ udptestwidget.h diff --git a/ground/gcs/src/plugins/hitl/hitlwidget.cpp b/ground/gcs/src/plugins/hitl/hitlwidget.cpp index 045d37485..063a8dbfb 100644 --- a/ground/gcs/src/plugins/hitl/hitlwidget.cpp +++ b/ground/gcs/src/plugins/hitl/hitlwidget.cpp @@ -25,12 +25,8 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "hitlwidget.h" + #include "ui_hitlwidget.h" -#include -#include -#include -#include -#include #include #include @@ -38,6 +34,11 @@ #include "coreplugin/icore.h" #include "coreplugin/threadmanager.h" +#include +#include +#include +#include +#include QStringList Simulator::instances; diff --git a/ground/gcs/src/plugins/hitl/hitlwidget.h b/ground/gcs/src/plugins/hitl/hitlwidget.h index 15fcbcf81..2157e28c1 100644 --- a/ground/gcs/src/plugins/hitl/hitlwidget.h +++ b/ground/gcs/src/plugins/hitl/hitlwidget.h @@ -28,10 +28,10 @@ #ifndef HITLWIDGET_H #define HITLWIDGET_H -#include -#include #include "simulator.h" +#include + class Ui_HITLWidget; class HITLWidget : public QWidget { diff --git a/ground/gcs/src/plugins/hitl/plugin.pro b/ground/gcs/src/plugins/hitl/plugin.pro index b6448e25e..de50497ac 100644 --- a/ground/gcs/src/plugins/hitl/plugin.pro +++ b/ground/gcs/src/plugins/hitl/plugin.pro @@ -1,11 +1,13 @@ TEMPLATE = lib TARGET = HITL -QT += network + +QT += widgets network include(../../plugin.pri) include(hitl_dependencies.pri) -HEADERS += hitlplugin.h \ +HEADERS += \ + hitlplugin.h \ hitlwidget.h \ hitloptionspage.h \ hitlfactory.h \ @@ -18,7 +20,9 @@ HEADERS += hitlplugin.h \ il2simulator.h \ xplanesimulator9.h \ xplanesimulator10.h -SOURCES += hitlplugin.cpp \ + +SOURCES += \ + hitlplugin.cpp \ hitlwidget.cpp \ hitloptionspage.cpp \ hitlfactory.cpp \ @@ -31,9 +35,13 @@ SOURCES += hitlplugin.cpp \ il2simulator.cpp \ xplanesimulator9.cpp \ xplanesimulator10.cpp + OTHER_FILES += hitl.pluginspec -FORMS += hitloptionspage.ui \ + +FORMS += \ + hitloptionspage.ui \ hitlwidget.ui + RESOURCES += hitlresources.qrc diff --git a/ground/gcs/src/plugins/importexport/importexport.pro b/ground/gcs/src/plugins/importexport/importexport.pro index 360ab7513..cd690330d 100644 --- a/ground/gcs/src/plugins/importexport/importexport.pro +++ b/ground/gcs/src/plugins/importexport/importexport.pro @@ -1,15 +1,25 @@ TEMPLATE = lib TARGET = ImportExportGadget + DEFINES += IMPORTEXPORT_LIBRARY -QT += xml + +QT += xml widgets + include(../../plugin.pri) include(importexport_dependencies.pri) -HEADERS += importexportplugin.h \ + +HEADERS += \ + importexportplugin.h \ importexportgadgetwidget.h \ importexportdialog.h -SOURCES += importexportplugin.cpp \ + +SOURCES += \ + importexportplugin.cpp \ importexportgadgetwidget.cpp \ importexportdialog.cpp + OTHER_FILES += ImportExportGadget.pluginspec -FORMS += importexportgadgetwidget.ui \ + +FORMS += \ + importexportgadgetwidget.ui \ importexportdialog.ui diff --git a/ground/gcs/src/plugins/ipconnection/ipconnection.pro b/ground/gcs/src/plugins/ipconnection/ipconnection.pro index 2bd94335b..4dbc3047c 100644 --- a/ground/gcs/src/plugins/ipconnection/ipconnection.pro +++ b/ground/gcs/src/plugins/ipconnection/ipconnection.pro @@ -1,17 +1,27 @@ TEMPLATE = lib TARGET = IPconnection + +QT += network widgets + +DEFINES += IPconnection_LIBRARY + include(../../plugin.pri) include(ipconnection_dependencies.pri) -HEADERS += ipconnectionplugin.h \ + +HEADERS += \ + ipconnectionplugin.h \ ipconnection_global.h \ ipconnectionconfiguration.h \ ipconnectionoptionspage.h \ ipconnection_internal.h -SOURCES += ipconnectionplugin.cpp \ + +SOURCES += \ + ipconnectionplugin.cpp \ ipconnectionconfiguration.cpp \ ipconnectionoptionspage.cpp + FORMS += ipconnectionoptionspage.ui + RESOURCES += -DEFINES += IPconnection_LIBRARY + OTHER_FILES += IPconnection.pluginspec -QT += network diff --git a/ground/gcs/src/plugins/lineardial/lineardial.pro b/ground/gcs/src/plugins/lineardial/lineardial.pro index b8fa90592..89557ce43 100644 --- a/ground/gcs/src/plugins/lineardial/lineardial.pro +++ b/ground/gcs/src/plugins/lineardial/lineardial.pro @@ -1,22 +1,30 @@ TEMPLATE = lib TARGET = LineardialGadget -QT += svg -QT += opengl + +QT += widgets svg opengl + include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(lineardial_dependencies.pri) -HEADERS += lineardialplugin.h -HEADERS += lineardialgadget.h -HEADERS += lineardialgadgetwidget.h -HEADERS += lineardialgadgetfactory.h -HEADERS += lineardialgadgetconfiguration.h -HEADERS += lineardialgadgetoptionspage.h -SOURCES += lineardialplugin.cpp -SOURCES += lineardialgadget.cpp -SOURCES += lineardialgadgetfactory.cpp -SOURCES += lineardialgadgetwidget.cpp -SOURCES += lineardialgadgetconfiguration.cpp -SOURCES += lineardialgadgetoptionspage.cpp + +HEADERS += \ + lineardialplugin.h \ + lineardialgadget.h \ + lineardialgadgetwidget.h \ + lineardialgadgetfactory.h \ + lineardialgadgetconfiguration.h \ + lineardialgadgetoptionspage.h + +SOURCES += \ + lineardialplugin.cpp \ + lineardialgadget.cpp \ + lineardialgadgetfactory.cpp \ + lineardialgadgetwidget.cpp \ + lineardialgadgetconfiguration.cpp \ + lineardialgadgetoptionspage.cpp + OTHER_FILES += LineardialGadget.pluginspec + FORMS += lineardialgadgetoptionspage.ui + RESOURCES += lineardial.qrc diff --git a/ground/gcs/src/plugins/logging/logging.pro b/ground/gcs/src/plugins/logging/logging.pro index d3494cbed..66c61a34b 100644 --- a/ground/gcs/src/plugins/logging/logging.pro +++ b/ground/gcs/src/plugins/logging/logging.pro @@ -1,17 +1,21 @@ TEMPLATE = lib - TARGET = LoggingGadget + DEFINES += LOGGING_LIBRARY + QT += svg include(../../plugin.pri) include(logging_dependencies.pri) -HEADERS += loggingplugin.h \ + +HEADERS += \ + loggingplugin.h \ logginggadgetwidget.h \ logginggadget.h \ logginggadgetfactory.h -SOURCES += loggingplugin.cpp \ +SOURCES += \ + loggingplugin.cpp \ logginggadgetwidget.cpp \ logginggadget.cpp \ logginggadgetfactory.cpp diff --git a/ground/gcs/src/plugins/magicwaypoint/magicwaypoint.pro b/ground/gcs/src/plugins/magicwaypoint/magicwaypoint.pro index 4eb15ee03..886aec685 100644 --- a/ground/gcs/src/plugins/magicwaypoint/magicwaypoint.pro +++ b/ground/gcs/src/plugins/magicwaypoint/magicwaypoint.pro @@ -1,22 +1,25 @@ TEMPLATE = lib TARGET = MagicWaypoint + QT += svg include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/uavobjects/uavobjects.pri) -HEADERS += magicwaypointgadget.h -HEADERS += magicwaypointgadgetwidget.h -HEADERS += magicwaypointgadgetfactory.h -HEADERS += magicwaypointplugin.h -HEADERS += positionfield.h +HEADERS += \ + magicwaypointgadget.h \ + magicwaypointgadgetwidget.h \ + magicwaypointgadgetfactory.h \ + magicwaypointplugin.h \ + positionfield.h -SOURCES += magicwaypointgadget.cpp -SOURCES += magicwaypointgadgetwidget.cpp -SOURCES += magicwaypointgadgetfactory.cpp -SOURCES += magicwaypointplugin.cpp -SOURCES += positionfield.cpp +SOURCES += \ + magicwaypointgadget.cpp \ + magicwaypointgadgetwidget.cpp \ + magicwaypointgadgetfactory.cpp \ + magicwaypointplugin.cpp \ + positionfield.cpp OTHER_FILES += MagicWaypoint.pluginspec diff --git a/ground/gcs/src/plugins/notify/notify.pro b/ground/gcs/src/plugins/notify/notify.pro index 0619df41f..c1f90a003 100644 --- a/ground/gcs/src/plugins/notify/notify.pro +++ b/ground/gcs/src/plugins/notify/notify.pro @@ -1,21 +1,22 @@ - TEMPLATE = lib TARGET = NotifyPlugin +QT += widgets multimedia + include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(notifyplugin_dependencies.pri) -QT += multimedia - -HEADERS += notifyplugin.h \ +HEADERS += \ + notifyplugin.h \ notifypluginoptionspage.h \ notifyitemdelegate.h \ notifytablemodel.h \ notificationitem.h \ notifylogging.h -SOURCES += notifyplugin.cpp \ +SOURCES += \ + notifyplugin.cpp \ notifypluginoptionspage.cpp \ notifyitemdelegate.cpp \ notifytablemodel.cpp \ @@ -29,5 +30,3 @@ FORMS += \ RESOURCES += \ res.qrc - - diff --git a/ground/gcs/src/plugins/notify/notifyplugin_dependencies.pri b/ground/gcs/src/plugins/notify/notifyplugin_dependencies.pri index 883e47127..c6c920832 100644 --- a/ground/gcs/src/plugins/notify/notifyplugin_dependencies.pri +++ b/ground/gcs/src/plugins/notify/notifyplugin_dependencies.pri @@ -1,3 +1,2 @@ include(../../plugins/uavtalk/uavtalk.pri) include(../../plugins/uavobjects/uavobjects.pri) - diff --git a/ground/gcs/src/plugins/ophid/ophid.pro b/ground/gcs/src/plugins/ophid/ophid.pro index d41a0e6e2..4b2bd8ab6 100644 --- a/ground/gcs/src/plugins/ophid/ophid.pro +++ b/ground/gcs/src/plugins/ophid/ophid.pro @@ -1,6 +1,8 @@ TEMPLATE = lib TARGET = opHID +QT += widgets + DEFINES += OPHID_LIBRARY //DEFINES += OPHID_DEBUG_ON @@ -25,7 +27,9 @@ SOURCES += \ src/ophid_hidapi.cpp FORMS += + RESOURCES += + OTHER_FILES += opHID.pluginspec INCLUDEPATH += ./inc diff --git a/ground/gcs/src/plugins/opmap/opmap.pro b/ground/gcs/src/plugins/opmap/opmap.pro index 8d1689635..6e1d1536f 100644 --- a/ground/gcs/src/plugins/opmap/opmap.pro +++ b/ground/gcs/src/plugins/opmap/opmap.pro @@ -1,10 +1,12 @@ -QT += xml TEMPLATE = lib +TARGET = OPMapGadget + +QT += widgets xml + PATHPLANNER { DEFINES += USE_PATHPLANNER } -TARGET = OPMapGadget include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../libs/opmapcontrol/opmapcontrol.pri) @@ -13,7 +15,8 @@ include(../../plugins/uavobjectutil/uavobjectutil.pri) include(../../plugins/uavtalk/uavtalk.pri) include(../../libs/utils/utils.pri) -HEADERS += opmapplugin.h \ +HEADERS += \ + opmapplugin.h \ opmapgadgetoptionspage.h \ opmapgadgetfactory.h \ opmapgadgetconfiguration.h \ @@ -29,7 +32,8 @@ HEADERS += opmapplugin.h \ modeluavoproxy.h \ homeeditor.h -SOURCES += opmapplugin.cpp \ +SOURCES += \ + opmapplugin.cpp \ opmapgadgetwidget.cpp \ opmapgadgetoptionspage.cpp \ opmapgadgetfactory.cpp \ @@ -47,7 +51,8 @@ SOURCES += opmapplugin.cpp \ OTHER_FILES += OPMapGadget.pluginspec -FORMS += opmapgadgetoptionspage.ui \ +FORMS += \ + opmapgadgetoptionspage.ui \ opmap_widget.ui \ opmap_edit_waypoint_dialog.ui \ opmap_zoom_slider_widget.ui \ diff --git a/ground/gcs/src/plugins/pathactioneditor/pathactioneditor.pro b/ground/gcs/src/plugins/pathactioneditor/pathactioneditor.pro index a528bc791..281d82a54 100644 --- a/ground/gcs/src/plugins/pathactioneditor/pathactioneditor.pro +++ b/ground/gcs/src/plugins/pathactioneditor/pathactioneditor.pro @@ -1,33 +1,34 @@ TEMPLATE = lib TARGET = PathActionEditor +QT += widgets + include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/uavobjects/uavobjects.pri) -HEADERS += pathactioneditorgadget.h -HEADERS += pathactioneditorgadgetwidget.h -HEADERS += pathactioneditorgadgetfactory.h -HEADERS += pathactioneditorplugin.h -HEADERS += pathactioneditortreemodel.h -HEADERS += treeitem.h -HEADERS += fieldtreeitem.h -HEADERS += browseritemdelegate.h - -SOURCES += pathactioneditorgadget.cpp -SOURCES += pathactioneditorgadgetwidget.cpp -SOURCES += pathactioneditorgadgetfactory.cpp -SOURCES += pathactioneditorplugin.cpp -SOURCES += pathactioneditortreemodel.cpp -SOURCES += treeitem.cpp -SOURCES += fieldtreeitem.cpp -SOURCES += browseritemdelegate.cpp +HEADERS += \ + pathactioneditorgadget.h \ + pathactioneditorgadgetwidget.h \ + pathactioneditorgadgetfactory.h \ + pathactioneditorplugin.h \ + pathactioneditortreemodel.h \ + treeitem.h \ + fieldtreeitem.h \ + browseritemdelegate.h +SOURCES += \ + pathactioneditorgadget.cpp \ + pathactioneditorgadgetwidget.cpp \ + pathactioneditorgadgetfactory.cpp \ + pathactioneditorplugin.cpp \ + pathactioneditortreemodel.cpp \ + treeitem.cpp \ + fieldtreeitem.cpp \ + browseritemdelegate.cpp OTHER_FILES += pathactioneditor.pluginspec FORMS += pathactioneditor.ui RESOURCES += - - diff --git a/ground/gcs/src/plugins/pathactioneditor/pathactioneditorgadgetwidget.h b/ground/gcs/src/plugins/pathactioneditor/pathactioneditorgadgetwidget.h index d68836a8e..349da13b0 100644 --- a/ground/gcs/src/plugins/pathactioneditor/pathactioneditorgadgetwidget.h +++ b/ground/gcs/src/plugins/pathactioneditor/pathactioneditorgadgetwidget.h @@ -27,12 +27,14 @@ #ifndef PathActionEditorGADGETWIDGET_H_ #define PathActionEditorGADGETWIDGET_H_ +#include "pathactioneditortreemodel.h" + +#include "pathaction.h" +#include "waypoint.h" + #include #include #include -#include "pathaction.h" -#include "waypoint.h" -#include "pathactioneditortreemodel.h" class Ui_PathActionEditor; diff --git a/ground/gcs/src/plugins/plugins.pro b/ground/gcs/src/plugins/plugins.pro index 8c8c380e3..47e2dcfc2 100644 --- a/ground/gcs/src/plugins/plugins.pro +++ b/ground/gcs/src/plugins/plugins.pro @@ -156,7 +156,7 @@ plugin_ipconnection.subdir = ipconnection plugin_ipconnection.depends = plugin_coreplugin SUBDIRS += plugin_ipconnection -#HITL Simulation gadget +# HITL Simulation gadget plugin_hitl.subdir = hitl plugin_hitl.depends = plugin_coreplugin plugin_hitl.depends += plugin_uavobjects @@ -188,12 +188,6 @@ SUBDIRS += plugin_gcscontrol #plugin_antennatrack.depends += plugin_uavobjects #SUBDIRS += plugin_antennatrack -# Scope OpenGL Gadget -#plugin_scopeogl.subdir = scopeogl -#plugin_scopeogl.depends = plugin_coreplugin -#plugin_scopeogl.depends += plugin_uavobjects -#SUBDIRS += plugin_scopeogl - # UAV Object Utility plugin plugin_uavobjectutil.subdir = uavobjectutil plugin_uavobjectutil.depends = plugin_coreplugin @@ -244,4 +238,3 @@ plugin_usagetracker.depends += plugin_uavobjects plugin_usagetracker.depends += plugin_uavtalk plugin_setupwizard.depends += plugin_uavobjectutil SUBDIRS += plugin_usagetracker - diff --git a/ground/gcs/src/plugins/qmlview/qmlview.pro b/ground/gcs/src/plugins/qmlview/qmlview.pro index e172f898a..67510c412 100644 --- a/ground/gcs/src/plugins/qmlview/qmlview.pro +++ b/ground/gcs/src/plugins/qmlview/qmlview.pro @@ -1,8 +1,7 @@ TEMPLATE = lib TARGET = QMLView -QT += svg -QT += opengl -QT += qml quick + +QT += svg opengl qml quick include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) diff --git a/ground/gcs/src/plugins/scope/scope.pro b/ground/gcs/src/plugins/scope/scope.pro index a580ce4c1..a8dd080fd 100644 --- a/ground/gcs/src/plugins/scope/scope.pro +++ b/ground/gcs/src/plugins/scope/scope.pro @@ -1,6 +1,8 @@ TEMPLATE = lib TARGET = ScopeGadget +QT += widgets + DEFINES += SCOPE_LIBRARY include(../../plugin.pri) diff --git a/ground/gcs/src/plugins/serialconnection/serialconnection.pro b/ground/gcs/src/plugins/serialconnection/serialconnection.pro index 7966af624..b80c1e0bb 100644 --- a/ground/gcs/src/plugins/serialconnection/serialconnection.pro +++ b/ground/gcs/src/plugins/serialconnection/serialconnection.pro @@ -1,15 +1,24 @@ TEMPLATE = lib TARGET = Serial + +QT += serialport widgets + include(../../plugin.pri) include(serial_dependencies.pri) -QT += serialport -HEADERS += serialplugin.h \ - serialpluginconfiguration.h \ - serialpluginoptionspage.h -SOURCES += serialplugin.cpp \ - serialpluginconfiguration.cpp \ - serialpluginoptionspage.cpp + +HEADERS += \ + serialplugin.h \ + serialpluginconfiguration.h \ + serialpluginoptionspage.h + +SOURCES += \ + serialplugin.cpp \ + serialpluginconfiguration.cpp \ + serialpluginoptionspage.cpp + FORMS += \ serialpluginoptions.ui + RESOURCES += + OTHER_FILES += Serial.pluginspec diff --git a/ground/gcs/src/plugins/serialconnection/serialplugin.cpp b/ground/gcs/src/plugins/serialconnection/serialplugin.cpp index 7ce9bb0d8..64807b519 100644 --- a/ground/gcs/src/plugins/serialconnection/serialplugin.cpp +++ b/ground/gcs/src/plugins/serialconnection/serialplugin.cpp @@ -30,12 +30,8 @@ #include #include -#include -#include - #include - SerialEnumerationThread::SerialEnumerationThread(SerialConnection *serial) : m_serial(serial), m_running(false) {} diff --git a/ground/gcs/src/plugins/setupwizard/outputcalibrationutil.cpp b/ground/gcs/src/plugins/setupwizard/outputcalibrationutil.cpp index c212f25c1..eefcf9065 100644 --- a/ground/gcs/src/plugins/setupwizard/outputcalibrationutil.cpp +++ b/ground/gcs/src/plugins/setupwizard/outputcalibrationutil.cpp @@ -27,12 +27,16 @@ */ #include "outputcalibrationutil.h" + #include "uavobject.h" #include "uavobjectmanager.h" #include "extensionsystem/pluginmanager.h" #include "vehicleconfigurationhelper.h" + #include "manualcontrolsettings.h" +#include + bool OutputCalibrationUtil::c_prepared = false; ActuatorCommand::Metadata OutputCalibrationUtil::c_savedActuatorCommandMetaData; diff --git a/ground/gcs/src/plugins/setupwizard/outputcalibrationutil.h b/ground/gcs/src/plugins/setupwizard/outputcalibrationutil.h index b47764d4e..727dd8189 100644 --- a/ground/gcs/src/plugins/setupwizard/outputcalibrationutil.h +++ b/ground/gcs/src/plugins/setupwizard/outputcalibrationutil.h @@ -30,8 +30,8 @@ #define OUTPUTCALIBRATIONUTIL_H #include -#include "actuatorcommand.h" +#include "actuatorcommand.h" class OutputCalibrationUtil : public QObject { Q_OBJECT diff --git a/ground/gcs/src/plugins/setupwizard/pages/savepage.cpp b/ground/gcs/src/plugins/setupwizard/pages/savepage.cpp index 8ab43e761..82a795bf3 100644 --- a/ground/gcs/src/plugins/setupwizard/pages/savepage.cpp +++ b/ground/gcs/src/plugins/setupwizard/pages/savepage.cpp @@ -26,11 +26,14 @@ */ #include + #include "savepage.h" #include "ui_savepage.h" #include "setupwizard.h" #include "vehicleconfigurationhelper.h" +#include + SavePage::SavePage(SetupWizard *wizard, QWidget *parent) : AbstractWizardPage(wizard, parent), ui(new Ui::SavePage), m_successfulWrite(false) diff --git a/ground/gcs/src/plugins/setupwizard/setupwizard.pro b/ground/gcs/src/plugins/setupwizard/setupwizard.pro index bcf1153ed..a8cb4d8cf 100644 --- a/ground/gcs/src/plugins/setupwizard/setupwizard.pro +++ b/ground/gcs/src/plugins/setupwizard/setupwizard.pro @@ -1,8 +1,7 @@ - TEMPLATE = lib TARGET = SetupWizard -QT += svg +QT += widgets svg include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) @@ -10,7 +9,9 @@ include(../../plugins/uavobjectutil/uavobjectutil.pri) include(../../plugins/config/config.pri) LIBS *= -l$$qtLibraryName(Uploader) -HEADERS += setupwizardplugin.h \ + +HEADERS += \ + setupwizardplugin.h \ setupwizard.h \ pages/opstartpage.h \ pages/opendpage.h \ @@ -44,7 +45,8 @@ HEADERS += setupwizardplugin.h \ vehicletemplateexportdialog.h \ vehicletemplateselectorwidget.h -SOURCES += setupwizardplugin.cpp \ +SOURCES += \ + setupwizardplugin.cpp \ setupwizard.cpp \ pages/opstartpage.cpp \ pages/opendpage.cpp \ diff --git a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index f2fcd804a..f46148dc4 100644 --- a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -27,7 +27,10 @@ */ #include "vehicleconfigurationhelper.h" + #include "extensionsystem/pluginmanager.h" +#include "uavobjectutilmanager.h" + #include "hwsettings.h" #include "actuatorsettings.h" #include "attitudesettings.h" @@ -42,10 +45,13 @@ #include "accelgyrosettings.h" #include "gpssettings.h" #include "airspeedsettings.h" -#include -#include #include "auxmagsettings.h" +#include +#include +#include +#include + VehicleConfigurationHelper::VehicleConfigurationHelper(VehicleConfigurationSource *configSource) : m_configSource(configSource), m_uavoManager(0), m_transactionOK(false), m_transactionTimeout(false), m_currentTransactionObjectID(-1), diff --git a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.h b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.h index 9b89c0ab9..757dbe646 100644 --- a/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.h +++ b/ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.h @@ -28,14 +28,17 @@ #ifndef VEHICLECONFIGURATIONHELPER_H #define VEHICLECONFIGURATIONHELPER_H -#include -#include #include "vehicleconfigurationsource.h" #include "uavobjectmanager.h" -#include "systemsettings.h" #include "cfg_vehicletypes/vehicleconfig.h" + +#include "systemsettings.h" #include "actuatorsettings.h" +#include +#include +#include + struct mixerChannelSettings { int type; int throttle1; diff --git a/ground/gcs/src/plugins/systemhealth/systemhealth.pro b/ground/gcs/src/plugins/systemhealth/systemhealth.pro index 0d492fea2..34bce280c 100644 --- a/ground/gcs/src/plugins/systemhealth/systemhealth.pro +++ b/ground/gcs/src/plugins/systemhealth/systemhealth.pro @@ -1,22 +1,30 @@ TEMPLATE = lib TARGET = SystemHealthGadget + QT += svg + include(../../plugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(systemhealth_dependencies.pri) -HEADERS += systemhealthplugin.h -HEADERS += systemhealthgadget.h -HEADERS += systemhealthgadgetwidget.h -HEADERS += systemhealthgadgetfactory.h -HEADERS += systemhealthgadgetconfiguration.h -HEADERS += systemhealthgadgetoptionspage.h -SOURCES += systemhealthplugin.cpp -SOURCES += systemhealthgadget.cpp -SOURCES += systemhealthgadgetfactory.cpp -SOURCES += systemhealthgadgetwidget.cpp -SOURCES += systemhealthgadgetconfiguration.cpp -SOURCES += systemhealthgadgetoptionspage.cpp + +HEADERS += \ + systemhealthplugin.h \ + systemhealthgadget.h \ + systemhealthgadgetwidget.h \ + systemhealthgadgetfactory.h \ + systemhealthgadgetconfiguration.h \ + systemhealthgadgetoptionspage.h + +SOURCES += \ + systemhealthplugin.cpp \ + systemhealthgadget.cpp \ + systemhealthgadgetfactory.cpp \ + systemhealthgadgetwidget.cpp \ + systemhealthgadgetconfiguration.cpp \ + systemhealthgadgetoptionspage.cpp + OTHER_FILES += SystemHealthGadget.pluginspec + FORMS += systemhealthgadgetoptionspage.ui RESOURCES += \ diff --git a/ground/gcs/src/plugins/telemetry/telemetry.pro b/ground/gcs/src/plugins/telemetry/telemetry.pro index a1d8a8ad9..6f79da813 100644 --- a/ground/gcs/src/plugins/telemetry/telemetry.pro +++ b/ground/gcs/src/plugins/telemetry/telemetry.pro @@ -7,7 +7,8 @@ QT += svg include(telemetry_dependencies.pri) include(../../libs/version_info/version_info.pri) -HEADERS += telemetry_global.h \ +HEADERS += \ + telemetry_global.h \ telemetryplugin.h \ monitorwidget.h \ monitorgadgetconfiguration.h \ @@ -15,7 +16,8 @@ HEADERS += telemetry_global.h \ monitorgadgetfactory.h \ monitorgadgetoptionspage.h -SOURCES += telemetryplugin.cpp \ +SOURCES += \ + telemetryplugin.cpp \ monitorwidget.cpp \ monitorgadgetconfiguration.cpp \ monitorgadget.cpp \ diff --git a/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowser.pro b/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowser.pro index fb68ed483..03fafd067 100644 --- a/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowser.pro +++ b/ground/gcs/src/plugins/uavobjectbrowser/uavobjectbrowser.pro @@ -1,8 +1,13 @@ TEMPLATE = lib TARGET = UAVObjectBrowser + +QT += widgets + include(../../plugin.pri) include(uavobjectbrowser_dependencies.pri) -HEADERS += browserplugin.h \ + +HEADERS += \ + browserplugin.h \ uavobjectbrowserconfiguration.h \ uavobjectbrowser.h \ uavobjectbrowserwidget.h \ @@ -12,7 +17,9 @@ HEADERS += browserplugin.h \ treeitem.h \ browseritemdelegate.h \ fieldtreeitem.h -SOURCES += browserplugin.cpp \ + +SOURCES += \ + browserplugin.cpp \ uavobjectbrowserconfiguration.cpp \ uavobjectbrowser.cpp \ uavobjectbrowserfactory.cpp \ @@ -22,8 +29,11 @@ SOURCES += browserplugin.cpp \ treeitem.cpp \ browseritemdelegate.cpp \ fieldtreeitem.cpp + OTHER_FILES += UAVObjectBrowser.pluginspec -FORMS += uavobjectbrowser.ui \ + +FORMS += \ + uavobjectbrowser.ui \ uavobjectbrowseroptionspage.ui \ viewoptions.ui diff --git a/ground/gcs/src/plugins/uavobjects/uavobject.cpp b/ground/gcs/src/plugins/uavobjects/uavobject.cpp index df26259a5..63b07b8fc 100644 --- a/ground/gcs/src/plugins/uavobjects/uavobject.cpp +++ b/ground/gcs/src/plugins/uavobjects/uavobject.cpp @@ -31,7 +31,10 @@ #include #include -#include +#include +#include +#include +#include using namespace Utils; diff --git a/ground/gcs/src/plugins/uavobjects/uavobjectmanager.cpp b/ground/gcs/src/plugins/uavobjects/uavobjectmanager.cpp index a90b18dd6..712586ea8 100644 --- a/ground/gcs/src/plugins/uavobjects/uavobjectmanager.cpp +++ b/ground/gcs/src/plugins/uavobjects/uavobjectmanager.cpp @@ -27,7 +27,8 @@ */ #include "uavobjectmanager.h" -#include +#include +#include /** * Constructor diff --git a/ground/gcs/src/plugins/uavobjects/uavobjects.pro b/ground/gcs/src/plugins/uavobjects/uavobjects.pro index c10c0c035..25372e372 100644 --- a/ground/gcs/src/plugins/uavobjects/uavobjects.pro +++ b/ground/gcs/src/plugins/uavobjects/uavobjects.pro @@ -17,6 +17,7 @@ HEADERS += \ uavobjectfield.h \ uavobjectsinit.h \ uavobjectsplugin.h + SOURCES += \ uavobject.cpp \ uavmetaobject.cpp \ diff --git a/ground/gcs/src/plugins/uavobjectutil/uavobjectutil.pro b/ground/gcs/src/plugins/uavobjectutil/uavobjectutil.pro index a7fae9bda..161c52cae 100644 --- a/ground/gcs/src/plugins/uavobjectutil/uavobjectutil.pro +++ b/ground/gcs/src/plugins/uavobjectutil/uavobjectutil.pro @@ -1,16 +1,20 @@ TEMPLATE = lib TARGET = UAVObjectUtil + DEFINES += UAVOBJECTUTIL_LIBRARY + include(../../plugin.pri) include(uavobjectutil_dependencies.pri) -HEADERS += uavobjectutil_global.h \ - uavobjectutilmanager.h \ +HEADERS += \ + uavobjectutil_global.h \ + uavobjectutilmanager.h \ uavobjectutilplugin.h \ - devicedescriptorstruct.h \ + devicedescriptorstruct.h \ uavobjecthelper.h -SOURCES += uavobjectutilmanager.cpp \ +SOURCES += \ + uavobjectutilmanager.cpp \ uavobjectutilplugin.cpp \ uavobjecthelper.cpp diff --git a/ground/gcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp b/ground/gcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp index 91f6d80cb..3f55aca7c 100644 --- a/ground/gcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp +++ b/ground/gcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp @@ -30,15 +30,15 @@ #include "utils/homelocationutil.h" +#include "objectpersistence.h" +#include "firmwareiapobj.h" +#include "homelocation.h" +#include "gpspositionsensor.h" + #include #include #include #include -#include - -#include "firmwareiapobj.h" -#include "homelocation.h" -#include "gpspositionsensor.h" // ****************************** // constructor/destructor diff --git a/ground/gcs/src/plugins/uavobjectutil/uavobjectutilmanager.h b/ground/gcs/src/plugins/uavobjectutil/uavobjectutilmanager.h index e8279e93e..2b298e3e3 100644 --- a/ground/gcs/src/plugins/uavobjectutil/uavobjectutilmanager.h +++ b/ground/gcs/src/plugins/uavobjectutil/uavobjectutilmanager.h @@ -34,16 +34,17 @@ #include "extensionsystem/pluginmanager.h" #include "uavobjectmanager.h" #include "uavobject.h" -#include "objectpersistence.h" #include "devicedescriptorstruct.h" + +#include "objectpersistence.h" +#include "firmwareiapobj.h" + #include #include #include #include #include -#include #include -#include class UAVOBJECTUTIL_EXPORT UAVObjectUtilManager : public QObject { Q_OBJECT diff --git a/ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp b/ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp index de58e0479..f745c8f80 100644 --- a/ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp +++ b/ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp @@ -27,12 +27,24 @@ */ #include "configtaskwidget.h" -#include +#include "uavobjectmanager.h" +#include "uavobject.h" +#include "uavobjectutilmanager.h" +#include "uavtalk/telemetrymanager.h" #include "uavsettingsimportexport/uavsettingsimportexportfactory.h" +#include "smartsavebutton.h" +#include "mixercurvewidget.h" -#include +#include +#include +#include +#include #include +#include +#include #include +#include +#include ConfigTaskWidget::ConfigTaskWidget(QWidget *parent) : QWidget(parent), m_currentBoardId(-1), m_isConnected(false), m_isWidgetUpdatesAllowed(true), m_wikiURL("Welcome"), m_saveButton(NULL), m_isDirty(false), m_outOfLimitsStyle("background-color: rgb(255, 0, 0);"), m_realtimeUpdateTimer(NULL) diff --git a/ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h b/ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h index 75290d53e..800df8292 100644 --- a/ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h +++ b/ground/gcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h @@ -27,25 +27,23 @@ #ifndef CONFIGTASKWIDGET_H #define CONFIGTASKWIDGET_H +#include "uavobjectwidgetutils_global.h" + #include "extensionsystem/pluginmanager.h" -#include "uavobjectmanager.h" -#include "uavobject.h" -#include "uavobjectutilmanager.h" -#include + #include #include -#include -#include "smartsavebutton.h" -#include "mixercurvewidget.h" -#include -#include -#include -#include -#include -#include "uavobjectwidgetutils_global.h" -#include -#include -#include +#include + +class UAVObject; +class UAVObjectField; +class UAVObjectManager; +class UAVObjectUtilManager; +class SmartSaveButton; + +class QComboBox; +class QPushButton; +class QEvent; class ShadowWidgetBinding : public QObject { Q_OBJECT diff --git a/ground/gcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils.pro b/ground/gcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils.pro index 1e8151426..fdf33be25 100644 --- a/ground/gcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils.pro +++ b/ground/gcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils.pro @@ -1,12 +1,15 @@ TEMPLATE = lib TARGET = UAVObjectWidgetUtils + DEFINES += UAVOBJECTWIDGETUTILS_LIBRARY -QT += svg + +QT += widgets svg include(../../plugin.pri) include(uavobjectwidgetutils_dependencies.pri) -HEADERS += uavobjectwidgetutils_global.h \ +HEADERS += \ + uavobjectwidgetutils_global.h \ uavobjectwidgetutilsplugin.h \ configtaskwidget.h \ mixercurvewidget.h \ @@ -15,7 +18,8 @@ HEADERS += uavobjectwidgetutils_global.h \ smartsavebutton.h \ popupwidget.h -SOURCES += uavobjectwidgetutilsplugin.cpp \ +SOURCES += \ + uavobjectwidgetutilsplugin.cpp \ configtaskwidget.cpp \ mixercurvewidget.cpp \ mixercurvepoint.cpp \ diff --git a/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.cpp b/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.cpp index c70f028d5..84310d9a0 100644 --- a/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.cpp +++ b/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.cpp @@ -27,6 +27,10 @@ */ #include "importsummary.h" +#include +#include +#include + ImportSummaryDialog::ImportSummaryDialog(QWidget *parent) : QDialog(parent), ui(new Ui::ImportSummaryDialog) diff --git a/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.h b/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.h index 524897c5b..5aa3f6fce 100644 --- a/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.h +++ b/ground/gcs/src/plugins/uavsettingsimportexport/importsummary.h @@ -27,16 +27,13 @@ #ifndef IMPORTSUMMARY_H #define IMPORTSUMMARY_H -#include -#include -#include -#include #include "ui_importsummarydialog.h" #include "uavdataobject.h" #include "uavobjectmanager.h" #include "extensionsystem/pluginmanager.h" #include "uavobjectutil/uavobjectutilmanager.h" +#include namespace Ui { class ImportSummaryDialog; diff --git a/ground/gcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp b/ground/gcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp index 8b4fe1ec3..97a13bd25 100644 --- a/ground/gcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp +++ b/ground/gcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp @@ -27,28 +27,18 @@ #include "uavsettingsimportexport.h" -#include -#include -#include -#include -#include "importsummary.h" -// for menu item #include #include #include -#include -// for UAVObjects #include "uavdataobject.h" #include "uavobjectmanager.h" #include "extensionsystem/pluginmanager.h" -// for XML object -#include +#include "importsummary.h" -// for file dialog and error messages -#include -#include +#include +#include UAVSettingsImportExportPlugin::UAVSettingsImportExportPlugin() { diff --git a/ground/gcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.pro b/ground/gcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.pro index 80e0fbbb7..c415aae10 100644 --- a/ground/gcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.pro +++ b/ground/gcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.pro @@ -1,17 +1,21 @@ - TEMPLATE = lib -QT += xml - TARGET = UAVSettingsImportExport + +QT += widgets xml + DEFINES += UAVSETTINGSIMPORTEXPORT_LIBRARY + include(../../plugin.pri) include(uavsettingsimportexport_dependencies.pri) include(../../libs/version_info/version_info.pri) -HEADERS += uavsettingsimportexport.h \ +HEADERS += \ + uavsettingsimportexport.h \ importsummary.h \ uavsettingsimportexportfactory.h -SOURCES += uavsettingsimportexport.cpp \ + +SOURCES += \ + uavsettingsimportexport.cpp \ importsummary.cpp \ uavsettingsimportexportfactory.cpp diff --git a/ground/gcs/src/plugins/uavtalk/uavtalk.pro b/ground/gcs/src/plugins/uavtalk/uavtalk.pro index e84b124e1..19f32f504 100644 --- a/ground/gcs/src/plugins/uavtalk/uavtalk.pro +++ b/ground/gcs/src/plugins/uavtalk/uavtalk.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = UAVTalk -QT += network +QT += widgets network DEFINES += UAVTALK_LIBRARY diff --git a/ground/gcs/src/plugins/uploader/uploader.pro b/ground/gcs/src/plugins/uploader/uploader.pro index fb70976ff..23990f5a2 100644 --- a/ground/gcs/src/plugins/uploader/uploader.pro +++ b/ground/gcs/src/plugins/uploader/uploader.pro @@ -1,5 +1,6 @@ TEMPLATE = lib TARGET = Uploader + DEFINES += UPLOADER_LIBRARY QT += svg serialport @@ -15,7 +16,8 @@ macx { QMAKE_CXXFLAGS += -Wno-enum-compare } -HEADERS += uploadergadget.h \ +HEADERS += \ + uploadergadget.h \ uploadergadgetconfiguration.h \ uploadergadgetfactory.h \ uploadergadgetoptionspage.h \ @@ -34,7 +36,8 @@ HEADERS += uploadergadget.h \ rebootdialog.h \ oplinkwatchdog.h -SOURCES += uploadergadget.cpp \ +SOURCES += \ + uploadergadget.cpp \ uploadergadgetconfiguration.cpp \ uploadergadgetfactory.cpp \ uploadergadgetoptionspage.cpp \ diff --git a/ground/gcs/src/plugins/usagetracker/usagetracker.pro b/ground/gcs/src/plugins/usagetracker/usagetracker.pro index eb3f9aea9..d5a0728ee 100644 --- a/ground/gcs/src/plugins/usagetracker/usagetracker.pro +++ b/ground/gcs/src/plugins/usagetracker/usagetracker.pro @@ -1,7 +1,7 @@ - TEMPLATE = lib TARGET = UsageTracker -QT += network + +QT += widgets network include(usagetracker.pri) include(../../plugin.pri) @@ -11,7 +11,10 @@ include(../../plugins/uavobjects/uavobjects.pri) include(../../plugins/uavobjectutil/uavobjectutil.pri) include(../../plugins/uavtalk/uavtalk.pri) -HEADERS += usagetrackerplugin.h -SOURCES += usagetrackerplugin.cpp +HEADERS += \ + usagetrackerplugin.h + +SOURCES += \ + usagetrackerplugin.cpp OTHER_FILES += usagetracker.pluginspec diff --git a/ground/gcs/src/plugins/welcome/welcome.pro b/ground/gcs/src/plugins/welcome/welcome.pro index a325536c9..70d366364 100644 --- a/ground/gcs/src/plugins/welcome/welcome.pro +++ b/ground/gcs/src/plugins/welcome/welcome.pro @@ -16,5 +16,7 @@ SOURCES += \ welcomemode.cpp \ RESOURCES += welcome.qrc + DEFINES += WELCOME_LIBRARY + OTHER_FILES += Welcome.pluginspec