From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 3 Dec 2008 23:42:17 +0000 (+0100)
Subject: Properly return pointers for IrcUserRole and IrcChannelRole
X-Git-Tag: 0.4.0~376
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7857ea0a520226e856af8d275550b76627f59c56;ds=sidebyside

Properly return pointers for IrcUserRole and IrcChannelRole
---

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index c75dd576..92020360 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -318,7 +318,7 @@ QueryBufferItem::QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *pare
 QVariant QueryBufferItem::data(int column, int role) const {
   switch(role) {
   case NetworkModel::IrcUserRole:
-    return _ircUser;
+    return QVariant::fromValue<QObject *>(_ircUser);
   case NetworkModel::UserAwayRole:
     return (bool)_ircUser ? _ircUser->isAway() : false;
   default:
@@ -392,7 +392,7 @@ ChannelBufferItem::ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeI
 QVariant ChannelBufferItem::data(int column, int role) const {
   switch(role) {
     case NetworkModel::IrcChannelRole:
-      return _ircChannel;
+      return QVariant::fromValue<QObject *>(_ircChannel);
     default:
       return BufferItem::data(column, role);
   }
@@ -689,8 +689,10 @@ QVariant IrcUserItem::data(int column, int role) const {
     return parent()->data(column, role);
   case NetworkModel::BufferInfoRole:
     return parent()->data(column, role);
+  case NetworkModel::IrcChannelRole:
+    return parent()->data(column, role);
   case NetworkModel::IrcUserRole:
-    return _ircUser.data();
+    return QVariant::fromValue<QObject *>(_ircUser.data());
   case NetworkModel::UserAwayRole:
     return (bool)_ircUser ? _ircUser->isAway() : false;
   default: