diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-11-24 16:32:37 +0900 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-11-28 12:00:44 +0000 |
| commit | 1e35c4520d5000783206d398cf3f12b2f86f8385 (patch) | |
| tree | dd2951801ad028d7a68bfb11cc016a1e915f756d /src/lib/corelib/tools | |
| parent | 3ed09bb9f6dfac876c6d9f4917fcb32c3ea08635 (diff) | |
Apply 'modernize-make-unique' fix-it
Change-Id: I93783cfa3267f69237b0ad888d0747e4272cda0a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/tools')
| -rw-r--r-- | src/lib/corelib/tools/settingscreator.cpp | 5 | ||||
| -rw-r--r-- | src/lib/corelib/tools/settingsmodel.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/corelib/tools/settingscreator.cpp b/src/lib/corelib/tools/settingscreator.cpp index eaaf2802c..b7c727cd0 100644 --- a/src/lib/corelib/tools/settingscreator.cpp +++ b/src/lib/corelib/tools/settingscreator.cpp @@ -1,3 +1,4 @@ +#include <memory> #include <utility> /**************************************************************************** @@ -104,7 +105,7 @@ void SettingsCreator::migrate() // Adapt all paths in settings that point to the old location. At the time of this writing, // that's only preferences.qbsSearchPaths as written by libqtprofilesetup, but we don't want // to hardcode that here. - m_settings.reset(new QSettings(m_newSettingsFilePath, format())); + m_settings = std::make_unique<QSettings>(m_newSettingsFilePath, format()); const auto allKeys = m_settings->allKeys(); for (const QString &key : allKeys) { QVariant v = m_settings->value(key); @@ -136,7 +137,7 @@ void SettingsCreator::createQSettings() m_newSettingsDir = m_settingsBaseDir + QLatin1String("/qbs/") + m_qbsVersion.toString(); m_settingsFileName = fi.fileName(); m_newSettingsFilePath = m_newSettingsDir + QLatin1Char('/') + m_settingsFileName; - m_settings.reset(new QSettings(m_newSettingsFilePath, tmp->format())); + m_settings = std::make_unique<QSettings>(m_newSettingsFilePath, tmp->format()); } Version SettingsCreator::predecessor() const diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp index d67f1da5c..7283e959c 100644 --- a/src/lib/corelib/tools/settingsmodel.cpp +++ b/src/lib/corelib/tools/settingsmodel.cpp @@ -125,7 +125,7 @@ public: SettingsModel::SettingsModel(const QString &settingsDir, Settings::Scope scope, QObject *parent) : QAbstractItemModel(parent), d(new SettingsModelPrivate) { - d->settings.reset(new qbs::Settings(settingsDir)); + d->settings = std::make_unique<qbs::Settings>(settingsDir); d->settings->setScopeForWriting(scope); d->readSettings(); } @@ -155,7 +155,7 @@ void SettingsModel::updateSettingsDir(const QString &settingsDir) { const Settings::Scope scope = d->scope(); beginResetModel(); - d->settings.reset(new qbs::Settings(settingsDir)); + d->settings = std::make_unique<qbs::Settings>(settingsDir); d->settings->setScopeForWriting(scope); d->readSettings(); endResetModel(); |