From 68a59a78f0c70d05ec26587603f9010aea732bfe Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 25 Nov 2014 13:29:34 -0800 Subject: [PATCH] File renames --- qgroundcontrol.pro | 10 +++++----- src/QGCApplication.cc | 2 +- src/comm/MAVLinkProtocol.cc | 2 +- src/main.cc | 2 +- src/ui/MainWindow.cc | 4 ++-- src/ui/QGCBaseParamWidget.cc | 2 +- src/ui/QGCMAVLinkLogPlayer.cc | 2 +- src/ui/QGCStatusBar.cc | 2 +- src/ui/SettingsDialog.cc | 6 +++--- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 80e5ab79c..57c765c64 100644 --- a/qgroundcontrol.pro +++ b/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 \ diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 047f75e85..0f6201b22 100644 --- a/src/QGCApplication.cc +++ b/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" diff --git a/src/comm/MAVLinkProtocol.cc b/src/comm/MAVLinkProtocol.cc index 34f556a04..778225c4f 100644 --- a/src/comm/MAVLinkProtocol.cc +++ b/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) diff --git a/src/main.cc b/src/main.cc index 428c2950d..9f49afae6 100644 --- a/src/main.cc +++ b/src/main.cc @@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project #include #include -#include "QGCCore.h" +#include "QGCApplication.h" #include "MainWindow.h" #include "configuration.h" #include "SerialLink.h" diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index c6405d5a4..54a6ed6ca 100644 --- a/src/ui/MainWindow.cc +++ b/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" diff --git a/src/ui/QGCBaseParamWidget.cc b/src/ui/QGCBaseParamWidget.cc index 8af84d341..eda71c278 100644 --- a/src/ui/QGCBaseParamWidget.cc +++ b/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) : diff --git a/src/ui/QGCMAVLinkLogPlayer.cc b/src/ui/QGCMAVLinkLogPlayer.cc index 46ff76005..30e46fbd6 100644 --- a/src/ui/QGCMAVLinkLogPlayer.cc +++ b/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" diff --git a/src/ui/QGCStatusBar.cc b/src/ui/QGCStatusBar.cc index 9f771b53d..b61513077 100644 --- a/src/ui/QGCStatusBar.cc +++ b/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), diff --git a/src/ui/SettingsDialog.cc b/src/ui/SettingsDialog.cc index 7c8e6c209..27fbfed86 100644 --- a/src/ui/SettingsDialog.cc +++ b/src/ui/SettingsDialog.cc @@ -24,16 +24,16 @@ #include #include -#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" -- 2.22.0