diff options
| author | Timo Lotterbach <timo.lotterbach@bmw-carit.de> | 2012-10-24 02:55:23 -0700 |
|---|---|---|
| committer | Michael Schuldt <michael.schuldt@bmw.de> | 2012-10-26 09:14:02 +0300 |
| commit | 64ada06faae2b58c3df269ab5071d780931ddf3e (patch) | |
| tree | 52749adcce148cd2dbe5454f7eabb8b47142d064 | |
| parent | ffb4fe251e375c4556d583d04fdb0428a5c3a3b8 (diff) | |
| download | layer_management-64ada06faae2b58c3df269ab5071d780931ddf3e.tar.gz | |
LayerManagerService: removed cyclic header inclusion
LayerManager.h included Scene.h
Scene.h included LayerManager.h
LayerManager now just forwards class Scene.
| -rw-r--r-- | LayerManagerService/include/Layermanager.h | 2 | ||||
| -rw-r--r-- | LayerManagerService/src/Layermanager.cpp | 1 | ||||
| -rw-r--r-- | LayerManagerService/src/Scene.cpp | 5 | ||||
| -rw-r--r-- | LayerManagerService/src/main.cpp | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/LayerManagerService/include/Layermanager.h b/LayerManagerService/include/Layermanager.h index ce36f46..ddc864e 100644 --- a/LayerManagerService/include/Layermanager.h +++ b/LayerManagerService/include/Layermanager.h @@ -22,10 +22,10 @@ #include "ICommandExecutor.h" #include "NotificationQueue.h" -#include "Scene.h" typedef std::map<unsigned int, const char*> PidToProcessNameTable; +class Scene; class ICommand; class IRenderer; class ICommunicator; diff --git a/LayerManagerService/src/Layermanager.cpp b/LayerManagerService/src/Layermanager.cpp index 13efcc5..0cf8506 100644 --- a/LayerManagerService/src/Layermanager.cpp +++ b/LayerManagerService/src/Layermanager.cpp @@ -25,6 +25,7 @@ #include "ICommunicator.h" #include "IRenderer.h" #include "ISceneProvider.h" +#include "Scene.h" static const char* NO_SENDER_NAME = "unknown"; diff --git a/LayerManagerService/src/Scene.cpp b/LayerManagerService/src/Scene.cpp index 80f2edc..7d11d4c 100644 --- a/LayerManagerService/src/Scene.cpp +++ b/LayerManagerService/src/Scene.cpp @@ -22,8 +22,11 @@ #include "Log.h" #include "Layer.h" -#include "GraphicalGroup.h" +#include "Surface.h" +#include "LayerGroup.h" +#include "SurfaceGroup.h" #include "Shader.h" +#include "Scene.h" Scene::Scene() { diff --git a/LayerManagerService/src/main.cpp b/LayerManagerService/src/main.cpp index bd8f72f..fe76ca3 100644 --- a/LayerManagerService/src/main.cpp +++ b/LayerManagerService/src/main.cpp @@ -23,6 +23,7 @@ #include "ICommunicator.h" #include "ISceneProvider.h" #include "ICommandExecutor.h" +#include "Scene.h" #include <iostream> #include <sys/types.h> #include <dirent.h> |