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

1 files changed, 8 insertions, 10 deletions

diff --git a/src/ui/control.cpp b/src/ui/control.cpp
index 718ad3b..6dc92cd 100644
--- a/src/ui/control.cpp
+++ b/src/ui/control.cpp
@@ -18,25 +18,23 @@
 
 #include "ui/control.h"
 
+#include "app/app.h"
+
 
 namespace Ui {
 // Object's constructor.
 CControl::CControl()
 {
-    m_iMan = CInstanceManager::GetInstancePointer();
-
-    m_engine      = static_cast< Gfx::CEngine* > ( m_iMan->SearchInstance(CLASS_ENGINE) );
-    m_event       = static_cast< CEventQueue* > ( m_iMan->SearchInstance(CLASS_EVENT) );
-    m_main        = static_cast< CRobotMain* > ( m_iMan->SearchInstance(CLASS_MAIN) );
-    m_particle    = static_cast< Gfx::CParticle* > (m_iMan->SearchInstance(CLASS_PARTICULE));
-    m_sound       = static_cast< CSoundInterface* > (m_iMan->SearchInstance(CLASS_SOUND));
-    m_eventType    = EVENT_NULL;
+    m_event       = CApplication::GetInstancePointer()->GetEventQueue();
+    m_sound       = CApplication::GetInstancePointer()->GetSound();
+    m_engine      = Gfx::CEngine::GetInstancePointer();
+    m_main        = CRobotMain::GetInstancePointer();
+    m_particle    = m_engine->GetParticle();
+    m_eventType   = EVENT_NULL;
     m_state       = STATE_ENABLE|STATE_VISIBLE|STATE_GLINT;
     m_fontSize    = Gfx::FONT_SIZE_SMALL;
-//    m_fontStretch = Gfx::FONT_NORM_STRETCH; //there is font stretching no more master
     m_fontType    = Gfx::FONT_COLOBOT;
     m_textAlign   = Gfx::TEXT_ALIGN_CENTER; //instead m_justify
-//    m_justif      = 0;
     m_bFocus      = false;
     m_bCapture    = false;