From 9a753e5c7790ee2a09cd72e7779e4a184af62d4a Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:39 +0100 Subject: [PATCH 01/39] uncrustification for ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h --- .../openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h b/ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h index 2ef36ff5e..9d61dde27 100644 --- a/ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h +++ b/ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h @@ -7,7 +7,7 @@ class AntennaTrackGadgetFactory; class AntennaTrackPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.AntennaTrack") + Q_PLUGIN_METADATA(IID "OpenPilot.AntennaTrack") public: AntennaTrackPlugin(); From 17da3a6c7ac59856b019583b31b914b889ba9b0b Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:40 +0100 Subject: [PATCH 02/39] uncrustification for ground/openpilotgcs/src/plugins/config/configplugin.h --- ground/openpilotgcs/src/plugins/config/configplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/config/configplugin.h b/ground/openpilotgcs/src/plugins/config/configplugin.h index d9360ceba..c47cfd791 100644 --- a/ground/openpilotgcs/src/plugins/config/configplugin.h +++ b/ground/openpilotgcs/src/plugins/config/configplugin.h @@ -40,7 +40,7 @@ class ConfigGadgetFactory; class ConfigPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Config") + Q_PLUGIN_METADATA(IID "OpenPilot.Config") public: ConfigPlugin(); From 6030b1ba0ac09827e60076e03b0548b332c73912 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:40 +0100 Subject: [PATCH 03/39] uncrustification for ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h --- ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h b/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h index 3a7edad1b..ddd4de647 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h +++ b/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h @@ -33,12 +33,11 @@ namespace Core { namespace Internal { - class MainWindow; class CorePlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Core") + Q_PLUGIN_METADATA(IID "OpenPilot.Core") public: CorePlugin(); @@ -54,7 +53,6 @@ public slots: private: MainWindow *m_mainWindow; }; - } // namespace Internal } // namespace Core From 2e5c179fa43e0a02b4bdfa92a552112d11c4ecd6 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:40 +0100 Subject: [PATCH 04/39] uncrustification for ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h --- ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h b/ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h index 5f81c5616..7c8d933dc 100644 --- a/ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h +++ b/ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h @@ -34,7 +34,7 @@ class DebugGadgetFactory; class DebugPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Debug") + Q_PLUGIN_METADATA(IID "OpenPilot.Debug") public: DebugPlugin(); From 765bd0a7ff1f224ba01f1a3b38acf58095efa93c Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:40 +0100 Subject: [PATCH 05/39] uncrustification for ground/openpilotgcs/src/plugins/dial/dialplugin.h --- ground/openpilotgcs/src/plugins/dial/dialplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/dial/dialplugin.h b/ground/openpilotgcs/src/plugins/dial/dialplugin.h index bae71391d..2b4532cfd 100644 --- a/ground/openpilotgcs/src/plugins/dial/dialplugin.h +++ b/ground/openpilotgcs/src/plugins/dial/dialplugin.h @@ -35,7 +35,7 @@ class DialGadgetFactory; class DialPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Dial") + Q_PLUGIN_METADATA(IID "OpenPilot.Dial") public: DialPlugin(); From a499b92d9d02f2f0d33efe1cd6e1bd66a7f589b1 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:40 +0100 Subject: [PATCH 06/39] uncrustification for ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h --- ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h b/ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h index 495ce7d33..7c6b1f4e7 100644 --- a/ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h +++ b/ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h @@ -34,7 +34,7 @@ class EmptyGadgetFactory; class EmptyPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Empty") + Q_PLUGIN_METADATA(IID "OpenPilot.Empty") public: EmptyPlugin(); From 65e8c0dc6fceff107b29b53677b7efa8a641fe4c Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:40 +0100 Subject: [PATCH 07/39] uncrustification for ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h --- ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h b/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h index 1a1312aca..417f0480c 100644 --- a/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h +++ b/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h @@ -35,7 +35,7 @@ class GCSControlGadgetFactory; class GCSControlPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.GCSControl") + Q_PLUGIN_METADATA(IID "OpenPilot.GCSControl") public: GCSControlPlugin(); From 58109f84611710e2bc2cce05efa875d24b2a3837 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:40 +0100 Subject: [PATCH 08/39] uncrustification for ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h --- ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h index 539dc3beb..0fbe040a5 100644 --- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h +++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h @@ -34,7 +34,7 @@ class GpsDisplayGadgetFactory; class GpsDisplayPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.GpsDisplay") + Q_PLUGIN_METADATA(IID "OpenPilot.GpsDisplay") public: GpsDisplayPlugin(); From 4adca55693a928fc1c2112c8f16eea0c36a9e7ff Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:40 +0100 Subject: [PATCH 09/39] uncrustification for ground/openpilotgcs/src/plugins/hitl/hitlplugin.h --- ground/openpilotgcs/src/plugins/hitl/hitlplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/hitl/hitlplugin.h b/ground/openpilotgcs/src/plugins/hitl/hitlplugin.h index bbbf25a8a..7829ade2a 100644 --- a/ground/openpilotgcs/src/plugins/hitl/hitlplugin.h +++ b/ground/openpilotgcs/src/plugins/hitl/hitlplugin.h @@ -37,7 +37,7 @@ class HITLFactory; class HITLPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.HITL") + Q_PLUGIN_METADATA(IID "OpenPilot.HITL") public: HITLPlugin(); From bcc651ddc82b4459a51bfd98c4f624efc3f53898 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:40 +0100 Subject: [PATCH 10/39] uncrustification for ground/openpilotgcs/src/plugins/importexport/importexportplugin.h --- .../openpilotgcs/src/plugins/importexport/importexportplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/importexport/importexportplugin.h b/ground/openpilotgcs/src/plugins/importexport/importexportplugin.h index 67364dc4a..1473e8da4 100644 --- a/ground/openpilotgcs/src/plugins/importexport/importexportplugin.h +++ b/ground/openpilotgcs/src/plugins/importexport/importexportplugin.h @@ -32,7 +32,7 @@ class IMPORTEXPORT_EXPORT ImportExportPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.ImportExport") + Q_PLUGIN_METADATA(IID "OpenPilot.ImportExport") public: ImportExportPlugin(); From 33616e6af49648db87318535e2c444b8ddb1f6b4 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:40 +0100 Subject: [PATCH 11/39] uncrustification for ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h --- .../openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h b/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h index d84199978..a7fcf4bcf 100644 --- a/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h +++ b/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h @@ -85,7 +85,7 @@ private: class IPconnection_EXPORT IPconnectionPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.IPconnection") + Q_PLUGIN_METADATA(IID "OpenPilot.IPconnection") public: IPconnectionPlugin(); From 98d213f1a2251775256aa45a3d482591d2c8f312 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 12/39] uncrustification for ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h --- ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h b/ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h index e2420d805..423e54cab 100644 --- a/ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h +++ b/ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h @@ -34,7 +34,7 @@ class LineardialGadgetFactory; class LineardialPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Lineardial") + Q_PLUGIN_METADATA(IID "OpenPilot.Lineardial") public: LineardialPlugin(); From 968470037f917629554c0cddf659fd573b4312e0 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 13/39] uncrustification for ground/openpilotgcs/src/plugins/logging/logfile.cpp --- ground/openpilotgcs/src/plugins/logging/logfile.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/logging/logfile.cpp b/ground/openpilotgcs/src/plugins/logging/logfile.cpp index 08dac17b0..2b1647139 100644 --- a/ground/openpilotgcs/src/plugins/logging/logfile.cpp +++ b/ground/openpilotgcs/src/plugins/logging/logfile.cpp @@ -152,8 +152,8 @@ bool LogFile::startReplay() { dataBuffer.clear(); myTime.restart(); - timeOffset = 0; - lastPlayed = 0; + timeOffset = 0; + lastPlayed = 0; file.read((char *)&lastTimeStamp, sizeof(lastTimeStamp)); timer.setInterval(10); timer.start(); From 3c23b1f46448bc0a324fb02f66ee569d506a5567 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 14/39] uncrustification for ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp --- .../src/plugins/logging/loggingplugin.cpp | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp b/ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp index fab4190aa..fc88cbe98 100644 --- a/ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp +++ b/ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp @@ -44,9 +44,9 @@ #include "uavobjectmanager.h" -LoggingConnection::LoggingConnection(LoggingPlugin *loggingPlugin): -loggingPlugin(loggingPlugin), -m_deviceOpened(false) +LoggingConnection::LoggingConnection(LoggingPlugin *loggingPlugin) : + loggingPlugin(loggingPlugin), + m_deviceOpened(false) {} LoggingConnection::~LoggingConnection() @@ -288,14 +288,12 @@ void LoggingThread::transactionCompleted(UAVObject *obj, bool success) LoggingPlugin::LoggingPlugin() : -state(IDLE), -loggingThread(NULL), -logConnection(new LoggingConnection(this)), -mf(NULL), -cmd(NULL) -{ - -} + state(IDLE), + loggingThread(NULL), + logConnection(new LoggingConnection(this)), + mf(NULL), + cmd(NULL) +{} LoggingPlugin::~LoggingPlugin() { From bc83fd6ffaa906eb94cfb33278630c26c4582b86 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 15/39] uncrustification for ground/openpilotgcs/src/plugins/logging/loggingplugin.h --- ground/openpilotgcs/src/plugins/logging/loggingplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/logging/loggingplugin.h b/ground/openpilotgcs/src/plugins/logging/loggingplugin.h index 1d39ccfff..ed697714e 100644 --- a/ground/openpilotgcs/src/plugins/logging/loggingplugin.h +++ b/ground/openpilotgcs/src/plugins/logging/loggingplugin.h @@ -116,7 +116,7 @@ private: class LoggingPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Logging") + Q_PLUGIN_METADATA(IID "OpenPilot.Logging") friend class LoggingConnection; From cc04e31b5dee46cb960db2efdc9bb173c3a3be61 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 16/39] uncrustification for ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h --- .../src/plugins/magicwaypoint/magicwaypointplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h b/ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h index 2eb3edbd3..78540e876 100644 --- a/ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h +++ b/ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h @@ -34,7 +34,7 @@ class MagicWaypointGadgetFactory; class MagicWaypointPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.MagicWaypoint") + Q_PLUGIN_METADATA(IID "OpenPilot.MagicWaypoint") public: MagicWaypointPlugin(); From 2cbe028cd5d7b847856b19afc86ec7c591fe9e96 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 17/39] uncrustification for ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h --- ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h b/ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h index 44818423d..72c9760d5 100644 --- a/ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h +++ b/ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h @@ -34,7 +34,7 @@ class ModelViewGadgetFactory; class ModelViewPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "Openpilot.ModelView") + Q_PLUGIN_METADATA(IID "Openpilot.ModelView") public: ModelViewPlugin(); From df77cd7613d9985a756a42b766d9bbc5cdef5849 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 18/39] uncrustification for ground/openpilotgcs/src/plugins/notify/notifyplugin.h --- ground/openpilotgcs/src/plugins/notify/notifyplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/notify/notifyplugin.h b/ground/openpilotgcs/src/plugins/notify/notifyplugin.h index 33f08859a..39912a94b 100644 --- a/ground/openpilotgcs/src/plugins/notify/notifyplugin.h +++ b/ground/openpilotgcs/src/plugins/notify/notifyplugin.h @@ -49,7 +49,7 @@ typedef struct { class SoundNotifyPlugin : public Core::IConfigurablePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "Openpilot.SoundNotify") + Q_PLUGIN_METADATA(IID "Openpilot.SoundNotify") public: SoundNotifyPlugin(); From 55eb581e45b1e8cd2390ea41345729b20a1f9589 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 19/39] uncrustification for ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h --- ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h index fdc1dcb2f..b182706e2 100644 --- a/ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h +++ b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h @@ -83,7 +83,7 @@ protected: class OPHID_EXPORT RawHIDPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.RawHID") + Q_PLUGIN_METADATA(IID "OpenPilot.RawHID") public: RawHIDPlugin(); From 4babcedfe29226d0e1f789b6d06fb617a7268a75 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 20/39] uncrustification for ground/openpilotgcs/src/plugins/opmap/opmapplugin.h --- ground/openpilotgcs/src/plugins/opmap/opmapplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/opmap/opmapplugin.h b/ground/openpilotgcs/src/plugins/opmap/opmapplugin.h index b3d00ac2a..bc64f96ee 100644 --- a/ground/openpilotgcs/src/plugins/opmap/opmapplugin.h +++ b/ground/openpilotgcs/src/plugins/opmap/opmapplugin.h @@ -34,7 +34,7 @@ class OPMapGadgetFactory; class OPMapPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.OPMap") + Q_PLUGIN_METADATA(IID "OpenPilot.OPMap") public: OPMapPlugin(); From 0fd357ae61526658109703ac047f589b211a0c25 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 21/39] uncrustification for ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h --- .../openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h b/ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h index 2a85aaefb..61ae110c7 100644 --- a/ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h +++ b/ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h @@ -34,7 +34,7 @@ class OsgEarthviewGadgetFactory; class OsgEarthviewPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.OsgEarthview") + Q_PLUGIN_METADATA(IID "OpenPilot.OsgEarthview") public: OsgEarthviewPlugin(); From 9b5c7e20c399a5a97c5139d98bc5f55f2043c9d6 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 22/39] uncrustification for ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h --- .../src/plugins/pathactioneditor/pathactioneditorplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h b/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h index b43d32b59..47139918b 100644 --- a/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h +++ b/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h @@ -33,7 +33,7 @@ class PathActionEditorGadgetFactory; class PathActionEditorPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.PathActionEditor") + Q_PLUGIN_METADATA(IID "OpenPilot.PathActionEditor") public: PathActionEditorPlugin(); From 04b7fbbf352e66ff06bb016acd28ff2bb6485309 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:41 +0100 Subject: [PATCH 23/39] uncrustification for ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h --- ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h index 136523d5b..0f137feaf 100644 --- a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h +++ b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h @@ -23,7 +23,7 @@ class PfdQmlGadgetFactory; class PfdQmlPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.PfdQml") + Q_PLUGIN_METADATA(IID "OpenPilot.PfdQml") public: PfdQmlPlugin(); From cef290ddca1cd3552ecc324c95512c1806fa9321 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 24/39] uncrustification for ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h --- ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h b/ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h index ebb70c80c..27844a7a3 100644 --- a/ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h +++ b/ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h @@ -34,7 +34,7 @@ class QmlViewGadgetFactory; class QmlViewPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.QmlView") + Q_PLUGIN_METADATA(IID "OpenPilot.QmlView") public: QmlViewPlugin(); From 2c04a338b49dbf3c6f57dc9b66473c640eaf3107 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 25/39] uncrustification for ground/openpilotgcs/src/plugins/scope/scopeplugin.h --- ground/openpilotgcs/src/plugins/scope/scopeplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/scope/scopeplugin.h b/ground/openpilotgcs/src/plugins/scope/scopeplugin.h index 0875fd67a..dd67761dd 100644 --- a/ground/openpilotgcs/src/plugins/scope/scopeplugin.h +++ b/ground/openpilotgcs/src/plugins/scope/scopeplugin.h @@ -34,7 +34,7 @@ class ScopeGadgetFactory; class ScopePlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Scope") + Q_PLUGIN_METADATA(IID "OpenPilot.Scope") public: ScopePlugin(); From a21357d8e917abd2ecb22e46823a380877c151f1 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 26/39] uncrustification for ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp --- .../openpilotgcs/src/plugins/serialconnection/serialplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp b/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp index ffca6bccb..59d130c02 100644 --- a/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp +++ b/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp @@ -74,7 +74,7 @@ SerialConnection::SerialConnection() : m_enumerateThread(this), m_deviceOpened(false) { - m_config = new SerialPluginConfiguration("Serial Telemetry", NULL, this); + m_config = new SerialPluginConfiguration("Serial Telemetry", NULL, this); m_config->restoresettings(); m_optionspage = new SerialPluginOptionsPage(m_config, this); From 406daf316cadf6e3724b957a0e31991bcdba9d53 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 27/39] uncrustification for ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h --- ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h b/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h index ebaa363c0..14031a871 100644 --- a/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h +++ b/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h @@ -118,7 +118,7 @@ protected: // class SERIAL_EXPORT SerialPlugin class SerialPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Serial") + Q_PLUGIN_METADATA(IID "OpenPilot.Serial") public: SerialPlugin(); From 68a8863fbda9fb65aee5632b716b99e0dec261a9 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 28/39] uncrustification for ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h --- ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h b/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h index 7be38727c..1880a2bf2 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h +++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h @@ -33,7 +33,7 @@ class SetupWizardPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard") + Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard") public: SetupWizardPlugin(); From 5c6885caf4ca46ca149cbdeb8207ef257bd7692c Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 29/39] uncrustification for ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h --- .../openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h b/ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h index 808ed4b46..b932dc287 100644 --- a/ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h +++ b/ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h @@ -34,7 +34,7 @@ class SystemHealthGadgetFactory; class SystemHealthPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.SystemHealth") + Q_PLUGIN_METADATA(IID "OpenPilot.SystemHealth") public: SystemHealthPlugin(); From 436293dbafee60e7f37bbe56e83f3423cddb706a Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 30/39] uncrustification for ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h --- .../openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h b/ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h index 929662d1b..3cccba277 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h +++ b/ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h @@ -34,7 +34,7 @@ class UAVObjectBrowserFactory; class BrowserPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Browser") + Q_PLUGIN_METADATA(IID "OpenPilot.Browser") public: BrowserPlugin(); From e7bd28e14c7fd2146c7e1feb582869096778701c Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 31/39] uncrustification for ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h --- ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h b/ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h index 8c26b7152..a684dcc21 100644 --- a/ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h +++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h @@ -36,7 +36,7 @@ class UAVOBJECTS_EXPORT UAVObjectsPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjects") + Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjects") public: UAVObjectsPlugin(); From 0e8f01baa83c2a8f3381ba03cf027120a7dddb95 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 32/39] uncrustification for ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h --- .../src/plugins/uavobjectutil/uavobjectutilplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h b/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h index fefc8ddf9..ed3a20efc 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h +++ b/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h @@ -35,7 +35,7 @@ class UAVOBJECTUTIL_EXPORT UAVObjectUtilPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectUtil") + Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectUtil") public: UAVObjectUtilPlugin(); From f73e2c1a75167b9e246adbf90fe2be7a92d4cb3c Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 33/39] uncrustification for ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h --- .../plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h index c1a72f7f7..dc988ef7f 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h +++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h @@ -33,7 +33,7 @@ class UAVOBJECTWIDGETUTILS_EXPORT UAVObjectWidgetUtilsPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectWidgetUtils") + Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectWidgetUtils") public: UAVObjectWidgetUtilsPlugin(); From 28d79420c1148960a9a43e2e2fa6cee674ae37c7 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 34/39] uncrustification for ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h --- .../plugins/uavsettingsimportexport/uavsettingsimportexport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h index 9cb5f1cd8..08acab11d 100644 --- a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h +++ b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h @@ -34,7 +34,7 @@ class UAVSETTINGSIMPORTEXPORT_EXPORT UAVSettingsImportExportPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.UAVSettingsImportExport") + Q_PLUGIN_METADATA(IID "OpenPilot.UAVSettingsImportExport") public: UAVSettingsImportExportPlugin(); From 2582eefaedd1c7b4c407c18ce64435146d888bc2 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:42 +0100 Subject: [PATCH 35/39] uncrustification for ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp --- ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp b/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp index 47936238c..9bfe7cf7d 100644 --- a/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp +++ b/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp @@ -184,7 +184,7 @@ void TelemetryMonitor::firmwareIAPUpdated(UAVObject *obj) QMutexLocker locker(mutex); if (firmwareIAPObj->getBoardType() != 0) { - emit connected(); + emit connected(); } } From 7420276a069b17f60ecf9546e2bf043775726eb1 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:43 +0100 Subject: [PATCH 36/39] uncrustification for ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h --- ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h b/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h index a0f03341d..77e27e71a 100644 --- a/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h +++ b/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h @@ -69,7 +69,7 @@ private: QQueue queue; GCSTelemetryStats *gcsStatsObj; FlightTelemetryStats *flightStatsObj; - FirmwareIAPObj* firmwareIAPObj; + FirmwareIAPObj *firmwareIAPObj; QTimer *statsTimer; UAVObject *objPending; QMutex *mutex; From 31d4234c799f5fa3f0f56ee5aa410e9173d1d00c Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:43 +0100 Subject: [PATCH 37/39] uncrustification for ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h --- ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h b/ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h index 5b8840971..4d5aaa598 100644 --- a/ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h +++ b/ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h @@ -38,7 +38,7 @@ class UAVTALK_EXPORT UAVTalkPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.UAVTalk") + Q_PLUGIN_METADATA(IID "OpenPilot.UAVTalk") public: UAVTalkPlugin(); From cf5d59a6779d06abd44d619f1a25d18fa303b507 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:43 +0100 Subject: [PATCH 38/39] uncrustification for ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h --- ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h b/ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h index b9ea238b6..2fb6a19f9 100644 --- a/ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h +++ b/ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h @@ -35,7 +35,7 @@ class UploaderGadgetFactory; class UPLOADER_EXPORT UploaderPlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Uploader") + Q_PLUGIN_METADATA(IID "OpenPilot.Uploader") public: UploaderPlugin(); From 89f7dab2de1f766316a613f18c2adc0a7b14baa6 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Nov 2013 17:34:43 +0100 Subject: [PATCH 39/39] uncrustification for ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h --- ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h b/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h index 337fdb57c..a272d9550 100644 --- a/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h +++ b/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h @@ -32,15 +32,13 @@ #include namespace Welcome { - class WelcomeMode; namespace Internal { - class WelcomePlugin : public ExtensionSystem::IPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "OpenPilot.Welcome") + Q_PLUGIN_METADATA(IID "OpenPilot.Welcome") public: WelcomePlugin(); @@ -53,7 +51,6 @@ public: private: WelcomeMode *m_welcomeMode; }; - } // namespace Welcome } // namespace Internal