X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fquassel.h;h=30d3d35f3bf8ea739f6108038eccc6737243bf93;hb=b0fcfdea3deb5e45961745d743c8468e905744b1;hp=e070bae14a4be2c7b6dc1c02703d05bc07dbcce5;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222;p=quassel.git diff --git a/src/common/quassel.h b/src/common/quassel.h index e070bae1..30d3d35f 100644 --- a/src/common/quassel.h +++ b/src/common/quassel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 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 * @@ -49,10 +49,8 @@ public: QString commitHash; uint commitDate; QString buildDate; - bool isSourceDirty; - uint protocolVersion; - uint clientNeedsProtocol; - uint coreNeedsProtocol; + + uint protocolVersion; // deprecated QString applicationName; QString coreApplicationName; @@ -71,8 +69,11 @@ public: enum Feature { SynchronizedMarkerLine = 0x0001, SaslAuthentication = 0x0002, + SaslExternal = 0x0004, + HideInactiveNetworks = 0x0008, + PasswordChange = 0x0010, - NumFeatures = 0x0002 + NumFeatures = 0x0010 }; Q_DECLARE_FLAGS(Features, Feature); @@ -83,7 +84,7 @@ public: virtual ~Quassel(); - static void setupBuildInfo(const QString &generated); + static void setupBuildInfo(); static inline const BuildInfo &buildInfo(); static inline RunMode runMode(); @@ -148,6 +149,7 @@ protected: inline void disableCrashhandler(); private: + void setupEnvironment(); void registerMetaTypes(); static void handleSignal(int signal);