From 1dcbe346ce833edd28847b1a2d781e7ee278e6b4 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 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0705705b317422c451e2b683aa51e96f149d1711 Author: Thilo Graf Date: 2021-07-17 (Sat, 17 Jul 2021) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- 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 d33291493..34498bfe7 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -169,7 +169,7 @@ void CLCD4l::StartLCD4l() if (exec_initscript("lcd4linux", "start")) OnAfterStart(); else - OnAfterError(); + OnError(); } } @@ -192,7 +192,7 @@ void CLCD4l::StopLCD4l() if (exec_initscript("lcd4linux", "stop")) OnAfterStop(); else - OnAfterError(); + OnError(); } void CLCD4l::SwitchLCD4l() @@ -861,7 +861,7 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) if (exec_initscript("lcd4linux", "restart")) OnAfterRestart(); else - OnAfterError(); + OnError(); } } } diff --git a/src/driver/lcd4l.h b/src/driver/lcd4l.h index b8cebde27..b51d84a0b 100644 --- a/src/driver/lcd4l.h +++ b/src/driver/lcd4l.h @@ -73,7 +73,7 @@ class CLCD4l OnAfterStop, OnBeforeRestart, OnAfterRestart, - OnAfterError; + OnAfter; private: std::thread *thrLCD4l; diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp index e35ac98a7..6f73feaaa 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -341,5 +341,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); }