Added nicklist for QuasselTopia. Various cosmetic and visual fixes.

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

diff --git a/src/common/global.h b/src/common/global.h
index c672c40..73ddd0b 100644 (file)
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -18,74 +18,21 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+// This file needs probably to go away at some point. Not much left anymore.
+
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
 /** The protocol version we use fo the communication between core and GUI */
 #define GUI_PROTOCOL 3
 
-#define BACKLOG_FORMAT 2
-#define BACKLOG_STRING "QuasselIRC Backlog File"
-
 #define DEFAULT_PORT 4242
 
-#include <QHash>
-#include <QMutex>
-#include <QString>
-#include <QVariant>
-
 /* Some global stuff */
-typedef QMap<QString, QVariant> VarMap;
-
-typedef uint UserId;
-typedef uint MsgId;
 
 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:
-    QString _msg;
-
-};
-
-class BufferId {
-  public:
-    BufferId() { id = gid = 0; } // FIXME
-    BufferId(uint uid, QString net, QString buf, uint gid = 0);
-
-    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;
-    QString net;
-    QString buf;
-
-    friend uint qHash(const BufferId &);
-    friend QDataStream &operator<<(QDataStream &out, const BufferId &bufferId);
-    friend QDataStream &operator>>(QDataStream &in, BufferId &bufferId);
-};
-
-QDataStream &operator<<(QDataStream &out, const BufferId &bufferId);
-QDataStream &operator>>(QDataStream &in, BufferId &bufferId);
-
-Q_DECLARE_METATYPE(BufferId);
-
-uint qHash(const BufferId &);
-
 #endif