From 20a11e28b5e07591c275ec7e21d057aaf72cc85a Mon Sep 17 00:00:00 2001 From: David Sansome Date: Sun, 22 May 2011 15:22:56 +0000 Subject: [PATCH] Remove the embedded-struct-names patch - we don't have nested structs any more --- .../patches/embedded-struct-names.patch | 25 ------------------- 3rdparty/pythonqt/src/PythonQt.cpp | 9 +++---- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 3rdparty/pythonqt/patches/embedded-struct-names.patch diff --git a/3rdparty/pythonqt/patches/embedded-struct-names.patch b/3rdparty/pythonqt/patches/embedded-struct-names.patch deleted file mode 100644 index 7a69a2b85..000000000 --- a/3rdparty/pythonqt/patches/embedded-struct-names.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/3rdparty/pythonqt/src/PythonQt.cpp b/3rdparty/pythonqt/src/PythonQt.cpp -index f97bdf1..53cd197 100644 ---- a/3rdparty/pythonqt/src/PythonQt.cpp -+++ b/3rdparty/pythonqt/src/PythonQt.cpp -@@ -1144,14 +1144,17 @@ bool PythonQtPrivate::addParentClass(const char* typeName, const char* parentTyp - - void PythonQtPrivate::registerCPPClass(const char* typeName, const char* parentTypeName, const char* package, PythonQtQObjectCreatorFunctionCB* wrapperCreator, PythonQtShellSetInstanceWrapperCB* shell, PyObject* module, int typeSlots) - { -- PythonQtClassInfo* info = lookupClassInfoAndCreateIfNotPresent(typeName); -+ QByteArray typeNameCopy(typeName); -+ typeNameCopy.replace("::", "_"); -+ -+ PythonQtClassInfo* info = lookupClassInfoAndCreateIfNotPresent(typeNameCopy); - if (!info->pythonQtClassWrapper()) { - info->setTypeSlots(typeSlots); -- info->setupCPPObject(typeName); -+ info->setupCPPObject(typeNameCopy); - createPythonQtClassWrapper(info, package, module); - } - if (parentTypeName && strcmp(parentTypeName,"")!=0) { -- addParentClass(typeName, parentTypeName, 0); -+ addParentClass(typeNameCopy, parentTypeName, 0); - } - if (wrapperCreator) { - info->setDecoratorProvider(wrapperCreator); diff --git a/3rdparty/pythonqt/src/PythonQt.cpp b/3rdparty/pythonqt/src/PythonQt.cpp index 53cd19780..f97bdf1b1 100644 --- a/3rdparty/pythonqt/src/PythonQt.cpp +++ b/3rdparty/pythonqt/src/PythonQt.cpp @@ -1144,17 +1144,14 @@ bool PythonQtPrivate::addParentClass(const char* typeName, const char* parentTyp void PythonQtPrivate::registerCPPClass(const char* typeName, const char* parentTypeName, const char* package, PythonQtQObjectCreatorFunctionCB* wrapperCreator, PythonQtShellSetInstanceWrapperCB* shell, PyObject* module, int typeSlots) { - QByteArray typeNameCopy(typeName); - typeNameCopy.replace("::", "_"); - - PythonQtClassInfo* info = lookupClassInfoAndCreateIfNotPresent(typeNameCopy); + PythonQtClassInfo* info = lookupClassInfoAndCreateIfNotPresent(typeName); if (!info->pythonQtClassWrapper()) { info->setTypeSlots(typeSlots); - info->setupCPPObject(typeNameCopy); + info->setupCPPObject(typeName); createPythonQtClassWrapper(info, package, module); } if (parentTypeName && strcmp(parentTypeName,"")!=0) { - addParentClass(typeNameCopy, parentTypeName, 0); + addParentClass(typeName, parentTypeName, 0); } if (wrapperCreator) { info->setDecoratorProvider(wrapperCreator);