projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Settings upgrade logic, classic for old installs
[quassel.git]
/
src
/
common
/
quassel.h
diff --git
a/src/common/quassel.h
b/src/common/quassel.h
index
1fe15ce
..
a2a573c
100644
(file)
--- a/
src/common/quassel.h
+++ b/
src/common/quassel.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-
09 by the Quassel Project
*
+ * Copyright (C) 2005-
2016 by the Quassel Project
*
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-15,7
+15,7
@@
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 5
9 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
+ * 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
***************************************************************************/
#ifndef QUASSEL_H_
***************************************************************************/
#ifndef QUASSEL_H_
@@
-47,12
+47,9
@@
public:
QString baseVersion;
QString generatedVersion;
QString commitHash;
QString baseVersion;
QString generatedVersion;
QString commitHash;
- uint commitDate;
- QString buildDate;
- bool isSourceDirty;
- uint protocolVersion;
- uint clientNeedsProtocol;
- uint coreNeedsProtocol;
+ QString commitDate;
+
+ uint protocolVersion; // deprecated
QString applicationName;
QString coreApplicationName;
QString applicationName;
QString coreApplicationName;
@@
-71,10
+68,15
@@
public:
enum Feature {
SynchronizedMarkerLine = 0x0001,
SaslAuthentication = 0x0002,
enum Feature {
SynchronizedMarkerLine = 0x0001,
SaslAuthentication = 0x0002,
+ SaslExternal = 0x0004,
+ HideInactiveNetworks = 0x0008,
+ PasswordChange = 0x0010,
+ CapNegotiation = 0x0020, /// IRCv3 capability negotiation, account tracking
+ VerifyServerSSL = 0x0040, /// IRC server SSL validation
- NumFeatures = 0x00
02
+ NumFeatures = 0x00
40
};
};
- 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
//! The features the current version of Quassel supports (\sa Feature)
/** \return An ORed list of all enum values in Feature
@@
-83,7
+85,7
@@
public:
virtual ~Quassel();
virtual ~Quassel();
- static void setupBuildInfo(
const QString &generated
);
+ static void setupBuildInfo();
static inline const BuildInfo &buildInfo();
static inline RunMode runMode();
static inline const BuildInfo &buildInfo();
static inline RunMode runMode();
@@
-148,6
+150,7
@@
protected:
inline void disableCrashhandler();
private:
inline void disableCrashhandler();
private:
+ void setupEnvironment();
void registerMetaTypes();
static void handleSignal(int signal);
void registerMetaTypes();
static void handleSignal(int signal);