src/corelib: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support

Also: QString::fromUtf16() -> QString::fromWCharArray()
      WCHAR & TCHAR -> wchar_t
      LPTSTR/LPCTSTR -> LPWSTR/LPCWSTR
      Documentation update

Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>

9 files changed, 83 insertions, 149 deletions

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index e6a471c..f0a3fec 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -1742,18 +1742,10 @@ QString QCoreApplication::applicationFilePath()
         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);
-    });
+    wchar_t module_name[MAX_PATH];
+    GetModuleFileName(0, module_name, MAX_PATH);
+    module_name[MAX_PATH] = 0;
+    QFileInfo filePath = QString::fromWCharArray(module_name);
 
     d->cachedApplicationFilePath = filePath.filePath();
     return d->cachedApplicationFilePath;
@@ -1902,13 +1894,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
 
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp
index 7a35340..657abd1 100644
--- a/src/corelib/kernel/qcoreapplication_win.cpp
+++ b/src/corelib/kernel/qcoreapplication_win.cpp
@@ -45,14 +45,15 @@
 #include "qt_windows.h"
 #include "qvector.h"
 #include "qmutex.h"
+#include "qfileinfo.h"
 #include "qcorecmdlineargs_p.h"
 #include <private/qthread_p.h>
 #include <ctype.h>
 
 QT_BEGIN_NAMESPACE
 
-char         appFileName[MAX_PATH+1];                // application file name
-char         theAppName[MAX_PATH+1];                        // application name
+char         appFileName[MAX_PATH];                // application file name
+char         theAppName[MAX_PATH];                        // application name
 HINSTANCE appInst        = 0;                // handle to app instance
 HINSTANCE appPrevInst        = 0;                // handle to prev app instance
 int appCmdShow = 0;
@@ -73,48 +74,35 @@ Q_CORE_EXPORT int qWinAppCmdShow()                        // get main window sho
     return appCmdShow;
 }
 
+Q_CORE_EXPORT QString qAppFileName()                // get application file name
+{
+    wchar_t buffer[MAX_PATH];
+    GetModuleFileName(0, buffer, MAX_PATH);
+    return QString::fromWCharArray(buffer);
+}
 
 void set_winapp_name()
 {
     static bool already_set = false;
     if (!already_set) {
         already_set = true;
-#ifndef Q_OS_WINCE
-        GetModuleFileNameA(0, appFileName, sizeof(appFileName));
-        appFileName[sizeof(appFileName)-1] = 0;
-#else
-        QString afm;
-        afm.resize(sizeof(appFileName));
-        afm.resize(GetModuleFileName(0, (wchar_t *) (afm.unicode()), sizeof(appFileName)));
-        memcpy(appFileName, afm.toLatin1(), sizeof(appFileName));
-#endif
-        const char *p = strrchr(appFileName, '\\');        // skip path
-        if (p)
-            memcpy(theAppName, p+1, qstrlen(p));
-        int l = qstrlen(theAppName);
-        if ((l > 4) && !qstricmp(theAppName + l - 4, ".exe"))
-            theAppName[l-4] = '\0';                // drop .exe extension
 
-        if (appInst == 0) {
-            QT_WA({
-                appInst = GetModuleHandle(0);
-            }, {
-                appInst = GetModuleHandleA(0);
-            });
-        }
-    }
-}
+        QString moduleName = qAppFileName();
 
-Q_CORE_EXPORT QString qAppFileName()                // get application file name
-{
-    return QString::fromLatin1(appFileName);
+        QByteArray filePath = moduleName.toLocal8Bit();
+        QByteArray fileName = QFileInfo(moduleName).baseName().toLocal8Bit();
+
+        memcpy(appFileName, filePath.constData(), filePath.length());
+        memcpy(theAppName, fileName.constData(), fileName.length());
+
+        if (appInst == 0)
+            appInst = GetModuleHandle(0);
+    }
 }
 
 QString QCoreApplicationPrivate::appName() const
 {
-    if (!theAppName[0])
-        set_winapp_name();
-    return QString::fromLatin1(theAppName);
+    return QFileInfo(qAppFileName()).baseName();
 }
 
 class QWinMsgHandlerCriticalSection
@@ -145,15 +133,11 @@ Q_CORE_EXPORT void qWinMsgHandler(QtMsgType t, const char* str)
         str = "(null)";
 
     staticCriticalSection.lock();
-    QT_WA({
-        QString s(QString::fromLocal8Bit(str));
-        s += QLatin1Char('\n');
-        OutputDebugStringW((TCHAR*)s.utf16());
-    }, {
-        QByteArray s(str);
-        s += '\n';
-        OutputDebugStringA(s.data());
-    })
+
+    QString s(QString::fromLocal8Bit(str));
+    s += QLatin1Char('\n');
+    OutputDebugString((wchar_t*)s.utf16());
+
     staticCriticalSection.unlock();
 }
 
diff --git a/src/corelib/kernel/qcorecmdlineargs_p.h b/src/corelib/kernel/qcorecmdlineargs_p.h
index c0dd813..a012b4e 100644
--- a/src/corelib/kernel/qcorecmdlineargs_p.h
+++ b/src/corelib/kernel/qcorecmdlineargs_p.h
@@ -135,9 +135,9 @@ static inline QStringList qWinCmdArgs(QString cmdLine) // not const-ref: this mi
     QStringList args;
 
     int argc = 0;
-    QVector<ushort*> argv = qWinCmdLine<ushort>((ushort*)cmdLine.utf16(), cmdLine.length(), argc);
+    QVector<wchar_t*> argv = qWinCmdLine<wchar_t>((wchar_t *)cmdLine.utf16(), cmdLine.length(), argc);
     for (int a = 0; a < argc; ++a) {
-        args << QString::fromUtf16(argv[a]);
+        args << QString::fromWCharArray(argv[a]);
     }
 
     return args;
@@ -147,10 +147,7 @@ static inline QStringList qCmdLineArgs(int argc, char *argv[])
 {
     Q_UNUSED(argc)
     Q_UNUSED(argv)
-    QString cmdLine = QT_WA_INLINE(
-        QString::fromUtf16((unsigned short*)GetCommandLineW()),
-        QString::fromLocal8Bit(GetCommandLineA())
-    );
+    QString cmdLine = QString::fromWCharArray(GetCommandLine());
     return qWinCmdArgs(cmdLine);
 }
 
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index cb1549c..23e4fa9 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -355,8 +355,7 @@ QEventDispatcherWin32Private::QEventDispatcherWin32Private()
 {
     resolveTimerAPI();
 
-    wakeUpNotifier.setHandle(QT_WA_INLINE(CreateEventW(0, FALSE, FALSE, 0),
-                                          CreateEventA(0, FALSE, FALSE, 0)));
+    wakeUpNotifier.setHandle(CreateEvent(0, FALSE, FALSE, 0));
     if (!wakeUpNotifier.handle())
         qWarning("QEventDispatcher: Creating QEventDispatcherWin32Private wakeup event failed");
 }
@@ -367,13 +366,8 @@ QEventDispatcherWin32Private::~QEventDispatcherWin32Private()
     CloseHandle(wakeUpNotifier.handle());
     if (internalHwnd)
         DestroyWindow(internalHwnd);
-    QByteArray className = "QEventDispatcherWin32_Internal_Widget" + QByteArray::number(quintptr(qt_internal_proc));
-#if !defined(Q_OS_WINCE)
-    UnregisterClassA(className.constData(), qWinAppInst());
-#else
-    UnregisterClassW(reinterpret_cast<const wchar_t *> (QString::fromLatin1(className.constData()).utf16())
-                     , qWinAppInst());
-#endif
+    QString className = QLatin1String("QEventDispatcherWin32_Internal_Widget") + QString::number(quintptr(qt_internal_proc));
+    UnregisterClass((wchar_t*)className.utf16(), qWinAppInst());
 }
 
 void QEventDispatcherWin32Private::activateEventNotifier(QWinEventNotifier * wen)
@@ -382,18 +376,24 @@ void QEventDispatcherWin32Private::activateEventNotifier(QWinEventNotifier * wen
     QCoreApplication::sendEvent(wen, &event);
 }
 
-
+// ### Qt 5: remove
 Q_CORE_EXPORT bool winPeekMessage(MSG* msg, HWND hWnd, UINT wMsgFilterMin,
                      UINT wMsgFilterMax, UINT wRemoveMsg)
 {
-    QT_WA({ return PeekMessage(msg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); } ,
-          { return PeekMessageA(msg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); });
+    return PeekMessage(msg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg);
 }
 
+// ### Qt 5: remove
 Q_CORE_EXPORT bool winPostMessage(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    QT_WA({ return PostMessage(hWnd, msg, wParam, lParam); } ,
-          { return PostMessageA(hWnd, msg, wParam, lParam); });
+    return PostMessage(hWnd, msg, wParam, lParam);
+}
+
+// ### Qt 5: remove
+Q_CORE_EXPORT bool winGetMessage(MSG* msg, HWND hWnd, UINT wMsgFilterMin,
+                     UINT wMsgFilterMax)
+{
+    return GetMessage(msg, hWnd, wMsgFilterMin, wMsgFilterMax);
 }
 
 // This function is called by a workerthread
@@ -443,10 +443,10 @@ LRESULT CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp)
 
     #ifdef GWLP_USERDATA
             QEventDispatcherWin32 *eventDispatcher =
-                (QEventDispatcherWin32 *) GetWindowLongPtrA(hwnd, GWLP_USERDATA);
+                (QEventDispatcherWin32 *) GetWindowLongPtr(hwnd, GWLP_USERDATA);
     #else
             QEventDispatcherWin32 *eventDispatcher =
-                (QEventDispatcherWin32 *) GetWindowLongA(hwnd, GWL_USERDATA);
+                (QEventDispatcherWin32 *) GetWindowLong(hwnd, GWL_USERDATA);
     #endif
             if (eventDispatcher) {
                 QEventDispatcherWin32Private *d = eventDispatcher->d_func();
@@ -494,54 +494,35 @@ LRESULT CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp)
 
 static HWND qt_create_internal_window(const QEventDispatcherWin32 *eventDispatcher)
 {
-    HINSTANCE hi = qWinAppInst();
-#if defined(Q_OS_WINCE)
+    // make sure that multiple Qt's can coexist in the same process
+    QString className = QLatin1Strign("QEventDispatcherWin32_Internal_Widget") + QString::number(quintptr(qt_internal_proc));
+
     WNDCLASS wc;
-#else
-    WNDCLASSA wc;
-#endif
     wc.style = 0;
     wc.lpfnWndProc = qt_internal_proc;
     wc.cbClsExtra = 0;
     wc.cbWndExtra = 0;
-    wc.hInstance = hi;
+    wc.hInstance = qWinAppInst();
     wc.hIcon = 0;
     wc.hCursor = 0;
     wc.hbrBackground = 0;
     wc.lpszMenuName = NULL;
+    wc.lpszClassName = reinterpret_cast<const wchar_t *> (className.utf16());
 
-    // make sure that multiple Qt's can coexist in the same process
-    QByteArray className = "QEventDispatcherWin32_Internal_Widget" + QByteArray::number(quintptr(qt_internal_proc));
-#if defined(Q_OS_WINCE)
-    QString tmp = QString::fromLatin1(className.data());
-    wc.lpszClassName = reinterpret_cast<const wchar_t *> (tmp.utf16());
     RegisterClass(&wc);
     HWND wnd = CreateWindow(wc.lpszClassName,  // classname
-                             wc.lpszClassName,  // window name
-                             0,                 // style
-                             0, 0, 0, 0,        // geometry
-                             0,                 // parent
-                             0,                 // menu handle
-                             hi,                // application
-                             0);                // windows creation data.
-#else
-    wc.lpszClassName = className.constData();
-    RegisterClassA(&wc);
-    HWND wnd = CreateWindowA(wc.lpszClassName,  // classname
-                             wc.lpszClassName,  // window name
-                             0,                 // style
-                             0, 0, 0, 0,        // geometry
-                             0,                 // parent
-                             0,                 // menu handle
-                             hi,                // application
-                             0);                // windows creation data.
-#endif
-
+                            wc.lpszClassName,  // window name
+                            0,                 // style
+                            0, 0, 0, 0,        // geometry
+                            0,                 // parent
+                            0,                 // menu handle
+                            qWinAppInst(),     // application
+                            0);                // windows creation data.
 
 #ifdef GWLP_USERDATA
-    SetWindowLongPtrA(wnd, GWLP_USERDATA, (LONG_PTR)eventDispatcher);
+    SetWindowLongPtr(wnd, GWLP_USERDATA, (LONG_PTR)eventDispatcher);
 #else
-    SetWindowLongA(wnd, GWL_USERDATA, (LONG)eventDispatcher);
+    SetWindowLong(wnd, GWL_USERDATA, (LONG)eventDispatcher);
 #endif
 
     if (!wnd) {
@@ -690,7 +671,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
                 haveMessage = true;
                 msg = d->queuedSocketEvents.takeFirst();
             } else {
-                haveMessage = winPeekMessage(&msg, 0, 0, 0, PM_REMOVE);
+                haveMessage = PeekMessage(&msg, 0, 0, 0, PM_REMOVE);
                 if (haveMessage && (flags & QEventLoop::ExcludeUserInputEvents)
                     && ((msg.message >= WM_KEYFIRST
                          && msg.message <= WM_KEYLAST)
@@ -738,11 +719,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
 
                 if (!filterEvent(&msg)) {
                     TranslateMessage(&msg);
-                    QT_WA({
-                        DispatchMessage(&msg);
-                    } , {
-                        DispatchMessageA(&msg);
-                    });
+                    DispatchMessage(&msg);
                 }
             } else if (waitRet >= WAIT_OBJECT_0 && waitRet < WAIT_OBJECT_0 + nCount) {
                 d->activateEventNotifier(d->winEventNotifierList.at(waitRet - WAIT_OBJECT_0));
@@ -781,7 +758,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
 bool QEventDispatcherWin32::hasPendingEvents()
 {
     MSG msg;
-    return qGlobalPostedEventsCount() || winPeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE);
+    return qGlobalPostedEventsCount() || PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE);
 }
 
 void QEventDispatcherWin32::registerSocketNotifier(QSocketNotifier *notifier)
diff --git a/src/corelib/kernel/qfunctions_wince.cpp b/src/corelib/kernel/qfunctions_wince.cpp
index 2c47adb..5680ad5 100644
--- a/src/corelib/kernel/qfunctions_wince.cpp
+++ b/src/corelib/kernel/qfunctions_wince.cpp
@@ -108,7 +108,7 @@ int qt_wince__getdrive( void )
     return 1;
 }
 
-int qt_wince__waccess( const WCHAR *path, int pmode )
+int qt_wince__waccess( const wchar_t *path, int pmode )
 {
     DWORD res = GetFileAttributes( path );
     if ( 0xFFFFFFFF == res )
@@ -118,7 +118,7 @@ int qt_wince__waccess( const WCHAR *path, int pmode )
         return -1;
 
     if ( (pmode & X_OK) && !(res & FILE_ATTRIBUTE_DIRECTORY) ) {
-        QString file = QString::fromUtf16(reinterpret_cast<const ushort *> (path));
+        QString file = QString::fromWCharArray(path);
         if ( !(file.endsWith(QString::fromLatin1(".exe")) ||
            file.endsWith(QString::fromLatin1(".com"))) )
         return -1;
@@ -130,12 +130,12 @@ int qt_wince__waccess( const WCHAR *path, int pmode )
 int qt_wince_open( const char *filename, int oflag, int pmode )
 {
     QString fn( QString::fromLatin1(filename) );
-    return _wopen( (WCHAR*)fn.utf16(), oflag, pmode );
+    return _wopen( (wchar_t*)fn.utf16(), oflag, pmode );
 }
 
-int qt_wince__wopen( const WCHAR *filename, int oflag, int /*pmode*/ )
+int qt_wince__wopen( const wchar_t *filename, int oflag, int /*pmode*/ )
 {
-    WCHAR *flag;
+    wchar_t *flag;
 
     if ( oflag & _O_APPEND ) {
         if ( oflag & _O_WRONLY ) {
@@ -290,7 +290,7 @@ bool qt_wince__chmod(const char *file, int mode)
     return _wchmod( reinterpret_cast<const wchar_t *> (QString::fromLatin1(file).utf16()), mode);
 }
 
-bool qt_wince__wchmod(const WCHAR *file, int mode)
+bool qt_wince__wchmod(const wchar_t *file, int mode)
 {
     // ### Does not work properly, what about just adding one property?
     if(mode&_S_IWRITE) {
diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h
index 307e17b..41cb641 100644
--- a/src/corelib/kernel/qfunctions_wince.h
+++ b/src/corelib/kernel/qfunctions_wince.h
@@ -175,8 +175,8 @@ typedef int mode_t;
 extern int errno;
 
 int     qt_wince__getdrive( void );
-int     qt_wince__waccess( const WCHAR *path, int pmode );
-int     qt_wince__wopen( const WCHAR *filename, int oflag, int pmode );
+int     qt_wince__waccess( const wchar_t *path, int pmode );
+int     qt_wince__wopen( const wchar_t *filename, int oflag, int pmode );
 long    qt_wince__lseek( int handle, long offset, int origin );
 int     qt_wince__read( int handle, void *buffer, unsigned int count );
 int     qt_wince__write( int handle, const void *buffer, unsigned int count );
@@ -204,7 +204,7 @@ int qt_wince_SetErrorMode(int);
 #endif
 
 bool qt_wince__chmod(const char *file, int mode);
-bool qt_wince__wchmod(const WCHAR *file, int mode);
+bool qt_wince__wchmod(const wchar_t *file, int mode);
 
 #pragma warning(disable: 4273)
 HANDLE qt_wince_CreateFileA(LPCSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE);
diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp
index d963a6d..c88149a 100644
--- a/src/corelib/kernel/qsharedmemory_win.cpp
+++ b/src/corelib/kernel/qsharedmemory_win.cpp
@@ -106,16 +106,11 @@ HANDLE QSharedMemoryPrivate::handle()
             return false;
         }
 #ifndef Q_OS_WINCE
-    QT_WA({
-            hand = OpenFileMappingW(FILE_MAP_ALL_ACCESS, false, (TCHAR*)safeKey.utf16());
-        }, {
-            hand = OpenFileMappingA(FILE_MAP_ALL_ACCESS, false, safeKey.toLocal8Bit().constData());
-        });
+        hand = OpenFileMapping(FILE_MAP_ALL_ACCESS, false, (wchar_t*)safeKey.utf16());
 #else
         // This works for opening a mapping too, but always opens it with read/write access in
         // attach as it seems.
-        hand = CreateFileMappingW(INVALID_HANDLE_VALUE,
-               0, PAGE_READWRITE, 0, 0, (TCHAR*)safeKey.utf16());
+        hand = CreateFileMapping(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, 0, 0, (wchar_t*)safeKey.utf16());
 #endif
         if (!hand) {
             setErrorString(function);
@@ -148,13 +143,7 @@ bool QSharedMemoryPrivate::create(int size)
     }
 
     // Create the file mapping.
-    QT_WA( {
-        hand = CreateFileMappingW(INVALID_HANDLE_VALUE,
-               0, PAGE_READWRITE, 0, size, (TCHAR*)safeKey.utf16());
-    }, {
-        hand = CreateFileMappingA(INVALID_HANDLE_VALUE,
-               0, PAGE_READWRITE, 0, size, safeKey.toLocal8Bit().constData());
-    } );
+    hand = CreateFileMapping(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, 0, size, (wchar_t*)safeKey.utf16());
     setErrorString(function);
 
     // hand is valid when it already exists unlike unix so explicitly check
diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp
index 4e03ddf..1102258 100644
--- a/src/corelib/kernel/qsystemsemaphore_win.cpp
+++ b/src/corelib/kernel/qsystemsemaphore_win.cpp
@@ -87,11 +87,7 @@ HANDLE QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode)
     // Create it if it doesn't already exists.
     if (semaphore == 0) {
         QString safeName = makeKeyFileName();
-        QT_WA({
-            semaphore = CreateSemaphoreW(0, initialValue, MAXLONG, (TCHAR*)safeName.utf16());
-        }, {
-            semaphore = CreateSemaphoreA(0, initialValue, MAXLONG, safeName.toLocal8Bit().constData());
-        });
+        semaphore = CreateSemaphore(0, initialValue, MAXLONG, (wchar_t*)safeName.utf16());
         if (semaphore == NULL)
             setErrorString(QLatin1String("QSystemSemaphore::handle"));
     }
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index d2a0b3a..2ee9d26 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -103,9 +103,8 @@ QT_BEGIN_NAMESPACE
 
     Note that QTimer's accuracy depends on the underlying operating
     system and hardware. Most platforms support an accuracy of
-    1 millisecond, but Windows 98 supports only 55. If Qt is
-    unable to deliver the requested number of timer clicks, it will
-    silently discard some.
+    1 millisecond. If Qt is unable to deliver the requested number of
+    timer clicks, it will silently discard some.
 
     An alternative to using QTimer is to call QObject::startTimer()
     for your object and reimplement the QObject::timerEvent() event