X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fstyledlabel.cpp;h=d3d7982fb3d414488494d1596b2ec0ec009946ac;hb=04d0f8b23cc2b14c8af31a391fb4b11174b9244e;hp=4aac9945989f96392621bec12bef1469e4625297;hpb=dae6003f55206168e6d3c5cbace84e5b0c65990c;p=quassel.git

diff --git a/src/uisupport/styledlabel.cpp b/src/uisupport/styledlabel.cpp
index 4aac9945..d3d7982f 100644
--- a/src/uisupport/styledlabel.cpp
+++ b/src/uisupport/styledlabel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 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  *
@@ -122,8 +122,8 @@ void StyledLabel::setText(const QString &text)
 {
     UiStyle *style = GraphicalUi::uiStyle();
 
-    UiStyle::StyledString sstr = style->styleString(style->mircToInternal(text), UiStyle::PlainMsg);
-    QList<QTextLayout::FormatRange> layoutList = style->toTextLayoutList(sstr.formatList, sstr.plainText.length(), 0);
+    UiStyle::StyledString sstr = style->styleString(style->mircToInternal(text), UiStyle::FormatType::PlainMsg);
+    QList<QTextLayout::FormatRange> layoutList = style->toTextLayoutList(sstr.formatList, sstr.plainText.length(), UiStyle::MessageLabel::None);
 
     // Use default font rather than the style's
     QTextLayout::FormatRange fmtRange;
@@ -216,7 +216,11 @@ int StyledLabel::posToCursor(const QPointF &pos)
 void StyledLabel::mouseMoveEvent(QMouseEvent *event)
 {
     if (event->buttons() == Qt::NoButton) {
+#if QT_VERSION < 0x050000
         Clickable click = _clickables.atCursorPos(posToCursor(event->posF()));
+#else
+        Clickable click = _clickables.atCursorPos(posToCursor(event->localPos()));
+#endif
         if (click.isValid())
             setHoverMode(click.start(), click.length());
         else
@@ -243,7 +247,11 @@ void StyledLabel::leaveEvent(QEvent *)
 void StyledLabel::mousePressEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
+#if QT_VERSION < 0x050000
         Clickable click = _clickables.atCursorPos(posToCursor(event->posF()));
+#else
+        Clickable click = _clickables.atCursorPos(posToCursor(event->localPos()));
+#endif
         if (click.isValid())
             emit clickableActivated(click);
     }