From f0216a3c53d43918295f1bd81975b391f4e5ed3b Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 5 Oct 2018 15:54:01 +0200
Subject: options: don't use typeindex w/ lambdas

Rename traits' functions to be more explicit.

Most of the changes are pretty old and I can't read
them at this time, sorry.

Adjust usages.

Issue: #825
Reported-by: @DanielKinsman
---
 migration/20160906_01-axis-signs.cpp   | 2 +-
 migration/20160906_02-modules.cpp      | 2 +-
 migration/20180118_00-reltrans.cpp     | 2 +-
 migration/20180428_00-module-names.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'migration')

diff --git a/migration/20160906_01-axis-signs.cpp b/migration/20160906_01-axis-signs.cpp
index 7b0be70a..064cd5fb 100644
--- a/migration/20160906_01-axis-signs.cpp
+++ b/migration/20160906_01-axis-signs.cpp
@@ -73,7 +73,7 @@ void axis_signs_split_rc11::run()
 
     for (const char* name : axis_names)
         new_bundle->store_kv(alt_sign_fmt.arg(name),
-                             QVariant(old_bundle->get<bool>(alt_sign_fmt.arg(name))));
+                             old_bundle->get_variant(alt_sign_fmt.arg(name)));
 
     new_bundle->save();
 }
diff --git a/migration/20160906_02-modules.cpp b/migration/20160906_02-modules.cpp
index 9ce2b9dc..8ba61248 100644
--- a/migration/20160906_02-modules.cpp
+++ b/migration/20160906_02-modules.cpp
@@ -58,7 +58,7 @@ struct split_modules_rc11 : migration
         bundle old_bundle = make_bundle("opentrack-ui");
 
         for (const char* name : module_names)
-            new_bundle->store_kv(name, QVariant(old_bundle->get<QString>(name)));
+            new_bundle->store_kv(name, old_bundle->get_variant(name));
 
         new_bundle->save();
     }
diff --git a/migration/20180118_00-reltrans.cpp b/migration/20180118_00-reltrans.cpp
index ba35e7f0..7a2ddec6 100644
--- a/migration/20180118_00-reltrans.cpp
+++ b/migration/20180118_00-reltrans.cpp
@@ -35,7 +35,7 @@ struct reltrans_enum : migration
     void run() override
     {
         auto b = make_bundle("opentrack-ui");
-        bool value = b->get<bool>(old_name);
+        bool value = b->get_variant(old_name).value<bool>();
         b->store_kv(new_name, int(value ? reltrans_enabled : reltrans_disabled));
         b->save();
     }
diff --git a/migration/20180428_00-module-names.cpp b/migration/20180428_00-module-names.cpp
index fbb7a161..174ca7ee 100644
--- a/migration/20180428_00-module-names.cpp
+++ b/migration/20180428_00-module-names.cpp
@@ -55,7 +55,7 @@ struct module_names : migration
                 continue;
             }
 
-            QString value = b->get<QString>(type.name);
+            QString value = b->get_variant(type.name).value<QString>();
 
             bool found = false;
 
-- 
cgit v1.2.3