From cd03d39a6d2bad0c1133832f97723634456eea29 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 20 Feb 2020 14:09:33 +0100
Subject: [PATCH] core: rename "nm-dhcp4-config.[ch]" to "nm-dhcp-config.[hc]"
 before merge

NMDhcp4Config and NMDhcp6Config will get a common base type NMDhcpConfig
and be merged. In preparation, rename the file.
---
 Makefile.am                                 | 4 ++--
 src/devices/nm-device.c                     | 2 +-
 src/dhcp/nm-dhcp-manager.h                  | 2 +-
 src/meson.build                             | 2 +-
 src/{nm-dhcp4-config.c => nm-dhcp-config.c} | 2 +-
 src/{nm-dhcp4-config.h => nm-dhcp-config.h} | 0
 src/nm-dispatcher.c                         | 2 +-
 src/nm-policy.c                             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename src/{nm-dhcp4-config.c => nm-dhcp-config.c} (99%)
 rename src/{nm-dhcp4-config.h => nm-dhcp-config.h} (100%)

diff --git a/Makefile.am b/Makefile.am
index 84a4589292..b53b7e5613 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2277,8 +2277,8 @@ src_libNetworkManager_la_SOURCES = \
 	src/nm-dcb.h \
 	src/nm-netns.c \
 	src/nm-netns.h \
-	src/nm-dhcp4-config.c \
-	src/nm-dhcp4-config.h \
+	src/nm-dhcp-config.c \
+	src/nm-dhcp-config.h \
 	src/nm-dhcp6-config.c \
 	src/nm-dhcp6-config.h \
 	src/nm-dispatcher.c \
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index dbda4d8501..27164e4380 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -43,7 +43,7 @@
 #include "nm-ip6-config.h"
 #include "nm-pacrunner-manager.h"
 #include "dnsmasq/nm-dnsmasq-manager.h"
-#include "nm-dhcp4-config.h"
+#include "nm-dhcp-config.h"
 #include "nm-dhcp6-config.h"
 #include "nm-rfkill-manager.h"
 #include "nm-firewall-manager.h"
diff --git a/src/dhcp/nm-dhcp-manager.h b/src/dhcp/nm-dhcp-manager.h
index fb1c98346b..1b793c22f8 100644
--- a/src/dhcp/nm-dhcp-manager.h
+++ b/src/dhcp/nm-dhcp-manager.h
@@ -9,7 +9,7 @@
 
 #include "nm-dhcp-client.h"
 #include "nm-ip4-config.h"
-#include "nm-dhcp4-config.h"
+#include "nm-dhcp-config.h"
 
 #define NM_TYPE_DHCP_MANAGER            (nm_dhcp_manager_get_type ())
 #define NM_DHCP_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_MANAGER, NMDhcpManager))
diff --git a/src/meson.build b/src/meson.build
index bc816a8543..1cee986b88 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -135,7 +135,7 @@ sources = files(
   'nm-config-data.c',
   'nm-connectivity.c',
   'nm-dcb.c',
-  'nm-dhcp4-config.c',
+  'nm-dhcp-config.c',
   'nm-dhcp6-config.c',
   'nm-dispatcher.c',
   'nm-firewall-manager.c',
diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp-config.c
similarity index 99%
rename from src/nm-dhcp4-config.c
rename to src/nm-dhcp-config.c
index f64c72574b..896e39268f 100644
--- a/src/nm-dhcp4-config.c
+++ b/src/nm-dhcp-config.c
@@ -5,7 +5,7 @@
 
 #include "nm-default.h"
 
-#include "nm-dhcp4-config.h"
+#include "nm-dhcp-config.h"
 
 #include "nm-dbus-interface.h"
 #include "nm-utils.h"
diff --git a/src/nm-dhcp4-config.h b/src/nm-dhcp-config.h
similarity index 100%
rename from src/nm-dhcp4-config.h
rename to src/nm-dhcp-config.h
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
index 54b0567bc3..f53f95ad30 100644
--- a/src/nm-dispatcher.c
+++ b/src/nm-dispatcher.c
@@ -14,7 +14,7 @@
 #include "nm-connectivity.h"
 #include "nm-act-request.h"
 #include "devices/nm-device.h"
-#include "nm-dhcp4-config.h"
+#include "nm-dhcp-config.h"
 #include "nm-dhcp6-config.h"
 #include "nm-proxy-config.h"
 #include "nm-ip4-config.h"
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 7a5ed42b6c..c6f3ecc6b3 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -29,7 +29,7 @@
 #include "settings/nm-settings.h"
 #include "settings/nm-settings-connection.h"
 #include "settings/nm-agent-manager.h"
-#include "nm-dhcp4-config.h"
+#include "nm-dhcp-config.h"
 #include "nm-dhcp6-config.h"
 #include "nm-config.h"
 #include "nm-netns.h"