Port from QAtomic::load() to loadRelaxed()

Semi-automated, just needed ~20 manual fixes:

$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)load\(\)/$1loadRelaxed\(\)/g' -i \{\} +
$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)store\(/$1storeRelaxed\(/g' -i \{\} +

It can be easily improved (e.g. for store check that there are no commas
after the opening parens). The most common offender is QLibrary::load,
and some code using std::atomic directly.

Change-Id: I07c38a3c8ed32c924ef4999e85c7e45cf48f0f6c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
 
 

2 files changed, 10 insertions, 10 deletions

diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index 9acf877790..901284e131 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -609,37 +609,37 @@ void tst_QFont::sharing()
     QFont f;
     f.setStyleHint(QFont::Serif);
     f.exactMatch(); // loads engine
-    QCOMPARE(QFontPrivate::get(f)->ref.load(), 1);
+    QCOMPARE(QFontPrivate::get(f)->ref.loadRelaxed(), 1);
     QVERIFY(QFontPrivate::get(f)->engineData);
-    QCOMPARE(QFontPrivate::get(f)->engineData->ref.load(), 1 + refs_by_cache);
+    QCOMPARE(QFontPrivate::get(f)->engineData->ref.loadRelaxed(), 1 + refs_by_cache);
 
     QFont f2(f);
     QCOMPARE(QFontPrivate::get(f2), QFontPrivate::get(f));
-    QCOMPARE(QFontPrivate::get(f2)->ref.load(), 2);
+    QCOMPARE(QFontPrivate::get(f2)->ref.loadRelaxed(), 2);
     QVERIFY(QFontPrivate::get(f2)->engineData);
     QCOMPARE(QFontPrivate::get(f2)->engineData, QFontPrivate::get(f)->engineData);
-    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.load(), 1 + refs_by_cache);
+    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.loadRelaxed(), 1 + refs_by_cache);
 
     f2.setKerning(!f.kerning());
     QVERIFY(QFontPrivate::get(f2) != QFontPrivate::get(f));
-    QCOMPARE(QFontPrivate::get(f2)->ref.load(), 1);
+    QCOMPARE(QFontPrivate::get(f2)->ref.loadRelaxed(), 1);
     QVERIFY(QFontPrivate::get(f2)->engineData);
     QCOMPARE(QFontPrivate::get(f2)->engineData, QFontPrivate::get(f)->engineData);
-    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.load(), 2 + refs_by_cache);
+    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.loadRelaxed(), 2 + refs_by_cache);
 
     f2 = f;
     QCOMPARE(QFontPrivate::get(f2), QFontPrivate::get(f));
-    QCOMPARE(QFontPrivate::get(f2)->ref.load(), 2);
+    QCOMPARE(QFontPrivate::get(f2)->ref.loadRelaxed(), 2);
     QVERIFY(QFontPrivate::get(f2)->engineData);
     QCOMPARE(QFontPrivate::get(f2)->engineData, QFontPrivate::get(f)->engineData);
-    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.load(), 1 + refs_by_cache);
+    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.loadRelaxed(), 1 + refs_by_cache);
 
     if (f.pointSize() > 0)
         f2.setPointSize(f.pointSize() * 2 / 3);
     else
         f2.setPixelSize(f.pixelSize() * 2 / 3);
     QVERIFY(QFontPrivate::get(f2) != QFontPrivate::get(f));
-    QCOMPARE(QFontPrivate::get(f2)->ref.load(), 1);
+    QCOMPARE(QFontPrivate::get(f2)->ref.loadRelaxed(), 1);
     QVERIFY(!QFontPrivate::get(f2)->engineData);
     QVERIFY(QFontPrivate::get(f2)->engineData != QFontPrivate::get(f)->engineData);
 }
diff --git a/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp b/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp
index 785cc3fef2..3d3211c7a2 100644
--- a/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp
+++ b/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp
@@ -217,7 +217,7 @@ void tst_QFontCache::clear()
 
 #ifdef QT_BUILD_INTERNAL
     QList<QFontEngine *> leakedEngines = QFontEngine_stopCollectingEngines();
-for (int i = 0; i < leakedEngines.size(); ++i) qWarning() << i << leakedEngines.at(i) << leakedEngines.at(i)->ref.load();
+for (int i = 0; i < leakedEngines.size(); ++i) qWarning() << i << leakedEngines.at(i) << leakedEngines.at(i)->ref.loadRelaxed();
     // and we are not leaking!
     QCOMPARE(leakedEngines.size(), 0);
 #endif