Changeset 561 for trunk/src/corelib/kernel/qtranslator.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/corelib/kernel/qtranslator.cpp (modified) (10 diffs)

trunk/src/corelib/kernel/qtranslator.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 QtCore module 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$
 **
@@ -59 +59 @@
 #if defined(Q_OS_UNIX)
 #define QT_USE_MMAP
+
 #endif
 
@@ -150 +151 @@
                 } else if (opcode & Q_MOD_100) {
                     leftOperand %= 100;
+
+
+
                 }
 
@@ -207 +211 @@
 }
 
-extern bool qt_detectRTLLanguage();
-
 class QTranslatorPrivate : public QObjectPrivate
 {
@@ -248 +250 @@
 
     \ingroup i18n
-    \ingroup environment
-    \mainclass
 
     An object of this class contains a set of translations from a
@@ -349 +349 @@
 {
     if (QCoreApplication::instance())
-        QCoreApplication::instance()->removeTranslator(this);
+        QCoreApplication::removeTranslator(this);
     Q_D(QTranslator);
     d->clear();
@@ -502 +502 @@
   \fn bool QTranslator::load(const uchar *data, int len)
 
-  Loads the .qm file data \a data of length \a len into the
+  Loads the  file data \a data of length \a len into the
   translator.
 
@@ -820 +820 @@
 */
 
+
+
 #endif // QT_NO_TRANSLATION
-
-QT_END_NAMESPACE