diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-09-25 13:14:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-02 10:43:48 +0200 |
| commit | ef3a544436beaecb4d26349ce115be39b680ef6a (patch) | |
| tree | 540c4d2f4485794165d6d780b04296da8910db14 /src/corelib/io/qtemporaryfile.h | |
| parent | f20266f9f43ab3956de271f696c769db02992e87 (diff) | |
Rename createLocalFile to createNativeFile & deprecate createLocalFile
As it was confusing to use the term local file when referring
to a file that was accessible using native APIs and not just
a file that was on a hard disk somewhere already the function
name has been changed.
By renaming it to createNativeFile we keep it consistant with QFileInfo
which has an isNativeFile() function too.
Test also added.
Task-number: QTBUG-3169
Change-Id: I410e7ed28133d68fd312c6c0faf3f7191460d7ce
Reviewed-by: João Abecasis <joao@abecasis.name>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qtemporaryfile.h')
| -rw-r--r-- | src/corelib/io/qtemporaryfile.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/corelib/io/qtemporaryfile.h b/src/corelib/io/qtemporaryfile.h index 96e6b1c779..b7c375ea41 100644 --- a/src/corelib/io/qtemporaryfile.h +++ b/src/corelib/io/qtemporaryfile.h @@ -83,10 +83,15 @@ public: QString fileName() const; QString fileTemplate() const; void setFileTemplate(const QString &name); - - inline static QTemporaryFile *createLocalFile(const QString &fileName) - { QFile file(fileName); return createLocalFile(file); } - static QTemporaryFile *createLocalFile(QFile &file); +#if QT_DEPRECATED_SINCE(5,1) + QT_DEPRECATED inline static QTemporaryFile *createLocalFile(const QString &fileName) + { return createNativeFile(fileName); } + QT_DEPRECATED inline static QTemporaryFile *createLocalFile(QFile &file) + { return createNativeFile(file); } +#endif + inline static QTemporaryFile *createNativeFile(const QString &fileName) + { QFile file(fileName); return createNativeFile(file); } + static QTemporaryFile *createNativeFile(QFile &file); protected: bool open(OpenMode flags); |