Replace qMove with std::move

Change-Id: I67df3ae6b5db0a158f86e75b99f422bd13853bc9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

9 files changed, 18 insertions, 18 deletions

diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.mm b/src/corelib/io/qfilesystemwatcher_fsevents.mm
index f594fad803..fb3b6f86fd 100644
--- a/src/corelib/io/qfilesystemwatcher_fsevents.mm
+++ b/src/corelib/io/qfilesystemwatcher_fsevents.mm
@@ -407,7 +407,7 @@ QStringList QFseventsFileSystemWatcherEngine::addPaths(const QStringList &paths,
         stopStream();
         if (!startStream()) {
             // ok, something went wrong, let's try to restore the previous state
-            watchingState = qMove(oldState);
+            watchingState = std::move(oldState);
             // and because we don't know which path caused the issue (if any), fail on all of them
             p = paths;
 
@@ -474,7 +474,7 @@ QStringList QFseventsFileSystemWatcherEngine::removePaths(const QStringList &pat
 
     if (needsRestart) {
         if (!restartStream()) {
-            watchingState = qMove(oldState);
+            watchingState = std::move(oldState);
             startStream();
         }
     }
diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
index beca6ccbf7..d1806aa12b 100644
--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
@@ -534,7 +534,7 @@ QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QSharedPointer
 */
 QSharedPointer<QNonContiguousByteDevice> QNonContiguousByteDeviceFactory::createShared(QSharedPointer<QRingBuffer> ringBuffer)
 {
-    return QSharedPointer<QNonContiguousByteDeviceRingBufferImpl>::create(qMove(ringBuffer));
+    return QSharedPointer<QNonContiguousByteDeviceRingBufferImpl>::create(std::move(ringBuffer));
 }
 
 /*!
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index 3dc48a1c58..d6fdd72dc1 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -227,7 +227,7 @@ public:
         friend bool operator!=(const RestorableId &lhs, const RestorableId &rhs) noexcept
         { return !operator==(lhs, rhs); }
     public:
-        explicit RestorableId(QObject *o, QByteArray p) noexcept : guard(o), obj(o), prop(qMove(p)) {}
+        explicit RestorableId(QObject *o, QByteArray p) noexcept : guard(o), obj(o), prop(std::move(p)) {}
         QObject *object() const noexcept { return guard; }
         QByteArray propertyName() const noexcept { return prop; }
     };
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index a5a473acf4..5f5302107b 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -3282,10 +3282,10 @@ static QByteArray toCase_template(T &input, const uchar * table)
     }
 
     if (firstBad == e)
-        return qMove(input);
+        return std::move(input);
 
     // transform the rest
-    QByteArray s = qMove(input);    // will copy if T is const QByteArray
+    QByteArray s = std::move(input);    // will copy if T is const QByteArray
     char *b = s.begin();            // will detach if necessary
     char *p = b + (firstBad - orig_begin);
     e = b + s.size();
diff --git a/src/corelib/tools/qringbuffer.cpp b/src/corelib/tools/qringbuffer.cpp
index 59650ed2f7..67cce57d01 100644
--- a/src/corelib/tools/qringbuffer.cpp
+++ b/src/corelib/tools/qringbuffer.cpp
@@ -59,7 +59,7 @@ void QRingChunk::detach()
     const int chunkSize = size();
     QByteArray x(chunkSize, Qt::Uninitialized);
     ::memcpy(x.data(), chunk.constData() + headOffset, chunkSize);
-    chunk = qMove(x);
+    chunk = std::move(x);
     headOffset = 0;
     tailOffset = chunkSize;
 }
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 74debd8cfa..4c5d95d1a1 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -4458,7 +4458,7 @@ int QString::indexOf(const QRegularExpression &re, int from, QRegularExpressionM
     if (match.hasMatch()) {
         const int ret = match.capturedStart();
         if (rmatch)
-            *rmatch = qMove(match);
+            *rmatch = std::move(match);
         return ret;
     }
 
@@ -4514,7 +4514,7 @@ int QString::lastIndexOf(const QRegularExpression &re, int from, QRegularExpress
         if (start < endpos) {
             lastIndex = start;
             if (rmatch)
-                *rmatch = qMove(match);
+                *rmatch = std::move(match);
         } else {
             break;
         }
@@ -4557,7 +4557,7 @@ bool QString::contains(const QRegularExpression &re, QRegularExpressionMatch *ma
     QRegularExpressionMatch m = re.match(*this);
     bool hasMatch = m.hasMatch();
     if (hasMatch && match)
-        *match = qMove(m);
+        *match = std::move(m);
     return hasMatch;
 }
 
@@ -4717,7 +4717,7 @@ QString QString::section(const QString &sep, int start, int end, SectionFlags fl
 class qt_section_chunk {
 public:
     qt_section_chunk() {}
-    qt_section_chunk(int l, QStringRef s) : length(l), string(qMove(s)) {}
+    qt_section_chunk(int l, QStringRef s) : length(l), string(std::move(s)) {}
     int length;
     QStringRef string;
 };
@@ -6609,7 +6609,7 @@ Q_NEVER_INLINE
 static QString detachAndConvertCase(T &str, QStringIterator it)
 {
     Q_ASSERT(!str.isEmpty());
-    QString s = qMove(str);             // will copy if T is const QString
+    QString s = std::move(str);             // will copy if T is const QString
     QChar *pp = s.begin() + it.index(); // will detach if necessary
 
     do {
@@ -6667,7 +6667,7 @@ static QString convertCase(T &str)
             return detachAndConvertCase<Traits>(str, it);
         }
     }
-    return qMove(str);
+    return std::move(str);
 }
 } // namespace QUnicodeTables
 
diff --git a/src/corelib/tools/qstringalgorithms_p.h b/src/corelib/tools/qstringalgorithms_p.h
index 4bcf697f78..64d9f2e676 100644
--- a/src/corelib/tools/qstringalgorithms_p.h
+++ b/src/corelib/tools/qstringalgorithms_p.h
@@ -77,7 +77,7 @@ template <typename StringType> struct QStringAlgorithms
         if (begin != data)
             memmove(data, begin, (end - begin) * sizeof(Char));
         str.resize(end - begin);
-        return qMove(str);
+        return std::move(str);
     }
 
     static inline StringType trimmed_helper_inplace(const NakedStringType &, const Char *, const Char *)
@@ -118,7 +118,7 @@ template <typename StringType> struct QStringAlgorithms
         const Char *end = str.cend();
         NakedStringType result = isConst || !str.isDetached() ?
                                      StringType(str.size(), Qt::Uninitialized) :
-                                     qMove(str);
+                                     std::move(str);
 
         Char *dst = const_cast<Char *>(result.cbegin());
         Char *ptr = dst;
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 8aa78ccb1e..096c369e51 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -773,9 +773,9 @@ void QVector<T>::append(const T &t)
         realloc(isTooSmall ? d->size + 1 : d->alloc, opt);
 
         if (QTypeInfo<T>::isComplex)
-            new (d->end()) T(qMove(copy));
+            new (d->end()) T(std::move(copy));
         else
-            *d->end() = qMove(copy);
+            *d->end() = std::move(copy);
 
     } else {
         if (QTypeInfo<T>::isComplex)
diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp
index 6fcb9f50e9..58e3c15560 100644
--- a/src/corelib/tools/qversionnumber.cpp
+++ b/src/corelib/tools/qversionnumber.cpp
@@ -482,7 +482,7 @@ QVersionNumber QVersionNumber::fromString(QLatin1String string, int *suffixIndex
     if (suffixIndex)
         *suffixIndex = int(lastGoodEnd - string.begin());
 
-    return QVersionNumber(qMove(seg));
+    return QVersionNumber(std::move(seg));
 }
 
 void QVersionNumber::SegmentStorage::setVector(int len, int maj, int min, int mic)