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 13:42:12 +0200 |
commit | 3dd32863337ea2f6308ebf2f7656795d3fd488c9 (patch) | |
tree | 08a3b35607dee19536ccb5f21b2ede0fdc41cc79 /sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.h | |
parent | 4f4f1be9f46e02e87357aeee613cfd5ea0be8220 (diff) | |
parent | 67d635fe2cc2c89c30486a2e26dea4106a9d9c16 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.h')
-rw-r--r-- | sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.h b/sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.h index 358ea9eec..f6c80fa99 100644 --- a/sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.h +++ b/sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.h @@ -38,7 +38,7 @@ ****************************************************************************/ #ifndef __QEASINGCURVE_GLUE__ -#define __QEASINGCURVE_GLUE__ +#define __QEASINGCURVE_GLUE__ #include <sbkpython.h> #include <QEasingCurve> @@ -47,20 +47,20 @@ class PySideEasingCurveFunctor { public: static void init(); - static QEasingCurve::EasingFunction createCustomFuntion(PyObject* parent, PyObject* pyFunc); + static QEasingCurve::EasingFunction createCustomFuntion(PyObject *parent, PyObject *pyFunc); qreal operator()(qreal progress); - PyObject* callable(); //Return New reference - static PyObject* callable(PyObject* parent); //Return New reference + PyObject *callable(); //Return New reference + static PyObject *callable(PyObject *parent); //Return New reference ~PySideEasingCurveFunctor(); private: - PyObject* m_parent; - PyObject* m_func; + PyObject *m_parent; + PyObject *m_func; int m_index; - PySideEasingCurveFunctor(int index, PyObject* parent, PyObject *pyFunc); + PySideEasingCurveFunctor(int index, PyObject *parent, PyObject *pyFunc); }; #endif |