summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2021-08-20 17:14:39 +0200
committerDaniel Schürmann <daschuer@mixxx.org>2021-08-20 17:14:39 +0200
commit4e8b18021dbf6995afaca092348c937ff1737cee (patch)
tree116310268f528137655bdd79ffe758500a3dc747 /src/control
parent98d1c9f7ebf78265bdcbfa01fb1fefd5d459d1c0 (diff)
Rename s_pDefaultCO
Diffstat (limited to 'src/control')
-rw-r--r--src/control/control.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/control/control.cpp b/src/control/control.cpp
index 831f7e41d1..5fee1f3306 100644
--- a/src/control/control.cpp
+++ b/src/control/control.cpp
@@ -26,7 +26,7 @@ static QHash<ConfigKey, ConfigKey> s_qCOAliasHash
GUARDED_BY(s_qCOHashMutex);
/// is used instead of a nullptr, helps to omit null checks everywhere
-static QWeakPointer<ControlDoublePrivate> s_defaultCO;
+static QWeakPointer<ControlDoublePrivate> s_pDefaultCO;
} // namespace
ControlDoublePrivate::ControlDoublePrivate()
@@ -184,16 +184,16 @@ QSharedPointer<ControlDoublePrivate> ControlDoublePrivate::getControl(
//static
QSharedPointer<ControlDoublePrivate> ControlDoublePrivate::getDefaultControl() {
- auto defaultCO = QSharedPointer<ControlDoublePrivate>(s_defaultCO);
+ auto defaultCO = QSharedPointer<ControlDoublePrivate>(s_pDefaultCO);
if (!defaultCO) {
// Try again with the mutex locked to protect against creating two
// ControlDoublePrivateConst objects. Access to s_defaultCO itself is
// thread save.
MMutexLocker locker(&s_qCOHashMutex);
- defaultCO = QSharedPointer<ControlDoublePrivate>(s_defaultCO);
+ defaultCO = QSharedPointer<ControlDoublePrivate>(s_pDefaultCO);
if (!defaultCO) {
defaultCO = QSharedPointer<ControlDoublePrivate>(new ControlDoublePrivateConst());
- s_defaultCO = defaultCO;
+ s_pDefaultCO = defaultCO;
}
}
return defaultCO;