From 9b572407a793ea7642563ccb81f150fc4b7f3cd2 Mon Sep 17 00:00:00 2001
From: elafargue <edouard@lafargue.name>
Date: Tue, 7 Jun 2011 17:15:16 +0200
Subject: [PATCH] Small compilation warning fixed and small typos

---
 .../src/plugins/coreplugin/connectionmanager.cpp             | 5 +++--
 ground/openpilotgcs/src/plugins/coreplugin/coreimpl.cpp      | 1 +
 ground/openpilotgcs/src/plugins/coreplugin/mainwindow.h      | 2 +-
 .../uavsettingsimportexport/uavsettingsimportexport.cpp      | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp b/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
index 07f0ef0c9..176263d04 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
+++ b/ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
@@ -219,8 +219,9 @@ void ConnectionManager::aboutToRemoveObject(QObject *obj)
 
 void ConnectionManager::onConnectionDestroyed(QObject *obj)	// Pip
 {
-        //onConnectionClosed(obj);
-        disconnectDevice();
+    Q_UNUSED(obj)
+    //onConnectionClosed(obj);
+    disconnectDevice();
 }
 
 /**
diff --git a/ground/openpilotgcs/src/plugins/coreplugin/coreimpl.cpp b/ground/openpilotgcs/src/plugins/coreplugin/coreimpl.cpp
index f3e95a8cb..dd6c3d0bc 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/coreimpl.cpp
+++ b/ground/openpilotgcs/src/plugins/coreplugin/coreimpl.cpp
@@ -183,6 +183,7 @@ void CoreImpl::updateContext()
 
 void CoreImpl::openFiles(const QStringList &arguments)
 {
+    Q_UNUSED(arguments)
     //m_mainwindow->openFiles(arguments);
 }
 
diff --git a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.h b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.h
index 585d4604a..d2f7b1977 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.h
+++ b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.h
@@ -177,8 +177,8 @@ private:
     QList<int> m_additionalContexts;
     QSettings *m_settings;
     QSettings *m_globalSettings;
-    bool m_dontSaveSettings; // In case of an Error or if we reset the settings, never save them.
     SettingsDatabase *m_settingsDatabase;
+    bool m_dontSaveSettings; // In case of an Error or if we reset the settings, never save them.
     ActionManagerPrivate *m_actionManager;
     MessageManager *m_messageManager;
     VariableManager *m_variableManager;
diff --git a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp
index 932af48fc..0b52a699a 100644
--- a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp
+++ b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.cpp
@@ -158,7 +158,7 @@ void UAVSettingsImportExportPlugin::importUAVSettings()
          if (obj == NULL) {
              // This object is unknown!
              qDebug() << "Object Unknown:" << uavObjectName << uavObjectID;
-             swui.addLine(uavObjectName, "Error (object Unknown)", false);
+             swui.addLine(uavObjectName, "Error (object unknown)", false);
 
          } else {
              //  - Update each field