projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing weired behavior and/or crashes for dynamic backlog replay
[quassel.git]
/
src
/
common
/
bufferinfo.cpp
diff --git
a/src/common/bufferinfo.cpp
b/src/common/bufferinfo.cpp
index
8d45a47
..
c45c8aa
100644
(file)
--- a/
src/common/bufferinfo.cpp
+++ b/
src/common/bufferinfo.cpp
@@
-28,22
+28,28
@@
#include "util.h"
BufferInfo::BufferInfo()
#include "util.h"
BufferInfo::BufferInfo()
- : _
i
d(0),
+ : _
bufferI
d(0),
_netid(0),
_netid(0),
- _gid(0),
+ _type(InvalidBuffer),
+ _groupId(0),
_bufferName(QString())
{
}
_bufferName(QString())
{
}
-BufferInfo::BufferInfo(BufferId id, NetworkId networkid, uint gid, QString buf)
- : _
i
d(id),
+BufferInfo::BufferInfo(BufferId id, NetworkId networkid,
Type type,
uint gid, QString buf)
+ : _
bufferI
d(id),
_netid(networkid),
_netid(networkid),
- _gid(gid),
+ _type(type),
+ _groupId(gid),
_bufferName(buf)
{
}
_bufferName(buf)
{
}
-QString BufferInfo::buffer() const {
+BufferInfo BufferInfo::fakeStatusBuffer(NetworkId networkId) {
+ return BufferInfo(0, networkId, StatusBuffer);
+}
+
+QString BufferInfo::bufferName() const {
if(isChannelName(_bufferName))
return _bufferName;
else
if(isChannelName(_bufferName))
return _bufferName;
else
@@
-51,23
+57,25
@@
QString BufferInfo::buffer() const {
}
QDebug operator<<(QDebug dbg, const BufferInfo &b) {
}
QDebug operator<<(QDebug dbg, const BufferInfo &b) {
- dbg.nospace() << "(bufId: " << b.
uid() << ", netId: " << b.networkId() << ", groupId: " << b.groupId() << ", buf: " << b.buffer
() << ")";
+ dbg.nospace() << "(bufId: " << b.
bufferId() << ", netId: " << b.networkId() << ", groupId: " << b.groupId() << ", buf: " << b.bufferName
() << ")";
return dbg.space();
}
QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo) {
return dbg.space();
}
QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo) {
- out << bufferInfo._
id << bufferInfo._netid << bufferInfo._gi
d << bufferInfo._bufferName.toUtf8();
+ out << bufferInfo._
bufferId << bufferInfo._netid << (qint16)bufferInfo._type << bufferInfo._groupI
d << bufferInfo._bufferName.toUtf8();
return out;
}
QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo) {
QByteArray buffername;
return out;
}
QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo) {
QByteArray buffername;
- in >> bufferInfo._id >> bufferInfo._netid >> bufferInfo._gid >> buffername;
+ qint16 bufferType;
+ in >> bufferInfo._bufferId >> bufferInfo._netid >> bufferType >> bufferInfo._groupId >> buffername;
+ bufferInfo._type = (BufferInfo::Type)bufferType;
bufferInfo._bufferName = QString::fromUtf8(buffername);
return in;
}
uint qHash(const BufferInfo &bufferid) {
bufferInfo._bufferName = QString::fromUtf8(buffername);
return in;
}
uint qHash(const BufferInfo &bufferid) {
- return qHash(bufferid._
id.toInt()
);
+ return qHash(bufferid._
bufferId
);
}
}