diff options
author | Ritt Konstantin <ritt.ks@gmail.com> | 2009-08-27 09:05:44 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-08-27 09:32:03 (GMT) |
commit | a22b32ee478420a398a69788f47b8fb00f68f01b (patch) | |
tree | 6b2ecc63bb52ac7ca273dd2c0d803e708a2e87c1 /src | |
parent | b726c223b39ba47dd86f16c1423229632372a70c (diff) | |
download | Qt-a22b32ee478420a398a69788f47b8fb00f68f01b.zip Qt-a22b32ee478420a398a69788f47b8fb00f68f01b.tar.gz Qt-a22b32ee478420a398a69788f47b8fb00f68f01b.tar.bz2 |
move QFSFileEngine-related symbian code from qtemporaryfile to qfsfileengine
i'm a garbage collector :)
AutoTest: Passed
RevBy: Miikka Heikkinen
Signed-off-by: axis <qt-info@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/io/qfsfileengine_unix.cpp | 5 | ||||
-rw-r--r-- | src/corelib/io/qtemporaryfile.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index 2ac886a..ec20e4a 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -565,7 +565,7 @@ QString QFSFileEngine::currentPath(const QString &) // try to create it (can happen with application private dirs) // Ignore mkdir failures; we want to be consistent with Open C // current path regardless. - ::mkdir(QFile::encodeName(nativeCurrentName), 0777); + QT_MKDIR(QFile::encodeName(nativeCurrentName), 0777); #else # if defined(QT_DEBUG) qWarning("QFSFileEngine::currentPath: stat(\".\") failed"); @@ -609,6 +609,9 @@ QString QFSFileEngine::tempPath() TFileName symbianPath = PathInfo::PhoneMemoryRootPath(); QString temp = QDir::fromNativeSeparators(qt_TDesC2QString(symbianPath)); temp += QLatin1String( "temp/"); + + // Just to verify that folder really exist on hardware + QT_MKDIR(QFile::encodeName(temp), 0777); # else # warning No fallback implementation of QFSFileEngine::tempPath() return QString(); diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index 3db0564..adfcf5e 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -514,10 +514,6 @@ QTemporaryFile::QTemporaryFile() { Q_D(QTemporaryFile); d->templateName = QDir::tempPath() + QLatin1String("/qt_temp.XXXXXX"); -#ifdef Q_OS_SYMBIAN - //Just to verify that folder really exist on hardware - fileEngine()->mkdir(QDir::tempPath(), true); -#endif } /*! |