[libchamplainmm] MarkerLayer: Rename SelectionLayer to MarkerLayer

[Juan R. Garcia Blanco <juanrgar src gnome org>]

commit 3fa0a9abf3959a0df1d2bbb141edece423463610
Author: Juan R. García Blanco <juanrgar gmail com>
Date:   Tue Feb 25 20:35:38 2014 +0100

    MarkerLayer: Rename SelectionLayer to MarkerLayer
    
        * Rename class name and methods in marker-layer.hg

 libchamplain/src/marker-layer.ccg |   24 ++++++++++++++++++++++++
 libchamplain/src/marker-layer.hg  |   33 ++++++++++++++++-----------------
 2 files changed, 40 insertions(+), 17 deletions(-)
---
diff --git a/libchamplain/src/marker-layer.ccg b/libchamplain/src/marker-layer.ccg
index e69de29..839596f 100644
--- a/libchamplain/src/marker-layer.ccg
+++ b/libchamplain/src/marker-layer.ccg
@@ -0,0 +1,24 @@
+/* Copyright (c) 2014  Juan R. García Blanco <juanrgar gmail com>
+ *
+ * This file is part of libchamplainmm.
+ *
+ * libchamplainmm is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, either version 2.1 of the License,
+ * or (at your option) any later version.
+ *
+ * libchamplainmm 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <champlain/champlain.h>
+
+namespace Champlain
+{
+} // namespace Champlain
+
diff --git a/libchamplain/src/marker-layer.hg b/libchamplain/src/marker-layer.hg
index 90ad761..9223107 100644
--- a/libchamplain/src/marker-layer.hg
+++ b/libchamplain/src/marker-layer.hg
@@ -18,11 +18,12 @@
 
 #include <glibmm.h>
 #include <libchamplainmm/layer.h>
+#include <libchamplainmm/marker.h>
+#include <vector>
 
 _DEFS(libchamplainmm,libchamplain)
 
 _CC_INCLUDE(champlain/champlain.h)
-_CC_INCLUDE(libchamplainmm/base-marker.h)
 _PINCLUDE(libchamplainmm/private/layer_p.h)
 
 namespace Champlain
@@ -32,39 +33,37 @@ _WRAP_ENUM(SelectionMode, ChamplainSelectionMode)
 
 class BaseMarker;
 
-class SelectionLayer :
+class MarkerLayer :
     public Layer
 {
-  _CLASS_GOBJECT(SelectionLayer, ChamplainSelectionLayer,
-                 CHAMPLAIN_SELECTION_LAYER,
+  _CLASS_GOBJECT(MarkerLayer, ChamplainMarkerLayer,
+                 CHAMPLAIN_MARKER_LAYER,
                  Layer, ChamplainLayer)
 
 protected:
   _CTOR_DEFAULT()
 
-  _IGNORE(champlain_selection_layer_count_selected_markers)
+  _IGNORE(champlain_marker_layer_count_selected_markers)
 
 public:
   _WRAP_CREATE()
 
-  _WRAP_METHOD(Glib::RefPtr<BaseMarker> get_selected(),
-               champlain_selection_layer_get_selected)
-  _WRAP_METHOD(
-    Glib::ListHandle<Glib::RefPtr<BaseMarker> > get_selected_markers() const,
-    champlain_selection_layer_get_selected_markers)
+#m4 _CONVERSION(`GList*', `std::vector<Glib::RefPtr<Marker> >', `Glib::ListHandler<Glib::RefPtr<Marker> 
> ::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
+  _WRAP_METHOD(std::vector<Glib::RefPtr<Marker> > get_selected(),
+               champlain_marker_layer_get_selected)
   _WRAP_METHOD(SelectionMode get_selection_mode() const,
-               champlain_selection_layer_get_selection_mode)
+               champlain_marker_layer_get_selection_mode)
   _WRAP_METHOD(bool marker_is_selected(
                       const Glib::RefPtr<BaseMarker> & marker) const,
-               champlain_selection_layer_marker_is_selected)
+               champlain_marker_layer_marker_is_selected)
   _WRAP_METHOD(void select(const Glib::RefPtr<BaseMarker> & marker),
-               champlain_selection_layer_select)
-  _WRAP_METHOD(void select_all(), champlain_selection_layer_select_all)
+               champlain_marker_layer_select)
+  _WRAP_METHOD(void select_all(), champlain_marker_layer_select_all)
   _WRAP_METHOD(void set_selection_mode(SelectionMode mode),
-               champlain_selection_layer_set_selection_mode)
+               champlain_marker_layer_set_selection_mode)
   _WRAP_METHOD(void unselect(const Glib::RefPtr<BaseMarker> & marker),
-               champlain_selection_layer_unselect)
-  _WRAP_METHOD(void unselect_all(), champlain_selection_layer_unselect_all)
+               champlain_marker_layer_unselect)
+  _WRAP_METHOD(void unselect_all(), champlain_marker_layer_unselect_all)
 
   _WRAP_PROPERTY("selection-mode", SelectionMode)