diff --git a/ark/app/batchextract.cpp b/ark/app/batchextract.cpp index a5054c9d..60d63a55 100644 --- a/ark/app/batchextract.cpp +++ b/ark/app/batchextract.cpp @@ -278,7 +278,7 @@ bool BatchExtract::showExtractDialog() } setAutoSubfolder(dialog.data()->autoSubfolders()); - setDestinationFolder(dialog.data()->destinationDirectory().pathOrUrl()); + setDestinationFolder(dialog.data()->destinationDirectory()); setOpenDestinationAfterExtraction(dialog.data()->openDestinationAfterExtraction()); setPreservePaths(dialog.data()->preservePaths()); diff --git a/ark/kerfuffle/extractiondialog.cpp b/ark/kerfuffle/extractiondialog.cpp index a015ed4c..19855e27 100644 --- a/ark/kerfuffle/extractiondialog.cpp +++ b/ark/kerfuffle/extractiondialog.cpp @@ -216,11 +216,11 @@ bool ExtractionDialog::closeAfterExtraction() const return m_ui->closeAfterExtraction->isChecked(); } -KUrl ExtractionDialog::destinationDirectory() const +QString ExtractionDialog::destinationDirectory() const { const KUrl selected = selectedUrl(); if (extractToSubfolder()) { - return QString(selected.pathOrUrl(KUrl::AddTrailingSlash) + subfolder() + QLatin1Char( '/' )); + return selected.pathOrUrl(KUrl::AddTrailingSlash) + subfolder() + QLatin1Char( '/' ); } return selected.pathOrUrl(KUrl::AddTrailingSlash); } diff --git a/ark/kerfuffle/extractiondialog.h b/ark/kerfuffle/extractiondialog.h index bec57774..389b2b9b 100644 --- a/ark/kerfuffle/extractiondialog.h +++ b/ark/kerfuffle/extractiondialog.h @@ -58,7 +58,7 @@ public: bool extractToSubfolder() const; bool autoSubfolders() const; bool preservePaths() const; - KUrl destinationDirectory() const; + QString destinationDirectory() const; QString subfolder() const; virtual void accept(); diff --git a/ark/part/part.cpp b/ark/part/part.cpp index fa35f7bf..f1be2c3b 100644 --- a/ark/part/part.cpp +++ b/ark/part/part.cpp @@ -693,7 +693,7 @@ void Part::slotExtractFiles() 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); registerJob(job);