resolved: rename resolved.h to resolved-manager.h

After all it pretty much exlcusively containers definitions about the
"Manager" object, hence let's call this the most obvious way.

12 files changed, 41 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index fb43b41282..30b2589086 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4732,12 +4732,13 @@ endif
 # ------------------------------------------------------------------------------
 if ENABLE_RESOLVED
 systemd_resolved_SOURCES = \
-	src/resolve/resolved.h \
 	src/resolve/resolved.c \
 	src/resolve/resolved-manager.c \
+	src/resolve/resolved-manager.h \
 	src/resolve/resolved-conf.c \
 	src/resolve/resolved-conf.h \
 	src/resolve/resolved-bus.c \
+	src/resolve/resolved-bus.h \
 	src/resolve/resolved-link.h \
 	src/resolve/resolved-link.c \
 	src/resolve/resolved-dns-domain.h \
diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index 6bd2b53b0e..fa00b3d0a1 100644
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -22,8 +22,8 @@
 #include "bus-errors.h"
 #include "bus-util.h"
 
-#include "resolved.h"
 #include "resolved-dns-domain.h"
+#include "resolved-bus.h"
 
 static int reply_query_state(DnsQuery *q) {
         _cleanup_free_ char *ip = NULL;
diff --git a/src/resolve/resolved-bus.h b/src/resolve/resolved-bus.h
new file mode 100644
index 0000000000..1e72891178
--- /dev/null
+++ b/src/resolve/resolved-bus.h
@@ -0,0 +1,26 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+  This file is part of systemd.
+
+  Copyright 2014 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "resolved-manager.h"
+
+int manager_connect_bus(Manager *m);
diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h
index cdd68fea07..b3dbea7b6b 100644
--- a/src/resolve/resolved-conf.h
+++ b/src/resolve/resolved-conf.h
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "resolved.h"
+#include "resolved-manager.h"
 
 int manager_parse_dns_server(Manager *m, DnsServerType type, const char *string);
 int manager_parse_config_file(Manager *m);
diff --git a/src/resolve/resolved-dns-query.h b/src/resolve/resolved-dns-query.h
index 7fc11dfbf4..adaf7b2588 100644
--- a/src/resolve/resolved-dns-query.h
+++ b/src/resolve/resolved-dns-query.h
@@ -29,13 +29,13 @@
 
 typedef struct DnsQuery DnsQuery;
 
-#include "resolved.h"
 #include "resolved-dns-scope.h"
 #include "resolved-dns-rr.h"
 #include "resolved-dns-question.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-stream.h"
 #include "resolved-dns-transaction.h"
+#include "resolved-manager.h"
 
 struct DnsQuery {
         Manager *manager;
diff --git a/src/resolve/resolved-dns-scope.h b/src/resolve/resolved-dns-scope.h
index 67a6ba2901..8f42068344 100644
--- a/src/resolve/resolved-dns-scope.h
+++ b/src/resolve/resolved-dns-scope.h
@@ -25,14 +25,14 @@
 
 typedef struct DnsScope DnsScope;
 
-#include "resolved.h"
-#include "resolved-link.h"
 #include "resolved-dns-server.h"
 #include "resolved-dns-packet.h"
 #include "resolved-dns-query.h"
 #include "resolved-dns-cache.h"
 #include "resolved-dns-zone.h"
 #include "resolved-dns-stream.h"
+#include "resolved-manager.h"
+#include "resolved-link.h"
 
 typedef enum DnsScopeMatch {
         DNS_SCOPE_NO,
diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h
index 358bbd43d6..8a9f5560d5 100644
--- a/src/resolve/resolved-dns-server.h
+++ b/src/resolve/resolved-dns-server.h
@@ -26,9 +26,8 @@
 typedef struct DnsServer DnsServer;
 typedef enum DnsServerSource DnsServerSource;
 
-#include "resolved.h"
+#include "resolved-manager.h"
 #include "resolved-link.h"
-#include "resolved-dns-server.h"
 
 typedef enum DnsServerType {
         DNS_SERVER_SYSTEM,
diff --git a/src/resolve/resolved-dns-stream.h b/src/resolve/resolved-dns-stream.h
index fc24bb670e..46eae31c60 100644
--- a/src/resolve/resolved-dns-stream.h
+++ b/src/resolve/resolved-dns-stream.h
@@ -25,9 +25,9 @@
 
 typedef struct DnsStream DnsStream;
 
-#include "resolved.h"
 #include "resolved-dns-packet.h"
 #include "resolved-dns-transaction.h"
+#include "resolved-manager.h"
 
 struct DnsStream {
         Manager *manager;
diff --git a/src/resolve/resolved-link.h b/src/resolve/resolved-link.h
index 3cafaab26c..d29311e049 100644
--- a/src/resolve/resolved-link.h
+++ b/src/resolve/resolved-link.h
@@ -29,10 +29,10 @@
 typedef struct Link Link;
 typedef struct LinkAddress LinkAddress;
 
-#include "resolved.h"
 #include "resolved-dns-server.h"
 #include "resolved-dns-scope.h"
 #include "resolved-dns-rr.h"
+#include "resolved-manager.h"
 
 struct LinkAddress {
         Link *link;
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index ffb356eae1..1e86c1003b 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -35,9 +35,10 @@
 #include "af-list.h"
 #include "utf8.h"
 
-#include "resolved.h"
-#include "resolved-conf.h"
 #include "resolved-dns-domain.h"
+#include "resolved-conf.h"
+#include "resolved-bus.h"
+#include "resolved-manager.h"
 
 #define SEND_TIMEOUT_USEC (200 * USEC_PER_MSEC)
 
diff --git a/src/resolve/resolved.h b/src/resolve/resolved-manager.h
index caac61b797..03386f0a4f 100644
--- a/src/resolve/resolved.h
+++ b/src/resolve/resolved-manager.h
@@ -35,6 +35,7 @@ typedef struct Manager Manager;
 #include "resolved-dns-server.h"
 #include "resolved-dns-scope.h"
 #include "resolved-dns-stream.h"
+#include "resolved-link.h"
 
 typedef enum Support {
         SUPPORT_NO,
@@ -136,7 +137,6 @@ void manager_refresh_rrs(Manager *m);
 int manager_next_hostname(Manager *m);
 
 int manager_our_packet(Manager *m, DnsPacket *p);
-int manager_connect_bus(Manager *m);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
 
diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index b4d743fe0d..900a36d8f0 100644
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -24,7 +24,7 @@
 #include "mkdir.h"
 #include "capability.h"
 
-#include "resolved.h"
+#include "resolved-manager.h"
 #include "resolved-conf.h"
 
 int main(int argc, char *argv[]) {