From aadb6f16af94a2baff9d13772e9ddce33faa7650 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 5 Sep 2013 11:46:07 +0200 Subject: SessionManager: Apply 'static' pattern Change-Id: I370f72fcf7a24216ee189979ce6b5c8bfc5f4140 Reviewed-by: David Schulz --- src/plugins/cpptools/cppmodelmanager_test.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp') diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index bdcbf25419..8ffd9a9339 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -49,12 +49,12 @@ #endif using namespace CppTools::Internal; +using namespace ProjectExplorer; typedef CPlusPlus::Document Document; typedef CppTools::CppModelManagerInterface::ProjectInfo ProjectInfo; typedef CppTools::ProjectPart ProjectPart; typedef CppTools::ProjectFile ProjectFile; -typedef ProjectExplorer::Project Project; Q_DECLARE_METATYPE(QList) @@ -119,7 +119,7 @@ class ExampleProjectConfigurator { public: ExampleProjectConfigurator(const QString &projectFile, - ProjectExplorer::ProjectExplorerPlugin *projectExplorer) + ProjectExplorerPlugin *projectExplorer) { const QString projectUserFile = projectFile + QLatin1String(".user"); QVERIFY(!QFileInfo(projectUserFile).exists()); @@ -142,13 +142,13 @@ public: QVERIFY(QFile::remove(m_fileToRemove)); } - ProjectExplorer::Project *project() const + Project *project() const { return m_project; } private: - ProjectExplorer::Project *m_project; + Project *m_project; QString m_fileToRemove; }; @@ -661,7 +661,7 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles() const QString projectFile = testDataDirectory.file(QLatin1String("testdata_guiproject1.pro")); // Open project with *.ui file - ProjectExplorer::ProjectExplorerPlugin *pe = ProjectExplorer::ProjectExplorerPlugin::instance(); + ProjectExplorerPlugin *pe = ProjectExplorerPlugin::instance(); ExampleProjectConfigurator exampleProjectConfigurator(projectFile, pe); Project *project = exampleProjectConfigurator.project(); @@ -698,8 +698,7 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles() QCOMPARE(QFileInfo(includedFiles.at(1)).fileName(), QLatin1String("ui_mainwindow.h")); // Close Project - ProjectExplorer::SessionManager *sm = pe->session(); - sm->removeProject(project); + SessionManager::removeProject(project); helper.waitForFinishedGc(); } -- cgit v1.2.1