Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
82d69691
Commit
82d69691
authored
Oct 27, 2018
by
Patrick José Pereira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ui: Move to pragma once
Signed-off-by:
Patrick José Pereira
<
patrickelectric@gmail.com
>
parent
a9a570dd
Changes
22
Show whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
31 additions
and
76 deletions
+31
-76
HILDockWidget.h
src/ui/HILDockWidget.h
+2
-4
MAVLinkDecoder.h
src/ui/MAVLinkDecoder.h
+1
-3
MainWindow.h
src/ui/MainWindow.h
+2
-4
MultiVehicleDockWidget.h
src/ui/MultiVehicleDockWidget.h
+2
-4
QGCHilConfiguration.h
src/ui/QGCHilConfiguration.h
+2
-4
QGCHilFlightGearConfiguration.h
src/ui/QGCHilFlightGearConfiguration.h
+1
-3
QGCHilJSBSimConfiguration.h
src/ui/QGCHilJSBSimConfiguration.h
+1
-3
QGCHilXPlaneConfiguration.h
src/ui/QGCHilXPlaneConfiguration.h
+1
-3
QGCMAVLinkInspector.h
src/ui/QGCMAVLinkInspector.h
+1
-3
QGCMAVLinkLogPlayer.h
src/ui/QGCMAVLinkLogPlayer.h
+1
-3
QGCMapRCToParamDialog.h
src/ui/QGCMapRCToParamDialog.h
+2
-4
QGCPluginHost.h
src/ui/QGCPluginHost.h
+1
-3
QGCUASFileView.h
src/ui/QGCUASFileView.h
+2
-4
QGCUASFileViewMulti.h
src/ui/QGCUASFileViewMulti.h
+1
-3
ChartPlot.h
src/ui/linechart/ChartPlot.h
+1
-3
IncrementalPlot.h
src/ui/linechart/IncrementalPlot.h
+2
-4
LinechartPlot.h
src/ui/linechart/LinechartPlot.h
+2
-4
LinechartWidget.h
src/ui/linechart/LinechartWidget.h
+2
-4
Linecharts.h
src/ui/linechart/Linecharts.h
+1
-3
ScrollZoomer.h
src/ui/linechart/ScrollZoomer.h
+1
-3
Scrollbar.h
src/ui/linechart/Scrollbar.h
+1
-4
QGCUnconnectedInfoWidget.h
src/ui/uas/QGCUnconnectedInfoWidget.h
+1
-3
No files found.
src/ui/HILDockWidget.h
View file @
82d69691
/****************************************************************************
/****************************************************************************
*
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
*
* QGroundControl is licensed according to the terms in the file
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
* COPYING.md in the root of the source code directory.
...
@@ -8,8 +8,7 @@
...
@@ -8,8 +8,7 @@
****************************************************************************/
****************************************************************************/
#ifndef HILDockWidget_H
#pragma once
#define HILDockWidget_H
#include "MultiVehicleDockWidget.h"
#include "MultiVehicleDockWidget.h"
...
@@ -26,4 +25,3 @@ protected:
...
@@ -26,4 +25,3 @@ protected:
virtual
QWidget
*
_newVehicleWidget
(
Vehicle
*
vehicle
,
QWidget
*
parent
);
virtual
QWidget
*
_newVehicleWidget
(
Vehicle
*
vehicle
,
QWidget
*
parent
);
};
};
#endif
src/ui/MAVLinkDecoder.h
View file @
82d69691
#ifndef MAVLINKDECODER_H
#pragma once
#define MAVLINKDECODER_H
#include <QObject>
#include <QObject>
#include <QHash>
#include <QHash>
...
@@ -53,4 +52,3 @@ protected:
...
@@ -53,4 +52,3 @@ protected:
QThread
*
creationThread
;
///< QThread on which the object is created
QThread
*
creationThread
;
///< QThread on which the object is created
};
};
#endif // MAVLINKDECODER_H
src/ui/MainWindow.h
View file @
82d69691
/****************************************************************************
/****************************************************************************
*
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
*
* QGroundControl is licensed according to the terms in the file
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
* COPYING.md in the root of the source code directory.
...
@@ -15,8 +15,7 @@
...
@@ -15,8 +15,7 @@
*
*
*/
*/
#ifndef _MAINWINDOW_H_
#pragma once
#define _MAINWINDOW_H_
#ifdef __mobile__
#ifdef __mobile__
#error Should not be include in mobile build
#error Should not be include in mobile build
...
@@ -181,4 +180,3 @@ private:
...
@@ -181,4 +180,3 @@ private:
QString
_getWindowGeometryKey
();
QString
_getWindowGeometryKey
();
};
};
#endif
/* _MAINWINDOW_H_ */
src/ui/MultiVehicleDockWidget.h
View file @
82d69691
/****************************************************************************
/****************************************************************************
*
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
*
* QGroundControl is licensed according to the terms in the file
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
* COPYING.md in the root of the source code directory.
...
@@ -8,8 +8,7 @@
...
@@ -8,8 +8,7 @@
****************************************************************************/
****************************************************************************/
#ifndef MultiVehicleDockWidget_H
#pragma once
#define MultiVehicleDockWidget_H
#include <QMap>
#include <QMap>
...
@@ -51,4 +50,3 @@ private:
...
@@ -51,4 +50,3 @@ private:
Ui
::
MultiVehicleDockWidget
*
_ui
;
Ui
::
MultiVehicleDockWidget
*
_ui
;
};
};
#endif
src/ui/QGCHilConfiguration.h
View file @
82d69691
/****************************************************************************
/****************************************************************************
*
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
*
* QGroundControl is licensed according to the terms in the file
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
* COPYING.md in the root of the source code directory.
...
@@ -8,8 +8,7 @@
...
@@ -8,8 +8,7 @@
****************************************************************************/
****************************************************************************/
#ifndef QGCHILCONFIGURATION_H
#pragma once
#define QGCHILCONFIGURATION_H
#include <QWidget>
#include <QWidget>
...
@@ -41,4 +40,3 @@ private:
...
@@ -41,4 +40,3 @@ private:
Ui
::
QGCHilConfiguration
*
ui
;
Ui
::
QGCHilConfiguration
*
ui
;
};
};
#endif // QGCHILCONFIGURATION_H
src/ui/QGCHilFlightGearConfiguration.h
View file @
82d69691
#ifndef QGCHILFLIGHTGEARCONFIGURATION_H
#pragma once
#define QGCHILFLIGHTGEARCONFIGURATION_H
#include <QWidget>
#include <QWidget>
...
@@ -53,4 +52,3 @@ signals:
...
@@ -53,4 +52,3 @@ signals:
void
barometerOffsetChanged
(
float
barometerOffsetkPa
);
void
barometerOffsetChanged
(
float
barometerOffsetkPa
);
};
};
#endif // QGCHILFLIGHTGEARCONFIGURATION_H
src/ui/QGCHilJSBSimConfiguration.h
View file @
82d69691
#ifndef QGCHILJSBSIMCONFIGURATION_H
#pragma once
#define QGCHILJSBSIMCONFIGURATION_H
#include <QWidget>
#include <QWidget>
...
@@ -29,4 +28,3 @@ private:
...
@@ -29,4 +28,3 @@ private:
Ui
::
QGCHilJSBSimConfiguration
*
ui
;
Ui
::
QGCHilJSBSimConfiguration
*
ui
;
};
};
#endif // QGCHILJSBSIMCONFIGURATION_H
src/ui/QGCHilXPlaneConfiguration.h
View file @
82d69691
#ifndef QGCHILXPLANECONFIGURATION_H
#pragma once
#define QGCHILXPLANECONFIGURATION_H
#include <QWidget>
#include <QWidget>
...
@@ -31,4 +30,3 @@ private:
...
@@ -31,4 +30,3 @@ private:
Ui
::
QGCHilXPlaneConfiguration
*
ui
;
Ui
::
QGCHilXPlaneConfiguration
*
ui
;
};
};
#endif // QGCHILXPLANECONFIGURATION_H
src/ui/QGCMAVLinkInspector.h
View file @
82d69691
#ifndef QGCMAVLINKINSPECTOR_H
#pragma once
#define QGCMAVLINKINSPECTOR_H
#include <QMap>
#include <QMap>
#include <QTimer>
#include <QTimer>
...
@@ -72,4 +71,3 @@ private:
...
@@ -72,4 +71,3 @@ private:
Ui
::
QGCMAVLinkInspector
*
ui
;
Ui
::
QGCMAVLinkInspector
*
ui
;
};
};
#endif // QGCMAVLINKINSPECTOR_H
src/ui/QGCMAVLinkLogPlayer.h
View file @
82d69691
#ifndef QGCMAVLINKLOGPLAYER_H
#pragma once
#define QGCMAVLINKLOGPLAYER_H
#include <QWidget>
#include <QWidget>
#include <QFile>
#include <QFile>
...
@@ -56,4 +55,3 @@ private:
...
@@ -56,4 +55,3 @@ private:
Ui
::
QGCMAVLinkLogPlayer
*
_ui
;
Ui
::
QGCMAVLinkLogPlayer
*
_ui
;
};
};
#endif
src/ui/QGCMapRCToParamDialog.h
View file @
82d69691
/****************************************************************************
/****************************************************************************
*
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
*
* QGroundControl is licensed according to the terms in the file
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
* COPYING.md in the root of the source code directory.
...
@@ -12,8 +12,7 @@
...
@@ -12,8 +12,7 @@
/// @brief Dialog to configure RC to parameter mapping
/// @brief Dialog to configure RC to parameter mapping
/// @author Thomas Gubler <thomasgubler@gmail.com>
/// @author Thomas Gubler <thomasgubler@gmail.com>
#ifndef QGCMAPRCTOPARAMDIALOG_H
#pragma once
#define QGCMAPRCTOPARAMDIALOG_H
#include <QDialog>
#include <QDialog>
#include <QThread>
#include <QThread>
...
@@ -57,4 +56,3 @@ private:
...
@@ -57,4 +56,3 @@ private:
Ui
::
QGCMapRCToParamDialog
*
ui
;
Ui
::
QGCMapRCToParamDialog
*
ui
;
};
};
#endif // QGCMAPRCTOPARAMDIALOG_H
src/ui/QGCPluginHost.h
View file @
82d69691
#ifndef QGCPLUGINHOST_H
#pragma once
#define QGCPLUGINHOST_H
#include <QWidget>
#include <QWidget>
...
@@ -19,4 +18,3 @@ private:
...
@@ -19,4 +18,3 @@ private:
Ui
::
QGCPluginHost
*
ui
;
Ui
::
QGCPluginHost
*
ui
;
};
};
#endif // QGCPLUGINHOST_H
src/ui/QGCUASFileView.h
View file @
82d69691
/****************************************************************************
/****************************************************************************
*
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
*
* QGroundControl is licensed according to the terms in the file
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
* COPYING.md in the root of the source code directory.
...
@@ -8,8 +8,7 @@
...
@@ -8,8 +8,7 @@
****************************************************************************/
****************************************************************************/
#ifndef QGCUASFILEVIEW_H
#pragma once
#define QGCUASFILEVIEW_H
#include <QWidget>
#include <QWidget>
#include <QTreeWidgetItem>
#include <QTreeWidgetItem>
...
@@ -64,4 +63,3 @@ private:
...
@@ -64,4 +63,3 @@ private:
CommandState
_currentCommand
;
///< Current active command
CommandState
_currentCommand
;
///< Current active command
};
};
#endif // QGCUASFILEVIEW_H
src/ui/QGCUASFileViewMulti.h
View file @
82d69691
#ifndef QGCUASFILEVIEWMULTI_H
#pragma once
#define QGCUASFILEVIEWMULTI_H
#include <QMap>
#include <QMap>
...
@@ -33,4 +32,3 @@ private:
...
@@ -33,4 +32,3 @@ private:
Ui
::
QGCUASFileViewMulti
*
ui
;
Ui
::
QGCUASFileViewMulti
*
ui
;
};
};
#endif // QGCUASFILEVIEWMULTI_H
src/ui/linechart/ChartPlot.h
View file @
82d69691
#ifndef CHARTPLOT_H
#pragma once
#define CHARTPLOT_H
#include <qwt_plot.h>
#include <qwt_plot.h>
#include <qwt_plot_grid.h>
#include <qwt_plot_grid.h>
...
@@ -42,4 +41,3 @@ protected:
...
@@ -42,4 +41,3 @@ protected:
float
_gridWidth
;
///< Width of gridlines in pixels
float
_gridWidth
;
///< Width of gridlines in pixels
};
};
#endif // CHARTPLOT_H
src/ui/linechart/IncrementalPlot.h
View file @
82d69691
/****************************************************************************
/****************************************************************************
*
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
*
* QGroundControl is licensed according to the terms in the file
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
* COPYING.md in the root of the source code directory.
...
@@ -15,8 +15,7 @@
...
@@ -15,8 +15,7 @@
*
*
*/
*/
#ifndef INCREMENTALPLOT_H
#pragma once
#define INCREMENTALPLOT_H
#include <QTimer>
#include <QTimer>
#include <qwt_plot.h>
#include <qwt_plot.h>
...
@@ -117,4 +116,3 @@ private:
...
@@ -117,4 +116,3 @@ private:
void
updateStyle
(
QwtPlotCurve
*
curve
);
void
updateStyle
(
QwtPlotCurve
*
curve
);
};
};
#endif
/* INCREMENTALPLOT_H */
src/ui/linechart/LinechartPlot.h
View file @
82d69691
/****************************************************************************
/****************************************************************************
*
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
*
* QGroundControl is licensed according to the terms in the file
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
* COPYING.md in the root of the source code directory.
...
@@ -16,8 +16,7 @@
...
@@ -16,8 +16,7 @@
*
*
*/
*/
#ifndef _LINECHARTPLOT_H_
#pragma once
#define _LINECHARTPLOT_H_
#define QUINT64_MIN Q_UINT64_C(0)
#define QUINT64_MIN Q_UINT64_C(0)
#define QUINT64_MAX Q_UINT64_C(18446744073709551615)
#define QUINT64_MAX Q_UINT64_C(18446744073709551615)
...
@@ -296,4 +295,3 @@ signals:
...
@@ -296,4 +295,3 @@ signals:
void
windowPositionChanged
(
quint64
position
);
void
windowPositionChanged
(
quint64
position
);
};
};
#endif // _LINECHARTPLOT_H_
src/ui/linechart/LinechartWidget.h
View file @
82d69691
/****************************************************************************
/****************************************************************************
*
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
*
* QGroundControl is licensed according to the terms in the file
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
* COPYING.md in the root of the source code directory.
...
@@ -15,8 +15,7 @@
...
@@ -15,8 +15,7 @@
* @author Lorenz Meier <mavteam@student.ethz.ch>
* @author Lorenz Meier <mavteam@student.ethz.ch>
* @author Thomas Gubler <thomasgubler@student.ethz.ch>
* @author Thomas Gubler <thomasgubler@student.ethz.ch>
*/
*/
#ifndef LINECHARTWIDGET_H
#pragma once
#define LINECHARTWIDGET_H
#include <QGridLayout>
#include <QGridLayout>
#include <QWidget>
#include <QWidget>
...
@@ -202,4 +201,3 @@ private:
...
@@ -202,4 +201,3 @@ private:
QTimer
_filterTimer
;
QTimer
_filterTimer
;
};
};
#endif // LINECHARTWIDGET_H
src/ui/linechart/Linecharts.h
View file @
82d69691
#ifndef LINECHARTS_H
#pragma once
#define LINECHARTS_H
#include <QStackedWidget>
#include <QStackedWidget>
#include <QMap>
#include <QMap>
...
@@ -29,4 +28,3 @@ private:
...
@@ -29,4 +28,3 @@ private:
MAVLinkDecoder
*
_mavlinkDecoder
;
MAVLinkDecoder
*
_mavlinkDecoder
;
};
};
#endif // LINECHARTS_H
src/ui/linechart/ScrollZoomer.h
View file @
82d69691
#ifndef _SCROLLZOOMER_H
#pragma once
#define _SCROLLZOOMER_H
#include <qglobal.h>
#include <qglobal.h>
#if QT_VERSION < 0x040000
#if QT_VERSION < 0x040000
...
@@ -73,4 +72,3 @@ private:
...
@@ -73,4 +72,3 @@ private:
bool
d_inZoom
;
bool
d_inZoom
;
};
};
#endif
src/ui/linechart/Scrollbar.h
View file @
82d69691
#ifndef _SCROLLBAR_H
#pragma once
#define _SCROLLBAR_H 1
#include <qscrollbar.h>
#include <qscrollbar.h>
...
@@ -49,5 +48,3 @@ private:
...
@@ -49,5 +48,3 @@ private:
double
d_maxBase
;
double
d_maxBase
;
int
d_baseTicks
;
int
d_baseTicks
;
};
};
#endif
src/ui/uas/QGCUnconnectedInfoWidget.h
View file @
82d69691
#ifndef QGCUNCONNECTEDINFOWIDGET_H
#pragma once
#define QGCUNCONNECTEDINFOWIDGET_H
#include <QWidget>
#include <QWidget>
...
@@ -35,4 +34,3 @@ public slots:
...
@@ -35,4 +34,3 @@ public slots:
void
addLink
();
void
addLink
();
};
};
#endif // QGCUNCONNECTEDINFOWIDGET_H
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