Changeset 848 for trunk/src/corelib

Timestamp:

May 6, 2011, 7:38:32 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/io: Fixed private member access.

Location:

trunk/src/corelib/io

Files:

• qdir.cpp (modified) (2 diffs)
• qfsfileengine_iterator_os2.cpp (modified) (2 diffs)

trunk/src/corelib/io/qdir.cpp

@@ -709 +709 @@
 
     QString fn = QDir::fromNativeSeparators(fileName);
-    if (!d->data->fileEngine)
+    if (!d->fileEngine)
         return fn;
 
@@ -730 +730 @@
     }
 
-    QString ret = d->data->fileEngine->fileName(QAbstractFileEngine::AbsoluteName);
+    QString ret = d->fileEngine->fileName(QAbstractFileEngine::AbsoluteName);
 
     if (!fn.isEmpty()) {

trunk/src/corelib/io/qfsfileengine_iterator_os2.cpp

@@ -100 +100 @@
     static QDateTime convertFileDateTime(FDATE fdate, FTIME ftime);
     void updateFileInfo(const QString &path, FILEFINDBUF3L *ffb);
-    void resetFileInfo() { d_ptr->reset(); }
+    void resetFileInfo() { d_ptr->(); }
 
     bool done;
@@ -288 +288 @@
         fileName.append(QLatin1Char('/'));
     fileName.append(QFile::decodeName(QByteArray(ffb->achName)));
-    d_ptr->initFileEngine(fileName);
-
-    d_ptr->data->fileFlags = QAbstractFileEngine::ExistsFlag    |
-                             QAbstractFileEngine::LocalDiskFlag |
-                             QAbstractFileEngine::ReadOwnerPerm |
-                             QAbstractFileEngine::ReadUserPerm  |
-                             QAbstractFileEngine::ReadGroupPerm |
-                             QAbstractFileEngine::ReadOtherPerm;
+    d_ptre(fileName);
+
+    d_ptr->fileFlags = QAbstractFileEngine::ExistsFlag    |
+                       QAbstractFileEngine::LocalDiskFlag |
+                       QAbstractFileEngine::ReadOwnerPerm |
+                       QAbstractFileEngine::ReadUserPerm  |
+                       QAbstractFileEngine::ReadGroupPerm |
+                       QAbstractFileEngine::ReadOtherPerm;
 
     if ((ffb->attrFile & FILE_READONLY) == 0) {
-        d_ptr->data->fileFlags |= QAbstractFileEngine::WriteOwnerPerm |
-                                  QAbstractFileEngine::WriteUserPerm  |
-                                  QAbstractFileEngine::WriteGroupPerm |
-                                  QAbstractFileEngine::WriteOtherPerm;
+        d_ptr->fileFlags |= QAbstractFileEngine::WriteOwnerPerm |
+                            QAbstractFileEngine::WriteUserPerm  |
+                            QAbstractFileEngine::WriteGroupPerm |
+                            QAbstractFileEngine::WriteOtherPerm;
     }
 
     if (ffb->attrFile & FILE_DIRECTORY)
-        d_ptr->data->fileFlags |= QAbstractFileEngine::DirectoryType;
+        d_ptr->fileFlags |= QAbstractFileEngine::DirectoryType;
     else
-        d_ptr->data->fileFlags |= QAbstractFileEngine::FileType;
+        d_ptr->fileFlags |= QAbstractFileEngine::FileType;
 
     if (ffb->attrFile & FILE_HIDDEN)
-        d_ptr->data->fileFlags |= QAbstractFileEngine::HiddenFlag;
-
-    d_ptr->data->fileTimes[QAbstractFileEngine::CreationTime] =
+        d_ptr->fileFlags |= QAbstractFileEngine::HiddenFlag;
+
+    d_ptr->fileTimes[QAbstractFileEngine::CreationTime] =
             convertFileDateTime(ffb->fdateCreation, ffb->ftimeCreation);
 
-    d_ptr->data->fileTimes[QAbstractFileEngine::ModificationTime] =
+    d_ptr->fileTimes[QAbstractFileEngine::ModificationTime] =
             convertFileDateTime(ffb->fdateLastWrite, ffb->ftimeLastWrite);
 
-    d_ptr->data->fileTimes[QAbstractFileEngine::AccessTime] =
+    d_ptr->fileTimes[QAbstractFileEngine::AccessTime] =
             convertFileDateTime(ffb->fdateLastAccess, ffb->ftimeLastAccess);
 
-    d_ptr->data->fileSize = ffb->cbFile;
+    d_ptr->fileSize = ffb->cbFile;
 
     // mark fields as "cached" and "present"
-    d_ptr->data->cachedFlags  = QFileInfoPrivate::CachedSize |
-                                QFileInfoPrivate::CachedFileFlags |
-                                QFileInfoPrivate::CachedLinkTypeFlag |
-                                QFileInfoPrivate::CachedBundleTypeFlag |
-                                QFileInfoPrivate::CachedMTime |
-                                QFileInfoPrivate::CachedCTime |
-                                QFileInfoPrivate::CachedATime;
-    d_ptr->data->cache_enabled = 1;
+    d_ptr->cachedFlags  = QFileInfoPrivate::CachedSize |
+                          QFileInfoPrivate::CachedFileFlags |
+                          QFileInfoPrivate::CachedLinkTypeFlag |
+                          QFileInfoPrivate::CachedBundleTypeFlag |
+                          QFileInfoPrivate::CachedMTime |
+                          QFileInfoPrivate::CachedCTime |
+                          QFileInfoPrivate::CachedATime;
+    d_ptr->cache_enabled = 1;
 }