From 001d37b257b126dd6ef1dced70f94ff3d2806d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dziwi=C5=84ski?= <piotr.dziwinski@nsn.com>
Date: Sat, 16 Feb 2013 22:37:43 +0100
Subject: CInstanceManager refactoring

 * removed classes managed by CInstanceManager
   except for CObject, CPyro, CBrain and CPhysics
   because of dependencies
 * refactored instance searching to use existing singleton instances of
   CApplication, CEngine and CRobotMain and calling their getter
   functions
---
 test/unit/ui/stubs/app_stub.cpp       | 14 +++++++++++++-
 test/unit/ui/stubs/engine_stub.cpp    | 16 ++++++++++++----
 test/unit/ui/stubs/particle_stub.cpp  |  2 +-
 test/unit/ui/stubs/robotmain_stub.cpp |  2 +-
 4 files changed, 27 insertions(+), 7 deletions(-)

(limited to 'test/unit/ui/stubs')

diff --git a/test/unit/ui/stubs/app_stub.cpp b/test/unit/ui/stubs/app_stub.cpp
index 70d9e82..094806f 100644
--- a/test/unit/ui/stubs/app_stub.cpp
+++ b/test/unit/ui/stubs/app_stub.cpp
@@ -1,7 +1,8 @@
 #include "app/app.h"
+
 #include "graphics/opengl/gldevice.h"
 
-template<> CApplication* CSingleton<CApplication>::mInstance = nullptr;
+template<> CApplication* CSingleton<CApplication>::m_instance = nullptr;
 
 namespace Gfx {
 
@@ -10,6 +11,8 @@ GLDeviceConfig::GLDeviceConfig()
 }
 
 } /* Gfx */ 
+
+
 CApplication::CApplication()
 {
 }
@@ -23,4 +26,13 @@ std::string CApplication::GetDataFilePath(DataDir /* dataDir */, const std::stri
     return subpath;
 }
 
+CSoundInterface* CApplication::GetSound()
+{
+    return nullptr;
+}
+
+CEventQueue* CApplication::GetEventQueue()
+{
+    return nullptr;
+}
 
diff --git a/test/unit/ui/stubs/engine_stub.cpp b/test/unit/ui/stubs/engine_stub.cpp
index de7bbe7..40886da 100644
--- a/test/unit/ui/stubs/engine_stub.cpp
+++ b/test/unit/ui/stubs/engine_stub.cpp
@@ -1,20 +1,28 @@
 #include "graphics/engine/engine.h"
 #include "graphics/engine/text.h"
+
 #include "mocks/text_mock.h"
 
+template<> Gfx::CEngine* CSingleton<Gfx::CEngine>::m_instance = nullptr;
+
 namespace Gfx {
 
-CEngine::CEngine(CInstanceManager* iMan, CApplication* app) :
-    m_iMan(iMan), m_app(app)
+CEngine::CEngine(CApplication* app) :
+    m_app(app)
 {
-    m_text = new CTextMock(m_iMan, this);
+    m_text = new CTextMock(this);
     m_text->Create();
 }
 
 CEngine::~CEngine()
 {
     delete m_text;
-    m_text = NULL;
+    m_text = nullptr;
+}
+
+CParticle* CEngine::GetParticle()
+{
+    return nullptr;
 }
 
 Math::Point CEngine::WindowToInterfaceSize(Math::IntPoint size)
diff --git a/test/unit/ui/stubs/particle_stub.cpp b/test/unit/ui/stubs/particle_stub.cpp
index c3bf6dc..34cf973 100644
--- a/test/unit/ui/stubs/particle_stub.cpp
+++ b/test/unit/ui/stubs/particle_stub.cpp
@@ -7,7 +7,7 @@
 namespace Gfx {
 
 
-CParticle::CParticle(CInstanceManager* /*iMan*/, CEngine* /*engine*/)
+CParticle::CParticle(CEngine* /*engine*/)
 {
 }
 
diff --git a/test/unit/ui/stubs/robotmain_stub.cpp b/test/unit/ui/stubs/robotmain_stub.cpp
index a36b1a1..c332d5a 100644
--- a/test/unit/ui/stubs/robotmain_stub.cpp
+++ b/test/unit/ui/stubs/robotmain_stub.cpp
@@ -1,7 +1,7 @@
 #include "object/robotmain.h"
 
 
-template<> CRobotMain* CSingleton<CRobotMain>::mInstance = nullptr;
+template<> CRobotMain* CSingleton<CRobotMain>::m_instance = nullptr;
 
 bool CRobotMain::GetGlint()
 {
-- 
cgit v1.2.3-1-g7c22