Rename class KProcIO to TDEProcIOHEADmaster

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

12 files changed, 56 insertions, 57 deletions

diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index f56a92aca..021d650ae 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -64,7 +64,7 @@ install( FILES
     krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h
     kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h
     kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h
-    kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h
+    kextendedsocket.h ksockaddr.h tdeprocio.h kasyncio.h kbufferedio.h
     kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h
     tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h
     klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc
@@ -121,7 +121,7 @@ set( ${target}_SRCS
   krandomsequence.cpp kstringhandler.cpp kcompletion.cpp
   tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
   kaudioplayer.cpp kdcoppropertyproxy.cpp ksockaddr.cpp
-  kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp
+  kextsock.cpp netsupp.cpp tdeprocio.cpp kbufferedio.cpp
   kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp
   fakes.c vsnprintf.c tdesycoca.cpp tdesycocadict.cpp tdesycoca.skel
   tdesycocafactory.cpp kxmessages.cpp tdestartupinfo.cpp
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index 1bc8f7a8c..3b4bae7cf 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -50,7 +50,7 @@ kpalette.cpp		Waldo Bastian <bastian@kde.org>
 kpixmapprovider.cpp	Carsten Pfeiffer <pfeiffer@kde.org>
 tdeprocctrl.cpp		Waldo Bastian <bastian@kde.org>
 tdeprocess.cpp		Waldo Bastian <bastian@kde.org>
-kprocio.cpp		Waldo Bastian <bastian@kde.org>
+tdeprocio.cpp		Waldo Bastian <bastian@kde.org>
 krandomsequence.cpp	Waldo Bastian <bastian@kde.org>
 kregexp.cpp
 krfcdate.cpp		Waldo Bastian <bastian@kde.org>
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index d30506507..35aa6f6f3 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -51,7 +51,7 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	krandomsequence.h knotifyclient.h kiconeffect.h \
 	kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \
 	netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
-	kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \
+	kextsock.h kextendedsocket.h ksockaddr.h tdeprocio.h kasyncio.h \
 	kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \
 	tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h \
 	klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc \
@@ -105,7 +105,7 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
 	ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
 	tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
 	kaudioplayer.cpp kdcoppropertyproxy.cpp \
-	ksockaddr.cpp kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp \
+	ksockaddr.cpp kextsock.cpp netsupp.cpp tdeprocio.cpp kbufferedio.cpp \
 	kpixmapprovider.cpp kurldrag.cpp \
 	kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c \
 	tdesycoca.cpp tdesycocadict.cpp tdesycocafactory.cpp tdesycoca.skel \
diff --git a/tdecore/README.exec b/tdecore/README.exec
index d47c808e9..6ddf1aef4 100644
--- a/tdecore/README.exec
+++ b/tdecore/README.exec
@@ -16,9 +16,9 @@ child of your process, e.g. because you want to catch stdout/stderr or need
 to send it data via stdin. You should never use this to start other KDE 
 applications unless your application is called kgdb :-) If you need to
 send/receive text like data to/from the process, you are probably better 
-off with KProcIO
+off with TDEProcIO
 
-3. KProcIO
+3. TDEProcIO
 
 Like TDEProcess. Unlike TDEProcess, this class actually makes it easy to 
 send data to and receive data from the process.
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index 24c87f524..e71455362 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -18,7 +18,7 @@
 171          tdecore (KSocks)
 172          tdecore (TDEStartupInfo)
 173          tdecore (TDELocale)
-174          tdecore (KProcIO)
+174          tdecore (TDEProcIO)
 175          tdecore (TDEProcess)
 176          tdecore (KWin)
 177          tdecore (TDEConfigSkeleton)
diff --git a/tdecore/tdeprocess.h b/tdecore/tdeprocess.h
index 658571ce7..a6329f147 100644
--- a/tdecore/tdeprocess.h
+++ b/tdecore/tdeprocess.h
@@ -47,7 +47,7 @@ class KPty;
  * This class allows a KDE application to start child processes without having
  * to worry about UN*X signal handling issues and zombie process reaping.
  *
- * @see KProcIO
+ * @see TDEProcIO
  *
  * Basically, this class distinguishes three different ways of running
  * child processes:
diff --git a/tdecore/kprocio.cpp b/tdecore/tdeprocio.cpp
index aac14a09e..e614148c5 100644
--- a/tdecore/kprocio.cpp
+++ b/tdecore/tdeprocio.cpp
@@ -24,19 +24,19 @@
 
 #include <stdio.h>
 
-#include "kprocio.h"
+#include "tdeprocio.h"
 
 #include <kdebug.h>
 #include <tqtextcodec.h>
 
-class KProcIOPrivate {
+class TDEProcIOPrivate {
 public:
-  KProcIOPrivate() : comm(TDEProcess::All) {}
+  TDEProcIOPrivate() : comm(TDEProcess::All) {}
   TDEProcess::Communication comm;
 };
 
-KProcIO::KProcIO ( TQTextCodec *_codec)
-  : codec(_codec), d(new KProcIOPrivate)
+TDEProcIO::TDEProcIO ( TQTextCodec *_codec)
+  : codec(_codec), d(new TDEProcIOPrivate)
 {
   rbi=0;
   readsignalon=writeready=true;
@@ -52,13 +52,13 @@ KProcIO::KProcIO ( TQTextCodec *_codec)
   }
 }
 
-KProcIO::~KProcIO()
+TDEProcIO::~TDEProcIO()
 {
   delete d;
 }
 
 void
-KProcIO::resetAll ()
+TDEProcIO::resetAll ()
 {
   if (isRunning())
      kill();
@@ -80,12 +80,12 @@ KProcIO::resetAll ()
 
 }
 
-void KProcIO::setComm (Communication comm)
+void TDEProcIO::setComm (Communication comm)
 {
   d->comm = comm;
 }
 
-bool KProcIO::start (RunMode runmode, bool includeStderr)
+bool TDEProcIO::start (RunMode runmode, bool includeStderr)
 {
   connect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
 	   this, TQ_SLOT (received (TDEProcess *, char *, int)));
@@ -102,12 +102,12 @@ bool KProcIO::start (RunMode runmode, bool includeStderr)
   return TDEProcess::start (runmode, d->comm);
 }
 
-bool KProcIO::writeStdin (const TQString &line, bool appendnewline)
+bool TDEProcIO::writeStdin (const TQString &line, bool appendnewline)
 {
   return writeStdin(TQCString(codec->fromUnicode(line)), appendnewline);
 }
 
-bool KProcIO::writeStdin (const TQCString &line, bool appendnewline)
+bool TDEProcIO::writeStdin (const TQCString &line, bool appendnewline)
 {
   TQCString *qs = new TQCString(line);
   
@@ -136,7 +136,7 @@ bool KProcIO::writeStdin (const TQCString &line, bool appendnewline)
   return true;
 }
 
-bool KProcIO::writeStdin(const TQByteArray &data)
+bool TDEProcIO::writeStdin(const TQByteArray &data)
 {
   if (!data.size())
      return true;
@@ -151,7 +151,7 @@ bool KProcIO::writeStdin(const TQByteArray &data)
   return true;
 }
 
-void KProcIO::closeWhenDone()
+void TDEProcIO::closeWhenDone()
 {
   if (writeready)
   {
@@ -163,7 +163,7 @@ void KProcIO::closeWhenDone()
   return;
 }
 
-void KProcIO::sent(TDEProcess *)
+void TDEProcIO::sent(TDEProcess *)
 {
   outbuffer.removeFirst();
 
@@ -186,21 +186,21 @@ void KProcIO::sent(TDEProcess *)
 
 }
 
-void KProcIO::received (TDEProcess *, char *buffer, int buflen)
+void TDEProcIO::received (TDEProcess *, char *buffer, int buflen)
 {
   recvbuffer += TQCString(buffer, buflen+1);
 
   controlledEmission();
 }
 
-void KProcIO::ackRead ()
+void TDEProcIO::ackRead ()
 {
   readsignalon=true;
   if (needreadsignal || recvbuffer.length()!=0)
      controlledEmission();
 }
 
-void KProcIO::controlledEmission ()
+void TDEProcIO::controlledEmission ()
 {
   if (readsignalon)
   {
@@ -214,7 +214,7 @@ void KProcIO::controlledEmission ()
   }
 }
 
-void KProcIO::enableReadSignals (bool enable)
+void TDEProcIO::enableReadSignals (bool enable)
 {
   readsignalon=enable;
 
@@ -222,7 +222,7 @@ void KProcIO::enableReadSignals (bool enable)
      emit readReady (this);
 }
 
-int KProcIO::readln (TQString &line, bool autoAck, bool *partial)
+int TDEProcIO::readln (TQString &line, bool autoAck, bool *partial)
 {
   int len;
 
@@ -269,8 +269,8 @@ int KProcIO::readln (TQString &line, bool autoAck, bool *partial)
 
 }
 
-void KProcIO::virtual_hook( int id, void* data )
+void TDEProcIO::virtual_hook( int id, void* data )
 { TDEProcess::virtual_hook( id, data ); }
 
-#include "kprocio.moc"
+#include "tdeprocio.moc"
 
diff --git a/tdecore/kprocio.h b/tdecore/tdeprocio.h
index 02a3257d5..d7394b8b1 100644
--- a/tdecore/kprocio.h
+++ b/tdecore/tdeprocio.h
@@ -1,4 +1,4 @@
-/* This file is part of the KDE libraries
+/* This file is part of the TDE libraries
    Copyright (C) 1997 David Sweet <dsweet@kde.org>
 
    This library is free software; you can redistribute it and/or
@@ -15,29 +15,29 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef KPROCIO_H_
-#define KPROCIO_H_
+#ifndef TDEPROCIO_H_
+#define TDEPROCIO_H_
 
 #include <tqstring.h>
 #include <tdeprocess.h>
 #include <tqstrlist.h>
 #include "tdelibs_export.h"
 
-class KProcIOPrivate;
+class TDEProcIOPrivate;
 class TQTextCodec;
 
 /**
- * KProcIO
+ * TDEProcIO
  *
  * This class provides a slightly simpler interface to the communication
  *  functions provided by TDEProcess.  The simplifications are:
- *    @li The buffer for a write is copied to an internal KProcIO
+ *    @li The buffer for a write is copied to an internal TDEProcIO
  *        buffer and maintained/freed appropriately.  There is no need
  *        to be concerned with wroteStdin() signals _at_all_.
  *    @li readln() reads a line of data and buffers any leftovers.
  *    @li Conversion from/to unicode.
  *
- * Basically, KProcIO gives you buffered I/O similar to fgets()/fputs().
+ * Basically, TDEProcIO gives you buffered I/O similar to fgets()/fputs().
  *
  * Aside from these, and the fact that start() takes different
  * parameters, use this class just like TDEProcess.
@@ -47,7 +47,7 @@ class TQTextCodec;
  **/
 
 
-class TDECORE_EXPORT KProcIO : public TDEProcess
+class TDECORE_EXPORT TDEProcIO : public TDEProcess
 {
   TQ_OBJECT
 
@@ -55,12 +55,12 @@ public:
   /**
    * Constructor
    */
-  KProcIO ( TQTextCodec *codec = 0 );
+  TDEProcIO ( TQTextCodec *codec = 0 );
 
   /**
    * Destructor
    */
-  ~KProcIO();
+  ~TDEProcIO();
 
   /**
    * Sets the communication mode to be passed to TDEProcess::start()
@@ -135,7 +135,7 @@ public:
    * You may use it multiple times if more than one line of data is
    *  available.
    * Be sure to use ackRead() when you have finished processing the
-   *  readReady() signal.  This informs KProcIO that you are ready for
+   *  readReady() signal.  This informs TDEProcIO that you are ready for
    *  another readReady() signal.
    *
    * readln() never blocks.
@@ -192,7 +192,7 @@ signals:
    * @param pio the process that emitted the signal
    * @see enableReadSignals()
    */
-  void readReady(KProcIO *pio);
+  void readReady(TDEProcIO *pio);
 
 protected:
   TQPtrList<TQByteArray> outbuffer;
@@ -210,8 +210,7 @@ protected slots:
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
-  KProcIOPrivate *d;
+  TDEProcIOPrivate *d;
 };
 
-#endif // KPROCIO_H_
-
+#endif
diff --git a/tdecore/tests/CMakeLists.txt b/tdecore/tests/CMakeLists.txt
index b0c1fb36b..e79dbfdeb 100644
--- a/tdecore/tests/CMakeLists.txt
+++ b/tdecore/tests/CMakeLists.txt
@@ -36,7 +36,7 @@ set( CHECKS
   ksocktest kstringhandlertest kcmdlineargstest tdeapptest kmemtest
   dcopkonqtest kipctest cplusplustest kiconloadertest kresolvertest
   kmdcodectest knotifytest ksortablevaluelisttest krfcdatetest testqtargs
-  kprociotest kcharsetstest kcalendartest kmacroexpandertest kshelltest
+  tdeprociotest kcharsetstest kcalendartest kmacroexpandertest kshelltest
   kxerrorhandlertest startserviceby kglobaltest ktimezonestest
 )
 
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index c7b1f7d0e..cbf12cb2c 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -26,14 +26,14 @@ check_PROGRAMS = tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest \
 	kdebugtest ksocktest kstringhandlertest kcmdlineargstest tdeapptest \
 	kmemtest kidlservertest kidlclienttest dcopkonqtest kipctest \
 	cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \
-	ksortablevaluelisttest krfcdatetest testqtargs kprociotest \
+	ksortablevaluelisttest krfcdatetest testqtargs tdeprociotest \
 	kcharsetstest kcalendartest kmacroexpandertest kshelltest \
 	kxerrorhandlertest startserviceby tdestdacceltest kglobaltest ktimezonestest
 
 TESTS = kurltest tdestdacceltest
 
 noinst_HEADERS = klocaletest.h tdeprocesstest.h KIDLTest.h \
-		kipctest.h kprociotest.h
+		kipctest.h tdeprociotest.h
 
 METASOURCES = AUTO
 
@@ -68,7 +68,7 @@ knotifytest_SOURCES = knotifytest.cpp
 ksortablevaluelisttest_SOURCES = ksortablevaluelisttest.cpp
 krfcdatetest_SOURCES = krfcdatetest.cpp
 testqtargs_SOURCES = testqtargs.cpp
-kprociotest_SOURCES = kprociotest.cpp
+tdeprociotest_SOURCES = tdeprociotest.cpp
 kcharsetstest_SOURCES = kcharsetstest.cpp
 kcalendartest_SOURCES = kcalendartest.cpp
 kmacroexpandertest_SOURCES = kmacroexpandertest.cpp
diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/tdeprociotest.cpp
index 81522f394..16c9b14b6 100644
--- a/tdecore/tests/kprociotest.cpp
+++ b/tdecore/tests/tdeprociotest.cpp
@@ -17,7 +17,7 @@
 
 #include <signal.h>
 
-#include "kprociotest.h"
+#include "tdeprociotest.h"
 
 
 
@@ -32,17 +32,17 @@ werke\nmerkt\nich\nund\nden\nbrauch\nund\nmit\ngeistesstaerke\ntu\nich\nwunder\n
 int main(int argc, char *argv[])
 {
  Dummy dummy; 
- TDEApplication app(argc, argv, TQCString("kprociotest"));
+ TDEApplication app(argc, argv, TQCString("tdeprociotest"));
 
- printf("Welcome to the KProcIO Demo Application!\n");
+ printf("Welcome to the TDEProcIO Demo Application!\n");
 
 
- KProcIO p;
+ TDEProcIO p;
  
  p << "rev";
  
  p.connect(&p, TQ_SIGNAL(processExited(TDEProcess*)), &dummy, TQ_SLOT(printMessage(TDEProcess*)));
- p.connect(&p, TQ_SIGNAL(readReady(KProcIO*)), &dummy, TQ_SLOT(gotOutput(KProcIO*)));
+ p.connect(&p, TQ_SIGNAL(readReady(TDEProcIO*)), &dummy, TQ_SLOT(gotOutput(TDEProcIO*)));
 
  bool b;
 
@@ -62,4 +62,4 @@ int main(int argc, char *argv[])
 
  return 0;
 }
-#include "kprociotest.moc"
+#include "tdeprociotest.moc"
diff --git a/tdecore/tests/kprociotest.h b/tdecore/tests/tdeprociotest.h
index 78b5ad926..194a26504 100644
--- a/tdecore/tests/kprociotest.h
+++ b/tdecore/tests/tdeprociotest.h
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <tqobject.h>
-#include "kprocio.h"
+#include "tdeprocio.h"
 
 class Dummy : public TQObject
 {
@@ -25,7 +25,7 @@ class Dummy : public TQObject
      printf("Process %d exited!\n", (int)proc->getPid()); 
    } 
  
-   void gotOutput(KProcIO*proc)
+   void gotOutput(TDEProcIO*proc)
    {
     TQString line;
     while(true) {