path: root/src/imports/dialogs/qquickfiledialog.cpp
diff options
authorShawn Rutledge <shawn.rutledge@digia.com>2013-06-27 13:08:08 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-28 16:44:10 +0200
commit811337a73c160447e5218ae55e93df99ac3d9edd (patch)
treeac196f54046d031684f9ef220574656e16889ee3 /src/imports/dialogs/qquickfiledialog.cpp
parent87a4a3d095f4fbabb91dade7e7313cb844256b9b (diff)
FileDialog.folder property should also be a QUrl, for consistencyv5.1.0-rc2v5.1.0
In QtQuick we never use plain file paths, because URL is more general. Also use const references for string and URL setters, and fixed the dependency between the FolderListModel's folder, the field for editing it, and the folder property of the AbstractFileDialog. Change-Id: I6e965b80b73d4eb2473712a4f4d4f816b768d802 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/imports/dialogs/qquickfiledialog.cpp')
1 files changed, 7 insertions, 12 deletions
diff --git a/src/imports/dialogs/qquickfiledialog.cpp b/src/imports/dialogs/qquickfiledialog.cpp
index f5d1a06d04..2ee4afc5d2 100644
--- a/src/imports/dialogs/qquickfiledialog.cpp
+++ b/src/imports/dialogs/qquickfiledialog.cpp
@@ -105,10 +105,7 @@ QQuickFileDialog::~QQuickFileDialog()
QList<QUrl> QQuickFileDialog::fileUrls()
- QList<QUrl> ret;
- foreach (QString path, m_selections)
- ret << QUrl::fromLocalFile(path);
- return ret;
+ return m_selections;
@@ -134,18 +131,16 @@ void QQuickFileDialog::clearSelection()
\brief Adds one file to \l fileUrls
- \l path should be given as an absolute file system path. If it is given as a
- file:// URL, it will be converted to a path. Returns true on success,
- false if the given path is not valid given the current setting properties.
+ \l path should be given as an absolute file:// path URL.
+ Returns true on success, false if the given path is
+ not valid given the current property settings.
-bool QQuickFileDialog::addSelection(QString path)
+bool QQuickFileDialog::addSelection(const QUrl &path)
- if (path.startsWith("file:"))
- path = QUrl(path).toLocalFile();
- QFileInfo info(path);
+ QFileInfo info(path.toLocalFile());
if (info.exists() && ((info.isDir() && m_selectFolder) || !info.isDir())) {
if (m_selectFolder)
- m_selections.append(pathFolder(path).toLocalFile());
+ m_selections.append(pathFolder(path.toLocalFile()));
return true;