diff options
author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-08-08 21:10:38 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:17:09 -0300 |
commit | 07048428fd2db051b0ad27c590ecf52ab4678f79 (patch) | |
tree | 47ec5b7d76788b63aadacc198ff9575e5f78eb6b /generator/shibokengenerator.h | |
parent | f02e7bd726a5560542e7c078b925f289a9d6a75d (diff) |
Moved functionality from a couple of write function to ones that return strings.
The methods writeToCppConversion and writeToPythonConversion now use the
services of cpythonToCppConversionFunction and cpythonToPythonConversionFunction.
Diffstat (limited to 'generator/shibokengenerator.h')
-rw-r--r-- | generator/shibokengenerator.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/generator/shibokengenerator.h b/generator/shibokengenerator.h index e920f7f9f..6890e9203 100644 --- a/generator/shibokengenerator.h +++ b/generator/shibokengenerator.h @@ -226,13 +226,12 @@ public: const AbstractMetaClass* getMultipleInheritingClass(const AbstractMetaClass* metaClass); void writeBaseConversion(QTextStream& s, const AbstractMetaType* type, - const AbstractMetaClass* context, Options options = NoOption); + const AbstractMetaClass* context = 0, Options options = NoOption); /// Simpler version of writeBaseConversion, uses only the base name of the type. void writeBaseConversion(QTextStream& s, const TypeEntry* type); void writeToPythonConversion(QTextStream& s, const AbstractMetaType* type, - const AbstractMetaClass* context, const QString& argumentName = QString()); - void writeToCppConversion(QTextStream& s, const AbstractMetaType* type, - const AbstractMetaClass* context, const QString& argumentName, Options options = NoOption); + const AbstractMetaClass* context, const QString& argumentName); + void writeToCppConversion(QTextStream& s, const AbstractMetaType* type, const AbstractMetaClass* context, const QString& argumentName); void writeToCppConversion(QTextStream& s, const AbstractMetaClass* metaClass, const QString& argumentName); /// Returns true if the argument is a pointer that rejects NULL values. @@ -319,6 +318,11 @@ public: return cpythonIsConvertibleFunction(metaArg->type(), genericNumberType); } QString guessCPythonIsConvertible(const QString& type); + + QString cpythonToCppConversionFunction(const AbstractMetaClass* metaClass); + QString cpythonToCppConversionFunction(const AbstractMetaType* type, const AbstractMetaClass* context = 0); + QString cpythonToPythonConversionFunction(const AbstractMetaType* type, const AbstractMetaClass* context = 0); + QString cpythonFunctionName(const AbstractMetaFunction* func); QString cpythonMethodDefinitionName(const AbstractMetaFunction* func); QString cpythonGettersSettersDefinitionName(const AbstractMetaClass* metaClass); |