Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove unused QFSFileEngine::open() methods

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-09-06 23:42:42 +03:00
parent 9a9349240a
commit 18b45cbb80
4 changed files with 1 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/io/qfile.cpp
View file

@ -65,22 +65,6 @@ QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleF
#endif
}
bool
QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handleFlags)
{
#ifdef QT_NO_FSFILEENGINE
Q_UNUSED(flags);
Q_UNUSED(fh);
return false;
#else
delete fileEngine;
fileEngine = 0;
QFSFileEngine *fe = new QFSFileEngine;
fileEngine = fe;
return fe->open(QIODevice::OpenMode(flags), fh, handleFlags);
#endif
}
void
QFilePrivate::setError(QFile::FileError err)
{
@ -818,7 +802,7 @@ bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags)
return false;
}
Q_D(QFile);
if (d->openExternalFile(mode, fh, handleFlags)) {
if (d->openExternalFile(mode, QT_FILENO(fh), handleFlags)) {
QIODevice::open(mode);
if (mode & Append) {
seek(size());

1
src/core/io/qfile_p.h
View file

@ -47,7 +47,6 @@ protected:
~QFilePrivate();
bool openExternalFile(int flags, int fd, QFile::FileHandleFlags handleFlags);
bool openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handleFlags);
QString fileName;
mutable QAbstractFileEngine *fileEngine;

31
src/core/io/qfsfileengine.cpp
View file

@ -209,37 +209,6 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode)
return true;
}
/*!
Opens the file handle \a fh in \a openMode mode. Returns true on
success; otherwise returns false.
*/
bool QFSFileEngine::open(QIODevice::OpenMode openMode, FILE *fh)
{
return QFSFileEngine::open(openMode, QT_FILENO(fh), QFile::DontCloseHandle);
}
/*!
Opens the file handle \a fh in \a openMode mode. Returns true
on success; otherwise returns false.
The \a handleFlags argument specifies whether the file handle will be
closed by Qt. See the QFile::FileHandleFlags documentation for more
information.
*/
bool QFSFileEngine::open(QIODevice::OpenMode openMode, FILE *fh, QFile::FileHandleFlags handleFlags)
{
return QFSFileEngine::open(openMode, QT_FILENO(fh), handleFlags);
}
/*!
Opens the file descriptor \a fd in \a openMode mode. Returns true
on success; otherwise returns false.
*/
bool QFSFileEngine::open(QIODevice::OpenMode openMode, int fd)
{
return QFSFileEngine::open(openMode, fd, QFile::DontCloseHandle);
}
/*!
Opens the file descriptor \a fd in \a openMode mode. Returns true
on success; otherwise returns false.

3
src/core/io/qfsfileengine.h
View file

@ -41,7 +41,6 @@ public:
~QFSFileEngine();
bool open(QIODevice::OpenMode openMode);
bool open(QIODevice::OpenMode flags, FILE *fh);
bool close();
bool flush();
qint64 size() const;
@ -77,9 +76,7 @@ public:
bool supportsExtension(Extension extension) const;
//FS only!!
bool open(QIODevice::OpenMode flags, int fd);
bool open(QIODevice::OpenMode flags, int fd, QFile::FileHandleFlags handleFlags);
bool open(QIODevice::OpenMode flags, FILE *fh, QFile::FileHandleFlags handleFlags);
static bool setCurrentPath(const QString &path);
static QString currentPath(const QString &path = QString());
static QString homePath();