Rename KLock and KTrader to avoid conflicts with KDE4

ark/arkwidget.cpp

@@ -2276,9 +2276,9 @@ void ArkWidget::showSettings(){
   dialog->addPage(new Addition(0, "Addition"), i18n("Addition"), "ark_addfile", i18n("File Addition Settings"));
   dialog->addPage(new Extraction(0, "Extraction"), i18n("Extraction"), "ark_extract", i18n("Extraction Settings"));
 
-  KTrader::OfferList offers;
+  TDETrader::OfferList offers;
 
-  offers = KTrader::self()->query( "KonqPopupMenu/Plugin", "Library == 'libarkplugin'" );
+  offers = TDETrader::self()->query( "KonqPopupMenu/Plugin", "Library == 'libarkplugin'" );
 
   if ( offers.isEmpty() )
      genPage->kcfg_KonquerorIntegration->setEnabled( false );

kgpg/keyinfowidget.cpp

@@ -342,7 +342,7 @@ void KgpgKeyInfo::finishphotoreadprocess(KProcIO *p)
 
 void KgpgKeyInfo::openPhoto()
 {
-			 KTrader::OfferList offers = KTrader::self()->query("image/jpeg", "Type == 'Application'");
+			 TDETrader::OfferList offers = TDETrader::self()->query("image/jpeg", "Type == 'Application'");
  			KService::Ptr ptr = offers.first();
  			//KMessageBox::sorry(0,ptr->desktopEntryName());
                         KProcIO *p=new KProcIO();

kgpg/listkeys.cpp

@@ -1606,7 +1606,7 @@ void listKeys::showKeyInfo(TQString keyID)
 
 void listKeys::slotShowPhoto()
 {
-        KTrader::OfferList offers = KTrader::self()->query("image/jpeg", "Type == 'Application'");
+        TDETrader::OfferList offers = TDETrader::self()->query("image/jpeg", "Type == 'Application'");
         KService::Ptr ptr = offers.first();
         //KMessageBox::sorry(0,ptr->desktopEntryName());
         KProcIO *p=new KProcIO(TQTextCodec::codecForLocale());