summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/htmlgenerator.cpp
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2012-03-19 13:26:55 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-20 14:11:06 +0100
commitd06de7f919f64b6e3d251b6644e2aba27751f030 (patch)
tree63fc6d403db9658f98e43eeba22710bb66fd37de /src/tools/qdoc/htmlgenerator.cpp
parent73f011b69c6fcbd10c79aa19938201205b1c344f (diff)
qdoc: Rename qt3 support pages to Compatibility pages.
Task-number: QTBUG-24849 Change-Id: I9453e38372f909d75bb4fb8642dc9bd7b993aa7e Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
-rw-r--r--src/tools/qdoc/htmlgenerator.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index c31a736389..6ab6e9f915 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -1223,7 +1223,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
CodeMarker::Compat);
if (!compatLink.isEmpty())
out() << "<li><a href=\"" << compatLink << "\">"
- << "Qt 3 support members</a></li>\n";
+ << "Compatibility members</a></li>\n";
out() << "</ul>\n";
@@ -1531,7 +1531,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
CodeMarker::Compat);
if (!compatLink.isEmpty())
out() << "<li><a href=\"" << compatLink << "\">"
- << "Qt 3 support members</a></li>\n";
+ << "Compatibility members</a></li>\n";
out() << "</ul>\n";
}
@@ -2140,8 +2140,8 @@ QString HtmlGenerator::generateLowStatusMemberFile(const InnerNode *inner,
QString fileName;
if (status == CodeMarker::Compat) {
- title = "Qt 3 Support Members for " + inner->name();
- fileName = fileBase(inner) + "-qt3." + fileExtension(inner);
+ title = "Compatibility Members for " + inner->name();
+ fileName = fileBase(inner) + "-compat." + fileExtension(inner);
}
else {
title = "Obsolete Members for " + inner->name();
@@ -2154,8 +2154,7 @@ QString HtmlGenerator::generateLowStatusMemberFile(const InnerNode *inner,
if (status == CodeMarker::Compat) {
out() << "<p><b>The following class members are part of the "
- "<a href=\"qt3support.html\">Qt 3 support layer</a>.</b> "
- "They are provided to help you port old code to Qt 4. We advise against "
+ "Qt compatibility layer.</b> We advise against "
"using them in new code.</p>\n";
}
else {
@@ -3277,7 +3276,7 @@ QString HtmlGenerator::fileBase(const Node *node) const
if (!node->isInnerNode()) {
switch (node->status()) {
case Node::Compat:
- result += "-qt3";
+ result += "-compat";
break;
case Node::Obsolete:
result += "-obsolete";
@@ -4702,7 +4701,7 @@ QString HtmlGenerator::fullDocumentLocation(const Node *node, bool subdir)
if (node->type() != Node::Class && node->type() != Node::Namespace) {
switch (node->status()) {
case Node::Compat:
- parentName.replace(".html", "-qt3.html");
+ parentName.replace(".html", "-compat.html");
break;
case Node::Obsolete:
parentName.replace(".html", "-obsolete.html");