X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=gui%2Fidentities.cpp;h=316171794084fd3245e61235e9d9f20f35648de8;hb=b27b03c4239150189b7ae8963ca2e8c9b1a0ce4a;hp=9ef5a91355761248639f8cd1d30ec9051b02733f;hpb=9070a3e905b7798c40c517f264eb595199a9aa79;p=quassel.git
diff --git a/gui/identities.cpp b/gui/identities.cpp
index 9ef5a913..31617179 100644
--- a/gui/identities.cpp
+++ b/gui/identities.cpp
@@ -22,11 +22,11 @@
IdentitiesDlg::IdentitiesDlg(QWidget *parent, QString selected) : QDialog(parent) {
ui.setupUi(this);
- connect(global, SIGNAL(dataUpdatedRemotely(QString)), this, SLOT(globalDataUpdated(QString)));
+ connect(Global::instance(), SIGNAL(dataUpdatedRemotely(UserId, QString)), this, SLOT(globalDataUpdated(UserId, QString)));
connect(ui.enableAutoAway, SIGNAL(stateChanged(int)), this, SLOT(autoAwayChecked()));
- identities = global->getData("Identities").toMap();
+ identities = Global::data("Identities").toMap();
foreach(QString name, identities.keys()) {
nameMapping[name] = name;
}
@@ -44,7 +44,7 @@ IdentitiesDlg::IdentitiesDlg(QWidget *parent, QString selected) : QDialog(parent
}
updateWidgets();
lastIdentity = getCurIdentity();
- connect(ui.identityList, SIGNAL(triggered(QString)), this, SLOT(identityChanged(QString)));
+ connect(ui.identityList, SIGNAL(activated(QString)), this, SLOT(identityChanged(QString)));
connect(ui.editIdentitiesButton, SIGNAL(clicked()), this, SLOT(editIdentities()));
connect(ui.nickList, SIGNAL(itemSelectionChanged()), this, SLOT(nickSelectionChanged()));
connect(ui.addNickButton, SIGNAL(clicked()), this, SLOT(addNick()));
@@ -55,7 +55,7 @@ IdentitiesDlg::IdentitiesDlg(QWidget *parent, QString selected) : QDialog(parent
}
/* this needs more work! mapping? */
-void IdentitiesDlg::globalDataUpdated(QString key) {
+void IdentitiesDlg::globalDataUpdated(UserId, 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?"),
@@ -236,9 +236,9 @@ void IdentitiesDlg::accept() {
updateIdentity(getCurIdentity());
QString result = checkValidity();
if(result.length() == 0) {
- global->putData("Identities", identities);
+ Global::putData("Identities", identities);
// We have to care about renamed identities and update the network list appropriately...
- VarMap networks = global->getData("Networks").toMap();
+ VarMap networks = Global::data("Networks").toMap();
foreach(QString netname, networks.keys()) {
VarMap net = networks[netname].toMap();
if(nameMapping.contains(net["Identity"].toString())) {
@@ -246,7 +246,7 @@ void IdentitiesDlg::accept() {
} else net["Identity"] = "Default";
networks[netname] = net;
}
- global->putData("Networks", networks);
+ Global::putData("Networks", networks);
QDialog::accept();
} else {
QMessageBox::warning(this, tr("Invalid Identity!"),