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-09-07 14:17:06 +0200 |
commit | 7f369fc76079695f00e249e017328fdf6d5e0680 (patch) | |
tree | 031de9468fd3547867f1186e24f69aa1fbe484aa /src/corelib/io/qfileinfo.cpp | |
parent | 659c4d56a075c1f49ece99be38d7e436b2c53581 (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; } |