X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreusersettings.cpp;h=4b9563943e9ee0c5eaae424472a3f61c5933ea09;hp=e9d4e2087db32510a70aa9488915bc83a140900b;hb=41bf70c263ee0af80ad1850fabe77ffffee188f4;hpb=28e33cd3255a838a045303bed073f4f9c40a3af4

diff --git a/src/core/coreusersettings.cpp b/src/core/coreusersettings.cpp
index e9d4e208..4b956394 100644
--- a/src/core/coreusersettings.cpp
+++ b/src/core/coreusersettings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,87 +15,69 @@
  *   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 "coreusersettings.h"
 
-CoreUserSettings::CoreUserSettings(UserId uid) : CoreSettings(QString("CoreUser/%1").arg(uid.toInt())), user(uid) {
-
-
-}
-
-Identity CoreUserSettings::identity(IdentityId id) {
-  QVariant v = localValue(QString("Identities/%1").arg(id.toInt()));
-  if(qVariantCanConvert<Identity>(v)) {
-    return v.value<Identity>();
-  }
-  return Identity();
-}
-
-QList<IdentityId> CoreUserSettings::identityIds() {
-  QList<IdentityId> res;
-  foreach(QString id, localChildKeys("Identities")) {
-    res << id.toInt();
-  }
-  return res;
-}
-
-void CoreUserSettings::storeIdentity(const Identity &identity) {
-  setLocalValue(QString("Identities/%1").arg(identity.id().toInt()), qVariantFromValue(identity));
-}
-
-void CoreUserSettings::removeIdentity(IdentityId id) {
-  removeLocalKey(QString("Identities/%1").arg(id.toInt()));
+CoreUserSettings::CoreUserSettings(UserId uid)
+    : CoreSettings(QString("CoreUser/%1").arg(uid.toInt()))
+    , user(uid)
+{}
+
+Identity CoreUserSettings::identity(IdentityId id) const
+{
+    QVariant v = localValue(QString("Identities/%1").arg(id.toInt()));
+    if (v.canConvert<Identity>()) {
+        return v.value<Identity>();
+    }
+    return Identity();
 }
 
-
-NetworkInfo CoreUserSettings::networkInfo(NetworkId id) {
-  QVariant v = localValue(QString("Networks/%1").arg(id.toInt()));
-  if(v.canConvert<NetworkInfo>()) {
-    return v.value<NetworkInfo>();
-  }
-  return NetworkInfo();
+QList<IdentityId> CoreUserSettings::identityIds() const
+{
+    QList<IdentityId> res;
+    foreach (QString id, localChildKeys("Identities")) {
+        res << id.toInt();
+    }
+    return res;
 }
 
-QList<NetworkId> CoreUserSettings::networkIds() {
-  QList<NetworkId> res;
-  foreach(QString id, localChildKeys("Networks")) {
-    res << id.toInt();
-  }
-  return res;
+void CoreUserSettings::storeIdentity(const Identity& identity)
+{
+    setLocalValue(QString("Identities/%1").arg(identity.id().toInt()), qVariantFromValue(identity));
 }
 
-void CoreUserSettings::storeNetworkInfo(const NetworkInfo &info) {
-  setLocalValue(QString("Networks/%1").arg(info.networkId.toInt()), QVariant::fromValue<NetworkInfo>(info));
+void CoreUserSettings::removeIdentity(IdentityId id)
+{
+    removeLocalKey(QString("Identities/%1").arg(id.toInt()));
 }
 
-void CoreUserSettings::removeNetworkInfo(NetworkId id) {
-  removeLocalKey(QString("Networks/%1").arg(id.toInt()));
+void CoreUserSettings::setSessionState(const QVariant& data)
+{
+    setLocalValue("SessionState", data);
 }
 
-// FIXME remove as soon as the network data migration is gone
-void CoreUserSettings::setSessionState(const QVariant &data) {
-  setLocalValue("SessionState", data);
+QVariant CoreUserSettings::sessionState(const QVariant& def) const
+{
+    return localValue("SessionState", def);
 }
 
-QVariant CoreUserSettings::sessionState(const QVariant &def) {
-  return localValue("SessionState", def);
+QVariantMap CoreUserSettings::sessionData() const
+{
+    QVariantMap res;
+    foreach (QString key, localChildKeys(QString("SessionData"))) {
+        res[key] = localValue(QString("SessionData/%1").arg(key));
+    }
+    return res;
 }
 
-QVariantMap CoreUserSettings::sessionData() {
-  QVariantMap res;
-  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)
+{
+    setLocalValue(QString("SessionData/%1").arg(key), 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) const
+{
+    return localValue(QString("SessionData/%1").arg(key), def);
 }
-
-QVariant CoreUserSettings::sessionValue(const QString &key, const QVariant &def) {
-  return localValue(QString("SessionData/%1").arg(key), def);
-}
-