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

4 files changed, 14 insertions, 14 deletions

diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index 95093de..3ba01b4 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -212,7 +212,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
     //
     ri.audioStream = 0;
     for( unsigned int i = 0; i < m_dvd[*it-1].numAudioStreams(); ++i ) {
-      if( m_dvd[*it-1].audioStream(i).langCode() == KGlobal::locale()->language() &&
+      if( m_dvd[*it-1].audioStream(i).langCode() == TDEGlobal::locale()->language() &&
 	  m_dvd[*it-1].audioStream(i).format() != K3bVideoDVD::AUDIO_FORMAT_DTS ) {
 	ri.audioStream = i;
 	break;
@@ -226,7 +226,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
 	.arg( m_dvd[*it-1].audioStream(i).channels() )
 	.arg( m_dvd[*it-1].audioStream(i).langCode().isEmpty()
 	      ? i18n("unknown language")
-	      : KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) )
+	      : TDEGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) )
 	.arg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
 	      ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() )
 	      : TQString() );
@@ -436,7 +436,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
 	break;
       case PATTERN_LANGUAGE_NAME:
 	if( title.numAudioStreams() > 0 )
-	  f.append( KGlobal::locale()->twoAlphaToLanguageName( title.audioStream( info.audioStream ).langCode() ) );
+	  f.append( TDEGlobal::locale()->twoAlphaToLanguageName( title.audioStream( info.audioStream ).langCode() ) );
 	break;
       case PATTERN_AUDIO_FORMAT:
 	// FIXME: what about MPEG audio streams?
@@ -471,7 +471,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
 	  f.append( "16:9" );
 	break;
       case PATTERN_CURRENT_DATE:
-	f.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
+	f.append( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) );
 	break;
       default:
 	f.append( pattern[i-1] );
diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
index 2081d32..2f2b38e 100644
--- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
@@ -74,7 +74,7 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv
   m_tempDir = new KTempDir();
   m_tempDir->setAutoDelete( true );
 
-  m_process = new KProcess();
+  m_process = new TDEProcess();
   *m_process << bin->path;
   *m_process << "-i" << dvd.device()->blockDeviceName();
   *m_process << "-T" << TQString("%1,%2").arg(title).arg(chapter);
@@ -85,9 +85,9 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv
   *m_process << "-Z" << "x200";
   *m_process << "-o" << m_tempDir->name();
 
-  connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
-	   this, TQT_SLOT(slotTranscodeFinished(KProcess*)) );
-  if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout
+  connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)),
+	   this, TQT_SLOT(slotTranscodeFinished(TDEProcess*)) );
+  if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout
     // something went wrong when starting the program
     // it "should" be the executable
     kdDebug() << "(K3bVideoDVDRippingPreview) Could not start transcode." << endl;
@@ -109,7 +109,7 @@ void K3bVideoDVDRippingPreview::cancel()
 }
 
 
-void K3bVideoDVDRippingPreview::slotTranscodeFinished( KProcess* )
+void K3bVideoDVDRippingPreview::slotTranscodeFinished( TDEProcess* )
 {
   // read the image
   TQString filename = m_tempDir->name() + "000000.ppm";// + tempTQDir->entryList( TQDir::Files ).first();
diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.h b/src/rip/videodvd/k3bvideodvdrippingpreview.h
index 7459ae8..92706dc 100644
--- a/src/rip/videodvd/k3bvideodvdrippingpreview.h
+++ b/src/rip/videodvd/k3bvideodvdrippingpreview.h
@@ -23,7 +23,7 @@
 
 
 class KTempDir;
-class KProcess;
+class TDEProcess;
 
 class K3bVideoDVDRippingPreview : public TQObject
 {
@@ -51,12 +51,12 @@ class K3bVideoDVDRippingPreview : public TQObject
   void previewDone( bool );
 
  private slots:
-  void slotTranscodeFinished( KProcess* );
+  void slotTranscodeFinished( TDEProcess* );
 
  private:
   TQImage m_preview;
   KTempDir* m_tempDir;
-  KProcess* m_process;
+  TDEProcess* m_process;
   int m_title;
   int m_chapter;
   K3bVideoDVD::VideoDVD m_dvd;
diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
index d3f1e72..4d03c64 100644
--- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
@@ -49,7 +49,7 @@ static TQString audioStreamString( const K3bVideoDVD::Title& title, unsigned int
       .arg( title.audioStream(i).channels() )
       .arg( title.audioStream(i).langCode().isEmpty()
 	    ? i18n("unknown language")
-	    : KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) )
+	    : TDEGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) )
       .arg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED 
 	    ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() )
 	    : TQString() );
@@ -74,7 +74,7 @@ static TQString subpictureStreamString( const K3bVideoDVD::Title& title, unsigne
 	    : i18n("Extended") )
       .arg( title.subPictureStream(i).langCode().isEmpty()
 	    ? i18n("unknown language")
-	    : KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) )
+	    : TDEGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) )
       .arg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED 
 	    ? TQString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() )
 	    : TQString() );