removing deprecated core user settings

diff --git a/src/core/coreusersettings.cpp b/src/core/coreusersettings.cpp
index e9d4e20..7236b2c 100644 (file)
--- a/src/core/coreusersettings.cpp
+++ b/src/core/coreusersettings.cpp
@@ -49,32 +49,6 @@ void CoreUserSettings::removeIdentity(IdentityId id) {
   removeLocalKey(QString("Identities/%1").arg(id.toInt()));
 }
 
   removeLocalKey(QString("Identities/%1").arg(id.toInt()));
 }
 

-
-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<NetworkId> CoreUserSettings::networkIds() {
-  QList<NetworkId> res;
-  foreach(QString id, localChildKeys("Networks")) {
-    res << id.toInt();
-  }
-  return res;
-}
-
-void CoreUserSettings::storeNetworkInfo(const NetworkInfo &info) {
-  setLocalValue(QString("Networks/%1").arg(info.networkId.toInt()), QVariant::fromValue<NetworkInfo>(info));
-}
-
-void CoreUserSettings::removeNetworkInfo(NetworkId id) {
-  removeLocalKey(QString("Networks/%1").arg(id.toInt()));
-}
-
-// FIXME remove as soon as the network data migration is gone

 void CoreUserSettings::setSessionState(const QVariant &data) {
   setLocalValue("SessionState", data);
 }
 void CoreUserSettings::setSessionState(const QVariant &data) {
   setLocalValue("SessionState", data);
 }

diff --git a/src/core/coreusersettings.h b/src/core/coreusersettings.h
index bf303cf..5759d72 100644 (file)
--- a/src/core/coreusersettings.h
+++ b/src/core/coreusersettings.h
@@ -38,11 +38,6 @@ class CoreUserSettings : public CoreSettings {
     void storeIdentity(const Identity &identity);
     void removeIdentity(IdentityId id);
 
     void storeIdentity(const Identity &identity);
     void removeIdentity(IdentityId id);
 

-    NetworkInfo networkInfo(NetworkId id);
-    QList<NetworkId> networkIds();
-    void storeNetworkInfo(const NetworkInfo &info);
-    void removeNetworkInfo(NetworkId id);
-

     void setSessionState(const QVariant &data);
     QVariant sessionState(const QVariant &def = QVariant());
 
     void setSessionState(const QVariant &data);
     QVariant sessionState(const QVariant &def = QVariant());