projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qt4-b-gone: Remove all code supporting Qt < 5.5 and KDE4
[quassel.git]
/
src
/
uisupport
/
styledlabel.cpp
diff --git
a/src/uisupport/styledlabel.cpp
b/src/uisupport/styledlabel.cpp
index
d3d7982
..
6e2361b
100644
(file)
--- a/
src/uisupport/styledlabel.cpp
+++ b/
src/uisupport/styledlabel.cpp
@@
-156,11
+156,7
@@
void StyledLabel::setText(const QString &text)
void StyledLabel::updateToolTip()
{
if (frameRect().width() - 2*frameWidth() < _layout.minimumWidth())
void StyledLabel::updateToolTip()
{
if (frameRect().width() - 2*frameWidth() < _layout.minimumWidth())
-#if QT_VERSION < 0x050000
- setToolTip(QString("<qt>%1</qt>").arg(Qt::escape(_layout.text()))); // only rich text gets wordwrapped!
-#else
setToolTip(QString("<qt>%1</qt>").arg(_layout.text().toHtmlEscaped())); // only rich text gets wordwrapped!
setToolTip(QString("<qt>%1</qt>").arg(_layout.text().toHtmlEscaped())); // only rich text gets wordwrapped!
-#endif
else
setToolTip(QString());
}
else
setToolTip(QString());
}
@@
-216,11
+212,7
@@
int StyledLabel::posToCursor(const QPointF &pos)
void StyledLabel::mouseMoveEvent(QMouseEvent *event)
{
if (event->buttons() == Qt::NoButton) {
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()));
Clickable click = _clickables.atCursorPos(posToCursor(event->localPos()));
-#endif
if (click.isValid())
setHoverMode(click.start(), click.length());
else
if (click.isValid())
setHoverMode(click.start(), click.length());
else
@@
-247,11
+239,7
@@
void StyledLabel::leaveEvent(QEvent *)
void StyledLabel::mousePressEvent(QMouseEvent *event)
{
if (event->button() == Qt::LeftButton) {
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()));
Clickable click = _clickables.atCursorPos(posToCursor(event->localPos()));
-#endif
if (click.isValid())
emit clickableActivated(click);
}
if (click.isValid())
emit clickableActivated(click);
}