Changeset 561 for trunk/src/gui/itemviews/qdirmodel.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/itemviews/qdirmodel.cpp (modified) (12 diffs)

trunk/src/gui/itemviews/qdirmodel.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -45 +45 @@
 #include <qstack.h>
 #include <qfile.h>
+#include <qfilesystemmodel.h>
 #include <qurl.h>
 #include <qmime.h>
@@ -190 +191 @@
     \ingroup model-view
 
+    \note The usage of QDirModel is not recommended anymore. The
+    QFileSystemModel class is a more performant alternative.
+
     This class provides access to the local filesystem, providing functions
     for renaming and removing files and directories, and for creating new
@@ -228 +232 @@
     \note QDirModel requires an instance of a GUI application.
 
-    \sa nameFilters(), setFilter(), filter(), QListView, QTreeView,
+    \sa nameFilters(), setFilter(), filter(), QListView, QTreeView, QFileSystemModel,
     {Dir View Example}, {Model Classes}
 */
@@ -869 +873 @@
 
     QString absolutePath = QDir(path).absolutePath();
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
+    absolutePath = absolutePath.toLower();
+#endif
 #if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_OS2)
-    absolutePath = absolutePath.toLower();
     // On Windows, "filename......." and "filename" are equivalent
     if (absolutePath.endsWith(QLatin1Char('.'))) {
@@ -910 +916 @@
         if (childAppended)
             emit const_cast<QDirModel*>(this)->layoutChanged();
-    } else if (pathElements.at(0).endsWith(QLatin1Char(':'))) {
+    } else 
+#endif
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
+    if (pathElements.at(0).endsWith(QLatin1Char(':'))) {
         pathElements[0] += QLatin1Char('/');
     }
@@ -932 +941 @@
             const QFileInfo& fi = parent->children.at(j).info;
             QString childFileName;
-#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_OS2)
             childFileName = idx.isValid() ? fi.fileName() : fi.absoluteFilePath();
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
             childFileName = childFileName.toLower();
-#else
-            childFileName = idx.isValid() ? fi.fileName() : fi.absoluteFilePath();
 #endif
             if (childFileName == element) {
@@ -953 +960 @@
                 newPath = parent->info.absoluteFilePath() + element;
             else
-                newPath= parent->info.absoluteFilePath() + QLatin1Char('/') + element;
+                newPath = parent->info.absoluteFilePath() + QLatin1Char('/') + element;
 #else
             QString newPath = parent->info.absoluteFilePath() + QLatin1Char('/') + element;
@@ -1305 +1312 @@
         if (name.startsWith(QLatin1Char('/'))) // UNC host
             return info.fileName();
+#endif        
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE)) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
         if (name.endsWith(QLatin1Char('/')))
             name.chop(1);
@@ -1336 +1345 @@
     quint64 bytes = n->info.size();
     if (bytes >= tb)
-        return QLocale().toString(bytes / tb) + QString::fromLatin1(" TB");
+        return QFileSystemModel::tr("%1 TB").arg(QLocale().toString(qreal(bytes) / tb, 'f', 3));
     if (bytes >= gb)
-        return QLocale().toString(bytes / gb) + QString::fromLatin1(" GB");
+        return QFileSystemModel::tr("%1 GB").arg(QLocale().toString(qreal(bytes) / gb, 'f', 2));
     if (bytes >= mb)
-        return QLocale().toString(bytes / mb) + QString::fromLatin1(" MB");
+        return QFileSystemModel::tr("%1 MB").arg(QLocale().toString(qreal(bytes) / mb, 'f', 1));
     if (bytes >= kb)
-        return QLocale().toString(bytes / kb) + QString::fromLatin1(" KB");
-    return QLocale().toString(bytes) + QString::fromLatin1(" bytes");
+        return QFileSystemModel::tr("%1 KB").arg(QLocale().toString(bytes / kb));
+    return QFileSystemModel::tr("%1 byte(s)").arg(QLocale().toString(bytes));
 }