From 64f135d90f2d4fb9b3b13712cf2be1f3eb65d50d Mon Sep 17 00:00:00 2001
From: sin-ack <sin-ack@users.noreply.github.com>
Date: Sun, 6 Feb 2022 16:05:28 +0000
Subject: [PATCH] LibCore+Userland: Remove Core::TCPSocket :^)

This was deprecated in favor of Core::Stream::TCPSocket, and now has no
users.
---
 Tests/LibCore/TestLibCoreStream.cpp           |  3 +-
 Userland/Libraries/LibCore/CMakeLists.txt     |  1 -
 Userland/Libraries/LibCore/TCPServer.cpp      |  1 -
 Userland/Libraries/LibCore/TCPSocket.cpp      | 50 -------------------
 Userland/Libraries/LibCore/TCPSocket.h        | 24 ---------
 Userland/Libraries/LibGemini/Job.h            |  1 -
 Userland/Libraries/LibHTTP/Job.cpp            |  1 -
 Userland/Libraries/LibHTTP/Job.h              |  1 -
 .../Libraries/LibWebSocket/ConnectionInfo.h   |  1 -
 .../Services/RequestServer/ConnectionCache.h  |  1 -
 10 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 Userland/Libraries/LibCore/TCPSocket.cpp
 delete mode 100644 Userland/Libraries/LibCore/TCPSocket.h

diff --git a/Tests/LibCore/TestLibCoreStream.cpp b/Tests/LibCore/TestLibCoreStream.cpp
index e2f3e7e041..9d86e68c38 100644
--- a/Tests/LibCore/TestLibCoreStream.cpp
+++ b/Tests/LibCore/TestLibCoreStream.cpp
@@ -9,7 +9,6 @@
 #include <LibCore/LocalServer.h>
 #include <LibCore/Stream.h>
 #include <LibCore/TCPServer.h>
-#include <LibCore/TCPSocket.h>
 #include <LibCore/Timer.h>
 #include <LibCore/UDPServer.h>
 #include <LibCore/UDPSocket.h>
@@ -141,7 +140,7 @@ TEST_CASE(file_adopt_invalid_fd)
 
 TEST_CASE(should_error_when_connection_fails)
 {
-    // NOTE: This is required here because Core::TCPSocket requires
+    // NOTE: This is required here because Core::Stream::TCPSocket requires
     //       Core::EventLoop through Core::Notifier.
     Core::EventLoop event_loop;
 
diff --git a/Userland/Libraries/LibCore/CMakeLists.txt b/Userland/Libraries/LibCore/CMakeLists.txt
index d71213f4eb..c5883e0be4 100644
--- a/Userland/Libraries/LibCore/CMakeLists.txt
+++ b/Userland/Libraries/LibCore/CMakeLists.txt
@@ -33,7 +33,6 @@ set(SOURCES
     System.cpp
     SystemServerTakeover.cpp
     TCPServer.cpp
-    TCPSocket.cpp
     TempFile.cpp
     Timer.cpp
     UDPServer.cpp
diff --git a/Userland/Libraries/LibCore/TCPServer.cpp b/Userland/Libraries/LibCore/TCPServer.cpp
index 74aae9e8be..1402a001a1 100644
--- a/Userland/Libraries/LibCore/TCPServer.cpp
+++ b/Userland/Libraries/LibCore/TCPServer.cpp
@@ -10,7 +10,6 @@
 #include <LibCore/Notifier.h>
 #include <LibCore/System.h>
 #include <LibCore/TCPServer.h>
-#include <LibCore/TCPSocket.h>
 
 namespace Core {
 
diff --git a/Userland/Libraries/LibCore/TCPSocket.cpp b/Userland/Libraries/LibCore/TCPSocket.cpp
deleted file mode 100644
index e2838750aa..0000000000
--- a/Userland/Libraries/LibCore/TCPSocket.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#include <LibCore/TCPSocket.h>
-#include <errno.h>
-#include <sys/socket.h>
-
-#ifndef SOCK_NONBLOCK
-#    include <sys/ioctl.h>
-#endif
-
-namespace Core {
-
-TCPSocket::TCPSocket(int fd, Object* parent)
-    : Socket(Socket::Type::TCP, parent)
-{
-    // NOTE: This constructor is used by TCPServer::accept(), so the socket is already connected.
-    m_connected = true;
-    set_fd(fd);
-    set_mode(OpenMode::ReadWrite);
-    set_error(0);
-}
-
-TCPSocket::TCPSocket(Object* parent)
-    : Socket(Socket::Type::TCP, parent)
-{
-#ifdef SOCK_NONBLOCK
-    int fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
-#else
-    int fd = socket(AF_INET, SOCK_STREAM, 0);
-    int option = 1;
-    ioctl(fd, FIONBIO, &option);
-#endif
-    if (fd < 0) {
-        set_error(errno);
-    } else {
-        set_fd(fd);
-        set_mode(OpenMode::ReadWrite);
-        set_error(0);
-    }
-}
-
-TCPSocket::~TCPSocket()
-{
-}
-
-}
diff --git a/Userland/Libraries/LibCore/TCPSocket.h b/Userland/Libraries/LibCore/TCPSocket.h
deleted file mode 100644
index 9316132dd4..0000000000
--- a/Userland/Libraries/LibCore/TCPSocket.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#pragma once
-
-#include <AK/Badge.h>
-#include <LibCore/Socket.h>
-
-namespace Core {
-
-class TCPSocket final : public Socket {
-    C_OBJECT(TCPSocket)
-public:
-    virtual ~TCPSocket() override;
-
-private:
-    TCPSocket(int fd, Object* parent = nullptr);
-    explicit TCPSocket(Object* parent = nullptr);
-};
-
-}
diff --git a/Userland/Libraries/LibGemini/Job.h b/Userland/Libraries/LibGemini/Job.h
index d58ab211b8..7505903433 100644
--- a/Userland/Libraries/LibGemini/Job.h
+++ b/Userland/Libraries/LibGemini/Job.h
@@ -8,7 +8,6 @@
 
 #include <AK/Optional.h>
 #include <LibCore/NetworkJob.h>
-#include <LibCore/TCPSocket.h>
 #include <LibGemini/GeminiRequest.h>
 #include <LibGemini/GeminiResponse.h>
 
diff --git a/Userland/Libraries/LibHTTP/Job.cpp b/Userland/Libraries/LibHTTP/Job.cpp
index b160c80a51..8ac31ee412 100644
--- a/Userland/Libraries/LibHTTP/Job.cpp
+++ b/Userland/Libraries/LibHTTP/Job.cpp
@@ -9,7 +9,6 @@
 #include <LibCompress/Gzip.h>
 #include <LibCompress/Zlib.h>
 #include <LibCore/Event.h>
-#include <LibCore/TCPSocket.h>
 #include <LibHTTP/HttpResponse.h>
 #include <LibHTTP/Job.h>
 #include <stdio.h>
diff --git a/Userland/Libraries/LibHTTP/Job.h b/Userland/Libraries/LibHTTP/Job.h
index 9f47860c15..9a5da1d5ac 100644
--- a/Userland/Libraries/LibHTTP/Job.h
+++ b/Userland/Libraries/LibHTTP/Job.h
@@ -10,7 +10,6 @@
 #include <AK/HashMap.h>
 #include <AK/Optional.h>
 #include <LibCore/NetworkJob.h>
-#include <LibCore/TCPSocket.h>
 #include <LibHTTP/HttpRequest.h>
 #include <LibHTTP/HttpResponse.h>
 
diff --git a/Userland/Libraries/LibWebSocket/ConnectionInfo.h b/Userland/Libraries/LibWebSocket/ConnectionInfo.h
index 6bb3e68ec0..25c86b52f1 100644
--- a/Userland/Libraries/LibWebSocket/ConnectionInfo.h
+++ b/Userland/Libraries/LibWebSocket/ConnectionInfo.h
@@ -9,7 +9,6 @@
 #include <AK/URL.h>
 #include <AK/Vector.h>
 #include <LibCore/Object.h>
-#include <LibCore/TCPSocket.h>
 #include <LibTLS/TLSv12.h>
 #include <LibWebSocket/Message.h>
 
diff --git a/Userland/Services/RequestServer/ConnectionCache.h b/Userland/Services/RequestServer/ConnectionCache.h
index 716c764c59..8a52c4e2fb 100644
--- a/Userland/Services/RequestServer/ConnectionCache.h
+++ b/Userland/Services/RequestServer/ConnectionCache.h
@@ -15,7 +15,6 @@
 #include <LibCore/ElapsedTimer.h>
 #include <LibCore/EventLoop.h>
 #include <LibCore/NetworkJob.h>
-#include <LibCore/TCPSocket.h>
 #include <LibCore/Timer.h>
 #include <LibTLS/TLSv12.h>