From 2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:19:29 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 plugins/encoder/external/k3bexternalencoder.cpp |  8 ++++----
 plugins/encoder/external/k3bexternalencoder.h   |  4 ++--
 plugins/encoder/sox/k3bsoxencoder.cpp           | 12 ++++++------
 plugins/encoder/sox/k3bsoxencoder.h             |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'plugins')

diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp
index 2290012..f3a1716 100644
--- a/plugins/encoder/external/k3bexternalencoder.cpp
+++ b/plugins/encoder/external/k3bexternalencoder.cpp
@@ -161,7 +161,7 @@ void K3bExternalEncoder::finishEncoderInternal()
 }
 
 
-void K3bExternalEncoder::slotExternalProgramFinished( KProcess* p )
+void K3bExternalEncoder::slotExternalProgramFinished( TDEProcess* p )
 {
   if( !p->normalExit() || p->exitStatus() != 0 )
     kdDebug() << "(K3bExternalEncoder) program exited with error." << endl;
@@ -207,8 +207,8 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension )
   d->process->setSplitStdout(true);
   d->process->setRawStdin(true);
 
-  connect( d->process, TQT_SIGNAL(processExited(KProcess*)),
-	   this, TQT_SLOT(slotExternalProgramFinished(KProcess*)) );
+  connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)),
+	   this, TQT_SLOT(slotExternalProgramFinished(TDEProcess*)) );
   connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)),
 	   this, TQT_SLOT(slotExternalProgramOutputLine(const TQString&)) );
   connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)),
@@ -244,7 +244,7 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension )
   // set one general error message
   setLastError( i18n("Command failed: %1").arg( s ) );
   
-  if( d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
+  if( d->process->start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) {
     if( d->cmd.writeWaveHeader )
       return writeWaveHeader();
     else
diff --git a/plugins/encoder/external/k3bexternalencoder.h b/plugins/encoder/external/k3bexternalencoder.h
index 45b9642..1ef865a 100644
--- a/plugins/encoder/external/k3bexternalencoder.h
+++ b/plugins/encoder/external/k3bexternalencoder.h
@@ -21,7 +21,7 @@
 
 
 class base_K3bExternalEncoderConfigWidget;
-class KProcess;
+class TDEProcess;
 
 
 class K3bExternalEncoder : public K3bAudioEncoder
@@ -52,7 +52,7 @@ class K3bExternalEncoder : public K3bAudioEncoder
   class Command;
 
  private slots:
-  void slotExternalProgramFinished( KProcess* );
+  void slotExternalProgramFinished( TDEProcess* );
   void slotExternalProgramOutputLine( const TQString& );
 
  private:
diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
index ee69541..37b5a66 100644
--- a/plugins/encoder/sox/k3bsoxencoder.cpp
+++ b/plugins/encoder/sox/k3bsoxencoder.cpp
@@ -68,11 +68,11 @@ class K3bSoxProgram : public K3bExternalProgram
     K3bExternalBin* bin = 0;
 
     // probe version
-    KProcess vp;
+    TDEProcess vp;
     K3bProcessOutputCollector out( &vp );
 
     vp << path << "-h";
-    if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
+    if( vp.start( TDEProcess::Block, TDEProcess::AllOutput ) ) {
       int pos = out.output().find( "sox: SoX Version" );
       if ( pos < 0 )
           pos = out.output().find( "sox: SoX v" ); // newer sox versions
@@ -153,7 +153,7 @@ void K3bSoxEncoder::finishEncoderInternal()
 }
 
 
-void K3bSoxEncoder::slotSoxFinished( KProcess* p )
+void K3bSoxEncoder::slotSoxFinished( TDEProcess* p )
 {
   if( !p->normalExit() || p->exitStatus() != 0 )
     kdDebug() << "(K3bSoxEncoder) sox exited with error." << endl;
@@ -182,8 +182,8 @@ bool K3bSoxEncoder::initEncoderInternal( const TQString& extension )
     d->process->setSplitStdout(true);
     d->process->setRawStdin(true);
 
-    connect( d->process, TQT_SIGNAL(processExited(KProcess*)),
-	     this, TQT_SLOT(slotSoxFinished(KProcess*)) );
+    connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)),
+	     this, TQT_SLOT(slotSoxFinished(TDEProcess*)) );
     connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)),
 	     this, TQT_SLOT(slotSoxOutputLine(const TQString&)) );
     connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)),
@@ -240,7 +240,7 @@ bool K3bSoxEncoder::initEncoderInternal( const TQString& extension )
     kdDebug() << s << flush << endl;
 
 
-    return d->process->start( KProcess::NotifyOnExit, KProcess::All );
+    return d->process->start( TDEProcess::NotifyOnExit, TDEProcess::All );
   }
   else {
     kdDebug() << "(K3bSoxEncoder) could not find sox bin." << endl;
diff --git a/plugins/encoder/sox/k3bsoxencoder.h b/plugins/encoder/sox/k3bsoxencoder.h
index 22faf85..a34271f 100644
--- a/plugins/encoder/sox/k3bsoxencoder.h
+++ b/plugins/encoder/sox/k3bsoxencoder.h
@@ -22,7 +22,7 @@
 
 
 class base_K3bSoxEncoderConfigWidget;
-class KProcess;
+class TDEProcess;
 
 class K3bSoxEncoder : public K3bAudioEncoder
 {
@@ -51,7 +51,7 @@ class K3bSoxEncoder : public K3bAudioEncoder
   void closeFile();
 
  private slots:
-  void slotSoxFinished( KProcess* );
+  void slotSoxFinished( TDEProcess* );
   void slotSoxOutputLine( const TQString& );
 
  private:
-- 
cgit v1.2.3