feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qml2Puppet: Replace a few deprecated QVariant::type() calls

Browse Source 
... by typeId().

Change-Id: Ib617db774cec2c23ac58bcd39d99a59f9820f443
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
hjk
2023-06-06 16:25:19 +02:00
parent d06df3b547
commit 097ed66cc5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.cpp
View File

@@ -374,7 +374,7 @@ void ObjectNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParentIn
QVariant ObjectNodeInstance::convertSpecialCharacter(const QVariant& value) const QVariant ObjectNodeInstance::convertSpecialCharacter(const QVariant& value) const
{ {
QVariant specialCharacterConvertedValue = value; QVariant specialCharacterConvertedValue = value;
if (value.type() == QVariant::String) { if (value.typeId() == QVariant::String) {
QString string = value.toString(); QString string = value.toString();
string.replace(QLatin1String("\\n"), QLatin1String("\n")); string.replace(QLatin1String("\\n"), QLatin1String("\n"));
string.replace(QLatin1String("\\t"), QLatin1String("\t")); string.replace(QLatin1String("\\t"), QLatin1String("\t"));
@@ -472,7 +472,7 @@ void ObjectNodeInstance::setPropertyVariant(const PropertyName &name, const QVar
QVariant oldValue = property.read(); QVariant oldValue = property.read();
if (oldValue.type() == QVariant::Url) { if (oldValue.typeId() == QVariant::Url) {
QUrl url = oldValue.toUrl(); QUrl url = oldValue.toUrl();
QString path = url.toLocalFile(); QString path = url.toLocalFile();
if (QFileInfo::exists(path) && nodeInstanceServer() && !path.isEmpty()) if (QFileInfo::exists(path) && nodeInstanceServer() && !path.isEmpty())
@@ -489,7 +489,7 @@ void ObjectNodeInstance::setPropertyVariant(const PropertyName &name, const QVar
qDebug() << "ObjectNodeInstance.setPropertyVariant: Cannot be written: " << object() << name << adjustedValue; qDebug() << "ObjectNodeInstance.setPropertyVariant: Cannot be written: " << object() << name << adjustedValue;
QVariant newValue = property.read(); QVariant newValue = property.read();
if (newValue.type() == QVariant::Url) { if (newValue.typeId() == QVariant::Url) {
QUrl url = newValue.toUrl(); QUrl url = newValue.toUrl();
QString path = url.toLocalFile(); QString path = url.toLocalFile();
if (QFileInfo::exists(path) && nodeInstanceServer() && !path.isEmpty()) if (QFileInfo::exists(path) && nodeInstanceServer() && !path.isEmpty())
@@ -579,7 +579,7 @@ void ObjectNodeInstance::refreshProperty(const PropertyName &name)
else else
property.write(resetValue(name)); property.write(resetValue(name));
if (oldValue.type() == QVariant::Url) { if (oldValue.typeId() == QVariant::Url) {
QByteArray key = oldValue.toUrl().toEncoded(QUrl::UrlFormattingOption(0x100)); QByteArray key = oldValue.toUrl().toEncoded(QUrl::UrlFormattingOption(0x100));
QString pixmapKey = QString::fromUtf8(key.constData(), key.size()); QString pixmapKey = QString::fromUtf8(key.constData(), key.size());
QPixmapCache::remove(pixmapKey); QPixmapCache::remove(pixmapKey);