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

List:       kde-commits
Subject:    [kdelibs/frameworks] kdeui/dialogs: port KEditToolbar to QProcess
From:       Martin T. H. Sandsmark <martin.sandsmark () kde ! org>
Date:       2013-03-17 15:44:57
Message-ID: 20130317154457.B0811A604F () git ! kde ! org
[Download RAW message or body]

Git commit 4748ddebf1129d53ec6690a144e4f7adb75df257 by Martin T. H. Sandsmark.
Committed on 17/03/2013 at 16:44.
Pushed by sandsmark into branch 'frameworks'.

port KEditToolbar to QProcess

M  +13   -14   kdeui/dialogs/kedittoolbar.cpp

http://commits.kde.org/kdelibs/4748ddebf1129d53ec6690a144e4f7adb75df257

diff --git a/kdeui/dialogs/kedittoolbar.cpp b/kdeui/dialogs/kedittoolbar.cpp
index 401a292..b03d2cb 100644
--- a/kdeui/dialogs/kedittoolbar.cpp
+++ b/kdeui/dialogs/kedittoolbar.cpp
@@ -25,6 +25,7 @@
 #include <QAction>
 #include <QDialogButtonBox>
 #include <QtXml/QDomDocument>
+#include <QtCore/QProcess>
 #include <QLayout>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
@@ -45,7 +46,6 @@
 #include <kseparator.h>
 #include <kconfig.h>
 #include <kdebug.h>
-#include <kprocess.h>
 #include <ktoolbar.h>
 #include <kdeversion.h>
 #include <kcombobox.h>
@@ -484,7 +484,7 @@ public:
     QLabel * m_helpArea;
     QPushButton* m_changeIcon;
     QPushButton* m_changeIconText;
-    KProcess* m_kdialogProcess;
+    QProcess* m_kdialogProcess;
     bool m_isPart : 1;
     bool m_hasKDialog : 1;
     bool m_loadedOnce : 1;
@@ -1546,19 +1546,18 @@ void KEditToolBarWidgetPrivate::slotChangeIcon()
   m_currentXmlData->dump();
   Q_ASSERT( m_currentXmlData->type() != XmlData::Merged );
 
-  m_kdialogProcess = new KProcess;
+  m_kdialogProcess = new QProcess;
   QString kdialogExe = QStandardPaths::findExecutable(QLatin1String("kdialog"));
-  (*m_kdialogProcess) << kdialogExe;
-  (*m_kdialogProcess) << "--caption";
-  (*m_kdialogProcess) << i18n( "Change Icon" );
-  (*m_kdialogProcess) << "--embed";
-  (*m_kdialogProcess) << QString::number( (quintptr)m_widget->window()->winId() );
-  (*m_kdialogProcess) << "--geticon";
-  (*m_kdialogProcess) << "Toolbar";
-  (*m_kdialogProcess) << "Actions";
-  m_kdialogProcess->setOutputChannelMode(KProcess::OnlyStdoutChannel);
-  m_kdialogProcess->setNextOpenMode( QIODevice::ReadOnly | QIODevice::Text );
-  m_kdialogProcess->start();
+  QStringList arguments;
+  arguments << "--caption"
+            << i18n( "Change Icon" )
+            << "--embed"
+            << QString::number( (quintptr)m_widget->window()->winId() )
+            << "--geticon"
+            << "Toolbar"
+            << "Actions";
+  m_kdialogProcess->setReadChannel(QProcess::StandardOutput);
+  m_kdialogProcess->start(kdialogExe, arguments, QIODevice::ReadOnly | QIODevice::Text);
   if ( !m_kdialogProcess->waitForStarted() ) {
     kError(240) << "Can't run " << kdialogExe << endl;
     delete m_kdialogProcess;
[prev in list] [next in list] [prev in thread] [next in thread]