X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreusersettings.cpp;h=93408674f33180c6960d87ac5f6aa491be9e74e3;hp=d9c260894426a24a6710abb184d22c9e45089f11;hb=8f2ee00f4edef1693628d3af0bdee84d725eb754;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a

diff --git a/src/core/coreusersettings.cpp b/src/core/coreusersettings.cpp
index d9c26089..93408674 100644
--- a/src/core/coreusersettings.cpp
+++ b/src/core/coreusersettings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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  *
@@ -20,22 +20,23 @@
 
 #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")) {
@@ -63,13 +64,13 @@ void CoreUserSettings::setSessionState(const QVariant &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"))) {
@@ -85,7 +86,7 @@ void CoreUserSettings::setSessionValue(const QString &key, const QVariant &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);
 }