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

---
 kaddressbook/contacteditorwidgetmanager.cpp | 4 ++--
 kaddressbook/editors/imeditorwidget.cpp     | 2 +-
 kaddressbook/extensionmanager.cpp           | 4 ++--
 kaddressbook/viewmanager.cpp                | 4 ++--
 kaddressbook/xxportmanager.cpp              | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kaddressbook')

diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index e0a282b7..c3bea4b0 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -75,10 +75,10 @@ void ContactEditorWidgetManager::reload()
 {
   mFactories.clear();
   kdDebug(5720) << "ContactEditorWidgetManager::reload()" << endl;
-  const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/ContactEditorWidget",
+  const TDETrader::OfferList plugins = TDETrader::self()->query( "KAddressBook/ContactEditorWidget",
     TQString( "[X-TDE-KAddressBook-CEWPluginVersion] == %1" ).arg( KAB_CEW_PLUGIN_VERSION ) );
 
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
     if ( !factory ) {
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index f8a92e1c..c8047d90 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -167,7 +167,7 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c
   //mWidget->btnDown->setEnabled( false );
   mPreferred = preferredIM;
   mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true );
-  mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) );
+  mProtocols = KPluginInfo::fromServices( TDETrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) );
 
   // order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list
   TQMap<TQString, KPluginInfo *> protocolMap;
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index dea1170e..bd565a84 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -216,10 +216,10 @@ void ExtensionManager::createExtensionWidgets()
   }
 
   // load the other extensions
-  const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension",
+  const TDETrader::OfferList plugins = TDETrader::self()->query( "KAddressBook/Extension",
     TQString( "[X-TDE-KAddressBook-ExtensionPluginVersion] == %1" ).arg( KAB_EXTENSIONWIDGET_PLUGIN_VERSION ) );
 
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
     if ( !factory ) {
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index bfb02760..937f994c 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -386,9 +386,9 @@ void ViewManager::scrollDown()
 
 void ViewManager::createViewFactories()
 {
-  const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View",
+  const TDETrader::OfferList plugins = TDETrader::self()->query( "KAddressBook/View",
     TQString( "[X-TDE-KAddressBook-ViewPluginVersion] == %1" ).arg(  KAB_VIEW_PLUGIN_VERSION ) );
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/View" ) )
       continue;
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 6d6b74e5..ed974311 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -120,9 +120,9 @@ void XXPortManager::loadPlugins()
 {
   mXXPortObjects.clear();
 
-  const KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort",
+  const TDETrader::OfferList plugins = TDETrader::self()->query( "KAddressBook/XXPort",
     TQString( "[X-TDE-KAddressBook-XXPortPluginVersion] == %1" ).arg( KAB_XXPORT_PLUGIN_VERSION ) );
-  KTrader::OfferList::ConstIterator it;
+  TDETrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) )
       continue;
-- 
cgit v1.2.3