diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/opengl/qopenglfunctions_2_0.cpp | 1 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_2_0.h | 2 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_2_1.cpp | 1 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_2_1.h | 2 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_3_0.cpp | 2 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_3_0.h | 4 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_3_2_compatibility.cpp | 2 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_3_2_compatibility.h | 4 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_3_3_compatibility.cpp | 1 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_3_3_compatibility.h | 2 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_4_0_compatibility.cpp | 1 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_4_0_compatibility.h | 2 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_4_1_compatibility.cpp | 1 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_4_1_compatibility.h | 2 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_4_2_compatibility.cpp | 1 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_4_2_compatibility.h | 2 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_4_3_compatibility.cpp | 1 | ||||
-rw-r--r-- | src/opengl/qopenglfunctions_4_3_compatibility.h | 2 |
18 files changed, 11 insertions, 22 deletions
diff --git a/src/opengl/qopenglfunctions_2_0.cpp b/src/opengl/qopenglfunctions_2_0.cpp index 834136d3dd9..0641f413901 100644 --- a/src/opengl/qopenglfunctions_2_0.cpp +++ b/src/opengl/qopenglfunctions_2_0.cpp @@ -44,7 +44,6 @@ QOpenGLFunctions_2_0::QOpenGLFunctions_2_0() , d_1_2_Deprecated(nullptr) , d_1_3_Deprecated(nullptr) , d_1_4_Deprecated(nullptr) - , m_reserved_2_0_Deprecated(nullptr) { } diff --git a/src/opengl/qopenglfunctions_2_0.h b/src/opengl/qopenglfunctions_2_0.h index f45a56b4f31..cca8d590e7e 100644 --- a/src/opengl/qopenglfunctions_2_0.h +++ b/src/opengl/qopenglfunctions_2_0.h @@ -656,7 +656,7 @@ private: QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated; QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated; QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated; - void *m_reserved_2_0_Deprecated; // To maintain BC + Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC }; // OpenGL 1.0 core functions diff --git a/src/opengl/qopenglfunctions_2_1.cpp b/src/opengl/qopenglfunctions_2_1.cpp index 984bb16d113..28f8b29dab7 100644 --- a/src/opengl/qopenglfunctions_2_1.cpp +++ b/src/opengl/qopenglfunctions_2_1.cpp @@ -45,7 +45,6 @@ QOpenGLFunctions_2_1::QOpenGLFunctions_2_1() , d_1_2_Deprecated(nullptr) , d_1_3_Deprecated(nullptr) , d_1_4_Deprecated(nullptr) - , m_reserved_2_0_Deprecated(nullptr) { } diff --git a/src/opengl/qopenglfunctions_2_1.h b/src/opengl/qopenglfunctions_2_1.h index 249ede36087..3b192e3b62d 100644 --- a/src/opengl/qopenglfunctions_2_1.h +++ b/src/opengl/qopenglfunctions_2_1.h @@ -667,7 +667,7 @@ private: QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated; QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated; QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated; - void *m_reserved_2_0_Deprecated; // To maintain BC + Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC }; // OpenGL 1.0 core functions diff --git a/src/opengl/qopenglfunctions_3_0.cpp b/src/opengl/qopenglfunctions_3_0.cpp index 5fcf1c9b2c7..b186ff2a9f7 100644 --- a/src/opengl/qopenglfunctions_3_0.cpp +++ b/src/opengl/qopenglfunctions_3_0.cpp @@ -46,8 +46,6 @@ QOpenGLFunctions_3_0::QOpenGLFunctions_3_0() , d_1_2_Deprecated(nullptr) , d_1_3_Deprecated(nullptr) , d_1_4_Deprecated(nullptr) - , m_reserved_2_0_Deprecated(nullptr) - , m_reserved_3_0_Deprecated(nullptr) { } diff --git a/src/opengl/qopenglfunctions_3_0.h b/src/opengl/qopenglfunctions_3_0.h index 5276fc730ae..01d6ccefaf6 100644 --- a/src/opengl/qopenglfunctions_3_0.h +++ b/src/opengl/qopenglfunctions_3_0.h @@ -756,8 +756,8 @@ private: QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated; QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated; QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated; - void *m_reserved_2_0_Deprecated; // To maintain BC - void *m_reserved_3_0_Deprecated; // To maintain BC + Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC + Q_DECL_UNUSED_MEMBER void *m_reserved_3_0_Deprecated = nullptr; // To maintain BC }; // OpenGL 1.0 core functions diff --git a/src/opengl/qopenglfunctions_3_2_compatibility.cpp b/src/opengl/qopenglfunctions_3_2_compatibility.cpp index 6c90c569d79..c1b1806998f 100644 --- a/src/opengl/qopenglfunctions_3_2_compatibility.cpp +++ b/src/opengl/qopenglfunctions_3_2_compatibility.cpp @@ -48,8 +48,6 @@ QOpenGLFunctions_3_2_Compatibility::QOpenGLFunctions_3_2_Compatibility() , d_1_2_Deprecated(nullptr) , d_1_3_Deprecated(nullptr) , d_1_4_Deprecated(nullptr) - , m_reserved_2_0_Deprecated(nullptr) - , m_reserved_3_0_Deprecated(nullptr) { } diff --git a/src/opengl/qopenglfunctions_3_2_compatibility.h b/src/opengl/qopenglfunctions_3_2_compatibility.h index 416ceb27253..b01c232385b 100644 --- a/src/opengl/qopenglfunctions_3_2_compatibility.h +++ b/src/opengl/qopenglfunctions_3_2_compatibility.h @@ -797,8 +797,8 @@ private: QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated; QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated; QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated; - void *m_reserved_2_0_Deprecated; // To maintain BC - void *m_reserved_3_0_Deprecated; // To maintain BC + Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC + Q_DECL_UNUSED_MEMBER void *m_reserved_3_0_Deprecated = nullptr; // To maintain BC }; // OpenGL 1.0 core functions diff --git a/src/opengl/qopenglfunctions_3_3_compatibility.cpp b/src/opengl/qopenglfunctions_3_3_compatibility.cpp index 0c61516ca14..60ef10553b4 100644 --- a/src/opengl/qopenglfunctions_3_3_compatibility.cpp +++ b/src/opengl/qopenglfunctions_3_3_compatibility.cpp @@ -49,7 +49,6 @@ QOpenGLFunctions_3_3_Compatibility::QOpenGLFunctions_3_3_Compatibility() , d_1_2_Deprecated(nullptr) , d_1_3_Deprecated(nullptr) , d_1_4_Deprecated(nullptr) - , m_reserved_2_0_Deprecated(nullptr) , d_3_3_Deprecated(nullptr) { } diff --git a/src/opengl/qopenglfunctions_3_3_compatibility.h b/src/opengl/qopenglfunctions_3_3_compatibility.h index 92f6bd8bde0..25490648f38 100644 --- a/src/opengl/qopenglfunctions_3_3_compatibility.h +++ b/src/opengl/qopenglfunctions_3_3_compatibility.h @@ -860,7 +860,7 @@ private: QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated; QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated; QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated; - void *m_reserved_2_0_Deprecated; // To maintain BC + Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC QOpenGLFunctions_3_3_DeprecatedBackend* d_3_3_Deprecated; }; diff --git a/src/opengl/qopenglfunctions_4_0_compatibility.cpp b/src/opengl/qopenglfunctions_4_0_compatibility.cpp index c380e73cb5e..7074de5bde7 100644 --- a/src/opengl/qopenglfunctions_4_0_compatibility.cpp +++ b/src/opengl/qopenglfunctions_4_0_compatibility.cpp @@ -50,7 +50,6 @@ QOpenGLFunctions_4_0_Compatibility::QOpenGLFunctions_4_0_Compatibility() , d_1_2_Deprecated(nullptr) , d_1_3_Deprecated(nullptr) , d_1_4_Deprecated(nullptr) - , m_reserved_2_0_Deprecated(nullptr) , d_3_3_Deprecated(nullptr) { } diff --git a/src/opengl/qopenglfunctions_4_0_compatibility.h b/src/opengl/qopenglfunctions_4_0_compatibility.h index ba725464af1..b72d01305a9 100644 --- a/src/opengl/qopenglfunctions_4_0_compatibility.h +++ b/src/opengl/qopenglfunctions_4_0_compatibility.h @@ -911,7 +911,7 @@ private: QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated; QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated; QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated; - void *m_reserved_2_0_Deprecated; // To maintain BC + Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC QOpenGLFunctions_3_3_DeprecatedBackend* d_3_3_Deprecated; }; diff --git a/src/opengl/qopenglfunctions_4_1_compatibility.cpp b/src/opengl/qopenglfunctions_4_1_compatibility.cpp index 399fd5c990c..035cc792769 100644 --- a/src/opengl/qopenglfunctions_4_1_compatibility.cpp +++ b/src/opengl/qopenglfunctions_4_1_compatibility.cpp @@ -51,7 +51,6 @@ QOpenGLFunctions_4_1_Compatibility::QOpenGLFunctions_4_1_Compatibility() , d_1_2_Deprecated(nullptr) , d_1_3_Deprecated(nullptr) , d_1_4_Deprecated(nullptr) - , m_reserved_2_0_Deprecated(nullptr) , d_3_3_Deprecated(nullptr) { } diff --git a/src/opengl/qopenglfunctions_4_1_compatibility.h b/src/opengl/qopenglfunctions_4_1_compatibility.h index ee8ab6be449..08b7c052325 100644 --- a/src/opengl/qopenglfunctions_4_1_compatibility.h +++ b/src/opengl/qopenglfunctions_4_1_compatibility.h @@ -1004,7 +1004,7 @@ private: QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated; QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated; QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated; - void *m_reserved_2_0_Deprecated; // To maintain BC + Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC QOpenGLFunctions_3_3_DeprecatedBackend* d_3_3_Deprecated; }; diff --git a/src/opengl/qopenglfunctions_4_2_compatibility.cpp b/src/opengl/qopenglfunctions_4_2_compatibility.cpp index 5bf2eedbaf3..faf0ca845f4 100644 --- a/src/opengl/qopenglfunctions_4_2_compatibility.cpp +++ b/src/opengl/qopenglfunctions_4_2_compatibility.cpp @@ -52,7 +52,6 @@ QOpenGLFunctions_4_2_Compatibility::QOpenGLFunctions_4_2_Compatibility() , d_1_2_Deprecated(nullptr) , d_1_3_Deprecated(nullptr) , d_1_4_Deprecated(nullptr) - , m_reserved_2_0_Deprecated(nullptr) , d_3_3_Deprecated(nullptr) { } diff --git a/src/opengl/qopenglfunctions_4_2_compatibility.h b/src/opengl/qopenglfunctions_4_2_compatibility.h index ca5b4127db4..2bc4f8b2284 100644 --- a/src/opengl/qopenglfunctions_4_2_compatibility.h +++ b/src/opengl/qopenglfunctions_4_2_compatibility.h @@ -1027,7 +1027,7 @@ private: QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated; QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated; QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated; - void *m_reserved_2_0_Deprecated; // To maintain BC + Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC QOpenGLFunctions_3_3_DeprecatedBackend* d_3_3_Deprecated; }; diff --git a/src/opengl/qopenglfunctions_4_3_compatibility.cpp b/src/opengl/qopenglfunctions_4_3_compatibility.cpp index c401a93189c..c3a3d5d32be 100644 --- a/src/opengl/qopenglfunctions_4_3_compatibility.cpp +++ b/src/opengl/qopenglfunctions_4_3_compatibility.cpp @@ -53,7 +53,6 @@ QOpenGLFunctions_4_3_Compatibility::QOpenGLFunctions_4_3_Compatibility() , d_1_2_Deprecated(nullptr) , d_1_3_Deprecated(nullptr) , d_1_4_Deprecated(nullptr) - , m_reserved_2_0_Deprecated(nullptr) , d_3_3_Deprecated(nullptr) { } diff --git a/src/opengl/qopenglfunctions_4_3_compatibility.h b/src/opengl/qopenglfunctions_4_3_compatibility.h index e79cecb5424..0370637653f 100644 --- a/src/opengl/qopenglfunctions_4_3_compatibility.h +++ b/src/opengl/qopenglfunctions_4_3_compatibility.h @@ -1065,7 +1065,7 @@ private: QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated; QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated; QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated; - void *m_reserved_2_0_Deprecated; // To maintain BC + Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC QOpenGLFunctions_3_3_DeprecatedBackend* d_3_3_Deprecated; }; |