options/qt: cleanup metatype definition

Also note Koenig lookup works

1 files changed, 9 insertions, 21 deletions

diff --git a/options/metatype.cpp b/options/metatype.cpp
index ed12821b..ddfdcef9 100644
--- a/options/metatype.cpp
+++ b/options/metatype.cpp
@@ -1,22 +1,10 @@
 #include "metatype.hpp"
-
-#define OPENTRACK_REGISTER_METATYPE(t) ::options::detail::custom_type_initializer::declare_for_type<t>(#t)
-
-namespace options {
-namespace detail {
-
-custom_type_initializer::custom_type_initializer()
-{
-    OPENTRACK_REGISTER_METATYPE(options::slider_value);
-    OPENTRACK_REGISTER_METATYPE(QList<double>);
-    OPENTRACK_REGISTER_METATYPE(QList<float>);
-    OPENTRACK_REGISTER_METATYPE(QList<int>);
-    OPENTRACK_REGISTER_METATYPE(QList<bool>);
-    OPENTRACK_REGISTER_METATYPE(QList<QString>);
-    OPENTRACK_REGISTER_METATYPE(QList<QPointF>);
-}
-
-const custom_type_initializer custom_type_initializer::singleton;
-
-}
-}
+#include "defs.hpp"
+
+OPENTRACK_DEFINE_METATYPE(::options::slider_value);
+OPENTRACK_DEFINE_METATYPE(QList<double>);
+OPENTRACK_DEFINE_METATYPE(QList<float>);
+OPENTRACK_DEFINE_METATYPE(QList<int>);
+OPENTRACK_DEFINE_METATYPE(QList<bool>);
+OPENTRACK_DEFINE_METATYPE(QList<QString>);
+OPENTRACK_DEFINE_METATYPE(QList<QPointF>);