From 15789902a11e026bee57dd9e89e97f2fa1a68c39 Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Tue, 25 Aug 2020 22:20:59 +0100
Subject: [PATCH] Issue #77 Remove outdated function

---
 samples/blackmisc/sampleschangeobject.cpp |  2 +-
 src/blackmisc/predicates.h                | 19 -------------------
 src/blackmisc/propertyindexvariantmap.h   |  6 ------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/samples/blackmisc/sampleschangeobject.cpp b/samples/blackmisc/sampleschangeobject.cpp
index 642e66cd2..de35e04e3 100644
--- a/samples/blackmisc/sampleschangeobject.cpp
+++ b/samples/blackmisc/sampleschangeobject.cpp
@@ -74,7 +74,7 @@ namespace BlackSample
         // now Jane's time is over
         CPropertyIndexVariantMap anotherController;
         anotherController.addValue(CAtcStation::IndexController, CVariant::fromValue(CUser("445566", "Fuzzy")));
-        atcList.applyIf(BlackMisc::Predicates::Matches(newController), anotherController);
+        atcList.applyIf([ = ](const auto &arg) { return newController.matches(arg); }, anotherController);
 
         qDebug() << "-- after update via value map";
         qDebug() << atcList.toQString();
diff --git a/src/blackmisc/predicates.h b/src/blackmisc/predicates.h
index cff601bf3..021bb9331 100644
--- a/src/blackmisc/predicates.h
+++ b/src/blackmisc/predicates.h
@@ -21,17 +21,6 @@ namespace BlackMisc
 
     namespace Predicates
     {
-        namespace Private
-        {
-            //! \private
-            struct Matches
-            {
-                const CPropertyIndexVariantMap &m_map;
-                Matches(const CPropertyIndexVariantMap &map) : m_map(map) {}
-                template <class T> bool operator()(const T &value) const;
-            };
-        }
-
         /*!
          * Predicate which tests whether some member functions return some values.
          * \param vs Pairs of { pointer to member function of T, value to compare it against }.
@@ -111,14 +100,6 @@ namespace BlackMisc
             };
         }
 
-        /*!
-         * Returns a predicate that returns true if its argument matches a captured CPropertyIndexVariantMap.
-         */
-        inline auto Matches(const CPropertyIndexVariantMap &map) -> Private::Matches
-        {
-            return { map };
-        }
-
     } //namespace Predicates
 } //namespace BlackMisc
 
diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h
index c399ab36d..a77575e7f 100644
--- a/src/blackmisc/propertyindexvariantmap.h
+++ b/src/blackmisc/propertyindexvariantmap.h
@@ -312,12 +312,6 @@ namespace BlackMisc
             return derived()->toQString().compare(compareValue.toQString());
         }
     } // Mixin
-
-    template <class T>
-    bool Predicates::Private::Matches::operator()(const T &value) const
-    {
-        return m_map.matches(value);
-    }
 } // ns
 
 Q_DECLARE_METATYPE(BlackMisc::CPropertyIndexVariantMap)