X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsettings.cpp;h=f525e3df8553d9e2bc5a10f4404e32c108918334;hp=87c0fc55261db4b55299c0f4ad9922b31d7eb6e6;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hpb=61f33c7895e324f6e95034d86897ad2e963653f1

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 87c0fc55..f525e3df 100644
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,44 +18,39 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <utility>
-
-#include <QStringList>
-
 #include "clientsettings.h"
 
+#include <utility>
+
 #include <QHostAddress>
+#include <QStringList>
 #ifdef HAVE_SSL
-#include <QSslSocket>
+#    include <QSslSocket>
 #endif
 
 #include "client.h"
 #include "quassel.h"
 
-ClientSettings::ClientSettings(QString g) : Settings(g, Quassel::buildInfo().clientApplicationName)
-{
-}
-
+ClientSettings::ClientSettings(QString g)
+    : Settings(g, Quassel::buildInfo().clientApplicationName)
+{}
 
 /***********************************************************************************************/
 
 CoreAccountSettings::CoreAccountSettings(QString subgroup)
-    : ClientSettings("CoreAccounts"),
-    _subgroup(std::move(subgroup))
-{
-}
-
+    : ClientSettings("CoreAccounts")
+    , _subgroup(std::move(subgroup))
+{}
 
-void CoreAccountSettings::notify(const QString &key, QObject *receiver, const char *slot) const
+QString CoreAccountSettings::keyForNotify(const QString& key) const
 {
-    ClientSettings::notify(QString("%1/%2/%3").arg(Client::currentCoreAccount().accountId().toInt()).arg(_subgroup).arg(key), receiver, slot);
+    return QString{"%1/%2/%3"}.arg(Client::currentCoreAccount().accountId().toInt()).arg(_subgroup).arg(key);
 }
 
-
 QList<AccountId> CoreAccountSettings::knownAccounts() const
 {
     QList<AccountId> ids;
-    foreach(const QString &key, localChildGroups()) {
+    foreach (const QString& key, localChildGroups()) {
         AccountId acc = key.toInt();
         if (acc.isValid())
             ids << acc;
@@ -63,59 +58,50 @@ QList<AccountId> CoreAccountSettings::knownAccounts() const
     return ids;
 }
 
-
 AccountId CoreAccountSettings::lastAccount() const
 {
     return localValue("LastAccount", 0).toInt();
 }
 
-
 void CoreAccountSettings::setLastAccount(AccountId account)
 {
     setLocalValue("LastAccount", account.toInt());
 }
 
-
 AccountId CoreAccountSettings::autoConnectAccount() const
 {
     return localValue("AutoConnectAccount", 0).toInt();
 }
 
-
 void CoreAccountSettings::setAutoConnectAccount(AccountId account)
 {
     setLocalValue("AutoConnectAccount", account.toInt());
 }
 
-
 bool CoreAccountSettings::autoConnectOnStartup() const
 {
     return localValue("AutoConnectOnStartup", false).toBool();
 }
 
-
 void CoreAccountSettings::setAutoConnectOnStartup(bool b)
 {
     setLocalValue("AutoConnectOnStartup", b);
 }
 
-
 bool CoreAccountSettings::autoConnectToFixedAccount() const
 {
     return localValue("AutoConnectToFixedAccount", false).toBool();
 }
 
-
 void CoreAccountSettings::setAutoConnectToFixedAccount(bool b)
 {
     setLocalValue("AutoConnectToFixedAccount", b);
 }
 
-
-void CoreAccountSettings::storeAccountData(AccountId id, const QVariantMap &data)
+void CoreAccountSettings::storeAccountData(AccountId id, const QVariantMap& data)
 {
     QString base = QString::number(id.toInt());
-    foreach(const QString &key, data.keys()) {
+    foreach (const QString& key, data.keys()) {
         setLocalValue(base + "/" + key, data.value(key));
     }
 
@@ -123,12 +109,11 @@ void CoreAccountSettings::storeAccountData(AccountId id, const QVariantMap &data
     removeLocalKey(QString("%1/Connection").arg(base));
 }
 
-
 QVariantMap CoreAccountSettings::retrieveAccountData(AccountId id) const
 {
     QVariantMap map;
     QString base = QString::number(id.toInt());
-    foreach(const QString &key, localChildKeys(base)) {
+    foreach (const QString& key, localChildKeys(base)) {
         map[key] = localValue(base + "/" + key);
     }
 
@@ -157,35 +142,31 @@ QVariantMap CoreAccountSettings::retrieveAccountData(AccountId id) const
     return map;
 }
 
-
-void CoreAccountSettings::setAccountValue(const QString &key, const QVariant &value)
+void CoreAccountSettings::setAccountValue(const QString& key, const QVariant& value)
 {
     if (!Client::currentCoreAccount().isValid())
         return;
     setLocalValue(QString("%1/%2/%3").arg(Client::currentCoreAccount().accountId().toInt()).arg(_subgroup).arg(key), value);
 }
 
-
-QVariant CoreAccountSettings::accountValue(const QString &key, const QVariant &def) const
+QVariant CoreAccountSettings::accountValue(const QString& key, const QVariant& def) const
 {
     if (!Client::currentCoreAccount().isValid())
         return QVariant();
     return localValue(QString("%1/%2/%3").arg(Client::currentCoreAccount().accountId().toInt()).arg(_subgroup).arg(key), def);
 }
 
-
-void CoreAccountSettings::setJumpKeyMap(const QHash<int, BufferId> &keyMap)
+void CoreAccountSettings::setJumpKeyMap(const QHash<int, BufferId>& keyMap)
 {
     QVariantMap variants;
     QHash<int, BufferId>::const_iterator mapIter = keyMap.constBegin();
     while (mapIter != keyMap.constEnd()) {
-        variants[QString::number(mapIter.key())] = qVariantFromValue(mapIter.value());
+        variants[QString::number(mapIter.key())] = QVariant::fromValue(mapIter.value());
         ++mapIter;
     }
     setAccountValue("JumpKeyMap", variants);
 }
 
-
 QHash<int, BufferId> CoreAccountSettings::jumpKeyMap() const
 {
     QHash<int, BufferId> keyMap;
@@ -198,17 +179,15 @@ QHash<int, BufferId> CoreAccountSettings::jumpKeyMap() const
     return keyMap;
 }
 
-
-void CoreAccountSettings::setBufferViewOverlay(const QSet<int> &viewIds)
+void CoreAccountSettings::setBufferViewOverlay(const QSet<int>& viewIds)
 {
     QVariantList variants;
-    foreach(int viewId, viewIds) {
-        variants << qVariantFromValue(viewId);
+    foreach (int viewId, viewIds) {
+        variants << QVariant::fromValue(viewId);
     }
     setAccountValue("BufferViewOverlay", variants);
 }
 
-
 QSet<int> CoreAccountSettings::bufferViewOverlay() const
 {
     QSet<int> viewIds;
@@ -219,20 +198,17 @@ QSet<int> CoreAccountSettings::bufferViewOverlay() const
     return viewIds;
 }
 
-
 void CoreAccountSettings::removeAccount(AccountId id)
 {
     removeLocalKey(QString("%1").arg(id.toInt()));
 }
 
-
 void CoreAccountSettings::clearAccounts()
 {
-    foreach(const QString &key, localChildGroups())
-    removeLocalKey(key);
+    foreach (const QString& key, localChildGroups())
+        removeLocalKey(key);
 }
 
-
 /***********************************************************************************************/
 // CoreConnectionSettings:
 
@@ -245,201 +221,167 @@ void CoreConnectionSettings::setNetworkDetectionMode(NetworkDetectionMode mode)
     setLocalValue("NetworkDetectionMode", mode);
 }
 
-
 CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettings::networkDetectionMode() const
 {
     auto mode = localValue("NetworkDetectionMode", UseQNetworkConfigurationManager).toInt();
     if (mode == 0)
-        mode = UseQNetworkConfigurationManager; // UseSolid is gone, map that to the new default
+        mode = UseQNetworkConfigurationManager;  // UseSolid is gone, map that to the new default
     return static_cast<NetworkDetectionMode>(mode);
 }
 
-
 void CoreConnectionSettings::setAutoReconnect(bool autoReconnect)
 {
     setLocalValue("AutoReconnect", autoReconnect);
 }
 
-
 bool CoreConnectionSettings::autoReconnect() const
 {
     return localValue("AutoReconnect", true).toBool();
 }
 
-
 void CoreConnectionSettings::setPingTimeoutInterval(int interval)
 {
     setLocalValue("PingTimeoutInterval", interval);
 }
 
-
 int CoreConnectionSettings::pingTimeoutInterval() const
 {
     return localValue("PingTimeoutInterval", 60).toInt();
 }
 
-
 void CoreConnectionSettings::setReconnectInterval(int interval)
 {
     setLocalValue("ReconnectInterval", interval);
 }
 
-
 int CoreConnectionSettings::reconnectInterval() const
 {
     return localValue("ReconnectInterval", 60).toInt();
 }
 
-
 /***********************************************************************************************/
 // NotificationSettings:
 
 NotificationSettings::NotificationSettings()
     : ClientSettings("Notification")
-{
-}
-
+{}
 
-void NotificationSettings::setValue(const QString &key, const QVariant &data)
+void NotificationSettings::setValue(const QString& key, const QVariant& data)
 {
     setLocalValue(key, data);
 }
 
-
-QVariant NotificationSettings::value(const QString &key, const QVariant &def) const
+QVariant NotificationSettings::value(const QString& key, const QVariant& def) const
 {
     return localValue(key, def);
 }
 
-
-void NotificationSettings::remove(const QString &key)
+void NotificationSettings::remove(const QString& key)
 {
     removeLocalKey(key);
 }
 
-
-void NotificationSettings::setHighlightList(const QVariantList &highlightList)
+void NotificationSettings::setHighlightList(const QVariantList& highlightList)
 {
     setLocalValue("Highlights/CustomList", highlightList);
 }
 
-
 QVariantList NotificationSettings::highlightList() const
 {
     return localValue("Highlights/CustomList").toList();
 }
 
-
 void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickType highlightNickType)
 {
     setLocalValue("Highlights/HighlightNick", highlightNickType);
 }
 
-
 NotificationSettings::HighlightNickType NotificationSettings::highlightNick() const
 {
-    return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick",
-                                                               CurrentNick).toInt();
+    return (NotificationSettings::HighlightNickType)localValue("Highlights/HighlightNick", CurrentNick).toInt();
 }
 
-
 void NotificationSettings::setNicksCaseSensitive(bool cs)
 {
     setLocalValue("Highlights/NicksCaseSensitive", cs);
 }
 
-
 bool NotificationSettings::nicksCaseSensitive() const
 {
     return localValue("Highlights/NicksCaseSensitive", false).toBool();
 }
 
-
 // ========================================
 //  TabCompletionSettings
 // ========================================
 
 TabCompletionSettings::TabCompletionSettings()
     : ClientSettings("TabCompletion")
-{
-}
-
+{}
 
-void TabCompletionSettings::setCompletionSuffix(const QString &suffix)
+void TabCompletionSettings::setCompletionSuffix(const QString& suffix)
 {
     setLocalValue("CompletionSuffix", suffix);
 }
 
-
 QString TabCompletionSettings::completionSuffix() const
 {
     return localValue("CompletionSuffix", ": ").toString();
 }
 
-
 void TabCompletionSettings::setAddSpaceMidSentence(bool space)
 {
     setLocalValue("AddSpaceMidSentence", space);
 }
 
-
 bool TabCompletionSettings::addSpaceMidSentence() const
 {
     return localValue("AddSpaceMidSentence", false).toBool();
 }
 
-
 void TabCompletionSettings::setSortMode(SortMode mode)
 {
     setLocalValue("SortMode", mode);
 }
 
-
 TabCompletionSettings::SortMode TabCompletionSettings::sortMode() const
 {
     return static_cast<SortMode>(localValue("SortMode"), LastActivity);
 }
 
-
 void TabCompletionSettings::setCaseSensitivity(Qt::CaseSensitivity cs)
 {
     setLocalValue("CaseSensitivity", cs);
 }
 
-
 Qt::CaseSensitivity TabCompletionSettings::caseSensitivity() const
 {
     return (Qt::CaseSensitivity)localValue("CaseSensitivity", Qt::CaseInsensitive).toInt();
 }
 
-
 void TabCompletionSettings::setUseLastSpokenTo(bool use)
 {
     setLocalValue("UseLastSpokenTo", use);
 }
 
-
 bool TabCompletionSettings::useLastSpokenTo() const
 {
     return localValue("UseLastSpokenTo", false).toBool();
 }
 
-
 // ========================================
 //  ItemViewSettings
 // ========================================
 
-ItemViewSettings::ItemViewSettings(const QString &group) : ClientSettings(group)
-{
-}
-
+ItemViewSettings::ItemViewSettings(const QString& group)
+    : ClientSettings(group)
+{}
 
 bool ItemViewSettings::displayTopicInTooltip() const
 {
     return localValue("DisplayTopicInTooltip", false).toBool();
 }
 
-
 bool ItemViewSettings::mouseWheelChangesBuffer() const
 {
     return localValue("MouseWheelChangesBuffer", false).toBool();