diff options
| author | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-23 23:46:30 +0100 |
|---|---|---|
| committer | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-23 23:46:30 +0100 |
| commit | e41dcda98ca49f1c21f89c5a8ad8ce4a95c40641 (patch) | |
| tree | 5b95562eb53ceed8f2e4ebc101cfda2361f116ea /engine/include/flatcomponent.h | |
| parent | Merge remote-tracking branch 'nao/master' (diff) | |
| download | flatland-e41dcda98ca49f1c21f89c5a8ad8ce4a95c40641.tar.gz flatland-e41dcda98ca49f1c21f89c5a8ad8ce4a95c40641.zip | |
Fixes on signals
Diffstat (limited to '')
| -rw-r--r-- | engine/include/flatcomponent.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/engine/include/flatcomponent.h b/engine/include/flatcomponent.h index 881e34f..4ad99c8 100644 --- a/engine/include/flatcomponent.h +++ b/engine/include/flatcomponent.h @@ -5,24 +5,28 @@ #include "core/labelled.hpp" #include <string> -class Component : virtual public flat::core::object, virtual public flat::core::labelled +namespace flat { + +class component : virtual public core::object, virtual public core::labelled { - Component * parent; + component * m_parent; public: /* Zero means attach to main window layer */ /* Send a 'created' signal in component reserved channel */ - Component(Component *parent = 0, const std::string& id = ""); + component(component *parent = 0, const std::string& id = ""); /* Send a 'deleted' signal in component reserved channel */ - virtual ~Component(); + virtual ~component(); - void setParent(Component*); - Component * getParent(); + void set_parent(component*); + component * parent(); virtual void render() = 0; }; +} + #endif |