From 6d72796ec04d65bab4d0175427d9b384bd338b19 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Thu, 9 Jan 2014 16:26:56 +0100
Subject: [PATCH] ProFileEditor: Remove unused factory variable
Change-Id: Ifa20cc17675dfce1da9b087ee2e9b2ecdb3d8f22
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/qmakeprojectmanager/profileeditor.cpp | 7 +++----
src/plugins/qmakeprojectmanager/profileeditor.h | 5 +----
src/plugins/qmakeprojectmanager/profileeditorfactory.cpp | 2 +-
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index 6e9e7556abd..55c4cfb8016 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 f0ab2fcfe76..b13826e3dd6 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 7ba617ce4e2..a5473d799cd 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();
}
--
GitLab