aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/cppeditor/cppeditor.cpp2
-rw-r--r--src/plugins/cppeditor/cpppreprocessordialog.cpp7
-rw-r--r--src/plugins/cppeditor/cpppreprocessordialog.h4
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();