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

2 files changed, 11 insertions, 11 deletions

diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index e4bc1e6f2..d9a1e2a72 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name)
 {
 	m_hasoutput = false;
 
-	connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*)));
-	connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int)));
-	connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(KProcess*,char*,int)));
+	connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
+	connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
 
 	TQPushButton	*cleanbtn = new TQPushButton(this, "-c");
 	cleanbtn->setPixmap(DesktopIcon("exec"));
@@ -196,7 +196,7 @@ void EscpWidget::startCommand(const TQString& arg)
 	m_hasoutput = ( arg == "-i" || arg == "-d" );
 	for ( TQValueList<TQCString>::ConstIterator it=m_proc.args().begin(); it!=m_proc.args().end(); ++it )
 		kdDebug() << "ARG: " << *it << endl;
-	if (m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput))
+	if (m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput))
 		setEnabled(false);
 	else
 	{
@@ -206,7 +206,7 @@ void EscpWidget::startCommand(const TQString& arg)
 	}
 }
 
-void EscpWidget::slotProcessExited(KProcess*)
+void EscpWidget::slotProcessExited(TDEProcess*)
 {
 	setEnabled(true);
 	if (!m_proc.normalExit() || m_proc.exitStatus() != 0)
@@ -229,13 +229,13 @@ void EscpWidget::slotProcessExited(KProcess*)
 	m_hasoutput = false;
 }
 
-void EscpWidget::slotReceivedStdout(KProcess*, char *buf, int len)
+void EscpWidget::slotReceivedStdout(TDEProcess*, char *buf, int len)
 {
 	TQString	bufstr = TQCString(buf, len);
 	m_outbuffer.append(bufstr);
 }
 
-void EscpWidget::slotReceivedStderr(KProcess*, char *buf, int len)
+void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len)
 {
 	TQString	bufstr = TQCString(buf, len);
 	m_errorbuffer.append(bufstr);
diff --git a/tdeprint/tools/escputil/escpwidget.h b/tdeprint/tools/escputil/escpwidget.h
index 7e3ba55e8..4ad284d00 100644
--- a/tdeprint/tools/escputil/escpwidget.h
+++ b/tdeprint/tools/escputil/escpwidget.h
@@ -37,16 +37,16 @@ public:
 	void setPrinterName(const TQString&);
 
 protected slots:
-	void slotReceivedStdout(KProcess*, char*, int);
-	void slotReceivedStderr(KProcess*, char*, int);
-	void slotProcessExited(KProcess*);
+	void slotReceivedStdout(TDEProcess*, char*, int);
+	void slotReceivedStderr(TDEProcess*, char*, int);
+	void slotProcessExited(TDEProcess*);
 	void slotButtonClicked();
 
 protected:
 	void startCommand(const TQString& arg);
 
 private:
-	KProcess	m_proc;
+	TDEProcess	m_proc;
 	KURL		m_deviceURL;
 	TQString		m_errorbuffer, m_outbuffer;
 	TQLabel		*m_printer, *m_device;