diff options
| author | Richard Moore <rich@kde.org> | 2012-02-19 15:55:29 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-22 00:07:31 +0100 |
| commit | 28401bf747d8ca81c9fe3179e8e59f779828a4a3 (patch) | |
| tree | 5325c62e6f05f69a78b79880fa8d5509e5b8fad9 /src/corelib/io/qfile.h | |
| parent | 5f5f9f33be4f21cdf925482898042bb792d53a78 (diff) | |
Merge overloads
Fixes ### Qt 5
Change-Id: I2846593616635440e17c8a9ce518780561992b84
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qfile.h')
| -rw-r--r-- | src/corelib/io/qfile.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index bf7290dda2..7f370d4214 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -144,10 +144,8 @@ public: bool isSequential() const; bool open(OpenMode flags); - bool open(FILE *f, OpenMode flags); - bool open(int fd, OpenMode flags); - bool open(FILE *f, OpenMode ioFlags, FileHandleFlags handleFlags); - bool open(int fd, OpenMode ioFlags, FileHandleFlags handleFlags); + bool open(FILE *f, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle); + bool open(int fd, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle); virtual void close(); qint64 size() const; |