Move QTemporaryFileEngine to private header

This is needed by QSaveFile.

Move QTemporaryFilePrivate to that header too, to avoid any confusion.

Change-Id: I8dce8a4fb853a9823c49ec565867432331e748cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 5 insertions, 50 deletions

diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index 161c64a73b..2f272e9a63 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -44,10 +44,9 @@
 #ifndef QT_NO_TEMPORARYFILE
 
 #include "qplatformdefs.h"
+#include "private/qtemporaryfile_p.h"
 #include "private/qfile_p.h"
-#include "private/qfsfileengine_p.h"
 #include "private/qsystemerror_p.h"
-#include "private/qfilesystemengine_p.h"
 
 #if !defined(Q_OS_WIN)
 #include "private/qcore_unix_p.h"       // overrides QT_OPEN
@@ -218,37 +217,6 @@ static bool createFileFromTemplate(NativeFileHandle &file,
 }
 
 //************* QTemporaryFileEngine
-class QTemporaryFileEngine : public QFSFileEngine
-{
-    Q_DECLARE_PRIVATE(QFSFileEngine)
-public:
-    QTemporaryFileEngine(const QString &file, bool fileIsTemplate = true)
-        : QFSFileEngine(), filePathIsTemplate(fileIsTemplate),
-          filePathWasTemplate(fileIsTemplate)
-    {
-        Q_D(QFSFileEngine);
-        d->fileEntry = QFileSystemEntry(file);
-
-        if (!filePathIsTemplate)
-            QFSFileEngine::setFileName(file);
-    }
-
-    ~QTemporaryFileEngine();
-
-    bool isReallyOpen();
-    void setFileName(const QString &file);
-    void setFileTemplate(const QString &fileTemplate);
-
-    bool open(QIODevice::OpenMode flags);
-    bool remove();
-    bool rename(const QString &newName);
-    bool renameOverwrite(const QString &newName);
-    bool close();
-
-    bool filePathIsTemplate;
-    bool filePathWasTemplate;
-};
-
 QTemporaryFileEngine::~QTemporaryFileEngine()
 {
     QFSFileEngine::close();
@@ -414,19 +382,6 @@ bool QTemporaryFileEngine::close()
 }
 
 //************* QTemporaryFilePrivate
-class QTemporaryFilePrivate : public QFilePrivate
-{
-    Q_DECLARE_PUBLIC(QTemporaryFile)
-
-protected:
-    QTemporaryFilePrivate();
-    ~QTemporaryFilePrivate();
-
-    QAbstractFileEngine *engine() const;
-
-    bool autoRemove;
-    QString templateName;
-};
 
 QTemporaryFilePrivate::QTemporaryFilePrivate() : autoRemove(true)
 {
@@ -447,7 +402,7 @@ QAbstractFileEngine *QTemporaryFilePrivate::engine() const
     return fileEngine;
 }
 
-static QString defaultTemplateName()
+QString QTemporaryFilePrivate::defaultTemplateName()
 {
     QString baseName;
 #if defined(QT_BUILD_CORE_LIB)
@@ -513,7 +468,7 @@ QTemporaryFile::QTemporaryFile()
     : QFile(*new QTemporaryFilePrivate)
 {
     Q_D(QTemporaryFile);
-    d->templateName = defaultTemplateName();
+    d->templateName = QTemporaryFilePrivate::defaultTemplateName();
 }
 
 QTemporaryFile::QTemporaryFile(const QString &templateName)
@@ -536,7 +491,7 @@ QTemporaryFile::QTemporaryFile()
     : QFile(*new QTemporaryFilePrivate, 0)
 {
     Q_D(QTemporaryFile);
-    d->templateName = defaultTemplateName();
+    d->templateName = QTemporaryFilePrivate::defaultTemplateName();
 }
 
 /*!
@@ -572,7 +527,7 @@ QTemporaryFile::QTemporaryFile(QObject *parent)
     : QFile(*new QTemporaryFilePrivate, parent)
 {
     Q_D(QTemporaryFile);
-    d->templateName = defaultTemplateName();
+    d->templateName = QTemporaryFilePrivate::defaultTemplateName();
 }
 
 /*!