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

ProjectExplorer: Settingspage code cosmetics

Browse Source 
FilePath, namespaces, indentation.

Change-Id: I77a3595bad01c1984bf23cd12ba06d90d58a71ea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-09-30 12:44:55 +02:00
parent d0a4fc4b2c
commit fcfdfdf823
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,10 +34,13 @@
#include <QCoreApplication> #include <QCoreApplication>
using namespace Core;
using namespace Utils;
namespace ProjectExplorer { namespace ProjectExplorer {
namespace Internal { namespace Internal {
enum { UseCurrentDirectory, UseProjectDirectory }; enum { UseCurrentDirectory, UseProjectDirectory };
class ProjectExplorerSettingsWidget : public QWidget class ProjectExplorerSettingsWidget : public QWidget
{ {
@@ -49,8 +52,8 @@ public:
ProjectExplorerSettings settings() const; ProjectExplorerSettings settings() const;
void setSettings(const ProjectExplorerSettings &s); void setSettings(const ProjectExplorerSettings &s);
QString projectsDirectory() const; FilePath projectsDirectory() const;
void setProjectsDirectory(const QString &pd); void setProjectsDirectory(const FilePath &pd);
bool useProjectsDirectory(); bool useProjectsDirectory();
void setUseProjectsDirectory(bool v); void setUseProjectsDirectory(bool v);
@@ -68,7 +71,7 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget(QWidget *parent) :
QWidget(parent) QWidget(parent)
{ {
m_ui.setupUi(this); m_ui.setupUi(this);
setJomVisible(Utils::HostOsInfo::isWindowsHost()); setJomVisible(HostOsInfo::isWindowsHost());
m_ui.stopBeforeBuildComboBox->addItem(tr("None"), int(StopBeforeBuild::None)); m_ui.stopBeforeBuildComboBox->addItem(tr("None"), int(StopBeforeBuild::None));
m_ui.stopBeforeBuildComboBox->addItem(tr("All"), int(StopBeforeBuild::All)); m_ui.stopBeforeBuildComboBox->addItem(tr("All"), int(StopBeforeBuild::All));
m_ui.stopBeforeBuildComboBox->addItem(tr("Same Project"), int(StopBeforeBuild::SameProject)); m_ui.stopBeforeBuildComboBox->addItem(tr("Same Project"), int(StopBeforeBuild::SameProject));
@@ -135,14 +138,14 @@ void ProjectExplorerSettingsWidget::setSettings(const ProjectExplorerSettings &
m_ui.lowBuildPriorityCheckBox->setChecked(m_settings.lowBuildPriority); m_ui.lowBuildPriorityCheckBox->setChecked(m_settings.lowBuildPriority);
} }
QString ProjectExplorerSettingsWidget::projectsDirectory() const FilePath ProjectExplorerSettingsWidget::projectsDirectory() const
{ {
return m_ui.projectsDirectoryPathChooser->filePath().toString(); return m_ui.projectsDirectoryPathChooser->filePath();
} }
void ProjectExplorerSettingsWidget::setProjectsDirectory(const QString &pd) void ProjectExplorerSettingsWidget::setProjectsDirectory(const FilePath &pd)
{ {
m_ui.projectsDirectoryPathChooser->setPath(pd); m_ui.projectsDirectoryPathChooser->setFilePath(pd);
} }
bool ProjectExplorerSettingsWidget::useProjectsDirectory() bool ProjectExplorerSettingsWidget::useProjectsDirectory()
@@ -179,8 +182,8 @@ QWidget *ProjectExplorerSettingsPage::widget()
if (!m_widget) { if (!m_widget) {
m_widget = new ProjectExplorerSettingsWidget; m_widget = new ProjectExplorerSettingsWidget;
m_widget->setSettings(ProjectExplorerPlugin::projectExplorerSettings()); m_widget->setSettings(ProjectExplorerPlugin::projectExplorerSettings());
m_widget->setProjectsDirectory(Core::DocumentManager::projectsDirectory().toString()); m_widget->setProjectsDirectory(DocumentManager::projectsDirectory());
m_widget->setUseProjectsDirectory(Core::DocumentManager::useProjectsDirectory()); m_widget->setUseProjectsDirectory(DocumentManager::useProjectsDirectory());
} }
return m_widget; return m_widget;
} }
@@ -189,9 +192,8 @@ void ProjectExplorerSettingsPage::apply()
{ {
if (m_widget) { if (m_widget) {
ProjectExplorerPlugin::setProjectExplorerSettings(m_widget->settings()); ProjectExplorerPlugin::setProjectExplorerSettings(m_widget->settings());
Core::DocumentManager::setProjectsDirectory( DocumentManager::setProjectsDirectory(m_widget->projectsDirectory());
Utils::FilePath::fromString(m_widget->projectsDirectory())); DocumentManager::setUseProjectsDirectory(m_widget->useProjectsDirectory());
Core::DocumentManager::setUseProjectsDirectory(m_widget->useProjectsDirectory());
} }
} }