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

List:       kde-commits
Subject:    [kdelibs/frameworks] kio/misc/kpac: Port KPAC::Discovery from KProcess to QProcess
From:       Matt Williams <matt () milliams ! com>
Date:       2012-02-19 13:15:57
Message-ID: 20120219131557.D2E67A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 60c69688eeaca7af8655acb3a4d920a459a14dab by Matt Williams.
Committed on 19/02/2012 at 14:16.
Pushed by milliams into branch 'frameworks'.

Port KPAC::Discovery from KProcess to QProcess

M  +3    -4    kio/misc/kpac/discovery.cpp
M  +2    -2    kio/misc/kpac/discovery.h

http://commits.kde.org/kdelibs/60c69688eeaca7af8655acb3a4d920a459a14dab

diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp
index 4721772..36f858c 100644
--- a/kio/misc/kpac/discovery.cpp
+++ b/kio/misc/kpac/discovery.cpp
@@ -46,24 +46,23 @@
 #include <sys/utsname.h>
 =

 #include <QtCore/QTimer>
+#include <QtCore/QProcess>
 #include <QtNetwork/QHostInfo>
 =

 #include <klocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
-#include <kprocess.h>
 #include "moc_discovery.cpp"
 =

 namespace KPAC
 {
     Discovery::Discovery( QObject* parent )
         : Downloader( parent ),
-          m_helper( new KProcess(this) )
+          m_helper( new QProcess(this) )
     {
         connect( m_helper, SIGNAL(readyReadStandardOutput()), SLOT(helperO=
utput()) );
         connect( m_helper, SIGNAL(finished(int,QProcess::ExitStatus)), SLO=
T(failed()) );
-        *m_helper << KStandardDirs::findExe("kpac_dhcp_helper");
-        m_helper->start();
+        m_helper->start(KStandardDirs::findExe("kpac_dhcp_helper"));
         if ( !m_helper->waitForStarted() )
             QTimer::singleShot( 0, this, SLOT(failed()) );
     }
diff --git a/kio/misc/kpac/discovery.h b/kio/misc/kpac/discovery.h
index 85b438a..208c1ba 100644
--- a/kio/misc/kpac/discovery.h
+++ b/kio/misc/kpac/discovery.h
@@ -23,7 +23,7 @@
 =

 #include "downloader.h"
 =

-class KProcess;
+class QProcess;
 =

 namespace KPAC
 {
@@ -43,7 +43,7 @@ namespace KPAC
         bool initDomainName();
         bool checkDomain() const;
 =

-        KProcess* m_helper;
+        QProcess* m_helper;
         QString m_domainName;
     };
 }

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