From 62d221006a8bc94937aac6fe98703dc620d13683 Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Mon, 30 Jun 2014 22:42:33 -0700 Subject: [PATCH] Renamed configuration.h to QGCConfig.h to avoid issues with opmapcontrol's configuration.h --- qgroundcontrol.pro | 2 +- src/QGC.h | 2 +- src/QGCConfig.h | 25 +++++++++++++++++++++++++ src/comm/OpalLink.h | 2 +- src/comm/QGCFlightGearLink.h | 2 +- src/comm/QGCJSBSimLink.h | 2 +- src/comm/QGCXPlaneLink.h | 2 +- src/comm/SerialLink.h | 4 ++-- src/comm/TCPLink.h | 2 +- src/comm/UDPLink.h | 2 +- src/configuration.h | 25 ------------------------- src/ui/configuration/terminalconsole.cpp | 2 +- 12 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 src/QGCConfig.h delete mode 100644 src/configuration.h diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 712a2c8..08adbff 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -406,7 +406,7 @@ HEADERS += \ src/ui/linechart/LinechartPlot.h \ src/ui/linechart/Scrollbar.h \ src/ui/linechart/ScrollZoomer.h \ - src/configuration.h \ + src/QGCConfig.h \ src/ui/uas/UASView.h \ src/ui/CameraView.h \ src/comm/MAVLinkSimulationLink.h \ diff --git a/src/QGC.h b/src/QGC.h index c0a548a..6c822c1 100644 --- a/src/QGC.h +++ b/src/QGC.h @@ -28,7 +28,7 @@ #include #include -#include "configuration.h" +#include "QGCConfig.h" /* Windows fixes */ diff --git a/src/QGCConfig.h b/src/QGCConfig.h new file mode 100644 index 0000000..bbfa865 --- /dev/null +++ b/src/QGCConfig.h @@ -0,0 +1,25 @@ +#ifndef QGC_CONFIGURATION_H +#define QGC_CONFIGURATION_H + +#include + +/** @brief Polling interval in ms */ +#define SERIAL_POLL_INTERVAL 4 + +/** @brief Heartbeat emission rate, in Hertz (times per second) */ +#define MAVLINK_HEARTBEAT_DEFAULT_RATE 1 +#define WITH_TEXT_TO_SPEECH 1 + +#define QGC_APPLICATION_NAME "QGroundControl" +#define QGC_APPLICATION_VERSION "v. 2.0.3 (beta)" + +namespace QGC + +{ +const QString APPNAME = "QGROUNDCONTROL"; +const QString ORG_NAME = "QGROUNDCONTROL.ORG"; //can be customized by forks to e.g. mycompany.com to maintain separate Settings for customized apps +const QString ORG_DOMAIN = "org.qgroundcontrol";//can be customized by forks +const int APPLICATIONVERSION = 203; // 2.0.3 +} + +#endif // QGC_CONFIGURATION_H diff --git a/src/comm/OpalLink.h b/src/comm/OpalLink.h index 6a67f0a..e9edbdb 100644 --- a/src/comm/OpalLink.h +++ b/src/comm/OpalLink.h @@ -44,7 +44,7 @@ This file is part of the QGROUNDCONTROL project #include "LinkManager.h" #include "MG.h" #include "QGCMAVLink.h" -#include "configuration.h" +#include "QGCConfig.h" #include "OpalRT.h" #include "ParameterList.h" #include "Parameter.h" diff --git a/src/comm/QGCFlightGearLink.h b/src/comm/QGCFlightGearLink.h index a86de73..39890ff 100644 --- a/src/comm/QGCFlightGearLink.h +++ b/src/comm/QGCFlightGearLink.h @@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project #include #include #include -#include +#include "QGCConfig.h" #include "UASInterface.h" #include "QGCHilLink.h" #include diff --git a/src/comm/QGCJSBSimLink.h b/src/comm/QGCJSBSimLink.h index b4825da..bb293cd 100644 --- a/src/comm/QGCJSBSimLink.h +++ b/src/comm/QGCJSBSimLink.h @@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project #include #include #include -#include +#include "QGCConfig.h" #include "UASInterface.h" #include "QGCHilLink.h" diff --git a/src/comm/QGCXPlaneLink.h b/src/comm/QGCXPlaneLink.h index ae44974..a95c891 100644 --- a/src/comm/QGCXPlaneLink.h +++ b/src/comm/QGCXPlaneLink.h @@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project #include #include #include -#include +#include "QGCConfig.h" #include "UASInterface.h" #include "QGCHilLink.h" diff --git a/src/comm/SerialLink.h b/src/comm/SerialLink.h index 0534417..5e96b71 100644 --- a/src/comm/SerialLink.h +++ b/src/comm/SerialLink.h @@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project #include #include #include -#include +#include "QGCConfig.h" #include "SerialLinkInterface.h" // We use QSerialPort::SerialPortError in a signal so we must declare it as a meta type @@ -67,7 +67,7 @@ public: int stopBits=1); ~SerialLink(); - static const int poll_interval = SERIAL_POLL_INTERVAL; ///< Polling interval, defined in configuration.h + static const int poll_interval = SERIAL_POLL_INTERVAL; ///< Polling interval, defined in QGCConfig.h /** @brief Get a list of the currently available ports */ QList getCurrentPorts(); diff --git a/src/comm/TCPLink.h b/src/comm/TCPLink.h index 9a7888c..f97db7f 100644 --- a/src/comm/TCPLink.h +++ b/src/comm/TCPLink.h @@ -35,7 +35,7 @@ #include #include #include -#include +#include "QGCConfig.h" // Even though QAbstractSocket::SocketError is used in a signal by Qt, Qt doesn't declare it as a meta type. // This in turn causes debug output to be kicked out about not being able to queue the signal. We declare it diff --git a/src/comm/UDPLink.h b/src/comm/UDPLink.h index a2e4f0e..00cf920 100644 --- a/src/comm/UDPLink.h +++ b/src/comm/UDPLink.h @@ -37,7 +37,7 @@ This file is part of the QGROUNDCONTROL project #include #include #include -#include +#include "QGCConfig.h" class UDPLink : public LinkInterface { diff --git a/src/configuration.h b/src/configuration.h deleted file mode 100644 index bbfa865..0000000 --- a/src/configuration.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef QGC_CONFIGURATION_H -#define QGC_CONFIGURATION_H - -#include - -/** @brief Polling interval in ms */ -#define SERIAL_POLL_INTERVAL 4 - -/** @brief Heartbeat emission rate, in Hertz (times per second) */ -#define MAVLINK_HEARTBEAT_DEFAULT_RATE 1 -#define WITH_TEXT_TO_SPEECH 1 - -#define QGC_APPLICATION_NAME "QGroundControl" -#define QGC_APPLICATION_VERSION "v. 2.0.3 (beta)" - -namespace QGC - -{ -const QString APPNAME = "QGROUNDCONTROL"; -const QString ORG_NAME = "QGROUNDCONTROL.ORG"; //can be customized by forks to e.g. mycompany.com to maintain separate Settings for customized apps -const QString ORG_DOMAIN = "org.qgroundcontrol";//can be customized by forks -const int APPLICATIONVERSION = 203; // 2.0.3 -} - -#endif // QGC_CONFIGURATION_H diff --git a/src/ui/configuration/terminalconsole.cpp b/src/ui/configuration/terminalconsole.cpp index 86df9e4..72e929f 100644 --- a/src/ui/configuration/terminalconsole.cpp +++ b/src/ui/configuration/terminalconsole.cpp @@ -37,7 +37,7 @@ This file is part of the APM_PLANNER project #include "terminalconsole.h" #include "ui_terminalconsole.h" #include "console.h" -#include "configuration.h" +#include "QGCConfig.h" #include #include