1 files changed, 32 insertions, 31 deletions

diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h
index 3bd2fb99c2..d5ee1c537b 100644
--- a/src/widgets/dialogs/qfiledialog_p.h
+++ b/src/widgets/dialogs/qfiledialog_p.h
@@ -74,8 +74,6 @@ struct QFileDialogArgs
     QFileDialog::Options options = {};
 };
 
-#define UrlRole (Qt::UserRole + 1)
-
 class Q_WIDGETS_EXPORT QFileDialogPrivate : public QDialogPrivate
 {
     Q_DECLARE_PUBLIC(QFileDialog)
@@ -122,11 +120,11 @@ public:
 
     QLineEdit *lineEdit() const;
 
-    static int maxNameLength(const QString &path);
+    static long maxNameLength(const QString &path);
 
     QString basename(const QString &path) const
     {
-        int separator = QDir::toNativeSeparators(path).lastIndexOf(QDir::separator());
+        const qsizetype separator = QDir::toNativeSeparators(path).lastIndexOf(QDir::separator());
         if (separator != -1)
             return path.mid(separator + 1);
         return path;
@@ -165,34 +163,34 @@ public:
     void emitFilesSelected(const QStringList &files);
     void saveHistorySelection();
 
-    void _q_goHome();
-    void _q_pathChanged(const QString &);
+    void goHome();
+    void pathChanged(const QString &);
     void navigate(HistoryItem &);
-    void _q_navigateBackward();
-    void _q_navigateForward();
-    void _q_navigateToParent();
-    void _q_createDirectory();
-    void _q_showListView();
-    void _q_showDetailsView();
-    void _q_showContextMenu(const QPoint &position);
-    void _q_renameCurrent();
-    void _q_deleteCurrent();
-    void _q_showHidden();
-    void _q_showHeader(QAction *);
-    void _q_updateOkButton();
-    void _q_currentChanged(const QModelIndex &index);
-    void _q_enterDirectory(const QModelIndex &index);
-    void _q_emitUrlSelected(const QUrl &file);
-    void _q_emitUrlsSelected(const QList<QUrl> &files);
-    void _q_nativeCurrentChanged(const QUrl &file);
-    void _q_nativeEnterDirectory(const QUrl &directory);
-    void _q_goToDirectory(const QString &);
-    void _q_useNameFilter(int index);
-    void _q_selectionChanged();
-    void _q_goToUrl(const QUrl &url);
-    void _q_autoCompleteFileName(const QString &);
-    void _q_rowsInserted(const QModelIndex & parent);
-    void _q_fileRenamed(const QString &path, const QString &oldName, const QString &newName);
+    void navigateBackward();
+    void navigateForward();
+    void navigateToParent();
+    void createDirectory();
+    void showListView();
+    void showDetailsView();
+    void showContextMenu(const QPoint &position);
+    void renameCurrent();
+    void deleteCurrent();
+    void showHidden();
+    void showHeader(QAction *);
+    void updateOkButton();
+    void currentChanged(const QModelIndex &index);
+    void enterDirectory(const QModelIndex &index);
+    void emitUrlSelected(const QUrl &file);
+    void emitUrlsSelected(const QList<QUrl> &files);
+    void nativeCurrentChanged(const QUrl &file);
+    void nativeEnterDirectory(const QUrl &directory);
+    void goToDirectory(const QString &);
+    void useNameFilter(int index);
+    void selectionChanged();
+    void goToUrl(const QUrl &url);
+    void autoCompleteFileName(const QString &);
+    void rowsInserted(const QModelIndex & parent);
+    void fileRenamed(const QString &path, const QString &oldName, const QString &newName);
 
     // layout
 #if QT_CONFIG(proxymodel)
@@ -223,6 +221,7 @@ public:
     // dialog. Returning false means that a non-native dialog must be
     // used instead.
     bool canBeNativeDialog() const override;
+    void setVisible(bool visible) override;
     inline bool usingWidgets() const;
 
     inline void setDirectory_sys(const QUrl &directory);
@@ -259,6 +258,8 @@ private:
     virtual void helperPrepareShow(QPlatformDialogHelper *) override;
     virtual void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) override;
 
+    void itemNotFound(const QString &fileName, QFileDialog::FileMode mode);
+    bool itemAlreadyExists(const QString &fileName);
     Q_DISABLE_COPY_MOVE(QFileDialogPrivate)
 };