summaryrefslogtreecommitdiffstats
path: root/kjsembed
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:50:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 10:50:32 -0600
commit5538de896d91beba2d934e4d218f1d2bb52e937b (patch)
tree166367146432517fcc404376de628b5505f2f5fd /kjsembed
parentddde3d2db1a481c6fd3fd3e4273176b75d17c5e8 (diff)
downloadtdebindings-5538de896d91beba2d934e4d218f1d2bb52e937b.tar.gz
tdebindings-5538de896d91beba2d934e4d218f1d2bb52e937b.zip
Rename KLock and KTrader to avoid conflicts with KDE4
Diffstat (limited to 'kjsembed')
-rw-r--r--kjsembed/docs/ChangeLog4
-rw-r--r--kjsembed/jsfactory.cpp8
-rw-r--r--kjsembed/jsfactory.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog
index 6212bcf7..3169a625 100644
--- a/kjsembed/docs/ChangeLog
+++ b/kjsembed/docs/ChangeLog
@@ -196,7 +196,7 @@
to KJSEmbed when they embed the interpreter into their applications.
To add a binding you create the binding as binding plugin, but instead
- of using the KTrader to register the plugin, you call
+ of using the TDETrader to register the plugin, you call
JSFactory::registerOpaqueType("Name", new TypeFactory(parent,"name");
Now KJS can create your type and manipulate it. This currently supports
@@ -3299,7 +3299,7 @@
2003-08-16 Saturday 14:41 rich
- Added support for a 4 argument for of createROPart() to allow you to
- specify custom constraints for the KTrader query.
+ specify custom constraints for the TDETrader query.
2003-08-16 Saturday 13:48 zrusin
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index f8c36d75..51e66f2f 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -168,11 +168,11 @@ namespace KJSEmbed {
#ifndef QT_ONLY
// Get list of valid plugin types
- KTrader::OfferList offers = KTrader::self() ->query( "JSBindingPlugin/Binding" );
+ TDETrader::OfferList offers = TDETrader::self() ->query( "JSBindingPlugin/Binding" );
if ( !offers.count() )
return ;
- KTrader::OfferListIterator itr = offers.begin();
+ TDETrader::OfferListIterator itr = offers.begin();
while ( itr != offers.end() ) {
TQString classname = ( *itr ) ->name();
JSFactoryImp *cons = new JSFactoryImp( exec, this, JSFactoryImp::NewInstance, classname );
@@ -710,7 +710,7 @@ namespace KJSEmbed {
<< " parent " << ( long ) parent
<< " args: " << args << endl;
- KTrader::OfferList offers = KTrader::self() ->query( svc, con );
+ TDETrader::OfferList offers = TDETrader::self() ->query( svc, con );
if ( !offers.count() )
return 0;
@@ -757,7 +757,7 @@ namespace KJSEmbed {
<< " parent " << ( long ) parent
<< " args: " << args << endl;
- KTrader::OfferList offers = KTrader::self() ->query( svc, con );
+ TDETrader::OfferList offers = TDETrader::self() ->query( svc, con );
if ( !offers.count() )
return 0;
diff --git a/kjsembed/jsfactory.h b/kjsembed/jsfactory.h
index 374b5fde..9bfe3e3d 100644
--- a/kjsembed/jsfactory.h
+++ b/kjsembed/jsfactory.h
@@ -205,7 +205,7 @@ public:
TQWidget *loadUI( const TQString &uiFile, TQObject *connector=0, TQWidget *parent=0, const char *name=0 );
/**
- * Queries KTrader for a plugin that provides the asked for object binding.
+ * Queries TDETrader for a plugin that provides the asked for object binding.
*If the binding was added the object is returned, otherwise a KJS::Null is.
*/
TQStringList listBindingPlugins( KJS::ExecState *exec, KJS::Object &self);