X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Feventmanager.h;h=31cc42e0a59c887d94b3ee832c0900b7e0520295;hb=e30092afc1803d753914a7ab9fa88bba818de559;hp=edebe61774f1d50d876ba2d39e16554580abca5b;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a;p=quassel.git

diff --git a/src/common/eventmanager.h b/src/common/eventmanager.h
index edebe617..31cc42e0 100644
--- a/src/common/eventmanager.h
+++ b/src/common/eventmanager.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -101,6 +101,7 @@ public :
         IrcEventPrivmsg,
         IrcEventQuit,
         IrcEventTopic,
+        IrcEventError,        /// ERROR message from server
         IrcEventWallops,
         IrcEventRawPrivmsg, ///< Undecoded privmsg (still needs CTCP parsing)
         IrcEventRawNotice, ///< Undecoded notice (still needs CTCP parsing)
@@ -112,11 +113,9 @@ public :
         MessageEvent                = 0x00040000, ///< Stringified event suitable for converting to Message
 
         CtcpEvent                   = 0x00050000,
-        CtcpEventFlush
+        CtcpEventFlush,
 
-#ifdef HAVE_QCA2
-        ,KeyEvent                    = 0x00060000
-#endif
+        KeyEvent                    = 0x00060000
     };
 
     EventManager(QObject *parent = 0);