X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuisettings.cpp;h=1d8a99ab07965e78239e9d231e633b3f47afedfc;hp=6a1ce9f4d6e2e323ccabdf9aefcc69b2602dbf82;hb=61f33c7895e324f6e95034d86897ad2e963653f1;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/uisupport/uisettings.cpp b/src/uisupport/uisettings.cpp
index 6a1ce9f4..1d8a99ab 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,47 +15,78 @@
  *   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);
+}
+
+
+bool UiSettings::valueExists(const QString &key) const
 {
+    return localKeyExists(key);
 }
 
 
+void UiSettings::remove(const QString &key)
+{
+    removeLocalKey(key);
+}
+
 /**************************************************************************/
 
-UiStyleSettings::UiStyleSettings() : UiSettings("UiStyle") {}
-UiStyleSettings::UiStyleSettings(const QString &subGroup) : UiSettings(QString("UiStyle/%1").arg(subGroup))
+UiStyleSettings::UiStyleSettings()
+    : UiSettings("UiStyle")
+{
+}
+
+
+UiStyleSettings::UiStyleSettings(const QString &subGroup)
+    : UiSettings(QString("UiStyle/%1").arg(subGroup))
 {
 }
 
 
-void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, QTextCharFormat format)
+void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, const QTextCharFormat &format)
 {
-    setLocalValue(QString("Format/%1").arg(ftype), format);
+    setLocalValue(QString("Format/%1").arg(static_cast<quint32>(ftype)), format);
 }
 
 
-QTextCharFormat UiStyleSettings::customFormat(UiStyle::FormatType ftype)
+QTextCharFormat UiStyleSettings::customFormat(UiStyle::FormatType ftype) const
 {
-    return localValue(QString("Format/%1").arg(ftype), QTextFormat()).value<QTextFormat>().toCharFormat();
+    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));
+    removeLocalKey(QString("Format/%1").arg(static_cast<quint32>(ftype)));
 }
 
 
-QList<UiStyle::FormatType> UiStyleSettings::availableFormats()
+QList<UiStyle::FormatType> UiStyleSettings::availableFormats() const
 {
     QList<UiStyle::FormatType> formats;
     QStringList list = localChildKeys("Format");
@@ -70,8 +101,9 @@ QList<UiStyle::FormatType> UiStyleSettings::availableFormats()
  * 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))
 {
 }
 
@@ -82,7 +114,7 @@ void SessionSettings::setValue(const QString &key, const QVariant &data)
 }
 
 
-QVariant SessionSettings::value(const QString &key, const QVariant &def)
+QVariant SessionSettings::value(const QString &key, const QVariant &def) const
 {
     return localValue(QString("%1/%2").arg(_sessionId, key), def);
 }
@@ -109,6 +141,18 @@ void SessionSettings::cleanup()
 }
 
 
+QString SessionSettings::sessionId() const
+{
+    return _sessionId;
+}
+
+
+void SessionSettings::setSessionId(QString sessionId)
+{
+    _sessionId = std::move(sessionId);
+}
+
+
 int SessionSettings::sessionAge()
 {
     QVariant val = localValue(QString("%1/_sessionAge").arg(_sessionId), 0);
@@ -158,25 +202,27 @@ void SessionSettings::sessionAging()
  * ShortcutSettings
  **************************************************************************/
 
-ShortcutSettings::ShortcutSettings() : UiSettings("Shortcuts")
+ShortcutSettings::ShortcutSettings()
+    : UiSettings("Shortcuts")
 {
 }
 
 
 void ShortcutSettings::clear()
 {
-    foreach(const QString &key, allLocalKeys())
-    removeLocalKey(key);
+    for (auto &&key : allLocalKeys()) {
+        removeLocalKey(key);
+    }
 }
 
 
-QStringList ShortcutSettings::savedShortcuts()
+QStringList ShortcutSettings::savedShortcuts() const
 {
     return localChildKeys();
 }
 
 
-QKeySequence ShortcutSettings::loadShortcut(const QString &name)
+QKeySequence ShortcutSettings::loadShortcut(const QString &name) const
 {
     return localValue(name, QKeySequence()).value<QKeySequence>();
 }