summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/node.h
diff options
context:
space:
mode:
authorMartin Smith <[email protected]>2013-09-16 13:07:57 +0200
committerThe Qt Project <[email protected]>2013-09-16 15:35:33 +0200
commit433f2315ac07534acb858006f3ad925cd31eaa98 (patch)
tree9f9ea6e35efc0084c6d326d5b564f3a6dc809455 /src/tools/qdoc/node.h
parent4bae7158d379acb15a4eae02a4fc3d3e6103a7f9 (diff)
qdoc: Now reports duplicate page titles better.
Currently, qdoc reports duplicate pages, when it should be reporting duplicate page titles. Sometimes the duplicate titles actually refer to the same page, but often they are different pages with the same title. This update changes the error message to better indicate that two identical page titles were seen. A further complication was that the qdoc warnings for these duplate page title errors were useless when the duplicates were in different Qt5 modules, because the support for file location information in the qdoc index files was inadequate. This update adds better location information to each section in the index file. This makes the index files bigger and will increase qdoc runtimes, hopefully not too much. Task-number: QTBUG-33506 Change-Id: I35db3c5e1551b9ef748d63377e94453da80c1e26 Reviewed-by: Jerome Pasion <[email protected]>
Diffstat (limited to 'src/tools/qdoc/node.h')
-rw-r--r--src/tools/qdoc/node.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h
index 8364fac82ff..76e762120ee 100644
--- a/src/tools/qdoc/node.h
+++ b/src/tools/qdoc/node.h
@@ -169,7 +169,7 @@ public:
void setBaseName(const QString& bn) { baseName_ = bn; }
void setAccess(Access access) { access_ = access; }
- void setLocation(const Location& location) { loc = location; }
+ void setLocation(const Location& location) { loc_ = location; }
void setDoc(const Doc& doc, bool replace = false);
void setStatus(Status status) {
if (status_ == Obsolete && status == Deprecated)
@@ -241,7 +241,7 @@ public:
Access access() const { return access_; }
QString accessString() const;
- const Location& location() const { return loc; }
+ const Location& location() const { return loc_; }
const Doc& doc() const { return doc_; }
Status status() const { return status_; }
Status inheritedStatus() const;
@@ -304,7 +304,7 @@ private:
InnerNode* parent_;
InnerNode* relatesTo_;
QString name_;
- Location loc;
+ Location loc_;
Doc doc_;
QMap<LinkType, QPair<QString, QString> > linkMap_;
QString baseName_;