X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fserver.cpp;h=ca878d1282e0f790a55fad21c15a0ef506770d53;hp=74f9c7ad743c1d30eefdf0b6b6733e745d1e7800;hb=7ec4585cecc74ce8d9a94b0e52f00a96d105e79e;hpb=62f292ad143923a3b774b9bd14f83f3b640c0cb8

diff --git a/core/server.cpp b/core/server.cpp
index 74f9c7ad..ca878d12 100644
--- a/core/server.cpp
+++ b/core/server.cpp
@@ -26,7 +26,7 @@
 #include <QMetaObject>
 #include <QDateTime>
 
-Server::Server(QString net) : network(net) {
+Server::Server(UserId uid, QString net) : user(uid), network(net) {
   QString MQUOTE = QString('\020');
   ctcpMDequoteHash[MQUOTE + '0'] = QString('\000');
   ctcpMDequoteHash[MQUOTE + 'n'] = QString('\n');
@@ -67,8 +67,8 @@ void Server::sendState() {
 
 void Server::connectToIrc(QString net) {
   if(net != network) return; // not me!
-  networkSettings = global->getData("Networks").toMap()[net].toMap();
-  identity = global->getData("Identities").toMap()[networkSettings["Identity"].toString()].toMap();
+  networkSettings = Global::data(user, "Networks").toMap()[net].toMap();
+  identity = Global::data(user, "Identities").toMap()[networkSettings["Identity"].toString()].toMap();
   QList<QVariant> servers = networkSettings["Servers"].toList();
   QString host = servers[0].toMap()["Address"].toString();
   quint16 port = servers[0].toMap()["Port"].toUInt();