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>
This commit is contained in:
Olivier Goffart 2019-12-06 13:19:37 +01:00
parent 127533637e
commit d6266c757d
45 changed files with 104 additions and 104 deletions

View File

@ -95,7 +95,7 @@ QVariant MimetypeModel::data(const QModelIndex &index, int role) const
if (role != Qt::DecorationRole || !index.isValid() || index.data(iconQueriedRole).toBool()) if (role != Qt::DecorationRole || !index.isValid() || index.data(iconQueriedRole).toBool())
return QStandardItemModel::data(index, role); return QStandardItemModel::data(index, role);
QStandardItem *item = itemFromIndex(index); 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()) if (!iconName.isEmpty())
item->setIcon(QIcon::fromTheme(iconName)); item->setIcon(QIcon::fromTheme(iconName));
item->setData(QVariant(true), iconQueriedRole); 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 QMimeType MimetypeModel::mimeType(const QModelIndex &index) const
{ {
return index.data(mimeTypeRole).value<QMimeType>(); return qvariant_cast<QMimeType>(index.data(mimeTypeRole));
} }
void MimetypeModel::populate() void MimetypeModel::populate()

View File

@ -144,7 +144,7 @@ static QCborValue convertFromVariant(const QVariant &v, TrimFloatingPoint fpTrim
} }
if (v.userType() == qMetaTypeId<VariantOrderedMap>()) { if (v.userType() == qMetaTypeId<VariantOrderedMap>()) {
const auto m = v.value<VariantOrderedMap>(); const auto m = qvariant_cast<VariantOrderedMap>(v);
QCborMap map; QCborMap map;
for (const auto &pair : m) for (const auto &pair : m)
map.insert(convertFromVariant(pair.first, fpTrimming), map.insert(convertFromVariant(pair.first, fpTrimming),

View File

@ -98,7 +98,7 @@ static QString dumpVariant(const QVariant &v, const QString &indent = QLatin1Str
int type = v.userType(); int type = v.userType();
if (type == qMetaTypeId<VariantOrderedMap>() || type == QVariant::Map) { if (type == qMetaTypeId<VariantOrderedMap>() || type == QVariant::Map) {
const auto map = (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 {"); result = QLatin1String("Map {");
for (const auto &pair : map) { for (const auto &pair : map) {

View File

@ -336,7 +336,7 @@ static void variantToXml(QXmlStreamWriter &xml, const QVariant &v)
} else if (type == QVariant::Map || type == qMetaTypeId<VariantOrderedMap>()) { } else if (type == QVariant::Map || type == qMetaTypeId<VariantOrderedMap>()) {
const VariantOrderedMap map = (type == QVariant::Map) ? const VariantOrderedMap map = (type == QVariant::Map) ?
VariantOrderedMap(v.toMap()) : VariantOrderedMap(v.toMap()) :
v.value<VariantOrderedMap>(); qvariant_cast<VariantOrderedMap>(v);
xml.writeStartElement("map"); xml.writeStartElement("map");
for (const auto &pair : map) { for (const auto &pair : map) {
@ -425,10 +425,10 @@ static void variantToXml(QXmlStreamWriter &xml, const QVariant &v)
default: default:
if (type == qMetaTypeId<qfloat16>()) { if (type == qMetaTypeId<qfloat16>()) {
xml.writeAttribute(typeString, "number"); 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>()) { } else if (type == qMetaTypeId<QCborSimpleType>()) {
xml.writeAttribute(typeString, "CBOR simple type"); xml.writeAttribute(typeString, "CBOR simple type");
xml.writeCharacters(QString::number(int(v.value<QCborSimpleType>()))); xml.writeCharacters(QString::number(int(qvariant_cast<QCborSimpleType>(v))));
} else { } else {
// does this convert to string? // does this convert to string?
const char *typeName = v.typeName(); const char *typeName = v.typeName();

View File

@ -74,7 +74,7 @@ int main(int argc, char *argv[])
qDebug() << "Stored:" << stored; qDebug() << "Stored:" << stored;
//! [retrieving a custom value] //! [retrieving a custom value]
Message retrieved = stored.value<Message>(); Message retrieved = qvariant_cast<Message>(stored);
qDebug() << "Retrieved:" << retrieved; qDebug() << "Retrieved:" << retrieved;
retrieved = qvariant_cast<Message>(stored); retrieved = qvariant_cast<Message>(stored);
qDebug() << "Retrieved:" << retrieved; qDebug() << "Retrieved:" << retrieved;

View File

@ -286,7 +286,7 @@ void RegularExpressionDialog::refresh()
setResultUiEnabled(true); 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::PatternOptions patternOptions = QRegularExpression::NoPatternOption;
QRegularExpression::MatchOptions matchOptions = QRegularExpression::NoMatchOption; QRegularExpression::MatchOptions matchOptions = QRegularExpression::NoMatchOption;

View File

@ -201,7 +201,7 @@ void MainWindow::findStyles(const QFont &font)
void MainWindow::filterChanged(int f) void MainWindow::filterChanged(int f)
{ {
const QFontComboBox::FontFilter filter = const QFontComboBox::FontFilter filter =
filterCombo->itemData(f).value<QFontComboBox::FontFilter>(); qvariant_cast<QFontComboBox::FontFilter>(filterCombo->itemData(f));
fontCombo->setFontFilters(filter); fontCombo->setFontFilters(filter);
statusBar()->showMessage(tr("%n font(s) found", nullptr, fontCombo->count())); statusBar()->showMessage(tr("%n font(s) found", nullptr, fontCombo->count()));
} }

View File

@ -85,21 +85,21 @@ void MainWindow::setBrushColor()
//! [2] //! [2]
void MainWindow::setAlphaValuator(QAction *action) void MainWindow::setAlphaValuator(QAction *action)
{ {
m_canvas->setAlphaChannelValuator(action->data().value<TabletCanvas::Valuator>()); m_canvas->setAlphaChannelValuator(qvariant_cast<TabletCanvas::Valuator>(action->data()));
} }
//! [2] //! [2]
//! [3] //! [3]
void MainWindow::setLineWidthValuator(QAction *action) void MainWindow::setLineWidthValuator(QAction *action)
{ {
m_canvas->setLineWidthType(action->data().value<TabletCanvas::Valuator>()); m_canvas->setLineWidthType(qvariant_cast<TabletCanvas::Valuator>(action->data()));
} }
//! [3] //! [3]
//! [4] //! [4]
void MainWindow::setSaturationValuator(QAction *action) void MainWindow::setSaturationValuator(QAction *action)
{ {
m_canvas->setColorSaturationValuator(action->data().value<TabletCanvas::Valuator>()); m_canvas->setColorSaturationValuator(qvariant_cast<TabletCanvas::Valuator>(action->data()));
} }
//! [4] //! [4]

View File

@ -90,6 +90,6 @@ void LocaleSelector::emitLocaleSelected(int index)
QVariant v = itemData(index); QVariant v = itemData(index);
if (!v.isValid()) if (!v.isValid())
return; return;
const QLocale l = v.value<QLocale>(); const QLocale l = qvariant_cast<QLocale>(v);
emit localeSelected(l); emit localeSelected(l);
} }

View File

@ -153,7 +153,7 @@ bool XbelTree::write(QIODevice *device) const
void XbelTree::updateDomElement(const QTreeWidgetItem *item, int column) 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 (!element.isNull()) {
if (column == 0) { if (column == 0) {
QDomElement oldTitleElement = element.firstChildElement(titleElement()); QDomElement oldTitleElement = element.firstChildElement(titleElement());

View File

@ -1544,7 +1544,7 @@ static void customStreamDebug(QDebug dbg, const QVariant &variant) {
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
QMetaType::TypeFlags flags = QMetaType::typeFlags(variant.userType()); QMetaType::TypeFlags flags = QMetaType::typeFlags(variant.userType());
if (flags & QMetaType::PointerToQObject) if (flags & QMetaType::PointerToQObject)
dbg.nospace() << variant.value<QObject*>(); dbg.nospace() << qvariant_cast<QObject*>(variant);
#else #else
Q_UNUSED(dbg); Q_UNUSED(dbg);
Q_UNUSED(variant); Q_UNUSED(variant);

View File

@ -779,7 +779,7 @@ namespace QtPrivate {
return QSequentialIterable(QtMetaTypePrivate::QSequentialIterableImpl(reinterpret_cast<const QByteArrayList*>(v.constData()))); return QSequentialIterable(QtMetaTypePrivate::QSequentialIterableImpl(reinterpret_cast<const QByteArrayList*>(v.constData())));
} }
#endif #endif
return QSequentialIterable(v.value<QtMetaTypePrivate::QSequentialIterableImpl>()); return QSequentialIterable(qvariant_cast<QtMetaTypePrivate::QSequentialIterableImpl>(v));
} }
}; };
template<> template<>
@ -794,7 +794,7 @@ namespace QtPrivate {
if (typeId == qMetaTypeId<QVariantHash>()) { if (typeId == qMetaTypeId<QVariantHash>()) {
return QAssociativeIterable(QtMetaTypePrivate::QAssociativeIterableImpl(reinterpret_cast<const QVariantHash*>(v.constData()))); return QAssociativeIterable(QtMetaTypePrivate::QAssociativeIterableImpl(reinterpret_cast<const QVariantHash*>(v.constData())));
} }
return QAssociativeIterable(v.value<QtMetaTypePrivate::QAssociativeIterableImpl>()); return QAssociativeIterable(qvariant_cast<QtMetaTypePrivate::QAssociativeIterableImpl>(v));
} }
}; };
template<> template<>
@ -857,7 +857,7 @@ namespace QtPrivate {
return QVariantValueHelper<QPair<QVariant, QVariant> >::invoke(v); return QVariantValueHelper<QPair<QVariant, QVariant> >::invoke(v);
if (QMetaType::hasRegisteredConverterFunction(typeId, qMetaTypeId<QtMetaTypePrivate::QPairVariantInterfaceImpl>())) { if (QMetaType::hasRegisteredConverterFunction(typeId, qMetaTypeId<QtMetaTypePrivate::QPairVariantInterfaceImpl>())) {
QtMetaTypePrivate::QPairVariantInterfaceImpl pi = v.value<QtMetaTypePrivate::QPairVariantInterfaceImpl>(); QtMetaTypePrivate::QPairVariantInterfaceImpl pi = qvariant_cast<QtMetaTypePrivate::QPairVariantInterfaceImpl>(v);
const QtMetaTypePrivate::VariantData d1 = pi.first(); const QtMetaTypePrivate::VariantData d1 = pi.first();
QVariant v1(d1.metaTypeId, d1.data, d1.flags); QVariant v1(d1.metaTypeId, d1.data, d1.flags);

View File

@ -757,13 +757,13 @@ QCborValue QCborValue::fromVariant(const QVariant &variant)
return QCborMap::fromJsonObject(doc.object()); return QCborMap::fromJsonObject(doc.object());
} }
case QMetaType::QCborValue: case QMetaType::QCborValue:
return variant.value<QCborValue>(); return qvariant_cast<QCborValue>(variant);
case QMetaType::QCborArray: case QMetaType::QCborArray:
return variant.value<QCborArray>(); return qvariant_cast<QCborArray>(variant);
case QMetaType::QCborMap: case QMetaType::QCborMap:
return variant.value<QCborMap>(); return qvariant_cast<QCborMap>(variant);
case QMetaType::QCborSimpleType: case QMetaType::QCborSimpleType:
return variant.value<QCborSimpleType>(); return qvariant_cast<QCborSimpleType>(variant);
#endif #endif
default: default:
break; break;

View File

@ -482,11 +482,11 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant)
return doc.isArray() ? QJsonValue(doc.array()) : QJsonValue(doc.object()); return doc.isArray() ? QJsonValue(doc.array()) : QJsonValue(doc.object());
} }
case QMetaType::QCborValue: case QMetaType::QCborValue:
return variant.value<QCborValue>().toJsonValue(); return qvariant_cast<QCborValue>(variant).toJsonValue();
case QMetaType::QCborArray: case QMetaType::QCborArray:
return variant.value<QCborArray>().toJsonArray(); return qvariant_cast<QCborArray>(variant).toJsonArray();
case QMetaType::QCborMap: case QMetaType::QCborMap:
return variant.value<QCborMap>().toJsonObject(); return qvariant_cast<QCborMap>(variant).toJsonObject();
#endif #endif
default: default:
break; break;

View File

@ -3065,7 +3065,7 @@ QList<Qt::DayOfWeek> QLocale::weekdays() const
if (d->m_data == systemData()) { if (d->m_data == systemData()) {
QVariant res = systemLocale()->query(QSystemLocale::Weekdays, QVariant()); QVariant res = systemLocale()->query(QSystemLocale::Weekdays, QVariant());
if (!res.isNull()) if (!res.isNull())
return static_cast<QList<Qt::DayOfWeek> >(res.value<QList<Qt::DayOfWeek> >()); return static_cast<QList<Qt::DayOfWeek> >(qvariant_cast<QList<Qt::DayOfWeek> >(res));
} }
#endif #endif
QList<Qt::DayOfWeek> weekdays; QList<Qt::DayOfWeek> weekdays;

View File

@ -283,9 +283,9 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const
return d->uiLanguages.isEmpty() ? QVariant() : QVariant(d->uiLanguages); return d->uiLanguages.isEmpty() ? QVariant() : QVariant(d->uiLanguages);
} }
case StringToStandardQuotation: case StringToStandardQuotation:
return lc_messages.quoteString(in.value<QStringRef>()); return lc_messages.quoteString(qvariant_cast<QStringRef>(in));
case StringToAlternateQuotation: case StringToAlternateQuotation:
return lc_messages.quoteString(in.value<QStringRef>(), QLocale::AlternateQuotation); return lc_messages.quoteString(qvariant_cast<QStringRef>(in), QLocale::AlternateQuotation);
case ListToSeparatedString: case ListToSeparatedString:
return lc_messages.createSeparatedList(in.toStringList()); return lc_messages.createSeparatedList(in.toStringList());
case LocaleChanged: case LocaleChanged:

View File

@ -60,15 +60,15 @@ static void copyArgument(void *to, int id, const QVariant &arg)
return; return;
case QMetaType::UChar: case QMetaType::UChar:
*reinterpret_cast<uchar *>(to) = arg.value<uchar>(); *reinterpret_cast<uchar *>(to) = qvariant_cast<uchar>(arg);
return; return;
case QMetaType::Short: case QMetaType::Short:
*reinterpret_cast<short *>(to) = arg.value<short>(); *reinterpret_cast<short *>(to) = qvariant_cast<short>(arg);
return; return;
case QMetaType::UShort: case QMetaType::UShort:
*reinterpret_cast<ushort *>(to) = arg.value<ushort>(); *reinterpret_cast<ushort *>(to) = qvariant_cast<ushort>(arg);
return; return;
case QVariant::Int: case QVariant::Int:
@ -105,13 +105,13 @@ static void copyArgument(void *to, int id, const QVariant &arg)
} }
if (id == QDBusMetaTypeId::variant()) { if (id == QDBusMetaTypeId::variant()) {
*reinterpret_cast<QDBusVariant *>(to) = arg.value<QDBusVariant>(); *reinterpret_cast<QDBusVariant *>(to) = qvariant_cast<QDBusVariant>(arg);
return; return;
} else if (id == QDBusMetaTypeId::objectpath()) { } else if (id == QDBusMetaTypeId::objectpath()) {
*reinterpret_cast<QDBusObjectPath *>(to) = arg.value<QDBusObjectPath>(); *reinterpret_cast<QDBusObjectPath *>(to) = qvariant_cast<QDBusObjectPath>(arg);
return; return;
} else if (id == QDBusMetaTypeId::signature()) { } else if (id == QDBusMetaTypeId::signature()) {
*reinterpret_cast<QDBusSignature *>(to) = arg.value<QDBusSignature>(); *reinterpret_cast<QDBusSignature *>(to) = qvariant_cast<QDBusSignature>(arg);
return; return;
} }
@ -136,7 +136,7 @@ static void copyArgument(void *to, int id, const QVariant &arg)
} }
// is it the same signature? // is it the same signature?
QDBusArgument dbarg = arg.value<QDBusArgument>(); QDBusArgument dbarg = qvariant_cast<QDBusArgument>(arg);
if (dbarg.currentSignature() != QLatin1String(userSignature)) { if (dbarg.currentSignature() != QLatin1String(userSignature)) {
// not the same signature, another mismatch // not the same signature, another mismatch
//qWarning? //qWarning?

View File

@ -1089,7 +1089,7 @@ QList<QByteArray> QImageReader::supportedSubTypes() const
return QList<QByteArray>(); return QList<QByteArray>();
if (d->handler->supportsOption(QImageIOHandler::SupportedSubTypes)) if (d->handler->supportsOption(QImageIOHandler::SupportedSubTypes))
return d->handler->option(QImageIOHandler::SupportedSubTypes).value< QList<QByteArray> >(); return qvariant_cast<QList<QByteArray> >(d->handler->option(QImageIOHandler::SupportedSubTypes));
return QList<QByteArray>(); return QList<QByteArray>();
} }

View File

@ -561,7 +561,7 @@ QList<QByteArray> QImageWriter::supportedSubTypes() const
{ {
if (!supportsOption(QImageIOHandler::SupportedSubTypes)) if (!supportsOption(QImageIOHandler::SupportedSubTypes))
return QList<QByteArray>(); return QList<QByteArray>();
return d->handler->option(QImageIOHandler::SupportedSubTypes).value< QList<QByteArray> >(); return qvariant_cast<QList<QByteArray> >(d->handler->option(QImageIOHandler::SupportedSubTypes));
} }
/*! /*!

View File

@ -456,7 +456,7 @@ glyph_metrics_t QFontEngineQPF2::boundingBox(glyph_t glyph)
QFixed QFontEngineQPF2::ascent() const QFixed QFontEngineQPF2::ascent() const
{ {
return QFixed::fromReal(extractHeaderField(fontData, Tag_Ascent).value<qreal>()); return QFixed::fromReal(qvariant_cast<qreal>(extractHeaderField(fontData, Tag_Ascent)));
} }
QFixed QFontEngineQPF2::capHeight() const QFixed QFontEngineQPF2::capHeight() const
@ -466,37 +466,37 @@ QFixed QFontEngineQPF2::capHeight() const
QFixed QFontEngineQPF2::descent() const QFixed QFontEngineQPF2::descent() const
{ {
return QFixed::fromReal(extractHeaderField(fontData, Tag_Descent).value<qreal>()); return QFixed::fromReal(qvariant_cast<qreal>(extractHeaderField(fontData, Tag_Descent)));
} }
QFixed QFontEngineQPF2::leading() const QFixed QFontEngineQPF2::leading() const
{ {
return QFixed::fromReal(extractHeaderField(fontData, Tag_Leading).value<qreal>()); return QFixed::fromReal(qvariant_cast<qreal>(extractHeaderField(fontData, Tag_Leading)));
} }
qreal QFontEngineQPF2::maxCharWidth() const qreal QFontEngineQPF2::maxCharWidth() const
{ {
return extractHeaderField(fontData, Tag_MaxCharWidth).value<qreal>(); return qvariant_cast<qreal>(extractHeaderField(fontData, Tag_MaxCharWidth));
} }
qreal QFontEngineQPF2::minLeftBearing() const qreal QFontEngineQPF2::minLeftBearing() const
{ {
return extractHeaderField(fontData, Tag_MinLeftBearing).value<qreal>(); return qvariant_cast<qreal>(extractHeaderField(fontData, Tag_MinLeftBearing));
} }
qreal QFontEngineQPF2::minRightBearing() const qreal QFontEngineQPF2::minRightBearing() const
{ {
return extractHeaderField(fontData, Tag_MinRightBearing).value<qreal>(); return qvariant_cast<qreal>(extractHeaderField(fontData, Tag_MinRightBearing));
} }
QFixed QFontEngineQPF2::underlinePosition() const QFixed QFontEngineQPF2::underlinePosition() const
{ {
return QFixed::fromReal(extractHeaderField(fontData, Tag_UnderlinePosition).value<qreal>()); return QFixed::fromReal(qvariant_cast<qreal>(extractHeaderField(fontData, Tag_UnderlinePosition)));
} }
QFixed QFontEngineQPF2::lineThickness() const QFixed QFontEngineQPF2::lineThickness() const
{ {
return QFixed::fromReal(extractHeaderField(fontData, Tag_LineThickness).value<qreal>()); return QFixed::fromReal(qvariant_cast<qreal>(extractHeaderField(fontData, Tag_LineThickness)));
} }
bool QFontEngineQPF2::isValid() const bool QFontEngineQPF2::isValid() const

View File

@ -299,7 +299,7 @@ QSyntaxHighlighter::QSyntaxHighlighter(QObject *parent)
: QObject(*new QSyntaxHighlighterPrivate, parent) : QObject(*new QSyntaxHighlighterPrivate, parent)
{ {
if (parent && parent->inherits("QTextEdit")) { if (parent && parent->inherits("QTextEdit")) {
QTextDocument *doc = parent->property("document").value<QTextDocument *>(); QTextDocument *doc = qvariant_cast<QTextDocument *>(parent->property("document"));
if (doc) if (doc)
setDocument(doc); setDocument(doc);
} }

View File

@ -273,11 +273,11 @@ namespace
const QByteArray placeholder = QByteArray(QByteArrayLiteral("$") + parameterName.toUtf8()); const QByteArray placeholder = QByteArray(QByteArrayLiteral("$") + parameterName.toUtf8());
const QVariant parameter = node.parameter(parameterName); const QVariant parameter = node.parameter(parameterName);
if (parameter.userType() == qMetaTypeId<QShaderLanguage::StorageQualifier>()) { if (parameter.userType() == qMetaTypeId<QShaderLanguage::StorageQualifier>()) {
const QShaderLanguage::StorageQualifier qualifier = parameter.value<QShaderLanguage::StorageQualifier>(); const QShaderLanguage::StorageQualifier qualifier = qvariant_cast<QShaderLanguage::StorageQualifier>(parameter);
const QByteArray value = toGlsl(qualifier, format); const QByteArray value = toGlsl(qualifier, format);
result.replace(placeholder, value); result.replace(placeholder, value);
} else if (parameter.userType() == qMetaTypeId<QShaderLanguage::VariableType>()) { } else if (parameter.userType() == qMetaTypeId<QShaderLanguage::VariableType>()) {
const QShaderLanguage::VariableType type = parameter.value<QShaderLanguage::VariableType>(); const QShaderLanguage::VariableType type = qvariant_cast<QShaderLanguage::VariableType>(parameter);
const QByteArray value = toGlsl(type); const QByteArray value = toGlsl(type);
result.replace(placeholder, value); result.replace(placeholder, value);
} else { } else {

View File

@ -693,7 +693,7 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
auto redirectPolicy = QNetworkRequest::ManualRedirectPolicy; auto redirectPolicy = QNetworkRequest::ManualRedirectPolicy;
const QVariant value = newHttpRequest.attribute(QNetworkRequest::RedirectPolicyAttribute); const QVariant value = newHttpRequest.attribute(QNetworkRequest::RedirectPolicyAttribute);
if (value.isValid()) if (value.isValid())
redirectPolicy = value.value<QNetworkRequest::RedirectPolicy>(); redirectPolicy = qvariant_cast<QNetworkRequest::RedirectPolicy>(value);
else if (newHttpRequest.attribute(QNetworkRequest::FollowRedirectsAttribute).toBool()) else if (newHttpRequest.attribute(QNetworkRequest::FollowRedirectsAttribute).toBool())
redirectPolicy = QNetworkRequest::NoLessSafeRedirectPolicy; redirectPolicy = QNetworkRequest::NoLessSafeRedirectPolicy;

View File

@ -218,7 +218,7 @@ void QEGLPlatformContext::adopt(const QVariant &nativeHandle, QPlatformOpenGLCon
qWarning("QEGLPlatformContext: Requires a QEGLNativeContext"); qWarning("QEGLPlatformContext: Requires a QEGLNativeContext");
return; return;
} }
QEGLNativeContext handle = nativeHandle.value<QEGLNativeContext>(); QEGLNativeContext handle = qvariant_cast<QEGLNativeContext>(nativeHandle);
EGLContext context = handle.context(); EGLContext context = handle.context();
if (!context) { if (!context) {
qWarning("QEGLPlatformContext: No EGLContext given"); qWarning("QEGLPlatformContext: No EGLContext given");

View File

@ -2230,7 +2230,7 @@ bool AtSpiAdaptor::valueInterface(QAccessibleInterface *interface, const QString
return false; return false;
if (function == QLatin1String("SetCurrentValue")) { if (function == QLatin1String("SetCurrentValue")) {
QDBusVariant v = message.arguments().at(2).value<QDBusVariant>(); QDBusVariant v = qvariant_cast<QDBusVariant>(message.arguments().at(2));
double value = v.variant().toDouble(); double value = v.variant().toDouble();
//Temporary fix //Temporary fix
//See https://bugzilla.gnome.org/show_bug.cgi?id=652596 //See https://bugzilla.gnome.org/show_bug.cgi?id=652596

View File

@ -152,7 +152,7 @@ const QDBusArgument &operator>>(const QDBusArgument &arg, QDBusMenuLayoutItem &i
while (!arg.atEnd()) { while (!arg.atEnd()) {
QDBusVariant dbusVariant; QDBusVariant dbusVariant;
arg >> dbusVariant; arg >> dbusVariant;
QDBusArgument childArgument = dbusVariant.variant().value<QDBusArgument>(); QDBusArgument childArgument = qvariant_cast<QDBusArgument>(dbusVariant.variant());
QDBusMenuLayoutItem child; QDBusMenuLayoutItem child;
childArgument >> child; childArgument >> child;

View File

@ -250,7 +250,7 @@ void QNetworkManagerEngine::interfacePropertiesChanged(const QMap<QString, QVari
if (i.key() == QLatin1String("ActiveConnections")) { if (i.key() == QLatin1String("ActiveConnections")) {
// Active connections changed, update configurations. // Active connections changed, update configurations.
const auto activeConnections = qdbus_cast<QList<QDBusObjectPath> >(i.value().value<QDBusArgument>()); const auto activeConnections = qdbus_cast<QList<QDBusObjectPath> >(qvariant_cast<QDBusArgument>(i.value()));
QStringList identifiers = accessPointConfigurations.keys(); QStringList identifiers = accessPointConfigurations.keys();
QStringList priorActiveConnections = activeConnectionsList.keys(); QStringList priorActiveConnections = activeConnectionsList.keys();

View File

@ -193,7 +193,7 @@ QList <QDBusObjectPath> QNetworkManagerInterface::activeConnections() const
{ {
if (propertyMap.contains("ActiveConnections")) { if (propertyMap.contains("ActiveConnections")) {
const QDBusArgument &dbusArgs = propertyMap.value("ActiveConnections").value<QDBusArgument>(); const QDBusArgument &dbusArgs = qvariant_cast<QDBusArgument>(propertyMap.value("ActiveConnections"));
QDBusObjectPath path; QDBusObjectPath path;
QList <QDBusObjectPath> list; QList <QDBusObjectPath> list;
@ -403,7 +403,7 @@ quint32 QNetworkManagerInterfaceDevice::deviceType() const
QDBusObjectPath QNetworkManagerInterfaceDevice::ip4config() const QDBusObjectPath QNetworkManagerInterfaceDevice::ip4config() const
{ {
if (propertyMap.contains("Ip4Config")) if (propertyMap.contains("Ip4Config"))
return propertyMap.value("Ip4Config").value<QDBusObjectPath>(); return qvariant_cast<QDBusObjectPath>(propertyMap.value("Ip4Config"));
return QDBusObjectPath(); return QDBusObjectPath();
} }
@ -411,7 +411,7 @@ void QNetworkManagerInterfaceDevice::propertiesSwap(QMap<QString,QVariant> map)
{ {
for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) { for (auto i = map.cbegin(), end = map.cend(); i != end; ++i) {
if (i.key() == QLatin1String("AvailableConnections")) { //Device if (i.key() == QLatin1String("AvailableConnections")) { //Device
const QDBusArgument &dbusArgs = i.value().value<QDBusArgument>(); const QDBusArgument &dbusArgs = qvariant_cast<QDBusArgument>(i.value());
QDBusObjectPath path; QDBusObjectPath path;
QStringList paths; QStringList paths;
dbusArgs.beginArray(); dbusArgs.beginArray();
@ -489,7 +489,7 @@ QStringList QNetworkManagerInterfaceDeviceWired::availableConnections()
{ {
QStringList list; QStringList list;
if (propertyMap.contains("AvailableConnections")) { if (propertyMap.contains("AvailableConnections")) {
const QDBusArgument &dbusArgs = propertyMap.value("Carrier").value<QDBusArgument>(); const QDBusArgument &dbusArgs = qvariant_cast<QDBusArgument>(propertyMap.value("Carrier"));
QDBusObjectPath path; QDBusObjectPath path;
dbusArgs.beginArray(); dbusArgs.beginArray();
while (!dbusArgs.atEnd()) { while (!dbusArgs.atEnd()) {
@ -598,7 +598,7 @@ quint32 QNetworkManagerInterfaceDeviceWireless::bitrate() const
QDBusObjectPath QNetworkManagerInterfaceDeviceWireless::activeAccessPoint() const QDBusObjectPath QNetworkManagerInterfaceDeviceWireless::activeAccessPoint() const
{ {
if (propertyMap.contains("ActiveAccessPoint")) if (propertyMap.contains("ActiveAccessPoint"))
return propertyMap.value("ActiveAccessPoint").value<QDBusObjectPath>(); return qvariant_cast<QDBusObjectPath>(propertyMap.value("ActiveAccessPoint"));
return QDBusObjectPath(); return QDBusObjectPath();
} }
@ -931,14 +931,14 @@ QNetworkManagerConnectionActive::~QNetworkManagerConnectionActive()
QDBusObjectPath QNetworkManagerConnectionActive::connection() const QDBusObjectPath QNetworkManagerConnectionActive::connection() const
{ {
if (propertyMap.contains("Connection")) if (propertyMap.contains("Connection"))
return propertyMap.value("Connection").value<QDBusObjectPath>(); return qvariant_cast<QDBusObjectPath>(propertyMap.value("Connection"));
return QDBusObjectPath(); return QDBusObjectPath();
} }
QDBusObjectPath QNetworkManagerConnectionActive::specificObject() const QDBusObjectPath QNetworkManagerConnectionActive::specificObject() const
{ {
if (propertyMap.contains("SpecificObject")) if (propertyMap.contains("SpecificObject"))
return propertyMap.value("SpecificObject").value<QDBusObjectPath>(); return qvariant_cast<QDBusObjectPath>(propertyMap.value("SpecificObject"));
return QDBusObjectPath(); return QDBusObjectPath();
} }
@ -946,7 +946,7 @@ QStringList QNetworkManagerConnectionActive::devices() const
{ {
QStringList list; QStringList list;
if (propertyMap.contains("Devices")) { if (propertyMap.contains("Devices")) {
const QDBusArgument &dbusArgs = propertyMap.value("Devices").value<QDBusArgument>(); const QDBusArgument &dbusArgs = qvariant_cast<QDBusArgument>(propertyMap.value("Devices"));
QDBusObjectPath path; QDBusObjectPath path;
dbusArgs.beginArray(); dbusArgs.beginArray();

View File

@ -285,7 +285,7 @@ void QIBusPlatformInputContext::commitText(const QDBusVariant &text)
if (!input) if (!input)
return; return;
const QDBusArgument arg = text.variant().value<QDBusArgument>(); const QDBusArgument arg = qvariant_cast<QDBusArgument>(text.variant());
QIBusText t; QIBusText t;
if (debug) if (debug)
@ -311,7 +311,7 @@ void QIBusPlatformInputContext::updatePreeditText(const QDBusVariant &text, uint
if (!input) if (!input)
return; return;
const QDBusArgument arg = text.variant().value<QDBusArgument>(); const QDBusArgument arg = qvariant_cast<QDBusArgument>(text.variant());
QIBusText t; QIBusText t;
arg >> t; arg >> t;

View File

@ -83,10 +83,10 @@ QIBusEngineDesc QIBusProxy::getGlobalEngine()
QVariant variant = reply.value().variant(); QVariant variant = reply.value().variant();
if (!variant.isValid()) if (!variant.isValid())
return desc; return desc;
QVariant child = variant.value<QDBusVariant>().variant(); QVariant child = qvariant_cast<QDBusVariant>(variant).variant();
if (!child.isValid()) if (!child.isValid())
return desc; return desc;
const QDBusArgument argument = child.value<QDBusArgument>(); const QDBusArgument argument = qvariant_cast<QDBusArgument>(child);
argument >> desc; argument >> desc;
return desc; return desc;
} }

View File

@ -62,7 +62,7 @@ void QIBusSerializable::deserializeFrom(const QDBusArgument &argument)
argument >> key; argument >> key;
argument >> value; argument >> value;
argument.endMapEntry(); argument.endMapEntry();
attachments[key] = value.variant().value<QDBusArgument>(); attachments[key] = qvariant_cast<QDBusArgument>(value.variant());
} }
argument.endMap(); argument.endMap();
} }
@ -201,7 +201,7 @@ void QIBusAttributeList::deserializeFrom(const QDBusArgument &arg)
arg >> var; arg >> var;
QIBusAttribute attr; QIBusAttribute attr;
var.variant().value<QDBusArgument>() >> attr; qvariant_cast<QDBusArgument>(var.variant()) >> attr;
attributes.append(std::move(attr)); attributes.append(std::move(attr));
} }
arg.endArray(); arg.endArray();
@ -268,7 +268,7 @@ void QIBusText::deserializeFrom(const QDBusArgument &argument)
argument >> text; argument >> text;
QDBusVariant variant; QDBusVariant variant;
argument >> variant; argument >> variant;
variant.variant().value<QDBusArgument>() >> attributes; qvariant_cast<QDBusArgument>(variant.variant()) >> attributes;
argument.endStructure(); argument.endStructure();
} }

View File

@ -429,7 +429,7 @@ void QGLXContext::init(QXcbScreen *screen, QPlatformOpenGLContext *share, const
qWarning("QGLXContext: Requires a QGLXNativeContext"); qWarning("QGLXContext: Requires a QGLXNativeContext");
return; return;
} }
QGLXNativeContext handle = nativeHandle.value<QGLXNativeContext>(); QGLXNativeContext handle = qvariant_cast<QGLXNativeContext>(nativeHandle);
GLXContext context = handle.context(); GLXContext context = handle.context();
if (!context) { if (!context) {
qWarning("QGLXContext: No GLXContext given"); qWarning("QGLXContext: No GLXContext given");

View File

@ -930,7 +930,7 @@ void QXcbWindow::setWindowFlags(Qt::WindowFlags flags)
QXcbWindowFunctions::WmWindowTypes wmWindowTypes; QXcbWindowFunctions::WmWindowTypes wmWindowTypes;
if (window()->dynamicPropertyNames().contains(wm_window_type_property_id)) { if (window()->dynamicPropertyNames().contains(wm_window_type_property_id)) {
wmWindowTypes = static_cast<QXcbWindowFunctions::WmWindowTypes>( wmWindowTypes = static_cast<QXcbWindowFunctions::WmWindowTypes>(
window()->property(wm_window_type_property_id).value<int>()); qvariant_cast<int>(window()->property(wm_window_type_property_id)));
} }
setWmWindowType(wmWindowTypes, flags); setWmWindowType(wmWindowTypes, flags);

View File

@ -100,10 +100,10 @@ void QCupsPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &v
d->cupsOptions = value.toStringList(); d->cupsOptions = value.toStringList();
break; break;
case PPK_QPageSize: case PPK_QPageSize:
d->setPageSize(value.value<QPageSize>()); d->setPageSize(qvariant_cast<QPageSize>(value));
break; break;
case PPK_QPageLayout: { case PPK_QPageLayout: {
QPageLayout pageLayout = value.value<QPageLayout>(); QPageLayout pageLayout = qvariant_cast<QPageLayout>(value);
if (pageLayout.isValid() && (d->m_printDevice.isValidPageLayout(pageLayout, d->resolution) if (pageLayout.isValid() && (d->m_printDevice.isValidPageLayout(pageLayout, d->resolution)
|| d->m_printDevice.supportsCustomPageSizes() || d->m_printDevice.supportsCustomPageSizes()
|| d->m_printDevice.supportedPageSizes().isEmpty())) { || d->m_printDevice.supportedPageSizes().isEmpty())) {

View File

@ -533,10 +533,10 @@ void QPageSetupWidget::setupPrinter() const
{ {
m_printer->setPageLayout(m_pageLayout); m_printer->setPageLayout(m_pageLayout);
#if QT_CONFIG(cups) #if QT_CONFIG(cups)
QCUPSSupport::PagesPerSheet pagesPerSheet = m_ui.pagesPerSheetCombo->currentData() QCUPSSupport::PagesPerSheet pagesPerSheet = qvariant_cast<QCUPSSupport::PagesPerSheet>(m_ui.pagesPerSheetCombo->currentData()
.value<QCUPSSupport::PagesPerSheet>(); );
QCUPSSupport::PagesPerSheetLayout pagesPerSheetLayout = m_ui.pagesPerSheetLayoutCombo->currentData() QCUPSSupport::PagesPerSheetLayout pagesPerSheetLayout = qvariant_cast<QCUPSSupport::PagesPerSheetLayout>(m_ui.pagesPerSheetLayoutCombo->currentData()
.value<QCUPSSupport::PagesPerSheetLayout>(); );
QCUPSSupport::setPagesPerSheetLayout(m_printer, pagesPerSheet, pagesPerSheetLayout); QCUPSSupport::setPagesPerSheetLayout(m_printer, pagesPerSheet, pagesPerSheetLayout);
#endif #endif
#ifdef PSD_ENABLE_PAPERSOURCE #ifdef PSD_ENABLE_PAPERSOURCE
@ -587,11 +587,11 @@ void QPageSetupWidget::pageSizeChanged()
{ {
QPageSize pageSize; QPageSize pageSize;
if (m_ui.pageSizeCombo->currentIndex() != m_realCustomPageSizeIndex) { if (m_ui.pageSizeCombo->currentIndex() != m_realCustomPageSizeIndex) {
pageSize = m_ui.pageSizeCombo->currentData().value<QPageSize>(); pageSize = qvariant_cast<QPageSize>(m_ui.pageSizeCombo->currentData());
#if QT_CONFIG(cups) #if QT_CONFIG(cups)
if (m_pageSizePpdOption) { if (m_pageSizePpdOption) {
ppd_file_t *ppd = m_printDevice->property(PDPK_PpdFile).value<ppd_file_t*>(); ppd_file_t *ppd = qvariant_cast<ppd_file_t*>(m_printDevice->property(PDPK_PpdFile));
QTextCodec *cupsCodec = QTextCodec::codecForName(ppd->lang_encoding); QTextCodec *cupsCodec = QTextCodec::codecForName(ppd->lang_encoding);
for (int i = 0; i < m_pageSizePpdOption->num_choices; ++i) { for (int i = 0; i < m_pageSizePpdOption->num_choices; ++i) {
const ppd_choice_t *choice = &m_pageSizePpdOption->choices[i]; const ppd_choice_t *choice = &m_pageSizePpdOption->choices[i];
@ -676,7 +676,7 @@ void QPageSetupWidget::unitChanged()
{ {
if (m_blockSignals) if (m_blockSignals)
return; return;
m_units = m_ui.unitCombo->currentData().value<QPageLayout::Unit>(); m_units = qvariant_cast<QPageLayout::Unit>(m_ui.unitCombo->currentData());
m_pageLayout.setUnits(m_units); m_pageLayout.setUnits(m_units);
updateWidget(); updateWidget();
} }

View File

@ -426,7 +426,7 @@ bool QPrintPropertiesDialog::createAdvancedOptionsWidget()
{ {
bool anyWidgetCreated = false; bool anyWidgetCreated = false;
ppd_file_t *ppd = m_currentPrintDevice->property(PDPK_PpdFile).value<ppd_file_t*>(); ppd_file_t *ppd = qvariant_cast<ppd_file_t*>(m_currentPrintDevice->property(PDPK_PpdFile));
if (ppd) { if (ppd) {
m_cupsCodec = QTextCodec::codecForName(ppd->lang_encoding); m_cupsCodec = QTextCodec::codecForName(ppd->lang_encoding);
@ -532,7 +532,7 @@ bool QPrintPropertiesDialog::createAdvancedOptionsWidget()
void QPrintPropertiesDialog::setPrinterAdvancedCupsOptions() const void QPrintPropertiesDialog::setPrinterAdvancedCupsOptions() const
{ {
for (const QComboBox *choicesCb : m_advancedOptionsCombos) { for (const QComboBox *choicesCb : m_advancedOptionsCombos) {
const ppd_option_t *option = choicesCb->property(ppdOptionProperty).value<const ppd_option_t *>(); const ppd_option_t *option = qvariant_cast<const ppd_option_t *>(choicesCb->property(ppdOptionProperty));
// We can't use choicesCb->currentIndex() to know the index of the option in the choices[] array // We can't use choicesCb->currentIndex() to know the index of the option in the choices[] array
// because some of them may not be present in the list because they conflict with the // because some of them may not be present in the list because they conflict with the
@ -551,7 +551,7 @@ void QPrintPropertiesDialog::setPrinterAdvancedCupsOptions() const
void QPrintPropertiesDialog::revertAdvancedOptionsToSavedValues() const void QPrintPropertiesDialog::revertAdvancedOptionsToSavedValues() const
{ {
for (QComboBox *choicesCb : m_advancedOptionsCombos) { for (QComboBox *choicesCb : m_advancedOptionsCombos) {
const int originallySelectedChoice = choicesCb->property(ppdOriginallySelectedChoiceProperty).value<int>(); const int originallySelectedChoice = qvariant_cast<int>(choicesCb->property(ppdOriginallySelectedChoiceProperty));
const int newComboIndexToSelect = choicesCb->findData(originallySelectedChoice); const int newComboIndexToSelect = choicesCb->findData(originallySelectedChoice);
choicesCb->setCurrentIndex(newComboIndexToSelect); choicesCb->setCurrentIndex(newComboIndexToSelect);
// The currentIndexChanged lambda takes care of resetting the ppd option // The currentIndexChanged lambda takes care of resetting the ppd option
@ -580,8 +580,8 @@ bool QPrintPropertiesDialog::anyAdvancedOptionConflict() const
bool anyConflicted = false; bool anyConflicted = false;
for (const QComboBox *choicesCb : m_advancedOptionsCombos) { for (const QComboBox *choicesCb : m_advancedOptionsCombos) {
const ppd_option_t *option = choicesCb->property(ppdOptionProperty).value<const ppd_option_t *>(); const ppd_option_t *option = qvariant_cast<const ppd_option_t *>(choicesCb->property(ppdOptionProperty));
QLabel *warningLabel = choicesCb->property(warningLabelProperty).value<QLabel *>(); QLabel *warningLabel = qvariant_cast<QLabel *>(choicesCb->property(warningLabelProperty));
if (option->conflicted) { if (option->conflicted) {
anyConflicted = true; anyConflicted = true;
const int pixmap_size = choicesCb->sizeHint().height() * .75; const int pixmap_size = choicesCb->sizeHint().height() * .75;
@ -900,7 +900,7 @@ void QPrintDialogPrivate::setupPrinter()
// page set // page set
if (p->printRange() == QPrinter::AllPages || p->printRange() == QPrinter::PageRange) { if (p->printRange() == QPrinter::AllPages || p->printRange() == QPrinter::PageRange) {
//If the application is selecting pages and the first page number is even then need to adjust the odd-even accordingly //If the application is selecting pages and the first page number is even then need to adjust the odd-even accordingly
QCUPSSupport::PageSet pageSet = options.pageSetCombo->itemData(options.pageSetCombo->currentIndex()).value<QCUPSSupport::PageSet>(); QCUPSSupport::PageSet pageSet = qvariant_cast<QCUPSSupport::PageSet>(options.pageSetCombo->itemData(options.pageSetCombo->currentIndex()));
if (q->isOptionEnabled(QPrintDialog::PrintPageRange) if (q->isOptionEnabled(QPrintDialog::PrintPageRange)
&& p->printRange() == QPrinter::PageRange && p->printRange() == QPrinter::PageRange
&& (q->fromPage() % 2 == 0)) { && (q->fromPage() % 2 == 0)) {
@ -1323,10 +1323,10 @@ bool QUnixPrintWidgetPrivate::checkFields()
#if QT_CONFIG(cups) #if QT_CONFIG(cups)
if (propertiesDialog) { if (propertiesDialog) {
QCUPSSupport::PagesPerSheet pagesPerSheet = propertiesDialog->widget.pageSetup->m_ui.pagesPerSheetCombo QCUPSSupport::PagesPerSheet pagesPerSheet = qvariant_cast<QCUPSSupport::PagesPerSheet>(propertiesDialog->widget.pageSetup->m_ui.pagesPerSheetCombo
->currentData().value<QCUPSSupport::PagesPerSheet>(); ->currentData());
QCUPSSupport::PageSet pageSet = optionsPane->options.pageSetCombo->currentData().value<QCUPSSupport::PageSet>(); QCUPSSupport::PageSet pageSet = qvariant_cast<QCUPSSupport::PageSet>(optionsPane->options.pageSetCombo->currentData());
if (pagesPerSheet != QCUPSSupport::OnePagePerSheet if (pagesPerSheet != QCUPSSupport::OnePagePerSheet

View File

@ -149,7 +149,7 @@ QCUPSSupport::JobHoldUntilWithTime QCUPSSupport::parseJobHoldUntil(const QString
ppd_option_t *QCUPSSupport::findPpdOption(const char *optionName, QPrintDevice *printDevice) ppd_option_t *QCUPSSupport::findPpdOption(const char *optionName, QPrintDevice *printDevice)
{ {
ppd_file_t *ppd = printDevice->property(PDPK_PpdFile).value<ppd_file_t*>(); ppd_file_t *ppd = qvariant_cast<ppd_file_t*>(printDevice->property(PDPK_PpdFile));
if (ppd) { if (ppd) {
for (int i = 0; i < ppd->num_groups; ++i) { for (int i = 0; i < ppd->num_groups; ++i) {

View File

@ -217,19 +217,19 @@ void QPdfPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &va
break; break;
} }
case PPK_QPageSize: { case PPK_QPageSize: {
QPageSize pageSize = value.value<QPageSize>(); QPageSize pageSize = qvariant_cast<QPageSize>(value);
if (pageSize.isValid()) if (pageSize.isValid())
d->m_pageLayout.setPageSize(pageSize); d->m_pageLayout.setPageSize(pageSize);
break; break;
} }
case PPK_QPageMargins: { case PPK_QPageMargins: {
QPair<QMarginsF, QPageLayout::Unit> pair = value.value<QPair<QMarginsF, QPageLayout::Unit> >(); QPair<QMarginsF, QPageLayout::Unit> pair = qvariant_cast<QPair<QMarginsF, QPageLayout::Unit> >(value);
d->m_pageLayout.setUnits(pair.second); d->m_pageLayout.setUnits(pair.second);
d->m_pageLayout.setMargins(pair.first); d->m_pageLayout.setMargins(pair.first);
break; break;
} }
case PPK_QPageLayout: { case PPK_QPageLayout: {
QPageLayout pageLayout = value.value<QPageLayout>(); QPageLayout pageLayout = qvariant_cast<QPageLayout>(value);
if (pageLayout.isValid()) if (pageLayout.isValid())
d->m_pageLayout = pageLayout; d->m_pageLayout = pageLayout;
break; break;

View File

@ -294,7 +294,7 @@ public:
{ {
QPrinterPrivate *pd = QPrinterPrivate::get(m_printer); QPrinterPrivate *pd = QPrinterPrivate::get(m_printer);
return pd->printEngine->property(QPrintEngine::PPK_QPageLayout).value<QPageLayout>(); return qvariant_cast<QPageLayout>(pd->printEngine->property(QPrintEngine::PPK_QPageLayout));
} }
QPrinter *m_printer; QPrinter *m_printer;

View File

@ -150,7 +150,7 @@ void QCupsJobWidget::setJobHold(QCUPSSupport::JobHoldUntil jobHold, const QTime
QCUPSSupport::JobHoldUntil QCupsJobWidget::jobHold() const QCUPSSupport::JobHoldUntil QCupsJobWidget::jobHold() const
{ {
return m_ui.jobHoldComboBox->itemData(m_ui.jobHoldComboBox->currentIndex()).value<QCUPSSupport::JobHoldUntil>(); return qvariant_cast<QCUPSSupport::JobHoldUntil>(m_ui.jobHoldComboBox->itemData(m_ui.jobHoldComboBox->currentIndex()));
} }
void QCupsJobWidget::toggleJobHoldTime() void QCupsJobWidget::toggleJobHoldTime()
@ -247,7 +247,7 @@ void QCupsJobWidget::setStartBannerPage(const QCUPSSupport::BannerPage bannerPag
QCUPSSupport::BannerPage QCupsJobWidget::startBannerPage() const QCUPSSupport::BannerPage QCupsJobWidget::startBannerPage() const
{ {
return m_ui.startBannerPageCombo->itemData(m_ui.startBannerPageCombo->currentIndex()).value<QCUPSSupport::BannerPage>(); return qvariant_cast<QCUPSSupport::BannerPage>(m_ui.startBannerPageCombo->itemData(m_ui.startBannerPageCombo->currentIndex()));
} }
void QCupsJobWidget::setEndBannerPage(const QCUPSSupport::BannerPage bannerPage) void QCupsJobWidget::setEndBannerPage(const QCUPSSupport::BannerPage bannerPage)
@ -257,7 +257,7 @@ void QCupsJobWidget::setEndBannerPage(const QCUPSSupport::BannerPage bannerPage)
QCUPSSupport::BannerPage QCupsJobWidget::endBannerPage() const QCUPSSupport::BannerPage QCupsJobWidget::endBannerPage() const
{ {
return m_ui.endBannerPageCombo->itemData(m_ui.endBannerPageCombo->currentIndex()).value<QCUPSSupport::BannerPage>(); return qvariant_cast<QCUPSSupport::BannerPage>(m_ui.endBannerPageCombo->itemData(m_ui.endBannerPageCombo->currentIndex()));
} }
QT_END_NAMESPACE QT_END_NAMESPACE

View File

@ -605,7 +605,7 @@ void QAbstractItemModelTesterPrivate::data()
// Check that the alignment is one we know about // Check that the alignment is one we know about
QVariant textAlignmentVariant = model->data(model->index(0, 0), Qt::TextAlignmentRole); QVariant textAlignmentVariant = model->data(model->index(0, 0), Qt::TextAlignmentRole);
if (textAlignmentVariant.isValid()) { if (textAlignmentVariant.isValid()) {
Qt::Alignment alignment = textAlignmentVariant.value<Qt::Alignment>(); Qt::Alignment alignment = qvariant_cast<Qt::Alignment>(textAlignmentVariant);
MODELTESTER_COMPARE(alignment, (alignment & (Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask))); MODELTESTER_COMPARE(alignment, (alignment & (Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask)));
} }

View File

@ -920,7 +920,7 @@ void QDialog::adjustPosition(QWidget* w)
if (w) { if (w) {
// Use pos() if the widget is embedded into a native window // Use pos() if the widget is embedded into a native window
QPoint pp; QPoint pp;
if (w->windowHandle() && w->windowHandle()->property("_q_embedded_native_parent_handle").value<WId>()) if (w->windowHandle() && qvariant_cast<WId>(w->windowHandle()->property("_q_embedded_native_parent_handle")))
pp = w->pos(); pp = w->pos();
else else
pp = w->mapToGlobal(QPoint(0,0)); pp = w->mapToGlobal(QPoint(0,0));

View File

@ -2413,7 +2413,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
int oldMin = styleObject->property("_q_stylemin").toInt(); int oldMin = styleObject->property("_q_stylemin").toInt();
int oldMax = styleObject->property("_q_stylemax").toInt(); int oldMax = styleObject->property("_q_stylemax").toInt();
QRect oldRect = styleObject->property("_q_stylerect").toRect(); QRect oldRect = styleObject->property("_q_stylerect").toRect();
QStyle::State oldState = static_cast<QStyle::State>(styleObject->property("_q_stylestate").value<QStyle::State::Int>()); QStyle::State oldState = static_cast<QStyle::State>(qvariant_cast<QStyle::State::Int>(styleObject->property("_q_stylestate")));
uint oldActiveControls = styleObject->property("_q_stylecontrols").toUInt(); uint oldActiveControls = styleObject->property("_q_stylecontrols").toUInt();
// a scrollbar is transient when the the scrollbar itself and // a scrollbar is transient when the the scrollbar itself and

View File

@ -261,9 +261,9 @@ void QScrollerProperties::setScrollMetric(ScrollMetric metric, const QVariant &v
case OvershootDragDistanceFactor: d->overshootDragDistanceFactor = qBound(qreal(0), value.toReal(), qreal(1)); break; case OvershootDragDistanceFactor: d->overshootDragDistanceFactor = qBound(qreal(0), value.toReal(), qreal(1)); break;
case OvershootScrollDistanceFactor: d->overshootScrollDistanceFactor = qBound(qreal(0), value.toReal(), qreal(1)); break; case OvershootScrollDistanceFactor: d->overshootScrollDistanceFactor = qBound(qreal(0), value.toReal(), qreal(1)); break;
case OvershootScrollTime: d->overshootScrollTime = value.toReal(); break; case OvershootScrollTime: d->overshootScrollTime = value.toReal(); break;
case HorizontalOvershootPolicy: d->hOvershootPolicy = value.value<QScrollerProperties::OvershootPolicy>(); break; case HorizontalOvershootPolicy: d->hOvershootPolicy = qvariant_cast<QScrollerProperties::OvershootPolicy>(value); break;
case VerticalOvershootPolicy: d->vOvershootPolicy = value.value<QScrollerProperties::OvershootPolicy>(); break; case VerticalOvershootPolicy: d->vOvershootPolicy = qvariant_cast<QScrollerProperties::OvershootPolicy>(value); break;
case FrameRate: d->frameRate = value.value<QScrollerProperties::FrameRates>(); break; case FrameRate: d->frameRate = qvariant_cast<QScrollerProperties::FrameRates>(value); break;
case ScrollMetricCount: break; case ScrollMetricCount: break;
} }
} }

View File

@ -172,7 +172,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt
// that order, also override the font for the popup menu. // that order, also override the font for the popup menu.
QVariant fontRoleData = index.data(Qt::FontRole); QVariant fontRoleData = index.data(Qt::FontRole);
if (fontRoleData.isValid()) { if (fontRoleData.isValid()) {
menuOption.font = fontRoleData.value<QFont>(); menuOption.font = qvariant_cast<QFont>(fontRoleData);
} else if (mCombo->testAttribute(Qt::WA_SetFont) } else if (mCombo->testAttribute(Qt::WA_SetFont)
|| mCombo->testAttribute(Qt::WA_MacSmallSize) || mCombo->testAttribute(Qt::WA_MacSmallSize)
|| mCombo->testAttribute(Qt::WA_MacMiniSize) || mCombo->testAttribute(Qt::WA_MacMiniSize)