GNOME.org
 

[geocode-glib] Unify include paths to be the same everywhere

commit e135c060bdf7e127f555cb5a0fe64516d81b38f6
Author: Andreas Henriksson <andreas fatal se>
Date:   Sun Jul 7 20:35:37 2013 +0200

    Unify include paths to be the same everywhere
    
    Change from "geocode-*.h" and <geocode-*.h> to
    <geocode-glib/geocode-*.h> where it wasn't using
    that style already.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=703571

 geocode-glib/Makefile.am            |    2 +-
 geocode-glib/geocode-error.c        |    2 +-
 geocode-glib/geocode-glib-private.h |    2 +-
 geocode-glib/geocode-glib.c         |    6 +++---
 geocode-glib/geocode-ipclient.c     |   10 +++++-----
 geocode-glib/geocode-ipclient.h     |    2 +-
 geocode-glib/geocode-location.c     |    2 +-
 geocode-glib/geocode-place.c        |    4 ++--
 geocode-glib/geocode-place.h        |    2 +-
 geocode-glib/geocode-reverse.c      |    8 ++++----
 geocode-glib/test-gcglib.c          |    4 ++--
 geocode-glib/test-geoip.c           |    4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/geocode-glib/Makefile.am b/geocode-glib/Makefile.am
index 3c9f85b..0e330e3 100644
--- a/geocode-glib/Makefile.am
+++ b/geocode-glib/Makefile.am
@@ -60,7 +60,7 @@ geocode-enum-types.h: $(GCGLIB_HEADER_FILES)
 
 geocode-enum-types.c: $(GCGLIB_HEADER_FILES) geocode-enum-types.h
        $(AM_V_GEN) ($(GLIB_MKENUMS) \
-               --fhead "#include \"geocode-glib.h\"\n#include \"geocode-enum-types.h\"" \
+               --fhead "#include <geocode-glib/geocode-glib.h>\n#include 
<geocode-glib/geocode-enum-types.h>" \
                --fprod "\n/* enumerations from \"@filename \" */" \
                --vhead "GType\n enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) 
{\n    static const G Type@Value values[] = {" \
                --vprod "      { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/geocode-glib/geocode-error.c b/geocode-glib/geocode-error.c
index 5a35ad3..fbb09d2 100644
--- a/geocode-glib/geocode-error.c
+++ b/geocode-glib/geocode-error.c
@@ -20,7 +20,7 @@
 
  */
 
-#include "geocode-error.h"
+#include <geocode-glib/geocode-error.h>
 
 /**
  * SECTION:geocode-error
diff --git a/geocode-glib/geocode-glib-private.h b/geocode-glib/geocode-glib-private.h
index 2393c9e..97fb518 100644
--- a/geocode-glib/geocode-glib-private.h
+++ b/geocode-glib/geocode-glib-private.h
@@ -24,7 +24,7 @@
 #define GEOCODE_GLIB_PRIVATE_H
 
 #include <glib.h>
-#include "geocode-location.h"
+#include <geocode-glib/geocode-location.h>
 
 G_BEGIN_DECLS
 
diff --git a/geocode-glib/geocode-glib.c b/geocode-glib/geocode-glib.c
index c4fece5..ac45545 100644
--- a/geocode-glib/geocode-glib.c
+++ b/geocode-glib/geocode-glib.c
@@ -26,9 +26,9 @@
 #include <gio/gio.h>
 #include <json-glib/json-glib.h>
 #include <libsoup/soup.h>
-#include <geocode-glib.h>
-#include <geocode-error.h>
-#include <geocode-glib-private.h>
+#include <geocode-glib/geocode-glib.h>
+#include <geocode-glib/geocode-error.h>
+#include <geocode-glib/geocode-glib-private.h>
 
 /**
  * SECTION:geocode-glib
diff --git a/geocode-glib/geocode-ipclient.c b/geocode-glib/geocode-ipclient.c
index d2f3570..033d9d4 100644
--- a/geocode-glib/geocode-ipclient.c
+++ b/geocode-glib/geocode-ipclient.c
@@ -25,11 +25,11 @@
 #include <libsoup/soup.h>
 #include <json-glib/json-glib.h>
 #include <string.h>
-#include "geocode-glib-private.h"
-#include "geocode-ipclient.h"
-#include "geocode-error.h"
-#include "geocode-enum-types.h"
-#include "geocode-ip-server/geoip-server.h"
+#include <geocode-glib/geocode-glib-private.h>
+#include <geocode-glib/geocode-ipclient.h>
+#include <geocode-glib/geocode-error.h>
+#include <geocode-glib/geocode-enum-types.h>
+#include <geocode-glib/geocode-ip-server/geoip-server.h>
 
 /**
  * SECTION:geocode-ipclient
diff --git a/geocode-glib/geocode-ipclient.h b/geocode-glib/geocode-ipclient.h
index e71bd7b..ffbc3d2 100644
--- a/geocode-glib/geocode-ipclient.h
+++ b/geocode-glib/geocode-ipclient.h
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 #include <gio/gio.h>
-#include "geocode-location.h"
+#include <geocode-glib/geocode-location.h>
 
 G_BEGIN_DECLS
 
diff --git a/geocode-glib/geocode-location.c b/geocode-glib/geocode-location.c
index 28dfa3f..79c0dcf 100644
--- a/geocode-glib/geocode-location.c
+++ b/geocode-glib/geocode-location.c
@@ -21,7 +21,7 @@
 
  */
 
-#include <geocode-location.h>
+#include <geocode-glib/geocode-location.h>
 #include <math.h>
 
 #define EARTH_RADIUS_KM 6372.795
diff --git a/geocode-glib/geocode-place.c b/geocode-glib/geocode-place.c
index eef5e03..97e8623 100644
--- a/geocode-glib/geocode-place.c
+++ b/geocode-glib/geocode-place.c
@@ -21,8 +21,8 @@
 
  */
 
-#include "geocode-place.h"
-#include "geocode-enum-types.h"
+#include <geocode-glib/geocode-place.h>
+#include <geocode-glib/geocode-enum-types.h>
 
 /**
  * SECTION:geocode-place
diff --git a/geocode-glib/geocode-place.h b/geocode-glib/geocode-place.h
index d4ef648..a61c513 100644
--- a/geocode-glib/geocode-place.h
+++ b/geocode-glib/geocode-place.h
@@ -25,7 +25,7 @@
 #define GEOCODE_PLACE_H
 
 #include <glib-object.h>
-#include "geocode-location.h"
+#include <geocode-glib/geocode-location.h>
 
 G_BEGIN_DECLS
 
diff --git a/geocode-glib/geocode-reverse.c b/geocode-glib/geocode-reverse.c
index a86fb00..b8115bf 100644
--- a/geocode-glib/geocode-reverse.c
+++ b/geocode-glib/geocode-reverse.c
@@ -26,10 +26,10 @@
 #include <gio/gio.h>
 #include <json-glib/json-glib.h>
 #include <libsoup/soup.h>
-#include <geocode-glib.h>
-#include <geocode-error.h>
-#include <geocode-reverse.h>
-#include <geocode-glib-private.h>
+#include <geocode-glib/geocode-glib.h>
+#include <geocode-glib/geocode-error.h>
+#include <geocode-glib/geocode-reverse.h>
+#include <geocode-glib/geocode-glib-private.h>
 
 /**
  * SECTION:geocode-reverse
diff --git a/geocode-glib/test-gcglib.c b/geocode-glib/test-gcglib.c
index 96bb0eb..b93c4d6 100644
--- a/geocode-glib/test-gcglib.c
+++ b/geocode-glib/test-gcglib.c
@@ -5,8 +5,8 @@
 #include <glib.h>
 #include <stdlib.h>
 #include <gio/gio.h>
-#include <geocode-glib.h>
-#include <geocode-glib-private.h>
+#include <geocode-glib/geocode-glib.h>
+#include <geocode-glib/geocode-glib-private.h>
 
 static GMainLoop *loop = NULL;
 
diff --git a/geocode-glib/test-geoip.c b/geocode-glib/test-geoip.c
index 0295813..ef9349d 100644
--- a/geocode-glib/test-geoip.c
+++ b/geocode-glib/test-geoip.c
@@ -5,8 +5,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gio/gio.h>
-#include <geocode-ipclient.h>
-#include "geocode-glib-private.h"
+#include <geocode-glib/geocode-ipclient.h>
+#include <geocode-glib/geocode-glib-private.h>
 
 static GMainLoop *loop = NULL;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]