Finished the fusion of the different main_* files, so now we have only one #ifdef...

[quassel.git] / src / common / global.h

diff --git a/src/common/global.h b/src/common/global.h
index 4285606..49f9750 100644 (file)
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -77,7 +77,7 @@ class Global : public QObject {
     void dataUpdatedRemotely(UserId, QString key);  // sent by remote update only!
 
   public:
-    enum RunMode { Monolithic, GuiOnly, CoreOnly };
+    enum RunMode { Monolithic, ClientOnly, CoreOnly };
     static RunMode runMode;
     static QString quasselDir;
 
@@ -99,6 +99,7 @@ class Global : public QObject {
 
 struct Exception {
     Exception(QString msg = "Unknown Exception") : _msg(msg) {};
+    virtual ~Exception() {}; // make gcc happy
     virtual inline QString msg() { return _msg; }
 
   protected: