diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-05 15:15:11 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-06 12:44:37 +0100 |
commit | 066402279d260c07f26af0d849985404633bdbcf (patch) | |
tree | 822c28984e7d9becffb8f4584397dde77cd3e616 /sources/shiboken6/generator/shiboken/cppgenerator.cpp | |
parent | 67c3c44225a777a2d4e4b3d3a43e7fac183f28cb (diff) |
shiboken6: Alphabetically sort class includes
Use an (ordered) std::set insetad of a (QHash-based) QSet.
Change-Id: I5dda107228127248e07543d00a2b8512dec4a3a0
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken6/generator/shiboken/cppgenerator.cpp')
-rw-r--r-- | sources/shiboken6/generator/shiboken/cppgenerator.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp index bf082de8c..1b4a04dd4 100644 --- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp +++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp @@ -50,6 +50,7 @@ #include <algorithm> #include <cstring> #include <memory> +#include <set> using namespace Qt::StringLiterals; @@ -6611,7 +6612,7 @@ bool CppGenerator::finishGeneration() StringStream s_classInitDecl(TextStream::Language::Cpp); StringStream s_classPythonDefines(TextStream::Language::Cpp); - QSet<Include> includes; + std::set<Include> includes; StringStream s_globalFunctionImpl(TextStream::Language::Cpp); StringStream s_globalFunctionDef(TextStream::Language::Cpp); StringStream signatureStream(TextStream::Language::Cpp); @@ -6620,8 +6621,8 @@ bool CppGenerator::finishGeneration() for (auto it = functionGroups.cbegin(), end = functionGroups.cend(); it != end; ++it) { const AbstractMetaFunctionCList &overloads = it.value(); for (const auto &func : overloads) { - if (func->typeEntry()) - includes << func->typeEntry()->include(); + if (auto te = func->typeEntry(); !te.isNull()) + includes.insert(te->include()); } if (overloads.isEmpty()) @@ -6662,26 +6663,26 @@ bool CppGenerator::finishGeneration() writeInitFunc(s_classInitDecl, s_classPythonDefines, getInitFunctionName(context), enclosingTypeEntry); - includes << smp.type.instantiations().constFirst().typeEntry()->include(); + includes.insert(smp.type.instantiations().constFirst().typeEntry()->include()); } for (auto &instantiatedContainer : api().instantiatedContainers()) { for (const auto &inst : instantiatedContainer.instantiations()) - includes << inst.typeEntry()->include(); + includes.insert(inst.typeEntry()->include()); } const ExtendedConverterData extendedConverters = getExtendedConverters(); for (auto it = extendedConverters.cbegin(), end = extendedConverters.cend(); it != end; ++it) { TypeEntryCPtr te = it.key(); - includes << te->include(); + includes.insert(te->include()); for (const auto &metaClass : it.value()) - includes << metaClass->typeEntry()->include(); + includes.insert(metaClass->typeEntry()->include()); } const QList<CustomConversionPtr> &typeConversions = getPrimitiveCustomConversions(); for (const auto &c : typeConversions) { if (auto te = c->ownerType(); !te.isNull()) - includes << te->include(); + includes.insert(te->include()); } QString moduleFileName(outputDirectory() + u'/' + subDirectoryForPackage(packageName())); @@ -6713,7 +6714,7 @@ bool CppGenerator::finishGeneration() } s << "#include \"" << getModuleHeaderFileName() << '"' << "\n\n"; - for (const Include &include : std::as_const(includes)) + for (const Include &include : includes) s << include; s << '\n'; |