From 7857ea0a520226e856af8d275550b76627f59c56 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Thu, 4 Dec 2008 00:42:17 +0100 Subject: [PATCH 1/1] Properly return pointers for IrcUserRole and IrcChannelRole --- src/client/networkmodel.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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(_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(_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(_ircUser.data()); case NetworkModel::UserAwayRole: return (bool)_ircUser ? _ircUser->isAway() : false; default: -- 2.20.1