summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-07-22 09:47:02 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-07-22 09:47:02 (GMT)
commit3a8968dd2aab9c4e40ed34222f557bec6a98349e (patch)
tree38cad8981cd567fbc1164878109604654ba8257d
parent236579465c8328fd4022a3dbbb68bf6fa9ffe4f4 (diff)
downloadQt-3a8968dd2aab9c4e40ed34222f557bec6a98349e.zip
Qt-3a8968dd2aab9c4e40ed34222f557bec6a98349e.tar.gz
Qt-3a8968dd2aab9c4e40ed34222f557bec6a98349e.tar.bz2
qdoc: Reported links to obsolete things that appear in non-obsolete things.
Also marked the other QHttpXxx classes as \obsolete.
-rw-r--r--src/network/access/qhttp.cpp3
-rw-r--r--tools/qdoc3/htmlgenerator.cpp9
2 files changed, 10 insertions, 2 deletions
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index 790b48a..faa2398 100644
--- a/src/network/access/qhttp.cpp
+++ b/src/network/access/qhttp.cpp
@@ -513,6 +513,7 @@ public:
/*!
\class QHttpHeader
+ \obsolete
\brief The QHttpHeader class contains header information for HTTP.
\ingroup io
@@ -1007,6 +1008,7 @@ public:
/*!
\class QHttpResponseHeader
+ \obsolete
\brief The QHttpResponseHeader class contains response header information for HTTP.
\ingroup io
@@ -1211,6 +1213,7 @@ public:
/*!
\class QHttpRequestHeader
+ \obsolete
\brief The QHttpRequestHeader class contains request header information for HTTP.
\ingroup io
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 8d5e3d3..e31f6cf 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -3514,16 +3514,21 @@ QString HtmlGenerator::getLink(const Atom *atom,
else {
*node = relative;
}
-#if 0
+
if (*node) {
if ((*node)->status() == Node::Obsolete) {
if (relative) {
if (relative->parent() != *node) {
if (relative->status() != Node::Obsolete) {
+ relative->doc().location().warning(tr("Link to obsolete item '%1' in %2")
+ .arg(atom->string())
+ .arg(marker->plainFullName(relative)));
+#if 0
qDebug() << "Link to Obsolete entity"
<< (*node)->name();
qDebug() << " relative entity"
<< relative->name();
+#endif
}
}
}
@@ -3543,7 +3548,7 @@ QString HtmlGenerator::getLink(const Atom *atom,
//qDebug() << "Node Status:" << (*node)->status();
#endif
}
-#endif
+
while (!path.isEmpty()) {
targetAtom = tre->findTarget(path.first(), *node);
if (targetAtom == 0)