Changes: Made MComponentData a "real" Singleton

RevBy: Stanislav Ionascu, Michael Hasselmann, Tomas Junnonen
Merge-Request: 824

4 files changed, 4 insertions, 4 deletions

diff --git a/tests/ut_mapplicationwindow/ut_mapplicationwindow.cpp b/tests/ut_mapplicationwindow/ut_mapplicationwindow.cpp
index c07596e1..6017c155 100644
--- a/tests/ut_mapplicationwindow/ut_mapplicationwindow.cpp
+++ b/tests/ut_mapplicationwindow/ut_mapplicationwindow.cpp
@@ -48,7 +48,7 @@ void Ut_MApplicationWindow::initTestCase()
         static char *argv[ 2 ];
         argv[ 0 ] = (char*)"./ut_mscenewindow";
         argv[ 1 ] = (char*)"-local-theme";
-        m_componentData = new MComponentData(argc, argv);
+        m_componentData = MComponentData::createInstance(argc, argv);
     }
     qRegisterMetaType<MApplicationPage *>("MApplicationPage*");
     qRegisterMetaType< QList<StatusBarTestOperation> >("QList<StatusBarTestOperation>");
diff --git a/tests/ut_mscenemanager/ut_mscenemanager.cpp b/tests/ut_mscenemanager/ut_mscenemanager.cpp
index d00a369a..4e32d939 100644
--- a/tests/ut_mscenemanager/ut_mscenemanager.cpp
+++ b/tests/ut_mscenemanager/ut_mscenemanager.cpp
@@ -87,7 +87,7 @@ void Ut_MSceneManager::initTestCase()
         static int argc = 1;
         static char *argv[ 1 ];
         argv[ 0 ] = (char*)"./ut_mwindow";
-        m_componentData = new MComponentData(argc, argv);
+        m_componentData = MComponentData::createInstance(argc, argv);
     }
     qRegisterMetaType<M::Orientation>("M::Orientation");
     qRegisterMetaType<M::Orientation>("M::OrientationAngle");
diff --git a/tests/ut_mscenewindow/ut_mscenewindow.cpp b/tests/ut_mscenewindow/ut_mscenewindow.cpp
index b60916a9..4b3278ea 100644
--- a/tests/ut_mscenewindow/ut_mscenewindow.cpp
+++ b/tests/ut_mscenewindow/ut_mscenewindow.cpp
@@ -63,7 +63,7 @@ void Ut_MSceneWindow::initTestCase()
         static int argc = 1;
         static char *argv[ 1 ];
         argv[ 0 ] = (char*)"./ut_mwindow";
-        m_componentData = new MComponentData(argc, argv);
+        m_componentData = MComponentData::createInstance(argc, argv);
     }
     window = new MWindow(new MSceneManager);
 
diff --git a/tests/ut_mwindow/ut_mwindow.cpp b/tests/ut_mwindow/ut_mwindow.cpp
index 41464cf7..ba2a7cc1 100644
--- a/tests/ut_mwindow/ut_mwindow.cpp
+++ b/tests/ut_mwindow/ut_mwindow.cpp
@@ -60,7 +60,7 @@ void Ut_MWindow::init()
         static int argc = 1;
         static char *argv[ 1 ];
         argv[ 0 ] = (char*)"./ut_mwindow";
-        m_componentData = new MComponentData(argc, argv);
+        m_componentData = MComponentData::createInstance(argc, argv);
     }
     win = new MWindow;
 }