From 0c9d97065a3d6ceb12d687555a1a33d90db96238 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 10:51:32 -0600
Subject: Rename KLock and KTrader to avoid conflicts with KDE4

---
 tdeparts/componentfactory.h  | 8 ++++----
 tdeparts/tests/ghostview.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tdeparts')

diff --git a/tdeparts/componentfactory.h b/tdeparts/componentfactory.h
index 6d1b7876b..20b3ebee8 100644
--- a/tdeparts/componentfactory.h
+++ b/tdeparts/componentfactory.h
@@ -307,7 +307,7 @@ namespace KParts
          * \endcode
          *
          * @param serviceType the type of service for which to find a plugin
-         * @param constraint an optional constraint to pass to the trader (see TDEIO::KTrader)
+         * @param constraint an optional constraint to pass to the trader (see TDEIO::TDETrader)
          * @param parent the parent object for the part itself
          * @param name the name that will be given to the part
          * @param args A list of string arguments, passed to the factory and possibly
@@ -325,7 +325,7 @@ namespace KParts
                                            const TQStringList &args = TQStringList(),
                                            int *error = 0 )
         {
-            KTrader::OfferList offers = KTrader::self()->query( serviceType, constraint );
+            TDETrader::OfferList offers = TDETrader::self()->query( serviceType, constraint );
             if ( offers.isEmpty() )
             {
                 if ( error )
@@ -354,7 +354,7 @@ namespace KParts
          * \endcode
          *
          * @param serviceType the type of service for which to find a part, e.g. a mimetype
-         * @param constraint an optional constraint to pass to the trader (see KTrader)
+         * @param constraint an optional constraint to pass to the trader (see TDETrader)
          * @param parentWidget the parent widget, will be set as the parent of the part's widget
          * @param widgetName the name that will be given to the part's widget
          * @param parent the parent object for the part itself
@@ -376,7 +376,7 @@ namespace KParts
                                                const TQStringList &args = TQStringList(),
                                                int *error = 0 )
         {
-            KTrader::OfferList offers = KTrader::self()->query( serviceType, TQString::fromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
+            TDETrader::OfferList offers = TDETrader::self()->query( serviceType, TQString::fromLatin1("KParts/ReadOnlyPart"), constraint, TQString::null );
             if ( offers.isEmpty() )
             {
                 if ( error )
diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index d63002d53..c94823aaf 100644
--- a/tdeparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
@@ -26,11 +26,11 @@ Shell::Shell()
   KAction * paQuit = new KAction( "&Quit" , "exit", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" );
 
   // Try to find a postscript component first
-  KTrader::OfferList offers = KTrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)");
+  TDETrader::OfferList offers = TDETrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)");
 
   KLibFactory *factory = 0;
   m_gvpart = 0;
-  KTrader::OfferList::Iterator it(offers.begin());
+  TDETrader::OfferList::Iterator it(offers.begin());
   for( ; it != offers.end(); ++it)
   {
     KService::Ptr ptr = (*it);
-- 
cgit v1.2.1