diff options
| author | Hugo Lima <hugo.lima@openbossa.org> | 2010-02-01 14:19:15 -0200 |
|---|---|---|
| committer | Hugo Lima <hugo.lima@openbossa.org> | 2010-02-01 14:35:17 -0200 |
| commit | 4a14c6632f6a4245a20bd46cb94f9d807188276d (patch) | |
| tree | fbfc1ee183a26610dee726e7c908a7cd97d30ec5 /abstractmetabuilder.cpp | |
| parent | 5d456d500f3e142902523df2157bbef1b82bfe1a (diff) | |
Allow a class to multiple inherit from various object-types.
Reviewed by Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'abstractmetabuilder.cpp')
| -rw-r--r-- | abstractmetabuilder.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/abstractmetabuilder.cpp b/abstractmetabuilder.cpp index 3043e5729..1061b0438 100644 --- a/abstractmetabuilder.cpp +++ b/abstractmetabuilder.cpp @@ -1333,14 +1333,6 @@ bool AbstractMetaBuilder::setupInheritance(AbstractMetaClass *metaClass) // true for primary base class else if (!baseClassEntry->designatedInterface()) { - if (primaries > 0) { - ReportHandler::warning(QString("class '%1' has multiple primary base classes" - " '%2' and '%3'") - .arg(metaClass->name()) - .arg(baseClasses.at(primary)) - .arg(baseClassEntry->name())); - return false; - } primaries++; primary = i; } @@ -1370,7 +1362,7 @@ bool AbstractMetaBuilder::setupInheritance(AbstractMetaClass *metaClass) setupInheritance(baseClass); - QString interfaceName = InterfaceTypeEntry::interfaceName(baseClass->name()); + QString interfaceName = baseClass->isInterface() ? InterfaceTypeEntry::interfaceName(baseClass->name()) : baseClass->name(); AbstractMetaClass *iface = m_metaClasses.findClass(interfaceName); if (!iface) { ReportHandler::warning(QString("unknown interface for '%1': '%2'") |