diff options
Diffstat (limited to 'sources/shiboken2/generator/shiboken2/shibokengenerator.h')
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/shibokengenerator.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.h b/sources/shiboken2/generator/shiboken2/shibokengenerator.h index 95f50d860..829e6231f 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.h +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.h @@ -29,17 +29,16 @@ #ifndef SHIBOKENGENERATOR_H #define SHIBOKENGENERATOR_H -#define CPP_ARG "cppArg" -#define CPP_ARG_REMOVED "removed_" CPP_ARG -#define CPP_RETURN_VAR "cppResult" -#define CPP_SELF_VAR "cppSelf" -#define PYTHON_ARG "pyArg" -#define PYTHON_ARGS PYTHON_ARG "s" -#define PYTHON_OVERRIDE_VAR "pyOverride" -#define PYTHON_RETURN_VAR "pyResult" -#define PYTHON_SELF_VAR "self" -#define PYTHON_TO_CPP_VAR "pythonToCpp" -#define SMART_POINTER_GETTER "kSmartPointerGetter" +extern const char *CPP_ARG; +extern const char *CPP_ARG_REMOVED; +extern const char *CPP_RETURN_VAR; +extern const char *CPP_SELF_VAR; +extern const char *PYTHON_ARG; +extern const char *PYTHON_ARGS; +extern const char *PYTHON_OVERRIDE_VAR; +extern const char *PYTHON_RETURN_VAR; +extern const char *PYTHON_TO_CPP_VAR; +extern const char *SMART_POINTER_GETTER; extern const char *CONV_RULE_OUT_VAR_SUFFIX; extern const char *BEGIN_ALLOW_THREADS; @@ -322,7 +321,7 @@ protected: QString cpythonGetterFunctionName(const AbstractMetaField* metaField); QString cpythonSetterFunctionName(const AbstractMetaField* metaField); QString cpythonWrapperCPtr(const AbstractMetaClass* metaClass, - const QString &argName = QLatin1String(PYTHON_SELF_VAR)); + const QString &argName = QLatin1String("self")); QString cpythonWrapperCPtr(const AbstractMetaType *metaType, const QString &argName); QString cpythonWrapperCPtr(const TypeEntry* type, const QString &argName); @@ -429,6 +428,8 @@ protected: const QRegularExpression &convertToCppRegEx() const { return m_typeSystemConvRegEx[TypeSystemToCppFunction]; } + static QString pythonArgsAt(int i); + static QString msgCouldNotFindMinimalConstructor(const QString &where, const QString &type); static QHash<QString, QString> m_pythonPrimitiveTypeName; |