RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 15:27:34 +00:00
Code Issues Activity Actions

LibCore: Convert CTimer to ObjectPtr

Browse source
This commit is contained in:
Andreas Kling 2019-09-20 15:19:46 +02:00
parent c34fd10b5b
commit 50a6560413
22 changed files with 91 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/SystemMonitor/NetworkStatisticsWidget.cpp
View file

@ -55,7 +55,7 @@ NetworkStatisticsWidget::NetworkStatisticsWidget(GWidget* parent)
net_tcp_fields.empend("bytes_out", "Bytes Out", TextAlignment::CenterRight);
m_socket_table_view->set_model(GJsonArrayModel::create("/proc/net/tcp", move(net_tcp_fields)));
m_update_timer = new CTimer(
m_update_timer = CTimer::create(
1000, [this] {
update_models();
},

2
Applications/SystemMonitor/NetworkStatisticsWidget.h
View file

@ -16,5 +16,5 @@ private:
GTableView* m_adapter_table_view { nullptr };
GTableView* m_socket_table_view { nullptr };
CTimer* m_update_timer { nullptr };
ObjectPtr<CTimer> m_update_timer;
};

2
Applications/SystemMonitor/ProcessStacksWidget.cpp
View file

@ -11,7 +11,7 @@ ProcessStacksWidget::ProcessStacksWidget(GWidget* parent)
m_stacks_editor = new GTextEditor(GTextEditor::Type::MultiLine, this);
m_stacks_editor->set_readonly(true);
m_timer = new CTimer(1000, [this] { refresh(); }, this);
m_timer = CTimer::create(1000, [this] { refresh(); }, this);
}
ProcessStacksWidget::~ProcessStacksWidget()

3
Applications/SystemMonitor/ProcessStacksWidget.h
View file

@ -1,5 +1,6 @@
#pragma once
#include <LibCore/ObjectPtr.h>
#include <LibGUI/GTextEditor.h>
#include <LibGUI/GWidget.h>
@ -17,5 +18,5 @@ public:
private:
pid_t m_pid { -1 };
GTextEditor* m_stacks_editor { nullptr };
CTimer* m_timer { nullptr };
ObjectPtr<CTimer> m_timer;
};

12
Applications/SystemMonitor/main.cpp
View file

@ -111,7 +111,7 @@ int main(int argc, char** argv)
auto* process_table_view = new ProcessTableView(*cpu_graph, process_table_container);
auto* memory_stats_widget = new MemoryStatsWidget(*memory_graph, graphs_container);
auto* refresh_timer = new CTimer(1000, [&] {
auto refresh_timer = CTimer::create(1000, [&] {
process_table_view->refresh();
memory_stats_widget->refresh();
});
@ -167,19 +167,19 @@ int main(int argc, char** argv)
};
auto frequency_menu = make<GMenu>("Frequency");
frequency_menu->add_action(GAction::create("0.25 sec", [refresh_timer](auto&) {
frequency_menu->add_action(GAction::create("0.25 sec", [&](auto&) {
refresh_timer->restart(250);
}));
frequency_menu->add_action(GAction::create("0.5 sec", [refresh_timer](auto&) {
frequency_menu->add_action(GAction::create("0.5 sec", [&](auto&) {
refresh_timer->restart(500);
}));
frequency_menu->add_action(GAction::create("1 sec", [refresh_timer](auto&) {
frequency_menu->add_action(GAction::create("1 sec", [&](auto&) {
refresh_timer->restart(1000);
}));
frequency_menu->add_action(GAction::create("3 sec", [refresh_timer](auto&) {
frequency_menu->add_action(GAction::create("3 sec", [&](auto&) {
refresh_timer->restart(3000);
}));
frequency_menu->add_action(GAction::create("5 sec", [refresh_timer](auto&) {
frequency_menu->add_action(GAction::create("5 sec", [&](auto&) {
refresh_timer->restart(5000);
}));
menubar->add_menu(move(frequency_menu));