diff options
| author | Dan Winship <danw@redhat.com> | 2015-04-06 16:42:31 -0400 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2015-07-24 13:25:47 -0400 |
| commit | e9c4d89922ae7498942003b1165d4c1d87c5e452 (patch) | |
| tree | f87c48e6b2d2777ee893f9d6aeabd95ee97bd8ca /libnm-glib/tests | |
| parent | 79292f812324dc56585908d0c0cab7000353e157 (diff) | |
all: rename nm-glib-compat.h to nm-glib.h, use everywhere
Rather than randomly including one or more of <glib.h>,
<glib-object.h>, and <gio/gio.h> everywhere (and forgetting to include
"nm-glib-compat.h" most of the time), rename nm-glib-compat.h to
nm-glib.h, include <gio/gio.h> from there, and then change all .c
files in NM to include "nm-glib.h" rather than including the glib
headers directly.
(Public headers files still have to include the real glib headers,
since nm-glib.h isn't installed...)
Also, remove glib includes from header files that are already
including a base object header file (which must itself already include
the glib headers).
Diffstat (limited to 'libnm-glib/tests')
| -rw-r--r-- | libnm-glib/tests/common.c | 2 | ||||
| -rw-r--r-- | libnm-glib/tests/common.h | 2 | ||||
| -rw-r--r-- | libnm-glib/tests/test-nm-client.c | 2 | ||||
| -rw-r--r-- | libnm-glib/tests/test-remote-settings-client.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libnm-glib/tests/common.c b/libnm-glib/tests/common.c index 540d43afa..3989f756f 100644 --- a/libnm-glib/tests/common.c +++ b/libnm-glib/tests/common.c @@ -21,9 +21,9 @@ #include "config.h" #include <dbus/dbus.h> -#include <glib.h> #include <string.h> +#include "nm-glib.h" #include "NetworkManager.h" #include "common.h" diff --git a/libnm-glib/tests/common.h b/libnm-glib/tests/common.h index 7c49d2532..63dbe4d24 100644 --- a/libnm-glib/tests/common.h +++ b/libnm-glib/tests/common.h @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include <gio/gio.h> +#include "nm-glib.h" typedef struct { GDBusConnection *bus; diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c index 0ec3924d9..067d460c9 100644 --- a/libnm-glib/tests/test-nm-client.c +++ b/libnm-glib/tests/test-nm-client.c @@ -23,12 +23,12 @@ #include <dbus/dbus.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <glib.h> #include <string.h> #include <sys/types.h> #include <signal.h> #include <NetworkManager.h> +#include "nm-glib.h" #include "nm-client.h" #include "nm-device-wifi.h" #include "nm-device-ethernet.h" diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c index afaa6fe11..b40a0facd 100644 --- a/libnm-glib/tests/test-remote-settings-client.c +++ b/libnm-glib/tests/test-remote-settings-client.c @@ -23,7 +23,6 @@ #include <dbus/dbus.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <glib.h> #include <string.h> #include <sys/types.h> #include <signal.h> @@ -34,6 +33,7 @@ #include <nm-setting-wired.h> #include <nm-utils.h> +#include "nm-glib.h" #include "nm-remote-settings.h" #include "common.h" |