X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=33f5b09dde7c8527aad6e3dff091c3b65462aa2b;hp=9f2105694e9aff80d334a2c6fbacd8a81bde328e;hb=39eb2fda3eaef2de78a8134556015ff86e9b85d4;hpb=a1b29a21c4bf583074931533b7b04ab8b9c693ab diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 9f210569..33f5b09d 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -28,6 +28,7 @@ #include "corebacklogmanager.h" #include "corebufferviewmanager.h" #include "coreirclisthelper.h" +#include "corenetworkconfig.h" #include "storage.h" #include "coreidentity.h" @@ -53,6 +54,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) _backlogManager(new CoreBacklogManager(this)), _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)), _ircListHelper(new CoreIrcListHelper(this)), + _networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)), _coreInfo(this), scriptEngine(new QScriptEngine(this)), _processMessages(false) @@ -87,6 +89,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) p->synchronize(&aliasManager()); p->synchronize(_backlogManager); p->synchronize(ircListHelper()); + p->synchronize(networkConfig()); p->synchronize(&_coreInfo); // Restore session state @@ -148,6 +151,7 @@ void CoreSession::loadSettings() { void CoreSession::saveSessionState() const { _bufferSyncer->storeDirtyIds(); _bufferViewManager->saveBufferViews(); + _networkConfig->save(); } void CoreSession::restoreSessionState() { @@ -333,7 +337,7 @@ void CoreSession::createIdentity(const CoreIdentity &identity) { _identities[identity.id()] = coreIdentity; // CoreIdentity has it's own synchronize method since it's "private" sslManager needs to be synced aswell coreIdentity->synchronize(signalProxy()); - connect(coreIdentity, SIGNAL(updated(const QVariantMap &)), this, SLOT(updateIdentityBySender())); + connect(coreIdentity, SIGNAL(updated()), this, SLOT(updateIdentityBySender())); emit identityCreated(*coreIdentity); }