X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Feventmanager.h;h=eb31921284cd93d548ebe299d493561dced8de0a;hb=6f38b6fdeb73e726c24b26a97b98c9cfe0fc8a0e;hp=025493bc3cb3b74515cd09936d9501604ffeaf7b;hpb=283fdb2c49e5efa1d497d8c3e6f624f86d008ff8;p=quassel.git

diff --git a/src/common/eventmanager.h b/src/common/eventmanager.h
index 025493bc..eb319212 100644
--- a/src/common/eventmanager.h
+++ b/src/common/eventmanager.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,7 +23,10 @@
 
 #include <QMetaEnum>
 
+#include "types.h"
+
 class Event;
+class Network;
 
 class EventManager : public QObject {
   Q_OBJECT
@@ -53,7 +56,7 @@ public:
     Silent   = 0x40, ///< Don't generate a MessageEvent
     Stopped  = 0x80
   };
-  Q_DECLARE_FLAGS(EventFlags, EventFlag);
+  Q_DECLARE_FLAGS(EventFlags, EventFlag)
 
   /*
 
@@ -107,16 +110,17 @@ public:
     MessageEvent                = 0x00040000, ///< Stringified event suitable for converting to Message
 
     CtcpEvent                   = 0x00050000,
-    CtcpEventFlush,
+    CtcpEventFlush
   };
 
   EventManager(QObject *parent = 0);
-  virtual ~EventManager();
 
-  EventType eventTypeByName(const QString &name) const;
-  EventType eventGroupByName(const QString &name) const;
+  static EventType eventTypeByName(const QString &name);
+  static EventType eventGroupByName(const QString &name);
+  static QString enumName(EventType type);
+  static QString enumName(int type); // for sanity tests
 
-  QString enumName(EventType type) const;
+  Event *createEvent(const QVariantMap &map);
 
 public slots:
   void registerObject(QObject *object, Priority priority = NormalPriority,
@@ -133,12 +137,12 @@ public slots:
   //! Send an event to the registered handlers
   /**
     The EventManager takes ownership of the event and will delete it once it's processed.
-    NOTE: This method is not threadsafe!
     @param event The event to be dispatched
    */
-  void sendEvent(Event *event);
+  void postEvent(Event *event);
 
 protected:
+  virtual Network *networkById(NetworkId id) const = 0;
   virtual void customEvent(QEvent *event);
 
 private:
@@ -169,17 +173,16 @@ private:
 
   int findEventType(const QString &methodSignature, const QString &methodPrefix) const;
 
-  void processEvents();
+  void processEvent(Event *event);
   void dispatchEvent(Event *event);
 
   //! @return the EventType enum
-  QMetaEnum eventEnum() const;
+  static QMetaEnum eventEnum();
 
   HandlerHash _registeredHandlers;
   HandlerHash _registeredFilters;
-  mutable QMetaEnum _enum;
-
   QList<Event *> _eventQueue;
+  static QMetaEnum _enum;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(EventManager::EventFlags);