OSDN Git Service

bluedevil: replacce KProcess with QProcess [ci reset]
authorIvailo Monev <xakepa10@gmail.com>
Fri, 12 Nov 2021 18:10:08 +0000 (20:10 +0200)
committerIvailo Monev <xakepa10@gmail.com>
Fri, 12 Nov 2021 18:10:08 +0000 (20:10 +0200)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
bluedevil/src/fileitemactionplugin/sendfileitemaction.cpp
bluedevil/src/kcmodule/bluedevildevices.cpp
bluedevil/src/wizard/bluewizard.cpp

index b232a3f..7c1b78b 100644 (file)
 #include <QMenu>
 #include <QAction>
 #include <QWidget>
-#include <QtCore/qvariant.h>
+#include <QVariant>
+#include <QProcess>
 
 #include <KIcon>
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <KDebug>
-#include <KProcess>
 #include <KLocalizedString>
 
 K_PLUGIN_FACTORY(SendFileItemActionFactory, registerPlugin<SendFileItemAction>();)
@@ -100,22 +100,19 @@ void SendFileItemAction::deviceTriggered()
         args.append("-f" + url.path());
     }
     kDebug() << args;
-    KProcess process;
-    process.setProgram("bluedevil-sendfile", args);
-    process.startDetached();
+
+    QProcess::startDetached("bluedevil-sendfile", args);
 }
 
 void SendFileItemAction::otherTriggered()
 {
-    kDebug();
     QStringList args;
 
     KUrl::List fileList =  m_fileItemInfos.urlList();
     Q_FOREACH(const KUrl &url,  fileList) {
         args.append("-f" + url.path());
     }
+    kDebug() << args;
 
-    KProcess process;
-    process.setProgram("bluedevil-sendfile", args);
-    process.startDetached();
+    QProcess::startDetached("bluedevil-sendfile", args);
 }
index 776b3f2..befd8c2 100644 (file)
@@ -28,6 +28,7 @@
 
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QTimer>
+#include <QtCore/QProcess>
 #include <QtGui/QFontMetrics>
 #include <QtGui/QLabel>
 #include <QtGui/QPainter>
@@ -39,7 +40,6 @@
 
 #include <kicon.h>
 #include <kdialog.h>
-#include <kprocess.h>
 #include <klineedit.h>
 #include <kaboutdata.h>
 #include <kmessagebox.h>
@@ -538,9 +538,7 @@ void KCMBlueDevilDevices::disconnectDevice()
 
 void KCMBlueDevilDevices::launchWizard()
 {
-    KProcess wizard;
-    wizard.setProgram("bluedevil-wizard");
-    wizard.startDetached();
+    QProcess::startDetached("bluedevil-wizard");
 }
 
 void KCMBlueDevilDevices::usableAdapterChanged(Adapter *adapter)
index 063440e..805aefb 100644 (file)
 #include <QApplication>
 #include <QDBusConnection>
 #include <QWizard>
-#include <QString>
+#include <QProcess>
 
 #include <bluedevil/bluedevil.h>
 #include <KPushButton>
-#include <kdebug.h>
-#include <KProcess>
+#include <KDebug>
 #include <KLocale>
 
 BlueWizard::BlueWizard(const KUrl &url) : QWizard(), m_device(0), m_manualPin(false)
@@ -117,9 +116,7 @@ QByteArray BlueWizard::deviceAddress() const
 
 void BlueWizard::restartWizard()
 {
-    KProcess proc;
-    proc.setProgram("bluedevil-wizard");
-    proc.startDetached();
+    QProcess::startDetached("bluedevil-wizard");
 
     qApp->quit();
 }