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

2 files changed, 7 insertions, 7 deletions

diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
index b8a9c080..71ad871f 100644
--- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
+++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
@@ -115,9 +115,9 @@ void JabberEditAccountWidget::reopen ()
 
 	cbAllowPlainTextPassword->setChecked (account()->configGroup()->readBoolEntry("AllowPlainTextPassword", true));
 
-	KGlobal::config()->setGroup("Jabber");
-	leLocalIP->setText (KGlobal::config()->readEntry("LocalIP", ""));
-	sbLocalPort->setValue (KGlobal::config()->readNumEntry("LocalPort", 8010));
+	TDEGlobal::config()->setGroup("Jabber");
+	leLocalIP->setText (TDEGlobal::config()->readEntry("LocalIP", ""));
+	sbLocalPort->setValue (TDEGlobal::config()->readNumEntry("LocalPort", 8010));
 
 	leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", TQString()));
 
@@ -178,9 +178,9 @@ void JabberEditAccountWidget::writeConfig ()
 
 	account()->setExcludeConnect(cbAutoConnect->isChecked());
 
-	KGlobal::config()->setGroup("Jabber");
-	KGlobal::config()->writeEntry("LocalIP", leLocalIP->text());
-	KGlobal::config()->writeEntry("LocalPort", sbLocalPort->value());
+	TDEGlobal::config()->setGroup("Jabber");
+	TDEGlobal::config()->writeEntry("LocalIP", leLocalIP->text());
+	TDEGlobal::config()->writeEntry("LocalPort", sbLocalPort->value());
 
 	account()->configGroup()->writeEntry("ProxyJID", leProxyJID->text());
 
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index 00f228d5..7cb869e9 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -73,7 +73,7 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent,
 	connect ( jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) );
 	
 	jidRegExp.setPattern ( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" );
-	hintPixmap = KGlobal::iconLoader()->loadIcon ( "jabber_online", KIcon::Small );
+	hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "jabber_online", KIcon::Small );
 
 	mSuccess = false;