/***************************************************************************
- * Copyright (C) 2005-07 by the Quassel IRC Team *
+ * Copyright (C) 2005-08 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "identity.h"
#include "util.h"
-#include "sessionsettings.h"
+#include "coreusersettings.h"
#include <QtScript>
SignalProxy *p = signalProxy();
- SessionSettings s(user);
- sessionData = s.sessionData(); qDebug() << sessionData;
- /*
- QSettings s; // FIXME don't use QSettings anymore
- mutex.lock();
- s.beginGroup(QString("SessionData/%1").arg(user));
- foreach(QString key, s.allKeys()) { qDebug() << key;
- sessionData[key] = s.value(key);
- }
- s.endGroup();
- mutex.unlock(); // FIXME remove
- */
- /* temporarily disabled
- s.beginGroup(QString("Identities/%1").arg(user));
- foreach(QString id, s.childKeys()) {
- Identity *i = new Identity(s.value(id).value<Identity>(), this);
+ CoreUserSettings s(user);
+ sessionData = s.sessionData();
+/*
+ CoreSettings cs;
+ foreach(QString id, cs.localChildKeys(QString("Identities/%1").arg(user))) {
+ Identity *i = new Identity(cs.localValue(QString("Identities/%1/%2").arg(user).arg(id)).value<Identity>(), this);
if(i->id() < 1) {
qDebug() << QString("Invalid identity!");
continue;
void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
- SessionSettings s(user);
+ CoreUserSettings s(user);
mutex.lock();
s.setSessionValue(key, data);
sessionData[key] = data;
// update
_identities[id.id()]->update(id);
}
- Q_ASSERT(false); // FIX QSettings first!
- QSettings s; // FIXME don't use QSettings
+/*
+ CoreSettings s;
s.beginGroup(QString("Identities/%1").arg(user));
s.setValue(QString::number(id.id()), QVariant::fromValue<Identity>(*_identities[id.id()]));
- s.endGroup();
+ s.endGroup();*/
}
void CoreSession::removeIdentity(IdentityId id) {