From 52baa8c52bc1fe5bdbdcee57e0f84c704b9f5591 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 8 Jan 2018 12:37:46 +0100 Subject: [PATCH] clients: drop redundant #include "NetworkManager.h" This header is already included by "nm-default.h". --- clients/cli/nmcli.h | 1 - clients/common/nm-meta-setting-desc.c | 1 - clients/common/nm-secret-agent-simple.c | 1 - clients/common/nm-secret-agent-simple.h | 1 - clients/common/nm-vpn-helpers.h | 2 -- clients/common/tests/test-general.c | 2 -- clients/nm-online.c | 2 -- clients/tui/nm-editor-bindings.h | 2 -- clients/tui/nm-editor-utils.c | 2 -- clients/tui/nm-editor-utils.h | 2 -- clients/tui/nmt-connect-connection-list.c | 2 -- clients/tui/nmt-device-entry.c | 2 -- clients/tui/nmt-device-entry.h | 2 -- clients/tui/nmt-edit-connection-list.h | 2 -- clients/tui/nmt-editor-page.h | 2 -- clients/tui/nmt-editor.h | 2 -- clients/tui/nmt-mac-entry.c | 1 - clients/tui/nmt-route-editor.h | 2 -- clients/tui/nmt-route-entry.c | 2 -- clients/tui/nmt-route-table.c | 2 -- clients/tui/nmt-slave-list.c | 2 -- clients/tui/nmtui-edit.c | 2 -- clients/tui/nmtui.c | 2 -- clients/tui/nmtui.h | 2 -- 24 files changed, 43 deletions(-) diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index 874bca214b..cccad8462a 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -20,7 +20,6 @@ #ifndef NMC_NMCLI_H #define NMC_NMCLI_H -#include "NetworkManager.h" #include "nm-secret-agent-old.h" #include "nm-meta-setting-desc.h" diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 51e01a85ed..4aa135a925 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -27,7 +27,6 @@ #include "nm-common-macros.h" #include "nm-utils/nm-enum-utils.h" -#include "NetworkManager.h" #include "nm-vpn-helpers.h" #include "nm-client-utils.h" #include "nm-meta-setting-access.h" diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 005d2ab6f1..4db57ca54b 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -33,7 +33,6 @@ #include -#include "NetworkManager.h" #include "nm-vpn-service-plugin.h" #include "nm-vpn-helpers.h" diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h index c0f6befcb4..505987dfd9 100644 --- a/clients/common/nm-secret-agent-simple.h +++ b/clients/common/nm-secret-agent-simple.h @@ -19,7 +19,6 @@ #ifndef __NM_SECRET_AGENT_SIMPLE_H__ #define __NM_SECRET_AGENT_SIMPLE_H__ -#include "NetworkManager.h" #include "nm-secret-agent-old.h" #define NM_TYPE_SECRET_AGENT_SIMPLE (nm_secret_agent_simple_get_type ()) diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h index 9e3b853929..4c15faa1b8 100644 --- a/clients/common/nm-vpn-helpers.h +++ b/clients/common/nm-vpn-helpers.h @@ -19,8 +19,6 @@ #ifndef __NM_VPN_HELPERS_H__ #define __NM_VPN_HELPERS_H__ -#include "NetworkManager.h" - typedef struct { const char *name; const char *ui_name; diff --git a/clients/common/tests/test-general.c b/clients/common/tests/test-general.c index 77ff4cea33..a833e263c3 100644 --- a/clients/common/tests/test-general.c +++ b/clients/common/tests/test-general.c @@ -19,8 +19,6 @@ #include "nm-default.h" -#include "NetworkManager.h" - #include "nm-meta-setting-access.h" #include "nm-utils/nm-test-utils.h" diff --git a/clients/nm-online.c b/clients/nm-online.c index ee0b5249ad..5bc80795b9 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -38,8 +38,6 @@ #include #include -#include "NetworkManager.h" - #define PROGRESS_STEPS 15 #define EXIT_FAILURE_OFFLINE 1 diff --git a/clients/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h index facbf1c604..72bd91e32d 100644 --- a/clients/tui/nm-editor-bindings.h +++ b/clients/tui/nm-editor-bindings.h @@ -19,8 +19,6 @@ #ifndef NM_EDITOR_BINDINGS_H #define NM_EDITOR_BINDINGS_H -#include "NetworkManager.h" - void nm_editor_bindings_init (void); void nm_editor_bind_ip_addresses_with_prefix_to_strv (int family, diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index b71e9fbed6..8fecefa8e5 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -27,8 +27,6 @@ #include "nm-default.h" -#include "NetworkManager.h" - #include "nm-editor-utils.h" #if 0 #include "nm-vpn-helpers.h" diff --git a/clients/tui/nm-editor-utils.h b/clients/tui/nm-editor-utils.h index 6f66edfeb0..e15cc5e8f5 100644 --- a/clients/tui/nm-editor-utils.h +++ b/clients/tui/nm-editor-utils.h @@ -19,8 +19,6 @@ #ifndef NM_EDITOR_UTILS_H #define NM_EDITOR_UTILS_H -#include "NetworkManager.h" - typedef struct { const char *name; GType setting_type; diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c index 7cecf7e22b..cced55fc2b 100644 --- a/clients/tui/nmt-connect-connection-list.c +++ b/clients/tui/nmt-connect-connection-list.c @@ -28,8 +28,6 @@ #include -#include "NetworkManager.h" - #include "nmtui.h" #include "nmt-connect-connection-list.h" #include "nm-client-utils.h" diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c index be1ad492c9..a4d63e4f34 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c @@ -40,8 +40,6 @@ #include #include -#include "NetworkManager.h" - #include "nmtui.h" #include "nmt-device-entry.h" diff --git a/clients/tui/nmt-device-entry.h b/clients/tui/nmt-device-entry.h index 9278244fdf..9c28882234 100644 --- a/clients/tui/nmt-device-entry.h +++ b/clients/tui/nmt-device-entry.h @@ -21,8 +21,6 @@ #include "nmt-editor-grid.h" -#include "NetworkManager.h" - #define NMT_TYPE_DEVICE_ENTRY (nmt_device_entry_get_type ()) #define NMT_DEVICE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_DEVICE_ENTRY, NmtDeviceEntry)) #define NMT_DEVICE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_DEVICE_ENTRY, NmtDeviceEntryClass)) diff --git a/clients/tui/nmt-edit-connection-list.h b/clients/tui/nmt-edit-connection-list.h index 9726e287ef..cb02ea4b7f 100644 --- a/clients/tui/nmt-edit-connection-list.h +++ b/clients/tui/nmt-edit-connection-list.h @@ -21,8 +21,6 @@ #include "nmt-newt.h" -#include "NetworkManager.h" - #define NMT_TYPE_EDIT_CONNECTION_LIST (nmt_edit_connection_list_get_type ()) #define NMT_EDIT_CONNECTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDIT_CONNECTION_LIST, NmtEditConnectionList)) #define NMT_EDIT_CONNECTION_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_EDIT_CONNECTION_LIST, NmtEditConnectionListClass)) diff --git a/clients/tui/nmt-editor-page.h b/clients/tui/nmt-editor-page.h index 93a66155fd..687f84a756 100644 --- a/clients/tui/nmt-editor-page.h +++ b/clients/tui/nmt-editor-page.h @@ -19,8 +19,6 @@ #ifndef NMT_EDITOR_PAGE_H #define NMT_EDITOR_PAGE_H -#include "NetworkManager.h" - #include "nmt-editor-grid.h" #include "nmt-editor-section.h" diff --git a/clients/tui/nmt-editor.h b/clients/tui/nmt-editor.h index 5620c5e823..ea51723e27 100644 --- a/clients/tui/nmt-editor.h +++ b/clients/tui/nmt-editor.h @@ -19,8 +19,6 @@ #ifndef NMT_EDITOR_H #define NMT_EDITOR_H -#include "NetworkManager.h" - #include "nmt-newt.h" #define NMT_TYPE_EDITOR (nmt_editor_get_type ()) diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index b954d2e0c9..7d49219638 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -32,7 +32,6 @@ #include -#include "NetworkManager.h" #include "nm-common-macros.h" diff --git a/clients/tui/nmt-route-editor.h b/clients/tui/nmt-route-editor.h index 8e63830e7c..d83523bcc8 100644 --- a/clients/tui/nmt-route-editor.h +++ b/clients/tui/nmt-route-editor.h @@ -19,8 +19,6 @@ #ifndef NMT_ROUTE_EDITOR_H #define NMT_ROUTE_EDITOR_H -#include "NetworkManager.h" - #include "nmt-newt.h" #define NMT_TYPE_ROUTE_EDITOR (nmt_route_editor_get_type ()) diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c index 1b37389f93..eea81e9985 100644 --- a/clients/tui/nmt-route-entry.c +++ b/clients/tui/nmt-route-entry.c @@ -32,8 +32,6 @@ #include #include -#include "NetworkManager.h" - #include "nmt-route-entry.h" #include "nmt-ip-entry.h" diff --git a/clients/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c index 79c543de6a..c2e5554213 100644 --- a/clients/tui/nmt-route-table.c +++ b/clients/tui/nmt-route-table.c @@ -30,8 +30,6 @@ #include #include -#include "NetworkManager.h" - #include "nmt-route-table.h" #include "nmt-route-entry.h" #include "nmt-widget-list.h" diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c index a8c31e056b..893b7caf97 100644 --- a/clients/tui/nmt-slave-list.c +++ b/clients/tui/nmt-slave-list.c @@ -26,8 +26,6 @@ #include "nm-default.h" -#include "NetworkManager.h" - #include "nmt-slave-list.h" G_DEFINE_TYPE (NmtSlaveList, nmt_slave_list, NMT_TYPE_EDIT_CONNECTION_LIST) diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c index a92e45a3cf..657724e328 100644 --- a/clients/tui/nmtui-edit.c +++ b/clients/tui/nmtui-edit.c @@ -27,8 +27,6 @@ #include -#include "NetworkManager.h" - #include "nmtui.h" #include "nmtui-edit.h" #include "nmt-edit-connection-list.h" diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index 70cad5d6ad..f6994f69fc 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -30,8 +30,6 @@ #include #include -#include "NetworkManager.h" - #include "nmt-newt.h" #include "nm-editor-bindings.h" diff --git a/clients/tui/nmtui.h b/clients/tui/nmtui.h index efb596221a..5ef8e82a84 100644 --- a/clients/tui/nmtui.h +++ b/clients/tui/nmtui.h @@ -19,8 +19,6 @@ #ifndef NMTUI_H #define NMTUI_H -#include "NetworkManager.h" - extern NMClient *nm_client; void nmtui_quit (void);