qdoc: ifdefed out all the debug code.

I think the crash that occurs when running qdoc over
multiple qdocconf files is fixed.

9 files changed, 17 insertions, 9 deletions

diff --git a/tools/qdoc3/codemarker.cpp b/tools/qdoc3/codemarker.cpp
index 4293902142..15f2c2db8d 100644
--- a/tools/qdoc3/codemarker.cpp
+++ b/tools/qdoc3/codemarker.cpp
@@ -112,7 +112,6 @@ void CodeMarker::initialize(const Config& config)
  */
 void CodeMarker::terminate()
 {
-    qDebug() << "void CodeMarker::terminate()";
     QList<CodeMarker *>::ConstIterator m = markers.begin();
     while (m != markers.end()) {
 	(*m)->terminateMarker();
diff --git a/tools/qdoc3/codeparser.cpp b/tools/qdoc3/codeparser.cpp
index f30ec84969..a717ff1ee4 100644
--- a/tools/qdoc3/codeparser.cpp
+++ b/tools/qdoc3/codeparser.cpp
@@ -140,7 +140,6 @@ void CodeParser::initialize(const Config& config)
  */
 void CodeParser::terminate()
 {
-    qDebug() << "void CodeParser::terminate()";
     QList<CodeParser *>::ConstIterator p = parsers.begin();
     while (p != parsers.end()) {
 	(*p)->terminateParser();
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 1f298827f5..ad4cdde879 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -2929,7 +2929,6 @@ void Doc::initialize(const Config& config)
 
 void Doc::terminate()
 {
-    qDebug() << "void Doc::terminate()";
     DocParser::exampleFiles.clear();
     DocParser::exampleDirs.clear();
     DocParser::sourceFiles.clear();
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index b7b63f36bf..0c6497bc64 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -213,7 +213,6 @@ void Generator::initialize(const Config &config)
 
 void Generator::terminate()
 {
-    qDebug() << "void Generator::terminate()";
     QList<Generator *>::ConstIterator g = generators.begin();
     while (g != generators.end()) {
         if (outputFormats.contains((*g)->format()))
@@ -1195,10 +1194,14 @@ void Generator::appendSortedQmlNames(Text& text,
     QMap<QString,Text> classMap;
     int index = 0;
 
+#ifdef DEBUG_MULTIPLE QDOCCONF_FILES
     qDebug() << "Generator::appendSortedQmlNames():" << base->name() << "is inherited by...";
+#endif    
     for (int i = 0; i < subs.size(); ++i) {
         Text t;
+#ifdef DEBUG_MULTIPLE QDOCCONF_FILES
         qDebug() << "    " << subs[i]->name();
+#endif        
         appendFullName(t, subs[i], base, marker);
         classMap[t.toString().toLower()] = t;
     }
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index f8fb5b24f1..c1e3678253 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -703,8 +703,6 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                       case Node::Fake:
                           if (node->subType() == Node::QmlClass) {
                               sections[QmlClass].appendMember((Node*)node);
-                              //qDebug() << "HtmlGenerator::generateAtom(): Atom::SinceList, append"
-                              //         << node->name();
                           }
                           break;
                       case Node::Namespace:
@@ -3769,7 +3767,6 @@ void HtmlGenerator::findAllSince(const InnerNode *node)
                         className = (*child)->parent()->name()+"::"+className;
                     nsmap.value().insert(className,(*child));
                     nqcmap.value().insert(className,(*child));
-                    //qDebug() << "findAllSince(): insert" << className << sinceVersion;
                 }
             }
             else {
diff --git a/tools/qdoc3/location.cpp b/tools/qdoc3/location.cpp
index 807903e586..19625da9e2 100644
--- a/tools/qdoc3/location.cpp
+++ b/tools/qdoc3/location.cpp
@@ -297,7 +297,6 @@ void Location::initialize(const Config& config)
  */
 void Location::terminate()
 {
-    qDebug() << "void Location::terminate()";
     delete spuriousRegExp;
     spuriousRegExp = 0;
 }
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index ea843bab41..fe4ad863e3 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -70,6 +70,7 @@
 #include "webxmlgenerator.h"
 #include "tokenizer.h"
 #include "tree.h"
+#include <qdebug.h>
 
 #include "qtranslator.h"
 #ifndef QT_BOOTSTRAPPED
@@ -362,7 +363,13 @@ static void processQdocconfFile(const QString &fileName)
 #ifndef QT_NO_TRANSLATION
     qDeleteAll(translators);
 #endif
+#ifdef DEBUG_SHUTDOWN_CRASH    
+    qDebug() << "main(): Delete tree";
+#endif    
     delete tree;
+#ifdef DEBUG_SHUTDOWN_CRASH    
+    qDebug() << "main(): Tree deleted";
+#endif
 }
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 1d43eddcf3..d60ff733f9 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -1297,7 +1297,9 @@ QmlClassNode::QmlClassNode(InnerNode *parent,
  */
 QmlClassNode::~QmlClassNode()
 {
+#ifdef DEBUG_MULTIPLE QDOCCONF_FILES
     qDebug() << "Deleting QmlClassNode:" << name();
+#endif    
 }
 
 /*!
@@ -1332,7 +1334,9 @@ QString QmlClassNode::fileBase() const
 void QmlClassNode::addInheritedBy(const QString& base, Node* sub)
 {
     inheritedBy.insert(base,sub);
+#ifdef DEBUG_MULTIPLE QDOCCONF_FILES
     qDebug() << "QmlClassNode::addInheritedBy(): insert" << base << sub->name() << inheritedBy.size();
+#endif    
 }
 
 /*!
@@ -1343,8 +1347,10 @@ void QmlClassNode::subclasses(const QString& base, NodeList& subs)
     subs.clear();
     if (inheritedBy.count(base) > 0) {
         subs = inheritedBy.values(base);
+#ifdef DEBUG_MULTIPLE QDOCCONF_FILES
         qDebug() << "QmlClassNode::subclasses():" <<  inheritedBy.count(base) << base
                  << "subs:" << subs.size() << "total size:" << inheritedBy.size();
+#endif        
     }
 }
 
diff --git a/tools/qdoc3/tokenizer.cpp b/tools/qdoc3/tokenizer.cpp
index f1885a8e17..7c10de65a6 100644
--- a/tools/qdoc3/tokenizer.cpp
+++ b/tools/qdoc3/tokenizer.cpp
@@ -525,7 +525,6 @@ void Tokenizer::initialize(const Config &config)
 
 void Tokenizer::terminate()
 {
-    qDebug() << "void Tokenize::terminate()";
     delete comment;
     comment = 0;
     delete versionX;