From 747c5f55408ce8ce47c4247a9719a4678ead9454 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Thu, 21 Feb 2008 22:10:28 +0100 Subject: Whitespace changes only. --- timerconflict.cpp | 6 +++--- timerconflict.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/timerconflict.cpp b/timerconflict.cpp index 9f0f8af..78db815 100644 --- a/timerconflict.cpp +++ b/timerconflict.cpp @@ -53,8 +53,8 @@ TimerConflict::TimerConflict( string const& data ) timer.concurrentTimerIndices.push_back(lexical_cast< int >( *conctimerpart )); break; } - } - conflictingTimers.push_back(timer); + } + conflictingTimers.push_back(timer); } } } @@ -67,7 +67,7 @@ TimerConflicts::TimerConflicts() Epgsearch_services_v1_0 service; if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 ) throw HtmlError( tr("EPGSearch version outdated! Please update.") ); - + list< string > conflicts = service.handler->TimerConflictList(); m_conflicts.assign( conflicts.begin(), conflicts.end() ); m_conflicts.sort(); diff --git a/timerconflict.h b/timerconflict.h index 4930909..f040789 100644 --- a/timerconflict.h +++ b/timerconflict.h @@ -14,8 +14,8 @@ public: int timerIndex; // it's index in VDR int percentage; // percentage of recording std::list concurrentTimerIndices; // concurrent timer indices - - TimerInConflict(int TimerIndex=-1, int Percentage=0) : timerIndex(TimerIndex), percentage(Percentage) {} + + TimerInConflict(int TimerIndex=-1, int Percentage=0) : timerIndex(TimerIndex), percentage(Percentage) {} }; class TimerConflict; @@ -29,11 +29,11 @@ class TimerConflict std::list< TimerInConflict > conflictingTimers; // conflicting timers at this time public: friend bool operator<( TimerConflict const& left, TimerConflict const& right ); - + TimerConflict( std::string const& data ); TimerConflict(); void Init(); - + time_t ConflictTime() { return conflictTime; } const std::list< TimerInConflict >& ConflictingTimers() { return conflictingTimers; } }; -- cgit v1.2.3