[libchamplain] Code formatting, remove unused MapDataSource functions

[Pierre-Luc Beaudoin <plbeaudoin src gnome org>]

commit 672d8c9645f3558e51f7481aaf9d9ba648fff4fe
Author: Simon Wenner <simon wenner ch>
Date:   Mon Jun 29 10:44:51 2009 +0200

    Code formatting, remove unused MapDataSource functions

 champlain/champlain-local-map-data-source.c |   12 +++++---
 champlain/champlain-map-data-source.c       |   38 ++++++--------------------
 champlain/champlain-map-data-source.h       |    3 --
 champlain/champlain-memphis-map-source.c    |   27 +++++++++++--------
 champlain/champlain-memphis-map-source.h    |    3 +-
 5 files changed, 35 insertions(+), 48 deletions(-)
---
diff --git a/champlain/champlain-local-map-data-source.c b/champlain/champlain-local-map-data-source.c
index 74580bb..46465dd 100644
--- a/champlain/champlain-local-map-data-source.c
+++ b/champlain/champlain-local-map-data-source.c
@@ -35,8 +35,10 @@ struct _ChamplainLocalMapDataSourcePrivate {
 };
 
 static void
-champlain_local_map_data_source_get_property (GObject *object, guint property_id,
-                              GValue *value, GParamSpec *pspec)
+champlain_local_map_data_source_get_property (GObject *object,
+    guint property_id,
+    GValue *value,
+    GParamSpec *pspec)
 {
   switch (property_id) {
   default:
@@ -45,8 +47,10 @@ champlain_local_map_data_source_get_property (GObject *object, guint property_id
 }
 
 static void
-champlain_local_map_data_source_set_property (GObject *object, guint property_id,
-                              const GValue *value, GParamSpec *pspec)
+champlain_local_map_data_source_set_property (GObject *object,
+    guint property_id,
+    const GValue *value,
+    GParamSpec *pspec)
 {
   switch (property_id) {
   default:
diff --git a/champlain/champlain-map-data-source.c b/champlain/champlain-map-data-source.c
index c83cbb5..63518e7 100644
--- a/champlain/champlain-map-data-source.c
+++ b/champlain/champlain-map-data-source.c
@@ -38,9 +38,7 @@ enum
   PROP_ID,
   PROP_NAME,
   PROP_LICENSE,
-  PROP_LICENSE_URI,
-  PROP_MIN_ZOOM_LEVEL,
-  PROP_MAX_ZOOM_LEVEL
+  PROP_LICENSE_URI
 };
 
 static guint signals[LAST_SIGNAL] = { 0, };
@@ -52,13 +50,13 @@ struct _ChamplainMapDataSourcePrivate {
   const char *name;
   const char *license;
   const char *license_uri;
-  guint min_zoom_level;
-  guint max_zoom_level;
 };
 
 static void
-champlain_map_data_source_get_property (GObject *object, guint property_id,
-                              GValue *value, GParamSpec *pspec)
+champlain_map_data_source_get_property (GObject *object,
+    guint property_id,
+    GValue *value,
+    GParamSpec *pspec)
 {
   switch (property_id) {
   // TODO
@@ -68,8 +66,10 @@ champlain_map_data_source_get_property (GObject *object, guint property_id,
 }
 
 static void
-champlain_map_data_source_set_property (GObject *object, guint property_id,
-                              const GValue *value, GParamSpec *pspec)
+champlain_map_data_source_set_property (GObject *object,
+    guint property_id,
+    const GValue *value,
+    GParamSpec *pspec)
 {
   switch (property_id) {
   // TODO
@@ -135,8 +135,6 @@ champlain_map_data_source_init (ChamplainMapDataSource *self)
   priv->name = NULL;
   priv->license = NULL;
   priv->license_uri = NULL;
-  priv->min_zoom_level = 0;
-  priv->max_zoom_level = 0;
 }
 
 ChamplainMapDataSource*
@@ -188,21 +186,3 @@ champlain_map_data_source_get_license_uri (ChamplainMapDataSource *self)
   ChamplainMapDataSourcePrivate *priv =  GET_PRIVATE(self);
   return priv->license_uri;
 }
-
-guint
-champlain_map_data_source_get_min_zoom_level (ChamplainMapDataSource *self)
-{
-  g_return_val_if_fail (CHAMPLAIN_IS_MAP_DATA_SOURCE (self), 0);
-
-  ChamplainMapDataSourcePrivate *priv =  GET_PRIVATE(self);
-  return priv->min_zoom_level;
-}
-
-guint
-champlain_map_data_source_get_max_zoom_level (ChamplainMapDataSource *self)
-{
-  g_return_val_if_fail (CHAMPLAIN_IS_MAP_DATA_SOURCE (self), 0);
-
-  ChamplainMapDataSourcePrivate *priv =  GET_PRIVATE(self);
-  return priv->max_zoom_level;
-}
diff --git a/champlain/champlain-map-data-source.h b/champlain/champlain-map-data-source.h
index 19eccd6..08ec00f 100644
--- a/champlain/champlain-map-data-source.h
+++ b/champlain/champlain-map-data-source.h
@@ -61,9 +61,6 @@ const gchar * champlain_map_data_source_get_name (ChamplainMapDataSource *data_s
 const gchar * champlain_map_data_source_get_license (ChamplainMapDataSource *data_source);
 const gchar * champlain_map_data_source_get_license_uri (ChamplainMapDataSource *data_source);
 
-guint champlain_map_data_source_get_min_zoom_level (ChamplainMapDataSource *data_source);
-guint champlain_map_data_source_get_max_zoom_level (ChamplainMapDataSource *data_source);
-
 G_END_DECLS
 
 #endif /* _CHAMPLAIN_MAP_DATA_SOURCE */
diff --git a/champlain/champlain-memphis-map-source.c b/champlain/champlain-memphis-map-source.c
index d976b32..ea8fc27 100644
--- a/champlain/champlain-memphis-map-source.c
+++ b/champlain/champlain-memphis-map-source.c
@@ -57,12 +57,21 @@ struct _ChamplainMemphisMapSourcePrivate {
   GThreadPool *thpool;
 };
 
+typedef struct _TileData TileData;
+
+struct _TileData {
+  ChamplainTile *tile;
+  cairo_surface_t *cst;
+};
+
 /* lock to protect the renderer state while rendering */
 GStaticRWLock MemphisLock = G_STATIC_RW_LOCK_INIT;
 
 static void
-champlain_memphis_map_source_get_property (GObject *object, guint property_id,
-                              GValue *value, GParamSpec *pspec)
+champlain_memphis_map_source_get_property (GObject *object,
+    guint property_id,
+    GValue *value,
+    GParamSpec *pspec)
 {
   ChamplainMemphisMapSource *self = CHAMPLAIN_MEMPHIS_MAP_SOURCE (object);
   ChamplainMemphisMapSourcePrivate *priv = GET_PRIVATE (self);
@@ -77,8 +86,10 @@ champlain_memphis_map_source_get_property (GObject *object, guint property_id,
 }
 
 static void
-champlain_memphis_map_source_set_property (GObject *object, guint property_id,
-                              const GValue *value, GParamSpec *pspec)
+champlain_memphis_map_source_set_property (GObject *object,
+    guint property_id,
+    const GValue *value,
+    GParamSpec *pspec)
 {
   ChamplainMemphisMapSource *self = CHAMPLAIN_MEMPHIS_MAP_SOURCE (object);
 
@@ -159,12 +170,6 @@ fill_tile (ChamplainMapSource *map_source, ChamplainTile *tile)
     }
 }
 
-typedef struct _TileData TileData;
-struct _TileData {
-  ChamplainTile *tile;
-  cairo_surface_t *cst;
-};
-
 static gboolean
 set_tile_content (gpointer data)
 {
@@ -286,7 +291,7 @@ champlain_memphis_map_source_new_full (ChamplainMapSourceDesc *desc,
       "name", desc->name,
       "license", desc->license,
       "license-uri", desc->license_uri,
-      "projection", CHAMPLAIN_MAP_PROJECTION_MERCATOR,
+      "projection", desc->projection,
       "min-zoom-level", desc->min_zoom_level,
       "max-zoom-level", desc->max_zoom_level,
       "tile-size", DEFAULT_TILE_SIZE,
diff --git a/champlain/champlain-memphis-map-source.h b/champlain/champlain-memphis-map-source.h
index 2306aad..326eba8 100644
--- a/champlain/champlain-memphis-map-source.h
+++ b/champlain/champlain-memphis-map-source.h
@@ -59,7 +59,8 @@ ChamplainMemphisMapSource * champlain_memphis_map_source_new_full (
     ChamplainMapDataSource *map_data_source);
 
 void champlain_memphis_map_source_set_tile_size (
-    ChamplainMemphisMapSource *map_source, guint size);
+    ChamplainMemphisMapSource *map_source,
+    guint size);
 
 void champlain_memphis_map_source_load_rules (
     ChamplainMemphisMapSource *map_source,