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/qobject.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/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 48c0bdbfcb..307518d81e 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -132,14 +132,10 @@ public: static const QMetaObject staticMetaObject; #endif #ifdef QT_NO_TRANSLATION - static QString tr(const char *sourceText, const char *, int) - { return QString::fromLatin1(sourceText); } - static QString tr(const char *sourceText, const char * = 0) + static QString tr(const char *sourceText, const char * = 0, int = -1) { return QString::fromLatin1(sourceText); } #ifndef QT_NO_TEXTCODEC - static QString trUtf8(const char *sourceText, const char *, int) - { return QString::fromUtf8(sourceText); } - static QString trUtf8(const char *sourceText, const char * = 0) + static QString trUtf8(const char *sourceText, const char * = 0, int = -1) { return QString::fromUtf8(sourceText); } #endif #endif //QT_NO_TRANSLATION |