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

TextEditor: Add a convenience append method for quick fixes

Browse Source 
Less noise on the user side.

Change-Id: Ia5b495a1f9d3ec43623056d793f6771b3b84fd6b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
hjk
2014-09-23 19:02:30 +02:00
parent 14022854d4
commit e11bbac671
10 changed files with 111 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,13 +176,13 @@ void ComponentFromObjectDef::match(const QmlJSQuickFixInterface &interface, Quic
return;
// check that the node is not the root node
if (i > 0 && !cast<UiProgram*>(path.at(i - 1))) {
result.append(QuickFixOperation::Ptr(new Operation(interface, objDef)));
result.append(new Operation(interface, objDef));
return;
}
} else if (UiObjectBinding *objBinding = cast<UiObjectBinding *>(node)) {
if (!interface->currentFile()->isCursorOn(objBinding->qualifiedTypeNameId))
return;
result.append(QuickFixOperation::Ptr(new Operation(interface, objBinding)));
result.append(new Operation(interface, objBinding));
return;
}
}

3
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -665,8 +665,7 @@ void QmlJSEditorWidget::showContextPane()
void QmlJSEditorWidget::performQuickFix(int index)
{
QuickFixOperation::Ptr op = m_quickFixes.at(index);
op->perform();
m_quickFixes.at(index)->perform();
}
void QmlJSEditorWidget::contextMenuEvent(QContextMenuEvent *e)

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

@@ -129,7 +129,7 @@ private:
QModelIndex m_outlineModelIndex;
QmlJS::ModelManagerInterface *m_modelManager;
QList<TextEditor::QuickFixOperation::Ptr> m_quickFixes;
TextEditor::QuickFixOperations m_quickFixes;
QmlJS::IContextPane *m_contextPane;
int m_oldCursorPosition;

4
src/plugins/qmljseditor/qmljsquickfixes.cpp
View File

@@ -81,7 +81,7 @@ class SplitInitializerOp: public QmlJSQuickFixFactory
}
if (objectInitializer)
result.append(TextEditor::QuickFixOperation::Ptr(new Operation(interface, objectInitializer)));
result.append(new Operation(interface, objectInitializer));
}
class Operation: public QmlJSQuickFixOperation
@@ -139,7 +139,7 @@ public:
foreach (const StaticAnalysis::Message &message, messages) {
if (interface->currentFile()->isCursorOn(message.location)) {
result.append(QuickFixOperation::Ptr(new Operation(interface, message)));
result.append(new Operation(interface, message));
return;
}
}

4
src/plugins/qmljseditor/qmljswrapinloader.cpp
View File

@@ -189,13 +189,13 @@ void WrapInLoader::match(const QmlJSQuickFixInterface &interface, QuickFixOperat
return;
// check that the node is not the root node
if (i > 0 && !cast<UiProgram*>(path.at(i - 1))) {
result.append(QuickFixOperation::Ptr(new Operation<UiObjectDefinition>(interface, objDef)));
result.append(new Operation<UiObjectDefinition>(interface, objDef));
return;
}
} else if (UiObjectBinding *objBinding = cast<UiObjectBinding *>(node)) {
if (!interface->currentFile()->isCursorOn(objBinding->qualifiedTypeNameId))
return;
result.append(QuickFixOperation::Ptr(new Operation<UiObjectBinding>(interface, objBinding)));
result.append(new Operation<UiObjectBinding>(interface, objBinding));
return;
}
}