Have QFileDialog use QUrl internally

When using the native dialog and through the helper, we use QUrl in
QFileDialog. It is preparatory work for having QUrl based methods on
QFileDialog interface itself.

Done-with: sean.harmer@kdab.com
Done-with: faure@kde.org

Change-Id: I61e99d498252241f38ec05724702a90ba050c4bb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

3 files changed, 33 insertions, 25 deletions

diff --git a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h b/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
index ad2483365b..e7c68f6ff5 100644
--- a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
+++ b/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
@@ -74,10 +74,10 @@ public:
     void hide();
 
     bool defaultNameFilterDisables() const;
-    void setDirectory(const QString &directory);
-    QString directory() const;
-    void selectFile(const QString &fileName);
-    QStringList selectedFiles() const;
+    void setDirectory(const QUrl &directory) Q_DECL_OVERRIDE;
+    QUrl directory() const Q_DECL_OVERRIDE;
+    void selectFile(const QUrl &fileName) Q_DECL_OVERRIDE;
+    QList<QUrl> selectedFiles() const Q_DECL_OVERRIDE;
     void setFilter();
     void selectNameFilter(const QString &filter);
     QString selectedNameFilter() const;
@@ -98,7 +98,7 @@ private:
 
     QPlatformDialogHelper::DialogCode m_result;
 #if defined(Q_OS_BLACKBERRY_TABLET)
-    QStringList m_paths;
+    QList<QUrl> m_paths;
 #endif
 };
 
diff --git a/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp b/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
index f4c48610a6..dc841eb1a9 100644
--- a/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
+++ b/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
@@ -120,8 +120,12 @@ bool QQnxFileDialogHelper::show(Qt::WindowFlags flags, Qt::WindowModality modali
 
         m_dialog->setMode(mode);
 
-        if (!opts->initiallySelectedFiles().isEmpty())
-            m_dialog->setDefaultSaveFileNames(opts->initiallySelectedFiles());
+        if (!opts->initiallySelectedFiles().isEmpty()) {
+            QStringList files;
+            Q_FOREACH ( const QUrl &url, opts->initiallySelectedFiles() )
+                files.append(url.toLocalFile());
+            m_dialog->setDefaultSaveFileNames(files);
+        }
     }
 
     // Cache the accept mode so we know which functions to use to get the results back
@@ -144,29 +148,33 @@ bool QQnxFileDialogHelper::defaultNameFilterDisables() const
     return false;
 }
 
-void QQnxFileDialogHelper::setDirectory(const QString &directory)
+void QQnxFileDialogHelper::setDirectory(const QUrl &directory)
 {
-    m_dialog->addDirectory(directory);
+    m_dialog->addDirectory(directory.toLocalFile());
 }
 
-QString QQnxFileDialogHelper::directory() const
+QUrl QQnxFileDialogHelper::directory() const
 {
     qFileDialogHelperDebug() << Q_FUNC_INFO;
     if (!m_dialog->directories().isEmpty())
-        return m_dialog->directories().first();
+        return QUrl::fromLocalFile(m_dialog->directories().first());
 
-    return QString();
+    return QUrl();
 }
 
-void QQnxFileDialogHelper::selectFile(const QString &fileName)
+void QQnxFileDialogHelper::selectFile(const QUrl &fileName)
 {
-    m_dialog->addDefaultSaveFileName(fileName);
+    m_dialog->addDefaultSaveFileName(fileName.toLocalFile());
 }
 
-QStringList QQnxFileDialogHelper::selectedFiles() const
+QList<QUrl> QQnxFileDialogHelper::selectedFiles() const
 {
     qFileDialogHelperDebug() << Q_FUNC_INFO;
-    return m_dialog->selectedFiles();
+    QList<QUrl> urls;
+    QStringList files = m_dialog->selectedFiles();
+    Q_FOREACH (const QString &file, files)
+        urls.append(QUrl::fromLocalFile(file));
+    return urls;
 }
 
 void QQnxFileDialogHelper::setFilter()
diff --git a/src/plugins/platforms/qnx/qqnxfiledialoghelper_playbook.cpp b/src/plugins/platforms/qnx/qqnxfiledialoghelper_playbook.cpp
index 12e8d8afbf..2a743d03f7 100644
--- a/src/plugins/platforms/qnx/qqnxfiledialoghelper_playbook.cpp
+++ b/src/plugins/platforms/qnx/qqnxfiledialoghelper_playbook.cpp
@@ -102,7 +102,7 @@ bool QQnxFileDialogHelper::handleEvent(bps_event_t *event)
 
             for (int i = 0; i < pathCount; ++i) {
                 QString path = QFile::decodeName(filePaths[i]);
-                m_paths.append(path);
+                m_paths.append(QUrl::fromLocalFile(path));
                 qFileDialogHelperDebug() << "path =" << path;
             }
 
@@ -112,7 +112,7 @@ bool QQnxFileDialogHelper::handleEvent(bps_event_t *event)
             const char *filePath = dialog_event_get_filesave_filepath(event);
             QString path = QFile::decodeName(filePath);
             qFileDialogHelperDebug() << "path =" << path;
-            m_paths.append(path);
+            m_paths.append(QUrl::fromLocalFile(path));
         }
     } else { // Cancel
         m_result = QPlatformDialogHelper::Rejected;
@@ -188,7 +188,7 @@ bool QQnxFileDialogHelper::show(Qt::WindowFlags flags, Qt::WindowModality modali
 
         // Maybe pre-select a filename
         if (!opts->initiallySelectedFiles().isEmpty()) {
-            QString fileName = opts->initiallySelectedFiles().first();
+            QString fileName = opts->initiallySelectedFiles().first().toLocalFile();
             dialog_set_filesave_filename(m_dialog, QFile::encodeName(fileName).constData());
         }
 
@@ -240,29 +240,29 @@ bool QQnxFileDialogHelper::defaultNameFilterDisables() const
     return false;
 }
 
-void QQnxFileDialogHelper::setDirectory(const QString &directory)
+void QQnxFileDialogHelper::setDirectory(const QUrl &directory)
 {
     qFileDialogHelperDebug() << Q_FUNC_INFO << "directory =" << directory;
     // No native API for setting the directory(!). The best we can do is to
     // set it as the file name but even then only with a file save dialog.
     if (m_dialog && m_acceptMode == QFileDialogOptions::AcceptSave)
-        dialog_set_filesave_filename(m_dialog, QFile::encodeName(directory).constData());
+        dialog_set_filesave_filename(m_dialog, QFile::encodeName(directory.toLocalFile()).constData());
 }
 
-QString QQnxFileDialogHelper::directory() const
+QUrl QQnxFileDialogHelper::directory() const
 {
     qFileDialogHelperDebug() << Q_FUNC_INFO;
     return m_paths.first();
 }
 
-void QQnxFileDialogHelper::selectFile(const QString &fileName)
+void QQnxFileDialogHelper::selectFile(const QUrl &fileName)
 {
     qFileDialogHelperDebug() << Q_FUNC_INFO << "filename =" << fileName;
     if (m_dialog && m_acceptMode == QFileDialogOptions::AcceptSave)
-        dialog_set_filesave_filename(m_dialog, QFile::encodeName(fileName).constData());
+        dialog_set_filesave_filename(m_dialog, QFile::encodeName(fileName.toLocalFile()).constData());
 }
 
-QStringList QQnxFileDialogHelper::selectedFiles() const
+QList<QUrl> QQnxFileDialogHelper::selectedFiles() const
 {
     qFileDialogHelperDebug() << Q_FUNC_INFO;
     return m_paths;