Simplify constructor code of QTemporaryFile.

Pass the name as parameter to the constructor of QTemporaryFilePrivate
and use delegation in the convenience constructors.

Change-Id: I4087600b804fe22910b4985a59a02547f54a6acd
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

2 files changed, 13 insertions, 19 deletions

diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index 0b0446a37e..c430c7714a 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -404,7 +404,12 @@ bool QTemporaryFileEngine::close()
 
 //************* QTemporaryFilePrivate
 
-QTemporaryFilePrivate::QTemporaryFilePrivate() : autoRemove(true)
+QTemporaryFilePrivate::QTemporaryFilePrivate()
+{
+}
+
+QTemporaryFilePrivate::QTemporaryFilePrivate(const QString &templateNameIn)
+    : templateName(templateNameIn)
 {
 }
 
@@ -498,15 +503,11 @@ QString QTemporaryFilePrivate::defaultTemplateName()
 QTemporaryFile::QTemporaryFile()
     : QFile(*new QTemporaryFilePrivate)
 {
-    Q_D(QTemporaryFile);
-    d->templateName = QTemporaryFilePrivate::defaultTemplateName();
 }
 
 QTemporaryFile::QTemporaryFile(const QString &templateName)
-    : QFile(*new QTemporaryFilePrivate)
+    : QFile(*new QTemporaryFilePrivate(templateName))
 {
-    Q_D(QTemporaryFile);
-    d->templateName = templateName;
 }
 
 #else
@@ -519,10 +520,8 @@ QTemporaryFile::QTemporaryFile(const QString &templateName)
     \sa setFileTemplate(), QDir::tempPath()
 */
 QTemporaryFile::QTemporaryFile()
-    : QFile(*new QTemporaryFilePrivate, 0)
+    : QTemporaryFile(nullptr)
 {
-    Q_D(QTemporaryFile);
-    d->templateName = QTemporaryFilePrivate::defaultTemplateName();
 }
 
 /*!
@@ -540,10 +539,8 @@ QTemporaryFile::QTemporaryFile()
     \sa open(), fileTemplate()
 */
 QTemporaryFile::QTemporaryFile(const QString &templateName)
-    : QFile(*new QTemporaryFilePrivate, 0)
+    : QTemporaryFile(templateName, nullptr)
 {
-    Q_D(QTemporaryFile);
-    d->templateName = templateName;
 }
 
 /*!
@@ -557,8 +554,6 @@ QTemporaryFile::QTemporaryFile(const QString &templateName)
 QTemporaryFile::QTemporaryFile(QObject *parent)
     : QFile(*new QTemporaryFilePrivate, parent)
 {
-    Q_D(QTemporaryFile);
-    d->templateName = QTemporaryFilePrivate::defaultTemplateName();
 }
 
 /*!
@@ -577,10 +572,8 @@ QTemporaryFile::QTemporaryFile(QObject *parent)
     \sa open(), fileTemplate()
 */
 QTemporaryFile::QTemporaryFile(const QString &templateName, QObject *parent)
-    : QFile(*new QTemporaryFilePrivate, parent)
+    : QFile(*new QTemporaryFilePrivate(templateName), parent)
 {
-    Q_D(QTemporaryFile);
-    d->templateName = templateName;
 }
 #endif
 
diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h
index 58cc318ffd..d057603034 100644
--- a/src/corelib/io/qtemporaryfile_p.h
+++ b/src/corelib/io/qtemporaryfile_p.h
@@ -67,13 +67,14 @@ class QTemporaryFilePrivate : public QFilePrivate
 
 protected:
     QTemporaryFilePrivate();
+    explicit QTemporaryFilePrivate(const QString &templateNameIn);
     ~QTemporaryFilePrivate();
 
     QAbstractFileEngine *engine() const;
     void resetFileEngine() const;
 
-    bool autoRemove;
-    QString templateName;
+    bool autoRemove = true;
+    QString templateName = defaultTemplateName();
 
     static QString defaultTemplateName();