diff options
8 files changed, 22 insertions, 12 deletions
diff --git a/sources/shiboken6/generator/generator.cpp b/sources/shiboken6/generator/generator.cpp index 3ac192f2c..6b634f967 100644 --- a/sources/shiboken6/generator/generator.cpp +++ b/sources/shiboken6/generator/generator.cpp @@ -246,12 +246,11 @@ bool Generator::generateFileForContext(const GeneratorContext &context) if (fileName.isEmpty()) return true; - QString filePath = outputDirectory() + u'/' - + subDirectoryForPackage(typeEntry->targetLangPackage()) - + u'/' + fileName; - FileOut fileOut(filePath); + const QString targetDirectory = outputDirectory() + u'/' + + subDirectoryForPackage(typeEntry->targetLangPackage()); + FileOut fileOut(targetDirectory + u'/' + fileName); - generateClass(fileOut.stream, context); + generateClass(fileOut.stream, targetDirectory, context); fileOut.done(); return true; diff --git a/sources/shiboken6/generator/generator.h b/sources/shiboken6/generator/generator.h index 9c11bb3f3..fb3a23dde 100644 --- a/sources/shiboken6/generator/generator.h +++ b/sources/shiboken6/generator/generator.h @@ -211,7 +211,9 @@ protected: * \param s text stream to write the generated output * \param metaClass the class that should be generated */ - virtual void generateClass(TextStream &s, const GeneratorContext &classContext) = 0; + virtual void generateClass(TextStream &s, + const QString &targetDir, + const GeneratorContext &classContext) = 0; virtual bool finishGeneration() = 0; /** diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp index 2b88f8d50..5acabb861 100644 --- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp +++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp @@ -404,8 +404,10 @@ static void writeInheritedFromList(TextStream &s, const AbstractMetaClassCPtr &m writeInheritanceList(s, res, "Inherits from"); } -void QtDocGenerator::generateClass(TextStream &s, const GeneratorContext &classContext) +void QtDocGenerator::generateClass(TextStream &s, const QString &targetDir, + const GeneratorContext &classContext) { + Q_UNUSED(targetDir) AbstractMetaClassCPtr metaClass = classContext.metaClass(); qCDebug(lcShibokenDoc).noquote().nospace() << "Generating Documentation for " << metaClass->fullName(); diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.h b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h index df72ea571..f1acaaeb7 100644 --- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.h +++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.h @@ -57,7 +57,8 @@ protected: bool shouldGenerate(const TypeEntryCPtr &) const override; static QString fileNameSuffix(); QString fileNameForContext(const GeneratorContext &context) const override; - void generateClass(TextStream &ts, const GeneratorContext &classContext) override; + void generateClass(TextStream &ts, const QString &targetDir, + const GeneratorContext &classContext) override; bool finishGeneration() override; private: diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp index 93516874d..f6cec0579 100644 --- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp +++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp @@ -620,7 +620,9 @@ static void writeAddedTypeSignatures(TextStream &s, const ComplexTypeEntryCPtr & /// Function used to write the class generated binding code on the buffer /// \param s the output buffer /// \param classContext the pointer to metaclass information -void CppGenerator::generateClass(TextStream &s, const GeneratorContext &classContext) +void CppGenerator::generateClass(TextStream &s, + const QString & /* targetDir */, + const GeneratorContext &classContext) { if (classContext.forSmartPointer()) { generateSmartPointerClass(s, classContext); diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.h b/sources/shiboken6/generator/shiboken/cppgenerator.h index d099f7ae9..e60f39e4e 100644 --- a/sources/shiboken6/generator/shiboken/cppgenerator.h +++ b/sources/shiboken6/generator/shiboken/cppgenerator.h @@ -46,7 +46,8 @@ public: protected: QString fileNameForContext(const GeneratorContext &context) const override; - void generateClass(TextStream &s, const GeneratorContext &classContext) override; + void generateClass(TextStream &s, const QString &targetDir, + const GeneratorContext &classContext) override; bool finishGeneration() override; private: diff --git a/sources/shiboken6/generator/shiboken/headergenerator.cpp b/sources/shiboken6/generator/shiboken/headergenerator.cpp index e42d1a762..bdc10b22f 100644 --- a/sources/shiboken6/generator/shiboken/headergenerator.cpp +++ b/sources/shiboken6/generator/shiboken/headergenerator.cpp @@ -109,7 +109,9 @@ static void writeProtectedEnums(TextStream &s, const AbstractMetaClassCPtr &meta } } -void HeaderGenerator::generateClass(TextStream &s, const GeneratorContext &classContext) +void HeaderGenerator::generateClass(TextStream &s, + const QString & /* targetDir */, + const GeneratorContext &classContext) { const AbstractMetaClassCPtr metaClass = classContext.metaClass(); diff --git a/sources/shiboken6/generator/shiboken/headergenerator.h b/sources/shiboken6/generator/shiboken/headergenerator.h index 03b98e743..ec2bb5a41 100644 --- a/sources/shiboken6/generator/shiboken/headergenerator.h +++ b/sources/shiboken6/generator/shiboken/headergenerator.h @@ -27,7 +27,8 @@ public: protected: QString fileNameForContext(const GeneratorContext &context) const override; - void generateClass(TextStream &s, const GeneratorContext &classContext) override; + void generateClass(TextStream &s, const QString &targetDir, + const GeneratorContext &classContext) override; bool finishGeneration() override; private: |