From f30bd48b5837ffa32862cae65b3ac19f94b96400 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 17 Oct 2013 11:19:26 +0200 Subject: [PATCH] CPPEditor: Rework preprocessor addition tooltip. Change the preprocessor popup to a dialog. Save the additional preprocessor directives to the session instead of the .pro.user file. Change-Id: I0d08c5684cfb21e822cde0a965c9cf14e5d6d47d Reviewed-by: Nikolai Kosjar --- src/plugins/cppeditor/cppeditor.cpp | 42 ++--- src/plugins/cppeditor/cppeditor.h | 1 - src/plugins/cppeditor/cppeditor.pro | 6 +- src/plugins/cppeditor/cppeditor.qbs | 6 +- .../cpppreprocessoradditionwidget.cpp | 171 ------------------ .../cpppreprocessoradditionwidget.ui | 96 ---------- .../cppeditor/cpppreprocessordialog.cpp | 108 +++++++++++ ...ditionwidget.h => cpppreprocessordialog.h} | 59 ++---- .../cppeditor/cpppreprocessordialog.ui | 109 +++++++++++ src/plugins/projectexplorer/project.cpp | 15 -- src/plugins/projectexplorer/project.h | 3 - 11 files changed, 258 insertions(+), 358 deletions(-) delete mode 100644 src/plugins/cppeditor/cpppreprocessoradditionwidget.cpp delete mode 100644 src/plugins/cppeditor/cpppreprocessoradditionwidget.ui create mode 100644 src/plugins/cppeditor/cpppreprocessordialog.cpp rename src/plugins/cppeditor/{cpppreprocessoradditionwidget.h => cpppreprocessordialog.h} (62%) create mode 100644 src/plugins/cppeditor/cpppreprocessordialog.ui diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 7b36de8cf06..90e65c0f073 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -34,7 +34,7 @@ #include "cppeditorplugin.h" #include "cppfollowsymbolundercursor.h" #include "cpphighlighter.h" -#include "cpppreprocessoradditionwidget.h" +#include "cpppreprocessordialog.h" #include "cppquickfixassistant.h" #include @@ -701,18 +701,17 @@ void CPPEditorWidget::selectAll() void CPPEditorWidget::setMimeType(const QString &mt) { - const QString &fileName = editor()->document()->filePath(); + const QString &filePath = editor()->document()->filePath(); // Check if this editor belongs to a project - QList projectParts = m_modelManager->projectPart(fileName); + QList projectParts = m_modelManager->projectPart(filePath); if (projectParts.isEmpty()) - projectParts = m_modelManager->projectPartFromDependencies(fileName); + projectParts = m_modelManager->projectPartFromDependencies(filePath); if (!projectParts.isEmpty()) { - if (ProjectExplorer::Project *project = projectParts.first()->project) { - QByteArray additionalDefines = project->additionalCppDefines() - .value(projectParts.first()->projectFile).toByteArray(); - m_modelManager->cppEditorSupport(editor())->snapshotUpdater()->setEditorDefines( - additionalDefines); - } + QSharedPointer updater + = m_modelManager->cppEditorSupport(editor())->snapshotUpdater(); + const QString &projectFile = projectParts.first()->projectFile; + updater->setEditorDefines(ProjectExplorer::SessionManager::value( + projectFile + QLatin1Char(',') + filePath).toByteArray()); } BaseTextEditorWidget::setMimeType(mt); @@ -1968,28 +1967,21 @@ void CPPEditorWidget::onCommentsSettingsChanged(const CppTools::CommentsSettings void CPPEditorWidget::showPreProcessorWidget() { const QString &fileName = editor()->document()->filePath(); - // Check if this editor belongs to a project + // Check if this editor belongs to a project QList projectParts = m_modelManager->projectPart(fileName); if (projectParts.isEmpty()) projectParts = m_modelManager->projectPartFromDependencies(fileName); if (projectParts.isEmpty()) projectParts << m_modelManager->fallbackProjectPart(); - PreProcessorAdditionPopUp::instance()->show(this, projectParts); - - connect(PreProcessorAdditionPopUp::instance(), - SIGNAL(finished(QByteArray)), - SLOT(preProcessorWidgetFinished(QByteArray))); -} - -void CPPEditorWidget::preProcessorWidgetFinished(const QByteArray &additionalDefines) -{ - PreProcessorAdditionPopUp::instance()->disconnect(this); - QSharedPointer updater - = m_modelManager->cppEditorSupport(editor())->snapshotUpdater(); - updater->setEditorDefines(additionalDefines); - updater->update(m_modelManager->workingCopy()); + CppPreProcessorDialog preProcessorDialog(this, projectParts); + if (preProcessorDialog.exec() == QDialog::Accepted) { + QSharedPointer updater + = m_modelManager->cppEditorSupport(editor())->snapshotUpdater(); + updater->setEditorDefines(preProcessorDialog.additionalPreProcessorDirectives().toLatin1()); + updater->update(m_modelManager->workingCopy()); + } } #include diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index 1a5fe51d370..fa94f6a2e05 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -188,7 +188,6 @@ private Q_SLOTS: void onCommentsSettingsChanged(const CppTools::CommentsSettings &settings); void showPreProcessorWidget(); - void preProcessorWidgetFinished(const QByteArray &additionalDefines); private: void markSymbols(const QTextCursor &tc, const CppTools::SemanticInfo &info); diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro index e0d9f7b0c46..64ffa94641f 100644 --- a/src/plugins/cppeditor/cppeditor.pro +++ b/src/plugins/cppeditor/cppeditor.pro @@ -25,7 +25,7 @@ HEADERS += cppeditorplugin.h \ cppincludehierarchyitem.h \ cppincludehierarchytreeview.h \ cppvirtualfunctionassistprovider.h \ - cpppreprocessoradditionwidget.h + cpppreprocessordialog.h SOURCES += cppeditorplugin.cpp \ cppautocompleter.cpp \ @@ -49,7 +49,7 @@ SOURCES += cppeditorplugin.cpp \ cppincludehierarchyitem.cpp \ cppincludehierarchytreeview.cpp \ cppvirtualfunctionassistprovider.cpp \ - cpppreprocessoradditionwidget.cpp + cpppreprocessordialog.cpp RESOURCES += cppeditor.qrc @@ -67,4 +67,4 @@ equals(TEST, 1) { } FORMS += \ - cpppreprocessoradditionwidget.ui + cpppreprocessordialog.ui diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index 7ca766b74cf..d8c465ad557 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -50,9 +50,9 @@ QtcPlugin { "cppincludehierarchytreeview.h", "cppoutline.cpp", "cppoutline.h", - "cpppreprocessoradditionwidget.cpp", - "cpppreprocessoradditionwidget.h", - "cpppreprocessoradditionwidget.ui", + "cpppreprocessordialog.cpp", + "cpppreprocessordialog.h", + "cpppreprocessordialog.ui", "cppquickfixassistant.cpp", "cppquickfixassistant.h", "cppquickfix.cpp", diff --git a/src/plugins/cppeditor/cpppreprocessoradditionwidget.cpp b/src/plugins/cppeditor/cpppreprocessoradditionwidget.cpp deleted file mode 100644 index 7762af59cca..00000000000 --- a/src/plugins/cppeditor/cpppreprocessoradditionwidget.cpp +++ /dev/null @@ -1,171 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#include "cpppreprocessoradditionwidget.h" -#include "ui_cpppreprocessoradditionwidget.h" - -#include "cppsnippetprovider.h" - -#include -#include -#include - -#include - -using namespace CppEditor::Internal; - -PreProcessorAdditionWidget::PreProcessorAdditionWidget(QWidget *parent) - : QWidget(parent) - , ui(new Ui::CppPreProcessorAdditionWidget) -{ - ui->setupUi(this); - CppEditor::Internal::CppSnippetProvider prov; - prov.decorateEditor(ui->additionalEdit); - setAttribute(Qt::WA_QuitOnClose, false); - setFocusPolicy(Qt::StrongFocus); - ui->additionalEdit->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); -} - -PreProcessorAdditionWidget::~PreProcessorAdditionWidget() -{ - emit finished(); - delete ui; -} - -PreProcessorAdditionPopUp *PreProcessorAdditionPopUp::instance() -{ - static PreProcessorAdditionPopUp inst; - return &inst; -} - -void PreProcessorAdditionPopUp::show(QWidget *parent, - const QList &projectParts) -{ - m_widget = new PreProcessorAdditionWidget(); - m_originalPartAdditions.clear(); - foreach (CppTools::ProjectPart::Ptr projectPart, projectParts) { - ProjectPartAddition addition; - addition.projectPart = projectPart; - m_widget->ui->projectComboBox->addItem(projectPart->displayName); - addition.additionalDefines = projectPart->project - ->additionalCppDefines().value(projectPart->projectFile).toByteArray(); - m_originalPartAdditions << addition; - } - m_partAdditions = m_originalPartAdditions; - - m_widget->ui->additionalEdit->setPlainText(QLatin1String( - m_partAdditions[m_widget->ui->projectComboBox->currentIndex()].additionalDefines)); - - QPoint pos = parent->mapToGlobal(parent->rect().topRight()); - pos.setX(pos.x() - m_widget->width()); - showInternal(pos, Utils::WidgetContent(m_widget, true), parent, QRect()); - - connect(m_widget->ui->additionalEdit, SIGNAL(textChanged()), SLOT(textChanged())); - connect(m_widget->ui->projectComboBox, SIGNAL(currentIndexChanged(int)), - SLOT(projectChanged(int))); - connect(m_widget, SIGNAL(finished()), SLOT(finish())); - connect(m_widget->ui->buttonBox, SIGNAL(accepted()), SLOT(apply())); - connect(m_widget->ui->buttonBox, SIGNAL(rejected()), SLOT(cancel())); -} - -bool PreProcessorAdditionPopUp::eventFilter(QObject *o, QEvent *event) -{ - // Filter out some events that would hide the widget, when they would be handled by the ToolTip - switch (event->type()) { - case QEvent::Leave: - // This event would hide the ToolTip because the view isn't a child of the WidgetContent - if (m_widget->ui->projectComboBox->view() == qApp->focusWidget()) - return false; - break; - case QEvent::KeyPress: - case QEvent::KeyRelease: - case QEvent::ShortcutOverride: - // Catch the escape key to close the widget - if (static_cast(event)->key() == Qt::Key_Escape) { - hideTipImmediately(); - return true; - } - break; - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::Wheel: - // This event would hide the ToolTip because the viewport isn't a child of the WidgetContent - if (o == m_widget->ui->projectComboBox->view()->viewport()) - return false; - break; - default: - break; - } - return Utils::ToolTip::eventFilter(o, event); -} - -void PreProcessorAdditionPopUp::textChanged() -{ - m_partAdditions[m_widget->ui->projectComboBox->currentIndex()].additionalDefines - = m_widget->ui->additionalEdit->toPlainText().toLatin1(); -} - - -void PreProcessorAdditionPopUp::finish() -{ - m_widget->disconnect(this); - foreach (ProjectPartAddition partAddition, m_originalPartAdditions) { - QVariantMap settings = partAddition.projectPart->project->additionalCppDefines(); - if (!settings[partAddition.projectPart->projectFile].toString().isEmpty() - && !partAddition.additionalDefines.isEmpty()) { - settings[partAddition.projectPart->projectFile] = partAddition.additionalDefines; - partAddition.projectPart->project->setAdditionalCppDefines(settings); - } - } - emit finished(m_originalPartAdditions.value(m_widget->ui->projectComboBox->currentIndex()) - .additionalDefines); -} - -void PreProcessorAdditionPopUp::projectChanged(int index) -{ - m_widget->ui->additionalEdit->setPlainText( - QLatin1String(m_partAdditions[index].additionalDefines)); -} - -void PreProcessorAdditionPopUp::apply() -{ - m_originalPartAdditions = m_partAdditions; - hideTipImmediately(); -} - -void PreProcessorAdditionPopUp::cancel() -{ - m_partAdditions = m_originalPartAdditions; - hideTipImmediately(); -} - -PreProcessorAdditionPopUp::PreProcessorAdditionPopUp() - : m_widget(0) -{} diff --git a/src/plugins/cppeditor/cpppreprocessoradditionwidget.ui b/src/plugins/cppeditor/cpppreprocessoradditionwidget.ui deleted file mode 100644 index 101ba17d3fe..00000000000 --- a/src/plugins/cppeditor/cpppreprocessoradditionwidget.ui +++ /dev/null @@ -1,96 +0,0 @@ - - - CppEditor::Internal::CppPreProcessorAdditionWidget - - - - 0 - 0 - 415 - 395 - - - - Qt::StrongFocus - - - PP - - - true - - - - - - - - Project: - - - - - - - - 0 - 0 - - - - - - - - - - Qt::Horizontal - - - - - - - Additional - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - - TextEditor::SnippetEditorWidget - QPlainTextEdit -
texteditor/snippets/snippeteditor.h
- - - - - diff --git a/src/plugins/cppeditor/cpppreprocessordialog.cpp b/src/plugins/cppeditor/cpppreprocessordialog.cpp new file mode 100644 index 00000000000..4241831068d --- /dev/null +++ b/src/plugins/cppeditor/cpppreprocessordialog.cpp @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ + +#include "cpppreprocessordialog.h" +#include "ui_cpppreprocessordialog.h" + +#include "cppeditor.h" +#include "cppsnippetprovider.h" + +#include + +using namespace CppEditor::Internal; + +CppPreProcessorDialog::CppPreProcessorDialog(CPPEditorWidget *editorWidget, + const QList &projectParts) + : QDialog(editorWidget) + , m_ui(new Ui::CppPreProcessorDialog()) + , m_filePath(editorWidget->editor()->document()->filePath()) +{ + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + + m_ui->setupUi(this); + m_ui->editorLabel->setText(m_ui->editorLabel->text().arg(QFileInfo(m_filePath).fileName())); + + CppSnippetProvider().decorateEditor(m_ui->editWidget); + + foreach (CppTools::ProjectPart::Ptr projectPart, projectParts) { + m_ui->projectComboBox->addItem(projectPart->displayName); + ProjectPartAddition addition; + addition.projectPart = projectPart; + addition.additionalDirectives = ProjectExplorer::SessionManager::value( + projectPart->projectFile + QLatin1Char(',') + m_filePath).toString(); + 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); + + connect(m_ui->projectComboBox, SIGNAL(currentIndexChanged(int)), SLOT(projectChanged(int))); + connect(m_ui->editWidget, SIGNAL(textChanged()), SLOT(textChanged())); +} + +CppPreProcessorDialog::~CppPreProcessorDialog() +{ + delete m_ui; +} + +int CppPreProcessorDialog::exec() +{ + if (QDialog::exec() == Rejected) + return Rejected; + + foreach (ProjectPartAddition partAddition, m_partAdditions) { + const QString &previousDirectives = ProjectExplorer::SessionManager::value( + partAddition.projectPart->projectFile + + QLatin1Char(',') + + m_filePath).toString(); + if (previousDirectives != partAddition.additionalDirectives) { + ProjectExplorer::SessionManager::setValue( + partAddition.projectPart->projectFile + QLatin1Char(',') + m_filePath, + partAddition.additionalDirectives); + } + } + return Accepted; +} + +QString CppPreProcessorDialog::additionalPreProcessorDirectives() const +{ + return m_ui->editWidget->toPlainText(); +} + +void CppPreProcessorDialog::projectChanged(int index) +{ + m_ui->editWidget->setPlainText(m_partAdditions[index].additionalDirectives); +} + +void CppPreProcessorDialog::textChanged() +{ + m_partAdditions[m_ui->projectComboBox->currentIndex()].additionalDirectives + = m_ui->editWidget->toPlainText(); +} diff --git a/src/plugins/cppeditor/cpppreprocessoradditionwidget.h b/src/plugins/cppeditor/cpppreprocessordialog.h similarity index 62% rename from src/plugins/cppeditor/cpppreprocessoradditionwidget.h rename to src/plugins/cppeditor/cpppreprocessordialog.h index 828805ca1d0..c56e397fe11 100644 --- a/src/plugins/cppeditor/cpppreprocessoradditionwidget.h +++ b/src/plugins/cppeditor/cpppreprocessordialog.h @@ -27,70 +27,47 @@ ** ****************************************************************************/ -#ifndef CPPPREPROCESSORADDITIONWIDGET_H -#define CPPPREPROCESSORADDITIONWIDGET_H +#ifndef CPPPREPROCESSORDIALOG_H +#define CPPPREPROCESSORDIALOG_H #include -#include -#include -#include -#include +#include namespace CppEditor { namespace Internal { -namespace Ui { class CppPreProcessorAdditionWidget; } +namespace Ui { class CppPreProcessorDialog; } -class PreProcessorAdditionWidget : public QWidget +class CPPEditorWidget; + +class CppPreProcessorDialog : public QDialog { Q_OBJECT public: - explicit PreProcessorAdditionWidget(QWidget *parent = 0); - ~PreProcessorAdditionWidget(); - Ui::CppPreProcessorAdditionWidget *ui; + explicit CppPreProcessorDialog(CPPEditorWidget *editorWidget, + const QList &projectParts); + ~CppPreProcessorDialog(); -signals: - void finished(); -}; - -class PreProcessorAdditionPopUp : public Utils::ToolTip -{ - Q_OBJECT - -public: - ~PreProcessorAdditionPopUp(){} - static PreProcessorAdditionPopUp *instance(); - - void show(QWidget *parent, const QList &projectPartAdditions); - bool eventFilter(QObject *o, QEvent *event); - -signals: - void finished(const QByteArray &additionalDefines); + int exec(); + QString additionalPreProcessorDirectives() const; private slots: - void textChanged(); - void finish(); void projectChanged(int index); - void apply(); - void cancel(); - -protected: - explicit PreProcessorAdditionPopUp(); + void textChanged(); private: struct ProjectPartAddition { CppTools::ProjectPart::Ptr projectPart; - QByteArray additionalDefines; + QString additionalDirectives; }; - PreProcessorAdditionWidget* m_widget; - QList m_originalPartAdditions; + Ui::CppPreProcessorDialog *m_ui; QList m_partAdditions; - + QString m_filePath; }; -} // namespace CPPEditor } // namespace Internal +} // namespace CPPEditor -#endif // CPPPREPROCESSORADDITIONWIDGET_H +#endif // CPPPREPROCESSORDIALOG_H diff --git a/src/plugins/cppeditor/cpppreprocessordialog.ui b/src/plugins/cppeditor/cpppreprocessordialog.ui new file mode 100644 index 00000000000..28c7b5f47bd --- /dev/null +++ b/src/plugins/cppeditor/cpppreprocessordialog.ui @@ -0,0 +1,109 @@ + + + CppEditor::Internal::CppPreProcessorDialog + + + + 0 + 0 + 400 + 300 + + + + Additional C++ Preprocess Directives + + + + + + + + Project: + + + + + + + + 0 + 0 + + + + + + + + + + Qt::Horizontal + + + + + + + Additional C++ Preprocessor Directives for %1: + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + TextEditor::SnippetEditorWidget + QPlainTextEdit +
texteditor/snippets/snippeteditor.h
+ + + + + + buttonBox + accepted() + CppEditor::Internal::CppPreProcessorDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + CppEditor::Internal::CppPreProcessorDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index e6c4b6f67bb..070e967fbee 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -71,7 +71,6 @@ const char TARGET_KEY_PREFIX[] = "ProjectExplorer.Project.Target."; const char TARGET_COUNT_KEY[] = "ProjectExplorer.Project.TargetCount"; const char EDITOR_SETTINGS_KEY[] = "ProjectExplorer.Project.EditorSettings"; const char PLUGIN_SETTINGS_KEY[] = "ProjectExplorer.Project.PluginSettings"; -const char CPP_SETTINGS_KEY[] = "ProjectExplorer.Project.CppSettings"; } // namespace namespace ProjectExplorer { @@ -91,7 +90,6 @@ public: Core::Context m_projectContext; Core::Context m_projectLanguages; QVariantMap m_pluginSettings; - QVariantMap m_additionalCppDefines; SettingsAccessor *m_accessor; }; @@ -331,7 +329,6 @@ QVariantMap Project::toMap() const map.insert(QLatin1String(EDITOR_SETTINGS_KEY), d->m_editorConfiguration->toMap()); map.insert(QLatin1String(PLUGIN_SETTINGS_KEY), d->m_pluginSettings); - map.insert(QLatin1String(CPP_SETTINGS_KEY), d->m_additionalCppDefines); return map; } @@ -359,8 +356,6 @@ bool Project::fromMap(const QVariantMap &map) if (map.contains(QLatin1String(PLUGIN_SETTINGS_KEY))) d->m_pluginSettings = map.value(QLatin1String(PLUGIN_SETTINGS_KEY)).toMap(); - if (map.contains(QLatin1String(CPP_SETTINGS_KEY))) - d->m_additionalCppDefines = map.value(QLatin1String(CPP_SETTINGS_KEY)).toMap(); bool ok; int maxI(map.value(QLatin1String(TARGET_COUNT_KEY), 0).toInt(&ok)); @@ -465,16 +460,6 @@ void Project::setNamedSettings(const QString &name, const QVariant &value) d->m_pluginSettings.insert(name, value); } -QVariantMap Project::additionalCppDefines() const -{ - return d->m_additionalCppDefines; -} - -void Project::setAdditionalCppDefines(const QVariantMap value) const -{ - d->m_additionalCppDefines = value; -} - bool Project::needsConfiguration() const { return false; diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index 782fa9932cc..962512c7b19 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -123,9 +123,6 @@ public: QVariant namedSettings(const QString &name) const; void setNamedSettings(const QString &name, const QVariant &value); - QVariantMap additionalCppDefines() const; - void setAdditionalCppDefines(const QVariantMap value) const; - virtual bool needsConfiguration() const; virtual void configureAsExampleProject(const QStringList &platforms);