diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-02-08 20:39:46 -0300 |
|---|---|---|
| committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-02-09 12:09:23 -0300 |
| commit | df7a5518466ce74ca3023b61ce1be21592f97252 (patch) | |
| tree | 2ae87365a1206c201c310f3e9b915a50a9c883a9 /shibokengenerator.cpp | |
| parent | 3b98369c971d23b8a45cfbf1b3a60f6ccee1f7ab (diff) | |
Fixes generation of binding reimplementation of modified virtual methods.
Argument removal and type modification no longer affects the generation
of virtual method signatures in the binding code.
Diffstat (limited to 'shibokengenerator.cpp')
| -rw-r--r-- | shibokengenerator.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shibokengenerator.cpp b/shibokengenerator.cpp index 8a4a4eba0..cc0f48a82 100644 --- a/shibokengenerator.cpp +++ b/shibokengenerator.cpp @@ -364,7 +364,6 @@ QString ShibokenGenerator::getFormatUnitString(const AbstractMetaFunction* func) } else if (arg->type()->isNativePointer() && arg->type()->name() == "char") { result += 'z'; } else { - Q_ASSERT(false); ReportHandler::warning("Unknown type used in ShibokenGenerator::getFormatUnitString!"); result += '?'; } @@ -600,7 +599,9 @@ QString ShibokenGenerator::argumentString(const AbstractMetaFunction *func, const AbstractMetaArgument *argument, Options options) const { - QString modified_type = func->typeReplaced(argument->argumentIndex() + 1); + QString modified_type; + if (!(options & OriginalTypeDescription)) + modified_type = func->typeReplaced(argument->argumentIndex() + 1); QString arg; if (modified_type.isEmpty()) |