diff --git a/src/VideoStreaming/VideoItem.h b/src/VideoStreaming/VideoItem.h index 861ce6dc96cd20eb3236b9effd7169f03c44a9bd..eeb1caa670107471f08bb2d6b52f56a8731b9f17 100644 --- a/src/VideoStreaming/VideoItem.h +++ b/src/VideoStreaming/VideoItem.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. @@ -14,8 +14,7 @@ * @author Gus Grubba */ -#ifndef VIDEO_ITEM_H -#define VIDEO_ITEM_H +#pragma once #include #include "VideoSurface.h" @@ -46,4 +45,3 @@ private: #endif }; -#endif // VIDEO_ITEM_H diff --git a/src/VideoStreaming/VideoReceiver.h b/src/VideoStreaming/VideoReceiver.h index edecf8502ba3fe1b71a72b19d4d50ae791c7f690..ea2c502046e379901c8b502b742aa6b09920e12a 100644 --- a/src/VideoStreaming/VideoReceiver.h +++ b/src/VideoStreaming/VideoReceiver.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. @@ -14,8 +14,7 @@ * @author Gus Grubba */ -#ifndef VIDEORECEIVER_H -#define VIDEORECEIVER_H +#pragma once #include "QGCLoggingCategory.h" #include @@ -150,4 +149,3 @@ protected: VideoSettings* _videoSettings; }; -#endif // VIDEORECEIVER_H diff --git a/src/VideoStreaming/VideoStreaming.h b/src/VideoStreaming/VideoStreaming.h index f918f6ed86af6b8a18192b7537187471fdc7d651..129c4816b7621fddc08489cdb298836a66499d42 100644 --- a/src/VideoStreaming/VideoStreaming.h +++ b/src/VideoStreaming/VideoStreaming.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. @@ -14,10 +14,8 @@ * @author Gus Grubba */ -#ifndef VIDEO_STREAMING_H -#define VIDEO_STREAMING_H +#pragma once extern void initializeVideoStreaming (int &argc, char *argv[], char* filename, char* debuglevel); extern void shutdownVideoStreaming (); -#endif // VIDEO_STREAMING_H diff --git a/src/VideoStreaming/VideoSurface.h b/src/VideoStreaming/VideoSurface.h index 1f84e7966442ad53c0a63ccda8ee7c56b6b65949..1737d164d393eb0659077f37930069e92d58e790 100644 --- a/src/VideoStreaming/VideoSurface.h +++ b/src/VideoStreaming/VideoSurface.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. @@ -14,8 +14,7 @@ * @author Gus Grubba */ -#ifndef VIDEO_SURFACE_H -#define VIDEO_SURFACE_H +#pragma once #include @@ -62,4 +61,3 @@ private: Q_DECLARE_METATYPE(VideoSurface*) -#endif // VIDEO_SURFACE_H diff --git a/src/VideoStreaming/VideoSurface_p.h b/src/VideoStreaming/VideoSurface_p.h index 5fd2ae1f22aaa7f3b35d9dc8b1b72203e30e8c84..0d401089f07ad992c2de9cd8205340fc53fab7f0 100644 --- a/src/VideoStreaming/VideoSurface_p.h +++ b/src/VideoStreaming/VideoSurface_p.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. @@ -14,8 +14,7 @@ * @author Gus Grubba */ -#ifndef VIDEO_SURFACE_P_H -#define VIDEO_SURFACE_P_H +#pragma once #include "VideoSurface.h" #include "VideoItem.h" @@ -31,4 +30,3 @@ public: GstElement* videoSink; }; -#endif // VIDEO_SURFACE_P_H diff --git a/src/VideoStreaming/gstqtvideosink/delegates/basedelegate.h b/src/VideoStreaming/gstqtvideosink/delegates/basedelegate.h index c1662860a36e42fc25dc4d320974ac087fdee70f..f48e713df98155dbaa8f1e73547c2106123b6952 100644 --- a/src/VideoStreaming/gstqtvideosink/delegates/basedelegate.h +++ b/src/VideoStreaming/gstqtvideosink/delegates/basedelegate.h @@ -21,8 +21,7 @@ * @author Gus Grubba */ -#ifndef BASEDELEGATE_H -#define BASEDELEGATE_H +#pragma once #include @@ -152,4 +151,3 @@ protected: GstElement * const m_sink; }; -#endif // BASEDELEGATE_H diff --git a/src/VideoStreaming/gstqtvideosink/delegates/qtquick2videosinkdelegate.h b/src/VideoStreaming/gstqtvideosink/delegates/qtquick2videosinkdelegate.h index f7f892f1f01b8b3c20d2f453c825db6a8b6c8bf8..be8338716ce73462b2d80a35bc69d469af07c612 100644 --- a/src/VideoStreaming/gstqtvideosink/delegates/qtquick2videosinkdelegate.h +++ b/src/VideoStreaming/gstqtvideosink/delegates/qtquick2videosinkdelegate.h @@ -20,8 +20,7 @@ * @author Gus Grubba */ -#ifndef QTQUICK2VIDEOSINKDELEGATE_H -#define QTQUICK2VIDEOSINKDELEGATE_H +#pragma once #include "basedelegate.h" #include @@ -35,4 +34,3 @@ public: QSGNode *updateNode(QSGNode *node, const QRectF & targetArea); }; -#endif // QTQUICK2VIDEOSINKDELEGATE_H diff --git a/src/VideoStreaming/gstqtvideosink/delegates/qtvideosinkdelegate.h b/src/VideoStreaming/gstqtvideosink/delegates/qtvideosinkdelegate.h index 538988451ddc5bc58e7bc9409fa5e1344eda07b0..50bb1a82d038a4f28ed9e34ac5d8ec1473b8e7ef 100644 --- a/src/VideoStreaming/gstqtvideosink/delegates/qtvideosinkdelegate.h +++ b/src/VideoStreaming/gstqtvideosink/delegates/qtvideosinkdelegate.h @@ -21,8 +21,7 @@ * @author Gus Grubba */ -#ifndef QT_VIDEO_SINK_DELEGATE_H -#define QT_VIDEO_SINK_DELEGATE_H +#pragma once #include "basedelegate.h" #include "../painters/abstractsurfacepainter.h" @@ -72,4 +71,3 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QtVideoSinkDelegate::PainterTypes) -#endif // QT_VIDEO_SINK_DELEGATE_H diff --git a/src/VideoStreaming/gstqtvideosink/delegates/qwidgetvideosinkdelegate.h b/src/VideoStreaming/gstqtvideosink/delegates/qwidgetvideosinkdelegate.h index 373bf3c9b8e0f58af0ec63c8f0dd3d06bfc889e7..a492726ab23e43d202a840178a97e035f022b226 100644 --- a/src/VideoStreaming/gstqtvideosink/delegates/qwidgetvideosinkdelegate.h +++ b/src/VideoStreaming/gstqtvideosink/delegates/qwidgetvideosinkdelegate.h @@ -22,8 +22,7 @@ * @author Gus Grubba */ -#ifndef QWIDGET_VIDEO_SINK_DELEGATE_H -#define QWIDGET_VIDEO_SINK_DELEGATE_H +#pragma once #include "qtvideosinkdelegate.h" #include @@ -53,4 +52,3 @@ private: bool m_opaquePaintEventAttribute; }; -#endif // QWIDGET_VIDEO_SINK_DELEGATE_H diff --git a/src/VideoStreaming/gstqtvideosink/gstqtglvideosink.h b/src/VideoStreaming/gstqtvideosink/gstqtglvideosink.h index 7d7e859b34d439055cef5b6276d95c56941b7762..f08552417481f14cd1c24227f6a900bf8b3f8b45 100644 --- a/src/VideoStreaming/gstqtvideosink/gstqtglvideosink.h +++ b/src/VideoStreaming/gstqtvideosink/gstqtglvideosink.h @@ -21,8 +21,7 @@ * @author Gus Grubba */ -#ifndef GST_QT_GL_VIDEO_SINK_H -#define GST_QT_GL_VIDEO_SINK_H +#pragma once #include "gstqtglvideosinkbase.h" @@ -75,4 +74,3 @@ struct GstQtGLVideoSinkClass }; #endif // GST_QT_VIDEO_SINK_NO_OPENGL -#endif // GST_QT_GL_VIDEO_SINK_H diff --git a/src/VideoStreaming/gstqtvideosink/gstqtglvideosinkbase.h b/src/VideoStreaming/gstqtvideosink/gstqtglvideosinkbase.h index 26ad69bf74df2662834c49c5d0161033121f3225..a49001423a449617356c443e3c5bdb64b21db381 100644 --- a/src/VideoStreaming/gstqtvideosink/gstqtglvideosinkbase.h +++ b/src/VideoStreaming/gstqtvideosink/gstqtglvideosinkbase.h @@ -21,8 +21,7 @@ * @author Gus Grubba */ -#ifndef GST_QT_GL_VIDEO_SINK_BASE_H -#define GST_QT_GL_VIDEO_SINK_BASE_H +#pragma once #include "gstqtvideosinkbase.h" #include @@ -97,4 +96,3 @@ struct GstQtGLVideoSinkBaseClass }; #endif // GST_QT_VIDEO_SINK_NO_OPENGL -#endif // GST_QT_GL_VIDEO_SINK_BASE_H diff --git a/src/VideoStreaming/gstqtvideosink/gstqtquick2videosink.h b/src/VideoStreaming/gstqtvideosink/gstqtquick2videosink.h index 2fedfa8c9c6571cf42a0b8ffecdfd7c53aeb3023..eaba1ff3e80b7ffef97e191d1382c394f2f305ed 100644 --- a/src/VideoStreaming/gstqtvideosink/gstqtquick2videosink.h +++ b/src/VideoStreaming/gstqtvideosink/gstqtquick2videosink.h @@ -21,8 +21,7 @@ * @author Gus Grubba */ -#ifndef __GST_QT_QUICK2_VIDEO_SINK_H__ -#define __GST_QT_QUICK2_VIDEO_SINK_H__ +#pragma once #include #include @@ -60,4 +59,3 @@ struct _GstQtQuick2VideoSinkClass GType gst_qt_quick2_video_sink_get_type (void); -#endif /* __GST_QT_QUICK2_VIDEO_SINK_H__ */ diff --git a/src/VideoStreaming/gstqtvideosink/gstqtvideosink.h b/src/VideoStreaming/gstqtvideosink/gstqtvideosink.h index 46e90f9c39b7b831e5c49e3e40b57cf9133155fb..99fd11d4f58f72f30a6ad6d2eed38be9e807dea5 100644 --- a/src/VideoStreaming/gstqtvideosink/gstqtvideosink.h +++ b/src/VideoStreaming/gstqtvideosink/gstqtvideosink.h @@ -21,8 +21,7 @@ * @author Gus Grubba */ -#ifndef GST_QT_VIDEO_SINK_H -#define GST_QT_VIDEO_SINK_H +#pragma once #include "gstqtvideosinkbase.h" @@ -64,4 +63,3 @@ struct GstQtVideoSinkClass qreal x, qreal y, qreal width, qreal height); }; -#endif diff --git a/src/VideoStreaming/gstqtvideosink/gstqtvideosinkbase.h b/src/VideoStreaming/gstqtvideosink/gstqtvideosinkbase.h index 3806c64dbb91389d420380a2a6f139f0211f8ec5..d5662bf2609becb2c0bececb858ee88a2c421c6d 100644 --- a/src/VideoStreaming/gstqtvideosink/gstqtvideosinkbase.h +++ b/src/VideoStreaming/gstqtvideosink/gstqtvideosinkbase.h @@ -21,8 +21,7 @@ * @author Gus Grubba */ -#ifndef GST_QT_VIDEO_SINK_BASE_H -#define GST_QT_VIDEO_SINK_BASE_H +#pragma once #include "gstqtvideosinkplugin.h" #include @@ -81,4 +80,3 @@ struct GstQtVideoSinkBaseClass GstVideoSinkClass parent_class; }; -#endif diff --git a/src/VideoStreaming/gstqtvideosink/gstqtvideosinkmarshal.h b/src/VideoStreaming/gstqtvideosink/gstqtvideosinkmarshal.h index a906bf04e88f19f4ead25417f4df8a9cfbe1cac3..fadef06174311273da4148794024b5b41e86c518 100644 --- a/src/VideoStreaming/gstqtvideosink/gstqtvideosinkmarshal.h +++ b/src/VideoStreaming/gstqtvideosink/gstqtvideosinkmarshal.h @@ -1,6 +1,5 @@ -#ifndef __g_cclosure_user_marshal_MARSHAL_H__ -#define __g_cclosure_user_marshal_MARSHAL_H__ +#pragma once #include @@ -40,5 +39,4 @@ extern void g_cclosure_user_marshal_POINTER__POINTER_DOUBLE_DOUBLE_DOUBLE_DOUBLE G_END_DECLS -#endif /* __g_cclosure_user_marshal_MARSHAL_H__ */ diff --git a/src/VideoStreaming/gstqtvideosink/gstqtvideosinkplugin.h b/src/VideoStreaming/gstqtvideosink/gstqtvideosinkplugin.h index 170942bb340b5899553dbf0d323f4610598c1efe..448744cfd40aa118bbae0c14e83a213376a0fb71 100644 --- a/src/VideoStreaming/gstqtvideosink/gstqtvideosinkplugin.h +++ b/src/VideoStreaming/gstqtvideosink/gstqtvideosinkplugin.h @@ -21,8 +21,7 @@ * @author Gus Grubba */ -#ifndef GST_QT_VIDEO_SINK_PLUGIN_H -#define GST_QT_VIDEO_SINK_PLUGIN_H +#pragma once #include #include @@ -74,4 +73,3 @@ inline bool qRealIsDouble() { return sizeof(qreal) == sizeof(double); } #define G_TYPE_QREAL qRealIsDouble() ? G_TYPE_DOUBLE : G_TYPE_FLOAT -#endif diff --git a/src/VideoStreaming/gstqtvideosink/gstqwidgetvideosink.h b/src/VideoStreaming/gstqtvideosink/gstqwidgetvideosink.h index 2b9e04530bea9a0ac3c0f9e515f3743aad8a0b4a..867d4536337cb39db89d072c07cdcf983b713790 100644 --- a/src/VideoStreaming/gstqtvideosink/gstqwidgetvideosink.h +++ b/src/VideoStreaming/gstqtvideosink/gstqwidgetvideosink.h @@ -22,8 +22,7 @@ * @author Gus Grubba */ -#ifndef GST_QWIDGET_VIDEO_SINK_H -#define GST_QWIDGET_VIDEO_SINK_H +#pragma once #include "gstqtvideosinkbase.h" @@ -58,4 +57,3 @@ struct GstQWidgetVideoSinkClass GstQtVideoSinkBaseClass parent_class; }; -#endif diff --git a/src/VideoStreaming/gstqtvideosink/painters/abstractsurfacepainter.h b/src/VideoStreaming/gstqtvideosink/painters/abstractsurfacepainter.h index e4b32e171e1cd4371e3494c4631675c6c9b988c4..48e5c06dae742d55552c0d1f3dddde21f3d59621 100644 --- a/src/VideoStreaming/gstqtvideosink/painters/abstractsurfacepainter.h +++ b/src/VideoStreaming/gstqtvideosink/painters/abstractsurfacepainter.h @@ -21,8 +21,7 @@ * @author Gus Grubba */ -#ifndef ABSTRACTSURFACEPAINTER_H -#define ABSTRACTSURFACEPAINTER_H +#pragma once #include "../utils/bufferformat.h" #include @@ -46,4 +45,3 @@ public: virtual void updateColors(int brightness, int contrast, int hue, int saturation) = 0; }; -#endif diff --git a/src/VideoStreaming/gstqtvideosink/painters/genericsurfacepainter.h b/src/VideoStreaming/gstqtvideosink/painters/genericsurfacepainter.h index 8a05b6bf22648dddac89ba1f3d6ece106e4d97a1..cfd49361bdd79d7756c7b91122e2564dfbc46a6b 100644 --- a/src/VideoStreaming/gstqtvideosink/painters/genericsurfacepainter.h +++ b/src/VideoStreaming/gstqtvideosink/painters/genericsurfacepainter.h @@ -21,8 +21,7 @@ * @author Gus Grubba */ -#ifndef GENERICSURFACEPAINTER_H -#define GENERICSURFACEPAINTER_H +#pragma once #include "abstractsurfacepainter.h" #include @@ -55,4 +54,3 @@ private: QImage::Format m_imageFormat; }; -#endif // GENERICSURFACEPAINTER_H diff --git a/src/VideoStreaming/gstqtvideosink/painters/openglsurfacepainter.h b/src/VideoStreaming/gstqtvideosink/painters/openglsurfacepainter.h index 2b60ca5ba2e0e2a3d340f34c8e806d497aed9d55..d3d1cb1f812bc5c102d120591d0716f76a213a35 100644 --- a/src/VideoStreaming/gstqtvideosink/painters/openglsurfacepainter.h +++ b/src/VideoStreaming/gstqtvideosink/painters/openglsurfacepainter.h @@ -21,8 +21,7 @@ * @author Gus Grubba */ -#ifndef OPENGLSURFACEPAINTER_H -#define OPENGLSURFACEPAINTER_H +#pragma once #ifndef GST_QT_VIDEO_SINK_NO_OPENGL @@ -138,5 +137,3 @@ private: }; #endif // GST_QT_VIDEO_SINK_NO_OPENGL - -#endif // OPENGLSURFACEPAINTER_H diff --git a/src/VideoStreaming/gstqtvideosink/painters/videomaterial.h b/src/VideoStreaming/gstqtvideosink/painters/videomaterial.h index ff42565013d9ff00c2a25c99429a4ff89e7e2036..f7b6e9a2c31307704a6b5905bd901d8561a335c2 100644 --- a/src/VideoStreaming/gstqtvideosink/painters/videomaterial.h +++ b/src/VideoStreaming/gstqtvideosink/painters/videomaterial.h @@ -22,8 +22,7 @@ * @author Gus Grubba */ -#ifndef VIDEOMATERIAL_H -#define VIDEOMATERIAL_H +#pragma once #include "../utils/bufferformat.h" #include @@ -80,4 +79,3 @@ private: friend class VideoMaterialShader; }; -#endif // VIDEOMATERIAL_H diff --git a/src/VideoStreaming/gstqtvideosink/painters/videonode.h b/src/VideoStreaming/gstqtvideosink/painters/videonode.h index 55cb478fd2d38371c5f865582c38eebc6591557b..58d9840334bbcafe0037993cd6dc8809ca96ef91 100644 --- a/src/VideoStreaming/gstqtvideosink/painters/videonode.h +++ b/src/VideoStreaming/gstqtvideosink/painters/videonode.h @@ -22,8 +22,7 @@ * @author Gus Grubba */ -#ifndef VIDEONODE_H -#define VIDEONODE_H +#pragma once #include "../utils/bufferformat.h" @@ -53,4 +52,3 @@ private: MaterialType m_materialType; }; -#endif // VIDEONODE_H diff --git a/src/VideoStreaming/gstqtvideosink/utils/bufferformat.h b/src/VideoStreaming/gstqtvideosink/utils/bufferformat.h index 44ba953bfc773b0999f521fd3b84cee9524a9643..1172beb28add35425c2ff94e84cee96e758886de 100644 --- a/src/VideoStreaming/gstqtvideosink/utils/bufferformat.h +++ b/src/VideoStreaming/gstqtvideosink/utils/bufferformat.h @@ -14,8 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef BUFFERFORMAT_H -#define BUFFERFORMAT_H +#pragma once #include "utils.h" #include @@ -67,4 +66,3 @@ Q_DECLARE_METATYPE(GstVideoFormat) Q_DECLARE_METATYPE(GstVideoColorMatrix) Q_DECLARE_METATYPE(BufferFormat) -#endif // BUFFERFORMAT_H diff --git a/src/VideoStreaming/gstqtvideosink/utils/glutils.h b/src/VideoStreaming/gstqtvideosink/utils/glutils.h index eb0d7834b9c8eb45d69f95bc6e04f5aad6a4c2e9..1ef0ea0cc38b441648fd1d2e1e525bd50b15ef5b 100644 --- a/src/VideoStreaming/gstqtvideosink/utils/glutils.h +++ b/src/VideoStreaming/gstqtvideosink/utils/glutils.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. @@ -14,8 +14,7 @@ * @author Gus Grubba */ -#ifndef GLUTILS_H -#define GLUTILS_H +#pragma once #if defined(__mobile__) && !defined(Q_OS_MAC) #include @@ -34,5 +33,3 @@ #define getQOpenGLFunctions() QOpenGLContext::currentContext()->versionFunctions() #define QOpenGLFunctionsDef QOpenGLFunctions_2_0 #endif - -#endif diff --git a/src/VideoStreaming/gstqtvideosink/utils/utils.h b/src/VideoStreaming/gstqtvideosink/utils/utils.h index f1528e6a3972b053ffb3f8454f17601c38b4c225..79517a1212144f42710cf5defbc136d9fe36a8c8 100644 --- a/src/VideoStreaming/gstqtvideosink/utils/utils.h +++ b/src/VideoStreaming/gstqtvideosink/utils/utils.h @@ -13,8 +13,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#ifndef UTILS_H -#define UTILS_H +#pragma once #include #include @@ -75,4 +74,3 @@ struct PaintAreas Q_DECLARE_METATYPE(Fraction) Q_DECLARE_METATYPE(PaintAreas) -#endif diff --git a/src/ViewWidgets/CustomCommandWidget.h b/src/ViewWidgets/CustomCommandWidget.h index 0ae481084addc916196f41432720bc106ba6eafb..27626ad67788bb0c6a80bd2e444d64e1fe238347 100644 --- a/src/ViewWidgets/CustomCommandWidget.h +++ b/src/ViewWidgets/CustomCommandWidget.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. @@ -11,8 +11,7 @@ /// @file /// @author Don Gagne -#ifndef CustomCommandWidget_H -#define CustomCommandWidget_H +#pragma once #include "QGCQmlWidgetHolder.h" @@ -24,4 +23,3 @@ public: CustomCommandWidget(const QString& title, QAction* action, QWidget *parent = 0); }; -#endif diff --git a/src/ViewWidgets/CustomCommandWidgetController.h b/src/ViewWidgets/CustomCommandWidgetController.h index c507c70c155137878d2444b69e98f9c2dd2d3c0b..afcbdb8b072e979fb435b6fb06e639e48ba5e08a 100644 --- a/src/ViewWidgets/CustomCommandWidgetController.h +++ b/src/ViewWidgets/CustomCommandWidgetController.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 CustomCommandWidgetController_H -#define CustomCommandWidgetController_H +#pragma once #include @@ -38,4 +37,3 @@ private: static const char* _settingsKey; }; -#endif diff --git a/src/ViewWidgets/ViewWidgetController.h b/src/ViewWidgets/ViewWidgetController.h index 332123713d90224f0b3885920402226690f855a5..5c5c4cc7a175ae085f6865f0d02706dd3a7e53c0 100644 --- a/src/ViewWidgets/ViewWidgetController.h +++ b/src/ViewWidgets/ViewWidgetController.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 VIEWWIDGETCONTROLLER_H -#define VIEWWIDGETCONTROLLER_H +#pragma once #include @@ -38,4 +37,3 @@ private: UASInterface* _uas; }; -#endif \ No newline at end of file diff --git a/src/comm/BluetoothLink.h b/src/comm/BluetoothLink.h index b3407a3fd74a72d155f5601fce65392b72097a62..6503afee1e5cb41d502bd71a8bec00757e2a08cd 100644 --- a/src/comm/BluetoothLink.h +++ b/src/comm/BluetoothLink.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 BTLINK_H -#define BTLINK_H +#pragma once #include #include @@ -194,4 +193,3 @@ private: }; -#endif // BTLINK_H diff --git a/src/comm/CallConv.h b/src/comm/CallConv.h index 6c13955cf42c75340822aba1910537368bc282b9..52f292895edbd8cb7ea9d8c635f13f4972a0a445 100644 --- a/src/comm/CallConv.h +++ b/src/comm/CallConv.h @@ -1,11 +1,8 @@ -#ifndef _CALLCONV_H_ -#define _CALLCONV_H_ +#pragma once #ifdef Q_OS_WIN #define CALLTYPEXBEE __stdcall #else // Q_OS_WIN #define CALLTYPEXBEE -#endif // Q_OS_WIN -#endif // _CALLCONV_H_ \ No newline at end of file diff --git a/src/comm/LinkConfiguration.h b/src/comm/LinkConfiguration.h index e4027313b498f80a58ad0137afcfc0e3d5cd10e1..68227be0dadc54a2fd9a2db4e17b1e40c1f5eb3d 100644 --- a/src/comm/LinkConfiguration.h +++ b/src/comm/LinkConfiguration.h @@ -1,14 +1,13 @@ /**************************************************************************** * - * (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. * ****************************************************************************/ -#ifndef LINKCONFIGURATION_H -#define LINKCONFIGURATION_H +#pragma once #include @@ -208,4 +207,3 @@ private: typedef QSharedPointer SharedLinkConfigurationPointer; -#endif // LINKCONFIGURATION_H diff --git a/src/comm/LinkInterface.h b/src/comm/LinkInterface.h index 58b8a27d5544477fac71b383012732df9a2a2a64..36c01fb72f6edefb2c9d6a2074428959bc28cb61 100644 --- a/src/comm/LinkInterface.h +++ b/src/comm/LinkInterface.h @@ -1,14 +1,13 @@ /**************************************************************************** * - * (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. * ****************************************************************************/ -#ifndef _LINKINTERFACE_H_ -#define _LINKINTERFACE_H_ +#pragma once #include #include @@ -308,4 +307,3 @@ private: typedef QSharedPointer SharedLinkInterfacePointer; -#endif // _LINKINTERFACE_H_ diff --git a/src/comm/LinkManager.h b/src/comm/LinkManager.h index 83474b6ba90d39dcf1c79dab6a5bb79571223aec..7aeb62e9b8cde6b8edc44017023688d64c567ead 100644 --- a/src/comm/LinkManager.h +++ b/src/comm/LinkManager.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. @@ -11,8 +11,7 @@ /// @file /// @author Lorenz Meier -#ifndef _LINKMANAGER_H_ -#define _LINKMANAGER_H_ +#pragma once #include #include @@ -244,4 +243,3 @@ private: #endif }; -#endif diff --git a/src/comm/LogReplayLink.h b/src/comm/LogReplayLink.h index 1ae85d5c9ea878ac55d7df99cb53e709f4ef791a..c28f55b66a8c7aa703343477f509c60d62305f81 100644 --- a/src/comm/LogReplayLink.h +++ b/src/comm/LogReplayLink.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 LogReplayLink_H -#define LogReplayLink_H +#pragma once #include "LinkInterface.h" #include "LinkConfiguration.h" @@ -155,4 +154,3 @@ private: static const int cbTimestamp = sizeof(quint64); }; -#endif diff --git a/src/comm/MAVLinkProtocol.h b/src/comm/MAVLinkProtocol.h index cd2a30568511b0aaa31ded882cdc7c0224e549b3..b2ec5589b00a36f1b51a809fe1aa7a49faf9f4c0 100644 --- a/src/comm/MAVLinkProtocol.h +++ b/src/comm/MAVLinkProtocol.h @@ -1,14 +1,13 @@ /**************************************************************************** * - * (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. * ****************************************************************************/ -#ifndef MAVLINKPROTOCOL_H_ -#define MAVLINKPROTOCOL_H_ +#pragma once #include #include @@ -171,4 +170,3 @@ private: MultiVehicleManager* _multiVehicleManager; }; -#endif // MAVLINKPROTOCOL_H_ diff --git a/src/comm/MavlinkMessagesTimer.h b/src/comm/MavlinkMessagesTimer.h index 0e4010d3b4dd2d4d24b497e1e2b91086aa9cd336..850e2f7d128850cd110499d96d45acebdcd7234d 100644 --- a/src/comm/MavlinkMessagesTimer.h +++ b/src/comm/MavlinkMessagesTimer.h @@ -7,8 +7,7 @@ * ****************************************************************************/ -#ifndef _MAVLINKMESSAGESTIMER_H_ -#define _MAVLINKMESSAGESTIMER_H_ +#pragma once #include #include @@ -103,4 +102,3 @@ private: static const int _messageReceivedTimeoutMSecs = 3500; // Signal connection lost after 3.5 seconds of no messages }; -#endif // _MAVLINKMESSAGESTIMER_H_ diff --git a/src/comm/MockLink.h b/src/comm/MockLink.h index 105839a0d2a761874f336ddee07bb1f7b394b070..4c6de83084bc4897bb9e2f688504714f60633dcb 100644 --- a/src/comm/MockLink.h +++ b/src/comm/MockLink.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 MOCKLINK_H -#define MOCKLINK_H +#pragma once #include #include @@ -259,4 +258,3 @@ private: static const char* _failParam; }; -#endif diff --git a/src/comm/MockLinkFileServer.h b/src/comm/MockLinkFileServer.h index 81e77e6618dc50084dc47528393c333e28f7d277..7b3084e279011bd783063e8219b624ddf37089e1 100644 --- a/src/comm/MockLinkFileServer.h +++ b/src/comm/MockLinkFileServer.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. @@ -11,8 +11,7 @@ /// @file /// @author Don Gagne -#ifndef MockLinkFileServer_H -#define MockLinkFileServer_H +#pragma once #include "FileManager.h" @@ -110,4 +109,3 @@ private: bool _randomDropsEnabled; }; -#endif diff --git a/src/comm/MockLinkMissionItemHandler.h b/src/comm/MockLinkMissionItemHandler.h index bc40a68dabe916fcb5fbe377d2af70daf2bbff56..b25f22e014bc760a3189e9f2225ff7c120b1e80d 100644 --- a/src/comm/MockLinkMissionItemHandler.h +++ b/src/comm/MockLinkMissionItemHandler.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 MockLinkMissionItemHandler_H -#define MockLinkMissionItemHandler_H +#pragma once #include #include @@ -115,4 +114,3 @@ private: bool _failWriteMissionCountFirstResponse; }; -#endif diff --git a/src/comm/QGCFlightGearLink.h b/src/comm/QGCFlightGearLink.h index 6545119575aa722d4ff59c3450651f53f44fdcf1..e9c94aa1bdd2340657689be2181fdbe8b7c763cb 100644 --- a/src/comm/QGCFlightGearLink.h +++ b/src/comm/QGCFlightGearLink.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 QGCFLIGHTGEARLINK_H -#define QGCFLIGHTGEARLINK_H +#pragma once #include #include @@ -160,4 +159,3 @@ private: float barometerOffsetkPa; }; -#endif // QGCFLIGHTGEARLINK_H diff --git a/src/comm/QGCHilLink.h b/src/comm/QGCHilLink.h index 9ac69813a53d465683bfacd366bb465915a603f3..3d1ead78b36d1ae38bcfc2c90bc4fb7a7ff9c1ac 100644 --- a/src/comm/QGCHilLink.h +++ b/src/comm/QGCHilLink.h @@ -1,5 +1,4 @@ -#ifndef QGCHILLINK_H -#define QGCHILLINK_H +#pragma once #include #include @@ -148,4 +147,3 @@ signals: void _invokeWriteBytes(QByteArray); }; -#endif // QGCHILLINK_H diff --git a/src/comm/QGCJSBSimLink.h b/src/comm/QGCJSBSimLink.h index 0cf65f8079e2c08cf22a64112f0fe8e42a6f3026..336eb979302d378246a121e28cd97f5a1491eaa5 100644 --- a/src/comm/QGCJSBSimLink.h +++ b/src/comm/QGCJSBSimLink.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 QGCJSBSIMLINK_H -#define QGCJSBSIMLINK_H +#pragma once #include #include @@ -147,4 +146,3 @@ private: void setName(QString name); }; -#endif // QGCJSBSimLink_H diff --git a/src/comm/QGCMAVLink.h b/src/comm/QGCMAVLink.h index 5b656c2218cbcc3ddeb20439c806351f098d6fe2..6c3ed82f582cdec51c28b396859ecaaf0eec632c 100644 --- a/src/comm/QGCMAVLink.h +++ b/src/comm/QGCMAVLink.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. @@ -14,8 +14,7 @@ * @author Lorenz Meier */ -#ifndef QGCMAVLINK_H -#define QGCMAVLINK_H +#pragma once #define MAVLINK_USE_MESSAGE_INFO #define MAVLINK_EXTERNAL_RX_STATUS // Single m_mavlink_status instance is in QGCApplication.cc @@ -33,5 +32,4 @@ public: static bool isVTOL(MAV_TYPE mavType); }; -#endif // QGCMAVLINK_H diff --git a/src/comm/QGCSerialPortInfo.h b/src/comm/QGCSerialPortInfo.h index 6937ac728f314fa78e8022ec72600e9e03436dd2..85d78ec68235f1a4e5467090b18c148a5347f1d9 100644 --- a/src/comm/QGCSerialPortInfo.h +++ b/src/comm/QGCSerialPortInfo.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 QGCSerialPortInfo_H -#define QGCSerialPortInfo_H +#pragma once #ifdef __android__ #include "qserialportinfo.h" @@ -91,4 +90,3 @@ private: static QList _boardFallbackList; }; -#endif diff --git a/src/comm/QGCXPlaneLink.h b/src/comm/QGCXPlaneLink.h index e6f9222107cd92a49bd94eae31fdfdde706c8a9f..466f187ba950ee0bf14c68aad3ed44a5e0960088 100644 --- a/src/comm/QGCXPlaneLink.h +++ b/src/comm/QGCXPlaneLink.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 QGCXPLANESIMULATIONLINK_H -#define QGCXPLANESIMULATIONLINK_H +#pragma once #include #include @@ -235,4 +234,3 @@ protected: void sendDataRef(QString ref, float value); }; -#endif // QGCXPLANESIMULATIONLINK_H diff --git a/src/comm/SerialInterface.h b/src/comm/SerialInterface.h index afecc2b4a39d94de054684bc5ce12c740866f7f7..5fcef72ec3cb10de88ae8c91dca1bb0529f0701f 100644 --- a/src/comm/SerialInterface.h +++ b/src/comm/SerialInterface.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 SERIALINTERFACE_H -#define SERIALINTERFACE_H +#pragma once #include #include @@ -201,6 +200,5 @@ public: } }; -#endif // SERIALINTERFACE_H // vim:ts=4:sw=4:tw=78:expandtab: diff --git a/src/comm/SerialLink.h b/src/comm/SerialLink.h index 82fe598d8cc5667839e1d134a95e7abca0440878..47f502063af6d4dc4024ad85d1c4cdb79fe8ac3e 100644 --- a/src/comm/SerialLink.h +++ b/src/comm/SerialLink.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 SERIALLINK_H -#define SERIALLINK_H +#pragma once class LinkInterface; class SerialConfiguration; @@ -194,4 +193,3 @@ signals: }; -#endif // SERIALLINK_H diff --git a/src/comm/TCPLink.h b/src/comm/TCPLink.h index 907af9cbc5dfe0aa2ee6d479a114b066ce97826f..35a3c22c8a47b7222041764ce86ff83a5d0b03d5 100644 --- a/src/comm/TCPLink.h +++ b/src/comm/TCPLink.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. @@ -13,8 +13,7 @@ /// /// @author Don Gagne -#ifndef TCPLINK_H -#define TCPLINK_H +#pragma once #include #include @@ -188,4 +187,3 @@ private: QMutex _statisticsMutex; }; -#endif // TCPLINK_H diff --git a/src/comm/UDPLink.h b/src/comm/UDPLink.h index e88782e04c884fcca9c2746bad1972f2b7eb4da8..1f76b9e2698e7deb9017da9ff3d4ca1df6dca26f 100644 --- a/src/comm/UDPLink.h +++ b/src/comm/UDPLink.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 UDPLINK_H -#define UDPLINK_H +#pragma once #include #include @@ -204,4 +203,3 @@ private: }; -#endif // UDPLINK_H diff --git a/src/qgcunittest/FileDialogTest.h b/src/qgcunittest/FileDialogTest.h index 673ef04a8eff0eabdabfa8535aaa8eb9dcafd1d0..e9f3a3eaf14f211291c14db79cb2ea0a7a84c2e7 100644 --- a/src/qgcunittest/FileDialogTest.h +++ b/src/qgcunittest/FileDialogTest.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. @@ -13,8 +13,7 @@ /// /// @author Don Gagne -#ifndef FILEDIALOGTEST_H -#define FILEDIALOGTEST_H +#pragma once #include "UnitTest.h" @@ -33,4 +32,3 @@ private slots: void _fileDialogExpectedIncorrect_test(void); }; -#endif diff --git a/src/qgcunittest/FileManagerTest.h b/src/qgcunittest/FileManagerTest.h index 50ab8af903f90c9da4d3bcb3ab8b4926604d754b..d27700cfea20d2c773993cfd175d018f5a0c1765 100644 --- a/src/qgcunittest/FileManagerTest.h +++ b/src/qgcunittest/FileManagerTest.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 FileManagerTEST_H -#define FileManagerTEST_H +#pragma once #include #include @@ -77,4 +76,3 @@ private: QStringList _fileListReceived; }; -#endif diff --git a/src/qgcunittest/FlightGearTest.h b/src/qgcunittest/FlightGearTest.h index 814dd37b586111580cd8fbc0374208e923e17668..8ad9aa5004cc124d8412c416dbf81bbe4a34f39b 100644 --- a/src/qgcunittest/FlightGearTest.h +++ b/src/qgcunittest/FlightGearTest.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 FLIGHTGEARTEST_H -#define FLIGHTGEARTEST_H +#pragma once #include "UnitTest.h" #include "TCPLink.h" @@ -31,4 +30,3 @@ private slots: void _parseUIArguments_test(void); }; -#endif diff --git a/src/qgcunittest/GeoTest.h b/src/qgcunittest/GeoTest.h index 7e57c3c58a58993f4ca725d087348be1ea4126bf..0ddcf6020fb6d1bec54d4daefdda2e1f8cdcbd65 100644 --- a/src/qgcunittest/GeoTest.h +++ b/src/qgcunittest/GeoTest.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. @@ -13,8 +13,7 @@ /// /// @author David Goodman -#ifndef GEOTEST_H -#define GEOTEST_H +#pragma once #include @@ -38,4 +37,3 @@ private: QGeoCoordinate _origin; }; -#endif // GEOTEST_H diff --git a/src/qgcunittest/LinkManagerTest.h b/src/qgcunittest/LinkManagerTest.h index 274c5506fd07c8c1f5341ddad19ed000736cf83d..9dba48bfe2a053a02f2c24f72c039c4bed7c9e22 100644 --- a/src/qgcunittest/LinkManagerTest.h +++ b/src/qgcunittest/LinkManagerTest.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 LINKMANAGERTEST_H -#define LINKMANAGERTEST_H +#pragma once #include "UnitTest.h" #include "LinkManager.h" @@ -54,4 +53,3 @@ private: const char* _rgSignals[_cSignals]; }; -#endif diff --git a/src/qgcunittest/MainWindowTest.h b/src/qgcunittest/MainWindowTest.h index 3f91c544158742832008d0966355ac176f71b356..cbfba663cebb631c5a8df4602b0f8fc068043a54 100644 --- a/src/qgcunittest/MainWindowTest.h +++ b/src/qgcunittest/MainWindowTest.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. @@ -13,8 +13,7 @@ /// /// @author Don Gagne -#ifndef MAINWINDOWTEST_H -#define MAINWINDOWTEST_H +#pragma once #include "UnitTest.h" #include "MainWindow.h" @@ -31,4 +30,3 @@ private: void _connectWindowClose_test(MAV_AUTOPILOT autopilot); }; -#endif diff --git a/src/qgcunittest/MavlinkLogTest.h b/src/qgcunittest/MavlinkLogTest.h index e10c94ef58259725dcef7a9cdff970ed4d51f863..e32dca36d3742b35b85db054b092b5550bfa1f3d 100644 --- a/src/qgcunittest/MavlinkLogTest.h +++ b/src/qgcunittest/MavlinkLogTest.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. @@ -13,8 +13,7 @@ /// /// @author Don Gagne -#ifndef MAVLINKLOGTEST_H -#define MAVLINKLOGTEST_H +#pragma once #include "UnitTest.h" @@ -48,4 +47,3 @@ private: static const char* _saveLogFilename; ///< Filename to save log files to }; -#endif diff --git a/src/qgcunittest/MessageBoxTest.h b/src/qgcunittest/MessageBoxTest.h index f9e4642f7514bdab0d2bfb198a82aeba458c1177..5567fb8f9b68caa006230de0a55bdad7c9a8a3a8 100644 --- a/src/qgcunittest/MessageBoxTest.h +++ b/src/qgcunittest/MessageBoxTest.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. @@ -13,8 +13,7 @@ /// /// @author Don Gagne -#ifndef MESSAGEBOXTEST_H -#define MESSAGEBOXTEST_H +#pragma once #include "UnitTest.h" @@ -33,4 +32,3 @@ private slots: void _badResponseButton_test(void); }; -#endif diff --git a/src/qgcunittest/MultiSignalSpy.h b/src/qgcunittest/MultiSignalSpy.h index 151c5ed0a134ed4db66e6fe9e83d3dea4fef9d76..c077c5c77aed035d3b8e64726432077359e1536d 100644 --- a/src/qgcunittest/MultiSignalSpy.h +++ b/src/qgcunittest/MultiSignalSpy.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 MULTISIGNALSPY_H -#define MULTISIGNALSPY_H +#pragma once #include #include @@ -80,4 +79,3 @@ private: bool _timeout; }; -#endif diff --git a/src/qgcunittest/RadioConfigTest.h b/src/qgcunittest/RadioConfigTest.h index 7791d097cfaf864a518a94101a9698e9efb97b69..d5f24296b547f9b207768fbb5b94a8e9cd122ada 100644 --- a/src/qgcunittest/RadioConfigTest.h +++ b/src/qgcunittest/RadioConfigTest.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 RadioConfigTest_H -#define RadioConfigTest_H +#pragma once #include "UnitTest.h" #include "MockLink.h" @@ -116,4 +115,3 @@ private: RadioComponentController* _controller; }; -#endif diff --git a/src/qgcunittest/TCPLinkTest.h b/src/qgcunittest/TCPLinkTest.h index e34d993da7fe78ff4de0b361eeb02233d4938e8d..f1788ce5c2b307f3bed9c4442d7c89b0f24a5378 100644 --- a/src/qgcunittest/TCPLinkTest.h +++ b/src/qgcunittest/TCPLinkTest.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 TCPLINKTEST_H -#define TCPLINKTEST_H +#pragma once #include "UnitTest.h" #include "TCPLink.h" @@ -67,4 +66,3 @@ private: const char* _rgSignals[_cSignals]; }; -#endif diff --git a/src/qgcunittest/TCPLoopBackServer.h b/src/qgcunittest/TCPLoopBackServer.h index e171f15114bedb307d18a3d58278ffbb3b04fafd..a224d078e2a5e8851b0d6f3b42e16ec52e571941 100644 --- a/src/qgcunittest/TCPLoopBackServer.h +++ b/src/qgcunittest/TCPLoopBackServer.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 TCPLOOPBACKSERVER_H -#define TCPLOOPBACKSERVER_H +#pragma once #include #include @@ -44,4 +43,3 @@ private: QTcpSocket* _tcpSocket; }; -#endif \ No newline at end of file diff --git a/src/qgcunittest/UnitTest.h b/src/qgcunittest/UnitTest.h index 79d30cd2ce32adca347655f813cad0326e2f2dea..f9d555dc0a3bd673a258bf7ee9ad8e92c000bf94 100644 --- a/src/qgcunittest/UnitTest.h +++ b/src/qgcunittest/UnitTest.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. @@ -13,9 +13,8 @@ /// /// @author Don Gagne -#ifndef UNITTEST_H -#define UNITTEST_H #ifndef __mobile__ +#pragma once #include #include @@ -43,15 +42,15 @@ class UnitTest : public QObject public: UnitTest(void); virtual ~UnitTest(void); - + /// @brief Called to run all the registered unit tests /// @param singleTest Name of test to just run a single test static int run(QString& singleTest); - + /// @brief Sets up for an expected QGCMessageBox /// @param response Response to take on message box void setExpectedMessageBox(QMessageBox::StandardButton response); - + /// @brief Types for UnitTest::setExpectedFileDialog enum FileDialogType { getExistingDirectory, @@ -59,30 +58,30 @@ public: getOpenFileNames, getSaveFileName }; - + /// @brief Sets up for an expected QGCQFileDialog /// @param type Type of expected file dialog /// @param response Files to return from call. Multiple files only supported by getOpenFileNames void setExpectedFileDialog(enum FileDialogType type, QStringList response); - + enum { expectFailNoFailure = 1 << 0, ///< not expecting any failures expectFailNoDialog = 1 << 1, ///< expecting a failure due to no dialog displayed expectFailBadResponseButton = 1 << 2, ///< expecting a failure due to bad button response (QGCMessageBox only) expectFailWrongFileDialog = 1 << 3 ///< expecting one dialog type, got the wrong type (QGCQFileDialog ony) }; - + /// @brief Check whether a message box was displayed and correctly responded to // @param Expected failure response flags void checkExpectedMessageBox(int expectFailFlags = expectFailNoFailure); - + /// Checks that the specified number of message boxes where shown. Do not call setExpectedMessageBox when using this method. void checkMultipleExpectedMessageBox(int messageCount); /// @brief Check whether a message box was displayed and correctly responded to // @param Expected failure response flags void checkExpectedFileDialog(int expectFailFlags = expectFailNoFailure); - + /// @brief Adds a unit test to the list. Should only be called by UnitTestWrapper. static void _addTest(QObject* test); @@ -107,18 +106,18 @@ public: static bool fuzzyCompareLatLon(const QGeoCoordinate& coord1, const QGeoCoordinate& coord2); protected slots: - + // These are all pure virtuals to force the derived class to implement each one and in turn // call the UnitTest private implementation. - + /// @brief Called before each test. /// Make sure to call UnitTest::init first in your derived class. virtual void init(void); - + /// @brief Called after each test. /// Make sure to call UnitTest::cleanup last in your derived class. virtual void cleanup(void); - + protected: void _connectMockLink(MAV_AUTOPILOT autopilot = MAV_AUTOPILOT_PX4); void _disconnectMockLink(void); @@ -139,38 +138,38 @@ private slots: private: // When the app is running in unit test mode the QGCMessageBox methods are re-routed here. - + static QMessageBox::StandardButton _messageBox(QMessageBox::Icon icon, const QString& title, const QString& text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton); - + // This allows the private call to _messageBox friend class QGCMessageBox; - + // When the app is running in unit test mode the QGCQFileDialog methods are re-routed here. - + static QString _getExistingDirectory( QWidget* parent, const QString& caption, const QString& dir, QFileDialog::Options options); - + static QString _getOpenFileName( QWidget* parent, const QString& caption, const QString& dir, const QString& filter, QFileDialog::Options options); - + static QStringList _getOpenFileNames( QWidget* parent, const QString& caption, const QString& dir, const QString& filter, QFileDialog::Options options); - + static QString _getSaveFileName( QWidget* parent, const QString& caption, @@ -192,14 +191,14 @@ private: static bool _badResponseButton; ///< Attempt to repond to expected message box with button not being displayed static QMessageBox::StandardButton _messageBoxResponseButton; ///< Response to next message box static int _missedMessageBoxCount; ///< Count of message box not checked with call to messageBoxWasDisplayed - + // Catch QGCQFileDialog calls static bool _fileDialogRespondedTo; ///< File dialog was responded to static bool _fileDialogResponseSet; ///< true: _fileDialogResponse was set by a call to UnitTest::setExpectedFileDialog static QStringList _fileDialogResponse; ///< Response to next file dialog static enum FileDialogType _fileDialogExpectedType; ///< type of file dialog expected to show static int _missedFileDialogCount; ///< Count of file dialogs not checked with call to UnitTest::fileDialogWasDisplayed - + bool _unitTestRun; ///< true: Unit Test was run bool _initCalled; ///< true: UnitTest::_init was called bool _cleanupCalled; ///< true: UnitTest::_cleanup was called @@ -219,5 +218,4 @@ private: QSharedPointer _unitTest; }; -#endif // Android #endif diff --git a/src/stable_headers.h b/src/stable_headers.h index da7194078cac32df7d08ef10d4e3ef10c04b88ac..b9f0119f4232f60d97353b87af98d8e148cec79c 100644 --- a/src/stable_headers.h +++ b/src/stable_headers.h @@ -1,9 +1,7 @@ -#ifndef STABLE_HEADERS_H -#define STABLE_HEADERS_H +#pragma once #include #include #include -#endif // STABLE_HEADERS_H diff --git a/src/uas/FileManager.h b/src/uas/FileManager.h index 5c95a98080e556c5147e159351df330b0b5fb480..d9bab30abb5552e82b52f424786ef1e1e6ae97b8 100644 --- a/src/uas/FileManager.h +++ b/src/uas/FileManager.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 FILEMANAGER_H -#define FILEMANAGER_H +#pragma once #include #include @@ -248,4 +247,3 @@ private: friend class MockLinkFileServer; }; -#endif // FileManager_H diff --git a/src/uas/UAS.h b/src/uas/UAS.h index 5cba2f0b8f5bf7e267d9cd99c00b2ee410591687..33161c24072431fca47cbb9f0d93c2a37192f23e 100644 --- a/src/uas/UAS.h +++ b/src/uas/UAS.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. @@ -11,8 +11,7 @@ // UASInterface, UAS.h/cc are deprecated. All new functionality should go into Vehicle.h/cc // -#ifndef _UAS_H_ -#define _UAS_H_ +#pragma once #include "UASInterface.h" #include @@ -328,4 +327,3 @@ private: }; -#endif // _UAS_H_ diff --git a/src/uas/UASInterface.h b/src/uas/UASInterface.h index 87fd501e9ed5c953ecabd3346fc3e61a38f603d5..f47b3355daa70a6929d44ae7e9f6eb677dd74258 100644 --- a/src/uas/UASInterface.h +++ b/src/uas/UASInterface.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. @@ -11,8 +11,7 @@ // UASInterface, UAS.h/cc are deprecated. All new functionality should go into Vehicle.h/cc // -#ifndef _UASINTERFACE_H_ -#define _UASINTERFACE_H_ +#pragma once #include #include @@ -192,4 +191,3 @@ signals: Q_DECLARE_INTERFACE(UASInterface, "org.qgroundcontrol/1.0") -#endif // _UASINTERFACE_H_ diff --git a/src/uas/UASMessageHandler.h b/src/uas/UASMessageHandler.h index 854a60bc2f785fc75a73466643e82c6fb29a0eb1..ae525741b072d86a04f02aec17c8ed248308821a 100644 --- a/src/uas/UASMessageHandler.h +++ b/src/uas/UASMessageHandler.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. @@ -14,8 +14,7 @@ * @author Gus Grubba */ -#ifndef QGCMESSAGEHANDLER_H -#define QGCMESSAGEHANDLER_H +#pragma once #include #include @@ -158,4 +157,3 @@ private: MultiVehicleManager* _multiVehicleManager; }; -#endif // QGCMESSAGEHANDLER_H 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