From 32349f6b8cb6d6331df06749bcb29744df6e1ae2 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 20 Jul 2017 14:04:08 +0200 Subject: options/metatype: nuke it The code isn't necessary, and causes uninitialized memory access when playing with QVariant later. --- options/metatype.cpp | 23 ----------------------- options/metatype.hpp | 36 ------------------------------------ options/options.hpp | 1 - 3 files changed, 60 deletions(-) delete mode 100644 options/metatype.cpp delete mode 100644 options/metatype.hpp (limited to 'options') 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) - -namespace options { -namespace detail { - -custom_type_initializer::custom_type_initializer() -{ - OPENTRACK_REGISTER_METATYPE(slider_value); - OPENTRACK_REGISTER_METATYPE(QList); - OPENTRACK_REGISTER_METATYPE(QList); - OPENTRACK_REGISTER_METATYPE(QList); - OPENTRACK_REGISTER_METATYPE(QList); - OPENTRACK_REGISTER_METATYPE(QList); - OPENTRACK_REGISTER_METATYPE(QList); -} - -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 -#include -#include -#include -#include -#include - -#include "export.hpp" - -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) -Q_DECLARE_METATYPE(QList) - -namespace options { -namespace detail { - -struct custom_type_initializer final -{ - static const custom_type_initializer singleton; - - custom_type_initializer(); - - template static inline void declare_for_type(const char* str) - { - qRegisterMetaType(str); - qRegisterMetaTypeStreamOperators(); - } -}; - -} -} 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" -- cgit v1.2.3