Rename KLock and KTrader to avoid conflicts with KDE4

3 files changed, 8 insertions, 8 deletions

diff --git a/tdehtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index 5934afd3e..03bc22987 100644
--- a/tdehtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -291,9 +291,9 @@ PluginBase::PluginBase(ExecState *exec, bool loadPluginInfo)
         plugins->setAutoDelete( true );
         mimes->setAutoDelete( true );
 
-        // read in using KTrader
-        KTrader::OfferList offers = KTrader::self()->query("Browser/View");
-        KTrader::OfferList::iterator it;
+        // read in using TDETrader
+        TDETrader::OfferList offers = TDETrader::self()->query("Browser/View");
+        TDETrader::OfferList::iterator it;
         for ( it = offers.begin(); it != offers.end(); ++it ) {
 
             TQVariant pluginsinfo = (**it).property( "X-TDE-BrowserView-PluginsInfo" );
diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 66e2fda75..64bef11dc 100644
--- a/tdehtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -812,7 +812,7 @@ void RenderPartObject::updateWidget()
                   // It is ActiveX, but the nsplugin system handling
                   // should also work, that's why we don't override the
                   // serviceType with application/x-activex-handler
-                  // but let the KTrader in tdehtmlpart::createPart() detect
+                  // but let the TDETrader in tdehtmlpart::createPart() detect
                   // the user's preference: launch with activex viewer or
                   // with nspluginviewer (Niko)
                   serviceType = "application/x-shockwave-flash";
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index b74984aaf..059763c6a 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -4652,20 +4652,20 @@ KParts::ReadOnlyPart *TDEHTMLPart::createPart( TQWidget *parentWidget, const cha
   if ( !serviceName.isEmpty() )
     constr.append( TQString::fromLatin1( "Name == '%1'" ).arg( serviceName ) );
 
-  KTrader::OfferList offers = KTrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() );
+  TDETrader::OfferList offers = TDETrader::self()->query( mimetype, "KParts/ReadOnlyPart", constr, TQString() );
 
   if ( offers.isEmpty() ) {
     int pos = mimetype.find( "-plugin" );
     if (pos < 0)
         return 0L;
     TQString stripped_mime = mimetype.left( pos );
-    offers = KTrader::self()->query( stripped_mime, "KParts/ReadOnlyPart", constr, TQString() );
+    offers = TDETrader::self()->query( stripped_mime, "KParts/ReadOnlyPart", constr, TQString() );
     if ( offers.isEmpty() )
         return 0L;
   }
 
-  KTrader::OfferList::ConstIterator it = offers.begin();
-  const KTrader::OfferList::ConstIterator itEnd = offers.end();
+  TDETrader::OfferList::ConstIterator it = offers.begin();
+  const TDETrader::OfferList::ConstIterator itEnd = offers.end();
   for ( ; it != itEnd; ++it )
   {
     KService::Ptr service = (*it);