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

---
 .../filters/xmltransformer/xmltransformerproc.cpp  | 24 +++++++++++-----------
 kttsd/filters/xmltransformer/xmltransformerproc.h  | 10 ++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'kttsd/filters/xmltransformer')

diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
index c1821db..c513c5d 100644
--- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp
+++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp
@@ -241,7 +241,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup)
     // outFile.unlink();    // only activate this if necessary.
 
     /// Spawn an xsltproc process to apply our stylesheet to input file.
-    m_xsltProc = new KProcess;
+    m_xsltProc = new TDEProcess;
     *m_xsltProc << m_xsltprocPath;
     *m_xsltProc << "-o" << m_outFilename  << "--novalid"
             << m_xsltFilePath << m_inFilename;
@@ -250,14 +250,14 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup)
     //     m_xsltProc->args() << endl;
 
     m_state = fsFiltering;
-    connect(m_xsltProc, TQT_SIGNAL(processExited(KProcess*)),
-            this, TQT_SLOT(slotProcessExited(KProcess*)));
-    connect(m_xsltProc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-            this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
-    connect(m_xsltProc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
-            this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
-    if (!m_xsltProc->start(KProcess::NotifyOnExit,
-         static_cast<KProcess::Communication>(KProcess::Stdout | KProcess::Stderr)))
+    connect(m_xsltProc, TQT_SIGNAL(processExited(TDEProcess*)),
+            this, TQT_SLOT(slotProcessExited(TDEProcess*)));
+    connect(m_xsltProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+            this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+    connect(m_xsltProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+            this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
+    if (!m_xsltProc->start(TDEProcess::NotifyOnExit,
+         static_cast<TDEProcess::Communication>(TDEProcess::Stdout | TDEProcess::Stderr)))
     {
         kdDebug() << "XmlTransformerProc::convert: Error starting xsltproc" << endl;
         m_state = fsIdle;
@@ -365,19 +365,19 @@ void XmlTransformerProc::processOutput()
  */
 /*virtual*/ bool XmlTransformerProc::wasModified() { return m_wasModified; }
 
-void XmlTransformerProc::slotProcessExited(KProcess*)
+void XmlTransformerProc::slotProcessExited(TDEProcess*)
 {
     // kdDebug() << "XmlTransformerProc::slotProcessExited: xsltproc has exited." << endl;
     processOutput();
 }
 
-void XmlTransformerProc::slotReceivedStdout(KProcess*, char* /*buffer*/, int /*buflen*/)
+void XmlTransformerProc::slotReceivedStdout(TDEProcess*, char* /*buffer*/, int /*buflen*/)
 {
     // TQString buf = TQString::fromLatin1(buffer, buflen);
     // kdDebug() << "XmlTransformerProc::slotReceivedStdout: Received from xsltproc: " << buf << endl;
 }
 
-void XmlTransformerProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
+void XmlTransformerProc::slotReceivedStderr(TDEProcess*, char* buffer, int buflen)
 {
     TQString buf = TQString::fromLatin1(buffer, buflen);
     kdDebug() << "XmlTransformerProc::slotReceivedStderr: Received error from xsltproc: " << buf << endl;
diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.h b/kttsd/filters/xmltransformer/xmltransformerproc.h
index 8d92e69..a7c5ccc 100644
--- a/kttsd/filters/xmltransformer/xmltransformerproc.h
+++ b/kttsd/filters/xmltransformer/xmltransformerproc.h
@@ -31,7 +31,7 @@
 // KTTS includes.
 #include "filterproc.h"
 
-class KProcess;
+class TDEProcess;
 
 class XmlTransformerProc : virtual public KttsFilterProc
 {
@@ -132,9 +132,9 @@ public:
     virtual bool wasModified();
 
 private slots:
-    void slotProcessExited(KProcess*);
-    void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
-    void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
+    void slotProcessExited(TDEProcess*);
+    void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
+    void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
 
 private:
     // Process output when xsltproc exits.
@@ -151,7 +151,7 @@ private:
     // Processing state.
     int m_state;
     // xsltproc process.
-    KProcess* m_xsltProc;
+    TDEProcess* m_xsltProc;
     // Input and Output filenames.
     TQString m_inFilename;
     TQString m_outFilename;
-- 
cgit v1.2.3