diff options
Diffstat (limited to 'sources/shiboken2/libshiboken/basewrapper_p.h')
| -rw-r--r-- | sources/shiboken2/libshiboken/basewrapper_p.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sources/shiboken2/libshiboken/basewrapper_p.h b/sources/shiboken2/libshiboken/basewrapper_p.h index 56a647b21..60fba13c5 100644 --- a/sources/shiboken2/libshiboken/basewrapper_p.h +++ b/sources/shiboken2/libshiboken/basewrapper_p.h @@ -97,6 +97,9 @@ struct SbkObjectPrivate unsigned int validCppObject : 1; /// Marked as true when the object constructor was called unsigned int cppObjectCreated : 1; + /// PYSIDE-1470: Marked as true if this is the Q*Application singleton. + /// This bit allows app deletion from shiboken?.delete() . + unsigned int isQAppSingleton : 1; /// Information about the object parents and children, may be null. Shiboken::ParentInfo *parentInfo; /// Manage reference count of objects that are referred to but not owned from. @@ -130,20 +133,23 @@ struct SbkObjectTypePrivate TypeDiscoveryFuncV2 type_discovery; /// Pointer to a function responsible for deletion of the C++ instance calling the proper destructor. ObjectDestructor cpp_dtor; + /// PYSIDE-1019: Caching the current select Id + unsigned int pyside_reserved_bits : 8; // MSVC has bug with the sign bit! /// True if this type holds two or more C++ instances, e.g.: a Python class which inherits from two C++ classes. - int is_multicpp : 1; + unsigned int is_multicpp : 1; /// True if this type was defined by the user. - int is_user_type : 1; + unsigned int is_user_type : 1; /// Tells is the type is a value type or an object-type, see BEHAVIOUR_ *constants. // TODO-CONVERTERS: to be deprecated/removed - int type_behaviour : 2; - int delete_in_main_thread : 1; + unsigned int type_behaviour : 2; + unsigned int delete_in_main_thread : 1; /// C++ name char *original_name; /// Type user data void *user_data; DeleteUserDataFunc d_func; void (*subtype_init)(SbkObjectType *, PyObject *, PyObject *); + const char **propertyStrings; }; |