projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync caps, use signal/slot, CAP NEW/DEL, polish
[quassel.git]
/
src
/
common
/
quassel.h
diff --git
a/src/common/quassel.h
b/src/common/quassel.h
index
6089ac0
..
ba883b0
100644
(file)
--- a/
src/common/quassel.h
+++ b/
src/common/quassel.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
6
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 *
@@
-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;
@@
-72,8
+69,10
@@
public:
SynchronizedMarkerLine = 0x0001,
SaslAuthentication = 0x0002,
SaslExternal = 0x0004,
SynchronizedMarkerLine = 0x0001,
SaslAuthentication = 0x0002,
SaslExternal = 0x0004,
+ HideInactiveNetworks = 0x0008,
+ PasswordChange = 0x0010,
- NumFeatures = 0x00
04
+ NumFeatures = 0x00
10
};
Q_DECLARE_FLAGS(Features, Feature);
};
Q_DECLARE_FLAGS(Features, Feature);
@@
-84,7
+83,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();
@@
-149,6
+148,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);