X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreusersettings.cpp;h=d12eb96d7d52f13cddf65794182c97983566a32e;hp=69ef23ede3f1e4fe1845d0ec28e5908f2032c79f;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hpb=9d54503555534a2c554f09a33df6afa33d6308ec

diff --git a/src/core/coreusersettings.cpp b/src/core/coreusersettings.cpp
index 69ef23ed..d12eb96d 100644
--- a/src/core/coreusersettings.cpp
+++ b/src/core/coreusersettings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 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  *
@@ -20,72 +20,64 @@
 
 #include "coreusersettings.h"
 
-CoreUserSettings::CoreUserSettings(UserId uid) : CoreSettings(QString("CoreUser/%1").arg(uid.toInt())), user(uid)
-{
-}
-
+CoreUserSettings::CoreUserSettings(UserId uid)
+    : CoreSettings(QString("CoreUser/%1").arg(uid.toInt()))
+    , user(uid)
+{}
 
-Identity CoreUserSettings::identity(IdentityId id)
+Identity CoreUserSettings::identity(IdentityId id) const
 {
     QVariant v = localValue(QString("Identities/%1").arg(id.toInt()));
-    if (qVariantCanConvert<Identity>(v)) {
+    if (v.canConvert<Identity>()) {
         return v.value<Identity>();
     }
     return Identity();
 }
 
-
-QList<IdentityId> CoreUserSettings::identityIds()
+QList<IdentityId> CoreUserSettings::identityIds() const
 {
     QList<IdentityId> res;
-    foreach(QString id, localChildKeys("Identities")) {
+    foreach (QString id, localChildKeys("Identities")) {
         res << id.toInt();
     }
     return res;
 }
 
-
-void CoreUserSettings::storeIdentity(const Identity &identity)
+void CoreUserSettings::storeIdentity(const Identity& identity)
 {
-    setLocalValue(QString("Identities/%1").arg(identity.id().toInt()), qVariantFromValue(identity));
+    setLocalValue(QString("Identities/%1").arg(identity.id().toInt()), QVariant::fromValue(identity));
 }
 
-
 void CoreUserSettings::removeIdentity(IdentityId id)
 {
     removeLocalKey(QString("Identities/%1").arg(id.toInt()));
 }
 
-
-void CoreUserSettings::setSessionState(const QVariant &data)
+void CoreUserSettings::setSessionState(const QVariant& data)
 {
     setLocalValue("SessionState", data);
 }
 
-
-QVariant CoreUserSettings::sessionState(const QVariant &def)
+QVariant CoreUserSettings::sessionState(const QVariant& def) const
 {
     return localValue("SessionState", def);
 }
 
-
-QVariantMap CoreUserSettings::sessionData()
+QVariantMap CoreUserSettings::sessionData() const
 {
     QVariantMap res;
-    foreach(QString key, localChildKeys(QString("SessionData"))) {
+    foreach (QString key, localChildKeys(QString("SessionData"))) {
         res[key] = localValue(QString("SessionData/%1").arg(key));
     }
     return res;
 }
 
-
-void CoreUserSettings::setSessionValue(const QString &key, const QVariant &data)
+void CoreUserSettings::setSessionValue(const QString& key, const QVariant& data)
 {
     setLocalValue(QString("SessionData/%1").arg(key), data);
 }
 
-
-QVariant CoreUserSettings::sessionValue(const QString &key, const QVariant &def)
+QVariant CoreUserSettings::sessionValue(const QString& key, const QVariant& def) const
 {
     return localValue(QString("SessionData/%1").arg(key), def);
 }