summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qtemporaryfile.cpp
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2011-12-08 16:00:33 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-08 18:28:31 +0100
commit757ef710d8778b01decfa772227194333fe0f305 (patch)
treec7d2cd9d2cebe144ba45a0cb1b1a95a3ecd258fc /src/corelib/io/qtemporaryfile.cpp
parentee18d6ea1f3c2f5388abea58bbe3f1f1ff2b2d5c (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/qtemporaryfile.cpp')
-rw-r--r--src/corelib/io/qtemporaryfile.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index ebcaaa71bd..677be45f65 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -439,8 +439,6 @@ protected:
QTemporaryFilePrivate();
~QTemporaryFilePrivate();
- QString defaultTemplateName() const;
-
bool autoRemove;
QString templateName;
};
@@ -453,7 +451,7 @@ QTemporaryFilePrivate::~QTemporaryFilePrivate()
{
}
-QString QTemporaryFilePrivate::defaultTemplateName() const
+static QString defaultTemplateName()
{
QString baseName;
#if defined(QT_BUILD_CORE_LIB)
@@ -518,7 +516,7 @@ QTemporaryFile::QTemporaryFile()
: QFile(*new QTemporaryFilePrivate)
{
Q_D(QTemporaryFile);
- d->templateName = d->defaultTemplateName();
+ d->templateName = defaultTemplateName();
}
QTemporaryFile::QTemporaryFile(const QString &templateName)
@@ -541,7 +539,7 @@ QTemporaryFile::QTemporaryFile()
: QFile(*new QTemporaryFilePrivate, 0)
{
Q_D(QTemporaryFile);
- d->templateName = d->defaultTemplateName();
+ d->templateName = defaultTemplateName();
}
/*!
@@ -577,7 +575,7 @@ QTemporaryFile::QTemporaryFile(QObject *parent)
: QFile(*new QTemporaryFilePrivate, parent)
{
Q_D(QTemporaryFile);
- d->templateName = d->defaultTemplateName();
+ d->templateName = defaultTemplateName();
}
/*!