Rename KLock and KTrader to avoid conflicts with KDE4

digikam/digikam/albumiconview.cpp

@@ -549,11 +549,11 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos)
     KMimeType::Ptr mimePtr = KMimeType::findByURL(iconItem->imageInfo()->kurl(), 0, true, true);
 
     TQValueVector<KService::Ptr> serviceVector;
-    KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(), "Type == 'Application'");
+    TDETrader::OfferList offers = TDETrader::self()->query(mimePtr->name(), "Type == 'Application'");
 
     TQPopupMenu openWithMenu;
 
-    KTrader::OfferList::Iterator iter;
+    TDETrader::OfferList::Iterator iter;
     KService::Ptr ptr;
     int index = 100;
 
@@ -1120,7 +1120,7 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item)
     {
         KMimeType::Ptr mimePtr = KMimeType::findByURL(item->imageInfo()->kurl(),
                                                       0, true, true);
-        KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(),
+        TDETrader::OfferList offers = TDETrader::self()->query(mimePtr->name(),
                                                            "Type == 'Application'");
 
         if (offers.isEmpty())

digikam/digikam/imagepreviewview.cpp

@@ -342,11 +342,11 @@ void ImagePreviewView::slotContextMenu()
     KMimeType::Ptr mimePtr = KMimeType::findByURL(url, 0, true, true);
 
     TQValueVector<KService::Ptr> serviceVector;
-    KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(), "Type == 'Application'");
+    TDETrader::OfferList offers = TDETrader::self()->query(mimePtr->name(), "Type == 'Application'");
 
     TQPopupMenu openWithMenu;
 
-    KTrader::OfferList::Iterator iter;
+    TDETrader::OfferList::Iterator iter;
     KService::Ptr ptr;
     int index = 100;
 

digikam/tdeioslave/digikamthumbnail.cpp

@@ -545,8 +545,8 @@ bool tdeio_digikamthumbnailProtocol::loadKDEThumbCreator(TQImage& image, const T
 
     TQString plugin;
 
-    KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator");
-    for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
+    TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
+    for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
     {
         TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
         for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)

digikam/utilities/imageeditor/canvas/imagepluginloader.cpp

@@ -92,8 +92,8 @@ ImagePluginLoader::ImagePluginLoader(TQObject *parent, SplashScreen *splash)
  
     TQStringList imagePluginsList2Load;
     
-    KTrader::OfferList offers = KTrader::self()->query("Digikam/ImagePlugin");
-    KTrader::OfferList::ConstIterator iter;
+    TDETrader::OfferList offers = TDETrader::self()->query("Digikam/ImagePlugin");
+    TDETrader::OfferList::ConstIterator iter;
     
     for (iter = offers.begin() ; iter != offers.end() ; ++iter) 
     {
@@ -116,8 +116,8 @@ void ImagePluginLoader::loadPluginsFromList(const TQStringList& list)
     if (d->splash)
         d->splash->message(i18n("Loading Image Plugins"));
 
-    KTrader::OfferList offers = KTrader::self()->query("Digikam/ImagePlugin");
-    KTrader::OfferList::ConstIterator iter;
+    TDETrader::OfferList offers = TDETrader::self()->query("Digikam/ImagePlugin");
+    TDETrader::OfferList::ConstIterator iter;
 
     int cpt = 0;
 
@@ -227,8 +227,8 @@ ImagePlugin* ImagePluginLoader::pluginIsLoaded(const TQString& name)
 
 ImagePlugin* ImagePluginLoader::pluginInstance(const TQString& libraryName)
 {
-    KTrader::OfferList offers = KTrader::self()->query("Digikam/ImagePlugin");
-    KTrader::OfferList::ConstIterator iter;
+    TDETrader::OfferList offers = TDETrader::self()->query("Digikam/ImagePlugin");
+    TDETrader::OfferList::ConstIterator iter;
     
     for(iter = offers.begin(); iter != offers.end(); ++iter)
     {
@@ -245,8 +245,8 @@ ImagePlugin* ImagePluginLoader::pluginInstance(const TQString& libraryName)
 
 bool ImagePluginLoader::pluginLibraryIsLoaded(const TQString& libraryName)
 {
-    KTrader::OfferList offers = KTrader::self()->query("Digikam/ImagePlugin");
-    KTrader::OfferList::ConstIterator iter;
+    TDETrader::OfferList offers = TDETrader::self()->query("Digikam/ImagePlugin");
+    TDETrader::OfferList::ConstIterator iter;
     
     for(iter = offers.begin(); iter != offers.end(); ++iter)
     {

digikam/utilities/lighttable/lighttablepreview.cpp

@@ -356,11 +356,11 @@ void LightTablePreview::slotContextMenu()
     KMimeType::Ptr mimePtr = KMimeType::findByURL(url, 0, true, true);
 
     TQValueVector<KService::Ptr> serviceVector;
-    KTrader::OfferList offers = KTrader::self()->query(mimePtr->name(), "Type == 'Application'");
+    TDETrader::OfferList offers = TDETrader::self()->query(mimePtr->name(), "Type == 'Application'");
 
     TQPopupMenu openWithMenu;
 
-    KTrader::OfferList::Iterator iter;
+    TDETrader::OfferList::Iterator iter;
     KService::Ptr ptr;
     int index = 100;