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

trunk/src/tools/uic3/main.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$
 **
@@ -115 +115 @@
                 if (opt == "wrap" || opt[1] == '\0') {
                     if (!(n < argc-1)) {
-                        error = "Missing name of converted ui file";
+                        error = "Missing name of converted UI file";
                         break;
                     }
@@ -231 +231 @@
                  "\t<uiheaderfile>  name of the data file\n"
                  "   %s  [options] -wrap <converteduifile> <uifile>\n"
-                 "\t<converteduifile>  name of the converted ui file\n"
+                 "\t<converteduifile>  name of the converted UI file\n"
                  "Generate implementation:\n"
                  "   %s  [options] -impl <headerfile> <uifile>\n"
@@ -255 +255 @@
                  "\t-nofwd             Omit forward declarations of custom classes\n"
                  "\t-no-implicit-includes Do not generate #include-directives for custom classes\n"
-                 "\t-nounload          Don't unload plugins after processing\n"
+                 "\t-nounload          Do not unload plugins after processing\n"
                  "\t-tr func           Use func() instead of tr() for i18n\n"
                  "\t-L path            Additional plugin search path\n"
@@ -368 +368 @@
 
     if (headerFile) {
-        out << "#include \"" << headerFile << "\"" << endl << endl;
+        out << "#include \"" << headerFile << '\"' << endl << endl;
     }