X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fglobal.h;h=1d1d3759421ba2e2ff3024dce5e5e4078e8c697b;hb=2eea4f7ac38f9c36a923d1ad3108aa1cd48f9749;hp=c672c402f5718dac6072920a2f18426002121299;hpb=372e281c83794188819e2a74f570e16684778456;p=quassel.git

diff --git a/src/common/global.h b/src/common/global.h
index c672c402..1d1d3759 100644
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -35,7 +35,6 @@
 #include <QVariant>
 
 /* Some global stuff */
-typedef QMap<QString, QVariant> VarMap;
 
 typedef uint UserId;
 typedef uint MsgId;
@@ -57,28 +56,30 @@ struct Exception {
 };
 
 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);
+public:
+  BufferId();
+  BufferId(uint _id, uint _networkid, uint _gid = 0, QString _net = QString(), QString _buf = QString());
+  
+  inline uint uid() const { return _id; }
+  inline uint networkId() const { return _netid; }
+  inline uint groupId() const { return _gid; }
+  inline QString network() const { return _networkName; }
+  QString buffer() const;
+  
+  void setGroupId(uint gid) { _gid = gid; }
+  
+  inline bool operator==(const BufferId &other) const { return _id == other._id; }
+
+private:
+  uint _id;
+  uint _netid;
+  uint _gid;
+  QString _networkName; // WILL BE REMOVED
+  QString _bufferName; // IS this actually needed?
+  
+  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);