summaryrefslogtreecommitdiffstats
path: root/test/unit/ui/edit_test.cpp
diff options
context:
space:
mode:
authorPiotr Dziwiński <piotr.dziwinski@nsn.com>2013-02-16 22:37:43 +0100
committerPiotr Dziwiński <piotr.dziwinski@nsn.com>2013-02-17 12:11:56 +0100
commit001d37b257b126dd6ef1dced70f94ff3d2806d28 (patch)
tree1025979c635c899f196d606f7d74170e33ef4f3a /test/unit/ui/edit_test.cpp
parent45040318b026f8864d244e39f1703685ad688470 (diff)
downloadcolobot-001d37b257b126dd6ef1dced70f94ff3d2806d28.tar.gz
colobot-001d37b257b126dd6ef1dced70f94ff3d2806d28.tar.bz2
colobot-001d37b257b126dd6ef1dced70f94ff3d2806d28.zip
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
Diffstat (limited to 'test/unit/ui/edit_test.cpp')
-rw-r--r--test/unit/ui/edit_test.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/test/unit/ui/edit_test.cpp b/test/unit/ui/edit_test.cpp
index f878f4b..2f31a89 100644
--- a/test/unit/ui/edit_test.cpp
+++ b/test/unit/ui/edit_test.cpp
@@ -13,19 +13,17 @@ public:
virtual void SetUp()
{
- m_engine = new Gfx::CEngine(&m_iMan, NULL);
+ m_engine = new Gfx::CEngine(nullptr);
- m_iMan.AddInstance(CLASS_ENGINE, m_engine);
m_edit = new Ui::CEdit;
}
virtual void TearDown()
{
- m_iMan.DeleteInstance(CLASS_ENGINE, m_engine);
delete m_engine;
- m_engine = NULL;
+ m_engine = nullptr;
delete m_edit;
- m_edit = NULL;
+ m_edit = nullptr;
}
virtual ~CEditTest()
@@ -34,7 +32,6 @@ public:
};
protected:
- CInstanceManager m_iMan;
CApplication m_app;
Gfx::CEngine * m_engine;
Ui::CEdit * m_edit;