1 files changed, 6 insertions, 7 deletions
diff --git a/xbmc/utils/SortUtils.cpp b/xbmc/utils/SortUtils.cpp
index a2601ddd50..3d1f347e3c 100644
--- a/xbmc/utils/SortUtils.cpp
+++ b/xbmc/utils/SortUtils.cpp
@@ -24,7 +24,6 @@
 #include "XBDateTime.h"
 #include "settings/AdvancedSettings.h"
 #include "utils/CharsetConverter.h"
-#include "utils/StdString.h"
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
 
@@ -120,7 +119,7 @@ string ByAlbum(SortAttribute attributes, const SortItem &values)
   if (attributes & SortAttributeIgnoreArticle)
     album = SortUtils::RemoveArticles(album);
 
-  CStdString label = StringUtils::Format("%s %s", album.c_str(), ArrayToString(attributes, values.at(FieldArtist)).c_str());
+  std::string label = StringUtils::Format("%s %s", album.c_str(), ArrayToString(attributes, values.at(FieldArtist)).c_str());
 
   const CVariant &track = values.at(FieldTrackNumber);
   if (!track.isNull())
@@ -136,7 +135,7 @@ string ByAlbumType(SortAttribute attributes, const SortItem &values)
 
 string ByArtist(SortAttribute attributes, const SortItem &values)
 {
-  CStdString label = ArrayToString(attributes, values.at(FieldArtist));
+  std::string label = ArrayToString(attributes, values.at(FieldArtist));
 
   const CVariant &year = values.at(FieldYear);
   if (g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear &&
@@ -161,7 +160,7 @@ string ByTrackNumber(SortAttribute attributes, const SortItem &values)
 
 string ByTime(SortAttribute attributes, const SortItem &values)
 {
-  CStdString label;
+  std::string label;
   const CVariant &time = values.at(FieldTime);
   if (time.isInteger())
     label = StringUtils::Format("%i", (int)time.asInteger());
@@ -193,7 +192,7 @@ string ByCountry(SortAttribute attributes, const SortItem &values)
 
 string ByYear(SortAttribute attributes, const SortItem &values)
 {
-  CStdString label;
+  std::string label;
   const CVariant &airDate = values.at(FieldAirDate);
   if (!airDate.isNull() && !airDate.asString().empty())
     label = airDate.asString() + " ";
@@ -656,7 +655,7 @@ void SortUtils::Sort(SortBy sortBy, SortOrder sortOrder, SortAttribute attribute
             item->insert(pair<Field, CVariant>(*field, CVariant::ConstNullVariant));
         }
 
-        CStdStringW sortLabel;
+        std::wstring sortLabel;
         g_charsetConverter.utf8ToW(preparator(attributes, *item), sortLabel, false);
         item->insert(pair<Field, CVariant>(FieldSort, CVariant(sortLabel)));
       }
@@ -695,7 +694,7 @@ void SortUtils::Sort(SortBy sortBy, SortOrder sortOrder, SortAttribute attribute
             (*item)->insert(pair<Field, CVariant>(*field, CVariant::ConstNullVariant));
         }
 
-        CStdStringW sortLabel;
+        std::wstring sortLabel;
         g_charsetConverter.utf8ToW(preparator(attributes, **item), sortLabel, false);
         (*item)->insert(pair<Field, CVariant>(FieldSort, CVariant(sortLabel)));
       }