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

ProjectExplorer: Change signature to Project::toMap(QVariantMap &)

Browse Source 
More aspect-friendly.

Change-Id: Ia107dbab65f3772b315d735e4c46f9dfe1043d5a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-27 13:45:51 +02:00
parent 07de94237c
commit 9a78f717e4
5 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/nim/project/nimbleproject.cpp
View File

@@ -26,11 +26,10 @@ NimbleProject::NimbleProject(const Utils::FilePath &fileName)
setBuildSystemCreator([] (Target *t) { return new NimbleBuildSystem(t); }); setBuildSystemCreator([] (Target *t) { return new NimbleBuildSystem(t); });
} }
QVariantMap NimbleProject::toMap() const void NimbleProject::toMap(QVariantMap &map) const
{ {
QVariantMap result = Project::toMap(); Project::toMap(map);
result[Constants::C_NIMPROJECT_EXCLUDEDFILES] = m_excludedFiles; map[Constants::C_NIMPROJECT_EXCLUDEDFILES] = m_excludedFiles;
return result;
} }
Project::RestoreResult NimbleProject::fromMap(const QVariantMap &map, QString *errorMessage) Project::RestoreResult NimbleProject::fromMap(const QVariantMap &map, QString *errorMessage)

2
src/plugins/nim/project/nimbleproject.h
View File

@@ -16,7 +16,7 @@ public:
NimbleProject(const Utils::FilePath &filename); NimbleProject(const Utils::FilePath &filename);
// Keep for compatibility with Qt Creator 4.10 // Keep for compatibility with Qt Creator 4.10
QVariantMap toMap() const final; void toMap(QVariantMap &map) const final;
QStringList excludedFiles() const; QStringList excludedFiles() const;
void setExcludedFiles(const QStringList &excludedFiles); void setExcludedFiles(const QStringList &excludedFiles);

9
src/plugins/nim/project/nimproject.cpp
View File

@@ -27,7 +27,7 @@ public:
Tasks projectIssues(const Kit *k) const final; Tasks projectIssues(const Kit *k) const final;
// Keep for compatibility with Qt Creator 4.10 // Keep for compatibility with Qt Creator 4.10
QVariantMap toMap() const final; void toMap(QVariantMap &map) const final;
QStringList excludedFiles() const; QStringList excludedFiles() const;
void setExcludedFiles(const QStringList &excludedFiles); void setExcludedFiles(const QStringList &excludedFiles);
@@ -63,11 +63,10 @@ Tasks NimProject::projectIssues(const Kit *k) const
return result; return result;
} }
QVariantMap NimProject::toMap() const void NimProject::toMap(QVariantMap &map) const
{ {
QVariantMap result = Project::toMap(); Project::toMap(map);
result[Constants::C_NIMPROJECT_EXCLUDEDFILES] = m_excludedFiles; map[Constants::C_NIMPROJECT_EXCLUDEDFILES] = m_excludedFiles;
return result;
} }
Project::RestoreResult NimProject::fromMap(const QVariantMap &map, QString *errorMessage) Project::RestoreResult NimProject::fromMap(const QVariantMap &map, QString *errorMessage)

12
src/plugins/projectexplorer/project.cpp
View File

@@ -634,8 +634,11 @@ void Project::saveSettings()
emit aboutToSaveSettings(); emit aboutToSaveSettings();
if (!d->m_accessor) if (!d->m_accessor)
d->m_accessor = std::make_unique<Internal::UserFileAccessor>(this); d->m_accessor = std::make_unique<Internal::UserFileAccessor>(this);
if (!targets().isEmpty()) if (!targets().isEmpty()) {
d->m_accessor->saveSettings(toMap(), ICore::dialogParent()); QVariantMap map;
toMap(map);
d->m_accessor->saveSettings(map, ICore::dialogParent());
}
} }
Project::RestoreResult Project::restoreSettings(QString *errorMessage) Project::RestoreResult Project::restoreSettings(QString *errorMessage)
@@ -688,11 +691,10 @@ FilePaths Project::files(const NodeMatcher &filter) const
creating new build configurations. creating new build configurations.
*/ */
QVariantMap Project::toMap() const void Project::toMap(QVariantMap &map) const
{ {
const QList<Target *> ts = targets(); const QList<Target *> ts = targets();
QVariantMap map;
map.insert(QLatin1String(ACTIVE_TARGET_KEY), ts.indexOf(d->m_activeTarget)); map.insert(QLatin1String(ACTIVE_TARGET_KEY), ts.indexOf(d->m_activeTarget));
map.insert(QLatin1String(TARGET_COUNT_KEY), ts.size()); map.insert(QLatin1String(TARGET_COUNT_KEY), ts.size());
for (int i = 0; i < ts.size(); ++i) for (int i = 0; i < ts.size(); ++i)
@@ -701,8 +703,6 @@ QVariantMap Project::toMap() const
map.insert(QLatin1String(EDITOR_SETTINGS_KEY), d->m_editorConfiguration.toMap()); map.insert(QLatin1String(EDITOR_SETTINGS_KEY), d->m_editorConfiguration.toMap());
if (!d->m_pluginSettings.isEmpty()) if (!d->m_pluginSettings.isEmpty())
map.insert(QLatin1String(PLUGIN_SETTINGS_KEY), d->m_pluginSettings); map.insert(QLatin1String(PLUGIN_SETTINGS_KEY), d->m_pluginSettings);
return map;
} }
/*! /*!

2
src/plugins/projectexplorer/project.h
View File

@@ -111,7 +111,7 @@ public:
const NodeMatcher &extraMatcher = {}) const; const NodeMatcher &extraMatcher = {}) const;
Utils::FilePaths binariesForSourceFile(const Utils::FilePath &sourceFile) const; Utils::FilePaths binariesForSourceFile(const Utils::FilePath &sourceFile) const;
virtual QVariantMap toMap() const; virtual void toMap(QVariantMap &map) const;
Core::Context projectContext() const; Core::Context projectContext() const;
Core::Context projectLanguages() const; Core::Context projectLanguages() const;