X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fbufferinfo.h;h=6a5a7798ac07270556429021cd7e0b26d2564b20;hb=cab361607b686847ee0df2e605f8f05598b65f99;hp=0597adcbed23038439b357f283da0eb984cf7958;hpb=50706d89d4d60e258ebb6873d3778383621898e4;p=quassel.git

diff --git a/src/common/bufferinfo.h b/src/common/bufferinfo.h
index 0597adcb..6a5a7798 100644
--- a/src/common/bufferinfo.h
+++ b/src/common/bufferinfo.h
@@ -29,23 +29,21 @@ class QDataStream;
 class BufferInfo {
 public:
   BufferInfo();
-  BufferInfo(uint id, uint networkid, uint gid = 0, QString net = QString(), QString buf = QString());
+  BufferInfo(BufferId id, NetworkId networkid, uint gid = 0, QString buf = QString());
   
-  inline BufferId uid() const { return _id; }
+  inline BufferId bufferId() const { return _bufferId; }
   inline NetworkId networkId() const { return _netid; }
-  inline uint groupId() const { return _gid; }
-  inline QString network() const { return _networkName; }
-  QString buffer() const;
+  inline uint groupId() const { return _groupId; }
+  QString bufferName() const;
   
-  void setGroupId(uint gid) { _gid = gid; }
+  void setGroupId(uint gid) { _groupId = gid; }
   
-  inline bool operator==(const BufferInfo &other) const { return _id == other._id; }
+  inline bool operator==(const BufferInfo &other) const { return _bufferId == other._bufferId; }
 
 private:
-  uint _id;
-  uint _netid;
-  uint _gid;
-  QString _networkName; // WILL BE REMOVED
+  BufferId _bufferId;
+  NetworkId _netid;
+  uint _groupId;
   QString _bufferName;
   
   friend uint qHash(const BufferInfo &);