diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-03-04 16:34:45 -0300 |
|---|---|---|
| committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-03-04 17:13:40 -0300 |
| commit | f4db0c74e0f267c102fff6eb47ecc3eae628a637 (patch) | |
| tree | e988b735d382f9d814078a9fba2009f9d6a38a39 /cppgenerator.h | |
| parent | dbeca960863dadbe8d496195bc60202619314214 (diff) | |
| parent | edc9cbfcfde439ccfe7100f53efc5d1e4ec34480 (diff) | |
Merge branch 'master' into extensibleconversions
Conflicts:
cppgenerator.cpp
libshiboken/basewrapper.cpp
Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Lauro Moura <lauro.neto@openbossa.org>
Diffstat (limited to 'cppgenerator.h')
| -rw-r--r-- | cppgenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cppgenerator.h b/cppgenerator.h index 1df870d81..c9d24d246 100644 --- a/cppgenerator.h +++ b/cppgenerator.h @@ -68,7 +68,7 @@ private: void writeTypeCheck(QTextStream& s, const AbstractMetaType* argType, QString argumentName, bool isNumber = false, QString customType = ""); void writeTypeCheck(QTextStream& s, const OverloadData* overloadData, QString argumentName); - void writeTypeNameFunction(QTextStream& s, const AbstractMetaClass* metaClass); + void writeTypeDiscoveryFunction(QTextStream& s, const AbstractMetaClass* metaClass); void writeGetattroFunction(QTextStream& s, const AbstractMetaClass* metaClass); |