Removed dead code ifdefed with QDOC2DOX

These changes were added to qdoc in the days when we thought we
might switch to doxygen. Now we have taken the approach of making
qdoc output be more doxygen-like, so this ifdefed code is now dead.

5 files changed, 2 insertions, 2240 deletions

diff --git a/tools/qdoc3/codeparser.cpp b/tools/qdoc3/codeparser.cpp
index 9a58bc6c81..f0ff27e730 100644
--- a/tools/qdoc3/codeparser.cpp
+++ b/tools/qdoc3/codeparser.cpp
@@ -241,19 +241,6 @@ void CodeParser::processCommonMetaCommand(const Location &location,
 	if (node->type() == Node::Fake) {
 	    FakeNode *fake = static_cast<FakeNode *>(node);
             fake->setTitle(arg);
-#ifdef QDOC2DOX            
-            /* qdoc -> doxygen.
-               I think this must be done here, because there can be multiple
-               "\externalpage" and "\title" metacommands in a single qdoc
-               comment, which means, among other things, that the "\title"
-               commands are not inserted into the metacommand map used by
-               the Doc class. I'm sure there4 is a better way to do this in
-               the DoxWriter class using the information in the FakeNode,
-               but I don't have time to figure it out right now.
-             */
-            if (DoxWriter::isDoxPass(1))
-                DoxWriter::insertTitle(fake,arg);
-#endif            
         }
         else
 	    location.warning(tr("Ignored '\\%1'").arg(COMMAND_TITLE));
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index 1ad5843078..8baef0c3cb 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -589,22 +589,6 @@ Node *CppCodeParser::processTopicCommand(const Doc& doc,
         // ### split(" ") hack is there to support header file syntax
         QStringList paths = arg.split(" "); 
         QStringList path = paths[0].split("::");
-        
-#if QDOC2DOX        
-        // qdoc -> doxygen.
-        if (Doc::isDoxPass(1)) {
-            if (command == COMMAND_PROPERTY) {
-                Doc::insertProperty(path);
-            }
-            else if (command == COMMAND_VARIABLE) {
-                Doc::insertVariable(path);
-            }
-            else if (command == COMMAND_ENUM) {
-                // zzz
-            }
-        }
-#endif
-
         Node *node = 0;
         if (!usedNamespaces.isEmpty()) {
             foreach (const QString &usedNamespace, usedNamespaces) {
@@ -1753,12 +1737,6 @@ bool CppCodeParser::matchDocsAndStuff()
             readToken();
 
             Doc::trimCStyleComment(start_loc,comment);
-            /*
-              qdoc --> doxygen
-              We must also remember the location of the end
-              of the comment, so we can construct a diff for
-              it.
-            */
             Location end_loc(location());
 
             /*
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 397fbfaf68..f0a4c128e1 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -515,14 +515,7 @@ void DocParser::parse(const QString& source,
                         break;
                     case CMD_BADCODE:
                         leavePara();
-#ifdef QDOC2DOX                        
-                        if (DoxWriter::isDoxPass())
-                            append(Atom::CodeBad,getUnmarkedCode(CMD_BADCODE));
-                        else
-                            append(Atom::CodeBad,getCode(CMD_BADCODE, marker));
-#else
                         append(Atom::CodeBad,getCode(CMD_BADCODE, marker));
-#endif                        
                         break;
                     case CMD_BASENAME:
                         leavePara();
@@ -538,17 +531,8 @@ void DocParser::parse(const QString& source,
                     case CMD_C:
                         enterPara();
                         x = untabifyEtc(getArgument(true));
-#ifdef QDOC2DOX                        
-                        if (DoxWriter::isDoxPass())
-                            append(Atom::C, x);
-                        else {
-                            marker = CodeMarker::markerForCode(x);
-                            append(Atom::C, marker->markedUpCode(x, 0, ""));
-                        }
-#else
                         marker = CodeMarker::markerForCode(x);
                         append(Atom::C, marker->markedUpCode(x, 0, ""));
-#endif
                         break;
                     case CMD_CAPTION:
                         leavePara();
@@ -559,14 +543,7 @@ void DocParser::parse(const QString& source,
                         break;
                     case CMD_CODE:
                         leavePara();
-#ifdef QDOC2DOX                        
-                        if (DoxWriter::isDoxPass())
-                            append(Atom::Code, getUnmarkedCode(CMD_CODE));
-                        else
-                            append(Atom::Code, getCode(CMD_CODE, marker));
-#else
                         append(Atom::Code, getCode(CMD_CODE, marker));
-#endif
                         break;
 #ifdef QDOC_QML        
                     case CMD_QML:
@@ -579,17 +556,6 @@ void DocParser::parse(const QString& source,
 #endif                        
                     case CMD_CODELINE:
                         {
-#ifdef QDOC2DOX                        
-                            if (!quoting && !DoxWriter::isDoxPass()) {
-                                if (priv->text.lastAtom()->type() == Atom::Code
-                                        && priv->text.lastAtom()->string().endsWith("\n\n"))
-                                    priv->text.lastAtom()->chopString();
-                                appendToCode("\n");
-                            } lse {
-                                append(Atom::CodeQuoteCommand, cmdStr);
-                                append(Atom::CodeQuoteArgument, " ");
-                            }
-#else
                             if (!quoting) {
                                 if (priv->text.lastAtom()->type() == Atom::Code
                                         && priv->text.lastAtom()->string().endsWith("\n\n"))
@@ -600,37 +566,10 @@ void DocParser::parse(const QString& source,
                                 append(Atom::CodeQuoteCommand, cmdStr);
                                 append(Atom::CodeQuoteArgument, " ");
                             }
-#endif
                         }
                         break;
                     case CMD_DOTS:
                         {
-#ifdef QDOC2DOX                        
-                            if (DoxWriter::isDoxPass()) {
-                                append(Atom::CodeQuoteCommand, cmdStr);
-                                append(Atom::CodeQuoteArgument, "    ...");
-                            }
-                            else if (!quoting) {
-                                if (priv->text.lastAtom()->type() == Atom::Code
-                                        && priv->text.lastAtom()->string().endsWith("\n\n"))
-                                    priv->text.lastAtom()->chopString();
-
-                                QString arg = getOptionalArgument();
-                                int indent = 4;
-                                if (!arg.isEmpty())
-                                    indent = arg.toInt();
-                                for (int i = 0; i < indent; ++i)
-                                    appendToCode(" ");
-                                appendToCode("...\n");
-                            }
-                            else {
-                                append(Atom::CodeQuoteCommand, cmdStr);
-                                QString arg = getOptionalArgument();
-                                if (arg.isEmpty())
-                                    arg = "4";
-                                append(Atom::CodeQuoteArgument, arg);
-                            }
-#else
                             if (!quoting) {
                                 if (priv->text.lastAtom()->type() == Atom::Code
                                         && priv->text.lastAtom()->string().endsWith("\n\n"))
@@ -651,7 +590,6 @@ void DocParser::parse(const QString& source,
                                     arg = "4";
                                 append(Atom::CodeQuoteArgument, arg);
                             }
-#endif
                         }
                         break;
                     case CMD_ELSE:
@@ -953,19 +891,8 @@ void DocParser::parse(const QString& source,
                         break;
                     case CMD_OLDCODE:
                         leavePara();
-#ifdef QDOC2DOX                        
-                        if (DoxWriter::isDoxPass()) {
-                            append(Atom::CodeOld, getUnmarkedCode(CMD_OLDCODE));
-                            append(Atom::CodeNew, getUnmarkedCode(CMD_NEWCODE));
-                        }
-                        else {
-                            append(Atom::CodeOld, getCode(CMD_OLDCODE, marker));
-                            append(Atom::CodeNew, getCode(CMD_NEWCODE, marker));
-                        }
-#else
                         append(Atom::CodeOld, getCode(CMD_OLDCODE, marker));
                         append(Atom::CodeNew, getCode(CMD_NEWCODE, marker));
-#endif
                         break;
                     case CMD_OMIT:
                         getUntilEnd(cmd);
@@ -1147,18 +1074,6 @@ void DocParser::parse(const QString& source,
                         {
                             QString snippet = getArgument();
                             QString identifier = getRestOfLine();
-#ifdef QDOC2DOX                        
-                            if (quoting || DoxWriter::isDoxPass()) {
-                                append(Atom::SnippetCommand, cmdStr);
-                                append(Atom::SnippetLocation, snippet);
-                                append(Atom::SnippetIdentifier, identifier);
-                            }
-                            else {
-                                Doc::quoteFromFile(location(),quoter,snippet);
-                                appendToCode(quoter.quoteSnippet(location(),
-                                                                 identifier));
-                            }
-#else
                             if (quoting) {
                                 append(Atom::SnippetCommand, cmdStr);
                                 append(Atom::SnippetLocation, snippet);
@@ -1169,7 +1084,6 @@ void DocParser::parse(const QString& source,
                                 appendToCode(quoter.quoteSnippet(location(),
                                                                  identifier));
                             }
-#endif
                         }
                         break;
                     case CMD_SUB:
@@ -1251,7 +1165,7 @@ void DocParser::parse(const QString& source,
                         append(Atom::FormattingRight, ATOM_FORMATTING_BOLD);
                         append(Atom::String, " ");
                         break;
-                    case CMD_OVERLOAD: // qdoc --> doxygen
+                    case CMD_OVERLOAD:
                         priv->metacommandsUsed.insert(cmdStr);
                         x.clear();
                         if (!isBlankLine())
@@ -2343,7 +2257,7 @@ QString DocParser::getCode(int cmd, CodeMarker *marker)
 }
 
 /*!
-  Used only for generating doxygen output.
+  Was used only for generating doxygen output.
  */
 QString DocParser::getUnmarkedCode(int cmd)
 {
@@ -2579,36 +2493,6 @@ QString DocParser::slashed(const QString& str)
 #define COMMAND_QMLBRIEF                Doc::alias("qmlbrief")
 #endif
 
-#ifdef QDOC2DOX                        
-#define DOXYGEN_INDENT 2
-#define DOXYGEN_TAB_SIZE 4
-#define DOXYGEN_INDENT_STRING "  "
-#define DOXYGEN_TAB_STRING "    "
-
-static QRegExp ws_rx("\\s");
-static QRegExp not_ws_rx("\\S");
-
-int DoxWriter::doxPass = 0;
-QString DoxWriter::currentClass;
-QSet<QString> DoxWriter::anchors;
-QStringMap DoxWriter::exampleTitles;
-QStringMap DoxWriter::headerFileTitles;
-QStringMap DoxWriter::fileTitles;
-QStringMap DoxWriter::groupTitles;
-QStringMap DoxWriter::moduleTitles;
-QStringMap DoxWriter::pageTitles;
-QStringMap DoxWriter::externalPageTitles;
-QStringMap DoxWriter::exampleTitlesInverse;
-QStringMap DoxWriter::headerFileTitlesInverse;
-QStringMap DoxWriter::fileTitlesInverse;
-QStringMap DoxWriter::groupTitlesInverse;
-QStringMap DoxWriter::moduleTitlesInverse;
-QStringMap DoxWriter::pageTitlesInverse;
-QStringMap DoxWriter::externalPageTitlesInverse;
-QStringMultiMap DoxWriter::variables;
-QStringMultiMap DoxWriter::properties;
-QStringMultiMap DoxWriter::enums;
-#endif
 
 Doc::Doc(const Location& start_loc,
          const Location& end_loc,
@@ -2618,15 +2502,6 @@ Doc::Doc(const Location& start_loc,
     priv = new DocPrivate(start_loc,end_loc,source);
     DocParser parser;
     parser.parse(source,priv,metaCommandSet);
-#ifdef QDOC2DOX                        
-    if (DoxWriter::isDoxPass()) {
-        DoxWriter doxWriter(source,priv);
-        if (DoxWriter::isDoxPass(1))
-            doxWriter.pass1();
-        else
-            doxWriter.pass2();
-    }
-#endif
 }
 
 Doc::Doc(const Doc& doc)
@@ -3180,1855 +3055,4 @@ void Doc::detach()
     priv = newPriv;
 }
 
-#ifdef QDOC2DOX                        
-/*!
-  Sets the doxygen writer pass to \a pass. You can use
-  isDoxPass(), with or without a parameter, to test if
-  you are in a doxygen writer run or in a specific pass
-  of a doxygen writer run.
-
-  This function is only called from main() if either the
-  \e doxygen1 or \e doxygen2 flag is passed to qdoc3 on
-  the command line.
- */
-void DoxWriter::setDoxPass(int pass)
-{
-    qDebug() << "SETTING doxygen pass to " << pass
-             << " in DoxWriter::setDoxPass()";
-    doxPass = pass;
-}
-
-/*!
-  Returns true if the doxygen pass is set to \a pass, 
-  which means we are in the specified \a pass of a doxygen
-  writer run of qdoc3.
- */
-bool DoxWriter::isDoxPass(int pass) { return (doxPass == pass); }
-
-/*!
-  Returns true if the doxygen pass is 1 or 2, which 
-  means this is a doxygen writer run to transform qdoc
-  comments into doxygen comments.
- */
-bool DoxWriter::isDoxPass() { return (doxPass > 0); }
-
-bool DoxWriter::conversionRequired() const
-{
-    /*
-      Loop through all the topic commands searching for
-      one that must be transformed to doxygen format. If
-      one is found, return true.
-     */
-    QCommandMap::const_iterator i;
-    i = priv->metaCommandMap.constBegin();
-    while (i != priv->metaCommandMap.constEnd()) {
-        QString s = i.key();
-        if (s == "enum")
-            return true;
-        else if (s == "example")
-            return true;
-        else if (s == "externalpage")
-            return true;
-        else if (s == "group")
-            return true;
-        else if (s == "headerfile")
-            return true;
-        else if (s == "module")
-            return true;
-        else if (s == "page")
-            return true;
-        else if (s == "property")
-            return true;
-        else if (s == "typedef")
-            return true;
-        else if (s == "variable")
-            return true;
-        else if (s == "overload")
-            return true;
-        else if (s == "reimp")
-            return true;
-        else if (s == "relates")
-            return true;
-        else if (s == "macro")
-            return true;
-        else {
-#if 0            
-            if (s == "class") 
-            else if (s == "namespace")
-            else if (s == "service")
-            else if (s == "inheaderfile") 
-            else if (s == "file") 
-            else if (s == "fn") 
-            else if (s == "contentspage") 
-            else if (s == "nextpage") 
-            else if (s == "previous") 
-            else if (s == "indexpage") 
-            else if (s == "startpage") 
-#endif            
-        }
-        ++i;
-    }
-    
-    /*
-      Loop through all the qdoc atoms searching for one
-      that must be transformed to doxygen format. If one
-      is found, return true.
-     */
-    const Atom* next = priv->text.firstAtom();
-    while (next != 0) {
-        Atom::Type atomType = next->type();
-        switch (atomType) {
-            case Atom::C:
-            case Atom::CaptionLeft: 
-            case Atom::Code: 
-            case Atom::CodeBad: 
-            case Atom::CodeNew: 
-            case Atom::CodeOld: 
-            case Atom::CodeQuoteArgument:
-            case Atom::CodeQuoteCommand:
-            case Atom::FootnoteLeft:
-            case Atom::FormatElse: 
-            case Atom::FormatEndif:
-            case Atom::FormatIf:
-            case Atom::GeneratedList:
-            case Atom::Image: 
-            case Atom::ImageText:
-            case Atom::InlineImage:
-            case Atom::LegaleseLeft:
-            case Atom::LineBreak: 
-            case Atom::Link: 
-            case Atom::LinkNode:
-            case Atom::ListLeft: 
-            case Atom::ListItemNumber:
-            case Atom::ListTagLeft:
-            case Atom::ListItemLeft:
-            case Atom::QuotationLeft: 
-            case Atom::RawString:
-            case Atom::SectionLeft:
-            case Atom::SectionHeadingLeft:
-            case Atom::SidebarLeft:
-            case Atom::SnippetCommand:
-            case Atom::SnippetIdentifier:
-            case Atom::SnippetLocation:
-            case Atom::TableLeft:
-            case Atom::TableHeaderLeft:
-            case Atom::TableRowLeft:
-            case Atom::TableItemLeft: 
-            case Atom::TableOfContents:
-            case Atom::Target:
-                return true;
-            case Atom::AbstractLeft: 
-            case Atom::AbstractRight: 
-            case Atom::AutoLink:
-            case Atom::BaseName: 
-            case Atom::BriefLeft:
-            case Atom::BriefRight: 
-            case Atom::CaptionRight:
-            case Atom::FormattingLeft:
-            case Atom::FormattingRight:
-            case Atom::Nop: 
-            case Atom::ParaLeft:
-            case Atom::ParaRight: 
-            case Atom::FootnoteRight:
-            case Atom::LegaleseRight:
-            case Atom::ListTagRight:
-            case Atom::ListItemRight: 
-            case Atom::ListRight: 
-            case Atom::QuotationRight:
-            case Atom::SectionRight:
-            case Atom::SectionHeadingRight:
-            case Atom::SidebarRight:
-            case Atom::String:
-            case Atom::TableRight: 
-            case Atom::TableHeaderRight:
-            case Atom::TableRowRight: 
-            case Atom::TableItemRight:
-            default:
-                break;
-        }
-        next = next->next();
-    }
-    return false;
-}
-
-/*!
-  A convenience function to write a qdoc metacommand as a
-  doxygen command, without conversion. i.e., some of the
-  qdoc metacommands don't require conversion for doxygen.
- */
-void DoxWriter::writeCommand(QCommandMap::const_iterator cmd)
-{
-    concatenate("\\" + cmd.key() + " " + cmd.value()[0]);
-    newLine();
-}
-
-/*!
-  Convert the qdoc commands in the metacommand map to
-  doxygen format. This function is called only in pass2().
-  The metacommand map contains all the metacommands that
-  were found in the qdoc comment that is being converted.
-  The metacommands are the ones that begin with the '\'.
-  These are not considered part of the text of the comment.
-  The text is converted by convertText().
- */
-void DoxWriter::convertMetaCommands()
-{
-    QCommandMap& metaCmdMap = priv->metaCommandMap;
-    QCommandMap::iterator cmd;
-    int c;
-
-    currentPage.clear();
-    currentFn.clear();
-    currentTitle.clear();
-    currentEnum.clear();
-    currentProperty.clear();
-    currentVariable.clear();
-    currentClass.clear();
-    currentExample.clear();
-    currentGroup.clear();
-    currentModule.clear();
-    currentMacro.clear();
-    currentService.clear();
-    currentTypedef.clear();
-    currentHeaderFile.clear();
-    commentType = OtherComment;
-
-    if ((cmd = metaCmdMap.find("class")) != metaCmdMap.end()) {
-        currentClass = cmd.value()[0];
-        if ((c = currentClass.indexOf(' ')) > 0)
-            currentClass = currentClass.left(c);
-        writeCommand(cmd);
-        metaCmdMap.erase(cmd);
-        commentType = ClassComment;
-    }
-    else if ((cmd = metaCmdMap.find("fn")) != metaCmdMap.end()) {
-        currentFn = cmd.value()[0];
-        writeCommand(cmd);
-        metaCmdMap.erase(cmd);
-        commentType = FnComment;
-    }
-    else if ((cmd = metaCmdMap.find("enum")) != metaCmdMap.end()) {
-        currentEnum = cmd.value()[0];
-        if ((c = currentEnum.lastIndexOf("::")) > 0) {
-            currentClass = currentEnum.left(c);
-            currentEnum = currentEnum.right(currentEnum.size()-c-2);
-            qDebug() << "currentEnum =" << currentEnum;
-            qDebug() << "currentClass =" << currentClass;
-        }
-        writeCommand(cmd);
-        metaCmdMap.erase(cmd);
-        commentType = EnumComment;
-    }
-    else if ((cmd = metaCmdMap.find("property")) != metaCmdMap.end()) {
-        currentClass = cmd.value()[0];
-        if ((c = currentClass.lastIndexOf("::")) > 0) {
-            currentProperty = currentClass.right(currentClass.size()-c-2);
-            currentClass = currentClass.left(c);
-            qDebug() << "currentProperty =" << currentProperty;
-            qDebug() << "currentClass =" << currentClass;
-        }
-        writeCommand(cmd);
-        metaCmdMap.erase(cmd);
-        commentType = PropertyComment;
-    }
-    else if ((cmd = metaCmdMap.find("variable")) != metaCmdMap.end()) {
-        currentClass = cmd.value()[0];
-        if ((c = currentClass.lastIndexOf("::")) > 0) {
-            currentVariable = currentClass.right(currentClass.size()-c-2);
-            currentClass = currentClass.left(c);
-            qDebug() << "currentVariable =" << currentVariable;
-            qDebug() << "currentClass =" << currentClass;
-        }
-        concatenate("\\var " + cmd.value()[0]);
-        newLine();
-        metaCmdMap.erase(cmd);
-        commentType = VariableComment;
-    }
-
-    if ((cmd = metaCmdMap.find("page")) != metaCmdMap.end()) {
-        currentPage = cmd.value()[0];
-        QString htmlFile = currentPage;
-        const QString* title = getPageTitle(htmlFile);
-        QStringList parts = htmlFile.split('.');
-        metaCmdMap.erase(cmd);
-        if (title) {
-            concatenate("\\page " + parts[0] + " " + *title);
-            newLine();
-        }
-        commentType = PageComment;
-        qDebug() << "currentPage =" << currentPage;
-    }
-
-    if ((cmd = metaCmdMap.find("example")) != metaCmdMap.end()) {
-        currentExample = cmd.value()[0];
-        metaCmdMap.erase(cmd);
-        commentType = ExampleComment;
-        qDebug() << "currentExample =" << currentExample;
-    }
-    
-    if ((cmd = metaCmdMap.find("macro")) != metaCmdMap.end()) {
-        currentMacro = cmd.value()[0];
-        metaCmdMap.erase(cmd);
-        commentType = MacroComment;
-        qDebug() << "currentMacro =" << currentMacro;
-    }
-    
-    if ((cmd = metaCmdMap.find("group")) != metaCmdMap.end()) {
-        currentGroup = cmd.value()[0];
-        metaCmdMap.erase(cmd);
-        commentType = GroupComment;
-        qDebug() << "currentGroup =" << currentGroup;
-    }
-    
-    if ((cmd = metaCmdMap.find("module")) != metaCmdMap.end()) {
-        currentModule = cmd.value()[0];
-        metaCmdMap.erase(cmd);
-        commentType = ModuleComment;
-        qDebug() << "currentModule =" << currentModule;
-    }
-    
-    if ((cmd = metaCmdMap.find("headerfile")) != metaCmdMap.end()) {
-        currentHeaderFile = cmd.value()[0];
-        metaCmdMap.erase(cmd);
-        commentType = HeaderFileComment;
-        qDebug() << "currentHeaderFile =" << currentHeaderFile;
-    }
-
-    if ((cmd = metaCmdMap.find("typedef")) != metaCmdMap.end()) {
-        currentClass = cmd.value()[0];
-        if ((c = currentClass.lastIndexOf("::")) > 0) {
-            currentTypedef = currentClass.right(currentClass.size()-c-2);
-            currentClass = currentClass.left(c);
-        }
-        metaCmdMap.erase(cmd);
-        commentType = TypedefComment;
-        qDebug() << "currentTypedef =" << currentTypedef;
-        qDebug() << "currentClass =" << currentClass;
-    }
-    
-    cmd = priv->metaCommandMap.begin();
-    while (cmd != priv->metaCommandMap.end()) {
-        for (int i=0; i<cmd.value().size(); i++) {
-            concatenate("\\" + cmd.key() + " " + cmd.value()[i]);
-            newLine();
-        }
-        //qDebug() << "   " << cmd.key() << ": " << cmd.value();
-        ++cmd;
-    }
-}
-
-/*!
-  Convert the qdoc text to doxygen format. The metacommands
-  are converted by convertMetaCommands(). This function is
-  called in pass2().
- */
-void DoxWriter::convertText()
-{
-    const Atom* prev = 0;
-    const Atom* next = priv->text.firstAtom();
-    while (next != 0) {
-        next->dump();
-        Atom::Type atomType = next->type();
-        switch (atomType) {
-            case Atom::AbstractLeft:
-                break;
-            case Atom::AbstractRight:
-                break;
-            case Atom::AutoLink:
-                concatenate(next->string());
-                break;
-            case Atom::BaseName:
-                break;
-            case Atom::BriefLeft:
-                concatenate("\\brief ");
-                break;
-            case Atom::BriefRight:
-                newLine();
-                break;
-            case Atom::C:
-                tt(next);
-                break;
-            case Atom::CaptionLeft:
-                unhandled(next);
-                break;
-            case Atom::CaptionRight:
-                unhandled(next);
-                break;
-            case Atom::Code:
-                code(next);
-                break;
-            case Atom::CodeBad:
-                code(next);
-                break;
-            case Atom::CodeNew:
-                newLine();
-                concatenate("you can rewrite it as");
-                code(next);
-                break;
-            case Atom::CodeOld:
-                newLine();
-                concatenate("For example, if you have code like");
-                code(next);
-                break;
-            case Atom::CodeQuoteArgument:
-                unhandled(next);
-                break;
-            case Atom::CodeQuoteCommand:
-                next = codeQuoteCommand(next);
-                break;
-            case Atom::FootnoteLeft:
-                break;
-            case Atom::FootnoteRight:
-                break;
-            case Atom::FormatElse:
-                formatElse();
-                break;
-            case Atom::FormatEndif:
-                formatEndif();
-                break;
-            case Atom::FormatIf:
-                formatIf(next);
-                break;
-            case Atom::FormattingLeft:
-                formattingLeft(next,next->next());
-                break;
-            case Atom::FormattingRight:
-                formattingRight(next,prev);
-                break;
-            case Atom::GeneratedList:
-                break;
-            case Atom::Image:
-                break;
-            case Atom::ImageText:
-                break;
-            case Atom::InlineImage:
-                break;
-            case Atom::LegaleseLeft:
-                break;
-            case Atom::LegaleseRight:
-                break;
-            case Atom::LineBreak:
-                break;
-            case Atom::Link:
-                next = link(next);
-                break;
-            case Atom::LinkNode:
-                break;
-            case Atom::ListLeft:
-                {
-                    bool nested = false;
-                    if (structs.isEmpty()) {
-                        const Atom* i = next->next();
-                        while (i->type() != Atom::ListRight) {
-                            if ((i->type() == Atom::ListLeft) ||
-                                (i->type() == Atom::TableLeft)) {
-                                nested = true;
-                                break;
-                            }
-                            i = i->next();
-                        }
-                    }
-                    else
-                        nested = true;
-                    StructDesc d(BulletList,nested);
-                    if (next->string() == "numeric")
-                        d.structType = NumericList;
-                    else if (next->string() == "value") {
-                        d.structType = ValueList;
-                    }
-                    else if (next->string() != "bullet")
-                        qDebug() << "UNKNOWN LIST TYPE" << next->string();
-                    structs.push(d);
-                    if (nested || (d.structType != BulletList)) {
-                        if (d.structType == BulletList)
-                            concatenate("<ul>");
-                        else if (d.structType == NumericList)
-                            concatenate("<ol>");
-                        else if (d.structType == ValueList)
-                            concatenate("<dl>");
-                        newLine();
-                    }
-                }
-                break;
-            case Atom::ListItemNumber:
-                structs.top().count = next->string().toInt();
-                break;
-            case Atom::ListTagLeft:
-                {
-                    structs.top().count++;
-                    concatenate("<dt>");
-                    const Atom* n = next->next();
-                    if (n->type() == Atom::String) {
-                        qDebug() << "ENUM VALUE" << n->string();
-                    }
-                    else 
-                        qDebug() << "NOT EN ENUM";
-                }
-                break;
-            case Atom::ListTagRight:
-                concatenate("</dt>");
-                break;
-            case Atom::ListItemLeft:
-                {
-                    newLine();
-                    const StructDesc& d = structs.top();
-                    if (d.structType == BulletList) {
-                        if (!d.nested) 
-                            concatenate("\\arg ");
-                        else
-                            concatenate("<li>");
-                    }
-                    else if (d.structType == NumericList)
-                        concatenate("<li>");
-                    else if (d.structType == ValueList)
-                        concatenate("<dd>");
-                }
-                break;
-            case Atom::ListItemRight:
-                {
-                    const StructDesc& d = structs.top();
-                    if (d.structType == BulletList) {
-                        if (d.nested) {
-                            concatenate("</li>");
-                            newLine();
-                        }
-                    }
-                    else if (d.structType == NumericList) {
-                        concatenate("</li>");
-                        newLine();
-                    }
-                    else if (d.structType == ValueList) {
-                        concatenate("</dd>");
-                        newLine();
-                    }
-                }
-                break;
-            case Atom::ListRight:
-                {
-                    if (!structs.isEmpty()) {
-                        const StructDesc& d = structs.top();
-                        if (d.nested || (d.structType != BulletList)) {
-                            if (d.structType == BulletList)
-                                concatenate("</ul>");
-                            else if (d.structType == NumericList)
-                                concatenate("</ol>");
-                            else if (d.structType == ValueList)
-                                concatenate("</dl>");
-                            newLine();
-                        }
-                        structs.pop();
-                    }
-                }
-                break;
-            case Atom::Nop:
-                // nothing.
-                break;
-            case Atom::ParaLeft:
-                if (structs.isEmpty())
-                    newLine();
-                break;
-            case Atom::ParaRight:
-                {
-                    if (structs.isEmpty())
-                        newLine();
-                    else {
-                        const StructDesc& d = structs.top();
-                        if (d.nested || (d.structType != BulletList)) {
-                            Atom::Type t = next->next()->type(); 
-                            if ((t != Atom::ListItemRight) &&
-                                (t != Atom::TableItemRight))
-                                newLine();
-                        }
-                        else
-                            newLine();
-                    }
-                }
-                break;
-            case Atom::QuotationLeft:
-                break;
-            case Atom::QuotationRight:
-                break;
-            case Atom::RawString:
-                concatenate(next->string());
-                break;
-            case Atom::SectionLeft:
-                // nothing.
-                break;
-            case Atom::SectionRight:
-                // nothing.
-                break;
-            case Atom::SectionHeadingLeft:
-                next = sectionHeading(next);
-                break;
-            case Atom::SectionHeadingRight:
-                newLine();
-                break;
-            case Atom::SidebarLeft:
-                break;
-            case Atom::SidebarRight:
-                break;
-            case Atom::SnippetCommand:
-                newLine();
-                concatenate("\\snippet ");
-                break;
-            case Atom::SnippetIdentifier:
-                newText += next->string();
-                lineLength += next->string().size();
-                newLine();
-                break;
-            case Atom::SnippetLocation:
-                newText += next->string() + " ";
-                lineLength += next->string().size() + 1;
-                break;
-            case Atom::String:
-                wrap(next->string());
-                break;
-            case Atom::TableLeft:
-                {
-                    bool nested = false;
-                    if (structs.isEmpty()) {
-                        const Atom* i = next->next();
-                        while (i->type() != Atom::TableRight) {
-                            if ((i->type() == Atom::ListLeft) ||
-                                (i->type() == Atom::TableLeft)) {
-                                nested = true;
-                                break;
-                            }
-                            i = i->next();
-                        }
-                    }
-                    else
-                        nested = true;
-                    StructDesc d(Table,nested);
-                    structs.push(d);
-                    if (next->string().isEmpty())
-                        concatenate("<table>");
-                    else {
-                        QString attrs = "width=\"" + next->string() + "\"";
-                        attrs += " align=\"center\""; 
-                        concatenate("<table " + attrs + ">");
-                    }
-                    newLine();
-                }
-                break;
-            case Atom::TableRight:
-                concatenate("</table>");
-                if (!structs.isEmpty())
-                    structs.pop();
-                newLine();
-                break;
-            case Atom::TableHeaderLeft:
-                concatenate("<tr>");
-                if (!structs.isEmpty())
-                    structs.top().inTableHeader = true;
-                newLine();
-                break;
-            case Atom::TableHeaderRight:
-                concatenate("</tr>");
-                if (!structs.isEmpty())
-                    structs.top().inTableHeader = false;
-                newLine();
-                break;
-            case Atom::TableRowLeft:
-                if (!structs.isEmpty()) {
-                    structs.top().inTableRow = true;
-                    concatenate("<tr valign=\"top\" class=\"");
-                    if (structs.top().odd)
-                        concatenate("odd\">");
-                    else
-                        concatenate("even\">");
-                    structs.top().odd = !structs.top().odd;
-                }
-                newLine();
-                break;
-            case Atom::TableRowRight:
-                concatenate("</tr>");
-                if (!structs.isEmpty())
-                    structs.top().inTableRow = false;
-                newLine();
-                break;
-            case Atom::TableItemLeft:
-                if (!structs.isEmpty()) {
-                    structs.top().inTableItem = true;
-                    concatenate("<td>");
-                    if (structs.top().inTableHeader)
-                        concatenate("<b> ");
-                }
-                break;
-            case Atom::TableItemRight:
-                if (!structs.isEmpty()) {
-                    structs.top().inTableItem = false;
-                    if (structs.top().inTableHeader)
-                        concatenate(" </b>");
-                    concatenate("</td>");
-                }
-                newLine();
-                break;
-            case Atom::TableOfContents:
-                break;
-            case Atom::Target:
-                {
-                    QString text = next->string();
-                    text.remove(ws_rx);
-                    newLine();
-                    concatenate("\\anchor ");
-                    newText += text;
-                    lineLength += text.size();
-                    newLine();
-                }
-                break;
-            case Atom::UnhandledFormat:
-                unhandled(next);
-                break;
-            case Atom::UnknownCommand:
-                unhandled(next);
-                break;
-            default:
-                //next->dump();
-                break;
-        }
-        prev = next;
-        next = next->next();
-    }
-}
-
-/*!
-  
-  Pass one looks for topic commands and target and section
-  commands, and maybe other stuff. These are serialized to
-  text files, which are read back in by pass2().
- */
-void DoxWriter::pass1()
-{
-    QCommandMap& metaCmdMap = priv->metaCommandMap;
-    if (!metaCmdMap.isEmpty()) {
-        int c;
-        QCommandMap::iterator cmd;
-        if ((cmd = metaCmdMap.find("enum")) != metaCmdMap.end()) {
-            commentType = EnumComment;
-            currentEnum = cmd.value()[0];
-            if ((c = currentEnum.lastIndexOf("::")) > 0) {
-                currentClass = currentEnum.left(c);
-                currentEnum = currentEnum.right(currentEnum.size()-c-2);
-                qDebug() << "currentEnum =" << currentEnum;
-                qDebug() << "currentClass =" << currentClass;
-                if (enums.contains(currentEnum,currentClass)) {
-                    qWarning() << "DoxWriter::pass1():"
-                               << "Duplicate enum:" 
-                               << currentClass << currentEnum;
-                }
-                else 
-                    enums.insert(currentEnum,currentClass);
-            }
-        }
-        else if ((cmd = metaCmdMap.find("property")) != metaCmdMap.end()) {
-            commentType = PropertyComment;
-            currentClass = cmd.value()[0];
-            if ((c = currentClass.lastIndexOf("::")) > 0) {
-                currentProperty = currentClass.right(currentClass.size()-c-2);
-                currentClass = currentClass.left(c);
-                qDebug() << "currentProperty =" << currentProperty;
-                qDebug() << "currentClass =" << currentClass;
-                if (properties.contains(currentProperty,currentClass)) {
-                    qWarning() << "DoxWriter::pass1():"
-                               << "Duplicate property:" 
-                               << currentClass << currentProperty;
-                }
-                else 
-                    properties.insert(currentProperty,currentClass);
-            }
-        }
-        else if ((cmd = metaCmdMap.find("variable")) != metaCmdMap.end()) {
-            commentType = VariableComment;
-            currentClass = cmd.value()[0];
-            if ((c = currentClass.lastIndexOf("::")) > 0) {
-                currentVariable = currentClass.right(currentClass.size()-c-2);
-                currentClass = currentClass.left(c);
-                qDebug() << "currentVariable =" << currentVariable;
-                qDebug() << "currentClass =" << currentClass;
-                if (variables.contains(currentVariable,currentClass)) {
-                    qWarning() << "DoxWriter::pass1():"
-                               << "Duplicate variable:" 
-                               << currentClass << currentVariable;
-                }
-                else 
-                    variables.insert(currentVariable,currentClass);
-            }
-        }
-    }
-
-    /*
-     */
-    const Atom* next = priv->text.firstAtom();
-    while (next != 0) {
-        switch (next->type()) {
-            case Atom::SectionHeadingLeft:
-                {
-                    QString text;
-                    next = next->next();
-                    while (next) {
-                        if (next->type() == Atom::SectionHeadingRight)
-                            break;
-                        else
-                            text += next->string();
-                        next = next->next();
-                    }
-                    //text.remove(ws_rx);
-                    insertAnchor(text);
-                }
-                break;
-            case Atom::Target:
-                {
-                    QString text = next->string();
-                    //text.remove(ws_rx);
-                    insertAnchor(text);
-                }
-            default:
-                break;
-        }
-        next = next->next();
-    }
-}
-
-/*!
-  Output a parsed, tokenized qdoc comment as a doxygen
-  comment in diff format for input to the patch command.
- */
-void DoxWriter::pass2()
-{
-    if (!conversionRequired()) {
-        qDebug() << "NO CONVERSION - FILE:" << priv->start_loc.fileName()
-                 << "START:" << priv->start_loc.lineNo()
-                 << "END:" << priv->end_loc.lineNo() - 1;
-        return;
-    }
-
-    /*
-      Transformation to doxygen required...
-     */
-    newText = "\n/*! \n";
-    convertMetaCommands();
-    convertText();
-    if (newText[newText.size()-1] == ' ')
-        newText.remove(newText.size()-1,1);
-    newText += " */\n";
-    qDebug() << "CONVERTED COMMENT - FILE:" << priv->start_loc.fileName()
-             << "START:" << priv->start_loc.lineNo()
-             << "END:" << priv->end_loc.lineNo() - 1;
-    qDebug() << newText; 
-}
-
-/*!
-  Unparse the second parameter of a "\l" command.
- */
-const Atom* DoxWriter::link(const Atom* atom)
-{
-    QString first_text = atom->string();
-    QString second_text;
-    const QString* value = 0;
-
-    const Atom* next = atom->next(Atom::FormattingLeft,Atom::LINK_);
-    if (next) {
-        next->dump();
-        while (1) {
-            next = next->next();
-            next->dump();
-            if (next->type() == Atom::FormattingRight) {
-                if (next->string() == Atom::LINK_)
-                    break;
-                else {
-                    // ignore it.
-                }
-            }
-            else
-                second_text += next->string();
-        }
-        int i = first_text.indexOf('#');
-        if (i >= 0) 
-            first_text = first_text.right(first_text.size() - i - 1);
-        //newLine();
-        if ((value = getExternalPage(first_text))) {
-            //qDebug() << "USED AN EXTERNAL PAGE TITLE" << first_text;
-            QString href = "<a href=\""+*value+"\">"+first_text+"</a>";
-            concatenate(href);
-        }
-        else if (first_text.startsWith("http:",Qt::CaseInsensitive)) {
-            if (first_text == second_text) {
-                concatenate(first_text);
-            }
-            else {
-                QString href = "<a href=\""+first_text+"\">"+second_text+"</a>";
-                concatenate(href);
-            }
-        }
-        else if ((value = getPageFile(first_text))) {
-            //qDebug() << "USED A PAGE TITLE" << first_text;
-            QStringList parts = (*value).split('.');
-            QString ref = "\\ref " + parts[0] + " \"" + second_text + "\"";
-            concatenate(ref);
-        }
-        else if ((value = getGroup(first_text))) {
-            //qDebug() << "USED A GROUP TITLE" << first_text;
-            concatenate("\\ref " + *value + " \"" + second_text + "\"");
-        }
-        else if ((value = getModule(first_text))) {
-            //qDebug() << "USED A MODULE TITLE" << first_text;
-            concatenate("\\ref " + *value + " \"" + second_text + "\"");
-        }
-        else if ((value = getExamplePath(first_text))) {
-            //qDebug() << "USED AN EXAMPLE TITLE" << first_text;
-            first_text.remove(ws_rx);
-            QString ref = "\\ref " + first_text + " \"" + second_text + "\"";
-            concatenate(ref);
-        }
-        else if ((value = getFile(first_text))) {
-            //qDebug() << "USED A FILE TITLE" << first_text;
-            // I think this command is no longer available.
-            first_text.remove(ws_rx);
-            QString ref = "\\ref " + first_text + " \"" + second_text + "\"";
-            concatenate(ref);
-        }
-        else if ((value = getHeaderFile(first_text))) {
-            //qDebug() << "USED A HEADER FILE TITLE" << first_text;
-            first_text.remove(ws_rx);
-            QString ref = "\\ref " + first_text + " \"" + second_text + "\"";
-            concatenate(ref);
-        }
-        else if (isAnchor(first_text)) {
-            //qDebug() << "USED AN ANCHOR" << first_text;
-            first_text.remove(ws_rx);
-            QString ref = "\\ref " + first_text + " \"" + second_text + "\"";
-            concatenate(ref);
-        }
-        else if ((value = getPageTitle(first_text))) {
-            //qDebug() << "USED AN INVERSE PAGE TITLE" << first_text;
-            QStringList parts = first_text.split('.');
-            QString ref = "\\ref " + parts[0] + " \"" + second_text + "\"";
-            concatenate(ref);
-        }
-        else if ((value = getExampleTitle(first_text))) {
-            //qDebug() << "USED AN INVERSE EXAMPLE TITLE" << first_text;
-            QString title = *value;
-            title.remove(ws_rx);
-            QString ref = "\\ref " + title  + " \"" + second_text + "\"";
-            concatenate(ref);
-        }
-        else if ((value = getGroupTitle(first_text))) {
-            //qDebug() << "USED AN INVERSE GROUP TITLE" << first_text;
-            concatenate("\\ref " + first_text + " \"" + second_text + "\"");
-        }
-        else if ((value = getModuleTitle(first_text))) {
-            //qDebug() << "USED AN INVERSE MODULE TITLE" << first_text;
-            concatenate("\\ref " + first_text + " \"" + second_text + "\"");
-        }
-        else if ((value = getFileTitle(first_text))) {
-            qDebug() << "USED AN INVERSE FILE TITLE" << first_text;
-        }
-        else if ((value = getHeaderFileTitle(first_text))) {
-            qDebug() << "USED AN INVERSE HEADER FILE TITLE" << first_text;
-        }
-        else if ((first_text.indexOf("::") >= 0) ||
-                 (first_text.indexOf("()") >= 0) ||
-                 (first_text[0] == 'Q')) {
-            //qDebug() << "AUTO-LINKABLE" << first_text;
-            if (first_text == second_text)
-                concatenate(first_text);
-            else {
-                QString link = first_text + " " + second_text;
-                concatenate("\\link " + link + "\\endlink");
-            }
-        }
-        else {
-            QString link;
-            QStringList propertyClasses;
-            QStringList variableClasses;
-            QStringList enumClasses;
-            bool p = isProperty(first_text,propertyClasses);
-            bool v = isVariable(first_text,variableClasses);
-            bool e = isEnum(first_text,enumClasses);
-            if (e) {
-                if (enumClasses.size() == 1)
-                    link = enumClasses[0];
-                else if (enumClasses.contains(currentClass))
-                    link = currentClass;
-                else {
-                    QString msg = "Unqualified enum name: " + first_text; 
-                    QString details = "Classes: " + enumClasses.join(", ");
-                    priv->start_loc.error(msg,details);
-                }
-                if (!link.isEmpty())
-                    qDebug() << "FOUND ENUM" << link << first_text;
-            }
-            else if (p && v) {
-                if (propertyClasses.size() == 1) {
-                    if (variableClasses.size() == 1) {
-                        if (propertyClasses[0] == variableClasses[0])
-                            link = propertyClasses[0];
-                    }
-                }
-                if (link.isEmpty()) {
-                    if (propertyClasses.contains(currentClass) ||
-                        variableClasses.contains(currentClass))
-                        link = currentClass;
-                    else {
-                        propertyClasses += variableClasses;
-                        QString msg = "Unqualified property or variable name: "
-                            + first_text; 
-                        QString details = "Classes: " +
-                            propertyClasses.join(", ");
-                        priv->start_loc.error(msg,details);
-                    }
-                }
-            }
-            else if (p) {
-                if (propertyClasses.size() == 1)
-                    link = propertyClasses[0];
-                else if (propertyClasses.contains(currentClass))
-                    link = currentClass;
-                else {
-                    QString msg = "Unqualified property name: " + first_text; 
-                    QString details = "Classes: " + propertyClasses.join(", ");
-                    priv->start_loc.error(msg,details);
-                }
-            }
-            else if (v) {
-                if (variableClasses.size() == 1)
-                    link = variableClasses[0];
-                else if (variableClasses.contains(currentClass))
-                    link = currentClass;
-                else {
-                    QString msg = "Unqualified variable name: " + first_text; 
-                    QString details = "Classes: " + variableClasses.join(", ");
-                    priv->start_loc.error(msg,details);
-                }
-            }
-            else {
-                qDebug() << "NOT AUTO-LINKABLE" << first_text;
-                QString s = first_text + " " + second_text;
-                concatenate("\\link " + s + "\\endlink");
-            }
-            if (!link.isEmpty()) {
-                link += "::" + first_text + " " + second_text;
-                concatenate("\\link " + link + "\\endlink");
-            }
-        }
-    }
-    else 
-        qDebug() << "LINK with no second parameter!!!!";
-    return next? next : atom;
-}
-
-/*!
-  If the current line length is 0, the current line is
-  indented according to the context.
- */
-void DoxWriter::indentLine()
-{
-    if (lineLength == 0) {
-        newText += DOXYGEN_INDENT_STRING;
-        lineLength = DOXYGEN_INDENT;
-        if (!structs.isEmpty()) {
-            for (int i=1; i<structs.size(); ++i) {
-                newText += DOXYGEN_TAB_STRING;
-                lineLength += DOXYGEN_TAB_SIZE;
-            }
-        }
-    }
-}
-
-/*!
-  Concatenates a newline to the doxygen text, increments the
-  line count, and resets the line length to 0.
- */
-void DoxWriter::newLine()
-{
-    newText += "\n";
-    ++lineCount;
-    lineLength = 0;
-}
-
-static const int maxLineLength = 70;
-
-/*!
-  Concatenate the \a text to the doxygen comment currently
-  under construction and increment the current line length
-  by the size of the \a text.
-  
-  If incrementing the current line length by the \a text size
-  would make the current line length longer than the maximum
-  line length, then call newLine() and indentLine() \e before
-  concatenating the \a text.
- */
-void DoxWriter::concatenate(QString text)
-{
-    if ((lineLength + text.size()) > maxLineLength)
-        newLine();
-    indentLine(); 
-    newText += text;
-    lineLength += text.size();
-}
-
-static bool punctuation(QChar c)
-{
-    switch (c.toAscii()) {
-    case '.':
-    case ',':
-    case ':':
-    case ';':
-    case '/':
-    case '+':
-    case '-':
-    case '?':
-    case '!':
-    case '\"':
-        return true;
-    default:
-        break;
-    }
-    return false;
-}
-
-/*!
-  Concatenate the \a text string to the doxygen text, doing
-  line wrapping where necessary. 
- */
-void DoxWriter::wrap(QString text)
-{
-    int from = 0;
-    int to = -1;
-
-    if ((lineLength == 0) || (lineLength >= maxLineLength)) {
-        if (!text.isEmpty() && (text[0] == ' '))
-            text = text.right(text.size() - 1);
-    }
-
-    indentLine();
-    while (text.size()) {
-        int avail = maxLineLength - lineLength;
-        from = text.indexOf(' ',from);
-        if (from >= 0) {
-            if (from < avail)
-                to = from++;
-            else if (from == 1 && punctuation(text[0]))
-                to = from++;
-            else {
-                if (to >= 0) {
-                    newText += text.left(to+1);
-                    lineLength += to + 1;
-                    text = text.right(text.size() - to - 1);
-                }
-                else {
-                    newLine();
-                    indentLine();
-                    newText += text.left(from+1);
-                    lineLength += from + 1;
-                    text = text.right(text.size() - from - 1);
-                }
-                from = 0;
-                to = -1;
-                if (text.size() && (lineLength > maxLineLength)) {
-                    newLine();
-                    indentLine();
-                }
-            }
-        }
-        else
-            break;
-    }
-    if (text.size()) {
-        if (lineLength >= maxLineLength) {
-            newLine();
-            indentLine();
-        }
-        newText += text;
-        lineLength += text.size();
-    }
-}
-
-/*!
-  This will output something, but it depends on what the
-  \a atom string and the \a next atom string are.
- */
-void DoxWriter::formattingLeft(const Atom* atom, const Atom* next)
-{
-    if (atom->string() == "parameter") {
-        concatenate("\\a ");
-        return;
-    }
-    else if (atom->string() == "underline") {
-        concatenate("<u>");
-        return;
-    }
-    else if (atom->string() == "superscript") {
-        concatenate("<sup>");
-        return;
-    }
-    else if (atom->string() == "subscript") {
-        concatenate("<sub>");
-        return;
-    }
-    int ws = -1;
-    if (next)
-        ws = next->string().indexOf(ws_rx);
-    if (atom->string() == "bold") {
-        if (ws < 0)
-            concatenate("\\b ");
-        else
-            concatenate("<b>");
-    }
-    else if (atom->string() == "italic") {
-        if (ws < 0)
-            concatenate("\\e ");
-        else
-            concatenate("<i>");
-    }
-    else if (atom->string() == "teletype") {
-        if (ws < 0)
-            concatenate("\\c ");
-        else
-            concatenate("<tt>");
-    }
-    else
-        qDebug() << "UNHANDLED FormattingLeft: " << atom->string();
-}
-
-/*!
-  This will output something, but it depends on what the
-  \a atom string and the \a prev atom string are.
- */
-void DoxWriter::formattingRight(const Atom* atom, const Atom* prev)
-{
-    if (atom->string() == "parameter")
-        return;
-    else if (atom->string() == "underline") {
-        concatenate("</u>");
-        return;
-    }
-    else if (atom->string() == "superscript") {
-        concatenate("</sup>");
-        return;
-    }
-    else if (atom->string() == "subscript") {
-        concatenate("</sub>");
-        return;
-    }
-    int ws = -1;
-    if (prev)
-        ws = prev->string().indexOf(ws_rx);
-    if (ws < 0)
-        return;
-    if (atom->string() == "bold")
-        concatenate("</b>");
-    else if (atom->string() == "italic")
-        concatenate("</i>");
-    else if (atom->string() == "teletype")
-        concatenate("</tt>");
-    else
-        qDebug() << "UNHANDLED FormattingRight: " << atom->string();
-}
-
-/*!
-  Output a \c or a <tt>...</tt>.
- */
-void DoxWriter::tt(const Atom* atom)
-{
-    if (atom->string().indexOf(ws_rx) < 0) {
-        concatenate("\\c ");
-        concatenate(atom->string());
-    }
-    else {
-        concatenate("<tt>");
-        concatenate(atom->string());
-        concatenate("</tt>");
-    }
-}
-
-/*!
- */
-void DoxWriter::formatIf(const Atom* atom)
-{
-    if (atom->string() == "HTML") {
-        newLine();
-        concatenate("\\htmlonly");
-        newLine();
-    }
-}
-
-/*!
- */
-void DoxWriter::formatEndif()
-{
-    newLine();
-    concatenate("\\endhtmlonly");
-    newLine();
-}
-
-/*!
- */
-void DoxWriter::formatElse()
-{
-    // nothing.
-}
-
-/*!
-  Pass 1: Construct a section identifier and insert it into
-  the anchor set.
-  
-  Pass 2: Convert section1, section2, and section3 commands
-  to section, subsection, and subsubsection respectively.
-  Warn if a section command higher than 3 is seen.
- */
-const Atom* DoxWriter::sectionHeading(const Atom* atom)
-{
-    QString heading_level = atom->string();
-    QString heading_text;
-    const Atom* next = atom->next();
-    while (next) {
-        next->dump();
-        if (next->type() == Atom::SectionHeadingRight) {
-            if (next->string() == heading_level)
-                break;
-            else {
-                qDebug() << "WRONG SectionHeading number!!!!";
-            }
-        }
-        else
-            heading_text += next->string();
-        next = next->next();
-    }
-
-    QString heading_identifier = heading_text;
-    heading_identifier.remove(ws_rx);
-    
-    newLine();
-    if (heading_level == "1")
-        heading_level = "\\section ";
-    else if (heading_level == "2")
-        heading_level = "\\subsection ";
-    else if (heading_level == "3")
-        heading_level = "\\subsubsection ";
-    else if (heading_level == "4") {
-        heading_level = "\\subsubsection ";
-        qDebug() << "WARNING section4 converted to \\subsubsection";
-    }
-    else {
-        heading_level = "\\subsubsection ";
-        qDebug() << "WARNING section5 converted to \\subsubsection";
-    }
-    concatenate(heading_level);
-    newText += heading_identifier + " ";
-    lineLength += heading_identifier.size() + 1;
-    newText += heading_text;
-    lineLength += heading_text.size();
-    newLine();
-    return next? next : atom;
-}
-
-/*!
-  Report an unhandled atom.
- */
-void DoxWriter::unhandled(const Atom* atom)
-{
-    qDebug() << "UNHANDLED ATOM";
-    atom->dump();
-}
-
-/*!
-  Output a code/endcode block.
- */
-void DoxWriter::code(const Atom* atom)
-{
-    newLine();
-    concatenate("\\code");
-    writeCode(atom->string());
-    concatenate("\\endcode");
-    newLine();
-}
-
-/*!
-  Output a code/endcode block depending on the
-  CodeQuote Command and CodeQuoteArgument parameters.
- */
-const Atom* DoxWriter::codeQuoteCommand(const Atom* atom)
-{
-    QString command = atom->string();
-    atom = atom->next();
-    concatenate("\\code");
-    if (command == "codeline") {
-        newLine();
-        concatenate(atom->string());
-        newLine();
-    }
-    else if (command == "dots") {
-        newLine();
-        concatenate(atom->string());
-        newLine();
-    }
-    else {
-        writeCode(atom->string());
-    }
-    concatenate("\\endcode");
-    return atom;
-}
-
-/*!
-  Appends a block of code to the comment.
- */
-void DoxWriter::writeCode(QString text)
-{
-    int cr_count = text.count('\n') - 1;
-    if (cr_count >= 0) {
-        int last_cr = text.lastIndexOf('\n');
-        newText += text.left(last_cr);
-        lineCount += cr_count;
-    }
-    else 
-        newText += text;
-    newLine();
-}
-
-/*!
-  Inserts \a text into the anchor set. This function is called
-  during doxygen pass 1.
- */
-void DoxWriter::insertAnchor(const QString& text)
-{
-    anchors.insert(text);
-}
-
-/*!
-  Returns true if \a text identifies an anchor, section,
-  subsection, subsubsection, or page.
- */
-bool DoxWriter::isAnchor(const QString& text)
-{
-    return anchors.contains(text);
-}
-
-/*!
-  Write the set of anchors to a file, one per line.
- */
-void DoxWriter::writeAnchors()
-{
-    QFile file("anchors.txt");
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qWarning("Unable to open anchors.txt for writing.");
-        return;
-    }
-    
-    QTextStream out(&file);
-    QSet<QString>::const_iterator i = anchors.constBegin();
-    while (i != anchors.constEnd()) {
-        out << *i << "\n";
-        ++i;
-    }
-    file.close();
-}
-
-/*!
-  Read the set of anchors from the anchors file, one per line,
-  and insert each one into the anchor set.
- */
-void DoxWriter::readAnchors()
-{
-    QFile file("anchors.txt");
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qWarning("Unable to open anchors.txt for reading.");
-        return;
-    }
-    
-    QTextStream in(&file);
-    while (!in.atEnd()) {
-        QString line = in.readLine();
-        anchors.insert(line);
-    }
-    file.close();
-#if 0    
-    QSet<QString>::const_iterator i = anchors.constBegin();
-    while (i != anchors.constEnd()) {
-        qDebug() << *i;
-        ++i;
-    }
-#endif    
-}
-
-/*!
-  Inserts \a title into one of the title maps. \a title is
-  mapped to the \a node name. This function is called during
-  doxygen pass 1.
- */
-void DoxWriter::insertTitle(FakeNode* node, const QString& title)
-{
-    switch (node->subType()) {
-    case FakeNode::Example:
-        if (exampleTitles.contains(title)) {
-            qWarning() << "DoxWriter::insertTitle():"
-                       << "Duplicate example title:"
-                       << title;
-        }
-        else {
-            exampleTitles[title] = node->name();
-            exampleTitlesInverse[node->name()] = title;
-        }
-        break;
-    case FakeNode::HeaderFile: 
-        if (headerFileTitles.contains(title)) {
-            qWarning() << "DoxWriter::insertTitle():"
-                       << "Duplicate header file title:"
-                       << title;
-        }
-        else {
-            headerFileTitles[title] = node->name();
-            headerFileTitlesInverse[node->name()] = title;
-        }
-        break;
-    case FakeNode::File:
-        if (fileTitles.contains(title)) {
-            qWarning() << "DoxWriter::insertTitle():"
-                       << "Duplicate file title:"
-                       << title;
-        }
-        else {
-            fileTitles[title] = node->name();
-            fileTitlesInverse[node->name()] = title;
-        }
-        break;
-    case FakeNode::Group:
-        if (groupTitles.contains(title)) {
-            qWarning() << "DoxWriter::insertTitle():"
-                       << "Duplicate group title:"
-                       << title;
-        }
-        else {
-            groupTitles[title] = node->name();
-            groupTitlesInverse[node->name()] = title;
-        }
-        break;
-    case FakeNode::Module:
-        if (moduleTitles.contains(title)) {
-            qWarning() << "DoxWriter::insertTitle():"
-                       << "Duplicate module title:"
-                       << title;
-        }
-        else {
-            moduleTitles[title] = node->name();
-            moduleTitlesInverse[node->name()] = title;
-        }
-        break;
-    case FakeNode::Page:
-        if (pageTitles.contains(title)) {
-            qWarning() << "DoxWriter::insertTitle():"
-                       << "Duplicate page title:"
-                       << title;
-        }
-        else {
-            pageTitles[title] = node->name();
-            pageTitlesInverse[node->name()] = title;
-        }
-        break;
-    case FakeNode::ExternalPage:
-        if (externalPageTitles.contains(title)) {
-            qWarning() << "DoxWriter::insertTitle():"
-                       << "Duplicate external page title:"
-                       << title;
-        }
-        else {
-            externalPageTitles[title] = node->name();
-            externalPageTitlesInverse[node->name()] = title;
-        }
-        break;
-    default:
-        break;
-    }
-}
-
-/*!
- */
-const QString* DoxWriter::getPageFile(const QString& title)
-{
-    QStringMapEntry entry = pageTitles.find(title);
-    return (entry == pageTitles.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getExamplePath(const QString& title)
-{
-    QStringMapEntry entry = exampleTitles.find(title);
-    return (entry == exampleTitles.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getFile(const QString& title)
-{
-    QStringMapEntry entry = fileTitles.find(title);
-    return (entry == fileTitles.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getHeaderFile(const QString& title)
-{
-    QStringMapEntry entry = headerFileTitles.find(title);
-    return (entry == headerFileTitles.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getGroup(const QString& title)
-{
-    QStringMapEntry entry = groupTitles.find(title);
-    return (entry == groupTitles.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getModule(const QString& title)
-{
-    QStringMapEntry entry = moduleTitles.find(title);
-    return (entry == moduleTitles.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getExternalPage(const QString& title)
-{
-    QStringMapEntry entry = externalPageTitles.find(title);
-    return (entry == externalPageTitles.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getPageTitle(const QString& text)
-{
-    QStringMapEntry entry = pageTitlesInverse.find(text);
-    return (entry == pageTitlesInverse.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getExampleTitle(const QString& text)
-{
-    QStringMapEntry entry = exampleTitlesInverse.find(text);
-    return (entry == exampleTitlesInverse.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getFileTitle(const QString& text)
-{
-    QStringMapEntry entry = fileTitlesInverse.find(text);
-    return (entry == fileTitlesInverse.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getHeaderFileTitle(const QString& text)
-{
-    QStringMapEntry entry = headerFileTitlesInverse.find(text);
-    return (entry == headerFileTitlesInverse.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getGroupTitle(const QString& text)
-{
-    QStringMapEntry entry = groupTitlesInverse.find(text);
-    return (entry == groupTitlesInverse.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getModuleTitle(const QString& text)
-{
-    QStringMapEntry entry = moduleTitlesInverse.find(text);
-    return (entry == moduleTitlesInverse.end()) ? 0 : &entry.value();
-}
-
-/*!
- */
-const QString* DoxWriter::getExternalPageTitle(const QString& text)
-{
-    QStringMapEntry entry = externalPageTitlesInverse.find(text);
-    return (entry == externalPageTitlesInverse.end()) ? 0 : &entry.value();
-}
-
-/*!
-  Serialize \a map to file \a name.
- */
-void DoxWriter::writeMap(const QStringMap& map, const QString& name)
-{
-
-    QFile file(name);
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qWarning() << "Unable to open" << name << "for writing.";
-        return;
-    }
-    
-    QTextStream out(&file);
-    QStringMap::const_iterator i = map.constBegin();
-    while (i != map.constEnd()) {
-        out << i.key() << "\n";
-        out << i.value() << "\n";
-        ++i;
-    }
-    file.close();
-}
-
-/*!
-  Read file \a name into the \a map.
- */
-void DoxWriter::readMap(QStringMap& map, QStringMap& inverseMap, const QString& name)
-{
-    QFile file(name);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qWarning() << "Unable to open" << name << "for reading.";
-        return;
-    }
-    
-    QTextStream in(&file);
-    while (!in.atEnd()) {
-        QString title = in.readLine();
-        QString value = in.readLine();
-        map[title] = value;
-        inverseMap[value] = title;
-    }
-    file.close();
-}
-
-/*!
-  Write the sets of titles to text files, one per line.
- */
-void DoxWriter::writeTitles()
-{
-    if (!pageTitles.isEmpty())
-        writeMap(pageTitles,"pagetitles.txt");
-    if (!fileTitles.isEmpty())
-        writeMap(fileTitles,"filetitles.txt");
-    if (!headerFileTitles.isEmpty())
-        writeMap(headerFileTitles,"headerfiletitles.txt");
-    if (!exampleTitles.isEmpty())
-        writeMap(exampleTitles,"exampletitles.txt");
-    if (!moduleTitles.isEmpty())
-        writeMap(moduleTitles,"moduletitles.txt");
-    if (!groupTitles.isEmpty())
-        writeMap(groupTitles,"grouptitles.txt");
-    if (!externalPageTitles.isEmpty())
-        writeMap(externalPageTitles,"externalpagetitles.txt");
-}
-
-/*!
-  Read the sets of titles from the titles files, one per line,
-  and insert each one into the appropriate title set.
- */
-void DoxWriter::readTitles()
-{
-    readMap(pageTitles,pageTitlesInverse,"pagetitles.txt");
-    readMap(fileTitles,fileTitlesInverse,"filetitles.txt");
-    readMap(headerFileTitles,headerFileTitlesInverse,"headerfiletitles.txt");
-    readMap(exampleTitles,exampleTitlesInverse,"exampletitles.txt");
-    readMap(moduleTitles,moduleTitlesInverse,"moduletitles.txt");
-    readMap(groupTitles,groupTitlesInverse,"grouptitles.txt");
-    readMap(externalPageTitles,
-            externalPageTitlesInverse,
-            "externalpagetitles.txt");
-}
-
-/*!
-  Serialize \a map to file \a name.
- */
-void DoxWriter::writeMultiMap(const QStringMultiMap& map, const QString& name)
-{
-
-    QFile file(name);
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        qWarning() << "Unable to open" << name << "for writing.";
-        return;
-    }
-    
-    QTextStream out(&file);
-    QStringMultiMap::const_iterator i = map.constBegin();
-    while (i != map.constEnd()) {
-        out << i.key() << "\n";
-        out << i.value() << "\n";
-        ++i;
-    }
-    file.close();
-}
-
-/*!
-  Write the4 property names and variable names to text files.
- */
-void DoxWriter::writeMembers()
-{
-    if (!variables.isEmpty())
-        writeMultiMap(variables,"variables.txt");
-    if (!properties.isEmpty())
-        writeMultiMap(properties,"properties.txt");
-    if (!enums.isEmpty())
-        writeMultiMap(enums,"enums.txt");
-}
-
-/*!
-  Read file \a name into the \a map.
- */
-void DoxWriter::readMultiMap(QStringMultiMap& map, const QString& name)
-{
-    QFile file(name);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qWarning() << "Unable to open" << name << "for reading.";
-        return;
-    }
-    
-    QTextStream in(&file);
-    while (!in.atEnd()) {
-        QString member = in.readLine();
-        QString className = in.readLine();
-        map.insert(member,className);
-    }
-    file.close();
-}
-
-/*!
-  Read the property names and variable names from the test files.
- */
-void DoxWriter::readMembers()
-{
-    readMultiMap(variables,"variables.txt");
-    readMultiMap(properties,"properties.txt");
-    readMultiMap(enums,"enums.txt");
-}
-
-/*!
-  Return true if \a name is a property. Loads \a classes with
-  the names of all the classes in which \a name is a property.
- */
-bool DoxWriter::isProperty(const QString& name, QStringList& classes)
-{
-    classes = properties.values(name);
-    return !classes.isEmpty();
-}
-
-/*!
-  Return true if \a name is a variable. Loads \a classes with
-  the names of all the classes in which \a name is a variable.
- */
-bool DoxWriter::isVariable(const QString& name, QStringList& classes)
-{
-    classes = variables.values(name);
-    return !classes.isEmpty();
-}
-
-/*!
-  Return true if \a name is an enum type. Loads \a classes with
-  the names of all the classes in which \a name is an enum type.
- */
-bool DoxWriter::isEnum(const QString& name, QStringList& classes)
-{
-    classes = enums.values(name);
-    return !classes.isEmpty();
-}
-#endif
-
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/doc.h b/tools/qdoc3/doc.h
index 6cb6f0a069..2c1d29ef2d 100644
--- a/tools/qdoc3/doc.h
+++ b/tools/qdoc3/doc.h
@@ -133,183 +133,6 @@ class Doc
     DocPrivate *priv;
 };
 
-#ifdef QDOC2DOX
-
-class DoxWriter
-{
-  public:
-    DoxWriter(const QString& source, DocPrivate* docPrivate)
-        : commentType(OtherComment),
-          lineLength(0),
-          lineCount(0),
-          priv(docPrivate),
-          oldText(source) {}
-    ~DoxWriter() {}
-
-    void pass1();
-    void pass2();
-
-    static void setDoxPass(int pass);
-    static bool isDoxPass(int pass);
-    static bool isDoxPass();
-    static void insertTitle(FakeNode* node, const QString& title);
-    static void writeTitles();
-    static void readTitles();
-    static void writeMembers();
-    static void readMembers();
-    static void writeAnchors();
-    static void readAnchors();
-
-  private:
-    void indentLine();
-    void newLine();
-    void concatenate(QString text);
-    void wrap(QString text);
-    bool conversionRequired() const;
-    void convertMetaCommands();
-    void convertText();
-    const Atom* link(const Atom* atom);
-    void formattingLeft(const Atom* atom, const Atom* next);
-    void formattingRight(const Atom* atom, const Atom* prev);
-    void tt(const Atom* atom);
-    void formatIf(const Atom* atom);
-    void formatEndif();
-    void formatElse();
-    const Atom* sectionHeading(const Atom* atom);
-    void unhandled(const Atom* atom);
-    void code(const Atom* atom);
-    const Atom* codeQuoteCommand(const Atom* atom);
-    void writeCode(QString text);
-    void writeCommand(QCommandMap::const_iterator cmd);
-
-    static void insertAnchor(const QString& text);
-    static bool isAnchor(const QString& text);
-
-    static const QString* getPageFile(const QString& title);
-    static const QString* getFile(const QString& title);
-    static const QString* getExamplePath(const QString& title);
-    static const QString* getHeaderFile(const QString& title);
-    static const QString* getGroup(const QString& title);
-    static const QString* getModule(const QString& title);
-    static const QString* getExternalPage(const QString& title);
-    static const QString* getPageTitle(const QString& text);
-    static const QString* getFileTitle(const QString& text);
-    static const QString* getExampleTitle(const QString& text);
-    static const QString* getHeaderFileTitle(const QString& text);
-    static const QString* getGroupTitle(const QString& text);
-    static const QString* getModuleTitle(const QString& text);
-    static const QString* getExternalPageTitle(const QString& text);
-    
-    static bool isProperty(const QString& title, QStringList& classes);
-    static bool isVariable(const QString& title, QStringList& classes);
-    static bool isEnum(const QString& title, QStringList& classes);
-
- private:
-    static void writeMap(const QStringMap& map, const QString& name);
-    static void readMap(QStringMap& map, 
-                        QStringMap& inverseMap, 
-                        const QString& name);
-    static void writeMultiMap(const QStringMultiMap& map, const QString& name);
-    static void readMultiMap(QStringMultiMap& map, const QString& name);
-
- public: // VS 6, SunCC need this to be public
-    enum StructType { BulletList, NumericList, ValueList, Table };
- private:
-    struct StructDesc {
-        StructType      structType;
-        int             count;
-        bool            nested;
-        bool            inTableHeader;
-        bool            inTableRow;
-        bool            inTableItem;
-        bool            odd;
-
-        StructDesc()
-            : structType(BulletList),
-              count(0),
-              nested(false),
-              inTableHeader(false),
-              inTableRow(false),
-              inTableItem(false),
-              odd(true) { }
-
-        StructDesc(StructType t, bool n)
-            : structType(t),
-              count(0),
-              nested(n),
-              inTableHeader(false),
-              inTableRow(false),
-              inTableItem(false),
-              odd(true) { }
-    };
-
-    typedef QStack<StructDesc> StructStack;
-
-    enum CommentType {
-        ClassComment,
-        EnumComment,
-        ExampleComment,
-        FnComment,
-        GroupComment,
-        HeaderFileComment,
-        MacroComment,
-        ModuleComment,
-        PageComment,
-        PropertyComment,
-        ServiceComment,
-        TypedefComment,
-        VariableComment,
-        OtherComment
-    };
-
-  private:
-    CommentType         commentType;
-    int                 lineLength;
-    int                 lineCount;
-    DocPrivate*         priv;
-    QString             oldText;
-    QString             newText;
-    StructStack         structs;
-
-    QString             currentPage;
-    QString             currentFn;
-    QString             currentTitle;
-    QString             currentEnum;
-    QString             currentProperty;
-    QString             currentVariable;
-    QString             currentExample;
-    QString             currentGroup;
-    QString             currentModule;
-    QString             currentMacro;
-    QString             currentService;
-    QString             currentTypedef;
-    QString             currentHeaderFile;
-    static QString      currentClass;
-
-    static int          doxPass;
-    static QSet<QString> anchors;
-    static QStringMap   exampleTitles;
-    static QStringMap   headerFileTitles;
-    static QStringMap   fileTitles;
-    static QStringMap   groupTitles;
-    static QStringMap   moduleTitles;
-    static QStringMap   pageTitles;
-    static QStringMap   externalPageTitles;
-    static QStringMap   exampleTitlesInverse;
-    static QStringMap   headerFileTitlesInverse;
-    static QStringMap   fileTitlesInverse;
-    static QStringMap   groupTitlesInverse;
-    static QStringMap   moduleTitlesInverse;
-    static QStringMap   pageTitlesInverse;
-    static QStringMap   externalPageTitlesInverse;
-
-    static QStringMultiMap variables;
-    static QStringMultiMap properties;
-    static QStringMultiMap enums;
-};
-
-#endif
-
 QT_END_NAMESPACE
 
 #endif
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 5c247fa988..514d06eb1e 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -98,8 +98,6 @@ static bool slow = false;
 static QStringList defines;
 static QHash<QString, Tree *> trees;
 
-//static int doxygen = 0;
-
 /*!
   Find the Tree for language \a lang and return a pointer to it.
   If there is no Tree for language \a lang in the Tree table, add
@@ -224,18 +222,6 @@ static void processQdocconfFile(const QString &fileName)
     QString lang = config.getString(CONFIG_LANGUAGE);
     Location langLocation = config.lastLocation();
 
-#ifdef QDOC2DOX    
-    // qdoc -> doxygen
-    if (doxygen == 2) {
-        qDebug() << "READING anchors.txt";
-        DoxWriter::readAnchors();
-        qDebug() << "READING title maps";
-        DoxWriter::readTitles();
-        qDebug() << "READING member multimaps";
-        DoxWriter::readMembers();
-    }
-#endif    
-
     /*
       Initialize the tree where all the parsed sources will be stored.
       The tree gets built as the source files are parsed, and then the
@@ -322,17 +308,6 @@ static void processQdocconfFile(const QString &fileName)
     tree->resolveGroups();
     tree->resolveTargets();
 
-#ifdef QDOC2DOX    
-    // qdoc -> doxygen
-    if (doxygen == 1) {
-        DoxWriter::writeAnchors();
-        DoxWriter::writeTitles();
-        DoxWriter::writeMembers();
-    }
-
-    if (doxygen == 0) {
-#endif    
-
     /*
       Now the tree has been built, and all the stuff that needed
       resolving has been resolved. Now it is time to traverse
@@ -357,11 +332,6 @@ static void processQdocconfFile(const QString &fileName)
     
     tree->setVersion("");
     Generator::terminate();
-
-#ifdef QDOC2DOX    
-    }
-#endif    
-
     CodeParser::terminate();
     CodeMarker::terminate();
     CppToQsConverter::terminate();
@@ -456,26 +426,6 @@ int main(int argc, char **argv)
         else if (opt == "-slow") {
             slow = true;
 	}
-        
-#ifdef QDOC2DOX        
-        else if (opt == "-doxygen1") {
-            // qdoc -> doxygen
-            // Don't use this; it isn't ready yet.
-            // Now it's a fossil.
-            qDebug() << "doxygen pass 1";
-            doxygen = 1;
-            DoxWriter::setDoxPass(1);
-        }
-        else if (opt == "-doxygen2") {
-            // qdoc -> doxygen
-            // Don't use this; it isn't ready yet.
-            // Now it's a fossil.
-            qDebug() << "doxygen pass 2";
-            doxygen = 2;
-            DoxWriter::setDoxPass(2);
-        }
-#endif
-        
         else {
 	    qdocFiles.append(opt);
 	}