Unverified Commit 7962c8d5 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #6958 from patrickelectric/move_pragma_once

Move to pragma once
parents 9468fca3 42c7bc77
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef VIDEO_ITEM_H #pragma once
#define VIDEO_ITEM_H
#include <QtQuick/QQuickItem> #include <QtQuick/QQuickItem>
#include "VideoSurface.h" #include "VideoSurface.h"
...@@ -46,4 +45,3 @@ private: ...@@ -46,4 +45,3 @@ private:
#endif #endif
}; };
#endif // VIDEO_ITEM_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef VIDEORECEIVER_H #pragma once
#define VIDEORECEIVER_H
#include "QGCLoggingCategory.h" #include "QGCLoggingCategory.h"
#include <QObject> #include <QObject>
...@@ -150,4 +149,3 @@ protected: ...@@ -150,4 +149,3 @@ protected:
VideoSettings* _videoSettings; VideoSettings* _videoSettings;
}; };
#endif // VIDEORECEIVER_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -14,10 +14,8 @@ ...@@ -14,10 +14,8 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef VIDEO_STREAMING_H #pragma once
#define VIDEO_STREAMING_H
extern void initializeVideoStreaming (int &argc, char *argv[], char* filename, char* debuglevel); extern void initializeVideoStreaming (int &argc, char *argv[], char* filename, char* debuglevel);
extern void shutdownVideoStreaming (); extern void shutdownVideoStreaming ();
#endif // VIDEO_STREAMING_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef VIDEO_SURFACE_H #pragma once
#define VIDEO_SURFACE_H
#include <QtCore/QObject> #include <QtCore/QObject>
...@@ -62,4 +61,3 @@ private: ...@@ -62,4 +61,3 @@ private:
Q_DECLARE_METATYPE(VideoSurface*) Q_DECLARE_METATYPE(VideoSurface*)
#endif // VIDEO_SURFACE_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef VIDEO_SURFACE_P_H #pragma once
#define VIDEO_SURFACE_P_H
#include "VideoSurface.h" #include "VideoSurface.h"
#include "VideoItem.h" #include "VideoItem.h"
...@@ -31,4 +30,3 @@ public: ...@@ -31,4 +30,3 @@ public:
GstElement* videoSink; GstElement* videoSink;
}; };
#endif // VIDEO_SURFACE_P_H
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef BASEDELEGATE_H #pragma once
#define BASEDELEGATE_H
#include <gst/gst.h> #include <gst/gst.h>
...@@ -152,4 +151,3 @@ protected: ...@@ -152,4 +151,3 @@ protected:
GstElement * const m_sink; GstElement * const m_sink;
}; };
#endif // BASEDELEGATE_H
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef QTQUICK2VIDEOSINKDELEGATE_H #pragma once
#define QTQUICK2VIDEOSINKDELEGATE_H
#include "basedelegate.h" #include "basedelegate.h"
#include <QtQuick/QSGNode> #include <QtQuick/QSGNode>
...@@ -35,4 +34,3 @@ public: ...@@ -35,4 +34,3 @@ public:
QSGNode *updateNode(QSGNode *node, const QRectF & targetArea); QSGNode *updateNode(QSGNode *node, const QRectF & targetArea);
}; };
#endif // QTQUICK2VIDEOSINKDELEGATE_H
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef QT_VIDEO_SINK_DELEGATE_H #pragma once
#define QT_VIDEO_SINK_DELEGATE_H
#include "basedelegate.h" #include "basedelegate.h"
#include "../painters/abstractsurfacepainter.h" #include "../painters/abstractsurfacepainter.h"
...@@ -72,4 +71,3 @@ private: ...@@ -72,4 +71,3 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(QtVideoSinkDelegate::PainterTypes) Q_DECLARE_OPERATORS_FOR_FLAGS(QtVideoSinkDelegate::PainterTypes)
#endif // QT_VIDEO_SINK_DELEGATE_H
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef QWIDGET_VIDEO_SINK_DELEGATE_H #pragma once
#define QWIDGET_VIDEO_SINK_DELEGATE_H
#include "qtvideosinkdelegate.h" #include "qtvideosinkdelegate.h"
#include <QEvent> #include <QEvent>
...@@ -53,4 +52,3 @@ private: ...@@ -53,4 +52,3 @@ private:
bool m_opaquePaintEventAttribute; bool m_opaquePaintEventAttribute;
}; };
#endif // QWIDGET_VIDEO_SINK_DELEGATE_H
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef GST_QT_GL_VIDEO_SINK_H #pragma once
#define GST_QT_GL_VIDEO_SINK_H
#include "gstqtglvideosinkbase.h" #include "gstqtglvideosinkbase.h"
...@@ -75,4 +74,3 @@ struct GstQtGLVideoSinkClass ...@@ -75,4 +74,3 @@ struct GstQtGLVideoSinkClass
}; };
#endif // GST_QT_VIDEO_SINK_NO_OPENGL #endif // GST_QT_VIDEO_SINK_NO_OPENGL
#endif // GST_QT_GL_VIDEO_SINK_H
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef GST_QT_GL_VIDEO_SINK_BASE_H #pragma once
#define GST_QT_GL_VIDEO_SINK_BASE_H
#include "gstqtvideosinkbase.h" #include "gstqtvideosinkbase.h"
#include <gst/video/colorbalance.h> #include <gst/video/colorbalance.h>
...@@ -97,4 +96,3 @@ struct GstQtGLVideoSinkBaseClass ...@@ -97,4 +96,3 @@ struct GstQtGLVideoSinkBaseClass
}; };
#endif // GST_QT_VIDEO_SINK_NO_OPENGL #endif // GST_QT_VIDEO_SINK_NO_OPENGL
#endif // GST_QT_GL_VIDEO_SINK_BASE_H
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef __GST_QT_QUICK2_VIDEO_SINK_H__ #pragma once
#define __GST_QT_QUICK2_VIDEO_SINK_H__
#include <gst/video/gstvideosink.h> #include <gst/video/gstvideosink.h>
#include <QtGlobal> #include <QtGlobal>
...@@ -60,4 +59,3 @@ struct _GstQtQuick2VideoSinkClass ...@@ -60,4 +59,3 @@ struct _GstQtQuick2VideoSinkClass
GType gst_qt_quick2_video_sink_get_type (void); GType gst_qt_quick2_video_sink_get_type (void);
#endif /* __GST_QT_QUICK2_VIDEO_SINK_H__ */
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef GST_QT_VIDEO_SINK_H #pragma once
#define GST_QT_VIDEO_SINK_H
#include "gstqtvideosinkbase.h" #include "gstqtvideosinkbase.h"
...@@ -64,4 +63,3 @@ struct GstQtVideoSinkClass ...@@ -64,4 +63,3 @@ struct GstQtVideoSinkClass
qreal x, qreal y, qreal width, qreal height); qreal x, qreal y, qreal width, qreal height);
}; };
#endif
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef GST_QT_VIDEO_SINK_BASE_H #pragma once
#define GST_QT_VIDEO_SINK_BASE_H
#include "gstqtvideosinkplugin.h" #include "gstqtvideosinkplugin.h"
#include <gst/video/gstvideosink.h> #include <gst/video/gstvideosink.h>
...@@ -81,4 +80,3 @@ struct GstQtVideoSinkBaseClass ...@@ -81,4 +80,3 @@ struct GstQtVideoSinkBaseClass
GstVideoSinkClass parent_class; GstVideoSinkClass parent_class;
}; };
#endif
#ifndef __g_cclosure_user_marshal_MARSHAL_H__ #pragma once
#define __g_cclosure_user_marshal_MARSHAL_H__
#include <glib-object.h> #include <glib-object.h>
...@@ -40,5 +39,4 @@ extern void g_cclosure_user_marshal_POINTER__POINTER_DOUBLE_DOUBLE_DOUBLE_DOUBLE ...@@ -40,5 +39,4 @@ extern void g_cclosure_user_marshal_POINTER__POINTER_DOUBLE_DOUBLE_DOUBLE_DOUBLE
G_END_DECLS G_END_DECLS
#endif /* __g_cclosure_user_marshal_MARSHAL_H__ */
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef GST_QT_VIDEO_SINK_PLUGIN_H #pragma once
#define GST_QT_VIDEO_SINK_PLUGIN_H
#include <gst/gst.h> #include <gst/gst.h>
#include <QtGlobal> #include <QtGlobal>
...@@ -74,4 +73,3 @@ inline bool qRealIsDouble() { return sizeof(qreal) == sizeof(double); } ...@@ -74,4 +73,3 @@ inline bool qRealIsDouble() { return sizeof(qreal) == sizeof(double); }
#define G_TYPE_QREAL qRealIsDouble() ? G_TYPE_DOUBLE : G_TYPE_FLOAT #define G_TYPE_QREAL qRealIsDouble() ? G_TYPE_DOUBLE : G_TYPE_FLOAT
#endif
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef GST_QWIDGET_VIDEO_SINK_H #pragma once
#define GST_QWIDGET_VIDEO_SINK_H
#include "gstqtvideosinkbase.h" #include "gstqtvideosinkbase.h"
...@@ -58,4 +57,3 @@ struct GstQWidgetVideoSinkClass ...@@ -58,4 +57,3 @@ struct GstQWidgetVideoSinkClass
GstQtVideoSinkBaseClass parent_class; GstQtVideoSinkBaseClass parent_class;
}; };
#endif
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef ABSTRACTSURFACEPAINTER_H #pragma once
#define ABSTRACTSURFACEPAINTER_H
#include "../utils/bufferformat.h" #include "../utils/bufferformat.h"
#include <QRectF> #include <QRectF>
...@@ -46,4 +45,3 @@ public: ...@@ -46,4 +45,3 @@ public:
virtual void updateColors(int brightness, int contrast, int hue, int saturation) = 0; virtual void updateColors(int brightness, int contrast, int hue, int saturation) = 0;
}; };
#endif
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef GENERICSURFACEPAINTER_H #pragma once
#define GENERICSURFACEPAINTER_H
#include "abstractsurfacepainter.h" #include "abstractsurfacepainter.h"
#include <QSet> #include <QSet>
...@@ -55,4 +54,3 @@ private: ...@@ -55,4 +54,3 @@ private:
QImage::Format m_imageFormat; QImage::Format m_imageFormat;
}; };
#endif // GENERICSURFACEPAINTER_H
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef OPENGLSURFACEPAINTER_H #pragma once
#define OPENGLSURFACEPAINTER_H
#ifndef GST_QT_VIDEO_SINK_NO_OPENGL #ifndef GST_QT_VIDEO_SINK_NO_OPENGL
...@@ -138,5 +137,3 @@ private: ...@@ -138,5 +137,3 @@ private:
}; };
#endif // GST_QT_VIDEO_SINK_NO_OPENGL #endif // GST_QT_VIDEO_SINK_NO_OPENGL
#endif // OPENGLSURFACEPAINTER_H
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef VIDEOMATERIAL_H #pragma once
#define VIDEOMATERIAL_H
#include "../utils/bufferformat.h" #include "../utils/bufferformat.h"
#include <QSize> #include <QSize>
...@@ -80,4 +79,3 @@ private: ...@@ -80,4 +79,3 @@ private:
friend class VideoMaterialShader; friend class VideoMaterialShader;
}; };
#endif // VIDEOMATERIAL_H
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef VIDEONODE_H #pragma once
#define VIDEONODE_H
#include "../utils/bufferformat.h" #include "../utils/bufferformat.h"
...@@ -53,4 +52,3 @@ private: ...@@ -53,4 +52,3 @@ private:
MaterialType m_materialType; MaterialType m_materialType;
}; };
#endif // VIDEONODE_H
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef BUFFERFORMAT_H #pragma once
#define BUFFERFORMAT_H
#include "utils.h" #include "utils.h"
#include <QSharedData> #include <QSharedData>
...@@ -67,4 +66,3 @@ Q_DECLARE_METATYPE(GstVideoFormat) ...@@ -67,4 +66,3 @@ Q_DECLARE_METATYPE(GstVideoFormat)
Q_DECLARE_METATYPE(GstVideoColorMatrix) Q_DECLARE_METATYPE(GstVideoColorMatrix)
Q_DECLARE_METATYPE(BufferFormat) Q_DECLARE_METATYPE(BufferFormat)
#endif // BUFFERFORMAT_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef GLUTILS_H #pragma once
#define GLUTILS_H
#if defined(__mobile__) && !defined(Q_OS_MAC) #if defined(__mobile__) && !defined(Q_OS_MAC)
#include <QOpenGLFunctions> #include <QOpenGLFunctions>
...@@ -34,5 +33,3 @@ ...@@ -34,5 +33,3 @@
#define getQOpenGLFunctions() QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>() #define getQOpenGLFunctions() QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>()
#define QOpenGLFunctionsDef QOpenGLFunctions_2_0 #define QOpenGLFunctionsDef QOpenGLFunctions_2_0
#endif #endif
#endif
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef UTILS_H #pragma once
#define UTILS_H
#include <QRectF> #include <QRectF>
#include <QSize> #include <QSize>
...@@ -75,4 +74,3 @@ struct PaintAreas ...@@ -75,4 +74,3 @@ struct PaintAreas
Q_DECLARE_METATYPE(Fraction) Q_DECLARE_METATYPE(Fraction)
Q_DECLARE_METATYPE(PaintAreas) Q_DECLARE_METATYPE(PaintAreas)
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
/// @file /// @file
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
#ifndef CustomCommandWidget_H #pragma once
#define CustomCommandWidget_H
#include "QGCQmlWidgetHolder.h" #include "QGCQmlWidgetHolder.h"
...@@ -24,4 +23,3 @@ public: ...@@ -24,4 +23,3 @@ public:
CustomCommandWidget(const QString& title, QAction* action, QWidget *parent = 0); CustomCommandWidget(const QString& title, QAction* action, QWidget *parent = 0);
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 CustomCommandWidgetController_H #pragma once
#define CustomCommandWidgetController_H
#include <QObject> #include <QObject>
...@@ -38,4 +37,3 @@ private: ...@@ -38,4 +37,3 @@ private:
static const char* _settingsKey; static const char* _settingsKey;
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 VIEWWIDGETCONTROLLER_H #pragma once
#define VIEWWIDGETCONTROLLER_H
#include <QObject> #include <QObject>
...@@ -38,4 +37,3 @@ private: ...@@ -38,4 +37,3 @@ private:
UASInterface* _uas; UASInterface* _uas;
}; };
#endif
\ No newline at end of file
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 BTLINK_H #pragma once
#define BTLINK_H
#include <QString> #include <QString>
#include <QList> #include <QList>
...@@ -194,4 +193,3 @@ private: ...@@ -194,4 +193,3 @@ private:
}; };
#endif // BTLINK_H
#ifndef _CALLCONV_H_ #pragma once
#define _CALLCONV_H_
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#define CALLTYPEXBEE __stdcall #define CALLTYPEXBEE __stdcall
#else // Q_OS_WIN #else // Q_OS_WIN
#define CALLTYPEXBEE #define CALLTYPEXBEE
#endif // Q_OS_WIN
#endif // _CALLCONV_H_
\ No newline at end of file
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
* *
****************************************************************************/ ****************************************************************************/
#ifndef LINKCONFIGURATION_H #pragma once
#define LINKCONFIGURATION_H
#include <QSettings> #include <QSettings>
...@@ -208,4 +207,3 @@ private: ...@@ -208,4 +207,3 @@ private:
typedef QSharedPointer<LinkConfiguration> SharedLinkConfigurationPointer; typedef QSharedPointer<LinkConfiguration> SharedLinkConfigurationPointer;
#endif // LINKCONFIGURATION_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
* *
****************************************************************************/ ****************************************************************************/
#ifndef _LINKINTERFACE_H_ #pragma once
#define _LINKINTERFACE_H_
#include <QThread> #include <QThread>
#include <QDateTime> #include <QDateTime>
...@@ -308,4 +307,3 @@ private: ...@@ -308,4 +307,3 @@ private:
typedef QSharedPointer<LinkInterface> SharedLinkInterfacePointer; typedef QSharedPointer<LinkInterface> SharedLinkInterfacePointer;
#endif // _LINKINTERFACE_H_
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
/// @file /// @file
/// @author Lorenz Meier <mavteam@student.ethz.ch> /// @author Lorenz Meier <mavteam@student.ethz.ch>
#ifndef _LINKMANAGER_H_ #pragma once
#define _LINKMANAGER_H_
#include <QList> #include <QList>
#include <QMultiMap> #include <QMultiMap>
...@@ -244,4 +243,3 @@ private: ...@@ -244,4 +243,3 @@ private:
#endif #endif
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 LogReplayLink_H #pragma once
#define LogReplayLink_H
#include "LinkInterface.h" #include "LinkInterface.h"
#include "LinkConfiguration.h" #include "LinkConfiguration.h"
...@@ -155,4 +154,3 @@ private: ...@@ -155,4 +154,3 @@ private:
static const int cbTimestamp = sizeof(quint64); static const int cbTimestamp = sizeof(quint64);
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
* *
****************************************************************************/ ****************************************************************************/
#ifndef MAVLINKPROTOCOL_H_ #pragma once
#define MAVLINKPROTOCOL_H_
#include <QObject> #include <QObject>
#include <QMutex> #include <QMutex>
...@@ -171,4 +170,3 @@ private: ...@@ -171,4 +170,3 @@ private:
MultiVehicleManager* _multiVehicleManager; MultiVehicleManager* _multiVehicleManager;
}; };
#endif // MAVLINKPROTOCOL_H_
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef _MAVLINKMESSAGESTIMER_H_ #pragma once
#define _MAVLINKMESSAGESTIMER_H_
#include <QTimer> #include <QTimer>
#include <QObject> #include <QObject>
...@@ -103,4 +102,3 @@ private: ...@@ -103,4 +102,3 @@ private:
static const int _messageReceivedTimeoutMSecs = 3500; // Signal connection lost after 3.5 seconds of no messages static const int _messageReceivedTimeoutMSecs = 3500; // Signal connection lost after 3.5 seconds of no messages
}; };
#endif // _MAVLINKMESSAGESTIMER_H_
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 MOCKLINK_H #pragma once
#define MOCKLINK_H
#include <QMap> #include <QMap>
#include <QLoggingCategory> #include <QLoggingCategory>
...@@ -259,4 +258,3 @@ private: ...@@ -259,4 +258,3 @@ private:
static const char* _failParam; static const char* _failParam;
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
/// @file /// @file
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
#ifndef MockLinkFileServer_H #pragma once
#define MockLinkFileServer_H
#include "FileManager.h" #include "FileManager.h"
...@@ -110,4 +109,3 @@ private: ...@@ -110,4 +109,3 @@ private:
bool _randomDropsEnabled; bool _randomDropsEnabled;
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 MockLinkMissionItemHandler_H #pragma once
#define MockLinkMissionItemHandler_H
#include <QObject> #include <QObject>
#include <QMap> #include <QMap>
...@@ -115,4 +114,3 @@ private: ...@@ -115,4 +114,3 @@ private:
bool _failWriteMissionCountFirstResponse; bool _failWriteMissionCountFirstResponse;
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 QGCFLIGHTGEARLINK_H #pragma once
#define QGCFLIGHTGEARLINK_H
#include <QString> #include <QString>
#include <QList> #include <QList>
...@@ -160,4 +159,3 @@ private: ...@@ -160,4 +159,3 @@ private:
float barometerOffsetkPa; float barometerOffsetkPa;
}; };
#endif // QGCFLIGHTGEARLINK_H
#ifndef QGCHILLINK_H #pragma once
#define QGCHILLINK_H
#include <QThread> #include <QThread>
#include <QProcess> #include <QProcess>
...@@ -148,4 +147,3 @@ signals: ...@@ -148,4 +147,3 @@ signals:
void _invokeWriteBytes(QByteArray); void _invokeWriteBytes(QByteArray);
}; };
#endif // QGCHILLINK_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 QGCJSBSIMLINK_H #pragma once
#define QGCJSBSIMLINK_H
#include <QString> #include <QString>
#include <QList> #include <QList>
...@@ -147,4 +146,3 @@ private: ...@@ -147,4 +146,3 @@ private:
void setName(QString name); void setName(QString name);
}; };
#endif // QGCJSBSimLink_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
* @author Lorenz Meier <pixhawk@switched.com> * @author Lorenz Meier <pixhawk@switched.com>
*/ */
#ifndef QGCMAVLINK_H #pragma once
#define QGCMAVLINK_H
#define MAVLINK_USE_MESSAGE_INFO #define MAVLINK_USE_MESSAGE_INFO
#define MAVLINK_EXTERNAL_RX_STATUS // Single m_mavlink_status instance is in QGCApplication.cc #define MAVLINK_EXTERNAL_RX_STATUS // Single m_mavlink_status instance is in QGCApplication.cc
...@@ -33,5 +32,4 @@ public: ...@@ -33,5 +32,4 @@ public:
static bool isVTOL(MAV_TYPE mavType); static bool isVTOL(MAV_TYPE mavType);
}; };
#endif // QGCMAVLINK_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 QGCSerialPortInfo_H #pragma once
#define QGCSerialPortInfo_H
#ifdef __android__ #ifdef __android__
#include "qserialportinfo.h" #include "qserialportinfo.h"
...@@ -91,4 +90,3 @@ private: ...@@ -91,4 +90,3 @@ private:
static QList<BoardFallback_t> _boardFallbackList; static QList<BoardFallback_t> _boardFallbackList;
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 QGCXPLANESIMULATIONLINK_H #pragma once
#define QGCXPLANESIMULATIONLINK_H
#include <QString> #include <QString>
#include <QList> #include <QList>
...@@ -235,4 +234,3 @@ protected: ...@@ -235,4 +234,3 @@ protected:
void sendDataRef(QString ref, float value); void sendDataRef(QString ref, float value);
}; };
#endif // QGCXPLANESIMULATIONLINK_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 SERIALINTERFACE_H #pragma once
#define SERIALINTERFACE_H
#include <QIODevice> #include <QIODevice>
#include <QtSerialPort/QSerialPort> #include <QtSerialPort/QSerialPort>
...@@ -201,6 +200,5 @@ public: ...@@ -201,6 +200,5 @@ public:
} }
}; };
#endif // SERIALINTERFACE_H
// vim:ts=4:sw=4:tw=78:expandtab: // vim:ts=4:sw=4:tw=78:expandtab:
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 SERIALLINK_H #pragma once
#define SERIALLINK_H
class LinkInterface; class LinkInterface;
class SerialConfiguration; class SerialConfiguration;
...@@ -194,4 +193,3 @@ signals: ...@@ -194,4 +193,3 @@ signals:
}; };
#endif // SERIALLINK_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
/// ///
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
#ifndef TCPLINK_H #pragma once
#define TCPLINK_H
#include <QString> #include <QString>
#include <QList> #include <QList>
...@@ -188,4 +187,3 @@ private: ...@@ -188,4 +187,3 @@ private:
QMutex _statisticsMutex; QMutex _statisticsMutex;
}; };
#endif // TCPLINK_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 UDPLINK_H #pragma once
#define UDPLINK_H
#include <QString> #include <QString>
#include <QList> #include <QList>
...@@ -204,4 +203,3 @@ private: ...@@ -204,4 +203,3 @@ private:
}; };
#endif // UDPLINK_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
/// ///
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
#ifndef FILEDIALOGTEST_H #pragma once
#define FILEDIALOGTEST_H
#include "UnitTest.h" #include "UnitTest.h"
...@@ -33,4 +32,3 @@ private slots: ...@@ -33,4 +32,3 @@ private slots:
void _fileDialogExpectedIncorrect_test(void); void _fileDialogExpectedIncorrect_test(void);
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 FileManagerTEST_H #pragma once
#define FileManagerTEST_H
#include <QObject> #include <QObject>
#include <QtTest/QtTest> #include <QtTest/QtTest>
...@@ -77,4 +76,3 @@ private: ...@@ -77,4 +76,3 @@ private:
QStringList _fileListReceived; QStringList _fileListReceived;
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 FLIGHTGEARTEST_H #pragma once
#define FLIGHTGEARTEST_H
#include "UnitTest.h" #include "UnitTest.h"
#include "TCPLink.h" #include "TCPLink.h"
...@@ -31,4 +30,3 @@ private slots: ...@@ -31,4 +30,3 @@ private slots:
void _parseUIArguments_test(void); void _parseUIArguments_test(void);
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
/// ///
/// @author David Goodman <dagoodma@gmail.com> /// @author David Goodman <dagoodma@gmail.com>
#ifndef GEOTEST_H #pragma once
#define GEOTEST_H
#include <QGeoCoordinate> #include <QGeoCoordinate>
...@@ -38,4 +37,3 @@ private: ...@@ -38,4 +37,3 @@ private:
QGeoCoordinate _origin; QGeoCoordinate _origin;
}; };
#endif // GEOTEST_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 LINKMANAGERTEST_H #pragma once
#define LINKMANAGERTEST_H
#include "UnitTest.h" #include "UnitTest.h"
#include "LinkManager.h" #include "LinkManager.h"
...@@ -54,4 +53,3 @@ private: ...@@ -54,4 +53,3 @@ private:
const char* _rgSignals[_cSignals]; const char* _rgSignals[_cSignals];
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
/// ///
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
#ifndef MAINWINDOWTEST_H #pragma once
#define MAINWINDOWTEST_H
#include "UnitTest.h" #include "UnitTest.h"
#include "MainWindow.h" #include "MainWindow.h"
...@@ -31,4 +30,3 @@ private: ...@@ -31,4 +30,3 @@ private:
void _connectWindowClose_test(MAV_AUTOPILOT autopilot); void _connectWindowClose_test(MAV_AUTOPILOT autopilot);
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
/// ///
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
#ifndef MAVLINKLOGTEST_H #pragma once
#define MAVLINKLOGTEST_H
#include "UnitTest.h" #include "UnitTest.h"
...@@ -48,4 +47,3 @@ private: ...@@ -48,4 +47,3 @@ private:
static const char* _saveLogFilename; ///< Filename to save log files to static const char* _saveLogFilename; ///< Filename to save log files to
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
/// ///
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
#ifndef MESSAGEBOXTEST_H #pragma once
#define MESSAGEBOXTEST_H
#include "UnitTest.h" #include "UnitTest.h"
...@@ -33,4 +32,3 @@ private slots: ...@@ -33,4 +32,3 @@ private slots:
void _badResponseButton_test(void); void _badResponseButton_test(void);
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 MULTISIGNALSPY_H #pragma once
#define MULTISIGNALSPY_H
#include <QObject> #include <QObject>
#include <QSignalSpy> #include <QSignalSpy>
...@@ -80,4 +79,3 @@ private: ...@@ -80,4 +79,3 @@ private:
bool _timeout; bool _timeout;
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 RadioConfigTest_H #pragma once
#define RadioConfigTest_H
#include "UnitTest.h" #include "UnitTest.h"
#include "MockLink.h" #include "MockLink.h"
...@@ -116,4 +115,3 @@ private: ...@@ -116,4 +115,3 @@ private:
RadioComponentController* _controller; RadioComponentController* _controller;
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 TCPLINKTEST_H #pragma once
#define TCPLINKTEST_H
#include "UnitTest.h" #include "UnitTest.h"
#include "TCPLink.h" #include "TCPLink.h"
...@@ -67,4 +66,3 @@ private: ...@@ -67,4 +66,3 @@ private:
const char* _rgSignals[_cSignals]; const char* _rgSignals[_cSignals];
}; };
#endif
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 TCPLOOPBACKSERVER_H #pragma once
#define TCPLOOPBACKSERVER_H
#include <QThread> #include <QThread>
#include <QTcpServer> #include <QTcpServer>
...@@ -44,4 +43,3 @@ private: ...@@ -44,4 +43,3 @@ private:
QTcpSocket* _tcpSocket; QTcpSocket* _tcpSocket;
}; };
#endif
\ No newline at end of file
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -13,9 +13,8 @@ ...@@ -13,9 +13,8 @@
/// ///
/// @author Don Gagne <don@thegagnes.com> /// @author Don Gagne <don@thegagnes.com>
#ifndef UNITTEST_H
#define UNITTEST_H
#ifndef __mobile__ #ifndef __mobile__
#pragma once
#include <QObject> #include <QObject>
#include <QtTest> #include <QtTest>
...@@ -43,15 +42,15 @@ class UnitTest : public QObject ...@@ -43,15 +42,15 @@ class UnitTest : public QObject
public: public:
UnitTest(void); UnitTest(void);
virtual ~UnitTest(void); virtual ~UnitTest(void);
/// @brief Called to run all the registered unit tests /// @brief Called to run all the registered unit tests
/// @param singleTest Name of test to just run a single test /// @param singleTest Name of test to just run a single test
static int run(QString& singleTest); static int run(QString& singleTest);
/// @brief Sets up for an expected QGCMessageBox /// @brief Sets up for an expected QGCMessageBox
/// @param response Response to take on message box /// @param response Response to take on message box
void setExpectedMessageBox(QMessageBox::StandardButton response); void setExpectedMessageBox(QMessageBox::StandardButton response);
/// @brief Types for UnitTest::setExpectedFileDialog /// @brief Types for UnitTest::setExpectedFileDialog
enum FileDialogType { enum FileDialogType {
getExistingDirectory, getExistingDirectory,
...@@ -59,30 +58,30 @@ public: ...@@ -59,30 +58,30 @@ public:
getOpenFileNames, getOpenFileNames,
getSaveFileName getSaveFileName
}; };
/// @brief Sets up for an expected QGCQFileDialog /// @brief Sets up for an expected QGCQFileDialog
/// @param type Type of expected file dialog /// @param type Type of expected file dialog
/// @param response Files to return from call. Multiple files only supported by getOpenFileNames /// @param response Files to return from call. Multiple files only supported by getOpenFileNames
void setExpectedFileDialog(enum FileDialogType type, QStringList response); void setExpectedFileDialog(enum FileDialogType type, QStringList response);
enum { enum {
expectFailNoFailure = 1 << 0, ///< not expecting any failures expectFailNoFailure = 1 << 0, ///< not expecting any failures
expectFailNoDialog = 1 << 1, ///< expecting a failure due to no dialog displayed expectFailNoDialog = 1 << 1, ///< expecting a failure due to no dialog displayed
expectFailBadResponseButton = 1 << 2, ///< expecting a failure due to bad button response (QGCMessageBox only) 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) 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 /// @brief Check whether a message box was displayed and correctly responded to
// @param Expected failure response flags // @param Expected failure response flags
void checkExpectedMessageBox(int expectFailFlags = expectFailNoFailure); void checkExpectedMessageBox(int expectFailFlags = expectFailNoFailure);
/// Checks that the specified number of message boxes where shown. Do not call setExpectedMessageBox when using this method. /// Checks that the specified number of message boxes where shown. Do not call setExpectedMessageBox when using this method.
void checkMultipleExpectedMessageBox(int messageCount); void checkMultipleExpectedMessageBox(int messageCount);
/// @brief Check whether a message box was displayed and correctly responded to /// @brief Check whether a message box was displayed and correctly responded to
// @param Expected failure response flags // @param Expected failure response flags
void checkExpectedFileDialog(int expectFailFlags = expectFailNoFailure); void checkExpectedFileDialog(int expectFailFlags = expectFailNoFailure);
/// @brief Adds a unit test to the list. Should only be called by UnitTestWrapper. /// @brief Adds a unit test to the list. Should only be called by UnitTestWrapper.
static void _addTest(QObject* test); static void _addTest(QObject* test);
...@@ -107,18 +106,18 @@ public: ...@@ -107,18 +106,18 @@ public:
static bool fuzzyCompareLatLon(const QGeoCoordinate& coord1, const QGeoCoordinate& coord2); static bool fuzzyCompareLatLon(const QGeoCoordinate& coord1, const QGeoCoordinate& coord2);
protected slots: protected slots:
// These are all pure virtuals to force the derived class to implement each one and in turn // These are all pure virtuals to force the derived class to implement each one and in turn
// call the UnitTest private implementation. // call the UnitTest private implementation.
/// @brief Called before each test. /// @brief Called before each test.
/// Make sure to call UnitTest::init first in your derived class. /// Make sure to call UnitTest::init first in your derived class.
virtual void init(void); virtual void init(void);
/// @brief Called after each test. /// @brief Called after each test.
/// Make sure to call UnitTest::cleanup last in your derived class. /// Make sure to call UnitTest::cleanup last in your derived class.
virtual void cleanup(void); virtual void cleanup(void);
protected: protected:
void _connectMockLink(MAV_AUTOPILOT autopilot = MAV_AUTOPILOT_PX4); void _connectMockLink(MAV_AUTOPILOT autopilot = MAV_AUTOPILOT_PX4);
void _disconnectMockLink(void); void _disconnectMockLink(void);
...@@ -139,38 +138,38 @@ private slots: ...@@ -139,38 +138,38 @@ private slots:
private: private:
// When the app is running in unit test mode the QGCMessageBox methods are re-routed here. // When the app is running in unit test mode the QGCMessageBox methods are re-routed here.
static QMessageBox::StandardButton _messageBox(QMessageBox::Icon icon, static QMessageBox::StandardButton _messageBox(QMessageBox::Icon icon,
const QString& title, const QString& title,
const QString& text, const QString& text,
QMessageBox::StandardButtons buttons, QMessageBox::StandardButtons buttons,
QMessageBox::StandardButton defaultButton); QMessageBox::StandardButton defaultButton);
// This allows the private call to _messageBox // This allows the private call to _messageBox
friend class QGCMessageBox; friend class QGCMessageBox;
// When the app is running in unit test mode the QGCQFileDialog methods are re-routed here. // When the app is running in unit test mode the QGCQFileDialog methods are re-routed here.
static QString _getExistingDirectory( static QString _getExistingDirectory(
QWidget* parent, QWidget* parent,
const QString& caption, const QString& caption,
const QString& dir, const QString& dir,
QFileDialog::Options options); QFileDialog::Options options);
static QString _getOpenFileName( static QString _getOpenFileName(
QWidget* parent, QWidget* parent,
const QString& caption, const QString& caption,
const QString& dir, const QString& dir,
const QString& filter, const QString& filter,
QFileDialog::Options options); QFileDialog::Options options);
static QStringList _getOpenFileNames( static QStringList _getOpenFileNames(
QWidget* parent, QWidget* parent,
const QString& caption, const QString& caption,
const QString& dir, const QString& dir,
const QString& filter, const QString& filter,
QFileDialog::Options options); QFileDialog::Options options);
static QString _getSaveFileName( static QString _getSaveFileName(
QWidget* parent, QWidget* parent,
const QString& caption, const QString& caption,
...@@ -192,14 +191,14 @@ private: ...@@ -192,14 +191,14 @@ private:
static bool _badResponseButton; ///< Attempt to repond to expected message box with button not being displayed 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 QMessageBox::StandardButton _messageBoxResponseButton; ///< Response to next message box
static int _missedMessageBoxCount; ///< Count of message box not checked with call to messageBoxWasDisplayed static int _missedMessageBoxCount; ///< Count of message box not checked with call to messageBoxWasDisplayed
// Catch QGCQFileDialog calls // Catch QGCQFileDialog calls
static bool _fileDialogRespondedTo; ///< File dialog was responded to static bool _fileDialogRespondedTo; ///< File dialog was responded to
static bool _fileDialogResponseSet; ///< true: _fileDialogResponse was set by a call to UnitTest::setExpectedFileDialog static bool _fileDialogResponseSet; ///< true: _fileDialogResponse was set by a call to UnitTest::setExpectedFileDialog
static QStringList _fileDialogResponse; ///< Response to next file dialog static QStringList _fileDialogResponse; ///< Response to next file dialog
static enum FileDialogType _fileDialogExpectedType; ///< type of file dialog expected to show 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 static int _missedFileDialogCount; ///< Count of file dialogs not checked with call to UnitTest::fileDialogWasDisplayed
bool _unitTestRun; ///< true: Unit Test was run bool _unitTestRun; ///< true: Unit Test was run
bool _initCalled; ///< true: UnitTest::_init was called bool _initCalled; ///< true: UnitTest::_init was called
bool _cleanupCalled; ///< true: UnitTest::_cleanup was called bool _cleanupCalled; ///< true: UnitTest::_cleanup was called
...@@ -219,5 +218,4 @@ private: ...@@ -219,5 +218,4 @@ private:
QSharedPointer<T> _unitTest; QSharedPointer<T> _unitTest;
}; };
#endif // Android
#endif #endif
#ifndef STABLE_HEADERS_H #pragma once
#define STABLE_HEADERS_H
#include <QtCore> #include <QtCore>
#include <QtGui> #include <QtGui>
#include <QtWidgets> #include <QtWidgets>
#endif // STABLE_HEADERS_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 FILEMANAGER_H #pragma once
#define FILEMANAGER_H
#include <QObject> #include <QObject>
#include <QDir> #include <QDir>
...@@ -248,4 +247,3 @@ private: ...@@ -248,4 +247,3 @@ private:
friend class MockLinkFileServer; friend class MockLinkFileServer;
}; };
#endif // FileManager_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
// UASInterface, UAS.h/cc are deprecated. All new functionality should go into Vehicle.h/cc // UASInterface, UAS.h/cc are deprecated. All new functionality should go into Vehicle.h/cc
// //
#ifndef _UAS_H_ #pragma once
#define _UAS_H_
#include "UASInterface.h" #include "UASInterface.h"
#include <MAVLinkProtocol.h> #include <MAVLinkProtocol.h>
...@@ -328,4 +327,3 @@ private: ...@@ -328,4 +327,3 @@ private:
}; };
#endif // _UAS_H_
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
// UASInterface, UAS.h/cc are deprecated. All new functionality should go into Vehicle.h/cc // UASInterface, UAS.h/cc are deprecated. All new functionality should go into Vehicle.h/cc
// //
#ifndef _UASINTERFACE_H_ #pragma once
#define _UASINTERFACE_H_
#include <QObject> #include <QObject>
#include <QList> #include <QList>
...@@ -192,4 +191,3 @@ signals: ...@@ -192,4 +191,3 @@ signals:
Q_DECLARE_INTERFACE(UASInterface, "org.qgroundcontrol/1.0") Q_DECLARE_INTERFACE(UASInterface, "org.qgroundcontrol/1.0")
#endif // _UASINTERFACE_H_
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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.
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
* @author Gus Grubba <mavlink@grubba.com> * @author Gus Grubba <mavlink@grubba.com>
*/ */
#ifndef QGCMESSAGEHANDLER_H #pragma once
#define QGCMESSAGEHANDLER_H
#include <QObject> #include <QObject>
#include <QVector> #include <QVector>
...@@ -158,4 +157,3 @@ private: ...@@ -158,4 +157,3 @@ private:
MultiVehicleManager* _multiVehicleManager; MultiVehicleManager* _multiVehicleManager;
}; };
#endif // QGCMESSAGEHANDLER_H
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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
#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
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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_ */
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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
#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
#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
#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
#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
#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
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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
#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
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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
#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
#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
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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 */
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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_
/**************************************************************************** /****************************************************************************
* *
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> * (c) 2009-2018 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
#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
#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
#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
#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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment