Merge pull request #5039 from CEikermann/patch-1

[vuplus_xbmc] / xbmc / Util.h

diff --git a/xbmc/Util.h b/xbmc/Util.h
index 197103f..2851897 100644 (file)
--- a/xbmc/Util.h
+++ b/xbmc/Util.h
@@ -24,7 +24,7 @@
 #include <vector>
 #include <string.h>
 #include <stdint.h>
-
+#include "utils/StringUtils.h"
 #include "MediaSource.h"
 
 // A list of filesystem types for LegalPath/FileName
@@ -47,8 +47,8 @@ struct sortstringbyname
   {
     CStdString strLine1 = strItem1;
     CStdString strLine2 = strItem2;
-    strLine1 = strLine1.ToLower();
-    strLine2 = strLine2.ToLower();
+    StringUtils::ToLower(strLine1);
+    StringUtils::ToLower(strLine2);
     return strcmp(strLine1.c_str(), strLine2.c_str()) < 0;
   }
 };
@@ -59,7 +59,7 @@ struct ExternalStreamInfo
   std::string language;
   unsigned int flag;
 
-  ExternalStreamInfo() : flag(0x1111){};
+  ExternalStreamInfo() : flag(0){};
 };
 
 class CUtil
@@ -152,7 +152,7 @@ public:
   static void ForceForwardSlashes(CStdString& strPath);
 
   static double AlbumRelevance(const CStdString& strAlbumTemp1, const CStdString& strAlbum1, const CStdString& strArtistTemp1, const CStdString& strArtist1);
-  static bool MakeShortenPath(CStdString StrInput, CStdString& StrOutput, int iTextMaxLength);
+  static bool MakeShortenPath(CStdString StrInput, CStdString& StrOutput, size_t iTextMaxLength);
   /*! \brief Checks wether the supplied path supports Write file operations (e.g. Rename, Delete, ...)
 
    \param strPath the path to be checked