diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:42 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:47 +0200 |
commit | 67d635fe2cc2c89c30486a2e26dea4106a9d9c16 (patch) | |
tree | b26f1bb7a9639f2b2a875c0cb2b937858b700add /sources/pyside2/libpyside/dynamicqmetaobject_p.h | |
parent | ffd068caf7063799e0196602e31ca7b1781c3f97 (diff) | |
parent | 75f824b13a2ef12a9a5a33db19216b4e43a72922 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I389468b76913ac3c8113ab89833c756a7a72e54f
Diffstat (limited to 'sources/pyside2/libpyside/dynamicqmetaobject_p.h')
-rw-r--r-- | sources/pyside2/libpyside/dynamicqmetaobject_p.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sources/pyside2/libpyside/dynamicqmetaobject_p.h b/sources/pyside2/libpyside/dynamicqmetaobject_p.h index 738b950ba..534be5825 100644 --- a/sources/pyside2/libpyside/dynamicqmetaobject_p.h +++ b/sources/pyside2/libpyside/dynamicqmetaobject_p.h @@ -58,19 +58,19 @@ namespace PySide * \param signature method signature * \param type method return type */ - MethodData(QMetaMethod::MethodType mtype, - const QByteArray& signature, - const QByteArray& rtype = QByteArray("void")); + MethodData(QMetaMethod::MethodType mtype, + const QByteArray &signature, + const QByteArray &rtype = QByteArray("void")); void clear(); bool isValid() const; - const QByteArray& signature() const { return m_signature; } - const QByteArray& returnType() const { return m_rtype; } + const QByteArray &signature() const { return m_signature; } + const QByteArray &returnType() const { return m_rtype; } QMetaMethod::MethodType methodType() const { return m_mtype; } //Qt5 moc: now we have to store method parameter names, count, type QList<QByteArray> parameterTypes() const; int parameterCount() const; QByteArray name() const; - bool operator==(const MethodData& other) const; + bool operator==(const MethodData &other) const; private: QByteArray m_signature; @@ -84,22 +84,22 @@ namespace PySide public: PropertyData(); PropertyData(const char *name, int cachedNotifyId = 0, PySideProperty *data = 0); - const QByteArray& name() const { return m_name; } + const QByteArray &name() const { return m_name; } PySideProperty *data() const { return m_data; } QByteArray type() const; uint flags() const; bool isValid() const; int cachedNotifyId() const; - bool operator==(const PropertyData& other) const; - bool operator==(const char* name) const; + bool operator==(const PropertyData &other) const; + bool operator==(const char *name) const; private: QByteArray m_name; int m_cachedNotifyId; - PySideProperty* m_data; + PySideProperty *m_data; }; -inline bool MethodData::operator==(const MethodData& other) const +inline bool MethodData::operator==(const MethodData &other) const { return m_mtype == other.methodType() && m_signature == other.signature(); } |