summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibCore
diff options
context:
space:
mode:
authorsin-ack <sin-ack@users.noreply.github.com>2021-05-10 09:29:41 +0000
committerAndreas Kling <kling@serenityos.org>2021-05-12 22:38:20 +0200
commitae9e35210404e901d2ec9c936ee00fa7dafcbadb (patch)
tree587fb941c72ba812d0dfbabd0dba5f149d5189f8 /Userland/Libraries/LibCore
parent2159f90e00cdca66eedbbb0807b731c74695e5d8 (diff)
downloadserenity-ae9e35210404e901d2ec9c936ee00fa7dafcbadb.zip
LibCore: Add unit to Core::Timer interval arguments
This patch adds the _ms suffix to the interval arguments in Core::Timer, to make it a little clearer what the interval unit is to others.
Diffstat (limited to 'Userland/Libraries/LibCore')
-rw-r--r--Userland/Libraries/LibCore/Timer.cpp20
-rw-r--r--Userland/Libraries/LibCore/Timer.h24
2 files changed, 22 insertions, 22 deletions
diff --git a/Userland/Libraries/LibCore/Timer.cpp b/Userland/Libraries/LibCore/Timer.cpp
index c14ff39cc3..cf5a35ac17 100644
--- a/Userland/Libraries/LibCore/Timer.cpp
+++ b/Userland/Libraries/LibCore/Timer.cpp
@@ -13,11 +13,11 @@ Timer::Timer(Object* parent)
{
}
-Timer::Timer(int interval, Function<void()>&& timeout_handler, Object* parent)
+Timer::Timer(int interval_ms, Function<void()>&& timeout_handler, Object* parent)
: Object(parent)
, on_timeout(move(timeout_handler))
{
- start(interval);
+ start(interval_ms);
}
Timer::~Timer()
@@ -26,28 +26,28 @@ Timer::~Timer()
void Timer::start()
{
- start(m_interval);
+ start(m_interval_ms);
}
-void Timer::start(int interval)
+void Timer::start(int interval_ms)
{
if (m_active)
return;
- m_interval = interval;
- start_timer(interval);
+ m_interval_ms = interval_ms;
+ start_timer(interval_ms);
m_active = true;
}
void Timer::restart()
{
- restart(m_interval);
+ restart(m_interval_ms);
}
-void Timer::restart(int interval)
+void Timer::restart(int interval_ms)
{
if (m_active)
stop();
- start(interval);
+ start(interval_ms);
}
void Timer::stop()
@@ -65,7 +65,7 @@ void Timer::timer_event(TimerEvent&)
else {
if (m_interval_dirty) {
stop();
- start(m_interval);
+ start(m_interval_ms);
}
}
diff --git a/Userland/Libraries/LibCore/Timer.h b/Userland/Libraries/LibCore/Timer.h
index 7e790224f0..94c1ac4c1c 100644
--- a/Userland/Libraries/LibCore/Timer.h
+++ b/Userland/Libraries/LibCore/Timer.h
@@ -15,15 +15,15 @@ class Timer final : public Object {
C_OBJECT(Timer);
public:
- static NonnullRefPtr<Timer> create_repeating(int interval, Function<void()>&& timeout_handler, Object* parent = nullptr)
+ static NonnullRefPtr<Timer> create_repeating(int interval_ms, Function<void()>&& timeout_handler, Object* parent = nullptr)
{
- auto timer = adopt_ref(*new Timer(interval, move(timeout_handler), parent));
+ auto timer = adopt_ref(*new Timer(interval_ms, move(timeout_handler), parent));
timer->stop();
return timer;
}
- static NonnullRefPtr<Timer> create_single_shot(int interval, Function<void()>&& timeout_handler, Object* parent = nullptr)
+ static NonnullRefPtr<Timer> create_single_shot(int interval_ms, Function<void()>&& timeout_handler, Object* parent = nullptr)
{
- auto timer = adopt_ref(*new Timer(interval, move(timeout_handler), parent));
+ auto timer = adopt_ref(*new Timer(interval_ms, move(timeout_handler), parent));
timer->set_single_shot(true);
timer->stop();
return timer;
@@ -32,18 +32,18 @@ public:
virtual ~Timer() override;
void start();
- void start(int interval);
+ void start(int interval_ms);
void restart();
- void restart(int interval);
+ void restart(int interval_ms);
void stop();
bool is_active() const { return m_active; }
- int interval() const { return m_interval; }
- void set_interval(int interval)
+ int interval() const { return m_interval_ms; }
+ void set_interval(int interval_ms)
{
- if (m_interval == interval)
+ if (m_interval_ms == interval_ms)
return;
- m_interval = interval;
+ m_interval_ms = interval_ms;
m_interval_dirty = true;
}
@@ -54,14 +54,14 @@ public:
private:
explicit Timer(Object* parent = nullptr);
- Timer(int interval, Function<void()>&& timeout_handler, Object* parent = nullptr);
+ Timer(int interval_ms, Function<void()>&& timeout_handler, Object* parent = nullptr);
virtual void timer_event(TimerEvent&) override;
bool m_active { false };
bool m_single_shot { false };
bool m_interval_dirty { false };
- int m_interval { 0 };
+ int m_interval_ms { 0 };
};
}