TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KLock and KTrader to avoid conflicts with KDE4

Browse Source
pull/2/head
Timothy Pearson 11 years ago
parent 98f4a055ba
commit dc5f267664
34 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File

6
kate/app/katemainwindow.cpp
Unescape View File

@ -602,9 +602,9 @@ void KateMainWindow::mSlotFixOpenWithMenu()
KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() ); KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() );
//kdDebug(13001)<<"13000"<<"url: "<<m_viewManager->activeView()->getDoc()->url().prettyURL()<<"mime type: "<<mime->name()<<endl; //kdDebug(13001)<<"13000"<<"url: "<<m_viewManager->activeView()->getDoc()->url().prettyURL()<<"mime type: "<<mime->name()<<endl;
// some checking goes here... // some checking goes here...
KTrader::OfferList offers = KTrader::self()->query(mime->name(), "Type == 'Application'"); TDETrader::OfferList offers = TDETrader::self()->query(mime->name(), "Type == 'Application'");
// for each one, insert a menu item... // for each one, insert a menu item...
for(KTrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it) { for(TDETrader::OfferList::Iterator it = offers.begin(); it != offers.end(); ++it) {
if ((*it)->name() == "Kate") continue; if ((*it)->name() == "Kate") continue;
documentOpenWith->popupMenu()->insertItem( SmallIcon( (*it)->icon() ), (*it)->name() ); documentOpenWith->popupMenu()->insertItem( SmallIcon( (*it)->icon() ), (*it)->name() );
} }
@ -629,7 +629,7 @@ void KateMainWindow::slotOpenWithMenuAction(int idx)
TQString qry = TQString("((Type == 'Application') and (Name == '%1'))").arg( appname.latin1() ); TQString qry = TQString("((Type == 'Application') and (Name == '%1'))").arg( appname.latin1() );
KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() ); KMimeType::Ptr mime = KMimeType::findByURL( m_viewManager->activeView()->getDoc()->url() );
KTrader::OfferList offers = KTrader::self()->query(mime->name(), qry); TDETrader::OfferList offers = TDETrader::self()->query(mime->name(), qry);
if (!offers.isEmpty()) { if (!offers.isEmpty()) {
KService::Ptr app = offers.first(); KService::Ptr app = offers.first();

4
kate/app/katepluginmanager.cpp
Unescape View File

@ -57,9 +57,9 @@ KatePluginManager *KatePluginManager::self()
void KatePluginManager::setupPluginList () void KatePluginManager::setupPluginList ()
{ {
TQValueList<KService::Ptr> traderList= KTrader::self()->query("Kate/Plugin", "(not ('Kate/ProjectPlugin' in ServiceTypes)) and (not ('Kate/InitPlugin' in ServiceTypes))"); TQValueList<KService::Ptr> traderList= TDETrader::self()->query("Kate/Plugin", "(not ('Kate/ProjectPlugin' in ServiceTypes)) and (not ('Kate/InitPlugin' in ServiceTypes))");
for(KTrader::OfferList::Iterator it(traderList.begin()); it != traderList.end(); ++it) for(TDETrader::OfferList::Iterator it(traderList.begin()); it != traderList.end(); ++it)
{ {
KService::Ptr ptr = (*it); KService::Ptr ptr = (*it);

6
kcontrol/componentchooser/componentchooser.cpp
Unescape View File

@ -62,7 +62,7 @@ void CfgComponent::slotComponentChanged(const TQString&) {
} }
void CfgComponent::save(TDEConfig *cfg) { void CfgComponent::save(TDEConfig *cfg) {
// yes, this can happen if there are NO KTrader offers for this component // yes, this can happen if there are NO TDETrader offers for this component
if (!m_lookupDict[ComponentSelector->currentText()]) if (!m_lookupDict[ComponentSelector->currentText()])
return; return;
@ -84,9 +84,9 @@ void CfgComponent::load(TDEConfig *cfg) {
TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure"); TQString ServiceTypeToConfigure=cfg->readEntry("ServiceTypeToConfigure");
TQString MimeTypeOfInterest=cfg->readEntry("MimeTypeOfInterest"); TQString MimeTypeOfInterest=cfg->readEntry("MimeTypeOfInterest");
KTrader::OfferList offers = KTrader::self()->query(MimeTypeOfInterest, "'"+ServiceTypeToConfigure+"' in ServiceTypes"); TDETrader::OfferList offers = TDETrader::self()->query(MimeTypeOfInterest, "'"+ServiceTypeToConfigure+"' in ServiceTypes");
for (KTrader::OfferList::Iterator tit = offers.begin(); tit != offers.end(); ++tit) for (TDETrader::OfferList::Iterator tit = offers.begin(); tit != offers.end(); ++tit)
{ {
ComponentSelector->insertItem((*tit)->name()); ComponentSelector->insertItem((*tit)->name());
m_lookupDict.insert((*tit)->name(),new TQString((*tit)->desktopEntryName())); m_lookupDict.insert((*tit)->name(),new TQString((*tit)->desktopEntryName()));

4
kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
Unescape View File

@ -126,9 +126,9 @@ void FilterOptions::load( bool useDefaults )
m_favoriteEngines << "google" << "google_groups" << "google_news" << "webster" << "dmoz" << "wikipedia"; m_favoriteEngines << "google" << "google_groups" << "google_news" << "webster" << "dmoz" << "wikipedia";
m_favoriteEngines = config.readListEntry("FavoriteSearchEngines", m_favoriteEngines); 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) it != services.end(); ++it)
{ {
displaySearchProvider(new SearchProvider(*it), displaySearchProvider(new SearchProvider(*it),

4
kcontrol/ebrowsing/plugins/ikws/searchprovider.cpp
Unescape View File

@ -71,8 +71,8 @@ SearchProvider *SearchProvider::findByDesktopName(const TQString &name)
SearchProvider *SearchProvider::findByKey(const TQString &key) SearchProvider *SearchProvider::findByKey(const TQString &key)
{ {
KTrader::OfferList providers = TDETrader::OfferList providers =
KTrader::self()->query("SearchProvider", TQString("'%1' in Keys").arg(key)); TDETrader::self()->query("SearchProvider", TQString("'%1' in Keys").arg(key));
return providers.count() ? new SearchProvider(providers[0]) : 0; return providers.count() ? new SearchProvider(providers[0]) : 0;
} }

2
kcontrol/filetypes/kserviceselectdlg.cpp
Unescape View File

@ -35,7 +35,7 @@ KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQS
new TQLabel( i18n( "Select service:" ), vbox ); new TQLabel( i18n( "Select service:" ), vbox );
m_listbox=new KListBox( vbox ); m_listbox=new KListBox( vbox );
// Can't make a KTrader query since we don't have a servicetype to give, // Can't make a TDETrader query since we don't have a servicetype to give,
// we want all services that are not applications....... // we want all services that are not applications.......
// So we have to do it the slow way // So we have to do it the slow way
// ### Why can't we query for KParts/ReadOnlyPart as the servicetype? Should work fine! // ### Why can't we query for KParts/ReadOnlyPart as the servicetype? Should work fine!

4
kcontrol/konq/desktopbehavior_impl.cpp
Unescape View File

@ -305,10 +305,10 @@ void DesktopBehavior::load( bool useDefaults )
bool bShowHidden = g_pConfig->readBoolEntry("ShowHidden", DEFAULT_SHOW_HIDDEN_ROOT_ICONS); bool bShowHidden = g_pConfig->readBoolEntry("ShowHidden", DEFAULT_SHOW_HIDDEN_ROOT_ICONS);
showHiddenBox->setChecked(bShowHidden); showHiddenBox->setChecked(bShowHidden);
//bool bVertAlign = g_pConfig->readBoolEntry("VertAlign", DEFAULT_VERT_ALIGN); //bool bVertAlign = g_pConfig->readBoolEntry("VertAlign", DEFAULT_VERT_ALIGN);
KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
previewListView->clear(); previewListView->clear();
TQStringList previews = g_pConfig->readListEntry("Preview"); TQStringList previews = g_pConfig->readListEntry("Preview");
for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName())); new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName()));
new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/")); new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/"));
// //

6
kcontrol/tdeio/fakeuaprovider.cpp
Unescape View File

@ -71,15 +71,15 @@ FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString
void FakeUASProvider::loadFromDesktopFiles() void FakeUASProvider::loadFromDesktopFiles()
{ {
m_providers.clear(); m_providers.clear();
m_providers = KTrader::self()->query("UserAgentStrings"); m_providers = TDETrader::self()->query("UserAgentStrings");
} }
void FakeUASProvider::parseDescription() void FakeUASProvider::parseDescription()
{ {
TQString tmp; TQString tmp;
KTrader::OfferList::ConstIterator it = m_providers.begin(); TDETrader::OfferList::ConstIterator it = m_providers.begin();
KTrader::OfferList::ConstIterator lastItem = m_providers.end(); TDETrader::OfferList::ConstIterator lastItem = m_providers.end();
for ( ; it != lastItem; ++it ) for ( ; it != lastItem; ++it )
{ {

2
kcontrol/tdeio/fakeuaprovider.h
Unescape View File

@ -49,7 +49,7 @@ protected:
void parseDescription(); void parseDescription();
private: private:
KTrader::OfferList m_providers; TDETrader::OfferList m_providers;
TQStringList m_lstIdentity; TQStringList m_lstIdentity;
TQStringList m_lstAlias; TQStringList m_lstAlias;
bool m_bIsDirty; bool m_bIsDirty;

2
kfind/kftabdlg.cpp
Unescape View File

@ -272,7 +272,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
TQToolTip::add(binaryContextCb,binaryTooltip); TQToolTip::add(binaryContextCb,binaryTooltip);
TQPushButton* editRegExp = 0; TQPushButton* editRegExp = 0;
if ( !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { if ( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) {
// The editor is available, so lets use it. // The editor is available, so lets use it.
editRegExp = new TQPushButton(i18n("&Edit..."), pages[2], "editRegExp"); editRegExp = new TQPushButton(i18n("&Edit..."), pages[2], "editRegExp");
} }

2
kicker/kicker/ui/k_new_mnu.cpp
Unescape View File

@ -2122,7 +2122,7 @@ void KMenu::initSearch()
if (!m_search_plugin) { if (!m_search_plugin) {
m_search_plugin_interface = new TQObject( this, "m_search_plugin_interface" ); m_search_plugin_interface = new TQObject( this, "m_search_plugin_interface" );
new MyKickoffSearchInterface( this, m_search_plugin_interface, "kickoffsearch interface" ); new MyKickoffSearchInterface( this, m_search_plugin_interface, "kickoffsearch interface" );
KTrader::OfferList offers = KTrader::self()->query("KickoffSearch/Plugin"); TDETrader::OfferList offers = TDETrader::self()->query("KickoffSearch/Plugin");
KService::Ptr service = *offers.begin(); KService::Ptr service = *offers.begin();
if (service) { if (service) {

2
klipper/configdialog.cpp
Unescape View File

@ -284,7 +284,7 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
listView->setSorting( -1 ); // newly inserted items just append unsorted listView->setSorting( -1 ); // newly inserted items just append unsorted
cbUseGUIRegExpEditor = new TQCheckBox( i18n("&Use graphical editor for editing regular expressions" ), this ); cbUseGUIRegExpEditor = new TQCheckBox( i18n("&Use graphical editor for editing regular expressions" ), this );
if ( KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) if ( TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() )
{ {
cbUseGUIRegExpEditor->hide(); cbUseGUIRegExpEditor->hide();
cbUseGUIRegExpEditor->setChecked( false ); cbUseGUIRegExpEditor->setChecked( false );

6
konqueror/client/kfmclient.cc
Unescape View File

@ -165,7 +165,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
is configured to reuse always, is configured to reuse always,
or it's not configured to never reuse, and the URL to-be-opened is "safe". or it's not configured to never reuse, and the URL to-be-opened is "safe".
The URL is safe, if the view used to view it is listed in the allowed KPart's. The URL is safe, if the view used to view it is listed in the allowed KPart's.
In order to find out the part, mimetype is needed, and KTrader is needed. In order to find out the part, mimetype is needed, and TDETrader is needed.
If mimetype is not known, KMimeType is used (which doesn't work e.g. for remote If mimetype is not known, KMimeType is used (which doesn't work e.g. for remote
URLs, but oh well). Since this function may be running without a TDEApplication URLs, but oh well). Since this function may be running without a TDEApplication
instance, I'm actually quite surprised it works, and it may sooner or later break. instance, I'm actually quite surprised it works, and it may sooner or later break.
@ -222,7 +222,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString&
} }
if( mimetype.isEmpty()) if( mimetype.isEmpty())
mimetype = KMimeType::findByURL( KURL( url ) )->name(); mimetype = KMimeType::findByURL( KURL( url ) )->name();
KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ), TDETrader::OfferList offers = TDETrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ),
TQString::null, TQString::null ); TQString::null, TQString::null );
KService::Ptr serv; KService::Ptr serv;
if( offers.count() > 0 ) if( offers.count() > 0 )
@ -529,7 +529,7 @@ bool clientApp::doIt()
{ {
KURL::List urls; KURL::List urls;
urls.append( args->url(1) ); urls.append( args->url(1) );
const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null ); const TDETrader::OfferList offers = TDETrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null );
if (offers.isEmpty()) return 1; if (offers.isEmpty()) return 1;
KService::Ptr serv = offers.first(); KService::Ptr serv = offers.first();
return KRun::run( *serv, urls ); return KRun::run( *serv, urls );

4
konqueror/iconview/konq_iconview.cc
Unescape View File

@ -226,9 +226,9 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
m_pamPreview->insert( m_paEnablePreviews ); m_pamPreview->insert( m_paEnablePreviews );
m_pamPreview->insert( new KActionSeparator(this) ); m_pamPreview->insert( new KActionSeparator(this) );
KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" ); TDETrader::OfferList plugins = TDETrader::self()->query( "ThumbCreator" );
TQMap< TQString, KToggleAction* > previewActions; TQMap< TQString, KToggleAction* > previewActions;
for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it ) for ( TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
{ {
if ( KToggleAction*& preview = previewActions[ ( *it )->name() ] ) if ( KToggleAction*& preview = previewActions[ ( *it )->name() ] )
preview->setName( TQCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() ); preview->setName( TQCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() );

18
konqueror/konq_factory.cc
Unescape View File

@ -86,14 +86,14 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const cha
KonqViewFactory KonqFactory::createView( const TQString &serviceType, KonqViewFactory KonqFactory::createView( const TQString &serviceType,
const TQString &serviceName, const TQString &serviceName,
KService::Ptr *serviceImpl, KService::Ptr *serviceImpl,
KTrader::OfferList *partServiceOffers, TDETrader::OfferList *partServiceOffers,
KTrader::OfferList *appServiceOffers, TDETrader::OfferList *appServiceOffers,
bool forceAutoEmbed ) bool forceAutoEmbed )
{ {
kdDebug(1202) << "Trying to create view for \"" << serviceType << "\"" << endl; kdDebug(1202) << "Trying to create view for \"" << serviceType << "\"" << endl;
// We need to get those in any case // We need to get those in any case
KTrader::OfferList offers, appOffers; TDETrader::OfferList offers, appOffers;
// Query the trader // Query the trader
getOffers( serviceType, &offers, &appOffers ); getOffers( serviceType, &offers, &appOffers );
@ -126,7 +126,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
// Look for this service // Look for this service
if ( !serviceName.isEmpty() ) if ( !serviceName.isEmpty() )
{ {
KTrader::OfferList::Iterator it = offers.begin(); TDETrader::OfferList::Iterator it = offers.begin();
for ( ; it != offers.end() && !service ; ++it ) for ( ; it != offers.end() && !service ; ++it )
{ {
if ( (*it)->desktopEntryName() == serviceName ) if ( (*it)->desktopEntryName() == serviceName )
@ -149,7 +149,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
.arg(service->name()).arg(KLibLoader::self()->lastErrorMessage())); .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 ) for ( ; !factory && it != offers.end() ; ++it )
{ {
service = (*it); service = (*it);
@ -193,19 +193,19 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType,
} }
void KonqFactory::getOffers( const TQString & serviceType, void KonqFactory::getOffers( const TQString & serviceType,
KTrader::OfferList *partServiceOffers, TDETrader::OfferList *partServiceOffers,
KTrader::OfferList *appServiceOffers ) TDETrader::OfferList *appServiceOffers )
{ {
if ( 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'", "DesktopEntryName != 'kfmclient' and DesktopEntryName != 'kfmclient_dir' and DesktopEntryName != 'kfmclient_html'",
TQString::null ); TQString::null );
} }
if ( partServiceOffers ) if ( partServiceOffers )
{ {
*partServiceOffers = KTrader::self()->query( serviceType, "KParts/ReadOnlyPart", *partServiceOffers = TDETrader::self()->query( serviceType, "KParts/ReadOnlyPart",
TQString::null, TQString::null ); TQString::null, TQString::null );
} }
} }

8
konqueror/konq_factory.h
Unescape View File

@ -69,13 +69,13 @@ public:
static KonqViewFactory createView( const TQString &serviceType, static KonqViewFactory createView( const TQString &serviceType,
const TQString &serviceName = TQString::null, const TQString &serviceName = TQString::null,
KService::Ptr *serviceImpl = 0, KService::Ptr *serviceImpl = 0,
KTrader::OfferList *partServiceOffers = 0, TDETrader::OfferList *partServiceOffers = 0,
KTrader::OfferList *appServiceOffers = 0, TDETrader::OfferList *appServiceOffers = 0,
bool forceAutoEmbed = false ); bool forceAutoEmbed = false );
static void getOffers( const TQString & serviceType, static void getOffers( const TQString & serviceType,
KTrader::OfferList *partServiceOffers = 0, TDETrader::OfferList *partServiceOffers = 0,
KTrader::OfferList *appServiceOffers = 0); TDETrader::OfferList *appServiceOffers = 0);
static const TDEAboutData* aboutData(); static const TDEAboutData* aboutData();

14
konqueror/konq_guiclients.cc
Unescape View File

@ -28,7 +28,7 @@
#include <kiconloader.h> #include <kiconloader.h>
PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow, PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
const KTrader::OfferList &embeddingServices, const TDETrader::OfferList &embeddingServices,
bool showEmbeddingServices, bool doTabHandling ) bool showEmbeddingServices, bool doTabHandling )
{ {
//giving a name to each guiclient: just for debugging //giving a name to each guiclient: just for debugging
@ -66,8 +66,8 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
if ( showEmbeddingServices ) if ( showEmbeddingServices )
{ {
KTrader::OfferList::ConstIterator it = embeddingServices.begin(); TDETrader::OfferList::ConstIterator it = embeddingServices.begin();
KTrader::OfferList::ConstIterator end = embeddingServices.end(); TDETrader::OfferList::ConstIterator end = embeddingServices.end();
if ( embeddingServices.count() == 1 ) if ( embeddingServices.count() == 1 )
{ {
@ -166,8 +166,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
m_mainWindow = mainWindow; m_mainWindow = mainWindow;
m_actions.setAutoDelete( true ); m_actions.setAutoDelete( true );
KTrader::OfferList offers = KTrader::self()->query( "Browser/View" ); TDETrader::OfferList offers = TDETrader::self()->query( "Browser/View" );
KTrader::OfferList::Iterator it = offers.begin(); TDETrader::OfferList::Iterator it = offers.begin();
while ( it != offers.end() ) while ( it != offers.end() )
{ {
TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" ); TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" );
@ -188,8 +188,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
if ( m_empty ) if ( m_empty )
return; return;
KTrader::OfferList::ConstIterator cIt = offers.begin(); TDETrader::OfferList::ConstIterator cIt = offers.begin();
KTrader::OfferList::ConstIterator cEnd = offers.end(); TDETrader::OfferList::ConstIterator cEnd = offers.end();
for (; cIt != cEnd; ++cIt ) for (; cIt != cEnd; ++cIt )
{ {
TQString description = i18n( "Show %1" ).arg( (*cIt)->name() ); TQString description = i18n( "Show %1" ).arg( (*cIt)->name() );

2
konqueror/konq_guiclients.h
Unescape View File

@ -55,7 +55,7 @@ class KonqView;
class PopupMenuGUIClient : public KXMLGUIClient class PopupMenuGUIClient : public KXMLGUIClient
{ {
public: public:
PopupMenuGUIClient( KonqMainWindow *mainWindow, const KTrader::OfferList &embeddingServices, PopupMenuGUIClient( KonqMainWindow *mainWindow, const TDETrader::OfferList &embeddingServices,
bool isIntoTrash, bool doTabHandling ); bool isIntoTrash, bool doTabHandling );
virtual ~PopupMenuGUIClient(); virtual ~PopupMenuGUIClient();

26
konqueror/konq_mainwindow.cc
Unescape View File

@ -1571,9 +1571,9 @@ void KonqMainWindow::slotOpenWith()
TQString serviceName = TQT_TQOBJECT_CONST(sender())->name(); TQString serviceName = TQT_TQOBJECT_CONST(sender())->name();
KTrader::OfferList offers = m_currentView->appServiceOffers(); TDETrader::OfferList offers = m_currentView->appServiceOffers();
KTrader::OfferList::ConstIterator it = offers.begin(); TDETrader::OfferList::ConstIterator it = offers.begin();
KTrader::OfferList::ConstIterator end = offers.end(); TDETrader::OfferList::ConstIterator end = offers.end();
for (; it != end; ++it ) for (; it != end; ++it )
if ( (*it)->desktopEntryName() == serviceName ) if ( (*it)->desktopEntryName() == serviceName )
{ {
@ -1615,9 +1615,9 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
// iterate over all services, update the toolbar service map // iterate over all services, update the toolbar service map
// and check if we can do a quick property-based viewmode change // and check if we can do a quick property-based viewmode change
const KTrader::OfferList offers = m_currentView->partServiceOffers(); const TDETrader::OfferList offers = m_currentView->partServiceOffers();
KTrader::OfferList::ConstIterator oIt = offers.begin(); TDETrader::OfferList::ConstIterator oIt = offers.begin();
KTrader::OfferList::ConstIterator oEnd = offers.end(); TDETrader::OfferList::ConstIterator oEnd = offers.end();
const TQString currentServiceKey = viewModeActionKey( m_currentView->service() ); const TQString currentServiceKey = viewModeActionKey( m_currentView->service() );
for (; oIt != oEnd; ++oIt ) for (; oIt != oEnd; ++oIt )
{ {
@ -4725,7 +4725,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
TQString currentServiceName = currentView->service()->desktopEntryName(); TQString currentServiceName = currentView->service()->desktopEntryName();
// List of services for the "Preview In" submenu. // List of services for the "Preview In" submenu.
m_popupEmbeddingServices = KTrader::self()->query( m_popupEmbeddingServices = TDETrader::self()->query(
m_popupServiceType, m_popupServiceType,
"KParts/ReadOnlyPart", "KParts/ReadOnlyPart",
// Obey "HideFromMenus". It defaults to false so we want "absent or true" // Obey "HideFromMenus". It defaults to false so we want "absent or true"
@ -5032,9 +5032,9 @@ void KonqMainWindow::updateOpenWithActions()
if (!kapp->authorizeKAction("openwith")) if (!kapp->authorizeKAction("openwith"))
return; return;
const KTrader::OfferList & services = m_currentView->appServiceOffers(); const TDETrader::OfferList & services = m_currentView->appServiceOffers();
KTrader::OfferList::ConstIterator it = services.begin(); TDETrader::OfferList::ConstIterator it = services.begin();
KTrader::OfferList::ConstIterator end = services.end(); TDETrader::OfferList::ConstIterator end = services.end();
for (; it != end; ++it ) for (; it != end; ++it )
{ {
KAction *action = new KAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() ); KAction *action = new KAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() );
@ -5089,7 +5089,7 @@ void KonqMainWindow::updateViewModeActions()
m_viewModeToolBarServices.clear(); m_viewModeToolBarServices.clear();
} }
KTrader::OfferList services = m_currentView->partServiceOffers(); TDETrader::OfferList services = m_currentView->partServiceOffers();
if ( services.count() <= 1 ) if ( services.count() <= 1 )
return; return;
@ -5110,8 +5110,8 @@ void KonqMainWindow::updateViewModeActions()
TDEConfig * config = TDEGlobal::config(); TDEConfig * config = TDEGlobal::config();
config->setGroup( "ModeToolBarServices" ); config->setGroup( "ModeToolBarServices" );
KTrader::OfferList::ConstIterator it = services.begin(); TDETrader::OfferList::ConstIterator it = services.begin();
KTrader::OfferList::ConstIterator end = services.end(); TDETrader::OfferList::ConstIterator end = services.end();
for (; it != end; ++it ) for (; it != end; ++it )
{ {
TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" ); TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" );

2
konqueror/konq_mainwindow.h
Unescape View File

@ -734,7 +734,7 @@ private:
ToggleViewGUIClient *m_toggleViewGUIClient; ToggleViewGUIClient *m_toggleViewGUIClient;
KTrader::OfferList m_popupEmbeddingServices; TDETrader::OfferList m_popupEmbeddingServices;
TQString m_popupService; TQString m_popupService;
TQString m_popupServiceType; TQString m_popupServiceType;
KURL m_popupURL; KURL m_popupURL;

6
konqueror/konq_view.cc
Unescape View File

@ -59,8 +59,8 @@ KonqView::KonqView( KonqViewFactory &viewFactory,
KonqFrame* viewFrame, KonqFrame* viewFrame,
KonqMainWindow *mainWindow, KonqMainWindow *mainWindow,
const KService::Ptr &service, const KService::Ptr &service,
const KTrader::OfferList &partServiceOffers, const TDETrader::OfferList &partServiceOffers,
const KTrader::OfferList &appServiceOffers, const TDETrader::OfferList &appServiceOffers,
const TQString &serviceType, const TQString &serviceType,
bool passiveMode bool passiveMode
) )
@ -325,7 +325,7 @@ bool KonqView::changeViewMode( const TQString &serviceType,
} }
kdDebug(1202) << "Switching view modes..." << endl; kdDebug(1202) << "Switching view modes..." << endl;
KTrader::OfferList partServiceOffers, appServiceOffers; TDETrader::OfferList partServiceOffers, appServiceOffers;
KService::Ptr service = 0L; KService::Ptr service = 0L;
KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, forceAutoEmbed ); KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, forceAutoEmbed );

12
konqueror/konq_view.h
Unescape View File

@ -82,8 +82,8 @@ public:
KonqFrame* viewFrame, KonqFrame* viewFrame,
KonqMainWindow * mainWindow, KonqMainWindow * mainWindow,
const KService::Ptr &service, const KService::Ptr &service,
const KTrader::OfferList &partServiceOffers, const TDETrader::OfferList &partServiceOffers,
const KTrader::OfferList &appServiceOffers, const TDETrader::OfferList &appServiceOffers,
const TQString &serviceType, const TQString &serviceType,
bool passiveMode); bool passiveMode);
@ -281,8 +281,8 @@ public:
TQString caption() const { return m_caption; } TQString caption() const { return m_caption; }
KTrader::OfferList partServiceOffers() { return m_partServiceOffers; } TDETrader::OfferList partServiceOffers() { return m_partServiceOffers; }
KTrader::OfferList appServiceOffers() { return m_appServiceOffers; } TDETrader::OfferList appServiceOffers() { return m_appServiceOffers; }
KonqMainWindow *mainWindow() const { return m_pMainWindow; } KonqMainWindow *mainWindow() const { return m_pMainWindow; }
@ -465,8 +465,8 @@ private:
uint m_bBackRightClick:1; uint m_bBackRightClick:1;
uint m_bHierarchicalView:1; uint m_bHierarchicalView:1;
uint m_bDisableScrolling:1; uint m_bDisableScrolling:1;
KTrader::OfferList m_partServiceOffers; TDETrader::OfferList m_partServiceOffers;
KTrader::OfferList m_appServiceOffers; TDETrader::OfferList m_appServiceOffers;
KService::Ptr m_service; KService::Ptr m_service;
TQString m_serviceType; TQString m_serviceType;
TQString m_caption; TQString m_caption;

18
konqueror/konq_viewmgr.cc
Unescape View File

@ -65,7 +65,7 @@ KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQStri
{ {
//kdDebug(1202) << "KonqViewManager::Initialize()" << endl; //kdDebug(1202) << "KonqViewManager::Initialize()" << endl;
KService::Ptr service; KService::Ptr service;
KTrader::OfferList partServiceOffers, appServiceOffers; TDETrader::OfferList partServiceOffers, appServiceOffers;
KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ ); KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ );
if ( newViewFactory.isNull() ) if ( newViewFactory.isNull() )
{ {
@ -106,7 +106,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
KonqFrame* splitFrame = m_pMainWindow->currentView()->frame(); KonqFrame* splitFrame = m_pMainWindow->currentView()->frame();
KService::Ptr service; KService::Ptr service;
KTrader::OfferList partServiceOffers, appServiceOffers; TDETrader::OfferList partServiceOffers, appServiceOffers;
KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, forceAutoEmbed ); KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, forceAutoEmbed );
@ -217,7 +217,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
TQString locationBarURL = m_pMainWindow->currentView()->locationBarURL(); TQString locationBarURL = m_pMainWindow->currentView()->locationBarURL();
KService::Ptr service; KService::Ptr service;
KTrader::OfferList partServiceOffers, appServiceOffers; TDETrader::OfferList partServiceOffers, appServiceOffers;
KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers ); KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers );
@ -328,7 +328,7 @@ KonqView* KonqViewManager::addTab(const TQString &serviceType, const TQString &s
} }
KService::Ptr service; KService::Ptr service;
KTrader::OfferList partServiceOffers, appServiceOffers; TDETrader::OfferList partServiceOffers, appServiceOffers;
KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ ); KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ );
@ -984,8 +984,8 @@ KonqView *KonqViewManager::chooseNextView( KonqView *view )
KonqViewFactory KonqViewManager::createView( const TQString &serviceType, KonqViewFactory KonqViewManager::createView( const TQString &serviceType,
const TQString &serviceName, const TQString &serviceName,
KService::Ptr &service, KService::Ptr &service,
KTrader::OfferList &partServiceOffers, TDETrader::OfferList &partServiceOffers,
KTrader::OfferList &appServiceOffers, TDETrader::OfferList &appServiceOffers,
bool forceAutoEmbed ) bool forceAutoEmbed )
{ {
kdDebug(1202) << "KonqViewManager::createView" << endl; kdDebug(1202) << "KonqViewManager::createView" << endl;
@ -1018,8 +1018,8 @@ KonqViewFactory KonqViewManager::createView( const TQString &serviceType,
KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
KonqViewFactory &viewFactory, KonqViewFactory &viewFactory,
const KService::Ptr &service, const KService::Ptr &service,
const KTrader::OfferList &partServiceOffers, const TDETrader::OfferList &partServiceOffers,
const KTrader::OfferList &appServiceOffers, const TDETrader::OfferList &appServiceOffers,
const TQString &serviceType, const TQString &serviceType,
bool passiveMode, bool passiveMode,
bool openAfterCurrentPage ) bool openAfterCurrentPage )
@ -1471,7 +1471,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
//kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl; //kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl;
KService::Ptr service; KService::Ptr service;
KTrader::OfferList partServiceOffers, appServiceOffers; TDETrader::OfferList partServiceOffers, appServiceOffers;
KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, true /*forceAutoEmbed*/ ); KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, true /*forceAutoEmbed*/ );
if ( viewFactory.isNull() ) if ( viewFactory.isNull() )

8
konqueror/konq_viewmgr.h
Unescape View File

@ -325,8 +325,8 @@ private:
KonqViewFactory createView( const TQString &serviceType, KonqViewFactory createView( const TQString &serviceType,
const TQString &serviceName, const TQString &serviceName,
KService::Ptr &service, KService::Ptr &service,
KTrader::OfferList &partServiceOffers, TDETrader::OfferList &partServiceOffers,
KTrader::OfferList &appServiceOffers, TDETrader::OfferList &appServiceOffers,
bool forceAutoEmbed = false ); bool forceAutoEmbed = false );
/** /**
@ -336,8 +336,8 @@ private:
KonqView *setupView( KonqFrameContainerBase *parentContainer, KonqView *setupView( KonqFrameContainerBase *parentContainer,
KonqViewFactory &viewFactory, KonqViewFactory &viewFactory,
const KService::Ptr &service, const KService::Ptr &service,
const KTrader::OfferList &partServiceOffers, const TDETrader::OfferList &partServiceOffers,
const KTrader::OfferList &appServiceOffers, const TDETrader::OfferList &appServiceOffers,
const TQString &serviceType, const TQString &serviceType,
bool passiveMode, bool openAfterCurrentPage = false); bool passiveMode, bool openAfterCurrentPage = false);

4
konqueror/kttsplugin/tdehtmlkttsd.cpp
Unescape View File

@ -37,7 +37,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons
: Plugin( parent, name ) : Plugin( parent, name )
{ {
// If KTTSD is not installed, hide action. // If KTTSD is not installed, hide action.
KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'"); TDETrader::OfferList offers = TDETrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'");
if (offers.count() > 0) if (offers.count() > 0)
{ {
(void) new KAction( i18n("&Speak Text"), (void) new KAction( i18n("&Speak Text"),
@ -46,7 +46,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons
actionCollection(), "tools_kttsd" ); actionCollection(), "tools_kttsd" );
} }
else else
kdDebug() << "TDEHTMLPLuginKTTSD::TDEHTMLPluginKTTSD: KTrader did not find KTTSD." << endl; kdDebug() << "TDEHTMLPLuginKTTSD::TDEHTMLPluginKTTSD: TDETrader did not find KTTSD." << endl;
} }
TDEHTMLPluginKTTSD::~TDEHTMLPluginKTTSD() TDEHTMLPluginKTTSD::~TDEHTMLPluginKTTSD()

2
konqueror/sidebar/trees/konq_sidebartree.cpp
Unescape View File

@ -770,7 +770,7 @@ void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQSt
KonqSidebarTreeModule * module = 0L; KonqSidebarTreeModule * module = 0L;
// Here's where we need to create the right module... // Here's where we need to create the right module...
// ### TODO: make this KTrader/KLibrary based. // ### TODO: make this TDETrader/KLibrary based.
TQString moduleName = cfg.readEntry( "X-TDE-TreeModule" ); TQString moduleName = cfg.readEntry( "X-TDE-TreeModule" );
TQString showHidden=cfg.readEntry("X-TDE-TreeModule-ShowHidden"); TQString showHidden=cfg.readEntry("X-TDE-TreeModule-ShowHidden");

2
konsole/konsole/konsole.cpp
Unescape View File

@ -4263,7 +4263,7 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ )
TQHBox* row = new TQHBox( (TQWidget*)group ); TQHBox* row = new TQHBox( (TQWidget*)group );
m_asRegExp = new TQCheckBox( i18n("As &regular expression"), row, "asRegexp" ); m_asRegExp = new TQCheckBox( i18n("As &regular expression"), row, "asRegexp" );
if (!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) { if (!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) {
m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" ); m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" );
connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) ); connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) );
connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) ); connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) );

4
kpersonalizer/keyecandypage.cpp
Unescape View File

@ -490,8 +490,8 @@ one holds the types, wich are NOT supposed to be shown. We need to take care of
void KEyeCandyPage::enablePreview(bool currSettings){ void KEyeCandyPage::enablePreview(bool currSettings){
TQStringList desktopPreviews; TQStringList desktopPreviews;
TQStringList konquerorNoPreviews; TQStringList konquerorNoPreviews;
KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) { for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) {
if(prevOther){ if(prevOther){
desktopPreviews.append((*it)->desktopEntryName()); desktopPreviews.append((*it)->desktopEntryName());
kdDebug() << "Adding Preview:" << (*it)->desktopEntryName() << endl; kdDebug() << "Adding Preview:" << (*it)->desktopEntryName() << endl;

2
ksplashml/kcmksplash/installer.cpp
Unescape View File

@ -373,7 +373,7 @@ void SplashInstaller::slotSetTheme(int id)
infoTxt += "</qt>"; infoTxt += "</qt>";
TQString pluginName( cnf.readEntry( "Engine", "Default" ) ); // Perhaps no default is better? TQString pluginName( cnf.readEntry( "Engine", "Default" ) ); // Perhaps no default is better?
if ((KTrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName))).isEmpty()) if ((TDETrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName))).isEmpty())
{ {
enabled = false; enabled = false;
error = i18n("This theme requires the plugin %1 which is not installed.").arg(pluginName); error = i18n("This theme requires the plugin %1 which is not installed.").arg(pluginName);

4
ksplashml/wndmain.cpp
Unescape View File

@ -346,7 +346,7 @@ void KSplash::loadTheme( const TQString& theme )
ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQString& theme ) ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQString& theme )
{ {
// Since we may be called before the DCOP server is active, we cannot use the KTrader framework for obtaining plugins. In its // Since we may be called before the DCOP server is active, we cannot use the TDETrader framework for obtaining plugins. In its
// place, we use the following naive heuristic to locate plugins. If we are not in managed mode, and we are not in testing mode // place, we use the following naive heuristic to locate plugins. If we are not in managed mode, and we are not in testing mode
// either, we assume that we have been called by starttde. In this case, we simply try to load the library whose name should // either, we assume that we have been called by starttde. In this case, we simply try to load the library whose name should
// conform to the following specification: // conform to the following specification:
@ -369,7 +369,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
else else
{ {
// Fancier way of locating plugins. // Fancier way of locating plugins.
KService::List list= KTrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName)); KService::List list= TDETrader::self()->query("KSplash/Plugin", TQString("[X-KSplash-PluginName] == '%1'").arg(pluginName));
KService::Ptr ptr; KService::Ptr ptr;
if (!list.isEmpty()) if (!list.isEmpty())
{ {

4
libkonq/konq_iconviewwidget.cc
Unescape View File

@ -1912,8 +1912,8 @@ void KonqIconViewWidget::updatePreviewMimeTypes()
d->pPreviewMimeTypes->clear(); d->pPreviewMimeTypes->clear();
// Load the list of plugins to determine which mimetypes are supported // Load the list of plugins to determine which mimetypes are supported
KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
KTrader::OfferList::ConstIterator it; TDETrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) { for ( it = plugins.begin(); it != plugins.end(); ++it ) {
if ( d->previewSettings.contains((*it)->desktopEntryName()) ) { if ( d->previewSettings.contains((*it)->desktopEntryName()) ) {

14
libkonq/konq_popupmenu.cc
Unescape View File

@ -847,7 +847,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
} }
} }
KTrader::OfferList offers; TDETrader::OfferList offers;
if (kapp->authorizeKAction("openwith")) if (kapp->authorizeKAction("openwith"))
{ {
@ -864,7 +864,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
++it; ++it;
} }
offers = KTrader::self()->query( first, constraint ); offers = TDETrader::self()->query( first, constraint );
} }
//// Ok, we have everything, now insert //// Ok, we have everything, now insert
@ -895,7 +895,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
text.appendChild( m_doc.createTextNode( i18n("&Open With") ) ); text.appendChild( m_doc.createTextNode( i18n("&Open With") ) );
} }
KTrader::OfferList::ConstIterator it = offers.begin(); TDETrader::OfferList::ConstIterator it = offers.begin();
for( ; it != offers.end(); it++ ) for( ; it != offers.end(); it++ )
{ {
KService::Ptr service = (*it); KService::Ptr service = (*it);
@ -1179,14 +1179,14 @@ void KonqPopupMenu::addPlugins()
{ {
// search for Konq_PopupMenuPlugins inspired by simons kpropsdlg // search for Konq_PopupMenuPlugins inspired by simons kpropsdlg
//search for a plugin with the right protocol //search for a plugin with the right protocol
KTrader::OfferList plugin_offers; TDETrader::OfferList plugin_offers;
unsigned int pluginCount = 0; unsigned int pluginCount = 0;
plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes"); plugin_offers = TDETrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes");
if ( plugin_offers.isEmpty() ) if ( plugin_offers.isEmpty() )
return; // no plugins installed do not bother about it return; // no plugins installed do not bother about it
KTrader::OfferList::ConstIterator iterator = plugin_offers.begin(); TDETrader::OfferList::ConstIterator iterator = plugin_offers.begin();
KTrader::OfferList::ConstIterator end = plugin_offers.end(); TDETrader::OfferList::ConstIterator end = plugin_offers.end();
addGroup( "plugins" ); addGroup( "plugins" );
// travers the offerlist // travers the offerlist

4
libkonq/konq_propsview.cc
Unescape View File

@ -563,8 +563,8 @@ const TQStringList& KonqPropsView::previewSettings()
d->previewsToShow = new TQStringList; d->previewsToShow = new TQStringList;
if (d->previewsEnabled) { if (d->previewsEnabled) {
KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" ); TDETrader::OfferList plugins = TDETrader::self()->query( "ThumbCreator" );
for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it ) for ( TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
{ {
TQString name = (*it)->desktopEntryName(); TQString name = (*it)->desktopEntryName();
if ( ! m_dontPreview.contains(name) ) if ( ! m_dontPreview.contains(name) )

6
tdeioslave/thumbnail/thumbnail.cpp
Unescape View File

@ -70,7 +70,7 @@
// iconSize - the size of the overlay icon to use if any // iconSize - the size of the overlay icon to use if any
// iconAlpha - the transparency value used for icon overlays // iconAlpha - the transparency value used for icon overlays
// plugin - the name of the plugin library to be used for thumbnail creation. // plugin - the name of the plugin library to be used for thumbnail creation.
// Provided by the application to save an addition KTrader // Provided by the application to save an addition TDETrader
// query here. // query here.
// shmid - the shared memory segment id to write the image's data to. // shmid - the shared memory segment id to write the image's data to.
// The segment is assumed to provide enough space for a 32-bit // The segment is assumed to provide enough space for a 32-bit
@ -240,10 +240,10 @@ void ThumbnailProtocol::get(const KURL &url)
#ifdef THUMBNAIL_HACK #ifdef THUMBNAIL_HACK
if (plugin.isEmpty()) if (plugin.isEmpty())
{ {
KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); TDETrader::OfferList plugins = TDETrader::self()->query("ThumbCreator");
TQMap<TQString, KService::Ptr> mimeMap; TQMap<TQString, KService::Ptr> mimeMap;
for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) for (TDETrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
{ {
TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList(); TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt) for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)

Write Preview
Loading…
Cancel
Save