diff options
| author | hjk <hjk@qt.io> | 2019-07-23 10:58:00 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-07-23 11:55:59 +0000 |
| commit | 251287f0d35dd82e68dabed8214ef8af893aff91 (patch) | |
| tree | a3ba843c1c23f4aea06bc01bf7ab0dd69d6fc741 /src/libs/utils/settingsaccessor.cpp | |
| parent | 2b26eca80f9ebcdc2f1dc0d890a39a4fbc2d129c (diff) | |
Avoid warning on empty expressions
For some reason, Q_UNUSED includes already a semicolon, adding one
on the user side creates an additional empty statement.
Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/libs/utils/settingsaccessor.cpp')
| -rw-r--r-- | src/libs/utils/settingsaccessor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp index 881652f5ea..bc34ec7f93 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -100,7 +100,7 @@ bool SettingsAccessor::saveSettings(const QVariantMap &data, QWidget *parent) co */ SettingsAccessor::RestoreData SettingsAccessor::readData(const FilePath &path, QWidget *parent) const { - Q_UNUSED(parent); + Q_UNUSED(parent) RestoreData result = readFile(path); if (!result.data.isEmpty()) result.data = preprocessReadSettings(result.data); @@ -113,7 +113,7 @@ SettingsAccessor::RestoreData SettingsAccessor::readData(const FilePath &path, Q optional<SettingsAccessor::Issue> SettingsAccessor::writeData(const FilePath &path, const QVariantMap &data, QWidget *parent) const { - Q_UNUSED(parent); + Q_UNUSED(parent) return writeFile(path, prepareToWriteSettings(data)); } @@ -365,7 +365,7 @@ int VersionedBackUpStrategy::compare(const SettingsAccessor::RestoreData &data1, optional<FilePath> VersionedBackUpStrategy::backupName(const QVariantMap &oldData, const FilePath &path, const QVariantMap &data) const { - Q_UNUSED(data); + Q_UNUSED(data) FilePath backupName = path; const QByteArray oldEnvironmentId = settingsIdFromMap(oldData); const int oldVersion = versionFromMap(oldData); @@ -707,8 +707,8 @@ QVariantMap MergingSettingsAccessor::postprocessMerge(const QVariantMap &main, const QVariantMap &secondary, const QVariantMap &result) const { - Q_UNUSED(main); - Q_UNUSED(secondary); + Q_UNUSED(main) + Q_UNUSED(secondary) return result; } |