From 7b67701dea2aa6ff046bcffdbec70f7fd941599e Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 27 Aug 2014 11:19:04 +0200 Subject: TextEditor: Fix failure in cpptools autotest The issue only appeared in the test due to the different editor construction there. Now use the same factory access. Change-Id: I3a8534fbe683bb88f04ad68850cecdfe32b11433 Reviewed-by: Christian Stenger --- .../cpptools/cpppointerdeclarationformatter_test.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp') diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp index 8877b1c41f..767192982b 100644 --- a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp +++ b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp @@ -35,6 +35,7 @@ #include #include +#include #include @@ -102,23 +103,20 @@ public: QVERIFY(ast); // Open file - TextEditor::BaseTextDocumentPtr textDocument(new TextEditor::BaseTextDocument); - textDocument->setId(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID); - TextEditor::BaseTextEditorWidget editorWidget(0); - editorWidget.setTextDocument(textDocument); - editorWidget.setupAsPlainEditor(); + TextEditor::BaseTextEditor *editor = TextEditor::PlainTextEditorFactory::createPlainTextEditor(); + TextEditor::BaseTextEditorWidget *editorWidget = editor->editorWidget(); QString error; - editorWidget.open(&error, document->fileName(), document->fileName()); + editor->open(&error, document->fileName(), document->fileName()); QVERIFY(error.isEmpty()); // Set cursor position - QTextCursor cursor = editorWidget.textCursor(); + QTextCursor cursor = editorWidget->textCursor(); cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::MoveAnchor, cursorPosition); - editorWidget.setTextCursor(cursor); + editorWidget->setTextCursor(cursor); - QTextDocument *qtextDocument = editorWidget.document(); + QTextDocument *qtextDocument = editorWidget->document(); CppRefactoringFilePtr cppRefactoringFile - = CppRefactoringChanges::file(&editorWidget, document); + = CppRefactoringChanges::file(editorWidget, document); // Prepare for formatting Overview overview; -- cgit v1.2.1