diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-07-29 12:40:12 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-07-31 18:28:15 +0200 |
| commit | a0f5131b04b94515be1700077715ae565daf7cbb (patch) | |
| tree | b435c30983e90750e986120862af1885208d5d55 | |
| parent | e62f6fefcde7e2c2cb2de2cc8c5d4089ea6c84b8 (diff) | |
options/metatype: pass exact same name for sliders
That made sliders from 2.3.7 still incompatible.
Apparently QVariant cares a lot about the difference
between "options::slider_value",
"::options::slider_value", and "slider_value".
| -rw-r--r-- | options/base-value.hpp | 1 | ||||
| -rw-r--r-- | options/group.hpp | 3 | ||||
| -rw-r--r-- | options/metatype.cpp | 2 | ||||
| -rw-r--r-- | options/metatype.hpp | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/options/base-value.hpp b/options/base-value.hpp index 0b6dfc44..4f90e3fc 100644 --- a/options/base-value.hpp +++ b/options/base-value.hpp @@ -5,7 +5,6 @@ #include "connector.hpp" #include "export.hpp" -#include "metatype.hpp" #include <QObject> #include <QString> diff --git a/options/group.hpp b/options/group.hpp index dd070dfd..93806193 100644 --- a/options/group.hpp +++ b/options/group.hpp @@ -4,6 +4,9 @@ #include "compat/util.hpp" +// included here to propagate into callers of options::group +#include "metatype.hpp" + #include <map> #include <memory> #include <QString> diff --git a/options/metatype.cpp b/options/metatype.cpp index 2aef98bf..ed12821b 100644 --- a/options/metatype.cpp +++ b/options/metatype.cpp @@ -7,7 +7,7 @@ namespace detail { custom_type_initializer::custom_type_initializer() { - OPENTRACK_REGISTER_METATYPE(::options::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 01ff4e71..c889766a 100644 --- a/options/metatype.hpp +++ b/options/metatype.hpp @@ -27,7 +27,7 @@ struct custom_type_initializer final custom_type_initializer(); - template<typename t> static inline void declare_for_type(const char* str) + template<typename t> static void declare_for_type(const char* str) { qRegisterMetaType<t>(str); qRegisterMetaTypeStreamOperators<t>(); |