[libchamplainmm] PathLayer: Set Layer as parent class; cleanup



commit 04fdae1b698422a7896194994b647f17dbfc3456
Author: Juan R. GarcĂ­a Blanco <juanrgar gmail com>
Date:   Sun Jun 8 21:04:55 2014 +0200

    PathLayer: Set Layer as parent class; cleanup

 champlain/src/path-layer.hg |   50 ++++++++++++++----------------------------
 1 files changed, 17 insertions(+), 33 deletions(-)
---
diff --git a/champlain/src/path-layer.hg b/champlain/src/path-layer.hg
index c60742e..fc6ea09 100644
--- a/champlain/src/path-layer.hg
+++ b/champlain/src/path-layer.hg
@@ -16,21 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <cluttermm.h>
-#include <glibmm.h>
-#include <champlainmm/point.h>
+#include <cluttermm/color.h>
+
+#include <champlainmm/layer.h>
 _DEFS(champlainmm,champlain)
-_PINCLUDE(glibmm/private/object_p.h)
+_PINCLUDE(champlainmm/private/layer_p.h)
 
 namespace Champlain
 {
 
-class Point;
-
-class PathLayer : public Glib::Object
+class PathLayer : public Layer
 {
-  _CLASS_GOBJECT(PathLayer, ChamplainPathLayer, CHAMPLAIN_PATH_LAYER,
-                 Glib::Object, GObject)
+  /**
+   *
+   * @newin{0,1}
+   */
+  _CLASS_GOBJECT(PathLayer, ChamplainPathLayer, CHAMPLAIN_PATH_LAYER, Champlain::Layer, ChamplainLayer)
 
 protected:
   _CTOR_DEFAULT()
@@ -38,35 +39,18 @@ protected:
 public:
   _WRAP_CREATE()
 
-  _WRAP_METHOD(void append_point(double latitude, double longitude),
-               champlain_path_layer_append_point)
-  _WRAP_METHOD(void clear_points(), champlain_path_layer_clear_points)
   _WRAP_METHOD(bool get_fill() const, champlain_path_layer_get_fill)
-  _WRAP_METHOD(Clutter::Color get_fill_color() const,
-               champlain_path_layer_get_fill_color)
+  _WRAP_METHOD(Clutter::Color get_fill_color() const, champlain_path_layer_get_fill_color)
   _WRAP_METHOD(bool get_stroke() const, champlain_path_layer_get_stroke)
-  _WRAP_METHOD(Clutter::Color get_stroke_color() const,
-               champlain_path_layer_get_stroke_color)
-  _WRAP_METHOD(double get_stroke_width() const,
-               champlain_path_layer_get_stroke_width)
-  _WRAP_METHOD(Glib::ListHandle<const Point *> get_points() const,
-               champlain_path_layer_get_points)
-  _WRAP_METHOD(void hide(), champlain_path_layer_hide)
-  _WRAP_METHOD(void insert_point(double latitude, double longitude, int pos),
-               champlain_path_layer_insert_point)
-  _WRAP_METHOD(void remove_point(const Point & point),
-               champlain_path_layer_remove_point)
+  _WRAP_METHOD(Clutter::Color get_stroke_color() const, champlain_path_layer_get_stroke_color)
+  _WRAP_METHOD(double get_stroke_width() const, champlain_path_layer_get_stroke_width)
   _WRAP_METHOD(void set_fill(bool value), champlain_path_layer_set_fill)
-  _WRAP_METHOD(void set_fill_color(const Clutter::Color & color),
-               champlain_path_layer_set_fill_color)
+  _WRAP_METHOD(void set_fill_color(const Clutter::Color & color), champlain_path_layer_set_fill_color)
   _WRAP_METHOD(void set_stroke(bool value), champlain_path_layer_set_stroke)
-  _WRAP_METHOD(void set_stroke_color(const Clutter::Color & color),
-               champlain_path_layer_set_stroke_color)
-  _WRAP_METHOD(void set_stroke_width(double width),
-               champlain_path_layer_set_stroke_width)
-  _WRAP_METHOD(void show(), champlain_path_layer_show)
+  _WRAP_METHOD(void set_stroke_color(const Clutter::Color & color), champlain_path_layer_set_stroke_color)
+  _WRAP_METHOD(void set_stroke_width(double width), champlain_path_layer_set_stroke_width)
 
-  _WRAP_PROPERTY("closed-path", bool)
+  _WRAP_PROPERTY("closed", bool)
   _WRAP_PROPERTY("fill", bool)
   _WRAP_PROPERTY("fill-color", Clutter::Color)
   _WRAP_PROPERTY("stroke", bool)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]