summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2013-02-24 17:26:01 (GMT)
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2013-02-24 17:26:01 (GMT)
commitf760f360d2408ec23b001bd71c59209b4d4f39e9 (patch)
tree728dcf3648bb83a912f36437e126fc40ccbedcd0
parent06d41e3eb782dc9d6d44477be0628bbce0e56297 (diff)
downloadvdr-plugin-live-f760f360d2408ec23b001bd71c59209b4d4f39e9.tar.gz
vdr-plugin-live-f760f360d2408ec23b001bd71c59209b4d4f39e9.tar.bz2
Only some white space and formatting changes.
-rw-r--r--epgsearch.cpp58
-rw-r--r--epgsearch.h14
-rw-r--r--livefeatures.h2
3 files changed, 37 insertions, 37 deletions
diff --git a/epgsearch.cpp b/epgsearch.cpp
index 11892de..cd29a0b 100644
--- a/epgsearch.cpp
+++ b/epgsearch.cpp
@@ -85,7 +85,7 @@ void SearchTimer::Init()
m_delAfterCountRecs = 0;
m_delAfterDaysOfFirstRec = 0;
m_useAsSearchTimerFrom = 0;
- m_useAsSearchTimerTil = 0;
+ m_useAsSearchTimerTil = 0;
m_catvaluesAvoidRepeat = 0;
m_ignoreMissingEPGCats = false;
}
@@ -204,7 +204,7 @@ std::string SearchTimer::ToText()
if (m_useExtEPGInfo)
{
for(unsigned int i=0; i<m_ExtEPGInfo.size(); i++)
- tmp_catvalues += (tmp_catvalues != ""?"|":"") +
+ tmp_catvalues += (tmp_catvalues != ""?"|":"") +
StringReplace(StringReplace(m_ExtEPGInfo[i], ":", "!^colon^!"), "|", "!^pipe^!");
}
@@ -381,11 +381,11 @@ bool SearchTimers::Save(SearchTimer* searchtimer)
SearchTimer* SearchTimers::GetByTimerId( std::string const& id )
{
- for (SearchTimers::iterator timer = m_timers.begin(); timer != m_timers.end(); ++timer)
- if (timer->Id() == lexical_cast< int >(id))
+ for (SearchTimers::iterator timer = m_timers.begin(); timer != m_timers.end(); ++timer)
+ if (timer->Id() == lexical_cast< int >(id))
return &*timer;
return NULL;
-
+
}
bool SearchTimers::ToggleActive(std::string const& id)
@@ -419,10 +419,10 @@ void SearchTimers::TriggerUpdate()
}
bool SearchTimer::BlacklistSelected(int id) const
-{
- for(unsigned int i=0; i<m_blacklistIDs.size(); i++)
- if (StringToInt(m_blacklistIDs[i]) == id) return true;
- return false;
+{
+ for(unsigned int i=0; i<m_blacklistIDs.size(); i++)
+ if (StringToInt(m_blacklistIDs[i]) == id) return true;
+ return false;
}
ExtEPGInfo::ExtEPGInfo( string const& data )
@@ -458,13 +458,13 @@ bool ExtEPGInfo::Selected(unsigned int index, std::string const& values)
vector< string > parts;
parts = StringSplit( values, ',' );
- for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
+ for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
parts = StringSplit( values, ';' );
- for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
+ for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
parts = StringSplit( values, '|' );
- for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
+ for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
parts = StringSplit( values, '~' );
- for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
+ for(unsigned int i=0; i<parts.size(); i++) if (StringTrim(parts[i]) == extepgvalue) return true;
return false;
}
@@ -562,7 +562,7 @@ const cEvent* SearchResult::GetEvent()
if (!Channel) return NULL;
const cSchedule *Schedule = Schedules->GetSchedule(Channel);
if (!Schedule) return NULL;
- return Schedule->GetEvent(m_eventId);
+ return Schedule->GetEvent(m_eventId);
}
std::set<std::string> SearchResults::querySet;
@@ -598,10 +598,10 @@ std::string SearchResults::AddQuery(std::string const& query)
std::string SearchResults::PopQuery(std::string const& md5)
{
std::string query;
- if (!md5.empty())
+ if (!md5.empty())
{
std::set<std::string>::iterator it;
- for (it = querySet.begin(); it != querySet.end(); it++)
+ for (it = querySet.begin(); it != querySet.end(); it++)
{
if (md5 == MD5Hash(*it))
{
@@ -616,21 +616,21 @@ std::string SearchResults::PopQuery(std::string const& md5)
RecordingDirs::RecordingDirs(bool shortList)
{
- if (shortList)
+ if (shortList)
{
- Epgsearch_services_v1_2 service;
- if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
- throw HtmlError( tr("EPGSearch version outdated! Please update.") );
-
- m_set = service.handler->ShortDirectoryList();
+ Epgsearch_services_v1_2 service;
+ if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
+ throw HtmlError( tr("EPGSearch version outdated! Please update.") );
+
+ m_set = service.handler->ShortDirectoryList();
}
- else
- {
- Epgsearch_services_v1_0 service;
- if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
- throw HtmlError( tr("EPGSearch version outdated! Please update.") );
-
- m_set = service.handler->DirectoryList();
+ else
+ {
+ Epgsearch_services_v1_0 service;
+ if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
+ throw HtmlError( tr("EPGSearch version outdated! Please update.") );
+
+ m_set = service.handler->DirectoryList();
}
}
diff --git a/epgsearch.h b/epgsearch.h
index 2f1f6a7..67a9b99 100644
--- a/epgsearch.h
+++ b/epgsearch.h
@@ -25,7 +25,7 @@ public:
Group = 2,
FTAOnly = 3
};
-
+
SearchTimer();
SearchTimer( std::string const& data );
void Init();
@@ -98,8 +98,8 @@ public:
void SetSwitchMinBefore(int switchMinBefore) { m_switchMinBefore = switchMinBefore; }
bool UseExtEPGInfo() const { return m_useExtEPGInfo; }
void SetUseExtEPGInfo(bool useExtEPGInfo) { m_useExtEPGInfo = useExtEPGInfo; }
- std::vector< std::string > ExtEPGInfo() const { return m_ExtEPGInfo; }
- void SetExtEPGInfo(std::vector< std::string > ExtEPGInfo) { m_ExtEPGInfo = ExtEPGInfo; }
+ std::vector< std::string > ExtEPGInfo() const { return m_ExtEPGInfo; }
+ void SetExtEPGInfo(std::vector< std::string > ExtEPGInfo) { m_ExtEPGInfo = ExtEPGInfo; }
bool AvoidRepeats() const { return m_avoidrepeats; }
void SetAvoidRepeats(bool avoidrepeats) { m_avoidrepeats = avoidrepeats; }
int AllowedRepeats() const { return m_allowedrepeats; }
@@ -136,7 +136,7 @@ public:
void SetUseAsSearchTimerTil(std::string const& datestring, std::string const& format);
bool IgnoreMissingEPGCats() const { return m_ignoreMissingEPGCats; }
void SetIgnoreMissingEPGCats(bool ignoreMissingEPGCats) { m_ignoreMissingEPGCats = ignoreMissingEPGCats; }
-
+
private:
int m_id;
std::string m_search;
@@ -392,7 +392,7 @@ public:
typedef recordingdirs::size_type size_type;
typedef recordingdirs::iterator iterator;
typedef recordingdirs::const_iterator const_iterator;
-
+
RecordingDirs(bool shortList=false);
iterator begin() { return m_set.begin(); }
@@ -407,8 +407,8 @@ private:
class EPGSearchSetupValues
{
public:
- static std::string ReadValue(const std::string& entry);
- static bool WriteValue(const std::string& entry, const std::string& value);
+ static std::string ReadValue(const std::string& entry);
+ static bool WriteValue(const std::string& entry, const std::string& value);
};
class EPGSearchExpr
diff --git a/livefeatures.h b/livefeatures.h
index 2f246cc..8c6f361 100644
--- a/livefeatures.h
+++ b/livefeatures.h
@@ -42,7 +42,7 @@ private:
SplitVersion m_version;
SplitVersion m_minVersion;
- Features()
+ Features()
: m_plugin( cPluginManager::GetPlugin( Feat::Plugin() ) )
, m_version( Version() )
, m_minVersion( Feat::MinVersion() ) {}