options: use non-generic comparison for bundle modification check

The generic QVariant comparison works badly for QList<QPointF>.

Create a comparator between two QVariants for base_value in value<tp>
ctor, using QVariant::value<tp> which returns right results once it's
converted to tp.

If a value was registered for a name in a bundle, use that comparator as
the comparator for that name. In case conflicting value types were
registered always use generic comparison for that name.

std::type_index needs to be used here since value<t> can be instantiated
in different modules (libraries), resulting in different value for the
comparator function pointer.

Move group::operator== to bundle type to avoid circular include for
connector.h.

Also use element_type more consistently in value<tp>.

1 files changed, 0 insertions, 24 deletions

diff --git a/options/group.cpp b/options/group.cpp
index d710afad..a2169ae5 100644
--- a/options/group.cpp
+++ b/options/group.cpp
@@ -91,28 +91,4 @@ const std::shared_ptr<QSettings> group::ini_file()
     return std::make_shared<QSettings>();
 }
 
-bool group::operator==(const group& other) const
-{
-    for (const auto& kv : kvs)
-    {
-        const QVariant val = other.get<QVariant>(kv.first);
-        if (!other.contains(kv.first) || kv.second != val)
-        {
-            qDebug() << "bundle" << name << "modified" << "key" << kv.first << "-" << val << "<>" << kv.second;
-            return false;
-        }
-    }
-
-    for (const auto& kv : other.kvs)
-    {
-        const QVariant val = get<QVariant>(kv.first);
-        if (!contains(kv.first) || kv.second != val)
-        {
-            qDebug() << "bundle" << name << "modified" << "key" << kv.first << "-" << kv.second << "<>" << val;
-            return false;
-        }
-    }
-    return true;
-}
-
 }