1 files changed, 40 insertions, 31 deletions

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index c07a6e9..5865dc3 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -1729,6 +1729,12 @@ QString QCoreApplication::translate(const char *context, const char *sourceText,
     return result;
 }
 
+// Declared in qglobal.h
+QString qtTrId(const char *id, int n)
+{
+    return QCoreApplication::translate(0, id, 0, QCoreApplication::UnicodeUTF8, n);
+}
+
 bool QCoreApplicationPrivate::isTranslatorInstalled(QTranslator *translator)
 {
     return QCoreApplication::self
@@ -1824,21 +1830,8 @@ QString QCoreApplication::applicationFilePath()
     if (!d->cachedApplicationFilePath.isNull())
         return d->cachedApplicationFilePath;
 
-#if defined( Q_WS_WIN )
-    QFileInfo filePath;
-    QT_WA({
-        wchar_t module_name[MAX_PATH+1];
-        GetModuleFileNameW(0, module_name, MAX_PATH);
-        module_name[MAX_PATH] = 0;
-        filePath = QString::fromUtf16((ushort *)module_name);
-    }, {
-        char module_name[MAX_PATH+1];
-        GetModuleFileNameA(0, module_name, MAX_PATH);
-        module_name[MAX_PATH] = 0;
-        filePath = QString::fromLocal8Bit(module_name);
-    });
-
-    d->cachedApplicationFilePath = filePath.filePath();
+#if defined(Q_WS_WIN)
+    d->cachedApplicationFilePath = QFileInfo(qAppFileName()).filePath();
     return d->cachedApplicationFilePath;
 #elif defined(Q_WS_MAC)
     QString qAppFileName_str = qAppFileName();
@@ -1998,13 +1991,13 @@ QStringList QCoreApplication::arguments()
         return list;
     }
 #ifdef Q_OS_WIN
-    QString cmdline = QT_WA_INLINE(QString::fromUtf16((unsigned short *)GetCommandLineW()), QString::fromLocal8Bit(GetCommandLineA()));
+    QString cmdline = QString::fromWCharArray(GetCommandLine());
 
 #if defined(Q_OS_WINCE)
     wchar_t tempFilename[MAX_PATH+1];
-    if (GetModuleFileNameW(0, tempFilename, MAX_PATH)) {
+    if (GetModuleFileName(0, tempFilename, MAX_PATH)) {
         tempFilename[MAX_PATH] = 0;
-        cmdline.prepend(QLatin1Char('\"') + QString::fromUtf16((unsigned short *)tempFilename) + QLatin1String("\" "));
+        cmdline.prepend(QLatin1Char('\"') + QString::fromWCharArray(tempFilename) + QLatin1String("\" "));
     }
 #endif // Q_OS_WINCE
 
@@ -2311,21 +2304,37 @@ void QCoreApplication::removeLibraryPath(const QString &path)
 /*!
     \fn EventFilter QCoreApplication::setEventFilter(EventFilter filter)
 
-    Sets the event filter \a filter. Returns a pointer to the filter
-    function previously defined.
-
-    The event filter is a function that is called for every message
-    received in all threads. This does \e not include messages to
+    Replaces the event filter function for the QCoreApplication with
+    \a filter and returns the pointer to the replaced event filter
+    function. Only the current event filter function is called. If you
+    want to use both filter functions, save the replaced EventFilter
+    in a place where yours can call it.
+
+    The event filter function set here is called for all messages
+    received by all threads meant for all Qt objects. It is \e not
+    called for messages that are not meant for Qt objects.
+
+    The event filter function should return true if the message should
+    be filtered, (i.e. stopped). It should return false to allow
+    processing the message to continue.
+
+    By default, no event filter function is set (i.e., this function
+    returns a null EventFilter the first time it is called).
+    
+    \note The filter function set here receives native messages,
+    i.e. MSG or XEvent structs, that are going to Qt objects. It is
+    called by QCoreApplication::filterEvent(). If the filter function
+    returns false to indicate the message should be processed further,
+    the native message can then be translated into a QEvent and
+    handled by the standard Qt \l{QEvent} {event} filering, e.g.
+    QObject::installEventFilter().
+
+    \note The filter function set here is different form the filter
+    function set via QAbstractEventDispatcher::setEventFilter(), which
+    gets all messages received by its thread, even messages meant for
     objects that are not handled by Qt.
 
-    The function can return true to stop the event to be processed by
-    Qt, or false to continue with the standard event processing.
-
-    Only one filter can be defined, but the filter can use the return
-    value to call the previously set event filter. By default, no
-    filter is set (i.e., the function returns 0).
-
-    \sa installEventFilter()
+    \sa QObject::installEventFilter(), QAbstractEventDispatcher::setEventFilter()
 */
 QCoreApplication::EventFilter
 QCoreApplication::setEventFilter(QCoreApplication::EventFilter filter)