diff options
| author | hjk <hjk121@nokiamail.com> | 2013-08-29 15:46:04 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-08-30 11:22:56 +0200 |
| commit | 4a24df38a3a164c51f9cdddd566c9928a7482a0a (patch) | |
| tree | 0017d4109b5437e0da0c0e423c888a2cb7dd8dca /src/plugins/cpptools/cppmodelmanager_test.cpp | |
| parent | e1823072a1094e9aba2781aec963fc2d2e56169f (diff) | |
| download | qt-creator-4a24df38a3a164c51f9cdddd566c9928a7482a0a.tar.gz | |
EditorManager: Use static pattern, adjust surrounding code
Change-Id: I3255a0150cd9a730336456c5a9f986eb74fefbff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager_test.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 3490909312..bdcbf25419 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -712,12 +712,11 @@ void CppToolsPlugin::test_modelmanager_gc_if_last_cppeditor_closed() MyTestDataDir testDataDirectory(QLatin1String("testdata_guiproject1")); const QString file = testDataDirectory.file(QLatin1String("main.cpp")); - Core::EditorManager *em = Core::EditorManager::instance(); CppModelManager *mm = CppModelManager::instance(); // Open a file in the editor QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 0); - Core::IEditor *editor = em->openEditor(file); + Core::IEditor *editor = Core::EditorManager::openEditor(file); QVERIFY(editor); QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 1); QVERIFY(mm->isCppEditor(editor)); @@ -727,7 +726,7 @@ void CppToolsPlugin::test_modelmanager_gc_if_last_cppeditor_closed() QVERIFY(mm->snapshot().contains(file)); // Close file/editor - em->closeEditor(editor, /*askAboutModifiedEditors=*/ false); + Core::EditorManager::closeEditor(editor, /*askAboutModifiedEditors=*/ false); helper.waitForFinishedGc(); // Check: File is removed from the snapshpt @@ -743,12 +742,11 @@ void CppToolsPlugin::test_modelmanager_dont_gc_opened_files() MyTestDataDir testDataDirectory(QLatin1String("testdata_guiproject1")); const QString file = testDataDirectory.file(QLatin1String("main.cpp")); - Core::EditorManager *em = Core::EditorManager::instance(); CppModelManager *mm = CppModelManager::instance(); // Open a file in the editor QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 0); - Core::IEditor *editor = em->openEditor(file); + Core::IEditor *editor = Core::EditorManager::openEditor(file); QVERIFY(editor); QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 1); QVERIFY(mm->isCppEditor(editor)); @@ -765,7 +763,7 @@ void CppToolsPlugin::test_modelmanager_dont_gc_opened_files() QVERIFY(mm->snapshot().contains(file)); // Close editor - em->closeEditors(QList<Core::IEditor*>() << editor); + Core::EditorManager::closeEditors(QList<Core::IEditor*>() << editor); helper.waitForFinishedGc(); QVERIFY(mm->snapshot().isEmpty()); } |