The type gpointer is already a pointer. No need for gpointer *data

diff --git a/bindings/perl/Champlain/xs/ChamplainMapSourceFactory.xs b/bindings/perl/Champlain/xs/ChamplainMapSourceFactory.xs
index d9e63cfc40c683cfd2ea5f2b2dd3cb13582c54be..50dffdafcf49d2d9bbe8b502b2b8da27a3a95680 100644 (file)
--- a/bindings/perl/Champlain/xs/ChamplainMapSourceFactory.xs
+++ b/bindings/perl/Champlain/xs/ChamplainMapSourceFactory.xs
@@ -8,7 +8,7 @@ champlainperl_constructor_create (SV *func, SV *data) {
 
 
 static ChamplainMapSource*
-champlainperl_constructor (ChamplainMapSourceDesc *desc, gpointer *data) {
+champlainperl_constructor (ChamplainMapSourceDesc *desc, gpointer data) {
        GPerlCallback *callback = (GPerlCallback *) data;
        GValue return_value = { 0, };
        ChamplainMapSource *retval;

diff --git a/champlain/champlain-map-source-desc.h b/champlain/champlain-map-source-desc.h
index 72dc79ae933b4060472c8a979903b95b1e9c1cdd..e0113a8f9d163049c4c64884916991b21485bb3c 100644 (file)
--- a/champlain/champlain-map-source-desc.h
+++ b/champlain/champlain-map-source-desc.h
@@ -40,7 +40,7 @@ typedef struct _ChamplainMapSourceDesc ChamplainMapSourceDesc;
  * Since: 0.4
  */
 typedef ChamplainMapSource * (*ChamplainMapSourceConstructor) (
-    ChamplainMapSourceDesc *desc, gpointer *data);
+    ChamplainMapSourceDesc *desc, gpointer data);
 #define CHAMPLAIN_MAP_SOURCE_CONSTRUCTOR (f) ((ChamplainMapSourceConstructor) (f))
 
 #define CHAMPLAIN_MAP_SOURCE_DESC(obj)     ((ChamplainMapSourceDesc *) (obj))

diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index 17f952efc7e12b2c67a447f807949ec220d502b5..84d1f81c18d4f1203d5a0215017230a27b75c87b 100644 (file)
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -74,15 +74,15 @@ struct _ChamplainMapSourceFactoryPrivate
 };
 
 static ChamplainMapSource * champlain_map_source_new_osm_mapnik (
-     ChamplainMapSourceDesc *desc, gpointer *data);
+     ChamplainMapSourceDesc *desc, gpointer data);
 static ChamplainMapSource * champlain_map_source_new_osm_cyclemap (
-    ChamplainMapSourceDesc *desc, gpointer *data);
+    ChamplainMapSourceDesc *desc, gpointer data);
 static ChamplainMapSource * champlain_map_source_new_osm_osmarender (
-    ChamplainMapSourceDesc *desc, gpointer *data);
+    ChamplainMapSourceDesc *desc, gpointer data);
 static ChamplainMapSource * champlain_map_source_new_oam (
-    ChamplainMapSourceDesc *desc, gpointer *data);
+    ChamplainMapSourceDesc *desc, gpointer data);
 static ChamplainMapSource * champlain_map_source_new_mff_relief (
-    ChamplainMapSourceDesc *desc, gpointer *data);
+    ChamplainMapSourceDesc *desc, gpointer data);
 
 
 static void
@@ -353,7 +353,7 @@ champlain_map_source_factory_register (ChamplainMapSourceFactory *factory,
 
 static ChamplainMapSource *
 champlain_map_source_new_osm_cyclemap (
-     ChamplainMapSourceDesc *desc, gpointer *data)
+     ChamplainMapSourceDesc *desc, gpointer data)
 {
   return CHAMPLAIN_MAP_SOURCE (champlain_network_map_source_new_full (CHAMPLAIN_MAP_SOURCE_OSM_CYCLE_MAP,
       "OpenStreetMap Cycle Map",
@@ -365,7 +365,7 @@ champlain_map_source_new_osm_cyclemap (
 
 static ChamplainMapSource *
 champlain_map_source_new_osm_osmarender (
-     ChamplainMapSourceDesc *desc, gpointer *data)
+     ChamplainMapSourceDesc *desc, gpointer data)
 {
   return CHAMPLAIN_MAP_SOURCE (champlain_network_map_source_new_full (CHAMPLAIN_MAP_SOURCE_OSM_OSMARENDER,
       "OpenStreetMap Osmarender",
@@ -377,7 +377,7 @@ champlain_map_source_new_osm_osmarender (
 
 static ChamplainMapSource *
 champlain_map_source_new_osm_mapnik (
-     ChamplainMapSourceDesc *desc, gpointer *data)
+     ChamplainMapSourceDesc *desc, gpointer data)
 {
   return CHAMPLAIN_MAP_SOURCE (champlain_network_map_source_new_full (CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK,
       "OpenStreetMap Mapnik",
@@ -389,7 +389,7 @@ champlain_map_source_new_osm_mapnik (
 
 static ChamplainMapSource *
 champlain_map_source_new_oam (
-     ChamplainMapSourceDesc *desc, gpointer *data)
+     ChamplainMapSourceDesc *desc, gpointer data)
 {
   return CHAMPLAIN_MAP_SOURCE (champlain_network_map_source_new_full (CHAMPLAIN_MAP_SOURCE_OAM,
       "OpenAerialMap",
@@ -401,7 +401,7 @@ champlain_map_source_new_oam (
 
 static ChamplainMapSource *
 champlain_map_source_new_mff_relief (
-    ChamplainMapSourceDesc *desc, gpointer *data)
+    ChamplainMapSourceDesc *desc, gpointer data)
 {
   return CHAMPLAIN_MAP_SOURCE (champlain_network_map_source_new_full (CHAMPLAIN_MAP_SOURCE_MFF_RELIEF,
       "Maps for Free Relief",