X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=5aba1915bace2498c1f56f955f3b0b06084cefc2;hp=81a7ed8f3567c5d138ae809e9469f3bab4a02e5d;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=e50ae7a06fc4e5d3a911c361d30953410deab609

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index 81a7ed8f..5aba1915 100644
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -50,8 +50,8 @@ ChatLine::ChatLine(int row, QAbstractItemModel *model,
     _width(width),
     _height(_contentsItem.height()),
     _selection(0),
-    _mouseGrabberItem(0),
-    _hoverItem(0)
+    _mouseGrabberItem(nullptr),
+    _hoverItem(nullptr)
 {
     Q_ASSERT(model);
     QModelIndex index = model->index(row, ChatLineModel::ContentsColumn);
@@ -78,7 +78,7 @@ ChatItem *ChatLine::item(ChatLineModel::ColumnType column)
     case ChatLineModel::ContentsColumn:
         return &_contentsItem;
     default:
-        return 0;
+        return nullptr;
     }
 }
 
@@ -91,7 +91,7 @@ ChatItem *ChatLine::itemAt(const QPointF &pos)
         return &_senderItem;
     if (_timestampItem.boundingRect().contains(pos))
         return &_timestampItem;
-    return 0;
+    return nullptr;
 }
 
 
@@ -118,7 +118,7 @@ bool ChatLine::sceneEvent(QEvent *event)
         setMouseGrabberItem(itemAt(linePos));
     }
     else if (event->type() == QEvent::UngrabMouse) {
-        setMouseGrabberItem(0);
+        setMouseGrabberItem(nullptr);
     }
     return QGraphicsItem::sceneEvent(event);
 }
@@ -215,15 +215,15 @@ void ChatLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     const QAbstractItemModel *model_ = model();
     QModelIndex myIdx = model_->index(row(), 0);
     Message::Type type = (Message::Type)myIdx.data(MessageModel::TypeRole).toInt();
-    UiStyle::MessageLabel label = (UiStyle::MessageLabel)myIdx.data(ChatLineModel::MsgLabelRole).toInt();
+    UiStyle::MessageLabel label = myIdx.data(ChatLineModel::MsgLabelRole).value<UiStyle::MessageLabel>();
 
-    QTextCharFormat msgFmt = QtUi::style()->format(UiStyle::formatType(type), label);
+    QTextCharFormat msgFmt = QtUi::style()->format({UiStyle::formatType(type), {}, {}}, label);
     if (msgFmt.hasProperty(QTextFormat::BackgroundBrush)) {
         painter->fillRect(boundingRect(), msgFmt.background());
     }
 
     if (_selection & Selected) {
-        QTextCharFormat selFmt = QtUi::style()->format(UiStyle::formatType(type), label | UiStyle::Selected);
+        QTextCharFormat selFmt = QtUi::style()->format({UiStyle::formatType(type), {}, {}}, label | UiStyle::MessageLabel::Selected);
         if (selFmt.hasProperty(QTextFormat::BackgroundBrush)) {
             qreal left = item((ChatLineModel::ColumnType)(_selection & ItemMask))->pos().x();
             QRectF selectRect(left, 0, width() - left, height());
@@ -287,7 +287,7 @@ void ChatLine::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
     if (_hoverItem) {
         _hoverItem->hoverLeaveEvent(event);
-        _hoverItem = 0;
+        _hoverItem = nullptr;
     }
 }