Fix compatibility with C++17.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ab599e34e8)
pull/271/head
Slávek Banko 8 months ago
parent b31821dd24
commit ab9f8038de
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -100,7 +100,7 @@ const int AddressBook::Entry::NoOfFields
=sizeof(AddressBook::Entry::Fields)/sizeof(AddressBook::Entry::Fields[0]); =sizeof(AddressBook::Entry::Fields)/sizeof(AddressBook::Entry::Fields[0]);
struct QStringLess struct QStringLess
: public binary_function<const TQString&, const TQString&, bool> : public std::function<bool(const TQString&, const TQString&)>
{ {
/** The function operator, inline. */ /** The function operator, inline. */
bool operator()(const TQString& x, const TQString& y) const bool operator()(const TQString& x, const TQString& y) const

@ -19,6 +19,7 @@
namespace std { } namespace std { }
using namespace std; using namespace std;
#include <functional>
#include <list> #include <list>
#include <map> #include <map>
#include <tqwidget.h> #include <tqwidget.h>
@ -43,7 +44,7 @@ class TQTextStream;
* it is called with. * it is called with.
*/ */
struct QCStringLess struct QCStringLess
: public binary_function<const TQCString&, const TQCString&, bool> : public std::function<bool(const TQCString&, const TQCString&)>
{ {
/** /**
* The function operator, inline. * The function operator, inline.

@ -2146,7 +2146,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
d->fileSystemSupportsACLs = fileSystemSupportsACL( pathCString ); d->fileSystemSupportsACLs = fileSystemSupportsACL( pathCString );
} }
if ( d->fileSystemSupportsACLs ) { if ( d->fileSystemSupportsACLs ) {
std::for_each( theNotSpecials.begin(), theNotSpecials.end(), std::mem_fun( &TQWidget::hide ) ); std::for_each( theNotSpecials.begin(), theNotSpecials.end(), std::mem_fn( &TQWidget::hide ) );
extendedACLs = new KACLEditWidget( mainVBox ); extendedACLs = new KACLEditWidget( mainVBox );
if ( d->extendedACL.isValid() && d->extendedACL.isExtended() ) if ( d->extendedACL.isValid() && d->extendedACL.isExtended() )
extendedACLs->setACL( d->extendedACL ); extendedACLs->setACL( d->extendedACL );

Loading…
Cancel
Save