diff options
| author | David Faure <faure@kde.org> | 2011-12-08 16:00:33 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-08 18:28:31 +0100 |
| commit | 757ef710d8778b01decfa772227194333fe0f305 (patch) | |
| tree | c7d2cd9d2cebe144ba45a0cb1b1a95a3ecd258fc /src/corelib/io/qtemporarydir.cpp | |
| parent | ee18d6ea1f3c2f5388abea58bbe3f1f1ff2b2d5c (diff) | |
QTemporaryDir/File: cleanups (static internal function, QScopedPointer)
Change-Id: I61311d151e2ae94a22df58297bbfb7a636a01c4a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qtemporarydir.cpp')
| -rw-r--r-- | src/corelib/io/qtemporarydir.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/corelib/io/qtemporarydir.cpp b/src/corelib/io/qtemporarydir.cpp index 66d9a8753a..78ec1774eb 100644 --- a/src/corelib/io/qtemporarydir.cpp +++ b/src/corelib/io/qtemporarydir.cpp @@ -66,7 +66,6 @@ public: QTemporaryDirPrivate(); ~QTemporaryDirPrivate(); - QString defaultTemplateName() const; void create(const QString &templateName); QString path; @@ -84,7 +83,7 @@ QTemporaryDirPrivate::~QTemporaryDirPrivate() { } -QString QTemporaryDirPrivate::defaultTemplateName() const +static QString defaultTemplateName() { QString baseName; #if defined(QT_BUILD_CORE_LIB) @@ -167,14 +166,14 @@ void QTemporaryDirPrivate::create(const QString &templateName) QTemporaryDir::QTemporaryDir() : d_ptr(new QTemporaryDirPrivate) { - d_ptr->create(d_ptr->defaultTemplateName()); + d_ptr->create(defaultTemplateName()); } QTemporaryDir::QTemporaryDir(const QString &templateName) : d_ptr(new QTemporaryDirPrivate) { if (templateName.isEmpty()) - d_ptr->create(d_ptr->defaultTemplateName()); + d_ptr->create(defaultTemplateName()); else d_ptr->create(templateName); } @@ -188,9 +187,8 @@ QTemporaryDir::QTemporaryDir(const QString &templateName) */ QTemporaryDir::~QTemporaryDir() { - if (d_ptr->success && d_ptr->autoRemove) + if (d_ptr->autoRemove) remove(); - delete d_ptr; } /*! |