aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmljseditor
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-02-07 14:47:35 +0100
committerEike Ziller <eike.ziller@digia.com>2014-02-10 13:17:52 +0100
commit23274136f60241c1cc9556824576fcbc4e2cdffe (patch)
tree64749585bba86ab09e72ce75ef61dd6790ed7d0d /src/plugins/qmljseditor
parent104ec050f2835d3dacf17c2b53effa76883421b1 (diff)
QmlJSEditor: Use ICore::dialogParent for component dialog
And remove a then unused function. Change-Id: I85f6db88af060192f3ee2587ba4cb5a55f8860fd Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/plugins/qmljseditor')
-rw-r--r--src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp2
-rw-r--r--src/plugins/qmljseditor/qmljsquickfixassist.cpp8
-rw-r--r--src/plugins/qmljseditor/qmljsquickfixassist.h2
3 files changed, 2 insertions, 10 deletions
diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
index 4d607068ad6..eeb2d535c15 100644
--- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
+++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
@@ -83,7 +83,7 @@ public:
{
QString componentName = m_componentName;
QString path = QFileInfo(fileName()).path();
- ComponentNameDialog::go(&componentName, &path, assistInterface()->editor());
+ ComponentNameDialog::go(&componentName, &path, Core::ICore::dialogParent());
if (componentName.isEmpty() || path.isEmpty())
return;
diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.cpp b/src/plugins/qmljseditor/qmljsquickfixassist.cpp
index c7ddeaf8f0d..d678f9924ff 100644
--- a/src/plugins/qmljseditor/qmljsquickfixassist.cpp
+++ b/src/plugins/qmljseditor/qmljsquickfixassist.cpp
@@ -50,9 +50,8 @@ QmlJSQuickFixAssistInterface::QmlJSQuickFixAssistInterface(QmlJSTextEditorWidget
TextEditor::AssistReason reason)
: DefaultAssistInterface(editor->document(), editor->position(),
editor->baseTextDocument()->filePath(), reason)
- , m_editor(editor)
, m_semanticInfo(editor->qmlJsEditorDocument()->semanticInfo())
- , m_currentFile(QmlJSRefactoringChanges::file(m_editor, m_semanticInfo.document))
+ , m_currentFile(QmlJSRefactoringChanges::file(editor, m_semanticInfo.document))
{}
QmlJSQuickFixAssistInterface::~QmlJSQuickFixAssistInterface()
@@ -68,11 +67,6 @@ QmlJSRefactoringFilePtr QmlJSQuickFixAssistInterface::currentFile() const
return m_currentFile;
}
-QmlJSTextEditorWidget *QmlJSQuickFixAssistInterface::editor() const
-{
- return m_editor;
-}
-
// ----------------------
// QmlJSQuickFixProcessor
// ----------------------
diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.h b/src/plugins/qmljseditor/qmljsquickfixassist.h
index 03c4a84caf9..60e349f4848 100644
--- a/src/plugins/qmljseditor/qmljsquickfixassist.h
+++ b/src/plugins/qmljseditor/qmljsquickfixassist.h
@@ -49,10 +49,8 @@ public:
const QmlJSTools::SemanticInfo &semanticInfo() const;
QmlJSTools::QmlJSRefactoringFilePtr currentFile() const;
- QmlJSTextEditorWidget *editor() const;
private:
- QmlJSTextEditorWidget *m_editor;
QmlJSTools::SemanticInfo m_semanticInfo;
QmlJSTools::QmlJSRefactoringFilePtr m_currentFile;
};