Changeset 8 for trunk/src

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

Location:

trunk/src

Files:

• 3rdparty/zlib/zlib.h (modified) (2 diffs)
• codecs/qtextcodec.cpp (modified) (4 diffs)
• dialogs/qfiledialog.cpp (modified) (11 diffs)
• dialogs/qmessagebox.cpp (modified) (3 diffs)
• kernel/qapplication.cpp (modified) (7 diffs)
• kernel/qapplication_pm.cpp (added)
• kernel/qclipboard.cpp (modified) (2 diffs)
• kernel/qclipboard_pm.cpp (added)
• kernel/qcolor.cpp (modified) (2 diffs)
• kernel/qcolor_pm.cpp (added)
• kernel/qcursor_pm.cpp (added)
• kernel/qdesktopwidget_pm.cpp (added)
• kernel/qdragobject.cpp (modified) (4 diffs)
• kernel/qeventloop_p.h (modified) (4 diffs)
• kernel/qeventloop_pm.cpp (added)
• kernel/qfont.cpp (modified) (2 diffs)
• kernel/qfont_pm.cpp (added)
• kernel/qfontdata_p.h (modified) (2 diffs)
• kernel/qfontdatabase.cpp (modified) (37 diffs)
• kernel/qfontdatabase_pm.cpp (added)
• kernel/qfontengine_p.h (modified) (4 diffs)
• kernel/qfontengine_pm.cpp (added)
• kernel/qiconset.cpp (modified) (1 diff)
• kernel/qlocalfs.cpp (modified) (1 diff)
• kernel/qmime.cpp (modified) (2 diffs)
• kernel/qmime_pm.cpp (added)
• kernel/qnetworkprotocol.cpp (modified) (3 diffs)
• kernel/qobject.cpp (modified) (1 diff)
• kernel/qpaintdevice_pm.cpp (added)
• kernel/qpainter.cpp (modified) (6 diffs)
• kernel/qpainter_pm.cpp (added)
• kernel/qpixmap.cpp (modified) (4 diffs)
• kernel/qpixmap_pm.cpp (added)
• kernel/qregion_pm.cpp (added)
• kernel/qrichtext.cpp (modified) (3 diffs)
• kernel/qscriptengine.cpp (modified) (1 diff)
• kernel/qscriptengine_pm.cpp (added)
• kernel/qsizegrip.cpp (modified) (2 diffs)
• kernel/qt_gfx.pri (modified) (4 diffs)
• kernel/qt_kernel.pri (modified) (2 diffs)
• kernel/qtextengine.cpp (modified) (1 diff)
• kernel/qtextengine_p.h (modified) (1 diff)
• kernel/qtextengine_pm.cpp (added)
• kernel/qthread.cpp (modified) (1 diff)
• kernel/qthread_pm.cpp (added)
• kernel/qtranslator.cpp (modified) (1 diff)
• kernel/qurl.cpp (modified) (3 diffs)
• kernel/qwidget.cpp (modified) (12 diffs)
• kernel/qwidget_pm.cpp (added)
• moc/moc.pro (modified) (2 diffs)
• network/qdns.cpp (modified) (12 diffs)
• network/qsocketdevice_pm.cpp (added)
• network/qt_network.pri (modified) (1 diff)
• qt.def.map.os2-g++ (added)
• qt.def.tpl.os2-g++ (added)
• qt.pro (modified) (5 diffs)
• styles/qcommonstyle.cpp (modified) (1 diff)
• styles/qcompactstyle.cpp (modified) (1 diff)
• styles/qmotifplusstyle.cpp (modified) (1 diff)
• styles/qmotifstyle.cpp (modified) (1 diff)
• styles/qsgistyle.cpp (modified) (1 diff)
• styles/qwindowsstyle.cpp (modified) (8 diffs)
• tools/qconfig.cpp (modified) (1 diff)
• tools/qcriticalsection_p.cpp (modified) (2 diffs)
• tools/qcriticalsection_p.h (modified) (4 diffs)
• tools/qdatetime.cpp (modified) (9 diffs)
• tools/qdir.cpp (modified) (8 diffs)
• tools/qdir_pm.cpp (added)
• tools/qfile.cpp (modified) (2 diffs)
• tools/qfile_pm.cpp (added)
• tools/qfiledefs_p.h (modified) (1 diff)
• tools/qfileinfo.cpp (modified) (6 diffs)
• tools/qfileinfo_pm.cpp (added)
• tools/qglobal.cpp (modified) (7 diffs)
• tools/qgpluginmanager.cpp (modified) (1 diff)
• tools/qlibrary.cpp (modified) (6 diffs)
• tools/qlibrary_p.h (modified) (1 diff)
• tools/qlibrary_pm.cpp (added)
• tools/qlocale.cpp (modified) (1 diff)
• tools/qmutex_pm.cpp (added)
• tools/qsettings.cpp (modified) (34 diffs)
• tools/qsettings_p.h (modified) (1 diff)
• tools/qsettings_pm.cpp (added)
• tools/qstring.cpp (modified) (6 diffs)
• tools/qt_tools.pri (modified) (3 diffs)
• tools/qthreadinstance_p.h (modified) (1 diff)
• tools/qthreadstorage_pm.cpp (added)
• tools/qwaitcondition_pm.cpp (added)
• widgets/qdockwindow.cpp (modified) (1 diff)
• widgets/qlabel.cpp (modified) (2 diffs)
• widgets/qlineedit.cpp (modified) (4 diffs)
• widgets/qpopupmenu.cpp (modified) (7 diffs)
• widgets/qscrollview.cpp (modified) (1 diff)
• widgets/qsplitter.cpp (modified) (2 diffs)
• widgets/qtextedit.cpp (modified) (14 diffs)
• widgets/qtitlebar.cpp (modified) (4 diffs)
• widgets/qtooltip.cpp (modified) (3 diffs)
• widgets/qwidgetresizehandler.cpp (modified) (2 diffs)

trunk/src/3rdparty/zlib/zlib.h

@@ -40 +40 @@
 #define ZLIB_VERSION "1.1.4"
 
+#ifdef Q_OS_WIN
 #ifdef QT_MAKEDLL
 #define Q_ZEXPORT __declspec(dllexport)
@@ -48 +49 @@
 #define Q_ZEXPORT ZEXPORT
 #endif
+#endif
+#else
+#define Q_ZEXPORT ZEXPORT
 #endif
 #ifdef Q_OS_TEMP

trunk/src/codecs/qtextcodec.cpp

@@ -562 +562 @@
 
 
-#ifdef Q_OS_WIN32
+#if defined(Q_OS_WIN32)
 class QWindowsLocalCodec: public QTextCodec
 {
@@ -621 +621 @@
 
 int QWindowsLocalCodec::heuristicContentMatch(const char* chars, int len) const
+{
+    // ### Not a bad default implementation?
+    QString t = toUnicode(chars,len);
+    int l = t.length();
+    QCString mb = fromUnicode(t,l);
+    int i=0;
+    while ( i < len ) {
+        if ( chars[i] == mb[i] )
+            i++;
+       else
+           break;
+    }
+    return i;
+}
+
+#elif defined(Q_OS_OS2)
+
+class QOS2LocalCodec: public QTextCodec
+{
+public:
+    QOS2LocalCodec();
+    ~QOS2LocalCodec();
+
+    QString toUnicode(const char* chars, int len) const;
+    QCString fromUnicode(const QString& uc, int& lenInOut ) const;
+
+    const char* name() const;
+    int mibEnum() const;
+
+    int heuristicContentMatch(const char* chars, int len) const;
+};
+
+QOS2LocalCodec::QOS2LocalCodec()
+{
+}
+
+QOS2LocalCodec::~QOS2LocalCodec()
+{
+}
+
+
+QString QOS2LocalCodec::toUnicode(const char* chars, int len) const
+{
+    return qt_os2MB2QString( chars, len );
+}
+
+QCString QOS2LocalCodec::fromUnicode(const QString& uc, int& lenInOut ) const
+{
+    QCString r = qt_os2QString2MB( uc, lenInOut );
+    lenInOut = r.length();
+    return r;
+}
+
+
+const char* QOS2LocalCodec::name() const
+{
+    return "System";
+}
+
+int QOS2LocalCodec::mibEnum() const
+{
+    return 0;
+}
+
+
+int QOS2LocalCodec::heuristicContentMatch(const char* chars, int len) const
 {
     // ### Not a bad default implementation?
@@ -2692 +2758 @@
 static void setupLocaleMapper()
 {
-#ifdef Q_OS_WIN32
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2) 
     localeMapper = QTextCodec::codecForName( "System" );
 #else
@@ -2855 +2921 @@
 #endif // Q_OS_WIN32
 
+#ifdef Q_OS_OS2
+    (void) new QOS2LocalCodec;
+#endif // Q_OS_OS2
+
     if ( !localeMapper )
         setupLocaleMapper();

trunk/src/dialogs/qfiledialog.cpp

@@ -991 +991 @@
                 return 1;
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
             if ( sortFilesBy == QDir::Name ) {
                 QString name1 = i1->name().lower();
@@ -3693 +3693 @@
             if ( !nameEdit->text().contains( "/" ) &&
                  !nameEdit->text().contains( "\\" )
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
                  && nameEdit->text()[ 1 ] != ':'
 #endif
@@ -3700 +3700 @@
             else if ( nameEdit->text()[ 0 ] == '/' ||
                       nameEdit->text()[ 0 ] == '\\'
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
                       || nameEdit->text()[ 1 ] == ':'
 #endif
@@ -4597 +4597 @@
 void QFileDialog::done( int i )
 {
+    // stop any pending operations
+    d->url.stop();
+    
     if ( i == QDialog::Accepted && (d->mode == ExistingFile || d->mode == ExistingFiles) ) {
         QStringList selection = selectedFiles();
@@ -5339 +5342 @@
         if ( ( nameEdit->cursorPosition() == (int)nameEdit->text().length() || nameEdit->hasSelectedText() ) &&
              isprint(((QKeyEvent *)e)->ascii()) ) {
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
             QString nt( nameEdit->text().lower() );
 #else
@@ -5347 +5350 @@
             nt += (char)(((QKeyEvent *)e)->ascii());
             QListViewItem * i = files->firstChild();
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
             while( i && i->text( 0 ).left(nt.length()).lower() != nt )
 #else
@@ -5643 +5646 @@
     if ( u.path() == "/" )
         return TRUE;
-#elif defined(Q_OS_WIN32)
+#elif defined(Q_OS_WIN32) || defined(Q_OS_OS2)
     QString p = u.path();
     if ( p.length() == 3 &&
@@ -5702 +5705 @@
         bool found = FALSE;
         for ( int i = 0; i < d->paths->count(); ++i ) {
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
             if ( d->paths->text( i ).lower() == s.lower() ) {
 #else
@@ -5769 +5772 @@
         if ( !d->hadDotDot && !isRoot( d->url ) ) {
             bool ok = TRUE;
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
             if ( d->url.path().left( 2 ) == "//" )
                 ok = FALSE;
@@ -5857 +5860 @@
             if ( isRoot( d->url ) )
                 continue;
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
             if ( d->url.path().left( 2 ) == "//" )
                 continue;
@@ -5885 +5888 @@
             }
         }
+#elif defined(Q_OS_OS2)
+        if ( !bShowHiddenFiles ) {
+            if ( d->url.isLocalFile() ) {
+                QString file = d->url.path();
+                if ( !file.endsWith( "/" ) )
+                    file.append( "/" );
+                file += inf.name();
+                if ( QFileInfo( file ).isHidden() )
+                    continue;
+            } else {
+                if ( inf.name() != ".." && inf.name()[0] == QChar('.') )
+                    continue;
+            }
+        }
 #else
         if ( !bShowHiddenFiles && inf.name() != ".." ) {

trunk/src/dialogs/qmessagebox.cpp

@@ -53 +53 @@
 #include "qnc_win.h"
 #endif
-
+#if defined(Q_WS_PM)
+//@@TODO (dmik): this is necessary for WinAlarm() which will be
+//  probably removed from here later.
+#include "qt_os2.h"
+#endif
 
 // Internal class - don't touch
@@ -592 +596 @@
             "<p>Qt provides single-source "
             "portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, "
+            "IBM&nbsp;OS/2&nbsp;Warp and eComStation, "
             "Linux, and all major commercial Unix variants."
             "<br>Qt is also available for embedded devices.</p>"
@@ -1034 +1039 @@
 #if defined(QT_ACCESSIBILITY_SUPPORT)
     QAccessible::updateAccessibility( this, 0, QAccessible::Alert );
+#else
+#if defined(Q_WS_PM)
+//@@TODO (dmik): currently, the accessibility support is not implemented
+//  on OS/2, but we still need to play a sound when QMessageBox is opened.
+    ULONG alarmStyle;
+    bool playAlarm = TRUE;
+    switch ( icon() ) {
+        case Warning:
+            alarmStyle = WA_WARNING;
+            break;
+        case Critical:
+            alarmStyle = WA_ERROR;
+            break;
+        case Information:
+            alarmStyle = WA_NOTE;
+            break;
+        default:
+            playAlarm = FALSE;
+            break;
+    }
+    if ( playAlarm )
+        WinAlarm( HWND_DESKTOP, alarmStyle );
+#endif
 #endif
     QDialog::showEvent( e );

trunk/src/kernel/qapplication.cpp

@@ -739 +739 @@
   If \a GUIenabled is FALSE, the application does not connect to the
   X-server.
-  On Windows and Macintosh, currently the window system is always
+  On Windows, OS/2 and Macintosh, currently the window system is always
   initialized, regardless of the value of GUIenabled. This may change in
   future versions of Qt.
@@ -1232 +1232 @@
             else
                 style = "Windows";              // default styles for Windows
+#elif defined(Q_WS_PM)
+            /// @todo (dmik) temporary, until the native style is done
+            style = "Windows";          // default style for OS/2
 #elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS)
             style = "CDE";                      // default style for X11 on Solaris
@@ -1541 +1544 @@
 }
 
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
 extern const char *qAppFileName();
 #endif
 
 #ifndef QT_NO_DIR
-#ifndef Q_WS_WIN
+#if !defined(Q_WS_WIN) && !(defined Q_WS_PM)
 static QString resolveSymlinks( const QString& path, int depth = 0 )
 {
@@ -1590 +1593 @@
     }
 }
-#endif // Q_WS_WIN
+#endif // !Q_WS_WIN && !Q_WS_PM
 
 /*!
@@ -1627 +1630 @@
 QString QApplication::applicationFilePath()
 {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
     return QDir::cleanDirPath( QFile::decodeName( qAppFileName() ) );
 #else
@@ -1706 +1709 @@
         QString installPathPlugins = QString::fromLocal8Bit(qInstallPathPlugins());
         if ( QFile::exists(installPathPlugins) ) {
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
             installPathPlugins.replace('\\', '/');
 #endif
@@ -1715 +1718 @@
         if (qApp)
             app_location = qApp->applicationFilePath();
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
         else {
             app_location = QString(qAppFileName());

trunk/src/kernel/qclipboard.cpp

@@ -155 +155 @@
 }
 
-#ifndef Q_WS_WIN32
+#if !defined(Q_WS_WIN32) && !defined(Q_WS_PM)
 /*!
     \internal
@@ -173 +173 @@
 
     This signal is emitted when the clipboard data is changed.
+    
+    \note On OS/2, this signal is guaranteed to be emitted only if no other
+    non-Qt applications (for example, the standard Clipboard Viewer shipped
+    with OS/2) register themselves as clipboard viewers -- this is the
+    limitation of the Presentation Manager, not Qt. Reconnecting this signal
+    to a slot will restore its functionality (until another non-Qt application
+    will again register itself as the clipboard viewer).
 */
 

trunk/src/kernel/qcolor.cpp

@@ -162 +162 @@
 #define COLOR0_PIX 0x00ffffff
 #define COLOR1_PIX 0
+#elif defined(Q_WS_PM)
+#define COLOR0_PIX (uint)CLR_FALSE
+#define COLOR1_PIX (uint)CLR_TRUE
 #else
 #define COLOR0_PIX 0
@@ -871 +874 @@
         return ((QColor*)this)->alloc();
     else if ( colormodel == d8 )
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN)
         // since d.d8.pix is uchar we have to use the PALETTEINDEX
         // macro to get the respective palette entry index.
         return (0x01000000 | (int)(short)(d.d8.pix));
+#elif defined(Q_WS_PM)
+        // the code below allows us to use negative color values (such as
+        // CLR_WHITE) in range from -1 to -128 as direct pixel colors (i.e.
+        // set using setPixel()) keeping their special meening.
+        if ( d.d8.direct )
+            return (int) ((char) d.d8.pix);
+        else
+            return d.d8.pix;
 #else
         return d.d8.pix;

trunk/src/kernel/qdragobject.cpp

@@ -838 +838 @@
             return r;
         QString text( d->txt );
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
         int index = text.find( QString::fromLatin1("\r\n"), 0 );
         while ( index != -1 ) {
@@ -1493 +1493 @@
         return QCString();
 
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
 
 
@@ -1603 +1603 @@
                 file.insert(0,'/');
         }
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
         if ( file.length() > 2 && file[0] == '/' && file[2] == '|' ) {
             file[2] = ':';
@@ -1613 +1613 @@
 #endif
     }
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
     else {
         file = uriToUnicodeUri(uri);

trunk/src/kernel/qeventloop_p.h

@@ -60 +60 @@
 #endif
 
-#if defined(Q_OS_UNIX) || defined (Q_WS_WIN)
+#if defined(Q_OS_UNIX) || defined(Q_WS_WIN) || defined(Q_WS_PM)
 #include "qptrlist.h"
-#endif // Q_OS_UNIX || Q_WS_WIN
+#endif // Q_OS_UNIX || Q_WS_WIN || Q_WS_PM
 
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) || defined(Q_WS_PM)
 struct QSockNot
 {
@@ -86 +86 @@
 #endif // Q_OS_UNIX
 
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) 
 struct QSockNot {
     QSocketNotifier *obj;
@@ -124 +124 @@
 #endif // Q_WS_X11
 
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) 
     int thread_pipe[2];
-
+#endif
+#if defined(Q_OS_UNIX) || defined(Q_WS_PM)
     // pending socket notifiers list
     QPtrList<QSockNot> sn_pending_list;
@@ -135 +136 @@
 #endif
 
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) 
     // pending socket notifiers list
     QPtrList<QSockNot> sn_pending_list;
 #endif // Q_WS_WIN
 
+#if defined(Q_WS_PM)
+    HAB hab;
+    HMQ hmq;
+#endif 
+
 };
 

trunk/src/kernel/qfont.cpp

@@ -1394 +1394 @@
         "courier",      "Courier New",
         "helvetica",    "Arial",
+#elif defined(Q_WS_PM)
+        "times",        "Times New Roman",
 #endif
-
         0,              0
     };
@@ -3100 +3101 @@
 }
 
-#if defined(Q_WS_WIN ) || defined (Q_WS_QWS)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) || defined (Q_WS_QWS)
 void QFontCache::cleanupPrinterFonts()
 {

trunk/src/kernel/qfontdata_p.h

@@ -101 +101 @@
         if ( family != other.family ) return family < other.family;
 
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
         if ( addStyle != other.addStyle ) return addStyle < other.addStyle;
-#endif // Q_WS_X11
-
+#elif defined(Q_WS_PM)
+        if ( pointSize != other.pointSize ) return pointSize < other.pointSize;
+#endif
         return FALSE;
     }
@@ -242 +243 @@
     void insertEngine( const Key &key, QFontEngine *engine );
 
-#if defined(Q_WS_WIN) || defined(Q_WS_QWS)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_WS_QWS)
     void cleanupPrinterFonts();
 #endif

trunk/src/kernel/qfontdatabase.cpp

@@ -71 +71 @@
 #endif
 
+#define SMOOTH_SCALABLE 0xffff
+
 static int ucstricmp( const QString &as, const QString &bs )
 {
@@ -138 +140 @@
     unsigned short pixelSize;
 
+#ifdef Q_WS_PM
+    unsigned short pointSize;                   // in deca-points
+    LONG lMatch;
+#endif
 #ifdef Q_WS_X11
     int count;
@@ -206 +212 @@
           fakeOblique( FALSE ), count( 0 ), pixelSizes( 0 )
     {
-#if defined(Q_WS_X11)
+#if defined(Q_WS_PM)
+        szFacename[0] = 0;
+#elif defined(Q_WS_X11)
         weightName = setwidthName = 0;
-#endif // Q_WS_X11
+#endif
     }
 
@@ -228 +236 @@
     QtFontSize *pixelSizes;
 
+#ifdef Q_WS_PM
+    CHAR szFacename [FACESIZE];
+#endif
 #ifdef Q_WS_X11
     const char *weightName;
@@ -233 +244 @@
 #endif // Q_WS_X11
 
+#ifdef Q_WS_PM
+    QtFontSize *pixelSize(
+        unsigned short size, bool = FALSE, unsigned short pointSize = 0 );
+#else    
     QtFontSize *pixelSize( unsigned short size, bool = FALSE );
+#endif    
 };
 
@@ -247 +263 @@
 }
 
+#ifdef Q_WS_PM
+QtFontSize *QtFontStyle::pixelSize(
+    unsigned short size, bool add, unsigned short pointSize )
+#else
 QtFontSize *QtFontStyle::pixelSize( unsigned short size, bool add )
+#endif
 {
     for ( int i = 0; i < count; i++ ) {
+#ifdef Q_WS_PM
+        if (
+            pixelSizes[i].pixelSize == size &&
+            (
+                size == SMOOTH_SCALABLE ||
+                !pointSize ||
+                pixelSizes[i].pointSize == pointSize
+            )
+        )
+#else        
         if ( pixelSizes[i].pixelSize == size )
+#endif            
             return pixelSizes + i;
     }
@@ -261 +293 @@
                               (((count+8) >> 3 ) << 3) * sizeof(QtFontSize) );
     pixelSizes[count].pixelSize = size;
+#ifdef Q_WS_PM
+    pixelSizes[count].pointSize = pointSize;
+    pixelSizes[count].lMatch = 0;
+#endif
 #ifdef Q_WS_X11
     pixelSizes[count].count = 0;
@@ -336 +372 @@
           name( n ), count( 0 ), foundries( 0 ) {
         memset( scripts, 0, sizeof( scripts ) );
+#ifdef Q_WS_PM
+//@@TODO (dmik): temporary solution to let QFontDialog work:
+//  at least UnknownScript is supported.
+        scripts[QFont::UnknownScript] = Supported;
+#endif        
     }
     ~QtFontFamily() {
@@ -357 +398 @@
     bool fullyLoaded : 1;
     QString name;
+#ifndef Q_WS_X11
     QString rawName;
+#endif    
 #ifdef Q_WS_X11
     QCString fontFilename;
@@ -393 +436 @@
 class QFontDatabasePrivate {
 public:
-    QFontDatabasePrivate() : count( 0 ), families( 0 ) { }
+    QFontDatabasePrivate() : 
+        count( 0 ), families( 0 ) { }
     ~QFontDatabasePrivate() {
+#ifdef Q_WS_PM
+        cleanup();
+#else
         while ( count-- )
             delete families[count];
         free( families );
+#endif
     }
     QtFontFamily *family( const QString &f, bool = FALSE );
@@ -403 +451 @@
     int count;
     QtFontFamily **families;
+
+#ifdef Q_WS_PM
+    static QFontDatabasePrivate* instance();
+private:    
+    void cleanup() {
+        while ( count )
+            delete families[--count];
+        free( families );
+        families = 0;
+    }
+    void reload(); 
+#endif
 };
 
@@ -627 +687 @@
 
 static QSingleCleanupHandler<QFontDatabasePrivate> qfontdatabase_cleanup;
+#ifdef Q_WS_PM
+QFontDatabasePrivate* QFontDatabasePrivate::instance()
+{
+    static QFontDatabasePrivate *db = 0;
+    if ( !db ) {
+        db = new QFontDatabasePrivate;
+        qfontdatabase_cleanup.set(&db);
+        db->reload();
+    }
+    return db;
+}
+#else
 static QFontDatabasePrivate *db=0;
-#define SMOOTH_SCALABLE 0xffff
+#endif
 
 #if defined( Q_WS_X11 )
@@ -636 +708 @@
 #elif defined( Q_WS_WIN )
 #  include "qfontdatabase_win.cpp"
+#elif defined( Q_WS_PM )
+#  include "qfontdatabase_pm.cpp"
 #elif defined( Q_WS_QWS )
 #  include "qfontdatabase_qws.cpp"
@@ -643 +717 @@
 
 
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_PM)
 static
 unsigned int bestFoundry( QFont::Script script, unsigned int score, int styleStrategy,
@@ -650 +724 @@
                           QtFontFoundry **best_foundry, QtFontStyle **best_style,
                           QtFontSize **best_size
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
                           , QtFontEncoding **best_encoding, int force_encoding_id
+#elif defined(Q_WS_PM)
+                          , int pointSize
 #endif
                           )
@@ -711 +787 @@
         // 1. see if we have an exact matching size
         if (! (styleStrategy & QFont::ForceOutline)) {
+#if defined(Q_WS_PM)
+            size = style->pixelSize(pixelSize, FALSE, pointSize);
+#else            
             size = style->pixelSize(pixelSize);
+#endif            
             if (size) px = size->pixelSize;
         }
@@ -843 +923 @@
 #endif
 
+#ifdef Q_WS_PM
+    QFontDatabasePrivate *db = QFontDatabasePrivate::instance();
+#else    
     if ( !db )
         initializeDb();
+#endif
 
     QFontEngine *fe = 0;
     if ( fp ) {
+#ifndef Q_WS_PM
         if ( fp->rawMode ) {
             fe = loadEngine( script, fp, request, 0, 0, 0
@@ -859 +944 @@
             return fe;
         }
+#endif // !Q_WS_PM
 
         QFontCache::Key key( request, script,
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
                              (int)fp->paintdevice
 #else
@@ -880 +966 @@
     parseFontName( request.family, foundry_name, family_name );
 
+#ifdef Q_WS_PM
+    // the "System VIO" PM font is broken in such way that its real pixel
+    // sizes do not correspond to their nominal point sizes specified in the
+    // font header (i.e. pixelSize is not equal to (pointSize * dpi) / 720).
+    // therefore we use the special table to convert pointSize to pixelSize
+    // in order to let bestFoundry() select the proper font with its nominal
+    // point size corresponding to the requested one.
+    // NOTE: this will produce incorrect results if "System VIO" is NOT
+    // an OS/2 standatd supplied bitmap font.
+    if( !ucstricmp( family_name, "System VIO") ) {
+        // possible sizes of the "System VIO" font ("pixel, point" pairs),
+        // sorted by point size
+        static const short SystemVIO_sz[] = {
+            12, 20,         16, 30,
+            8,  40,         13, 50,
+            15, 60,         24, 70,
+            8,  80,         10, 90,
+            12, 100,        14, 110,
+            16, 120,        18, 130,
+            16, 140,        12, 150,
+            20, 160,        21, 170,
+            29, 180,
+        };
+        const int SystemVIO_sz_len = sizeof(SystemVIO_sz) / sizeof(SystemVIO_sz[0]);
+        int pt = request.pointSize;
+        pt = QMAX( pt, SystemVIO_sz [1] );                      // min limit 
+        pt = QMIN( pt, SystemVIO_sz [SystemVIO_sz_len - 1] );   // max limit
+        int i = 1;
+        while ( SystemVIO_sz[i] < pt ) i += 2;
+        if ( SystemVIO_sz[i] > pt ) {
+            int prev = SystemVIO_sz[i-2];
+            int mid = prev + (SystemVIO_sz[i] - prev + 1) / 2;
+            if ( pt < mid ) i -= 2; 
+        }
+        ((QFontDef&)request).pixelSize = SystemVIO_sz[i-1];
+        ((QFontDef&)request).pointSize = SystemVIO_sz[i];
+    }
+#endif
+    
 #ifdef Q_WS_X11
     if (family_name.isEmpty() && script == QFont::Han) {
@@ -905 +1030 @@
               "    stretch: %d\n"
               "    pixelSize: %d\n"
+              "    pointSize: %d\n"
               "    pitch: %c",
               family_name.isEmpty() ? "-- first in script --" : family_name.latin1(),
               foundry_name.isEmpty() ? "-- any --" : foundry_name.latin1(),
               script, scriptName( script ).latin1(),
-              request.weight, request.italic, request.stretch, request.pixelSize, pitch );
+              request.weight, request.italic, request.stretch,
+              request.pixelSize, request.pointSize,
+              pitch );
 
 #ifdef QT_XFT2
@@ -944 +1072 @@
             uint score_adjust = 0;
             QFont::Script override_script = script;
+#ifndef Q_WS_PM
             if ( ! ( try_family->scripts[script] & QtFontFamily::Supported )
                  && script != QFont::Unicode) {
@@ -978 +1107 @@
                 }
             }
+#endif // !Q_WS_PM
 
             QtFontFoundry *try_foundry = 0;
@@ -992 +1122 @@
                              try_family, foundry_name, styleKey, request.pixelSize, pitch,
                              &try_foundry, &try_style, &try_size
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
                              , &try_encoding, force_encoding_id
+#elif defined(Q_WS_PM)
+                             , request.pointSize
 #endif
                     );
@@ -1002 +1134 @@
                                         QString::null, styleKey, request.pixelSize,
                                         pitch, &try_foundry, &try_style, &try_size
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
                                         , &try_encoding, force_encoding_id
+#elif defined(Q_WS_PM)
+                                        , request.pointSize
 #endif
                     );
@@ -1047 +1181 @@
 
             fe = loadEngine( script, fp, request, best_family, best_foundry, best_style
-#ifdef Q_WS_X11
+#if defined(Q_WS_PM)
+                             , best_size
+#elif defined(Q_WS_X11)
                              , best_size, best_encoding, ( force_encoding_id >= 0 )
 #endif
@@ -1060 +1196 @@
             }
 
+#ifdef Q_WS_PM
+            // On OS/2, fontDef.pixelSize and fontDef.pointSize are filled
+            // by QFontEnginePM constructor
+#else             
             if ( best_style->smoothScalable )
                 fe->fontDef.pixelSize = request.pixelSize;
@@ -1082 +1222 @@
                 fe->fontDef.pointSize = request.pointSize;
             }
+#endif            
             fe->fontDef.styleHint     = request.styleHint;
             fe->fontDef.styleStrategy = request.styleStrategy;
@@ -1094 +1235 @@
 
     if ( fe ) {
+#ifdef Q_WS_PM
+///@@TODO (dmik): should do something here?
+#else
         if ( script != QFont::Unicode && !canRender( fe, script ) ) {
             FM_DEBUG( "  WARN: font loaded cannot render sample 0x%04x",
@@ -1117 +1261 @@
             return fe;
         }
+#endif // !Q_WS_PM
 
         if ( fp ) {
             QFontCache::Key key( request, script,
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
                                  (int)fp->paintdevice
 #else
@@ -1128 +1273 @@
             QFontCache::instance->insertEngine( key, fe );
 
+#ifndef Q_WS_PM
             for ( int i = 0; i < QFont::NScripts; ++i ) {
                 if ( i == script ) continue;
@@ -1137 +1283 @@
                 QFontCache::instance->insertEngine( key, fe );
             }
+#endif // !Q_WS_PM
         }
     } else {
         if ( request.family.isEmpty() ) {
+#ifdef Q_WS_PM
+//@@TODO (dmik): what to return in such case?
+            qFatal( "QFontDatabase::findFont: request.family is empty and nothing is found, should it ever happen?" );
+#else
             FM_DEBUG( "returning box engine" );
 
@@ -1146 +1297 @@
             if ( fp ) {
                 QFontCache::Key key( request, script,
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) 
                                      (int)fp->paintdevice
 #else
@@ -1154 +1305 @@
                 QFontCache::instance->insertEngine( key, fe );
             }
+#endif // Q_WS_PM
         }
     }
@@ -1159 +1311 @@
     return fe;
 }
-#endif // Q_WS_X11 || Q_WS_WIN
+#endif // Q_WS_X11 || Q_WS_WIN || Q_WS_PM
 
 
@@ -1355 +1507 @@
 QFontDatabase::QFontDatabase()
 {
+#ifdef Q_WS_PM
+    d = QFontDatabasePrivate::instance();    
+#else    
     createDatabase();
 
     d = db;
+#endif
 }
 
@@ -1635 +1791 @@
 
                 if (size->pixelSize != 0 && size->pixelSize != USHRT_MAX) {
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
                     const uint pointSize = qRound(qt_pointSize(size->pixelSize, 0, -1));
+#elif defined(Q_WS_PM)
+//@@TODO (dmik): some bitmap fonts (i.e. System VIO) have point sizes
+//  that do not really correlate with their actual pixel sizes (i.e.
+//  their pointsize != pixelsizde * DPI / 72), What to return in that case?  
+                    const uint pointSize = size->pointSize / 10;
 #else
                     const uint pointSize = size->pixelSize; // embedded uses 72dpi
@@ -1740 +1901 @@
 
                 if ( size->pixelSize != 0 && size->pixelSize != USHRT_MAX ) {
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
                     const uint pointSize = qRound(qt_pointSize(size->pixelSize, 0, -1));
+#elif defined(Q_WS_PM)
+//@@TODO (dmik): some bitmap fonts (i.e. System VIO) have point sizes
+//  that do not really correlate with their actual pixel sizes (i.e.
+//  their pointsize != pixelsizde * DPI / 72), What to return in that case?  
+                    const uint pointSize = size->pointSize / 10;
 #else
                     const uint pointSize = size->pixelSize; // embedded uses 72dpi

trunk/src/kernel/qfontengine_p.h

@@ -40 +40 @@
 #endif
 
+#ifdef Q_WS_PM
+#include "qt_os2.h"
+#endif
+
 #include "qtextengine_p.h"
 
 class QPaintDevice;
 
-struct glyph_metrics_t;
-class QChar;
-typedef unsigned short glyph_t;
-struct qoffset_t;
-typedef int advance_t;
-class QOpenType;
+//@@TODO (dmik): these all are defined in the included "qtextengine_p.h",
+//  what do we need it here for?
+//struct glyph_metrics_t;
+//class QChar;
+//typedef unsigned short glyph_t;
+//struct qoffset_t;
+//typedef int advance_t;
+//class QOpenType;
 struct TransformedFont;
 
-#if defined( Q_WS_X11 ) || defined( Q_WS_WIN) || defined( Q_WS_MAC )
+#if defined( Q_WS_X11 ) || defined( Q_WS_WIN) || defined( Q_WS_PM) || defined( Q_WS_MAC )
 class QFontEngine : public QShared
 {
@@ -71 +77 @@
         Win,
         Uniscribe,
+
+        // OS/2 types
+        PM,
 
         // Apple MacOS types
@@ -151 +160 @@
     short rbearing;
 #endif // Q_WS_WIN
+#ifdef Q_WS_PM
+    HPS ps() const;
+    void selectTo( HPS ps ) const;
+    
+    HPS hps;
+    FATTRS fa;
+    PFONTMETRICS pfm;
+#endif
 #ifdef Q_WS_X11
     TransformedFont *transformed_fonts;
@@ -605 +622 @@
 #endif
 
-#endif // Q_WS_WIN
-
-#endif
+#elif defined( Q_WS_PM )
+
+class QFontEnginePM : public QFontEngine
+{
+public:
+    QFontEnginePM( HPS ps, PFATTRS pfa, int pixelSize, int pointSize );
+    virtual ~QFontEnginePM() { delete[] widthCache; }
+
+    Error stringToCMap( const QChar *str, int len, glyph_t *glyphs, advance_t *advances, int *nglyphs, bool mirrored ) const;
+
+    void draw( QPainter *p, int x, int y, const QTextEngine *engine, const QScriptItem *si, int textFlags );
+
+    glyph_metrics_t boundingBox( const glyph_t *glyphs,
+                               const advance_t *advances, const qoffset_t *offsets, int numGlyphs );
+    glyph_metrics_t boundingBox( glyph_t glyph );
+
+    int ascent() const;
+    int descent() const;
+    int leading() const;
+    int maxCharWidth() const;
+    int minLeftBearing() const;
+    int minRightBearing() const;
+
+//@@TODO (dmik): need other implementation?    
+    const char *name() const { return 0; }
+
+    bool canRender( const QChar *string,  int len );
+
+    Type type() const;
+
+//@@TODO (dmik): the current implementation of font-related code does not
+//  support true unicode (chars and strings are converted using
+//  QString::local8bit), so 256 is enough. It will be changed later (when,
+//  for example, ft2lib will be used). See also stringToCMap() implementation.       
+    enum { widthCacheSize = 256 };
+    unsigned char *widthCache;
+};
+
+#endif
+
+#endif

trunk/src/kernel/qiconset.cpp

@@ -827 +827 @@
     pixmap->fill( dis.background() );
 
+    if ( !normalMask.mask() )
+        normalMask.setMask( normalMask );
+    
     QPainter painter;
     painter.begin( pixmap );
-    painter.setPen( dis.base() );
+    painter.setPen( dis.light() );
     painter.drawPixmap( 1, 1, normalMask );
-    painter.setPen( dis.foreground() );
+    painter.setPen( dis.dark() );
     painter.drawPixmap( 0, 0, normalMask );
     painter.end();
-
-    if ( !normalMask.mask() )
-        normalMask.setMask( normalMask );
 
     QBitmap mask( pixmap->size() );

trunk/src/kernel/qlocalfs.cpp

@@ -155 +155 @@
                            fi->size(), fi->lastModified(), fi->lastRead(), fi->isDir(), fi->isFile(),
                            fi->isSymLink(), fi->isWritable(), fi->isReadable(), fi->isExecutable() );
+        // ### Block signals to initiate a hack in QNetworkOperation that will
+        // prevent the op from being deleted during the qApp->processEvents() call
+        op->blockSignals( TRUE );
+        qApp->processEvents();
+        op->blockSignals( FALSE );
+        if ( op->state() == StStopped ) {
+            op->free();
+            return;
+        }
     }
     emit newChildren( infos, op );

trunk/src/kernel/qmime.cpp

@@ -356 +356 @@
     QStringList::Iterator it;
     if ( abs_name[0] == '/'
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
             || ( abs_name[0] && abs_name[1] == ':' ) || abs_name.startsWith("\\\\")
 #endif
@@ -456 +456 @@
     if ( context.isNull() ||
          !(context[0] == '/'
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
          || ( context[0] && context[1] == ':')
 #endif

trunk/src/kernel/qnetworkprotocol.cpp

@@ -84 +84 @@
             oldOps.removeFirst();
         }
-        delete opStartTimer;
     }
 
@@ -430 +429 @@
 QNetworkProtocol::~QNetworkProtocol()
 {
+    QNetworkOperation *op = d->opInProgress;
+    if ( op ) {
+        op->setState( StStopped );
+        op->setProtocolDetail( tr( "Operation stopped by the user" ) );
+        emit finished( op );
+        // op->free() will be called by QNetworkOperationPrivate dtor below 
+    }
     delete d;
 }
@@ -1257 +1263 @@
 void QNetworkOperation::deleteMe()
 {
-    delete this;
+    // ### A hackish workaround to prevent this op from being deleted during
+    // the qApp->processEvents() call in QLocalFs::operationListChildren().
+    // The proper way is to add something like QNetworkOperation::cancelFree()
+    // to stop deleteTimer and make it a documented method.
+    if ( !signalsBlocked() )
+        delete this;
 }
 

trunk/src/kernel/qobject.cpp

@@ -214 +214 @@
 
 
-// Event functions, implemented in qapplication_xxx.cpp
+// Event functions, implemented in qeventloop_xxx.cpp
 
 int   qStartTimer( int interval, QObject *obj );

trunk/src/kernel/qpainter.cpp

@@ -1635 +1635 @@
         } else {
             txop = TxScale;
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) 
             setf(DirtyFont);
 #endif
@@ -1641 +1641 @@
     } else {
         txop = TxRotShear;
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) 
         setf(DirtyFont);
 #endif
@@ -2345 +2345 @@
         if ( !pdev->cmd( QPaintDevice::PdcDrawPixmap, this, param ) || !hdc )
             return;
+#elif defined(Q_WS_PM)
+        if ( !pdev->cmd( QPaintDevice::PdcDrawPixmap, this, param ) || !hps )
+            return;
 #elif defined(Q_WS_QWS)
         pdev->cmd( QPaintDevice::PdcDrawPixmap, this, param );
@@ -2493 +2496 @@
         if ( !pdev->cmd( QPaintDevice::PdcDrawImage, this, param ) || !hdc )
             return;
+#elif defined(Q_WS_PM)
+        if ( !pdev->cmd( QPaintDevice::PdcDrawImage, this, param ) || !hps )
+            return;
 #elif defined (Q_WS_QWS)
         pdev->cmd( QPaintDevice::PdcDrawImage, this, param );
@@ -2551 +2557 @@
 #if defined(Q_WS_WIN)
         if ( !pdev->cmd( QPaintDevice::PdcDrawImage, this, param ) || !hdc )
+            return;
+#elif defined(Q_WS_PM)
+        if ( !pdev->cmd( QPaintDevice::PdcDrawImage, this, param ) || !hps )
             return;
 #elif defined(Q_WS_QWS)
@@ -2793 +2802 @@
                      !hdc )
                     return;                     // QPrinter wants PdcDrawText2
+#elif defined(Q_WS_PM)
+                if ( !pdev->cmd( QPaintDevice::PdcDrawText2Formatted,
+                                 this, param) ||
+                     !hps )
+                    return;
 #elif defined(Q_WS_QWS)
                 pdev->cmd( QPaintDevice::PdcDrawText2Formatted, this, param);

trunk/src/kernel/qpixmap.cpp

@@ -367 +367 @@
 #if defined(Q_WS_WIN)
         hdc = pixmap.hdc;                       // copy Windows device context
+#elif defined(Q_WS_PM)
+        hps = pixmap.hps;                       // copy OS/2 PM presentation space
 #elif defined(Q_WS_X11)
         hd = pixmap.hd;                         // copy X11 drawable
@@ -475 +477 @@
 #if defined(Q_WS_WIN)
         hdc = pixmap.hdc;
+#elif defined(Q_WS_PM)
+        hps = pixmap.hps;
 #elif defined(Q_WS_X11)
         hd = pixmap.hd;                         // copy QPaintDevice drawable
@@ -735 +739 @@
             delete data->mask;
             data->mask = 0;
+#if defined (Q_WS_PM)
+            if ( data->maskedHbm ) {
+                GpiDeleteBitmap( data->maskedHbm );
+                data->maskedHbm = 0;
+            }
+#endif
         }
         return;
@@ -754 +764 @@
     data->alphapm = 0;
 #endif // Q_WS_X11 && !QT_NO_XFTFREETYPE
+
+#if defined (Q_WS_PM)
+    if ( data->maskedHbm ) {
+        GpiDeleteBitmap( data->maskedHbm );
+        data->maskedHbm = 0;
+    }
+#endif
 
     delete data->mask;

trunk/src/kernel/qrichtext.cpp

@@ -76 +76 @@
 #endif
 
+#ifdef Q_WS_PM
+#include "qt_os2.h"
+#endif
+
 #define QChar_linesep QChar(0x2028U)
 
@@ -98 +102 @@
             value = value * metrics.logicalDpiY() / gdc;
         ReleaseDC( 0, hdc );
+#elif defined (Q_WS_PM)
+        LONG dpi;
+        DevQueryCaps( GpiQueryDevice( qt_display_ps() ),
+            CAPS_VERTICAL_FONT_RES, 1, &dpi );
+        value = value * metrics.logicalDpiY() / dpi;
 #elif defined (Q_WS_MAC)
         value = value * metrics.logicalDpiY() / 75; // ##### FIXME
@@ -517 +526 @@
     bool justInsert = TRUE;
     QString s( str );
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) 
     if ( checkNewLine ) {
         int i = 0;

trunk/src/kernel/qscriptengine.cpp

@@ -1041 +1041 @@
 #elif defined( Q_WS_WIN )
 # include "qscriptengine_win.cpp"
+#elif defined( Q_WS_PM )
+# include "qscriptengine_pm.cpp"
 #elif defined( Q_WS_MAC )
 # include "qscriptengine_mac.cpp"

trunk/src/kernel/qsizegrip.cpp

@@ -50 +50 @@
 #include "qobjectlist.h"
 #include "qt_windows.h"
+#elif defined (Q_WS_PM)
+#include "qobjectlist.h"
+#include "qt_os2.h"
 #elif defined(Q_WS_MAC)
 bool qt_mac_update_sizer(QWidget *, int); //qwidget_mac.cpp
@@ -236 +239 @@
         tlw->resize( w, h );
     }
-#ifdef Q_WS_WIN
+#if defined (Q_WS_WIN)
     MSG msg;
     while( PeekMessage( &msg, winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE ) )
+      ;
+#elif defined (Q_WS_PM)
+//@@TODO (dmik): is the code below really necessary?
+    QMSG qmsg;
+    while( WinPeekMsg( 0, &qmsg, winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE ) )
       ;
 #endif

trunk/src/kernel/qt_gfx.pri

@@ -7 +7 @@
         system-mng {
             win32:LIBS += libmng.lib
+            os2:LIBS += libmng.lib
             unix:LIBS  += -lmng
         } else {
@@ -46 +47 @@
            unix:LIBS += -ljpeg
            win32:LIBS += libjpeg.lib
+           os2:LIBS += libjpeg.lib
         } else {
             INCLUDEPATH += 3rdparty/libjpeg
@@ -105 +107 @@
             unix:LIBS  += -lpng
             win32:LIBS += libpng.lib
+            os2:LIBS += png.lib
         } else {
             INCLUDEPATH  += 3rdparty/libpng
@@ -147 +150 @@
    unix:LIBS += -lz
    win32:LIBS += libz.lib
+   os2:LIBS += z.lib
 }
 

trunk/src/kernel/qt_kernel.pri

@@ -122 +122 @@
                   $$KERNEL_CPP/qfontengine_win.cpp
 
+        os2:SOURCES += \
+          $$KERNEL_CPP/qapplication_pm.cpp \
+                  $$KERNEL_CPP/qclipboard_pm.cpp \
+                  $$KERNEL_CPP/qcolor_pm.cpp \
+          $$KERNEL_CPP/qcursor_pm.cpp \
+                  $$KERNEL_CPP/qdesktopwidget_pm.cpp \
+                  $$KERNEL_CPP/qeventloop_pm.cpp \
+                  $$KERNEL_CPP/qfont_pm.cpp \
+                  $$KERNEL_CPP/qmime_pm.cpp \
+                  $$KERNEL_CPP/qpixmap_pm.cpp \
+                  $$KERNEL_CPP/qpaintdevice_pm.cpp \
+                  $$KERNEL_CPP/qpainter_pm.cpp \
+                  $$KERNEL_CPP/qregion_pm.cpp \
+          $$KERNEL_CPP/qthread_pm.cpp \
+                  $$KERNEL_CPP/qwidget_pm.cpp \
+                  $$KERNEL_CPP/qfontengine_pm.cpp
+
         unix:x11 {
               SOURCES += $$KERNEL_CPP/qapplication_x11.cpp \
@@ -260 +277 @@
         }
 }
+
+#@@TODO(dmik): headers and sources below are substracted until implemented
+os2 {
+        HEADERS -= \
+                $$KERNEL_P/qinputcontext_p.h \
+                $$KERNEL_H/qpolygonscanner.h \
+                $$KERNEL_H/qprinter.h \
+                $$KERNEL_H/qprocess.h \
+                $$KERNEL_H/qsessionmanager.h \
+                $$KERNEL_H/qsound.h
+
+        SOURCES -= \
+                $$KERNEL_CPP/qpolygonscanner.cpp \
+                $$KERNEL_CPP/qprinter.cpp \
+                $$KERNEL_CPP/qprocess.cpp \
+                $$KERNEL_CPP/qsound.cpp
+}

trunk/src/kernel/qtextengine.cpp

@@ -826 +826 @@
 #elif defined( Q_WS_WIN )
 # include "qtextengine_win.cpp"
+#elif defined( Q_WS_PM )
+# include "qtextengine_pm.cpp"
 #elif defined( Q_WS_MAC )
 # include "qtextengine_mac.cpp"

trunk/src/kernel/qtextengine_p.h

@@ -167 +167 @@
     unsigned short reserved          :1;
     unsigned short engineReserved    :2;
+};
+
+inline bool operator == ( const QScriptAnalysis &sa1, const QScriptAnalysis &sa2 )
+{
+    return
+        sa1.script == sa2.script &&
+        sa1.bidiLevel == sa2.bidiLevel;
+        // ###
+//          && override == other.override;
+}
+
+#elif defined( Q_WS_PM )
+
+//@@TODO (dmik): the definitions below is almost unchecked (no true unicode
+//  support yet)
+
+//@@TODO (dmik): curretnly glyphs are just 8 bit chars (see
+//  QFontEnginePM::stringToCMap()), so glyph_t is temporarily defined as
+//  unsigned char. it should be changed later.
+typedef unsigned char glyph_t;
+//typedef unsigned short glyph_t;
+
+struct qoffset_t {
+    int x;
+    int y;
+};
+
+typedef int advance_t;
+
+//@@TODO (dmik): it's a dummy version...
+struct QScriptAnalysis {
+    unsigned short script         :10;
+    unsigned short bidiLevel         :5;
+    unsigned short override          :1;
+    unsigned short reserved          :1;
 };
 

trunk/src/kernel/qthread.cpp

@@ -41 +41 @@
 #include <private/qthreadinstance_p.h>
 
+#ifndef QT_NO_COMPAT
 #ifndef QT_H
 #  include "qapplication.h"
 #endif // QT_H
+#endif // QT_NO_COMPAT
 
 #if QT_VERSION >= 0x040000

trunk/src/kernel/qtranslator.cpp

@@ -406 +406 @@
 
     if ( filename[0] == '/'
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
          || (filename[0] && filename[1] == ':') || filename[0] == '\\'
 #endif

trunk/src/kernel/qurl.cpp

@@ -834 +834 @@
         d->host.remove( (uint)0, 1 );
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
     // hack for windows file://machine/path syntax
     if ( d->protocol == "file" ) {
@@ -1028 +1028 @@
             d->cleanPath = d->path;
         } else if ( isLocalFile() ) {
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
             // hack for stuff like \\machine\path and //machine/path on windows
             if ( ( d->path.left( 1 ) == "/" || d->path.left( 1 ) == "\\" ) && 
@@ -1101 +1101 @@
 {
     if ( d->path.isEmpty() || d->path.endsWith( "/" )
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
         || d->path.endsWith( "\\" )
 #endif

trunk/src/kernel/qwidget.cpp

@@ -61 +61 @@
 #include "qinputcontext_p.h"
 #endif
+#if defined(Q_WS_PM)
+#include "qt_os2.h"
+#endif
 #if defined(Q_WS_QWS)
 #include "qwsmanager_qws.h"
@@ -513 +516 @@
   QWidget utility functions
  *****************************************************************************/
-
 static QFont qt_naturalWidgetFont( QWidget* w ) {
     QFont naturalfont = QApplication::font( w );
@@ -3259 +3261 @@
 #if defined(Q_WS_WIN)
         && GetFocus() == winId()
+#elif defined(Q_WS_PM)
+//@@TODO (dmik): currently we don't use WinSetFocus(). what for? Qt seems
+//  to completely handle focus traversal itself. 
+//      && WinQueryFocus( HWND_DESKTOP ) == winId()
 #endif
         )
@@ -3294 +3300 @@
             SetFocus( winId() );
         else {
+#elif defined(Q_WS_PM)
+//@@TODO (dmik): currently we don't use WinSetFocus(). what for? Qt seems
+//  to completely handle focus traversal itself. 
+//      if ( !topLevelWidget()->isPopup() )
+//          WinSetFocus( HWND_DESKTOP, winId() );
+//      else {
 #endif
 #if defined(QT_ACCESSIBILITY_SUPPORT)
             QAccessible::updateAccessibility( this, 0, QAccessible::Focus );
 #endif
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) // || defined(Q_WS_PM)
         }
 #endif
@@ -3345 +3357 @@
             SetFocus( 0 );
         else {
+#elif defined(Q_WS_PM)
+//@@TODO (dmik): currently we don't use WinSetFocus(). what for? Qt seems
+//  to completely handle focus traversal itself. 
+//      if ( !isPopup() && WinQueryFocus( HWND_DESKTOP ) == winId() )
+//          WinSetFocus( HWND_DESKTOP, topLevelWidget()->winId() );
+//      else {
 #endif
 #if defined(QT_ACCESSIBILITY_SUPPORT)
             QAccessible::updateAccessibility( this, 0, QAccessible::Focus );
 #endif
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) // || defined(Q_WS_PM)
         }
 #endif
@@ -3567 +3585 @@
     }
 #endif
+//@@TODO (dmik): I think we don't need the same as above in OS/2,
+//  because if the window is active (in Qt terminology)
+//  qApp->activeWindow() will be equal to toplevelWidget() which is
+//  checked at the beginnig.
 
     return FALSE;
@@ -3985 +4007 @@
     // On Windows, show the popup now so that our own focus handling
     // stores the correct old focus widget even if it's stolen in the showevent
+//@@TODO (dmik): need the same in OS/2? guess not.        
 #if defined(Q_WS_WIN)
     if ( testWFlags(WType_Popup) )
@@ -4006 +4029 @@
         showWindow();
 
-#if !defined(Q_WS_WIN)
+//@@TODO (dmik): need the same in OS/2? guess not.        
+#if !defined(Q_WS_WIN) 
     if ( testWFlags(WType_Popup) )
         qApp->openPopup( this );
@@ -4048 +4072 @@
         qt_leave_modal( this );
 
-#if defined(Q_WS_WIN)
+//@@TODO (dmik): is it correct for OS/2?    
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
     if ( isTopLevel() && !isPopup() && parentWidget() && isActiveWindow() )
         parentWidget()->setActiveWindow();      // Activate parent
@@ -4927 +4952 @@
         }
 
+#ifndef Q_WS_PM
+    // We disable this on OS/2 since we send these events from qt_sendBlocked()
+    // which does it more accurately compared to the code below -- only those
+    // widgets that have actually been blocked/unblocked (not less and not
+    // more) will receive these events.         
     case QEvent::WindowBlocked:
     case QEvent::WindowUnblocked:
@@ -4938 +4968 @@
         }
         break;
+#endif        
 
     default:
@@ -5527 +5558 @@
 */
 bool QWidget::winEvent( MSG * )
+{
+    return FALSE;
+}
+
+#endif
+#if defined(Q_WS_PM)
+
+/*!
+    This special event handler can be reimplemented in a subclass to
+    receive native OS/2 PM events.
+
+    In your reimplementation of this function, if you want to stop the
+    event being handled by Qt, return TRUE. If you return FALSE, this
+    native event is passed back to Qt, which translates the event into
+    a Qt event and sends it to the widget.
+
+    \warning This function is not portable.
+
+    \sa QApplication::pmEventFilter()
+*/
+bool QWidget::pmEvent( QMSG * )
 {
     return FALSE;

trunk/src/moc/moc.pro

@@ -6 +6 @@
                   QT_NO_STL QT_NO_COMPRESS
 win32:DEFINES  += QT_NODLL
+os2:DEFINES  += QT_NODLL
 DESTDIR         = ../../bin
 
@@ -48 +49 @@
 unix:SOURCES    += ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp
 win32:SOURCES   += ../tools/qfile_win.cpp ../tools/qdir_win.cpp ../tools/qfileinfo_win.cpp
+os2:SOURCES     += ../tools/qfile_pm.cpp ../tools/qdir_pm.cpp ../tools/qfileinfo_pm.cpp
 macx:LIBS       += -framework Carbon
 

trunk/src/network/qdns.cpp

@@ -79 +79 @@
 #include <dlfcn.h>
 #endif
+#if defined(Q_OS_OS2)
+//@@TODO (dmik): currently these headers are not used
+//  (see comments to QDns::doSynchronousLookup())
+//#include <netinet/in.h>
+//#include <resolv.h>
+#endif
 
 //#define QDNS_DEBUG
@@ -105 +111 @@
 static bool ipv6support = FALSE;
 
+#if defined(Q_OS_OS2)
+//@@TODO (dmik): currently qdns_res_init() is not used
+//  (see comments to QDns::doSynchronousLookup())
+#else
 static int qdns_res_init()
 {
@@ -116 +126 @@
     else
         return -1;
-#elif defined(Q_OS_UNIX)
+#elif defined(Q_OS_UNIX) || defined(Q_OS_OS2) 
     return res_init();
 #else
@@ -122 +132 @@
 #endif
 }
+#endif
 
 
@@ -129 +140 @@
     {
 #if defined(Q_DNS_SYNCHRONOUS)
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
         noEventLoop = qApp==0 || qApp->loopLevel()==0;
 #else
@@ -881 +892 @@
 {
     if ( !globalManager ) {
+        new QDnsManager();
         qAddPostRoutine(cleanupDns);
-        new QDnsManager();
     }
     return globalManager;
@@ -2443 +2454 @@
 }
 
-#elif defined(Q_OS_UNIX)
+#elif defined(Q_OS_UNIX) || defined(Q_OS_OS2)
 
 #if defined(Q_DNS_SYNCHRONOUS)
 void QDns::doSynchronousLookup()
 {
+#if defined(Q_OS_OS2)
+    //@@TODO (dmik): we can use the code below on OS/2 also but this will
+    //  require linking against the additional library containing res_*
+    //  functions and global data, which is normally not used anywhere else
+    //  (because QDns implementation does lookups diretcly to achieve
+    //  asynchronous behavior) and will just waste some system resources.
+    //  Anyhow, is synchronous behavior really necessary? Do nothing for now.
+#else
     if ( t!=None && !l.isEmpty() ) {
         QValueListIterator<QString> it = n.begin();
@@ -2499 +2518 @@
         emit resultsReady();
     }
+#endif
 }
 #endif
@@ -2517 +2537 @@
 
     // read resolv.conf manually.
+#if defined(Q_OS_OS2)
+    char *etc = getenv( "ETC" );
+    if ( !etc ) {
+        etc = "x:\\MPTN\\ETC";
+        ULONG boot = 0;
+        DosQuerySysInfo( QSV_BOOT_DRIVE, QSV_BOOT_DRIVE, (PVOID)boot, sizeof(boot) );
+        *etc = (char)(boot + 'A' - 1);
+    }
+    // currently, resolv takes precedence over resolv2 assuming that resolv
+    // is created for PPP connections and therefore should override resolv2
+    // which is created for permanent LAN connections.
+    QFile resolvConf( QString( etc ) + "\\resolv" );
+    if ( !resolvConf.exists() )
+        resolvConf.setName( QString( etc ) + "\\resolv2" ); 
+#else
     QFile resolvConf("/etc/resolv.conf");
+#endif    
     if (resolvConf.open(IO_ReadOnly)) {
         QTextStream stream( &resolvConf );
@@ -2529 +2565 @@
             if ( type == "nameserver" ) {
                 QHostAddress *address = new QHostAddress();
-                if ( address->setAddress( QString(line[1]) ) ) {
+                if ( address->setAddress( list[1] ) ) {
                     // only add ipv6 addresses from resolv.conf if
                     // this host supports ipv6.
@@ -2548 +2584 @@
     }
 
+#if defined(Q_OS_OS2)
+//@@TODO (dmik): currently the code below is not used
+//  (see comments to QDns::doSynchronousLookup())
+#else
     if (ns->isEmpty()) {
 #if defined(Q_MODERN_RES_API)
@@ -2594 +2634 @@
         }
     }
-
+#endif    
+
+#if defined(Q_OS_OS2)
+    QFile hosts( QString( etc ) + "\\hosts" );
+#else
     QFile hosts( QString::fromLatin1( "/etc/hosts" ) );
+#endif    
     if ( hosts.open( IO_ReadOnly ) ) {
         // read the /etc/hosts file, creating long-life A and PTR RRs

trunk/src/network/qt_network.pri

@@ -20 +20 @@
         unix:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_unix.cpp
         win32:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_win.cpp
+        os2:NETWORK_SOURCES += $$NETWORK_CPP/qsocketdevice_pm.cpp
         SOURCES    += $$NETWORK_SOURCES
 }

trunk/src/qt.pro

@@ -11 +11 @@
 
 win32:!shared:CONFIG += staticlib
+os2:!shared:CONFIG += staticlib
 
 win32-borland {
@@ -86 +87 @@
 win32-borland:INCLUDEPATH += kernel
 
+os2 {
+        OS2_ALL_H = ../include
+        SQL_H       = $$OS2_ALL_H
+        KERNEL_H    = $$OS2_ALL_H
+        WIDGETS_H   = $$OS2_ALL_H
+        TABLE_H     = $$OS2_ALL_H
+        DIALOGS_H   = $$OS2_ALL_H
+        ICONVIEW_H  = $$OS2_ALL_H
+        NETWORK_H   = $$OS2_ALL_H
+        OPENGL_H    = $$OS2_ALL_H
+        TOOLS_H     = $$OS2_ALL_H
+        CODECS_H    = $$OS2_ALL_H
+        WORKSPACE_H = $$OS2_ALL_H
+        XML_H       = $$OS2_ALL_H
+        CANVAS_H    = $$OS2_ALL_H
+        STYLES_H    = $$OS2_ALL_H
+        CONFIG      -= incremental
+
+        CONFIG  += zlib
+        INCLUDEPATH += tmp
+        !staticlib {
+                DEFINES += QT_MAKEDLL
+                exists(qt.rc):RC_FILE = qt.rc
+                exists(qt.def.tpl.$$QMAKESPEC):DEF_FILE_TEMPLATE = qt.def.tpl.$$QMAKESPEC
+                exists(qt.def.map.$$QMAKESPEC):DEF_FILE_MAP = qt.def.map.$$QMAKESPEC
+        }
+}
+
 unix {
         CANVAS_H        = $$CANVAS_CPP
@@ -143 +172 @@
 
 #modules
-include($$KERNEL_CPP/qt_kernel.pri)
-include($$WIDGETS_CPP/qt_widgets.pri)
-include($$DIALOGS_CPP/qt_dialogs.pri)
-include($$ICONVIEW_CPP/qt_iconview.pri)
-include($$WORKSPACE_CPP/qt_workspace.pri)
-include($$NETWORK_CPP/qt_network.pri)
-include($$CANVAS_CPP/qt_canvas.pri)
-include($$TABLE_CPP/qt_table.pri)
-include($$XML_CPP/qt_xml.pri)
-include($$OPENGL_CPP/qt_opengl.pri)
-include($$SQL_CPP/qt_sql.pri)
-include($$KERNEL_CPP/qt_gfx.pri)
-include($$TOOLS_CPP/qt_tools.pri)
-include($$CODECS_CPP/qt_codecs.pri)
-include($$STYLES_CPP/qt_styles.pri)
+os2 {
+        # this section should be removed one day
+    # when an OS/2 version of every module is ready
+        include($$KERNEL_CPP/qt_kernel.pri)
+        include($$WIDGETS_CPP/qt_widgets.pri)
+        include($$DIALOGS_CPP/qt_dialogs.pri)
+        include($$WORKSPACE_CPP/qt_workspace.pri)
+        include($$NETWORK_CPP/qt_network.pri)
+        include($$XML_CPP/qt_xml.pri)
+        include($$KERNEL_CPP/qt_gfx.pri)
+        include($$TOOLS_CPP/qt_tools.pri)
+        include($$CODECS_CPP/qt_codecs.pri)
+        include($$STYLES_CPP/qt_styles.pri)
+} else {
+        include($$KERNEL_CPP/qt_kernel.pri)
+        include($$WIDGETS_CPP/qt_widgets.pri)
+        include($$DIALOGS_CPP/qt_dialogs.pri)
+        include($$ICONVIEW_CPP/qt_iconview.pri)
+        include($$WORKSPACE_CPP/qt_workspace.pri)
+        include($$NETWORK_CPP/qt_network.pri)
+        include($$CANVAS_CPP/qt_canvas.pri)
+        include($$TABLE_CPP/qt_table.pri)
+        include($$XML_CPP/qt_xml.pri)
+        include($$OPENGL_CPP/qt_opengl.pri)
+        include($$SQL_CPP/qt_sql.pri)
+        include($$KERNEL_CPP/qt_gfx.pri)
+        include($$TOOLS_CPP/qt_tools.pri)
+        include($$CODECS_CPP/qt_codecs.pri)
+        include($$STYLES_CPP/qt_styles.pri)
+}
 embedded:include($$EMBEDDED_CPP/qt_embedded.pri)
 
@@ -166 +210 @@
 
 #install directives
-include(qt_install.pri)
+#@@todo(dmik): need this on OS/2?
+!os2:include(qt_install.pri)
 !staticlib:PRL_EXPORT_DEFINES += QT_SHARED
 
@@ -190 +235 @@
                    $$STYLES_CPP/qstyleplugin.cpp \
                    $$CODECS_CPP/qtextcodecplugin.cpp \
-                   $$WIDGETS_CPP/qwidgetplugin.cpp 
-}
+                   $$WIDGETS_CPP/qwidgetplugin.cpp
+}
+
+os2 {
+        # targets and commands to sync private headers
+        private_headers.target = ..\.private_headers
+        private_headers.depends = do_private_headers
+        do_private_headers.target = do_private_headers
+        do_private_headers.commands = cd .. && $(MAKE) private_headers
+        QMAKE_EXTRA_TARGETS += do_private_headers private_headers
+        PRE_TARGETDEPS += $$do_private_headers.target
+        QMAKE_INTERNAL_INCLUDED_FILES += $$private_headers.target
+}

trunk/src/styles/qcommonstyle.cpp

@@ -146 +146 @@
 #ifndef QT_NO_LISTVIEW
     case PE_CheckListController: {
-        p->drawPixmap(r, QPixmap((const char **)check_list_controller_xpm));
+        QRect pr( r );
+        QPixmap px( (const char **)check_list_controller_xpm );
+        // center pixmap if smaller, otherwise it will be scaled to fit
+        int d = pr.width() - px.width();
+        if ( d > 0 ) {
+            pr.setX( pr.x() + d / 2 );
+            pr.setWidth( px.width() );
+        }
+        d = pr.height() - px.height();
+        if ( d > 0 ) {
+            pr.setY( pr.y() + d / 2 );
+            pr.setHeight( px.height() );
+        }
+        p->drawPixmap( pr, px );
         break; }
     case PE_CheckListExclusiveIndicator: {

trunk/src/styles/qcompactstyle.cpp

@@ -152 +152 @@
             const QPopupMenu *popupmenu = (const QPopupMenu *) widget;
             QMenuItem *mi = opt.menuItem();
+            
+            // QPopupMenu has WResizeNoErase and WRepaintNoErase flags, so we
+            // must erase areas not covered by menu items (this is requested by
+            // QPopupMenu using 0 as the menu item argument).
+            // [Win32 version feels ok without this, because it doesn't actually
+            // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+            // erases the background before WM_PAINT and after every resize].
+#if !defined (Q_WS_PM)
             if ( !mi )
                 break;
+#endif
 
             int tab = opt.tabWidth();

trunk/src/styles/qmotifplusstyle.cpp

@@ -757 +757 @@
             QPopupMenu *popupmenu = (QPopupMenu *) widget;
             QMenuItem *mi = opt.menuItem();
+            
+            // QPopupMenu has WResizeNoErase and WRepaintNoErase flags, so we
+            // must erase areas not covered by menu items (this is requested by
+            // QPopupMenu using 0 as the menu item argument).
+            // [Win32 version feels ok without this, because it doesn't actually
+            // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+            // erases the background before WM_PAINT and after every resize].
+#if !defined (Q_WS_PM)
             if ( !mi )
                 break;
+#endif
 
             int tab = opt.tabWidth();

trunk/src/styles/qmotifstyle.cpp

@@ -1004 +1004 @@
             const QPopupMenu *popupmenu = (const QPopupMenu *) widget;
             QMenuItem *mi = opt.menuItem();
+            
+            // QPopupMenu has WResizeNoErase and WRepaintNoErase flags, so we
+            // must erase areas not covered by menu items (this is requested by
+            // QPopupMenu using 0 as the menu item argument).
+            // [Win32 version feels ok without this, because it doesn't actually
+            // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+            // erases the background before WM_PAINT and after every resize].
+#if !defined (Q_WS_PM)
             if ( !mi )
                 break;
+#endif
 
             int tab = opt.tabWidth();

trunk/src/styles/qsgistyle.cpp

@@ -946 +946 @@
                 break;
             QMenuItem *mi = opt.menuItem();
+            
+            // QPopupMenu has WResizeNoErase and WRepaintNoErase flags, so we
+            // must erase areas not covered by menu items (this is requested by
+            // QPopupMenu using 0 as the menu item argument).
+            // [Win32 version feels ok without this, because it doesn't actually
+            // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+            // erases the background before WM_PAINT and after every resize].
+#if !defined (Q_WS_PM)
             if ( !mi )
                 break;
+#endif
             const QPopupMenu *popupmenu = (const QPopupMenu *) widget;
             int tab = opt.tabWidth();

trunk/src/styles/qwindowsstyle.cpp

@@ -85 +85 @@
 enum QSliderDirection { SlUp, SlDown, SlLeft, SlRight };
 
+#ifndef QT_NO_MENUDATA
 // A friendly class providing access to QMenuData's protected member.
 class FriendlyMenuData : public QMenuData
@@ -90 +91 @@
     friend class QWindowsStyle;
 };
+#endif
 
 // Private class
@@ -158 +160 @@
         break;
     case QEvent::KeyRelease:
+#ifndef QT_NO_MENUDATA
         if (((QKeyEvent*)e)->key() == Key_Alt) {
             widget = widget->topLevelWidget();
@@ -172 +175 @@
             }
         }
+#endif
         break;
     case QEvent::FocusIn:
     case QEvent::FocusOut:
+#ifndef QT_NO_MENUBAR
         {
             // Menubars toggle based on focus
@@ -181 +186 @@
                 menuBarTimer = menuBar->startTimer(0);
         }
+#endif
         break;
     case QEvent::Close:
@@ -188 +194 @@
         break;
     case QEvent::Timer:
+#ifndef QT_NO_MENUBAR
         {
             QMenuBar *menuBar = ::qt_cast<QMenuBar*>(o);
@@ -198 +205 @@
             }
         }
+#endif
         break;
     default:
@@ -841 +849 @@
             const QPopupMenu *popupmenu = (const QPopupMenu *) widget;
             QMenuItem *mi = opt.menuItem();
+            
+            // QPopupMenu has WResizeNoErase and WRepaintNoErase flags, so we
+            // must erase areas not covered by menu items (this is requested by
+            // QPopupMenu using 0 as the menu item argument).
+            // [Win32 version feels ok without this, because it doesn't actually
+            // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+            // erases the background before WM_PAINT and after every resize].
+#if !defined (Q_WS_PM)
             if ( !mi )
                 break;
-
+#endif
+            
             int tab = opt.tabWidth();
             int maxpmw = opt.maxIconWidth();

trunk/src/tools/qconfig.cpp

@@ -2 +2 @@
 
 /* Install paths from configure */
-static const char QT_INSTALL_PREFIX [267] = "qt_nstpath=E:\\develop\\Qt\\win-3.3.1";
-static const char QT_INSTALL_BINS   [267] = "qt_binpath=E:\\develop\\Qt\\win-3.3.1\\bin";
-static const char QT_INSTALL_DOCS   [267] = "qt_docpath=E:\\develop\\Qt\\win-3.3.1\\doc";
-static const char QT_INSTALL_HEADERS[267] = "qt_hdrpath=E:\\develop\\Qt\\win-3.3.1\\include";
-static const char QT_INSTALL_LIBS   [267] = "qt_libpath=E:\\develop\\Qt\\win-3.3.1\\lib";
-static const char QT_INSTALL_PLUGINS[267] = "qt_plgpath=E:\\develop\\Qt\\win-3.3.1\\plugins";
-static const char QT_INSTALL_DATA   [267] = "qt_datpath=E:\\develop\\Qt\\win-3.3.1";
-static const char QT_INSTALL_TRANSLATIONS [267] = "qt_trnpath=E:\\develop\\Qt\\win-3.3.1\\translations";
+static const char QT_INSTALL_PREFIX [267] = "qt_nstpath=C:\\Qt\\3.3.1";
+static const char QT_INSTALL_BINS   [267] = "qt_binpath=C:\\Qt\\3.3.1\\bin";
+static const char QT_INSTALL_DOCS   [267] = "qt_docpath=C:\\Qt\\3.3.1\\doc";
+static const char QT_INSTALL_HEADERS[267] = "qt_hdrpath=C:\\Qt\\3.3.1\\include";
+static const char QT_INSTALL_LIBS   [267] = "qt_libpath=C:\\Qt\\3.3.1\\lib";
+static const char QT_INSTALL_PLUGINS[267] = "qt_plgpath=C:\\Qt\\3.3.1\\plugins";
+static const char QT_INSTALL_DATA   [267] = "qt_datpath=C:\\Qt\\3.3.1";
+static const char QT_INSTALL_TRANSLATIONS [267] = "qt_trnpath=C:\\Qt\\3.3.1\\translations";
 
 /* strlen( "qt_xxxpath=" ) == 11 */

trunk/src/tools/qcriticalsection_p.cpp

@@ -36 +36 @@
 #if defined(QT_THREAD_SUPPORT)
 
-#include "qt_windows.h"
-
 #include <private/qcriticalsection_p.h>
 
+#if defined(Q_WS_WIN)
+#   include "qt_windows.h"
+#elif defined(Q_OS_OS2)
+#   include "qt_os2.h"
+#endif
+
+#if defined(Q_WS_WIN)
 class QCriticalSectionPrivate 
 {
@@ -47 +52 @@
     CRITICAL_SECTION section;
 };
-
+#endif
 
 QCriticalSection::QCriticalSection()
 {
+#if defined(Q_WS_WIN)
     d = new QCriticalSectionPrivate;
     InitializeCriticalSection( &d->section );
+#endif
 }
 
 QCriticalSection::~QCriticalSection()
 {
+#if defined(Q_WS_WIN)
     DeleteCriticalSection( &d->section );
     delete d;
+#endif
 }
 
 void QCriticalSection::enter()
 {
+#if defined(Q_WS_WIN)
     EnterCriticalSection( &d->section );
+#elif defined(Q_OS_OS2)
+    DosEnterCritSec();
+#endif
 }
 
 void QCriticalSection::leave()
 {
+#if defined(Q_WS_WIN)
     LeaveCriticalSection( &d->section );
+#elif defined(Q_OS_OS2)
+    DosExitCritSec();
+#endif
 }
 

trunk/src/tools/qcriticalsection_p.h

@@ -38 +38 @@
 
 #ifndef QT_H
+#include "qglobal.h"
 #endif // QT_H
 
@@ -54 +55 @@
 #if defined(QT_THREAD_SUPPORT)
 
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
 
 /*
@@ -60 +61 @@
 */
 
+#if defined(Q_WS_WIN)
 class QCriticalSectionPrivate;
+#endif
 
 class QCriticalSection
@@ -70 +73 @@
     void leave();
 
+#if defined(Q_WS_WIN)
 private:
     QCriticalSectionPrivate *d;
+#endif    
 };
 

trunk/src/tools/qdatetime.cpp

@@ -51 +51 @@
 #endif
 
+#if defined(Q_OS_OS2)
+#include <unidef.h>
+#include <sys/timeb.h>
+#endif
+
 static const uint FIRST_DAY     = 2361222;      // Julian day for 1752-09-14
 static const int  FIRST_YEAR    = 1752;         // ### wrong for many countries
@@ -515 +520 @@
     }
 #endif
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+    UniChar buffer[256];
+    tm tt;
+    memset( &tt, 0, sizeof( tm ) );
+    tt.tm_mon = month - 1;
+    LocaleObject lo = qt_os2DefLocaleObj();
+    if (lo)
+        if ( UniStrftime( lo, buffer, sizeof( buffer ) / sizeof( UniChar ),
+                (UniChar *)L"%b", &tt )
+        )
+            return QString::fromUcs2( buffer );
+#elif !defined(Q_WS_WIN)
     char buffer[255];
     tm tt;
@@ -561 +577 @@
     }
 #endif
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+    UniChar buffer[256];
+    tm tt;
+    memset( &tt, 0, sizeof( tm ) );
+    tt.tm_mon = month - 1;
+    LocaleObject lo = qt_os2DefLocaleObj();
+    if (lo)
+        if ( UniStrftime( lo, buffer, sizeof( buffer ) / sizeof( UniChar ),
+                (UniChar *)L"%B", &tt )
+        )
+            return QString::fromUcs2( buffer );
+#elif !defined(Q_WS_WIN)
     char buffer[255];
     tm tt;
@@ -615 +642 @@
     }
 #endif
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+    UniChar buffer[256];
+    tm tt;
+    memset( &tt, 0, sizeof( tm ) );
+    tt.tm_wday = ( weekday == 7 ) ? 0 : weekday;
+    LocaleObject lo = qt_os2DefLocaleObj();
+    if (lo)
+        if ( UniStrftime( lo, buffer, sizeof( buffer ) / sizeof( UniChar ),
+                (UniChar *)L"%a", &tt )
+        )
+            return QString::fromUcs2( buffer );
+#elif !defined(Q_WS_WIN)
     char buffer[255];
     tm tt;
@@ -663 +701 @@
     }
 #endif
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+    UniChar buffer[256];
+    tm tt;
+    memset( &tt, 0, sizeof( tm ) );
+    tt.tm_wday = ( weekday == 7 ) ? 0 : weekday;
+    LocaleObject lo = qt_os2DefLocaleObj();
+    if (lo)
+        if ( UniStrftime( lo, buffer, sizeof( buffer ) / sizeof( UniChar ),
+                (UniChar *)L"%A", &tt )
+        )
+            return QString::fromUcs2( buffer );
+#elif !defined(Q_WS_WIN)
     char buffer[255];
     tm tt;
@@ -729 +778 @@
     case Qt::LocalDate:
         {
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+            tm tt;
+            memset( &tt, 0, sizeof( tm ) );
+            UniChar buf[256];
+            tt.tm_mday = day();
+            tt.tm_mon = month() - 1;
+            tt.tm_year = year() - 1900;
+
+            LocaleObject lo = qt_os2DefLocaleObj();
+            if (lo)
+                if ( UniStrftime( lo, buf, sizeof( buf ) / sizeof( UniChar ),
+                        (UniChar *)L"%x", &tt )
+                )
+                    return QString::fromUcs2( buf );
+#elif !defined(Q_WS_WIN)
             tm tt;
             memset( &tt, 0, sizeof( tm ) );
@@ -1395 +1458 @@
     case Qt::LocalDate:
         {
-#ifndef Q_WS_WIN
+#if defined(Q_OS_OS2)
+            tm tt;
+            memset( &tt, 0, sizeof( tm ) );
+            UniChar buf[256];
+            tt.tm_sec = second();
+            tt.tm_min = minute();
+            tt.tm_hour = hour();
+
+            LocaleObject lo = qt_os2DefLocaleObj();
+            if (lo)
+                if ( UniStrftime( lo, buf, sizeof( buf ) / sizeof( UniChar ),
+                        (UniChar *)L"%X", &tt )
+                )
+                    return QString::fromUcs2( buf );
+#elif !defined(Q_WS_WIN)
             tm tt;
             memset( &tt, 0, sizeof( tm ) );
@@ -1743 +1820 @@
     ct->ds = (uint)( MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min +
                      1000 * t->tm_sec + tv.tv_usec / 1000 );
+#elif defined(Q_OS_OS2)
+    timeb ltime;
+    ::ftime( &ltime );
+    tm *t;
+    if ( ts == Qt::LocalTime )
+        t = localtime( &ltime.time );
+    else
+        t = gmtime( &ltime.time );
+    ct->ds = (uint) ( MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min +
+                      1000 * t->tm_sec + ltime.millitm );
 #else
     time_t ltime; // no millisecond resolution
@@ -1748 +1835 @@
     tm *t;
     if ( ts == Qt::LocalTime )
-        localtime( &ltime );
+        t = localtime( &ltime );
     else
-        gmtime( &ltime );
+        t = gmtime( &ltime );
     ct->ds = (uint) ( MSECS_PER_HOUR * t->tm_hour + MSECS_PER_MIN * t->tm_min +
                       1000 * t->tm_sec );

trunk/src/tools/qdir.cpp

@@ -68 +68 @@
     A QDir can point to a file using either a relative or an absolute
     path. Absolute paths begin with the directory separator "/"
-    (optionally preceded by a drive specification under Windows). If
+    (optionally preceded by a drive specification under Windows and OS/2). If
     you always use "/" as a directory separator, Qt will translate
     your paths to conform to the underlying operating system. Relative
@@ -116 +116 @@
     The list of root directories is provided by drives(); on Unix
     systems this returns a list containing one root directory, "/"; on
-    Windows the list will usually contain "C:/", and possibly "D:/",
+    Windows or OS/2 the list will usually contain "C:/", and possibly "D:/",
     etc.
 
@@ -281 +281 @@
     The path can be either absolute or relative. Absolute paths begin
     with the directory separator "/" (optionally preceded by a drive
-    specification under Windows). Relative file names begin with a
+    specification under Windows and OS/2). Relative file names begin with a
     directory name or a file name and specify a path relative to the
     current directory. An example of an absolute path is the string
@@ -403 +403 @@
 
     QString tmp = absPath();
-#ifdef Q_OS_WIN32
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
     if ( fileName[0].isLetter() && fileName[1] == ':' ) {
+#if defined(Q_OS_OS2)
+#if defined(Q_CC_GNU)
+        char drv = fileName.upper()[0].latin1();
+        if ( _getdrive() != drv ) {
+            char buf[PATH_MAX];
+            _getcwd1( buf, drv );
+#else
+        int drv = fileName.upper()[0].latin1() - 'A' + 1;
+        if ( _getdrive() != drv ) {
+            char buf[PATH_MAX];
+            _getdcwd( drv, buf, PATH_MAX );
+#endif
+            tmp = buf;
+#else
         int drv = fileName.upper()[0].latin1() - 'A' + 1;
         if ( _getdrive() != drv ) {
@@ -416 +430 @@
                 tmp = buf;
             } );
+#endif
             if ( !tmp.endsWith("\\") )
                 tmp += "\\";
@@ -445 +460 @@
     "c:\winnt\system32".
 
+    On OS/2, convertSeparators("c:/os2/system") returns
+    "c:\os2\system".
+    
     The returned string may be the same as the argument on some
     operating systems, for example on Unix.
@@ -1083 +1101 @@
 /*!
     Returns the native directory separator; "/" under UNIX (including
-    Mac OS X) and "\" under Windows.
+    Mac OS X) and "\" under Windows and OS/2.
 
     You do not need to use this function to build file paths. If you
@@ -1126 +1144 @@
     environment variable). If none of these exist "C:\" is used.
 
+    Under OS/2 the \c HOME environment variable is also used. If it
+    does not exist the path is formed by concatenating the \c
+    HOMEDRIVE and \c HOMEPATH environment variables. If they don't
+    exist the rootDirPath() is used (which always returns "x:/" where \c x
+    is the system boot drive letter).
+    
     Under non-Windows operating systems the \c HOME environment
     variable is used if it exists, otherwise rootDirPath() is used.

trunk/src/tools/qfile.cpp

@@ -139 +139 @@
 
     Qt uses Unicode file names. If you want to do your own I/O on Unix
-    systems you may want to use encodeName() (and decodeName()) to
+    and OS/2 systems you may want to use encodeName() (and decodeName()) to
     convert the file name into the local encoding.
 
@@ -565 +565 @@
 /*!
     When you use QFile, QFileInfo, and QDir to access the file system
-    with Qt, you can use Unicode file names. On Unix, these file names
-    are converted to an 8-bit encoding. If you want to do your own
-    file I/O on Unix, you should convert the file name using this
+    with Qt, you can use Unicode file names. On Unix and OS/2, these file
+    names are converted to an 8-bit encoding. If you want to do your own
+    file I/O on Unix or OS/2, you should convert the file name using this
     function. On Windows NT/2000, Unicode file names are supported
     directly in the file system and this function should be avoided.

trunk/src/tools/qfiledefs_p.h

@@ -54 +54 @@
 struct QFileInfoCache
 {
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
     QT_STATBUF st;
 #else

trunk/src/tools/qfileinfo.cpp

@@ -64 +64 @@
     A QFileInfo can point to a file with either a relative or an
     absolute file path. Absolute file paths begin with the directory
-    separator "/" (or with a drive specification on Windows). Relative
+    separator "/" (or with a drive specification on Windows and OS/2). Relative
     file names begin with a directory name or a file name and specify
     a path relative to the current working directory. An example of an
@@ -130 +130 @@
     rights of the current user, you should use isReadable(), isWritable() and
     isExecutable().
+    
+    @@TODO: describe OS/2 semantics regarding permissions.
 */
 
@@ -266 +268 @@
     The \a file can also include an absolute or relative file path.
     Absolute paths begin with the directory separator (e.g. "/" under
-    Unix) or a drive specification (under Windows). Relative file
+    Unix) or a drive specification (under Windows and OS/2). Relative file
     names begin with a directory name or a file name and specify a
     path relative to the current directory.
@@ -529 +531 @@
 }
 
-#ifndef Q_WS_WIN
+#if !defined(Q_WS_WIN) && !defined(Q_OS_OS2)
 bool QFileInfo::isHidden() const
 {
@@ -654 +656 @@
     The absolute path name consists of the full path and the file
     name. On Unix this will always begin with the root, '/',
-    directory. On Windows this will always begin 'D:/' where D is a
+    directory. On Windows and OS/2 this will always begin 'D:/' where D is a
     drive letter, except for network shares that are not mapped to a
     drive letter, in which case the path will begin '//sharename/'.
@@ -672 +674 @@
     QString tmp;
     if ( QDir::isRelativePath(fn)
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
          && fn[1] != ':'
 #endif

trunk/src/tools/qglobal.cpp

@@ -47 +47 @@
 #if defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET) && !defined(Q_OS_TEMP)
 #include <crtdbg.h>
+#endif
+
+#if defined(Q_OS_OS2)
+#include "qt_os2.h"
 #endif
 
@@ -359 +363 @@
     \endcode
 
-    Under X11, the text is printed to stderr. Under Windows, the text
+    Under X11 or OS/2, the text is printed to stderr. Under Windows, the text
     is sent to the debugger.
 
@@ -392 +396 @@
     \endcode
 
-    Under X11, the text is printed to stderr. Under Windows, the text
+    Under X11 or OS/2, the text is printed to stderr. Under Windows, the text
     is sent to the debugger.
 
@@ -426 +430 @@
     \endcode
 
-    Under X11, the text is printed to stderr. Under Windows, the text
+    Under X11 or OS/2, the text is printed to stderr. Under Windows, the text
     is sent to the debugger.
 
@@ -652 +656 @@
   error code will be used if possible. Use this method to handle
   failures in platform specific API calls.
+  
+  Under OS/2, the value -1 for \a code should only be used after Presentation
+  Manager calls.
 
   This function does nothing when Qt is built with \c QT_NO_DEBUG
@@ -689 +696 @@
     } );
     LocalFree( (HLOCAL)string );
+#elif defined(Q_OS_OS2)
+    if ( code != -1 ) {
+        CHAR buf [256] = {0};
+        ULONG len = 0;
+        APIRET rc = DosGetMessage( NULL, 0, buf, sizeof(buf) - 1, code, "OSO001.MSG", &len );
+        if ( !rc ) {
+            buf[len] = '\0';
+            qWarning( "%s\n\tError %s", msg, buf );
+        } else {
+            if ( rc == ERROR_MR_MSG_TOO_LONG )
+                qWarning(
+                    "%s\n\tError code SYS%04d, "
+                    "type help %d in the command prompt to get more information",
+                    msg, code, code );
+            else
+                qWarning( "%s\n\tError code %d (system error)", msg, code );
+        }
+    } else {
+        code = (int) WinGetLastError( 0 );
+        if ( code )
+            qWarning( "%s\n\tError code %08X (PM error)", msg, code );
+        else
+            qWarning( msg );
+    }
 #else
     if ( code != -1 )
@@ -858 +889 @@
 
     The default message handler prints the message to the standard
-    output under X11 or to the debugger under Windows. If it is a
+    output under X11 and OS/2 or to the debugger under Windows. If it is a
     fatal message, the application aborts immediately.
 

trunk/src/tools/qgpluginmanager.cpp

@@ -315 +315 @@
         return;
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_OS2)
     QString filter = "*.dll";
 #elif defined(Q_OS_MACX)

trunk/src/tools/qlibrary.cpp

@@ -1 @@
-//depot/qt/3/src/tools/qlibrary.cpp#9 - edit change 123005 (text)
 /****************************************************************************
 ** $Id$
@@ -123 +122 @@
     QLibrary lib( "mylib.dll" );
     \endcode
-    on Windows, and
+    on Windows and OS/2, and
     \code
     QLibrary lib( "libmylib.so" );
@@ -178 +177 @@
     with a C++ compiler. On Windows you also have to explicitly export
     the function from the DLL using the \c {__declspec(dllexport)}
-    compiler directive.
+    compiler directive. 
 
     \code
@@ -197 +196 @@
     \endcode
 
+    On OS/2 you should create a .DEF file that describes what functions are
+    exported and use it when linking your DLL (@@TODO: add more info and an
+    example).
+    
     On Darwin and Mac OS X this function uses code from dlcompat, part of the
     OpenDarwin project.
@@ -385 +388 @@
     QString str = lib.library();
     \endcode
-    will set \e str to "mylib.dll" on Windows, and "libmylib.so" on Linux.
+    will set \e str to "mylib.dll" on Windows and OS/2, and "libmylib.so" on Linux.
 */
 QString QLibrary::library() const
@@ -394 +397 @@
     QString filename = libfile;
 
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2) 
     if ( filename.findRev( '.' ) <= filename.findRev( '/' ) )
         filename += ".dll";

trunk/src/tools/qlibrary_p.h

@@ -64 +64 @@
     QLibraryPrivate( QLibrary *lib );
 
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN)
     HINSTANCE pHnd;
+#elif defined(Q_OS_OS2)
+    HMODULE pHnd;
 #else
     void *pHnd;

trunk/src/tools/qlocale.cpp

@@ -53 +53 @@
 #      define isnan(d) _isnan(d)
 #   endif
-#endif
+#elif defined(Q_OS_OS2) && defined(Q_CC_GNU)
+#   undef NAN
+#   undef INFINITY
+#endif
+
 
 #if !defined( QWS ) && defined( Q_OS_MAC )

trunk/src/tools/qsettings.cpp

@@ -74 +74 @@
 
     On Unix systems, QSettings uses text files to store settings. On Windows
-    systems, QSettings uses the system registry.  On Mac OS X, QSettings uses
-    the Carbon preferences API.
+    and OS/2 systems, QSettings uses the system registry.  On Mac OS X,
+    QSettings uses the Carbon preferences API.
 
     Each setting comprises an identifying key and the data associated with
@@ -160 +160 @@
     \endcode
 
-    Since settings for Windows are stored in the registry there are
+    Since settings for Windows and OS/2 are stored in the registry there are
     some size limitations as follows:
     \list
@@ -225 +225 @@
 
     For cross-platform applications you should ensure that the
-    \link #sizelimit Windows size limitations \endlink are not exceeded.
+    \link #sizelimit Windows and OS/2 size limitations \endlink are not exceeded.
 */
 
@@ -233 +233 @@
     \value Mac Macintosh execution environments
     \value Unix Mac OS X, Unix, Linux and Unix-like execution environments
-    \value Windows Windows execution environments
+    \value Windows Windows and OS/2 execution environments
 */
 
@@ -333 +333 @@
         return;
 
-#ifndef Q_WS_WIN
+#if !defined(Q_WS_WIN) && !defined(Q_WS_PM)
     HANDLE lockfd = openlock( filename, Q_LOCKREAD );
 #endif
@@ -356 +356 @@
     file.close();
 
-#ifndef Q_WS_WIN
+#if !defined(Q_WS_WIN) && !defined(Q_WS_PM)
     closelock( lockfd );
 #endif
@@ -456 +456 @@
     : groupDirty( TRUE ), modified(FALSE), globalScope(TRUE)
 {
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( format != QSettings::Ini )
         return;
@@ -697 +697 @@
 
   When \a s is \e Windows and the execution environment is \e not
-  Windows the function does nothing. Similarly when \a s is \e Unix and
+  Windows or OS/2 the function does nothing. Similarly when \a s is \e Unix and
   the execution environment is \e not Unix the function does nothing.
 
-  When \a s is \e Windows, and the execution environment is Windows, the
+  When \a s is \e Windows, and the execution environment is Windows or OS/2, the
   search path list will be used as the first subfolder of the "Software"
   folder in the registry.
@@ -781 +781 @@
 void QSettings::insertSearchPath( System s, const QString &path)
 {
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd ) {
         d->sysInsertSearchPath( s, path );
@@ -788 +788 @@
 #endif
 
-#if !defined(Q_WS_WIN)
+#if !defined(Q_WS_WIN) && !defined(Q_WS_PM)
     if ( s == Windows )
         return;
 #endif
-#if !defined(Q_WS_WIN)
+#if !defined(Q_WS_WIN) && !defined(Q_WS_PM)
     if ( s == Mac )
         return;
@@ -804 +804 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd && s != Unix ) {
 #else
@@ -816 +816 @@
 
     QString realPath = path;
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
     QString defPath = d->globalScope ? d->searchPaths.first() : d->searchPaths.last();
     realPath = defPath + path;
@@ -844 +844 @@
     }
 
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined (Q_WS_PM)
     if ( d->sysd ) {
         d->sysRemoveSearchPath( s, path );
@@ -850 +850 @@
     }
 #endif
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd && s != Unix ) {
 #else
@@ -876 +876 @@
     Q_CHECK_PTR(d);
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     d->sysd = 0;
     d->sysInit();
@@ -893 +893 @@
     Q_CHECK_PTR(d);
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     d->sysd = 0;
     if ( format == Native )
@@ -911 +911 @@
     sync();
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         d->sysClear();
@@ -926 +926 @@
 bool QSettings::sync()
 {
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysSync();
@@ -981 +981 @@
         }
 
-#ifndef Q_WS_WIN
+#if !defined(Q_WS_WIN) && !defined(Q_WS_PM)
         HANDLE lockfd = openlock( filename, Q_LOCKWRITE );
 #endif
@@ -1055 +1055 @@
         file.remove();
 
-#ifndef Q_WS_WIN
+#if !defined(Q_WS_WIN) && !defined(Q_WS_PM)
         closelock( lockfd );
 #endif
@@ -1093 +1093 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysReadBoolEntry( grp_key, def, ok );
@@ -1145 +1145 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysReadDoubleEntry( grp_key, def, ok );
@@ -1190 +1190 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysReadNumEntry( grp_key, def, ok );
@@ -1236 +1236 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysReadEntry( grp_key, def, ok );
@@ -1311 +1311 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysWriteEntry( grp_key, value );
@@ -1342 +1342 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysWriteEntry( grp_key, value );
@@ -1372 +1372 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysWriteEntry( grp_key, value );
@@ -1425 +1425 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysWriteEntry( grp_key, value );
@@ -1486 +1486 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysRemoveEntry( grp_key );
@@ -1564 +1564 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysEntryList( grp_key );
@@ -1660 +1660 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return d->sysSubkeyList( grp_key );
@@ -1753 +1753 @@
     }
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     if ( d->sysd )
         return QDateTime();
@@ -1961 +1961 @@
 void QSettings::setPath( const QString &domain, const QString &product, Scope scope )
 {
-//    On Windows, any trailing ".com(\..*)" is stripped from the domain. The
+//    On Windows and OS/2, any trailing ".com(\..*)" is stripped from the domain. The
 //    Global scope corresponds to HKEY_LOCAL_MACHINE, and User corresponds to
 //    HKEY_CURRENT_USER. Note that on some installations, not all users can
@@ -1982 +1982 @@
     int lastDot = domain.findRev( '.' );
 
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
     actualSearchPath = "/" + domain.mid( 0, lastDot ) + "/" + product;
     insertSearchPath( Windows, actualSearchPath );

trunk/src/tools/qsettings_p.h

@@ -106 +106 @@
     bool globalScope :1;
 
-#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_WS_PM) || defined(Q_OS_MAC))
     // system dependent implementations to use the 
     // system specific setting database (ie. registry on Windows)

trunk/src/tools/qstring.cpp

@@ -62 +62 @@
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
+#endif
+#if defined(Q_OS_OS2)
+#include <unidef.h>
+#include <uconv.h>
 #endif
 #if !defined( QT_NO_COMPONENT ) && !defined( QT_LITE_COMPONENT )
@@ -5701 +5705 @@
 /*!
     Returns the string encoded in a locale-specific format. On X11,
-    this is the QTextCodec::codecForLocale(). On Windows, it is a
+    this is the QTextCodec::codecForLocale(). On Windows and OS/2, it is a
     system-defined encoding. On Mac OS X, this always uses UTF-8 as
     the encoding.
@@ -5731 +5735 @@
     return isNull() ? QCString("") : qt_winQString2MB( *this );
 #endif
+#if defined(Q_OS_OS2)
+    return isNull() ? QCString("") : qt_os2QString2MB( *this );
+#endif
 #ifdef Q_WS_QWS
     return utf8(); // ### if there is any 8 bit format supported?
@@ -5780 +5787 @@
     return qt_winMB2QString( local8Bit );
 #endif
+#if defined(Q_OS_OS2)
+    return qt_os2MB2QString( local8Bit, len );
+#endif
 #ifdef Q_WS_QWS
     return fromUtf8(local8Bit,len);
@@ -6193 +6203 @@
         return 0;
     }
+#elif defined(Q_OS_OS2)
+    LocaleObject lo = qt_os2DefLocaleObj();
+    if (lo)
+        return UniStrcoll( lo, (UniChar*) ucs2(), (UniChar *) s.ucs2() );
+    else
+        return ucstrcmp( *this, s );
 #elif defined(Q_WS_MACX)
     int delta = 0;
@@ -6928 +6944 @@
 
 #endif // Q_OS_WIN32
+
+#if defined (Q_OS_OS2)
+
+static LocaleObject qt_os2DefLocaleObj_var = NULL;
+static UconvObject qt_os2DefUconvObj_var = NULL;
+
+const LocaleObject qt_os2DefLocaleObj()
+{
+    if ( !qt_os2DefLocaleObj_var )
+        UniCreateLocaleObject( UNI_UCS_STRING_POINTER, (UniChar *)L"",
+                &qt_os2DefLocaleObj_var );
+    return qt_os2DefLocaleObj_var;
+}
+
+const UconvObject qt_os2DefUconvObj()
+{
+    if ( !qt_os2DefUconvObj_var )
+        UniCreateUconvObject( (UniChar *)L"", &qt_os2DefUconvObj_var );
+    return qt_os2DefUconvObj_var;
+}
+
+QCString qt_os2QString2MB( const QString& s, int uclen )
+{
+    if ( uclen < 0 || (uint) uclen > s.length() )
+        uclen = s.length();
+    if ( s.isNull() )
+        return QCString();
+    if ( uclen == 0 )
+        return QCString("");
+
+    UniChar *ucPtr = (UniChar *) s.unicode();
+    size_t ucLeft = uclen;
+    
+    size_t mblen = uclen;
+    QCString mbBuf( mblen + 1 );
+    char *mbPtr = mbBuf.data();
+    size_t mbLeft = mblen;
+    
+    size_t nonIdent = 0;
+    UconvObject uo = qt_os2DefUconvObj();
+    int rc;
+    
+    while ( ucLeft ) {
+        rc = UniUconvFromUcs ( uo, &ucPtr, &ucLeft, (void**)&mbPtr, &mbLeft, &nonIdent );
+        if ( rc == ULS_BUFFERFULL ) {
+            size_t mbDone = mblen - mbLeft;
+            size_t ucDone = uclen - ucLeft;
+            // assume that ucLeft/mbLeft is an approximation of ucDone/mbDone
+            mblen = mbDone + (ucLeft * mbDone) / ucDone; 
+            mbBuf.resize( mblen + 1 );
+            mbPtr = mbBuf.data() + mbDone;
+        } else if ( rc != ULS_SUCCESS ) {
+#ifndef QT_NO_DEBUG
+            // Fail.
+            qWarning("UniUconvFromUcs cannot convert multibyte text (error %d): %s (UTF8)",
+                rc, s.utf8().data());
+#endif
+            break;
+        }
+    }
+    mbBuf[ mblen - mbLeft ] = '\0';
+    return mbBuf;
+}
+
+// WATCH OUT: mblen must NOT include the NUL (in contrast with qt_winMB2QString) 
+QString qt_os2MB2QString( const char* mb, int mblen )
+{
+    if ( !mb )
+        return QString::null;
+    if ( mblen < 0 ) {
+        mblen = strlen( mb );
+    } else {
+        char *end = (char *) memchr (mb, '\0', mblen);
+        if ( end )
+            mblen = end - mb; 
+    }
+    if ( !mblen )
+        return QString::null;
+    
+    const char *mbPtr = mb;
+    size_t mbLeft = mblen;
+
+    size_t uclen = mblen;
+    QMemArray<UniChar> ucBuf( uclen );
+    UniChar *ucPtr = ucBuf.data();
+    size_t ucLeft = uclen;
+
+    size_t nonIdent = 0;
+    UconvObject uo = qt_os2DefUconvObj();
+    int rc;
+    
+    while ( mbLeft ) {
+        rc = UniUconvToUcs ( uo, (void**)&mbPtr, &mbLeft, &ucPtr, &ucLeft, &nonIdent );
+        if ( rc == ULS_BUFFERFULL ) {
+            size_t ucDone = uclen - ucLeft;
+            size_t mbDone = mblen - mbLeft;
+            // assume that mbLeft/ucLeft is an approximation of mbDone/ucDone
+            uclen = ucDone + (mbLeft * ucDone) / mbDone; 
+            ucBuf.resize( uclen );
+            ucPtr = ucBuf.data() + ucDone;
+        } else if ( rc != ULS_SUCCESS ) {
+#ifndef QT_NO_DEBUG
+            // Fail.
+            qWarning("UniUconvFromUcs cannot convert multibyte text (error %d)", rc);
+#endif
+            break;
+        }
+    }
+    uclen -= ucLeft;
+    if ( uclen == 0 )
+        return QString::null;
+    QString s( (QChar*)ucBuf.data(), uclen );
+    return s;
+}
+
+#endif // Q_OS_OS2

trunk/src/tools/qt_tools.pri

@@ -91 +91 @@
         }
 
+        os2:SOURCES += $$TOOLS_CPP/qdir_pm.cpp \
+                  $$TOOLS_CPP/qfile_pm.cpp \
+                  $$TOOLS_CPP/qfileinfo_pm.cpp \
+                  $$TOOLS_CPP/qlibrary_pm.cpp \
+                  $$TOOLS_CPP/qsettings_pm.cpp \
+                  $$TOOLS_CPP/qmutex_pm.cpp \
+                  $$TOOLS_CPP/qwaitcondition_pm.cpp \
+                  $$TOOLS_CPP/qthreadstorage_pm.cpp \
+                  $$TOOLS_CPP/qcriticalsection_p.cpp
+
         offmac:SOURCES += $$TOOLS_CPP/qdir_mac.cpp \
                   $$TOOLS_CPP/qfile_mac.cpp \
@@ -102 +112 @@
 
         mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp
-        mac { 
+        mac {
                 SOURCES+=3rdparty/dlcompat/dlfcn.c
                 INCLUDEPATH+=3rdparty/dlcompat
@@ -149 +159 @@
         }
 }
-

trunk/src/tools/qthreadinstance_p.h

@@ -88 +88 @@
     static void finish( QThreadInstance * );
 #endif // Q_OS_WIN32
+
+#ifdef Q_OS_OS2
+    TID thread_id;
+    int waiters;
+
+    static void _System start( void * );
+    static void finish( QThreadInstance * );
+#endif // Q_OS_OS2
 };
 

trunk/src/widgets/qdockwindow.cpp

@@ -391 +391 @@
     timer = new QTimer( this );
     connect( timer, SIGNAL( timeout() ), this, SLOT( minimize() ) );
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) 
     setCursor( SizeAllCursor );
 #endif

trunk/src/widgets/qlabel.cpp

@@ -280 +280 @@
       ( ( textformat == AutoText ) && QStyleSheet::mightBeRichText(ltext) ) );
 #else
-    bool useRichText = TRUE;
+    bool useRichText = FALSE;
 #endif
 #ifndef QT_NO_ACCEL
@@ -711 +711 @@
 
         if ( x + w < cr.right() )
-            reg = reg.unite( QRect( x + w, cr.y(),  cr.right() - x - w, cr.height() ) );
+            reg = reg.unite( QRect( x + w, cr.y(),  cr.right() - x - w + 1, cr.height() ) );
         if ( y + h < cr.bottom() )
-            reg = reg.unite( QRect( cr.x(), y +  h, cr.width(), cr.bottom() - y - h ) );
+            reg = reg.unite( QRect( cr.x(), y +  h, cr.width(), cr.bottom() - y - h + 1 ) );
 
         erase( reg );

trunk/src/widgets/qlineedit.cpp

@@ -1379 +1379 @@
             case Key_Left:
             case Key_Right:
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || (defined (Q_WS_PM) && !defined (QT_NO_CLIPBOARD))
             case Key_Insert:
             case Key_Delete:
@@ -1636 +1636 @@
             }
             break;
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
         case Key_Insert:
             copy();
@@ -1713 +1713 @@
         case Key_Delete:
             if ( !d->readOnly ) {
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || (defined (Q_WS_PM) && !defined (QT_NO_CLIPBOARD))
                 if ( e->state() & ShiftButton ) {
                     cut();
@@ -1722 +1722 @@
             }
             break;
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || (defined (Q_WS_PM) && !defined (QT_NO_CLIPBOARD))
         case Key_Insert:
             if ( !d->readOnly && e->state() & ShiftButton )

trunk/src/widgets/qpopupmenu.cpp

@@ -1509 +1509 @@
         itemh = sz.height();
 
-        if ( ncols > 1 && y + itemh > contentsRect().bottom() ) {
-            if ( y < contentsRect().bottom() ) {
-                QRect rect(x, y, itemw, contentsRect().bottom() - y);
+        if ( ncols > 1 && y + itemh - 1 > contentsRect().bottom() ) {
+            if ( y <= contentsRect().bottom() ) {
+                QRect rect(x, y, itemw, contentsRect().bottom() - y + 1);
                 if(!p->hasClipping() || p->clipRegion().contains(rect)) {
                     flags = QStyle::Style_Default;
@@ -1528 +1528 @@
         ++row;
     }
-    if ( y < contentsRect().bottom() ) {
-        QRect rect(x, y, itemw, contentsRect().bottom() - y);
+    if ( y <= contentsRect().bottom() ) {
+        QRect rect(x, y, itemw, contentsRect().bottom() - y + 1);
         if(!p->hasClipping() || p->clipRegion().contains(rect)) {
             flags = QStyle::Style_Default;
@@ -1676 +1676 @@
                 actSig( mi->id(), b);
             }
+#endif
+#if defined(Q_WS_PM)
+#ifndef QT_NO_WHATSTHIS
+            else
+#endif
+//@@TODO (dmik): we need to play a sound when a disabled item is activated
+//  to conform to the OS/2 CUA. Btw, should'n it be supported by QAccessibility
+//  globally in Qt?
+                WinAlarm( HWND_DESKTOP, WA_ERROR );
 #endif
         } else  if ( popup ) {
@@ -1919 +1928 @@
 #endif
             mi = mitems->at( actItem );
-            if ( !mi->isEnabled() && !b )
+            if ( !mi->isEnabled() && !b ) {
+#if defined(Q_WS_PM)
+//@@TODO (dmik): we need to play a sound when a disabled item is activated
+//  to conform to the OS/2 CUA. Btw, should'n it be supported by QAccessibility
+//  globally in Qt?
+                WinAlarm( HWND_DESKTOP, WA_ERROR );
+#endif
                 break;
+            }
             popup = mi->popup();
             if ( popup ) {
@@ -2009 +2025 @@
                 popup->setFirstItemActive();
             } else {
+#if !defined(Q_WS_PM) // do it later, only in case of item activation
                 byeMenuBar();
+#endif
 #ifndef QT_NO_WHATSTHIS
                 bool b = QWhatsThis::inWhatsThisMode();
@@ -2016 +2034 @@
 #endif
                 if ( mi->isEnabledAndVisible() || b ) {
+#if defined(Q_WS_PM)
+                    byeMenuBar();
+#endif
                     active_popup_menu = this;
                     QGuardedPtr<QSignal> signal = mi->signal();
@@ -2023 +2044 @@
                     active_popup_menu = 0;
                 }
+#if defined(Q_WS_PM)
+//@@TODO (dmik): we need to play a sound when the disabled item is activated
+//  to conform to the OS/2 CUA. Btw, should'n it be supported by QAccessibility
+//  globally in Qt?
+                else
+                    WinAlarm( HWND_DESKTOP, WA_ERROR );
+#endif
             }
         } else if ( clashCount > 1 ) { // Clashes, highlight next...

trunk/src/widgets/qscrollview.cpp

@@ -579 +579 @@
 
 QScrollView::QScrollView( QWidget *parent, const char *name, WFlags f ) :
-    QFrame( parent, name, f & (~WStaticContents) & (~WResizeNoErase) )
-{
-    WFlags flags = WResizeNoErase | (f&WPaintClever) | (f&WRepaintNoErase) | (f&WStaticContents);
+    QFrame( parent, name, f & (~WStaticContents) & (~WResizeNoErase) & (~WRepaintNoErase) )
+{
+    WFlags flags = (f&WResizeNoErase) | (f&WPaintClever) | (f&WRepaintNoErase) | (f&WStaticContents);
     d = new QScrollViewData( this, flags );
 

trunk/src/widgets/qsplitter.cpp

@@ -507 +507 @@
 {
     QPainter paint( this );
-    paint.setPen( gray );
+    paint.setPen( NoPen );
     paint.setBrush( gray );
     paint.setRasterOp( XorROP );
@@ -513 +513 @@
     const int rBord = 3; // customizable?
     int hw = handleWidth();
+
+    int p1, p2, op1, op2, tmp;
+    if ( p >= 0 ) {
+        p1 = p + hw / 2 - rBord;
+        p2 = p1 + 2 * rBord - 1;
+    }
+    if ( opaqueOldPos >= 0 ) {
+        op1 = opaqueOldPos + hw / 2 - rBord;
+        op2 = op1 + 2 * rBord - 1;
+        // exclude overlapping area to avoid flicker
+        if ( p >= 0 ) {
+            if ( p2 >= op1 && p2 <= op2 ) {
+                tmp = op1;
+                op1 = p2 + 1;
+                p2 = tmp - 1;
+            } else if ( p1 >= op1 && p1 <= op2 ) {
+                tmp = op2;
+                op2 = p1 - 1;
+                p1 = tmp + 1;
+            }
+        }
+    }
     if ( orient == Horizontal ) {
         if ( opaqueOldPos >= 0 )
-            paint.drawRect( opaqueOldPos + hw / 2 - rBord, r.y(),
-                            2 * rBord, r.height() );
+            paint.drawRect( op1, r.y(), op2 - op1 + 1, r.height() );
         if ( p >= 0 )
-            paint.drawRect( p + hw / 2 - rBord, r.y(), 2 * rBord, r.height() );
+            paint.drawRect( p1, r.y(), p2 - p1 + 1, r.height() );
     } else {
         if ( opaqueOldPos >= 0 )
-            paint.drawRect( r.x(), opaqueOldPos + hw / 2 - rBord,
-                            r.width(), 2 * rBord );
+            paint.drawRect( r.x(), op1, r.width(), op2 - op1 + 1 );
         if ( p >= 0 )
-            paint.drawRect( r.x(), p + hw / 2 - rBord, r.width(), 2 * rBord );
+            paint.drawRect( r.x(), p1, r.width(), p2 - p1 + 1 );
     }
     opaqueOldPos = p;

trunk/src/widgets/qtextedit.cpp

@@ -1162 +1162 @@
             case Key_Home:
             case Key_End:
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
             case Key_Insert:
             case Key_Delete:
@@ -1172 +1172 @@
         } else {
             switch ( ke->key() ) {
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
             case Key_Insert:
                 ke->accept();
@@ -1276 +1276 @@
         break;
     case Key_Delete:
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
         if ( e->state() & ShiftButton ) {
             cut();
@@ -1294 +1294 @@
         if ( e->state() & ShiftButton )
             paste();
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
         else if ( e->state() & ControlButton )
             copy();
@@ -1302 +1302 @@
         break;
     case Key_Backspace:
-#if defined (Q_WS_WIN)
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
         if ( e->state() & AltButton ) {
             if (e->state() & ControlButton ) {
@@ -1517 +1517 @@
                     doKeyboardAction( ActionKill );
                     break;
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_WIN) || defined (Q_WS_PM)
                 case Key_Insert:
                     copy();
@@ -2408 +2408 @@
             emitLinkClicked( u.toString( FALSE, FALSE ) );
         }
+#ifndef QT_NO_TEXTBROWSER
         if (::qt_cast<QTextBrowser*>(this)) { // change for 4.0
             QConnectionList *clist = receivers(
@@ -2418 +2419 @@
             }
         }
+#endif        
 
         // emitting linkClicked() may result in that the cursor winds
@@ -4724 +4726 @@
             }
             if (!doc->focusIndicator.name.isEmpty()) {
+#ifndef QT_NO_TEXTBROWSER
                 if (::qt_cast<QTextBrowser*>(this)) { // change for 4.0
                     QConnectionList *clist = receivers(
@@ -4736 +4739 @@
                     }
                 }
+#endif                
             }
 #ifndef QT_NO_CURSOR
@@ -4749 +4753 @@
                 copy();
                 break;
-#ifdef Q_WS_WIN
+#if defined (Q_WS_WIN) || defined (Q_WS_PM)
             case Key_Insert:
                 copy();
@@ -5010 +5014 @@
         }
     } else {
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined (Q_OS_OS2)
         // Need to convert CRLF to LF
         t.replace( "\r\n", "\n" );
@@ -6692 +6696 @@
     int endLine = startLine + nLines;
 
-    if ( startLine >= d->od->numLines )
-        return;
+    if ( startLine >= d->od->numLines ) {
+#if defined (Q_WS_PM)
+        // see below for more info
+        p->eraseRect( clipx, clipy, clipw, cliph );
+#endif
+        return;
+    }
+    
     if ( (startLine + nLines) > d->od->numLines )
         nLines = d->od->numLines - startLine;
@@ -6842 +6852 @@
     td->draw( p, r.x(), r.y(), r.width(), r.height(), colorGroup() );
     p->translate( 0, -(clipy - offset) );
+    
+#if defined (Q_WS_PM)
+    // QTextEdit has WResizeNoErase and WRepaintNoErase flags (actually applied
+    // to the viewport()), so we must erase areas not covered by the text doc.
+    // [Win32 version feels ok without this, because it doesn't actually
+    // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+    // erases the background before WM_PAINT and after every resize].
+    
+    int tw = td->width();
+    // calculate the height the text doc will occupy starting with clipy
+    int th = td->height() - offset;  
+    if ( clipx + clipw > td->width() ) {
+        // erase background to the left of every line
+        p->eraseRect( tw, clipy, clipx + clipw - tw, th );
+    }
+    if ( cliph > th ) {
+        // erase background under the text doc
+        p->eraseRect( clipx, clipy + th, clipw, cliph - th );
+    }
+#endif
+    
     delete td;
 }

trunk/src/widgets/qtitlebar.cpp

@@ -58 +58 @@
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
+#elif defined(Q_WS_PM)
+#include "qt_os2.h"
 #endif
 
@@ -189 +191 @@
 }
 
-#ifdef Q_WS_WIN
+#if defined (Q_WS_WIN)
 extern QRgb qt_colorref2qrgb(COLORREF col);
+#elif defined (Q_WS_PM)
+extern QRgb qt_sysclr2qrgb( LONG sysClr );
 #endif
 
@@ -196 +200 @@
 {
     QPalette pal = palette();
+
+#if defined (Q_WS_PM)
+    // we always use PM system colors for titlebars (regardless of
+    // QApplication::desktopSettingsAware()), because the simulation will
+    // most likely produce the same color both for an active and inactive title.
+    pal.setColor( QPalette::Active, QColorGroup::Highlight,
+        QColor( qt_sysclr2qrgb( SYSCLR_ACTIVETITLE ) ) );
+    pal.setColor( QPalette::Active, QColorGroup::Base,
+        pal.active().highlight() );
+    pal.setColor( QPalette::Active, QColorGroup::HighlightedText,
+        QColor( qt_sysclr2qrgb( SYSCLR_ACTIVETITLETEXT ) ) );
+    pal.setColor( QPalette::Inactive, QColorGroup::Highlight,
+        QColor( qt_sysclr2qrgb( SYSCLR_INACTIVETITLE ) ) );
+    pal.setColor( QPalette::Inactive, QColorGroup::Base,
+        pal.inactive().highlight() );
+    pal.setColor( QPalette::Inactive, QColorGroup::HighlightedText,
+        QColor( qt_sysclr2qrgb( SYSCLR_INACTIVETITLETEXT ) ) );
+#else
 
     bool colorsInitialized = FALSE;
@@ -239 +261 @@
         pal.setColor( QPalette::Inactive, QColorGroup::HighlightedText, palette().inactive().background() );
     }
+#endif // Q_WS_PM
 
     setPalette( pal );

trunk/src/widgets/qtooltip.cpp

@@ -126 +126 @@
     int wakeUpDelay;
     QTimer  fallAsleep;
+#ifdef Q_WS_PM
+    QTimer  doAllowAnimation;
+#endif    
 
     QPtrDict<Tip> *tips;
@@ -164 +167 @@
     connect( &wakeUp, SIGNAL(timeout()), SLOT(showTip()) );
     connect( &fallAsleep, SIGNAL(timeout()), SLOT(hideTip()) );
+#ifdef Q_WS_PM    
+    connect( &doAllowAnimation, SIGNAL(timeout()), SLOT(allowAnimation()) );
+#endif    
     removeTimer = new QTimer( this );
 }
@@ -589 +595 @@
 void QTipManager::hideTip()
 {
+#ifdef Q_WS_PM
+    // OS/2 PM has a very low limit on the number of simultaneous PM timers,
+    // so we reuse the same timer instead of creating a new one every time this
+    // function is invoked (it can happen more frequently than once per 250 ms).
+    doAllowAnimation.start( 250, TRUE );
+#else
     QTimer::singleShot( 250, this, SLOT(allowAnimation()) );
+#endif    
     preventAnimation = TRUE;
 

trunk/src/widgets/qwidgetresizehandler.cpp

@@ -45 +45 @@
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
+#elif defined(Q_WS_PM)
+#include "qt_os2.h"
 #endif
 
@@ -306 +308 @@
             ;
     } );
+#elif defined(Q_WS_PM)
+    QMSG qmsg;
+    while( WinPeekMsg( 0, &qmsg, widget->winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE ) )
+        ;
 #endif