Changeset 561 for trunk/src/tools/uic3/parser.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)
• src/tools/uic3/parser.cpp (modified) (6 diffs)

trunk/src/tools/uic3/parser.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 @@
 {
     QString slot(func);
-    int begin = slot.indexOf(QLatin1String("(")) + 1;
+    int begin = slot.indexOf(QLatin1Char('(')) + 1;
     QString args = slot.mid(begin);
-    args = args.left(args.indexOf(QLatin1String(")")));
+    args = args.left(args.indexOf(QLatin1Char(')')));
     QStringList lst = args.split(QLatin1Char(','));
     QString res = slot.left(begin);
     for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it) {
         if (it != lst.begin())
-            res += QLatin1String(",");
+            res += QLatin1Char(',');
         QString arg = *it;
         int pos = 0;
@@ -66 +66 @@
             arg = arg.simplified();
             if ((pos = arg.indexOf(QLatin1Char(':'))) != -1)
-                arg = arg.left(pos).simplified() + QLatin1String(":") + arg.mid(pos + 1).simplified();
+                arg = arg.left(pos).simplified() + QLatin1Char(':') + arg.mid(pos + 1).simplified();
             QStringList l = arg.split(QLatin1Char(' '));
             if (l.count() == 2) {
@@ -74 +74 @@
                     arg = l[0];
             } else if (l.count() == 3) {
-                arg = l[0] + QLatin1String(" ") + l[1];
+                arg = l[0] + QLatin1Char(' ') + l[1];
             }
         }
         res += arg;
     }
-    res += QLatin1String(")");
+    res += QLatin1Char(')');
     return res;
 }