Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-18 12:28:31 +01:00
Code Issues Releases Wiki Activity

Remove the embedded-struct-names patch - we don't have nested structs any more

Browse Source
This commit is contained in:
David Sansome 2011-05-22 15:22:56 +00:00
parent e1620385d5
commit 20a11e28b5
2 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
3rdparty/pythonqt/patches/embedded-struct-names.patch vendored
View File

@ -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);

9
3rdparty/pythonqt/src/PythonQt.cpp vendored
View File

@ -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) void PythonQtPrivate::registerCPPClass(const char* typeName, const char* parentTypeName, const char* package, PythonQtQObjectCreatorFunctionCB* wrapperCreator, PythonQtShellSetInstanceWrapperCB* shell, PyObject* module, int typeSlots)
{ {
QByteArray typeNameCopy(typeName); PythonQtClassInfo* info = lookupClassInfoAndCreateIfNotPresent(typeName);
typeNameCopy.replace("::", "_");
PythonQtClassInfo* info = lookupClassInfoAndCreateIfNotPresent(typeNameCopy);
if (!info->pythonQtClassWrapper()) { if (!info->pythonQtClassWrapper()) {
info->setTypeSlots(typeSlots); info->setTypeSlots(typeSlots);
info->setupCPPObject(typeNameCopy); info->setupCPPObject(typeName);
createPythonQtClassWrapper(info, package, module); createPythonQtClassWrapper(info, package, module);
} }
if (parentTypeName && strcmp(parentTypeName,"")!=0) { if (parentTypeName && strcmp(parentTypeName,"")!=0) {
addParentClass(typeNameCopy, parentTypeName, 0); addParentClass(typeName, parentTypeName, 0);
} }
if (wrapperCreator) { if (wrapperCreator) {
info->setDecoratorProvider(wrapperCreator); info->setDecoratorProvider(wrapperCreator);