core: rename "nm-bus-manager.h" to "nm-dbus-manager.h"

The next commit will completely rework NMBusManager and replace
NMExportedObject by a new type NMDBusObject.

Originally, NMDBusObject was added along NMExportedObject to ease
the rework and have compilable, intermediate stages of refactoring. Now,
I think the new name is better, because NMDBusObject is very strongly related
to the bus manager and the old name NMExportedObject didn't make that
clear.

I also slighly prefer the name NMDBusObject over NMBusObject, hence
for consistancy, also rename NMBusManager to NMDBusManager.

This commit only renames the file for a nicer diff in the next commit.
It does not actually update the type name in sources. That will be done
later.

16 files changed, 16 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 029bd4bf72..47b4acedfc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1589,8 +1589,8 @@ src_libNetworkManager_la_SOURCES = \
 	src/nm-active-connection.h \
 	src/nm-audit-manager.c \
 	src/nm-audit-manager.h \
-	src/nm-bus-manager.c \
-	src/nm-bus-manager.h \
+	src/nm-dbus-manager.c \
+	src/nm-dbus-manager.h \
 	src/nm-config.c \
 	src/nm-config.h \
 	src/nm-config-data.c \
diff --git a/src/dhcp/nm-dhcp-listener.c b/src/dhcp/nm-dhcp-listener.c
index 89d592f174..11651110b9 100644
--- a/src/dhcp/nm-dhcp-listener.c
+++ b/src/dhcp/nm-dhcp-listener.c
@@ -33,7 +33,7 @@
 #include "nm-dhcp-client.h"
 #include "nm-dhcp-manager.h"
 #include "nm-core-internal.h"
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 #include "NetworkManagerUtils.h"
 
 #define PRIV_SOCK_PATH            NMRUNDIR "/private-dhcp"
diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c
index 1a224d8813..e366dba383 100644
--- a/src/dns/nm-dns-dnsmasq.c
+++ b/src/dns/nm-dns-dnsmasq.c
@@ -35,7 +35,7 @@
 #include "nm-utils.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 #include "NetworkManagerUtils.h"
 
 #define PIDFILE NMRUNDIR "/dnsmasq.pid"
diff --git a/src/dns/nm-dns-systemd-resolved.c b/src/dns/nm-dns-systemd-resolved.c
index a6035fa4b1..fe2ef59467 100644
--- a/src/dns/nm-dns-systemd-resolved.c
+++ b/src/dns/nm-dns-systemd-resolved.c
@@ -37,7 +37,7 @@
 #include "nm-utils.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 #include "nm-manager.h"
 #include "nm-setting-connection.h"
 #include "devices/nm-device.h"
diff --git a/src/main.c b/src/main.c
index 896e39d644..e829fea0fc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,7 +39,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-manager.h"
 #include "platform/nm-linux-platform.h"
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 #include "devices/nm-device.h"
 #include "dhcp/nm-dhcp-manager.h"
 #include "nm-config.h"
diff --git a/src/meson.build b/src/meson.build
index 5c57f5fc59..e814f58403 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -145,7 +145,7 @@ sources = files(
   'nm-auth-manager.c',
   'nm-auth-subject.c',
   'nm-auth-utils.c',
-  'nm-bus-manager.c',
+  'nm-dbus-manager.c',
   'nm-checkpoint.c',
   'nm-checkpoint-manager.c',
   'nm-config.c',
diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
index 0f40ff7c22..ffb102d2ed 100644
--- a/src/nm-auth-subject.c
+++ b/src/nm-auth-subject.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 #include "NetworkManagerUtils.h"
 
 enum {
diff --git a/src/nm-bus-manager.c b/src/nm-dbus-manager.c
index 3ad2131c30..965bcec78f 100644
--- a/src/nm-bus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -21,7 +21,7 @@
 
 #include "nm-default.h"
 
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 
 #include <unistd.h>
 #include <sys/stat.h>
diff --git a/src/nm-bus-manager.h b/src/nm-dbus-manager.h
index 153f7cdce2..153f7cdce2 100644
--- a/src/nm-bus-manager.h
+++ b/src/nm-dbus-manager.h
diff --git a/src/nm-exported-object.c b/src/nm-exported-object.c
index c52a38b700..4db83d351b 100644
--- a/src/nm-exported-object.c
+++ b/src/nm-exported-object.c
@@ -25,7 +25,7 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 
 #include "devices/nm-device.h"
 #include "nm-active-connection.h"
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index 68bc1beada..7f543eb077 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -597,7 +597,7 @@ const NMDhcpClientFactory *const _nm_dhcp_manager_factories[4] = {
 #include "nm-config.h"
 #include "devices/nm-device.h"
 #include "nm-active-connection.h"
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 
 void
 nm_main_config_reload (int signal)
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 256c53b93f..06a64e257c 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 
 #include "nm-common-macros.h"
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 #include "vpn/nm-vpn-manager.h"
 #include "devices/nm-device.h"
 #include "devices/nm-device-generic.h"
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index a68db47e33..c92389ffcb 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -31,7 +31,7 @@
 #include "nm-auth-utils.h"
 #include "nm-setting-vpn.h"
 #include "nm-auth-manager.h"
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 #include "nm-session-monitor.h"
 #include "nm-simple-connection.h"
 #include "NetworkManagerUtils.h"
diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c
index 4bfe0f72f2..33ce4ba2bf 100644
--- a/src/settings/nm-secret-agent.c
+++ b/src/settings/nm-secret-agent.c
@@ -26,8 +26,8 @@
 #include <pwd.h>
 
 #include "nm-dbus-interface.h"
+#include "nm-dbus-manager.h"
 #include "nm-core-internal.h"
-#include "nm-bus-manager.h"
 #include "nm-auth-subject.h"
 #include "nm-simple-connection.h"
 #include "NetworkManagerUtils.h"
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 411c13ecea..7adf76ef30 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -65,7 +65,7 @@
 #include "devices/nm-device-ethernet.h"
 #include "nm-settings-connection.h"
 #include "nm-settings-plugin.h"
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 #include "nm-auth-utils.h"
 #include "nm-auth-subject.h"
 #include "nm-session-monitor.h"
diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c
index ff6d40b856..c8ad69a523 100644
--- a/src/tests/config/test-config.c
+++ b/src/tests/config/test-config.c
@@ -25,7 +25,7 @@
 #include "nm-config.h"
 #include "nm-test-device.h"
 #include "platform/nm-fake-platform.h"
-#include "nm-bus-manager.h"
+#include "nm-dbus-manager.h"
 #include "nm-connectivity.h"
 
 #include "nm-test-utils-core.h"