From 8c58d6feb3e8134db23c82db2eba16f958658ceb Mon Sep 17 00:00:00 2001 From: Jasmin Jessich Date: Sun, 18 Jun 2017 14:49:19 +0200 Subject: Fixed compilation with VDR 2.2.0 --- timers.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/timers.cpp b/timers.cpp index d280a27..98e4ad8 100644 --- a/timers.cpp +++ b/timers.cpp @@ -291,7 +291,7 @@ namespace vdrlive { Timers->SetExplicitModify(); const cTimer *checkTimer = Timers->GetTimer( newTimer.get() ); #else - cTimer* checkTimer = Timers.GetTimer( newTimer.get() ); + const cTimer* checkTimer = Timers.GetTimer( newTimer.get() ); #endif if ( checkTimer ) { StoreError( timerData, tr("Timer already defined") ); @@ -321,9 +321,9 @@ namespace vdrlive { #if VDRVERSNUM >= 20301 LOCK_TIMERS_WRITE; Timers->SetExplicitModify(); - cTimer* oldTimer = (cTimer *)Timers->GetTimer( timerData.first ); + cTimer* oldTimer = Timers->GetTimer( timerData.first ); #else - cTimer* oldTimer = Timers.GetTimer( timerData.first ); + cTimer* oldTimer = Timers.GetTimer( const_cast(timerData.first) ); #endif if ( oldTimer == 0 ) { StoreError( timerData, tr("Timer not defined") ); @@ -357,9 +357,9 @@ namespace vdrlive { #if VDRVERSNUM >= 20301 LOCK_TIMERS_WRITE; Timers->SetExplicitModify(); - cTimer* oldTimer = (cTimer *)Timers->GetTimer( timerData.first ); + cTimer* oldTimer = Timers->GetTimer( timerData.first ); #else - cTimer* oldTimer = Timers.GetTimer( timerData.first ); + cTimer* oldTimer = Timers.GetTimer( const_cast(timerData.first) ); #endif if ( oldTimer == 0 ) { StoreError( timerData, tr("Timer not defined") ); @@ -397,9 +397,9 @@ namespace vdrlive { #if VDRVERSNUM >= 20301 LOCK_TIMERS_WRITE; Timers->SetExplicitModify(); - cTimer* toggleTimer = (cTimer *)Timers->GetTimer( timerData.first ); + cTimer* toggleTimer = Timers->GetTimer( timerData.first ); #else - cTimer* toggleTimer = Timers.GetTimer( timerData.first ); + cTimer* toggleTimer = Timers.GetTimer( const_cast(timerData.first) ); #endif if ( toggleTimer == 0 ) { StoreError( timerData, tr("Timer not defined") ); -- cgit v1.2.3