From 04e8b332bb4a478b5d9ab83b70c3982af3b85be3 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 29 May 2014 23:12:04 +0300 Subject: Unify Utils::ChangeSet usages * Remove using Utils::ChangeSet from header files * Remove unused typedef for Range * Add it only in source files that contain many occurrences Change-Id: I60a8b77e2d5a46431507f53b6d60186d511ccf30 Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/cpprefactoringchanges.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/plugins/cpptools/cpprefactoringchanges.cpp') diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp index a44bdadb2e..a07d7a404c 100644 --- a/src/plugins/cpptools/cpprefactoringchanges.cpp +++ b/src/plugins/cpptools/cpprefactoringchanges.cpp @@ -38,7 +38,6 @@ using namespace CPlusPlus; using namespace CppTools; -using namespace Utils; class CppTools::CppRefactoringChangesData : public TextEditor::RefactoringChangesData { @@ -195,18 +194,18 @@ bool CppRefactoringFile::isCursorOn(const AST *ast) const return false; } -ChangeSet::Range CppRefactoringFile::range(unsigned tokenIndex) const +Utils::ChangeSet::Range CppRefactoringFile::range(unsigned tokenIndex) const { const Token &token = tokenAt(tokenIndex); unsigned line, column; cppDocument()->translationUnit()->getPosition(token.utf16charsBegin(), &line, &column); const int start = document()->findBlockByNumber(line - 1).position() + column - 1; - return ChangeSet::Range(start, start + token.utf16chars()); + return Utils::ChangeSet::Range(start, start + token.utf16chars()); } -ChangeSet::Range CppRefactoringFile::range(AST *ast) const +Utils::ChangeSet::Range CppRefactoringFile::range(AST *ast) const { - return ChangeSet::Range(startOf(ast), endOf(ast)); + return Utils::ChangeSet::Range(startOf(ast), endOf(ast)); } int CppRefactoringFile::startOf(unsigned index) const -- cgit v1.2.3