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

---
 krfb/kcm_krfb/kcm_krfb.cpp | 2 +-
 krfb/kinetd/kinetd.cpp     | 4 ++--
 krfb/kinetd/kinetd.h       | 2 +-
 krfb/krfb/configuration.cc | 2 +-
 krfb/krfb/trayicon.cpp     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'krfb')

diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp
index 38fb5ad3..ade2fe95 100644
--- a/krfb/kcm_krfb/kcm_krfb.cpp
+++ b/krfb/kcm_krfb/kcm_krfb.cpp
@@ -47,7 +47,7 @@ typedef KGenericFactory<KcmKRfb, TQWidget> KcmKRfbFactory;
 // Can't use K_EXPORT_COMPONENT_FACTORY, since insertCatalogue necessary
 extern "C" {
   KDE_EXPORT void *init_kcm_krfb() {
-    KGlobal::locale()->insertCatalogue("krfb"); // For invitation translations
+    TDEGlobal::locale()->insertCatalogue("krfb"); // For invitation translations
     return new KcmKRfbFactory("kcm_krfb"); 
   }
 }
diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp
index c05f1830..42a7f053 100644
--- a/krfb/kinetd/kinetd.cpp
+++ b/krfb/kinetd/kinetd.cpp
@@ -224,7 +224,7 @@ void PortListener::accepted(KSocket *sock) {
 
 	m_process.clearArguments();
 	m_process << m_execPath << m_argument << TQString::number(sock->socket());
-	if (!m_process.start(KProcess::DontCare)) {
+	if (!m_process.start(TDEProcess::DontCare)) {
 		KNotifyClient::event("ProcessFailed",
 			i18n("Call \"%1 %2 %3\" failed").arg(m_execPath)
 				.arg(m_argument)
@@ -652,7 +652,7 @@ KInetD::~KInetD() {
 extern "C" {
 	KDE_EXPORT KDEDModule *create_kinetd(TQCString &name)
 	{
-        KGlobal::locale()->insertCatalogue("kinetd");
+        TDEGlobal::locale()->insertCatalogue("kinetd");
 		return new KInetD(name);
 	}
 }
diff --git a/krfb/kinetd/kinetd.h b/krfb/kinetd/kinetd.h
index eee64e59..cb29889d 100644
--- a/krfb/kinetd/kinetd.h
+++ b/krfb/kinetd/kinetd.h
@@ -57,7 +57,7 @@ private:
 	TQString m_uuid;
 
 	KServerSocket *m_socket;
-	KProcess m_process;
+	TDEProcess m_process;
 
 	KConfig *m_config;
 	KServiceRegistry *m_srvreg;
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc
index d78f7f92..a5c78c42 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cc
@@ -461,7 +461,7 @@ void Configuration::inviteEmail() {
 			.arg(inv.password())
 			.arg(hostname())
 			.arg(5800) // determine with dcop ... later ...
-			.arg(KGlobal::locale()->formatDateTime(inv.expirationTime())));
+			.arg(TDEGlobal::locale()->formatDateTime(inv.expirationTime())));
 }
 
 ////////////// invoke kcontrol module //////////////////////////
diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp
index 14c94bc2..c0cc9aa3 100644
--- a/krfb/krfb/trayicon.cpp
+++ b/krfb/krfb/trayicon.cpp
@@ -54,7 +54,7 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
 	actionCollection(this),
 	quitting(false)
 {
-	KIconLoader *loader = KGlobal::iconLoader();
+	KIconLoader *loader = TDEGlobal::iconLoader();
 	trayIconOpen = loader->loadIcon("eyes-open24", KIcon::User);
 	trayIconClosed = loader->loadIcon("eyes-closed24", KIcon::User);
 	setPixmap(trayIconClosed);
-- 
cgit v1.2.1