client/Internal: rename to Config.hxx

meson.build

@@ -206,10 +206,10 @@ sources = [
   'src/decoder/DecoderPrint.cxx',
   'src/client/Listener.cxx',
   'src/client/Client.cxx',
+  'src/client/Config.cxx',
   'src/client/Domain.cxx',
   'src/client/Event.cxx',
   'src/client/Expire.cxx',
-  'src/client/Global.cxx',
   'src/client/Idle.cxx',
   'src/client/List.cxx',
   'src/client/New.cxx',

src/Main.cxx

@@ -28,7 +28,7 @@
 #include "Permission.hxx"
 #include "Listen.hxx"
 #include "client/Listener.hxx"
-#include "client/Client.hxx"
+#include "client/Config.hxx"
 #include "client/List.hxx"
 #include "command/AllCommands.hxx"
 #include "Partition.hxx"

src/client/Client.hxx

@@ -37,7 +37,6 @@
 
 #include <stddef.h>
 
-struct ConfigData;
 class SocketAddress;
 class UniqueSocketDescriptor;
 class EventLoop;
@@ -260,9 +259,6 @@ private:
 	void OnTimeout() noexcept;
 };
 
-void
-client_manager_init(const ConfigData &config);
-
 void
 client_new(EventLoop &loop, Partition &partition,
 	   UniqueSocketDescriptor fd, SocketAddress address, int uid,

src/client/Config.cxx

@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "Internal.hxx"
+#include "Config.hxx"
 #include "config/Data.hxx"
 
 #define CLIENT_TIMEOUT_DEFAULT			(60)

src/client/Config.hxx

@@ -17,15 +17,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_CLIENT_INTERNAL_HXX
+#ifndef MPD_CLIENT_CONFIG_HXX
-#define MPD_CLIENT_INTERNAL_HXX
+#define MPD_CLIENT_CONFIG_HXX
-
-#include "Client.hxx"
 
 #include <chrono>
 
+struct ConfigData;
+
 extern std::chrono::steady_clock::duration client_timeout;
 extern size_t client_max_command_list_size;
 extern size_t client_max_output_buffer_size;
 
+void
+client_manager_init(const ConfigData &config);
+
 #endif

src/client/Idle.cxx

@@ -17,7 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "Internal.hxx"
+#include "Client.hxx"
+#include "Config.hxx"
 #include "Response.hxx"
 #include "Idle.hxx"
 

src/client/New.cxx

@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
+#include "Client.hxx"
-#include "Internal.hxx"
+#include "Config.hxx"
 #include "Domain.hxx"
 #include "List.hxx"
 #include "Partition.hxx"

src/client/Process.cxx

@@ -17,7 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "Internal.hxx"
+#include "Client.hxx"
+#include "Config.hxx"
 #include "Domain.hxx"
 #include "protocol/Result.hxx"
 #include "command/AllCommands.hxx"

src/client/Read.cxx

@@ -17,7 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "Internal.hxx"
+#include "Client.hxx"
+#include "Config.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
 #include "event/Loop.hxx"

src/command/CommandListBuilder.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "CommandListBuilder.hxx"
-#include "client/Internal.hxx"
+#include "client/Config.hxx"
 
 #include <string.h>