X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtgui%2Fidentities.cpp;h=a168b2f9b5d92a0e35afae5778044c17c40d9965;hb=64773d0bbb9ad9e7b0a26aa9751447fa7288ca56;hp=316171794084fd3245e61235e9d9f20f35648de8;hpb=077d44f36d2f5c730283ef6be839aea7dd073d56;p=quassel.git
diff --git a/src/qtgui/identities.cpp b/src/qtgui/identities.cpp
index 31617179..a168b2f9 100644
--- a/src/qtgui/identities.cpp
+++ b/src/qtgui/identities.cpp
@@ -19,19 +19,20 @@
***************************************************************************/
#include "identities.h"
+#include "client.h"
IdentitiesDlg::IdentitiesDlg(QWidget *parent, QString selected) : QDialog(parent) {
ui.setupUi(this);
- connect(Global::instance(), SIGNAL(dataUpdatedRemotely(UserId, QString)), this, SLOT(globalDataUpdated(UserId, QString)));
+ connect(Client::instance(), SIGNAL(sessionDataChanged(const QString &)), this, SLOT(globalDataUpdated(QString)));
connect(ui.enableAutoAway, SIGNAL(stateChanged(int)), this, SLOT(autoAwayChecked()));
- identities = Global::data("Identities").toMap();
+ identities = Client::retrieveSessionData("Identities").toMap();
foreach(QString name, identities.keys()) {
nameMapping[name] = name;
}
if(identities.size() == 0) {
- VarMap id = createDefaultIdentity();
+ QVariantMap id = createDefaultIdentity();
id["IdName"] = "Default";
identities["Default"] = id;
nameMapping["Default"] = "Default";
@@ -55,7 +56,7 @@ IdentitiesDlg::IdentitiesDlg(QWidget *parent, QString selected) : QDialog(parent
}
/* this needs more work! mapping? */
-void IdentitiesDlg::globalDataUpdated(UserId, QString key) {
+void IdentitiesDlg::globalDataUpdated(QString key) {
if(key == "Identities") {
if(QMessageBox::warning(this, tr("Data changed remotely!"), tr("Some other GUI client changed the identities data!
"
"Apply updated settings, losing all changes done locally?"),
@@ -67,8 +68,8 @@ void IdentitiesDlg::globalDataUpdated(UserId, QString key) {
}
}
-VarMap IdentitiesDlg::createDefaultIdentity() {
- VarMap id;
+QVariantMap IdentitiesDlg::createDefaultIdentity() {
+ QVariantMap id;
id["RealName"] = "foo";
id["Ident"] = "";
id["NickList"] = QStringList();
@@ -97,7 +98,7 @@ QString IdentitiesDlg::getCurIdentity() {
}
void IdentitiesDlg::updateWidgets() {
- VarMap id = identities[getCurIdentity()].toMap();
+ QVariantMap id = identities[getCurIdentity()].toMap();
ui.realNameEdit->setText(id["RealName"].toString());
ui.identEdit->setText(id["Ident"].toString());
ui.nickList->clear();
@@ -127,7 +128,7 @@ void IdentitiesDlg::updateWidgets() {
}
void IdentitiesDlg::updateIdentity(QString idName) {
- VarMap id;
+ QVariantMap id;
id["RealName"] = ui.realNameEdit->text();
id["Ident"] = ui.identEdit->text();
QStringList nicks;
@@ -236,17 +237,17 @@ void IdentitiesDlg::accept() {
updateIdentity(getCurIdentity());
QString result = checkValidity();
if(result.length() == 0) {
- Global::putData("Identities", identities);
+ Client::storeSessionData("Identities", identities);
// We have to care about renamed identities and update the network list appropriately...
- VarMap networks = Global::data("Networks").toMap();
+ QVariantMap networks = Client::retrieveSessionData("Networks").toMap();
foreach(QString netname, networks.keys()) {
- VarMap net = networks[netname].toMap();
+ QVariantMap net = networks[netname].toMap();
if(nameMapping.contains(net["Identity"].toString())) {
net["Identity"] = nameMapping[net["Identity"].toString()];
} else net["Identity"] = "Default";
networks[netname] = net;
}
- Global::putData("Networks", networks);
+ Client::storeSessionData("Networks", networks);
QDialog::accept();
} else {
QMessageBox::warning(this, tr("Invalid Identity!"),
@@ -259,7 +260,7 @@ QString IdentitiesDlg::checkValidity() {
QString reason;
foreach(QString name, identities.keys()) {
QString r;
- VarMap id = identities[name].toMap();
+ QVariantMap id = identities[name].toMap();
if(name == "Default") name = tr("Default Identity");
if(id["RealName"].toString().isEmpty()) {
r += tr(" You have not set a real name.");
@@ -296,7 +297,7 @@ void IdentitiesDlg::editIdentities() {
/******************************************************************************/
-IdentitiesEditDlg::IdentitiesEditDlg(QWidget *parent, VarMap _identities, QMap _mapping, VarMap templ, QString selected)
+IdentitiesEditDlg::IdentitiesEditDlg(QWidget *parent, QVariantMap _identities, QMap _mapping, QVariantMap templ, QString selected)
: QDialog(parent) {
ui.setupUi(this);
identities = _identities;
@@ -330,7 +331,7 @@ IdentitiesEditDlg::IdentitiesEditDlg(QWidget *parent, VarMap _identities, QMap