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 | |
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')
-rw-r--r-- | src/plugins/cpptools/cppcompletion_test.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cpptools/cppfilesettingspage.cpp | 3 | ||||
-rw-r--r-- | src/plugins/cpptools/cppfindreferences.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cpptools/cpplocatorfilter_test.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cpptools/cppmodelmanager_test.cpp | 10 | ||||
-rw-r--r-- | src/plugins/cpptools/cpppreprocessor.cpp | 3 | ||||
-rw-r--r-- | src/plugins/cpptools/cpptoolseditorsupport.cpp | 2 |
7 files changed, 10 insertions, 14 deletions
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index 9948577029..4248d9d431 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -91,7 +91,7 @@ public: ~CompletionTestCase() { - EditorManager::instance()->closeEditors(QList<IEditor*>() << editor, + EditorManager::closeEditors(QList<IEditor*>() << editor, /*askAboutModifiedEditors=*/ false); cmm->GC(); QVERIFY(cmm->snapshot().isEmpty()); diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 1c0c49904d..fcc5f28861 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -205,9 +205,8 @@ QString CppFileSettings::licenseTemplate(const QString &fileName, const QString return QString(); } - QTextCodec *codec = Core::EditorManager::instance()->defaultTextCodec(); QTextStream licenseStream(&file); - licenseStream.setCodec(codec); + licenseStream.setCodec(Core::EditorManager::defaultTextCodec()); licenseStream.setAutoDetectUnicode(true); QString license = licenseStream.readAll(); diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index 1a945a730c..bf566c60cf 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -61,7 +61,7 @@ static QString getSource(const QString &fileName, QString fileContents; Utils::TextFileFormat format; QString error; - QTextCodec *defaultCodec = Core::EditorManager::instance()->defaultTextCodec(); + QTextCodec *defaultCodec = Core::EditorManager::defaultTextCodec(); Utils::TextFileFormat::ReadResult result = Utils::TextFileFormat::readFile( fileName, defaultCodec, &fileContents, &format, &error); if (result != Utils::TextFileFormat::ReadSuccess) diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp index 9d2e9e8c7e..682b78cd5b 100644 --- a/src/plugins/cpptools/cpplocatorfilter_test.cpp +++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp @@ -125,7 +125,7 @@ private: virtual void doAfterLocatorRun() { - EditorManager::instance()->closeEditor(m_editor, /*askAboutModifiedEditors=*/ false); + EditorManager::closeEditor(m_editor, /*askAboutModifiedEditors=*/ false); QCoreApplication::processEvents(); QVERIFY(EditorManager::documentModel()->openedDocuments().isEmpty()); m_modelManager->GC(); 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()); } diff --git a/src/plugins/cpptools/cpppreprocessor.cpp b/src/plugins/cpptools/cpppreprocessor.cpp index 649d3d6bc9..417363db3c 100644 --- a/src/plugins/cpptools/cpppreprocessor.cpp +++ b/src/plugins/cpptools/cpppreprocessor.cpp @@ -171,9 +171,8 @@ void CppPreprocessor::getFileContents(const QString &absoluteFilePath, QFile file(absoluteFilePath); if (file.open(QFile::ReadOnly | QFile::Text)) { - QTextCodec *defaultCodec = Core::EditorManager::instance()->defaultTextCodec(); QTextStream stream(&file); - stream.setCodec(defaultCodec); + stream.setCodec(Core::EditorManager::defaultTextCodec()); if (contents) *contents = stream.readAll(); if (revision) diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index e99338bc4a..6bb8bfbc04 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -305,7 +305,7 @@ void CppEditorSupport::startHighlighting() // Start highlighting only if the editor is or would be visible // (in case another mode is active) in the edit mode. - if (!Core::EditorManager::instance()->visibleEditors().contains(m_textEditor)) + if (!Core::EditorManager::visibleEditors().contains(m_textEditor)) return; if (m_highlightingSupport->requiresSemanticInfo()) { |