zeroconf/Zeroconf*: drop prefix from file names

src/Main.cxx

@@ -43,7 +43,7 @@
 #include "fs/AllocatedPath.hxx"
 #include "fs/Config.hxx"
 #include "playlist/PlaylistRegistry.hxx"
-#include "zeroconf/ZeroconfGlue.hxx"
+#include "zeroconf/Glue.hxx"
 #include "decoder/DecoderList.hxx"
 #include "pcm/AudioParser.hxx"
 #include "pcm/Convert.hxx"

src/zeroconf/Bonjour.cxx

@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ZeroconfBonjour.hxx"
+#include "Bonjour.hxx"
-#include "ZeroconfInternal.hxx"
+#include "Internal.hxx"
 #include "event/SocketEvent.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"

src/zeroconf/Glue.cxx

@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ZeroconfGlue.hxx"
+#include "Glue.hxx"
-#include "ZeroconfAvahi.hxx"
+#include "avahi/Init.hxx"
-#include "ZeroconfBonjour.hxx"
+#include "Bonjour.hxx"
 #include "config/Data.hxx"
 #include "config/Option.hxx"
 #include "Listen.hxx"

src/zeroconf/Internal.hxx

@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef ZEROCONF_INTERNAL_H
+#ifndef ZEROCONF_INTERNAL_HXX
-#define ZEROCONF_INTERNAL_H
+#define ZEROCONF_INTERNAL_HXX
 
 /* The dns-sd service type qualifier to publish */
 #define SERVICE_TYPE		"_mpd._tcp"

src/zeroconf/avahi/Init.cxx

@@ -17,13 +17,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "ZeroconfAvahi.hxx"
+#include "Init.hxx"
-#include "avahi/Client.hxx"
+#include "../Internal.hxx"
-#include "avahi/ConnectionListener.hxx"
+#include "Client.hxx"
-#include "avahi/ErrorHandler.hxx"
+#include "ConnectionListener.hxx"
-#include "avahi/Publisher.hxx"
+#include "ErrorHandler.hxx"
-#include "avahi/Service.hxx"
+#include "Publisher.hxx"
-#include "ZeroconfInternal.hxx"
+#include "Service.hxx"
 #include "util/RuntimeError.hxx"
 #include "Log.hxx"
 

src/zeroconf/avahi/meson.build

@@ -6,6 +6,7 @@ endif
 
 avahi = static_library(
   'avahi',
+  'Init.cxx',
   'Client.cxx',
   'Error.cxx',
   'Poll.cxx',

src/zeroconf/meson.build

@@ -35,8 +35,8 @@ if zeroconf_option == 'bonjour'
 
   zeroconf = static_library(
     'zeroconf_bonjour',
-    'ZeroconfGlue.cxx',
+    'Glue.cxx',
-    'ZeroconfBonjour.cxx',
+    'Bonjour.cxx',
     include_directories: inc,
   )
 
@@ -56,8 +56,7 @@ else
   
   zeroconf = static_library(
     'zeroconf_bonjour',
-    'ZeroconfGlue.cxx',
+    'Glue.cxx',
-    'ZeroconfAvahi.cxx',
     include_directories: inc,
     dependencies: [
       avahi_dep,

test/run_avahi.cxx

@@ -19,7 +19,7 @@
 
 #include "event/Loop.hxx"
 #include "ShutdownHandler.hxx"
-#include "zeroconf/ZeroconfAvahi.hxx"
+#include "zeroconf/avahi/Init.hxx"
 
 #include <stdlib.h>