summaryrefslogtreecommitdiffstats
path: root/tdehtml/ecma
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:51:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:51:32 -0600
commit0c9d97065a3d6ceb12d687555a1a33d90db96238 (patch)
tree4305105967fc03b06139b57871d5ab6d2360e75b /tdehtml/ecma
parent59d153016be1e09cb31cdb18bef0a649acfc6292 (diff)
downloadtdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.tar.gz
tdelibs-0c9d97065a3d6ceb12d687555a1a33d90db96238.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml/ecma')
-rw-r--r--tdehtml/ecma/kjs_navigator.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdehtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index 5934afd3e..03bc22987 100644
--- a/tdehtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -291,9 +291,9 @@ PluginBase::PluginBase(ExecState *exec, bool loadPluginInfo)
plugins->setAutoDelete( true );
mimes->setAutoDelete( true );
- // read in using KTrader
- KTrader::OfferList offers = KTrader::self()->query("Browser/View");
- KTrader::OfferList::iterator it;
+ // read in using TDETrader
+ TDETrader::OfferList offers = TDETrader::self()->query("Browser/View");
+ TDETrader::OfferList::iterator it;
for ( it = offers.begin(); it != offers.end(); ++it ) {
TQVariant pluginsinfo = (**it).property( "X-TDE-BrowserView-PluginsInfo" );