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

3 files changed, 6 insertions, 6 deletions

diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
index 5fb799c1..8d310bc0 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
@@ -158,9 +158,9 @@ void NetMeetingInvitation::slotTimeout()
 
 void NetMeetingInvitation::startMeeting(const TQString & ip_address)
 {
-	//TODO: use KProcess
+	//TODO: use TDEProcess
 	
-	KConfig *config=KGlobal::config();
+	KConfig *config=TDEGlobal::config();
 	config->setGroup("Netmeeting Plugin");
 	TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address);
 	
@@ -168,7 +168,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address)
 	
 	TQStringList args=TQStringList::split(" ", app);
 	
-	KProcess p;
+	TDEProcess p;
 	for(TQStringList::Iterator it=args.begin() ; it != args.end() ; ++it)
 	{
 		p << *it;
diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp
index 827270f7..2f76b09a 100644
--- a/kopete/plugins/netmeeting/netmeetingplugin.cpp
+++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp
@@ -36,7 +36,7 @@ static const TDEAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting")
 K_EXPORT_COMPONENT_FACTORY( kopete_netmeeting, KGenericFactory<NetMeetingPlugin>( &aboutdata )  )
 
 NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ )
-: Kopete::Plugin( KGlobal::instance(), parent, name )
+: Kopete::Plugin( TDEGlobal::instance(), parent, name )
 {
 	if(MSNProtocol::protocol())
 		slotPluginLoaded(MSNProtocol::protocol());
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index 313eb197..a1801fbf 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -56,7 +56,7 @@ NetmeetingPreferences::~NetmeetingPreferences()
 
 void NetmeetingPreferences::load()
 {
-	KConfig *config=KGlobal::config();
+	KConfig *config=TDEGlobal::config();
 	config->setGroup("Netmeeting Plugin");
 	preferencesDialog->m_app->setCurrentText(config->readEntry("NetmeetingApplication","ekiga -c callto://%1"));
 	emit KCModule::changed(false);
@@ -64,7 +64,7 @@ void NetmeetingPreferences::load()
 
 void NetmeetingPreferences::save()
 {
-	KConfig *config=KGlobal::config();
+	KConfig *config=TDEGlobal::config();
 	config->setGroup("Netmeeting Plugin");
 	config->writeEntry("NetmeetingApplication",preferencesDialog->m_app->currentText());
 	emit KCModule::changed(false);