consistency++

MessageItem -> MessageModelItem
Chatline -> ChatlineModelItem

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index 3be7601..17e9049 100644 (file)
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -52,7 +52,7 @@ bool MessageModel::setData(const QModelIndex &index, const QVariant &value, int
 void MessageModel::insertMessage(const Message &msg) {
   MsgId id = msg.msgId();
   int idx = indexForId(id);
-  MessageItem *item = createMessageItem(msg);
+  MessageModelItem *item = createMessageModelItem(msg);
   beginInsertRows(QModelIndex(), idx, idx);
   _messageList.insert(idx, item);
   endInsertRows();
@@ -81,7 +81,7 @@ int MessageModel::indexForId(MsgId id) {
 
 /**********************************************************************************/
 
-MessageItem::MessageItem(const Message &msg) {
+MessageModelItem::MessageModelItem(const Message &msg) {
   _timestamp = msg.timestamp();
   _msgId = msg.msgId();
   _bufferId = msg.bufferInfo().bufferId();
@@ -90,11 +90,11 @@ MessageItem::MessageItem(const Message &msg) {
 
 }
 
-MessageItem::~MessageItem() {
+MessageModelItem::~MessageModelItem() {
 
 }
 
-QVariant MessageItem::data(int column, int role) const {
+QVariant MessageModelItem::data(int column, int role) const {
   if(column < MessageModel::TimestampColumn || column > MessageModel::TextColumn) return QVariant();
   switch(role) {
     case MessageModel::MsgIdRole: return QVariant::fromValue<MsgId>(_msgId);

diff --git a/src/client/messagemodel.h b/src/client/messagemodel.h
index afbe89f..d37100c 100644 (file)
--- a/src/client/messagemodel.h
+++ b/src/client/messagemodel.h
@@ -27,7 +27,7 @@
 #include "message.h"
 #include "types.h"
 
-class MessageItem;
+class MessageModelItem;
 class MsgId;
 
 class MessageModel : public QAbstractItemModel {
@@ -66,26 +66,26 @@ class MessageModel : public QAbstractItemModel {
     void insertMessages(const QList<Message> &);
 
   protected:
-    virtual MessageItem *createMessageItem(const Message &) = 0;
+    virtual MessageModelItem *createMessageModelItem(const Message &) = 0;
 
   private:
-    QList<MessageItem *> _messageList;
+    QList<MessageModelItem *> _messageList;
 
     int indexForId(MsgId);
 
 };
 
-class MessageItem {
+class MessageModelItem {
 
   public:
 
-    //! Creates a MessageItem from a Message object.
+    //! Creates a MessageModelItem from a Message object.
     /** This baseclass implementation takes care of all Message data *except* the stylable strings.
      *  Subclasses need to provide Qt::DisplayRole at least, which should describe the plaintext
      *  strings without formattings (e.g. for searching purposes).
      */
-    MessageItem(const Message &);
-    virtual ~MessageItem();
+    MessageModelItem(const Message &);
+    virtual ~MessageModelItem();
 
     virtual QVariant data(int column, int role) const;
     virtual bool setData(int column, const QVariant &value, int role) = 0;

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 0acb5be..bc10ca5 100644 (file)
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -19,11 +19,6 @@
  ***************************************************************************/
 
 #include "bufferwidget.h"
-#ifdef SPUTDEV
-# include "chatline.h"
-#else
-# include "chatline-old.h"
-#endif
 #include "chatview.h"
 #include "chatwidget.h"
 #include "settings.h"

diff --git a/src/qtui/chatlinemodel.cpp b/src/qtui/chatlinemodel.cpp
index 09904e2..9ca1ff8 100644 (file)
--- a/src/qtui/chatlinemodel.cpp
+++ b/src/qtui/chatlinemodel.cpp
@@ -20,7 +20,7 @@
 
 #include "chatlinemodel.h"
 
-#include "chatline.h"
+#include "chatlinemodelitem.h"
 
 ChatlineModel::ChatlineModel(QObject *parent) : MessageModel(parent) {
 
@@ -32,7 +32,7 @@ ChatlineModel::~ChatlineModel() {
 }
 
 
-MessageItem *ChatlineModel::createMessageItem(const Message &msg) {
-  return new Chatline(msg);
+MessageModelItem *ChatlineModel::createMessageModelItem(const Message &msg) {
+  return new ChatlineModelItem(msg);
 
 }

diff --git a/src/qtui/chatlinemodel.h b/src/qtui/chatlinemodel.h
index 3dec09c..11c9a07 100644 (file)
--- a/src/qtui/chatlinemodel.h
+++ b/src/qtui/chatlinemodel.h
@@ -35,7 +35,7 @@ class ChatlineModel : public MessageModel {
     virtual ~ChatlineModel();
 
   protected:
-    virtual MessageItem *createMessageItem(const Message &);
+    virtual MessageModelItem *createMessageModelItem(const Message &);
 
 };
 

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatlinemodelitem.cpp
similarity index 88%
rename from src/qtui/chatline.cpp
rename to src/qtui/chatlinemodelitem.cpp
index d4c8390..dbd5e93 100644 (file)
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatlinemodelitem.cpp
@@ -18,18 +18,18 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "chatline.h"
+#include "chatlinemodelitem.h"
 #include "chatlinemodel.h"
 #include "qtui.h"
 #include "uistyle.h"
 
-Chatline::Chatline(const Message &msg) : MessageItem(msg) {
+ChatlineModelItem::ChatlineModelItem(const Message &msg) : MessageModelItem(msg) {
   _msg = QtUi::style()->styleMessage(msg);
 
 }
 
 
-QVariant Chatline::data(int column, int role) const {
+QVariant ChatlineModelItem::data(int column, int role) const {
   switch(role) {
     case ChatlineModel::DisplayRole:
       switch(column) {
@@ -46,9 +46,9 @@ QVariant Chatline::data(int column, int role) const {
       }
       break;
   }
-  return MessageItem::data(column, role);
+  return MessageModelItem::data(column, role);
 }
 
-bool Chatline::setData(int column, const QVariant &value, int role) {
+bool ChatlineModelItem::setData(int column, const QVariant &value, int role) {
   return false;
 }

diff --git a/src/qtui/chatline.h b/src/qtui/chatlinemodelitem.h
similarity index 90%
rename from src/qtui/chatline.h
rename to src/qtui/chatlinemodelitem.h
index 448f4db..6256dc2 100644 (file)
--- a/src/qtui/chatline.h
+++ b/src/qtui/chatlinemodelitem.h
@@ -18,17 +18,17 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef CHATLINE_H_
-#define CHATLINE_H_
+#ifndef CHATLINEMODELITEM_H_
+#define CHATLINEMODELITEM_H_
 
 #include "messagemodel.h"
 #include "uistyle.h"
 
-class Chatline : public MessageItem {
+class ChatlineModelItem : public MessageModelItem {
 
   public:
-    Chatline(const Message &);
-    //virtual ~Chatline() {};
+    ChatlineModelItem(const Message &);
+    //virtual ~ChatlineModelItem() {};
 
     virtual QVariant data(int column, int role) const;
     virtual bool setData(int column, const QVariant &value, int role);

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index dc2d560..a78c2ba 100644 (file)
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -23,7 +23,7 @@
 
 #include "buffer.h"
 #include "chatitem.h"
-#include "chatline.h"
+#include "chatlinemodelitem.h"
 #include "chatscene.h"
 #include "quasselui.h"
 

diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp
index aa62310..f76cf2a 100644 (file)
--- a/src/qtui/chatview.cpp
+++ b/src/qtui/chatview.cpp
@@ -21,7 +21,7 @@
 #include <QGraphicsTextItem>
 
 #include "buffer.h"
-#include "chatline.h"
+#include "chatlinemodelitem.h"
 #include "chatscene.h"
 #include "chatview.h"
 #include "client.h"

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index cbf50ad..36644da 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -25,11 +25,6 @@
 #include "bufferviewconfig.h"
 #include "bufferviewfilter.h"
 #include "bufferviewmanager.h"
-#ifdef SPUTDEV
-# include "chatline.h"
-#else
-# include "chatline-old.h"
-#endif
 #include "client.h"
 #include "clientbacklogmanager.h"
 #include "coreconnectdlg.h"

diff --git a/src/qtui/qtui.pri b/src/qtui/qtui.pri
index 7f01d41..5688c06 100644 (file)
--- a/src/qtui/qtui.pri
+++ b/src/qtui/qtui.pri
@@ -13,8 +13,8 @@ HDRS += aboutdlg.h bufferwidget.h chatline-old.h chatwidget.h \
 
 # new chatline model stuff
 sputdev {
-  SRCS += chatitem.cpp chatline.cpp chatlinemodel.cpp chatscene.cpp chatview.cpp
-  HDRS += chatitem.h chatline.h chatlinemodel.h chatscene.h chatview.h
+  SRCS += chatitem.cpp chatlinemodelitem.cpp chatlinemodel.cpp chatscene.cpp chatview.cpp
+  HDRS += chatitem.h chatlinemodelitem.h chatlinemodel.h chatscene.h chatview.h
   SRCS -= chatline-old.cpp chatwidget.cpp
   HDRS -= chatline-old.h chatwidget.h
 }