From dc5f267664506a312203c26bfe9001a448b0bb0f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 10:49:49 -0600 Subject: Rename KLock and KTrader to avoid conflicts with KDE4 --- kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp | 4 ++-- kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kcontrol/ebrowsing/plugins') diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index 474394108..35a059710 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -126,9 +126,9 @@ void FilterOptions::load( bool useDefaults ) m_favoriteEngines << "google" << "google_groups" << "google_news" << "webster" << "dmoz" << "wikipedia"; m_favoriteEngines = config.readListEntry("FavoriteSearchEngines", m_favoriteEngines); - const KTrader::OfferList services = KTrader::self()->query("SearchProvider"); + const TDETrader::OfferList services = TDETrader::self()->query("SearchProvider"); - for (KTrader::OfferList::ConstIterator it = services.begin(); + for (TDETrader::OfferList::ConstIterator it = services.begin(); it != services.end(); ++it) { displaySearchProvider(new SearchProvider(*it), diff --git a/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp b/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp index 11b7ee692..f2cbdfc6f 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp @@ -71,8 +71,8 @@ SearchProvider *SearchProvider::findByDesktopName(const TQString &name) SearchProvider *SearchProvider::findByKey(const TQString &key) { - KTrader::OfferList providers = - KTrader::self()->query("SearchProvider", TQString("'%1' in Keys").arg(key)); + TDETrader::OfferList providers = + TDETrader::self()->query("SearchProvider", TQString("'%1' in Keys").arg(key)); return providers.count() ? new SearchProvider(providers[0]) : 0; } -- cgit v1.2.1