From d06de7f919f64b6e3d251b6644e2aba27751f030 Mon Sep 17 00:00:00 2001
From: Casper van Donderen <casper.vandonderen@nokia.com>
Date: Mon, 19 Mar 2012 13:26:55 +0100
Subject: [PATCH] qdoc: Rename qt3 support pages to Compatibility pages.

Task-number: QTBUG-24849

Change-Id: I9453e38372f909d75bb4fb8642dc9bd7b993aa7e
Reviewed-by: Martin Smith <martin.smith@nokia.com>
---
 src/tools/qdoc/generator.cpp         |  7 ++-----
 src/tools/qdoc/helpprojectwriter.cpp |  8 ++++----
 src/tools/qdoc/htmlgenerator.cpp     | 15 +++++++--------
 src/tools/qdoc/node.cpp              |  2 --
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp
index 04624a5..213efc8 100644
--- a/src/tools/qdoc/generator.cpp
+++ b/src/tools/qdoc/generator.cpp
@@ -1066,13 +1066,10 @@ void Generator::generateStatus(const Node *node, CodeMarker *marker)
                  << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD)
                  << "This "
                  << typeString(node)
-                 << " is part of the Qt 3 compatibility layer."
+                 << " is part of the Qt compatibility layer."
                  << Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD)
                  << " It is provided to keep old source code working. "
-                 << "We strongly advise against "
-                 << "using it in new code. See "
-                 << Atom(Atom::AutoLink, "Porting to Qt 4")
-                 << " for more information."
+                 << "We strongly advise against using it in new code."
                  << Atom::ParaRight;
         }
         break;
diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp
index 0968772..5efd6ef 100644
--- a/src/tools/qdoc/helpprojectwriter.cpp
+++ b/src/tools/qdoc/helpprojectwriter.cpp
@@ -506,10 +506,10 @@ void HelpProjectWriter::writeNode(HelpProject &project, QXmlStreamWriter &writer
             project.files.insert(membersPath);
         }
         if (project.memberStatus[node].contains(Node::Compat)) {
-            QString compatPath = href.left(href.size()-5) + "-qt3.html";
+            QString compatPath = href.left(href.size()-5) + "-compat.html";
             writer.writeStartElement("section");
             writer.writeAttribute("ref", compatPath);
-            writer.writeAttribute("title", tr("Qt 3 support members"));
+            writer.writeAttribute("title", tr("Compatibility members"));
             writer.writeEndElement(); // section
             project.files.insert(compatPath);
         }
@@ -553,10 +553,10 @@ void HelpProjectWriter::writeNode(HelpProject &project, QXmlStreamWriter &writer
                 project.files.insert(membersPath);
             }
             if (project.memberStatus[node].contains(Node::Compat)) {
-                QString compatPath = href.left(href.size()-5) + "-qt3.html";
+                QString compatPath = href.left(href.size()-5) + "-compat.html";
                 writer.writeStartElement("section");
                 writer.writeAttribute("ref", compatPath);
-                writer.writeAttribute("title", tr("Qt 3 support members"));
+                writer.writeAttribute("title", tr("Compatibility members"));
                 writer.writeEndElement(); // section
                 project.files.insert(compatPath);
             }
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index c31a736..6ab6e9f 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");
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index e4350f1..fb4a3fe 100644
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -1171,8 +1171,6 @@ QString Node::moduleName() const
         return "QtNetwork";
     else if (moduleName == "opengl")
         return "QtOpenGL";
-    else if (moduleName == "qt3support")
-        return "Qt3Support";
     else if (moduleName == "svg")
         return "QtSvg";
     else if (moduleName == "sql")
-- 
2.7.4