Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

4 files changed, 23 insertions, 23 deletions

diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp
index d83581c..6b1de51 100644
--- a/libk3b/projects/datacd/k3bisoimager.cpp
+++ b/libk3b/projects/datacd/k3bisoimager.cpp
@@ -155,7 +155,7 @@ void K3bIsoImager::handleMkisofsInfoMessage( const TQString& line, int type )
 }
 
 
-void K3bIsoImager::slotProcessExited( KProcess* p )
+void K3bIsoImager::slotProcessExited( TDEProcess* p )
 {
   kdDebug() << k_funcinfo << endl;
 
@@ -340,11 +340,11 @@ void K3bIsoImager::startSizeCalculation()
 
   // TODO: use K3bProcess::OutputCollector instead iof our own two slots.
 
-  connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
-	   this, TQT_SLOT(slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int)) );
+  connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+	   this, TQT_SLOT(slotCollectMkisofsPrintSizeStderr(TDEProcess*, char*, int)) );
   connect( m_process, TQT_SIGNAL(stdoutLine(const TQString&)),
 	   this, TQT_SLOT(slotCollectMkisofsPrintSizeStdout(const TQString&)) );
-  connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
+  connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)),
 	   this, TQT_SLOT(slotMkisofsPrintSizeFinished()) );
 
   // we also want error messages
@@ -355,7 +355,7 @@ void K3bIsoImager::startSizeCalculation()
   m_collectedMkisofsPrintSizeStderr = TQString();
   m_mkisofsPrintSizeResult = 0;
 
-  if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+  if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
     emit infoMessage( i18n("Could not start %1.").arg("mkisofs"), K3bJob::ERROR );
     cleanup();
 
@@ -365,7 +365,7 @@ void K3bIsoImager::startSizeCalculation()
 }
 
 
-void K3bIsoImager::slotCollectMkisofsPrintSizeStderr(KProcess*, char* data , int len)
+void K3bIsoImager::slotCollectMkisofsPrintSizeStderr(TDEProcess*, char* data , int len)
 {
   emit debuggingOutput( "mkisofs", TQString::fromLocal8Bit( data, len ) );
   m_collectedMkisofsPrintSizeStderr.append( TQString::fromLocal8Bit( data, len ) );
@@ -485,8 +485,8 @@ void K3bIsoImager::start()
     return;
   }
 
-  connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
-	   this, TQT_SLOT(slotProcessExited(KProcess*)) );
+  connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)),
+	   this, TQT_SLOT(slotProcessExited(TDEProcess*)) );
 
   connect( m_process, TQT_SIGNAL(stderrLine( const TQString& )),
 	   this, TQT_SLOT(slotReceivedStderr( const TQString& )) );
@@ -528,7 +528,7 @@ void K3bIsoImager::start()
   kdDebug() << s << endl << flush;
   emit debuggingOutput("mkisofs command:", s);
 
-  if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput) ) {
+  if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) {
     // something went wrong when starting the program
     // it "should" be the executable
     kdDebug() << "(K3bIsoImager) could not start mkisofs" << endl;
diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h
index 51bee7b..42277c2 100644
--- a/libk3b/projects/datacd/k3bisoimager.h
+++ b/libk3b/projects/datacd/k3bisoimager.h
@@ -28,7 +28,7 @@ class K3bDataItem;
 class K3bFileItem;
 class TQTextStream;
 class K3bProcess;
-class KProcess;
+class TDEProcess;
 class K3bDevice::Device;
 class KTempFile;
 
@@ -146,10 +146,10 @@ class K3bIsoImager : public K3bJob, public K3bMkisofsHandler
 
  protected slots:
   virtual void slotReceivedStderr( const TQString& );
-  virtual void slotProcessExited( KProcess* );
+  virtual void slotProcessExited( TDEProcess* );
 
  private slots:
-  void slotCollectMkisofsPrintSizeStderr(KProcess*, char*, int);
+  void slotCollectMkisofsPrintSizeStderr(TDEProcess*, char*, int);
   void slotCollectMkisofsPrintSizeStdout( const TQString& );
   void slotMkisofsPrintSizeFinished();
   void slotDataPreparationDone( bool success );
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
index 3aa90b3..e81c98b 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
@@ -79,7 +79,7 @@ void K3bMsInfoFetcher::start()
 void K3bMsInfoFetcher::getMsInfo()
 {
   delete m_process;
-  m_process = new KProcess();
+  m_process = new TDEProcess();
 
   const K3bExternalBin* bin = 0;
   if( m_dvd ) {
@@ -116,18 +116,18 @@ void K3bMsInfoFetcher::getMsInfo()
     emit debuggingOutput( "msinfo command:", s );
 
 
-    //   connect( m_process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
-    // 	   this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) );
-    connect( m_process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-	     this, TQT_SLOT(slotCollectOutput(KProcess*, char*, int)) );
-    connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
+    //   connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+    // 	   this, TQT_SLOT(slotCollectOutput(TDEProcess*, char*, int)) );
+    connect( m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+	     this, TQT_SLOT(slotCollectOutput(TDEProcess*, char*, int)) );
+    connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)),
 	     this, TQT_SLOT(slotProcessExited()) );
 
     m_msInfo = TQString();
     m_collectedOutput = TQString();
     m_canceled = false;
 
-    if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+    if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
       emit infoMessage( i18n("Could not start %1.").arg(bin->name()), K3bJob::ERROR );
       jobFinished(false);
     }
@@ -218,7 +218,7 @@ void K3bMsInfoFetcher::slotProcessExited()
 }
 
 
-void K3bMsInfoFetcher::slotCollectOutput( KProcess*, char* output, int len )
+void K3bMsInfoFetcher::slotCollectOutput( TDEProcess*, char* output, int len )
 {
   emit debuggingOutput( "msinfo", TQString::fromLocal8Bit( output, len ) );
 
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.h b/libk3b/projects/datacd/k3bmsinfofetcher.h
index a661519..88a174f 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.h
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.h
@@ -22,7 +22,7 @@ namespace K3bDevice {
   class Device;
   class DeviceHandler;
 }
-class KProcess;
+class TDEProcess;
 
 class K3bMsInfoFetcher : public K3bJob
 {
@@ -45,7 +45,7 @@ class K3bMsInfoFetcher : public K3bJob
 
  private slots:
   void slotProcessExited();
-  void slotCollectOutput( KProcess*, char* output, int len );
+  void slotCollectOutput( TDEProcess*, char* output, int len );
   void slotMediaDetectionFinished( K3bDevice::DeviceHandler* );
   void getMsInfo();
 
@@ -55,7 +55,7 @@ class K3bMsInfoFetcher : public K3bJob
   int m_nextSessionStart;
   TQString m_collectedOutput;
 
-  KProcess* m_process;
+  TDEProcess* m_process;
   K3bDevice::Device* m_device;
 
   bool m_canceled;