diff options
| -rw-r--r-- | src/linguist/linguist/formpreviewview.cpp | 4 | ||||
| -rw-r--r-- | src/linguist/lupdate/cpp.cpp | 6 | ||||
| -rw-r--r-- | src/linguist/shared/translator.cpp | 6 | ||||
| -rw-r--r-- | src/linguist/shared/translator.h | 5 |
4 files changed, 11 insertions, 10 deletions
diff --git a/src/linguist/linguist/formpreviewview.cpp b/src/linguist/linguist/formpreviewview.cpp index 4c24229c1..7c5b24f6c 100644 --- a/src/linguist/linguist/formpreviewview.cpp +++ b/src/linguist/linguist/formpreviewview.cpp @@ -55,9 +55,9 @@ QT_BEGIN_NAMESPACE #if defined(Q_CC_SUN) || defined(Q_CC_HPACC) || defined(Q_CC_XLC) -int qHash(const QUiTranslatableStringValue &tsv) +size_t qHash(const QUiTranslatableStringValue &tsv) #else -static int qHash(const QUiTranslatableStringValue &tsv) +static size_t qHash(const QUiTranslatableStringValue &tsv) #endif { return qHash(tsv.value()) ^ qHash(tsv.qualifier()); diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp index b7823e622..11eda3df2 100644 --- a/src/linguist/lupdate/cpp.cpp +++ b/src/linguist/lupdate/cpp.cpp @@ -45,16 +45,14 @@ static QString MagicComment(QLatin1String("TRANSLATOR")); //#define DIAGNOSE_RETRANSLATABILITY // FIXME: should make a runtime option of this - -uint qHash(const HashString &str) +size_t qHash(const HashString &str) { if (str.m_hash & 0x80000000) str.m_hash = qHash(str.m_str) & 0x7fffffff; return str.m_hash; } - -uint qHash(const HashStringList &list) +size_t qHash(const HashStringList &list) { if (list.m_hash & 0x80000000) { uint hash = 0; diff --git a/src/linguist/shared/translator.cpp b/src/linguist/shared/translator.cpp index d3a4193c9..a2ea32a13 100644 --- a/src/linguist/shared/translator.cpp +++ b/src/linguist/shared/translator.cpp @@ -521,7 +521,7 @@ struct TranslatorMessageIdPtr { Q_DECLARE_TYPEINFO(TranslatorMessageIdPtr, Q_MOVABLE_TYPE); -inline int qHash(TranslatorMessageIdPtr tmp) +inline size_t qHash(TranslatorMessageIdPtr tmp) { return qHash(tmp->id()); } @@ -547,9 +547,9 @@ struct TranslatorMessageContentPtr { Q_DECLARE_TYPEINFO(TranslatorMessageContentPtr, Q_MOVABLE_TYPE); -inline int qHash(TranslatorMessageContentPtr tmp) +inline size_t qHash(TranslatorMessageContentPtr tmp) { - int hash = qHash(tmp->context()) ^ qHash(tmp->sourceText()); + size_t hash = qHash(tmp->context()) ^ qHash(tmp->sourceText()); if (!tmp->sourceText().isEmpty()) // Special treatment for context comments (empty source). hash ^= qHash(tmp->comment()); diff --git a/src/linguist/shared/translator.h b/src/linguist/shared/translator.h index 233e238d8..0d3880c13 100644 --- a/src/linguist/shared/translator.h +++ b/src/linguist/shared/translator.h @@ -106,7 +106,10 @@ public: QString context, source, comment; }; Q_DECLARE_TYPEINFO(TMMKey, Q_MOVABLE_TYPE); -inline uint qHash(const TMMKey &key) { return qHash(key.context) ^ qHash(key.source) ^ qHash(key.comment); } +inline size_t qHash(const TMMKey &key) +{ + return qHash(key.context) ^ qHash(key.source) ^ qHash(key.comment); +} class Translator { |