Merge pull request #1006 from DonLakeFlyer/FileRenames

File renames

qgroundcontrol.pro

@@ -289,7 +289,7 @@ FORMS += \
     src/ui/QGCUASFileViewMulti.ui \
     src/ui/QGCUDPLinkConfiguration.ui \
     src/ui/QGCTCPLinkConfiguration.ui \
-    src/ui/QGCSettingsWidget.ui \
+    src/ui/SettingsDialog.ui \
     src/ui/UASControlParameters.ui \
     src/ui/map/QGCMapTool.ui \
     src/ui/map/QGCMapToolBar.ui \
@@ -334,7 +334,7 @@ FORMS += \
 
 HEADERS += \
     src/MG.h \
-    src/QGCCore.h \
+    src/QGCApplication.h \
     src/uas/UASInterface.h \
     src/uas/UAS.h \
     src/uas/UASManager.h \
@@ -413,7 +413,7 @@ HEADERS += \
     src/ui/QGCUASFileViewMulti.h \
     src/ui/QGCUDPLinkConfiguration.h \
     src/ui/QGCTCPLinkConfiguration.h \
-    src/ui/QGCSettingsWidget.h \
+    src/ui/SettingsDialog.h \
     src/ui/uas/UASControlParameters.h \
     src/uas/QGCUASParamManager.h \
     src/ui/map/QGCMapWidget.h \
@@ -492,7 +492,7 @@ HEADERS += \
 
 SOURCES += \
     src/main.cc \
-    src/QGCCore.cc \
+    src/QGCApplication.cc \
     src/uas/UASManager.cc \
     src/uas/UAS.cc \
     src/comm/LinkManager.cc \
@@ -565,7 +565,7 @@ SOURCES += \
     src/ui/QGCUASFileViewMulti.cc \
     src/ui/QGCUDPLinkConfiguration.cc \
     src/ui/QGCTCPLinkConfiguration.cc \
-    src/ui/QGCSettingsWidget.cc \
+    src/ui/SettingsDialog.cc \
     src/ui/uas/UASControlParameters.cpp \
     src/uas/QGCUASParamManager.cc \
     src/ui/map/QGCMapWidget.cc \

src/QGCApplication.cc

@@ -43,7 +43,7 @@
 
 #include "configuration.h"
 #include "QGC.h"
-#include "QGCCore.h"
+#include "QGCApplication.h"
 #include "MainWindow.h"
 #include "GAudioOutput.h"
 #include "CmdLineOptParser.h"

src/comm/MAVLinkProtocol.cc

@@ -28,7 +28,7 @@
 #include "QGCMAVLink.h"
 #include "QGCMAVLinkUASFactory.h"
 #include "QGC.h"
-#include "QGCCore.h"
+#include "QGCApplication.h"
 
 Q_DECLARE_METATYPE(mavlink_message_t)
 

src/main.cc

@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QApplication>
 #include <QSslSocket>
 
-#include "QGCCore.h"
+#include "QGCApplication.h"
 #include "MainWindow.h"
 #include "configuration.h"
 #include "SerialLink.h"

src/ui/MainWindow.cc

@@ -52,7 +52,7 @@ This file is part of the QGROUNDCONTROL project
 #include "GAudioOutput.h"
 #include "QGCToolWidget.h"
 #include "QGCMAVLinkLogPlayer.h"
-#include "QGCSettingsWidget.h"
+#include "SettingsDialog.h"
 #include "QGCMapTool.h"
 #include "MAVLinkDecoder.h"
 #include "QGCMAVLinkMessageSender.h"
@@ -70,7 +70,7 @@ This file is part of the QGROUNDCONTROL project
 #include "terminalconsole.h"
 #include "menuactionhelper.h"
 #include "QGCUASFileViewMulti.h"
-#include "QGCCore.h"
+#include "QGCApplication.h"
 #include "QGCFileDialog.h"
 #include "QGCMessageBox.h"
 

src/ui/QGCBaseParamWidget.cc

@@ -6,7 +6,7 @@
 
 #include "QGCUASParamManagerInterface.h"
 #include "UASInterface.h"
-#include "QGCCore.h"
+#include "QGCApplication.h"
 #include "QGCFileDialog.h"
 
 QGCBaseParamWidget::QGCBaseParamWidget(QWidget *parent) :

src/ui/QGCMAVLinkLogPlayer.cc

@@ -6,7 +6,7 @@
 #include "QGCMAVLinkLogPlayer.h"
 #include "QGC.h"
 #include "ui_QGCMAVLinkLogPlayer.h"
-#include "QGCCore.h"
+#include "QGCApplication.h"
 #include "LinkManager.h"
 #include "QGCFileDialog.h"
 

src/ui/QGCStatusBar.cc

@@ -27,7 +27,7 @@ This file is part of the QGROUNDCONTROL project
 #include "QGCStatusBar.h"
 #include "UASManager.h"
 #include "MainWindow.h"
-#include "QGCCore.h"
+#include "QGCApplication.h"
 
 QGCStatusBar::QGCStatusBar(QWidget *parent) :
     QStatusBar(parent),

src/ui/SettingsDialog.cc

@@ -24,16 +24,16 @@
 #include <QSettings>
 #include <QDesktopWidget>
 
-#include "QGCSettingsWidget.h"
+#include "SettingsDialog.h"
 #include "MainWindow.h"
-#include "ui_QGCSettingsWidget.h"
+#include "ui_SettingsDialog.h"
 
 #include "JoystickWidget.h"
 #include "LinkManager.h"
 #include "MAVLinkProtocol.h"
 #include "MAVLinkSettingsWidget.h"
 #include "GAudioOutput.h"
-#include "QGCCore.h"
+#include "QGCApplication.h"
 #include "QGCFileDialog.h"
 #include "QGCMessageBox.h"