diff --git a/src/ui/HILDockWidget.h b/src/ui/HILDockWidget.h index d2d14e3a72db9ab893cb278866e2d543a4b06583..5e75bb3c5f970fecbf836af5380d95c3c5b20b16 100644 --- a/src/ui/HILDockWidget.h +++ b/src/ui/HILDockWidget.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * (c) 2009-2016 QGROUNDCONTROL PROJECT + * (c) 2009-2018 QGROUNDCONTROL PROJECT * * QGroundControl is licensed according to the terms in the file * COPYING.md in the root of the source code directory. @@ -8,8 +8,7 @@ ****************************************************************************/ -#ifndef HILDockWidget_H -#define HILDockWidget_H +#pragma once #include "MultiVehicleDockWidget.h" @@ -26,4 +25,3 @@ protected: virtual QWidget* _newVehicleWidget(Vehicle* vehicle, QWidget* parent); }; -#endif diff --git a/src/ui/MAVLinkDecoder.h b/src/ui/MAVLinkDecoder.h index 9f715bace9ef7fe24d30f2aa4f6eb56b1358bb3c..50df5e105b258ef48ea5841e0d54d28034bd3a94 100644 --- a/src/ui/MAVLinkDecoder.h +++ b/src/ui/MAVLinkDecoder.h @@ -1,5 +1,4 @@ -#ifndef MAVLINKDECODER_H -#define MAVLINKDECODER_H +#pragma once #include #include @@ -53,4 +52,3 @@ protected: QThread* creationThread; ///< QThread on which the object is created }; -#endif // MAVLINKDECODER_H diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index 40ffafb45b6381948a4d09b0476a8c9ebd889608..98c2897b152562396bfa4dde5c994a4084b769cf 100644 --- a/src/ui/MainWindow.h +++ b/src/ui/MainWindow.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * (c) 2009-2016 QGROUNDCONTROL PROJECT + * (c) 2009-2018 QGROUNDCONTROL PROJECT * * QGroundControl is licensed according to the terms in the file * COPYING.md in the root of the source code directory. @@ -15,8 +15,7 @@ * */ -#ifndef _MAINWINDOW_H_ -#define _MAINWINDOW_H_ +#pragma once #ifdef __mobile__ #error Should not be include in mobile build @@ -181,4 +180,3 @@ private: QString _getWindowGeometryKey(); }; -#endif /* _MAINWINDOW_H_ */ diff --git a/src/ui/MultiVehicleDockWidget.h b/src/ui/MultiVehicleDockWidget.h index d22a6c06bab6a16caf19f4ee1da952f5cc356c2e..12557b10312121ed2a39cb937982a2e71faefceb 100644 --- a/src/ui/MultiVehicleDockWidget.h +++ b/src/ui/MultiVehicleDockWidget.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * (c) 2009-2016 QGROUNDCONTROL PROJECT + * (c) 2009-2018 QGROUNDCONTROL PROJECT * * QGroundControl is licensed according to the terms in the file * COPYING.md in the root of the source code directory. @@ -8,8 +8,7 @@ ****************************************************************************/ -#ifndef MultiVehicleDockWidget_H -#define MultiVehicleDockWidget_H +#pragma once #include @@ -51,4 +50,3 @@ private: Ui::MultiVehicleDockWidget* _ui; }; -#endif diff --git a/src/ui/QGCHilConfiguration.h b/src/ui/QGCHilConfiguration.h index ffcb2f440e2c41f9ccb6724d68f9f99030527355..331fef97d1b22b5c1b641fa1f3bec5a3bf927f1b 100644 --- a/src/ui/QGCHilConfiguration.h +++ b/src/ui/QGCHilConfiguration.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * (c) 2009-2016 QGROUNDCONTROL PROJECT + * (c) 2009-2018 QGROUNDCONTROL PROJECT * * QGroundControl is licensed according to the terms in the file * COPYING.md in the root of the source code directory. @@ -8,8 +8,7 @@ ****************************************************************************/ -#ifndef QGCHILCONFIGURATION_H -#define QGCHILCONFIGURATION_H +#pragma once #include @@ -41,4 +40,3 @@ private: Ui::QGCHilConfiguration *ui; }; -#endif // QGCHILCONFIGURATION_H diff --git a/src/ui/QGCHilFlightGearConfiguration.h b/src/ui/QGCHilFlightGearConfiguration.h index 6ebd999b6f3383c8ee8c817865dd490536d4906e..e69176fe7242c811ce1865bd3b946102f4af1387 100644 --- a/src/ui/QGCHilFlightGearConfiguration.h +++ b/src/ui/QGCHilFlightGearConfiguration.h @@ -1,5 +1,4 @@ -#ifndef QGCHILFLIGHTGEARCONFIGURATION_H -#define QGCHILFLIGHTGEARCONFIGURATION_H +#pragma once #include @@ -53,4 +52,3 @@ signals: void barometerOffsetChanged(float barometerOffsetkPa); }; -#endif // QGCHILFLIGHTGEARCONFIGURATION_H diff --git a/src/ui/QGCHilJSBSimConfiguration.h b/src/ui/QGCHilJSBSimConfiguration.h index b03bdf4a0f16fa0251f058c8499918292a42edcb..99ce61b261b32df914f6579ecb8adc944f4ea7b3 100644 --- a/src/ui/QGCHilJSBSimConfiguration.h +++ b/src/ui/QGCHilJSBSimConfiguration.h @@ -1,5 +1,4 @@ -#ifndef QGCHILJSBSIMCONFIGURATION_H -#define QGCHILJSBSIMCONFIGURATION_H +#pragma once #include @@ -29,4 +28,3 @@ private: Ui::QGCHilJSBSimConfiguration *ui; }; -#endif // QGCHILJSBSIMCONFIGURATION_H diff --git a/src/ui/QGCHilXPlaneConfiguration.h b/src/ui/QGCHilXPlaneConfiguration.h index e03e232d8630606abc9a2380f78e7bd9c74ae55d..082625188fb3f934aefb6c224ac9c24be08d5f5d 100644 --- a/src/ui/QGCHilXPlaneConfiguration.h +++ b/src/ui/QGCHilXPlaneConfiguration.h @@ -1,5 +1,4 @@ -#ifndef QGCHILXPLANECONFIGURATION_H -#define QGCHILXPLANECONFIGURATION_H +#pragma once #include @@ -31,4 +30,3 @@ private: Ui::QGCHilXPlaneConfiguration *ui; }; -#endif // QGCHILXPLANECONFIGURATION_H diff --git a/src/ui/QGCMAVLinkInspector.h b/src/ui/QGCMAVLinkInspector.h index cd5084d6699bb368edd21ecfef060fb97967526e..3953beab033a8fe083c64d9536e5dacdcfc045d9 100644 --- a/src/ui/QGCMAVLinkInspector.h +++ b/src/ui/QGCMAVLinkInspector.h @@ -1,5 +1,4 @@ -#ifndef QGCMAVLINKINSPECTOR_H -#define QGCMAVLINKINSPECTOR_H +#pragma once #include #include @@ -72,4 +71,3 @@ private: Ui::QGCMAVLinkInspector *ui; }; -#endif // QGCMAVLINKINSPECTOR_H diff --git a/src/ui/QGCMAVLinkLogPlayer.h b/src/ui/QGCMAVLinkLogPlayer.h index f83d268347b3a765d180372caa99d411f13a81f2..dfa80e254cfc4e8242574a28eabd84114916bf47 100644 --- a/src/ui/QGCMAVLinkLogPlayer.h +++ b/src/ui/QGCMAVLinkLogPlayer.h @@ -1,5 +1,4 @@ -#ifndef QGCMAVLINKLOGPLAYER_H -#define QGCMAVLINKLOGPLAYER_H +#pragma once #include #include @@ -56,4 +55,3 @@ private: Ui::QGCMAVLinkLogPlayer* _ui; }; -#endif diff --git a/src/ui/QGCMapRCToParamDialog.h b/src/ui/QGCMapRCToParamDialog.h index 723849402c40b4eaa8a08b53f4bb2f629c1ac57d..56a46bc3d2641add668032bb81c0ecf2c42dd83e 100644 --- a/src/ui/QGCMapRCToParamDialog.h +++ b/src/ui/QGCMapRCToParamDialog.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * (c) 2009-2016 QGROUNDCONTROL PROJECT + * (c) 2009-2018 QGROUNDCONTROL PROJECT * * QGroundControl is licensed according to the terms in the file * COPYING.md in the root of the source code directory. @@ -12,8 +12,7 @@ /// @brief Dialog to configure RC to parameter mapping /// @author Thomas Gubler -#ifndef QGCMAPRCTOPARAMDIALOG_H -#define QGCMAPRCTOPARAMDIALOG_H +#pragma once #include #include @@ -57,4 +56,3 @@ private: Ui::QGCMapRCToParamDialog* ui; }; -#endif // QGCMAPRCTOPARAMDIALOG_H diff --git a/src/ui/QGCPluginHost.h b/src/ui/QGCPluginHost.h index fe78e6cad085fe7716c524460878fd048db3468b..c732d6b348646bd2bf8976c62fcd266a0efadc26 100644 --- a/src/ui/QGCPluginHost.h +++ b/src/ui/QGCPluginHost.h @@ -1,5 +1,4 @@ -#ifndef QGCPLUGINHOST_H -#define QGCPLUGINHOST_H +#pragma once #include @@ -19,4 +18,3 @@ private: Ui::QGCPluginHost *ui; }; -#endif // QGCPLUGINHOST_H diff --git a/src/ui/QGCUASFileView.h b/src/ui/QGCUASFileView.h index a7740056a44e67421c2e07c37ebd586af635c9bb..86e74dfdf94cfc1b0b1f7ef618f33ebc46362783 100644 --- a/src/ui/QGCUASFileView.h +++ b/src/ui/QGCUASFileView.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * (c) 2009-2016 QGROUNDCONTROL PROJECT + * (c) 2009-2018 QGROUNDCONTROL PROJECT * * QGroundControl is licensed according to the terms in the file * COPYING.md in the root of the source code directory. @@ -8,8 +8,7 @@ ****************************************************************************/ -#ifndef QGCUASFILEVIEW_H -#define QGCUASFILEVIEW_H +#pragma once #include #include @@ -64,4 +63,3 @@ private: CommandState _currentCommand; ///< Current active command }; -#endif // QGCUASFILEVIEW_H diff --git a/src/ui/QGCUASFileViewMulti.h b/src/ui/QGCUASFileViewMulti.h index eedc93695cc389a34b4b3d5d68168196f07eb765..69c05e115751e6d846b9952ea01920b12e3c4e37 100644 --- a/src/ui/QGCUASFileViewMulti.h +++ b/src/ui/QGCUASFileViewMulti.h @@ -1,5 +1,4 @@ -#ifndef QGCUASFILEVIEWMULTI_H -#define QGCUASFILEVIEWMULTI_H +#pragma once #include @@ -33,4 +32,3 @@ private: Ui::QGCUASFileViewMulti *ui; }; -#endif // QGCUASFILEVIEWMULTI_H diff --git a/src/ui/linechart/ChartPlot.h b/src/ui/linechart/ChartPlot.h index 1a6a5b52a3ee90a515995bf91e96e51c6903391a..51a7892bbdc9ff3730c7f7208ba35ebf57921dd7 100644 --- a/src/ui/linechart/ChartPlot.h +++ b/src/ui/linechart/ChartPlot.h @@ -1,5 +1,4 @@ -#ifndef CHARTPLOT_H -#define CHARTPLOT_H +#pragma once #include #include @@ -42,4 +41,3 @@ protected: float _gridWidth; ///< Width of gridlines in pixels }; -#endif // CHARTPLOT_H diff --git a/src/ui/linechart/IncrementalPlot.h b/src/ui/linechart/IncrementalPlot.h index 75133766de6feb44dfd770ff9adcab391b521b37..422641df3c4cb38b56d31c1a1389fb3a84d21c00 100644 --- a/src/ui/linechart/IncrementalPlot.h +++ b/src/ui/linechart/IncrementalPlot.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * (c) 2009-2016 QGROUNDCONTROL PROJECT + * (c) 2009-2018 QGROUNDCONTROL PROJECT * * QGroundControl is licensed according to the terms in the file * COPYING.md in the root of the source code directory. @@ -15,8 +15,7 @@ * */ -#ifndef INCREMENTALPLOT_H -#define INCREMENTALPLOT_H +#pragma once #include #include @@ -117,4 +116,3 @@ private: void updateStyle(QwtPlotCurve *curve); }; -#endif /* INCREMENTALPLOT_H */ diff --git a/src/ui/linechart/LinechartPlot.h b/src/ui/linechart/LinechartPlot.h index 2d6e38e9f02b58b129386692aa892c0fffc7dcc9..2a21e531b99f4c29b547234f6747f953687537c4 100644 --- a/src/ui/linechart/LinechartPlot.h +++ b/src/ui/linechart/LinechartPlot.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * (c) 2009-2016 QGROUNDCONTROL PROJECT + * (c) 2009-2018 QGROUNDCONTROL PROJECT * * QGroundControl is licensed according to the terms in the file * COPYING.md in the root of the source code directory. @@ -16,8 +16,7 @@ * */ -#ifndef _LINECHARTPLOT_H_ -#define _LINECHARTPLOT_H_ +#pragma once #define QUINT64_MIN Q_UINT64_C(0) #define QUINT64_MAX Q_UINT64_C(18446744073709551615) @@ -296,4 +295,3 @@ signals: void windowPositionChanged(quint64 position); }; -#endif // _LINECHARTPLOT_H_ diff --git a/src/ui/linechart/LinechartWidget.h b/src/ui/linechart/LinechartWidget.h index 99e61caea759f85661275a653542562db1f85970..1fdd63ab4aa5c70f25cd0f6277a58e2fa0bc8dfc 100644 --- a/src/ui/linechart/LinechartWidget.h +++ b/src/ui/linechart/LinechartWidget.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * (c) 2009-2016 QGROUNDCONTROL PROJECT + * (c) 2009-2018 QGROUNDCONTROL PROJECT * * QGroundControl is licensed according to the terms in the file * COPYING.md in the root of the source code directory. @@ -15,8 +15,7 @@ * @author Lorenz Meier * @author Thomas Gubler */ -#ifndef LINECHARTWIDGET_H -#define LINECHARTWIDGET_H +#pragma once #include #include @@ -202,4 +201,3 @@ private: QTimer _filterTimer; }; -#endif // LINECHARTWIDGET_H diff --git a/src/ui/linechart/Linecharts.h b/src/ui/linechart/Linecharts.h index 198667118c8191832412ee710d5e0876ca6064d6..c50fe546014bf8565da58002727adb891946c05a 100644 --- a/src/ui/linechart/Linecharts.h +++ b/src/ui/linechart/Linecharts.h @@ -1,5 +1,4 @@ -#ifndef LINECHARTS_H -#define LINECHARTS_H +#pragma once #include #include @@ -29,4 +28,3 @@ private: MAVLinkDecoder* _mavlinkDecoder; }; -#endif // LINECHARTS_H diff --git a/src/ui/linechart/ScrollZoomer.h b/src/ui/linechart/ScrollZoomer.h index fbbbe18f26c9e254cc371a13952353097237afa2..c89ebe79de8de1d226603158790d9513f7785966 100644 --- a/src/ui/linechart/ScrollZoomer.h +++ b/src/ui/linechart/ScrollZoomer.h @@ -1,5 +1,4 @@ -#ifndef _SCROLLZOOMER_H -#define _SCROLLZOOMER_H +#pragma once #include #if QT_VERSION < 0x040000 @@ -73,4 +72,3 @@ private: bool d_inZoom; }; -#endif diff --git a/src/ui/linechart/Scrollbar.h b/src/ui/linechart/Scrollbar.h index 0587dd0fccfa7c9e3dd53c356e3f6771cfcac4d6..7466014cb315e3762a8e33369981d6b354489db0 100644 --- a/src/ui/linechart/Scrollbar.h +++ b/src/ui/linechart/Scrollbar.h @@ -1,5 +1,4 @@ -#ifndef _SCROLLBAR_H -#define _SCROLLBAR_H 1 +#pragma once #include @@ -49,5 +48,3 @@ private: double d_maxBase; int d_baseTicks; }; - -#endif diff --git a/src/ui/uas/QGCUnconnectedInfoWidget.h b/src/ui/uas/QGCUnconnectedInfoWidget.h index 60a522f06bc4d6b5a1d98f2929f0b82660297c53..a38943f04311efe018bfb5cc56eac9709765a4ba 100644 --- a/src/ui/uas/QGCUnconnectedInfoWidget.h +++ b/src/ui/uas/QGCUnconnectedInfoWidget.h @@ -1,5 +1,4 @@ -#ifndef QGCUNCONNECTEDINFOWIDGET_H -#define QGCUNCONNECTEDINFOWIDGET_H +#pragma once #include @@ -35,4 +34,3 @@ public slots: void addLink(); }; -#endif // QGCUNCONNECTEDINFOWIDGET_H