diff options
Diffstat (limited to 'src/imports/widgets/qquickqfiledialog.cpp')
-rw-r--r-- | src/imports/widgets/qquickqfiledialog.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/imports/widgets/qquickqfiledialog.cpp b/src/imports/widgets/qquickqfiledialog.cpp index 6aab2adbb9..7446887eb8 100644 --- a/src/imports/widgets/qquickqfiledialog.cpp +++ b/src/imports/widgets/qquickqfiledialog.cpp @@ -66,12 +66,10 @@ public: } virtual bool defaultNameFilterDisables() const { return true; } - virtual void setDirectory(const QString &dir) { m_dialog.setDirectory(dir); } - virtual void selectFile(const QString &f) { m_dialog.selectFile(f); } - /* TODO after dialog helper switches to URLs - virtual QString directory() const { return m_dialog.directory().absolutePath(); } - virtual QStringList selectedFiles() const { return m_dialog.selectedFiles(); } - */ + virtual void setDirectory(const QUrl &dir) { m_dialog.setDirectoryUrl(dir); } + virtual QUrl directory() const { return m_dialog.directoryUrl(); } + virtual void selectFile(const QUrl &f) { m_dialog.selectUrl(f); } + virtual QList<QUrl> selectedFiles() const; virtual void setFilter() { m_dialog.setWindowTitle(QPlatformFileDialogHelper::options()->windowTitle()); @@ -190,7 +188,6 @@ QPlatformFileDialogHelper *QQuickQFileDialog::helper() if (parentItem) m_parentWindow = parentItem->window(); - /* TODO after dialog helper switches to URLs if (!m_dlgHelper) { m_dlgHelper = new QFileDialogHelper(); connect(m_dlgHelper, SIGNAL(directoryEntered(QString)), this, SIGNAL(folderChanged())); @@ -198,9 +195,13 @@ QPlatformFileDialogHelper *QQuickQFileDialog::helper() connect(m_dlgHelper, SIGNAL(accept()), this, SLOT(accept())); connect(m_dlgHelper, SIGNAL(reject()), this, SLOT(reject())); } - */ return m_dlgHelper; } +QList<QUrl> QFileDialogHelper::selectedFiles() const +{ + return m_dialog.selectedUrls(); +} + QT_END_NAMESPACE |