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>

6 files changed, 7 insertions, 20 deletions

diff --git a/sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.cpp b/sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.cpp
index 6629d3c91..4f55fb8f3 100644
--- a/sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.cpp
+++ b/sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.cpp
@@ -44,7 +44,6 @@
 
 #include "glue/qeasingcurve_glue.h"
 
-#define __ECF_ATT_NAME__        "__ecf__"
 #define MAX_CUSTOM_FUNCTIONS    10
 
 static void deleteData(void *data);
@@ -122,7 +121,7 @@ PySideEasingCurveFunctor::~PySideEasingCurveFunctor()
 {
 
     CustomFunctionsData::m_list[m_index].m_obj = 0;
-    PyObject_SetAttrString(m_parent, __ECF_ATT_NAME__, Py_None);
+    PyObject_SetAttrString(m_parent, "__ecf__", Py_None);
 }
 
 qreal PySideEasingCurveFunctor::operator()(qreal progress)
@@ -147,13 +146,13 @@ PyObject *PySideEasingCurveFunctor::callable()
 
 PyObject *PySideEasingCurveFunctor::callable(PyObject *parent)
 {
-    return PyObject_GetAttrString(parent, __ECF_ATT_NAME__);
+    return PyObject_GetAttrString(parent, "__ecf__");
 }
 
 PySideEasingCurveFunctor::PySideEasingCurveFunctor(int index, PyObject *parent, PyObject *pyFunc)
     : m_parent(parent), m_func(pyFunc), m_index(index)
 {
-    PyObject_SetAttrString(m_parent, __ECF_ATT_NAME__, m_func);
+    PyObject_SetAttrString(m_parent, "__ecf__", m_func);
     PySide::WeakRef::create(m_parent, deleteData, this);
 }
 
diff --git a/sources/pyside2/libpyside/dynamicqmetaobject_p.h b/sources/pyside2/libpyside/dynamicqmetaobject_p.h
index 534be5825..9199630b7 100644
--- a/sources/pyside2/libpyside/dynamicqmetaobject_p.h
+++ b/sources/pyside2/libpyside/dynamicqmetaobject_p.h
@@ -45,8 +45,6 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QMetaMethod>
 
-#define GLOBAL_RECEIVER_CLASS_NAME "__GlobalReceiver__"
-
 struct PySideProperty;
 namespace PySide
 {
diff --git a/sources/pyside2/libpyside/globalreceiverv2.cpp b/sources/pyside2/libpyside/globalreceiverv2.cpp
index 84ec92687..0377f7697 100644
--- a/sources/pyside2/libpyside/globalreceiverv2.cpp
+++ b/sources/pyside2/libpyside/globalreceiverv2.cpp
@@ -187,7 +187,7 @@ DynamicSlotDataV2::~DynamicSlotDataV2()
 
 GlobalReceiverV2::GlobalReceiverV2(PyObject *callback, SharedMap map) :
     QObject(nullptr),
-    m_metaObject(GLOBAL_RECEIVER_CLASS_NAME, &QObject::staticMetaObject),
+    m_metaObject("__GlobalReceiver__", &QObject::staticMetaObject),
     m_sharedMap(std::move(map))
 {
     m_data = new DynamicSlotDataV2(callback, this);
diff --git a/sources/pyside2/libpyside/pysideclassinfo_p.h b/sources/pyside2/libpyside/pysideclassinfo_p.h
index c0038a71a..021aa58e9 100644
--- a/sources/pyside2/libpyside/pysideclassinfo_p.h
+++ b/sources/pyside2/libpyside/pysideclassinfo_p.h
@@ -44,8 +44,6 @@
 #include <QMetaObject>
 #include "pysideclassinfo.h"
 
-#define __INFO_ATTR_NAME__      "__classInfo__"  // not used! ???
-
 struct PySideClassInfo;
 
 extern "C"
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");
diff --git a/sources/shiboken2/libshiboken/sbkstring.h b/sources/shiboken2/libshiboken/sbkstring.h
index 7f434e1b9..0ead25269 100644
--- a/sources/shiboken2/libshiboken/sbkstring.h
+++ b/sources/shiboken2/libshiboken/sbkstring.h
@@ -43,12 +43,6 @@
 #include "sbkpython.h"
 #include "shibokenmacros.h"
 
-#if PY_MAJOR_VERSION >= 3
-    #define SBK_BYTES_NAME "bytes"
-#else
-    #define SBK_BYTES_NAME "str"
-#endif
-
 namespace Shiboken
 {
 namespace String