summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2024-04-12 13:26:23 +0200
committerSlávek Banko <slavek.banko@axis.cz>2024-04-12 15:00:05 +0200
commitab9f8038deeb50995f94b21035368ed66b8c128c (patch)
treec543db0df09f68ee586a9a3422a981b898a4d40e
parentb31821dd2489a41c04047bb71c25b61fccb02607 (diff)
downloadtdelibs-ab9f8038deeb50995f94b21035368ed66b8c128c.tar.gz
tdelibs-ab9f8038deeb50995f94b21035368ed66b8c128c.zip
Fix compatibility with C++17.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit ab599e34e847d8db1560b8c5809e02be62060c58)
-rw-r--r--kab/addressbook.cpp2
-rw-r--r--kab/qconfigDB.h3
-rw-r--r--tdeio/tdefile/kpropertiesdialog.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/kab/addressbook.cpp b/kab/addressbook.cpp
index 1a6655266..0cf8b9307 100644
--- a/kab/addressbook.cpp
+++ b/kab/addressbook.cpp
@@ -100,7 +100,7 @@ const int AddressBook::Entry::NoOfFields
=sizeof(AddressBook::Entry::Fields)/sizeof(AddressBook::Entry::Fields[0]);
struct QStringLess
- : public binary_function<const TQString&, const TQString&, bool>
+ : public std::function<bool(const TQString&, const TQString&)>
{
/** The function operator, inline. */
bool operator()(const TQString& x, const TQString& y) const
diff --git a/kab/qconfigDB.h b/kab/qconfigDB.h
index 94a211527..f74e5886c 100644
--- a/kab/qconfigDB.h
+++ b/kab/qconfigDB.h
@@ -19,6 +19,7 @@
namespace std { }
using namespace std;
+#include <functional>
#include <list>
#include <map>
#include <tqwidget.h>
@@ -43,7 +44,7 @@ class TQTextStream;
* it is called with.
*/
struct QCStringLess
- : public binary_function<const TQCString&, const TQCString&, bool>
+ : public std::function<bool(const TQCString&, const TQCString&)>
{
/**
* The function operator, inline.
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 2457f4a69..3796d96ad 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -2146,7 +2146,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
d->fileSystemSupportsACLs = fileSystemSupportsACL( pathCString );
}
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 );
if ( d->extendedACL.isValid() && d->extendedACL.isExtended() )
extendedACLs->setACL( d->extendedACL );