Changeset 561 for trunk/tools/qdoc3/main.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdoc3/main.cpp (modified) (13 diffs)

trunk/tools/qdoc3/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -44 +44 @@
 */
 
+#include <qglobal.h>
 #include <QtCore>
 #include <stdlib.h>
@@ -95 +96 @@
 
 static bool slow = false;
+static bool showInternal = false;
+static bool obsoleteLinks = false;
 static QStringList defines;
 static QHash<QString, Tree *> trees;
-
-//static int doxygen = 0;
 
 /*!
@@ -122 +123 @@
     Location::information(tr("Usage: qdoc [options] file1.qdocconf ...\n"
                               "Options:\n"
-                              "    -help     "
+                              "    -help         "
                               "Display this information and exit\n"
-                              "    -version  "
+                              "    -version      "
                               "Display version of qdoc and exit\n"
-                              "    -D<name>  "
+                              "    -D<name>      "
                               "Define <name> as a macro while parsing sources\n"
-                              "    -slow     "
-                              "Turn on features that slow down qdoc") );
+                              "    -slow         "
+                              "Turn on features that slow down qdoc\n"
+                              "    -showinternal "
+                              "Include stuff marked internal\n"
+                              "    -obsoletelinks "
+                              "Report links from obsolete items to non-obsolete items") );
 }
 
@@ -137 +142 @@
 static void printVersion()
 {
-    Location::information(tr("qdoc version 4.4.1"));
+    QString s = QString(tr("qdoc version ")) + QString(QT_VERSION_STR);
+    Location::information(s);
 }
 
@@ -161 +167 @@
     }
     config.setStringList(CONFIG_SLOW, QStringList(slow ? "true" : "false"));
+    config.setStringList(CONFIG_SHOWINTERNAL,
+                         QStringList(showInternal ? "true" : "false"));
+    config.setStringList(CONFIG_OBSOLETELINKS,
+                         QStringList(obsoleteLinks ? "true" : "false"));
 
     /*
@@ -223 +233 @@
     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.
@@ -321 +319 @@
     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
@@ -353 +340 @@
     if (!tagFile.isEmpty())
         tree->generateTagFile(tagFile);
-    
+
     tree->setVersion("");
     Generator::terminate();
-
-#ifdef QDOC2DOX    
-    }
-#endif    
-
     CodeParser::terminate();
     CodeMarker::terminate();
@@ -371 +353 @@
     foreach (QTranslator *translator, translators)
         delete translator;
-
     delete tree;
 }
@@ -455 +436 @@
             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 == "-showinternal") {
+            showInternal = true;
         }
-        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);
+        else if (opt == "-obsoletelinks") {
+            obsoleteLinks = true;
         }
-#endif
-        
         else {
             qdocFiles.append(opt);