code cleanup :)

Author: MichaEiler

channels.cpp

@@ -1,6 +1,7 @@
 #include "channels.h"
+using namespace std;
 
-void ChannelsResponder::reply(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
+void ChannelsResponder::reply(ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
 {
   QueryHandler::addHeader(reply);
 
@@ -20,7 +21,7 @@ void ChannelsResponder::reply(std::ostream& out, cxxtools::http::Request& reques
   }
 }
 
-void ChannelsResponder::replyChannels(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
+void ChannelsResponder::replyChannels(ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
 {
   QueryHandler q("/channels", request);
 
@@ -40,10 +41,10 @@ void ChannelsResponder::replyChannels(std::ostream& out, cxxtools::http::Request
     return;
   }
 
-  std::string channel_details = q.getParamAsString(0);
+  string channel_details = q.getParamAsString(0);
   int start_filter = q.getOptionAsInt("start");
   int limit_filter = q.getOptionAsInt("limit");
-  std::string group_filter = q.getOptionAsString("group");
+  string group_filter = q.getOptionAsString("group");
 
   if (channel_details.length() > 0) {
      cChannel* channel = VdrExtension::getChannel(channel_details);
@@ -54,7 +55,7 @@ void ChannelsResponder::replyChannels(std::ostream& out, cxxtools::http::Request
      } else {
         channelList->init();
 
-        std::string group = "";
+        string group = "";
         int total = 0;
         for (cChannel *channelIt = Channels.First(); channelIt; channelIt = Channels.Next(channelIt))
         { 
@@ -65,7 +66,7 @@ void ChannelsResponder::replyChannels(std::ostream& out, cxxtools::http::Request
                  group = channelIt->Name();
         }
         channelList->setTotal(total);
-        std::string image = FileCaches::get()->searchChannelLogo(channel);
+        string image = FileCaches::get()->searchChannelLogo(channel);
         channelList->addChannel(channel, group, image.length() == 0);
      }
   } else {
@@ -74,12 +75,12 @@ void ChannelsResponder::replyChannels(std::ostream& out, cxxtools::http::Request
      }
      channelList->init();
      int total = 0;
-     std::string group = "";
+     string group = "";
      for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel))
      {
        if (!channel->GroupSep()) {
           if ( group_filter.length() == 0 || group == group_filter ) {
-             std::string image = FileCaches::get()->searchChannelLogo(channel);
+             string image = FileCaches::get()->searchChannelLogo(channel);
              channelList->addChannel(channel, group, image.length() != 0);
              total++;
           }
@@ -94,37 +95,37 @@ void ChannelsResponder::replyChannels(std::ostream& out, cxxtools::http::Request
   delete channelList;
 }
 
-void ChannelsResponder::replyImage(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
+void ChannelsResponder::replyImage(ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
 {
   StreamExtension se(&out);
   QueryHandler q("/channels/image/", request);
 
-  std::string channelid = q.getParamAsString(0);
+  string channelid = q.getParamAsString(0);
   cChannel* channel = VdrExtension::getChannel(channelid);
-  std::string imageFolder = Settings::get()->ChannelLogoDirectory() + (std::string)"/";
+  string imageFolder = Settings::get()->ChannelLogoDirectory() + (string)"/";
 
   if (channel == NULL) {
      reply.httpReturn(502, "Channel not found!");
      return;
   }
 
-  std::string imageName = FileCaches::get()->searchChannelLogo(channel);
+  string imageName = FileCaches::get()->searchChannelLogo(channel);
 
   if (imageName.length() == 0 ) {
      reply.httpReturn(502, "No image found!");
      return;
   }
 
-  std::string absolute_path = imageFolder + imageName;
-  std::string contenttype = (std::string)"image/" + imageName.substr( imageName.find_last_of('.') + 1 );
+  string absolute_path = imageFolder + imageName;
+  string contenttype = (string)"image/" + imageName.substr( imageName.find_last_of('.') + 1 );
   if ( se.writeBinary(absolute_path) ) {
      reply.addHeader("Content-Type", contenttype.c_str());
   } else {
     reply.httpReturn(502, "Binary Output failed");
   }
 }
 
-void ChannelsResponder::replyGroups(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
+void ChannelsResponder::replyGroups(ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
 { 
   QueryHandler q("/channels/groups", request);
   ChannelGroupList* channelGroupList;
@@ -182,7 +183,7 @@ void operator<<= (cxxtools::SerializationInfo& si, const SerChannel& c)
   si.addMember("is_radio") <<= c.IsRadio;
 }
 
-ChannelList::ChannelList(std::ostream* _out)
+ChannelList::ChannelList(ostream* _out)
 {
   s = new StreamExtension(_out);
 }
@@ -198,7 +199,7 @@ void HtmlChannelList::init()
   s->write("<ul>");
 }
 
-void HtmlChannelList::addChannel(cChannel* channel, std::string group, bool image)
+void HtmlChannelList::addChannel(cChannel* channel, string group, bool image)
 {
   if ( filtered() ) return;
 
@@ -213,20 +214,20 @@ void HtmlChannelList::finish()
   s->write("</body></html>");
 }
 
-void JsonChannelList::addChannel(cChannel* channel, std::string group, bool image)
+void JsonChannelList::addChannel(cChannel* channel, string group, bool image)
 {  
   if ( filtered() ) return;
 
-  std::string suffix = (std::string) ".ts";
+  string suffix = (string) ".ts";
 
   SerChannel serChannel;
   serChannel.Name = StringExtension::UTF8Decode(channel->Name());
   serChannel.Number = channel->Number();
-  serChannel.ChannelId = StringExtension::UTF8Decode((std::string)channel->GetChannelID().ToString());
+  serChannel.ChannelId = StringExtension::UTF8Decode((string)channel->GetChannelID().ToString());
   serChannel.Image = image;
   serChannel.Group = StringExtension::UTF8Decode(group);
   serChannel.Transponder = channel->Transponder();
-  serChannel.Stream = StringExtension::UTF8Decode(((std::string)channel->GetChannelID().ToString() + (std::string)suffix).c_str());
+  serChannel.Stream = StringExtension::UTF8Decode(((string)channel->GetChannelID().ToString() + (string)suffix).c_str());
   // TODO: There is an atsc Patch
   #if APIVERSNUM >= 10714
   serChannel.IsAtsc = channel->IsAtsc();
@@ -255,20 +256,20 @@ void XmlChannelList::init()
   s->write("<channels xmlns=\"http://www.domain.org/restfulapi/2011/channels-xml\">\n");
 }
 
-void XmlChannelList::addChannel(cChannel* channel, std::string group, bool image)
+void XmlChannelList::addChannel(cChannel* channel, string group, bool image)
 {
   if ( filtered() ) return;
 
-  std::string suffix = (std::string) ".ts";
+  string suffix = (string) ".ts";
 
   s->write(" <channel>\n");
   s->write(cString::sprintf("  <param name=\"name\">%s</param>\n", StringExtension::encodeToXml(channel->Name()).c_str()));
   s->write(cString::sprintf("  <param name=\"number\">%i</param>\n", channel->Number()));
-  s->write(cString::sprintf("  <param name=\"channel_id\">%s</param>\n",  StringExtension::encodeToXml( (std::string)channel->GetChannelID().ToString()).c_str()));
+  s->write(cString::sprintf("  <param name=\"channel_id\">%s</param>\n",  StringExtension::encodeToXml( (string)channel->GetChannelID().ToString()).c_str()));
   s->write(cString::sprintf("  <param name=\"image\">%s</param>\n", (image ? "true" : "false")));
   s->write(cString::sprintf("  <param name=\"group\">%s</param>\n", StringExtension::encodeToXml( group ).c_str()));
   s->write(cString::sprintf("  <param name=\"transponder\">%i</param>\n", channel->Transponder()));
-  s->write(cString::sprintf("  <param name=\"stream\">%s</param>\n", StringExtension::encodeToXml( ((std::string)channel->GetChannelID().ToString() + (std::string)suffix).c_str()).c_str()));
+  s->write(cString::sprintf("  <param name=\"stream\">%s</param>\n", StringExtension::encodeToXml( ((string)channel->GetChannelID().ToString() + (string)suffix).c_str()).c_str()));
   // TODO: There is an atsc Patch
   #if APIVERSNUM >= 10714
   s->write(cString::sprintf("  <param name=\"is_atsc\">%s</param>\n", channel->IsAtsc() ? "true" : "false"));
@@ -305,7 +306,7 @@ void HtmlChannelGroupList::init()
   s->write("<ul>");
 }
 
-void HtmlChannelGroupList::addGroup(std::string group)
+void HtmlChannelGroupList::addGroup(string group)
 {
   if ( filtered() ) return;
 
@@ -320,7 +321,7 @@ void HtmlChannelGroupList::finish()
   s->write("</body></html>");
 }
 
-void JsonChannelGroupList::addGroup(std::string group)
+void JsonChannelGroupList::addGroup(string group)
 {
   if ( filtered() ) return;
   groups.push_back(StringExtension::UTF8Decode(group));
@@ -341,7 +342,7 @@ void XmlChannelGroupList::init()
   s->write("<groups xmlns=\"http://www.domain.org/restfulapi/2011/groups-xml\">\n");
 }
 
-void XmlChannelGroupList::addGroup(std::string group)
+void XmlChannelGroupList::addGroup(string group)
 {
   if ( filtered() ) return;
   s->write(cString::sprintf(" <group>%s</group>\n", group.c_str()));

epgsearch.cpp

@@ -1,5 +1,6 @@
 #include "epgsearch.h"
 
+using namespace std;
 
 void operator<<= (cxxtools::SerializationInfo& si, SerSearchTimerContainer s)
 {
@@ -54,11 +55,10 @@ void operator<<= (cxxtools::SerializationInfo& si, SerSearchTimerContainer s)
 
 namespace vdrlive {
 
-using namespace std;
 
-std::string SearchTimer::ToXml()
+string SearchTimer::ToXml()
 {
-  std::ostringstream s;
+  ostringstream s;
   s << "<searchtimer>\n"
   << "<id>" << Id() << "</id>\n"
   << "<search>" << StringExtension::encodeToXml(Search()) << "</search>\n"
@@ -89,7 +89,7 @@ std::string SearchTimer::ToXml()
   << "<switch_min_before>" << SwitchMinBefore() << "</switch_min_before>\n"
   << "<use_ext_epg_info>" << UseExtEPGInfo() << "</use_ext_epg_info>\n"
   << "<ext_epg_info>\n";
-  std::vector< std::string > epg_infos = ExtEPGInfo();
+  vector<string > epg_infos = ExtEPGInfo();
   for (int i=0;i<(int)epg_infos.size();i++)
   {
     s << " <info>" << epg_infos[i] << "</info>\n";
@@ -115,14 +115,14 @@ std::string SearchTimer::ToXml()
   return s.str();
 }
 
-std::string SearchTimer::ToHtml()
+string SearchTimer::ToHtml()
 {
   return Search();
 }
 
-std::string SearchTimer::LoadFromQuery(QueryHandler& q)
+string SearchTimer::LoadFromQuery(QueryHandler& q)
 {
-  std::string search = q.getBodyAsString("search");
+  string search = q.getBodyAsString("search");
   if ( search.length() > 0 ) { m_search = search; } else { return "Search required."; }
 
   m_useTime = q.getBodyAsBool("use_time");
@@ -200,7 +200,7 @@ std::string SearchTimer::LoadFromQuery(QueryHandler& q)
   int action = q.getBodyAsInt("search_timer_action");
   if ( action >= 0 ) m_action = action;
 
-  std::string directory = q.getBodyAsString("directory");
+  string directory = q.getBodyAsString("directory");
   if ( directory.length() > 0 ) m_directory = directory;
 
   int del_after_days = q.getBodyAsInt("del_recs_after_days");
@@ -284,7 +284,7 @@ istream& operator>>( istream& is, tChannelID& ret )
 template< typename To, typename From >
 To lexical_cast( From const& from )
 {
-   std::stringstream parser;
+   stringstream parser;
    parser << from;
    To result;
    parser >> result;
@@ -299,8 +299,8 @@ bool operator<( SearchTimer const& left, SearchTimer const& right )
 {
    string leftlower = left.m_search;
    string rightlower = right.m_search;
-   std::transform(leftlower.begin(), leftlower.end(), leftlower.begin(), (int(*)(int)) tolower);
-   std::transform(rightlower.begin(), rightlower.end(), rightlower.begin(), (int(*)(int)) tolower);
+   transform(leftlower.begin(), leftlower.end(), leftlower.begin(), (int(*)(int)) tolower);
+   transform(rightlower.begin(), rightlower.end(), rightlower.begin(), (int(*)(int)) tolower);
    return leftlower < rightlower;
 }
 
@@ -422,17 +422,17 @@ SearchTimer::SearchTimer( string const& data )
 	}
 }
 
-std::string SearchTimer::ToText()
+string SearchTimer::ToText()
 {
-   std::string tmp_Start;
-   std::string tmp_Stop;
-   std::string tmp_minDuration;
-   std::string tmp_maxDuration;
-   std::string tmp_chanSel;
-   std::string tmp_search;
-   std::string tmp_directory;
-   std::string tmp_catvalues;
-   std::string tmp_blacklists;
+   string tmp_Start;
+   string tmp_Stop;
+   string tmp_minDuration;
+   string tmp_maxDuration;
+   string tmp_chanSel;
+   string tmp_search;
+   string tmp_directory;
+   string tmp_catvalues;
+   string tmp_blacklists;
 
    tmp_search = StringExtension::replace(StringExtension::replace(m_search, "|", "!^pipe^!"), ":", "|");
    tmp_directory = StringExtension::replace(StringExtension::replace(m_directory, "|", "!^pipe^!"), ":", "|");
@@ -462,7 +462,7 @@ std::string SearchTimer::ToText()
       cChannel const* channelMax = Channels.GetByChannelID( m_channelMax );
 
       if (channelMax && channelMin->Number() < channelMax->Number())
-         tmp_chanSel = *m_channelMin.ToString() + std::string("|") + *m_channelMax.ToString();
+         tmp_chanSel = *m_channelMin.ToString() + string("|") + *m_channelMax.ToString();
       else
          tmp_chanSel = *m_channelMin.ToString();
    }
@@ -611,7 +611,7 @@ bool SearchTimers::Save(SearchTimer* searchtimer)
 	}
 }
 
-SearchTimer* SearchTimers::GetByTimerId( std::string const& id )
+SearchTimer* SearchTimers::GetByTimerId( string const& id )
 {
    for (SearchTimers::iterator timer = m_timers.begin(); timer != m_timers.end(); ++timer) 
       if (timer->Id() == lexical_cast< int >(id)) 
@@ -620,15 +620,15 @@ SearchTimer* SearchTimers::GetByTimerId( std::string const& id )
 
 }
 
-bool SearchTimers::ToggleActive(std::string const& id)
+bool SearchTimers::ToggleActive(string const& id)
 {
 	SearchTimer* search = GetByTimerId( id );
 	if (!search) return false;
 	search->SetUseAsSearchTimer(search->UseAsSearchTimer()==1?0:1);
 	return Save(search);
 }
 
-bool SearchTimers::Delete(std::string const& id)
+bool SearchTimers::Delete(string const& id)
 {
 	SearchTimer* search = GetByTimerId( id );
 	if (!search) return false;
@@ -681,7 +681,7 @@ void ExtEPGInfo::ParseValues( string const& data )
    m_values = StringExtension::split( data, "," );
 }
 
-bool ExtEPGInfo::Selected(unsigned int index, std::string const& values)
+bool ExtEPGInfo::Selected(unsigned int index, string const& values)
 {
    if (index >= m_values.size()) return false;
    string extepgvalue = StringExtension::trim(m_values[index]);
@@ -791,7 +791,7 @@ const cEvent* SearchResult::GetEvent()
 	return Schedule->GetEvent(m_eventId);	
 }
 
-std::set<std::string> SearchResults::querySet;
+set<string> SearchResults::querySet;
 
 void SearchResults::GetByID(int id)
 {
@@ -803,7 +803,7 @@ void SearchResults::GetByID(int id)
    m_list.sort();
 }
 
-void SearchResults::GetByQuery(std::string const& query)
+void SearchResults::GetByQuery(string const& query)
 {
    Epgsearch_services_v1_0 service;
    cPluginManager::CallFirstService(ServiceInterface, &service); 
@@ -831,22 +831,22 @@ RecordingDirs::RecordingDirs(bool shortList)
     }
 }
 
-std::string EPGSearchSetupValues::ReadValue(const std::string& entry)
+string EPGSearchSetupValues::ReadValue(const string& entry)
 {
    Epgsearch_services_v1_0 service;
    cPluginManager::CallFirstService(ServiceInterface, &service);
    return service.handler->ReadSetupValue(entry);
 }
 
-bool EPGSearchSetupValues::WriteValue(const std::string& entry, const std::string& value)
+bool EPGSearchSetupValues::WriteValue(const string& entry, const string& value)
 {
    Epgsearch_services_v1_0 service;
    cPluginManager::CallFirstService(ServiceInterface, &service);
 
    return service.handler->WriteSetupValue(entry, value);
 }
 
-std::string EPGSearchExpr::EvaluateExpr(const std::string& expr, const cEvent* event)
+string EPGSearchExpr::EvaluateExpr(const string& expr, const cEvent* event)
 {
    Epgsearch_services_v1_2 service;
    cPluginManager::CallFirstService(ServiceInterface, &service);