diff options
-rw-r--r-- | src/plugins/cppeditor/cppfunctiondecldeflink.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppquickfixes.cpp | 7 | ||||
-rw-r--r-- | src/plugins/cpptools/cpppointerdeclarationformatter.cpp | 6 | ||||
-rw-r--r-- | src/plugins/cpptools/cpppointerdeclarationformatter.h | 7 | ||||
-rw-r--r-- | src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp | 6 | ||||
-rw-r--r-- | src/plugins/cpptools/cpprefactoringchanges.cpp | 9 | ||||
-rw-r--r-- | src/plugins/texteditor/basetexteditor.h | 1 | ||||
-rw-r--r-- | tests/auto/changeset/tst_changeset.cpp | 108 |
8 files changed, 70 insertions, 76 deletions
diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index e70cec8213..9fa4bc030a 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp @@ -298,7 +298,7 @@ void FunctionDeclDefLink::apply(CPPEditorWidget *editor, bool jumpToMatch) const int targetStart = newTargetFile->position(targetLine, targetColumn); const int targetEnd = targetStart + targetInitial.size(); if (targetInitial == newTargetFile->textOf(targetStart, targetEnd)) { - const ChangeSet changeset = changes(snapshot, targetStart); + const Utils::ChangeSet changeset = changes(snapshot, targetStart); newTargetFile->setChangeSet(changeset); if (jumpToMatch) { const int jumpTarget = newTargetFile->position(targetFunction->line(), targetFunction->column()); diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 0cc5aefda7..f7dc95f81c 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -71,6 +71,7 @@ using namespace CppEditor; using namespace CppEditor::Internal; using namespace CppTools; using namespace TextEditor; +using Utils::ChangeSet; void CppEditor::Internal::registerQuickFixes(ExtensionSystem::IPlugin *plugIn) { @@ -4216,7 +4217,7 @@ public: toFile->apply(); // remove definition from fromFile - Utils::ChangeSet headerTarget; + ChangeSet headerTarget; if (m_type == MoveOutsideMemberToCppFile) { headerTarget.remove(fromFile->range(m_funcDef)); } else { @@ -4330,7 +4331,7 @@ public: fromFile->endOf(m_funcAST->function_body)); // Replace declaration with function and delete old definition - Utils::ChangeSet toTarget; + ChangeSet toTarget; toTarget.replace(m_toRange, wholeFunctionText); if (m_toFileName == m_fromFileName) toTarget.remove(fromRange); @@ -4339,7 +4340,7 @@ public: toFile->setOpenEditor(true, m_toRange.start); toFile->apply(); if (m_toFileName != m_fromFileName) { - Utils::ChangeSet fromTarget; + ChangeSet fromTarget; fromTarget.remove(fromRange); fromFile->setChangeSet(fromTarget); fromFile->apply(); diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter.cpp index ed5dd40266..2c2aae2380 100644 --- a/src/plugins/cpptools/cpppointerdeclarationformatter.cpp +++ b/src/plugins/cpptools/cpppointerdeclarationformatter.cpp @@ -382,8 +382,8 @@ void PointerDeclarationFormatter::checkAndRewrite(DeclaratorAST *declarator, for (unsigned token = tokenRange.start; token <= tokenRange.end; ++token) CHECK_R(!tokenAt(token).expanded(), "Token is expanded"); - Range range(m_cppRefactoringFile->startOf(tokenRange.start), - m_cppRefactoringFile->endOf(tokenRange.end)); + Utils::ChangeSet::Range range(m_cppRefactoringFile->startOf(tokenRange.start), + m_cppRefactoringFile->endOf(tokenRange.end)); CHECK_R(range.start >= 0 && range.end > 0, "ChangeRange invalid1"); CHECK_R(range.start < range.end, "ChangeRange invalid2"); @@ -446,7 +446,7 @@ void PointerDeclarationFormatter::checkAndRewrite(DeclaratorAST *declarator, // original source. It tries to create an replacement operation // at this position and fails due to overlapping ranges (the // simple declaration range includes parameter declaration range). - ChangeSet change(m_changeSet); + Utils::ChangeSet change(m_changeSet); if (change.replace(range, rewrittenDeclaration)) m_changeSet = change; else if (DEBUG_OUTPUT) diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter.h b/src/plugins/cpptools/cpppointerdeclarationformatter.h index 4fc15b659c..02b5d5c83c 100644 --- a/src/plugins/cpptools/cpppointerdeclarationformatter.h +++ b/src/plugins/cpptools/cpppointerdeclarationformatter.h @@ -39,9 +39,6 @@ namespace CppTools { using namespace CPlusPlus; using namespace CppTools; -using Utils::ChangeSet; - -typedef Utils::ChangeSet::Range Range; /*! \class CppTools::PointerDeclarationFormatter @@ -85,7 +82,7 @@ public: Returns a ChangeSet for applying the formatting changes. The ChangeSet is empty if it was not possible to rewrite anything. */ - ChangeSet format(AST *ast) + Utils::ChangeSet format(AST *ast) { if (ast) accept(ast); @@ -119,7 +116,7 @@ private: Overview &m_overview; const CursorHandling m_cursorHandling; - ChangeSet m_changeSet; + Utils::ChangeSet m_changeSet; }; } // namespace CppTools diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp index 469173a27a..65f2c8468a 100644 --- a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp +++ b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp @@ -48,14 +48,10 @@ using namespace CPlusPlus; using namespace CppTools; using namespace CppTools::Internal; -using Utils::ChangeSet; - Q_DECLARE_METATYPE(Overview) namespace { -typedef Utils::ChangeSet::Range Range; - QString stripCursor(const QString &source) { QString copy(source); @@ -127,7 +123,7 @@ public: // Run the formatter PointerDeclarationFormatter formatter(cppRefactoringFile, overview, cursorHandling); - ChangeSet change = formatter.format(ast); // ChangeSet may be empty. + Utils::ChangeSet change = formatter.format(ast); // ChangeSet may be empty. // Apply change QTextCursor changeCursor(textDocument); 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 diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index 09838f7d38..5d37e0c3b8 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -48,7 +48,6 @@ QT_END_NAMESPACE namespace Utils { class LineColumnLabel; - class ChangeSet; } namespace TextEditor { diff --git a/tests/auto/changeset/tst_changeset.cpp b/tests/auto/changeset/tst_changeset.cpp index 753b95239e..bab9ad5347 100644 --- a/tests/auto/changeset/tst_changeset.cpp +++ b/tests/auto/changeset/tst_changeset.cpp @@ -33,6 +33,8 @@ //TESTED_COMPONENT=src/utils/changeset +using Utils::ChangeSet; + class tst_ChangeSet : public QObject { Q_OBJECT @@ -53,35 +55,35 @@ private slots: void tst_ChangeSet::singleReplace() { { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.replace(0, 2, "ghi")); cs.apply(&test); QCOMPARE(test, QLatin1String("ghicdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.replace(4, 6, "ghi")); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdghi")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.replace(3, 3, "ghi")); cs.apply(&test); QCOMPARE(test, QLatin1String("abcghidef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.replace(0, 6, "")); cs.apply(&test); QCOMPARE(test, QLatin1String("")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.replace(3, 13, "ghi")); cs.apply(&test); @@ -92,35 +94,35 @@ void tst_ChangeSet::singleReplace() void tst_ChangeSet::singleMove() { { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.move(0, 2, 4)); cs.apply(&test); QCOMPARE(test, QLatin1String("cdabef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.move(4, 6, 0)); cs.apply(&test); QCOMPARE(test, QLatin1String("efabcd")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.move(3, 13, 0)); cs.apply(&test); QCOMPARE(test, QLatin1String("defabc")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.move(3, 3, 0)); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.move(0, 1, 10)); cs.apply(&test); @@ -132,28 +134,28 @@ void tst_ChangeSet::singleMove() void tst_ChangeSet::singleInsert() { { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.insert(0, "ghi")); cs.apply(&test); QCOMPARE(test, QLatin1String("ghiabcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.insert(6, "ghi")); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdefghi")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.insert(3, "")); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.insert(7, "g")); cs.apply(&test); @@ -165,35 +167,35 @@ void tst_ChangeSet::singleInsert() void tst_ChangeSet::singleRemove() { { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.remove(0, 1)); cs.apply(&test); QCOMPARE(test, QLatin1String("bcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.remove(3, 6)); cs.apply(&test); QCOMPARE(test, QLatin1String("abc")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.remove(4, 14)); cs.apply(&test); QCOMPARE(test, QLatin1String("abcd")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.remove(2, 2)); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.remove(7, 8)); cs.apply(&test); @@ -204,42 +206,42 @@ void tst_ChangeSet::singleRemove() void tst_ChangeSet::singleFlip() { { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.flip(0, 2, 3, 6)); cs.apply(&test); QCOMPARE(test, QLatin1String("defcab")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.flip(1, 3, 3, 4)); cs.apply(&test); QCOMPARE(test, QLatin1String("adbcef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.flip(3, 3, 4, 4)); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.flip(3, 3, 4, 5)); cs.apply(&test); QCOMPARE(test, QLatin1String("abcedf")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.flip(0, 6, 6, 12)); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.flip(0, 6, 7, 10)); cs.apply(&test); @@ -247,29 +249,29 @@ void tst_ChangeSet::singleFlip() QCOMPARE(test, QLatin1String("")); } { - Utils::ChangeSet cs; + ChangeSet cs; QCOMPARE(cs.flip(0, 3, 1, 4), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QCOMPARE(cs.flip(0, 3, 2, 5), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.flip(0, 3, 0, 0)); QString test("abcdef"); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.flip(0, 0, 0, 3)); QString test("abcdef"); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.flip(0, 3, 3, 3)); QString test("abcdef"); cs.apply(&test); @@ -280,35 +282,35 @@ void tst_ChangeSet::singleFlip() void tst_ChangeSet::singleCopy() { { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.copy(0, 2, 4)); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdabef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.copy(1, 3, 3)); cs.apply(&test); QCOMPARE(test, QLatin1String("abcbcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.copy(3, 3, 4)); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.copy(0, 6, 6)); cs.apply(&test); QCOMPARE(test, QLatin1String("abcdefabcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QString test("abcdef"); QVERIFY(cs.copy(0, 6, 7)); cs.apply(&test); @@ -316,22 +318,22 @@ void tst_ChangeSet::singleCopy() QCOMPARE(test, QLatin1String("abcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QCOMPARE(cs.copy(0, 3, 1), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QCOMPARE(cs.copy(0, 3, 2), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.copy(0, 3, 0)); QString test("abcdef"); cs.apply(&test); QCOMPARE(test, QLatin1String("abcabcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.copy(0, 3, 3)); QString test("abcdef"); cs.apply(&test); @@ -342,7 +344,7 @@ void tst_ChangeSet::singleCopy() void tst_ChangeSet::doubleInsert() { { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.insert(1, "01")); QVERIFY(cs.insert(1, "234")); QString test("abcdef"); @@ -350,7 +352,7 @@ void tst_ChangeSet::doubleInsert() QCOMPARE(test, QLatin1String("a01234bcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.insert(1, "234")); QVERIFY(cs.insert(1, "01")); QString test("abcdef"); @@ -358,7 +360,7 @@ void tst_ChangeSet::doubleInsert() QCOMPARE(test, QLatin1String("a23401bcdef")); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.insert(1, "01")); QVERIFY(cs.remove(1, 2)); QVERIFY(cs.insert(2, "234")); @@ -371,48 +373,48 @@ void tst_ChangeSet::doubleInsert() void tst_ChangeSet::conflicts() { { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.move(1, 4, 5)); QCOMPARE(cs.replace(0, 2, "abc"), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.move(1, 4, 5)); QCOMPARE(cs.replace(1, 4, "abc"), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.move(1, 4, 5)); QCOMPARE(cs.replace(1, 2, "abc"), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.move(1, 4, 5)); QCOMPARE(cs.replace(2, 2, "abc"), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.move(1, 4, 5)); QCOMPARE(cs.replace(2, 3, "abc"), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.move(1, 4, 5)); QCOMPARE(cs.replace(3, 3, "abc"), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.move(1, 4, 5)); QCOMPARE(cs.replace(3, 4, "abc"), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.move(1, 4, 5)); QCOMPARE(cs.replace(4, 6, "abc"), false); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.move(1, 4, 5)); QVERIFY(cs.replace(0, 1, "bla")); QString test("abcdef"); @@ -420,7 +422,7 @@ void tst_ChangeSet::conflicts() QCOMPARE(test, QLatin1String("blaebcdf")); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.move(1, 4, 5)); QVERIFY(cs.replace(4, 5, "bla")); QString test("abcdef"); @@ -428,7 +430,7 @@ void tst_ChangeSet::conflicts() QCOMPARE(test, QLatin1String("ablabcdf")); } { - Utils::ChangeSet cs; + ChangeSet cs; QVERIFY(cs.move(1, 4, 5)); QVERIFY(cs.replace(5, 6, "bla")); QString test("abcdef"); |