projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #180 from digitalcircuit/ircv3-expanded-caps
[quassel.git]
/
src
/
common
/
quassel.h
diff --git
a/src/common/quassel.h
b/src/common/quassel.h
index
b141f32
..
30d3d35
100644
(file)
--- a/
src/common/quassel.h
+++ b/
src/common/quassel.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
5
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 *
@@
-71,8
+71,9
@@
public:
SaslAuthentication = 0x0002,
SaslExternal = 0x0004,
HideInactiveNetworks = 0x0008,
SaslAuthentication = 0x0002,
SaslExternal = 0x0004,
HideInactiveNetworks = 0x0008,
+ PasswordChange = 0x0010,
- NumFeatures = 0x00
08
+ NumFeatures = 0x00
10
};
Q_DECLARE_FLAGS(Features, Feature);
};
Q_DECLARE_FLAGS(Features, Feature);
@@
-148,6
+149,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);