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

trunk/src/tools/uic3/embed.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 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -178 +178 @@
         e->height = img.height();
         e->depth = img.depth();
-        e->numColors = img.numColors();
+        e->numColors = img.();
         e->colorTable = new QRgb[e->numColors];
         e->alpha = img.hasAlphaBuffer();
@@ -196 +196 @@
         e->compressed =
 #endif
-            embedData( out, img.bits(), img.numBytes() );
+            embedData( out, img.bits(), img.() );
         out << "\n};\n\n";
         if ( e->numColors ) {
@@ -239 +239 @@
             else
                 out << "false, ";
-            out << "\"" << e->name << "\" },\n";
+            out <<  << e->name << "\" },\n";
             delete e;
         }