GIT_REPOSITORIES/LPP/PythonQt Commit - r26:dcd28715f924

added support for downcasting via polymorphic handlers...

florianlink -

r26:dcd28715f924

parent child

Context file:

r26:dcd28715f924

Collapse all files

src/PythonQt.cpp +17 0

@@ -372,6 +372,12 PyObject* PythonQtPrivate::wrapPtr(void* ptr, const QByteArray& name)
372	break;	372	break;
373	}	373	}
374	}	374	}
		375
		376	if (info) {
		377	// try to downcast in the class hierarchy, which will modify info and ptr if it is successfull
		378	ptr = info->castDownIfPossible(ptr, &info);
		379	}
		380
375	if (!info \|\| info->pythonQtClassWrapper()==NULL) {	381	if (!info \|\| info->pythonQtClassWrapper()==NULL) {
376	// still unknown, register as CPP class	382	// still unknown, register as CPP class
377	registerCPPClass(name.constData());	383	registerCPPClass(name.constData());
@@ -1066,6 +1072,17 PythonQtClassInfo* PythonQtPrivate::lookupClassInfoAndCreateIfNotPresent(const c
1066	return info;	1072	return info;
1067	}	1073	}
1068		1074
		1075	void PythonQt::addPolymorphicHandler(const char* typeName, PythonQtPolymorphicHandlerCB* cb)
		1076	{
		1077	_p->addPolymorphicHandler(typeName, cb);
		1078	}
		1079
		1080	void PythonQtPrivate::addPolymorphicHandler(const char* typeName, PythonQtPolymorphicHandlerCB* cb)
		1081	{
		1082	PythonQtClassInfo* info = lookupClassInfoAndCreateIfNotPresent(typeName);
		1083	info->addPolymorphicHandler(cb);
		1084	}
		1085
1069	bool PythonQt::addParentClass(const char* typeName, const char* parentTypeName, int upcastingOffset)	1086	bool PythonQt::addParentClass(const char* typeName, const char* parentTypeName, int upcastingOffset)
1070	{	1087	{
1071	return _p->addParentClass(typeName, parentTypeName, upcastingOffset);	1088	return _p->addParentClass(typeName, parentTypeName, upcastingOffset);

src/PythonQt.h +9 -2

             class PythonQtCppWrapperFactory;
             class PythonQtQFileImporter;
-            typedef void PythonQtQObjectWrappedCB(QObject* object);
+            typedef void  PythonQtQObjectWrappedCB(QObject* object);
-            typedef void PythonQtQObjectNoLongerWrappedCB(QObject* object);
+            typedef void  PythonQtQObjectNoLongerWrappedCB(QObject* object);
+            typedef void* PythonQtPolymorphicHandlerCB(const void *ptr, char **class_name);
             typedef void PythonQtShellSetInstanceWrapperCB(void* object, PythonQtInstanceWrapper* wrapper);
               //! Returns false if the typeName was not yet registered.
               bool addParentClass(const char* typeName, const char* parentTypeName, int upcastingOffset=0);
+              //! add a handler for polymorphic downcasting
+              void addPolymorphicHandler(const char* typeName, PythonQtPolymorphicHandlerCB* cb);
               //! parses the given file and returns the python code object, this can then be used to call evalCode()
               PythonQtObjectPtr parseFile(const QString& filename);
               //! add parent class relation
               bool addParentClass(const char* typeName, const char* parentTypeName, int upcastingOffset);
+              //! add a handler for polymorphic downcasting
+              void addPolymorphicHandler(const char* typeName, PythonQtPolymorphicHandlerCB* cb);
               //! lookup existing classinfo and return new if not yet present
               PythonQtClassInfo* lookupClassInfoAndCreateIfNotPresent(const char* typeName);

src/PythonQtClassInfo.cpp +36 -1

@@ -466,7 +466,8 QStringList PythonQtClassInfo::memberList(bool metaOnly)
466	}	466	}
467	}	467	}
468	}	468	}
469	return l;	469
		470	return QSet<QString>::fromList(l).toList();
470	}	471	}
471		472
472	const char* PythonQtClassInfo::className()	473	const char* PythonQtClassInfo::className()
@@ -669,3 +670,37 bool PythonQtClassInfo::hasOwnerMethodButNoOwner(void* object)
669	return false;	670	return false;
670	}	671	}
671	}	672	}
		673
		674	void* PythonQtClassInfo::recursiveCastDownIfPossible(void* ptr, char** resultClassName)
		675	{
		676	if (!_polymorphicHandlers.isEmpty()) {
		677	foreach(PythonQtPolymorphicHandlerCB* cb, _polymorphicHandlers) {
		678	void* resultPtr = (*cb)(ptr, resultClassName);
		679	if (resultPtr) {
		680	return resultPtr;
		681	}
		682	}
		683	}
		684	foreach(const ParentClassInfo& info, _parentClasses) {
		685	if (!info._parent->isQObject()) {
		686	void* resultPtr = info._parent->recursiveCastDownIfPossible((char*)ptr + info._upcastingOffset, resultClassName);
		687	if (resultPtr) {
		688	return resultPtr;
		689	}
		690	}
		691	}
		692	return NULL;
		693	}
		694
		695	void* PythonQtClassInfo::castDownIfPossible(void* ptr, PythonQtClassInfo** resultClassInfo)
		696	{
		697	char* className;
		698	void* resultPtr = recursiveCastDownIfPossible(ptr, &className);
		699	if (resultPtr) {
		700	*resultClassInfo = PythonQt::priv()->getClassInfo(className);
		701	} else {
		702	*resultClassInfo = this;
		703	resultPtr = ptr;
		704	}
		705	return resultPtr;
		706	}

src/PythonQtClassInfo.h +10 0

                 return _shellSetInstanceWrapperCB;
               }
+              //! add a handler for polymorphic downcasting
+              void addPolymorphicHandler(PythonQtPolymorphicHandlerCB* cb) { _polymorphicHandlers.append(cb); }
+              //! cast the pointer down in the class hierarchy if a polymorphic handler allows to do that
+              void* castDownIfPossible(void* ptr, PythonQtClassInfo** resultClassInfo);
             private:
               //! clear all cached members
               void clearCachedMembers();
+              void* recursiveCastDownIfPossible(void* ptr, char** resultClassName);
               PythonQtSlotInfo* findDecoratorSlotsFromDecoratorProvider(const char* memberName, PythonQtSlotInfo* inputInfo, bool &found, QHash<QByteArray, PythonQtMemberInfo>& memberCache, int upcastingOffset);
               void listDecoratorSlotsFromDecoratorProvider(QStringList& list, bool metaOnly);
               PythonQtSlotInfo* recursiveFindDecoratorSlotsFromDecoratorProvider(const char* memberName, PythonQtSlotInfo* inputInfo, bool &found, QHash<QByteArray, PythonQtMemberInfo>& memberCache, int upcastingOffset);
               QByteArray                           _wrappedClassName;
               QList<ParentClassInfo>               _parentClasses;
+              QList<PythonQtPolymorphicHandlerCB*> _polymorphicHandlers;
               QObject*                             _decoratorProvider;
               PythonQtQObjectCreatorFunctionCB*    _decoratorProviderCB;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages