forked from qt-creator/qt-creator
C++: add header chooser to codemodel settings page.
Change-Id: I2da9c4b382afcad2faad1817af266381a2f02b2a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
@@ -60,6 +60,7 @@ void CppCodeModelSettingsWidget::setSettings(const QSharedPointer<CppCodeModelSe
|
||||
applyToWidget(m_ui->cppChooser, QLatin1String(Constants::CPP_SOURCE_MIMETYPE));
|
||||
applyToWidget(m_ui->objcChooser, QLatin1String(Constants::OBJECTIVE_C_SOURCE_MIMETYPE));
|
||||
applyToWidget(m_ui->objcppChooser, QLatin1String(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE));
|
||||
applyToWidget(m_ui->hChooser, QLatin1String(Constants::C_HEADER_MIMETYPE));
|
||||
|
||||
m_ui->ignorePCHCheckBox->setChecked(s->pchUsage() == CppCodeModelSettings::PchUse_None);
|
||||
}
|
||||
@@ -88,6 +89,8 @@ void CppCodeModelSettingsWidget::applyToSettings() const
|
||||
QLatin1String(Constants::OBJECTIVE_C_SOURCE_MIMETYPE));
|
||||
changed |= applyToSettings(m_ui->objcppChooser,
|
||||
QLatin1String(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE));
|
||||
changed |= applyToSettings(m_ui->hChooser,
|
||||
QLatin1String(Constants::C_HEADER_MIMETYPE));
|
||||
|
||||
if (m_ui->ignorePCHCheckBox->isChecked() !=
|
||||
(m_settings->pchUsage() == CppCodeModelSettings::PchUse_None)) {
|
||||
@@ -104,11 +107,11 @@ void CppCodeModelSettingsWidget::applyToSettings() const
|
||||
bool CppCodeModelSettingsWidget::applyToSettings(QComboBox *chooser, const QString &mimeType) const
|
||||
{
|
||||
QString newId = chooser->itemData(chooser->currentIndex()).toString();
|
||||
QString ¤tId = m_settings->modelManagerSupportId(mimeType);
|
||||
QString currentId = m_settings->modelManagerSupportId(mimeType);
|
||||
if (newId == currentId)
|
||||
return false;
|
||||
|
||||
currentId = newId;
|
||||
m_settings->setModelManagerSupportId(mimeType, newId);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user