[libshumate/tintou/cleanup] Get rid of unneeded glib types
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libshumate/tintou/cleanup] Get rid of unneeded glib types
- Date: Tue, 22 Sep 2020 10:20:21 +0000 (UTC)
commit cefad4e6c4858b159e3d7c34e2118820ab406f85
Author: Corentin Noël <corentin noel collabora com>
Date: Tue Sep 22 12:17:57 2020 +0200
Get rid of unneeded glib types
Do as GTK in commit https://gitlab.gnome.org/GNOME/gtk/-/commit/ec9fd76c8700b52011c53e31987691a07f406b19
and use pure C types when GLib types are not necessary.
demos/launcher-gtk.c | 16 +++---
demos/launcher.c | 8 +--
demos/polygons.c | 6 +-
demos/url-marker.c | 12 ++--
shumate/shumate-bounding-box.c | 13 +++--
shumate/shumate-bounding-box.h | 22 ++++----
shumate/shumate-coordinate.c | 35 ++++++------
shumate/shumate-coordinate.h | 4 +-
shumate/shumate-debug.c | 8 +--
shumate/shumate-debug.h | 4 +-
shumate/shumate-file-cache.c | 56 +++++++++----------
shumate/shumate-file-cache.h | 4 +-
shumate/shumate-license.c | 8 +--
shumate/shumate-license.h | 8 +--
shumate/shumate-location.c | 8 +--
shumate/shumate-location.h | 16 +++---
shumate/shumate-map-layer.c | 10 ++--
shumate/shumate-map-source-chain.c | 16 +++---
shumate/shumate-map-source-desc.c | 50 ++++++++---------
shumate/shumate-map-source-desc.h | 20 +++----
shumate/shumate-map-source-factory.c | 12 ++--
shumate/shumate-map-source-factory.h | 6 +-
shumate/shumate-map-source.c | 38 ++++++-------
shumate/shumate-map-source.h | 38 ++++++-------
shumate/shumate-marker-layer.c | 16 +++---
shumate/shumate-marker.c | 20 +++----
shumate/shumate-memory-cache.c | 18 +++---
shumate/shumate-network-tile-source.c | 72 ++++++++++++------------
shumate/shumate-network-tile-source.h | 24 ++++----
shumate/shumate-path-layer.c | 18 +++---
shumate/shumate-path-layer.h | 4 +-
shumate/shumate-scale.c | 24 ++++----
shumate/shumate-tile-cache.c | 18 +++---
shumate/shumate-tile-cache.h | 4 +-
shumate/shumate-tile-source.c | 32 +++++------
shumate/shumate-tile-source.h | 8 +--
shumate/shumate-tile.c | 6 +-
shumate/shumate-tile.h | 4 +-
shumate/shumate-view.c | 100 +++++++++++++++++-----------------
shumate/shumate-view.h | 12 ++--
shumate/shumate-viewport.c | 50 ++++++++---------
shumate/shumate-viewport.h | 20 +++----
42 files changed, 434 insertions(+), 434 deletions(-)
---
diff --git a/demos/launcher-gtk.c b/demos/launcher-gtk.c
index 450f999..f484cff 100644
--- a/demos/launcher-gtk.c
+++ b/demos/launcher-gtk.c
@@ -65,7 +65,7 @@ toggle_layer (GtkToggleButton *widget,
static gboolean
mouse_click_cb (ClutterActor *actor, ClutterButtonEvent *event, ChamplainView *view)
{
- gdouble lat, lon;
+ double lat, lon;
lon = champlain_view_x_to_longitude (view, event->x);
lat = champlain_view_y_to_latitude (view, event->y);
@@ -79,7 +79,7 @@ static void
map_source_changed (GtkWidget *widget,
ChamplainView *view)
{
- gchar *id;
+ char *id;
ChamplainMapSource *source;
GtkTreeIter iter;
GtkTreeModel *model;
@@ -103,7 +103,7 @@ static void
zoom_changed (GtkSpinButton *spinbutton,
ChamplainView *view)
{
- gint zoom = gtk_spin_button_get_value_as_int (spinbutton);
+ int zoom = gtk_spin_button_get_value_as_int (spinbutton);
g_object_set (G_OBJECT (view), "zoom-level", zoom, NULL);
}
@@ -114,7 +114,7 @@ map_zoom_changed (ChamplainView *view,
GParamSpec *gobject,
GtkSpinButton *spinbutton)
{
- gint zoom;
+ int zoom;
g_object_get (G_OBJECT (view), "zoom-level", &zoom, NULL);
gtk_spin_button_set_value (spinbutton, zoom);
@@ -190,8 +190,8 @@ build_combo_box (GtkComboBox *box)
while (iter != NULL)
{
ChamplainMapSourceDesc *desc = CHAMPLAIN_MAP_SOURCE_DESC (iter->data);
- const gchar *id = champlain_map_source_desc_get_id (desc);
- const gchar *name = champlain_map_source_desc_get_name (desc);
+ const char *id = champlain_map_source_desc_get_id (desc);
+ const char *name = champlain_map_source_desc_get_name (desc);
gtk_tree_store_append (store, &parent, NULL);
gtk_tree_store_set (store, &parent, COL_ID, id,
@@ -213,7 +213,7 @@ build_combo_box (GtkComboBox *box)
static void
-append_point (ChamplainPathLayer *layer, gdouble lon, gdouble lat)
+append_point (ChamplainPathLayer *layer, double lon, double lat)
{
ChamplainCoordinate *coord;
@@ -230,7 +230,7 @@ export_png (GtkButton *button,
GdkPixbuf *pixbuf;
GFileOutputStream *os;
GFile *file;
- gint width, height;
+ int width, height;
if (champlain_view_get_state (view) != CHAMPLAIN_STATE_DONE)
return;
diff --git a/demos/launcher.c b/demos/launcher.c
index 4d41191..35a75f4 100644
--- a/demos/launcher.c
+++ b/demos/launcher.c
@@ -26,12 +26,12 @@
static void
map_view_button_release_cb (GtkGestureClick *gesture,
- gint n_press,
- gdouble x,
- gdouble y,
+ int n_press,
+ double x,
+ double y,
ShumateView *view)
{
- gdouble lat, lon;
+ double lat, lon;
ShumateViewport *viewport;
viewport = shumate_view_get_viewport (view);
diff --git a/demos/polygons.c b/demos/polygons.c
index f970176..4678e24 100644
--- a/demos/polygons.c
+++ b/demos/polygons.c
@@ -47,7 +47,7 @@ make_button (char *text)
ClutterActor *button, *button_bg, *button_text;
ClutterColor white = { 0xff, 0xff, 0xff, 0xff };
ClutterColor black = { 0x00, 0x00, 0x00, 0xff };
- gfloat width, height;
+ float width, height;
button = clutter_actor_new ();
@@ -69,7 +69,7 @@ make_button (char *text)
static void
-append_point (ShumatePathLayer *layer, gdouble lon, gdouble lat)
+append_point (ShumatePathLayer *layer, double lon, double lat)
{
ShumateCoordinate *coord;
@@ -84,7 +84,7 @@ main (int argc,
{
ClutterActor *actor, *stage, *buttons, *button;
ShumatePathLayer *layer;
- gfloat width, total_width = 0;;
+ float width, total_width = 0;;
GList *dash = NULL;
if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
diff --git a/demos/url-marker.c b/demos/url-marker.c
index b2301f4..085be78 100644
--- a/demos/url-marker.c
+++ b/demos/url-marker.c
@@ -26,8 +26,8 @@ typedef struct
{
SoupMessage *message;
ShumateMarkerLayer *layer;
- gdouble latitude;
- gdouble longitude;
+ double latitude;
+ double longitude;
} MarkerData;
@@ -50,7 +50,7 @@ image_downloaded_cb (GObject *source_object,
g_autoptr(GdkPixbuf) pixbuf = NULL;
g_autoptr(ShumateMarkerLayer) layer = g_steal_pointer (&marker_data->layer);
g_autoptr(SoupMessage) message = g_steal_pointer (&marker_data->message);
- g_autofree gchar *url = soup_uri_to_string (soup_message_get_uri (message), FALSE);
+ g_autofree char *url = soup_uri_to_string (soup_message_get_uri (message), FALSE);
ShumateMarker *marker = NULL;
guint status_code = 0;
@@ -92,9 +92,9 @@ image_downloaded_cb (GObject *source_object,
static void
create_marker_from_url (ShumateMarkerLayer *layer,
SoupSession *session,
- gdouble latitude,
- gdouble longitude,
- const gchar *url)
+ double latitude,
+ double longitude,
+ const char *url)
{
MarkerData *data;
diff --git a/shumate/shumate-bounding-box.c b/shumate/shumate-bounding-box.c
index e2c0946..3f8d5b1 100644
--- a/shumate/shumate-bounding-box.c
+++ b/shumate/shumate-bounding-box.c
@@ -103,8 +103,8 @@ shumate_bounding_box_free (ShumateBoundingBox *bbox)
*/
void
shumate_bounding_box_get_center (ShumateBoundingBox *bbox,
- gdouble *latitude,
- gdouble *longitude)
+ double *latitude,
+ double *longitude)
{
g_return_if_fail (SHUMATE_BOUNDING_BOX (bbox));
@@ -122,7 +122,7 @@ shumate_bounding_box_get_center (ShumateBoundingBox *bbox,
*/
void
shumate_bounding_box_compose (ShumateBoundingBox *bbox,
- ShumateBoundingBox *other)
+ ShumateBoundingBox *other)
{
g_return_if_fail (SHUMATE_BOUNDING_BOX (bbox));
@@ -151,7 +151,8 @@ shumate_bounding_box_compose (ShumateBoundingBox *bbox,
*/
void
shumate_bounding_box_extend (ShumateBoundingBox *bbox,
- gdouble latitude, gdouble longitude)
+ double latitude,
+ double longitude)
{
g_return_if_fail (SHUMATE_BOUNDING_BOX (bbox));
@@ -201,8 +202,8 @@ shumate_bounding_box_is_valid (ShumateBoundingBox *bbox)
*/
gboolean
shumate_bounding_box_covers(ShumateBoundingBox *bbox,
- gdouble latitude,
- gdouble longitude)
+ double latitude,
+ double longitude)
{
g_return_val_if_fail (SHUMATE_BOUNDING_BOX (bbox), FALSE);
diff --git a/shumate/shumate-bounding-box.h b/shumate/shumate-bounding-box.h
index 2b6c536..0ead8be 100644
--- a/shumate/shumate-bounding-box.h
+++ b/shumate/shumate-bounding-box.h
@@ -44,10 +44,10 @@ typedef struct _ShumateBoundingBox ShumateBoundingBox;
struct _ShumateBoundingBox
{
/*< public >*/
- gdouble left;
- gdouble top;
- gdouble right;
- gdouble bottom;
+ double left;
+ double top;
+ double right;
+ double bottom;
};
GType shumate_bounding_box_get_type (void) G_GNUC_CONST;
@@ -60,21 +60,21 @@ ShumateBoundingBox *shumate_bounding_box_copy (const ShumateBoundingBox *bbox);
void shumate_bounding_box_free (ShumateBoundingBox *bbox);
void shumate_bounding_box_get_center (ShumateBoundingBox *bbox,
- gdouble *latitude,
- gdouble *longitude);
+ double *latitude,
+ double *longitude);
void shumate_bounding_box_compose (ShumateBoundingBox *bbox,
- ShumateBoundingBox *other);
+ ShumateBoundingBox *other);
void shumate_bounding_box_extend (ShumateBoundingBox *bbox,
- gdouble latitude,
- gdouble longitude);
+ double latitude,
+ double longitude);
gboolean shumate_bounding_box_is_valid (ShumateBoundingBox *bbox);
gboolean shumate_bounding_box_covers(ShumateBoundingBox *bbox,
- gdouble latitude,
- gdouble longitude);
+ double latitude,
+ double longitude);
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ShumateBoundingBox, shumate_bounding_box_free)
diff --git a/shumate/shumate-coordinate.c b/shumate/shumate-coordinate.c
index 9c58bc7..b8f24d0 100644
--- a/shumate/shumate-coordinate.c
+++ b/shumate/shumate-coordinate.c
@@ -32,29 +32,28 @@
enum
{
- PROP_0,
- PROP_LONGITUDE,
+ PROP_LONGITUDE = 1,
PROP_LATITUDE,
};
static void set_location (ShumateLocation *location,
- gdouble latitude,
- gdouble longitude);
-static gdouble get_latitude (ShumateLocation *location);
-static gdouble get_longitude (ShumateLocation *location);
+ double latitude,
+ double longitude);
+static double get_latitude (ShumateLocation *location);
+static double get_longitude (ShumateLocation *location);
static void location_interface_init (ShumateLocationInterface *iface);
typedef struct
{
- gdouble longitude;
- gdouble latitude;
+ double longitude;
+ double latitude;
} ShumateCoordinatePrivate;
G_DEFINE_TYPE_WITH_CODE (ShumateCoordinate, shumate_coordinate, G_TYPE_INITIALLY_UNOWNED,
- G_ADD_PRIVATE (ShumateCoordinate)
- G_IMPLEMENT_INTERFACE (SHUMATE_TYPE_LOCATION, location_interface_init));
+ G_ADD_PRIVATE (ShumateCoordinate)
+ G_IMPLEMENT_INTERFACE (SHUMATE_TYPE_LOCATION, location_interface_init));
static void
shumate_coordinate_get_property (GObject *object,
@@ -94,14 +93,14 @@ shumate_coordinate_set_property (GObject *object,
{
case PROP_LONGITUDE:
{
- gdouble longitude = g_value_get_double (value);
+ double longitude = g_value_get_double (value);
set_location (SHUMATE_LOCATION (coordinate), priv->latitude, longitude);
break;
}
case PROP_LATITUDE:
{
- gdouble latitude = g_value_get_double (value);
+ double latitude = g_value_get_double (value);
set_location (SHUMATE_LOCATION (coordinate), latitude, priv->longitude);
break;
}
@@ -114,8 +113,8 @@ shumate_coordinate_set_property (GObject *object,
static void
set_location (ShumateLocation *location,
- gdouble latitude,
- gdouble longitude)
+ double latitude,
+ double longitude)
{
ShumateCoordinate *coordinate = SHUMATE_COORDINATE (location);
ShumateCoordinatePrivate *priv = shumate_coordinate_get_instance_private (coordinate);
@@ -130,7 +129,7 @@ set_location (ShumateLocation *location,
}
-static gdouble
+static double
get_latitude (ShumateLocation *location)
{
ShumateCoordinate *coordinate = SHUMATE_COORDINATE (location);
@@ -142,7 +141,7 @@ get_latitude (ShumateLocation *location)
}
-static gdouble
+static double
get_longitude (ShumateLocation *location)
{
ShumateCoordinate *coordinate = SHUMATE_COORDINATE (location);
@@ -214,8 +213,8 @@ shumate_coordinate_new ()
* Returns: the created instance.
*/
ShumateCoordinate *
-shumate_coordinate_new_full (gdouble latitude,
- gdouble longitude)
+shumate_coordinate_new_full (double latitude,
+ double longitude)
{
return SHUMATE_COORDINATE (g_object_new (SHUMATE_TYPE_COORDINATE,
"latitude", latitude,
diff --git a/shumate/shumate-coordinate.h b/shumate/shumate-coordinate.h
index 049b416..d179c52 100644
--- a/shumate/shumate-coordinate.h
+++ b/shumate/shumate-coordinate.h
@@ -47,8 +47,8 @@ struct _ShumateCoordinateClass
ShumateCoordinate *shumate_coordinate_new (void);
-ShumateCoordinate *shumate_coordinate_new_full (gdouble latitude,
- gdouble longitude);
+ShumateCoordinate *shumate_coordinate_new_full (double latitude,
+ double longitude);
G_END_DECLS
diff --git a/shumate/shumate-debug.c b/shumate/shumate-debug.c
index 9bb2e29..4cc1f96 100644
--- a/shumate/shumate-debug.c
+++ b/shumate/shumate-debug.c
@@ -54,7 +54,7 @@ debug_set_flags (ShumateDebugFlags new_flags)
void
-shumate_debug_set_flags (const gchar *flags_string)
+shumate_debug_set_flags (const char *flags_string)
{
guint nkeys;
@@ -75,7 +75,7 @@ shumate_debug_flag_is_set (ShumateDebugFlags flag)
void
shumate_debug (ShumateDebugFlags flag,
- const gchar *format,
+ const char *format,
...)
{
if (flag & flags)
@@ -98,13 +98,13 @@ shumate_debug_flag_is_set (ShumateDebugFlags flag)
void
-shumate_debug (ShumateDebugFlags flag, const gchar *format, ...)
+shumate_debug (ShumateDebugFlags flag, const char *format, ...)
{
}
void
-shumate_debug_set_flags (const gchar *flags_string)
+shumate_debug_set_flags (const char *flags_string)
{
}
diff --git a/shumate/shumate-debug.h b/shumate/shumate-debug.h
index fbacdd3..97b50a3 100644
--- a/shumate/shumate-debug.h
+++ b/shumate/shumate-debug.h
@@ -42,9 +42,9 @@ typedef enum
gboolean shumate_debug_flag_is_set (ShumateDebugFlags flag);
void shumate_debug (ShumateDebugFlags flag,
- const gchar *format,
+ const char *format,
...) G_GNUC_PRINTF (2, 3);
-void shumate_debug_set_flags (const gchar *flags_string);
+void shumate_debug_set_flags (const char *flags_string);
G_END_DECLS
#endif /* __SHUMATE_DEBUG_H__ */
diff --git a/shumate/shumate-file-cache.c b/shumate/shumate-file-cache.c
index d0eb995..ceb5f65 100644
--- a/shumate/shumate-file-cache.c
+++ b/shumate/shumate-file-cache.c
@@ -49,7 +49,7 @@ enum
typedef struct
{
guint size_limit;
- gchar *cache_dir;
+ char *cache_dir;
sqlite3 *db;
sqlite3_stmt *stmt_select;
@@ -60,13 +60,13 @@ G_DEFINE_TYPE_WITH_PRIVATE (ShumateFileCache, shumate_file_cache, SHUMATE_TYPE_T
static void finalize_sql (ShumateFileCache *file_cache);
static void init_cache (ShumateFileCache *file_cache);
-static gchar *get_filename (ShumateFileCache *file_cache,
+static char *get_filename (ShumateFileCache *file_cache,
ShumateTile *tile);
static gboolean tile_is_expired (ShumateFileCache *file_cache,
ShumateTile *tile);
static void delete_tile (ShumateFileCache *file_cache,
- const gchar *filename);
-static gboolean create_cache_dir (const gchar *dir_name);
+ const char *filename);
+static gboolean create_cache_dir (const char *dir_name);
static void fill_tile (ShumateMapSource *map_source,
ShumateTile *tile,
@@ -74,7 +74,7 @@ static void fill_tile (ShumateMapSource *map_source,
static void store_tile (ShumateTileCache *tile_cache,
ShumateTile *tile,
- const gchar *contents,
+ const char *contents,
gsize size);
static void refresh_tile_time (ShumateTileCache *tile_cache,
ShumateTile *tile);
@@ -141,7 +141,7 @@ finalize_sql (ShumateFileCache *file_cache)
if (priv->db)
{
- gint error = sqlite3_close (priv->db);
+ int error = sqlite3_close (priv->db);
if (error != SQLITE_OK)
DEBUG ("Sqlite returned error %d when closing cache.db", error);
priv->db = NULL;
@@ -164,7 +164,7 @@ shumate_file_cache_finalize (GObject *object)
static gboolean
-create_cache_dir (const gchar *dir_name)
+create_cache_dir (const char *dir_name)
{
/* If needed, create the cache's dirs */
if (dir_name)
@@ -184,8 +184,8 @@ static void
init_cache (ShumateFileCache *file_cache)
{
ShumateFileCachePrivate *priv = shumate_file_cache_get_instance_private (file_cache);
- gchar *filename = NULL;
- gchar *error_msg = NULL;
+ char *filename = NULL;
+ char *error_msg = NULL;
gint error;
g_return_if_fail (create_cache_dir (priv->cache_dir));
@@ -347,7 +347,7 @@ shumate_file_cache_init (ShumateFileCache *file_cache)
*/
ShumateFileCache *
shumate_file_cache_new_full (guint size_limit,
- const gchar *cache_dir)
+ const char *cache_dir)
{
ShumateFileCache *cache;
@@ -386,7 +386,7 @@ shumate_file_cache_get_size_limit (ShumateFileCache *file_cache)
*
* Returns: the directory
*/
-const gchar *
+const char *
shumate_file_cache_get_cache_dir (ShumateFileCache *file_cache)
{
ShumateFileCachePrivate *priv = shumate_file_cache_get_instance_private (file_cache);
@@ -417,7 +417,7 @@ shumate_file_cache_set_size_limit (ShumateFileCache *file_cache,
}
-static gchar *
+static char *
get_filename (ShumateFileCache *file_cache,
ShumateTile *tile)
{
@@ -429,7 +429,7 @@ get_filename (ShumateFileCache *file_cache,
ShumateMapSource *map_source = SHUMATE_MAP_SOURCE (file_cache);
- gchar *filename = g_strdup_printf ("%s" G_DIR_SEPARATOR_S
+ char *filename = g_strdup_printf ("%s" G_DIR_SEPARATOR_S
"%s" G_DIR_SEPARATOR_S
"%d" G_DIR_SEPARATOR_S
"%d" G_DIR_SEPARATOR_S "%d.png",
@@ -499,7 +499,7 @@ on_pixbuf_created (GObject *source_object,
g_autoptr(GdkTexture) texture = NULL;
g_autoptr(GError) error = NULL;
g_autoptr(GFile) file = NULL;
- g_autofree gchar *filename = NULL;
+ g_autofree char *filename = NULL;
g_autoptr(GFileInfo) info = NULL;
pixbuf = gdk_pixbuf_new_from_stream_finish (res, &error);
@@ -547,7 +547,7 @@ on_pixbuf_created (GObject *source_object,
sql_rc = sqlite3_step (priv->stmt_select);
if (sql_rc == SQLITE_ROW)
{
- const gchar *etag = (const gchar *) sqlite3_column_text (priv->stmt_select, 0);
+ const char *etag = (const char *) sqlite3_column_text (priv->stmt_select, 0);
shumate_tile_set_etag (SHUMATE_TILE (tile), etag);
}
else if (sql_rc == SQLITE_DONE)
@@ -599,7 +599,7 @@ on_file_loaded (GObject *source_object,
input_stream = G_INPUT_STREAM (g_file_read_finish (G_FILE (source_object), res, &error));
if (!input_stream)
{
- g_autofree gchar *path = g_file_get_path (G_FILE (source_object));
+ g_autofree char *path = g_file_get_path (G_FILE (source_object));
ShumateMapSource *next_source = shumate_map_source_get_next_source (SHUMATE_MAP_SOURCE (self));
DEBUG ("Failed to load tile %s, error: %s", path, error->message);
@@ -633,7 +633,7 @@ fill_tile (ShumateMapSource *map_source,
{
FileLoadedData *user_data;
g_autoptr(GFile) file = NULL;
- g_autofree gchar *filename = NULL;
+ g_autofree char *filename = NULL;
filename = get_filename (self, tile);
file = g_file_new_for_path (filename);
@@ -667,7 +667,7 @@ refresh_tile_time (ShumateTileCache *tile_cache,
ShumateMapSource *map_source = SHUMATE_MAP_SOURCE (tile_cache);
ShumateMapSource *next_source = shumate_map_source_get_next_source (map_source);
ShumateFileCache *file_cache = SHUMATE_FILE_CACHE (tile_cache);
- gchar *filename = NULL;
+ char *filename = NULL;
GFile *file;
GFileInfo *info;
@@ -699,7 +699,7 @@ refresh_tile_time (ShumateTileCache *tile_cache,
static void
store_tile (ShumateTileCache *tile_cache,
ShumateTile *tile,
- const gchar *contents,
+ const char *contents,
gsize size)
{
g_return_if_fail (SHUMATE_IS_FILE_CACHE (tile_cache));
@@ -708,10 +708,10 @@ store_tile (ShumateTileCache *tile_cache,
ShumateMapSource *next_source = shumate_map_source_get_next_source (map_source);
ShumateFileCache *file_cache = SHUMATE_FILE_CACHE (tile_cache);
ShumateFileCachePrivate *priv = shumate_file_cache_get_instance_private (file_cache);
- gchar *query = NULL;
- gchar *error = NULL;
- gchar *path = NULL;
- gchar *filename = NULL;
+ char *query = NULL;
+ char *error = NULL;
+ char *path = NULL;
+ char *filename = NULL;
GError *gerror = NULL;
GFile *file;
GFileOutputStream *ostream;
@@ -790,7 +790,7 @@ on_tile_filled (ShumateTileCache *tile_cache,
ShumateFileCache *file_cache = SHUMATE_FILE_CACHE (tile_cache);
ShumateFileCachePrivate *priv = shumate_file_cache_get_instance_private (file_cache);
int sql_rc = SQLITE_OK;
- gchar *filename = NULL;
+ char *filename = NULL;
filename = get_filename (file_cache, tile);
@@ -820,12 +820,12 @@ call_next:
static void
-delete_tile (ShumateFileCache *file_cache, const gchar *filename)
+delete_tile (ShumateFileCache *file_cache, const char *filename)
{
ShumateFileCachePrivate *priv = shumate_file_cache_get_instance_private (file_cache);
g_return_if_fail (SHUMATE_IS_FILE_CACHE (file_cache));
- gchar *query, *error = NULL;
+ char *query, *error = NULL;
GError *gerror = NULL;
GFile *file;
@@ -887,12 +887,12 @@ shumate_file_cache_purge (ShumateFileCache *file_cache)
g_return_if_fail (SHUMATE_IS_FILE_CACHE (file_cache));
- gchar *query;
+ char *query;
sqlite3_stmt *stmt;
int rc = 0;
guint current_size = 0;
guint highest_popularity = 0;
- gchar *error;
+ char *error;
query = "SELECT SUM (size) FROM tiles";
rc = sqlite3_prepare (priv->db, query, strlen (query), &stmt, NULL);
diff --git a/shumate/shumate-file-cache.h b/shumate/shumate-file-cache.h
index 6072bbb..b187bfa 100644
--- a/shumate/shumate-file-cache.h
+++ b/shumate/shumate-file-cache.h
@@ -46,13 +46,13 @@ struct _ShumateFileCacheClass
};
ShumateFileCache *shumate_file_cache_new_full (guint size_limit,
- const gchar *cache_dir);
+ const char *cache_dir);
guint shumate_file_cache_get_size_limit (ShumateFileCache *file_cache);
void shumate_file_cache_set_size_limit (ShumateFileCache *file_cache,
guint size_limit);
-const gchar *shumate_file_cache_get_cache_dir (ShumateFileCache *file_cache);
+const char *shumate_file_cache_get_cache_dir (ShumateFileCache *file_cache);
void shumate_file_cache_purge (ShumateFileCache *file_cache);
void shumate_file_cache_purge_on_idle (ShumateFileCache *file_cache);
diff --git a/shumate/shumate-license.c b/shumate/shumate-license.c
index 6725192..c2e21db 100644
--- a/shumate/shumate-license.c
+++ b/shumate/shumate-license.c
@@ -229,7 +229,7 @@ shumate_license_new (void)
*/
void
shumate_license_set_extra_text (ShumateLicense *license,
- const gchar *text)
+ const char *text)
{
g_return_if_fail (SHUMATE_IS_LICENSE (license));
@@ -248,7 +248,7 @@ shumate_license_set_extra_text (ShumateLicense *license,
*
* Returns: the additional license text
*/
-const gchar *
+const char *
shumate_license_get_extra_text (ShumateLicense *license)
{
g_return_val_if_fail (SHUMATE_IS_LICENSE (license), NULL);
@@ -266,7 +266,7 @@ shumate_license_get_extra_text (ShumateLicense *license)
*/
void
shumate_license_set_xalign (ShumateLicense *license,
- gfloat xalign)
+ float xalign)
{
g_return_if_fail (SHUMATE_IS_LICENSE (license));
@@ -285,7 +285,7 @@ shumate_license_set_xalign (ShumateLicense *license,
*
* Returns: the license's text horizontal alignment.
*/
-gfloat
+float
shumate_license_get_xalign (ShumateLicense *license)
{
g_return_val_if_fail (SHUMATE_IS_LICENSE (license), 1.0f);
diff --git a/shumate/shumate-license.h b/shumate/shumate-license.h
index 1e1f5e4..8e800f5 100644
--- a/shumate/shumate-license.h
+++ b/shumate/shumate-license.h
@@ -44,12 +44,12 @@ G_DECLARE_FINAL_TYPE (ShumateLicense, shumate_license, SHUMATE, LICENSE, GtkWidg
ShumateLicense *shumate_license_new (void);
void shumate_license_set_extra_text (ShumateLicense *license,
- const gchar *text);
-const gchar *shumate_license_get_extra_text (ShumateLicense *license);
+ const char *text);
+const char *shumate_license_get_extra_text (ShumateLicense *license);
void shumate_license_set_xalign (ShumateLicense *license,
- gfloat xalign);
-gfloat shumate_license_get_xalign (ShumateLicense *license);
+ float xalign);
+float shumate_license_get_xalign (ShumateLicense *license);
void shumate_license_append_map_source (ShumateLicense *license,
ShumateMapSource *map_source);
diff --git a/shumate/shumate-location.c b/shumate/shumate-location.c
index e42fe0b..98e21ac 100644
--- a/shumate/shumate-location.c
+++ b/shumate/shumate-location.c
@@ -72,8 +72,8 @@ shumate_location_default_init (ShumateLocationInterface *iface)
*/
void
shumate_location_set_location (ShumateLocation *location,
- gdouble latitude,
- gdouble longitude)
+ double latitude,
+ double longitude)
{
SHUMATE_LOCATION_GET_IFACE (location)->set_location (location,
latitude,
@@ -89,7 +89,7 @@ shumate_location_set_location (ShumateLocation *location,
*
* Returns: the latitude coordinate in degrees.
*/
-gdouble
+double
shumate_location_get_latitude (ShumateLocation *location)
{
return SHUMATE_LOCATION_GET_IFACE (location)->get_latitude (location);
@@ -104,7 +104,7 @@ shumate_location_get_latitude (ShumateLocation *location)
*
* Returns: the longitude coordinate in degrees.
*/
-gdouble
+double
shumate_location_get_longitude (ShumateLocation *location)
{
return SHUMATE_LOCATION_GET_IFACE (location)->get_longitude (location);
diff --git a/shumate/shumate-location.h b/shumate/shumate-location.h
index 5da01f0..0f29c1a 100644
--- a/shumate/shumate-location.h
+++ b/shumate/shumate-location.h
@@ -56,18 +56,18 @@ struct _ShumateLocationInterface
GTypeInterface g_iface;
/*< public >*/
- gdouble (*get_latitude)(ShumateLocation *location);
- gdouble (*get_longitude)(ShumateLocation *location);
+ double (*get_latitude)(ShumateLocation *location);
+ double (*get_longitude)(ShumateLocation *location);
void (*set_location)(ShumateLocation *location,
- gdouble latitude,
- gdouble longitude);
+ double latitude,
+ double longitude);
};
void shumate_location_set_location (ShumateLocation *location,
- gdouble latitude,
- gdouble longitude);
-gdouble shumate_location_get_latitude (ShumateLocation *location);
-gdouble shumate_location_get_longitude (ShumateLocation *location);
+ double latitude,
+ double longitude);
+double shumate_location_get_latitude (ShumateLocation *location);
+double shumate_location_get_longitude (ShumateLocation *location);
G_END_DECLS
diff --git a/shumate/shumate-map-layer.c b/shumate/shumate-map-layer.c
index f89fde0..9ce6c42 100644
--- a/shumate/shumate-map-layer.c
+++ b/shumate/shumate-map-layer.c
@@ -95,13 +95,13 @@ shumate_map_layer_compute_grid (ShumateMapLayer *self)
{
guint tile_size;
guint zoom_level;
- gdouble center_latitude, center_longitude;
+ double center_latitude, center_longitude;
guint center_x, center_y;
- gint x_offset, y_offset;
+ int x_offset, y_offset;
guint tile_x, tile_y;
guint tile_initial_x, tile_initial_y;
guint source_rows, source_columns;
- gint width, height;
+ int width, height;
GtkAllocation child_allocation;
ShumateViewport *viewport;
@@ -130,11 +130,11 @@ shumate_map_layer_compute_grid (ShumateMapLayer *self)
child_allocation.height = tile_size;
tile_x = tile_initial_x;
- for (gint x = 0; x < self->required_tiles_x; x++)
+ for (int x = 0; x < self->required_tiles_x; x++)
{
child_allocation.y = -y_offset;
tile_y = tile_initial_y;
- for (gint y = 0; y < self->required_tiles_y; y++)
+ for (int y = 0; y < self->required_tiles_y; y++)
{
TileGridPosition *tile_child;
ShumateTile *child;
diff --git a/shumate/shumate-map-source-chain.c b/shumate/shumate-map-source-chain.c
index c187cb1..6564dd2 100644
--- a/shumate/shumate-map-source-chain.c
+++ b/shumate/shumate-map-source-chain.c
@@ -43,10 +43,10 @@ typedef struct
G_DEFINE_TYPE_WITH_PRIVATE (ShumateMapSourceChain, shumate_map_source_chain, SHUMATE_TYPE_MAP_SOURCE);
-static const gchar *get_id (ShumateMapSource *map_source);
-static const gchar *get_name (ShumateMapSource *map_source);
-static const gchar *get_license (ShumateMapSource *map_source);
-static const gchar *get_license_uri (ShumateMapSource *map_source);
+static const char *get_id (ShumateMapSource *map_source);
+static const char *get_name (ShumateMapSource *map_source);
+static const char *get_license (ShumateMapSource *map_source);
+static const char *get_license_uri (ShumateMapSource *map_source);
static guint get_min_zoom_level (ShumateMapSource *map_source);
static guint get_max_zoom_level (ShumateMapSource *map_source);
static guint get_tile_size (ShumateMapSource *map_source);
@@ -112,7 +112,7 @@ shumate_map_source_chain_new (void)
}
-static const gchar *
+static const char *
get_id (ShumateMapSource *map_source)
{
ShumateMapSourceChain *source_chain = SHUMATE_MAP_SOURCE_CHAIN (map_source);
@@ -125,7 +125,7 @@ get_id (ShumateMapSource *map_source)
}
-static const gchar *
+static const char *
get_name (ShumateMapSource *map_source)
{
ShumateMapSourceChain *source_chain = SHUMATE_MAP_SOURCE_CHAIN (map_source);
@@ -138,7 +138,7 @@ get_name (ShumateMapSource *map_source)
}
-static const gchar *
+static const char *
get_license (ShumateMapSource *map_source)
{
ShumateMapSourceChain *source_chain = SHUMATE_MAP_SOURCE_CHAIN (map_source);
@@ -151,7 +151,7 @@ get_license (ShumateMapSource *map_source)
}
-static const gchar *
+static const char *
get_license_uri (ShumateMapSource *map_source)
{
ShumateMapSourceChain *source_chain = SHUMATE_MAP_SOURCE_CHAIN (map_source);
diff --git a/shumate/shumate-map-source-desc.c b/shumate/shumate-map-source-desc.c
index 75e6d34..53c64cf 100644
--- a/shumate/shumate-map-source-desc.c
+++ b/shumate/shumate-map-source-desc.c
@@ -49,11 +49,11 @@ struct _ShumateMapSourceDesc
{
GObject parent_instance;
- gchar *id;
- gchar *name;
- gchar *license;
- gchar *license_uri;
- gchar *uri_format;
+ char *id;
+ char *name;
+ char *license;
+ char *license_uri;
+ char *uri_format;
guint min_zoom_level;
guint max_zoom_level;
guint tile_size;
@@ -65,15 +65,15 @@ struct _ShumateMapSourceDesc
G_DEFINE_TYPE (ShumateMapSourceDesc, shumate_map_source_desc, G_TYPE_OBJECT);
static void set_id (ShumateMapSourceDesc *desc,
- const gchar *id);
+ const char *id);
static void set_name (ShumateMapSourceDesc *desc,
- const gchar *name);
+ const char *name);
static void set_license (ShumateMapSourceDesc *desc,
- const gchar *license);
+ const char *license);
static void set_license_uri (ShumateMapSourceDesc *desc,
- const gchar *license_uri);
+ const char *license_uri);
static void set_uri_format (ShumateMapSourceDesc *desc,
- const gchar *uri_format);
+ const char *uri_format);
static void set_min_zoom_level (ShumateMapSourceDesc *desc,
guint zoom_level);
static void set_max_zoom_level (ShumateMapSourceDesc *desc,
@@ -418,15 +418,15 @@ shumate_map_source_desc_init (ShumateMapSourceDesc *desc)
*/
ShumateMapSourceDesc *
shumate_map_source_desc_new_full (
- gchar *id,
- gchar *name,
- gchar *license,
- gchar *license_uri,
+ char *id,
+ char *name,
+ char *license,
+ char *license_uri,
guint min_zoom,
guint max_zoom,
guint tile_size,
ShumateMapProjection projection,
- gchar *uri_format,
+ char *uri_format,
ShumateMapSourceConstructor constructor,
gpointer data)
{
@@ -454,7 +454,7 @@ shumate_map_source_desc_new_full (
*
* Returns: the map source's id.
*/
-const gchar *
+const char *
shumate_map_source_desc_get_id (ShumateMapSourceDesc *desc)
{
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE_DESC (desc), NULL);
@@ -471,7 +471,7 @@ shumate_map_source_desc_get_id (ShumateMapSourceDesc *desc)
*
* Returns: the map source's name.
*/
-const gchar *
+const char *
shumate_map_source_desc_get_name (ShumateMapSourceDesc *desc)
{
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE_DESC (desc), NULL);
@@ -488,7 +488,7 @@ shumate_map_source_desc_get_name (ShumateMapSourceDesc *desc)
*
* Returns: the map source's license.
*/
-const gchar *
+const char *
shumate_map_source_desc_get_license (ShumateMapSourceDesc *desc)
{
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE_DESC (desc), NULL);
@@ -505,7 +505,7 @@ shumate_map_source_desc_get_license (ShumateMapSourceDesc *desc)
*
* Returns: the map source's license URI.
*/
-const gchar *
+const char *
shumate_map_source_desc_get_license_uri (ShumateMapSourceDesc *desc)
{
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE_DESC (desc), NULL);
@@ -522,7 +522,7 @@ shumate_map_source_desc_get_license_uri (ShumateMapSourceDesc *desc)
*
* Returns: the URI format.
*/
-const gchar *
+const char *
shumate_map_source_desc_get_uri_format (ShumateMapSourceDesc *desc)
{
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE_DESC (desc), NULL);
@@ -635,7 +635,7 @@ shumate_map_source_desc_get_constructor (ShumateMapSourceDesc *desc)
static void
set_id (ShumateMapSourceDesc *desc,
- const gchar *id)
+ const char *id)
{
g_return_if_fail (SHUMATE_IS_MAP_SOURCE_DESC (desc));
@@ -648,7 +648,7 @@ set_id (ShumateMapSourceDesc *desc,
static void
set_name (ShumateMapSourceDesc *desc,
- const gchar *name)
+ const char *name)
{
g_return_if_fail (SHUMATE_IS_MAP_SOURCE_DESC (desc));
@@ -661,7 +661,7 @@ set_name (ShumateMapSourceDesc *desc,
static void
set_license (ShumateMapSourceDesc *desc,
- const gchar *license)
+ const char *license)
{
g_return_if_fail (SHUMATE_IS_MAP_SOURCE_DESC (desc));
@@ -674,7 +674,7 @@ set_license (ShumateMapSourceDesc *desc,
static void
set_license_uri (ShumateMapSourceDesc *desc,
- const gchar *license_uri)
+ const char *license_uri)
{
g_return_if_fail (SHUMATE_IS_MAP_SOURCE_DESC (desc));
@@ -687,7 +687,7 @@ set_license_uri (ShumateMapSourceDesc *desc,
static void
set_uri_format (ShumateMapSourceDesc *desc,
- const gchar *uri_format)
+ const char *uri_format)
{
g_return_if_fail (SHUMATE_IS_MAP_SOURCE_DESC (desc));
diff --git a/shumate/shumate-map-source-desc.h b/shumate/shumate-map-source-desc.h
index e1b28a6..636b9ef 100644
--- a/shumate/shumate-map-source-desc.h
+++ b/shumate/shumate-map-source-desc.h
@@ -59,23 +59,23 @@ typedef ShumateMapSource* (*ShumateMapSourceConstructor) (ShumateMapSourceDesc *
#define SHUMATE_MAP_SOURCE_CONSTRUCTOR (f) ((ShumateMapSourceConstructor) (f))
ShumateMapSourceDesc *shumate_map_source_desc_new_full (
- gchar *id,
- gchar *name,
- gchar *license,
- gchar *license_uri,
+ char *id,
+ char *name,
+ char *license,
+ char *license_uri,
guint min_zoom,
guint max_zoom,
guint tile_size,
ShumateMapProjection projection,
- gchar *uri_format,
+ char *uri_format,
ShumateMapSourceConstructor constructor,
gpointer data);
-const gchar *shumate_map_source_desc_get_id (ShumateMapSourceDesc *desc);
-const gchar *shumate_map_source_desc_get_name (ShumateMapSourceDesc *desc);
-const gchar *shumate_map_source_desc_get_license (ShumateMapSourceDesc *desc);
-const gchar *shumate_map_source_desc_get_license_uri (ShumateMapSourceDesc *desc);
-const gchar *shumate_map_source_desc_get_uri_format (ShumateMapSourceDesc *desc);
+const char *shumate_map_source_desc_get_id (ShumateMapSourceDesc *desc);
+const char *shumate_map_source_desc_get_name (ShumateMapSourceDesc *desc);
+const char *shumate_map_source_desc_get_license (ShumateMapSourceDesc *desc);
+const char *shumate_map_source_desc_get_license_uri (ShumateMapSourceDesc *desc);
+const char *shumate_map_source_desc_get_uri_format (ShumateMapSourceDesc *desc);
guint shumate_map_source_desc_get_min_zoom_level (ShumateMapSourceDesc *desc);
guint shumate_map_source_desc_get_max_zoom_level (ShumateMapSourceDesc *desc);
guint shumate_map_source_desc_get_tile_size (ShumateMapSourceDesc *desc);
diff --git a/shumate/shumate-map-source-factory.c b/shumate/shumate-map-source-factory.c
index c583f9d..acff662 100644
--- a/shumate/shumate-map-source-factory.c
+++ b/shumate/shumate-map-source-factory.c
@@ -292,7 +292,7 @@ shumate_map_source_factory_get_registered (ShumateMapSourceFactory *factory)
*/
ShumateMapSource *
shumate_map_source_factory_create (ShumateMapSourceFactory *factory,
- const gchar *id)
+ const char *id)
{
GSList *item;
@@ -331,7 +331,7 @@ shumate_map_source_factory_create (ShumateMapSourceFactory *factory,
*/
ShumateMapSource *
shumate_map_source_factory_create_cached_source (ShumateMapSourceFactory *factory,
- const gchar *id)
+ const char *id)
{
ShumateMapSourceChain *source_chain;
ShumateMapSource *tile_source;
@@ -376,7 +376,7 @@ shumate_map_source_factory_create_cached_source (ShumateMapSourceFactory *factor
*/
ShumateMapSource *
shumate_map_source_factory_create_memcached_source (ShumateMapSourceFactory *factory,
- const gchar *id)
+ const char *id)
{
ShumateMapSourceChain *source_chain;
ShumateMapSource *tile_source;
@@ -421,10 +421,10 @@ shumate_map_source_factory_create_error_source (ShumateMapSourceFactory *factory
}
-static gint
+static int
compare_id (ShumateMapSourceDesc *a, ShumateMapSourceDesc *b)
{
- const gchar *id_a, *id_b;
+ const char *id_a, *id_b;
id_a = shumate_map_source_desc_get_id (a);
id_b = shumate_map_source_desc_get_id (b);
@@ -464,7 +464,7 @@ static ShumateMapSource *
shumate_map_source_new_generic (ShumateMapSourceDesc *desc)
{
ShumateMapSource *map_source;
- const gchar *id, *name, *license, *license_uri, *uri_format;
+ const char *id, *name, *license, *license_uri, *uri_format;
guint min_zoom, max_zoom, tile_size;
ShumateMapProjection projection;
diff --git a/shumate/shumate-map-source-factory.h b/shumate/shumate-map-source-factory.h
index ea6b1d6..0927ebb 100644
--- a/shumate/shumate-map-source-factory.h
+++ b/shumate/shumate-map-source-factory.h
@@ -46,11 +46,11 @@ G_DECLARE_FINAL_TYPE (ShumateMapSourceFactory, shumate_map_source_factory, SHUMA
ShumateMapSourceFactory *shumate_map_source_factory_dup_default (void);
ShumateMapSource *shumate_map_source_factory_create (ShumateMapSourceFactory *factory,
- const gchar *id);
+ const char *id);
ShumateMapSource *shumate_map_source_factory_create_cached_source (ShumateMapSourceFactory *factory,
- const gchar *id);
+ const char *id);
ShumateMapSource *shumate_map_source_factory_create_memcached_source (ShumateMapSourceFactory *factory,
- const gchar *id);
+ const char *id);
ShumateMapSource *shumate_map_source_factory_create_error_source (ShumateMapSourceFactory *factory,
guint tile_size);
diff --git a/shumate/shumate-map-source.c b/shumate/shumate-map-source.c
index 94067bb..20a8b81 100644
--- a/shumate/shumate-map-source.c
+++ b/shumate/shumate-map-source.c
@@ -224,7 +224,7 @@ shumate_map_source_set_next_source (ShumateMapSource *map_source,
*
* Returns: the map source's id.
*/
-const gchar *
+const char *
shumate_map_source_get_id (ShumateMapSource *map_source)
{
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE (map_source), NULL);
@@ -241,7 +241,7 @@ shumate_map_source_get_id (ShumateMapSource *map_source)
*
* Returns: the map source's name.
*/
-const gchar *
+const char *
shumate_map_source_get_name (ShumateMapSource *map_source)
{
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE (map_source), NULL);
@@ -258,7 +258,7 @@ shumate_map_source_get_name (ShumateMapSource *map_source)
*
* Returns: the map source's license.
*/
-const gchar *
+const char *
shumate_map_source_get_license (ShumateMapSource *map_source)
{
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE (map_source), NULL);
@@ -275,7 +275,7 @@ shumate_map_source_get_license (ShumateMapSource *map_source)
*
* Returns: the map source's license URI.
*/
-const gchar *
+const char *
shumate_map_source_get_license_uri (ShumateMapSource *map_source)
{
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE (map_source), NULL);
@@ -363,10 +363,10 @@ shumate_map_source_get_projection (ShumateMapSource *map_source)
*
* Returns: the x position
*/
-gdouble
+double
shumate_map_source_get_x (ShumateMapSource *map_source,
guint zoom_level,
- gdouble longitude)
+ double longitude)
{
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE (map_source), 0.0);
@@ -388,10 +388,10 @@ shumate_map_source_get_x (ShumateMapSource *map_source,
*
* Returns: the y position
*/
-gdouble
+double
shumate_map_source_get_y (ShumateMapSource *map_source,
guint zoom_level,
- gdouble latitude)
+ double latitude)
{
double sin_latitude;
@@ -415,16 +415,16 @@ shumate_map_source_get_y (ShumateMapSource *map_source,
*
* Returns: the longitude
*/
-gdouble
+double
shumate_map_source_get_longitude (ShumateMapSource *map_source,
guint zoom_level,
- gdouble x)
+ double x)
{
- gdouble longitude;
+ double longitude;
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE (map_source), 0.0);
/* FIXME: support other projections */
- gdouble dx = x / (gdouble) shumate_map_source_get_tile_size (map_source);
+ double dx = x / (double) shumate_map_source_get_tile_size (map_source);
longitude = dx / pow (2.0, zoom_level) * 360.0 - 180.0;
return CLAMP (longitude, SHUMATE_MIN_LONGITUDE, SHUMATE_MAX_LONGITUDE);
@@ -442,12 +442,12 @@ shumate_map_source_get_longitude (ShumateMapSource *map_source,
*
* Returns: the latitude
*/
-gdouble
+double
shumate_map_source_get_latitude (ShumateMapSource *map_source,
guint zoom_level,
- gdouble y)
+ double y)
{
- gdouble latitude, map_size, dy;
+ double latitude, map_size, dy;
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE (map_source), 0.0);
/* FIXME: support other projections */
@@ -511,11 +511,11 @@ shumate_map_source_get_column_count (ShumateMapSource *map_source,
*
* Returns: the meters per pixel
*/
-gdouble
+double
shumate_map_source_get_meters_per_pixel (ShumateMapSource *map_source,
guint zoom_level,
- gdouble latitude,
- G_GNUC_UNUSED gdouble longitude)
+ double latitude,
+ G_GNUC_UNUSED double longitude)
{
g_return_val_if_fail (SHUMATE_IS_MAP_SOURCE (map_source), 0.0);
@@ -526,7 +526,7 @@ shumate_map_source_get_meters_per_pixel (ShumateMapSource *map_source,
* radius_at_latitude = 2pi * k * sin (pi/2-theta)
*/
- gdouble map_size = shumate_map_source_get_tile_size (map_source) * shumate_map_source_get_row_count
(map_source, zoom_level);
+ double map_size = shumate_map_source_get_tile_size (map_source) * shumate_map_source_get_row_count
(map_source, zoom_level);
/* FIXME: support other projections */
return 2.0 * G_PI * EARTH_RADIUS * sin (G_PI / 2.0 - G_PI / 180.0 * latitude) / map_size;
}
diff --git a/shumate/shumate-map-source.h b/shumate/shumate-map-source.h
index 8823528..4a3326c 100644
--- a/shumate/shumate-map-source.h
+++ b/shumate/shumate-map-source.h
@@ -53,10 +53,10 @@ struct _ShumateMapSourceClass
{
GInitiallyUnownedClass parent_class;
- const gchar * (*get_id)(ShumateMapSource *map_source);
- const gchar * (*get_name)(ShumateMapSource *map_source);
- const gchar * (*get_license)(ShumateMapSource *map_source);
- const gchar * (*get_license_uri)(ShumateMapSource *map_source);
+ const char * (*get_id)(ShumateMapSource *map_source);
+ const char * (*get_name)(ShumateMapSource *map_source);
+ const char * (*get_license)(ShumateMapSource *map_source);
+ const char * (*get_license_uri)(ShumateMapSource *map_source);
guint (*get_min_zoom_level)(ShumateMapSource *map_source);
guint (*get_max_zoom_level)(ShumateMapSource *map_source);
guint (*get_tile_size)(ShumateMapSource *map_source);
@@ -71,35 +71,35 @@ ShumateMapSource *shumate_map_source_get_next_source (ShumateMapSource *map_sour
void shumate_map_source_set_next_source (ShumateMapSource *map_source,
ShumateMapSource *next_source);
-const gchar *shumate_map_source_get_id (ShumateMapSource *map_source);
-const gchar *shumate_map_source_get_name (ShumateMapSource *map_source);
-const gchar *shumate_map_source_get_license (ShumateMapSource *map_source);
-const gchar *shumate_map_source_get_license_uri (ShumateMapSource *map_source);
+const char *shumate_map_source_get_id (ShumateMapSource *map_source);
+const char *shumate_map_source_get_name (ShumateMapSource *map_source);
+const char *shumate_map_source_get_license (ShumateMapSource *map_source);
+const char *shumate_map_source_get_license_uri (ShumateMapSource *map_source);
guint shumate_map_source_get_min_zoom_level (ShumateMapSource *map_source);
guint shumate_map_source_get_max_zoom_level (ShumateMapSource *map_source);
guint shumate_map_source_get_tile_size (ShumateMapSource *map_source);
ShumateMapProjection shumate_map_source_get_projection (ShumateMapSource *map_source);
-gdouble shumate_map_source_get_x (ShumateMapSource *map_source,
+double shumate_map_source_get_x (ShumateMapSource *map_source,
guint zoom_level,
- gdouble longitude);
-gdouble shumate_map_source_get_y (ShumateMapSource *map_source,
+ double longitude);
+double shumate_map_source_get_y (ShumateMapSource *map_source,
guint zoom_level,
- gdouble latitude);
-gdouble shumate_map_source_get_longitude (ShumateMapSource *map_source,
+ double latitude);
+double shumate_map_source_get_longitude (ShumateMapSource *map_source,
guint zoom_level,
- gdouble x);
-gdouble shumate_map_source_get_latitude (ShumateMapSource *map_source,
+ double x);
+double shumate_map_source_get_latitude (ShumateMapSource *map_source,
guint zoom_level,
- gdouble y);
+ double y);
guint shumate_map_source_get_row_count (ShumateMapSource *map_source,
guint zoom_level);
guint shumate_map_source_get_column_count (ShumateMapSource *map_source,
guint zoom_level);
-gdouble shumate_map_source_get_meters_per_pixel (ShumateMapSource *map_source,
+double shumate_map_source_get_meters_per_pixel (ShumateMapSource *map_source,
guint zoom_level,
- gdouble latitude,
- gdouble longitude);
+ double latitude,
+ double longitude);
void shumate_map_source_fill_tile (ShumateMapSource *map_source,
ShumateTile *tile,
diff --git a/shumate/shumate-marker-layer.c b/shumate/shumate-marker-layer.c
index e5236c8..44c838a 100644
--- a/shumate/shumate-marker-layer.c
+++ b/shumate/shumate-marker-layer.c
@@ -77,9 +77,9 @@ set_selected_all_but_one (ShumateMarkerLayer *self,
static void
on_click_gesture_released (ShumateMarkerLayer *self,
- gint n_press,
- gdouble x,
- gdouble y,
+ int n_press,
+ double x,
+ double y,
GtkGestureClick *gesture)
{
ShumateMarkerLayerPrivate *priv = shumate_marker_layer_get_instance_private (self);
@@ -111,9 +111,9 @@ set_marker_position (ShumateMarkerLayer *layer,
{
ShumateViewport *viewport;
ShumateMapSource *map_source;
- gint x, y;
+ int x, y;
int width, height;
- gdouble lon, lat;
+ double lon, lat;
GtkAllocation allocation;
g_assert (SHUMATE_IS_MARKER_LAYER (layer));
@@ -383,14 +383,14 @@ marker_position_notify (ShumateMarker *marker,
static void
marker_move_by_cb (ShumateMarker *marker,
- gdouble dx,
- gdouble dy,
+ double dx,
+ double dy,
GdkEvent *event,
ShumateMarkerLayer *layer)
{
ShumateMarkerLayerPrivate *priv = shumate_marker_layer_get_instance_private (layer);
ShumateView *view = priv->view;
- gdouble x, y, lat, lon;
+ double x, y, lat, lon;
/*x = shumate_view_longitude_to_x (view, shumate_location_get_longitude (SHUMATE_LOCATION (marker)));
y = shumate_view_latitude_to_y (view, shumate_location_get_latitude (SHUMATE_LOCATION (marker)));
diff --git a/shumate/shumate-marker.c b/shumate/shumate-marker.c
index ddccebf..356ed91 100644
--- a/shumate/shumate-marker.c
+++ b/shumate/shumate-marker.c
@@ -67,16 +67,16 @@ static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
typedef struct
{
- gdouble lon;
- gdouble lat;
+ double lon;
+ double lat;
guint selected :1;
gboolean selectable;
gboolean draggable;
- gfloat click_x;
- gfloat click_y;
+ float click_x;
+ float click_y;
gboolean moved;
} ShumateMarkerPrivate;
@@ -152,8 +152,8 @@ shumate_marker_get_selection_text_color ()
static void
shumate_marker_set_location (ShumateLocation *location,
- gdouble latitude,
- gdouble longitude)
+ double latitude,
+ double longitude)
{
ShumateMarker *marker = (ShumateMarker *) location;
ShumateMarkerPrivate *priv = shumate_marker_get_instance_private (marker);
@@ -168,7 +168,7 @@ shumate_marker_set_location (ShumateLocation *location,
}
-static gdouble
+static double
shumate_marker_get_latitude (ShumateLocation *location)
{
ShumateMarker *marker = (ShumateMarker *) location;
@@ -180,7 +180,7 @@ shumate_marker_get_latitude (ShumateLocation *location)
}
-static gdouble
+static double
shumate_marker_get_longitude (ShumateLocation *location)
{
ShumateMarker *marker = (ShumateMarker *) location;
@@ -237,14 +237,14 @@ shumate_marker_set_property (GObject *object,
{
case PROP_LONGITUDE:
{
- gdouble lon = g_value_get_double (value);
+ double lon = g_value_get_double (value);
shumate_marker_set_location (SHUMATE_LOCATION (marker), priv->lat, lon);
break;
}
case PROP_LATITUDE:
{
- gdouble lat = g_value_get_double (value);
+ double lat = g_value_get_double (value);
shumate_marker_set_location (SHUMATE_LOCATION (marker), lat, priv->lon);
break;
}
diff --git a/shumate/shumate-memory-cache.c b/shumate/shumate-memory-cache.c
index b54f7fe..6908f98 100644
--- a/shumate/shumate-memory-cache.c
+++ b/shumate/shumate-memory-cache.c
@@ -52,8 +52,8 @@ G_DEFINE_TYPE_WITH_PRIVATE (ShumateMemoryCache, shumate_memory_cache, SHUMATE_TY
typedef struct
{
- gchar *key;
- gchar *data;
+ char *key;
+ char *data;
guint size;
} QueueMember;
@@ -64,7 +64,7 @@ static void fill_tile (ShumateMapSource *map_source,
static void store_tile (ShumateTileCache *tile_cache,
ShumateTile *tile,
- const gchar *contents,
+ const char *contents,
gsize size);
static void refresh_tile_time (ShumateTileCache *tile_cache,
ShumateTile *tile);
@@ -229,7 +229,7 @@ shumate_memory_cache_set_size_limit (ShumateMemoryCache *memory_cache,
}
-static gchar *
+static char *
generate_queue_key (ShumateMemoryCache *memory_cache,
ShumateTile *tile)
{
@@ -237,7 +237,7 @@ generate_queue_key (ShumateMemoryCache *memory_cache,
g_return_val_if_fail (SHUMATE_IS_TILE (tile), NULL);
ShumateMapSource *map_source = SHUMATE_MAP_SOURCE (memory_cache);
- gchar *key;
+ char *key;
key = g_strdup_printf ("%d/%d/%d/%s",
shumate_tile_get_zoom_level (tile),
@@ -285,7 +285,7 @@ fill_tile (ShumateMapSource *map_source,
ShumateMemoryCache *memory_cache = SHUMATE_MEMORY_CACHE (map_source);
ShumateMemoryCachePrivate *priv = shumate_memory_cache_get_instance_private (memory_cache);
GList *link;
- g_autofree gchar *key = generate_queue_key (memory_cache, tile);
+ g_autofree char *key = generate_queue_key (memory_cache, tile);
link = g_hash_table_lookup (priv->hash_table, key);
if (link)
@@ -332,7 +332,7 @@ fill_tile (ShumateMapSource *map_source,
static void
store_tile (ShumateTileCache *tile_cache,
ShumateTile *tile,
- const gchar *contents,
+ const char *contents,
gsize size)
{
g_return_if_fail (SHUMATE_IS_MEMORY_CACHE (tile_cache));
@@ -342,7 +342,7 @@ store_tile (ShumateTileCache *tile_cache,
ShumateMemoryCache *memory_cache = SHUMATE_MEMORY_CACHE (tile_cache);
ShumateMemoryCachePrivate *priv = shumate_memory_cache_get_instance_private (memory_cache);
GList *link;
- gchar *key;
+ char *key;
key = generate_queue_key (memory_cache, tile);
link = g_hash_table_lookup (priv->hash_table, key);
@@ -420,7 +420,7 @@ on_tile_filled (ShumateTileCache *tile_cache,
ShumateMemoryCache *memory_cache = SHUMATE_MEMORY_CACHE (tile_cache);
ShumateMemoryCachePrivate *priv = shumate_memory_cache_get_instance_private (memory_cache);
GList *link;
- gchar *key;
+ char *key;
key = generate_queue_key (memory_cache, tile);
link = g_hash_table_lookup (priv->hash_table, key);
diff --git a/shumate/shumate-network-tile-source.c b/shumate/shumate-network-tile-source.c
index 5ad0aaf..b9014c3 100644
--- a/shumate/shumate-network-tile-source.c
+++ b/shumate/shumate-network-tile-source.c
@@ -68,10 +68,10 @@ enum
typedef struct
{
gboolean offline;
- gchar *uri_format;
- gchar *proxy_uri;
+ char *uri_format;
+ char *proxy_uri;
SoupSession *soup_session;
- gint max_conns;
+ int max_conns;
} ShumateNetworkTileSourcePrivate;
G_DEFINE_TYPE_WITH_PRIVATE (ShumateNetworkTileSource, shumate_network_tile_source, SHUMATE_TYPE_TILE_SOURCE);
@@ -94,7 +94,7 @@ typedef struct
ShumateNetworkTileSource *self;
GCancellable *cancellable;
ShumateTile *tile;
- gchar *etag;
+ char *etag;
} TileRenderedData;
@@ -105,10 +105,10 @@ static void tile_state_notify (ShumateTile *tile,
G_GNUC_UNUSED GParamSpec *pspec,
GCancellable *cancellable);
-static gchar *get_tile_uri (ShumateNetworkTileSource *source,
- gint x,
- gint y,
- gint z);
+static char *get_tile_uri (ShumateNetworkTileSource *source,
+ int x,
+ int y,
+ int z);
static void
shumate_network_tile_source_get_property (GObject *object,
@@ -336,15 +336,15 @@ shumate_network_tile_source_init (ShumateNetworkTileSource *tile_source)
* Returns: a constructed #ShumateNetworkTileSource object
*/
ShumateNetworkTileSource *
-shumate_network_tile_source_new_full (const gchar *id,
- const gchar *name,
- const gchar *license,
- const gchar *license_uri,
+shumate_network_tile_source_new_full (const char *id,
+ const char *name,
+ const char *license,
+ const char *license_uri,
guint min_zoom,
guint max_zoom,
guint tile_size,
ShumateMapProjection projection,
- const gchar *uri_format)
+ const char *uri_format)
{
ShumateNetworkTileSource *source;
@@ -372,7 +372,7 @@ shumate_network_tile_source_new_full (const gchar *id,
* Returns: A URI format used for URI creation when downloading tiles. See
* shumate_network_tile_source_set_uri_format() for more information.
*/
-const gchar *
+const char *
shumate_network_tile_source_get_uri_format (ShumateNetworkTileSource *tile_source)
{
ShumateNetworkTileSourcePrivate *priv = shumate_network_tile_source_get_instance_private (tile_source);
@@ -399,7 +399,7 @@ shumate_network_tile_source_get_uri_format (ShumateNetworkTileSource *tile_sourc
*/
void
shumate_network_tile_source_set_uri_format (ShumateNetworkTileSource *tile_source,
- const gchar *uri_format)
+ const char *uri_format)
{
ShumateNetworkTileSourcePrivate *priv = shumate_network_tile_source_get_instance_private (tile_source);
@@ -420,7 +420,7 @@ shumate_network_tile_source_set_uri_format (ShumateNetworkTileSource *tile_sourc
*
* Returns: the proxy uri
*/
-const gchar *
+const char *
shumate_network_tile_source_get_proxy_uri (ShumateNetworkTileSource *tile_source)
{
ShumateNetworkTileSourcePrivate *priv = shumate_network_tile_source_get_instance_private (tile_source);
@@ -440,7 +440,7 @@ shumate_network_tile_source_get_proxy_uri (ShumateNetworkTileSource *tile_source
*/
void
shumate_network_tile_source_set_proxy_uri (ShumateNetworkTileSource *tile_source,
- const gchar *proxy_uri)
+ const char *proxy_uri)
{
ShumateNetworkTileSourcePrivate *priv = shumate_network_tile_source_get_instance_private (tile_source);
@@ -516,7 +516,7 @@ shumate_network_tile_source_set_offline (ShumateNetworkTileSource *tile_source,
* Returns: the max number of allowed simultaneous connections for this tile
* source.
*/
-gint
+int
shumate_network_tile_source_get_max_conns (ShumateNetworkTileSource *tile_source)
{
ShumateNetworkTileSourcePrivate *priv = shumate_network_tile_source_get_instance_private (tile_source);
@@ -539,7 +539,7 @@ shumate_network_tile_source_get_max_conns (ShumateNetworkTileSource *tile_source
*/
void
shumate_network_tile_source_set_max_conns (ShumateNetworkTileSource *tile_source,
- gint max_conns)
+ int max_conns)
{
ShumateNetworkTileSourcePrivate *priv = shumate_network_tile_source_get_instance_private (tile_source);
@@ -566,7 +566,7 @@ shumate_network_tile_source_set_max_conns (ShumateNetworkTileSource *tile_source
void
shumate_network_tile_source_set_user_agent (
ShumateNetworkTileSource *tile_source,
- const gchar *user_agent)
+ const char *user_agent)
{
ShumateNetworkTileSourcePrivate *priv = shumate_network_tile_source_get_instance_private (tile_source);
@@ -580,18 +580,18 @@ shumate_network_tile_source_set_user_agent (
#define SIZE 8
-static gchar *
+static char *
get_tile_uri (ShumateNetworkTileSource *tile_source,
- gint x,
- gint y,
- gint z)
+ int x,
+ int y,
+ int z)
{
ShumateNetworkTileSourcePrivate *priv = shumate_network_tile_source_get_instance_private (tile_source);
- gchar **tokens;
- gchar *token;
+ char **tokens;
+ char *token;
GString *ret;
- gint i = 0;
+ int i = 0;
tokens = g_strsplit (priv->uri_format, "#", 20);
token = tokens[i];
@@ -599,8 +599,8 @@ get_tile_uri (ShumateNetworkTileSource *tile_source,
while (token != NULL)
{
- gint number = G_MAXINT;
- gchar value[SIZE];
+ int number = G_MAXINT;
+ char value[SIZE];
if (strcmp (token, "X") == 0)
number = x;
@@ -644,7 +644,7 @@ on_pixbuf_created (GObject *source_object,
g_autoptr(GError) error = NULL;
g_autoptr(GdkPixbuf) pixbuf = NULL;
g_autoptr(GdkTexture) texture = NULL;
- g_autofree gchar *etag = g_steal_pointer (&rendered_data->etag);
+ g_autofree char *etag = g_steal_pointer (&rendered_data->etag);
ShumateTileCache *tile_cache = shumate_tile_source_get_cache (SHUMATE_TILE_SOURCE (self));
g_slice_free (TileRenderedData, rendered_data);
@@ -674,7 +674,7 @@ on_pixbuf_created (GObject *source_object,
if (tile_cache)
{
g_autoptr(GError) error = NULL;
- g_autofree gchar *buffer = NULL;
+ g_autofree char *buffer = NULL;
gsize buffer_size;
if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &buffer_size, "png", &error, NULL))
g_warning ("Unable to export tile: %s", error->message);
@@ -704,7 +704,7 @@ on_message_sent (GObject *source_object,
ShumateTileSource *tile_source = SHUMATE_TILE_SOURCE (self);
ShumateTileCache *tile_cache = shumate_tile_source_get_cache (tile_source);
ShumateMapSource *next_source = shumate_map_source_get_next_source (SHUMATE_MAP_SOURCE (self));
- const gchar *etag;
+ const char *etag;
TileRenderedData *data;
g_slice_free (TileLoadedData, callback_data);
@@ -776,7 +776,7 @@ tile_state_notify (ShumateTile *tile,
}
-static gchar *
+static char *
get_modified_time_string (ShumateTile *tile)
{
GDateTime *modified_time;
@@ -808,7 +808,7 @@ fill_tile (ShumateMapSource *map_source,
if (!priv->offline)
{
TileLoadedData *callback_data = g_slice_new0 (TileLoadedData);
- g_autofree gchar *uri = NULL;
+ g_autofree char *uri = NULL;
uri = get_tile_uri (tile_source,
shumate_tile_get_x (tile),
@@ -825,8 +825,8 @@ fill_tile (ShumateMapSource *map_source,
{
/* validate tile */
- const gchar *etag = shumate_tile_get_etag (tile);
- gchar *date = get_modified_time_string (tile);
+ const char *etag = shumate_tile_get_etag (tile);
+ char *date = get_modified_time_string (tile);
/* If an etag is available, only use it.
* OSM servers seems to send now as the modified time for all tiles
diff --git a/shumate/shumate-network-tile-source.h b/shumate/shumate-network-tile-source.h
index b8695cd..f97af4d 100644
--- a/shumate/shumate-network-tile-source.h
+++ b/shumate/shumate-network-tile-source.h
@@ -44,34 +44,34 @@ struct _ShumateNetworkTileSourceClass
ShumateTileSourceClass parent_class;
};
-ShumateNetworkTileSource *shumate_network_tile_source_new_full (const gchar *id,
- const gchar *name,
- const gchar *license,
- const gchar *license_uri,
+ShumateNetworkTileSource *shumate_network_tile_source_new_full (const char *id,
+ const char *name,
+ const char *license,
+ const char *license_uri,
guint min_zoom,
guint max_zoom,
guint tile_size,
ShumateMapProjection projection,
- const gchar *uri_format);
+ const char *uri_format);
-const gchar *shumate_network_tile_source_get_uri_format (ShumateNetworkTileSource *tile_source);
+const char *shumate_network_tile_source_get_uri_format (ShumateNetworkTileSource *tile_source);
void shumate_network_tile_source_set_uri_format (ShumateNetworkTileSource *tile_source,
- const gchar *uri_format);
+ const char *uri_format);
gboolean shumate_network_tile_source_get_offline (ShumateNetworkTileSource *tile_source);
void shumate_network_tile_source_set_offline (ShumateNetworkTileSource *tile_source,
gboolean offline);
-const gchar *shumate_network_tile_source_get_proxy_uri (ShumateNetworkTileSource *tile_source);
+const char *shumate_network_tile_source_get_proxy_uri (ShumateNetworkTileSource *tile_source);
void shumate_network_tile_source_set_proxy_uri (ShumateNetworkTileSource *tile_source,
- const gchar *proxy_uri);
+ const char *proxy_uri);
-gint shumate_network_tile_source_get_max_conns (ShumateNetworkTileSource *tile_source);
+int shumate_network_tile_source_get_max_conns (ShumateNetworkTileSource *tile_source);
void shumate_network_tile_source_set_max_conns (ShumateNetworkTileSource *tile_source,
- gint max_conns);
+ int max_conns);
void shumate_network_tile_source_set_user_agent (ShumateNetworkTileSource *tile_source,
- const gchar *user_agent);
+ const char *user_agent);
G_END_DECLS
diff --git a/shumate/shumate-path-layer.c b/shumate/shumate-path-layer.c
index 4a47262..dbc81e9 100644
--- a/shumate/shumate-path-layer.c
+++ b/shumate/shumate-path-layer.c
@@ -65,8 +65,8 @@ typedef struct
gboolean fill;
GdkRGBA *fill_color;
gboolean stroke;
- gdouble stroke_width;
- GArray *dashes; /* gdouble */
+ double stroke_width;
+ GArray *dashes; /* double */
GList *nodes; /* ShumateLocation */
} ShumatePathLayerPrivate;
@@ -237,7 +237,7 @@ shumate_path_layer_snapshot (GtkWidget *widget,
ShumatePathLayer *self = (ShumatePathLayer *)widget;
ShumatePathLayerPrivate *priv = shumate_path_layer_get_instance_private (self);
ShumateViewport *viewport;
- gint width, height;
+ int width, height;
cairo_t *cr;
GList *elem;
@@ -255,7 +255,7 @@ shumate_path_layer_snapshot (GtkWidget *widget,
for (elem = priv->nodes; elem != NULL; elem = elem->next)
{
ShumateLocation *location = SHUMATE_LOCATION (elem->data);
- gdouble x, y;
+ double x, y;
x = shumate_viewport_longitude_to_widget_x (viewport, widget, shumate_location_get_longitude
(location));
y = shumate_viewport_latitude_to_widget_y (viewport, widget, shumate_location_get_latitude (location));
@@ -385,7 +385,7 @@ shumate_path_layer_init (ShumatePathLayer *self)
priv->stroke = TRUE;
priv->stroke_width = 2.0;
priv->nodes = NULL;
- priv->dashes = g_array_new (FALSE, TRUE, sizeof(gdouble));
+ priv->dashes = g_array_new (FALSE, TRUE, sizeof(double));
priv->fill_color = gdk_rgba_copy (&DEFAULT_FILL_COLOR);
priv->stroke_color = gdk_rgba_copy (&DEFAULT_STROKE_COLOR);
@@ -732,7 +732,7 @@ shumate_path_layer_get_fill (ShumatePathLayer *layer)
*/
void
shumate_path_layer_set_stroke_width (ShumatePathLayer *layer,
- gdouble value)
+ double value)
{
ShumatePathLayerPrivate *priv = shumate_path_layer_get_instance_private (layer);
@@ -753,7 +753,7 @@ shumate_path_layer_set_stroke_width (ShumatePathLayer *layer,
*
* Returns: the width of the stroke
*/
-gdouble
+double
shumate_path_layer_get_stroke_width (ShumatePathLayer *layer)
{
ShumatePathLayerPrivate *priv = shumate_path_layer_get_instance_private (layer);
@@ -831,7 +831,7 @@ shumate_path_layer_set_dash (ShumatePathLayer *layer,
for (iter = dash_pattern; iter != NULL; iter = iter->next)
{
- gdouble val = (gdouble) GPOINTER_TO_UINT (iter->data);
+ double val = (double) GPOINTER_TO_UINT (iter->data);
g_array_append_val (priv->dashes, val);
}
}
@@ -855,7 +855,7 @@ shumate_path_layer_get_dash (ShumatePathLayer *layer)
g_return_val_if_fail (SHUMATE_IS_PATH_LAYER (layer), NULL);
for (i = 0; i < priv->dashes->len; i++)
- list = g_list_append (list, GUINT_TO_POINTER ((guint) g_array_index (priv->dashes, gdouble, i)));
+ list = g_list_append (list, GUINT_TO_POINTER ((guint) g_array_index (priv->dashes, double, i)));
return list;
}
diff --git a/shumate/shumate-path-layer.h b/shumate/shumate-path-layer.h
index 5a78c6e..1b5545a 100644
--- a/shumate/shumate-path-layer.h
+++ b/shumate/shumate-path-layer.h
@@ -77,9 +77,9 @@ gboolean shumate_path_layer_get_stroke (ShumatePathLayer *layer);
void shumate_path_layer_set_stroke (ShumatePathLayer *layer,
gboolean value);
-gdouble shumate_path_layer_get_stroke_width (ShumatePathLayer *layer);
+double shumate_path_layer_get_stroke_width (ShumatePathLayer *layer);
void shumate_path_layer_set_stroke_width (ShumatePathLayer *layer,
- gdouble value);
+ double value);
gboolean shumate_path_layer_get_closed (ShumatePathLayer *layer);
void shumate_path_layer_set_closed (ShumatePathLayer *layer,
diff --git a/shumate/shumate-scale.c b/shumate/shumate-scale.c
index 26bc36e..2e08a15 100644
--- a/shumate/shumate-scale.c
+++ b/shumate/shumate-scale.c
@@ -86,18 +86,18 @@ G_DEFINE_TYPE (ShumateScale, shumate_scale, GTK_TYPE_WIDGET);
static gboolean
shumate_scale_compute_length (ShumateScale *self,
ShumateUnit unit,
- gfloat *out_scale_width,
- gfloat *out_base,
+ float *out_scale_width,
+ float *out_base,
gboolean *out_is_small_unit)
{
ShumateMapSource *map_source;
- gint zoom_level;
- gdouble lat, lon;
- gfloat scale_width;
- gfloat base;
- gfloat factor;
+ int zoom_level;
+ double lat, lon;
+ float scale_width;
+ float base;
+ float factor;
gboolean is_small_unit = TRUE;
- gfloat m_per_pixel;
+ float m_per_pixel;
g_assert (SHUMATE_IS_SCALE (self));
@@ -180,11 +180,11 @@ shumate_scale_compute_length (ShumateScale *self,
static void
shumate_scale_on_scale_changed (ShumateScale *self)
{
- gfloat metric_scale_width, metric_base;
- gfloat imperial_scale_width, imperial_base;
+ float metric_scale_width, metric_base;
+ float imperial_scale_width, imperial_base;
gboolean metric_is_small_unit, imperial_is_small_unit;
- g_autofree gchar *metric_label = NULL;
- g_autofree gchar *imperial_label = NULL;
+ g_autofree char *metric_label = NULL;
+ g_autofree char *imperial_label = NULL;
shumate_scale_compute_length (self, SHUMATE_UNIT_METRIC, &metric_scale_width, &metric_base,
&metric_is_small_unit);
shumate_scale_compute_length (self, SHUMATE_UNIT_IMPERIAL, &imperial_scale_width, &imperial_base,
&imperial_is_small_unit);
diff --git a/shumate/shumate-tile-cache.c b/shumate/shumate-tile-cache.c
index 29aece4..0a1b0b7 100644
--- a/shumate/shumate-tile-cache.c
+++ b/shumate/shumate-tile-cache.c
@@ -30,10 +30,10 @@
G_DEFINE_ABSTRACT_TYPE (ShumateTileCache, shumate_tile_cache, SHUMATE_TYPE_MAP_SOURCE)
-static const gchar *get_id (ShumateMapSource * map_source);
-static const gchar *get_name (ShumateMapSource *map_source);
-static const gchar *get_license (ShumateMapSource *map_source);
-static const gchar *get_license_uri (ShumateMapSource *map_source);
+static const char *get_id (ShumateMapSource * map_source);
+static const char *get_name (ShumateMapSource *map_source);
+static const char *get_license (ShumateMapSource *map_source);
+static const char *get_license_uri (ShumateMapSource *map_source);
static guint get_min_zoom_level (ShumateMapSource *map_source);
static guint get_max_zoom_level (ShumateMapSource *map_source);
static guint get_tile_size (ShumateMapSource *map_source);
@@ -80,7 +80,7 @@ shumate_tile_cache_init (ShumateTileCache *tile_cache)
void
shumate_tile_cache_store_tile (ShumateTileCache *tile_cache,
ShumateTile *tile,
- const gchar *contents,
+ const char *contents,
gsize size)
{
g_return_if_fail (SHUMATE_IS_TILE_CACHE (tile_cache));
@@ -129,7 +129,7 @@ shumate_tile_cache_on_tile_filled (ShumateTileCache *tile_cache,
}
-static const gchar *
+static const char *
get_id (ShumateMapSource *map_source)
{
g_return_val_if_fail (SHUMATE_IS_TILE_CACHE (map_source), NULL);
@@ -142,7 +142,7 @@ get_id (ShumateMapSource *map_source)
}
-static const gchar *
+static const char *
get_name (ShumateMapSource *map_source)
{
g_return_val_if_fail (SHUMATE_IS_TILE_CACHE (map_source), NULL);
@@ -155,7 +155,7 @@ get_name (ShumateMapSource *map_source)
}
-static const gchar *
+static const char *
get_license (ShumateMapSource *map_source)
{
g_return_val_if_fail (SHUMATE_IS_TILE_CACHE (map_source), NULL);
@@ -168,7 +168,7 @@ get_license (ShumateMapSource *map_source)
}
-static const gchar *
+static const char *
get_license_uri (ShumateMapSource *map_source)
{
g_return_val_if_fail (SHUMATE_IS_TILE_CACHE (map_source), NULL);
diff --git a/shumate/shumate-tile-cache.h b/shumate/shumate-tile-cache.h
index 5dc449f..31a97b3 100644
--- a/shumate/shumate-tile-cache.h
+++ b/shumate/shumate-tile-cache.h
@@ -44,7 +44,7 @@ struct _ShumateTileCacheClass
void (*store_tile)(ShumateTileCache *tile_cache,
ShumateTile *tile,
- const gchar *contents,
+ const char *contents,
gsize size);
void (*refresh_tile_time)(ShumateTileCache *tile_cache,
ShumateTile *tile);
@@ -54,7 +54,7 @@ struct _ShumateTileCacheClass
void shumate_tile_cache_store_tile (ShumateTileCache *tile_cache,
ShumateTile *tile,
- const gchar *contents,
+ const char *contents,
gsize size);
void shumate_tile_cache_refresh_tile_time (ShumateTileCache *tile_cache,
ShumateTile *tile);
diff --git a/shumate/shumate-tile-source.c b/shumate/shumate-tile-source.c
index 4f80db1..63f13d4 100644
--- a/shumate/shumate-tile-source.c
+++ b/shumate/shumate-tile-source.c
@@ -45,10 +45,10 @@ enum
typedef struct
{
- gchar *id;
- gchar *name;
- gchar *license;
- gchar *license_uri;
+ char *id;
+ char *name;
+ char *license;
+ char *license_uri;
guint min_zoom_level;
guint max_zoom_level;
guint tile_size;
@@ -58,10 +58,10 @@ typedef struct
G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ShumateTileSource, shumate_tile_source, SHUMATE_TYPE_MAP_SOURCE);
-static const gchar *get_id (ShumateMapSource *map_source);
-static const gchar *get_name (ShumateMapSource *map_source);
-static const gchar *get_license (ShumateMapSource *map_source);
-static const gchar *get_license_uri (ShumateMapSource *map_source);
+static const char *get_id (ShumateMapSource *map_source);
+static const char *get_name (ShumateMapSource *map_source);
+static const char *get_license (ShumateMapSource *map_source);
+static const char *get_license_uri (ShumateMapSource *map_source);
static guint get_min_zoom_level (ShumateMapSource *map_source);
static guint get_max_zoom_level (ShumateMapSource *map_source);
static guint get_tile_size (ShumateMapSource *map_source);
@@ -413,7 +413,7 @@ shumate_tile_source_set_cache (ShumateTileSource *tile_source,
}
-static const gchar *
+static const char *
get_id (ShumateMapSource *map_source)
{
ShumateTileSource *tile_source = SHUMATE_TILE_SOURCE (map_source);
@@ -425,7 +425,7 @@ get_id (ShumateMapSource *map_source)
}
-static const gchar *
+static const char *
get_name (ShumateMapSource *map_source)
{
ShumateTileSource *tile_source = SHUMATE_TILE_SOURCE (map_source);
@@ -437,7 +437,7 @@ get_name (ShumateMapSource *map_source)
}
-static const gchar *
+static const char *
get_license (ShumateMapSource *map_source)
{
ShumateTileSource *tile_source = SHUMATE_TILE_SOURCE (map_source);
@@ -449,7 +449,7 @@ get_license (ShumateMapSource *map_source)
}
-static const gchar *
+static const char *
get_license_uri (ShumateMapSource *map_source)
{
ShumateTileSource *tile_source = SHUMATE_TILE_SOURCE (map_source);
@@ -518,7 +518,7 @@ get_projection (ShumateMapSource *map_source)
*/
void
shumate_tile_source_set_id (ShumateTileSource *tile_source,
- const gchar *id)
+ const char *id)
{
ShumateTileSourcePrivate *priv = shumate_tile_source_get_instance_private (tile_source);
@@ -540,7 +540,7 @@ shumate_tile_source_set_id (ShumateTileSource *tile_source,
*/
void
shumate_tile_source_set_name (ShumateTileSource *tile_source,
- const gchar *name)
+ const char *name)
{
ShumateTileSourcePrivate *priv = shumate_tile_source_get_instance_private (tile_source);
@@ -562,7 +562,7 @@ shumate_tile_source_set_name (ShumateTileSource *tile_source,
*/
void
shumate_tile_source_set_license (ShumateTileSource *tile_source,
- const gchar *license)
+ const char *license)
{
ShumateTileSourcePrivate *priv = shumate_tile_source_get_instance_private (tile_source);
@@ -584,7 +584,7 @@ shumate_tile_source_set_license (ShumateTileSource *tile_source,
*/
void
shumate_tile_source_set_license_uri (ShumateTileSource *tile_source,
- const gchar *license_uri)
+ const char *license_uri)
{
ShumateTileSourcePrivate *priv = shumate_tile_source_get_instance_private (tile_source);
diff --git a/shumate/shumate-tile-source.h b/shumate/shumate-tile-source.h
index d554d7f..2c3c7e8 100644
--- a/shumate/shumate-tile-source.h
+++ b/shumate/shumate-tile-source.h
@@ -50,13 +50,13 @@ void shumate_tile_source_set_cache (ShumateTileSource *tile_source,
ShumateTileCache *cache);
void shumate_tile_source_set_id (ShumateTileSource *tile_source,
- const gchar *id);
+ const char *id);
void shumate_tile_source_set_name (ShumateTileSource *tile_source,
- const gchar *name);
+ const char *name);
void shumate_tile_source_set_license (ShumateTileSource *tile_source,
- const gchar *license);
+ const char *license);
void shumate_tile_source_set_license_uri (ShumateTileSource *tile_source,
- const gchar *license_uri);
+ const char *license_uri);
void shumate_tile_source_set_min_zoom_level (ShumateTileSource *tile_source,
guint zoom_level);
diff --git a/shumate/shumate-tile.c b/shumate/shumate-tile.c
index a291e13..6fa2837 100644
--- a/shumate/shumate-tile.c
+++ b/shumate/shumate-tile.c
@@ -46,7 +46,7 @@ typedef struct
gboolean fade_in;
GDateTime *modified_time; /* The last modified time of the cache */
- gchar *etag; /* The HTTP ETag sent by the server */
+ char *etag; /* The HTTP ETag sent by the server */
GdkTexture *texture;
} ShumateTilePrivate;
@@ -696,7 +696,7 @@ shumate_tile_set_modified_time (ShumateTile *self,
*
* Returns: the tile's ETag
*/
-const gchar *
+const char *
shumate_tile_get_etag (ShumateTile *self)
{
ShumateTilePrivate *priv = shumate_tile_get_instance_private (self);
@@ -716,7 +716,7 @@ shumate_tile_get_etag (ShumateTile *self)
*/
void
shumate_tile_set_etag (ShumateTile *self,
- const gchar *etag)
+ const char *etag)
{
ShumateTilePrivate *priv = shumate_tile_get_instance_private (self);
diff --git a/shumate/shumate-tile.h b/shumate/shumate-tile.h
index 5457499..aed0e80 100644
--- a/shumate/shumate-tile.h
+++ b/shumate/shumate-tile.h
@@ -91,9 +91,9 @@ GDateTime *shumate_tile_get_modified_time (ShumateTile *self);
void shumate_tile_set_modified_time (ShumateTile *self,
GDateTime *modified_time);
-const gchar *shumate_tile_get_etag (ShumateTile *self);
+const char *shumate_tile_get_etag (ShumateTile *self);
void shumate_tile_set_etag (ShumateTile *self,
- const gchar *etag);
+ const char *etag);
gboolean shumate_tile_get_fade_in (ShumateTile *self);
void shumate_tile_set_fade_in (ShumateTile *self,
diff --git a/shumate/shumate-view.c b/shumate/shumate-view.c
index 6309fcd..c3a3145 100644
--- a/shumate/shumate-view.c
+++ b/shumate/shumate-view.c
@@ -101,10 +101,10 @@ typedef struct
{
ShumateView *view;
//ClutterTimeline *timeline;
- gdouble to_latitude;
- gdouble to_longitude;
- gdouble from_latitude;
- gdouble from_longitude;
+ double to_latitude;
+ double to_longitude;
+ double from_latitude;
+ double from_longitude;
} GoToContext;
@@ -112,10 +112,10 @@ typedef struct
{
ShumateView *view;
ShumateMapSource *map_source;
- gint x;
- gint y;
- gint zoom_level;
- gint size;
+ int x;
+ int y;
+ int zoom_level;
+ int size;
} FillTileCallbackData;
@@ -124,7 +124,7 @@ typedef struct
ShumateViewport *viewport;
/* There are num_right_clones clones on the right, and one extra on the left */
- gint num_right_clones;
+ int num_right_clones;
GList *map_clones;
/* There are num_right_clones + 2 user layer slots, overlayed on the map clones.
* Initially, the first slot contains the left clone, the second slot
@@ -146,7 +146,7 @@ typedef struct
// shumate_view_go_to's context, kept for stop_go_to
GoToContext *goto_context;
- gint tiles_loading;
+ int tiles_loading;
guint zoom_timeout;
@@ -154,21 +154,21 @@ typedef struct
gboolean animating_zoom;
guint anim_start_zoom_level;
- gdouble zoom_actor_viewport_x;
- gdouble zoom_actor_viewport_y;
+ double zoom_actor_viewport_x;
+ double zoom_actor_viewport_y;
guint zoom_actor_timeout;
- gdouble current_x;
- gdouble current_y;
+ double current_x;
+ double current_y;
/* Zoom gesture */
guint initial_gesture_zoom;
- gdouble focus_lat;
- gdouble focus_lon;
+ double focus_lat;
+ double focus_lon;
gboolean zoom_started;
- gdouble accumulated_scroll_dy;
- gdouble drag_begin_lat;
- gdouble drag_begin_lon;
+ double accumulated_scroll_dy;
+ double drag_begin_lat;
+ double drag_begin_lon;
} ShumateViewPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (ShumateView, shumate_view, GTK_TYPE_WIDGET);
@@ -183,8 +183,8 @@ static void shumate_view_set_property (GObject *object,
GParamSpec *pspec);
static void shumate_view_dispose (GObject *object);
static void shumate_view_go_to_with_duration (ShumateView *view,
- gdouble latitude,
- gdouble longitude,
+ double latitude,
+ double longitude,
guint duration);
/*static gboolean
@@ -207,7 +207,7 @@ scroll_event (G_GNUC_UNUSED ShumateView *this,
{
GdkScrollDirection direction;
gdk_event_get_scroll_direction(event, &direction);
- gdouble x, y;
+ double x, y;
gdk_event_get_coords(event, &x, &y);
ShumateViewPrivate *priv = shumate_view_get_instance_private (view);
@@ -220,8 +220,8 @@ scroll_event (G_GNUC_UNUSED ShumateView *this,
zoom_level = priv->zoom_level - 1;
else if (direction == GDK_SCROLL_SMOOTH)
{
- gdouble dx, dy;
- gint steps;
+ double dx, dy;
+ int steps;
gdk_event_get_scroll_deltas (event, &dx, &dy);
@@ -245,8 +245,8 @@ scroll_event (G_GNUC_UNUSED ShumateView *this,
static void
on_drag_gesture_drag_begin (ShumateView *self,
- gdouble start_x,
- gdouble start_y,
+ double start_x,
+ double start_y,
GtkGestureDrag *gesture)
{
ShumateViewPrivate *priv = shumate_view_get_instance_private (self);
@@ -261,8 +261,8 @@ on_drag_gesture_drag_begin (ShumateView *self,
static void
on_drag_gesture_drag_update (ShumateView *self,
- gdouble offset_x,
- gdouble offset_y,
+ double offset_x,
+ double offset_y,
GtkGestureDrag *gesture)
{
ShumateViewPrivate *priv = shumate_view_get_instance_private (self);
@@ -302,8 +302,8 @@ on_drag_gesture_drag_update (ShumateView *self,
static void
on_drag_gesture_drag_end (ShumateView *self,
- gdouble offset_x,
- gdouble offset_y,
+ double offset_x,
+ double offset_y,
GtkGestureDrag *gesture)
{
ShumateViewPrivate *priv = shumate_view_get_instance_private (self);
@@ -347,14 +347,14 @@ on_drag_gesture_drag_end (ShumateView *self,
static gboolean
on_scroll_controller_scroll (ShumateView *self,
- gdouble dx,
- gdouble dy,
+ double dx,
+ double dy,
GtkEventControllerScroll *controller)
{
ShumateViewPrivate *priv = shumate_view_get_instance_private (self);
ShumateMapSource *map_source;
- gdouble scroll_latitude, scroll_longitude;
- gdouble view_lon, view_lat;
+ double scroll_latitude, scroll_longitude;
+ double view_lon, view_lat;
g_object_freeze_notify (G_OBJECT (priv->viewport));
view_lon = shumate_location_get_longitude (SHUMATE_LOCATION (priv->viewport));
@@ -374,9 +374,9 @@ on_scroll_controller_scroll (ShumateView *self,
if (map_source)
{
- gdouble scroll_map_x, scroll_map_y;
- gdouble view_center_x, view_center_y;
- gdouble x_offset, y_offset;
+ double scroll_map_x, scroll_map_y;
+ double view_center_x, view_center_y;
+ double x_offset, y_offset;
guint zoom_level;
scroll_map_x = shumate_viewport_longitude_to_widget_x (priv->viewport, GTK_WIDGET (self),
scroll_longitude);
@@ -398,8 +398,8 @@ on_scroll_controller_scroll (ShumateView *self,
static void
on_motion_controller_motion (ShumateView *self,
- gdouble x,
- gdouble y,
+ double x,
+ double y,
GtkEventControllerMotion *controller)
{
ShumateViewPrivate *priv = shumate_view_get_instance_private (self);
@@ -425,7 +425,7 @@ shumate_view_get_property (GObject *object,
case PROP_DECELERATION:
{
- gdouble decel = 0.0;
+ double decel = 0.0;
//g_object_get (priv->kinetic_scroll, "deceleration", &decel, NULL);
g_value_set_double (value, decel);
break;
@@ -796,8 +796,8 @@ shumate_view_get_viewport (ShumateView *self)
*/
void
shumate_view_center_on (ShumateView *view,
- gdouble latitude,
- gdouble longitude)
+ double latitude,
+ double longitude)
{
ShumateViewPrivate *priv = shumate_view_get_instance_private (view);
@@ -845,8 +845,8 @@ shumate_view_stop_go_to (ShumateView *view)
*/
void
shumate_view_go_to (ShumateView *view,
- gdouble latitude,
- gdouble longitude)
+ double latitude,
+ double longitude)
{
ShumateViewPrivate *priv = shumate_view_get_instance_private (view);
guint duration;
@@ -863,8 +863,8 @@ shumate_view_go_to (ShumateView *view,
static void
shumate_view_go_to_with_duration (ShumateView *view,
- gdouble latitude,
- gdouble longitude,
+ double latitude,
+ double longitude,
guint duration) /* In ms */
{
ShumateViewPrivate *priv = shumate_view_get_instance_private (view);
@@ -983,13 +983,13 @@ shumate_view_set_map_source (ShumateView *view,
/**
* shumate_view_set_deceleration:
* @view: a #ShumateView
- * @rate: a #gdouble between 1.001 and 2.0
+ * @rate: a #double between 1.001 and 2.0
*
* The deceleration rate for the kinetic mode.
*/
void
shumate_view_set_deceleration (ShumateView *view,
- gdouble rate)
+ double rate)
{
g_return_if_fail (SHUMATE_IS_VIEW (view));
g_return_if_fail (rate < 2.0 && rate > 1.0001);
@@ -1066,12 +1066,12 @@ shumate_view_set_animate_zoom (ShumateView *view,
*
* Returns: the view's deceleration rate.
*/
-gdouble
+double
shumate_view_get_deceleration (ShumateView *view)
{
g_return_val_if_fail (SHUMATE_IS_VIEW (view), 0.0);
- gdouble decel = 0.0;
+ double decel = 0.0;
//g_object_get (view->priv->kinetic_scroll, "decel-rate", &decel, NULL);
return decel;
}
diff --git a/shumate/shumate-view.h b/shumate/shumate-view.h
index d374946..6f1e938 100644
--- a/shumate/shumate-view.h
+++ b/shumate/shumate-view.h
@@ -59,11 +59,11 @@ ShumateView *shumate_view_new_simple (void);
ShumateViewport *shumate_view_get_viewport (ShumateView *self);
void shumate_view_center_on (ShumateView *view,
- gdouble latitude,
- gdouble longitude);
+ double latitude,
+ double longitude);
void shumate_view_go_to (ShumateView *view,
- gdouble latitude,
- gdouble longitude);
+ double latitude,
+ double longitude);
void shumate_view_stop_go_to (ShumateView *view);
void shumate_view_set_map_source (ShumateView *view,
@@ -75,7 +75,7 @@ void shumate_view_remove_overlay_source (ShumateView *view,
GList *shumate_view_get_overlay_sources (ShumateView *view);
void shumate_view_set_deceleration (ShumateView *view,
- gdouble rate);
+ double rate);
void shumate_view_set_kinetic_mode (ShumateView *view,
gboolean kinetic);
void shumate_view_set_zoom_on_double_click (ShumateView *view,
@@ -89,7 +89,7 @@ void shumate_view_add_layer (ShumateView *view,
void shumate_view_remove_layer (ShumateView *view,
ShumateLayer *layer);
-gdouble shumate_view_get_deceleration (ShumateView *view);
+double shumate_view_get_deceleration (ShumateView *view);
gboolean shumate_view_get_kinetic_mode (ShumateView *view);
gboolean shumate_view_get_zoom_on_double_click (ShumateView *view);
gboolean shumate_view_get_animate_zoom (ShumateView *view);
diff --git a/shumate/shumate-viewport.c b/shumate/shumate-viewport.c
index 7471010..31111c6 100644
--- a/shumate/shumate-viewport.c
+++ b/shumate/shumate-viewport.c
@@ -37,8 +37,8 @@ struct _ShumateViewport
{
GObject parent_instance;
- gdouble lon;
- gdouble lat;
+ double lon;
+ double lat;
guint zoom_level;
guint min_zoom_level;
@@ -66,7 +66,7 @@ enum
static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
-static gdouble
+static double
shumate_viewport_get_latitude (ShumateLocation *location)
{
ShumateViewport *self = (ShumateViewport *)location;
@@ -76,7 +76,7 @@ shumate_viewport_get_latitude (ShumateLocation *location)
return self->lat;
}
-static gdouble
+static double
shumate_viewport_get_longitude (ShumateLocation *location)
{
ShumateViewport *self = (ShumateViewport *)location;
@@ -88,8 +88,8 @@ shumate_viewport_get_longitude (ShumateLocation *location)
static void
shumate_viewport_set_location (ShumateLocation *location,
- gdouble latitude,
- gdouble longitude)
+ double latitude,
+ double longitude)
{
ShumateViewport *self = (ShumateViewport *)location;
@@ -453,7 +453,7 @@ shumate_viewport_set_reference_map_source (ShumateViewport *self,
* when none has been set.
*/
ShumateMapSource *
-shumate_viewport_get_reference_map_source (ShumateViewport *self)
+shumate_viewport_get_reference_map_source (ShumateViewport *self)
{
g_return_val_if_fail (SHUMATE_IS_VIEWPORT (self), NULL);
@@ -471,13 +471,13 @@ shumate_viewport_get_reference_map_source (ShumateViewport *self)
*
* Returns: the longitude
*/
-gdouble
+double
shumate_viewport_widget_x_to_longitude (ShumateViewport *self,
GtkWidget *widget,
- gdouble x)
+ double x)
{
- gdouble center_x;
- gint width;
+ double center_x;
+ int width;
g_return_val_if_fail (SHUMATE_IS_VIEWPORT (self), 0.0);
g_return_val_if_fail (GTK_IS_WIDGET (widget), 0.0);
@@ -504,13 +504,13 @@ shumate_viewport_widget_x_to_longitude (ShumateViewport *self,
*
* Returns: the latitude
*/
-gdouble
+double
shumate_viewport_widget_y_to_latitude (ShumateViewport *self,
GtkWidget *widget,
- gdouble y)
+ double y)
{
- gdouble center_y;
- gint height;
+ double center_y;
+ int height;
g_return_val_if_fail (SHUMATE_IS_VIEWPORT (self), 0.0);
g_return_val_if_fail (GTK_IS_WIDGET (widget), 0.0);
@@ -537,14 +537,14 @@ shumate_viewport_widget_y_to_latitude (ShumateViewport *self,
*
* Returns: the x coordinate
*/
-gdouble
+double
shumate_viewport_longitude_to_widget_x (ShumateViewport *self,
GtkWidget *widget,
- gdouble longitude)
+ double longitude)
{
- gdouble center_longitude;
- gdouble left_x, x;
- gint width;
+ double center_longitude;
+ double left_x, x;
+ int width;
g_return_val_if_fail (SHUMATE_IS_VIEWPORT (self), 0.0);
g_return_val_if_fail (GTK_IS_WIDGET (widget), 0.0);
@@ -573,14 +573,14 @@ shumate_viewport_longitude_to_widget_x (ShumateViewport *self,
*
* Returns: the y coordinate
*/
-gdouble
+double
shumate_viewport_latitude_to_widget_y (ShumateViewport *self,
GtkWidget *widget,
- gdouble latitude)
+ double latitude)
{
- gdouble center_latitude;
- gdouble top_y, y;
- gint height;
+ double center_latitude;
+ double top_y, y;
+ int height;
g_return_val_if_fail (SHUMATE_IS_VIEWPORT (self), 0.0);
g_return_val_if_fail (GTK_IS_WIDGET (widget), 0.0);
diff --git a/shumate/shumate-viewport.h b/shumate/shumate-viewport.h
index d4aab57..1c1509e 100644
--- a/shumate/shumate-viewport.h
+++ b/shumate/shumate-viewport.h
@@ -56,18 +56,18 @@ void shumate_viewport_set_reference_map_source (ShumateViewport *self,
ShumateMapSource *map_source);
ShumateMapSource *shumate_viewport_get_reference_map_source (ShumateViewport *self);
-gdouble shumate_viewport_widget_x_to_longitude (ShumateViewport *self,
- GtkWidget *widget,
- gdouble x);
-gdouble shumate_viewport_widget_y_to_latitude (ShumateViewport *self,
+double shumate_viewport_widget_x_to_longitude (ShumateViewport *self,
GtkWidget *widget,
- gdouble y);
-gdouble shumate_viewport_longitude_to_widget_x (ShumateViewport *self,
- GtkWidget *widget,
- gdouble longitude);
-gdouble shumate_viewport_latitude_to_widget_y (ShumateViewport *self,
+ double x);
+double shumate_viewport_widget_y_to_latitude (ShumateViewport *self,
+ GtkWidget *widget,
+ double y);
+double shumate_viewport_longitude_to_widget_x (ShumateViewport *self,
GtkWidget *widget,
- gdouble latitude);
+ double longitude);
+double shumate_viewport_latitude_to_widget_y (ShumateViewport *self,
+ GtkWidget *widget,
+ double latitude);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
