projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code cleanup. Distclean advised
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
076e704
..
1676e33
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-40,9
+40,9
@@
BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
_activity(NoActivity)
{
// determine BufferType
_activity(NoActivity)
{
// determine BufferType
- if(bufferInfo.buffer().isEmpty())
+ if(bufferInfo.buffer
Name
().isEmpty())
_type = StatusType;
_type = StatusType;
- else if(isChannelName(bufferInfo.buffer()))
+ else if(isChannelName(bufferInfo.buffer
Name
()))
_type = ChannelType;
else
_type = QueryType;
_type = ChannelType;
else
_type = QueryType;
@@
-59,7
+59,7
@@
const BufferInfo &BufferItem::bufferInfo() const {
}
quint64 BufferItem::id() const {
}
quint64 BufferItem::id() const {
- return bufferInfo().
ui
d().toInt();
+ return bufferInfo().
bufferI
d().toInt();
}
bool BufferItem::isStatusBuffer() const {
}
bool BufferItem::isStatusBuffer() const {
@@
-96,7
+96,7
@@
QVariant BufferItem::data(int column, int role) const {
case NetworkModel::ItemTypeRole:
return NetworkModel::BufferItemType;
case NetworkModel::BufferIdRole:
case NetworkModel::ItemTypeRole:
return NetworkModel::BufferItemType;
case NetworkModel::BufferIdRole:
- return qVariantFromValue(bufferInfo().
ui
d());
+ return qVariantFromValue(bufferInfo().
bufferI
d());
case NetworkModel::NetworkIdRole:
return qVariantFromValue(bufferInfo().networkId());
case NetworkModel::BufferInfoRole:
case NetworkModel::NetworkIdRole:
return qVariantFromValue(bufferInfo().networkId());
case NetworkModel::BufferInfoRole:
@@
-163,7
+163,7
@@
QString BufferItem::bufferName() const {
if(bufferType() == StatusType)
return tr("Status Buffer");
else
if(bufferType() == StatusType)
return tr("Status Buffer");
else
- return bufferInfo().buffer();
+ return bufferInfo().buffer
Name
();
}
QString BufferItem::topic() const {
}
QString BufferItem::topic() const {
@@
-578,7
+578,7
@@
QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
}
BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
}
BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
- QModelIndex bufferIdx = bufferIndex(bufferInfo.
ui
d());
+ QModelIndex bufferIdx = bufferIndex(bufferInfo.
bufferI
d());
if(bufferIdx.isValid())
return static_cast<BufferItem *>(bufferIdx.internalPointer());
else
if(bufferIdx.isValid())
return static_cast<BufferItem *>(bufferIdx.internalPointer());
else
@@
-708,6
+708,6
@@
void NetworkModel::updateBufferActivity(const Message &msg) {
if(msg.flags() & Message::Highlight)
level |= BufferItem::Highlight;
if(msg.flags() & Message::Highlight)
level |= BufferItem::Highlight;
- bufferItem(msg.buffer())->updateActivity(level);
+ bufferItem(msg.buffer
Info
())->updateActivity(level);
}
}