From bdc28e35806d93b259830f8b3fecdf60761c62d0 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Thu, 17 May 2012 04:52:33 +0900 Subject: 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 --- src/corelib/kernel/qcoreapplication.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src') diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 2c942f9037..47be74c0a6 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -213,19 +213,6 @@ inline bool QCoreApplication::sendSpontaneousEvent(QObject *receiver, QEvent *ev { if (event) event->spont = true; return self ? self->notifyInternal(receiver, event) : false; } #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) -- cgit v1.2.3