diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-02 00:41:28 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-07 18:40:30 +0000 |
commit | 0b7d9d28119d27bd6ccb277876f4d904d1d7afcb (patch) | |
tree | 854b1ff3acb40291afcac38e1e265a9a7881d2d1 /src/corelib | |
parent | 1b73c202ce907cd03864413f472bfeb5abf5151e (diff) |
QAbstractFileEngine: make setFileTime not a pure virtual
Most engines just had to override the virtual to return false. So do it
in the base class.
Change-Id: I8d96dea9955d4c749b99fffd14cd738a48aa818c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/io/qabstractfileengine.cpp | 10 | ||||
-rw-r--r-- | src/corelib/io/qabstractfileengine_p.h | 2 | ||||
-rw-r--r-- | src/corelib/io/qresource.cpp | 7 | ||||
-rw-r--r-- | src/corelib/io/qresource_p.h | 1 |
4 files changed, 9 insertions, 11 deletions
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp index 85dc2f33a2..169e933546 100644 --- a/src/corelib/io/qabstractfileengine.cpp +++ b/src/corelib/io/qabstractfileengine.cpp @@ -726,10 +726,10 @@ QString QAbstractFileEngine::owner(FileOwner owner) const return QString(); } -/*! - \fn bool QAbstractFileEngine::setFileTime(const QDateTime &newDate, FileTime time) +/*! \since 5.10 + Sets the file \a time to \a newDate, returning true if successful; otherwise returns false. @@ -737,6 +737,12 @@ QString QAbstractFileEngine::owner(FileOwner owner) const \sa fileTime() */ +bool QAbstractFileEngine::setFileTime(const QDateTime &newDate, FileTime time) +{ + Q_UNUSED(newDate); + Q_UNUSED(time); + return false; +} /*! If \a time is \c CreationTime, return when the file was created. diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h index 9d0a101b49..5685a39e81 100644 --- a/src/corelib/io/qabstractfileengine_p.h +++ b/src/corelib/io/qabstractfileengine_p.h @@ -144,7 +144,7 @@ public: virtual QString fileName(FileName file=DefaultName) const; virtual uint ownerId(FileOwner) const; virtual QString owner(FileOwner) const; - virtual bool setFileTime(const QDateTime &newDate, FileTime time) = 0; + virtual bool setFileTime(const QDateTime &newDate, FileTime time); virtual QDateTime fileTime(FileTime time) const; virtual void setFileName(const QString &file); virtual int handle() const; diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index ff31524c1c..984ed23812 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -1457,13 +1457,6 @@ QString QResourceFileEngine::owner(FileOwner) const return QString(); } -bool QResourceFileEngine::setFileTime(const QDateTime &newDate, FileTime time) -{ - Q_UNUSED(newDate); - Q_UNUSED(time); - return false; -} - QDateTime QResourceFileEngine::fileTime(FileTime time) const { Q_D(const QResourceFileEngine); diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index 1b0f4f66e4..e08ba64d2b 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -103,7 +103,6 @@ public: virtual uint ownerId(FileOwner) const Q_DECL_OVERRIDE; virtual QString owner(FileOwner) const Q_DECL_OVERRIDE; - virtual bool setFileTime(const QDateTime &newDate, FileTime time) Q_DECL_OVERRIDE; virtual QDateTime fileTime(FileTime time) const Q_DECL_OVERRIDE; virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) Q_DECL_OVERRIDE; |