Changeset 846 for trunk/tools/qdoc3/doc.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdoc3/doc.cpp (modified) (4 diffs)

trunk/tools/qdoc3/doc.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -2747 +2747 @@
 }
 
-#if notyet // ###
-Doc::SectioningUnit Doc::sectioningUnit() const
-{
-    if (priv == 0 || priv->extra == 0) {
-        return DocPrivateExtra().sectioningUnit;
-    }
-    else {
-        return priv->extra->sectioningUnit;
-    }
-}
-#endif
-
 const QSet<QString> &Doc::parameterNames() const
 {
@@ -3037 +3025 @@
     result.reserve(title.size());
 
-    bool slurping = false;
+    bool dashAppended = false;
     bool begun = false;
     int lastAlnum = 0;
@@ -3048 +3036 @@
             result += QLatin1Char(c);
             begun = true;
-            slurping = false;
+            dashAppended = false;
             lastAlnum = result.size();
         }
-        else if (!slurping) {
+        else if (!dashAppended) {
             if (begun)
                 result += QLatin1Char('-');
-            slurping = true;
+            dashAppended = true;
         }
+#if 0
+        // This was screwing things up.
         else {
-            // !alnum && slurping -> nothin
+            result += title[i];
+            lastAlnum = result.size();
         }
+#endif        
     }
     result.truncate(lastAlnum);