test: Add build system support and a main function for unit tests

[quassel.git] / src / core / coreusersettings.cpp

diff --git a/src/core/coreusersettings.cpp b/src/core/coreusersettings.cpp
index 64ac7ea..9340867 100644 (file)
--- a/src/core/coreusersettings.cpp
+++ b/src/core/coreusersettings.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  *
@@ -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);
 }