diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp index 0c8f35f8b26d59fd12b9f6e1cf8617828b94bfa4..da9b9e4a31f0d2c674870b416ce526ea36970122 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 437a5b244cdb0f5e8116516f90f258a0359066f0..2108147bb6178e885d72a2964ff5a9da641c540a 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 a2cf4f52ea5940f7eab013961090899fae6a33ae..9163700940aeeb16216b0d81de1fedad1bb6b102 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;