From 4961e6d6eedcbd941180b7d49cd9344cbea8c106 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sun, 9 Sep 2012 14:42:13 +0200 Subject: [PATCH] comparators: fix LocaleBasedItemSorting --- src/utility/comparators.cpp | 6 +++--- src/utility/comparators.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/utility/comparators.cpp b/src/utility/comparators.cpp index c49c3ae3..76cfc53a 100644 --- a/src/utility/comparators.cpp +++ b/src/utility/comparators.cpp @@ -59,10 +59,10 @@ bool LocaleBasedItemSorting::operator()(const MPD::Item &a, const MPD::Item &b) switch (a.type) { case MPD::itDirectory: - result = m_cmp(getBasename(a.name), getBasename(b.name)) < 0; + result = m_cmp(getBasename(a.name), getBasename(b.name)); break; case MPD::itPlaylist: - result = m_cmp(a.name, b.name) < 0; + result = m_cmp(a.name, b.name); break; case MPD::itSong: switch (m_sort_mode) @@ -75,7 +75,7 @@ bool LocaleBasedItemSorting::operator()(const MPD::Item &a, const MPD::Item &b) break; case smCustomFormat: result = m_cmp(a.song->toString(Config.browser_sort_format), - b.song->toString(Config.browser_sort_format)) < 0; + b.song->toString(Config.browser_sort_format)); break; } break; diff --git a/src/utility/comparators.h b/src/utility/comparators.h index 2c1f7f6e..b5d0e2c9 100644 --- a/src/utility/comparators.h +++ b/src/utility/comparators.h @@ -43,7 +43,7 @@ class LocaleBasedSorting LocaleStringComparison m_cmp; public: - LocaleBasedSorting(const std::locale loc, bool ignore_the) : m_cmp(loc, ignore_the) { } + LocaleBasedSorting(const std::locale &loc, bool ignore_the) : m_cmp(loc, ignore_the) { } bool operator()(const std::string &a, const std::string &b) const { return m_cmp(a, b) < 0; @@ -65,7 +65,7 @@ class LocaleBasedItemSorting SortMode m_sort_mode; public: - LocaleBasedItemSorting(const std::locale loc, bool ignore_the, SortMode mode) + LocaleBasedItemSorting(const std::locale &loc, bool ignore_the, SortMode mode) : m_cmp(loc, ignore_the), m_sort_mode(mode) { } bool operator()(const MPD::Item &a, const MPD::Item &b) const;