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

use proper type for QFile::fileEngine member

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-01-14 16:40:00 +00:00
parent 057c9726a2
commit 46ae020ff2
5 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,10 +70,8 @@ QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleF
return false;
#else
delete fileEngine;
fileEngine = 0;
QFSFileEngine *fe = new QFSFileEngine;
fileEngine = fe;
return fe->open(QIODevice::OpenMode(flags), fd, handleFlags);
fileEngine = new QFSFileEngine;
return fileEngine->open(QIODevice::OpenMode(flags), fd, handleFlags);
#endif
}
@ -86,10 +84,8 @@ QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handl
return false;
#else
delete fileEngine;
fileEngine = 0;
QFSFileEngine *fe = new QFSFileEngine;
fileEngine = fe;
return fe->open(QIODevice::OpenMode(flags), fh, handleFlags);
fileEngine = new QFSFileEngine;
return fileEngine->open(QIODevice::OpenMode(flags), fh, handleFlags);
#endif
}
@ -1453,11 +1449,11 @@ QFile::writeData(const char *data, qint64 len)
\internal
Returns the QIOEngine for this QFile object.
*/
QAbstractFileEngine *QFile::fileEngine() const
QFSFileEngine *QFile::fileEngine() const
{
Q_D(const QFile);
if(!d->fileEngine)
d->fileEngine = QAbstractFileEngine::create(d->fileName);
d->fileEngine = new QFSFileEngine(d->fileName);
return d->fileEngine;
}

4
src/core/io/qfile.h
View file

@ -47,7 +47,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QAbstractFileEngine;
class QFSFileEngine;
class QFilePrivate;
class Q_CORE_EXPORT QFile : public QIODevice
@ -153,7 +153,7 @@ public:
uchar *map(qint64 offset, qint64 size);
bool unmap(uchar *address);
virtual QAbstractFileEngine *fileEngine() const;
virtual QFSFileEngine *fileEngine() const;
protected:

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

@ -45,7 +45,7 @@
// We mean it.
//
#include "QtCore/qabstractfileengine.h"
#include "QtCore/qfsfileengine.h"
#include "QtCore/qiodevice_p.h"
#include "QtCore/qringbuffer_p.h"
@ -63,7 +63,7 @@ protected:
bool openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handleFlags);
QString fileName;
mutable QAbstractFileEngine *fileEngine;
mutable QFSFileEngine *fileEngine;
bool lastWasWrite;
QRingBuffer writeBuffer;

2
src/core/io/qtemporaryfile.cpp
View file

@ -602,7 +602,7 @@ QTemporaryFile *QTemporaryFile::createLocalFile(QFile &file)
\internal
*/
QAbstractFileEngine *QTemporaryFile::fileEngine() const
QFSFileEngine *QTemporaryFile::fileEngine() const
{
Q_D(const QTemporaryFile);
if(!d->fileEngine) {

2
src/core/io/qtemporaryfile.h
View file

@ -79,7 +79,7 @@ public:
{ QFile file(fileName); return createLocalFile(file); }
static QTemporaryFile *createLocalFile(QFile &file);
virtual QAbstractFileEngine *fileEngine() const;
virtual QFSFileEngine *fileEngine() const;
protected:
bool open(OpenMode flags);