projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark highlighted messages with a subtly different background color.
[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();
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 _i
d; }
+ inline BufferId
bufferId() const { return _bufferI
d; }
inline NetworkId networkId() const { return _netid; }
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) { _g
i
d = gid; }
+ void setGroupId(uint gid) { _g
roupI
d = gid; }
- inline bool operator==(const BufferInfo &other) const { return _
id == other._i
d; }
+ inline bool operator==(const BufferInfo &other) const { return _
bufferId == other._bufferI
d; }
private:
private:
- BufferId _
i
d;
+ BufferId _
bufferI
d;
NetworkId _netid;
NetworkId _netid;
- uint _gid;
- QString _networkName; // WILL BE REMOVED
+ uint _groupId;
QString _bufferName;
friend uint qHash(const BufferInfo &);
QString _bufferName;
friend uint qHash(const BufferInfo &);