summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppmodelmanager_test.cpp
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-09-12 01:08:28 +0200
committerhjk <hjk121@nokiamail.com>2014-09-26 08:50:00 +0200
commit1ba91e3040e9bebb2fc9f41bb786d365e28a6bee (patch)
treef84f740e6f14c408a9c17ee888fb36082d8ebff5 /src/plugins/cpptools/cppmodelmanager_test.cpp
parentd066e3ca143128d51e12edbcf04b74633326d914 (diff)
downloadqt-creator-1ba91e3040e9bebb2fc9f41bb786d365e28a6bee.tar.gz
ProjectExplorer: Apply static pattern to ProjectExplorerPlugin
Adjust caller sites and surroundings. Change-Id: I6c3c80e42f35eabedc1f89c8c42cca1025aca12f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
-rw-r--r--src/plugins/cpptools/cppmodelmanager_test.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp
index 1d30e04c0a..fccc9b5b86 100644
--- a/src/plugins/cpptools/cppmodelmanager_test.cpp
+++ b/src/plugins/cpptools/cppmodelmanager_test.cpp
@@ -117,15 +117,14 @@ public:
class ExampleProjectConfigurator
{
public:
- ExampleProjectConfigurator(const QString &projectFile,
- ProjectExplorerPlugin *projectExplorer)
+ ExampleProjectConfigurator(const QString &projectFile)
{
const QString projectUserFile = projectFile + _(".user");
QVERIFY(!QFileInfo(projectUserFile).exists());
// Open project
QString errorOpeningProject;
- m_project = projectExplorer->openProject(projectFile, &errorOpeningProject);
+ m_project = ProjectExplorerPlugin::openProject(projectFile, &errorOpeningProject);
QVERIFY(m_project);
QVERIFY(errorOpeningProject.isEmpty());
@@ -671,8 +670,7 @@ void CppToolsPlugin::test_modelmanager_extraeditorsupport_uiFiles()
const QString projectFile = testDataDirectory.file(_("testdata_guiproject1.pro"));
// Open project with *.ui file
- ProjectExplorerPlugin *pe = ProjectExplorerPlugin::instance();
- ExampleProjectConfigurator exampleProjectConfigurator(projectFile, pe);
+ ExampleProjectConfigurator exampleProjectConfigurator(projectFile);
Project *project = exampleProjectConfigurator.project();
// Check working copy.