diff options
Diffstat (limited to 'src/gui/opengl')
-rw-r--r-- | src/gui/opengl/qopengldebug.h | 4 | ||||
-rw-r--r-- | src/gui/opengl/qopenglpixeltransferoptions.h | 4 | ||||
-rw-r--r-- | src/gui/opengl/qopenglversionfunctions.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/opengl/qopengldebug.h b/src/gui/opengl/qopengldebug.h index 556ec175e1..1ba3ef91ac 100644 --- a/src/gui/opengl/qopengldebug.h +++ b/src/gui/opengl/qopengldebug.h @@ -111,11 +111,11 @@ public: QOpenGLDebugMessage &operator=(const QOpenGLDebugMessage &debugMessage); #ifdef Q_COMPILER_RVALUE_REFS - QOpenGLDebugMessage &operator=(QOpenGLDebugMessage &&other) Q_DECL_NOTHROW { swap(other); return *this; } + QOpenGLDebugMessage &operator=(QOpenGLDebugMessage &&other) noexcept { swap(other); return *this; } #endif ~QOpenGLDebugMessage(); - void swap(QOpenGLDebugMessage &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + void swap(QOpenGLDebugMessage &other) noexcept { qSwap(d, other.d); } Source source() const; Type type() const; diff --git a/src/gui/opengl/qopenglpixeltransferoptions.h b/src/gui/opengl/qopenglpixeltransferoptions.h index 2fc52b82d8..be60e66e71 100644 --- a/src/gui/opengl/qopenglpixeltransferoptions.h +++ b/src/gui/opengl/qopenglpixeltransferoptions.h @@ -56,13 +56,13 @@ public: QOpenGLPixelTransferOptions(); QOpenGLPixelTransferOptions(const QOpenGLPixelTransferOptions &); #ifdef Q_COMPILER_RVALUE_REFS - QOpenGLPixelTransferOptions &operator=(QOpenGLPixelTransferOptions &&other) Q_DECL_NOTHROW + QOpenGLPixelTransferOptions &operator=(QOpenGLPixelTransferOptions &&other) noexcept { swap(other); return *this; } #endif QOpenGLPixelTransferOptions &operator=(const QOpenGLPixelTransferOptions &); ~QOpenGLPixelTransferOptions(); - void swap(QOpenGLPixelTransferOptions &other) Q_DECL_NOTHROW + void swap(QOpenGLPixelTransferOptions &other) noexcept { data.swap(other.data); } void setAlignment(int alignment); diff --git a/src/gui/opengl/qopenglversionfunctions.h b/src/gui/opengl/qopenglversionfunctions.h index f828e5668b..aa6e49b9ae 100644 --- a/src/gui/opengl/qopenglversionfunctions.h +++ b/src/gui/opengl/qopenglversionfunctions.h @@ -97,7 +97,7 @@ struct QOpenGLVersionStatus OpenGLStatus status; }; -inline uint qHash(const QOpenGLVersionStatus &v, uint seed = 0) Q_DECL_NOTHROW +inline uint qHash(const QOpenGLVersionStatus &v, uint seed = 0) noexcept { return qHash(static_cast<int>(v.status * 1000) + v.version.first * 100 + v.version.second * 10, seed); |