diff options
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qdebug.h | 2 | ||||
-rw-r--r-- | src/corelib/io/qprocess_p.h | 2 | ||||
-rw-r--r-- | src/corelib/io/qurl.h | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 4295800f1a..99c2909aa0 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -85,7 +85,7 @@ public: inline QDebug(const QDebug &o):stream(o.stream) { ++stream->ref; } inline QDebug &operator=(const QDebug &other); ~QDebug(); - inline void swap(QDebug &other) { qSwap(stream, other.stream); } + inline void swap(QDebug &other) Q_DECL_NOTHROW { qSwap(stream, other.stream); } QDebug &resetFormat(); diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h index 35626ddc38..8c5987aa05 100644 --- a/src/corelib/io/qprocess_p.h +++ b/src/corelib/io/qprocess_p.h @@ -98,7 +98,7 @@ public: QByteArray key; uint hash; }; -inline uint qHash(const QProcEnvKey &key) { return key.hash; } +inline uint qHash(const QProcEnvKey &key) Q_DECL_NOTHROW { return key.hash; } class QProcEnvValue { diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index abf96f5fcd..a1f62925e2 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -173,14 +173,14 @@ public: QUrl &operator=(const QString &url); #endif #ifdef Q_COMPILER_RVALUE_REFS - QUrl(QUrl &&other) : d(0) - { qSwap(d, other.d); } - inline QUrl &operator=(QUrl &&other) + QUrl(QUrl &&other) Q_DECL_NOTHROW : d(other.d) + { other.d = Q_NULLPTR; } + inline QUrl &operator=(QUrl &&other) Q_DECL_NOTHROW { qSwap(d, other.d); return *this; } #endif ~QUrl(); - inline void swap(QUrl &other) { qSwap(d, other.d); } + inline void swap(QUrl &other) Q_DECL_NOTHROW { qSwap(d, other.d); } void setUrl(const QString &url, ParsingMode mode = TolerantMode); QString url(FormattingOptions options = FormattingOptions(PrettyDecoded)) const; |