qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qmlformat: Pass QQmlFormatOptions by const ref 

There actually is a code path that returns it as-is and that saves a
copy this way.

Coverity-Id: 469518
Coverity-Id: 469514
Change-Id: I50bcfe6c30648baba192233003d4a77fb8a4d048
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
This commit is contained in:
Ulf Hermann 2024-10-07 11:32:50 +02:00
parent 5f30988f01
commit 5ecfe3d57f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/qmlformat/qmlformat.cpp
View File

@ -249,18 +249,24 @@ int main(int argc, char *argv[])
if (options.writeDefaultSettingsEnabled()) if (options.writeDefaultSettingsEnabled())
return settings.writeDefaults() ? 0 : -1; return settings.writeDefaults() ? 0 : -1;
auto getSettings = [&](const QString &file, QQmlFormatOptions options) { auto getSettings = [&](const QString &file, const QQmlFormatOptions &options) {
// Perform formatting inplace if --files option is set. // Perform formatting inplace if --files option is set.
if (!options.files().isEmpty()) const bool hasFiles = !options.files().isEmpty();
options.setIsInplace(true);
if (options.ignoreSettingsEnabled() || !settings.search(file)) if (options.ignoreSettingsEnabled() || !settings.search(file)) {
return options; if (!hasFiles)
return options;
QQmlFormatOptions perFileOptions = options;
perFileOptions.setIsInplace(true);
return perFileOptions;
}
QQmlFormatOptions perFileOptions = options; QQmlFormatOptions perFileOptions = options;
if (hasFiles)
perFileOptions.setIsInplace(true);
perFileOptions.applySettings(settings); perFileOptions.applySettings(settings);
return perFileOptions; return perFileOptions;
}; };