X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=ec12da7b31ee6ec923e8ac5b3b5dd329b88fce56;hp=e10b359950a0e2b430cd9111606557c0a05ab7ee;hb=372e281c83794188819e2a74f570e16684778456;hpb=44b22c4419f478a20f6324f9f3a700a2dec56302 diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index e10b3599..ec12da7b 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -46,8 +46,6 @@ CoreSession::CoreSession(UserId uid, Storage *_storage) : user(uid), storage(_st connect(this, SIGNAL(backlogData(BufferId, QList, bool)), coreProxy, SLOT(csBacklogData(BufferId, QList, bool))); connect(this, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId))); connect(storage, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId))); - connect(Global::instance(), SIGNAL(dataUpdatedRemotely(UserId, QString)), this, SLOT(globalDataUpdated(UserId, QString))); - connect(Global::instance(), SIGNAL(dataPutLocally(UserId, QString)), this, SLOT(globalDataUpdated(UserId, QString))); connect(this, SIGNAL(sessionDataChanged(const QString &, const QVariant &)), coreProxy, SLOT(csSessionDataChanged(const QString &, const QVariant &))); connect(coreProxy, SIGNAL(gsSessionDataChanged(const QString &, const QVariant &)), this, SLOT(storeSessionData(const QString &, const QVariant &))); } @@ -64,13 +62,6 @@ void CoreSession::processSignal(ClientSignal sig, QVariant arg1, QVariant arg2, coreProxy->recv(sig, arg1, arg2, arg3); } -void CoreSession::globalDataUpdated(UserId uid, QString key) { - Q_ASSERT(uid == userId()); - QVariant data = Global::data(userId(), key); - QSettings s; - s.setValue(QString("Global/%1/").arg(userId())+key, data); -} - void CoreSession::storeSessionData(const QString &key, const QVariant &data) { QSettings s; s.beginGroup(QString("SessionData/%1").arg(user));