From 54ea41af470d31a2cb4526f31327397c0ea1a30c Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Tue, 15 Jun 2010 10:22:28 +0200
Subject: [PATCH] Removed implicit change set and related utility methods.
---
.../qmljscomponentfromobjectdef.cpp | 8 ++---
src/plugins/qmljseditor/qmljsquickfix.cpp | 32 ++++---------------
src/plugins/qmljseditor/qmljsquickfix.h | 8 +----
3 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
index 0c8f35f8b26..da9b9e4a31f 100644
--- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
+++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
@@ -93,13 +93,13 @@ void ComponentFromObjectDef::createChanges()
QString imports;
UiProgram *prog = semanticInfo().document->qmlProgram();
if (prog && prog->imports) {
- const int start = position(prog->imports->firstSourceLocation());
- const int end = position(prog->members->member->firstSourceLocation());
+ const int start = startPosition(prog->imports->firstSourceLocation());
+ const int end = startPosition(prog->members->member->firstSourceLocation());
imports = textOf(start, end);
}
- const int start = position(_objDef->firstSourceLocation());
- const int end = position(_objDef->lastSourceLocation());
+ const int start = startPosition(_objDef->firstSourceLocation());
+ const int end = startPosition(_objDef->lastSourceLocation());
const QString txt = imports + textOf(start, end) + QLatin1String("}\n");
Utils::ChangeSet changes;
diff --git a/src/plugins/qmljseditor/qmljsquickfix.cpp b/src/plugins/qmljseditor/qmljsquickfix.cpp
index 437a5b244cd..2108147bb61 100644
--- a/src/plugins/qmljseditor/qmljsquickfix.cpp
+++ b/src/plugins/qmljseditor/qmljsquickfix.cpp
@@ -74,16 +74,18 @@ public:
const QmlJS::AST::SourceLocation loc = member->firstSourceLocation();
// insert a newline at the beginning of this binding
- changes.insert(position(loc), QLatin1String("\n"));
+ changes.insert(startPosition(loc), QLatin1String("\n"));
}
}
// insert a newline before the closing brace
- changes.insert(position(_objectInitializer->rbraceToken), QLatin1String("\n"));
+ changes.insert(startPosition(_objectInitializer->rbraceToken),
+ QLatin1String("\n"));
refactoringChanges()->changeFile(fileName(), changes);
- refactoringChanges()->reindent(fileName(), range(position(_objectInitializer->lbraceToken),
- position(_objectInitializer->rbraceToken)));
+ refactoringChanges()->reindent(fileName(),
+ range(startPosition(_objectInitializer->lbraceToken),
+ startPosition(_objectInitializer->rbraceToken)));
}
@@ -173,31 +175,11 @@ QmlJSRefactoringChanges *QmlJSQuickFixOperation::qmljsRefactoringChanges() const
RefactoringChanges *QmlJSQuickFixOperation::refactoringChanges() const
{ return qmljsRefactoringChanges(); }
-unsigned QmlJSQuickFixOperation::position(const QmlJS::AST::SourceLocation &loc) const
+unsigned QmlJSQuickFixOperation::startPosition(const QmlJS::AST::SourceLocation &loc) const
{
return position(loc.startLine, loc.startColumn);
}
-void QmlJSQuickFixOperation::move(const QmlJS::AST::SourceLocation &loc, int to)
-{
- move(position(loc.startColumn, loc.startColumn), to);
-}
-
-void QmlJSQuickFixOperation::replace(const QmlJS::AST::SourceLocation &loc, const QString &replacement)
-{
- replace(position(loc.startLine, loc.startColumn), replacement);
-}
-
-void QmlJSQuickFixOperation::remove(const QmlJS::AST::SourceLocation &loc)
-{
- remove(position(loc.startLine, loc.startColumn));
-}
-
-void QmlJSQuickFixOperation::copy(const QmlJS::AST::SourceLocation &loc, int to)
-{
- copy(position(loc.startLine, loc.startColumn), to);
-}
-
QmlJSQuickFixCollector::QmlJSQuickFixCollector()
{
}
diff --git a/src/plugins/qmljseditor/qmljsquickfix.h b/src/plugins/qmljseditor/qmljsquickfix.h
index a2cf4f52ea5..9163700940a 100644
--- a/src/plugins/qmljseditor/qmljsquickfix.h
+++ b/src/plugins/qmljseditor/qmljsquickfix.h
@@ -71,13 +71,7 @@ protected:
QmlJSRefactoringChanges *qmljsRefactoringChanges() const;
virtual TextEditor::RefactoringChanges *refactoringChanges() const;
- unsigned position(const QmlJS::AST::SourceLocation &loc) const;
-
- // token based operations
- void move(const QmlJS::AST::SourceLocation &loc, int to);
- void replace(const QmlJS::AST::SourceLocation &loc, const QString &replacement);
- void remove(const QmlJS::AST::SourceLocation &loc);
- void copy(const QmlJS::AST::SourceLocation &loc, int to);
+ unsigned startPosition(const QmlJS::AST::SourceLocation &loc) const;
private:
SemanticInfo _semanticInfo;
--
GitLab