diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 10:49:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 10:49:49 -0600 |
| commit | dc5f267664506a312203c26bfe9001a448b0bb0f (patch) | |
| tree | a78c7f15e87303d22b89619db42fc56ad8f4a046 /konqueror/konq_factory.cc | |
| parent | 98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff) | |
| download | tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip | |
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_factory.cc')
| -rw-r--r-- | konqueror/konq_factory.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index 4f7fdf842..c730991b5 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -86,14 +86,14 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha KonqViewFactory KonqFactory::createView( const TQString &serviceType, const TQString &serviceName, KService::Ptr *serviceImpl, - KTrader::OfferList *partServiceOffers, - KTrader::OfferList *appServiceOffers, + TDETrader::OfferList *partServiceOffers, + TDETrader::OfferList *appServiceOffers, bool forceAutoEmbed ) { kdDebug(1202) << "Trying to create view for \"" << serviceType << "\"" << endl; // We need to get those in any case - KTrader::OfferList offers, appOffers; + TDETrader::OfferList offers, appOffers; // Query the trader getOffers( serviceType, &offers, &appOffers ); @@ -126,7 +126,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType, // Look for this service if ( !serviceName.isEmpty() ) { - KTrader::OfferList::Iterator it = offers.begin(); + TDETrader::OfferList::Iterator it = offers.begin(); for ( ; it != offers.end() && !service ; ++it ) { if ( (*it)->desktopEntryName() == serviceName ) @@ -149,7 +149,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType, .arg(service->name()).arg(KLibLoader::self()->lastErrorMessage())); } - KTrader::OfferList::Iterator it = offers.begin(); + TDETrader::OfferList::Iterator it = offers.begin(); for ( ; !factory && it != offers.end() ; ++it ) { service = (*it); @@ -193,19 +193,19 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType, } void KonqFactory::getOffers( const TQString & serviceType, - KTrader::OfferList *partServiceOffers, - KTrader::OfferList *appServiceOffers ) + TDETrader::OfferList *partServiceOffers, + TDETrader::OfferList *appServiceOffers ) { if ( appServiceOffers ) { - *appServiceOffers = KTrader::self()->query( serviceType, "Application", + *appServiceOffers = TDETrader::self()->query( serviceType, "Application", "DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'", TQString::null ); } if ( partServiceOffers ) { - *partServiceOffers = KTrader::self()->query( serviceType, "KParts/ReadOnlyPart", + *partServiceOffers = TDETrader::self()->query( serviceType, "KParts/ReadOnlyPart", TQString::null, TQString::null ); } } |