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

4 files changed, 11 insertions, 11 deletions

diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index d46f8707..bb4766e8 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -348,9 +348,9 @@ void JabberAccount::connectWithPassword ( const TQString &password )
 	m_jabberClient->setAllowPlainTextPassword ( configGroup()->readBoolEntry ( "AllowPlainTextPassword", false ) );
 
 	// enable file transfer (if empty, IP will be set after connection has been established)
-	KGlobal::config()->setGroup ( "Jabber" );
-	m_jabberClient->setFileTransfersEnabled ( true, KGlobal::config()->readEntry ( "LocalIP" ) );
-	setS5BServerPort ( KGlobal::config()->readNumEntry ( "LocalPort", 8010 ) );
+	TDEGlobal::config()->setGroup ( "Jabber" );
+	m_jabberClient->setFileTransfersEnabled ( true, TDEGlobal::config()->readEntry ( "LocalIP" ) );
+	setS5BServerPort ( TDEGlobal::config()->readNumEntry ( "LocalPort", 8010 ) );
 
 	//
 	// Determine system name
diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index 5dac2e18..6ed0bcfd 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -277,7 +277,7 @@ void JabberBaseContact::updateResourceList ()
 		
 		// resource timestamp
 		resourceListStr += TQString ( "<tr><td>%1: %2</td></tr>" ).
-						   arg ( i18n ( "Timestamp" ), KGlobal::locale()->formatDateTime ( (*it)->resource().status().timeStamp(), true, true ) );
+						   arg ( i18n ( "Timestamp" ), TDEGlobal::locale()->formatDateTime ( (*it)->resource().status().timeStamp(), true, true ) );
 
 		// message, if any
 		if ( !(*it)->resource().status().status().stripWhiteSpace().isEmpty () )
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;