Commit 717f10ae authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch 'deprecated_krun' into 'master'

Get rid of deprecated binaryName

See merge request kde/kdenlive!64
parents 1176cdec 3c6ea701
Pipeline #9694 passed with stage
in 24 minutes and 37 seconds
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
#include "kdenlive_debug.h" #include "kdenlive_debug.h"
#include "klocalizedstring.h" #include "klocalizedstring.h"
#include <KIO/DesktopExecParser>
#include <KLineEdit> #include <KLineEdit>
#include <KMessageBox> #include <KMessageBox>
#include <KOpenWithDialog> #include <KOpenWithDialog>
#include <KRun>
#include <KService> #include <KService>
#include <QAction> #include <QAction>
#include <QDir> #include <QDir>
...@@ -725,7 +725,7 @@ void KdenliveSettingsDialog::slotEditAudioApplication() ...@@ -725,7 +725,7 @@ void KdenliveSettingsDialog::slotEditAudioApplication()
QPointer<KOpenWithDialog> dlg = new KOpenWithDialog(QList<QUrl>(), i18n("Select default audio editor"), m_configEnv.kcfg_defaultaudioapp->text(), this); QPointer<KOpenWithDialog> dlg = new KOpenWithDialog(QList<QUrl>(), i18n("Select default audio editor"), m_configEnv.kcfg_defaultaudioapp->text(), this);
if (dlg->exec() == QDialog::Accepted) { if (dlg->exec() == QDialog::Accepted) {
service = dlg->service(); service = dlg->service();
m_configEnv.kcfg_defaultaudioapp->setText(KRun::binaryName(service->exec(), false)); m_configEnv.kcfg_defaultaudioapp->setText(KIO::DesktopExecParser::executablePath(service->exec()));
} }
delete dlg; delete dlg;
...@@ -736,7 +736,7 @@ void KdenliveSettingsDialog::slotEditImageApplication() ...@@ -736,7 +736,7 @@ void KdenliveSettingsDialog::slotEditImageApplication()
QPointer<KOpenWithDialog> dlg = new KOpenWithDialog(QList<QUrl>(), i18n("Select default image editor"), m_configEnv.kcfg_defaultimageapp->text(), this); QPointer<KOpenWithDialog> dlg = new KOpenWithDialog(QList<QUrl>(), i18n("Select default image editor"), m_configEnv.kcfg_defaultimageapp->text(), this);
if (dlg->exec() == QDialog::Accepted) { if (dlg->exec() == QDialog::Accepted) {
KService::Ptr service = dlg->service(); KService::Ptr service = dlg->service();
m_configEnv.kcfg_defaultimageapp->setText(KRun::binaryName(service->exec(), false)); m_configEnv.kcfg_defaultimageapp->setText(KIO::DesktopExecParser::executablePath(service->exec()));
} }
delete dlg; delete dlg;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment