[libchamplain] Line break long macro definitions

From: Jiří Techet <jiritechet src gnome org>
To: commits-list gnome org
Cc:
Subject: [libchamplain] Line break long macro definitions
Date: Sun, 1 Aug 2010 23:16:44 +0000 (UTC)
commit ca8cc7c66b7a00a5e05b957cb7a336f1a51c6c04
Author: JiÅ?Ã Techet <techet gmail com>
Date:   Sun Aug 1 18:11:11 2010 +0200

    Line break long macro definitions
    
    Signed-off-by: JiÅ?Ã Techet <techet gmail com>

 champlain-gtk/gtk-champlain-embed.c       |    3 +-
 champlain-gtk/gtk-champlain-embed.h       |   23 +++++++++++++++-----
 champlain/champlain-base-marker.c         |    3 +-
 champlain/champlain-base-marker.h         |   22 +++++++++++++++-----
 champlain/champlain-error-tile-renderer.c |    3 +-
 champlain/champlain-error-tile-renderer.h |   22 +++++++++++++++-----
 champlain/champlain-file-cache.c          |    3 +-
 champlain/champlain-file-cache.h          |   22 +++++++++++++++-----
 champlain/champlain-file-tile-source.c    |    3 +-
 champlain/champlain-image-renderer.c      |    4 +-
 champlain/champlain-image-renderer.h      |   24 +++++++++++++++-------
 champlain/champlain-map-source-chain.c    |    3 +-
 champlain/champlain-map-source-chain.h    |   22 +++++++++++++++-----
 champlain/champlain-map-source-factory.c  |    3 +-
 champlain/champlain-map-source-factory.h  |   22 +++++++++++++++-----
 champlain/champlain-map-source.c          |    3 +-
 champlain/champlain-map-source.h          |   22 +++++++++++++++-----
 champlain/champlain-marker.c              |    3 +-
 champlain/champlain-marker.h              |   22 +++++++++++++++-----
 champlain/champlain-memory-cache.c        |    3 +-
 champlain/champlain-memory-cache.h        |   23 +++++++++++++++------
 champlain/champlain-network-tile-source.c |    3 +-
 champlain/champlain-network-tile-source.h |   22 +++++++++++++++-----
 champlain/champlain-renderer.c            |    8 -------
 champlain/champlain-renderer.h            |   31 +++++++++++++++--------------
 champlain/champlain-tile-cache.c          |    3 +-
 champlain/champlain-tile-cache.h          |   22 +++++++++++++++-----
 champlain/champlain-tile-source.h         |   22 +++++++++++++++-----
 champlain/champlain-view.c                |   12 ++++++----
 champlain/champlain-view.h                |   22 +++++++++++++++-----
 30 files changed, 273 insertions(+), 130 deletions(-)
---
diff --git a/champlain-gtk/gtk-champlain-embed.c b/champlain-gtk/gtk-champlain-embed.c
index 5a417f0..3c9999f 100644
--- a/champlain-gtk/gtk-champlain-embed.c
+++ b/champlain-gtk/gtk-champlain-embed.c
@@ -53,7 +53,8 @@ enum
 
 //static guint gtk_champlain_embed_embed_signals[LAST_SIGNAL] = { 0, };
 
-#define GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedPrivate))
+#define GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((obj), GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedPrivate))
 
 struct _GtkChamplainEmbedPrivate
 {
diff --git a/champlain-gtk/gtk-champlain-embed.h b/champlain-gtk/gtk-champlain-embed.h
index bc89be6..34f34d3 100644
--- a/champlain-gtk/gtk-champlain-embed.h
+++ b/champlain-gtk/gtk-champlain-embed.h
@@ -28,12 +28,23 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_CHAMPLAIN_EMBED     (gtk_champlain_embed_get_type())
-#define GTK_CHAMPLAIN_EMBED(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbed))
-#define GTK_CHAMPLAIN_EMBED_CLASS(klass)  (G_TYPE_CHECK_CLASS_CAST((klass),  GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedClass))
-#define GTK_CHAMPLAIN_IS_EMBED(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_CHAMPLAIN_EMBED))
-#define GTK_CHAMPLAIN_IS_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  GTK_TYPE_CHAMPLAIN_EMBED))
-#define GTK_CHAMPLAIN_EMBED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedClass))
+#define GTK_TYPE_CHAMPLAIN_EMBED \
+  (gtk_champlain_embed_get_type())
+
+#define GTK_CHAMPLAIN_EMBED(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbed))
+
+#define GTK_CHAMPLAIN_EMBED_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),  GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedClass))
+
+#define GTK_CHAMPLAIN_IS_EMBED(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_CHAMPLAIN_EMBED))
+
+#define GTK_CHAMPLAIN_IS_EMBED_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),  GTK_TYPE_CHAMPLAIN_EMBED))
+
+#define GTK_CHAMPLAIN_EMBED_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS((obj),  GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedClass))
 
 typedef struct _GtkChamplainEmbedPrivate GtkChamplainEmbedPrivate;
 
diff --git a/champlain/champlain-base-marker.c b/champlain/champlain-base-marker.c
index 9abe6d2..3a76fe3 100644
--- a/champlain/champlain-base-marker.c
+++ b/champlain/champlain-base-marker.c
@@ -67,7 +67,8 @@ enum
 
 G_DEFINE_TYPE (ChamplainBaseMarker, champlain_base_marker, CLUTTER_TYPE_GROUP);
 
-#define CHAMPLAIN_BASE_MARKER_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_BASE_MARKER, ChamplainBaseMarkerPrivate))
+#define CHAMPLAIN_BASE_MARKER_GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_BASE_MARKER, ChamplainBaseMarkerPrivate))
 
 struct _ChamplainBaseMarkerPrivate
 {
diff --git a/champlain/champlain-base-marker.h b/champlain/champlain-base-marker.h
index 9c5a7bd..dd770f8 100644
--- a/champlain/champlain-base-marker.h
+++ b/champlain/champlain-base-marker.h
@@ -30,12 +30,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_BASE_MARKER     (champlain_base_marker_get_type())
-#define CHAMPLAIN_BASE_MARKER(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_BASE_MARKER, ChamplainBaseMarker))
-#define CHAMPLAIN_BASE_MARKER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  CHAMPLAIN_TYPE_BASE_MARKER, ChamplainBaseMarkerClass))
-#define CHAMPLAIN_IS_BASE_MARKER(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_BASE_MARKER))
-#define CHAMPLAIN_IS_BASE_MARKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  CHAMPLAIN_TYPE_BASE_MARKER))
-#define CHAMPLAIN_BASE_MARKER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  CHAMPLAIN_TYPE_BASE_MARKER, ChamplainBaseMarkerClass))
+#define CHAMPLAIN_TYPE_BASE_MARKER champlain_base_marker_get_type()
+
+#define CHAMPLAIN_BASE_MARKER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_BASE_MARKER, ChamplainBaseMarker))
+
+#define CHAMPLAIN_BASE_MARKER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),  CHAMPLAIN_TYPE_BASE_MARKER, ChamplainBaseMarkerClass))
+
+#define CHAMPLAIN_IS_BASE_MARKER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_BASE_MARKER))
+
+#define CHAMPLAIN_IS_BASE_MARKER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),  CHAMPLAIN_TYPE_BASE_MARKER))
+
+#define CHAMPLAIN_BASE_MARKER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS((obj),  CHAMPLAIN_TYPE_BASE_MARKER, ChamplainBaseMarkerClass))
 
 typedef struct _ChamplainBaseMarkerPrivate ChamplainBaseMarkerPrivate;
 
diff --git a/champlain/champlain-error-tile-renderer.c b/champlain/champlain-error-tile-renderer.c
index 5e5639e..dc9019b 100644
--- a/champlain/champlain-error-tile-renderer.c
+++ b/champlain/champlain-error-tile-renderer.c
@@ -21,7 +21,8 @@
 
 G_DEFINE_TYPE (ChamplainErrorTileRenderer, champlain_error_tile_renderer, CHAMPLAIN_TYPE_RENDERER)
 
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER, ChamplainErrorTileRendererPrivate))
+#define GET_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER, ChamplainErrorTileRendererPrivate))
 
 struct _ChamplainErrorTileRendererPrivate
 {
diff --git a/champlain/champlain-error-tile-renderer.h b/champlain/champlain-error-tile-renderer.h
index 92e6c5c..a31cb8d 100644
--- a/champlain/champlain-error-tile-renderer.h
+++ b/champlain/champlain-error-tile-renderer.h
@@ -28,12 +28,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_ERROR_TILE_RENDERER            (champlain_error_tile_renderer_get_type ())
-#define CHAMPLAIN_ERROR_TILE_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER, ChamplainErrorTileRenderer))
-#define CHAMPLAIN_ERROR_TILE_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER, ChamplainErrorTileRendererClass))
-#define CHAMPLAIN_IS_ERROR_TILE_RENDERER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER))
-#define CHAMPLAIN_IS_ERROR_TILE_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER))
-#define CHAMPLAIN_ERROR_TILE_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER, ChamplainErrorTileRendererClass))
+#define CHAMPLAIN_TYPE_ERROR_TILE_RENDERER champlain_error_tile_renderer_get_type ()
+
+#define CHAMPLAIN_ERROR_TILE_RENDERER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER, ChamplainErrorTileRenderer))
+
+#define CHAMPLAIN_ERROR_TILE_RENDERER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER, ChamplainErrorTileRendererClass))
+
+#define CHAMPLAIN_IS_ERROR_TILE_RENDERER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER))
+
+#define CHAMPLAIN_IS_ERROR_TILE_RENDERER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER))
+
+#define CHAMPLAIN_ERROR_TILE_RENDERER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_ERROR_TILE_RENDERER, ChamplainErrorTileRendererClass))
 
 typedef struct _ChamplainErrorTileRendererPrivate ChamplainErrorTileRendererPrivate;
 
diff --git a/champlain/champlain-file-cache.c b/champlain/champlain-file-cache.c
index 4c019ab..c759718 100644
--- a/champlain/champlain-file-cache.c
+++ b/champlain/champlain-file-cache.c
@@ -40,7 +40,8 @@
 
 G_DEFINE_TYPE (ChamplainFileCache, champlain_file_cache, CHAMPLAIN_TYPE_TILE_CACHE);
 
-#define GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_FILE_CACHE, ChamplainFileCachePrivate))
+#define GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_FILE_CACHE, ChamplainFileCachePrivate))
 
 enum
 {
diff --git a/champlain/champlain-file-cache.h b/champlain/champlain-file-cache.h
index a25c270..aaebaf5 100644
--- a/champlain/champlain-file-cache.h
+++ b/champlain/champlain-file-cache.h
@@ -29,12 +29,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_FILE_CACHE             (champlain_file_cache_get_type ())
-#define CHAMPLAIN_FILE_CACHE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_FILE_CACHE, ChamplainFileCache))
-#define CHAMPLAIN_FILE_CACHE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_FILE_CACHE, ChamplainFileCacheClass))
-#define CHAMPLAIN_IS_FILE_CACHE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_FILE_CACHE))
-#define CHAMPLAIN_IS_FILE_CACHE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_FILE_CACHE))
-#define CHAMPLAIN_FILE_CACHE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_FILE_CACHE, ChamplainFileCacheClass))
+#define CHAMPLAIN_TYPE_FILE_CACHE champlain_file_cache_get_type ()
+
+#define CHAMPLAIN_FILE_CACHE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_FILE_CACHE, ChamplainFileCache))
+
+#define CHAMPLAIN_FILE_CACHE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_FILE_CACHE, ChamplainFileCacheClass))
+
+#define CHAMPLAIN_IS_FILE_CACHE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_FILE_CACHE))
+
+#define CHAMPLAIN_IS_FILE_CACHE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_FILE_CACHE))
+
+#define CHAMPLAIN_FILE_CACHE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_FILE_CACHE, ChamplainFileCacheClass))
 
 typedef struct _ChamplainFileCachePrivate ChamplainFileCachePrivate;
 
diff --git a/champlain/champlain-file-tile-source.c b/champlain/champlain-file-tile-source.c
index e84e01d..4e44a5b 100644
--- a/champlain/champlain-file-tile-source.c
+++ b/champlain/champlain-file-tile-source.c
@@ -36,11 +36,10 @@
 
 G_DEFINE_TYPE (ChamplainFileTileSource, champlain_file_tile_source, CHAMPLAIN_TYPE_TILE_SOURCE)
 
-
-
 static void fill_tile (ChamplainMapSource *map_source,
     ChamplainTile *tile);
 
+
 static void
 champlain_file_tile_source_dispose (GObject *object)
 {
diff --git a/champlain/champlain-image-renderer.c b/champlain/champlain-image-renderer.c
index 599d7a6..953eca1 100644
--- a/champlain/champlain-image-renderer.c
+++ b/champlain/champlain-image-renderer.c
@@ -18,11 +18,11 @@
 
 #include "champlain-image-renderer.h"
 #include <gdk/gdk.h>
-//#include <clutter/clutter.h>
 
 G_DEFINE_TYPE(ChamplainImageRenderer, champlain_image_renderer, CHAMPLAIN_TYPE_RENDERER)
 
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CHAMPLAIN_TYPE_IMAGE_RENDERER, ChamplainImageRendererPrivate))
+#define GET_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((o), CHAMPLAIN_TYPE_IMAGE_RENDERER, ChamplainImageRendererPrivate))
 
 struct _ChamplainImageRendererPrivate
 {
diff --git a/champlain/champlain-image-renderer.h b/champlain/champlain-image-renderer.h
index add940a..e8b25a0 100644
--- a/champlain/champlain-image-renderer.h
+++ b/champlain/champlain-image-renderer.h
@@ -28,12 +28,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_IMAGE_RENDERER            (champlain_image_renderer_get_type())
-#define CHAMPLAIN_IMAGE_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_IMAGE_RENDERER, ChamplainImageRenderer))
-#define CHAMPLAIN_IMAGE_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), CHAMPLAIN_TYPE_IMAGE_RENDERER, ChamplainImageRendererClass))
-#define CHAMPLAIN_IS_IMAGE_RENDERER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_IMAGE_RENDERER))
-#define CHAMPLAIN_IS_IMAGE_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), CHAMPLAIN_TYPE_IMAGE_RENDERER))
-#define CHAMPLAIN_IMAGE_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), CHAMPLAIN_TYPE_IMAGE_RENDERER, ChamplainImageRendererClass))
+#define CHAMPLAIN_TYPE_IMAGE_RENDERER champlain_image_renderer_get_type()
+
+#define CHAMPLAIN_IMAGE_RENDERER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_IMAGE_RENDERER, ChamplainImageRenderer))
+
+#define CHAMPLAIN_IMAGE_RENDERER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), CHAMPLAIN_TYPE_IMAGE_RENDERER, ChamplainImageRendererClass))
+
+#define CHAMPLAIN_IS_IMAGE_RENDERER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_IMAGE_RENDERER))
+
+#define CHAMPLAIN_IS_IMAGE_RENDERER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), CHAMPLAIN_TYPE_IMAGE_RENDERER))
+
+#define CHAMPLAIN_IMAGE_RENDERER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS((obj), CHAMPLAIN_TYPE_IMAGE_RENDERER, ChamplainImageRendererClass))
 
 typedef struct _ChamplainImageRendererPrivate ChamplainImageRendererPrivate;
 
@@ -52,8 +62,6 @@ struct _ChamplainImageRendererClass
   ChamplainRendererClass parent_class;
 };
 
-// returns ClutterActor * - the user provides the tile as client data
-
 GType champlain_image_renderer_get_type (void);
 
 ChamplainImageRenderer* champlain_image_renderer_new (void);
diff --git a/champlain/champlain-map-source-chain.c b/champlain/champlain-map-source-chain.c
index 80f0922..cf0aaa7 100644
--- a/champlain/champlain-map-source-chain.c
+++ b/champlain/champlain-map-source-chain.c
@@ -36,7 +36,8 @@
 
 G_DEFINE_TYPE (ChamplainMapSourceChain, champlain_map_source_chain, CHAMPLAIN_TYPE_MAP_SOURCE);
 
-#define GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN, ChamplainMapSourceChainPrivate))
+#define GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN, ChamplainMapSourceChainPrivate))
 
 struct _ChamplainMapSourceChainPrivate
 {
diff --git a/champlain/champlain-map-source-chain.h b/champlain/champlain-map-source-chain.h
index 3c5ae1e..5ad03c4 100644
--- a/champlain/champlain-map-source-chain.h
+++ b/champlain/champlain-map-source-chain.h
@@ -29,12 +29,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN             (champlain_map_source_chain_get_type ())
-#define CHAMPLAIN_MAP_SOURCE_CHAIN(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN, ChamplainMapSourceChain))
-#define CHAMPLAIN_MAP_SOURCE_CHAIN_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN, ChamplainMapSourceChainClass))
-#define CHAMPLAIN_IS_MAP_SOURCE_CHAIN(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN))
-#define CHAMPLAIN_IS_MAP_SOURCE_CHAIN_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN))
-#define CHAMPLAIN_MAP_SOURCE_CHAIN_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN, ChamplainMapSourceChainClass))
+#define CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN champlain_map_source_chain_get_type ()
+
+#define CHAMPLAIN_MAP_SOURCE_CHAIN(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN, ChamplainMapSourceChain))
+
+#define CHAMPLAIN_MAP_SOURCE_CHAIN_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN, ChamplainMapSourceChainClass))
+
+#define CHAMPLAIN_IS_MAP_SOURCE_CHAIN(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN))
+
+#define CHAMPLAIN_IS_MAP_SOURCE_CHAIN_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN))
+
+#define CHAMPLAIN_MAP_SOURCE_CHAIN_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_MAP_SOURCE_CHAIN, ChamplainMapSourceChainClass))
 
 typedef struct _ChamplainMapSourceChainPrivate ChamplainMapSourceChainPrivate;
 
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index efc0785..bfc1343 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -74,7 +74,8 @@ static ChamplainMapSourceFactory *instance = NULL;
 
 G_DEFINE_TYPE (ChamplainMapSourceFactory, champlain_map_source_factory, G_TYPE_OBJECT);
 
-#define GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY, ChamplainMapSourceFactoryPrivate))
+#define GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY, ChamplainMapSourceFactoryPrivate))
 
 struct _ChamplainMapSourceFactoryPrivate
 {
diff --git a/champlain/champlain-map-source-factory.h b/champlain/champlain-map-source-factory.h
index ca4e984..92b947b 100644
--- a/champlain/champlain-map-source-factory.h
+++ b/champlain/champlain-map-source-factory.h
@@ -33,12 +33,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY     (champlain_map_source_factory_get_type())
-#define CHAMPLAIN_MAP_SOURCE_FACTORY(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY, ChamplainMapSourceFactory))
-#define CHAMPLAIN_MAP_SOURCE_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY, ChamplainMapSourceFactoryClass))
-#define CHAMPLAIN_IS_MAP_SOURCE_FACTORY(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY))
-#define CHAMPLAIN_IS_MAP_SOURCE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY))
-#define CHAMPLAIN_MAP_SOURCE_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY, ChamplainMapSourceFactoryClass))
+#define CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY champlain_map_source_factory_get_type()
+
+#define CHAMPLAIN_MAP_SOURCE_FACTORY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY, ChamplainMapSourceFactory))
+
+#define CHAMPLAIN_MAP_SOURCE_FACTORY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),  CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY, ChamplainMapSourceFactoryClass))
+
+#define CHAMPLAIN_IS_MAP_SOURCE_FACTORY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY))
+
+#define CHAMPLAIN_IS_MAP_SOURCE_FACTORY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),  CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY))
+
+#define CHAMPLAIN_MAP_SOURCE_FACTORY_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS((obj),  CHAMPLAIN_TYPE_MAP_SOURCE_FACTORY, ChamplainMapSourceFactoryClass))
 
 typedef struct _ChamplainMapSourceFactory ChamplainMapSourceFactory;
 typedef struct _ChamplainMapSourceFactoryClass ChamplainMapSourceFactoryClass;
diff --git a/champlain/champlain-map-source.c b/champlain/champlain-map-source.c
index 66eec48..42ef049 100644
--- a/champlain/champlain-map-source.c
+++ b/champlain/champlain-map-source.c
@@ -56,7 +56,8 @@
 
 G_DEFINE_TYPE (ChamplainMapSource, champlain_map_source, G_TYPE_INITIALLY_UNOWNED);
 
-#define GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_MAP_SOURCE, ChamplainMapSourcePrivate))
+#define GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_MAP_SOURCE, ChamplainMapSourcePrivate))
 
 enum
 {
diff --git a/champlain/champlain-map-source.h b/champlain/champlain-map-source.h
index f134d37..cfc6631 100644
--- a/champlain/champlain-map-source.h
+++ b/champlain/champlain-map-source.h
@@ -29,12 +29,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_MAP_SOURCE             (champlain_map_source_get_type ())
-#define CHAMPLAIN_MAP_SOURCE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_MAP_SOURCE, ChamplainMapSource))
-#define CHAMPLAIN_MAP_SOURCE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_MAP_SOURCE, ChamplainMapSourceClass))
-#define CHAMPLAIN_IS_MAP_SOURCE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_MAP_SOURCE))
-#define CHAMPLAIN_IS_MAP_SOURCE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_MAP_SOURCE))
-#define CHAMPLAIN_MAP_SOURCE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_MAP_SOURCE, ChamplainMapSourceClass))
+#define CHAMPLAIN_TYPE_MAP_SOURCE champlain_map_source_get_type ()
+
+#define CHAMPLAIN_MAP_SOURCE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_MAP_SOURCE, ChamplainMapSource))
+  
+#define CHAMPLAIN_MAP_SOURCE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_MAP_SOURCE, ChamplainMapSourceClass))
+
+#define CHAMPLAIN_IS_MAP_SOURCE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_MAP_SOURCE))
+
+#define CHAMPLAIN_IS_MAP_SOURCE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_MAP_SOURCE))
+
+#define CHAMPLAIN_MAP_SOURCE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_MAP_SOURCE, ChamplainMapSourceClass))
 
 typedef struct _ChamplainMapSourcePrivate ChamplainMapSourcePrivate;
 
diff --git a/champlain/champlain-marker.c b/champlain/champlain-marker.c
index 7c0c7fb..7db03eb 100644
--- a/champlain/champlain-marker.c
+++ b/champlain/champlain-marker.c
@@ -108,7 +108,8 @@ struct _ChamplainMarkerPrivate
 
 G_DEFINE_TYPE (ChamplainMarker, champlain_marker, CHAMPLAIN_TYPE_BASE_MARKER);
 
-#define GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_MARKER, ChamplainMarkerPrivate))
+#define GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_MARKER, ChamplainMarkerPrivate))
 
 static void draw_marker (ChamplainMarker *marker);
 
diff --git a/champlain/champlain-marker.h b/champlain/champlain-marker.h
index dfbfbe9..6a87b71 100644
--- a/champlain/champlain-marker.h
+++ b/champlain/champlain-marker.h
@@ -30,12 +30,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_MARKER     (champlain_marker_get_type())
-#define CHAMPLAIN_MARKER(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_MARKER, ChamplainMarker))
-#define CHAMPLAIN_MARKER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass),  CHAMPLAIN_TYPE_MARKER, ChamplainMarkerClass))
-#define CHAMPLAIN_IS_MARKER(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_MARKER))
-#define CHAMPLAIN_IS_MARKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  CHAMPLAIN_TYPE_MARKER))
-#define CHAMPLAIN_MARKER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  CHAMPLAIN_TYPE_MARKER, ChamplainMarkerClass))
+#define CHAMPLAIN_TYPE_MARKER champlain_marker_get_type()
+
+#define CHAMPLAIN_MARKER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_MARKER, ChamplainMarker))
+
+#define CHAMPLAIN_MARKER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),  CHAMPLAIN_TYPE_MARKER, ChamplainMarkerClass))
+
+#define CHAMPLAIN_IS_MARKER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_MARKER))
+
+#define CHAMPLAIN_IS_MARKER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),  CHAMPLAIN_TYPE_MARKER))
+
+#define CHAMPLAIN_MARKER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS((obj),  CHAMPLAIN_TYPE_MARKER, ChamplainMarkerClass))
 
 typedef struct _ChamplainMarkerPrivate ChamplainMarkerPrivate;
 
diff --git a/champlain/champlain-memory-cache.c b/champlain/champlain-memory-cache.c
index 9354967..342ad9d 100644
--- a/champlain/champlain-memory-cache.c
+++ b/champlain/champlain-memory-cache.c
@@ -27,7 +27,8 @@
 
 G_DEFINE_TYPE (ChamplainMemoryCache, champlain_memory_cache, CHAMPLAIN_TYPE_TILE_CACHE);
 
-#define GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CHAMPLAIN_TYPE_MEMORY_CACHE, ChamplainMemoryCachePrivate))
+#define GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CHAMPLAIN_TYPE_MEMORY_CACHE, ChamplainMemoryCachePrivate))
 
 enum
 {
diff --git a/champlain/champlain-memory-cache.h b/champlain/champlain-memory-cache.h
index b3c5c75..0a2e141 100644
--- a/champlain/champlain-memory-cache.h
+++ b/champlain/champlain-memory-cache.h
@@ -28,12 +28,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_MEMORY_CACHE             (champlain_memory_cache_get_type ())
-#define CHAMPLAIN_MEMORY_CACHE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_MEMORY_CACHE, ChamplainMemoryCache))
-#define CHAMPLAIN_MEMORY_CACHE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_MEMORY_CACHE, ChamplainMemoryCacheClass))
-#define CHAMPLAIN_IS_MEMORY_CACHE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_MEMORY_CACHE))
-#define CHAMPLAIN_IS_MEMORY_CACHE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_MEMORY_CACHE))
-#define CHAMPLAIN_MEMORY_CACHE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_MEMORY_CACHE, ChamplainMemoryCacheClass))
+#define CHAMPLAIN_TYPE_MEMORY_CACHE champlain_memory_cache_get_type ()
+
+#define CHAMPLAIN_MEMORY_CACHE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_MEMORY_CACHE, ChamplainMemoryCache))
+
+#define CHAMPLAIN_MEMORY_CACHE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_MEMORY_CACHE, ChamplainMemoryCacheClass))
+
+#define CHAMPLAIN_IS_MEMORY_CACHE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_MEMORY_CACHE))
+
+#define CHAMPLAIN_IS_MEMORY_CACHE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_MEMORY_CACHE))
+
+#define CHAMPLAIN_MEMORY_CACHE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_MEMORY_CACHE, ChamplainMemoryCacheClass))
 
 typedef struct _ChamplainMemoryCachePrivate ChamplainMemoryCachePrivate;
 
@@ -62,7 +72,6 @@ void champlain_memory_cache_set_size_limit (ChamplainMemoryCache *memory_cache,
 
 void champlain_memory_cache_clean (ChamplainMemoryCache *memory_cache);
 
-
 G_END_DECLS
 
 #endif /* _CHAMPLAIN_MEMORY_CACHE_H_ */
diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c
index c99a142..c901b12 100644
--- a/champlain/champlain-network-tile-source.c
+++ b/champlain/champlain-network-tile-source.c
@@ -70,7 +70,8 @@ enum
 
 G_DEFINE_TYPE (ChamplainNetworkTileSource, champlain_network_tile_source, CHAMPLAIN_TYPE_TILE_SOURCE);
 
-#define GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE, ChamplainNetworkTileSourcePrivate))
+#define GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE, ChamplainNetworkTileSourcePrivate))
 
 struct _ChamplainNetworkTileSourcePrivate
 {
diff --git a/champlain/champlain-network-tile-source.h b/champlain/champlain-network-tile-source.h
index 532e86f..0dc58f2 100644
--- a/champlain/champlain-network-tile-source.h
+++ b/champlain/champlain-network-tile-source.h
@@ -29,12 +29,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE             (champlain_network_tile_source_get_type ())
-#define CHAMPLAIN_NETWORK_TILE_SOURCE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE, ChamplainNetworkTileSource))
-#define CHAMPLAIN_NETWORK_TILE_SOURCE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE, ChamplainNetworkTileSourceClass))
-#define CHAMPLAIN_IS_NETWORK_TILE_SOURCE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE))
-#define CHAMPLAIN_IS_NETWORK_TILE_SOURCE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE))
-#define CHAMPLAIN_NETWORK_TILE_SOURCE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE, ChamplainNetworkTileSourceClass))
+#define CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE champlain_network_tile_source_get_type ()
+
+#define CHAMPLAIN_NETWORK_TILE_SOURCE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE, ChamplainNetworkTileSource))
+
+#define CHAMPLAIN_NETWORK_TILE_SOURCE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE, ChamplainNetworkTileSourceClass))
+
+#define CHAMPLAIN_IS_NETWORK_TILE_SOURCE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE))
+
+#define CHAMPLAIN_IS_NETWORK_TILE_SOURCE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE))
+
+#define CHAMPLAIN_NETWORK_TILE_SOURCE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_NETWORK_TILE_SOURCE, ChamplainNetworkTileSourceClass))
 
 typedef struct _ChamplainNetworkTileSourcePrivate ChamplainNetworkTileSourcePrivate;
 
diff --git a/champlain/champlain-renderer.c b/champlain/champlain-renderer.c
index fbee2e9..9ac165f 100644
--- a/champlain/champlain-renderer.c
+++ b/champlain/champlain-renderer.c
@@ -20,14 +20,6 @@
 
 G_DEFINE_TYPE(ChamplainRenderer, champlain_renderer, G_TYPE_OBJECT)
 
-//#define GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_RENDERER, ChamplainRenderer))
-
-
-//struct _ChamplainRendererPrivate
-//{
-    /* add your private declarations here */
-//};
-
 enum
 {
   /* normal signals */
diff --git a/champlain/champlain-renderer.h b/champlain/champlain-renderer.h
index 3e460b2..6624476 100644
--- a/champlain/champlain-renderer.h
+++ b/champlain/champlain-renderer.h
@@ -27,43 +27,44 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_RENDERER            (champlain_renderer_get_type())
-#define CHAMPLAIN_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_RENDERER, ChamplainRenderer))
-#define CHAMPLAIN_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), CHAMPLAIN_TYPE_RENDERER, ChamplainRendererClass))
-#define CHAMPLAIN_IS_RENDERER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_RENDERER))
-#define CHAMPLAIN_IS_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), CHAMPLAIN_TYPE_RENDERER))
-#define CHAMPLAIN_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), CHAMPLAIN_TYPE_RENDERER, ChamplainRendererClass))
+#define CHAMPLAIN_TYPE_RENDERER champlain_renderer_get_type()
+
+#define CHAMPLAIN_RENDERER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_RENDERER, ChamplainRenderer))
+
+#define CHAMPLAIN_RENDERER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), CHAMPLAIN_TYPE_RENDERER, ChamplainRendererClass))
+
+#define CHAMPLAIN_IS_RENDERER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_RENDERER))
+
+#define CHAMPLAIN_IS_RENDERER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), CHAMPLAIN_TYPE_RENDERER))
+
+#define CHAMPLAIN_RENDERER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS((obj), CHAMPLAIN_TYPE_RENDERER, ChamplainRendererClass))
 
 typedef struct _ChamplainRenderer      ChamplainRenderer;
 typedef struct _ChamplainRendererClass    ChamplainRendererClass;
-//typedef struct _ChamplainRendererPrivate    ChamplainRendererPrivate;
 
 struct _ChamplainRenderer
 {
   GObject parent;
-//  ChamplainRendererPrivate *priv;
 };
 
 struct _ChamplainRendererClass
 {
   GObjectClass parent_class;
 
-  // takes ownership
   void (*set_data) (ChamplainRenderer *renderer, const gchar *data, guint size);
-  // only reads coords of the tile
   void (*render) (ChamplainRenderer *renderer, ChamplainTile *tile);
 };
 
-// returns ClutterActor * - the user provides the tile as client data
-
 GType    champlain_renderer_get_type    (void);
-//GObject*  champlain_renderer_new      (void);
-
 
 void champlain_renderer_set_data (ChamplainRenderer *renderer, const gchar *data, guint size);
 void champlain_renderer_render (ChamplainRenderer *renderer, ChamplainTile *tile);
 
-
 G_END_DECLS
 
 #endif /* __CHAMPLAIN_RENDERER_H__ */
diff --git a/champlain/champlain-tile-cache.c b/champlain/champlain-tile-cache.c
index 19d75f6..79706df 100644
--- a/champlain/champlain-tile-cache.c
+++ b/champlain/champlain-tile-cache.c
@@ -29,7 +29,8 @@
 
 G_DEFINE_TYPE (ChamplainTileCache, champlain_tile_cache, CHAMPLAIN_TYPE_MAP_SOURCE)
 
-#define GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_TILE_CACHE, ChamplainTileCachePrivate))
+#define GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((obj), CHAMPLAIN_TYPE_TILE_CACHE, ChamplainTileCachePrivate))
 
 
 static const gchar *get_id (ChamplainMapSource *map_source);
diff --git a/champlain/champlain-tile-cache.h b/champlain/champlain-tile-cache.h
index ff8ffc7..50f7f86 100644
--- a/champlain/champlain-tile-cache.h
+++ b/champlain/champlain-tile-cache.h
@@ -28,12 +28,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_TILE_CACHE             (champlain_tile_cache_get_type ())
-#define CHAMPLAIN_TILE_CACHE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_TILE_CACHE, ChamplainTileCache))
-#define CHAMPLAIN_TILE_CACHE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_TILE_CACHE, ChamplainTileCacheClass))
-#define CHAMPLAIN_IS_TILE_CACHE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_TILE_CACHE))
-#define CHAMPLAIN_IS_TILE_CACHE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_TILE_CACHE))
-#define CHAMPLAIN_TILE_CACHE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_TILE_CACHE, ChamplainTileCacheClass))
+#define CHAMPLAIN_TYPE_TILE_CACHE champlain_tile_cache_get_type ()
+
+#define CHAMPLAIN_TILE_CACHE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_TILE_CACHE, ChamplainTileCache))
+
+#define CHAMPLAIN_TILE_CACHE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_TILE_CACHE, ChamplainTileCacheClass))
+
+#define CHAMPLAIN_IS_TILE_CACHE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_TILE_CACHE))
+
+#define CHAMPLAIN_IS_TILE_CACHE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_TILE_CACHE))
+
+#define CHAMPLAIN_TILE_CACHE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_TILE_CACHE, ChamplainTileCacheClass))
 
 typedef struct _ChamplainTileCachePrivate ChamplainTileCachePrivate;
 
diff --git a/champlain/champlain-tile-source.h b/champlain/champlain-tile-source.h
index 9daf9e2..584f291 100644
--- a/champlain/champlain-tile-source.h
+++ b/champlain/champlain-tile-source.h
@@ -30,12 +30,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_TILE_SOURCE             (champlain_tile_source_get_type ())
-#define CHAMPLAIN_TILE_SOURCE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_TILE_SOURCE, ChamplainTileSource))
-#define CHAMPLAIN_TILE_SOURCE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_TILE_SOURCE, ChamplainTileSourceClass))
-#define CHAMPLAIN_IS_TILE_SOURCE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_TILE_SOURCE))
-#define CHAMPLAIN_IS_TILE_SOURCE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_TILE_SOURCE))
-#define CHAMPLAIN_TILE_SOURCE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_TILE_SOURCE, ChamplainTileSourceClass))
+#define CHAMPLAIN_TYPE_TILE_SOURCE champlain_tile_source_get_type ()
+
+#define CHAMPLAIN_TILE_SOURCE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), CHAMPLAIN_TYPE_TILE_SOURCE, ChamplainTileSource))
+
+#define CHAMPLAIN_TILE_SOURCE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), CHAMPLAIN_TYPE_TILE_SOURCE, ChamplainTileSourceClass))
+
+#define CHAMPLAIN_IS_TILE_SOURCE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CHAMPLAIN_TYPE_TILE_SOURCE))
+
+#define CHAMPLAIN_IS_TILE_SOURCE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), CHAMPLAIN_TYPE_TILE_SOURCE))
+
+#define CHAMPLAIN_TILE_SOURCE_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_TILE_SOURCE, ChamplainTileSourceClass))
 
 typedef struct _ChamplainTileSourcePrivate ChamplainTileSourcePrivate;
 
diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index 186a635..38c5f01 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -110,11 +110,13 @@ enum
 #define PADDING 10
 static guint signals[LAST_SIGNAL] = { 0, };
 
-#define GET_PRIVATE(obj)     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CHAMPLAIN_TYPE_VIEW, ChamplainViewPrivate))
-#define ZOOM_LEVEL_OUT_OF_RANGE(priv, level)    (level < priv->min_zoom_level || \
-                                                 level > priv->max_zoom_level || \
-                                                 level < champlain_map_source_get_min_zoom_level (priv->map_source) || \
-                                                 level > champlain_map_source_get_max_zoom_level (priv->map_source))
+#define GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CHAMPLAIN_TYPE_VIEW, ChamplainViewPrivate))
+#define ZOOM_LEVEL_OUT_OF_RANGE(priv, level) \
+  (level < priv->min_zoom_level || \
+   level > priv->max_zoom_level || \
+   level < champlain_map_source_get_min_zoom_level (priv->map_source) || \
+   level > champlain_map_source_get_max_zoom_level (priv->map_source))
 
 #define CHAMPLAIN_MIN_LAT -90
 #define CHAMPLAIN_MAX_LAT 90
diff --git a/champlain/champlain-view.h b/champlain/champlain-view.h
index ca4800f..4c35cdc 100644
--- a/champlain/champlain-view.h
+++ b/champlain/champlain-view.h
@@ -36,12 +36,22 @@
 
 G_BEGIN_DECLS
 
-#define CHAMPLAIN_TYPE_VIEW     (champlain_view_get_type())
-#define CHAMPLAIN_VIEW(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_VIEW, ChamplainView))
-#define CHAMPLAIN_VIEW_CLASS(klass)  (G_TYPE_CHECK_CLASS_CAST((klass),  CHAMPLAIN_TYPE_VIEW, ChamplainViewClass))
-#define CHAMPLAIN_IS_VIEW(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_VIEW))
-#define CHAMPLAIN_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  CHAMPLAIN_TYPE_VIEW))
-#define CHAMPLAIN_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  CHAMPLAIN_TYPE_VIEW, ChamplainViewClass))
+#define CHAMPLAIN_TYPE_VIEW champlain_view_get_type()
+
+#define CHAMPLAIN_VIEW(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), CHAMPLAIN_TYPE_VIEW, ChamplainView))
+  
+#define CHAMPLAIN_VIEW_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),  CHAMPLAIN_TYPE_VIEW, ChamplainViewClass))
+  
+#define CHAMPLAIN_IS_VIEW(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), CHAMPLAIN_TYPE_VIEW))
+  
+#define CHAMPLAIN_IS_VIEW_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),  CHAMPLAIN_TYPE_VIEW))
+  
+#define CHAMPLAIN_VIEW_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS((obj),  CHAMPLAIN_TYPE_VIEW, ChamplainViewClass))
 
 typedef struct _ChamplainViewPrivate ChamplainViewPrivate;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]