diff options
| author | David Schulz <david.schulz@digia.com> | 2013-10-17 07:59:57 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@digia.com> | 2013-10-22 07:38:24 +0200 |
| commit | 10f42df8b3532ae71fd7d405e28614f81bcf40e7 (patch) | |
| tree | 95659f0b79395212cf7a076c3da94a02e256ef71 /src/plugins/cppeditor/cpppreprocessordialog.cpp | |
| parent | ffc90ba09f9ef52cfbe254da142f235e7a34aadf (diff) | |
| download | qt-creator-10f42df8b3532ae71fd7d405e28614f81bcf40e7.tar.gz | |
CppEditor: Remember project in preprocessor dialog.
Change-Id: If226707541b1fd4d5c22de2795fb39bc333cfa49
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cppeditor/cpppreprocessordialog.cpp')
| -rw-r--r-- | src/plugins/cppeditor/cpppreprocessordialog.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/plugins/cppeditor/cpppreprocessordialog.cpp b/src/plugins/cppeditor/cpppreprocessordialog.cpp index 37b400cbf7..e964962555 100644 --- a/src/plugins/cppeditor/cpppreprocessordialog.cpp +++ b/src/plugins/cppeditor/cpppreprocessordialog.cpp @@ -31,6 +31,7 @@ #include "ui_cpppreprocessordialog.h" #include "cppeditor.h" +#include "cppeditorconstants.h" #include "cppsnippetprovider.h" #include <projectexplorer/session.h> @@ -57,6 +58,10 @@ CppPreProcessorDialog::CppPreProcessorDialog(CPPEditorWidget *editorWidget, CppSnippetProvider().decorateEditor(m_ui->editWidget); + const QString ¤tProjectFile = ProjectExplorer::SessionManager::value( + QLatin1String(Constants::CPP_PREPROCESSOR_PROJECT_PREFIX) + m_filePath).toString(); + int currentIndex = 0; + QList<CppTools::ProjectPart::Ptr> sortedProjectParts(projectParts); qStableSort(sortedProjectParts.begin(), sortedProjectParts.end(), projectPartLessThan); @@ -66,12 +71,14 @@ CppPreProcessorDialog::CppPreProcessorDialog(CPPEditorWidget *editorWidget, addition.projectPart = projectPart; addition.additionalDirectives = ProjectExplorer::SessionManager::value( projectPart->projectFile + QLatin1Char(',') + m_filePath).toString(); + if (projectPart->projectFile == currentProjectFile) + currentIndex = m_ui->projectComboBox->count() - 1; m_partAdditions << addition; } if (m_ui->projectComboBox->count() <= 1) m_ui->projectComboBox->setEnabled(false); - m_ui->editWidget->setPlainText( - m_partAdditions.value(m_ui->projectComboBox->currentIndex()).additionalDirectives); + m_ui->projectComboBox->setCurrentIndex(currentIndex); + m_ui->editWidget->setPlainText(m_partAdditions.value(currentIndex).additionalDirectives); connect(m_ui->projectComboBox, SIGNAL(currentIndexChanged(int)), SLOT(projectChanged(int))); connect(m_ui->editWidget, SIGNAL(textChanged()), SLOT(textChanged())); @@ -87,6 +94,10 @@ int CppPreProcessorDialog::exec() if (QDialog::exec() == Rejected) return Rejected; + ProjectExplorer::SessionManager::setValue( + QLatin1String(Constants::CPP_PREPROCESSOR_PROJECT_PREFIX) + m_filePath, + m_partAdditions[m_ui->projectComboBox->currentIndex()].projectPart->projectFile); + foreach (ProjectPartAddition partAddition, m_partAdditions) { const QString &previousDirectives = ProjectExplorer::SessionManager::value( partAddition.projectPart->projectFile |