From 8b4903e733fc49c77bcb3cd3c6399f7132b17248 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Mon, 21 Oct 2019 19:50:07 +0200
Subject: [PATCH] LibVT: Move TerminalWidget from the Terminal app to here

It would be nice to be able to reuse this widget in other apps. :^)
---
 Applications/Makefile.common                                  | 2 +-
 Applications/Terminal/Makefile                                | 1 -
 Applications/Terminal/main.cpp                                | 2 +-
 Libraries/LibVT/Makefile                                      | 3 ++-
 {Applications/Terminal => Libraries/LibVT}/TerminalWidget.cpp | 0
 {Applications/Terminal => Libraries/LibVT}/TerminalWidget.h   | 0
 {Applications/Terminal => Libraries/LibVT}/XtermColors.h      | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename {Applications/Terminal => Libraries/LibVT}/TerminalWidget.cpp (100%)
 rename {Applications/Terminal => Libraries/LibVT}/TerminalWidget.h (100%)
 rename {Applications/Terminal => Libraries/LibVT}/XtermColors.h (100%)

diff --git a/Applications/Makefile.common b/Applications/Makefile.common
index 8514e4bf09..12b3670803 100755
--- a/Applications/Makefile.common
+++ b/Applications/Makefile.common
@@ -3,7 +3,7 @@ DEFINES += -DUSERLAND
 all: $(APP)
 
 $(APP): $(OBJS)
-	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lmarkdown -lhtml -lgui -ldraw -laudio -lipc -lthread -lvt -lpcidb -lcore -lc
+	$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lmarkdown -lhtml -laudio -lipc -lvt -lpcidb -lgui -ldraw -lthread -lcore -lc
 
 .cpp.o:
 	@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
diff --git a/Applications/Terminal/Makefile b/Applications/Terminal/Makefile
index 6d6981a83f..0eb3bcb3be 100644
--- a/Applications/Terminal/Makefile
+++ b/Applications/Terminal/Makefile
@@ -1,7 +1,6 @@
 include ../../Makefile.common
 
 OBJS = \
-    TerminalWidget.o \
     main.o
 
 APP = Terminal
diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
index 4b5082249b..325652a402 100644
--- a/Applications/Terminal/main.cpp
+++ b/Applications/Terminal/main.cpp
@@ -1,4 +1,3 @@
-#include "TerminalWidget.h"
 #include <Kernel/KeyCode.h>
 #include <LibCore/CArgsParser.h>
 #include <LibCore/CUserInfo.h>
@@ -14,6 +13,7 @@
 #include <LibGUI/GSlider.h>
 #include <LibGUI/GWidget.h>
 #include <LibGUI/GWindow.h>
+#include <LibVT/TerminalWidget.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/Libraries/LibVT/Makefile b/Libraries/LibVT/Makefile
index 2370a93b12..ba58d2af19 100644
--- a/Libraries/LibVT/Makefile
+++ b/Libraries/LibVT/Makefile
@@ -1,7 +1,8 @@
 include ../../Makefile.common
 
 OBJS = \
-    Terminal.o
+    Terminal.o \
+    TerminalWidget.o
 
 LIBRARY = libvt.a
 DEFINES += -DUSERLAND
diff --git a/Applications/Terminal/TerminalWidget.cpp b/Libraries/LibVT/TerminalWidget.cpp
similarity index 100%
rename from Applications/Terminal/TerminalWidget.cpp
rename to Libraries/LibVT/TerminalWidget.cpp
diff --git a/Applications/Terminal/TerminalWidget.h b/Libraries/LibVT/TerminalWidget.h
similarity index 100%
rename from Applications/Terminal/TerminalWidget.h
rename to Libraries/LibVT/TerminalWidget.h
diff --git a/Applications/Terminal/XtermColors.h b/Libraries/LibVT/XtermColors.h
similarity index 100%
rename from Applications/Terminal/XtermColors.h
rename to Libraries/LibVT/XtermColors.h