Changeset 8 for trunk/src/tools/qglobal.cpp

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

File:

• trunk/src/tools/qglobal.cpp (modified) (7 diffs)

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.