Skip to content

Commit

Permalink
remove namespace std - part2
Browse files Browse the repository at this point in the history
  • Loading branch information
@wirbel-at-vdr-portal
wirbel-at-vdr-portal authored and kfb77 committed May 22, 2021
1 parent 8db400b commit 3bfb524
Show file tree
Hide file tree
Showing 59 changed files with 605 additions and 642 deletions.
10 changes: 5 additions & 5 deletions cache.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@

namespace vgstools {

template< typename TKey, typename TValue, typename KeyComp = std::less< TKey > >
template<typename TKey, typename TValue, typename KeyComp = std::less<TKey>>
class cache
{
public:
typedef TKey key_type;
typedef TValue mapped_type;
typedef stdext::shared_ptr< mapped_type > ptr_type;
typedef stdext::shared_ptr<mapped_type> ptr_type;

private:
typedef std::pair< key_type, ptr_type > value_type;
typedef std::pair<key_type, ptr_type> value_type;

typedef std::list< value_type > ValueList;
typedef std::map< key_type, typename ValueList::iterator, KeyComp > KeyMap;
typedef std::list<value_type> ValueList;
typedef std::map<key_type, typename ValueList::iterator, KeyComp> KeyMap;

public:
cache( size_t maxWeight )
Expand Down
2 changes: 1 addition & 1 deletion epg_events.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ namespace vdrlive
return found;
}

for (int j = 0;j < size;j++)
for (int j = 0; j < size; j++)
{
const std::string filemask(recfolder + "/*." + filetypes[j]);
glob_t globbuf;
Expand Down
128 changes: 64 additions & 64 deletions epgsearch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ bool operator<( SearchTimer const& left, SearchTimer const& right )
bool CheckEpgsearchVersion()
{
/* @winni: Falls Du an der Versionsnummer Anpassungen vornehmen willst, mach das bitte in livefeatures.h ganz unten. Danke */
const Features< features::epgsearch >& f = LiveFeatures< features::epgsearch >();
const Features<features::epgsearch>& f = LiveFeatures<features::epgsearch>();
if ( f.Loaded() ) {
if ( !f.Recent() )
throw HtmlError( tr("Required minimum version of epgsearch: ") + std::string( f.MinVersion() ));
Expand Down Expand Up @@ -56,8 +56,8 @@ void SearchTimer::Init()
m_useDayOfWeek = false;
m_dayOfWeek = 0;
m_useEpisode = false;
m_priority = lexical_cast< int >(EPGSearchSetupValues::ReadValue("DefPriority"));
m_lifetime = lexical_cast< int >(EPGSearchSetupValues::ReadValue("DefLifetime"));
m_priority = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefPriority"));
m_lifetime = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefLifetime"));
m_fuzzytolerance = 1;
m_useInFavorites = false;
m_useAsSearchtimer = 0;
Expand All @@ -68,8 +68,8 @@ void SearchTimer::Init()
m_switchMinBefore = 1;
m_useExtEPGInfo = false;
m_useVPS = false;
m_marginstart = lexical_cast< int >(EPGSearchSetupValues::ReadValue("DefMarginStart"));
m_marginstop = lexical_cast< int >(EPGSearchSetupValues::ReadValue("DefMarginStop"));
m_marginstart = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefMarginStart"));
m_marginstop = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefMarginStop"));
m_avoidrepeats = false;
m_allowedrepeats = 0;
m_compareTitle = false;
Expand All @@ -95,56 +95,56 @@ SearchTimer::SearchTimer( std::string const& data )
std::vector<std::string>::const_iterator part = parts.begin();
for ( int i = 0; part != parts.end(); ++i, ++part ) {
switch ( i ) {
case 0: m_id = lexical_cast< int >( *part ); break;
case 0: m_id = lexical_cast<int>( *part ); break;
case 1: m_search = StringReplace( StringReplace( *part, "|", ":" ), "!^pipe^!", "|" ); break;
case 2: m_useTime = lexical_cast< bool >( *part ); break;
case 3: if ( m_useTime ) m_startTime = lexical_cast< int >( *part ); break;
case 4: if ( m_useTime ) m_stopTime = lexical_cast< int >( *part ); break;
case 5: m_useChannel = lexical_cast< int >( *part ); break;
case 2: m_useTime = lexical_cast<bool>( *part ); break;
case 3: if ( m_useTime ) m_startTime = lexical_cast<int>( *part ); break;
case 4: if ( m_useTime ) m_stopTime = lexical_cast<int>( *part ); break;
case 5: m_useChannel = lexical_cast<int>( *part ); break;
case 6: ParseChannel( *part ); break;
case 7: m_useCase = lexical_cast< int >( *part ); break;
case 8: m_mode = lexical_cast< int >( *part ); break;
case 9: m_useTitle = lexical_cast< bool >( *part ); break;
case 10: m_useSubtitle = lexical_cast< bool >( *part ); break;
case 11: m_useDescription = lexical_cast< bool >( *part ); break;
case 12: m_useDuration = lexical_cast< bool >( *part ); break;
case 13: if ( m_useDuration ) m_minDuration = lexical_cast< int >( *part ); break;
case 14: if ( m_useDuration ) m_maxDuration = lexical_cast< int >( *part ); break;
case 15: m_useAsSearchtimer = lexical_cast< int >( *part ); break;
case 16: m_useDayOfWeek = lexical_cast< bool >( *part ); break;
case 17: m_dayOfWeek = lexical_cast< int >( *part ); break;
case 18: m_useEpisode = lexical_cast< bool >( *part ); break;
case 7: m_useCase = lexical_cast<int>( *part ); break;
case 8: m_mode = lexical_cast<int>( *part ); break;
case 9: m_useTitle = lexical_cast<bool>( *part ); break;
case 10: m_useSubtitle = lexical_cast<bool>( *part ); break;
case 11: m_useDescription = lexical_cast<bool>( *part ); break;
case 12: m_useDuration = lexical_cast<bool>( *part ); break;
case 13: if ( m_useDuration ) m_minDuration = lexical_cast<int>( *part ); break;
case 14: if ( m_useDuration ) m_maxDuration = lexical_cast<int>( *part ); break;
case 15: m_useAsSearchtimer = lexical_cast<int>( *part ); break;
case 16: m_useDayOfWeek = lexical_cast<bool>( *part ); break;
case 17: m_dayOfWeek = lexical_cast<int>( *part ); break;
case 18: m_useEpisode = lexical_cast<bool>( *part ); break;
case 19: m_directory = StringReplace( StringReplace( *part, "|", ":" ), "!^pipe^!", "|" ); break;
case 20: m_priority = lexical_cast< int >( *part ); break;
case 21: m_lifetime = lexical_cast< int >( *part ); break;
case 22: m_marginstart = lexical_cast< int >( *part ); break;
case 23: m_marginstop = lexical_cast< int >( *part ); break;
case 24: m_useVPS = lexical_cast< bool >( *part ); break;
case 25: m_action = lexical_cast< int >( *part ); break;
case 26: m_useExtEPGInfo = lexical_cast< bool >( *part ); break;
case 20: m_priority = lexical_cast<int>( *part ); break;
case 21: m_lifetime = lexical_cast<int>( *part ); break;
case 22: m_marginstart = lexical_cast<int>( *part ); break;
case 23: m_marginstop = lexical_cast<int>( *part ); break;
case 24: m_useVPS = lexical_cast<bool>( *part ); break;
case 25: m_action = lexical_cast<int>( *part ); break;
case 26: m_useExtEPGInfo = lexical_cast<bool>( *part ); break;
case 27: ParseExtEPGInfo( *part ); break;
case 28: m_avoidrepeats = lexical_cast< bool >( *part ); break;
case 29: m_allowedrepeats = lexical_cast< int >( *part ); break;
case 30: m_compareTitle = lexical_cast< bool >( *part ); break;
case 31: m_compareSubtitle = lexical_cast< int >( *part ); break;
case 32: m_compareSummary = lexical_cast< bool >( *part ); break;
case 28: m_avoidrepeats = lexical_cast<bool>( *part ); break;
case 29: m_allowedrepeats = lexical_cast<int>( *part ); break;
case 30: m_compareTitle = lexical_cast<bool>( *part ); break;
case 31: m_compareSubtitle = lexical_cast<int>( *part ); break;
case 32: m_compareSummary = lexical_cast<bool>( *part ); break;
case 33: m_catvaluesAvoidRepeat = lexical_cast< long >( *part ); break;
case 34: m_repeatsWithinDays = lexical_cast< int >( *part ); break;
case 35: m_delAfterDays = lexical_cast< int >( *part ); break;
case 36: m_recordingsKeep = lexical_cast< int >( *part ); break;
case 37: m_switchMinBefore = lexical_cast< int >( *part ); break;
case 38: m_pauseOnNrRecordings = lexical_cast< int >( *part ); break;
case 39: m_blacklistmode = lexical_cast< int >( *part ); break;
case 34: m_repeatsWithinDays = lexical_cast<int>( *part ); break;
case 35: m_delAfterDays = lexical_cast<int>( *part ); break;
case 36: m_recordingsKeep = lexical_cast<int>( *part ); break;
case 37: m_switchMinBefore = lexical_cast<int>( *part ); break;
case 38: m_pauseOnNrRecordings = lexical_cast<int>( *part ); break;
case 39: m_blacklistmode = lexical_cast<int>( *part ); break;
case 40: ParseBlacklist( *part ); break;
case 41: m_fuzzytolerance = lexical_cast< int >( *part ); break;
case 42: m_useInFavorites = lexical_cast< bool >( *part ); break;
case 43: m_menuTemplate = lexical_cast< int >( *part ); break;
case 44: m_delMode = lexical_cast< int >( *part ); break;
case 45: m_delAfterCountRecs = lexical_cast< int >( *part ); break;
case 46: m_delAfterDaysOfFirstRec = lexical_cast< int >( *part ); break;
case 47: m_useAsSearchTimerFrom = lexical_cast< time_t >( *part ); break;
case 48: m_useAsSearchTimerTil = lexical_cast< time_t >( *part ); break;
case 49: m_ignoreMissingEPGCats = lexical_cast< bool >( *part ); break;
case 41: m_fuzzytolerance = lexical_cast<int>( *part ); break;
case 42: m_useInFavorites = lexical_cast<bool>( *part ); break;
case 43: m_menuTemplate = lexical_cast<int>( *part ); break;
case 44: m_delMode = lexical_cast<int>( *part ); break;
case 45: m_delAfterCountRecs = lexical_cast<int>( *part ); break;
case 46: m_delAfterDaysOfFirstRec = lexical_cast<int>( *part ); break;
case 47: m_useAsSearchTimerFrom = lexical_cast<time_t>( *part ); break;
case 48: m_useAsSearchTimerTil = lexical_cast<time_t>( *part ); break;
case 49: m_ignoreMissingEPGCats = lexical_cast<bool>( *part ); break;
}
}
} catch ( bad_lexical_cast const& ex ) {
Expand Down Expand Up @@ -285,7 +285,7 @@ void SearchTimer::ParseChannel( std::string const& data )
void SearchTimer::ParseChannelIDs( std::string const& data )
{
std::vector<std::string> parts = StringSplit( data, '|' );
m_channelMin = lexical_cast< tChannelID >( parts[ 0 ] );
m_channelMin = lexical_cast<tChannelID>( parts[ 0 ] );

#if VDRVERSNUM >= 20301
LOCK_CHANNELS_READ;
Expand All @@ -299,7 +299,7 @@ void SearchTimer::ParseChannelIDs( std::string const& data )
if ( parts.size() < 2 )
return;

m_channelMax = lexical_cast< tChannelID >( parts[ 1 ] );
m_channelMax = lexical_cast<tChannelID>( parts[ 1 ] );

#if VDRVERSNUM >= 20301
channel = Channels->GetByChannelID( m_channelMax );
Expand Down Expand Up @@ -402,7 +402,7 @@ 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))
if (timer->Id() == lexical_cast<int>(id))
return &*timer;
return NULL;

Expand All @@ -425,7 +425,7 @@ bool SearchTimers::Delete(std::string const& id)
if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
throw HtmlError( tr("EPGSearch version outdated! Please update.") );

if (service.handler->DelSearchTimer(lexical_cast< int >( id )))
if (service.handler->DelSearchTimer(lexical_cast<int>( id )))
return Reload();
return false;
}
Expand Down Expand Up @@ -455,11 +455,11 @@ ExtEPGInfo::ExtEPGInfo( std::string const& data )
std::vector<std::string>::const_iterator part = parts.begin();
for ( int i = 0; part != parts.end(); ++i, ++part ) {
switch ( i ) {
case 0: m_id = lexical_cast< int >( *part ); break;
case 0: m_id = lexical_cast<int>( *part ); break;
case 1: m_name = *part; break;
case 2: m_menuname = *part; break;
case 3: ParseValues( *part ); break;
case 4: m_searchmode = lexical_cast< int >( *part ); break;
case 4: m_searchmode = lexical_cast<int>( *part ); break;
}
}
} catch ( bad_lexical_cast const& ex ) {
Expand Down Expand Up @@ -529,7 +529,7 @@ Blacklist::Blacklist( std::string const& data )
std::vector<std::string>::const_iterator part = parts.begin();
for ( int i = 0; part != parts.end(); ++i, ++part ) {
switch ( i ) {
case 0: m_id = lexical_cast< int >( *part ); break;
case 0: m_id = lexical_cast<int>( *part ); break;
case 1: m_search = StringReplace( StringReplace( *part, "|", ":" ), "!^pipe^!", "|" ); break;
}
}
Expand All @@ -555,18 +555,18 @@ SearchResult::SearchResult( std::string const& data )
std::vector<std::string>::const_iterator part = parts.begin();
for ( int i = 0; part != parts.end(); ++i, ++part ) {
switch ( i ) {
case 0: m_searchId = lexical_cast< int >( *part ); break;
case 1: m_eventId = lexical_cast< u_int32_t >( *part ); break;
case 0: m_searchId = lexical_cast<int>( *part ); break;
case 1: m_eventId = lexical_cast<u_int32_t>( *part ); break;
case 2: m_title = StringReplace( *part, "|", ":" ); break;
case 3: m_shorttext = StringReplace( *part, "|", ":" ); break;
case 4: m_description = StringReplace( *part, "|", ":" ); break;
case 5: m_starttime = lexical_cast< unsigned long >( *part ); break;
case 6: m_stoptime = lexical_cast< unsigned long >( *part ); break;
case 7: m_channel = lexical_cast< tChannelID >( *part ); break;
case 8: m_timerstart = lexical_cast< unsigned long >( *part ); break;
case 9: m_timerstop = lexical_cast< unsigned long >( *part ); break;
case 5: m_starttime = lexical_cast<unsigned long>( *part ); break;
case 6: m_stoptime = lexical_cast<unsigned long>( *part ); break;
case 7: m_channel = lexical_cast<tChannelID>( *part ); break;
case 8: m_timerstart = lexical_cast<unsigned long>( *part ); break;
case 9: m_timerstop = lexical_cast<unsigned long>( *part ); break;
case 10: m_file = *part; break;
case 11: m_timerMode = lexical_cast< int >( *part ); break;
case 11: m_timerMode = lexical_cast<int>( *part ); break;
}
}
} catch ( bad_lexical_cast const& ex ) {
Expand Down
28 changes: 14 additions & 14 deletions epgsearch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class SearchTimer
int StopTime() const { return m_stopTime; }
std::string StopTimeFormatted();
void SetStopTime(int stopTime) { m_stopTime = stopTime; }
eUseChannel UseChannel() const { return static_cast< eUseChannel >( m_useChannel ); }
eUseChannel UseChannel() const { return static_cast<eUseChannel>( m_useChannel ); }
void SetUseChannel(eUseChannel useChannel) { m_useChannel = useChannel; }
tChannelID ChannelMin() const { return m_channelMin; }
void SetChannelMin(tChannelID channelMin) { m_channelMin = channelMin; }
Expand Down Expand Up @@ -104,8 +104,8 @@ class SearchTimer
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(const std::vector< std::string >& ExtEPGInfo) { m_ExtEPGInfo = ExtEPGInfo; }
std::vector<std::string> ExtEPGInfo() const { return m_ExtEPGInfo; }
void SetExtEPGInfo(const 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; }
Expand Down Expand Up @@ -179,15 +179,15 @@ class SearchTimer
int m_marginstop;
bool m_useVPS;
bool m_useExtEPGInfo;
std::vector< std::string > m_ExtEPGInfo;
std::vector<std::string> m_ExtEPGInfo;
bool m_avoidrepeats;
int m_allowedrepeats;
bool m_compareTitle;
int m_compareSubtitle;
bool m_compareSummary;
int m_repeatsWithinDays;
int m_blacklistmode;
std::vector< std::string > m_blacklistIDs;
std::vector<std::string> m_blacklistIDs;
int m_menuTemplate;
unsigned long m_catvaluesAvoidRepeat;
int m_delMode;
Expand All @@ -208,13 +208,13 @@ class ExtEPGInfo
ExtEPGInfo(std::string const& data );
int Id() const { return m_id; }
std::string Name() const { return m_menuname; }
std::vector< std::string > Values() const { return m_values; }
std::vector<std::string> Values() const { return m_values; }
bool Selected(unsigned int index, std::string const& values);
private:
int m_id;
std::string m_name;
std::string m_menuname;
std::vector< std::string > m_values;
std::vector<std::string> m_values;
int m_searchmode;

void ParseValues( std::string const& data );
Expand All @@ -223,7 +223,7 @@ class ExtEPGInfo
class ExtEPGInfos
{
public:
typedef std::list< ExtEPGInfo > ExtEPGInfoList;
typedef std::list<ExtEPGInfo> ExtEPGInfoList;
typedef ExtEPGInfoList::size_type size_type;
typedef ExtEPGInfoList::iterator iterator;
typedef ExtEPGInfoList::const_iterator const_iterator;
Expand Down Expand Up @@ -252,7 +252,7 @@ class ChannelGroup
class ChannelGroups
{
public:
typedef std::list< ChannelGroup > ChannelGroupList;
typedef std::list<ChannelGroup> ChannelGroupList;
typedef ChannelGroupList::size_type size_type;
typedef ChannelGroupList::iterator iterator;
typedef ChannelGroupList::const_iterator const_iterator;
Expand All @@ -272,7 +272,7 @@ class ChannelGroups
class SearchTimers
{
public:
typedef std::list< SearchTimer > TimerList;
typedef std::list<SearchTimer> TimerList;
typedef TimerList::size_type size_type;
typedef TimerList::iterator iterator;
typedef TimerList::const_iterator const_iterator;
Expand Down Expand Up @@ -312,7 +312,7 @@ class Blacklist
class Blacklists
{
public:
typedef std::list< Blacklist > blacklist;
typedef std::list<Blacklist> blacklist;
typedef blacklist::size_type size_type;
typedef blacklist::iterator iterator;
typedef blacklist::const_iterator const_iterator;
Expand Down Expand Up @@ -345,7 +345,7 @@ class SearchResult
time_t TimerStartTime() const { return m_timerstart; }
time_t TimerStopTime() const { return m_timerstop; }
int TimerMode() const { return m_timerMode; }
bool operator<( SearchResult const& other ) const { return m_starttime < other.m_starttime; }
bool operator<( SearchResult const& other ) const { return m_starttime < other.m_starttime; }
const cEvent* GetEvent(const cChannel* Channel);

#if VDRVERSNUM >= 20301
Expand Down Expand Up @@ -376,7 +376,7 @@ class SearchResults
{
static std::set<std::string> querySet;
public:
typedef std::list< SearchResult > searchresults;
typedef std::list<SearchResult> searchresults;
typedef searchresults::size_type size_type;
typedef searchresults::iterator iterator;
typedef searchresults::const_iterator const_iterator;
Expand All @@ -402,7 +402,7 @@ class SearchResults
class RecordingDirs
{
public:
typedef std::set< std::string > recordingdirs;
typedef std::set<std::string> recordingdirs;
typedef recordingdirs::size_type size_type;
typedef recordingdirs::iterator iterator;
typedef recordingdirs::const_iterator const_iterator;
Expand Down
2 changes: 1 addition & 1 deletion filecache.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ bool FileObject::load()
std::streamsize size = ifs.tellg();
ifs.seekg( 0, std::ios::beg );

std::vector< char > data( size );
std::vector<char> data( size );
data.resize( size );
ifs.read( &data[0], size );
ifs.close();
Expand Down
Loading

0 comments on commit 3bfb524

Please sign in to comment.