diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-18 11:19:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-18 11:52:40 +0000 |
| commit | a3c6eb91a7c543aa78f87a73242ee17be585b712 (patch) | |
| tree | d516c3c4bc62c93aef7212e279394e8a232ecce2 /sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp | |
| parent | 768cfefa3d693f682d8c71b085e861c3be9631d7 (diff) | |
shiboken6: Fix some warning messages
Use standard messages where applicable.
Move some messages over to messages.cpp and add a location.
Remove some messages that cannot be triggered any more.
Change-Id: I7fc821e4360b06af7ef6e5db7e30de0f1e8ed5ca
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp')
| -rw-r--r-- | sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp index d8776d2db..61899c9ea 100644 --- a/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder.cpp @@ -482,20 +482,14 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom) for (AbstractMetaClass *cls : qAsConst(m_metaClasses)) { cls->fixFunctions(); - if (!cls->typeEntry()) { - qCWarning(lcShiboken).noquote().nospace() - << QStringLiteral("class '%1' does not have an entry in the type system") - .arg(cls->name()); - } else { - const bool couldAddDefaultCtors = cls->isConstructible() - && !cls->isNamespace() - && (cls->attributes() & AbstractMetaAttributes::HasRejectedConstructor) == 0; - if (couldAddDefaultCtors) { - if (!cls->hasConstructors()) - cls->addDefaultConstructor(); - if (cls->typeEntry()->isValue() && !cls->isAbstract() && !cls->hasCopyConstructor()) - cls->addDefaultCopyConstructor(ancestorHasPrivateCopyConstructor(cls)); - } + const bool couldAddDefaultCtors = cls->isConstructible() + && !cls->isNamespace() + && (cls->attributes() & AbstractMetaAttributes::HasRejectedConstructor) == 0; + if (couldAddDefaultCtors) { + if (!cls->hasConstructors()) + cls->addDefaultConstructor(); + if (cls->typeEntry()->isValue() && !cls->isAbstract() && !cls->hasCopyConstructor()) + cls->addDefaultCopyConstructor(ancestorHasPrivateCopyConstructor(cls)); } } const auto &allEntries = types->entries(); @@ -1327,11 +1321,8 @@ void AbstractMetaBuilderPrivate::traverseFunctions(ScopeModelItem scopeItem, setupFunctionDefaults(metaFunction, metaClass); - if (metaFunction->isSignal() && metaClass->hasSignal(metaFunction)) { - qCWarning(lcShiboken).noquote().nospace() - << QStringLiteral("signal '%1' in class '%2' is overloaded.") - .arg(metaFunction->name(), metaClass->name()); - } + if (metaFunction->isSignal() && metaClass->hasSignal(metaFunction)) + qCWarning(lcShiboken, "%s", qPrintable(msgSignalOverloaded(metaClass, metaFunction))); if (metaFunction->isConversionOperator()) fixReturnTypeOfConversionOperator(metaFunction); @@ -1440,13 +1431,13 @@ bool AbstractMetaBuilderPrivate::setupInheritance(AbstractMetaClass *metaClass) auto typeEntry = types->findType(baseClassName); if (typeEntry == nullptr || !typeEntry->isComplex()) { qCWarning(lcShiboken, "%s", - qPrintable(msgUnknownBase(metaClass, baseClassName))); + qPrintable(msgBaseNotInTypeSystem(metaClass, baseClassName))); return false; } auto baseClass = AbstractMetaClass::findClass(m_metaClasses, typeEntry); if (!baseClass) { - qCWarning(lcShiboken).noquote().nospace() - << QStringLiteral("class not found for setup inheritance '%1'").arg(baseClassName); + qCWarning(lcShiboken, "%s", + qPrintable(msgUnknownBase(metaClass, baseClassName))); return false; } metaClass->addBaseClass(baseClass); @@ -1929,9 +1920,9 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(const Functio && !metaFunction->isOperatorOverload() && !metaFunction->isSignal() && metaFunction->argumentName(i + 1, false, currentClass).isEmpty()) { - qCWarning(lcShiboken).noquote().nospace() - << QStringLiteral("Argument %1 on function '%2::%3' has default expression but does not have name.") - .arg(i+1).arg(className, metaFunction->minimalSignature()); + qCWarning(lcShiboken, "%s", + qPrintable(msgUnnamedArgumentDefaultExpression(currentClass, i + 1, + className, metaFunction))); } } @@ -2859,9 +2850,7 @@ static void writeRejectLogFile(const QString &name, { QFile f(name); if (!f.open(QIODevice::WriteOnly | QIODevice::Text)) { - qCWarning(lcShiboken).noquote().nospace() - << QStringLiteral("failed to write log file: '%1'") - .arg(QDir::toNativeSeparators(f.fileName())); + qCWarning(lcShiboken, "%s", qPrintable(msgCannotOpenForWriting(f))); return; } |