summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-09-01 12:59:43 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-09-01 12:59:43 (GMT)
commit9e31072524f496493c9b9b799c4f9520f77cf7c5 (patch)
tree67a830b7396a53fe5f6e5e7ce1f23ef7b9467afc
parenta543c044234f2854a53f9a659e9004f4aa536bc7 (diff)
downloadQt-9e31072524f496493c9b9b799c4f9520f77cf7c5.zip
Qt-9e31072524f496493c9b9b799c4f9520f77cf7c5.tar.gz
Qt-9e31072524f496493c9b9b799c4f9520f77cf7c5.tar.bz2
Make QFileSystemEngine::slowCanonicalized private
-rw-r--r--src/corelib/io/qfilesystemengine_p.h1
-rw-r--r--src/corelib/io/qfsfileengine_win.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemengine_p.h b/src/corelib/io/qfilesystemengine_p.h
index 982b782..f50701e 100644
--- a/src/corelib/io/qfilesystemengine_p.h
+++ b/src/corelib/io/qfilesystemengine_p.h
@@ -85,6 +85,7 @@ public:
static bool setPermissions(const QFileSystemEntry &entry, QFile::Permissions permissions,
QFileSystemMetaData *data = 0);
+private:
static QString slowCanonicalized(const QString &path);
};
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index bc88776..7262129 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -1621,7 +1621,7 @@ QString QFSFileEngine::fileName(FileName file) const
} else if (file == CanonicalName || file == CanonicalPathName) {
if (!(fileFlags(ExistsFlag) & ExistsFlag))
return QString();
- QFileSystemEngine entry(QFileSystemEngine::slowCanonicalized(fileName(AbsoluteName)));
+ QFileSystemEntry entry(QFileSystemEngine::canonicalName(d->fileEntry));
if (file == CanonicalPathName)
return entry.path();