diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-17 07:36:18 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-28 07:26:02 +0200 |
commit | 811a8a0631c6aacb20b68696eb769109af16b519 (patch) | |
tree | 7a21dfbfe81ab02ff37da45100a2f9f0758db160 | |
parent | e87b29d4e1c53b79b53bca5e2eda62e6b3d289b3 (diff) |
shiboken: Remove unused static functions
Remove _compareAbstractMetaFunctions() msgInvalidVersion(),
fixing warnings.
Change-Id: I5f55b0de2d3c3fed2df09cb922c02569c937f7c1
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | 35 | ||||
-rw-r--r-- | sources/shiboken2/ApiExtractor/typesystemparser.cpp | 11 |
2 files changed, 0 insertions, 46 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp index 2d546cadd..8468cf858 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp @@ -1284,41 +1284,6 @@ void AbstractMetaBuilderPrivate::fixReturnTypeOfConversionOperator(AbstractMetaF metaFunction->replaceType(metaType); } -static bool _compareAbstractMetaTypes(const AbstractMetaType *type, - const AbstractMetaType *other, - AbstractMetaType::ComparisonFlags flags = {}) -{ - return (type != nullptr) == (other != nullptr) - && (type == nullptr || type->compare(*other, flags)); -} - -static bool _compareAbstractMetaFunctions(const AbstractMetaFunction *func, - const AbstractMetaFunction *other, - AbstractMetaType::ComparisonFlags argumentFlags = {}) -{ - if (!func && !other) - return true; - if (!func || !other) - return false; - if (func->name() != other->name()) - return false; - const int argumentsCount = func->arguments().count(); - if (argumentsCount != other->arguments().count() - || func->isConstant() != other->isConstant() - || func->isStatic() != other->isStatic() - || !_compareAbstractMetaTypes(func->type(), other->type())) { - return false; - } - for (int i = 0; i < argumentsCount; ++i) { - if (!_compareAbstractMetaTypes(func->arguments().at(i)->type(), - other->arguments().at(i)->type(), - argumentFlags)) { - return false; - } - } - return true; -} - AbstractMetaFunctionList AbstractMetaBuilderPrivate::classFunctionList(const ScopeModelItem &scopeItem, AbstractMetaClass::Attributes *constructorAttributes, AbstractMetaClass *currentClass) diff --git a/sources/shiboken2/ApiExtractor/typesystemparser.cpp b/sources/shiboken2/ApiExtractor/typesystemparser.cpp index 0bb56f0fe..98c729a32 100644 --- a/sources/shiboken2/ApiExtractor/typesystemparser.cpp +++ b/sources/shiboken2/ApiExtractor/typesystemparser.cpp @@ -575,17 +575,6 @@ static inline attribute.value()); } -static QString msgInvalidVersion(const QStringRef &version, const QString &package = QString()) -{ - QString result; - QTextStream str(&result); - str << "Invalid version \"" << version << '"'; - if (!package.isEmpty()) - str << "\" specified for package " << package; - str << '.'; - return result; -} - static bool addRejection(TypeDatabase *database, QXmlStreamAttributes *attributes, QString *errorMessage) { |