From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 23 Mar 2014 01:27:45 +0000 (+0100)
Subject: Don't make EventType::KeyEvent depend on HAVE_QCA2
X-Git-Tag: 0.11.0~95
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=be7f9fcb48b8587e59aefb26cec1caf3fcb95da2;hp=61124ace4a9a9356a619cc2f26b96f6c710c514c

Don't make EventType::KeyEvent depend on HAVE_QCA2

This enum value can be known even if we don't have encryption support.
---

diff --git a/src/common/eventmanager.h b/src/common/eventmanager.h
index 94c29346..e3b29800 100644
--- a/src/common/eventmanager.h
+++ b/src/common/eventmanager.h
@@ -112,11 +112,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);