diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp similarity index 98% rename from src/plugins/projectexplorer/settingsaccessor.cpp rename to src/libs/utils/settingsaccessor.cpp index 6af26979abb..5493be88b8d 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. @@ -25,16 +25,14 @@ #include "settingsaccessor.h" -#include -#include +#include "persistentsettings.h" +#include "qtcassert.h" #include #include #include #include -using namespace Utils; - namespace { const char ORIGINAL_VERSION_KEY[] = "OriginalVersion"; @@ -55,7 +53,7 @@ static QString generateSuffix(const QString &alt1, const QString &alt2) } // end namespace -namespace ProjectExplorer { +namespace Utils { /*! * Performs a simple renaming of the listed keys in \a changes recursively on \a map. @@ -457,7 +455,7 @@ SettingsAccessor::IssueInfo SettingsAccessor::findIssues(const QVariantMap &data QByteArray readId = settingsIdFromMap(data); if (!readId.isEmpty() && readId != settingsId()) { result.title = differentEnvironmentMsg(d->m_displayName); - result.message = QApplication::translate("ProjectExplorer::EnvironmentIdAccessor", + result.message = QApplication::translate("Utils::EnvironmentIdAccessor", "

No .user settings file created by this instance " "of %1 was found.

" "

Did you work with this project on another machine or " @@ -485,7 +483,7 @@ QVariant SettingsAccessor::retrieveSharedSettings() const QString SettingsAccessor::differentEnvironmentMsg(const QString &projectName) { - return QApplication::translate("ProjectExplorer::EnvironmentIdAccessor", + return QApplication::translate("Utils::EnvironmentIdAccessor", "Settings File for \"%1\" from a different Environment?") .arg(projectName); } @@ -719,9 +717,9 @@ QVariantMap SettingsAccessor::readSharedSettings(QWidget *parent) const QMessageBox msgBox( QMessageBox::Question, - QApplication::translate("ProjectExplorer::SettingsAccessor", + QApplication::translate("Utils::SettingsAccessor", "Unsupported Shared Settings File"), - QApplication::translate("ProjectExplorer::SettingsAccessor", + QApplication::translate("Utils::SettingsAccessor", "The version of your .shared file is not " "supported by %1. " "Do you want to try loading it anyway?") @@ -796,4 +794,4 @@ QVariantMap SettingsAccessor::readFile(const FileName &path) const return prepareSettings(reader.restoreValues()); } -} // namespace ProjectExplorer +} // namespace Utils diff --git a/src/plugins/projectexplorer/settingsaccessor.h b/src/libs/utils/settingsaccessor.h similarity index 96% rename from src/plugins/projectexplorer/settingsaccessor.h rename to src/libs/utils/settingsaccessor.h index d01826081cd..7b6f190ff10 100644 --- a/src/plugins/projectexplorer/settingsaccessor.h +++ b/src/libs/utils/settingsaccessor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. @@ -25,19 +25,21 @@ #pragma once -#include +#include "utils_global.h" + +#include "fileutils.h" #include #include #include -namespace ProjectExplorer { +namespace Utils { // -------------------------------------------------------------------- // VersionUpgrader: // -------------------------------------------------------------------- // Handles updating a QVariantMap from version() - 1 to version() -class VersionUpgrader +class QTCREATOR_UTILS_EXPORT VersionUpgrader { public: virtual ~VersionUpgrader() = default; @@ -54,7 +56,7 @@ protected: class SettingsAccessorPrivate; -class SettingsAccessor +class QTCREATOR_UTILS_EXPORT SettingsAccessor { public: explicit SettingsAccessor(const Utils::FileName &baseFile); @@ -149,4 +151,4 @@ private: friend class SettingsAccessorPrivate; }; -} // namespace ProjectExplorer +} // namespace Utils diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index be1d9c47366..53b212f9d24 100644 --- a/src/libs/utils/utils-lib.pri +++ b/src/libs/utils/utils-lib.pri @@ -28,6 +28,7 @@ SOURCES += \ $$PWD/environmentdialog.cpp \ $$PWD/qtcprocess.cpp \ $$PWD/reloadpromptutils.cpp \ + $$PWD/settingsaccessor.cpp \ $$PWD/shellcommand.cpp \ $$PWD/shellcommandpage.cpp \ $$PWD/settingsselector.cpp \ @@ -132,6 +133,7 @@ HEADERS += \ $$PWD/qtcprocess.h \ $$PWD/utils_global.h \ $$PWD/reloadpromptutils.h \ + $$PWD/settingsaccessor.h \ $$PWD/settingsselector.h \ $$PWD/shellcommand.h \ $$PWD/shellcommandpage.h \ diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 9878ee2efe9..ec287beb3d7 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -198,6 +198,8 @@ Project { "savefile.cpp", "savefile.h", "scopedswap.h", + "settingsaccessor.cpp", + "settingsaccessor.h", "settingsselector.cpp", "settingsselector.h", "settingsutils.h", diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index 84ce3d0fedf..e519159666c 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/src/plugins/projectexplorer/projectexplorer.pro @@ -103,7 +103,6 @@ HEADERS += projectexplorer.h \ gcctoolchainfactories.h \ appoutputpane.h \ codestylesettingspropertiespage.h \ - settingsaccessor.h \ deployablefile.h \ devicesupport/idevice.h \ devicesupport/desktopdevice.h \ @@ -245,7 +244,6 @@ SOURCES += projectexplorer.cpp \ processparameters.cpp \ appoutputpane.cpp \ codestylesettingspropertiespage.cpp \ - settingsaccessor.cpp \ devicesupport/idevice.cpp \ devicesupport/desktopdevice.cpp \ devicesupport/desktopdevicefactory.cpp \ diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index a10aeca32de..dd43d0d1ece 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -131,7 +131,6 @@ Project { "sessionmodel.cpp", "sessionmodel.h", "sessionview.cpp", "sessionview.h", "sessiondialog.cpp", "sessiondialog.h", "sessiondialog.ui", - "settingsaccessor.cpp", "settingsaccessor.h", "showineditortaskhandler.cpp", "showineditortaskhandler.h", "showoutputtaskhandler.cpp", "showoutputtaskhandler.h", "subscription.cpp", "subscription.h", diff --git a/src/plugins/projectexplorer/userfileaccessor.h b/src/plugins/projectexplorer/userfileaccessor.h index 5247003c116..ed5cc734713 100644 --- a/src/plugins/projectexplorer/userfileaccessor.h +++ b/src/plugins/projectexplorer/userfileaccessor.h @@ -25,9 +25,8 @@ #pragma once -#include "settingsaccessor.h" - #include +#include #include #include @@ -38,7 +37,7 @@ namespace ProjectExplorer { class Project; namespace Internal { -class UserFileAccessor : public SettingsAccessor +class UserFileAccessor : public Utils::SettingsAccessor { public: UserFileAccessor(Project *project);