keyfile: rename files

Setting plugins should have their own name prefix (nms) and
keyfile should have as prefix "nms-kf". As a first step, rename
the files.

15 files changed, 47 insertions, 40 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index f5213834da..7d2a37f1b5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -384,16 +384,16 @@ libNetworkManager_la_SOURCES = \
 	settings/nm-settings.c \
 	settings/nm-settings.h \
 	\
-	settings/plugins/keyfile/nm-keyfile-connection.c \
-	settings/plugins/keyfile/nm-keyfile-connection.h \
-	settings/plugins/keyfile/plugin.c \
-	settings/plugins/keyfile/plugin.h \
-	settings/plugins/keyfile/reader.c \
-	settings/plugins/keyfile/reader.h \
-	settings/plugins/keyfile/utils.c \
-	settings/plugins/keyfile/utils.h \
-	settings/plugins/keyfile/writer.c \
-	settings/plugins/keyfile/writer.h \
+	settings/plugins/keyfile/nms-keyfile-connection.c \
+	settings/plugins/keyfile/nms-keyfile-connection.h \
+	settings/plugins/keyfile/nms-keyfile-plugin.c \
+	settings/plugins/keyfile/nms-keyfile-plugin.h \
+	settings/plugins/keyfile/nms-keyfile-reader.c \
+	settings/plugins/keyfile/nms-keyfile-reader.h \
+	settings/plugins/keyfile/nms-keyfile-utils.c \
+	settings/plugins/keyfile/nms-keyfile-utils.h \
+	settings/plugins/keyfile/nms-keyfile-writer.c \
+	settings/plugins/keyfile/nms-keyfile-writer.h \
 	\
 	supplicant-manager/nm-supplicant-config.c \
 	supplicant-manager/nm-supplicant-config.h \
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index aafb543750..229e252440 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -69,7 +69,7 @@
 #include "nm-auth-utils.h"
 #include "nm-auth-subject.h"
 #include "nm-session-monitor.h"
-#include "plugins/keyfile/plugin.h"
+#include "plugins/keyfile/nms-keyfile-plugin.h"
 #include "nm-agent-manager.h"
 #include "nm-config.h"
 #include "nm-audit-manager.h"
diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index 42c6188989..d2a51cf355 100644
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -21,22 +21,22 @@ noinst_LTLIBRARIES = \
 ##### I/O library for testcases #####
 
 libkeyfile_io_la_SOURCES = \
-	reader.c \
-	reader.h \
-	writer.c \
-	writer.h \
-	utils.c \
-	utils.h
+	nms-keyfile-reader.c \
+	nms-keyfile-reader.h \
+	nms-keyfile-writer.c \
+	nms-keyfile-writer.h \
+	nms-keyfile-utils.c \
+	nms-keyfile-utils.h
 
 libkeyfile_io_la_LIBADD = $(GLIB_LIBS)
 
 #####################################
 
 libnm_settings_plugin_keyfile_la_SOURCES = \
-	nm-keyfile-connection.c \
-	nm-keyfile-connection.h \
-	plugin.c \
-	plugin.h
+	nms-keyfile-connection.c \
+	nms-keyfile-connection.h \
+	nms-keyfile-plugin.c \
+	nms-keyfile-plugin.h
 
 libnm_settings_plugin_keyfile_la_LIBADD = \
 	libkeyfile-io.la
diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.c b/src/settings/plugins/keyfile/nms-keyfile-connection.c
index 97a5ee4c52..1cda3c0edd 100644
--- a/src/settings/plugins/keyfile/nm-keyfile-connection.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-connection.c
@@ -21,6 +21,8 @@
 
 #include "nm-default.h"
 
+#include "nms-keyfile-connection.h"
+
 #include <string.h>
 #include <glib/gstdio.h>
 
@@ -29,10 +31,10 @@
 #include "nm-utils.h"
 
 #include "nm-settings-plugin.h"
-#include "nm-keyfile-connection.h"
-#include "reader.h"
-#include "writer.h"
-#include "utils.h"
+
+#include "nms-keyfile-reader.h"
+#include "nms-keyfile-writer.h"
+#include "nms-keyfile-utils.h"
 
 G_DEFINE_TYPE (NMKeyfileConnection, nm_keyfile_connection, NM_TYPE_SETTINGS_CONNECTION)
 
diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.h b/src/settings/plugins/keyfile/nms-keyfile-connection.h
index 31dbe754a8..31dbe754a8 100644
--- a/src/settings/plugins/keyfile/nm-keyfile-connection.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-connection.h
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
index 40014128ba..94c7e81e9f 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
@@ -21,7 +21,7 @@
 
 #include "nm-default.h"
 
-#include "plugin.h"
+#include "nms-keyfile-plugin.h"
 
 #include <sys/stat.h>
 #include <unistd.h>
@@ -38,9 +38,10 @@
 #include "nm-core-internal.h"
 
 #include "nm-settings-plugin.h"
-#include "nm-keyfile-connection.h"
-#include "writer.h"
-#include "utils.h"
+
+#include "nms-keyfile-connection.h"
+#include "nms-keyfile-writer.h"
+#include "nms-keyfile-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/settings/plugins/keyfile/plugin.h b/src/settings/plugins/keyfile/nms-keyfile-plugin.h
index 21f41c88d1..21f41c88d1 100644
--- a/src/settings/plugins/keyfile/plugin.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.h
diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/nms-keyfile-reader.c
index 264b26a430..0373157308 100644
--- a/src/settings/plugins/keyfile/reader.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-reader.c
@@ -20,12 +20,13 @@
 
 #include "nm-default.h"
 
+#include "nms-keyfile-reader.h"
+
 #include <sys/stat.h>
 #include <string.h>
 
-#include "reader.h"
-
 #include "nm-keyfile-internal.h"
+
 #include "NetworkManagerUtils.h"
 
 static const char *
diff --git a/src/settings/plugins/keyfile/reader.h b/src/settings/plugins/keyfile/nms-keyfile-reader.h
index 7bbc6005c2..7bbc6005c2 100644
--- a/src/settings/plugins/keyfile/reader.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-reader.h
diff --git a/src/settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/nms-keyfile-utils.c
index b5c306e4c1..8b955f53f6 100644
--- a/src/settings/plugins/keyfile/utils.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.c
@@ -20,10 +20,11 @@
 
 #include "nm-default.h"
 
+#include "nms-keyfile-utils.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "utils.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
diff --git a/src/settings/plugins/keyfile/utils.h b/src/settings/plugins/keyfile/nms-keyfile-utils.h
index 85aa545842..85aa545842 100644
--- a/src/settings/plugins/keyfile/utils.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.h
diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c
index c8eb880090..ec472aaa4d 100644
--- a/src/settings/plugins/keyfile/writer.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c
@@ -21,16 +21,18 @@
 
 #include "nm-default.h"
 
+#include "nms-keyfile-writer.h"
+
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 
-#include "writer.h"
-#include "utils.h"
 #include "nm-keyfile-internal.h"
 
+#include "nms-keyfile-utils.h"
+
 typedef struct {
 	const char *keyfile_dir;
 } WriteInfo;
diff --git a/src/settings/plugins/keyfile/writer.h b/src/settings/plugins/keyfile/nms-keyfile-writer.h
index 894356518d..894356518d 100644
--- a/src/settings/plugins/keyfile/writer.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.h
diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index a697787fe3..05689559ea 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -24,9 +24,9 @@ noinst_PROGRAMS = test-keyfile
 
 test_keyfile_SOURCES = \
 	test-keyfile.c \
-	../reader.c \
-	../writer.c \
-	../utils.c
+	../nms-keyfile-reader.c \
+	../nms-keyfile-writer.c \
+	../nms-keyfile-utils.c
 
 test_keyfile_LDADD = \
 	$(top_builddir)/src/libNetworkManager.la \
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
index 8c4c798133..4eebf04a96 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile.c
@@ -30,9 +30,9 @@
 
 #include "nm-core-internal.h"
 
-#include "reader.h"
-#include "writer.h"
-#include "utils.h"
+#include "nms-keyfile-reader.h"
+#include "nms-keyfile-writer.h"
+#include "nms-keyfile-utils.h"
 
 #include "nm-test-utils-core.h"