From 4a14c6632f6a4245a20bd46cb94f9d807188276d Mon Sep 17 00:00:00 2001 From: Hugo Lima Date: Mon, 1 Feb 2010 14:19:15 -0200 Subject: Allow a class to multiple inherit from various object-types. Reviewed by Marcelo Lira --- abstractmetabuilder.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'abstractmetabuilder.cpp') 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'") -- cgit v1.2.3