summaryrefslogtreecommitdiffstats
path: root/src/corelib/io
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/io')
-rw-r--r--src/corelib/io/qdir.h2
-rw-r--r--src/corelib/io/qfileinfo.h2
-rw-r--r--src/corelib/io/qprocess.h2
-rw-r--r--src/corelib/io/qstorageinfo.h2
-rw-r--r--src/corelib/io/qurl.h2
-rw-r--r--src/corelib/io/qurlquery.h2
6 files changed, 0 insertions, 12 deletions
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h
index 547ac163c7..45a40995f8 100644
--- a/src/corelib/io/qdir.h
+++ b/src/corelib/io/qdir.h
@@ -109,9 +109,7 @@ public:
QT_DEPRECATED_X("Use QDir::setPath() instead")
QDir &operator=(const QString &path);
#endif
-#ifdef Q_COMPILER_RVALUE_REFS
QDir &operator=(QDir &&other) noexcept { swap(other); return *this; }
-#endif
void swap(QDir &other) noexcept
{ qSwap(d_ptr, other.d_ptr); }
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index bd9e1d216f..111517325d 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -67,9 +67,7 @@ public:
~QFileInfo();
QFileInfo &operator=(const QFileInfo &fileinfo);
-#ifdef Q_COMPILER_RVALUE_REFS
QFileInfo &operator=(QFileInfo &&other) noexcept { swap(other); return *this; }
-#endif
void swap(QFileInfo &other) noexcept
{ qSwap(d_ptr, other.d_ptr); }
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h
index 83b7138ff9..9fda5fba11 100644
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@@ -72,9 +72,7 @@ public:
QProcessEnvironment();
QProcessEnvironment(const QProcessEnvironment &other);
~QProcessEnvironment();
-#ifdef Q_COMPILER_RVALUE_REFS
QProcessEnvironment &operator=(QProcessEnvironment && other) noexcept { swap(other); return *this; }
-#endif
QProcessEnvironment &operator=(const QProcessEnvironment &other);
void swap(QProcessEnvironment &other) noexcept { qSwap(d, other.d); }
diff --git a/src/corelib/io/qstorageinfo.h b/src/corelib/io/qstorageinfo.h
index addcbb2990..237e68d2a1 100644
--- a/src/corelib/io/qstorageinfo.h
+++ b/src/corelib/io/qstorageinfo.h
@@ -62,9 +62,7 @@ public:
~QStorageInfo();
QStorageInfo &operator=(const QStorageInfo &other);
-#ifdef Q_COMPILER_RVALUE_REFS
QStorageInfo &operator=(QStorageInfo &&other) noexcept { swap(other); return *this; }
-#endif
inline void swap(QStorageInfo &other) noexcept
{ qSwap(d, other.d); }
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index 70e549c1a9..94269e4369 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -182,12 +182,10 @@ public:
QUrl(const QString &url, ParsingMode mode = TolerantMode);
QUrl &operator=(const QString &url);
#endif
-#ifdef Q_COMPILER_RVALUE_REFS
QUrl(QUrl &&other) noexcept : d(other.d)
{ other.d = nullptr; }
inline QUrl &operator=(QUrl &&other) noexcept
{ qSwap(d, other.d); return *this; }
-#endif
~QUrl();
inline void swap(QUrl &other) noexcept { qSwap(d, other.d); }
diff --git a/src/corelib/io/qurlquery.h b/src/corelib/io/qurlquery.h
index 2a497dc8da..89d0f88059 100644
--- a/src/corelib/io/qurlquery.h
+++ b/src/corelib/io/qurlquery.h
@@ -70,9 +70,7 @@ public:
QUrlQuery(const QUrlQuery &other);
QUrlQuery &operator=(const QUrlQuery &other);
-#ifdef Q_COMPILER_RVALUE_REFS
QUrlQuery &operator=(QUrlQuery &&other) noexcept { swap(other); return *this; }
-#endif
~QUrlQuery();
bool operator==(const QUrlQuery &other) const;