Changeset 846 for trunk/src/gui/embedded/qscreen_qws.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/embedded/qscreen_qws.cpp (modified) (5 diffs)

trunk/src/gui/embedded/qscreen_qws.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -40 +40 @@
 ****************************************************************************/
 
+#include "qplatformdefs.h"
 #include "qscreen_qws.h"
 
@@ -3224 +3225 @@
     }
 
-    DIR * dirptr=opendir("/proc/bus/pci");
+    QT_DIR *dirptr = QT_OPENDIR("/proc/bus/pci");
     if(!dirptr)
         return qt_dodriver("unaccel.so",0,0);
-    DIR * dirptr2;
-    dirent * cards;
-
-    dirent * busses=readdir(dirptr);
+    QT_DIR * dirptr2;
+    QT_DIRENT *cards;
+
+    QT_DIRENT *busses = QT_READDIR(dirptr);
 
     while(busses) {
@@ -3238 +3239 @@
             qstrcpy(buf+14,busses->d_name);
             int p=strlen(buf);
-            dirptr2=opendir(buf);
+            dirptr2 = QT_OPENDIR(buf);
             if(dirptr2) {
-                cards=readdir(dirptr2);
+                cards = QT_READDIR(dirptr2);
                 while(cards) {
                     if(cards->d_name[0]!='.') {
@@ -3249 +3250 @@
                             return ret;
                     }
-                    cards=readdir(dirptr2);
+                    cards = QT_READDIR(dirptr2);
                 }
-                closedir(dirptr2);
+                QT_CLOSEDIR(dirptr2);
             }
         }
-        busses=readdir(dirptr);
-    }
-    closedir(dirptr);
+        busses = QT_READDIR(dirptr);
+    }
+    QT_CLOSEDIR(dirptr);
 
     return qt_dodriver("unaccel.so",0,0);