From 978960904c97d51f45c6cfa98bb77042009cffb3 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@digia.com>
Date: Thu, 8 Nov 2012 15:01:45 +0100
Subject: [PATCH] Compile fix for Windows
Task-number: QTCREATORBUG-8209
Change-Id: I2ae88b5fc8ad5b4de7c9dc2eacb4eaf5d6f4fe2b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
---
src/plugins/qmljseditor/qmljsquickfix.cpp | 1 -
src/plugins/qmljseditor/qmljsquickfix.h | 2 +-
src/plugins/qmljseditor/qmljsquickfixes.cpp | 3 +--
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qmljseditor/qmljsquickfix.cpp b/src/plugins/qmljseditor/qmljsquickfix.cpp
index 59df72bfd45..6952c24e91f 100644
--- a/src/plugins/qmljseditor/qmljsquickfix.cpp
+++ b/src/plugins/qmljseditor/qmljsquickfix.cpp
@@ -45,7 +45,6 @@ using namespace QmlJS::AST;
using namespace QmlJSEditor;
using namespace QmlJSEditor::Internal;
using namespace QmlJSTools;
-using namespace TextEditor;
using TextEditor::RefactoringChanges;
QmlJSQuickFixOperation::QmlJSQuickFixOperation(const QmlJSQuickFixInterface &interface,
diff --git a/src/plugins/qmljseditor/qmljsquickfix.h b/src/plugins/qmljseditor/qmljsquickfix.h
index 7dd6886fbe1..83c7fa6f3a0 100644
--- a/src/plugins/qmljseditor/qmljsquickfix.h
+++ b/src/plugins/qmljseditor/qmljsquickfix.h
@@ -94,7 +94,7 @@ protected:
Implement this method to match and create the appropriate
QmlJSQuickFixOperation objects.
*/
- virtual void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result) = 0;
+ virtual void match(const QmlJSQuickFixInterface &interface, TextEditor::QuickFixOperations &result) = 0;
};
} // namespace QmlJSEditor
diff --git a/src/plugins/qmljseditor/qmljsquickfixes.cpp b/src/plugins/qmljseditor/qmljsquickfixes.cpp
index f4bc9c00723..9583331be7f 100644
--- a/src/plugins/qmljseditor/qmljsquickfixes.cpp
+++ b/src/plugins/qmljseditor/qmljsquickfixes.cpp
@@ -45,7 +45,6 @@ using namespace QmlJS::AST;
using namespace QmlJSEditor;
using namespace QmlJSEditor::Internal;
using namespace QmlJSTools;
-using namespace TextEditor;
using TextEditor::RefactoringChanges;
namespace {
@@ -80,7 +79,7 @@ class SplitInitializerOp: public QmlJSQuickFixFactory
}
if (objectInitializer)
- result.append(QuickFixOperation::Ptr(new Operation(interface, objectInitializer)));
+ result.append(TextEditor::QuickFixOperation::Ptr(new Operation(interface, objectInitializer)));
}
class Operation: public QmlJSQuickFixOperation
--
GitLab