Drop QFile::fileEngine

The function was already marked as internal.

By moving access to the underlying file engine to private API this
supports the effort to completely drop file engines from public API. In
the future, the goal is to completely drop the file-engine abstraction
as it exists today.

Change-Id: I332fa56e70c87e83c1e08bb9f75e04df7c93fec7
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>

1 files changed, 16 insertions, 19 deletions

diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index b80ba6eee1..75681dadff 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -407,6 +407,8 @@ protected:
     QTemporaryFilePrivate();
     ~QTemporaryFilePrivate();
 
+    QAbstractFileEngine *engine() const;
+
     bool autoRemove;
     QString templateName;
 };
@@ -419,6 +421,17 @@ QTemporaryFilePrivate::~QTemporaryFilePrivate()
 {
 }
 
+QAbstractFileEngine *QTemporaryFilePrivate::engine() const
+{
+    if (!fileEngine) {
+        if (fileName.isEmpty())
+            fileEngine = new QTemporaryFileEngine(templateName);
+        else
+            fileEngine = new QTemporaryFileEngine(fileName, false);
+    }
+    return fileEngine;
+}
+
 static QString defaultTemplateName()
 {
     QString baseName;
@@ -640,7 +653,7 @@ QString QTemporaryFile::fileName() const
     Q_D(const QTemporaryFile);
     if(d->fileName.isEmpty())
         return QString();
-    return fileEngine()->fileName(QAbstractFileEngine::DefaultName);
+    return d->engine()->fileName(QAbstractFileEngine::DefaultName);
 }
 
 /*!
@@ -692,7 +705,7 @@ void QTemporaryFile::setFileTemplate(const QString &name)
 */
 QTemporaryFile *QTemporaryFile::createLocalFile(QFile &file)
 {
-    if (QAbstractFileEngine *engine = file.fileEngine()) {
+    if (QAbstractFileEngine *engine = file.d_func()->engine()) {
         if(engine->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::LocalDiskFlag)
             return 0; //local already
         //cache
@@ -726,22 +739,6 @@ QTemporaryFile *QTemporaryFile::createLocalFile(QFile &file)
 }
 
 /*!
-   \internal
-*/
-
-QAbstractFileEngine *QTemporaryFile::fileEngine() const
-{
-    Q_D(const QTemporaryFile);
-    if(!d->fileEngine) {
-        if (d->fileName.isEmpty())
-            d->fileEngine = new QTemporaryFileEngine(d->templateName);
-        else
-            d->fileEngine = new QTemporaryFileEngine(d->fileName, false);
-    }
-    return d->fileEngine;
-}
-
-/*!
    \reimp
 
     Creates a unique file name for the temporary file, and opens it.  You can
@@ -752,7 +749,7 @@ bool QTemporaryFile::open(OpenMode flags)
 {
     Q_D(QTemporaryFile);
     if (!d->fileName.isEmpty()) {
-        if (static_cast<QTemporaryFileEngine*>(fileEngine())->isReallyOpen()) {
+        if (static_cast<QTemporaryFileEngine*>(d->engine())->isReallyOpen()) {
             setOpenMode(flags);
             return true;
         }