From: Manuel Nickschas Date: Tue, 13 May 2008 23:46:53 +0000 (+0000) Subject: Chatline -> ChatLine X-Git-Tag: 0.3.0~419 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=1817c8c8e2437d8aadcc1f07195fa4555cb1c17c Chatline -> ChatLine consistency++ --- diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp index 1abfcfb2..71ed2c8d 100644 --- a/src/qtui/chatline.cpp +++ b/src/qtui/chatline.cpp @@ -27,24 +27,24 @@ #include "chatline.h" #include "qtui.h" -Chatline::Chatline(const QModelIndex &index, QGraphicsItem *parent) : QGraphicsItem(parent) { - _timestampItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatlineModel::TimestampColumn)), this); - _senderItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatlineModel::SenderColumn)), this); - _contentsItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatlineModel::ContentsColumn)), this); +ChatLine::ChatLine(const QModelIndex &index, QGraphicsItem *parent) : QGraphicsItem(parent) { + _timestampItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatLineModel::TimestampColumn)), this); + _senderItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatLineModel::SenderColumn)), this); + _contentsItem = new ChatItem(QPersistentModelIndex(index.sibling(index.row(), ChatLineModel::ContentsColumn)), this); _senderItem->setPos(80, 0); _contentsItem->setPos(160, 0); } -Chatline::~Chatline() { +ChatLine::~ChatLine() { } -QRectF Chatline::boundingRect () const { +QRectF ChatLine::boundingRect () const { return childrenBoundingRect(); } -void Chatline::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { +void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { } diff --git a/src/qtui/chatline.h b/src/qtui/chatline.h index 6ca0e8f3..8531f39a 100644 --- a/src/qtui/chatline.h +++ b/src/qtui/chatline.h @@ -27,11 +27,11 @@ class ChatItem; -class Chatline : public QGraphicsItem { +class ChatLine : public QGraphicsItem { public: - Chatline(const QModelIndex &tempIndex, QGraphicsItem *parent = 0); - virtual ~Chatline(); + ChatLine(const QModelIndex &tempIndex, QGraphicsItem *parent = 0); + virtual ~ChatLine(); virtual QRectF boundingRect () const; virtual void paint (QPainter * painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); diff --git a/src/qtui/chatlinemodel.cpp b/src/qtui/chatlinemodel.cpp index 9ca1ff8b..3cf68b17 100644 --- a/src/qtui/chatlinemodel.cpp +++ b/src/qtui/chatlinemodel.cpp @@ -22,17 +22,17 @@ #include "chatlinemodelitem.h" -ChatlineModel::ChatlineModel(QObject *parent) : MessageModel(parent) { +ChatLineModel::ChatLineModel(QObject *parent) : MessageModel(parent) { } -ChatlineModel::~ChatlineModel() { +ChatLineModel::~ChatLineModel() { } -MessageModelItem *ChatlineModel::createMessageModelItem(const Message &msg) { - return new ChatlineModelItem(msg); +MessageModelItem *ChatLineModel::createMessageModelItem(const Message &msg) { + return new ChatLineModelItem(msg); } diff --git a/src/qtui/chatlinemodel.h b/src/qtui/chatlinemodel.h index 11c9a076..b61bd66b 100644 --- a/src/qtui/chatlinemodel.h +++ b/src/qtui/chatlinemodel.h @@ -23,16 +23,16 @@ #include "messagemodel.h" -class ChatlineModel : public MessageModel { +class ChatLineModel : public MessageModel { Q_OBJECT public: - enum ChatlineRole { + enum ChatLineRole { FormatRole = MessageModel::UserRole }; - ChatlineModel(QObject *parent = 0); - virtual ~ChatlineModel(); + ChatLineModel(QObject *parent = 0); + virtual ~ChatLineModel(); protected: virtual MessageModelItem *createMessageModelItem(const Message &); diff --git a/src/qtui/chatlinemodelitem.cpp b/src/qtui/chatlinemodelitem.cpp index 4e1eb476..59f7b5cc 100644 --- a/src/qtui/chatlinemodelitem.cpp +++ b/src/qtui/chatlinemodelitem.cpp @@ -23,7 +23,7 @@ #include "qtui.h" #include "uistyle.h" -ChatlineModelItem::ChatlineModelItem(const Message &msg) : MessageModelItem(msg) { +ChatLineModelItem::ChatLineModelItem(const Message &msg) : MessageModelItem(msg) { QtUiStyle::StyledMessage m = QtUi::style()->styleMessage(msg); _timestamp.plainText = m.timestamp.plainText; @@ -37,24 +37,24 @@ ChatlineModelItem::ChatlineModelItem(const Message &msg) : MessageModelItem(msg) } -QVariant ChatlineModelItem::data(int column, int role) const { - const ChatlinePart *part; +QVariant ChatLineModelItem::data(int column, int role) const { + const ChatLinePart *part; switch(column) { - case ChatlineModel::TimestampColumn: part = &_timestamp; break; - case ChatlineModel::SenderColumn: part = &_sender; break; - case ChatlineModel::ContentsColumn: part = &_contents; break; + case ChatLineModel::TimestampColumn: part = &_timestamp; break; + case ChatLineModel::SenderColumn: part = &_sender; break; + case ChatLineModel::ContentsColumn: part = &_contents; break; default: return MessageModelItem::data(column, role); } switch(role) { - case ChatlineModel::DisplayRole: return part->plainText; - case ChatlineModel::FormatRole: return QVariant::fromValue(part->formatList); + case ChatLineModel::DisplayRole: return part->plainText; + case ChatLineModel::FormatRole: return QVariant::fromValue(part->formatList); } return MessageModelItem::data(column, role); } -bool ChatlineModelItem::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/chatlinemodelitem.h b/src/qtui/chatlinemodelitem.h index 4d5469e5..9b5a4966 100644 --- a/src/qtui/chatlinemodelitem.h +++ b/src/qtui/chatlinemodelitem.h @@ -24,23 +24,23 @@ #include "messagemodel.h" #include "uistyle.h" -class ChatlineModelItem : public MessageModelItem { +class ChatLineModelItem : public MessageModelItem { public: - ChatlineModelItem(const Message &); - //virtual ~ChatlineModelItem() {}; + ChatLineModelItem(const Message &); + //virtual ~ChatLineModelItem() {}; virtual QVariant data(int column, int role) const; virtual bool setData(int column, const QVariant &value, int role); private: - struct ChatlinePart { + struct ChatLinePart { QString plainText; UiStyle::FormatList formatList; }; - ChatlinePart _timestamp, _sender, _contents; + ChatLinePart _timestamp, _sender, _contents; }; #endif diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 872ea922..85a1787d 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -30,7 +30,7 @@ ChatScene::ChatScene(MessageModel *model, QObject *parent) : QGraphicsScene(parent), _model(model) { connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(rowsInserted(const QModelIndex &, int, int))); for(int i = 0; i < model->rowCount(); i++) { - Chatline *line = new Chatline(model->index(i, 0)); + ChatLine *line = new ChatLine(model->index(i, 0)); addItem(line); line->setPos(30, i*line->boundingRect().height()); } diff --git a/src/qtui/qtui.cpp b/src/qtui/qtui.cpp index a65a4794..e58777e6 100644 --- a/src/qtui/qtui.cpp +++ b/src/qtui/qtui.cpp @@ -57,7 +57,7 @@ MessageModel *QtUi::createMessageModel(QObject *parent) { Q_UNUSED(parent) return 0; #else - return new ChatlineModel(parent); + return new ChatLineModel(parent); #endif }