Merge two simple version of translate() functions for QT_NO_TRANSLATION

the commit 53a420a4d1a2d845603dd85ce9ce345c6819088e merged translate()
functions. The simple versions need to be merged too.

Change-Id: Ie873483beb8ed0b911ae0568e97b427f4c6b74e3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 2c942f9..47be74c 100644 (file)
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -215,19 +215,6 @@ inline bool QCoreApplication::sendSpontaneousEvent(QObject *receiver, QEvent *ev
 #ifdef QT_NO_TRANSLATION
 // Simple versions
 inline QString QCoreApplication::translate(const char *, const char *sourceText,
-                                           const char *, Encoding encoding)
-{
-#ifndef QT_NO_TEXTCODEC
-    if (encoding == UnicodeUTF8)
-        return QString::fromUtf8(sourceText);
-#else
-    Q_UNUSED(encoding)
-#endif
-    return QString::fromLatin1(sourceText);
-}
-
-// Simple versions
-inline QString QCoreApplication::translate(const char *, const char *sourceText,
                                            const char *, Encoding encoding, int)
 {
 #ifndef QT_NO_TEXTCODEC