Replace qMove with std::move

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

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();
         }
     }

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));
 }
 
 /*!

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; }
     };

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();

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;
 }

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
 

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;

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)

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)

src/dbus/qdbusabstractinterface.cpp

@@ -185,7 +185,7 @@ bool QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, void *retu
     if (reply.signature() != QLatin1String("v")) {
         QString errmsg = QLatin1String("Invalid signature `%1' in return from call to "
                                        DBUS_INTERFACE_PROPERTIES);
-        lastError = QDBusError(QDBusError::InvalidSignature, qMove(errmsg).arg(reply.signature()));
+        lastError = QDBusError(QDBusError::InvalidSignature, std::move(errmsg).arg(reply.signature()));
         return false;
     }
 

src/dbus/qdbusintegrator.cpp

@@ -1196,7 +1196,7 @@ void QDBusConnectionPrivate::doDispatch()
             PendingMessageList::Iterator end = pendingMessages.end();
             for ( ; it != end; ++it) {
                 qDBusDebug() << this << "dequeueing message" << *it;
-                handleMessage(qMove(*it));
+                handleMessage(std::move(*it));
             }
             pendingMessages.clear();
         }

src/gui/image/qimage.cpp

@@ -1396,7 +1396,7 @@ void QImage::setColorTable(const QVector<QRgb> colors)
 #if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
     d->colortable = colors;
 #else
-    d->colortable = qMove(const_cast<QVector<QRgb>&>(colors));
+    d->colortable = std::move(const_cast<QVector<QRgb>&>(colors));
 #endif
     d->has_alpha_clut = false;
     for (int i = 0; i < d->colortable.size(); ++i) {
@@ -5587,7 +5587,7 @@ Q_GUI_EXPORT void qt_imageTransform(QImage &src, QImageIOHandler::Transformation
     if (orient == QImageIOHandler::TransformationRotate270) {
         src = rotated270(src);
     } else {
-        src = qMove(src).mirrored(orient & QImageIOHandler::TransformationMirror,
+        src = std::move(src).mirrored(orient & QImageIOHandler::TransformationMirror,
                                   orient & QImageIOHandler::TransformationFlip);
         if (orient & QImageIOHandler::TransformationRotate90)
             src = rotated90(src);

src/gui/image/qimage.h

@@ -291,11 +291,11 @@ public:
     QImage mirrored(bool horizontally = false, bool vertically = true) const &
         { return mirrored_helper(horizontally, vertically); }
     QImage &&mirrored(bool horizontally = false, bool vertically = true) &&
-        { mirrored_inplace(horizontally, vertically); return qMove(*this); }
+        { mirrored_inplace(horizontally, vertically); return std::move(*this); }
     QImage rgbSwapped() const &
         { return rgbSwapped_helper(); }
     QImage &&rgbSwapped() &&
-        { rgbSwapped_inplace(); return qMove(*this); }
+        { rgbSwapped_inplace(); return std::move(*this); }
 #else
     QImage mirrored(bool horizontally = false, bool vertically = true) const;
     QImage rgbSwapped() const;

src/gui/kernel/qevent.h

@@ -549,7 +549,7 @@ public:
     };
     class Attribute {
     public:
-        Attribute(AttributeType typ, int s, int l, QVariant val) : type(typ), start(s), length(l), value(qMove(val)) {}
+        Attribute(AttributeType typ, int s, int l, QVariant val) : type(typ), start(s), length(l), value(std::move(val)) {}
         Attribute(AttributeType typ, int s, int l) : type(typ), start(s), length(l), value() {}
 
         AttributeType type;

src/gui/opengl/qopenglgradientcache_p.h

@@ -66,7 +66,7 @@ class QOpenGL2GradientCache : public QOpenGLSharedResource
     struct CacheInfo
     {
         inline CacheInfo(QGradientStops s, qreal op, QGradient::InterpolationMode mode) :
-            stops(qMove(s)), opacity(op), interpolationMode(mode) {}
+            stops(std::move(s)), opacity(op), interpolationMode(mode) {}
 
         GLuint texId;
         QGradientStops stops;

src/gui/painting/qbrush.cpp

@@ -1140,11 +1140,11 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
         if (s.version() >= QDataStream::Qt_5_5) {
             QImage img;
             s >> img;
-            b.setTextureImage(qMove(img));
+            b.setTextureImage(std::move(img));
         } else {
             QPixmap pm;
             s >> pm;
-            b.setTexture(qMove(pm));
+            b.setTexture(std::move(pm));
         }
     } else if (style == Qt::LinearGradientPattern
                || style == Qt::RadialGradientPattern

src/gui/painting/qpaintengine_raster.cpp

@@ -4244,7 +4244,7 @@ public:
     struct CacheInfo : QSpanData::Pinnable
     {
         inline CacheInfo(QGradientStops s, int op, QGradient::InterpolationMode mode) :
-            stops(qMove(s)), opacity(op), interpolationMode(mode) {}
+            stops(std::move(s)), opacity(op), interpolationMode(mode) {}
         QRgba64 buffer64[GRADIENT_STOPTABLE_SIZE];
         QRgb buffer32[GRADIENT_STOPTABLE_SIZE];
         QGradientStops stops;

src/gui/painting/qtextureglyphcache.cpp

@@ -73,7 +73,7 @@ int QTextureGlyphCache::calculateSubPixelPositionCount(glyph_t glyph) const
             if (path.isEmpty())
                 break;
 
-            images[numImages++] = qMove(img);
+            images[numImages++] = std::move(img);
         } else {
             bool found = false;
             for (int j = 0; j < numImages; ++j) {
@@ -83,7 +83,7 @@ int QTextureGlyphCache::calculateSubPixelPositionCount(glyph_t glyph) const
                 }
             }
             if (!found)
-                images[numImages++] = qMove(img);
+                images[numImages++] = std::move(img);
         }
     }
 

src/network/access/qhttpnetworkconnection.cpp

@@ -1318,7 +1318,7 @@ QHttpNetworkConnection::QHttpNetworkConnection(const QString &hostName, quint16
     : QObject(*(new QHttpNetworkConnectionPrivate(hostName, port, encrypt, connectionType)), parent)
 {
     Q_D(QHttpNetworkConnection);
-    d->networkSession = qMove(networkSession);
+    d->networkSession = std::move(networkSession);
     d->init();
 }
 
@@ -1330,7 +1330,7 @@ QHttpNetworkConnection::QHttpNetworkConnection(quint16 connectionCount, const QS
                                                    connectionType)), parent)
 {
     Q_D(QHttpNetworkConnection);
-    d->networkSession = qMove(networkSession);
+    d->networkSession = std::move(networkSession);
     d->init();
 }
 #else
@@ -1477,7 +1477,7 @@ QSharedPointer<QSslContext> QHttpNetworkConnection::sslContext()
 void QHttpNetworkConnection::setSslContext(QSharedPointer<QSslContext> context)
 {
     Q_D(QHttpNetworkConnection);
-    d->sslContext = qMove(context);
+    d->sslContext = std::move(context);
 }
 
 void QHttpNetworkConnection::ignoreSslErrors(int channel)

src/network/access/qhttpthreaddelegate.cpp

@@ -189,7 +189,7 @@ public:
                                        QHttpNetworkConnection::ConnectionType connectionType,
                                        QSharedPointer<QNetworkSession> networkSession)
         : QHttpNetworkConnection(hostName, port, encrypt, connectionType, /*parent=*/0,
-                                 qMove(networkSession))
+                                 std::move(networkSession))
 #endif
     {
         setExpires(true);

src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp

@@ -1512,7 +1512,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData,
         if (names.name.isEmpty())
             continue;
 
-        families->append(qMove(names));
+        families->append(std::move(names));
 
         if (values || signatures)
             getFontTable(data, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length);

src/testlib/qteamcitylogger.cpp

@@ -251,7 +251,7 @@ QString QTeamCityLogger::tcEscapedString(const QString &str) const
         }
     }
 
-    return qMove(formattedString).simplified();
+    return std::move(formattedString).simplified();
 }
 
 QString QTeamCityLogger::escapedTestFuncName() const

src/testlib/qtestcase.cpp

@@ -2148,7 +2148,7 @@ QSharedPointer<QTemporaryDir> QTest::qExtractTestData(const QString &dirName)
           }
       }
 
-      result = qMove(tempDir);
+      result = std::move(tempDir);
 
       return result;
 }

src/widgets/dialogs/qerrormessage.cpp

@@ -322,8 +322,8 @@ bool QErrorMessagePrivate::nextPending()
 #else
             errors->setPlainText(message);
 #endif
-            currentMessage = qMove(message);
+            currentMessage = std::move(message);
-            currentType = qMove(type);
+            currentType = std::move(type);
             return true;
         }
     }

src/widgets/styles/qstylesheetstyle.cpp

@@ -851,7 +851,7 @@ QHash<QStyle::SubControl, QRect> QStyleSheetStyle::titleBarLayout(const QWidget
             info.rule = subRule;
             info.offset = offsets[where];
             info.where = where;
-            infos.append(qMove(info));
+            infos.append(std::move(info));
 
             offsets[where] += info.width;
         }

tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp

@@ -333,7 +333,7 @@ template <class C>
 C sorted(C c)
 {
     std::sort(c.begin(), c.end());
-    return qMove(c);
+    return std::move(c);
 }
 
 void tst_QStringListModel::setData_emits_both_roles()

tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp

@@ -291,10 +291,10 @@ void tst_QAtomicIntegerXX::copy()
     QCOMPARE(copy2.load(), atomic.load());
 
     // move
-    QAtomicInteger<T> copy3(qMove(copy));
+    QAtomicInteger<T> copy3(std::move(copy));
     QCOMPARE(copy3.load(), atomic.load());
 
-    QAtomicInteger<T> copy4 = qMove(copy2);
+    QAtomicInteger<T> copy4 = std::move(copy2);
     QCOMPARE(copy4.load(), atomic.load());
 }
 
@@ -317,11 +317,11 @@ void tst_QAtomicIntegerXX::assign()
 
     // move
     QAtomicInteger<T> copy3;
-    copy3 = qMove(copy);
+    copy3 = std::move(copy);
     QCOMPARE(copy3.load(), atomic.load());
 
     QAtomicInteger<T> copy4;
-    copy4 = qMove(copy2);
+    copy4 = std::move(copy2);
     QCOMPARE(copy4.load(), atomic.load());
 }
 

tests/auto/corelib/tools/collections/tst_collections.cpp

@@ -2425,7 +2425,7 @@ void testContainer()
         c1 = newInstance<Container>();
         QVERIFY(c1.size() == 4);
         QVERIFY(c1 == newInstance<Container>());
-        Container c2 = qMove(c1);
+        Container c2 = std::move(c1);
         QVERIFY(c2.size() == 4);
         QVERIFY(c2 == newInstance<Container>());
     }

tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp

@@ -2245,28 +2245,28 @@ void tst_QByteArray::toUpperLower()
     QCOMPARE(input.toLower(), lower);
 
     QByteArray copy = input;
-    QCOMPARE(qMove(copy).toUpper(), upper);
+    QCOMPARE(std::move(copy).toUpper(), upper);
     copy = input;
     copy.detach();
-    QCOMPARE(qMove(copy).toUpper(), upper);
+    QCOMPARE(std::move(copy).toUpper(), upper);
 
     copy = input;
-    QCOMPARE(qMove(copy).toLower(), lower);
+    QCOMPARE(std::move(copy).toLower(), lower);
     copy = input;
     copy.detach();
-    QCOMPARE(qMove(copy).toLower(), lower);
+    QCOMPARE(std::move(copy).toLower(), lower);
 
     copy = lower;
-    QCOMPARE(qMove(copy).toLower(), lower);
+    QCOMPARE(std::move(copy).toLower(), lower);
     copy = lower;
     copy.detach();
-    QCOMPARE(qMove(copy).toLower(), lower);
+    QCOMPARE(std::move(copy).toLower(), lower);
 
     copy = upper;
-    QCOMPARE(qMove(copy).toUpper(), upper);
+    QCOMPARE(std::move(copy).toUpper(), upper);
     copy = upper;
     copy.detach();
-    QCOMPARE(qMove(copy).toUpper(), upper);
+    QCOMPARE(std::move(copy).toUpper(), upper);
 }
 
 void tst_QByteArray::isUpper()

tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp

@@ -194,22 +194,22 @@ void tst_QByteArrayList::operator_plus() const
     {
         QByteArrayList bal1 = lhs;
         const QByteArrayList bal2 = rhs;
-        QCOMPARE(qMove(bal1) + bal2, expectedResult);
+        QCOMPARE(std::move(bal1) + bal2, expectedResult);
     }
     {
         QList<QByteArray> lba1 = lhs;
         const QByteArrayList bal2 = rhs;
-        QCOMPARE(qMove(lba1) + bal2, expectedResult);
+        QCOMPARE(std::move(lba1) + bal2, expectedResult);
     }
     {
         QByteArrayList bal1 = lhs;
         const QList<QByteArray> lba2 = rhs;
-        QCOMPARE(qMove(bal1) + lba2, expectedResult);
+        QCOMPARE(std::move(bal1) + lba2, expectedResult);
     }
     {
         QList<QByteArray> lba1 = lhs;
         const QList<QByteArray> lba2 = rhs;
-        QCOMPARE(qMove(lba1) + lba2, QList<QByteArray>(expectedResult)); // check we don't mess with old code
+        QCOMPARE(std::move(lba1) + lba2, QList<QByteArray>(expectedResult)); // check we don't mess with old code
     }
 
     // operator += for const lvalues
@@ -232,7 +232,7 @@ void tst_QByteArrayList::operator_plus() const
     QByteArrayList t1 = lhs;
     QByteArrayList t2 = rhs;
 
-    QCOMPARE(qMove(t1) + t2, expectedResult);
+    QCOMPARE(std::move(t1) + t2, expectedResult);
 }
 
 void tst_QByteArrayList::operator_plus_data() const

tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp

@@ -68,7 +68,7 @@ void tst_QContiguousCache::assignment()
    // copy:
    cc1 = cc2;
    // move:
-   cc1 = qMove(cc2);
+   cc1 = std::move(cc2);
 }
 
 void tst_QContiguousCache::empty()

tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp

@@ -573,10 +573,10 @@ void tst_QSharedPointer::useOfForwardDeclared()
 
     // move assignment:
     QSharedPointer<ForwardDeclared> sp4;
-    sp4 = qMove(sp);
+    sp4 = std::move(sp);
 
     // and move constuction:
-    QSharedPointer<ForwardDeclared> sp5 = qMove(sp2);
+    QSharedPointer<ForwardDeclared> sp5 = std::move(sp2);
 
     // swapping:
     sp4.swap(sp3);

tests/auto/corelib/tools/qstring/tst_qstring.cpp

@@ -2202,12 +2202,12 @@ void tst_QString::toUpper()
 
         // call rvalue-ref while shared (the original mustn't change)
         QString copy = s;
-        QCOMPARE(qMove(copy).toUpper(), QString("GROSSSTRASSE"));
+        QCOMPARE(std::move(copy).toUpper(), QString("GROSSSTRASSE"));
         QCOMPARE(s, QString::fromUtf8("Gro\xc3\x9fstra\xc3\x9f""e"));
 
         // call rvalue-ref version on detached case
         copy.clear();
-        QCOMPARE(qMove(s).toUpper(), QString("GROSSSTRASSE"));
+        QCOMPARE(std::move(s).toUpper(), QString("GROSSSTRASSE"));
     }
 
     QString lower, upper;
@@ -2417,11 +2417,11 @@ void tst_QString::trimmed()
     QCOMPARE(a.trimmed(), QLatin1String("a"));
 
     a="Text";
-    QCOMPARE(qMove(a).trimmed(), QLatin1String("Text"));
+    QCOMPARE(std::move(a).trimmed(), QLatin1String("Text"));
     a=" ";
-    QCOMPARE(qMove(a).trimmed(), QLatin1String(""));
+    QCOMPARE(std::move(a).trimmed(), QLatin1String(""));
     a=" a   ";
-    QCOMPARE(qMove(a).trimmed(), QLatin1String("a"));
+    QCOMPARE(std::move(a).trimmed(), QLatin1String("a"));
 }
 
 void tst_QString::simplified_data()
@@ -2476,13 +2476,13 @@ void tst_QString::simplified()
 
     // without detaching:
     QString copy1 = full;
-    QCOMPARE(qMove(full).simplified(), simple);
+    QCOMPARE(std::move(full).simplified(), simple);
     QCOMPARE(full, orig_full);
 
     // force a detach
     if (!full.isEmpty())
         full[0] = full[0];
-    QCOMPARE(qMove(full).simplified(), simple);
+    QCOMPARE(std::move(full).simplified(), simple);
 }
 
 void tst_QString::insert_data(bool emptyIsNoop)
@@ -4524,7 +4524,7 @@ void tst_QString::toLatin1Roundtrip()
 
     // try the rvalue version of toLatin1()
     QString s = unicodesrc;
-    QCOMPARE(qMove(s).toLatin1(), latin1);
+    QCOMPARE(std::move(s).toLatin1(), latin1);
 
     // and verify that the moved-from object can still be used
     s = "foo";

tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp

@@ -436,7 +436,7 @@ void tst_QVersionNumber::normalized()
     QFETCH(QVersionNumber, expected);
 
     QCOMPARE(version.normalized(), expected);
-    QCOMPARE(qMove(version).normalized(), expected);
+    QCOMPARE(std::move(version).normalized(), expected);
 }
 
 void tst_QVersionNumber::isNormalized_data()
@@ -590,21 +590,21 @@ void tst_QVersionNumber::moveSemantics()
     // QVersionNumber(QVersionNumber &&)
     {
         QVersionNumber v1(1, 2, 3);
-        QVersionNumber v2 = qMove(v1);
+        QVersionNumber v2 = std::move(v1);
         QCOMPARE(v2, QVersionNumber(1, 2, 3));
     }
     // QVersionNumber &operator=(QVersionNumber &&)
     {
         QVersionNumber v1(1, 2, 3);
         QVersionNumber v2;
-        v2 = qMove(v1);
+        v2 = std::move(v1);
         QCOMPARE(v2, QVersionNumber(1, 2, 3));
     }
     // QVersionNumber(QVector<int> &&)
     {
         QVector<int> segments = QVector<int>() << 1 << 2 << 3;
         QVersionNumber v1(segments);
-        QVersionNumber v2(qMove(segments));
+        QVersionNumber v2(std::move(segments));
         QVERIFY(!v1.isNull());
         QVERIFY(!v2.isNull());
         QCOMPARE(v1, v2);
@@ -620,7 +620,7 @@ void tst_QVersionNumber::moveSemantics()
         QVERIFY(!v.isNull());
         QVERIFY(!nv.isNull());
         QVERIFY(nv.isNormalized());
-        nv = qMove(v).normalized();
+        nv = std::move(v).normalized();
         QVERIFY(!nv.isNull());
         QVERIFY(nv.isNormalized());
     }
@@ -632,7 +632,7 @@ void tst_QVersionNumber::moveSemantics()
         segments = v.segments();
         QVERIFY(!v.isNull());
         QVERIFY(!segments.empty());
-        segments = qMove(v).segments();
+        segments = std::move(v).segments();
         QVERIFY(!segments.empty());
     }
 #endif

tests/auto/gui/image/qimage/tst_qimage.cpp

@@ -3403,7 +3403,7 @@ void tst_QImage::ditherGradient_data()
     QTest::newRow("rgb32 -> rgb666 (dithering)") << rgb32 << QImage::Format_RGB666 << int(Qt::PreferDither | Qt::OrderedDither) << 129;
 
     // Test we get the same results for opaque input in the ARGBPM implementation.
-    rgb32 = qMove(rgb32).convertToFormat(QImage::Format_ARGB32_Premultiplied);
+    rgb32 = std::move(rgb32).convertToFormat(QImage::Format_ARGB32_Premultiplied);
     QTest::newRow("argb32pm -> argb4444pm (no dither)") << rgb32 << QImage::Format_ARGB4444_Premultiplied << 0 << 16;
     QTest::newRow("argb32pm -> rgb444 (dithering)") << rgb32 << QImage::Format_RGB444 << int(Qt::PreferDither | Qt::OrderedDither) << 33;
     QTest::newRow("argb32pm -> argb4444pm (dithering)") << rgb32 << QImage::Format_ARGB4444_Premultiplied << int(Qt::PreferDither | Qt::OrderedDither) << 33;

tests/auto/gui/kernel/qpalette/tst_qpalette.cpp

@@ -148,14 +148,14 @@ void tst_QPalette::moveSemantics()
     QCOMPARE(src, control);
     QVERIFY(!dst.isCopyOf(src));
     QVERIFY(!dst.isCopyOf(control));
-    dst = qMove(src); // move assignment
+    dst = std::move(src); // move assignment
     QVERIFY(!dst.isCopyOf(src)); // isCopyOf() works on moved-from palettes, too
     QVERIFY(dst.isCopyOf(control));
     QCOMPARE(dst, control);
     src = control; // check moved-from 'src' can still be assigned to (doesn't crash)
     QVERIFY(src.isCopyOf(dst));
     QVERIFY(src.isCopyOf(control));
-    QPalette dst2(qMove(src)); // move construction
+    QPalette dst2(std::move(src)); // move construction
     QVERIFY(!src.isCopyOf(dst));
     QVERIFY(!src.isCopyOf(dst2));
     QVERIFY(!src.isCopyOf(control));

tests/auto/gui/painting/qpen/tst_qpen.cpp

@@ -95,7 +95,7 @@ void tst_QPen::move()
     QPen p1(Qt::black);
 
     // check that moving does the right thing:
-    QPen p2 = qMove(p1); // could be move or copy construction, so don't check p1's state
+    QPen p2 = std::move(p1); // could be move or copy construction, so don't check p1's state
     QCOMPARE(p2.color(), QColor(Qt::black));
 
     // this, executed ehre, would crash:
@@ -110,7 +110,7 @@ void tst_QPen::move()
     QCOMPARE(p1.color(), QColor(Qt::yellow));
 
     // check that moved-from QPens p2, p3 can still be safely destroyed:
-    QPen p5 = qMove(p2);
+    QPen p5 = std::move(p2);
 
     // intentionally no more statements beyond this point
 }
@@ -120,7 +120,7 @@ void tst_QPen::move_assign()
     QPen p1(Qt::black), p2(Qt::white);
 
     // check that moving does the right thing:
-    p2 = qMove(p1); // could be move or copy assignment, so don't check p1's state
+    p2 = std::move(p1); // could be move or copy assignment, so don't check p1's state
     QCOMPARE(p2.color(), QColor(Qt::black));
 
     // check that move-assigned-from QPen p1 can still be used, albeit
@@ -137,7 +137,7 @@ void tst_QPen::move_assign()
 
     // check that moved-from QPens p2, p3 can still be safely destroyed:
     QPen p5;
-    p5 = qMove(p2);
+    p5 = std::move(p2);
 
     // intentionally no more statements beyond this point
 }

tests/auto/network/kernel/qnetworkdatagram/tst_qnetworkdatagram.cpp

@@ -131,7 +131,7 @@ void tst_QNetworkDatagram::makeReply()
     QNetworkDatagram copy = dgram;
     copy.setData(copy.data());
     {
-        QNetworkDatagram reply = qMove(copy).makeReply("World");
+        QNetworkDatagram reply = std::move(copy).makeReply("World");
         QCOMPARE(reply.data(), QByteArray("World"));
         QCOMPARE(reply.senderAddress(), QHostAddress(localAddress));
         QCOMPARE(reply.senderPort(), localAddress.isEmpty() ? -1 : dgram.destinationPort());

tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp

@@ -252,7 +252,7 @@ class QTestTranslator : public QTranslator
 {
     const QString m_str;
 public:
-    explicit QTestTranslator(QString str) : m_str(qMove(str)) {}
+    explicit QTestTranslator(QString str) : m_str(std::move(str)) {}
 
     QString translate(const char *, const char *sourceText, const char *, int) const override
     { return m_str + sourceText + m_str; }
@@ -265,7 +265,7 @@ class QTranslatorGuard {
     Translator t;
 public:
     template <typename Arg>
-    explicit QTranslatorGuard(Arg a) : t(qMove(a))
+    explicit QTranslatorGuard(Arg a) : t(std::move(a))
     { qApp->installTranslator(&t); }
     ~QTranslatorGuard()
     { qApp->removeTranslator(&t); }

tests/benchmarks/gui/image/qimageconversion/tst_qimageconversion.cpp

@@ -357,10 +357,10 @@ void tst_QImageConversion::convertGenericInplace()
     QFETCH(QImage::Format, outputFormat);
 
     QImage::Format inputFormat = inputImage.format();
-    QImage tmpImage = qMove(inputImage);
+    QImage tmpImage = std::move(inputImage);
 
     QBENCHMARK {
-        tmpImage = (qMove(tmpImage).convertToFormat(outputFormat)).convertToFormat(inputFormat);
+        tmpImage = (std::move(tmpImage).convertToFormat(outputFormat)).convertToFormat(inputFormat);
     }
 }