X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Feventmanager.h;h=bc0a1d402881fe1cb2508a3ace774302ecd796ab;hp=a41dbe5d490cc090b5cabf452324503e2d0c6e85;hb=d9588ab4fff449eeb77ebb03a6cb1c5c91d1449d;hpb=46984aca05b2d5f8dddd0c8739e60a1753078123 diff --git a/src/common/eventmanager.h b/src/common/eventmanager.h index a41dbe5d..bc0a1d40 100644 --- a/src/common/eventmanager.h +++ b/src/common/eventmanager.h @@ -46,8 +46,11 @@ public: }; enum EventFlag { - Backlog = 0x40, - Stopped = 0x80 + Fake = 0x08, ///< Ignore this in CoreSessionEventProcessor + Netsplit = 0x10, ///< Netsplit join/part, ignore on display + Backlog = 0x20, + Silent = 0x40, ///< Don't generate a MessageEvent + Stopped = 0x80 }; Q_DECLARE_FLAGS(EventFlags, EventFlag) @@ -70,6 +73,8 @@ public: NetworkReconnecting, NetworkDisconnecting, NetworkDisconnected, + NetworkSplitJoin, + NetworkSplitQuit, NetworkIncoming, IrcServerEvent = 0x00020000, @@ -153,7 +158,7 @@ private: inline HandlerHash ®isteredFilters() { return _registeredFilters; } //! Add handlers to an existing sorted (by priority) handler list - void insertHandlers(const QList &newHandlers, QList &existing); + void insertHandlers(const QList &newHandlers, QList &existing, bool checkDupes = false); //! Add filters to an existing filter hash void insertFilters(const QList &newFilters, QHash &existing);