diff options
author | João Abecasis <joao.abecasis@nokia.com> | 2010-08-30 15:02:29 +0200 |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2010-08-31 16:15:00 +0200 |
commit | c2df86d23477573ef664a20b47b19a42e4a2e6c8 (patch) | |
tree | 8ab18f4025619937ffd5def57b6a2a6245bcc80e /src/corelib/io/qfileinfo.cpp | |
parent | 900eb656849d4fa3ff119305c08b631c76fae75e (diff) |
Removed QFileInfoPrivate::initFileEngine
As it served no real purpose. Instead, the relevant bits were inlined in
the constructor that used it and makeAbsolute was adapted to use
operator=.
Reviewed-by: Thomas Zander
Diffstat (limited to 'src/corelib/io/qfileinfo.cpp')
-rw-r--r-- | src/corelib/io/qfileinfo.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index fe557d005a..ccfc9c2c76 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -47,15 +47,6 @@ QT_BEGIN_NAMESPACE -void QFileInfoPrivate::initFileEngine(const QString &file) -{ - delete fileEngine; - fileEngine = 0; - clear(); - fileEngine = QAbstractFileEngine::create(file); - fileName = file; -} - QString QFileInfoPrivate::getFileName(QAbstractFileEngine::FileName name) const { if (cache_enabled && !fileNames[(int)name].isNull()) @@ -586,7 +577,8 @@ bool QFileInfo::makeAbsolute() return false; QString absFileName = d_ptr.constData()->getFileName(QAbstractFileEngine::AbsoluteName); // QSharedDataPointer::operator->() will detach. - d_ptr->initFileEngine(absFileName); + + *this = QFileInfo(absFileName); return true; } |