diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2017-07-20 14:04:08 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-07-20 14:04:08 +0200 |
commit | 32349f6b8cb6d6331df06749bcb29744df6e1ae2 (patch) | |
tree | 290ac6c31a1181669594f1de100fa9b2c6c91c19 /options | |
parent | bc1bbb4739cf4c2147dc78a43bf90f5a7258ec62 (diff) |
options/metatype: nuke it
The code isn't necessary, and causes uninitialized
memory access when playing with QVariant later.
Diffstat (limited to 'options')
-rw-r--r-- | options/metatype.cpp | 23 | ||||
-rw-r--r-- | options/metatype.hpp | 36 | ||||
-rw-r--r-- | options/options.hpp | 1 |
3 files changed, 0 insertions, 60 deletions
diff --git a/options/metatype.cpp b/options/metatype.cpp deleted file mode 100644 index 8f92f385..00000000 --- a/options/metatype.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "slider.hpp" -#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(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; - -} -} diff --git a/options/metatype.hpp b/options/metatype.hpp deleted file mode 100644 index 68480b55..00000000 --- a/options/metatype.hpp +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include <QMetaType> -#include <QList> -#include <QString> -#include <QPointF> -#include <QDataStream> -#include <QDebug> - -#include "export.hpp" - -Q_DECLARE_METATYPE(QList<double>) -Q_DECLARE_METATYPE(QList<float>) -Q_DECLARE_METATYPE(QList<int>) -Q_DECLARE_METATYPE(QList<bool>) -Q_DECLARE_METATYPE(QList<QString>) -Q_DECLARE_METATYPE(QList<QPointF>) - -namespace options { -namespace detail { - -struct custom_type_initializer final -{ - static const custom_type_initializer singleton; - - custom_type_initializer(); - - template<typename t> static inline void declare_for_type(const char* str) - { - qRegisterMetaType<t>(str); - qRegisterMetaTypeStreamOperators<t>(); - } -}; - -} -} diff --git a/options/options.hpp b/options/options.hpp index 0528b0d9..fdeb74cd 100644 --- a/options/options.hpp +++ b/options/options.hpp @@ -16,5 +16,4 @@ #include "slider.hpp" #include "value.hpp" #include "tie.hpp" -#include "metatype.hpp" #include "scoped.hpp" |