Rename new IPC headers & classes

Sticking these in a namespace allows us to use a more generic
("Connection") term without clashing, which is way easier to understand
than to try to come up with unique names for both.

3 files changed, 4 insertions, 5 deletions

diff --git a/Servers/AudioServer/ASClientConnection.cpp b/Servers/AudioServer/ASClientConnection.cpp
index d34de74eaa..acb467ddbc 100644
--- a/Servers/AudioServer/ASClientConnection.cpp
+++ b/Servers/AudioServer/ASClientConnection.cpp
@@ -14,7 +14,7 @@
 #include <stdio.h>
 
 ASClientConnection::ASClientConnection(int fd, int client_id, ASMixer& mixer)
-    : CIPCServerSideClient(fd, client_id)
+    : Connection(fd, client_id)
     , m_mixer(mixer)
 {
 }
diff --git a/Servers/AudioServer/ASClientConnection.h b/Servers/AudioServer/ASClientConnection.h
index 5065994481..ecc48477d1 100644
--- a/Servers/AudioServer/ASClientConnection.h
+++ b/Servers/AudioServer/ASClientConnection.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <LibCore/CIPCServerSideClient.h>
+#include <LibCore/CoreIPCServer.h>
 #include <LibAudio/ASAPI.h>
 
 class ASMixer;
 
-class ASClientConnection final : public CIPCServerSideClient<ASAPI_ServerMessage, ASAPI_ClientMessage>
+class ASClientConnection final : public IPC::Server::Connection<ASAPI_ServerMessage, ASAPI_ClientMessage>
 {
 public:
     explicit ASClientConnection(int fd, int client_id, ASMixer& mixer);
diff --git a/Servers/AudioServer/ASEventLoop.cpp b/Servers/AudioServer/ASEventLoop.cpp
index 203ba6538c..dfb4ce3a2a 100644
--- a/Servers/AudioServer/ASEventLoop.cpp
+++ b/Servers/AudioServer/ASEventLoop.cpp
@@ -31,8 +31,7 @@ void ASEventLoop::drain_server()
     } else {
         dbgprintf("AudioServer: accept()ed client %d\n", client_fd);
         static int s_next_client_id = 0;
-        CIPCServerSideClientCreator<ASClientConnection>(client_fd, s_next_client_id++, m_mixer);
-        //new ASClientConnection(client_fd, s_next_client_id++, m_mixer);
+        IPC::Server::new_connection_for_client<ASClientConnection>(client_fd, s_next_client_id++, m_mixer);
     }
 }