diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-09-19 20:18:08 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-21 12:07:19 +0200 |
| commit | 91d2ee5e09a6b48cd1133c727cd02945f29ea994 (patch) | |
| tree | cd609b91d9964b76456f56d4bedcc11b4a7e69ed /src/corelib/kernel/qtranslator.h | |
| parent | 4f1e2aa27a35965f8ddf394452a48e3aa473d9ed (diff) | |
merge translate() overloads
Change-Id: I58f0d2c2ec6da751860a90096c49c662658643c1
Reviewed-on: http://codereview.qt-project.org/5164
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/corelib/kernel/qtranslator.h')
| -rw-r--r-- | src/corelib/kernel/qtranslator.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h index 0a9bbde953..43cd63d1da 100644 --- a/src/corelib/kernel/qtranslator.h +++ b/src/corelib/kernel/qtranslator.h @@ -63,11 +63,8 @@ public: explicit QTranslator(QObject *parent = 0); ~QTranslator(); - // ### Qt 5: Merge (with "int n = -1") virtual QString translate(const char *context, const char *sourceText, - const char *disambiguation = 0) const; - QString translate(const char *context, const char *sourceText, const char *disambiguation, - int n) const; + const char *disambiguation = 0, int n = -1) const; virtual bool isEmpty() const; |