projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalProxy will no longer attempt to deliver data types unknown to Qt's MetaSystem
[quassel.git]
/
src
/
common
/
bufferinfo.h
diff --git
a/src/common/bufferinfo.h
b/src/common/bufferinfo.h
index
0597adc
..
5e2b5f2
100644
(file)
--- a/
src/common/bufferinfo.h
+++ b/
src/common/bufferinfo.h
@@
-29,7
+29,7
@@
class QDataStream;
class BufferInfo {
public:
BufferInfo();
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 net = QString(), QString buf = QString());
inline BufferId uid() const { return _id; }
inline NetworkId networkId() const { return _netid; }
inline BufferId uid() const { return _id; }
inline NetworkId networkId() const { return _netid; }
@@
-42,8
+42,8
@@
public:
inline bool operator==(const BufferInfo &other) const { return _id == other._id; }
private:
inline bool operator==(const BufferInfo &other) const { return _id == other._id; }
private:
-
uint
_id;
-
uint
_netid;
+
BufferId
_id;
+
NetworkId
_netid;
uint _gid;
QString _networkName; // WILL BE REMOVED
QString _bufferName;
uint _gid;
QString _networkName; // WILL BE REMOVED
QString _bufferName;