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

QmlDesigner: Use QJsonValueConstRef instead of auto

Browse Source 
This used to not build on linux. Doesnt seem the case anymore.

Change-Id: Ia58d388bfe4f5cc794b29f8e25a9a8d6b3f229c3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Mahmoud Badri
2024-04-26 14:49:05 +03:00
parent 7ba7624bb6
commit b0b1542814
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/effectcomposer/compositionnode.cpp
View File

@@ -128,7 +128,7 @@ void CompositionNode::parse(const QString &effectName, const QString &qenPath, c
// parse properties
QJsonArray jsonProps = json.value("properties").toArray();
for (const auto /*QJsonValueRef*/ &prop : jsonProps) {
for (const QJsonValueConstRef &prop : jsonProps) {
const auto uniform = new Uniform(effectName, prop.toObject(), qenPath);
m_unifomrsModel.addUniform(uniform);
m_uniforms.append(uniform);

4
src/plugins/qmldesigner/components/contentlibrary/contentlibraryeffectsmodel.cpp
View File

@@ -182,7 +182,7 @@ void ContentLibraryEffectsModel::loadBundle()
QStringList files;
const QJsonArray assetsArr = itemObj.value("files").toArray();
for (const auto /*QJson{Const,}ValueRef*/ &asset : assetsArr)
for (const QJsonValueConstRef &asset : assetsArr)
files.append(asset.toString());
QUrl icon = QUrl::fromLocalFile(bundleDir.filePath(itemObj.value("icon").toString()));
@@ -202,7 +202,7 @@ void ContentLibraryEffectsModel::loadBundle()
QStringList sharedFiles;
const QJsonArray sharedFilesArr = m_bundleObj.value("sharedFiles").toArray();
for (const auto /*QJson{Const,}ValueRef*/ &file : sharedFilesArr)
for (const QJsonValueConstRef &file : sharedFilesArr)
sharedFiles.append(file.toString());
createImporter(bundleDir.path(), bundleId, sharedFiles);

4
src/plugins/qmldesigner/components/contentlibrary/contentlibrarymaterialsmodel.cpp
View File

@@ -284,7 +284,7 @@ void ContentLibraryMaterialsModel::loadMaterialBundle(const QDir &matBundleDir)
QStringList files;
const QJsonArray assetsArr = matObj.value("files").toArray();
for (const auto /*QJson{Const,}ValueRef*/ &asset : assetsArr)
for (const QJsonValueConstRef &asset : assetsArr)
files.append(asset.toString());
QUrl icon = QUrl::fromLocalFile(matBundleDir.filePath(matObj.value("icon").toString()));
@@ -305,7 +305,7 @@ void ContentLibraryMaterialsModel::loadMaterialBundle(const QDir &matBundleDir)
QStringList sharedFiles;
const QJsonArray sharedFilesArr = m_matBundleObj.value("sharedFiles").toArray();
for (const auto /*QJson{Const,}ValueRef*/ &file : sharedFilesArr)
for (const QJsonValueConstRef &file : sharedFilesArr)
sharedFiles.append(file.toString());
QStringList missingSharedFiles;

4
src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.cpp
View File

@@ -311,7 +311,7 @@ void ContentLibraryUserModel::loadMaterialBundle()
QStringList files;
const QJsonArray assetsArr = matObj.value("files").toArray();
for (const auto /*QJson{Const,}ValueRef*/ &asset : assetsArr)
for (const QJsonValueConstRef &asset : assetsArr)
files.append(asset.toString());
QUrl icon = QUrl::fromLocalFile(bundleDir.filePath(matObj.value("icon").toString()));
@@ -327,7 +327,7 @@ void ContentLibraryUserModel::loadMaterialBundle()
QStringList sharedFiles;
const QJsonArray sharedFilesArr = m_bundleObj.value("sharedFiles").toArray();
for (const auto /*QJson{Const,}ValueRef*/ &file : sharedFilesArr)
for (const QJsonValueConstRef &file : sharedFilesArr)
sharedFiles.append(file.toString());
createImporter(bundleDir.path(), m_bundleId, sharedFiles);

8
src/plugins/qmldesigner/components/materialbrowser/materialbrowsermodel.cpp
View File

@@ -434,22 +434,20 @@ void MaterialBrowserModel::copyMaterialProperties(int idx, const QString &sectio
QJsonObject propsSpecObj = m_propertyGroupsObj.value(m_copiedMaterialType).toObject();
if (propsSpecObj.contains(section)) { // should always be true
const QJsonArray propNames = propsSpecObj.value(section).toArray();
// auto == QJsonValueConstRef after 04dc959d49e5e3 / Qt 6.4, QJsonValueRef before
for (const auto &propName : propNames)
for (const QJsonValueConstRef &propName : propNames)
copiedProps.append(propName.toString().toLatin1());
if (section == "Base") { // add QtQuick3D.Material base props as well
QJsonObject propsMatObj = m_propertyGroupsObj.value("Material").toObject();
const QJsonArray propNames = propsMatObj.value("Base").toArray();
// auto == QJsonValueConstRef after 04dc959d49e5e3 / Qt 6.4, QJsonValueRef before
for (const auto &propName : propNames)
for (const QJsonValueConstRef &propName : propNames)
copiedProps.append(propName.toString().toLatin1());
}
}
}
m_copiedMaterialProps.clear();
for (const auto &propName : copiedProps) {
for (const PropertyName &propName : copiedProps) {
PropertyCopyData data;
data.name = propName;
data.isValid = m_allPropsCopied || validProps.contains(propName);