From 7cc0f974f560d37b0a44421c58fd093fa4c24c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Sun, 7 Jun 2020 17:56:58 +0200 Subject: [PATCH] Use a sequence converter for QStringList instead of a QClass converter. --- src/runner/converters.h | 11 ----------- src/runner/pythonrunner.cpp | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/runner/converters.h b/src/runner/converters.h index a364e51..8419e81 100644 --- a/src/runner/converters.h +++ b/src/runner/converters.h @@ -201,7 +201,6 @@ namespace utils { template <> struct MetaData { static const char* className() { return "QFileInfo"; } }; template <> struct MetaData { static const char* className() { return "QIcon"; } }; template <> struct MetaData { static const char* className() { return "QSize"; } }; - template <> struct MetaData { static const char* className() { return "QStringList"; } }; template <> struct MetaData { static const char* className() { return "QUrl"; } }; template <> struct MetaData { static const char* className() { return "QVariant"; } }; @@ -290,16 +289,6 @@ namespace utils { wrapper = reinterpret_cast(objPtr); return wrapper->super.data; } - else { - if constexpr (std::is_same_v) - { - // QStringLists aren't wrapped by PyQt - regular Python string/unicode lists are used instead - bpy::extract> extractor(objPtr); - if (extractor.check()) { - return new QStringList(extractor()); - } - } - } return nullptr; } }; diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 7c193f1..e9ca3e7 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -77,7 +77,6 @@ BOOST_PYTHON_MODULE(mobase) utils::register_qclass_converter(); utils::register_qclass_converter(); utils::register_qclass_converter(); - utils::register_qclass_converter(); utils::register_qclass_converter(); // QFlags: @@ -96,6 +95,7 @@ BOOST_PYTHON_MODULE(mobase) utils::register_sequence_container>(); utils::register_sequence_container>(); utils::register_sequence_container>(); + utils::register_sequence_container(); utils::register_sequence_container>(); utils::register_sequence_container>(); utils::register_sequence_container>(); // Required for QVariant since this is QVariantList.