MessageItem -> MessageModelItem
Chatline -> ChatlineModelItem
void MessageModel::insertMessage(const Message &msg) {
MsgId id = msg.msgId();
int idx = indexForId(id);
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();
beginInsertRows(QModelIndex(), idx, idx);
_messageList.insert(idx, item);
endInsertRows();
/**********************************************************************************/
/**********************************************************************************/
-MessageItem::MessageItem(const Message &msg) {
+MessageModelItem::MessageModelItem(const Message &msg) {
_timestamp = msg.timestamp();
_msgId = msg.msgId();
_bufferId = msg.bufferInfo().bufferId();
_timestamp = msg.timestamp();
_msgId = msg.msgId();
_bufferId = msg.bufferInfo().bufferId();
-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);
if(column < MessageModel::TimestampColumn || column > MessageModel::TextColumn) return QVariant();
switch(role) {
case MessageModel::MsgIdRole: return QVariant::fromValue<MsgId>(_msgId);
#include "message.h"
#include "types.h"
#include "message.h"
#include "types.h"
class MsgId;
class MessageModel : public QAbstractItemModel {
class MsgId;
class MessageModel : public QAbstractItemModel {
void insertMessages(const QList<Message> &);
protected:
void insertMessages(const QList<Message> &);
protected:
- virtual MessageItem *createMessageItem(const Message &) = 0;
+ virtual MessageModelItem *createMessageModelItem(const Message &) = 0;
- QList<MessageItem *> _messageList;
+ QList<MessageModelItem *> _messageList;
int indexForId(MsgId);
};
int indexForId(MsgId);
};
+class MessageModelItem {
- //! 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).
*/
/** 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;
virtual QVariant data(int column, int role) const;
virtual bool setData(int column, const QVariant &value, int role) = 0;
***************************************************************************/
#include "bufferwidget.h"
***************************************************************************/
#include "bufferwidget.h"
-#ifdef SPUTDEV
-# include "chatline.h"
-#else
-# include "chatline-old.h"
-#endif
#include "chatview.h"
#include "chatwidget.h"
#include "settings.h"
#include "chatview.h"
#include "chatwidget.h"
#include "settings.h"
#include "chatlinemodel.h"
#include "chatlinemodel.h"
+#include "chatlinemodelitem.h"
ChatlineModel::ChatlineModel(QObject *parent) : MessageModel(parent) {
ChatlineModel::ChatlineModel(QObject *parent) : MessageModel(parent) {
-MessageItem *ChatlineModel::createMessageItem(const Message &msg) {
- return new Chatline(msg);
+MessageModelItem *ChatlineModel::createMessageModelItem(const Message &msg) {
+ return new ChatlineModelItem(msg);
virtual ~ChatlineModel();
protected:
virtual ~ChatlineModel();
protected:
- virtual MessageItem *createMessageItem(const Message &);
+ virtual MessageModelItem *createMessageModelItem(const Message &);
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include "chatlinemodelitem.h"
#include "chatlinemodel.h"
#include "qtui.h"
#include "uistyle.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);
}
_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) {
switch(role) {
case ChatlineModel::DisplayRole:
switch(column) {
- 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) {
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 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"
#include "messagemodel.h"
#include "uistyle.h"
-class Chatline : public MessageItem {
+class ChatlineModelItem : public MessageModelItem {
- 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);
virtual QVariant data(int column, int role) const;
virtual bool setData(int column, const QVariant &value, int role);
#include "buffer.h"
#include "chatitem.h"
#include "buffer.h"
#include "chatitem.h"
+#include "chatlinemodelitem.h"
#include "chatscene.h"
#include "quasselui.h"
#include "chatscene.h"
#include "quasselui.h"
#include <QGraphicsTextItem>
#include "buffer.h"
#include <QGraphicsTextItem>
#include "buffer.h"
+#include "chatlinemodelitem.h"
#include "chatscene.h"
#include "chatview.h"
#include "client.h"
#include "chatscene.h"
#include "chatview.h"
#include "client.h"
#include "bufferviewconfig.h"
#include "bufferviewfilter.h"
#include "bufferviewmanager.h"
#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"
#include "client.h"
#include "clientbacklogmanager.h"
#include "coreconnectdlg.h"
# new chatline model stuff
sputdev {
# 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
}
SRCS -= chatline-old.cpp chatwidget.cpp
HDRS -= chatline-old.h chatwidget.h
}