Remove deprecated members from dialog classes

And a few cleanups of out-dated comments and dead code.

Change-Id: I59c6b9129a21b8953626cb63c3ebbf9b6c49a657
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 4 insertions, 38 deletions

diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
index 790f52f2e7..3703e7be26 100644
--- a/src/widgets/dialogs/qfiledialog.h
+++ b/src/widgets/dialogs/qfiledialog.h
@@ -67,13 +67,6 @@ class Q_WIDGETS_EXPORT QFileDialog : public QDialog
     Q_PROPERTY(FileMode fileMode READ fileMode WRITE setFileMode)
     Q_PROPERTY(AcceptMode acceptMode READ acceptMode WRITE setAcceptMode)
     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)
-#endif
     Q_PROPERTY(Options options READ options WRITE setOptions)
     Q_PROPERTY(QStringList supportedSchemes READ supportedSchemes WRITE setSupportedSchemes)
 
@@ -92,13 +85,10 @@ public:
         ShowDirsOnly                = 0x00000001,
         DontResolveSymlinks         = 0x00000002,
         DontConfirmOverwrite        = 0x00000004,
-#if QT_DEPRECATED_SINCE(5, 14)
-        DontUseSheet Q_DECL_ENUMERATOR_DEPRECATED = 0x00000008,
-#endif
-        DontUseNativeDialog         = 0x00000010,
-        ReadOnly                    = 0x00000020,
-        HideNameFilterDetails       = 0x00000040,
-        DontUseCustomDirectoryIcons = 0x00000080
+        DontUseNativeDialog         = 0x00000008,
+        ReadOnly                    = 0x00000010,
+        HideNameFilterDetails       = 0x00000020,
+        DontUseCustomDirectoryIcons = 0x00000040
     };
     Q_ENUM(Option)
     Q_DECLARE_FLAGS(Options, Option)
@@ -124,13 +114,6 @@ public:
     void selectUrl(const QUrl &url);
     QList<QUrl> selectedUrls() const;
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    QT_DEPRECATED_X("Use setOption(HideNameFilterDetails, !enabled) instead")
-    void setNameFilterDetailsVisible(bool enabled);
-    QT_DEPRECATED_X("Use !testOption(HideNameFilterDetails) instead")
-    bool isNameFilterDetailsVisible() const;
-#endif
-
     void setNameFilter(const QString &filter);
     void setNameFilters(const QStringList &filters);
     QStringList nameFilters() const;
@@ -156,29 +139,12 @@ public:
     void setAcceptMode(AcceptMode mode);
     AcceptMode acceptMode() const;
 
-#if QT_DEPRECATED_SINCE(5, 13)
-    void setReadOnly(bool enabled);
-    bool isReadOnly() const;
-
-    QT_DEPRECATED_X("Use setOption(DontResolveSymlinks, !enabled) instead")
-    void setResolveSymlinks(bool enabled);
-    QT_DEPRECATED_X("Use !testOption(DontResolveSymlinks) instead")
-    bool resolveSymlinks() const;
-#endif
-
     void setSidebarUrls(const QList<QUrl> &urls);
     QList<QUrl> sidebarUrls() const;
 
     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;