From e42f090ed3e0915fde8b47b61447f053af9a8e4c Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Tue, 15 Jan 2019 21:16:04 +0100
Subject: [PATCH] Rename WindowComposer -> WindowServer.

I keep referring to it as the windowing server anyway.
---
 Kernel/Makefile           | 6 ------
 Kernel/WindowComposer.cpp | 5 ++---
 Kernel/WindowComposer.h   | 7 -------
 Kernel/init.cpp           | 4 ++--
 4 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 Kernel/WindowComposer.h

diff --git a/Kernel/Makefile b/Kernel/Makefile
index 7f11b755223..1adda3b31b2 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -58,12 +58,6 @@ WIDGETS_OBJS = \
     ../Widgets/Color.o \
     ../Widgets/CharacterBitmap.o \
     ../Widgets/EventLoop.o \
-    ../Widgets/Label.o \
-    ../Widgets/Button.o \
-    ../Widgets/MsgBox.o \
-    ../Widgets/ListBox.o \
-    ../Widgets/CheckBox.o \
-    ../Widgets/TextBox.o \
     ../Widgets/AbstractScreen.o \
     ../Widgets/GUIEventDevice.o \
 
diff --git a/Kernel/WindowComposer.cpp b/Kernel/WindowComposer.cpp
index b5fa1ff7d60..674562ad7f2 100644
--- a/Kernel/WindowComposer.cpp
+++ b/Kernel/WindowComposer.cpp
@@ -1,4 +1,3 @@
-#include "WindowComposer.h"
 #include "Process.h"
 #include <Widgets/Font.h>
 #include <Widgets/FrameBuffer.h>
@@ -6,7 +5,7 @@
 #include <Widgets/EventLoop.h>
 #include <Widgets/Window.h>
 
-void WindowComposer_main()
+void WindowServer_main()
 {
     auto info = current->get_display_info();
 
@@ -16,7 +15,7 @@ void WindowComposer_main()
 
     WindowManager::the();
 
-    dbgprintf("Entering WindowComposer main loop.\n");
+    dbgprintf("Entering WindowServer main loop.\n");
     EventLoop::main().exec();
 
     ASSERT_NOT_REACHED();
diff --git a/Kernel/WindowComposer.h b/Kernel/WindowComposer.h
deleted file mode 100644
index 3aecaf817bd..00000000000
--- a/Kernel/WindowComposer.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-class WindowComposer {
-public:
-    
-};
-
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index 8001460b58e..d7c42823f0d 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -137,8 +137,8 @@ static void init_stage2()
     Process::create_kernel_process("spawn_stress", spawn_stress);
 #endif
 
-    extern void WindowComposer_main();
-    Process::create_kernel_process("WindowComposer", WindowComposer_main);
+    extern void WindowServer_main();
+    Process::create_kernel_process("WindowServer", WindowServer_main);
 
     current->sys$exit(0);
     ASSERT_NOT_REACHED();