projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssl: Use QSslSocket directly to avoid redundant qobject_casts
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
4713932
..
4fbdfc6
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
19
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,6
+20,7
@@
#include "networkmodel.h"
#include "networkmodel.h"
+#include <algorithm>
#include <utility>
#include <QAbstractItemView>
#include <utility>
#include <QAbstractItemView>
@@
-69,7
+70,7
@@
QVariant NetworkItem::data(int column, int role) const
else
return QVariant();
case NetworkModel::NetworkIdRole:
else
return QVariant();
case NetworkModel::NetworkIdRole:
- return
qVariantF
romValue(_networkId);
+ return
QVariant::f
romValue(_networkId);
case NetworkModel::ItemTypeRole:
return NetworkModel::NetworkItemType;
case NetworkModel::ItemActiveRole:
case NetworkModel::ItemTypeRole:
return NetworkModel::NetworkItemType;
case NetworkModel::ItemActiveRole:
@@
-376,11
+377,11
@@
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
qVariantF
romValue(bufferInfo().bufferId());
+ return
QVariant::f
romValue(bufferInfo().bufferId());
case NetworkModel::NetworkIdRole:
case NetworkModel::NetworkIdRole:
- return
qVariantF
romValue(bufferInfo().networkId());
+ return
QVariant::f
romValue(bufferInfo().networkId());
case NetworkModel::BufferInfoRole:
case NetworkModel::BufferInfoRole:
- return
qVariantF
romValue(bufferInfo());
+ return
QVariant::f
romValue(bufferInfo());
case NetworkModel::BufferTypeRole:
return int(bufferType());
case NetworkModel::ItemActiveRole:
case NetworkModel::BufferTypeRole:
return int(bufferType());
case NetworkModel::ItemActiveRole:
@@
-388,9
+389,9
@@
QVariant BufferItem::data(int column, int role) const
case NetworkModel::BufferActivityRole:
return (int)activityLevel();
case NetworkModel::BufferFirstUnreadMsgIdRole:
case NetworkModel::BufferActivityRole:
return (int)activityLevel();
case NetworkModel::BufferFirstUnreadMsgIdRole:
- return
qVariantF
romValue(firstUnreadMsgId());
+ return
QVariant::f
romValue(firstUnreadMsgId());
case NetworkModel::MarkerLineMsgIdRole:
case NetworkModel::MarkerLineMsgIdRole:
- return
qVariantF
romValue(markerLineMsgId());
+ return
QVariant::f
romValue(markerLineMsgId());
default:
return PropertyMapItem::data(column, role);
}
default:
return PropertyMapItem::data(column, role);
}
@@
-482,7
+483,7
@@
QVariant QueryBufferItem::data(int column, int role) const
case Qt::EditRole:
return BufferItem::data(column, Qt::DisplayRole);
case NetworkModel::IrcUserRole:
case Qt::EditRole:
return BufferItem::data(column, Qt::DisplayRole);
case NetworkModel::IrcUserRole:
- return QVariant::fromValue
<QObject*>
(_ircUser);
+ return QVariant::fromValue(_ircUser);
case NetworkModel::UserAwayRole:
return (bool)_ircUser ? _ircUser->isAway() : false;
default:
case NetworkModel::UserAwayRole:
return (bool)_ircUser ? _ircUser->isAway() : false;
default:
@@
-695,7
+696,7
@@
QVariant ChannelBufferItem::data(int column, int role) const
{
switch (role) {
case NetworkModel::IrcChannelRole:
{
switch (role) {
case NetworkModel::IrcChannelRole:
- return QVariant::fromValue
<QObject*>
(_ircChannel);
+ return QVariant::fromValue(_ircChannel);
default:
return BufferItem::data(column, role);
}
default:
return BufferItem::data(column, role);
}
@@
-1062,7
+1063,7
@@
QVariant IrcUserItem::data(int column, int role) const
case NetworkModel::IrcChannelRole:
return parent()->data(column, role);
case NetworkModel::IrcUserRole:
case NetworkModel::IrcChannelRole:
return parent()->data(column, role);
case NetworkModel::IrcUserRole:
- return QVariant::fromValue
<QObject*>
(_ircUser.data());
+ return QVariant::fromValue(_ircUser.data());
case NetworkModel::UserAwayRole:
return (bool)_ircUser ? _ircUser->isAway() : false;
default:
case NetworkModel::UserAwayRole:
return (bool)_ircUser ? _ircUser->isAway() : false;
default:
@@
-1520,7
+1521,7
@@
void NetworkModel::checkForRemovedBuffers(const QModelIndex& parent, int start,
return;
for (int row = start; row <= end; row++) {
return;
for (int row = start; row <= end; row++) {
- _bufferItemCache.remove(
parent.child(row, 0
).data(BufferIdRole).value<BufferId>());
+ _bufferItemCache.remove(
index(row, 0, parent
).data(BufferIdRole).value<BufferId>());
}
}
}
}
@@
-1530,7
+1531,7
@@
void NetworkModel::checkForNewBuffers(const QModelIndex& parent, int start, int
return;
for (int row = start; row <= end; row++) {
return;
for (int row = start; row <= end; row++) {
- QModelIndex child = parent.
child(row, 0
);
+ QModelIndex child = parent.
model()->index(row, 0, parent
);
_bufferItemCache[child.data(BufferIdRole).value<BufferId>()] = static_cast<BufferItem*>(child.internalPointer());
}
}
_bufferItemCache[child.data(BufferIdRole).value<BufferId>()] = static_cast<BufferItem*>(child.internalPointer());
}
}