diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:49:49 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 10:49:49 -0600 |
commit | dc5f267664506a312203c26bfe9001a448b0bb0f (patch) | |
tree | a78c7f15e87303d22b89619db42fc56ad8f4a046 /kcontrol/ebrowsing/plugins/ikws | |
parent | 98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff) | |
download | tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/ebrowsing/plugins/ikws')
-rw-r--r-- | kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp | 4 | ||||
-rw-r--r-- | kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
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; } |