Remove all references to unary_function/binary_function

All they do is add some typedefs, which are not required.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2d850a809
Author: Hendi <hendi48@freenet.de>
Date: 2023-01-25 (Wed, 25 Jan 2023)



------------------
This commit was generated by Migit
This commit is contained in:
Hendi
2023-01-25 22:37:07 +01:00
committed by vanhofen
parent 91ec8d8300
commit 5df631018e
6 changed files with 21 additions and 21 deletions

View File

@@ -164,13 +164,13 @@ public:
typedef std::vector<class SIlinkage> SIlinkage_descs; typedef std::vector<class SIlinkage> SIlinkage_descs;
// Fuer for_each // Fuer for_each
struct printSIlinkage : public std::unary_function<class SIlinkage, void> struct printSIlinkage
{ {
void operator() (const SIlinkage &l) { l.dump();} void operator() (const SIlinkage &l) { l.dump();}
}; };
// Fuer for_each // Fuer for_each
struct saveSIlinkageXML : public std::unary_function<class SIlinkage, void> struct saveSIlinkageXML
{ {
FILE *f; FILE *f;
saveSIlinkageXML(FILE *fi) { f=fi;} saveSIlinkageXML(FILE *fi) { f=fi;}
@@ -240,13 +240,13 @@ class SIcomponent
typedef std::vector <SIcomponent> SIcomponents; typedef std::vector <SIcomponent> SIcomponents;
// Fuer for_each // Fuer for_each
struct printSIcomponent : public std::unary_function<class SIcomponent, void> struct printSIcomponent
{ {
void operator() (const SIcomponent &c) { c.dump();} void operator() (const SIcomponent &c) { c.dump();}
}; };
// Fuer for_each // Fuer for_each
struct saveSIcomponentXML : public std::unary_function<class SIcomponent, void> struct saveSIcomponentXML
{ {
FILE *f; FILE *f;
saveSIcomponentXML(FILE *fi) { f=fi;} saveSIcomponentXML(FILE *fi) { f=fi;}
@@ -280,13 +280,13 @@ class SIparentalRating
typedef std::vector <SIparentalRating> SIparentalRatings; typedef std::vector <SIparentalRating> SIparentalRatings;
// Fuer for_each // Fuer for_each
struct printSIparentalRating : public std::unary_function<SIparentalRating, void> struct printSIparentalRating
{ {
void operator() (const SIparentalRating &r) { r.dump();} void operator() (const SIparentalRating &r) { r.dump();}
}; };
// Fuer for_each // Fuer for_each
struct saveSIparentalRatingXML : public std::unary_function<SIparentalRating, void> struct saveSIparentalRatingXML
{ {
FILE *f; FILE *f;
saveSIparentalRatingXML(FILE *fi) { f=fi;} saveSIparentalRatingXML(FILE *fi) { f=fi;}
@@ -329,13 +329,13 @@ class SItime {
typedef std::set <SItime, std::less<SItime> > SItimes; typedef std::set <SItime, std::less<SItime> > SItimes;
// Fuer for_each // Fuer for_each
struct printSItime : public std::unary_function<SItime, void> struct printSItime
{ {
void operator() (const SItime &t) { t.dump();} void operator() (const SItime &t) { t.dump();}
}; };
// Fuer for_each // Fuer for_each
struct saveSItimeXML : public std::unary_function<SItime, void> struct saveSItimeXML
{ {
FILE *f; FILE *f;
saveSItimeXML(FILE *fi) { f=fi;} saveSItimeXML(FILE *fi) { f=fi;}
@@ -570,13 +570,13 @@ class SIevent
typedef std::vector <SIevent> SIevents; typedef std::vector <SIevent> SIevents;
// Fuer for_each // Fuer for_each
struct printSIevent : public std::unary_function<SIevent, void> struct printSIevent
{ {
void operator() (const SIevent &e) { e.dump();} void operator() (const SIevent &e) { e.dump();}
}; };
// Fuer for_each // Fuer for_each
struct saveSIeventXML : public std::unary_function<SIevent, void> struct saveSIeventXML
{ {
FILE *f; FILE *f;
saveSIeventXML(FILE *fi) { f=fi;} saveSIeventXML(FILE *fi) { f=fi;}
@@ -585,7 +585,7 @@ struct saveSIeventXML : public std::unary_function<SIevent, void>
#if 0 #if 0
// Fuer for_each // Fuer for_each
struct saveSIeventXMLwithServiceName : public std::unary_function<SIevent, void> struct saveSIeventXMLwithServiceName
{ {
FILE *f; FILE *f;
const SIservices *s; const SIservices *s;
@@ -604,7 +604,7 @@ struct saveSIeventXMLwithServiceName : public std::unary_function<SIevent, void>
#if 0 #if 0
// Fuer for_each // Fuer for_each
struct printSIeventWithService : public std::unary_function<SIevent, void> struct printSIeventWithService
{ {
printSIeventWithService(const SIservices &svs) { s=&svs;} printSIeventWithService(const SIservices &svs) { s=&svs;}
void operator() (const SIevent &e) { void operator() (const SIevent &e) {

View File

@@ -78,7 +78,7 @@ public:
}; };
// Fuer for_each // Fuer for_each
struct printSInvodReference : public std::unary_function<class SInvodReference, void> struct printSInvodReference
{ {
void operator() (const SInvodReference &ref) { ref.dump();} void operator() (const SInvodReference &ref) { ref.dump();}
}; };
@@ -151,7 +151,7 @@ public:
}; };
// Fuer for_each // Fuer for_each
struct printSIservice : public std::unary_function<SIservice, void> struct printSIservice
{ {
void operator() (const SIservice &s) { s.dump();} void operator() (const SIservice &s) { s.dump();}
}; };

View File

@@ -65,7 +65,7 @@ class CHDDMenuHandler : public CMenuTarget
}; };
std::vector<hdd_s> hdd_list; std::vector<hdd_s> hdd_list;
std::set<std::string> kernel_fs_list; std::set<std::string> kernel_fs_list;
struct cmp_hdd_by_name: public std::binary_function <const struct hdd_s, const struct hdd_s, bool> struct cmp_hdd_by_name
{ {
bool operator() (const struct hdd_s &c1, const struct hdd_s &c2) bool operator() (const struct hdd_s &c1, const struct hdd_s &c2)
{ {

View File

@@ -393,7 +393,7 @@ class CMenuOptionChooserOptions
std::string valname; std::string valname;
}; };
struct CMenuOptionChooserCompareItem: public std::binary_function <const CMenuOptionChooserOptions * const, const CMenuOptionChooserOptions * const, bool> struct CMenuOptionChooserCompareItem
{ {
static bool cmpToLower(const char a, const char b) static bool cmpToLower(const char a, const char b)
{ {

View File

@@ -192,7 +192,7 @@ class CBouquetManager : public OpenThreads::Thread
* For instance all countless variants of the letter a have to be regarded as the same letter. * For instance all countless variants of the letter a have to be regarded as the same letter.
*/ */
struct CmpBouquetByChName: public std::binary_function <const CZapitBouquet * const, const CZapitBouquet * const, bool> struct CmpBouquetByChName
{ {
static bool comparetolower(const char a, const char b) static bool comparetolower(const char a, const char b)
{ {

View File

@@ -320,7 +320,7 @@ class CZapitChannel
inline void setAlternateLogo(const std::string &pLogo) { altlogo = pLogo; } inline void setAlternateLogo(const std::string &pLogo) { altlogo = pLogo; }
}; };
struct CmpChannelBySat: public std::binary_function <const CZapitChannel * const, const CZapitChannel * const, bool> struct CmpChannelBySat
{ {
static bool comparetolower(const char a, const char b) static bool comparetolower(const char a, const char b)
{ {
@@ -337,7 +337,7 @@ struct CmpChannelBySat: public std::binary_function <const CZapitChannel * const
}; };
}; };
struct CmpChannelByFreq: public std::binary_function <const CZapitChannel * const, const CZapitChannel * const, bool> struct CmpChannelByFreq
{ {
static bool comparetolower(const char a, const char b) static bool comparetolower(const char a, const char b)
{ {
@@ -354,7 +354,7 @@ struct CmpChannelByFreq: public std::binary_function <const CZapitChannel * cons
}; };
}; };
struct CmpChannelByChName: public std::binary_function <const CZapitChannel * const, const CZapitChannel * const, bool> struct CmpChannelByChName
{ {
static bool comparetolower(const char a, const char b) static bool comparetolower(const char a, const char b)
{ {
@@ -367,7 +367,7 @@ struct CmpChannelByChName: public std::binary_function <const CZapitChannel * co
}; };
}; };
struct CmpChannelByChNum: public std::binary_function <const CZapitChannel * const, const CZapitChannel * const, bool> struct CmpChannelByChNum
{ {
bool operator() (const CZapitChannel * const c1, const CZapitChannel * const c2) bool operator() (const CZapitChannel * const c1, const CZapitChannel * const c2)
{ {