Settings classes: unify on QUO_ macro prefix

At some point macros were prepended with QTNT (pronounced "cute-n't",
"Quotient" with vowels dropped) but that didn't go very far. Having
forgotten about this, I introduced QUO prefix in a few places. Being
initial letters of "Quotient", QUO feels more understandable (and
coincidentally is a well-known Latin word); so let's unify on this.

4 files changed, 14 insertions, 14 deletions

diff --git a/lib/networksettings.cpp b/lib/networksettings.cpp
index ce46ce5f..06b1fdf9 100644
--- a/lib/networksettings.cpp
+++ b/lib/networksettings.cpp
@@ -11,9 +11,9 @@ void NetworkSettings::setupApplicationProxy() const
         { proxyType(), proxyHostName(), proxyPort() });
 }
 
-QTNT_DEFINE_SETTING(NetworkSettings, QNetworkProxy::ProxyType, proxyType,
+QUO_DEFINE_SETTING(NetworkSettings, QNetworkProxy::ProxyType, proxyType,
                    "proxy_type", QNetworkProxy::DefaultProxy, setProxyType)
-QTNT_DEFINE_SETTING(NetworkSettings, QString, proxyHostName, "proxy_hostname",
+QUO_DEFINE_SETTING(NetworkSettings, QString, proxyHostName, "proxy_hostname",
                    {}, setProxyHostName)
-QTNT_DEFINE_SETTING(NetworkSettings, quint16, proxyPort, "proxy_port", -1,
+QUO_DEFINE_SETTING(NetworkSettings, quint16, proxyPort, "proxy_port", -1,
                    setProxyPort)
diff --git a/lib/networksettings.h b/lib/networksettings.h
index df11a9c8..b83a0e15 100644
--- a/lib/networksettings.h
+++ b/lib/networksettings.h
@@ -12,9 +12,9 @@ Q_DECLARE_METATYPE(QNetworkProxy::ProxyType)
 namespace Quotient {
 class NetworkSettings : public SettingsGroup {
     Q_OBJECT
-    QTNT_DECLARE_SETTING(QNetworkProxy::ProxyType, proxyType, setProxyType)
-    QTNT_DECLARE_SETTING(QString, proxyHostName, setProxyHostName)
-    QTNT_DECLARE_SETTING(quint16, proxyPort, setProxyPort)
+    QUO_DECLARE_SETTING(QNetworkProxy::ProxyType, proxyType, setProxyType)
+    QUO_DECLARE_SETTING(QString, proxyHostName, setProxyHostName)
+    QUO_DECLARE_SETTING(quint16, proxyPort, setProxyPort)
     Q_PROPERTY(QString proxyHost READ proxyHostName WRITE setProxyHostName)
 public:
     template <typename... ArgTs>
diff --git a/lib/settings.cpp b/lib/settings.cpp
index ed9082b0..5549e4de 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -102,11 +102,11 @@ void SettingsGroup::remove(const QString& key)
     Settings::remove(fullKey);
 }
 
-QTNT_DEFINE_SETTING(AccountSettings, QString, deviceId, "device_id", {},
+QUO_DEFINE_SETTING(AccountSettings, QString, deviceId, "device_id", {},
                    setDeviceId)
-QTNT_DEFINE_SETTING(AccountSettings, QString, deviceName, "device_name", {},
+QUO_DEFINE_SETTING(AccountSettings, QString, deviceName, "device_name", {},
                    setDeviceName)
-QTNT_DEFINE_SETTING(AccountSettings, bool, keepLoggedIn, "keep_logged_in", false,
+QUO_DEFINE_SETTING(AccountSettings, bool, keepLoggedIn, "keep_logged_in", false,
                    setKeepLoggedIn)
 
 static const auto HomeserverKey = QStringLiteral("homeserver");
diff --git a/lib/settings.h b/lib/settings.h
index efd0d714..3cab8958 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -104,7 +104,7 @@ private:
     QString groupPath;
 };
 
-#define QTNT_DECLARE_SETTING(type, propname, setter)      \
+#define QUO_DECLARE_SETTING(type, propname, setter)      \
     Q_PROPERTY(type propname READ propname WRITE setter) \
 public:                                                  \
     type propname() const;                               \
@@ -112,7 +112,7 @@ public:                                                  \
                                                          \
 private:
 
-#define QTNT_DEFINE_SETTING(classname, type, propname, qsettingname,   \
+#define QUO_DEFINE_SETTING(classname, type, propname, qsettingname,   \
                            defaultValue, setter)                      \
     type classname::propname() const                                  \
     {                                                                 \
@@ -127,9 +127,9 @@ private:
 class AccountSettings : public SettingsGroup {
     Q_OBJECT
     Q_PROPERTY(QString userId READ userId CONSTANT)
-    QTNT_DECLARE_SETTING(QString, deviceId, setDeviceId)
-    QTNT_DECLARE_SETTING(QString, deviceName, setDeviceName)
-    QTNT_DECLARE_SETTING(bool, keepLoggedIn, setKeepLoggedIn)
+    QUO_DECLARE_SETTING(QString, deviceId, setDeviceId)
+    QUO_DECLARE_SETTING(QString, deviceName, setDeviceName)
+    QUO_DECLARE_SETTING(bool, keepLoggedIn, setKeepLoggedIn)
     Q_PROPERTY(QByteArray encryptionAccountPickle READ encryptionAccountPickle
                    WRITE setEncryptionAccountPickle)
 public: