diff options
author | Eike Ziller <eike.ziller@digia.com> | 2013-12-19 10:21:03 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-01-07 09:40:40 +0100 |
commit | 3ace54406b4d785105850c137b9a76e3a9ea0af0 (patch) | |
tree | b202a3e48f83c9f8f552e8a2f5c8fc7cfb43a904 | |
parent | e793e2d8302f2daeed8f2a1bae1ccab0280faa5b (diff) |
Reduce dependencies of CppPreProcessorDialog
It doesn't really need a CppEditorWidget
Change-Id: Ic36b1d467460cdcdce372df2887033bd9f5fff29
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
-rw-r--r-- | src/plugins/cppeditor/cppeditor.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cpppreprocessordialog.cpp | 7 | ||||
-rw-r--r-- | src/plugins/cppeditor/cpppreprocessordialog.h | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index b5ff2a08bd..44ef1f2a20 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -1995,7 +1995,7 @@ void CPPEditorWidget::showPreProcessorWidget() if (projectParts.isEmpty()) projectParts << m_modelManager->fallbackProjectPart(); - CppPreProcessorDialog preProcessorDialog(this, projectParts); + CppPreProcessorDialog preProcessorDialog(this, baseTextDocument()->filePath(), projectParts); if (preProcessorDialog.exec() == QDialog::Accepted) { QSharedPointer<SnapshotUpdater> updater = m_modelManager->cppEditorSupport(editor())->snapshotUpdater(); diff --git a/src/plugins/cppeditor/cpppreprocessordialog.cpp b/src/plugins/cppeditor/cpppreprocessordialog.cpp index 983bbe9aca..ab32e0b119 100644 --- a/src/plugins/cppeditor/cpppreprocessordialog.cpp +++ b/src/plugins/cppeditor/cpppreprocessordialog.cpp @@ -30,7 +30,6 @@ #include "cpppreprocessordialog.h" #include "ui_cpppreprocessordialog.h" -#include "cppeditor.h" #include "cppeditorconstants.h" #include "cppsnippetprovider.h" @@ -44,11 +43,11 @@ static bool projectPartLessThan(const CppTools::ProjectPart::Ptr &projectPart1, return projectPart1->displayName < projectPart2->displayName; } -CppPreProcessorDialog::CppPreProcessorDialog(CPPEditorWidget *editorWidget, +CppPreProcessorDialog::CppPreProcessorDialog(QWidget *parent, const QString &filePath, const QList<CppTools::ProjectPart::Ptr> &projectParts) - : QDialog(editorWidget) + : QDialog(parent) , m_ui(new Ui::CppPreProcessorDialog()) - , m_filePath(editorWidget->editor()->document()->filePath()) + , m_filePath(filePath) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); diff --git a/src/plugins/cppeditor/cpppreprocessordialog.h b/src/plugins/cppeditor/cpppreprocessordialog.h index c71e387e87..80080d3b8b 100644 --- a/src/plugins/cppeditor/cpppreprocessordialog.h +++ b/src/plugins/cppeditor/cpppreprocessordialog.h @@ -38,14 +38,12 @@ namespace CppEditor { namespace Internal { namespace Ui { class CppPreProcessorDialog; } -class CPPEditorWidget; - class CppPreProcessorDialog : public QDialog { Q_OBJECT public: - explicit CppPreProcessorDialog(CPPEditorWidget *editorWidget, + explicit CppPreProcessorDialog(QWidget *parent, const QString &filePath, const QList<CppTools::ProjectPart::Ptr> &projectParts); ~CppPreProcessorDialog(); |