X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuisettings.cpp;h=b4c286633621113caca0ce9f7bc5be4a3c49531c;hp=fe45fd98c7a032dd70cf8b3d4decd489b00133e6;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=fdfd62334f728bd05470c5191194d55027fec86e

diff --git a/src/uisupport/uisettings.cpp b/src/uisupport/uisettings.cpp
index fe45fd98..b4c28663 100644
--- a/src/uisupport/uisettings.cpp
+++ b/src/uisupport/uisettings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,139 +15,190 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "uisettings.h"
 
+#include <utility>
+
 #include "action.h"
 #include "actioncollection.h"
 
-UiSettings::UiSettings(const QString &group)
-  : ClientSettings(group)
+UiSettings::UiSettings(QString group)
+    : ClientSettings(std::move(group))
+{}
+
+void UiSettings::setValue(const QString& key, const QVariant& data)
 {
+    setLocalValue(key, data);
 }
 
-/**************************************************************************/
+QVariant UiSettings::value(const QString& key, const QVariant& def) const
+{
+    return localValue(key, def);
+}
 
-UiStyleSettings::UiStyleSettings() : UiSettings("UiStyle") {}
-UiStyleSettings::UiStyleSettings(const QString &subGroup) : UiSettings(QString("UiStyle/%1").arg(subGroup))
+bool UiSettings::valueExists(const QString& key) const
 {
+    return localKeyExists(key);
 }
 
-void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, QTextCharFormat format) {
-  setLocalValue(QString("Format/%1").arg(ftype), format);
+void UiSettings::remove(const QString& key)
+{
+    removeLocalKey(key);
+}
+
+/**************************************************************************/
+
+UiStyleSettings::UiStyleSettings()
+    : UiSettings("UiStyle")
+{}
+
+UiStyleSettings::UiStyleSettings(const QString& subGroup)
+    : UiSettings(QString("UiStyle/%1").arg(subGroup))
+{}
+
+void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, const QTextCharFormat& format)
+{
+    setLocalValue(QString("Format/%1").arg(static_cast<quint32>(ftype)), format);
 }
 
-QTextCharFormat UiStyleSettings::customFormat(UiStyle::FormatType ftype) {
-  return localValue(QString("Format/%1").arg(ftype), QTextFormat()).value<QTextFormat>().toCharFormat();
+QTextCharFormat UiStyleSettings::customFormat(UiStyle::FormatType ftype) const
+{
+    return localValue(QString("Format/%1").arg(static_cast<quint32>(ftype)), QTextFormat()).value<QTextFormat>().toCharFormat();
 }
 
-void UiStyleSettings::removeCustomFormat(UiStyle::FormatType ftype) {
-  removeLocalKey(QString("Format/%1").arg(ftype));
+void UiStyleSettings::removeCustomFormat(UiStyle::FormatType ftype)
+{
+    removeLocalKey(QString("Format/%1").arg(static_cast<quint32>(ftype)));
 }
 
-QList<UiStyle::FormatType> UiStyleSettings::availableFormats() {
-  QList<UiStyle::FormatType> formats;
-  QStringList list = localChildKeys("Format");
-  foreach(QString type, list) {
-    formats << (UiStyle::FormatType)type.toInt();
-  }
-  return formats;
+QList<UiStyle::FormatType> UiStyleSettings::availableFormats() const
+{
+    QList<UiStyle::FormatType> formats;
+    QStringList list = localChildKeys("Format");
+    foreach (QString type, list) {
+        formats << (UiStyle::FormatType)type.toInt();
+    }
+    return formats;
 }
 
 /**************************************************************************
  * SessionSettings
  **************************************************************************/
 
-SessionSettings::SessionSettings(const QString & sessionId, const QString & group)
-: UiSettings(group), _sessionId(sessionId)
+SessionSettings::SessionSettings(QString sessionId, QString group)
+    : UiSettings(std::move(group))
+    , _sessionId(std::move(sessionId))
+{}
+
+void SessionSettings::setValue(const QString& key, const QVariant& data)
 {
+    setLocalValue(QString("%1/%2").arg(_sessionId, key), data);
+}
 
+QVariant SessionSettings::value(const QString& key, const QVariant& def) const
+{
+    return localValue(QString("%1/%2").arg(_sessionId, key), def);
 }
 
-void SessionSettings::setValue(const QString &key, const QVariant &data) {
-  setLocalValue(QString("%1/%2").arg(_sessionId, key), data);
+void SessionSettings::removeKey(const QString& key)
+{
+    removeLocalKey(QString("%1/%2").arg(_sessionId, key));
 }
 
-QVariant SessionSettings::value(const QString &key, const QVariant &def) {
-  return localValue(QString("%1/%2").arg(_sessionId, key), def);
+void SessionSettings::cleanup()
+{
+    QStringList sessions = localChildGroups();
+    QString str;
+    SessionSettings s(sessionId());
+    foreach (str, sessions) {
+        // load session and check age
+        s.setSessionId(str);
+        if (s.sessionAge() > 3) {
+            s.removeSession();
+        }
+    }
 }
 
-void SessionSettings::removeKey(const QString &key) {
-  removeLocalKey(QString("%1/%2").arg(_sessionId, key));
+QString SessionSettings::sessionId() const
+{
+    return _sessionId;
 }
 
-void SessionSettings::cleanup() {
-  QStringList sessions = localChildGroups();
-  QString str;
-  SessionSettings s(sessionId());
-  foreach(str, sessions) {
-    // load session and check age
-    s.setSessionId(str);
-    if(s.sessionAge() > 3) {
-      s.removeSession();
-    }
-  }
+void SessionSettings::setSessionId(QString sessionId)
+{
+    _sessionId = std::move(sessionId);
 }
 
-int SessionSettings::sessionAge() {
-  QVariant val = localValue(QString("%1/_sessionAge").arg(_sessionId), 0);
-  bool b = false;
-  int i = val.toInt(&b);
-  if(b) {
-    return i;
-  } else {
-    // no int saved, delete session
-    //qDebug() << QString("deleting invalid session %1 (invalid session age found)").arg(_sessionId);
-    removeSession();
-  }
-  return 10;
+int SessionSettings::sessionAge()
+{
+    QVariant val = localValue(QString("%1/_sessionAge").arg(_sessionId), 0);
+    bool b = false;
+    int i = val.toInt(&b);
+    if (b) {
+        return i;
+    }
+    else {
+        // no int saved, delete session
+        // qDebug() << QString("deleting invalid session %1 (invalid session age found)").arg(_sessionId);
+        removeSession();
+    }
+    return 10;
 }
 
-void SessionSettings::removeSession() {
-  QStringList keys = localChildKeys(sessionId());
-  foreach(QString k, keys) {
-    removeKey(k);
-  }
+void SessionSettings::removeSession()
+{
+    QStringList keys = localChildKeys(sessionId());
+    foreach (QString k, keys) {
+        removeKey(k);
+    }
 }
 
-void SessionSettings::setSessionAge(int age) {
-  setValue(QString("_sessionAge"),age);
+void SessionSettings::setSessionAge(int age)
+{
+    setValue(QString("_sessionAge"), age);
 }
 
-void SessionSettings::sessionAging() {
-  QStringList sessions = localChildGroups();
-  QString str;
-  SessionSettings s(sessionId());
-  foreach(str, sessions) {
-    // load session and check age
-    s.setSessionId(str);
-    s.setSessionAge(s.sessionAge()+1);
-  }
+void SessionSettings::sessionAging()
+{
+    QStringList sessions = localChildGroups();
+    QString str;
+    SessionSettings s(sessionId());
+    foreach (str, sessions) {
+        // load session and check age
+        s.setSessionId(str);
+        s.setSessionAge(s.sessionAge() + 1);
+    }
 }
 
 /**************************************************************************
  * ShortcutSettings
  **************************************************************************/
 
-ShortcutSettings::ShortcutSettings() : UiSettings("Shortcuts") {
+ShortcutSettings::ShortcutSettings()
+    : UiSettings("Shortcuts")
+{}
 
+void ShortcutSettings::clear()
+{
+    for (auto&& key : allLocalKeys()) {
+        removeLocalKey(key);
+    }
 }
 
-void ShortcutSettings::clear() {
-  foreach(const QString &key, allLocalKeys())
-    removeLocalKey(key);
-}
-
-QStringList ShortcutSettings::savedShortcuts() {
-  return localChildKeys();
+QStringList ShortcutSettings::savedShortcuts() const
+{
+    return localChildKeys();
 }
 
-QKeySequence ShortcutSettings::loadShortcut(const QString &name) {
-  return localValue(name, QKeySequence()).value<QKeySequence>();
+QKeySequence ShortcutSettings::loadShortcut(const QString& name) const
+{
+    return localValue(name, QKeySequence()).value<QKeySequence>();
 }
 
-void ShortcutSettings::saveShortcut(const QString &name, const QKeySequence &seq) {
-  setLocalValue(name, seq);
+void ShortcutSettings::saveShortcut(const QString& name, const QKeySequence& seq)
+{
+    setLocalValue(name, seq);
 }