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>

2 files changed, 5 insertions, 25 deletions

diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 1b3e06dd69..6a3a463f6b 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -907,41 +907,24 @@ void QTranslatorPrivate::clear()
 }
 
 /*!
-    Returns the translation for the key (\a context, \a sourceText,
-    \a disambiguation). If none is found, also tries (\a context, \a
-    sourceText, ""). If that still fails, returns an empty string.
-
-    If you need to programatically insert translations in to a
-    QTranslator, this function can be reimplemented.
-
-    \sa load()
-*/
-QString QTranslator::translate(const char *context, const char *sourceText, const char *disambiguation) const
-{
-    Q_D(const QTranslator);
-    return d->do_translate(context, sourceText, disambiguation, -1);
-}
-
-
-/*!
     \overload translate()
 
     Returns the translation for the key (\a context, \a sourceText,
     \a disambiguation). If none is found, also tries (\a context, \a
-    sourceText, ""). If that still fails, returns an empty string.
+    sourceText, ""). If that still fails, returns a null string.
 
     If \a n is not -1, it is used to choose an appropriate form for
     the translation (e.g. "%n file found" vs. "%n files found").
 
+    If you need to programatically insert translations into a
+    QTranslator, this function can be reimplemented.
+
     \sa load()
 */
 QString QTranslator::translate(const char *context, const char *sourceText, const char *disambiguation,
                                int n) const
 {
     Q_D(const QTranslator);
-    // this step is necessary because the 3-parameter translate() overload is virtual
-    if (n == -1)
-        return translate(context, sourceText, disambiguation);
     return d->do_translate(context, sourceText, disambiguation, n);
 }
 
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;