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>
 
 

5 files changed, 17 insertions, 17 deletions

diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp
index 91b3396217..f6ff56c83c 100644
--- a/src/corelib/io/qloggingcategory.cpp
+++ b/src/corelib/io/qloggingcategory.cpp
@@ -239,7 +239,7 @@ QLoggingCategory::QLoggingCategory(const char *category, QtMsgType enableForLeve
 
 void QLoggingCategory::init(const char *category, QtMsgType severityLevel)
 {
-    enabled.store(0x01010101);   // enabledDebug = enabledWarning = enabledCritical = true;
+    enabled.storeRelaxed(0x01010101);   // enabledDebug = enabledWarning = enabledCritical = true;
 
     if (category)
         name = category;
@@ -342,10 +342,10 @@ void QLoggingCategory::setEnabled(QtMsgType type, bool enable)
 {
     switch (type) {
 #ifdef Q_ATOMIC_INT8_IS_SUPPORTED
-    case QtDebugMsg: bools.enabledDebug.store(enable); break;
-    case QtInfoMsg: bools.enabledInfo.store(enable); break;
-    case QtWarningMsg: bools.enabledWarning.store(enable); break;
-    case QtCriticalMsg: bools.enabledCritical.store(enable); break;
+    case QtDebugMsg: bools.enabledDebug.storeRelaxed(enable); break;
+    case QtInfoMsg: bools.enabledInfo.storeRelaxed(enable); break;
+    case QtWarningMsg: bools.enabledWarning.storeRelaxed(enable); break;
+    case QtCriticalMsg: bools.enabledCritical.storeRelaxed(enable); break;
 #else
     case QtDebugMsg: setBoolLane(&enabled, enable, DebugShift); break;
     case QtInfoMsg: setBoolLane(&enabled, enable, InfoShift); break;
diff --git a/src/corelib/io/qloggingcategory.h b/src/corelib/io/qloggingcategory.h
index 5825095729..1c3e10b493 100644
--- a/src/corelib/io/qloggingcategory.h
+++ b/src/corelib/io/qloggingcategory.h
@@ -58,15 +58,15 @@ public:
     void setEnabled(QtMsgType type, bool enable);
 
 #ifdef Q_ATOMIC_INT8_IS_SUPPORTED
-    bool isDebugEnabled() const { return bools.enabledDebug.load(); }
-    bool isInfoEnabled() const { return bools.enabledInfo.load(); }
-    bool isWarningEnabled() const { return bools.enabledWarning.load(); }
-    bool isCriticalEnabled() const { return bools.enabledCritical.load(); }
+    bool isDebugEnabled() const { return bools.enabledDebug.loadRelaxed(); }
+    bool isInfoEnabled() const { return bools.enabledInfo.loadRelaxed(); }
+    bool isWarningEnabled() const { return bools.enabledWarning.loadRelaxed(); }
+    bool isCriticalEnabled() const { return bools.enabledCritical.loadRelaxed(); }
 #else
-    bool isDebugEnabled() const { return enabled.load() >> DebugShift & 1; }
-    bool isInfoEnabled() const { return enabled.load() >> InfoShift & 1; }
-    bool isWarningEnabled() const { return enabled.load() >> WarningShift & 1; }
-    bool isCriticalEnabled() const { return enabled.load() >> CriticalShift & 1; }
+    bool isDebugEnabled() const { return enabled.loadRelaxed() >> DebugShift & 1; }
+    bool isInfoEnabled() const { return enabled.loadRelaxed() >> InfoShift & 1; }
+    bool isWarningEnabled() const { return enabled.loadRelaxed() >> WarningShift & 1; }
+    bool isCriticalEnabled() const { return enabled.loadRelaxed() >> CriticalShift & 1; }
 #endif
     const char *categoryName() const { return name; }
 
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
index 00acb81158..d02e87837c 100644
--- a/src/corelib/io/qprocess_p.h
+++ b/src/corelib/io/qprocess_p.h
@@ -220,7 +220,7 @@ public:
 
 template<> Q_INLINE_TEMPLATE void QSharedDataPointer<QProcessEnvironmentPrivate>::detach()
 {
-    if (d && d->ref.load() == 1)
+    if (d && d->ref.loadRelaxed() == 1)
         return;
     QProcessEnvironmentPrivate *x = (d ? new QProcessEnvironmentPrivate(*d)
                                      : new QProcessEnvironmentPrivate);
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 9bebfff53f..f82ad48b2c 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -3802,7 +3802,7 @@ void QUrl::detach()
 */
 bool QUrl::isDetached() const
 {
-    return !d || d->ref.load() == 1;
+    return !d || d->ref.loadRelaxed() == 1;
 }
 
 
diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp
index a8f40a3a12..36a2880bf1 100644
--- a/src/corelib/io/qurlquery.cpp
+++ b/src/corelib/io/qurlquery.cpp
@@ -189,7 +189,7 @@ public:
 
 template<> void QSharedDataPointer<QUrlQueryPrivate>::detach()
 {
-    if (d && d->ref.load() == 1)
+    if (d && d->ref.loadRelaxed() == 1)
         return;
     QUrlQueryPrivate *x = (d ? new QUrlQueryPrivate(*d)
                              : new QUrlQueryPrivate);
@@ -462,7 +462,7 @@ bool QUrlQuery::isEmpty() const
 */
 bool QUrlQuery::isDetached() const
 {
-    return d && d->ref.load() == 1;
+    return d && d->ref.loadRelaxed() == 1;
 }
 
 /*!