From 8b1746b09df51df17befdaccc661ce81a8dfb5e8 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Thu, 28 May 2015 12:07:05 +0200
Subject: qdoc: Just reformatting and removing dead code

Whitespace only.

Change-Id: I6e4b55ad55e22da4150530457202f144fcc7f416
Reviewed-by: Martin Smith <martin.smith@digia.com>
---
 src/tools/qdoc/codeparser.cpp    | 27 ---------------------------
 src/tools/qdoc/cppcodeparser.cpp | 29 ++++++-----------------------
 2 files changed, 6 insertions(+), 50 deletions(-)

(limited to 'src')

diff --git a/src/tools/qdoc/codeparser.cpp b/src/tools/qdoc/codeparser.cpp
index 90823080ce..4f80ec80d9 100644
--- a/src/tools/qdoc/codeparser.cpp
+++ b/src/tools/qdoc/codeparser.cpp
@@ -423,33 +423,6 @@ void CodeParser::checkModuleInclusion(Node* n)
                                             .arg(n->name()).arg(Generator::defaultModuleName()));
             }
             break;
-#if 0
-        case Node::Document:
-            if (n->access() != Node::Private && !n->doc().isEmpty()) {
-                if (n->docSubtype() == Node::HeaderFile) {
-#if 0
-                    n->doc().location().warning(tr("Header file with title \"%1\" has no \\inmodule command; "
-                                                   "using project name by default: %2")
-                                                .arg(n->title()).arg(Generator::defaultModuleName()));
-#endif
-                }
-                else if (n->docSubtype() == Node::Page) {
-#if 0
-                    n->doc().location().warning(tr("Page with title \"%1\" has no \\inmodule command; "
-                                                   "using project name by default: %2")
-                                                .arg(n->title()).arg(Generator::defaultModuleName()));
-#endif
-                }
-                else if (n->docSubtype() == Node::Example) {
-#if 0
-                    n->doc().location().warning(tr("Example with title \"%1\" has no \\inmodule command; "
-                                                   "using project name by default: %2")
-                                                .arg(n->title()).arg(Generator::defaultModuleName()));
-#endif
-                }
-            }
-            break;
-#endif
         default:
             break;
         }
diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp
index 90f91c5f06..0468f3691e 100644
--- a/src/tools/qdoc/cppcodeparser.cpp
+++ b/src/tools/qdoc/cppcodeparser.cpp
@@ -520,16 +520,6 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc,
             else if (t == "ditamap")
                 ptype = Node::DitaMapPage;
         }
-
-#if 0
-        const Node* n = qdb_->checkForCollision(args[0]);
-        if (n) {
-            QString other = n->doc().location().fileName();
-            doc.location().warning(tr("Name/title collision detected: '%1' in '\\%2'")
-                                   .arg(args[0]).arg(command),
-                                   tr("Also used here: %1").arg(other));
-        }
-#endif
         DocumentNode* dn = 0;
         if (ptype == Node::DitaMapPage)
             dn = new DitaMapNode(qdb_->primaryTreeRoot(), args[0]);
@@ -892,8 +882,7 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
             ((Aggregate *) node)->addInclude(arg);
         }
         else {
-            doc.location().warning(tr("Ignored '\\%1'")
-                                   .arg(COMMAND_INHEADERFILE));
+            doc.location().warning(tr("Ignored '\\%1'").arg(COMMAND_INHEADERFILE));
         }
     }
     else if (command == COMMAND_OVERLOAD) {
@@ -932,9 +921,7 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
                 func->setReimplemented(true);
             }
             else {
-                doc.location().warning(tr("Ignored '\\%1' in %2")
-                                       .arg(COMMAND_REIMP)
-                                       .arg(node->name()));
+                doc.location().warning(tr("Ignored '\\%1' in %2").arg(COMMAND_REIMP).arg(node->name()));
             }
         }
     }
@@ -2078,29 +2065,25 @@ bool CppCodeParser::matchDeclList(Aggregate *parent)
         case Tok_Q_DECLARE_SEQUENTIAL_ITERATOR:
             readToken();
             if (match(Tok_LeftParen) && match(Tok_Ident))
-                sequentialIteratorClasses.insert(previousLexeme(),
-                                                 location().fileName());
+                sequentialIteratorClasses.insert(previousLexeme(), location().fileName());
             match(Tok_RightParen);
             break;
         case Tok_Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR:
             readToken();
             if (match(Tok_LeftParen) && match(Tok_Ident))
-                mutableSequentialIteratorClasses.insert(previousLexeme(),
-                                                        location().fileName());
+                mutableSequentialIteratorClasses.insert(previousLexeme(), location().fileName());
             match(Tok_RightParen);
             break;
         case Tok_Q_DECLARE_ASSOCIATIVE_ITERATOR:
             readToken();
             if (match(Tok_LeftParen) && match(Tok_Ident))
-                associativeIteratorClasses.insert(previousLexeme(),
-                                                  location().fileName());
+                associativeIteratorClasses.insert(previousLexeme(), location().fileName());
             match(Tok_RightParen);
             break;
         case Tok_Q_DECLARE_MUTABLE_ASSOCIATIVE_ITERATOR:
             readToken();
             if (match(Tok_LeftParen) && match(Tok_Ident))
-                mutableAssociativeIteratorClasses.insert(previousLexeme(),
-                                                         location().fileName());
+                mutableAssociativeIteratorClasses.insert(previousLexeme(), location().fileName());
             match(Tok_RightParen);
             break;
         case Tok_Q_DECLARE_FLAGS:
-- 
cgit v1.2.3