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

---
 kaudiocreator/encoder.cpp          | 14 +++++++-------
 kaudiocreator/encoder.h            |  4 ++--
 kaudiocreator/encoderconfigimp.cpp |  6 +++---
 kaudiocreator/main.cpp             |  2 +-
 kaudiocreator/tracksimp.h          |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kaudiocreator')

diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp
index cd4b93ea..dfad467f 100644
--- a/kaudiocreator/encoder.cpp
+++ b/kaudiocreator/encoder.cpp
@@ -212,11 +212,11 @@ void Encoder::tendToNewJobs() {
 	proc->setPriority(Prefs::niceLevel());
  
 	*proc << TQFile::encodeName(command).data();
-	connect(proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
-		    this, TQT_SLOT(receivedThreadOutput(KProcess *, char *, int )));
-	connect(proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )),
-		    this, TQT_SLOT(receivedThreadOutput(KProcess *, char *, int )));
-	connect(proc, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(jobDone(KProcess *)));
+	connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+		    this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int )));
+	connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )),
+		    this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int )));
+	connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(jobDone(TDEProcess *)));
 	jobs.insert(proc, job);
 	threads.append(proc);
 
@@ -230,7 +230,7 @@ void Encoder::tendToNewJobs() {
  * @param buffer the output from the process
  * @param buflen the length of the buffer.
  */
-void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length ) {
+void Encoder::receivedThreadOutput(TDEProcess *process, char *buffer, int length ) {
 	if ( Prefs::fullDecoderDebug() && buffer)
 		kdDebug(60002) << buffer << endl;
 	
@@ -271,7 +271,7 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length )
  * When the process is done encoding a file this function is called.
  * @param job the job that just finished.
  */
-void Encoder::jobDone(KProcess *process ) {
+void Encoder::jobDone(TDEProcess *process ) {
 	// Normal error checking here.
 	if ( !process)
 		return;
diff --git a/kaudiocreator/encoder.h b/kaudiocreator/encoder.h
index 243276e6..b891e0b5 100644
--- a/kaudiocreator/encoder.h
+++ b/kaudiocreator/encoder.h
@@ -53,8 +53,8 @@ public slots:
   EncoderPrefs* loadEncoder( int encoder );
 
 private slots:
-  void receivedThreadOutput(KProcess *process, char *buffer, int buflen);
-  void jobDone(KProcess *process);
+  void receivedThreadOutput(TDEProcess *process, char *buffer, int buflen);
+  void jobDone(TDEProcess *process);
   void tendToNewJobs();
 
 private:
diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp
index e49dd6a9..96c7810f 100644
--- a/kaudiocreator/encoderconfigimp.cpp
+++ b/kaudiocreator/encoderconfigimp.cpp
@@ -186,7 +186,7 @@ void EncoderConfigImp::configureEncoderSlot() {
     return;
   }
   TQString groupName = encoderNames[kcfg_currentEncoder->currentText()];
-  KConfig &config = *KGlobal::config();
+  KConfig &config = *TDEGlobal::config();
   if(!config.hasGroup(groupName))
     return;
 
@@ -272,13 +272,13 @@ EncoderPrefs *EncoderPrefs::prefs(const TQString &groupName)
 
 bool EncoderPrefs::hasPrefs(const TQString &groupName)
 {
-  KConfig &config = *KGlobal::config();
+  KConfig &config = *TDEGlobal::config();
   return config.hasGroup(groupName);
 }
 
 void EncoderPrefs::deletePrefs(const TQString &groupName)
 {
-  KConfig &config = *KGlobal::config();
+  KConfig &config = *TDEGlobal::config();
   config.deleteGroup(groupName);
   if (!m_prefs)
     return;
diff --git a/kaudiocreator/main.cpp b/kaudiocreator/main.cpp
index 8bd6c94b..2f5ebb54 100644
--- a/kaudiocreator/main.cpp
+++ b/kaudiocreator/main.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[]){
   KAudioCreator *app = new KAudioCreator(0, "MainWindow");
 
   // we need some strings from libkcddb for the cddb album dialog
-  KGlobal::locale()->insertCatalogue("libkcddb");
+  TDEGlobal::locale()->insertCatalogue("libkcddb");
 
   a.setMainWidget(app);
 
diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h
index ac7ddb7e..3cc2a09e 100644
--- a/kaudiocreator/tracksimp.h
+++ b/kaudiocreator/tracksimp.h
@@ -38,7 +38,7 @@
 
 using namespace KCDDB;
 class Job;
-class KProcess;
+class TDEProcess;
 class KCompactDisc;
 
 class TracksItem : public KListViewItem
-- 
cgit v1.2.1