summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <awesomekling@gmail.com>2019-01-15 21:16:04 +0100
committerAndreas Kling <awesomekling@gmail.com>2019-01-15 21:16:04 +0100
commite42f090ed3e0915fde8b47b61447f053af9a8e4c (patch)
treee33095d95e3888ba741f58d82a54b3e4241d5f65
parentd0137f0e96191e6ebc4efa3565fd7f6f1b2bce2e (diff)
downloadserenity-e42f090ed3e0915fde8b47b61447f053af9a8e4c.zip
Rename WindowComposer -> WindowServer.
I keep referring to it as the windowing server anyway.
-rw-r--r--Kernel/Makefile6
-rw-r--r--Kernel/WindowComposer.cpp5
-rw-r--r--Kernel/WindowComposer.h7
-rw-r--r--Kernel/init.cpp4
4 files changed, 4 insertions, 18 deletions
diff --git a/Kernel/Makefile b/Kernel/Makefile
index 7f11b75522..1adda3b31b 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 b5fa1ff7d6..674562ad7f 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 3aecaf817b..0000000000
--- 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 8001460b58..d7c42823f0 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();