[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kio] src/widgets: Port from deprecated KRun::run(KService) to KRun::runService(...)
From:       David Faure <faure () kde ! org>
Date:       2014-12-31 23:25:14
Message-ID: E1Y6Sde-0007xE-P2 () scm ! kde ! org
[Download RAW message or body]

Git commit b193a7e0e03bb2e13e74f49277261603ca30f365 by David Faure.
Committed on 30/12/2014 at 08:47.
Pushed by dfaure into branch 'master'.

Port from deprecated KRun::run(KService) to KRun::runService(...)

Change-Id: Ia36476a4ac34d3fd16deba996595976ca071c79e

M  +1    -1    src/widgets/dropjob.cpp
M  +1    -1    src/widgets/kdesktopfileactions.cpp
M  +2    -2    src/widgets/kfileitemactions.cpp
M  +5    -5    src/widgets/krun.cpp

http://commits.kde.org/kio/b193a7e0e03bb2e13e74f49277261603ca30f365

diff --git a/src/widgets/dropjob.cpp b/src/widgets/dropjob.cpp
index 44ecf52..63beb0a 100644
--- a/src/widgets/dropjob.cpp
+++ b/src/widgets/dropjob.cpp
@@ -395,7 +395,7 @@ void DropJobPrivate::handleDropToDesktopFile()
     if (desktopFile.hasApplicationType()) {
         // Drop to application -> start app with urls as argument
         KService service(destFile);
-        if (!KRun::run(service, m_urls, KJobWidgets::window(q))) {
+        if (!KRun::runService(service, m_urls, KJobWidgets::window(q))) {
             q->setError(KIO::ERR_CANNOT_LAUNCH_PROCESS);
             q->setErrorText(destFile);
         }
diff --git a/src/widgets/kdesktopfileactions.cpp b/src/widgets/kdesktopfileactions.cpp
index 98ced79..2f02c2f 100644
--- a/src/widgets/kdesktopfileactions.cpp
+++ b/src/widgets/kdesktopfileactions.cpp
@@ -145,7 +145,7 @@ static bool runApplication(const QUrl &_url, const QString &_serviceFile, const
     }
 
     QList<QUrl> lst;
-    return KRun::run(s, lst, 0 /*TODO - window*/, false, QString(), asn);
+    return KRun::runService(s, lst, 0 /*TODO - window*/, false, QString(), asn);
 }
 
 static bool runLink(const QUrl &_url, const KDesktopFile &cfg, const QByteArray &asn)
diff --git a/src/widgets/kfileitemactions.cpp b/src/widgets/kfileitemactions.cpp
index 8384cb4..d9dfa8c 100644
--- a/src/widgets/kfileitemactions.cpp
+++ b/src/widgets/kfileitemactions.cpp
@@ -619,7 +619,7 @@ void KFileItemActionsPrivate::slotRunPreferredApplications()
             KRun::displayOpenWithDialog(serviceItems.urlList(), m_parentWidget);
             continue;
         }
-        KRun::run(*servicePtr, serviceItems.urlList(), m_parentWidget);
+        KRun::runService(*servicePtr, serviceItems.urlList(), m_parentWidget);
     }
 }
 
@@ -650,7 +650,7 @@ void KFileItemActionsPrivate::slotRunApplication(QAction *act)
     KService::Ptr app = act->data().value<KService::Ptr>();
     Q_ASSERT(app);
     if (app) {
-        KRun::run(*app, m_props.urlList(), m_parentWidget);
+        KRun::runService(*app, m_props.urlList(), m_parentWidget);
     }
 }
 
diff --git a/src/widgets/krun.cpp b/src/widgets/krun.cpp
index b9ad4e0..8b21c78 100644
--- a/src/widgets/krun.cpp
+++ b/src/widgets/krun.cpp
@@ -228,7 +228,7 @@ bool KRun::runUrl(const QUrl &u, const QString &_mimetype, QWidget *window, bool
 #endif
     }
 
-    return KRun::run(*offer, lst, window, tempFile, suggestedFileName, asn);
+    return KRun::runService(*offer, lst, window, tempFile, suggestedFileName, asn);
 }
 
 bool KRun::displayOpenWithDialog(const QList<QUrl> &lst, QWidget *window, bool tempFiles,
@@ -255,7 +255,7 @@ bool KRun::displayOpenWithDialog(const QList<QUrl> &lst, QWidget *window, bool t
             //qDebug() << "No service set, running " << l.text();
             service = KService::Ptr(new KService(QString() /*name*/, l.text(), QString() /*icon*/));
         }
-        return KRun::run(*service, lst, window, tempFiles, suggestedFileName, asn);
+        return KRun::runService(*service, lst, window, tempFiles, suggestedFileName, asn);
     }
     return false;
 }
@@ -782,7 +782,7 @@ bool KRun::run(const QString &_exec, const QList<QUrl> &_urls, QWidget *window,
 {
     KService::Ptr service(new KService(_name, _exec, _icon));
 
-    return run(*service, _urls, window, false, QString(), asn);
+    return runService(*service, _urls, window, false, QString(), asn);
 }
 
 bool KRun::runCommand(const QString &cmd, QWidget *window, const QString &workingDirectory)
@@ -985,7 +985,7 @@ bool KRun::KRunPrivate::runExecutable(const QString &_exec)
         }
     } else {
         KService::Ptr service = KService::serviceByStorageId(_exec);
-        if (service && q->run(*service, urls, m_window, false, QString(), m_asn)) {
+        if (service && q->runService(*service, urls, m_window, false, QString(), m_asn)) {
             m_bFinished = true;
             startTimer();
             return true;
@@ -1250,7 +1250,7 @@ void KRun::foundMimeType(const QString &type)
         if (serv && serv->hasMimeType(type)) {
             QList<QUrl> lst;
             lst.append(d->m_strURL);
-            if (KRun::run(*serv, lst, d->m_window, false, QString(), d->m_asn)) {
+            if (KRun::runService(*serv, lst, d->m_window, false, QString(), d->m_asn)) {
                 setFinished(true);
                 return;
             }
[prev in list] [next in list] [prev in thread] [next in thread]