From: Shane Synan <digitalcircuit36939@gmail.com>
Date: Fri, 27 May 2016 03:57:54 +0000 (-0400)
Subject: Add CapNegotiation Feature flag, fix CMakeLists
X-Git-Tag: travis-deploy-test~470^2~1
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=0edd0d92e656c5467ff34ea0ea9c837ceb16d0bf

Add CapNegotiation Feature flag, fix CMakeLists

Add CapNegotiation Feature flag to Quassel's CoreFeatures list.
Technically, this isn't needed - newer clients can connect to older
cores just fine.  However, it may be useful to know if the core
supports cap negotiation or account-tracking in the future, and
there's no way to retroactively add this flag once 0.13 is released.

Remove an unneccessary semicolon at the end of Q_DECLARE_FLAGS.

Add quassel.h to CMakeLists.txt, so automoc includes it and it shows
up in Qt Creator.
---

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index b2aa2008..66416c37 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -44,6 +44,7 @@ set(SOURCES
     # needed for automoc
     coreinfo.h
     irccap.h
+    protocol.h
 )
 
 if (USE_QT5)
diff --git a/src/common/quassel.h b/src/common/quassel.h
index ba883b0b..09a5d847 100644
--- a/src/common/quassel.h
+++ b/src/common/quassel.h
@@ -71,10 +71,11 @@ public:
         SaslExternal = 0x0004,
         HideInactiveNetworks = 0x0008,
         PasswordChange = 0x0010,
+        CapNegotiation = 0x0020,           /// IRCv3 capability negotiation, account tracking
 
-        NumFeatures = 0x0010
+        NumFeatures = 0x0020
     };
-    Q_DECLARE_FLAGS(Features, Feature);
+    Q_DECLARE_FLAGS(Features, Feature)
 
     //! The features the current version of Quassel supports (\sa Feature)
     /** \return An ORed list of all enum values in Feature