Rename KLock and KTrader to avoid conflicts with KDE4

kopete/KABC_INTEG_NOTES

@@ -406,7 +406,7 @@ Notes
 
 Client would need to identify addressbook entries that are IM contactable, and obtain status information from an IM app or library.
 
-David Faure says it's possible to do loose lazy binding to the app responsible for providing status information as in 1).  Something to do with KTrader and DCOP.  We would need some DCOP to return status info to the client from the IM app.
+David Faure says it's possible to do loose lazy binding to the app responsible for providing status information as in 1).  Something to do with TDETrader and DCOP.  We would need some DCOP to return status info to the client from the IM app.
 
 Showing the IM status of a contact in KMail, in KAddressBook....
 A "reply-by-IM" action in KMail

kopete/libkopete/kopetepluginmanager.cpp

@@ -91,7 +91,7 @@ PluginManager* PluginManager::self()
 
 PluginManager::PluginManager() : TQObject( tqApp ), d( new Private )
 {
-	d->plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "Kopete/Plugin" ),
+	d->plugins = KPluginInfo::fromServices( TDETrader::self()->query( TQString::fromLatin1( "Kopete/Plugin" ),
 		TQString::fromLatin1( "[X-Kopete-Version] == 1000900" ) ) );
 
 	// We want to add a reference to the application's event loop so we