Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 18:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ark: use proper type for the return value of Kerfuffle::ExtractionDialog::destinationDirectory()

Browse source 
otherwise there are QString to KUrl to QString conversions

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-18 03:07:30 +03:00
parent 9b438b75d9
commit ddcd646ea0
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ark/app/batchextract.cpp
View file

@ -278,7 +278,7 @@ bool BatchExtract::showExtractDialog()
} }
setAutoSubfolder(dialog.data()->autoSubfolders()); setAutoSubfolder(dialog.data()->autoSubfolders());
setDestinationFolder(dialog.data()->destinationDirectory().pathOrUrl()); setDestinationFolder(dialog.data()->destinationDirectory());
setOpenDestinationAfterExtraction(dialog.data()->openDestinationAfterExtraction()); setOpenDestinationAfterExtraction(dialog.data()->openDestinationAfterExtraction());
setPreservePaths(dialog.data()->preservePaths()); setPreservePaths(dialog.data()->preservePaths());

4
ark/kerfuffle/extractiondialog.cpp
View file

@ -216,11 +216,11 @@ bool ExtractionDialog::closeAfterExtraction() const
return m_ui->closeAfterExtraction->isChecked(); return m_ui->closeAfterExtraction->isChecked();
} }
KUrl ExtractionDialog::destinationDirectory() const QString ExtractionDialog::destinationDirectory() const
{ {
const KUrl selected = selectedUrl(); const KUrl selected = selectedUrl();
if (extractToSubfolder()) { if (extractToSubfolder()) {
return QString(selected.pathOrUrl(KUrl::AddTrailingSlash) + subfolder() + QLatin1Char( '/' )); return selected.pathOrUrl(KUrl::AddTrailingSlash) + subfolder() + QLatin1Char( '/' );
} }
return selected.pathOrUrl(KUrl::AddTrailingSlash); return selected.pathOrUrl(KUrl::AddTrailingSlash);
} }

2
ark/kerfuffle/extractiondialog.h
View file

@ -58,7 +58,7 @@ public:
bool extractToSubfolder() const; bool extractToSubfolder() const;
bool autoSubfolders() const; bool autoSubfolders() const;
bool preservePaths() const; bool preservePaths() const;
KUrl destinationDirectory() const; QString destinationDirectory() const;
QString subfolder() const; QString subfolder() const;
virtual void accept(); virtual void accept();

2
ark/part/part.cpp
View file

@ -693,7 +693,7 @@ void Part::slotExtractFiles()
options[QLatin1String("FollowExtractionDialogSettings")] = true; options[QLatin1String("FollowExtractionDialogSettings")] = true;
const QString destinationDirectory = dialog.data()->destinationDirectory().pathOrUrl(); const QString destinationDirectory = dialog.data()->destinationDirectory();
ExtractJob *job = m_model->extractFiles(files, destinationDirectory, options); ExtractJob *job = m_model->extractFiles(files, destinationDirectory, options);
registerJob(job); registerJob(job);