[cstdstring] demise Format, replacing with StringUtils::Format

[vuplus_xbmc] / xbmc / pvr / recordings / PVRRecording.cpp

diff --git a/xbmc/pvr/recordings/PVRRecording.cpp b/xbmc/pvr/recordings/PVRRecording.cpp
index ae53c3a..8ad5286 100644 (file)
--- a/xbmc/pvr/recordings/PVRRecording.cpp
+++ b/xbmc/pvr/recordings/PVRRecording.cpp
@@ -130,7 +130,7 @@ bool CPVRRecording::Delete(void)
 
 bool CPVRRecording::Rename(const CStdString &strNewName)
 {
-  m_strTitle.Format("%s", strNewName);
+  m_strTitle = StringUtils::Format("%s", strNewName.c_str());
   PVR_ERROR error = g_PVRClients->RenameRecording(*this);
   if (error != PVR_ERROR_NO_ERROR)
   {
@@ -261,8 +261,7 @@ void CPVRRecording::Update(const CPVRRecording &tag)
     m_resumePoint.totalTimeInSeconds = tag.m_resumePoint.totalTimeInSeconds;
   }
 
-  CStdString strShow;
-  strShow.Format("%s - ", g_localizeStrings.Get(20364).c_str());
+  CStdString strShow = StringUtils::Format("%s - ", g_localizeStrings.Get(20364).c_str());
   if (m_strPlotOutline.Left(strShow.size()).Equals(strShow))
   {
     CStdString strEpisode = m_strPlotOutline;
@@ -271,7 +270,7 @@ void CPVRRecording::Update(const CPVRRecording &tag)
     int pos = strTitle.ReverseFind('/');
     strTitle.erase(0, pos + 1);
     strEpisode.erase(0, strShow.size());
-    m_strTitle.Format("%s - %s", strTitle.c_str(), strEpisode);
+    m_strTitle = StringUtils::Format("%s - %s", strTitle.c_str(), strEpisode.c_str());
     pos = strEpisode.Find('-');
     strEpisode.erase(0, pos + 2);
     m_strPlotOutline = strEpisode;
@@ -294,10 +293,10 @@ void CPVRRecording::UpdatePath(void)
     strTitle.Replace('/',' ');
 
     if (!m_strDirectory.IsEmpty())
-      strDirectory.Format("%s/", m_strDirectory.c_str());
+      strDirectory = StringUtils::Format("%s/", m_strDirectory.c_str());
     if (!m_strChannelName.IsEmpty())
-      strChannel.Format(" (%s)", m_strChannelName.c_str());
-    m_strFileNameAndPath.Format("pvr://recordings/%s%s, TV%s, %s.pvr", strDirectory.c_str(), strTitle.c_str(), strChannel.c_str(), strDatetime.c_str());
+      strChannel = StringUtils::Format(" (%s)", m_strChannelName.c_str());
+    m_strFileNameAndPath = StringUtils::Format("pvr://recordings/%s%s, TV%s, %s.pvr", strDirectory.c_str(), strTitle.c_str(), strChannel.c_str(), strDatetime.c_str());
   }
 }