Update wm_layer

Change-Id: Ia8277ba20a97a0a5b3617ae14a447e0e962afafd
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

1 files changed, 12 insertions, 33 deletions

diff --git a/src/wm_layer.hpp b/src/wm_layer.hpp
index 001134a..3362ba7 100644
--- a/src/wm_layer.hpp
+++ b/src/wm_layer.hpp
@@ -44,7 +44,7 @@ class LayerState
     std::unordered_map<std::string, std::string> area2appid;
 };
 
-class LayerSetting
+class WMLayer
 {
   public:
     enum MANAGEMENT_TYPE
@@ -53,26 +53,21 @@ class LayerSetting
         STACK
     };
 
-    explicit LayerSetting(const std::string& name, MANAGEMENT_TYPE type, unsigned begin, unsigned end);
-    ~LayerSetting() = default;
-
-    const std::string& layerName() { return this->name; }
-    MANAGEMENT_TYPE layerType() { return this->type; };
-    void setRoleList(const std::string& role);
-    void appendArea(const std::string& area);
+    explicit WMLayer(json_object* j);
+    ~WMLayer() = default;
+    unsigned getNewLayerID(const std::string& role);
     unsigned idBegin() { return this->id_begin; }
     unsigned idEnd()   { return this->id_end; }
-    unsigned getNewLayerID(const std::string& role);
+    const std::string& layerName();
+    MANAGEMENT_TYPE    layerType() { return this->type; }
+    void appendArea(const std::string& area);
     void removeLayerID(unsigned id);
-
-/*     unsigned getNewID(const std::string& role);
-    void remove(unsigned ivi_layer_id);
-    void clear();
-    bool attach(unsigned ivi_layer_id, const std::string& area);
-    void stack(unsigned ivi_layer_id, const std::string& area);
-    bool updateRenderOrder(const std::vector<unsigned> list); */
-
+    LayerState getLayerState() const { return before_state; }
+    WMError    setLayerState(const LayerState& l);
+    bool checkIDBelongTo(unsigned id);
   private:
+    LayerState before_state;
+    LayerState state;
     std::string name = ""; // Layer name
     MANAGEMENT_TYPE type;
     std::string role_list;
@@ -82,22 +77,6 @@ class LayerSetting
     unsigned id_end;
 };
 
-class WMLayer
-{
-  public:
-    WMLayer();
-    WMLayer(json_object* j);
-    ~WMLayer() = default;
-    unsigned getNewLayerID(const std::string& role);
-    LayerState getLayerState() const { return before_state; }
-    WMError setLayerState(const LayerState& l);
-    bool checkIDBelongTo(unsigned id);
-  private:
-    LayerState before_state;
-    LayerState state;
-    std::unique_ptr<LayerSetting> setting;
-};
-
 } // namespace wm
 
 #endif // WM_LAYERS_H