use #pragma once anf move the GL check to the very top of the files

10 files changed, 46 insertions, 42 deletions

diff --git a/src/waveform/renderers/glslwaveformrenderersignal.cpp b/src/waveform/renderers/glslwaveformrenderersignal.cpp
index 968b328b99..7a178b4bd3 100644
--- a/src/waveform/renderers/glslwaveformrenderersignal.cpp
+++ b/src/waveform/renderers/glslwaveformrenderersignal.cpp
@@ -1,3 +1,7 @@
+#include <QtCore/qglobal.h>
+
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
+
 #include <QGLFramebufferObject>
 
 #include "waveform/renderers/glslwaveformrenderersignal.h"
@@ -6,8 +10,6 @@
 #include "waveform/waveform.h"
 #include "waveform/waveformwidgetfactory.h"
 
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
-
 GLSLWaveformRendererSignal::GLSLWaveformRendererSignal(WaveformWidgetRenderer* waveformWidgetRenderer,
                                                        bool rgbShader)
         : WaveformRendererSignalBase(waveformWidgetRenderer),
diff --git a/src/waveform/renderers/glslwaveformrenderersignal.h b/src/waveform/renderers/glslwaveformrenderersignal.h
index 58a396792a..019fe293d7 100644
--- a/src/waveform/renderers/glslwaveformrenderersignal.h
+++ b/src/waveform/renderers/glslwaveformrenderersignal.h
@@ -1,13 +1,14 @@
-#ifndef GLWAVEFORMRENDERERSIGNALSHADER_H
-#define GLWAVEFORMRENDERERSIGNALSHADER_H
+#pragma once
+
+#include <QtCore/qglobal.h>
+
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
 #include <QGLFramebufferObject>
 #include <QGLShaderProgram>
 #include <QtOpenGL>
 #include <QOpenGLFunctions_2_1>
 
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
-
 #include "track/track.h"
 #include "util/memory.h"
 #include "waveform/renderers/waveformrenderersignalbase.h"
@@ -75,5 +76,3 @@ class GLSLWaveformRendererRGBSignal : public GLSLWaveformRendererSignal {
 };
 
 #endif // QT_NO_OPENGL && !QT_OPENGL_ES_2
-
-#endif // GLWAVEFORMRENDERERSIGNALSHADER_H
diff --git a/src/waveform/renderers/glvsynctestrenderer.cpp b/src/waveform/renderers/glvsynctestrenderer.cpp
index f4e508d0e7..a3bb6dc03d 100644
--- a/src/waveform/renderers/glvsynctestrenderer.cpp
+++ b/src/waveform/renderers/glvsynctestrenderer.cpp
@@ -1,3 +1,7 @@
+#include <QtCore/qglobal.h>
+
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
+
 #include "waveform/renderers/glvsynctestrenderer.h"
 
 #include "waveform/renderers/waveformwidgetrenderer.h"
@@ -5,8 +9,6 @@
 #include "waveform/waveformwidgetfactory.h"
 #include "util/performancetimer.h"
 
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
-
 GLVSyncTestRenderer::GLVSyncTestRenderer(
         WaveformWidgetRenderer* waveformWidgetRenderer)
     : WaveformRendererSignalBase(waveformWidgetRenderer),
diff --git a/src/waveform/renderers/glvsynctestrenderer.h b/src/waveform/renderers/glvsynctestrenderer.h
index 0d9e96fd54..c0be75e17d 100644
--- a/src/waveform/renderers/glvsynctestrenderer.h
+++ b/src/waveform/renderers/glvsynctestrenderer.h
@@ -1,10 +1,11 @@
-#ifndef GLVSYNCTESTRENDERER_H
-#define GLVSYNCTESTRENDERER_H
+#pragma once
 
-#include <QOpenGLFunctions_2_1>
+#include <QtCore/qglobal.h>
 
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
+#include <QOpenGLFunctions_2_1>
+
 #include "waveformrenderersignalbase.h"
 
 class ControlObject;
@@ -23,5 +24,3 @@ private:
 };
 
 #endif // QT_NO_OPENGL && !QT_OPENGL_ES_2
-
-#endif // GLVSYNCTESTRENDERER_H
diff --git a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
index 37f935e28a..d3e32f8f21 100644
--- a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
+++ b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
@@ -1,3 +1,9 @@
+#include <QtCore/qglobal.h>
+
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
+
+#include <QDomNode>
+
 #include "glwaveformrendererfilteredsignal.h"
 #include "track/track.h"
 #include "waveform/waveform.h"
@@ -5,10 +11,6 @@
 #include "waveform/waveformwidgetfactory.h"
 #include "util/math.h"
 
-#include <QDomNode>
-
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
-
 GLWaveformRendererFilteredSignal::GLWaveformRendererFilteredSignal(
         WaveformWidgetRenderer* waveformWidgetRenderer)
         : WaveformRendererSignalBase(waveformWidgetRenderer) {
diff --git a/src/waveform/renderers/glwaveformrendererfilteredsignal.h b/src/waveform/renderers/glwaveformrendererfilteredsignal.h
index 6adf386e5a..171f7b8f60 100644
--- a/src/waveform/renderers/glwaveformrendererfilteredsignal.h
+++ b/src/waveform/renderers/glwaveformrendererfilteredsignal.h
@@ -1,10 +1,12 @@
-#ifndef GLWAVEFROMRENDERERFILTEREDSIGNAL_H
-#define GLWAVEFROMRENDERERFILTEREDSIGNAL_H
+#pragma once
 
-#include <QOpenGLFunctions_2_1>
+#include <QtCore/qglobal.h>
 
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
+#include <QDomNode>
+#include <QOpenGLFunctions_2_1>
+
 #include "waveformrenderersignalbase.h"
 
 class ControlObject;
@@ -21,5 +23,3 @@ public:
 };
 
 #endif // QT_NO_OPENGL && !QT_OPENGL_ES_2
-
-#endif // GLWAVEFROMRENDERERFILTEREDSIGNAL_H
diff --git a/src/waveform/renderers/glwaveformrendererrgb.cpp b/src/waveform/renderers/glwaveformrendererrgb.cpp
index 87717c700c..0bf3f38999 100644
--- a/src/waveform/renderers/glwaveformrendererrgb.cpp
+++ b/src/waveform/renderers/glwaveformrendererrgb.cpp
@@ -1,3 +1,7 @@
+#include <QtCore/qglobal.h>
+
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
+
 #include "glwaveformrendererrgb.h"
 #include "waveformwidgetrenderer.h"
 #include "waveform/waveform.h"
@@ -6,8 +10,6 @@
 #include "widget/wskincolor.h"
 #include "util/math.h"
 
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
-
 GLWaveformRendererRGB::GLWaveformRendererRGB(
         WaveformWidgetRenderer* waveformWidgetRenderer)
         : WaveformRendererSignalBase(waveformWidgetRenderer) {
diff --git a/src/waveform/renderers/glwaveformrendererrgb.h b/src/waveform/renderers/glwaveformrendererrgb.h
index 42202fe6fe..c2cb844bd5 100644
--- a/src/waveform/renderers/glwaveformrendererrgb.h
+++ b/src/waveform/renderers/glwaveformrendererrgb.h
@@ -1,10 +1,11 @@
-#ifndef GLWAVEFORMRENDERERRGB_H
-#define GLWAVEFORMRENDERERRGB_H
+#pragma once
 
-#include <QOpenGLFunctions_2_1>
+#include <QtCore/qglobal.h>
 
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
+#include <QOpenGLFunctions_2_1>
+
 #include "waveformrenderersignalbase.h"
 
 class ControlObject;
@@ -24,5 +25,3 @@ class GLWaveformRendererRGB: public WaveformRendererSignalBase,
 };
 
 #endif // QT_NO_OPENGL && !QT_OPENGL_ES_2
-
-#endif // GLWAVEFORMRENDERERRGB_H
diff --git a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
index 9a3ed3f377..324eaf434b 100644
--- a/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
+++ b/src/waveform/renderers/glwaveformrenderersimplesignal.cpp
@@ -1,12 +1,12 @@
-#include "glwaveformrenderersimplesignal.h"
+#include <QtCore/qglobal.h>
 
-#include "waveformwidgetrenderer.h"
-#include "waveform/waveform.h"
+#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
-#include "waveform/waveformwidgetfactory.h"
+#include "glwaveformrenderersimplesignal.h"
 #include "util/math.h"
-
-#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
+#include "waveform/waveform.h"
+#include "waveform/waveformwidgetfactory.h"
+#include "waveformwidgetrenderer.h"
 
 GLWaveformRendererSimpleSignal::GLWaveformRendererSimpleSignal(
         WaveformWidgetRenderer* waveformWidgetRenderer)
diff --git a/src/waveform/renderers/glwaveformrenderersimplesignal.h b/src/waveform/renderers/glwaveformrenderersimplesignal.h
index 0d18916ceb..7389bd2795 100644
--- a/src/waveform/renderers/glwaveformrenderersimplesignal.h
+++ b/src/waveform/renderers/glwaveformrenderersimplesignal.h
@@ -1,10 +1,11 @@
-#ifndef GLWAVEFORMRENDERERSIMPLESIGNAL_H
-#define GLWAVEFORMRENDERERSIMPLESIGNAL_H
+#pragma once
 
-#include <QOpenGLFunctions_2_1>
+#include <QtCore/qglobal.h>
 
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
 
+#include <QOpenGLFunctions_2_1>
+
 #include "waveformrenderersignalbase.h"
 
 class ControlObject;
@@ -19,5 +20,3 @@ public:
 };
 
 #endif // QT_NO_OPENGL && !QT_OPENGL_ES_2
-
-#endif // GLWAVEFORMRENDERERSIMPLESIGNAL_H