[libchamplain] Some minor renames

[Jiří Techet <jiritechet src gnome org>]

commit ba26bce9f625a67041292e598c0c3fa55841ccbc
Author: JiÅ?í Techet <techet gmail com>
Date:   Wed Feb 2 00:47:01 2011 +0100

    Some minor renames

 champlain/champlain-marker-layer.c |   19 +++----------------
 champlain/champlain-marker-layer.h |    4 ++--
 champlain/champlain-point.h        |    7 +++----
 champlain/champlain-view.c         |   12 ++++++------
 4 files changed, 14 insertions(+), 28 deletions(-)
---
diff --git a/champlain/champlain-marker-layer.c b/champlain/champlain-marker-layer.c
index 6e727e2..a042b89 100644
--- a/champlain/champlain-marker-layer.c
+++ b/champlain/champlain-marker-layer.c
@@ -46,7 +46,6 @@ G_DEFINE_TYPE (ChamplainMarkerLayer, champlain_marker_layer, CHAMPLAIN_TYPE_LAYE
 enum
 {
   /* normal signals */
-  CHANGED,
   LAST_SIGNAL
 };
 
@@ -66,7 +65,7 @@ enum
 static ClutterColor DEFAULT_FILL_COLOR = { 0xcc, 0x00, 0x00, 0xaa };
 static ClutterColor DEFAULT_STROKE_COLOR = { 0xa4, 0x00, 0x00, 0xff };
 
-static guint signals[LAST_SIGNAL] = { 0, };
+//static guint signals[LAST_SIGNAL] = { 0, };
 
 struct _ChamplainMarkerLayerPrivate
 {
@@ -362,18 +361,6 @@ champlain_marker_layer_class_init (ChamplainMarkerLayerClass *klass)
           TRUE,
           CHAMPLAIN_PARAM_READWRITE));
 
-  /**
-   * ChamplainMarkerLayer::changed
-   *
-   * The changed signal is emitted when the selected marker(s) change.
-   *
-   * Since: 0.4.1
-   */
-  signals[CHANGED] =
-    g_signal_new ("changed", G_OBJECT_CLASS_TYPE (object_class),
-        G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
 }
 
 
@@ -748,7 +735,7 @@ champlain_marker_layer_get_selected_markers (ChamplainMarkerLayer *layer)
  * Since: 0.4
  */
 void
-champlain_marker_layer_unselect_all (ChamplainMarkerLayer *layer)
+champlain_marker_layer_unselect_all_markers (ChamplainMarkerLayer *layer)
 {
   g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer));
 
@@ -766,7 +753,7 @@ champlain_marker_layer_unselect_all (ChamplainMarkerLayer *layer)
  * Since: 0.4
  */
 void
-champlain_marker_layer_select_all (ChamplainMarkerLayer *layer)
+champlain_marker_layer_select_all_markers (ChamplainMarkerLayer *layer)
 {
   g_return_if_fail (CHAMPLAIN_IS_MARKER_LAYER (layer));
 
diff --git a/champlain/champlain-marker-layer.h b/champlain/champlain-marker-layer.h
index 63c9ab1..cd9a2ec 100644
--- a/champlain/champlain-marker-layer.h
+++ b/champlain/champlain-marker-layer.h
@@ -99,8 +99,8 @@ void champlain_marker_layer_hide_all_markers (ChamplainMarkerLayer *layer);
 void champlain_marker_layer_set_all_markers_movable (ChamplainMarkerLayer *layer);
 void champlain_marker_layer_set_all_markers_unmovable (ChamplainMarkerLayer *layer);
 
-void champlain_marker_layer_select_all (ChamplainMarkerLayer *layer);
-void champlain_marker_layer_unselect_all (ChamplainMarkerLayer *layer);
+void champlain_marker_layer_select_all_markers (ChamplainMarkerLayer *layer);
+void champlain_marker_layer_unselect_all_markers (ChamplainMarkerLayer *layer);
 GSList *champlain_marker_layer_get_selected_markers (ChamplainMarkerLayer *layer);
 
 void champlain_marker_layer_set_selection_mode (ChamplainMarkerLayer *layer,
diff --git a/champlain/champlain-point.h b/champlain/champlain-point.h
index a545f17..cfa54b2 100644
--- a/champlain/champlain-point.h
+++ b/champlain/champlain-point.h
@@ -73,16 +73,15 @@ ClutterActor *champlain_point_new_full (gdouble size,
 
 void champlain_point_set_color (ChamplainPoint *point,
     const ClutterColor *color);
-
 ClutterColor *champlain_point_get_color (ChamplainPoint *point);
 
-void champlain_point_set_highlight_color (ClutterColor *color);
-const ClutterColor *champlain_point_get_highlight_color (void);
-
 void champlain_point_set_size (ChamplainPoint *point,
     gdouble size);
 gdouble champlain_point_get_size (ChamplainPoint *point);
 
+void champlain_point_set_highlight_color (ClutterColor *color);
+const ClutterColor *champlain_point_get_highlight_color (void);
+
 G_END_DECLS
 
 #endif
diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index 03d4768..5255415 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -381,15 +381,15 @@ champlain_view_get_property (GObject *object,
       break;
 
     case PROP_ZOOM_LEVEL:
-      g_value_set_int (value, priv->zoom_level);
+      g_value_set_uint (value, priv->zoom_level);
       break;
 
     case PROP_MIN_ZOOM_LEVEL:
-      g_value_set_int (value, priv->min_zoom_level);
+      g_value_set_uint (value, priv->min_zoom_level);
       break;
 
     case PROP_MAX_ZOOM_LEVEL:
-      g_value_set_int (value, priv->max_zoom_level);
+      g_value_set_uint (value, priv->max_zoom_level);
       break;
 
     case PROP_MAP_SOURCE:
@@ -450,15 +450,15 @@ champlain_view_set_property (GObject *object,
       break;
 
     case PROP_ZOOM_LEVEL:
-      champlain_view_set_zoom_level (view, g_value_get_int (value));
+      champlain_view_set_zoom_level (view, g_value_get_uint (value));
       break;
 
     case PROP_MIN_ZOOM_LEVEL:
-      champlain_view_set_min_zoom_level (view, g_value_get_int (value));
+      champlain_view_set_min_zoom_level (view, g_value_get_uint (value));
       break;
 
     case PROP_MAX_ZOOM_LEVEL:
-      champlain_view_set_max_zoom_level (view, g_value_get_int (value));
+      champlain_view_set_max_zoom_level (view, g_value_get_uint (value));
       break;
 
     case PROP_MAP_SOURCE: