projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed QVariant::fromValue() to qVariantFromValue, since MSVC6 supposedly cannot...
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
aa4aefe
..
6d6792c
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-94,9
+94,9
@@
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
QVariant::fromValue<BufferId>
(bufferInfo().uid());
+ return
qVariantFromValue
(bufferInfo().uid());
case NetworkModel::NetworkIdRole:
case NetworkModel::NetworkIdRole:
- return
QVariant::fromValue<NetworkId>
(bufferInfo().networkId());
+ return
qVariantFromValue
(bufferInfo().networkId());
case NetworkModel::BufferTypeRole:
return int(bufferType());
case NetworkModel::ItemActiveRole:
case NetworkModel::BufferTypeRole:
return int(bufferType());
case NetworkModel::ItemActiveRole:
@@
-220,7
+220,7
@@
NetworkItem::NetworkItem(const NetworkId &netid, AbstractTreeItem *parent)
QVariant NetworkItem::data(int column, int role) const {
switch(role) {
case NetworkModel::NetworkIdRole:
QVariant NetworkItem::data(int column, int role) const {
switch(role) {
case NetworkModel::NetworkIdRole:
- return
QVariant::fromValue<NetworkId>
(_networkId);
+ return
qVariantFromValue
(_networkId);
case NetworkModel::ItemTypeRole:
return NetworkModel::NetworkItemType;
case NetworkModel::ItemActiveRole:
case NetworkModel::ItemTypeRole:
return NetworkModel::NetworkItemType;
case NetworkModel::ItemActiveRole: