From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 24 Aug 2009 23:11:06 +0000 (+0200)
Subject: Wupps, Altlast-Alarm
X-Git-Tag: 0.5-rc1~24
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=91d4d49abb5e1a8dabba5ae5e460981afda0a354

Wupps, Altlast-Alarm

MessageModelItem::_msg was never set or used. Thus, we shouldn't return that for
the MessageRole and rather delegate that to ChatLineModelItem...
---

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index ab81fe26..ba5db096 100644
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -407,7 +407,7 @@ QVariant MessageModelItem::data(int column, int role) const {
     return QVariant();
 
   switch(role) {
-    case MessageModel::MessageRole: return QVariant::fromValue<Message>(_msg);
+    case MessageModel::MessageRole: return QVariant::fromValue<Message>(message());
     case MessageModel::MsgIdRole: return QVariant::fromValue<MsgId>(msgId());
     case MessageModel::BufferIdRole: return QVariant::fromValue<BufferId>(bufferId());
     case MessageModel::TypeRole: return msgType();
@@ -422,9 +422,6 @@ bool MessageModelItem::setData(int column, const QVariant &value, int role) {
   Q_UNUSED(column);
 
   switch(role) {
-  case MessageModel::FlagsRole:
-    _msg.setFlags((Message::Flags)value.toUInt());
-    return true;
   case MessageModel::RedirectedToRole:
     _redirectedTo = value.value<BufferId>();
     return true;
diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h
index 851509b1..623efa66 100644
--- a/src/client/messagemodel.h
+++ b/src/client/messagemodel.h
@@ -142,7 +142,6 @@ public:
   static bool lessThan(const MessageModelItem *m1, const MessageModelItem *m2);
 
 private:
-  Message _msg;
   BufferId _redirectedTo;
 };
 
diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp
index 343fb992..3613630e 100644
--- a/src/qtui/chatlinemodelitem.cpp
+++ b/src/qtui/chatlinemodelitem.cpp
@@ -52,6 +52,16 @@ ChatLineModelItem::ChatLineModelItem(const Message &msg)
     _styledMsg.setFlags(msg.flags() |= Message::ServerMsg);
 }
 
+bool ChatLineModelItem::setData(int column, const QVariant &value, int role) {
+  switch(role) {
+    case MessageModel::FlagsRole:
+      _styledMsg.setFlags((Message::Flags)value.toUInt());
+      return true;
+    default:
+      return MessageModelItem::setData(column, value, role);
+  }
+}
+
 QVariant ChatLineModelItem::data(int column, int role) const {
   if(role == ChatLineModel::MsgLabelRole)
     return messageLabel();
diff --git a/src/qtui/chatlinemodelitem.h b/src/qtui/chatlinemodelitem.h
index 6eae1af1..8f90d22b 100644
--- a/src/qtui/chatlinemodelitem.h
+++ b/src/qtui/chatlinemodelitem.h
@@ -30,6 +30,7 @@ public:
   ChatLineModelItem(const Message &);
 
   virtual QVariant data(int column, int role) const;
+  virtual bool setData(int column, const QVariant &value, int role);
 
   virtual inline const Message &message() const { return _styledMsg; }
   virtual inline const QDateTime &timestamp() const { return _styledMsg.timestamp(); }