From bb798c188b2fc1b368e91ac5d813d805e2d17e72 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 26 Jul 2017 05:27:13 +0200
Subject: options: organize metatype declarations

---
 options/base-value.hpp | 1 +
 options/metatype.cpp   | 3 +--
 options/metatype.hpp   | 2 ++
 options/slider.hpp     | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'options')

diff --git a/options/base-value.hpp b/options/base-value.hpp
index 4f90e3fc..0b6dfc44 100644
--- a/options/base-value.hpp
+++ b/options/base-value.hpp
@@ -5,6 +5,7 @@
 #include "connector.hpp"
 
 #include "export.hpp"
+#include "metatype.hpp"
 
 #include <QObject>
 #include <QString>
diff --git a/options/metatype.cpp b/options/metatype.cpp
index 8f92f385..2aef98bf 100644
--- a/options/metatype.cpp
+++ b/options/metatype.cpp
@@ -1,4 +1,3 @@
-#include "slider.hpp"
 #include "metatype.hpp"
 
 #define OPENTRACK_REGISTER_METATYPE(t) ::options::detail::custom_type_initializer::declare_for_type<t>(#t)
@@ -8,7 +7,7 @@ namespace detail {
 
 custom_type_initializer::custom_type_initializer()
 {
-    OPENTRACK_REGISTER_METATYPE(slider_value);
+    OPENTRACK_REGISTER_METATYPE(::options::slider_value);
     OPENTRACK_REGISTER_METATYPE(QList<double>);
     OPENTRACK_REGISTER_METATYPE(QList<float>);
     OPENTRACK_REGISTER_METATYPE(QList<int>);
diff --git a/options/metatype.hpp b/options/metatype.hpp
index 68480b55..01ff4e71 100644
--- a/options/metatype.hpp
+++ b/options/metatype.hpp
@@ -8,6 +8,7 @@
 #include <QDebug>
 
 #include "export.hpp"
+#include "slider.hpp"
 
 Q_DECLARE_METATYPE(QList<double>)
 Q_DECLARE_METATYPE(QList<float>)
@@ -15,6 +16,7 @@ Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<bool>)
 Q_DECLARE_METATYPE(QList<QString>)
 Q_DECLARE_METATYPE(QList<QPointF>)
+Q_DECLARE_METATYPE(::options::slider_value)
 
 namespace options {
 namespace detail {
diff --git a/options/slider.hpp b/options/slider.hpp
index 48b690d2..bda1d398 100644
--- a/options/slider.hpp
+++ b/options/slider.hpp
@@ -47,4 +47,3 @@ QDataStream& operator >> (QDataStream& in, options::slider_value& v);
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(options::slider_value)
-- 
cgit v1.2.3