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

trunk/tools/linguist/shared/translatormessage.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 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -144 +144 @@
 
 
-bool TranslatorMessage::operator==(const TranslatorMessage& m) const
-{
-    static QString msgIdPlural = QLatin1String("po-msgid_plural");
-
-    // Special treatment for context comments (empty source).
-    return (m_context == m.m_context)
-        && m_sourcetext == m.m_sourcetext
-        && m_extra[msgIdPlural] == m.m_extra[msgIdPlural]
-        && (m_sourcetext.isEmpty() || m_comment == m.m_comment);
-}
-
-
-bool TranslatorMessage::operator<(const TranslatorMessage& m) const
-{
-    if (m_context != m.m_context)
-        return m_context < m.m_context;
-    if (m_sourcetext != m.m_sourcetext)
-        return m_sourcetext < m.m_sourcetext;
-    return m_comment < m.m_comment;
-}
-
-int qHash(const TranslatorMessage &msg)
-{
-    return
-        qHash(msg.context()) ^
-        qHash(msg.sourceText()) ^
-        qHash(msg.extra(QLatin1String("po-msgid_plural"))) ^
-        qHash(msg.comment());
-}
-
 bool TranslatorMessage::hasExtra(const QString &key) const
 {