aboutsummaryrefslogtreecommitdiff
path: root/xbmc/utils/SortUtils.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'xbmc/utils/SortUtils.cpp')
-rw-r--r--xbmc/utils/SortUtils.cpp76
1 files changed, 38 insertions, 38 deletions
diff --git a/xbmc/utils/SortUtils.cpp b/xbmc/utils/SortUtils.cpp
index 0edfc39fcb..7f41a7fd53 100644
--- a/xbmc/utils/SortUtils.cpp
+++ b/xbmc/utils/SortUtils.cpp
@@ -56,13 +56,13 @@ std::string ByFile(SortAttribute attributes, const SortItem &values)
{
CURL url(values.at(FieldPath).asString());
- return StringUtils::Format("{} {}", url.GetFileNameWithoutPath().c_str(),
+ return StringUtils::Format("{} {}", url.GetFileNameWithoutPath(),
values.at(FieldStartOffset).asInteger());
}
std::string ByPath(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{} {}", values.at(FieldPath).asString().c_str(),
+ return StringUtils::Format("{} {}", values.at(FieldPath).asString(),
values.at(FieldStartOffset).asInteger());
}
@@ -71,14 +71,14 @@ std::string ByLastPlayed(SortAttribute attributes, const SortItem &values)
if (attributes & SortAttributeIgnoreLabel)
return values.at(FieldLastPlayed).asString();
- return StringUtils::Format("{} {}", values.at(FieldLastPlayed).asString().c_str(),
- ByLabel(attributes, values).c_str());
+ return StringUtils::Format("{} {}", values.at(FieldLastPlayed).asString(),
+ ByLabel(attributes, values));
}
std::string ByPlaycount(SortAttribute attributes, const SortItem &values)
{
return StringUtils::Format("{} {}", (int)values.at(FieldPlaycount).asInteger(),
- ByLabel(attributes, values).c_str());
+ ByLabel(attributes, values));
}
std::string ByDate(SortAttribute attributes, const SortItem &values)
@@ -88,19 +88,19 @@ std::string ByDate(SortAttribute attributes, const SortItem &values)
std::string ByDateAdded(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{} {}", values.at(FieldDateAdded).asString().c_str(),
+ return StringUtils::Format("{} {}", values.at(FieldDateAdded).asString(),
(int)values.at(FieldId).asInteger());
}
std::string BySize(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{}", values.at(FieldSize).asInteger());
+ return std::to_string(values.at(FieldSize).asInteger());
}
std::string ByDriveType(SortAttribute attributes, const SortItem &values)
{
return StringUtils::Format("{} {}", (int)values.at(FieldDriveType).asInteger(),
- ByLabel(attributes, values).c_str());
+ ByLabel(attributes, values));
}
std::string ByTitle(SortAttribute attributes, const SortItem &values)
@@ -117,8 +117,8 @@ std::string ByAlbum(SortAttribute attributes, const SortItem &values)
if (attributes & SortAttributeIgnoreArticle)
album = SortUtils::RemoveArticles(album);
- std::string label = StringUtils::Format(
- "{} {}", album.c_str(), ArrayToString(attributes, values.at(FieldArtist)).c_str());
+ std::string label =
+ StringUtils::Format("{} {}", album, ArrayToString(attributes, values.at(FieldArtist)));
const CVariant &track = values.at(FieldTrackNumber);
if (!track.isNull())
@@ -184,7 +184,7 @@ std::string ByArtistThenYear(SortAttribute attributes, const SortItem &values)
std::string ByTrackNumber(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{}", (int)values.at(FieldTrackNumber).asInteger());
+ return std::to_string((int)values.at(FieldTrackNumber).asInteger());
}
std::string ByTotalDiscs(SortAttribute attributes, const SortItem& values)
@@ -197,15 +197,15 @@ std::string ByTime(SortAttribute attributes, const SortItem &values)
std::string label;
const CVariant &time = values.at(FieldTime);
if (time.isInteger())
- label = StringUtils::Format("{}", (int)time.asInteger());
+ label = std::to_string((int)time.asInteger());
else
- label = StringUtils::Format("{}", time.asString().c_str());
+ label = time.asString();
return label;
}
std::string ByProgramCount(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{}", (int)values.at(FieldProgramCount).asInteger());
+ return std::to_string((int)values.at(FieldProgramCount).asInteger());
}
std::string ByPlaylistOrder(SortAttribute attributes, const SortItem &values)
@@ -231,7 +231,7 @@ std::string ByYear(SortAttribute attributes, const SortItem &values)
if (!airDate.isNull() && !airDate.asString().empty())
label = airDate.asString() + " ";
- label += StringUtils::Format("{}", (int)values.at(FieldYear).asInteger());
+ label += std::to_string((int)values.at(FieldYear).asInteger());
const CVariant &album = values.at(FieldAlbum);
if (!album.isNull())
@@ -279,25 +279,25 @@ std::string BySortTitle(SortAttribute attributes, const SortItem &values)
std::string ByRating(SortAttribute attributes, const SortItem &values)
{
return StringUtils::Format("{:f} {}", values.at(FieldRating).asFloat(),
- ByLabel(attributes, values).c_str());
+ ByLabel(attributes, values));
}
std::string ByUserRating(SortAttribute attributes, const SortItem &values)
{
return StringUtils::Format("{} {}", static_cast<int>(values.at(FieldUserRating).asInteger()),
- ByLabel(attributes, values).c_str());
+ ByLabel(attributes, values));
}
std::string ByVotes(SortAttribute attributes, const SortItem &values)
{
return StringUtils::Format("{} {}", (int)values.at(FieldVotes).asInteger(),
- ByLabel(attributes, values).c_str());
+ ByLabel(attributes, values));
}
std::string ByTop250(SortAttribute attributes, const SortItem &values)
{
return StringUtils::Format("{} {}", (int)values.at(FieldTop250).asInteger(),
- ByLabel(attributes, values).c_str());
+ ByLabel(attributes, values));
}
std::string ByMPAA(SortAttribute attributes, const SortItem &values)
@@ -335,7 +335,7 @@ std::string ByEpisodeNumber(SortAttribute attributes, const SortItem &values)
if (title.empty())
title = ByLabel(attributes, values);
- return StringUtils::Format("{} {}", num, title.c_str());
+ return StringUtils::Format("{} {}", num, title);
}
std::string BySeason(SortAttribute attributes, const SortItem &values)
@@ -345,19 +345,19 @@ std::string BySeason(SortAttribute attributes, const SortItem &values)
if (!specialSeason.isNull())
season = (int)specialSeason.asInteger();
- return StringUtils::Format("{} {}", season, ByLabel(attributes, values).c_str());
+ return StringUtils::Format("{} {}", season, ByLabel(attributes, values));
}
std::string ByNumberOfEpisodes(SortAttribute attributes, const SortItem &values)
{
return StringUtils::Format("{} {}", (int)values.at(FieldNumberOfEpisodes).asInteger(),
- ByLabel(attributes, values).c_str());
+ ByLabel(attributes, values));
}
std::string ByNumberOfWatchedEpisodes(SortAttribute attributes, const SortItem &values)
{
return StringUtils::Format("{} {}", (int)values.at(FieldNumberOfWatchedEpisodes).asInteger(),
- ByLabel(attributes, values).c_str());
+ ByLabel(attributes, values));
}
std::string ByTvShowStatus(SortAttribute attributes, const SortItem &values)
@@ -378,58 +378,58 @@ std::string ByProductionCode(SortAttribute attributes, const SortItem &values)
std::string ByVideoResolution(SortAttribute attributes, const SortItem &values)
{
return StringUtils::Format("{} {}", (int)values.at(FieldVideoResolution).asInteger(),
- ByLabel(attributes, values).c_str());
+ ByLabel(attributes, values));
}
std::string ByVideoCodec(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{} {}", values.at(FieldVideoCodec).asString().c_str(),
- ByLabel(attributes, values).c_str());
+ return StringUtils::Format("{} {}", values.at(FieldVideoCodec).asString(),
+ ByLabel(attributes, values));
}
std::string ByVideoAspectRatio(SortAttribute attributes, const SortItem &values)
{
return StringUtils::Format("{:.3f} {}", values.at(FieldVideoAspectRatio).asFloat(),
- ByLabel(attributes, values).c_str());
+ ByLabel(attributes, values));
}
std::string ByAudioChannels(SortAttribute attributes, const SortItem &values)
{
return StringUtils::Format("{} {}", (int)values.at(FieldAudioChannels).asInteger(),
- ByLabel(attributes, values).c_str());
+ ByLabel(attributes, values));
}
std::string ByAudioCodec(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{} {}", values.at(FieldAudioCodec).asString().c_str(),
- ByLabel(attributes, values).c_str());
+ return StringUtils::Format("{} {}", values.at(FieldAudioCodec).asString(),
+ ByLabel(attributes, values));
}
std::string ByAudioLanguage(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{} {}", values.at(FieldAudioLanguage).asString().c_str(),
- ByLabel(attributes, values).c_str());
+ return StringUtils::Format("{} {}", values.at(FieldAudioLanguage).asString(),
+ ByLabel(attributes, values));
}
std::string BySubtitleLanguage(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{} {}", values.at(FieldSubtitleLanguage).asString().c_str(),
- ByLabel(attributes, values).c_str());
+ return StringUtils::Format("{} {}", values.at(FieldSubtitleLanguage).asString(),
+ ByLabel(attributes, values));
}
std::string ByBitrate(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{}", values.at(FieldBitrate).asInteger());
+ return std::to_string(values.at(FieldBitrate).asInteger());
}
std::string ByListeners(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{}", values.at(FieldListeners).asInteger());
+ return std::to_string(values.at(FieldListeners).asInteger());
}
std::string ByRandom(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{}", CUtil::GetRandomNumber());
+ return std::to_string(CUtil::GetRandomNumber());
}
std::string ByChannel(SortAttribute attributes, const SortItem &values)
@@ -454,7 +454,7 @@ std::string ByDateTaken(SortAttribute attributes, const SortItem &values)
std::string ByRelevance(SortAttribute attributes, const SortItem &values)
{
- return StringUtils::Format("{}", (int)values.at(FieldRelevance).asInteger());
+ return std::to_string((int)values.at(FieldRelevance).asInteger());
}
std::string ByInstallDate(SortAttribute attributes, const SortItem &values)
generated by cgit v1.2.3 (git 2.26.2) at 2025-03-19 13:53:01 +0000