forked from qt-creator/qt-creator
CppEditor: simplify CppQuickFixOperation interface
Change-Id: Ib3ed82c7f07f80027b18471ffb7b3055fa74eb52 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
@@ -62,9 +62,7 @@ namespace {
|
||||
*/
|
||||
class SplitInitializerOp: public QmlJSQuickFixFactory
|
||||
{
|
||||
public:
|
||||
virtual QList<QmlJSQuickFixOperation::Ptr> match(
|
||||
const QSharedPointer<const QmlJSQuickFixAssistInterface> &interface)
|
||||
void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result)
|
||||
{
|
||||
UiObjectInitializer *objectInitializer = 0;
|
||||
|
||||
@@ -82,12 +80,9 @@ public:
|
||||
}
|
||||
|
||||
if (objectInitializer)
|
||||
return singleResult(new Operation(interface, objectInitializer));
|
||||
else
|
||||
return noResult();
|
||||
result.append(QuickFixOperation::Ptr(new Operation(interface, objectInitializer)));
|
||||
}
|
||||
|
||||
private:
|
||||
class Operation: public QmlJSQuickFixOperation
|
||||
{
|
||||
UiObjectInitializer *_objectInitializer;
|
||||
@@ -102,7 +97,7 @@ private:
|
||||
"Split Initializer"));
|
||||
}
|
||||
|
||||
virtual void performChanges(QmlJSRefactoringFilePtr currentFile,
|
||||
void performChanges(QmlJSRefactoringFilePtr currentFile,
|
||||
const QmlJSRefactoringChanges &)
|
||||
{
|
||||
Q_ASSERT(_objectInitializer != 0);
|
||||
@@ -137,18 +132,16 @@ class AddAnalysisMessageSuppressionComment: public QmlJSQuickFixFactory
|
||||
{
|
||||
Q_DECLARE_TR_FUNCTIONS(QmlJSEditor::AddAnalysisMessageSuppressionComment)
|
||||
public:
|
||||
virtual QList<QmlJSQuickFixOperation::Ptr> match(
|
||||
const QSharedPointer<const QmlJSQuickFixAssistInterface> &interface)
|
||||
void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result)
|
||||
{
|
||||
const QList<StaticAnalysis::Message> &messages = interface->semanticInfo().staticAnalysisMessages;
|
||||
|
||||
foreach (const StaticAnalysis::Message &message, messages) {
|
||||
if (interface->currentFile()->isCursorOn(message.location)) {
|
||||
return singleResult(new Operation(interface, message));
|
||||
result.append(QuickFixOperation::Ptr(new Operation(interface, message)));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
return noResult();
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
Reference in New Issue
Block a user