Merge commit 'qt/master' into kinetic-declarativeui

Conflicts:
	src/corelib/kernel/qabstractitemmodel.cpp
	src/corelib/kernel/qobject.cpp
	tools/qdoc3/htmlgenerator.cpp

2 files changed, 73 insertions, 28 deletions

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index cff8331..75bd069 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -701,13 +701,17 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         else if (atom->string() == ATOM_LIST_VALUE) {
             threeColumnEnumValueTable = isThreeColumnEnumValueTable(atom);
             if (threeColumnEnumValueTable) {
-                out() << "<p><table border=\"1\" cellpadding=\"2\" cellspacing=\"1\" width=\"100%\">\n"
-                         "<tr><th width=\"25%\">Constant</th><th width=\"15%\">Value</th>"
-                         "<th width=\"60%\">Description</th></tr>\n";
+                out() << "<p><table class=\"valuelist\" border=\"1\" cellpadding=\"2\" "
+                      << "cellspacing=\"1\" width=\"100%\">\n"
+                      << "<tr><th width=\"25%\">Constant</th>"
+                      << "<th width=\"15%\">Value</th>"
+                      << "<th width=\"60%\">Description</th></tr>\n";
             }
             else {
-                out() << "<p><table border=\"1\" cellpadding=\"2\" cellspacing=\"1\" width=\"40%\">\n"
-                      << "<tr><th width=\"60%\">Constant</th><th width=\"40%\">Value</th></tr>\n";
+                out() << "<p><table  class=\"valuelist\" border=\"1\" cellpadding=\"2\" "
+                      << "cellspacing=\"1\" width=\"40%\">\n"
+                      << "<tr><th width=\"60%\">Constant</th><th "
+                      << "width=\"40%\">Value</th></tr>\n";
             }
         }
         else {
@@ -881,14 +885,17 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         }
         if (!atom->string().isEmpty()) {
             if (atom->string().contains("%"))
-                out() << "<p><table width=\"" << atom->string() << "\" "
+                out() << "<p><table class=\"generic\" width=\"" << atom->string() << "\" "
                       << "align=\"center\" cellpadding=\"2\" "
                       << "cellspacing=\"1\" border=\"0\">\n";
-            else
-                out() << "<p><table align=\"center\" cellpadding=\"2\" cellspacing=\"1\" border=\"0\">\n";
+            else {
+                out() << "<p><table class=\"generic\" align=\"center\" cellpadding=\"2\" "
+                      << "cellspacing=\"1\" border=\"0\">\n";
+            }
         }
         else {
-            out() << "<p><table align=\"center\" cellpadding=\"2\" cellspacing=\"1\" border=\"0\">\n";
+            out() << "<p><table class=\"generic\" align=\"center\" cellpadding=\"2\" "
+                  << "cellspacing=\"1\" border=\"0\">\n";
         }
         numTableRows = 0;
         break;
@@ -1102,6 +1109,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
             if (!s->inherited.isEmpty())
                 needOtherSection = true;
         } else {
+            out() << "<hr />\n";
             out() << "<a name=\""
                   << registerRef((*s).name.toLower())
                   << "\"></a>\n";
@@ -1637,9 +1645,9 @@ void HtmlGenerator::generateTableOfContents(const Node *node,
 
     QString tdTag;
     if (numColumns > 1) {
-        tdTag = "<td width=\"" +
-            QString::number((100 + numColumns - 1) / numColumns) + "%\">";
-        out() << "<p><table width=\"100%\">\n<tr valign=\"top\">" << tdTag << "\n";
+        tdTag = "<td width=\"" + QString::number((100 + numColumns - 1) / numColumns) + "%\">";
+        out() << "<p><table class=\"toc\" width=\"100%\">\n<tr valign=\"top\">"
+              << tdTag << "\n";
     }
 
     // disable nested links in table of contents
@@ -1879,7 +1887,8 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative,
                                           CodeMarker *marker,
                                           const QMap<QString, const Node *> &nodeMap)
 {
-    out() << "<p><table width=\"100%\" class=\"annotated\" cellpadding=\"2\" cellspacing=\"1\" border=\"0\">\n";
+    out() << "<p><table width=\"100%\" class=\"annotated\" cellpadding=\"2\" "
+          << "cellspacing=\"1\" border=\"0\">\n";
 
     int row = 0;
     foreach (const QString &name, nodeMap.keys()) {
@@ -2036,7 +2045,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
     }
     firstOffset[NumColumns] = classMap.count();
 
-    out() << "<p><table width=\"100%\">\n";
+    out() << "<p><table class=\"generic\" width=\"100%\">\n";
     for (k = 0; k < numRows; k++) {
         out() << "<tr>\n";
         for (i = 0; i < NumColumns; i++) {
@@ -2362,12 +2371,12 @@ void HtmlGenerator::generateSectionList(const Section& section,
             name_alignment = false;
         }
         if (name_alignment) {
-            out() << "<table border=\"0\" cellpadding=\"0\" "
+            out() << "<table class=\"alignedsummary\" border=\"0\" cellpadding=\"0\" "
                   << "cellspacing=\"0\" width=\"100%\">\n";
         }
         else {
             if (twoColumn)
-                out() << "<p><table width=\"100%\" "
+                out() << "<p><table class=\"propsummary\" width=\"100%\" "
                       << "border=\"0\" cellpadding=\"0\""
                       << " cellspacing=\"0\">\n"
                       << "<tr><td width=\"45%\" valign=\"top\">";
@@ -2485,7 +2494,7 @@ void HtmlGenerator::generateSynopsis(const Node *node,
 QString HtmlGenerator::highlightedCode(const QString& markedCode,
                                        CodeMarker *marker,
                                        const Node *relative,
-                                       CodeMarker::SynopsisStyle style,
+                                       CodeMarker::SynopsisStyle ,
                                        bool nameAlignment)
 {
     QString src = markedCode;
@@ -2498,8 +2507,6 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
 
     // replace all <@link> tags: "(<@link node=\"([^\"]+)\">).*(</@link>)"
     static const QString linkTag("link");
-    //if (src.contains("setAcceptDrops"))
-    //    qDebug() << "SRC:" << src;
     bool done = false;
     for (int i = 0, n = src.size(); i < n;) {
         if (src.at(i) == charLangle && src.at(i + 1).unicode() == '@') {
@@ -2664,12 +2671,13 @@ void HtmlGenerator::generateSectionList(const Section& section,
         bool twoColumn = false;
         if (style == CodeMarker::SeparateList) {
             twoColumn = (section.members.count() >= 16);
-        } else if (section.members.first()->type() == Node::Property) {
+        }
+        else if (section.members.first()->type() == Node::Property) {
             twoColumn = (section.members.count() >= 5);
         }
         if (twoColumn)
-            out() << "<p><table width=\"100%\" border=\"0\" cellpadding=\"0\""
-                     " cellspacing=\"0\">\n"
+            out() << "<p><table class=\"generic\" width=\"100%\" border=\"0\" "
+                  << "cellpadding=\"0\" cellspacing=\"0\">\n"
                   << "<tr><td width=\"45%\" valign=\"top\">";
         out() << "<ul>\n";
 
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css
index 45d63db..d8c3d33 100644
--- a/tools/qdoc3/test/classic.css
+++ b/tools/qdoc3/test/classic.css
@@ -14,12 +14,49 @@ H3 {
 
 h3.fn,span.fn
 {
-  background-color: #e0eff6;
+  background-color: #eee;
   border-width: 1px;
   border-style: solid;
-  border-color: #3388be #e0eff6 #e9f8ff #e0eff6;
+  border-color: #ddd #ddd #ddd #ddd ;
   font-weight: bold;
   padding: 6px 0px 6px 10px;
+  margin: 42px 0px 0px 0px;
+}
+
+hr {
+  border: 0;
+  color: #9E9E9E;
+  background-color: #ccc;
+  height: 1px;
+  width: 100%;
+  text-align: left;
+  margin: 34px 0px 34px 0px;
+}
+
+table {
+	border-width: 1px 1px 1px 1px;
+	border-style: solid;
+	border-color: #dddddd;
+	border-collapse: collapse;
+	background-color: #f0f0f0;
+    margin-left: 1.5%;
+    width: 97%
+}
+
+table th {
+	border-width: 1px 1px 1px 2px;
+	padding: 4px;
+	border-style: solid;
+	border-color: #444;
+    color:white;
+    background-color:#444;
+}
+
+p {
+  margin-left: 1.5%;
+  margin-top: 8px;
+  width: 97%
+  margin-bottom: 8px;
 }
 
 a:link
@@ -66,7 +103,7 @@ body
 
 table td.memItemLeft {
   width: 200px;
-  padding: 1px 0px 0px 8px;
+  padding: 2px 0px 0px 8px;
   margin: 4px;
   border-top-width: 1px;
   border-right-width: 1px;
@@ -76,7 +113,7 @@ table td.memItemLeft {
   border-right-color: #E0E0E0;
   border-bottom-color: #E0E0E0;
   border-left-color: #E0E0E0;
-  border-top-style: solid;
+  border-top-style: none;
   border-right-style: none;
   border-bottom-style: none;
   border-left-style: none;
@@ -85,7 +122,7 @@ table td.memItemLeft {
   white-space: nowrap
 }
 table td.memItemRight {
-  padding: 1px 8px 0px 8px;
+  padding: 2px 8px 0px 8px;
   margin: 4px;
   border-top-width: 1px;
   border-right-width: 1px;
@@ -95,7 +132,7 @@ table td.memItemRight {
   border-right-color: #E0E0E0;
   border-bottom-color: #E0E0E0;
   border-left-color: #E0E0E0;
-  border-top-style: solid;
+  border-top-style: none;
   border-right-style: none;
   border-bottom-style: none;
   border-left-style: none;