X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcoresession.cpp;h=52cab60b78f0b16c7da9e2e2c81dc5c94258cdec;hb=5e9a649d94d1832e0b4f3f296e8a2df2d8741d9b;hp=1c38a87a628dfea7bc8af3b665dbdfda0bfc56f2;hpb=0f667b4d2fb9a34b8ebbfe1d07b47407ce54468a;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 1c38a87a..52cab60b 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -18,28 +18,31 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "coresession.h"
+
 #include <QtScript>
 
 #include "core.h"
-#include "coresession.h"
 #include "coreuserinputhandler.h"
-#include "signalproxy.h"
 #include "corebuffersyncer.h"
 #include "corebacklogmanager.h"
 #include "corebufferviewmanager.h"
-#include "coreirclisthelper.h"
-#include "corenetworkconfig.h"
-#include "storage.h"
-
 #include "coreidentity.h"
+#include "coreignorelistmanager.h"
+#include "coreirclisthelper.h"
 #include "corenetwork.h"
-#include "ircuser.h"
-#include "ircchannel.h"
-
-#include "util.h"
+#include "corenetworkconfig.h"
+#include "coresessioneventprocessor.h"
 #include "coreusersettings.h"
+#include "eventmanager.h"
+#include "ircchannel.h"
+#include "ircparser.h"
+#include "ircuser.h"
 #include "logger.h"
-#include "coreignorelistmanager.h"
+#include "messageevent.h"
+#include "signalproxy.h"
+#include "storage.h"
+#include "util.h"
 
 class ProcessMessagesEvent : public QEvent {
 public:
@@ -57,6 +60,9 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
     _ircListHelper(new CoreIrcListHelper(this)),
     _networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
     _coreInfo(this),
+    _eventManager(new EventManager(this)),
+    _eventProcessor(new CoreSessionEventProcessor(this)),
+    _ircParser(new IrcParser(this)),
     scriptEngine(new QScriptEngine(this)),
     _processMessages(false),
     _ignoreListManager(this)
@@ -87,6 +93,10 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   loadSettings();
   initScriptEngine();
 
+  eventManager()->registerObject(ircParser(), EventManager::NormalPriority, "process");
+  eventManager()->registerObject(eventProcessor(), EventManager::HighPriority, "process");
+  eventManager()->registerObject(this, EventManager::LowPriority, "process"); // for sending MessageEvents to the client
+
   // periodically save our session state
   connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState()));
 
@@ -240,6 +250,11 @@ void CoreSession::recvStatusMsgFromServer(QString msg) {
   emit displayStatusMsg(net->networkName(), msg);
 }
 
+void CoreSession::processMessageEvent(MessageEvent *event) {
+  recvMessageFromServer(event->networkId(), event->msgType(), event->bufferType(), event->target(),
+                        event->text(), event->sender(), event->msgFlags());
+}
+
 QList<BufferInfo> CoreSession::buffers() const {
   return Core::requestBuffers(user());
 }