diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-10 19:37:03 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-12 17:12:41 +0000 |
| commit | afc7b26313e0d6c43bdc62b021751f30e6fa27a5 (patch) | |
| tree | 9cbc5638bd0bc21efaabc2f4e8845601b3fff16f /src/widgets/dialogs/qfiledialog.h | |
| parent | 652075d1e09c8dc1cfaa8d273d136d27e3d141f2 (diff) | |
QtWidgets: mark QFileDialog functions as deprecated
Mark some long obsolete functions as deprecated so the can be removed
with Qt6:
- QFileDialog::setConfirmOverwrite()/confirmOverwrite()
- QFileDialog::setReadOnly()/isReadOnly()
Change-Id: I3cc1df76c8e40e95b8e9893ae06ef488fad26fb6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/widgets/dialogs/qfiledialog.h')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index c75795fd77..95e03618ac 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -66,10 +66,10 @@ class Q_WIDGETS_EXPORT QFileDialog : public QDialog Q_PROPERTY(ViewMode viewMode READ viewMode WRITE setViewMode) Q_PROPERTY(FileMode fileMode READ fileMode WRITE setFileMode) Q_PROPERTY(AcceptMode acceptMode READ acceptMode WRITE setAcceptMode) - Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE false) - Q_PROPERTY(bool confirmOverwrite READ confirmOverwrite WRITE setConfirmOverwrite DESIGNABLE false) Q_PROPERTY(QString defaultSuffix READ defaultSuffix WRITE setDefaultSuffix) #if QT_DEPRECATED_SINCE(5, 13) + Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE false) + Q_PROPERTY(bool confirmOverwrite READ confirmOverwrite WRITE setConfirmOverwrite DESIGNABLE false) Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks DESIGNABLE false) Q_PROPERTY(bool nameFilterDetailsVisible READ isNameFilterDetailsVisible WRITE setNameFilterDetailsVisible DESIGNABLE false) @@ -80,7 +80,8 @@ class Q_WIDGETS_EXPORT QFileDialog : public QDialog public: enum ViewMode { Detail, List }; Q_ENUM(ViewMode) - enum FileMode { AnyFile, ExistingFile, Directory, ExistingFiles, DirectoryOnly }; + enum FileMode { AnyFile, ExistingFile, Directory, ExistingFiles, + DirectoryOnly Q_DECL_ENUMERATOR_DEPRECATED_X("Use setOption(ShowDirsOnly, true) instead")}; Q_ENUM(FileMode) enum AcceptMode { AcceptOpen, AcceptSave }; Q_ENUM(AcceptMode) @@ -153,10 +154,10 @@ public: void setAcceptMode(AcceptMode mode); AcceptMode acceptMode() const; +#if QT_DEPRECATED_SINCE(5, 13) void setReadOnly(bool enabled); bool isReadOnly() const; -#if QT_DEPRECATED_SINCE(5, 13) QT_DEPRECATED_X("Use setOption(DontResolveSymlinks, !enabled) instead") void setResolveSymlinks(bool enabled); QT_DEPRECATED_X("Use !testOption(DontResolveSymlinks) instead") @@ -169,8 +170,12 @@ public: QByteArray saveState() const; bool restoreState(const QByteArray &state); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use setOption(DontConfirmOverwrite, !enabled) instead") void setConfirmOverwrite(bool enabled); + QT_DEPRECATED_X("Use !testOption(DontConfirmOverwrite) instead") bool confirmOverwrite() const; +#endif void setDefaultSuffix(const QString &suffix); QString defaultSuffix() const; |