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

CMake: Some cosmetics to move closer to default style

Browse Source 
Change-Id: If2c36eda6157e5dd78abf4f25029ecfd153e228a
Reviewed-by: pawelrutka <prutka13@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2018-03-16 12:53:33 +01:00
parent 07d8b7bfa4
commit cd1534a646
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp
View File

@@ -29,9 +29,7 @@
namespace CMakeProjectManager {
namespace Internal {
namespace {
const char PROJECT_TYPE_ICON[] = ":/cmakeproject/images/project_type_settings_icon.png";
}
CMakeSpecificSettingWidget::CMakeSpecificSettingWidget(QWidget *parent):
QWidget(parent)
@@ -55,10 +53,9 @@ CMakeSpecificSettings CMakeSpecificSettingWidget::settings() const
CMakeSpecificSettings set;
int popupSetting = m_ui.newFileAddedCopyToCpliSettingGroup->checkedId();
set.setAfterAddFileSetting( (popupSetting == -1) ? AfterAddFileAction::ASK_USER :
static_cast<AfterAddFileAction>(popupSetting));
set.setAfterAddFileSetting(popupSetting == -1 ? AfterAddFileAction::ASK_USER
: static_cast<AfterAddFileAction>(popupSetting));
return set;
}
void CMakeSpecificSettingWidget::setProjectPopupSetting(AfterAddFileAction mode)
@@ -78,7 +75,7 @@ void CMakeSpecificSettingWidget::setProjectPopupSetting(AfterAddFileAction mode)
CMakeSpecificSettingsPage::CMakeSpecificSettingsPage(CMakeSpecificSettings *settings,
QObject *parent):
Core::IOptionsPage{parent}, m_settings{settings}
Core::IOptionsPage(parent), m_settings(settings)
{
setCategory("ProjectTypeSettingsPage");
setDisplayName("Project-Type Settings");
@@ -103,8 +100,7 @@ void CMakeSpecificSettingsPage::apply()
const CMakeSpecificSettings newSettings = m_widget->settings();
*m_settings = newSettings;
m_settings->toSettings(Core::ICore::settings());
}
}
}
} // Internal
} // CMakeProjectManager