Merge branch 'next' into corvuscorax/onboardlogging

ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h

@@ -33,7 +33,6 @@
 
 namespace Core {
 namespace Internal {
-
 class MainWindow;
 
 class CorePlugin : public ExtensionSystem::IPlugin {
@@ -54,7 +53,6 @@ public slots:
 private:
     MainWindow *m_mainWindow;
 };
-
 } // namespace Internal
 } // namespace Core
 

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()
 {

ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h

@@ -69,7 +69,7 @@ private:
     QQueue<UAVObject *> queue;
     GCSTelemetryStats *gcsStatsObj;
     FlightTelemetryStats *flightStatsObj;
-    FirmwareIAPObj* firmwareIAPObj;
+    FirmwareIAPObj *firmwareIAPObj;
     QTimer *statsTimer;
     UAVObject *objPending;
     QMutex *mutex;

ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h

@@ -32,11 +32,9 @@
 #include <extensionsystem/iplugin.h>
 
 namespace Welcome {
-
 class WelcomeMode;
 
 namespace Internal {
-
 class WelcomePlugin
     : public ExtensionSystem::IPlugin {
     Q_OBJECT
@@ -53,7 +51,6 @@ public:
 private:
     WelcomeMode *m_welcomeMode;
 };
-
 } // namespace Welcome
 } // namespace Internal