[libchamplainmm] Cleanup generate_extra_defs_libchamplain.cc

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

commit d238295926fc3e3cf1a7b702680ade92969295ea
Author: Juan R. García Blanco <juanrgar gmail com>
Date:   Tue Mar 4 22:36:26 2014 +0100

    Cleanup generate_extra_defs_libchamplain.cc
    
        * Remove CHAMPLAIN_TYPE_MAP_PROJECTION
        * Remove CHAMPLAIN_TYPE_STATE
        * Regenerate champlain_signals.defs

 champlain/src/champlain_signals.defs               |  204 ++++++++++----------
 .../extradefs/generate_extra_defs_libchamplain.cc  |   10 +-
 2 files changed, 104 insertions(+), 110 deletions(-)
---
diff --git a/champlain/src/champlain_signals.defs b/champlain/src/champlain_signals.defs
index f83954e..ed2a83d 100644
--- a/champlain/src/champlain_signals.defs
+++ b/champlain/src/champlain_signals.defs
@@ -1,94 +1,3 @@
-;; From ChamplainMarker
-
-(define-signal button-press
-  (of-object "ChamplainMarker")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("ClutterEvent*" "p0")
-  )
-)
-
-(define-signal button-release
-  (of-object "ChamplainMarker")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("ClutterEvent*" "p0")
-  )
-)
-
-(define-signal drag-motion
-  (of-object "ChamplainMarker")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gdouble" "p0")
-    '("gdouble" "p1")
-    '("ClutterEvent*" "p2")
-  )
-)
-
-(define-signal drag-finish
-  (of-object "ChamplainMarker")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("ClutterEvent*" "p0")
-  )
-)
-
-(define-property selected
-  (of-object "ChamplainMarker")
-  (prop-type "GParamBoolean")
-  (docs "The sighlighted state of the marker")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property selectable
-  (of-object "ChamplainMarker")
-  (prop-type "GParamBoolean")
-  (docs "The draggable state of the marker")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property draggable
-  (of-object "ChamplainMarker")
-  (prop-type "GParamBoolean")
-  (docs "The draggable state of the marker")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From ChamplainLayer
-
-;; From ChamplainMapSource
-
-(define-property next-source
-  (of-object "ChamplainMapSource")
-  (prop-type "GParamObject")
-  (docs "Next source in the loading chain")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property renderer
-  (of-object "ChamplainMapSource")
-  (prop-type "GParamObject")
-  (docs "Tile renderer used to render tiles")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From ChamplainMapProjection
-
 ;; From ChamplainLabel
 
 (define-property image
@@ -199,6 +108,8 @@
   (construct-only #f)
 )
 
+;; From ChamplainLayer
+
 ;; From ChamplainLocation
 
 (define-property latitude
@@ -219,6 +130,104 @@
   (construct-only #f)
 )
 
+;; From ChamplainMapSource
+
+(define-property next-source
+  (of-object "ChamplainMapSource")
+  (prop-type "GParamObject")
+  (docs "Next source in the loading chain")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property renderer
+  (of-object "ChamplainMapSource")
+  (prop-type "GParamObject")
+  (docs "Tile renderer used to render tiles")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From ChamplainMarkerLayer
+
+(define-property selection-mode
+  (of-object "ChamplainMarkerLayer")
+  (prop-type "GParamEnum")
+  (docs "Determines the type of selection that will be performed.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From ChamplainMarker
+
+(define-signal button-press
+  (of-object "ChamplainMarker")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("ClutterEvent*" "p0")
+  )
+)
+
+(define-signal button-release
+  (of-object "ChamplainMarker")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("ClutterEvent*" "p0")
+  )
+)
+
+(define-signal drag-motion
+  (of-object "ChamplainMarker")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gdouble" "p0")
+    '("gdouble" "p1")
+    '("ClutterEvent*" "p2")
+  )
+)
+
+(define-signal drag-finish
+  (of-object "ChamplainMarker")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("ClutterEvent*" "p0")
+  )
+)
+
+(define-property selected
+  (of-object "ChamplainMarker")
+  (prop-type "GParamBoolean")
+  (docs "The sighlighted state of the marker")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property selectable
+  (of-object "ChamplainMarker")
+  (prop-type "GParamBoolean")
+  (docs "The draggable state of the marker")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property draggable
+  (of-object "ChamplainMarker")
+  (prop-type "GParamBoolean")
+  (docs "The draggable state of the marker")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From ChamplainPathLayer
 
 (define-property closed
@@ -284,19 +293,6 @@
   (construct-only #f)
 )
 
-;; From ChamplainMarkerLayer
-
-(define-property selection-mode
-  (of-object "ChamplainMarkerLayer")
-  (prop-type "GParamEnum")
-  (docs "Determines the type of selection that will be performed.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-;; From ChamplainState
-
 ;; From ChamplainTile
 
 (define-signal render-complete
diff --git a/tools/extradefs/generate_extra_defs_libchamplain.cc 
b/tools/extradefs/generate_extra_defs_libchamplain.cc
index c0e8918..8ad2cc9 100644
--- a/tools/extradefs/generate_extra_defs_libchamplain.cc
+++ b/tools/extradefs/generate_extra_defs_libchamplain.cc
@@ -26,15 +26,13 @@ main(int argc, char *argv[])
 {
   clutter_init(&argc, &argv);
 
-  std::cout << get_defs(CHAMPLAIN_TYPE_MARKER)
+  std::cout << get_defs(CHAMPLAIN_TYPE_LABEL)
             << get_defs(CHAMPLAIN_TYPE_LAYER)
-            << get_defs(CHAMPLAIN_TYPE_MAP_SOURCE)
-            << get_defs(CHAMPLAIN_TYPE_MAP_PROJECTION)
-            << get_defs(CHAMPLAIN_TYPE_LABEL)
             << get_defs(CHAMPLAIN_TYPE_LOCATION)
-            << get_defs(CHAMPLAIN_TYPE_PATH_LAYER)
+            << get_defs(CHAMPLAIN_TYPE_MAP_SOURCE)
             << get_defs(CHAMPLAIN_TYPE_MARKER_LAYER)
-            << get_defs(CHAMPLAIN_TYPE_STATE)
+            << get_defs(CHAMPLAIN_TYPE_MARKER)
+            << get_defs(CHAMPLAIN_TYPE_PATH_LAYER)
             << get_defs(CHAMPLAIN_TYPE_TILE)
             << get_defs(CHAMPLAIN_TYPE_VIEW)
             ;