diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-20 10:17:27 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-24 08:33:47 +0200 |
| commit | b7f63eadeb1b6a3791797e7ecaeb191997395965 (patch) | |
| tree | 1ec6bedfd3459492acc13e73a6e7def8e7a5730b /sources/pyside2/libpyside/signalmanager.cpp | |
| parent | 9c5950320814d6e0cfe7d6ebe9850ae49c18ae06 (diff) | |
Clean up string related macros
Expand and remove some macros and fix up versions.
Initial-patch-by: Christian Tismer <tismer@stackless.com>
Task-number: PYSIDE-1087
Change-Id: I20a0be86e6ec6c21423de47bfd81ed003263c922
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/libpyside/signalmanager.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/signalmanager.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sources/pyside2/libpyside/signalmanager.cpp b/sources/pyside2/libpyside/signalmanager.cpp index 0895cc682..c13b5280f 100644 --- a/sources/pyside2/libpyside/signalmanager.cpp +++ b/sources/pyside2/libpyside/signalmanager.cpp @@ -77,8 +77,6 @@ #define PYSIDE_SIGNAL '2' #include "globalreceiverv2.h" -#define PYTHON_TYPE "PyObject" - namespace { static PyObject *metaObjectAttr = 0; @@ -268,15 +266,15 @@ SignalManager::SignalManager() : m_d(new SignalManagerPrivate) using namespace Shiboken; // Register PyObject type to use in queued signal and slot connections - qRegisterMetaType<PyObjectWrapper>(PYTHON_TYPE); - qRegisterMetaTypeStreamOperators<PyObjectWrapper>(PYTHON_TYPE); + qRegisterMetaType<PyObjectWrapper>("PyObject"); + qRegisterMetaTypeStreamOperators<PyObjectWrapper>("PyObject"); qRegisterMetaTypeStreamOperators<PyObjectWrapper>("PyObjectWrapper"); qRegisterMetaTypeStreamOperators<PyObjectWrapper>("PySide::PyObjectWrapper"); SbkConverter *converter = Shiboken::Conversions::createConverter(&PyBaseObject_Type, nullptr); Shiboken::Conversions::setCppPointerToPythonFunction(converter, PyObject_PTR_CppToPython_PyObject); Shiboken::Conversions::setPythonToCppPointerFunctions(converter, PyObject_PythonToCpp_PyObject_PTR, is_PyObject_PythonToCpp_PyObject_PTR_Convertible); - Shiboken::Conversions::registerConverterName(converter, PYTHON_TYPE); + Shiboken::Conversions::registerConverterName(converter, "PyObject"); Shiboken::Conversions::registerConverterName(converter, "object"); Shiboken::Conversions::registerConverterName(converter, "PyObjectWrapper"); Shiboken::Conversions::registerConverterName(converter, "PySide::PyObjectWrapper"); |