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

[vuplus_xbmc] / xbmc / linux / HALManager.h

diff --git a/xbmc/linux/HALManager.h b/xbmc/linux/HALManager.h
index 01a832f..6f4be17 100644 (file)
--- a/xbmc/linux/HALManager.h
+++ b/xbmc/linux/HALManager.h
@@ -32,6 +32,7 @@
 #define BYTE char
 #include "utils/log.h"
 #include "threads/CriticalSection.h"
+#include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #include "MediaSource.h"
 
@@ -63,20 +64,20 @@ public:
   { // Not the prettiest but it's better than having to reproduce it elsewere in the code...
     CStdString rtn, tmp1, tmp2, tmp3, tmp4;
     if (UUID.size() > 0)
-      tmp1.Format("UUID %s | ", UUID.c_str());
+      tmp1 = StringUtils::Format("UUID %s | ", UUID.c_str());
     if (FileSystem.size() > 0)
-      tmp2.Format("FileSystem %s | ", FileSystem.c_str());
+      tmp2 = StringUtils::Format("FileSystem %s | ", FileSystem.c_str());
     if (MountPoint.size() > 0)
-      tmp3.Format("Mounted on %s | ", MountPoint.c_str());
+      tmp3 = StringUtils::Format("Mounted on %s | ", MountPoint.c_str());
     if (HotPlugged)
-      tmp4.Format("HotPlugged YES | ");
+      tmp4 = StringUtils::Format("HotPlugged YES | ");
     else
-      tmp4.Format("HotPlugged NO  | ");
+      tmp4 = StringUtils::Format("HotPlugged NO  | ");
 
     if (Approved)
-      rtn.Format("%s%s%s%sType %i |Approved YES ", tmp1.c_str(), tmp2.c_str(), tmp3.c_str(), tmp4.c_str(), Type);
+      rtn = StringUtils::Format("%s%s%s%sType %i |Approved YES ", tmp1.c_str(), tmp2.c_str(), tmp3.c_str(), tmp4.c_str(), Type);
     else
-      rtn.Format("%s%s%s%sType %i |Approved NO  ", tmp1.c_str(), tmp2.c_str(), tmp3.c_str(), tmp4.c_str(), Type);
+      rtn = StringUtils::Format("%s%s%s%sType %i |Approved NO  ", tmp1.c_str(), tmp2.c_str(), tmp3.c_str(), tmp4.c_str(), Type);
 
     return  rtn;
   }