[libchamplainmm] Tile: Set parent to Clutter::Actor; cleanup

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

commit ce8d8631d7b96ee1c5346fdf363c2b7564482ecc
Author: Juan R. García Blanco <juanrgar gmail com>
Date:   Sun Jun 8 22:05:42 2014 +0200

    Tile: Set parent to Clutter::Actor; cleanup

 champlain/src/tile.hg |   29 ++++++-----------------------
 1 files changed, 6 insertions(+), 23 deletions(-)
---
diff --git a/champlain/src/tile.hg b/champlain/src/tile.hg
index 05170c6..16b4911 100644
--- a/champlain/src/tile.hg
+++ b/champlain/src/tile.hg
@@ -16,25 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string>
-#include <cluttermm.h>
-#include <champlainmm/defines.h>
-
+#include <glibmm/ustring.h>
+#include <cluttermm/actor.h>
+#include <champlain/champlain.h>
 _DEFS(champlainmm,champlain)
-
-_CC_INCLUDE(champlain/champlain.h)
-_PINCLUDE(glibmm/private/object_p.h)
+_PINCLUDE(cluttermm/private/actor_p.h)
 
 namespace Champlain
 {
 
 _WRAP_ENUM(State, ChamplainState)
 
-class Tile :
-    public Glib::Object
+class Tile : public Clutter::Actor
 {
-  _CLASS_GOBJECT(Tile, ChamplainTile, CHAMPLAIN_TILE,
-                 Glib::Object, GObject)
+  _CLASS_GOBJECT(Tile, ChamplainTile, CHAMPLAIN_TILE, Clutter::Actor, ClutterActor)
 
 protected:
   _CTOR_DEFAULT()
@@ -50,12 +45,6 @@ public:
   _WRAP_METHOD(guint get_zoom_level() const, champlain_tile_get_zoom_level)
   _WRAP_METHOD(guint get_size() const, champlain_tile_get_size)
   _WRAP_METHOD(State get_state() const, champlain_tile_get_state)
-  _WRAP_METHOD(std::string get_uri() const, champlain_tile_get_uri)
-  _WRAP_METHOD(std::string get_filename() const, champlain_tile_get_filename)
-  _WRAP_METHOD(Glib::RefPtr<const Clutter::Actor> get_actor() const,
-               champlain_tile_get_actor)
-  _WRAP_METHOD(Glib::RefPtr<Clutter::Actor> get_actor(),
-               champlain_tile_get_actor)
   _WRAP_METHOD(Glib::RefPtr<const Clutter::Actor> get_content() const,
                champlain_tile_get_content)
   _WRAP_METHOD(Glib::RefPtr<Clutter::Actor> get_content(),
@@ -73,9 +62,6 @@ public:
                champlain_tile_set_zoom_level)
   _WRAP_METHOD(void set_size(guint size), champlain_tile_set_size)
   _WRAP_METHOD(void set_state(State state), champlain_tile_set_state)
-  _WRAP_METHOD(void set_uri(const std::string & uri), champlain_tile_set_uri)
-  _WRAP_METHOD(void set_filename(const std::string & filename),
-               champlain_tile_set_filename)
   _WRAP_METHOD(void set_content(const Glib::RefPtr<Clutter::Actor> & actor),
                champlain_tile_set_content)
   _WRAP_METHOD(void set_etag(const Glib::ustring & etag),
@@ -88,9 +74,6 @@ public:
   _WRAP_PROPERTY("zoom-level", int)
   _WRAP_PROPERTY("size", int)
   _WRAP_PROPERTY("state", State)
-  _WRAP_PROPERTY("uri", std::string)
-  _WRAP_PROPERTY("filename", std::string)
-  _WRAP_PROPERTY("actor", Glib::RefPtr<Clutter::Actor>)
   _WRAP_PROPERTY("content", Glib::RefPtr<Clutter::Actor>)
   _WRAP_PROPERTY("etag", Glib::ustring)
 };