From 32973379b57e3f650547a8d28570f96262d08f56 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 17 Jul 2021 22:49:19 +0200 Subject: [PATCH] lcd4l: rename OnAfterError->OnError --- src/driver/lcd4l.cpp | 6 +++--- src/driver/lcd4l.h | 2 +- src/gui/lcd4l_setup.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index c590b1d04..f1796f45c 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -168,7 +168,7 @@ void CLCD4l::StartLCD4l() if (exec_initscript("lcd4linux", "start", "systemctl")) OnAfterStart(); else - OnAfterError(); + OnError(); } } @@ -191,7 +191,7 @@ void CLCD4l::StopLCD4l() if (exec_initscript("lcd4linux", "stop", "systemctl")) OnAfterStop(); else - OnAfterError(); + OnError(); } void CLCD4l::SwitchLCD4l() @@ -886,7 +886,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) if (exec_initscript("lcd4linux", "restart", "systemctl")) OnAfterRestart(); else - OnAfterError(); + OnError(); } } } diff --git a/src/driver/lcd4l.h b/src/driver/lcd4l.h index f63e2866e..b4d5f876b 100644 --- a/src/driver/lcd4l.h +++ b/src/driver/lcd4l.h @@ -85,7 +85,7 @@ class CLCD4l OnAfterStop, OnBeforeRestart, OnAfterRestart, - OnAfterError; + OnError; private: std::thread *thrLCD4l; diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp index bd08a197a..ff1f73ee8 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -329,5 +329,5 @@ void CLCD4lSetup::connectSlots() CLCD4l::getInstance()->OnAfterStop.connect(sl_remove); CLCD4l::getInstance()->OnAfterRestart.connect(sl_remove); - CLCD4l::getInstance()->OnAfterError.connect(sl_remove); + CLCD4l::getInstance()->OnError.connect(sl_remove); }