X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fglobal.h;h=c672c402f5718dac6072920a2f18426002121299;hp=fa961f2f8ab0382bb7cea69a5d9873bbab9bd9e8;hb=51dc042dd59b491e45951cb9d8371a1f62857945;hpb=077d44f36d2f5c730283ef6be839aea7dd073d56

diff --git a/src/common/global.h b/src/common/global.h
index fa961f2f..c672c402 100644
--- 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 GUI_PROTOCOL 2
+#define GUI_PROTOCOL 3
 
 #define BACKLOG_FORMAT 2
 #define BACKLOG_STRING "QuasselIRC Backlog File"
 
-class Global;
+#define DEFAULT_PORT 4242
 
-#include <QtCore>
-//#include <QMutex>
+#include <QHash>
+#include <QMutex>
+#include <QString>
+#include <QVariant>
 
 /* Some global stuff */
 typedef QMap<QString, QVariant> VarMap;
@@ -38,67 +40,15 @@ typedef QMap<QString, QVariant> VarMap;
 typedef uint UserId;
 typedef uint MsgId;
 
-/**
- * This class is mostly a globally synchronized data store, meant for storing systemwide settings such
- * as identities or network lists. This class is a singleton, but not static as we'd like to use signals and
- * slots with it.
- * The global object is used in both Core and GUI clients. Storing and retrieving data is thread-safe.
- * \note While updated data is propagated to all the remote parts of Quassel quite quickly, the synchronization
- *       protocol is in no way designed to guarantee strict consistency at all times. In other words, it may
- *       well happen that different instances of global data differ from one another for a little while until
- *       all update messages have been processed. You should never rely on all global data stores being consistent.
-*/
-class Global : public QObject {
-  Q_OBJECT
-
-  public:
-    //static Logger *getLogger();
-    //static void setLogger(Logger *);
-
-//    static QIcon *getIcon(QString symbol);
-
-    static Global *instance();
-    static void destroy();
-    static void setGuiUser(UserId);
-
-    static QVariant data(QString key, QVariant defaultValue = QVariant());
-    static QVariant data(UserId, QString key, QVariant defaultValue = QVariant());
-    static QStringList keys();
-    static QStringList keys(UserId);
-
-    static void putData(QString key, QVariant data);      ///< Store data changed locally, will be propagated to all other clients and the core
-    static void putData(UserId, QString key, QVariant data);
-
-    static void updateData(QString key, QVariant data);   ///< Update stored data if requested by the core or other clients
-    static void updateData(UserId, QString key, QVariant data);
-
-  signals:
-    void dataPutLocally(UserId, QString key);
-    void dataUpdatedRemotely(UserId, QString key);  // sent by remote update only!
-
-  public:
-    enum RunMode { Monolithic, GuiOnly, CoreOnly };
-    static RunMode runMode;
-    static QString quasselDir;
-
-  private:
-    Global();
-    ~Global();
-    static Global *instanceptr;
-
-    static UserId guiUser;
-    //static void initIconMap();
-
-    //static Logger *logger;
-
-//    static QString iconPath;
-    //QHash<QString, QString> iconMap;
-    static QMutex mutex;
-    QHash<UserId, QHash<QString, QVariant> > datastore;
-};
+namespace Global {
+  enum RunMode { Monolithic, ClientOnly, CoreOnly };
+  extern RunMode runMode;
+  extern QString quasselDir;
+}
 
 struct Exception {
     Exception(QString msg = "Unknown Exception") : _msg(msg) {};
+    virtual ~Exception() {}; // make gcc happy
     virtual inline QString msg() { return _msg; }
 
   protected:
@@ -111,14 +61,15 @@ class BufferId {
     BufferId() { id = gid = 0; } // FIXME
     BufferId(uint uid, QString net, QString buf, uint gid = 0);
 
-    inline uint uid() { return id; }
-    inline uint groupId() { return gid; }
-    inline QString network() { return net; }
-    QString buffer(); // nickfrommask?
+    inline uint uid() const { return id; }
+    inline uint groupId() const { return gid; }
+    inline QString network() const { return net; }
+    QString buffer() const; // nickfrommask?
 
     void setGroupId(uint _gid) { gid = _gid; }
 
     inline bool operator==(const BufferId &other) const { return id == other.id; }
+
   private:
     uint id;
     uint gid;