qVariantValue is deprecated in Qt 5.0

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index bbdbc12..6ac42be 100644 (file)
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -577,14 +577,14 @@ void InputWidget::colorChosen(QAction *action)
 {
     QTextCharFormat fmt;
     QColor color;
 {
     QTextCharFormat fmt;
     QColor color;

-    if (qVariantValue<QString>(action->data()) == "") {
+    if (action->data().value<QString>() == "") {

         color = Qt::transparent;
         fmt = getFormatOfWordOrSelection();
         fmt.clearForeground();
         setFormatOnSelection(fmt);
     }
     else {
         color = Qt::transparent;
         fmt = getFormatOfWordOrSelection();
         fmt.clearForeground();
         setFormatOnSelection(fmt);
     }
     else {

-        color = QColor(inputLine()->rgbColorFromMirc(qVariantValue<QString>(action->data())));
+        color = QColor(inputLine()->rgbColorFromMirc(action->data().value<QString>()));

         fmt.setForeground(color);
         mergeFormatOnSelection(fmt);
     }
         fmt.setForeground(color);
         mergeFormatOnSelection(fmt);
     }


@@ -597,14 +597,14 @@ void InputWidget::colorHighlightChosen(QAction *action)
 {
     QTextCharFormat fmt;
     QColor color;
 {
     QTextCharFormat fmt;
     QColor color;

-    if (qVariantValue<QString>(action->data()) == "") {
+    if (action->data().value<QString>() == "") {

         color = Qt::transparent;
         fmt = getFormatOfWordOrSelection();
         fmt.clearBackground();
         setFormatOnSelection(fmt);
     }
     else {
         color = Qt::transparent;
         fmt = getFormatOfWordOrSelection();
         fmt.clearBackground();
         setFormatOnSelection(fmt);
     }
     else {

-        color = QColor(inputLine()->rgbColorFromMirc(qVariantValue<QString>(action->data())));
+        color = QColor(inputLine()->rgbColorFromMirc(action->data().value<QString>()));

         fmt.setBackground(color);
         mergeFormatOnSelection(fmt);
     }
         fmt.setBackground(color);
         mergeFormatOnSelection(fmt);
     }

diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp
index 1201a51..5f8d7a8 100644 (file)
--- 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;
 
             if (!variant.isValid())
                 continue;
 

-            BufferId bufferId = qVariantValue<BufferId>(variant);
+            BufferId bufferId = variant.value<BufferId>();

             removeBuffer(bufferId);
         }
     }
             removeBuffer(bufferId);
         }
     }