Prevent the core from restoring its state if it is unconfigured.

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

diff --git a/src/common/bufferinfo.h b/src/common/bufferinfo.h
index 5e2b5f2..6a5a779 100644 (file)
--- a/src/common/bufferinfo.h
+++ b/src/common/bufferinfo.h
@@ -29,23 +29,21 @@ class QDataStream;
 class BufferInfo {
 public:
   BufferInfo();
-  BufferInfo(BufferId id, NetworkId 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:
-  BufferId _id;
+  BufferId _bufferId;
   NetworkId _netid;
-  uint _gid;
-  QString _networkName; // WILL BE REMOVED
+  uint _groupId;
   QString _bufferName;
   
   friend uint qHash(const BufferInfo &);