feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJSEditor: Use ICore::dialogParent for component dialog

Browse Source 
And remove a then unused function.

Change-Id: I85f6db88af060192f3ee2587ba4cb5a55f8860fd
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Eike Ziller
2014-02-07 14:47:35 +01:00
parent 104ec050f2
commit 23274136f6
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
View File

@@ -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;

8
src/plugins/qmljseditor/qmljsquickfixassist.cpp
View File

@@ -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
// ----------------------

2
src/plugins/qmljseditor/qmljsquickfixassist.h
View File

@@ -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;
};