From f2791fa792cad8ebae169e1decabb331f0e830c2 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 9 Nov 2013 16:00:00 +0100 Subject: [PATCH] remove unneeded CConfigFile from lcdd and shutdown_count --- src/driver/lcdd.cpp | 5 +---- src/driver/lcdd.h | 7 ++----- src/driver/shutdown_count.cpp | 3 +-- src/driver/shutdown_count.h | 4 +--- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/driver/lcdd.cpp b/src/driver/lcdd.cpp index 9fa3abb40..9b88a4342 100644 --- a/src/driver/lcdd.cpp +++ b/src/driver/lcdd.cpp @@ -1,13 +1,11 @@ /* - $Id$ - LCD-Daemon - DBoxII-Project Copyright (C) 2001 Steffen Hehn 'McClean' Homepage: http://dbox.cyberphoria.org/ Copyright (C) 2008 Novell, Inc. Author: Stefan Seyfried - (C) 2009-2012 Stefan Seyfried + (C) 2009-2013 Stefan Seyfried License: GPL @@ -85,7 +83,6 @@ static bool isUTF8(const std::string &string) } CLCD::CLCD() - : configfile('\t') { #ifdef LCD_UPDATE m_fileList = NULL; diff --git a/src/driver/lcdd.h b/src/driver/lcdd.h index 0086c0aa1..99d1d0316 100644 --- a/src/driver/lcdd.h +++ b/src/driver/lcdd.h @@ -1,12 +1,10 @@ /* - $Id$ - LCD-Daemon - DBoxII-Project Copyright (C) 2001 Steffen Hehn 'McClean' Homepage: http://dbox.cyberphoria.org/ - Copyright (C) 2008-2012 Stefan Seyfried + Copyright (C) 2008-2013 Stefan Seyfried License: GPL @@ -77,8 +75,8 @@ typedef enum #include "driver/file.h" #endif // LCD_UPDATE -#include #include +#include #ifdef HAVE_TRIPLEDRAGON #include @@ -149,7 +147,6 @@ class CLCD bool showclock; bool movie_centered; bool movie_is_ac3; - CConfigFile configfile; pthread_t thrTime; bool thread_started; int last_toggle_state_power; diff --git a/src/driver/shutdown_count.cpp b/src/driver/shutdown_count.cpp index c885223f3..d3081f224 100644 --- a/src/driver/shutdown_count.cpp +++ b/src/driver/shutdown_count.cpp @@ -4,7 +4,7 @@ Copyright (C) 2001 Steffen Hehn 'McClean' Homepage: http://dbox.cyberphoria.org/ - Copyright (C) 2012 Stefan Seyfried + Copyright (C) 2012-2013 Stefan Seyfried License: GPL @@ -40,7 +40,6 @@ SHTDCNT::SHTDCNT() - : configfile('\t') { thread_running = false; } diff --git a/src/driver/shutdown_count.h b/src/driver/shutdown_count.h index aca81fd1f..ed7cd0c29 100644 --- a/src/driver/shutdown_count.h +++ b/src/driver/shutdown_count.h @@ -4,7 +4,7 @@ Copyright (C) 2001 Steffen Hehn 'McClean' Homepage: http://dbox.cyberphoria.org/ - Copyright (C) 2012 Stefan Seyfried + Copyright (C) 2012-2013 Stefan Seyfried License: GPL @@ -26,7 +26,6 @@ #ifndef __shutdown_count__ #define __shutdown_count__ -#include #include class SHTDCNT @@ -37,7 +36,6 @@ class SHTDCNT bool thread_running; unsigned int shutdown_cnt; unsigned int sleep_cnt; - CConfigFile configfile; void shutdown_counter(); SHTDCNT();