AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QFileDialog: use QUrl::toString(QUrl::PreferLocalFile)

Browse Source 
It'll handle both cases.

Change-Id: I6e2e037f19eff74a1e99b2a92dc2c9daf11fcd94
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Ahmad Samir 2022-10-14 20:50:19 +02:00
parent 7396f36e42
commit f2d7e31bae
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widgets/dialogs/qfiledialog.cpp
View File

@ -1271,12 +1271,9 @@ QStringList QFileDialog::selectedFiles() const
QStringList files;
const QList<QUrl> userSelectedFiles = d->userSelectedFiles();
files.reserve(userSelectedFiles.size());
for (const QUrl &file : userSelectedFiles) {
if (file.isLocalFile() || file.isEmpty())
files.append(file.toLocalFile());
else
files.append(file.toString());
}
for (const QUrl &file : userSelectedFiles)
files.append(file.toString(QUrl::PreferLocalFile));
if (files.isEmpty() && d->usingWidgets()) {
const FileMode fm = fileMode();
if (fm != ExistingFile && fm != ExistingFiles)
@ -2193,12 +2190,8 @@ QStringList QFileDialog::getOpenFileNames(QWidget *parent,
filter, selectedFilter, options, schemes);
QStringList fileNames;
fileNames.reserve(selectedUrls.size());
for (const QUrl &url : selectedUrls) {
if (url.isLocalFile() || url.isEmpty())
fileNames << url.toLocalFile();
else
fileNames << url.toString();
}
for (const QUrl &url : selectedUrls)
fileNames.append(url.toString(QUrl::PreferLocalFile));
return fileNames;
}