Use TDEProcIO class

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

amarok/HACKING

@@ -83,12 +83,12 @@ Comments are essential when adding a strange hack, like the following example:
  |   * happens to be called in the forked process
  |   * See bug #103750 for more information.
  |   */
- | class AmarokProcIO : public KProcIO 
+ | class AmarokProcIO : public TDEProcIO 
  | {
  |     public:
  |     virtual int commSetupDoneC() {
- |         const int i = KProcIO::commSetupDoneC();
- |         Amarok::closeOpenFiles(KProcIO::out[0],KProcIO::in[0],KProcIO::err[0]);
+ |         const int i = TDEProcIO::commSetupDoneC();
+ |         Amarok::closeOpenFiles(TDEProcIO::out[0],TDEProcIO::in[0],TDEProcIO::err[0]);
  |         return i;
  |     }
  | };

amarok/src/amarok.h

@@ -7,7 +7,7 @@
 #include <tqstring.h>
 
 #include <kurl.h> // recursiveUrlExpand
-#include <kprocio.h> //Amarok::ProcIO
+#include <tdeprocio.h> //Amarok::ProcIO
 #include <tdeio/netaccess.h>
 #include <tdeversion.h>
 
@@ -273,12 +273,12 @@ namespace Amarok
     * happens to be called in the forked process
     * See bug #103750 for more information.
     */
-    class LIBAMAROK_EXPORT ProcIO : public KProcIO {
+    class LIBAMAROK_EXPORT ProcIO : public TDEProcIO {
         public:
         ProcIO(); // ctor sets the textcodec to UTF-8, in scriptmanager.cpp
         virtual int commSetupDoneC() {
-            const int i = KProcIO::commSetupDoneC();
-            Amarok::closeOpenFiles( KProcIO::out[0],KProcIO::in[0],KProcIO::err[0] );
+            const int i = TDEProcIO::commSetupDoneC();
+            Amarok::closeOpenFiles( TDEProcIO::out[0],TDEProcIO::in[0],TDEProcIO::err[0] );
             return i;
         };
     };

amarok/src/lastfm.cpp

@@ -489,7 +489,7 @@ WebService::handshake( const TQString& username, const TQString& password )
         *m_server << AmarokConfig::soundSystem();
         *m_server << Amarok::proxyForUrl( m_streamUrl.toString() );
     
-        if( !m_server->start( KProcIO::NotifyOnExit, true ) ) {
+        if( !m_server->start( TDEProcIO::NotifyOnExit, true ) ) {
             error() << "Failed to start amarok_proxy.rb" << endl;
             return false;
         }
@@ -505,7 +505,7 @@ WebService::handshake( const TQString& username, const TQString& password )
         if (this->wasCanceled())
             return false;
     
-        connect( m_server, TQ_SIGNAL( readReady( KProcIO* ) ), this, TQ_SLOT( readProxy() ) );
+        connect( m_server, TQ_SIGNAL( readReady( TDEProcIO* ) ), this, TQ_SLOT( readProxy() ) );
         connect( m_server, TQ_SIGNAL( processExited( TDEProcess* ) ), Controller::instance(), TQ_SLOT( playbackStopped() ) );
     }
     else

amarok/src/lastfm.h

@@ -29,7 +29,7 @@
 
 class KLineEdit;
 class TDEAction;
-class KProcIO;
+class TDEProcIO;
 class KURL;
 class TQSocket;
 class TQTimer;
@@ -205,7 +205,7 @@ namespace LastFm
             TQUrl    m_streamUrl;    // last.fm webserver for direct connection (proxy connects to this)
             bool    m_subscriber;   // self explanatory
 
-            KProcIO* m_server;
+            TDEProcIO* m_server;
 
             TQString    m_proxyUrl;
             MetaBundle m_metaBundle;

amarok/src/mediadevice/daap/daapserver.cpp

@@ -27,18 +27,18 @@ DaapServer::DaapServer(TQObject* parent, char* name)
 {
     DEBUG_BLOCK
 
-    m_server = new KProcIO();
+    m_server = new TDEProcIO();
     m_server->setComm( TDEProcess::All );
     *m_server << "amarok_daapserver.rb";
     *m_server << locate( "data", "amarok/ruby_lib/" );
     *m_server << locate( "lib", "ruby_lib/" );
     *m_server << locate( "data", "amarok/scripts/ruby_debug/debug.rb" );
-    if( !m_server->start( KProcIO::NotifyOnExit, true ) ) {
+    if( !m_server->start( TDEProcIO::NotifyOnExit, true ) ) {
         error() << "Failed to start amarok_daapserver.rb" << endl;
         return;
     }
 
-    connect( m_server, TQ_SIGNAL( readReady( KProcIO* ) ), this, TQ_SLOT( readSql() ) );
+    connect( m_server, TQ_SIGNAL( readReady( TDEProcIO* ) ), this, TQ_SLOT( readSql() ) );
 }
 
 DaapServer::~DaapServer()

amarok/src/mediadevice/daap/daapserver.h

@@ -30,7 +30,7 @@ class DaapServer : public TQObject
     public slots:
         void readSql();
     private:
-        KProcIO* m_server;
+        TDEProcIO* m_server;
         #ifdef DNSSD_SUPPORT
             DNSSD::PublicService* m_service;
         #endif

amarok/src/mediadevice/daap/proxy.cpp

@@ -68,7 +68,7 @@ Proxy::Proxy(KURL stream, DaapClient* client, const char* name)
     *m_proxy << TQString::number( revisionId );
     *m_proxy << Amarok::proxyForUrl( realStream.url() );
 
-    if( !m_proxy->start( KProcIO::NotifyOnExit, true ) ) {
+    if( !m_proxy->start( TDEProcIO::NotifyOnExit, true ) ) {
         error() << "Failed to start amarok_proxy.rb" << endl;
         return;
     }
@@ -81,7 +81,7 @@ Proxy::Proxy(KURL stream, DaapClient* client, const char* name)
     }
     debug() << "started amarok_proxy.rb --daap " << TQString::number( port ) << ' ' << realStream.url() << ' ' << AmarokConfig::soundSystem() << ' ' << hash << ' ' << revisionId << endl;
     connect( m_proxy, TQ_SIGNAL( processExited( TDEProcess* ) ), this, TQ_SLOT( playbackStopped() ) );
-    connect( m_proxy, TQ_SIGNAL( readReady( KProcIO* ) ), this, TQ_SLOT( readProxy() ) );
+    connect( m_proxy, TQ_SIGNAL( readReady( TDEProcIO* ) ), this, TQ_SLOT( readProxy() ) );
 }
 
 Proxy::~Proxy()

amarok/src/scancontroller.cpp

@@ -78,7 +78,7 @@ ScanController::ScanController( CollectionDB* parent, bool incremental, const TQ
 
     connect( this, TQ_SIGNAL( scanDone( bool ) ), MountPointManager::instance(), TQ_SLOT( updateStatisticsURLs( bool ) ) );
 
-    connect( m_scanner, TQ_SIGNAL( readReady( KProcIO* ) ), TQ_SLOT( slotReadReady() ) );
+    connect( m_scanner, TQ_SIGNAL( readReady( TDEProcIO* ) ), TQ_SLOT( slotReadReady() ) );
 
     *m_scanner << "amarokcollectionscanner";
     *m_scanner << "--nocrashhandler"; // We want to be able to catch SIGSEGV
@@ -534,7 +534,7 @@ ScanController::customEvent( TQCustomEvent* e )
 
         delete m_scanner; // Reusing doesn't work, so we have to destroy and reinstantiate
         m_scanner = new Amarok::ProcIO();
-        connect( m_scanner, TQ_SIGNAL( readReady( KProcIO* ) ), TQ_SLOT( slotReadReady() ) );
+        connect( m_scanner, TQ_SIGNAL( readReady( TDEProcIO* ) ), TQ_SLOT( slotReadReady() ) );
 
         *m_scanner << "amarokcollectionscanner";
         *m_scanner << "--nocrashhandler"; // We want to be able to catch SIGSEGV

amarok/src/scancontroller.h

@@ -26,7 +26,7 @@
 #include "threadmanager.h" //baseclass
 
 class CollectionDB;
-class KProcIO;
+class TDEProcIO;
 
 /**
  * @class ScanController
@@ -112,7 +112,7 @@ class ScanController : public ThreadManager::DependentJob, public TQXmlDefaultHa
         static const uint MAX_RESTARTS = 80;
         static const uint MAX_FAILURE_PERCENTAGE = 5;
 
-        KProcIO* m_scanner;
+        TDEProcIO* m_scanner;
         TQStringList m_folders;
         TQStringList m_foldersToRemove;
         bool m_incremental;

amarok/src/scriptmanager.cpp

@@ -52,7 +52,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdepopupmenu.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
 #include <tdeprotocolmanager.h>
 #include <kpushbutton.h>
 #include <krun.h>
@@ -75,10 +75,10 @@ namespace Amarok {
     }
 
      /**
-    * This constructor is needed so that the correct codec is used. KProcIO defaults
+    * This constructor is needed so that the correct codec is used. TDEProcIO defaults
     * to latin1, while the scanner uses UTF-8.
     */
-    ProcIO::ProcIO() : KProcIO( TQTextCodec::codecForName( "UTF-8" ) ) {}
+    ProcIO::ProcIO() : TDEProcIO( TQTextCodec::codecForName( "UTF-8" ) ) {}
 
     TQString
     proxyForUrl(const TQString& url)
@@ -844,7 +844,7 @@ ScriptManager::ensureScoreScriptRunning()
 
 
 void
-ScriptManager::terminateProcess( KProcIO** proc )
+ScriptManager::terminateProcess( TDEProcIO** proc )
 {
     if( *proc ) {
         (*proc)->kill(); // Sends SIGTERM
@@ -860,7 +860,7 @@ void
 ScriptManager::notifyScripts( const TQString& message )
 {
     foreachType( ScriptMap, m_scripts ) {
-        KProcIO* const proc = it.data().process;
+        TDEProcIO* const proc = it.data().process;
         if( proc ) proc->writeStdin( message );
     }
 }

amarok/src/scriptmanager.h

@@ -34,7 +34,7 @@ class ScriptManagerBase;
 class TQListViewItem;
 class KArchiveDirectory;
 class TDEProcess;
-class KProcIO;
+class TDEProcIO;
 
 
 /**
@@ -152,8 +152,8 @@ class ScriptManager : public KDialogBase, public EngineObserver
 
         TQString ensureScoreScriptRunning();
 
-        /** Terminates a process with SIGTERM and deletes the KProcIO object */
-        void terminateProcess( KProcIO** proc );
+        /** Terminates a process with SIGTERM and deletes the TDEProcIO object */
+        void terminateProcess( TDEProcIO** proc );
 
         /** Sends a string message to all running scripts */
         void notifyScripts( const TQString& message );
@@ -185,7 +185,7 @@ class ScriptManager : public KDialogBase, public EngineObserver
         struct ScriptItem {
             KURL           url;
             TQString        type;
-            KProcIO*       process;
+            TDEProcIO*       process;
             TQListViewItem* li;
             TQString        log;
             ScriptItem() : process( 0 ), li( 0 ) {}