diff options
| author | Martin Smith <martin.smith@nokia.com> | 2012-05-08 13:13:14 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-09 02:28:44 +0200 |
| commit | 025d544caa93afd2bc9af5f0bf8cebd2d988cc24 (patch) | |
| tree | 72b64e4a1cb7b920a81a2031932534091afdc47d /src/tools/qdoc/doc.cpp | |
| parent | 3db8f5fbb381f009b111cd91af30bfa9bf159a5d (diff) | |
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>
Diffstat (limited to 'src/tools/qdoc/doc.cpp')
| -rw-r--r-- | src/tools/qdoc/doc.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/tools/qdoc/doc.cpp b/src/tools/qdoc/doc.cpp index eb0efc53d83..af7e26dd171 100644 --- a/src/tools/qdoc/doc.cpp +++ b/src/tools/qdoc/doc.cpp @@ -346,6 +346,8 @@ static QString cleanLink(const QString &link) return link.mid(colonPos + 1).simplified(); } +typedef QMap<QString, ArgList> CommandMap; + class DocPrivate : public Shared { public: @@ -368,7 +370,7 @@ public: QStringList enumItemList; QStringList omitEnumItemList; QSet<QString> metacommandsUsed; - QCommandMap metaCommandMap; + CommandMap metaCommandMap; bool hasLegalese : 1; bool hasSectioningUnits : 1; DocPrivateExtra *extra; @@ -1386,13 +1388,13 @@ void DocParser::parse(const QString& source, append(Atom::ParaRight); p1 = getMetaCommandArgument(cmdStr); } - priv->metaCommandMap[cmdStr].append(p1); + priv->metaCommandMap[cmdStr].append(ArgLocPair(p1,location())); break; case NOT_A_CMD: if (metaCommandSet.contains(cmdStr)) { priv->metacommandsUsed.insert(cmdStr); QString arg = getMetaCommandArgument(cmdStr); - priv->metaCommandMap[cmdStr].append(arg); + priv->metaCommandMap[cmdStr].append(ArgLocPair(arg,location())); if (possibleTopics.contains(cmdStr)) { priv->topics.append(Topic(cmdStr,arg)); } @@ -3043,9 +3045,9 @@ const TopicList& Doc::topicsUsed() const return priv == 0 ? *nullTopicList() : priv->topics; } -QStringList Doc::metaCommandArgs(const QString& metacommand) const +ArgList Doc::metaCommandArgs(const QString& metacommand) const { - return priv == 0 ? QStringList() : priv->metaCommandMap.value(metacommand); + return priv == 0 ? ArgList() : priv->metaCommandMap.value(metacommand); } const QList<Text> &Doc::alsoList() const |