diff options
| author | hjk <hjk121@nokiamail.com> | 2014-05-07 16:25:04 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-05-13 11:48:30 +0200 |
| commit | 6e584b5b4953b996ef07c4625adf178c59de24f7 (patch) | |
| tree | 2af702c76bf5323c331154b553aacbe5523592f5 /src/plugins/cpptools/cppmodelmanager_test.cpp | |
| parent | 226c1abc89888fa2f272d92c466725fd6dad65db (diff) | |
| download | qt-creator-6e584b5b4953b996ef07c4625adf178c59de24f7.tar.gz | |
DocumentModel: Make interface static
Move item model implementation to private, adjust user code.
Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager_test.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 7f2b7765c8..04f6651095 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -710,10 +710,10 @@ void CppToolsPlugin::test_modelmanager_gc_if_last_cppeditor_closed() helper.resetRefreshedSourceFiles(); // Open a file in the editor - QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 0); + QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); Core::IEditor *editor = Core::EditorManager::openEditor(file); QVERIFY(editor); - QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 1); + QCOMPARE(Core::DocumentModel::openedDocuments().size(), 1); QVERIFY(mm->isCppEditor(editor)); QVERIFY(mm->workingCopy().contains(file)); @@ -741,10 +741,10 @@ void CppToolsPlugin::test_modelmanager_dont_gc_opened_files() helper.resetRefreshedSourceFiles(); // Open a file in the editor - QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 0); + QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); Core::IEditor *editor = Core::EditorManager::openEditor(file); QVERIFY(editor); - QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 1); + QCOMPARE(Core::DocumentModel::openedDocuments().size(), 1); QVERIFY(mm->isCppEditor(editor)); // Wait until the file is refreshed and check whether it is in the working copy @@ -832,7 +832,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project() QCOMPARE(mm->snapshot().size(), 4); // Open a file in the editor - QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 0); + QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); struct Data { QString firstDeclarationName; @@ -849,7 +849,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project() Core::IEditor *editor = Core::EditorManager::openEditor(fileName); EditorCloser closer(editor); QVERIFY(editor); - QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 1); + QCOMPARE(Core::DocumentModel::openedDocuments().size(), 1); QVERIFY(mm->isCppEditor(editor)); CppEditorSupport *sup = mm->cppEditorSupport( @@ -903,7 +903,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project_pch() QCOMPARE(mm->snapshot().size(), 4); // Open a file in the editor - QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 0); + QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); struct Data { QString firstDeclarationName; @@ -920,7 +920,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_project_pch() Core::IEditor *editor = Core::EditorManager::openEditor(fileName); EditorCloser closer(editor); QVERIFY(editor); - QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 1); + QCOMPARE(Core::DocumentModel::openedDocuments().size(), 1); QVERIFY(mm->isCppEditor(editor)); CppEditorSupport *sup = mm->cppEditorSupport( @@ -972,7 +972,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_editor() QCOMPARE(mm->snapshot().size(), 4); // Open a file in the editor - QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 0); + QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); struct Data { QString editorDefines; @@ -989,7 +989,7 @@ void CppToolsPlugin::test_modelmanager_defines_per_editor() Core::IEditor *editor = Core::EditorManager::openEditor(main1File); EditorCloser closer(editor); QVERIFY(editor); - QCOMPARE(Core::EditorManager::documentModel()->openedDocuments().size(), 1); + QCOMPARE(Core::DocumentModel::openedDocuments().size(), 1); QVERIFY(mm->isCppEditor(editor)); CppEditorSupport *sup = mm->cppEditorSupport( |