]> err.no Git - libchamplain/commitdiff
Rename files and fix includes according to coding styles
authorPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Fri, 30 Jan 2009 17:34:50 +0000 (19:34 +0200)
committerPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Fri, 30 Jan 2009 17:34:50 +0000 (19:34 +0200)
30 files changed:
champlain/Makefile.am
champlain/champlain-defines.h [moved from champlain/champlaindefines.h with 99% similarity]
champlain/champlain-layer.c [moved from champlain/champlainlayer.c with 97% similarity]
champlain/champlain-layer.h [moved from champlain/champlainlayer.h with 96% similarity]
champlain/champlain-map.c [moved from champlain/map.c with 98% similarity]
champlain/champlain-map.h [moved from champlain/map.h with 94% similarity]
champlain/champlain-marker.c [moved from champlain/champlainmarker.c with 98% similarity]
champlain/champlain-marker.h [moved from champlain/champlainmarker.h with 98% similarity]
champlain/champlain-private.h [moved from champlain/champlainprivate.h with 100% similarity]
champlain/champlain-tile.c [moved from champlain/tile.c with 98% similarity]
champlain/champlain-tile.h [moved from champlain/tile.h with 97% similarity]
champlain/champlain-view.c [moved from champlain/champlainview.c with 99% similarity]
champlain/champlain-view.h [moved from champlain/champlainview.h with 98% similarity]
champlain/champlain-zoom-level.c [moved from champlain/zoomlevel.c with 95% similarity]
champlain/champlain-zoom-level.h [moved from champlain/zoomlevel.h with 97% similarity]
champlain/champlain.h
champlain/sources/debugmap.h
champlain/sources/googlemap.c
champlain/sources/googlemap.h
champlain/sources/googlesat.c
champlain/sources/googlesat.h
champlain/sources/googleterrain.c
champlain/sources/googleterrain.h
champlain/sources/mffrelief.c
champlain/sources/mffrelief.h
champlain/sources/oam.c
champlain/sources/oam.h
champlain/sources/osmmapnik.c
champlain/sources/osmmapnik.h
configure.ac

index 38d7ef5216a8550adaebb06f2fcdcc3812af43a4..19208c2941215ea8ed838ab1a3380602e406b909 100644 (file)
@@ -1,57 +1,59 @@
 
 BUILT_SOURCES = \
-       champlain-marshal.h \
-       champlain-marshal.c 
+       champlain-marshal.h             \
+       champlain-marshal.c
 
 CLEANFILES = $(BUILT_SOURCES)
 
 CHAMPLAIN_MARSHAL = champlain-marshal
-CHAMPLAIN_MARSHAL_LIST = champlain-marshal.list 
+CHAMPLAIN_MARSHAL_LIST = champlain-marshal.list
 
 lib_LTLIBRARIES = libchamplain-0.2.la
 
-libchamplain_0_2_la_SOURCES = $(CHAMPLAIN_MARSHAL_LIST) \
-                                       $(BUILT_SOURCES) \
-                                       champlainview.c \
-                                       champlainlayer.c \
-                                       champlainmarker.c \
-                                       map.c  \
-                                       zoomlevel.c \
-                                       tile.c \
-                                       sources/oam.c \
-                                       sources/osmmapnik.c \
-                                       sources/mffrelief.c \
-                                       sources/googlemap.c \
-                                       sources/googlesat.c \
-                                       sources/googleterrain.c \
-                                       sources/debugmap.c
-
-noinst_HEADERS = champlainview.h \
-                                       champlainmarker.c \
-                                       champlainprivate.h \
-                                       map.h  \
-                                       zoomlevel.h \
-                                       tile.h \
-                                       sources/oam.h \
-                                       sources/osmmapnik.h \
-                                       sources/mffrelief.h \
-                                       sources/googlemap.h \
-                                       sources/googlesat.h \
-                                       sources/googleterrain.h \
-                                       sources/debugmap.h
+libchamplain_0_2_la_SOURCES = \
+       $(CHAMPLAIN_MARSHAL_LIST)       \
+       $(BUILT_SOURCES)                \
+       champlain-view.c                \
+       champlain-layer.c               \
+       champlain-marker.c              \
+       champlain-map.c                 \
+       champlain-zoom-level.c          \
+       champlain-tile.c                \
+       sources/oam.c                   \
+       sources/osmmapnik.c             \
+       sources/mffrelief.c             \
+       sources/googlemap.c             \
+       sources/googlesat.c             \
+       sources/googleterrain.c         \
+       sources/debugmap.c
 
-libchamplain_0_2_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la
+noinst_HEADERS = \
+       champlain-view.h                \
+       champlain-marker.c              \
+       champlain-private.h             \
+       champlain-map.h                 \
+       champlain-zoom-level.h          \
+       champlain-tile.h                \
+       sources/oam.h                   \
+       sources/osmmapnik.h             \
+       sources/mffrelief.h             \
+       sources/googlemap.h             \
+       sources/googlesat.h             \
+       sources/googleterrain.h         \
+       sources/debugmap.h
 
-champlain-marshal.h: $(CHAMPLAIN_MARSHAL_LIST)
-       @GLIB_GENMARSHAL@ --header --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).h 
+libchamplain_include_HEADERS = \
+       champlain.h                     \
+       champlain-view.h                \
+       champlain-defines.h             \
+       champlain-layer.h               \
+       champlain-marker.h
 
-champlain-marshal.c: $(CHAMPLAIN_MARSHAL_LIST)
-       @GLIB_GENMARSHAL@ --body --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).c
+libchamplain_0_2_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la
 
-libchamplain_includedir=$(includedir)/libchamplain-0.2/champlain
-libchamplain_include_HEADERS = champlain.h champlainview.h champlaindefines.h champlainlayer.h champlainmarker.h
+libchamplain_includedir = $(includedir)/libchamplain-0.2/champlain
 
-libchamplain_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
+libchamplain_0_2_la_LDFLAGS = -version-info $(LIBRARY_VERSION)
 
 AM_CPPFLAGS = $(DEPS_CFLAGS) -DDATADIR=\""$(datadir)"\" -I$(top_srcdir)/tidy -I$(top_srcdir) -DCHAMPLAIN_COMPILATION
 AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.*
@@ -60,3 +62,9 @@ svgdir = $(datadir)/champlain
 svg_DATA = error.svg
 
 EXTRA_DIST = $(svg_DATA) $(CHAMPLAIN_MARSHAL_LIST)
+
+champlain-marshal.h: $(CHAMPLAIN_MARSHAL_LIST)
+       @GLIB_GENMARSHAL@ --header --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).h
+
+champlain-marshal.c: $(CHAMPLAIN_MARSHAL_LIST)
+       @GLIB_GENMARSHAL@ --body --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).c
similarity index 99%
rename from champlain/champlaindefines.h
rename to champlain/champlain-defines.h
index 9c3ea97a22c0d1fc8923a5cd4333a5005ea242fa..78c38851943213d4bb1ab8a2b456639fa3b2e969 100644 (file)
@@ -39,5 +39,5 @@ typedef struct _ChamplainMarkerClass ChamplainMarkerClass;
 #define CHAMPLAIN_PARAM_READWRITE    \
         (G_PARAM_READABLE | G_PARAM_WRITABLE | \
          G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB)
-         
+
 #endif
similarity index 97%
rename from champlain/champlainlayer.c
rename to champlain/champlain-layer.c
index f9304e2c777da2e173e1e7cc91acb301b75c6980..34bfa53ee405b3eeb5fa1f456338272112443a6b 100644 (file)
@@ -29,8 +29,9 @@
 
 #include "config.h"
 
-#include "champlainlayer.h"
-#include "champlaindefines.h"
+#include "champlain-layer.h"
+
+#include "champlain-defines.h"
 
 #include <clutter/clutter.h>
 #include <glib.h>
similarity index 96%
rename from champlain/champlainlayer.h
rename to champlain/champlain-layer.h
index f22e4b39a97d4e8b1f5ddc4b5b9df15362465f35..7a30c896133e454ff31706fffffab1fc89cc33fa 100644 (file)
@@ -23,7 +23,8 @@
 #ifndef CHAMPLAIN_LAYER_H
 #define CHAMPLAIN_LAYER_H
 
-#include <champlain/champlaindefines.h>
+#include <champlain/champlain-defines.h>
+
 #include <glib-object.h>
 #include <clutter/clutter.h>
 
similarity index 98%
rename from champlain/map.c
rename to champlain/champlain-map.c
index a7ddf3f624bd673d9d215f89d65ba0219abc6cd6..58a2d0819663eaff829fa9c969d0a34fff9f9a0d 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "map.h"
-#include "zoomlevel.h"
+#include "champlain-map.h"
+
+#include "champlain-zoom-level.h"
 #include "sources/osmmapnik.h"
 #include "sources/mffrelief.h"
 #include "sources/oam.h"
 #include "sources/debugmap.h"
+
 #include <math.h>
 
 Map*
similarity index 94%
rename from champlain/map.h
rename to champlain/champlain-map.h
index 3c68bbba6fb0b64cc535270091fd115b53470410..e011d8bd7b21bccc710063bc4c0ab572ba7de96f 100644 (file)
 #define MAP_H
 
 #include "champlain.h"
-#include "champlainview.h"
-#include "champlainprivate.h"
-#include "zoomlevel.h"
-#include "tile.h"
+#include "champlain-private.h"
+#include "champlain-tile.h"
+#include "champlain-view.h"
+#include "champlain-zoom-level.h"
 
 #include <glib.h>
 #include <clutter/clutter.h>
similarity index 98%
rename from champlain/champlainmarker.c
rename to champlain/champlain-marker.c
index b938e77dcfa0e012c0b3700d8cbd0ba8c2c74b1c..ed4c11fbb05ea62c66844c3e6f5170d47aadb597 100644 (file)
 
 #include "config.h"
 
-#include "champlaindefines.h"
-#include "champlainmarker.h"
-#include "champlainprivate.h"
+#include "champlain-marker.h"
+
 #include "champlain.h"
+#include "champlain-defines.h"
 #include "champlain-marshal.h"
-#include "map.h"
-#include "tile.h"
-#include "zoomlevel.h"
+#include "champlain-private.h"
+#include "champlain-map.h"
+#include "champlain-tile.h"
+#include "champlain-zoom-level.h"
 
 #include <clutter/clutter.h>
 #include <clutter-cairo/clutter-cairo.h>
similarity index 98%
rename from champlain/champlainmarker.h
rename to champlain/champlain-marker.h
index 887fea242ec6772dd8c4cebff9e9649110954fcf..cc5a9ed328cf40d8c599a780ae698716a390c422 100644 (file)
@@ -23,7 +23,8 @@
 #ifndef CHAMPLAIN_MARKER_H
 #define CHAMPLAIN_MARKER_H
 
-#include <champlain/champlaindefines.h>
+#include <champlain/champlain-defines.h>
+
 #include <glib-object.h>
 #include <clutter/clutter.h>
 
similarity index 98%
rename from champlain/tile.c
rename to champlain/champlain-tile.c
index de1ae37be20f6cb4a3f27d6d47df8aa9e9695167..fe5766097fc886d090dbf846b12f370cd60d8b22 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "tile.h"
-#include "map.h"
-#include "champlainprivate.h"
+#include "champlain-tile.h"
+
+#include "champlain-map.h"
+#include "champlain-private.h"
 
 #include <math.h>
 #include <errno.h>
similarity index 97%
rename from champlain/tile.h
rename to champlain/champlain-tile.h
index e92e33ea80730c77181e10e3909d3a4a9776faed..a74146d37d8a970234717005e15eed869b8ecd0a 100644 (file)
 #ifndef CHAMPLAIN_MAP_TILE_H
 #define CHAMPLAIN_MAP_TILE_H
 
+#include <champlain/champlain-private.h>
+
 #include <glib.h>
 #include <clutter/clutter.h>
-#include <champlain/champlainprivate.h>
 
 struct _Tile
 {
similarity index 99%
rename from champlain/champlainview.c
rename to champlain/champlain-view.c
index bca6db49fb7491c9c5ab815fbf34d7d932c56579..8625aad89567f42a9133c8c131d6af02d5c33a9b 100644 (file)
 
 #include "config.h"
 
-#include "champlaindefines.h"
-#include "champlainprivate.h"
+#include "champlain-view.h"
+
 #include "champlain.h"
+#include "champlain-defines.h"
+#include "champlain-map.h"
 #include "champlain-marshal.h"
-#include "champlainview.h"
-#include "map.h"
-#include "tile.h"
-#include "zoomlevel.h"
+#include "champlain-private.h"
+#include "champlain-tile.h"
+#include "champlain-zoom-level.h"
 
 #include <clutter/clutter.h>
 #include <glib.h>
similarity index 98%
rename from champlain/champlainview.h
rename to champlain/champlain-view.h
index ab627c5b6ba6f71793da6b82e9df0c88d710282f..3dea328f4af576ff3879360d539dc310b6b30a53 100644 (file)
 
 #if !defined (__CHAMPLAIN_CHAMPLAIN_H_INSIDE__) && !defined (CHAMPLAIN_COMPILATION)
 #error "Only <champlain/champlain.h> can be included directly."
-#endif 
+#endif
 
 #ifndef CHAMPLAIN_VIEW_H
 #define CHAMPLAIN_VIEW_H
 
-#include <champlain/champlaindefines.h>
+#include <champlain/champlain-defines.h>
+
 #include <glib.h>
 #include <glib-object.h>
 #include <clutter/clutter.h>
similarity index 95%
rename from champlain/zoomlevel.c
rename to champlain/champlain-zoom-level.c
index 899912dfce70dcfad3546674305ddffd4a768207..1d1ffe1c0664460775f2d5bbaa2d2d167a465dd9 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <zoomlevel.h>
-#include <tile.h>
-#include "map.h"
+#include "champlain-zoom-level.h"
+
+#include "champlain-map.h"
+#include "champlain-tile.h"
+
 #include <clutter/clutter.h>
 
 ZoomLevel*
similarity index 97%
rename from champlain/zoomlevel.h
rename to champlain/champlain-zoom-level.h
index 63e8d7403a75e2fe8314e1eb95331639fb1aedef..75bee9572d1a83a166153c5d17e2642d97940b71 100644 (file)
 #ifndef CHAMPLAIN_MAP_ZOOM_LEVEL_H
 #define CHAMPLAIN_MAP_ZOOM_LEVEL_H
 
+#include "champlain-private.h"
+
 #include <glib.h>
 #include <clutter/clutter.h>
-#include "champlainprivate.h"
 
 typedef struct
 {
index 4acdb2bba9c358edd639c764d28b411e36db0422..1af2859f7430d3c1ee1599347c58c07562ebaaf2 100644 (file)
 
 #include <glib.h>
 
-#include <champlain/champlaindefines.h>
-#include <champlain/champlainview.h>
-#include <champlain/champlainmarker.h>
-#include <champlain/champlainlayer.h>
+#include "champlain/champlain-defines.h"
+#include "champlain/champlain-layer.h"
+#include "champlain/champlain-marker.h"
+#include "champlain/champlain-view.h"
 
 #undef __CHAMPLAIN_CHAMPLAIN_H_INSIDE__
 
index a8232caef4bd26c4451abba39554af32b79c1151..f296955719c9e6f28f5167744f1127473b8b4d58 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef OPENSTREETMAP_H
 #define OPENSTREETMAP_H
 
-#include <map.h>
+#include "champlain-map.h"
 
 void debugmap_init(Map* map);
 
index a111e633d7a1b0626b31e8d1598a68f63ca2f3d9..8b7ce0b8928d198ce9f539561dca7ed2a2c911b9 100644 (file)
@@ -23,7 +23,9 @@
  */
 
 #include "sources/googlemap.h"
-#include "map.h"
+
+#include "champlain-map.h"
+
 #include <math.h>
 #include <clutter/clutter.h>
 
index e3d6ac1a77f2fac5f16f3a8727679f4ed66b48cc..38a1eda2fd0a97ef378da7e49e363e146ea2d0af 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef GOOGLE_MAP_H
 #define GOOGLE_MAP_H
 
-#include <map.h>
+#include "champlain-map.h"
 
 void google_map_init(Map* map);
 
index 31d172e452f19bc096d6c11780c83b320c747a66..9083e48846708ddf4514c9dff9eb6d872f263b58 100644 (file)
  */
 
 #include "sources/googlesat.h"
-#include "map.h"
-#include <math.h>
+
+#include "champlain-map.h"
+
 #include <clutter/clutter.h>
+#include <math.h>
 
 guint google_sat_row_count(Map *map, guint zoom_level);
 guint google_sat_column_count(Map *map, guint zoom_level);
index d86679325fdc467c804ef40498d4c82000066483..ab13fef7c3c8ac4b5720cdbe11eaf7e61e9094c8 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef GOOGLE_SAT_H
 #define GOOGLE_SAT_H
 
-#include <map.h>
+#include "champlain-map.h"
 
 void google_sat_init(Map* map);
 
index 8f9524a030195fc270cb879c646acf5167de70fd..6811c6aae91a06f8204315fae5de1dff9d40183c 100644 (file)
  */
 
 #include "sources/googleterrain.h"
-#include "map.h"
-#include <math.h>
+
+#include "champlain-map.h"
+
 #include <clutter/clutter.h>
+#include <math.h>
 
 guint google_terrain_row_count(Map *map, guint zoom_level);
 guint google_terrain_column_count(Map *map, guint zoom_level);
index edbf2a1b5afe94f4e704a57c7fef65090e4b0d46..f82d0f06b9ed6646542f9510f122795dd54490b2 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef GOOGLE_TERRAIN_H
 #define GOOGLE_TERRAIN_H
 
-#include <map.h>
+#include "champlain-map.h"
 
 void google_terrain_init(Map* map);
 
index 220436ba368035f99ae4eaa5760189c1dc80309c..cbac1e352002f556fc81806a6b0f20e67fc42b3c 100644 (file)
@@ -18,7 +18,9 @@
  */
 
 #include "sources/mffrelief.h"
-#include "map.h"
+
+#include "champlain-map.h"
+
 #include <math.h>
 #include <clutter/clutter.h>
 
index a26c0a5152ecd7f59dc69f5cbdc5ce67b43a9929..196dbfe113bf6baf8303bf77f3de85f6647d2e14 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef MFF_RELIEF_H
 #define MFF_RELIEF_H
 
-#include <map.h>
+#include "champlain-map.h"
 
 void mff_relief_init(Map* map);
 
index de72b5d9da4c429c1622d4138f8af6eb8015f7b3..2a5f3a75ae09b8b1956de8e3d2d75f97a224cda6 100644 (file)
  */
 
 #include "sources/oam.h"
-#include "map.h"
-#include <math.h>
+
+#include "champlain-map.h"
+
 #include <clutter/clutter.h>
+#include <math.h>
 
 guint oam_row_count(Map *map, guint zoom_level);
 guint oam_column_count(Map *map, guint zoom_level);
index a8bb8622d2ee669c644b0821e800694c2da88442..c3650d7d704c6aadaa210e358c7fd1e8eceffc29 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef OAM_H
 #define OAM_H
 
-#include <map.h>
+#include "champlain-map.h"
 
 void oam_init(Map* map);
 
index 45dda6e35a5c67474c966cc802b205f952341576..f700ee011f898937f847adeff7bd13f06f3ecfbf 100644 (file)
@@ -18,7 +18,9 @@
  */
 
 #include "sources/osmmapnik.h"
-#include "map.h"
+
+#include "champlain-map.h"
+
 #include <math.h>
 #include <clutter/clutter.h>
 
index 21628720a75a34c7a5bb8a481501d5aa57e15517..25af08bdf479fda41873daf1675752bbea30b3c7 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef OSM_MAPNIK_H
 #define OSM_MAPNIK_H
 
-#include <map.h>
+#include "champlain-map.h"
 
 void osm_mapnik_init(Map* map);
 
index 87b455cf62cbbd12a70912ea0fe985293c700851..c1d0c458ad3f94de0f681a810d17f5e1f349ea8d 100644 (file)
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.61)
 AC_INIT(libchamplain, 0.2.8, pierre-luc@pierlux.com)
-AC_CONFIG_SRCDIR([champlain/champlainview.h])
+AC_CONFIG_SRCDIR([champlain/champlain.h])
 AC_CONFIG_HEADER([config.h])
 
 AM_INIT_AUTOMAKE