summaryrefslogtreecommitdiffstats
path: root/konqueror
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:49:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:49:49 -0600
commitdc5f267664506a312203c26bfe9001a448b0bb0f (patch)
treea78c7f15e87303d22b89619db42fc56ad8f4a046 /konqueror
parent98f4a055baf6eb7ea5c3d69d6a3f2162b491e253 (diff)
downloadtdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.tar.gz
tdebase-dc5f267664506a312203c26bfe9001a448b0bb0f.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'konqueror')
-rw-r--r--konqueror/client/kfmclient.cc6
-rw-r--r--konqueror/iconview/konq_iconview.cc4
-rw-r--r--konqueror/konq_factory.cc18
-rw-r--r--konqueror/konq_factory.h8
-rw-r--r--konqueror/konq_guiclients.cc14
-rw-r--r--konqueror/konq_guiclients.h2
-rw-r--r--konqueror/konq_mainwindow.cc26
-rw-r--r--konqueror/konq_mainwindow.h2
-rw-r--r--konqueror/konq_view.cc6
-rw-r--r--konqueror/konq_view.h12
-rw-r--r--konqueror/konq_viewmgr.cc18
-rw-r--r--konqueror/konq_viewmgr.h8
-rw-r--r--konqueror/kttsplugin/tdehtmlkttsd.cpp4
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp2
14 files changed, 65 insertions, 65 deletions
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index 899d27f84..f5586af62 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -165,7 +165,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
is configured to reuse always,
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.
- 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
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.
@@ -222,7 +222,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString&
}
if( mimetype.isEmpty())
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 );
KService::Ptr serv;
if( offers.count() > 0 )
@@ -529,7 +529,7 @@ bool clientApp::doIt()
{
KURL::List urls;
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;
KService::Ptr serv = offers.first();
return KRun::run( *serv, urls );
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index b5848dd8c..7ce0752e2 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -226,9 +226,9 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
m_pamPreview->insert( m_paEnablePreviews );
m_pamPreview->insert( new KActionSeparator(this) );
- KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" );
+ TDETrader::OfferList plugins = TDETrader::self()->query( "ThumbCreator" );
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() ] )
preview->setName( TQCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() );
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 );
}
}
diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h
index d856dbfa6..5d771354e 100644
--- a/konqueror/konq_factory.h
+++ b/konqueror/konq_factory.h
@@ -69,13 +69,13 @@ public:
static KonqViewFactory createView( const TQString &serviceType,
const TQString &serviceName = TQString::null,
KService::Ptr *serviceImpl = 0,
- KTrader::OfferList *partServiceOffers = 0,
- KTrader::OfferList *appServiceOffers = 0,
+ TDETrader::OfferList *partServiceOffers = 0,
+ TDETrader::OfferList *appServiceOffers = 0,
bool forceAutoEmbed = false );
static void getOffers( const TQString & serviceType,
- KTrader::OfferList *partServiceOffers = 0,
- KTrader::OfferList *appServiceOffers = 0);
+ TDETrader::OfferList *partServiceOffers = 0,
+ TDETrader::OfferList *appServiceOffers = 0);
static const TDEAboutData* aboutData();
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc
index a2be33e4e..94aaf8ba1 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cc
@@ -28,7 +28,7 @@
#include <kiconloader.h>
PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
- const KTrader::OfferList &embeddingServices,
+ const TDETrader::OfferList &embeddingServices,
bool showEmbeddingServices, bool doTabHandling )
{
//giving a name to each guiclient: just for debugging
@@ -66,8 +66,8 @@ PopupMenuGUIClient::PopupMenuGUIClient( KonqMainWindow *mainWindow,
if ( showEmbeddingServices )
{
- KTrader::OfferList::ConstIterator it = embeddingServices.begin();
- KTrader::OfferList::ConstIterator end = embeddingServices.end();
+ TDETrader::OfferList::ConstIterator it = embeddingServices.begin();
+ TDETrader::OfferList::ConstIterator end = embeddingServices.end();
if ( embeddingServices.count() == 1 )
{
@@ -166,8 +166,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
m_mainWindow = mainWindow;
m_actions.setAutoDelete( true );
- KTrader::OfferList offers = KTrader::self()->query( "Browser/View" );
- KTrader::OfferList::Iterator it = offers.begin();
+ TDETrader::OfferList offers = TDETrader::self()->query( "Browser/View" );
+ TDETrader::OfferList::Iterator it = offers.begin();
while ( it != offers.end() )
{
TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" );
@@ -188,8 +188,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
if ( m_empty )
return;
- KTrader::OfferList::ConstIterator cIt = offers.begin();
- KTrader::OfferList::ConstIterator cEnd = offers.end();
+ TDETrader::OfferList::ConstIterator cIt = offers.begin();
+ TDETrader::OfferList::ConstIterator cEnd = offers.end();
for (; cIt != cEnd; ++cIt )
{
TQString description = i18n( "Show %1" ).arg( (*cIt)->name() );
diff --git a/konqueror/konq_guiclients.h b/konqueror/konq_guiclients.h
index 10e1d495c..238153371 100644
--- a/konqueror/konq_guiclients.h
+++ b/konqueror/konq_guiclients.h
@@ -55,7 +55,7 @@ class KonqView;
class PopupMenuGUIClient : public KXMLGUIClient
{
public:
- PopupMenuGUIClient( KonqMainWindow *mainWindow, const KTrader::OfferList &embeddingServices,
+ PopupMenuGUIClient( KonqMainWindow *mainWindow, const TDETrader::OfferList &embeddingServices,
bool isIntoTrash, bool doTabHandling );
virtual ~PopupMenuGUIClient();
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 5ad4c6eae..0f3aeeb5e 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -1571,9 +1571,9 @@ void KonqMainWindow::slotOpenWith()
TQString serviceName = TQT_TQOBJECT_CONST(sender())->name();
- KTrader::OfferList offers = m_currentView->appServiceOffers();
- KTrader::OfferList::ConstIterator it = offers.begin();
- KTrader::OfferList::ConstIterator end = offers.end();
+ TDETrader::OfferList offers = m_currentView->appServiceOffers();
+ TDETrader::OfferList::ConstIterator it = offers.begin();
+ TDETrader::OfferList::ConstIterator end = offers.end();
for (; it != end; ++it )
if ( (*it)->desktopEntryName() == serviceName )
{
@@ -1615,9 +1615,9 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
// iterate over all services, update the toolbar service map
// and check if we can do a quick property-based viewmode change
- const KTrader::OfferList offers = m_currentView->partServiceOffers();
- KTrader::OfferList::ConstIterator oIt = offers.begin();
- KTrader::OfferList::ConstIterator oEnd = offers.end();
+ const TDETrader::OfferList offers = m_currentView->partServiceOffers();
+ TDETrader::OfferList::ConstIterator oIt = offers.begin();
+ TDETrader::OfferList::ConstIterator oEnd = offers.end();
const TQString currentServiceKey = viewModeActionKey( m_currentView->service() );
for (; oIt != oEnd; ++oIt )
{
@@ -4725,7 +4725,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
TQString currentServiceName = currentView->service()->desktopEntryName();
// List of services for the "Preview In" submenu.
- m_popupEmbeddingServices = KTrader::self()->query(
+ m_popupEmbeddingServices = TDETrader::self()->query(
m_popupServiceType,
"KParts/ReadOnlyPart",
// Obey "HideFromMenus". It defaults to false so we want "absent or true"
@@ -5032,9 +5032,9 @@ void KonqMainWindow::updateOpenWithActions()
if (!kapp->authorizeKAction("openwith"))
return;
- const KTrader::OfferList & services = m_currentView->appServiceOffers();
- KTrader::OfferList::ConstIterator it = services.begin();
- KTrader::OfferList::ConstIterator end = services.end();
+ const TDETrader::OfferList & services = m_currentView->appServiceOffers();
+ TDETrader::OfferList::ConstIterator it = services.begin();
+ TDETrader::OfferList::ConstIterator end = services.end();
for (; it != end; ++it )
{
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();
}
- KTrader::OfferList services = m_currentView->partServiceOffers();
+ TDETrader::OfferList services = m_currentView->partServiceOffers();
if ( services.count() <= 1 )
return;
@@ -5110,8 +5110,8 @@ void KonqMainWindow::updateViewModeActions()
TDEConfig * config = TDEGlobal::config();
config->setGroup( "ModeToolBarServices" );
- KTrader::OfferList::ConstIterator it = services.begin();
- KTrader::OfferList::ConstIterator end = services.end();
+ TDETrader::OfferList::ConstIterator it = services.begin();
+ TDETrader::OfferList::ConstIterator end = services.end();
for (; it != end; ++it )
{
TQVariant prop = (*it)->property( "X-TDE-BrowserView-Toggable" );
diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h
index d1b6e0c01..026f150c8 100644
--- a/konqueror/konq_mainwindow.h
+++ b/konqueror/konq_mainwindow.h
@@ -734,7 +734,7 @@ private:
ToggleViewGUIClient *m_toggleViewGUIClient;
- KTrader::OfferList m_popupEmbeddingServices;
+ TDETrader::OfferList m_popupEmbeddingServices;
TQString m_popupService;
TQString m_popupServiceType;
KURL m_popupURL;
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index c19438668..023b1e19f 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -59,8 +59,8 @@ KonqView::KonqView( KonqViewFactory &viewFactory,
KonqFrame* viewFrame,
KonqMainWindow *mainWindow,
const KService::Ptr &service,
- const KTrader::OfferList &partServiceOffers,
- const KTrader::OfferList &appServiceOffers,
+ const TDETrader::OfferList &partServiceOffers,
+ const TDETrader::OfferList &appServiceOffers,
const TQString &serviceType,
bool passiveMode
)
@@ -325,7 +325,7 @@ bool KonqView::changeViewMode( const TQString &serviceType,
}
kdDebug(1202) << "Switching view modes..." << endl;
- KTrader::OfferList partServiceOffers, appServiceOffers;
+ TDETrader::OfferList partServiceOffers, appServiceOffers;
KService::Ptr service = 0L;
KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, forceAutoEmbed );
diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h
index 6a63bff9f..55f0f1069 100644
--- a/konqueror/konq_view.h
+++ b/konqueror/konq_view.h
@@ -82,8 +82,8 @@ public:
KonqFrame* viewFrame,
KonqMainWindow * mainWindow,
const KService::Ptr &service,
- const KTrader::OfferList &partServiceOffers,
- const KTrader::OfferList &appServiceOffers,
+ const TDETrader::OfferList &partServiceOffers,
+ const TDETrader::OfferList &appServiceOffers,
const TQString &serviceType,
bool passiveMode);
@@ -281,8 +281,8 @@ public:
TQString caption() const { return m_caption; }
- KTrader::OfferList partServiceOffers() { return m_partServiceOffers; }
- KTrader::OfferList appServiceOffers() { return m_appServiceOffers; }
+ TDETrader::OfferList partServiceOffers() { return m_partServiceOffers; }
+ TDETrader::OfferList appServiceOffers() { return m_appServiceOffers; }
KonqMainWindow *mainWindow() const { return m_pMainWindow; }
@@ -465,8 +465,8 @@ private:
uint m_bBackRightClick:1;
uint m_bHierarchicalView:1;
uint m_bDisableScrolling:1;
- KTrader::OfferList m_partServiceOffers;
- KTrader::OfferList m_appServiceOffers;
+ TDETrader::OfferList m_partServiceOffers;
+ TDETrader::OfferList m_appServiceOffers;
KService::Ptr m_service;
TQString m_serviceType;
TQString m_caption;
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc
index b2ff4b475..f570322dc 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cc
@@ -65,7 +65,7 @@ KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQStri
{
//kdDebug(1202) << "KonqViewManager::Initialize()" << endl;
KService::Ptr service;
- KTrader::OfferList partServiceOffers, appServiceOffers;
+ TDETrader::OfferList partServiceOffers, appServiceOffers;
KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ );
if ( newViewFactory.isNull() )
{
@@ -106,7 +106,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
KonqFrame* splitFrame = m_pMainWindow->currentView()->frame();
KService::Ptr service;
- KTrader::OfferList partServiceOffers, appServiceOffers;
+ TDETrader::OfferList partServiceOffers, appServiceOffers;
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();
KService::Ptr service;
- KTrader::OfferList partServiceOffers, appServiceOffers;
+ TDETrader::OfferList 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;
- KTrader::OfferList partServiceOffers, appServiceOffers;
+ TDETrader::OfferList partServiceOffers, appServiceOffers;
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,
const TQString &serviceName,
KService::Ptr &service,
- KTrader::OfferList &partServiceOffers,
- KTrader::OfferList &appServiceOffers,
+ TDETrader::OfferList &partServiceOffers,
+ TDETrader::OfferList &appServiceOffers,
bool forceAutoEmbed )
{
kdDebug(1202) << "KonqViewManager::createView" << endl;
@@ -1018,8 +1018,8 @@ KonqViewFactory KonqViewManager::createView( const TQString &serviceType,
KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
KonqViewFactory &viewFactory,
const KService::Ptr &service,
- const KTrader::OfferList &partServiceOffers,
- const KTrader::OfferList &appServiceOffers,
+ const TDETrader::OfferList &partServiceOffers,
+ const TDETrader::OfferList &appServiceOffers,
const TQString &serviceType,
bool passiveMode,
bool openAfterCurrentPage )
@@ -1471,7 +1471,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent,
//kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl;
KService::Ptr service;
- KTrader::OfferList partServiceOffers, appServiceOffers;
+ TDETrader::OfferList partServiceOffers, appServiceOffers;
KonqViewFactory viewFactory = KonqFactory::createView( serviceType, serviceName, &service, &partServiceOffers, &appServiceOffers, true /*forceAutoEmbed*/ );
if ( viewFactory.isNull() )
diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h
index 766cfb799..a7dbf939c 100644
--- a/konqueror/konq_viewmgr.h
+++ b/konqueror/konq_viewmgr.h
@@ -325,8 +325,8 @@ private:
KonqViewFactory createView( const TQString &serviceType,
const TQString &serviceName,
KService::Ptr &service,
- KTrader::OfferList &partServiceOffers,
- KTrader::OfferList &appServiceOffers,
+ TDETrader::OfferList &partServiceOffers,
+ TDETrader::OfferList &appServiceOffers,
bool forceAutoEmbed = false );
/**
@@ -336,8 +336,8 @@ private:
KonqView *setupView( KonqFrameContainerBase *parentContainer,
KonqViewFactory &viewFactory,
const KService::Ptr &service,
- const KTrader::OfferList &partServiceOffers,
- const KTrader::OfferList &appServiceOffers,
+ const TDETrader::OfferList &partServiceOffers,
+ const TDETrader::OfferList &appServiceOffers,
const TQString &serviceType,
bool passiveMode, bool openAfterCurrentPage = false);
diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
index 6d643dd9b..e642918d4 100644
--- a/konqueror/kttsplugin/tdehtmlkttsd.cpp
+++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp
@@ -37,7 +37,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons
: Plugin( parent, name )
{
// 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)
{
(void) new KAction( i18n("&Speak Text"),
@@ -46,7 +46,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons
actionCollection(), "tools_kttsd" );
}
else
- kdDebug() << "TDEHTMLPLuginKTTSD::TDEHTMLPluginKTTSD: KTrader did not find KTTSD." << endl;
+ kdDebug() << "TDEHTMLPLuginKTTSD::TDEHTMLPluginKTTSD: TDETrader did not find KTTSD." << endl;
}
TDEHTMLPluginKTTSD::~TDEHTMLPluginKTTSD()
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index af7177b2e..01bdc1d7a 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -770,7 +770,7 @@ void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent, const TQSt
KonqSidebarTreeModule * module = 0L;
// 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 showHidden=cfg.readEntry("X-TDE-TreeModule-ShowHidden");