diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2019-12-06 13:19:37 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2019-12-15 12:30:52 +0100 |
commit | d6266c757d2f2ea4ff1e71dc8545f9bf97aa3bb1 (patch) | |
tree | 37fff2c5d030728d65072b0d036b7e78fde058a5 /examples | |
parent | 127533637e4ff4d3301fe02c88a2a506dd24c199 (diff) |
Replace usages of QVariant::value by qvariant_cast
This is done automatically with a clazy check
Change-Id: I3b59511d3d36d416c8eda74858ead611d327b116
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples')
10 files changed, 15 insertions, 15 deletions
diff --git a/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.cpp b/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.cpp index f755e060c6..64732ba980 100644 --- a/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.cpp +++ b/examples/corelib/mimetypes/mimetypebrowser/mimetypemodel.cpp @@ -95,7 +95,7 @@ QVariant MimetypeModel::data(const QModelIndex &index, int role) const if (role != Qt::DecorationRole || !index.isValid() || index.data(iconQueriedRole).toBool()) return QStandardItemModel::data(index, role); QStandardItem *item = itemFromIndex(index); - const QString iconName = item->data(mimeTypeRole).value<QMimeType>().iconName(); + const QString iconName = qvariant_cast<QMimeType>(item->data(mimeTypeRole)).iconName(); if (!iconName.isEmpty()) item->setIcon(QIcon::fromTheme(iconName)); item->setData(QVariant(true), iconQueriedRole); @@ -104,7 +104,7 @@ QVariant MimetypeModel::data(const QModelIndex &index, int role) const QMimeType MimetypeModel::mimeType(const QModelIndex &index) const { - return index.data(mimeTypeRole).value<QMimeType>(); + return qvariant_cast<QMimeType>(index.data(mimeTypeRole)); } void MimetypeModel::populate() diff --git a/examples/corelib/serialization/convert/cborconverter.cpp b/examples/corelib/serialization/convert/cborconverter.cpp index f907bb0af6..60410ed26a 100644 --- a/examples/corelib/serialization/convert/cborconverter.cpp +++ b/examples/corelib/serialization/convert/cborconverter.cpp @@ -144,7 +144,7 @@ static QCborValue convertFromVariant(const QVariant &v, TrimFloatingPoint fpTrim } if (v.userType() == qMetaTypeId<VariantOrderedMap>()) { - const auto m = v.value<VariantOrderedMap>(); + const auto m = qvariant_cast<VariantOrderedMap>(v); QCborMap map; for (const auto &pair : m) map.insert(convertFromVariant(pair.first, fpTrimming), diff --git a/examples/corelib/serialization/convert/datastreamconverter.cpp b/examples/corelib/serialization/convert/datastreamconverter.cpp index 7cdb844141..7e9f5e1bdc 100644 --- a/examples/corelib/serialization/convert/datastreamconverter.cpp +++ b/examples/corelib/serialization/convert/datastreamconverter.cpp @@ -98,7 +98,7 @@ static QString dumpVariant(const QVariant &v, const QString &indent = QLatin1Str int type = v.userType(); if (type == qMetaTypeId<VariantOrderedMap>() || type == QVariant::Map) { const auto map = (type == QVariant::Map) ? - VariantOrderedMap(v.toMap()) : v.value<VariantOrderedMap>(); + VariantOrderedMap(v.toMap()) : qvariant_cast<VariantOrderedMap>(v); result = QLatin1String("Map {"); for (const auto &pair : map) { diff --git a/examples/corelib/serialization/convert/xmlconverter.cpp b/examples/corelib/serialization/convert/xmlconverter.cpp index e62801bf76..d9e724dfe1 100644 --- a/examples/corelib/serialization/convert/xmlconverter.cpp +++ b/examples/corelib/serialization/convert/xmlconverter.cpp @@ -336,7 +336,7 @@ static void variantToXml(QXmlStreamWriter &xml, const QVariant &v) } else if (type == QVariant::Map || type == qMetaTypeId<VariantOrderedMap>()) { const VariantOrderedMap map = (type == QVariant::Map) ? VariantOrderedMap(v.toMap()) : - v.value<VariantOrderedMap>(); + qvariant_cast<VariantOrderedMap>(v); xml.writeStartElement("map"); for (const auto &pair : map) { @@ -425,10 +425,10 @@ static void variantToXml(QXmlStreamWriter &xml, const QVariant &v) default: if (type == qMetaTypeId<qfloat16>()) { xml.writeAttribute(typeString, "number"); - xml.writeCharacters(QString::number(float(v.value<qfloat16>()))); + xml.writeCharacters(QString::number(float(qvariant_cast<qfloat16>(v)))); } else if (type == qMetaTypeId<QCborSimpleType>()) { xml.writeAttribute(typeString, "CBOR simple type"); - xml.writeCharacters(QString::number(int(v.value<QCborSimpleType>()))); + xml.writeCharacters(QString::number(int(qvariant_cast<QCborSimpleType>(v)))); } else { // does this convert to string? const char *typeName = v.typeName(); diff --git a/examples/corelib/tools/customtype/main.cpp b/examples/corelib/tools/customtype/main.cpp index d50bf9efea..af8e233a19 100644 --- a/examples/corelib/tools/customtype/main.cpp +++ b/examples/corelib/tools/customtype/main.cpp @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) qDebug() << "Stored:" << stored; //! [retrieving a custom value] - Message retrieved = stored.value<Message>(); + Message retrieved = qvariant_cast<Message>(stored); qDebug() << "Retrieved:" << retrieved; retrieved = qvariant_cast<Message>(stored); qDebug() << "Retrieved:" << retrieved; diff --git a/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp b/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp index ea3cb00a02..6398098eee 100644 --- a/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp +++ b/examples/widgets/tools/regularexpression/regularexpressiondialog.cpp @@ -286,7 +286,7 @@ void RegularExpressionDialog::refresh() setResultUiEnabled(true); - QRegularExpression::MatchType matchType = matchTypeComboBox->currentData().value<QRegularExpression::MatchType>(); + QRegularExpression::MatchType matchType = qvariant_cast<QRegularExpression::MatchType>(matchTypeComboBox->currentData()); QRegularExpression::PatternOptions patternOptions = QRegularExpression::NoPatternOption; QRegularExpression::MatchOptions matchOptions = QRegularExpression::NoMatchOption; diff --git a/examples/widgets/widgets/charactermap/mainwindow.cpp b/examples/widgets/widgets/charactermap/mainwindow.cpp index b0f9705c21..702b50156b 100644 --- a/examples/widgets/widgets/charactermap/mainwindow.cpp +++ b/examples/widgets/widgets/charactermap/mainwindow.cpp @@ -201,7 +201,7 @@ void MainWindow::findStyles(const QFont &font) void MainWindow::filterChanged(int f) { const QFontComboBox::FontFilter filter = - filterCombo->itemData(f).value<QFontComboBox::FontFilter>(); + qvariant_cast<QFontComboBox::FontFilter>(filterCombo->itemData(f)); fontCombo->setFontFilters(filter); statusBar()->showMessage(tr("%n font(s) found", nullptr, fontCombo->count())); } diff --git a/examples/widgets/widgets/tablet/mainwindow.cpp b/examples/widgets/widgets/tablet/mainwindow.cpp index 8bcb9ada63..c5b631ee44 100644 --- a/examples/widgets/widgets/tablet/mainwindow.cpp +++ b/examples/widgets/widgets/tablet/mainwindow.cpp @@ -85,21 +85,21 @@ void MainWindow::setBrushColor() //! [2] void MainWindow::setAlphaValuator(QAction *action) { - m_canvas->setAlphaChannelValuator(action->data().value<TabletCanvas::Valuator>()); + m_canvas->setAlphaChannelValuator(qvariant_cast<TabletCanvas::Valuator>(action->data())); } //! [2] //! [3] void MainWindow::setLineWidthValuator(QAction *action) { - m_canvas->setLineWidthType(action->data().value<TabletCanvas::Valuator>()); + m_canvas->setLineWidthType(qvariant_cast<TabletCanvas::Valuator>(action->data())); } //! [3] //! [4] void MainWindow::setSaturationValuator(QAction *action) { - m_canvas->setColorSaturationValuator(action->data().value<TabletCanvas::Valuator>()); + m_canvas->setColorSaturationValuator(qvariant_cast<TabletCanvas::Valuator>(action->data())); } //! [4] diff --git a/examples/widgets/widgets/validators/localeselector.cpp b/examples/widgets/widgets/validators/localeselector.cpp index 1382da0cc9..3dcd04d9ff 100644 --- a/examples/widgets/widgets/validators/localeselector.cpp +++ b/examples/widgets/widgets/validators/localeselector.cpp @@ -90,6 +90,6 @@ void LocaleSelector::emitLocaleSelected(int index) QVariant v = itemData(index); if (!v.isValid()) return; - const QLocale l = v.value<QLocale>(); + const QLocale l = qvariant_cast<QLocale>(v); emit localeSelected(l); } diff --git a/examples/xml/dombookmarks/xbeltree.cpp b/examples/xml/dombookmarks/xbeltree.cpp index d90cdc03b4..76ea5fb2bb 100644 --- a/examples/xml/dombookmarks/xbeltree.cpp +++ b/examples/xml/dombookmarks/xbeltree.cpp @@ -153,7 +153,7 @@ bool XbelTree::write(QIODevice *device) const void XbelTree::updateDomElement(const QTreeWidgetItem *item, int column) { - QDomElement element = item->data(0, DomElementRole).value<QDomElement>(); + QDomElement element = qvariant_cast<QDomElement>(item->data(0, DomElementRole)); if (!element.isNull()) { if (column == 0) { QDomElement oldTitleElement = element.firstChildElement(titleElement()); |