Changeset 8 for trunk/src/tools/qdir.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/qdir.cpp (modified) (8 diffs)

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.