Cleanup allowing for tags to be available at later points, adds TAGMSG

[quassel.git] / src / qtui / markerlineitem.cpp

diff --git a/src/qtui/markerlineitem.cpp b/src/qtui/markerlineitem.cpp
index 96290ce..52cc488 100644 (file)
--- a/src/qtui/markerlineitem.cpp
+++ b/src/qtui/markerlineitem.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,54 +18,51 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include "markerlineitem.h"
+
 #include <QPainter>
 
-#include "markerlineitem.h"
 #include "qtui.h"
 
-MarkerLineItem::MarkerLineItem(qreal sceneWidth, QGraphicsItem *parent)
-    : QGraphicsObject(parent),
-    _boundingRect(0, 0, sceneWidth, 1),
-    _chatLine(0)
+MarkerLineItem::MarkerLineItem(qreal sceneWidth, QGraphicsItem* parent)
+    : QGraphicsObject(parent)
+    , _boundingRect(0, 0, sceneWidth, 1)
+    , _chatLine(nullptr)
 {
     setVisible(false);
     setZValue(8);
-    styleChanged(); // init brush and height
-    connect(QtUi::style(), SIGNAL(changed()), SLOT(styleChanged()));
+    styleChanged();  // init brush and height
+    connect(QtUi::style(), &UiStyle::changed, this, &MarkerLineItem::styleChanged);
 }
 
-
-void MarkerLineItem::setChatLine(ChatLine *line)
+void MarkerLineItem::setChatLine(ChatLine* line)
 {
     _chatLine = line;
     if (!line)
         setVisible(false);
 }
 
-
 void MarkerLineItem::styleChanged()
 {
-    _brush = QtUi::style()->brush(UiStyle::MarkerLine);
+    _brush = QtUi::style()->brush(UiStyle::ColorRole::MarkerLine);
 
     // if this is a solid color, we assume 1px because wesurely  don't surely don't want to fill the entire chatline.
     // else, use the height of a single line of text to play around with gradients etc.
     qreal height = 1.;
     if (_brush.style() != Qt::SolidPattern)
-        height = QtUi::style()->fontMetrics(QtUiStyle::PlainMsg, 0)->lineSpacing();
+        height = QtUi::style()->fontMetrics(QtUiStyle::FormatType::PlainMsg, UiStyle::MessageLabel::None)->lineSpacing();
 
     prepareGeometryChange();
     _boundingRect = QRectF(0, 0, scene() ? scene()->width() : 100, height);
 }
 
-
-void MarkerLineItem::sceneRectChanged(const QRectF &rect)
+void MarkerLineItem::sceneRectChanged(const QRectF& rect)
 {
     prepareGeometryChange();
     _boundingRect.setWidth(rect.width());
 }
 
-
-void MarkerLineItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void MarkerLineItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
     Q_UNUSED(option);
     Q_UNUSED(widget);