diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp index 6e9e7556abd5476b8de60b01de011096169e1039..55c4cfb80166d9dd86943279bf4dcd6410c6fb3d 100644 --- a/src/plugins/qmakeprojectmanager/profileeditor.cpp +++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp @@ -61,8 +61,7 @@ ProFileEditor::ProFileEditor(ProFileEditorWidget *editor) Core::IEditor *ProFileEditor::duplicate() { - ProFileEditorWidget *ret = new ProFileEditorWidget( - qobject_cast<ProFileEditorWidget*>(editorWidget())->factory()); + ProFileEditorWidget *ret = new ProFileEditorWidget(); ret->duplicateFrom(editorWidget()); TextEditor::TextEditorSettings::initializeEditor(ret); return ret->editor(); @@ -82,8 +81,8 @@ TextEditor::CompletionAssistProvider *ProFileEditor::completionAssistProvider() // ProFileEditorWidget // -ProFileEditorWidget::ProFileEditorWidget(ProFileEditorFactory *factory, QWidget *parent) - : BaseTextEditorWidget(new ProFileDocument(), parent), m_factory(factory) +ProFileEditorWidget::ProFileEditorWidget(QWidget *parent) + : BaseTextEditorWidget(new ProFileDocument(), parent) { baseTextDocument()->setSyntaxHighlighter(new ProFileHighlighter); m_commentDefinition.clearCommentStyles(); diff --git a/src/plugins/qmakeprojectmanager/profileeditor.h b/src/plugins/qmakeprojectmanager/profileeditor.h index f0ab2fcfe76ed62a3a1862714ca1ddf86ea4bdce..b13826e3dd6da0998efff69d4c407409d135ef0d 100644 --- a/src/plugins/qmakeprojectmanager/profileeditor.h +++ b/src/plugins/qmakeprojectmanager/profileeditor.h @@ -58,9 +58,7 @@ class ProFileEditorWidget : public TextEditor::BaseTextEditorWidget Q_OBJECT public: - ProFileEditorWidget(ProFileEditorFactory *factory, QWidget *parent = 0); - - ProFileEditorFactory *factory() { return m_factory; } + ProFileEditorWidget(QWidget *parent = 0); void unCommentSelection(); @@ -71,7 +69,6 @@ protected: void contextMenuEvent(QContextMenuEvent *); private: - ProFileEditorFactory *m_factory; Utils::CommentDefinition m_commentDefinition; }; diff --git a/src/plugins/qmakeprojectmanager/profileeditorfactory.cpp b/src/plugins/qmakeprojectmanager/profileeditorfactory.cpp index 7ba617ce4e2a319d57eb71602ed73f9c0825218f..a5473d799cd7b0014ea190af8320418f5cad0a08 100644 --- a/src/plugins/qmakeprojectmanager/profileeditorfactory.cpp +++ b/src/plugins/qmakeprojectmanager/profileeditorfactory.cpp @@ -62,7 +62,7 @@ ProFileEditorFactory::ProFileEditorFactory(QmakeManager *manager) : Core::IEditor *ProFileEditorFactory::createEditor() { - ProFileEditorWidget *editor = new ProFileEditorWidget(this); + ProFileEditorWidget *editor = new ProFileEditorWidget; TextEditor::TextEditorSettings::initializeEditor(editor); return editor->editor(); }