projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qVariantValue is deprecated in Qt 5.0
[quassel.git]
/
src
/
qtui
/
inputwidget.cpp
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);
}