aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/libshiboken/bindingmanager.h
diff options
context:
space:
mode:
authorChristian Tismer <tismer@stackless.com>2019-06-16 12:05:39 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-24 11:25:31 +0200
commit380c65e62de0e60da667dc0d87935171b91b9c6c (patch)
tree480c872f247316a66e446ba196a5bd1a339a0bcd /sources/shiboken2/libshiboken/bindingmanager.h
parent992ff1f7925009b7ead6d6f005cafcf2e57ed44e (diff)
Cleanup pointer whitespace everywhere
Among other files to fix, basewrapper.(cpp|h) was full of uncommon pointer whitespace. After fixing that, I could not resist and fixed also libshiboken, generators, and after acceptance also PySide. Most of the time, this regex worked fine (\w\w+)([*&]+)[ ]*(?![&*]*[/=]) replaced with \1 \2 but everything was checked by hand. I did not touch the shiboken tests which are quite hairy. It turned out that inserting a space between a variable and asterisk causes a crash of shiboken, if the same line contains "CONVERTTOCPP". This was temporarily fixed by adding another space after it. Example.. sources/pyside2/PySide2/glue/qtcore.cpp line 977 QByteArray * cppSelf = %CONVERTTOCPP[QByteArray *](obj); //XXX /|\ omitting this space crashes shiboken! cppgenerator.cpp was special, since it was modified to _generate_ correct pointer whitespace. This caused a few testcases to fail, which had to be adjusted, again. This was difficult since some internal names must end on "*" and generated code normally not. Removing the last errors involved binary search on path sets... Apply C++ 11 fixits to the changed code, where applicable. Done-with: Friedemann.Kleint@qt.io Task-number: PYSIDE-1037 Change-Id: I4ac070f52c5efb296c05d581c9d46e6f397a6c81 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/shiboken2/libshiboken/bindingmanager.h')
-rw-r--r--sources/shiboken2/libshiboken/bindingmanager.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/sources/shiboken2/libshiboken/bindingmanager.h b/sources/shiboken2/libshiboken/bindingmanager.h
index d03aa999a..bfcbdc79b 100644
--- a/sources/shiboken2/libshiboken/bindingmanager.h
+++ b/sources/shiboken2/libshiboken/bindingmanager.h
@@ -52,36 +52,36 @@ namespace Shiboken
struct DestructorEntry;
-typedef void (*ObjectVisitor)(SbkObject*, void*);
+typedef void (*ObjectVisitor)(SbkObject *, void *);
class LIBSHIBOKEN_API BindingManager
{
public:
- BindingManager(const BindingManager&) = delete;
- BindingManager(BindingManager&&) = delete;
- BindingManager& operator=(const BindingManager&) = delete;
- BindingManager& operator=(BindingManager&&) = delete;
+ BindingManager(const BindingManager &) = delete;
+ BindingManager(BindingManager &&) = delete;
+ BindingManager &operator=(const BindingManager &) = delete;
+ BindingManager &operator=(BindingManager &&) = delete;
- static BindingManager& instance();
+ static BindingManager &instance();
bool hasWrapper(const void *cptr);
- void registerWrapper(SbkObject* pyObj, void* cptr);
- void releaseWrapper(SbkObject* wrapper);
+ void registerWrapper(SbkObject *pyObj, void *cptr);
+ void releaseWrapper(SbkObject *wrapper);
void runDeletionInMainThread();
void addToDeletionInMainThread(const DestructorEntry &);
- SbkObject* retrieveWrapper(const void* cptr);
- PyObject* getOverride(const void* cptr, const char* methodName);
+ SbkObject *retrieveWrapper(const void *cptr);
+ PyObject *getOverride(const void *cptr, const char *methodName);
- void addClassInheritance(SbkObjectType* parent, SbkObjectType* child);
+ void addClassInheritance(SbkObjectType *parent, SbkObjectType *child);
/**
- * \deprecated Use \fn resolveType(void**, SbkObjectType*), this version is broken when used with multiple inheritance
+ * \deprecated Use \fn resolveType(void **, SbkObjectType *), this version is broken when used with multiple inheritance
* because the \p cptr pointer of the discovered type may be different of the given \p cptr in case
* of multiple inheritance
*/
- SBK_DEPRECATED(SbkObjectType* resolveType(void* cptr, SbkObjectType* type));
+ SBK_DEPRECATED(SbkObjectType *resolveType(void *cptr, SbkObjectType *type));
/**
* Try to find the correct type of *cptr knowing that it's at least of type \p type.
* In case of multiple inheritance this function may change the contents of cptr.
@@ -89,9 +89,9 @@ public:
* \param type type of *cptr
* \warning This function is slow, use it only as last resort.
*/
- SbkObjectType* resolveType(void** cptr, SbkObjectType* type);
+ SbkObjectType *resolveType(void **cptr, SbkObjectType *type);
- std::set<PyObject*> getAllPyObjects();
+ std::set<PyObject *> getAllPyObjects();
/**
* Calls the function \p visitor for each object registered on binding manager.
@@ -100,14 +100,14 @@ public:
* \param visitor function called for each object.
* \param data user data passed as second argument to the visitor function.
*/
- void visitAllPyObjects(ObjectVisitor visitor, void* data);
+ void visitAllPyObjects(ObjectVisitor visitor, void *data);
private:
~BindingManager();
BindingManager();
struct BindingManagerPrivate;
- BindingManagerPrivate* m_d;
+ BindingManagerPrivate *m_d;
};
} // namespace Shiboken