X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=6c0c5e136e54d5d86ae5cb1fb0a10f379ab91e3d;hb=a5455d1ea8785e864ce4b513e63283ed156d4872;hp=1e543e7d86e75aaf1706cb5bb31d4f34f0da91a9;hpb=0cba5df52ef9e773aef1a301ca6a4cfe8199bfd1;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 1e543e7d..6c0c5e13 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -27,6 +27,7 @@
 #include "corebuffersyncer.h"
 #include "corebacklogmanager.h"
 #include "corebufferviewmanager.h"
+#include "coreeventmanager.h"
 #include "coreidentity.h"
 #include "coreignorelistmanager.h"
 #include "coreirclisthelper.h"
@@ -35,7 +36,6 @@
 #include "coresessioneventprocessor.h"
 #include "coreusersettings.h"
 #include "ctcpparser.h"
-#include "eventmanager.h"
 #include "eventstringifier.h"
 #include "ircchannel.h"
 #include "ircparser.h"
@@ -62,7 +62,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
     _ircListHelper(new CoreIrcListHelper(this)),
     _networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
     _coreInfo(this),
-    _eventManager(new EventManager(this)),
+    _eventManager(new CoreEventManager(this)),
     _eventStringifier(new EventStringifier(this)),
     _sessionEventProcessor(new CoreSessionEventProcessor(this)),
     _ctcpParser(new CtcpParser(this)),
@@ -405,7 +405,7 @@ void CoreSession::createIdentity(const Identity &identity, const QVariantMap &ad
 void CoreSession::createIdentity(const CoreIdentity &identity) {
   CoreIdentity *coreIdentity = new CoreIdentity(identity, this);
   _identities[identity.id()] = coreIdentity;
-  // CoreIdentity has it's own synchronize method since it's "private" sslManager needs to be synced aswell
+  // CoreIdentity has its own synchronize method since its "private" sslManager needs to be synced as well
   coreIdentity->synchronize(signalProxy());
   connect(coreIdentity, SIGNAL(updated()), this, SLOT(updateIdentityBySender()));
   emit identityCreated(*coreIdentity);