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 <nikolai.kosjar@digia.com>
This commit is contained in:
Orgad Shaneh
2014-05-29 23:12:04 +03:00
committed by Orgad Shaneh
parent c5012f258c
commit 04e8b332bb
8 changed files with 70 additions and 76 deletions

View File

@@ -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