projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
next try *lol*
[quassel.git]
/
src
/
common
/
global.h
diff --git
a/src/common/global.h
b/src/common/global.h
index
4285606
..
2723b66
100644
(file)
--- a/
src/common/global.h
+++ b/
src/common/global.h
@@
-22,15
+22,17
@@
#define _GLOBAL_H_
/** The protocol version we use fo the communication between core and GUI */
#define _GLOBAL_H_
/** The protocol version we use fo the communication between core and GUI */
-#define GUI_PROTOCOL
2
+#define GUI_PROTOCOL
3
#define BACKLOG_FORMAT 2
#define BACKLOG_STRING "QuasselIRC Backlog File"
class Global;
#define BACKLOG_FORMAT 2
#define BACKLOG_STRING "QuasselIRC Backlog File"
class Global;
-#include <QtCore>
-//#include <QMutex>
+#include <QHash>
+#include <QMutex>
+#include <QString>
+#include <QVariant>
/* Some global stuff */
typedef QMap<QString, QVariant> VarMap;
/* Some global stuff */
typedef QMap<QString, QVariant> VarMap;
@@
-77,7
+79,7
@@
class Global : public QObject {
void dataUpdatedRemotely(UserId, QString key); // sent by remote update only!
public:
void dataUpdatedRemotely(UserId, QString key); // sent by remote update only!
public:
- enum RunMode { Monolithic,
Gui
Only, CoreOnly };
+ enum RunMode { Monolithic,
Client
Only, CoreOnly };
static RunMode runMode;
static QString quasselDir;
static RunMode runMode;
static QString quasselDir;
@@
-99,6
+101,7
@@
class Global : public QObject {
struct Exception {
Exception(QString msg = "Unknown Exception") : _msg(msg) {};
struct Exception {
Exception(QString msg = "Unknown Exception") : _msg(msg) {};
+ virtual ~Exception() {}; // make gcc happy
virtual inline QString msg() { return _msg; }
protected:
virtual inline QString msg() { return _msg; }
protected: