From 025d544caa93afd2bc9af5f0bf8cebd2d988cc24 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Tue, 8 May 2012 13:13:14 +0200
Subject: qdoc: Fixed qdoc error messages

qdoc prints many error messages without including the
source file path and the line number for where the error
occurs. This makes it difficult to find the place to
fix the error. This update corrects some of those error
messages. Further updates will fix the others.

Change-Id: I9c0eed96482c61643a2d83c5135368413e63ae52
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
---
 src/tools/qdoc/codeparser.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/tools/qdoc/codeparser.cpp')

diff --git a/src/tools/qdoc/codeparser.cpp b/src/tools/qdoc/codeparser.cpp
index f06cc1f0408..1d0c4867633 100644
--- a/src/tools/qdoc/codeparser.cpp
+++ b/src/tools/qdoc/codeparser.cpp
@@ -229,7 +229,7 @@ QSet<QString> CodeParser::commonMetaCommands()
  */
 void CodeParser::processCommonMetaCommand(const Location& location,
                                           const QString& command,
-                                          const QString& arg,
+                                          const ArgLocPair& arg,
                                           Node* node,
                                           Tree* tree)
 {
@@ -241,13 +241,13 @@ void CodeParser::processCommonMetaCommand(const Location& location,
         node->setStatus(Node::Deprecated);
     }
     else if (command == COMMAND_INGROUP) {
-        tree->addToGroup(node, arg);
+        tree->addToGroup(node, arg.first);
     }
     else if (command == COMMAND_INPUBLICGROUP) {
-        tree->addToPublicGroup(node, arg);
+        tree->addToPublicGroup(node, arg.first);
     }
     else if (command == COMMAND_INMODULE) {
-        node->setModuleName(arg);
+        node->setModuleName(arg.first);
     }
     else if (command == COMMAND_INQMLMODULE) {
         node->setQmlModule(arg);
@@ -280,15 +280,15 @@ void CodeParser::processCommonMetaCommand(const Location& location,
         node->setThreadSafeness(Node::Reentrant);
     }
     else if (command == COMMAND_SINCE) {
-        node->setSince(arg);
+        node->setSince(arg.first);
     }
     else if (command == COMMAND_PAGEKEYWORDS) {
-        node->addPageKeywords(arg);
+        node->addPageKeywords(arg.first);
     }
     else if (command == COMMAND_SUBTITLE) {
         if (node->type() == Node::Fake) {
             FakeNode *fake = static_cast<FakeNode *>(node);
-            fake->setSubTitle(arg);
+            fake->setSubTitle(arg.first);
         }
         else
             location.warning(tr("Ignored '\\%1'").arg(COMMAND_SUBTITLE));
@@ -299,11 +299,11 @@ void CodeParser::processCommonMetaCommand(const Location& location,
     else if (command == COMMAND_TITLE) {
         if (node->type() == Node::Fake) {
             FakeNode *fake = static_cast<FakeNode *>(node);
-            fake->setTitle(arg);
+            fake->setTitle(arg.first);
             if (fake->subType() == Node::Example) {
                 ExampleNode::exampleNodeMap.insert(fake->title(),static_cast<ExampleNode*>(fake));
             }
-            nameToTitle.insert(fake->name(),arg);
+            nameToTitle.insert(fake->name(),arg.first);
         }
         else
             location.warning(tr("Ignored '\\%1'").arg(COMMAND_TITLE));
-- 
cgit v1.2.3