projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
beautyfied the code in userinputhandler::handlectcp
[quassel.git]
/
src
/
common
/
bufferinfo.cpp
diff --git
a/src/common/bufferinfo.cpp
b/src/common/bufferinfo.cpp
index
d696ab3
..
e36defc
100644
(file)
--- a/
src/common/bufferinfo.cpp
+++ b/
src/common/bufferinfo.cpp
@@
-35,7
+35,7
@@
BufferInfo::BufferInfo()
_bufferName(QString()) {
}
_bufferName(QString()) {
}
-BufferInfo::BufferInfo(
uint id, uint
networkid, uint gid, QString net, QString buf)
+BufferInfo::BufferInfo(
BufferId id, NetworkId
networkid, uint gid, QString net, QString buf)
: _id(id),
_netid(networkid),
_gid(gid),
: _id(id),
_netid(networkid),
_gid(gid),
@@
-47,7
+47,7
@@
QString BufferInfo::buffer() const {
if(isChannelName(_bufferName))
return _bufferName;
else
if(isChannelName(_bufferName))
return _bufferName;
else
- return nickFromMask(_bufferName); // FIXME get rid of global functions and use the Network
Info
stuff instead!
+ return nickFromMask(_bufferName); // FIXME get rid of global functions and use the Network stuff instead!
}
QDebug operator<<(QDebug dbg, const BufferInfo &b) {
}
QDebug operator<<(QDebug dbg, const BufferInfo &b) {
@@
-71,6
+71,6
@@
QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo) {
}
uint qHash(const BufferInfo &bufferid) {
}
uint qHash(const BufferInfo &bufferid) {
- return qHash(bufferid._id);
+ return qHash(bufferid._id
.toInt()
);
}
}