diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2011-11-28 15:24:25 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-30 22:28:02 +0100 |
| commit | 53a420a4d1a2d845603dd85ce9ce345c6819088e (patch) | |
| tree | 6b1e78ddcfc8843122805273c51cef932c9125e1 /src/corelib/kernel/qcoreapplication.h | |
| parent | 49140efe2d0a31fd529b8e6af09e0df31e3a719c (diff) | |
Merge QObject::tr*() and QCoreApplication::translate() overloads
These were marked as TODO items for Qt 5. Do them now. (The TODO item
was added when plural support was added back in the early Qt 4 days.)
Change-Id: I3be50bc657582db730401103d691234695784340
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.h')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 4d3ee9bc7a..3d6aa170fd 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -139,15 +139,11 @@ public: static void removeTranslator(QTranslator * messageFile); #endif enum Encoding { CodecForTr, UnicodeUTF8, DefaultCodec = CodecForTr }; - // ### Qt 5: merge static QString translate(const char * context, const char * key, const char * disambiguation = 0, - Encoding encoding = CodecForTr); - static QString translate(const char * context, - const char * key, - const char * disambiguation, - Encoding encoding, int n); + Encoding encoding = CodecForTr, + int n = -1); static void flush(); @@ -240,18 +236,12 @@ inline QString QCoreApplication::translate(const char *, const char *sourceText, } #endif -// ### merge the four functions into two (using "int n = -1") #define Q_DECLARE_TR_FUNCTIONS(context) \ public: \ - static inline QString tr(const char *sourceText, const char *disambiguation = 0) \ - { return QCoreApplication::translate(#context, sourceText, disambiguation); } \ - static inline QString trUtf8(const char *sourceText, const char *disambiguation = 0) \ - { return QCoreApplication::translate(#context, sourceText, disambiguation, \ - QCoreApplication::UnicodeUTF8); } \ - static inline QString tr(const char *sourceText, const char *disambiguation, int n) \ + static inline QString tr(const char *sourceText, const char *disambiguation = 0, int n = -1) \ { return QCoreApplication::translate(#context, sourceText, disambiguation, \ QCoreApplication::CodecForTr, n); } \ - static inline QString trUtf8(const char *sourceText, const char *disambiguation, int n) \ + static inline QString trUtf8(const char *sourceText, const char *disambiguation = 0, int n = -1) \ { return QCoreApplication::translate(#context, sourceText, disambiguation, \ QCoreApplication::UnicodeUTF8, n); } \ private: |