qdoc: Removed several #if 1 macros.

The code should be there. Also removed
a few obsolete #defines.

Change-Id: Id63418b344157a99ac502329eea4f0bc9dc77849
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

diff --git a/src/tools/qdoc/atom.h b/src/tools/qdoc/atom.h
index 0ab0c9c..80e6625 100644 (file)
--- a/src/tools/qdoc/atom.h
+++ b/src/tools/qdoc/atom.h
@@ -48,8 +48,6 @@
 
 #include <qstringlist.h>
 
-#define QDOC_QML
-
 QT_BEGIN_NAMESPACE
 
 class Atom

diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp
index e5c500c..e309784 100644 (file)
--- a/src/tools/qdoc/ditaxmlgenerator.cpp
+++ b/src/tools/qdoc/ditaxmlgenerator.cpp
@@ -3860,12 +3860,6 @@ QString DitaXmlGenerator::linkForNode(const Node* node, const Node* relative)
                   node, not the file for node.
                  */
                 fn = fileName(relative);
-#if DEBUG_ABSTRACT
-                qDebug() << "ABSTRACT:" << node->parent()->name()
-                         << node->name() << relative->name()
-                         << node->parent()->type() << node->parent()->subType()
-                         << relative->type() << relative->subType() << outFileName();
-#endif
             }
         }
     }

diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 4923b23..769e0ae 100644 (file)
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -2527,16 +2527,10 @@ void HtmlGenerator::generateFunctionIndex(const Node *relative,
     char nextLetter = 'a';
     char currentLetter;
 
-#if 1
     out() << "<ul>\n";
-#endif
     QMap<QString, NodeMap >::ConstIterator f = funcIndex.constBegin();
     while (f != funcIndex.constEnd()) {
-#if 1
         out() << "<li>";
-#else
-        out() << "<p>";
-#endif
         out() << protectEnc(f.key()) << ':';
 
         currentLetter = f.key()[0].unicode();
@@ -2551,17 +2545,11 @@ void HtmlGenerator::generateFunctionIndex(const Node *relative,
             generateFullName((*s)->parent(), relative, marker, *s);
             ++s;
         }
-#if 1
         out() << "</li>";
-#else
-        out() << "</p>";
-#endif
         out() << '\n';
         ++f;
     }
-#if 1
     out() << "</ul>\n";
-#endif
 }
 
 void HtmlGenerator::generateLegaleseList(const Node *relative,
@@ -3377,12 +3365,6 @@ QString HtmlGenerator::linkForNode(const Node *node, const Node *relative)
                   node, not the file for node.
                  */
                 fn = fileName(relative);
-#if DEBUG_ABSTRACT
-                qDebug() << "ABSTRACT:" << node->parent()->name()
-                         << node->name() << relative->name()
-                         << node->parent()->type() << node->parent()->subType()
-                         << relative->type() << relative->subType() << outFileName();
-#endif
             }
         }
     }

diff --git a/src/tools/qdoc/location.h b/src/tools/qdoc/location.h
index 1e1333f..1a65339 100644 (file)
--- a/src/tools/qdoc/location.h
+++ b/src/tools/qdoc/location.h
@@ -50,8 +50,6 @@
 
 #include "tr.h"
 
-#define QDOC_QML
-
 QT_BEGIN_NAMESPACE
 
 class Config;