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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Change-Id: I957c22020fbacb2f631220b0cdc7fa16a782798b
This commit is contained in:
Orgad Shaneh
2016-11-21 10:25:45 +02:00
parent 6a061b2a35 97c9213358
commit 6d1d1a4416
36 changed files with 488 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,13 +246,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(new Operation(interface, objDef));
result << new Operation(interface, objDef);
return;
}
} else if (UiObjectBinding *objBinding = cast<UiObjectBinding *>(node)) {
if (!interface->currentFile()->isCursorOn(objBinding->qualifiedTypeNameId))
return;
result.append(new Operation(interface, objBinding));
result << new Operation(interface, objBinding);
return;
}
}

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

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

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

@@ -186,13 +186,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(new Operation<UiObjectDefinition>(interface, objDef));
result << new Operation<UiObjectDefinition>(interface, objDef);
return;
}
} else if (UiObjectBinding *objBinding = cast<UiObjectBinding *>(node)) {
if (!interface->currentFile()->isCursorOn(objBinding->qualifiedTypeNameId))
return;
result.append(new Operation<UiObjectBinding>(interface, objBinding));
result << new Operation<UiObjectBinding>(interface, objBinding);
return;
}
}