diff --git a/Applications/Terminal/Terminal.h b/Applications/Terminal/Terminal.h index 3fedf44bdf..724b128772 100644 --- a/Applications/Terminal/Terminal.h +++ b/Applications/Terminal/Terminal.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include class Font; @@ -160,5 +160,5 @@ private: int m_glyph_width { 0 }; - GTimer m_cursor_blink_timer; + CTimer m_cursor_blink_timer; }; diff --git a/LibGUI/GTimer.cpp b/LibCore/CTimer.cpp similarity index 62% rename from LibGUI/GTimer.cpp rename to LibCore/CTimer.cpp index 18c092f1b0..f78fa6a51c 100644 --- a/LibGUI/GTimer.cpp +++ b/LibCore/CTimer.cpp @@ -1,20 +1,20 @@ -#include +#include -GTimer::GTimer(CObject* parent) +CTimer::CTimer(CObject* parent) : CObject(parent) { } -GTimer::~GTimer() +CTimer::~CTimer() { } -void GTimer::start() +void CTimer::start() { start(m_interval); } -void GTimer::start(int interval) +void CTimer::start(int interval) { if (m_active) return; @@ -22,7 +22,7 @@ void GTimer::start(int interval) m_active = true; } -void GTimer::stop() +void CTimer::stop() { if (!m_active) return; @@ -30,7 +30,7 @@ void GTimer::stop() m_active = false; } -void GTimer::timer_event(CTimerEvent&) +void CTimer::timer_event(CTimerEvent&) { if (m_single_shot) stop(); diff --git a/LibGUI/GTimer.h b/LibCore/CTimer.h similarity index 77% rename from LibGUI/GTimer.h rename to LibCore/CTimer.h index 68707748c8..349917eae4 100644 --- a/LibGUI/GTimer.h +++ b/LibCore/CTimer.h @@ -3,10 +3,10 @@ #include #include -class GTimer final : public CObject { +class CTimer final : public CObject { public: - explicit GTimer(CObject* parent = nullptr); - virtual ~GTimer() override; + explicit CTimer(CObject* parent = nullptr); + virtual ~CTimer() override; void start(); void start(int interval); @@ -21,7 +21,7 @@ public: Function on_timeout; - virtual const char* class_name() const override { return "GTimer"; } + virtual const char* class_name() const override { return "CTimer"; } private: virtual void timer_event(CTimerEvent&) override; diff --git a/LibCore/Makefile b/LibCore/Makefile index f3af95529f..6e5dda7f5a 100644 --- a/LibCore/Makefile +++ b/LibCore/Makefile @@ -11,6 +11,7 @@ OBJS = \ CNetworkJob.o \ CNetworkResponse.o \ CObject.o \ + CTimer.o \ CEventLoop.o \ CEvent.o diff --git a/LibGUI/Makefile b/LibGUI/Makefile index 3847add902..6ee8b250c6 100644 --- a/LibGUI/Makefile +++ b/LibGUI/Makefile @@ -49,7 +49,6 @@ LIBGUI_OBJS = \ GTreeView.o \ GFileSystemModel.o \ GSplitter.o \ - GTimer.o \ GSpinBox.o \ GGroupBox.o \ GWindow.o