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 #148 from Tucos/DMdebug
[quassel.git]
/
src
/
common
/
eventmanager.h
diff --git
a/src/common/eventmanager.h
b/src/common/eventmanager.h
index
edebe61
..
ec14064
100644
(file)
--- a/
src/common/eventmanager.h
+++ b/
src/common/eventmanager.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
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 *
@@
-112,11
+112,9
@@
public :
MessageEvent = 0x00040000, ///< Stringified event suitable for converting to Message
CtcpEvent = 0x00050000,
MessageEvent = 0x00040000, ///< Stringified event suitable for converting to Message
CtcpEvent = 0x00050000,
- CtcpEventFlush
+ CtcpEventFlush
,
-#ifdef HAVE_QCA2
- ,KeyEvent = 0x00060000
-#endif
+ KeyEvent = 0x00060000
};
EventManager(QObject *parent = 0);
};
EventManager(QObject *parent = 0);