layers: rename surface_id_to_layer and surface_id_to_layer_map

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

1 files changed, 9 insertions, 10 deletions

diff --git a/src/layers.hpp b/src/layers.hpp
index a3cb2a9..e2d2bf5 100644
--- a/src/layers.hpp
+++ b/src/layers.hpp
@@ -14,7 +14,7 @@
 
 namespace wm {
 
-struct surface_id_to_layer {
+struct layer {
    // Min and max surface ID mapped to this layer
    int id_min = -1;
    int id_max = -1;
@@ -31,31 +31,30 @@ struct surface_id_to_layer {
    genivi::rect rect;
    // XXX perhaps a zorder is needed here?
 
-   explicit surface_id_to_layer(nlohmann::json const &j);
+   explicit layer(nlohmann::json const &j);
 
-   bool operator<(struct surface_id_to_layer const &rhs) const {
+   bool operator<(struct layer const &rhs) const {
       return this->id_max < rhs.id_max;
    }
 };
 
 // Actually, we shouldn't need a struct here ... but let's just keep it at that
 // for now, to contain its mapping type and the _single_ useful method.
-struct surface_id_to_layer_map {
-   typedef std::set<struct surface_id_to_layer> surface_to_layer_map_type;
+struct layer_map {
+   typedef std::set<struct layer> storage_type;
    typedef std::vector<unsigned int> layers_type;
 
-   surface_to_layer_map_type mapping;
+   storage_type mapping;
    layers_type layers;
 
-   optional<int> get_layer_for_surface(int surface_id);
-   optional<genivi::rect> get_rect_for_surface(int surface_id);
+   optional<int> get_layer_id(int surface_id);
+   optional<genivi::rect> get_layer_rect(int surface_id);
    layers_type::size_type get_layers_count() const {
       return this->layers.size();
    }
 };
 
-struct result<struct surface_id_to_layer_map> to_surface_id_to_layer_map(
-   nlohmann::json const &j);
+struct result<struct layer_map> to_layer_map(nlohmann::json const &j);
 
 }  // namespace wm