Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
42c7bc77
Commit
42c7bc77
authored
Oct 27, 2018
by
Patrick José Pereira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ViewStreaming: Move to pragma once
Signed-off-by:
Patrick José Pereira
<
patrickelectric@gmail.com
>
parent
f054d357
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
31 additions
and
83 deletions
+31
-83
VideoItem.h
src/VideoStreaming/VideoItem.h
+2
-4
VideoReceiver.h
src/VideoStreaming/VideoReceiver.h
+2
-4
VideoStreaming.h
src/VideoStreaming/VideoStreaming.h
+2
-4
VideoSurface.h
src/VideoStreaming/VideoSurface.h
+2
-4
VideoSurface_p.h
src/VideoStreaming/VideoSurface_p.h
+2
-4
basedelegate.h
src/VideoStreaming/gstqtvideosink/delegates/basedelegate.h
+1
-3
qtquick2videosinkdelegate.h
...ming/gstqtvideosink/delegates/qtquick2videosinkdelegate.h
+1
-3
qtvideosinkdelegate.h
...oStreaming/gstqtvideosink/delegates/qtvideosinkdelegate.h
+1
-3
qwidgetvideosinkdelegate.h
...aming/gstqtvideosink/delegates/qwidgetvideosinkdelegate.h
+1
-3
gstqtglvideosink.h
src/VideoStreaming/gstqtvideosink/gstqtglvideosink.h
+1
-3
gstqtglvideosinkbase.h
src/VideoStreaming/gstqtvideosink/gstqtglvideosinkbase.h
+1
-3
gstqtquick2videosink.h
src/VideoStreaming/gstqtvideosink/gstqtquick2videosink.h
+1
-3
gstqtvideosink.h
src/VideoStreaming/gstqtvideosink/gstqtvideosink.h
+1
-3
gstqtvideosinkbase.h
src/VideoStreaming/gstqtvideosink/gstqtvideosinkbase.h
+1
-3
gstqtvideosinkmarshal.h
src/VideoStreaming/gstqtvideosink/gstqtvideosinkmarshal.h
+1
-3
gstqtvideosinkplugin.h
src/VideoStreaming/gstqtvideosink/gstqtvideosinkplugin.h
+1
-3
gstqwidgetvideosink.h
src/VideoStreaming/gstqtvideosink/gstqwidgetvideosink.h
+1
-3
abstractsurfacepainter.h
...treaming/gstqtvideosink/painters/abstractsurfacepainter.h
+1
-3
genericsurfacepainter.h
...Streaming/gstqtvideosink/painters/genericsurfacepainter.h
+1
-3
openglsurfacepainter.h
...oStreaming/gstqtvideosink/painters/openglsurfacepainter.h
+1
-4
videomaterial.h
src/VideoStreaming/gstqtvideosink/painters/videomaterial.h
+1
-3
videonode.h
src/VideoStreaming/gstqtvideosink/painters/videonode.h
+1
-3
bufferformat.h
src/VideoStreaming/gstqtvideosink/utils/bufferformat.h
+1
-3
glutils.h
src/VideoStreaming/gstqtvideosink/utils/glutils.h
+2
-5
utils.h
src/VideoStreaming/gstqtvideosink/utils/utils.h
+1
-3
No files found.
src/VideoStreaming/VideoItem.h
View file @
42c7bc77
/****************************************************************************
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
...
...
@@ -14,8 +14,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef VIDEO_ITEM_H
#define VIDEO_ITEM_H
#pragma once
#include <QtQuick/QQuickItem>
#include "VideoSurface.h"
...
...
@@ -46,4 +45,3 @@ private:
#endif
};
#endif // VIDEO_ITEM_H
src/VideoStreaming/VideoReceiver.h
View file @
42c7bc77
/****************************************************************************
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
...
...
@@ -14,8 +14,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef VIDEORECEIVER_H
#define VIDEORECEIVER_H
#pragma once
#include "QGCLoggingCategory.h"
#include <QObject>
...
...
@@ -150,4 +149,3 @@ protected:
VideoSettings
*
_videoSettings
;
};
#endif // VIDEORECEIVER_H
src/VideoStreaming/VideoStreaming.h
View file @
42c7bc77
/****************************************************************************
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
...
...
@@ -14,10 +14,8 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#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
src/VideoStreaming/VideoSurface.h
View file @
42c7bc77
/****************************************************************************
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
...
...
@@ -14,8 +14,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef VIDEO_SURFACE_H
#define VIDEO_SURFACE_H
#pragma once
#include <QtCore/QObject>
...
...
@@ -62,4 +61,3 @@ private:
Q_DECLARE_METATYPE
(
VideoSurface
*
)
#endif // VIDEO_SURFACE_H
src/VideoStreaming/VideoSurface_p.h
View file @
42c7bc77
/****************************************************************************
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
...
...
@@ -14,8 +14,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#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
src/VideoStreaming/gstqtvideosink/delegates/basedelegate.h
View file @
42c7bc77
...
...
@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef BASEDELEGATE_H
#define BASEDELEGATE_H
#pragma once
#include <gst/gst.h>
...
...
@@ -152,4 +151,3 @@ protected:
GstElement
*
const
m_sink
;
};
#endif // BASEDELEGATE_H
src/VideoStreaming/gstqtvideosink/delegates/qtquick2videosinkdelegate.h
View file @
42c7bc77
...
...
@@ -20,8 +20,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef QTQUICK2VIDEOSINKDELEGATE_H
#define QTQUICK2VIDEOSINKDELEGATE_H
#pragma once
#include "basedelegate.h"
#include <QtQuick/QSGNode>
...
...
@@ -35,4 +34,3 @@ public:
QSGNode
*
updateNode
(
QSGNode
*
node
,
const
QRectF
&
targetArea
);
};
#endif // QTQUICK2VIDEOSINKDELEGATE_H
src/VideoStreaming/gstqtvideosink/delegates/qtvideosinkdelegate.h
View file @
42c7bc77
...
...
@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#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
src/VideoStreaming/gstqtvideosink/delegates/qwidgetvideosinkdelegate.h
View file @
42c7bc77
...
...
@@ -22,8 +22,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef QWIDGET_VIDEO_SINK_DELEGATE_H
#define QWIDGET_VIDEO_SINK_DELEGATE_H
#pragma once
#include "qtvideosinkdelegate.h"
#include <QEvent>
...
...
@@ -53,4 +52,3 @@ private:
bool
m_opaquePaintEventAttribute
;
};
#endif // QWIDGET_VIDEO_SINK_DELEGATE_H
src/VideoStreaming/gstqtvideosink/gstqtglvideosink.h
View file @
42c7bc77
...
...
@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#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
src/VideoStreaming/gstqtvideosink/gstqtglvideosinkbase.h
View file @
42c7bc77
...
...
@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef GST_QT_GL_VIDEO_SINK_BASE_H
#define GST_QT_GL_VIDEO_SINK_BASE_H
#pragma once
#include "gstqtvideosinkbase.h"
#include <gst/video/colorbalance.h>
...
...
@@ -97,4 +96,3 @@ struct GstQtGLVideoSinkBaseClass
};
#endif // GST_QT_VIDEO_SINK_NO_OPENGL
#endif // GST_QT_GL_VIDEO_SINK_BASE_H
src/VideoStreaming/gstqtvideosink/gstqtquick2videosink.h
View file @
42c7bc77
...
...
@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef __GST_QT_QUICK2_VIDEO_SINK_H__
#define __GST_QT_QUICK2_VIDEO_SINK_H__
#pragma once
#include <gst/video/gstvideosink.h>
#include <QtGlobal>
...
...
@@ -60,4 +59,3 @@ struct _GstQtQuick2VideoSinkClass
GType
gst_qt_quick2_video_sink_get_type
(
void
);
#endif
/* __GST_QT_QUICK2_VIDEO_SINK_H__ */
src/VideoStreaming/gstqtvideosink/gstqtvideosink.h
View file @
42c7bc77
...
...
@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#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
src/VideoStreaming/gstqtvideosink/gstqtvideosinkbase.h
View file @
42c7bc77
...
...
@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef GST_QT_VIDEO_SINK_BASE_H
#define GST_QT_VIDEO_SINK_BASE_H
#pragma once
#include "gstqtvideosinkplugin.h"
#include <gst/video/gstvideosink.h>
...
...
@@ -81,4 +80,3 @@ struct GstQtVideoSinkBaseClass
GstVideoSinkClass
parent_class
;
};
#endif
src/VideoStreaming/gstqtvideosink/gstqtvideosinkmarshal.h
View file @
42c7bc77
#ifndef __g_cclosure_user_marshal_MARSHAL_H__
#define __g_cclosure_user_marshal_MARSHAL_H__
#pragma once
#include <glib-object.h>
...
...
@@ -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__ */
src/VideoStreaming/gstqtvideosink/gstqtvideosinkplugin.h
View file @
42c7bc77
...
...
@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef GST_QT_VIDEO_SINK_PLUGIN_H
#define GST_QT_VIDEO_SINK_PLUGIN_H
#pragma once
#include <gst/gst.h>
#include <QtGlobal>
...
...
@@ -74,4 +73,3 @@ inline bool qRealIsDouble() { return sizeof(qreal) == sizeof(double); }
#define G_TYPE_QREAL qRealIsDouble() ? G_TYPE_DOUBLE : G_TYPE_FLOAT
#endif
src/VideoStreaming/gstqtvideosink/gstqwidgetvideosink.h
View file @
42c7bc77
...
...
@@ -22,8 +22,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#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
src/VideoStreaming/gstqtvideosink/painters/abstractsurfacepainter.h
View file @
42c7bc77
...
...
@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef ABSTRACTSURFACEPAINTER_H
#define ABSTRACTSURFACEPAINTER_H
#pragma once
#include "../utils/bufferformat.h"
#include <QRectF>
...
...
@@ -46,4 +45,3 @@ public:
virtual
void
updateColors
(
int
brightness
,
int
contrast
,
int
hue
,
int
saturation
)
=
0
;
};
#endif
src/VideoStreaming/gstqtvideosink/painters/genericsurfacepainter.h
View file @
42c7bc77
...
...
@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef GENERICSURFACEPAINTER_H
#define GENERICSURFACEPAINTER_H
#pragma once
#include "abstractsurfacepainter.h"
#include <QSet>
...
...
@@ -55,4 +54,3 @@ private:
QImage
::
Format
m_imageFormat
;
};
#endif // GENERICSURFACEPAINTER_H
src/VideoStreaming/gstqtvideosink/painters/openglsurfacepainter.h
View file @
42c7bc77
...
...
@@ -21,8 +21,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#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
src/VideoStreaming/gstqtvideosink/painters/videomaterial.h
View file @
42c7bc77
...
...
@@ -22,8 +22,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef VIDEOMATERIAL_H
#define VIDEOMATERIAL_H
#pragma once
#include "../utils/bufferformat.h"
#include <QSize>
...
...
@@ -80,4 +79,3 @@ private:
friend
class
VideoMaterialShader
;
};
#endif // VIDEOMATERIAL_H
src/VideoStreaming/gstqtvideosink/painters/videonode.h
View file @
42c7bc77
...
...
@@ -22,8 +22,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef VIDEONODE_H
#define VIDEONODE_H
#pragma once
#include "../utils/bufferformat.h"
...
...
@@ -53,4 +52,3 @@ private:
MaterialType
m_materialType
;
};
#endif // VIDEONODE_H
src/VideoStreaming/gstqtvideosink/utils/bufferformat.h
View file @
42c7bc77
...
...
@@ -14,8 +14,7 @@
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/>.
*/
#ifndef BUFFERFORMAT_H
#define BUFFERFORMAT_H
#pragma once
#include "utils.h"
#include <QSharedData>
...
...
@@ -67,4 +66,3 @@ Q_DECLARE_METATYPE(GstVideoFormat)
Q_DECLARE_METATYPE
(
GstVideoColorMatrix
)
Q_DECLARE_METATYPE
(
BufferFormat
)
#endif // BUFFERFORMAT_H
src/VideoStreaming/gstqtvideosink/utils/glutils.h
View file @
42c7bc77
/****************************************************************************
*
* (c) 2009-201
6
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-201
8
QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
...
...
@@ -14,8 +14,7 @@
* @author Gus Grubba <mavlink@grubba.com>
*/
#ifndef GLUTILS_H
#define GLUTILS_H
#pragma once
#if defined(__mobile__) && !defined(Q_OS_MAC)
#include <QOpenGLFunctions>
...
...
@@ -34,5 +33,3 @@
#define getQOpenGLFunctions() QOpenGLContext::currentContext()->versionFunctions<QOpenGLFunctions_2_0>()
#define QOpenGLFunctionsDef QOpenGLFunctions_2_0
#endif
#endif
src/VideoStreaming/gstqtvideosink/utils/utils.h
View file @
42c7bc77
...
...
@@ -13,8 +13,7 @@
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/>.
*/
#ifndef UTILS_H
#define UTILS_H
#pragma once
#include <QRectF>
#include <QSize>
...
...
@@ -75,4 +74,3 @@ struct PaintAreas
Q_DECLARE_METATYPE
(
Fraction
)
Q_DECLARE_METATYPE
(
PaintAreas
)
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment