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

Remove ProjectExplorerPlugin::setBuildDirectoryTemplate()

Browse Source 
The default build directory template is part of the
ProjectExplorerSettings data structure, but was read and written
separately by the settings page, which was confusing, because it meant
the respective value was essentially written twice, once with a dummy
value and then with the real one right afterwards. Fix that.

Change-Id: Id9536560dbd0505c2099abe627bca7e116fec296
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-02-28 17:16:52 +01:00
parent 729c74379a
commit 80bcaa4ada
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -3766,16 +3766,6 @@ QString ProjectExplorerPlugin::buildDirectoryTemplate()
return dd->m_projectExplorerSettings.buildDirectoryTemplate; return dd->m_projectExplorerSettings.buildDirectoryTemplate;
} }
/*!
Sets the current build directory template to \a directory.
\sa defaultbuildDirectory
*/
void ProjectExplorerPlugin::setBuildDirectoryTemplate(const QString &dir)
{
dd->m_projectExplorerSettings.buildDirectoryTemplate = dir;
}
QString ProjectExplorerPlugin::defaultBuildDirectoryTemplate() QString ProjectExplorerPlugin::defaultBuildDirectoryTemplate()
{ {
return QString(Constants::DEFAULT_BUILD_DIRECTORY_TEMPLATE); return QString(Constants::DEFAULT_BUILD_DIRECTORY_TEMPLATE);

1
src/plugins/projectexplorer/projectexplorer.h
View File

@@ -164,7 +164,6 @@ public:
static void openOpenProjectDialog(); static void openOpenProjectDialog();
static QString buildDirectoryTemplate(); static QString buildDirectoryTemplate();
static void setBuildDirectoryTemplate(const QString &dir);
static QString defaultBuildDirectoryTemplate(); static QString defaultBuildDirectoryTemplate();
signals: signals:

9
src/plugins/projectexplorer/projectexplorersettingspage.cpp
View File

@@ -57,15 +57,14 @@ public:
bool useProjectsDirectory(); bool useProjectsDirectory();
void setUseProjectsDirectory(bool v); void setUseProjectsDirectory(bool v);
QString buildDirectoryTemplate() const;
void setBuildDirectoryTemplate(const QString &bd);
private: private:
void slotDirectoryButtonGroupChanged(); void slotDirectoryButtonGroupChanged();
void resetBuildDirectoryTemplate(); void resetBuildDirectoryTemplate();
void updateBuildDirectoryResetButton(); void updateBuildDirectoryResetButton();
void setJomVisible(bool); void setJomVisible(bool);
QString buildDirectoryTemplate() const;
void setBuildDirectoryTemplate(const QString &bd);
Ui::ProjectExplorerSettingsPageUi m_ui; Ui::ProjectExplorerSettingsPageUi m_ui;
mutable ProjectExplorerSettings m_settings; mutable ProjectExplorerSettings m_settings;
@@ -114,6 +113,7 @@ ProjectExplorerSettings ProjectExplorerSettingsWidget::settings() const
m_settings.maxAppOutputChars = m_ui.maxAppOutputBox->value(); m_settings.maxAppOutputChars = m_ui.maxAppOutputBox->value();
m_settings.maxBuildOutputChars = m_ui.maxBuildOutputBox->value(); m_settings.maxBuildOutputChars = m_ui.maxBuildOutputBox->value();
m_settings.stopBeforeBuild = static_cast<ProjectExplorerSettings::StopBeforeBuild>(m_ui.stopBeforeBuildComboBox->currentIndex()); m_settings.stopBeforeBuild = static_cast<ProjectExplorerSettings::StopBeforeBuild>(m_ui.stopBeforeBuildComboBox->currentIndex());
m_settings.buildDirectoryTemplate = buildDirectoryTemplate();
return m_settings; return m_settings;
} }
@@ -136,6 +136,7 @@ void ProjectExplorerSettingsWidget::setSettings(const ProjectExplorerSettings &
m_ui.maxAppOutputBox->setValue(m_settings.maxAppOutputChars); m_ui.maxAppOutputBox->setValue(m_settings.maxAppOutputChars);
m_ui.maxBuildOutputBox->setValue(m_settings.maxBuildOutputChars); m_ui.maxBuildOutputBox->setValue(m_settings.maxBuildOutputChars);
m_ui.stopBeforeBuildComboBox->setCurrentIndex(static_cast<int>(m_settings.stopBeforeBuild)); m_ui.stopBeforeBuildComboBox->setCurrentIndex(static_cast<int>(m_settings.stopBeforeBuild));
setBuildDirectoryTemplate(pes.buildDirectoryTemplate);
} }
QString ProjectExplorerSettingsWidget::projectsDirectory() const QString ProjectExplorerSettingsWidget::projectsDirectory() const
@@ -205,7 +206,6 @@ QWidget *ProjectExplorerSettingsPage::widget()
m_widget->setSettings(ProjectExplorerPlugin::projectExplorerSettings()); m_widget->setSettings(ProjectExplorerPlugin::projectExplorerSettings());
m_widget->setProjectsDirectory(Core::DocumentManager::projectsDirectory().toString()); m_widget->setProjectsDirectory(Core::DocumentManager::projectsDirectory().toString());
m_widget->setUseProjectsDirectory(Core::DocumentManager::useProjectsDirectory()); m_widget->setUseProjectsDirectory(Core::DocumentManager::useProjectsDirectory());
m_widget->setBuildDirectoryTemplate(ProjectExplorerPlugin::buildDirectoryTemplate());
} }
return m_widget; return m_widget;
} }
@@ -217,7 +217,6 @@ void ProjectExplorerSettingsPage::apply()
Core::DocumentManager::setProjectsDirectory( Core::DocumentManager::setProjectsDirectory(
Utils::FileName::fromString(m_widget->projectsDirectory())); Utils::FileName::fromString(m_widget->projectsDirectory()));
Core::DocumentManager::setUseProjectsDirectory(m_widget->useProjectsDirectory()); Core::DocumentManager::setUseProjectsDirectory(m_widget->useProjectsDirectory());
ProjectExplorerPlugin::setBuildDirectoryTemplate(m_widget->buildDirectoryTemplate());
} }
} }