From f8ac74fd09451dcb61f34730f5f605f0fadbb9e8 Mon Sep 17 00:00:00 2001 From: Bas Pape Date: Sat, 20 Apr 2013 23:45:10 +0200 Subject: [PATCH] qVariantValue is deprecated in Qt 5.0 --- src/qtui/inputwidget.cpp | 8 ++++---- src/qtui/nicklistwidget.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index bbdbc125..6ac42be3 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -577,14 +577,14 @@ void InputWidget::colorChosen(QAction *action) { QTextCharFormat fmt; QColor color; - if (qVariantValue(action->data()) == "") { + if (action->data().value() == "") { color = Qt::transparent; fmt = getFormatOfWordOrSelection(); fmt.clearForeground(); setFormatOnSelection(fmt); } else { - color = QColor(inputLine()->rgbColorFromMirc(qVariantValue(action->data()))); + color = QColor(inputLine()->rgbColorFromMirc(action->data().value())); fmt.setForeground(color); mergeFormatOnSelection(fmt); } @@ -597,14 +597,14 @@ void InputWidget::colorHighlightChosen(QAction *action) { QTextCharFormat fmt; QColor color; - if (qVariantValue(action->data()) == "") { + if (action->data().value() == "") { color = Qt::transparent; fmt = getFormatOfWordOrSelection(); fmt.clearBackground(); setFormatOnSelection(fmt); } else { - color = QColor(inputLine()->rgbColorFromMirc(qVariantValue(action->data()))); + color = QColor(inputLine()->rgbColorFromMirc(action->data().value())); fmt.setBackground(color); mergeFormatOnSelection(fmt); } diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp index 1201a516..5f8d7a81 100644 --- a/src/qtui/nicklistwidget.cpp +++ b/src/qtui/nicklistwidget.cpp @@ -175,7 +175,7 @@ void NickListWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, if (!variant.isValid()) continue; - BufferId bufferId = qVariantValue(variant); + BufferId bufferId = variant.value(); removeBuffer(bufferId); } } -- 2.20.1