diff options
Diffstat (limited to 'src/tools/qdoc/generator.h')
-rw-r--r-- | src/tools/qdoc/generator.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/tools/qdoc/generator.h b/src/tools/qdoc/generator.h index 58e9073922..52d73e8dea 100644 --- a/src/tools/qdoc/generator.h +++ b/src/tools/qdoc/generator.h @@ -81,7 +81,7 @@ public: virtual void initializeGenerator(const Config &config); virtual void terminateGenerator(); - QString fullDocumentLocation(const Node *node, bool subdir = false); + QString fullDocumentLocation(const Node *node, bool useSubdir = false); const Config* config() { return config_; } static Generator *currentGenerator() { return currentGenerator_; } @@ -100,6 +100,8 @@ public: static bool runPrepareOnly() { return (qdocPass_ == Prepare); } static bool runGenerateOnly() { return (qdocPass_ == Generate); } static QString defaultModuleName() { return project; } + static void resetUseOutputSubdirs() { useOutputSubdirs_ = false; } + static bool useOutputSubdirs() { return useOutputSubdirs_; } protected: virtual void beginSubPage(const InnerNode* node, const QString& fileName); @@ -185,6 +187,17 @@ protected: QString tagFile_; QStack<QTextStream*> outStreamStack; + void appendFullName(Text& text, + const Node *apparentNode, + const Node *relative, + const Node *actualNode = 0); + void appendFullName(Text& text, + const Node *apparentNode, + const QString& fullName, + const Node *actualNode); + void appendFullNames(Text& text, const NodeList& nodes, const Node* relative); + void appendSortedNames(Text& text, const ClassNode *classe, const QList<RelatedClass> &classes); + private: static Generator* currentGenerator_; static QStringList exampleDirs; @@ -206,18 +219,10 @@ private: static QStringList styleFiles; static bool debugging_; static bool noLinkErrors_; + static bool redirectDocumentationToDevNull_; static Passes qdocPass_; + static bool useOutputSubdirs_; - void appendFullName(Text& text, - const Node *apparentNode, - const Node *relative, - const Node *actualNode = 0); - void appendFullName(Text& text, - const Node *apparentNode, - const QString& fullName, - const Node *actualNode); - void appendFullNames(Text& text, const NodeList& nodes, const Node* relative); - void appendSortedNames(Text& text, const ClassNode *classe, const QList<RelatedClass> &classes); void generateReimplementedFrom(const FunctionNode *func, CodeMarker *marker); QString amp; |