Fix file naming conviention

diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 663ab7ae7f1554a2f0b2c3c5bd1489ada4fa36ad..518cf652e038bed9b6447421381e1f5f101f48b8 100644 (file)
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -19,25 +19,25 @@ libchamplain_0_2_la_SOURCES = $(CHAMPLAIN_MARSHAL_LIST) \
                                        zoomlevel.c \
                                        tile.c \
                                        sources/oam.c \
-                                       sources/osm_mapnik.c \
-                                       sources/mff_relief.c \
-                                       sources/google_map.c \
-                                       sources/google_sat.c \
-                                       sources/google_terrain.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 \
-                                       champlain_private.h \
+                                       champlainprivate.h \
                                        map.h  \
                                        zoomlevel.h \
                                        tile.h \
                                        sources/oam.h \
-                                       sources/osm_mapnik.h \
-                                       sources/mff_relief.h \
-                                       sources/google_map.h \
-                                       sources/google_sat.h \
-                                       sources/google_terrain.h \
+                                       sources/osmmapnik.h \
+                                       sources/mffrelief.h \
+                                       sources/googlemap.h \
+                                       sources/googlesat.h \
+                                       sources/googleterrain.h \
                                        sources/debugmap.h
 
 libchamplain_0_2_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la
@@ -49,7 +49,7 @@ champlain-marshal.c: $(CHAMPLAIN_MARSHAL_LIST)
        @GLIB_GENMARSHAL@ --body --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).c
 
 libchamplain_includedir=$(includedir)/libchamplain-0.2/champlain
-libchamplain_include_HEADERS = champlain.h champlainview.h champlain_defines.h champlainlayer.h champlainmarker.h
+libchamplain_include_HEADERS = champlain.h champlainview.h champlaindefines.h champlainlayer.h champlainmarker.h
 
 libchamplain_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
 

diff --git a/champlain/champlain.h b/champlain/champlain.h
index 3ab807b383b805dbf49b6479c673ce38356807cf..cdaf714023e88fbc825121a5b47d1c7a0f66d642 100644 (file)
--- a/champlain/champlain.h
+++ b/champlain/champlain.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <champlain/champlain_defines.h>
+#include <champlain/champlaindefines.h>
 #include <champlain/champlainview.h>
 #include <champlain/champlainmarker.h>
 #include <champlain/champlainlayer.h>

diff --git a/champlain/champlain_defines.h b/champlain/champlaindefines.h
similarity index 100%
rename from champlain/champlain_defines.h
rename to champlain/champlaindefines.h

diff --git a/champlain/champlainlayer.c b/champlain/champlainlayer.c
index 4aec98e884ea21f8cfbebb9f8a5e2e76fbf875b5..bfe9ae78f971dd251a7956f4a343e6518c264424 100644 (file)
--- a/champlain/champlainlayer.c
+++ b/champlain/champlainlayer.c
@@ -19,7 +19,7 @@
 #include "config.h"
 
 #include "champlainlayer.h"
-#include "champlain_defines.h"
+#include "champlaindefines.h"
 
 #include <clutter/clutter.h>
 #include <glib.h>

diff --git a/champlain/champlainlayer.h b/champlain/champlainlayer.h
index a8e924e87d49c4c49c32fb1b790a728dae01f59b..99c4a9170ae4edf04ee39e242f9074767d9d0498 100644 (file)
--- a/champlain/champlainlayer.h
+++ b/champlain/champlainlayer.h
@@ -19,7 +19,7 @@
 #ifndef CHAMPLAIN_LAYER_H
 #define CHAMPLAIN_LAYER_H
 
-#include <champlain/champlain_defines.h>
+#include <champlain/champlaindefines.h>
 #include <glib-object.h>
 #include <clutter/clutter.h>
 

diff --git a/champlain/champlainmarker.c b/champlain/champlainmarker.c
index 84877b7d8e14413600b004f9b9bcd1c0df3600b3..423df8f1a889add4895a1bed5f3026a981f81c10 100644 (file)
--- a/champlain/champlainmarker.c
+++ b/champlain/champlainmarker.c
@@ -18,9 +18,9 @@
 
 #include "config.h"
 
-#include "champlain_defines.h"
+#include "champlaindefines.h"
 #include "champlainmarker.h"
-#include "champlain_private.h"
+#include "champlainprivate.h"
 #include "champlain.h"
 #include "champlain-marshal.h"
 #include "map.h"

diff --git a/champlain/champlainmarker.h b/champlain/champlainmarker.h
index ac2a19f069cf50b6421995fc2218aed5dba2286b..badb41d3b4ce09ba378ac310cd9b23802f2c2fce 100644 (file)
--- a/champlain/champlainmarker.h
+++ b/champlain/champlainmarker.h
@@ -19,7 +19,7 @@
 #ifndef CHAMPLAIN_MARKER_H
 #define CHAMPLAIN_MARKER_H
 
-#include <champlain/champlain_defines.h>
+#include <champlain/champlaindefines.h>
 #include <glib-object.h>
 #include <clutter/clutter.h>
 

diff --git a/champlain/champlain_private.h b/champlain/champlainprivate.h
similarity index 100%
rename from champlain/champlain_private.h
rename to champlain/champlainprivate.h

diff --git a/champlain/champlainview.c b/champlain/champlainview.c
index 743ec23075dac24d2c55022aebba4ef3ba9c3ca0..082b22051198176b649273e42e50b1fb01083c9a 100644 (file)
--- a/champlain/champlainview.c
+++ b/champlain/champlainview.c
@@ -18,8 +18,8 @@
 
 #include "config.h"
 
-#include "champlain_defines.h"
-#include "champlain_private.h"
+#include "champlaindefines.h"
+#include "champlainprivate.h"
 #include "champlain.h"
 #include "champlain-marshal.h"
 #include "champlainview.h"

diff --git a/champlain/champlainview.h b/champlain/champlainview.h
index b463beb177bec9ee22f8fee173ddc8cffa82c3d1..581c1a80c0f5cf39b4863759b432e620f55e7b27 100644 (file)
--- a/champlain/champlainview.h
+++ b/champlain/champlainview.h
@@ -19,7 +19,7 @@
 #ifndef CHAMPLAIN_VIEW_H
 #define CHAMPLAIN_VIEW_H
 
-#include <champlain/champlain_defines.h>
+#include <champlain/champlaindefines.h>
 #include <glib.h>
 #include <glib-object.h>
 #include <clutter/clutter.h>

diff --git a/champlain/map.c b/champlain/map.c
index 74fda79d9ad8f23eab8aae4225414418a0c7f23b..a7ddf3f624bd673d9d215f89d65ba0219abc6cd6 100644 (file)
--- a/champlain/map.c
+++ b/champlain/map.c
@@ -18,8 +18,8 @@
 
 #include "map.h"
 #include "zoomlevel.h"
-#include "sources/osm_mapnik.h"
-#include "sources/mff_relief.h"
+#include "sources/osmmapnik.h"
+#include "sources/mffrelief.h"
 #include "sources/oam.h"
 #include "sources/debugmap.h"
 #include <math.h>

diff --git a/champlain/map.h b/champlain/map.h
index 487844c1f237c63ffa8e07e8cfafde780eea5745..e52c81561c165a20325676bb3e739aae7957c422 100644 (file)
--- a/champlain/map.h
+++ b/champlain/map.h
@@ -21,7 +21,7 @@
 
 #include "champlain.h"
 #include "champlainview.h"
-#include "champlain_private.h"
+#include "champlainprivate.h"
 #include "zoomlevel.h"
 #include "tile.h"
 

diff --git a/champlain/sources/google_map.c b/champlain/sources/googlemap.c
similarity index 99%
rename from champlain/sources/google_map.c
rename to champlain/sources/googlemap.c
index 3f5e1f90db29317cb46ca8d3b0d54fe5225f94ef..a111e633d7a1b0626b31e8d1598a68f63ca2f3d9 100644 (file)
--- a/champlain/sources/google_map.c
+++ b/champlain/sources/googlemap.c
@@ -22,7 +22,7 @@
  * The current code isn't working because the web server is returning Forbiden error message.
  */
 
-#include "sources/google_map.h"
+#include "sources/googlemap.h"
 #include "map.h"
 #include <math.h>
 #include <clutter/clutter.h>

diff --git a/champlain/sources/google_map.h b/champlain/sources/googlemap.h
similarity index 100%
rename from champlain/sources/google_map.h
rename to champlain/sources/googlemap.h

diff --git a/champlain/sources/google_sat.c b/champlain/sources/googlesat.c
similarity index 99%
rename from champlain/sources/google_sat.c
rename to champlain/sources/googlesat.c
index 8290eba092eaf1ad4964de0655648fc81c4e4c38..31d172e452f19bc096d6c11780c83b320c747a66 100644 (file)
--- a/champlain/sources/google_sat.c
+++ b/champlain/sources/googlesat.c
@@ -22,7 +22,7 @@
  * The current code isn't working because the web server is returning Forbiden error message.
  */
 
-#include "sources/google_sat.h"
+#include "sources/googlesat.h"
 #include "map.h"
 #include <math.h>
 #include <clutter/clutter.h>

diff --git a/champlain/sources/google_sat.h b/champlain/sources/googlesat.h
similarity index 100%
rename from champlain/sources/google_sat.h
rename to champlain/sources/googlesat.h

diff --git a/champlain/sources/google_terrain.c b/champlain/sources/googleterrain.c
similarity index 99%
rename from champlain/sources/google_terrain.c
rename to champlain/sources/googleterrain.c
index 8d1937b323f59e24932d91cfa625ba30bd136844..8f9524a030195fc270cb879c646acf5167de70fd 100644 (file)
--- a/champlain/sources/google_terrain.c
+++ b/champlain/sources/googleterrain.c
@@ -22,7 +22,7 @@
  * The current code isn't working because the web server is returning Forbiden error message.
  */
 
-#include "sources/google_terrain.h"
+#include "sources/googleterrain.h"
 #include "map.h"
 #include <math.h>
 #include <clutter/clutter.h>

diff --git a/champlain/sources/google_terrain.h b/champlain/sources/googleterrain.h
similarity index 100%
rename from champlain/sources/google_terrain.h
rename to champlain/sources/googleterrain.h

diff --git a/champlain/sources/mff_relief.c b/champlain/sources/mffrelief.c
similarity index 99%
rename from champlain/sources/mff_relief.c
rename to champlain/sources/mffrelief.c
index 89dee589dcdc4f154d315d85057957efbb784bb0..6956a2e54b7a76e39906e35d3105a26c789e17f9 100644 (file)
--- a/champlain/sources/mff_relief.c
+++ b/champlain/sources/mffrelief.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "sources/mff_relief.h"
+#include "sources/mffrelief.h"
 #include "map.h"
 #include <math.h>
 #include <clutter/clutter.h>

diff --git a/champlain/sources/mff_relief.h b/champlain/sources/mffrelief.h
similarity index 100%
rename from champlain/sources/mff_relief.h
rename to champlain/sources/mffrelief.h

diff --git a/champlain/sources/osm_mapnik.c b/champlain/sources/osmmapnik.c
similarity index 99%
rename from champlain/sources/osm_mapnik.c
rename to champlain/sources/osmmapnik.c
index 5899089910b8d766c6087cc7ffd9de35700b862e..7ea393a1ef5bb100c8a09b0edb0e9cf8e70d60d4 100644 (file)
--- a/champlain/sources/osm_mapnik.c
+++ b/champlain/sources/osmmapnik.c
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "sources/osm_mapnik.h"
+#include "sources/osmmapnik.h"
 #include "map.h"
 #include <math.h>
 #include <clutter/clutter.h>

diff --git a/champlain/sources/osm_mapnik.h b/champlain/sources/osmmapnik.h
similarity index 100%
rename from champlain/sources/osm_mapnik.h
rename to champlain/sources/osmmapnik.h

diff --git a/champlain/tile.c b/champlain/tile.c
index 935f2f425f479b0749a41001c711420f4ad251f5..5302497a496209575f9d4560b36fe354e55f8ac7 100644 (file)
--- a/champlain/tile.c
+++ b/champlain/tile.c
@@ -18,7 +18,7 @@
 
 #include "tile.h"
 #include "map.h"
-#include "champlain_private.h"
+#include "champlainprivate.h"
 
 #include <math.h>
 #include <errno.h>

diff --git a/champlain/tile.h b/champlain/tile.h
index b473f96bfd28e1ed9bed774a30128204b98d84db..e92e33ea80730c77181e10e3909d3a4a9776faed 100644 (file)
--- a/champlain/tile.h
+++ b/champlain/tile.h
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 #include <clutter/clutter.h>
-#include <champlain/champlain_private.h>
+#include <champlain/champlainprivate.h>
 
 struct _Tile
 {

diff --git a/champlain/zoomlevel.h b/champlain/zoomlevel.h
index 1b33e25e2f9b622240c45c7e48bf04584c5cb92d..7c9ab7448801603446a7cc442a6f2ee141c6d25d 100644 (file)
--- a/champlain/zoomlevel.h
+++ b/champlain/zoomlevel.h
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 #include <clutter/clutter.h>
-#include "champlain_private.h"
+#include "champlainprivate.h"
 
 typedef struct
 {