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

---
 krdc/rdp/krdpview.cpp | 12 ++++++------
 krdc/rdp/krdpview.h   |  8 ++++----
 krdc/vnc/kvncview.cpp |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'krdc')

diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index 73ea3753..00ebf1a6 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -228,7 +228,7 @@ bool KRdpView::start()
 
 	m_container->show();
 
-	m_process = new KProcess(TQT_TQOBJECT(m_container));
+	m_process = new TDEProcess(TQT_TQOBJECT(m_container));
 	*m_process << "rdesktop";
 	// Check for fullscreen mode
 	if ((hp->width() == 0) && (hp->height() == 0)) {
@@ -291,12 +291,12 @@ bool KRdpView::start()
 	*m_process << "-X" << ("0x" + TQString::number(m_container->winId(), 16));
 	*m_process << "-a" << TQString::number(hp->colorDepth());
 	*m_process << (m_host + ":" + TQString::number(m_port));
-	connect(m_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(processDied(KProcess *)));
-	connect(m_process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(receivedStderr(KProcess *, char *, int)));
+	connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(processDied(TDEProcess *)));
+	connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
 	connect(m_container, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(connectionClosed()));
 	connect(m_container, TQT_SIGNAL(newEmbeddedWindow(WId)), TQT_SLOT(connectionOpened(WId)));
   tqDebug("Color depth: %d", hp->colorDepth());
-	if(!m_process->start(KProcess::NotifyOnExit, KProcess::Stderr))
+	if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr))
 	{
 		KMessageBox::error(0, i18n("Could not start rdesktop; make sure rdesktop is properly installed."),
 		                      i18n("rdesktop Failure"));
@@ -357,7 +357,7 @@ void KRdpView::connectionClosed()
 	m_quitFlag = true;
 }
 
-void KRdpView::processDied(KProcess */*proc*/)
+void KRdpView::processDied(TDEProcess */*proc*/)
 {
 	if(m_status == REMOTE_VIEW_CONNECTING)
 	{
@@ -371,7 +371,7 @@ void KRdpView::processDied(KProcess */*proc*/)
 	}
 }
 
-void KRdpView::receivedStderr(KProcess */*proc*/, char *buffer, int /*buflen*/)
+void KRdpView::receivedStderr(TDEProcess */*proc*/, char *buffer, int /*buflen*/)
 {
 	TQString output(buffer);
 	TQString line;
diff --git a/krdc/rdp/krdpview.h b/krdc/rdp/krdpview.h
index edab5870..46a2cbf9 100644
--- a/krdc/rdp/krdpview.h
+++ b/krdc/rdp/krdpview.h
@@ -28,7 +28,7 @@
 #define TCP_PORT_RDP 3389
 #define RDP_LOGON_NORMAL 0x33
 
-class KProcess;
+class TDEProcess;
 class KRdpView;
 
 class RdpContainer : public QXEmbed
@@ -103,13 +103,13 @@ class KRdpView : public KRemoteView
 		bool    m_quitFlag;                // if set: die
 		TQString m_clientVersion;           // version number returned by rdesktop
 		RdpContainer *m_container;         // container for the rdesktop window
-		KProcess *m_process;               // rdesktop process
+		TDEProcess *m_process;               // rdesktop process
 
 	private slots:
 		void connectionOpened(WId window); // called if rdesktop started
 		void connectionClosed();           // called if rdesktop quits
-		void processDied(KProcess *);      // called if rdesktop dies
-		void receivedStderr(KProcess *proc, char *buffer, int buflen);
+		void processDied(TDEProcess *);      // called if rdesktop dies
+		void receivedStderr(TDEProcess *proc, char *buffer, int buflen);
 		                                   // catches rdesktop debug output
 };
 
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index 9763b351..6ad50e93 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -96,7 +96,7 @@ KVncView::KVncView(TQWidget *parent,
 	connect(m_cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
 	connect(m_cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged()));
 
-	KStandardDirs *dirs = KGlobal::dirs();
+	KStandardDirs *dirs = TDEGlobal::dirs();
 	TQBitmap cursorBitmap(dirs->findResource("appdata",
 						"pics/pointcursor.png"));
 	TQBitmap cursorMask(dirs->findResource("appdata",
-- 
cgit v1.2.1