Changeset 561 for trunk/tools/qdoc3/separator.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

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

trunk/tools/qdoc3/separator.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -49 +49 @@
 QT_BEGIN_NAMESPACE
 
-QString separator( int index, int count )
+QString separator(int index, int count)
 {
-    if ( index == count - 1 )
-        return tr( ".", "terminator" );
+    if (index == count - 1)
+        return tr(".", "terminator");
+    if (count == 2)
+        return tr(" and ", "separator when N = 2");
+    if (index == 0)
+        return tr(", ", "first separator when N > 2");
+    if (index < count - 2)
+        return tr(", ", "general separator when N > 2");
+    return tr(", and ", "last separator when N > 2");
+}
 
-    if ( count == 2 ) {
-        return tr( " and ", "separator when N = 2" );
-    } else {
-        if ( index == 0 ) {
-            return tr( ", ", "first separator when N > 2" );
-        } else if ( index < count - 2 ) {
-            return tr( ", ", "general separator when N > 2" );
-        } else {
-            return tr( ", and ", "last separator when N > 2" );
-        }
-    }
+QString comma(int index, int count)
+{
+    if (index == count - 1)
+        return QString("");
+    if (count == 2)
+        return tr(" and ", "separator when N = 2");
+    if (index == 0) 
+        return tr(", ", "first separator when N > 2");
+    if (index < count - 2) 
+        return tr(", ", "general separator when N > 2");
+    return tr(", and ", "last separator when N > 2");
 }