Changeset 561 for trunk/tools/linguist/shared/ts.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/linguist/shared/ts.cpp (modified) (7 diffs)

trunk/tools/linguist/shared/ts.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Qt Linguist 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -198 +198 @@
             } else if (elementStarts(strlengthvariant)) {
                 if (!result.isEmpty())
-                    result += QChar(Translator::DefaultVariantSeparator);
+                    result += QChar(Translator::VariantSeparator);
                 result += readContents();
             } else {
@@ -515 +515 @@
 {
     int offset;
-    if ((offset = input.indexOf(QChar(Translator::DefaultVariantSeparator))) >= 0) {
+    if ((offset = input.indexOf(QChar(Translator::VariantSeparator))) >= 0) {
         t << " variants=\"yes\">";
         int start = 0;
@@ -525 +525 @@
                 break;
             start = offset + 1;
-            offset = input.indexOf(QChar(Translator::DefaultVariantSeparator), start);
+            offset = input.indexOf(QChar(Translator::VariantSeparator), start);
             if (offset < 0)
                 offset = input.length();
@@ -694 +694 @@
                 if (msg.isPlural()) {
                     t << ">";
-                    QStringList translns = translator.normalizedTranslations(msg, cd, &result);
-                    for (int j = 0; j < qMax(1, translns.count()); ++j) {
+                    );
+                    for (int j = 0; j < ); ++j) {
                         t << "\n            <numerusform";
                         writeVariants(t, "            ", translns[j]);