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

---
 kttsd/plugins/freetts/freettsproc.cpp | 32 ++++++++++++++++----------------
 kttsd/plugins/freetts/freettsproc.h   | 12 ++++++------
 2 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'kttsd/plugins/freetts')

diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp
index c7b2200..4d6c177 100644
--- a/kttsd/plugins/freetts/freettsproc.cpp
+++ b/kttsd/plugins/freetts/freettsproc.cpp
@@ -102,15 +102,15 @@ void FreeTTSProc::synth(
         
 	}
 	
-	m_freettsProc = new KProcess;
-	connect(m_freettsProc, TQT_SIGNAL(processExited(KProcess*)),
-		   this, TQT_SLOT(slotProcessExited(KProcess*)));
-	connect(m_freettsProc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-		   this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
-	connect(m_freettsProc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
-		   this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
-	connect(m_freettsProc, TQT_SIGNAL(wroteStdin(KProcess*)),
-		   this, TQT_SLOT(slotWroteStdin(KProcess* )));
+	m_freettsProc = new TDEProcess;
+	connect(m_freettsProc, TQT_SIGNAL(processExited(TDEProcess*)),
+		   this, TQT_SLOT(slotProcessExited(TDEProcess*)));
+	connect(m_freettsProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+		   this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+	connect(m_freettsProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+		   this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
+	connect(m_freettsProc, TQT_SIGNAL(wroteStdin(TDEProcess*)),
+		   this, TQT_SLOT(slotWroteStdin(TDEProcess* )));
 	if (synthFilename.isNull())
 		m_state = psSaying;
 	else
@@ -122,7 +122,7 @@ void FreeTTSProc::synth(
 	
 	/// As freetts.jar doesn't seem to like being called from an absolute path, 
 	/// we need to strip off the path to freetts.jar and pass it to 
-	/// KProcess::setWorkingDirectory()
+	/// TDEProcess::setWorkingDirectory()
 	/// We could just strip off 11 characters from the end of the path to freetts.jar, but thats
 	/// not exactly very portable...
 	TQString filename = TQFileInfo(freettsJarPath).baseName().append(TQString(".").append(TQFileInfo(freettsJarPath).extension()));
@@ -140,10 +140,10 @@ void FreeTTSProc::synth(
 	m_synthFilename = synthFilename;
 	
 	kdDebug() << "FreeTTSProc::synth: Synthing text: '" << saidText << "' using FreeTTS plug in" << endl;
-	if (!m_freettsProc->start(KProcess::NotifyOnExit, KProcess::All)) {
+	if (!m_freettsProc->start(TDEProcess::NotifyOnExit, TDEProcess::All)) {
 		kdDebug() << "FreeTTSProc::synth: Error starting FreeTTS process.  Is freetts.jar in the PATH?" << endl;
 		m_state = psIdle;
-		kdDebug() << "KProcess args: " << argsToTQStringList(m_freettsProc->args()) << endl;
+		kdDebug() << "TDEProcess args: " << argsToTQStringList(m_freettsProc->args()) << endl;
 		return;
 	}
 	kdDebug()<< "FreeTTSProc:synth: FreeTTS initialized" << endl;
@@ -188,7 +188,7 @@ void FreeTTSProc::stopText() {
 	kdDebug() << "FreeTTSProc::stopText: FreeTTS stopped." << endl;
 }
 
-void FreeTTSProc::slotProcessExited(KProcess*) {
+void FreeTTSProc::slotProcessExited(TDEProcess*) {
 	kdDebug() << "FreeTTSProc:slotProcessExited: FreeTTS process has exited." << endl;
 	pluginState prevState = m_state;
 	if (m_waitingStop) {
@@ -205,17 +205,17 @@ void FreeTTSProc::slotProcessExited(KProcess*) {
 	}
 }
 
-void FreeTTSProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) {
+void FreeTTSProc::slotReceivedStdout(TDEProcess*, char* buffer, int buflen) {
 	TQString buf = TQString::fromLatin1(buffer, buflen);
 	kdDebug() << "FreeTTSProc::slotReceivedStdout: Received output from FreeTTS: " << buf << endl;
 }
 
-void FreeTTSProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) {
+void FreeTTSProc::slotReceivedStderr(TDEProcess*, char* buffer, int buflen) {
 	TQString buf = TQString::fromLatin1(buffer, buflen);
 	kdDebug() << "FreeTTSProc::slotReceivedStderr: Received error from FreeTTS: " << buf << endl;
 }
 
-void FreeTTSProc::slotWroteStdin(KProcess*) {
+void FreeTTSProc::slotWroteStdin(TDEProcess*) {
 	kdDebug() << "FreeTTSProc::slotWroteStdin: closing Stdin" << endl;
 	m_freettsProc->closeStdin();
 }
diff --git a/kttsd/plugins/freetts/freettsproc.h b/kttsd/plugins/freetts/freettsproc.h
index 54a2f0c..8e1e06f 100644
--- a/kttsd/plugins/freetts/freettsproc.h
+++ b/kttsd/plugins/freetts/freettsproc.h
@@ -24,7 +24,7 @@
 
 #include <pluginproc.h>
 
-class KProcess;
+class TDEProcess;
 
 class FreeTTSProc : public PlugInProc{
 	Q_OBJECT
@@ -143,10 +143,10 @@ public:
 	const TQString &freettsJarPath);
 
 private slots:
-	void slotProcessExited(KProcess* proc);
-	void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
-	void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
-	void slotWroteStdin(KProcess* proc);
+	void slotProcessExited(TDEProcess* proc);
+	void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
+	void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
+	void slotWroteStdin(TDEProcess* proc);
 
 private:
 	
@@ -158,7 +158,7 @@ private:
 	/**
 	 * FreeTTS process
 	 */
-	KProcess* m_freettsProc;
+	TDEProcess* m_freettsProc;
 	
 	/**
 	 * Synthesis filename.
-- 
cgit v1.2.3