Index: code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.cc
===================================================================
--- code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.cc	(revision 2029)
+++ 	(revision )
@@ -1,96 +1,0 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Benjamin Knecht
- *   Co-authors:
- *      ...
- *
- */
-#include "OrxonoxStableHeaders.h"
-#include "CameraHandler.h"
-
-#include <OgreViewport.h>
-
-#include "core/Core.h"
-#include "objects/worldentities/Camera.h"
-
-
-namespace orxonox
-{
-    CameraHandler* CameraHandler::singletonRef_s = 0;
-
-    CameraHandler::CameraHandler(Ogre::Viewport* viewport)
-        : viewport_(viewport)
-    {
-        assert(singletonRef_s == 0);
-        singletonRef_s = this;
-    }
-
-    CameraHandler::~CameraHandler()
-    {
-        assert(singletonRef_s != 0);
-        singletonRef_s = 0;
-    }
-
-    Camera* CameraHandler::getActiveCamera() const
-    {
-        if (this->cameraList_.size() > 0)
-            return this->cameraList_.front();
-        else
-            return 0;
-    }
-
-    void CameraHandler::requestFocus(Camera* camera)
-    {
-        if (!Core::showsGraphics())
-            return;
-
-        // notify old camera (if it exists)
-        if (this->cameraList_.size() > 0)
-            this->cameraList_.front()->removeFocus();
-
-        // add to list
-        this->cameraList_.push_front(camera);
-        camera->setFocus(this->viewport_);
-    }
-
-    void CameraHandler::releaseFocus(Camera* camera)
-    {
-        if (!Core::showsGraphics())
-            return;
-
-        // notify the cam of releasing the focus
-        if (this->cameraList_.front() == camera)
-        {
-            camera->removeFocus();
-            this->cameraList_.pop_front();
-
-            // set new focus if necessary
-            if (cameraList_.size() > 0)
-                cameraList_.front()->setFocus(this->viewport_);
-        }
-        else
-        {
-            this->cameraList_.remove(camera);
-        }
-    }
-}
Index: code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.h
===================================================================
--- code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.h	(revision 2029)
+++ 	(revision )
@@ -1,69 +1,0 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Benjamin Knecht
- *   Co-authors:
- *      ...
- *
- */
-
- /**
- @file  CameraHandler.h
- @brief Handles the instances of Camera class
- @author Benjamin Knecht <beni_at_orxonox.net>
-  */
-
-#ifndef _Camera_Handler_H__
-#define _Camera_Handler_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include <cassert>
-#include <list>
-#include <OgrePrerequisites.h>
-
-namespace orxonox
-{
-    class _OrxonoxExport CameraHandler
-    {
-        public:
-            CameraHandler(Ogre::Viewport* viewport);
-            ~CameraHandler();
-
-            Camera* getActiveCamera() const;
-
-            void requestFocus(Camera* camera);
-            void releaseFocus(Camera* camera);
-
-            static CameraHandler& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
-
-        private:
-            CameraHandler(const CameraHandler&);
-
-            std::list<Camera*> cameraList_;
-            Ogre::Viewport* viewport_;
-
-            static CameraHandler* singletonRef_s;
-    };
-}
-
-#endif /* _Camera_Handler_H__ */
Index: code/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.cc
===================================================================
--- code/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.cc	(revision 2029)
+++ code/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.cc	(revision 2030)
@@ -41,5 +41,5 @@
 #include "core/ConfigValueIncludes.h"
 #include "objects/Scene.h"
-#include "objects/CameraHandler.h"
+#include "CameraHandler.h"
 
 namespace orxonox
