Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
62d22100
Commit
62d22100
authored
Jun 30, 2014
by
Bryant Mairs
Browse files
Renamed configuration.h to QGCConfig.h to avoid issues with opmapcontrol's configuration.h
parent
3a01d185
Changes
11
Hide whitespace changes
Inline
Side-by-side
qgroundcontrol.pro
View file @
62d22100
...
...
@@ -406,7 +406,7 @@ HEADERS += \
src
/
ui
/
linechart
/
LinechartPlot
.
h
\
src
/
ui
/
linechart
/
Scrollbar
.
h
\
src
/
ui
/
linechart
/
ScrollZoomer
.
h
\
src
/
c
onfig
uration
.
h
\
src
/
QGCC
onfig
.
h
\
src
/
ui
/
uas
/
UASView
.
h
\
src
/
ui
/
CameraView
.
h
\
src
/
comm
/
MAVLinkSimulationLink
.
h
\
...
...
src/QGC.h
View file @
62d22100
...
...
@@ -28,7 +28,7 @@
#include <QColor>
#include <QThread>
#include "
c
onfig
uration
.h"
#include "
QGCC
onfig.h"
/* Windows fixes */
...
...
src/
c
onfig
uration
.h
→
src/
QGCC
onfig.h
View file @
62d22100
File moved
src/comm/OpalLink.h
View file @
62d22100
...
...
@@ -44,7 +44,7 @@ This file is part of the QGROUNDCONTROL project
#include "LinkManager.h"
#include "MG.h"
#include "QGCMAVLink.h"
#include "
c
onfig
uration
.h"
#include "
QGCC
onfig.h"
#include "OpalRT.h"
#include "ParameterList.h"
#include "Parameter.h"
...
...
src/comm/QGCFlightGearLink.h
View file @
62d22100
...
...
@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
#include <QTimer>
#include <QProcess>
#include <LinkInterface.h>
#include
<configuration
.h
>
#include
"QGCConfig
.h
"
#include "UASInterface.h"
#include "QGCHilLink.h"
#include <QGCHilFlightGearConfiguration.h>
...
...
src/comm/QGCJSBSimLink.h
View file @
62d22100
...
...
@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
#include <QTimer>
#include <QProcess>
#include <LinkInterface.h>
#include
<configuration
.h
>
#include
"QGCConfig
.h
"
#include "UASInterface.h"
#include "QGCHilLink.h"
...
...
src/comm/QGCXPlaneLink.h
View file @
62d22100
...
...
@@ -39,7 +39,7 @@ This file is part of the QGROUNDCONTROL project
#include <QTimer>
#include <QProcess>
#include <LinkInterface.h>
#include
<configuration
.h
>
#include
"QGCConfig
.h
"
#include "UASInterface.h"
#include "QGCHilLink.h"
...
...
src/comm/SerialLink.h
View file @
62d22100
...
...
@@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project
#include <QThread>
#include <QMutex>
#include <QString>
#include
<configuration
.h
>
#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
c
onfig
uration
.h
static
const
int
poll_interval
=
SERIAL_POLL_INTERVAL
;
///< Polling interval, defined in
QGCC
onfig.h
/** @brief Get a list of the currently available ports */
QList
<
QString
>
getCurrentPorts
();
...
...
src/comm/TCPLink.h
View file @
62d22100
...
...
@@ -35,7 +35,7 @@
#include <QMutex>
#include <QHostAddress>
#include <LinkInterface.h>
#include
<configuration
.h
>
#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
...
...
src/comm/UDPLink.h
View file @
62d22100
...
...
@@ -37,7 +37,7 @@ This file is part of the QGROUNDCONTROL project
#include <QMutex>
#include <QUdpSocket>
#include <LinkInterface.h>
#include
<configuration
.h
>
#include
"QGCConfig
.h
"
class
UDPLink
:
public
LinkInterface
{
...
...
src/ui/configuration/terminalconsole.cpp
View file @
62d22100
...
...
@@ -37,7 +37,7 @@ This file is part of the APM_PLANNER project
#include "terminalconsole.h"
#include "ui_terminalconsole.h"
#include "console.h"
#include "
c
onfig
uration
.h"
#include "
QGCC
onfig.h"
#include <QDebug>
#include <QSettings>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment