From 432925be80264e56a63d82d6838f8a0510f5f328 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Thu, 5 Apr 2012 18:58:25 +0400
Subject: [PATCH] zapit/include/zapit/bouquets.h: remove CmpChannel..

---
 src/zapit/include/zapit/bouquets.h | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/zapit/include/zapit/bouquets.h b/src/zapit/include/zapit/bouquets.h
index ab7790e91..1dc8253db 100644
--- a/src/zapit/include/zapit/bouquets.h
+++ b/src/zapit/include/zapit/bouquets.h
@@ -28,7 +28,8 @@ typedef ZapitChannelList::iterator zapit_list_it_t;
 
 class CZapitBouquet
 {
- public:
+	public:
+
 	std::string Name;
 	bool        bHidden;
 	bool        bLocked;
@@ -46,9 +47,9 @@ class CZapitBouquet
 
 	void removeService(CZapitChannel* oldChannel);
 	void removeService(const t_channel_id channel_id, unsigned char serviceType = ST_RESERVED) { removeService(getChannelByChannelID(channel_id, serviceType)); }
-	
+
 	void moveService (const unsigned int oldPosition, const unsigned int newPosition, const unsigned char serviceType);
-	
+
 	size_t recModeRadioSize(const transponder_id_t transponder_id);
 	size_t recModeTVSize   (const transponder_id_t transponder_id);
 	CZapitChannel* getChannelByChannelID(const t_channel_id channel_id, const unsigned char serviceType = ST_RESERVED);
@@ -124,18 +125,6 @@ class CBouquetManager
  * Hence we need a compare function that considers the whole unicode charset.
  * For instance all countless variants of the letter a have to be regarded as the same letter.
  */
-struct CmpChannelByChName: public binary_function <const CZapitChannel * const, const CZapitChannel * const, bool>
-{
-	static bool comparetolower(const char a, const char b)
-		{
-			return tolower(a) < tolower(b);
-		};
-
-	bool operator() (const CZapitChannel * const c1, const CZapitChannel * const c2)
-		{
-			return std::lexicographical_compare(c1->getName().begin(), c1->getName().end(), c2->getName().begin(), c2->getName().end(), comparetolower);
-		};
-};
 
 struct CmpBouquetByChName: public binary_function <const CZapitBouquet * const, const CZapitBouquet * const, bool>
 {
@@ -151,13 +140,4 @@ struct CmpBouquetByChName: public binary_function <const CZapitBouquet * const,
 		};
 };
 
-struct CmpChannelByChNum: public binary_function <const CZapitChannel * const, const CZapitChannel * const, bool>
-{
-	bool operator() (const CZapitChannel * const c1, const CZapitChannel * const c2)
-	{
-		return c1->number < c2->number;
-		;
-	};
-};
-
 #endif /* __bouquets_h__ */