From e35f072d9d17455dc6d5852f94310b9d136c118a Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 13 Nov 2013 08:54:09 +0100 Subject: [PATCH] remove unneeded CConfigFile from lcdd and shutdown_count Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/769d31045533564fbfec1d4914018e8ddf454a1b Author: Stefan Seyfried Date: 2013-11-13 (Wed, 13 Nov 2013) --- src/driver/lcdd.cpp | 3 --- src/driver/lcdd.h | 5 +---- src/driver/shutdown_count.cpp | 2 -- src/driver/shutdown_count.h | 4 ---- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/driver/lcdd.cpp b/src/driver/lcdd.cpp index 8b6083df6..6730b59f0 100644 --- a/src/driver/lcdd.cpp +++ b/src/driver/lcdd.cpp @@ -1,6 +1,4 @@ /* - $Id$ - LCD-Daemon - DBoxII-Project Copyright (C) 2001 Steffen Hehn 'McClean' @@ -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 1e7e5be15..6689a79de 100644 --- a/src/driver/lcdd.h +++ b/src/driver/lcdd.h @@ -1,6 +1,4 @@ /* - $Id$ - LCD-Daemon - DBoxII-Project Copyright (C) 2001 Steffen Hehn 'McClean' @@ -80,8 +78,8 @@ typedef enum #include "driver/file.h" #endif // LCD_UPDATE -#include #include +#include #include @@ -150,7 +148,6 @@ class CLCD bool showclock; bool movie_centered; bool movie_is_ac3; - CConfigFile configfile; pthread_t thrTime; int last_toggle_state_power; int clearClock; diff --git a/src/driver/shutdown_count.cpp b/src/driver/shutdown_count.cpp index a7b092022..9416a30fd 100644 --- a/src/driver/shutdown_count.cpp +++ b/src/driver/shutdown_count.cpp @@ -4,7 +4,6 @@ Copyright (C) 2001 Steffen Hehn 'McClean' Homepage: http://dbox.cyberphoria.org/ - License: GPL This program is free software; you can redistribute it and/or modify @@ -39,7 +38,6 @@ SHTDCNT::SHTDCNT() - : configfile('\t') { } diff --git a/src/driver/shutdown_count.h b/src/driver/shutdown_count.h index 6b0692da6..7fed38ba8 100644 --- a/src/driver/shutdown_count.h +++ b/src/driver/shutdown_count.h @@ -4,8 +4,6 @@ Copyright (C) 2001 Steffen Hehn 'McClean' Homepage: http://dbox.cyberphoria.org/ - - License: GPL This program is free software; you can redistribute it and/or modify @@ -26,7 +24,6 @@ #ifndef __shutdown_count__ #define __shutdown_count__ -#include #include class SHTDCNT @@ -36,7 +33,6 @@ class SHTDCNT pthread_t thrTime; unsigned int shutdown_cnt; unsigned int sleep_cnt; - CConfigFile configfile; void shutdown_counter(); SHTDCNT();