diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:44:01 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:44:01 +0000 |
| commit | 479f5f799523bffbcc83dff581a2299c047c6fff (patch) | |
| tree | 186aae707ed02aac6c7cab2fb14e97f72aca5e36 /kjsembed | |
| parent | f1dbff6145c98324ff82e34448b7483727e8ace4 (diff) | |
| download | tdebindings-479f5f799523bffbcc83dff581a2299c047c6fff.tar.gz tdebindings-479f5f799523bffbcc83dff581a2299c047c6fff.zip | |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1157645 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kjsembed')
174 files changed, 4109 insertions, 4109 deletions
diff --git a/kjsembed/bindings/bindingobject.cpp b/kjsembed/bindings/bindingobject.cpp index 4477c336..2c280e5c 100644 --- a/kjsembed/bindings/bindingobject.cpp +++ b/kjsembed/bindings/bindingobject.cpp @@ -5,8 +5,8 @@ namespace KJSEmbed { namespace Bindings { -BindingObject::BindingObject( QObject *parent, const char *name ) - : QObject( parent, name ) +BindingObject::BindingObject( TQObject *parent, const char *name ) + : TQObject( parent, name ) { } diff --git a/kjsembed/bindings/bindingobject.h b/kjsembed/bindings/bindingobject.h index 1516ade2..4cd0224c 100644 --- a/kjsembed/bindings/bindingobject.h +++ b/kjsembed/bindings/bindingobject.h @@ -22,14 +22,14 @@ #ifndef KJSEMBED_BINDING_OBJECT_H #define KJSEMBED_BINDING_OBJECT_H -#include <qobject.h> +#include <tqobject.h> namespace KJSEmbed { namespace Bindings { /** - * A baseclass for QObject bindings. This class is currently just a - * stub, but I hope it will contain utilities for QObject wrapper + * A baseclass for TQObject bindings. This class is currently just a + * stub, but I hope it will contain utilities for TQObject wrapper * classes. * * @author Richard Moore, rich@kde.org @@ -40,7 +40,7 @@ class BindingObject : public QObject Q_OBJECT public: - BindingObject( QObject *parent, const char *name=0 ); + BindingObject( TQObject *parent, const char *name=0 ); virtual ~BindingObject(); const char *jsClassName() const { return jsClazz; } @@ -49,7 +49,7 @@ protected: void setJSClassName( const char *clazz ) { jsClazz = clazz; } private: - QCString jsClazz; + TQCString jsClazz; class BindingObjectPrivate *d; }; diff --git a/kjsembed/bindings/brush_imp.cpp b/kjsembed/bindings/brush_imp.cpp index 061dc1f4..c01a03a2 100644 --- a/kjsembed/bindings/brush_imp.cpp +++ b/kjsembed/bindings/brush_imp.cpp @@ -22,8 +22,8 @@ #include <kjsembed/global.h> #include <kjsembed/jsvalueproxy.h> #include <kjsembed/jsbinding.h> -#include <qvariant.h> -#include <qbrush.h> +#include <tqvariant.h> +#include <tqbrush.h> #include "brush_imp.h" @@ -41,7 +41,7 @@ BrushImp::~BrushImp() void BrushImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "QBrush") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQBrush") ) return; JSProxy::MethodTable methods[] = { { Methodstyle, "style"}, @@ -80,9 +80,9 @@ void BrushImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) { KJS::Value BrushImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "QBrush") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQBrush") ) return KJS::Value(); JSValueProxy *op = JSProxy::toValueProxy( self.imp() ); - QBrush brush = op->toVariant().toBrush(); + TQBrush brush = op->toVariant().toBrush(); KJS::Value retValue = KJS::Value(); switch ( mid ) { @@ -104,7 +104,7 @@ KJS::Value BrushImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L } case MethodsetColor: { - QColor color = extractQColor(exec, args, 0); + TQColor color = extractQColor(exec, args, 0); brush.setColor(color); break; } diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp index caa47313..d27ff703 100644 --- a/kjsembed/bindings/dcop_imp.cpp +++ b/kjsembed/bindings/dcop_imp.cpp @@ -23,33 +23,33 @@ #include <dcopref.h> #include <dcopclient.h> #include <kdebug.h> -#include <qregexp.h> +#include <tqregexp.h> #include "dcop_imp.h" #include "dcop_imp.moc" #include <kdatastream.h> #include <kurl.h> -#include <qvariant.h> -#include <qstring.h> -#include <qmap.h> -#include <qfont.h> -#include <qpixmap.h> -#include <qbrush.h> -#include <qrect.h> -#include <qsize.h> -#include <qcolor.h> -#include <qimage.h> -#include <qpoint.h> -#include <qvaluelist.h> -#include <qiconset.h> -#include <qpointarray.h> -#include <qbitmap.h> -#include <qcursor.h> -#include <qdatetime.h> -#include <qmemarray.h> -#include <qkeysequence.h> -#include <qbitarray.h> +#include <tqvariant.h> +#include <tqstring.h> +#include <tqmap.h> +#include <tqfont.h> +#include <tqpixmap.h> +#include <tqbrush.h> +#include <tqrect.h> +#include <tqsize.h> +#include <tqcolor.h> +#include <tqimage.h> +#include <tqpoint.h> +#include <tqvaluelist.h> +#include <tqiconset.h> +#include <tqpointarray.h> +#include <tqbitmap.h> +#include <tqcursor.h> +#include <tqdatetime.h> +#include <tqmemarray.h> +#include <tqkeysequence.h> +#include <tqbitarray.h> #include <kjs/interpreter.h> #include <kjs/identifier.h> @@ -65,8 +65,8 @@ namespace KJSEmbed { namespace Bindings { KJS::Object JSDCOPRefLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const { - QString application = extractQString(exec, args, 0); - QString object = extractQString(exec, args, 1); + TQString application = extractQString(exec, args, 0); + TQString object = extractQString(exec, args, 1); JSOpaqueProxy * prx; if( application.isEmpty() ) prx= new JSOpaqueProxy( new DCOPRef(), "DCOPRef" ); @@ -157,14 +157,14 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: kdWarning() << "Not enough args..." << endl; return KJS::Boolean(false); } - QByteArray data, replyData; - QDataStream ds( replyData, IO_ReadOnly); - QCString type; + TQByteArray data, replyData; + TQDataStream ds( replyData, IO_ReadOnly); + TQCString type; - QString app = ref->app(); - QString interface = ref->obj(); - QString function = extractQString(exec, args, 0); - QStringList argTypes = JSDCOPClient::getTypes( function ); + TQString app = ref->app(); + TQString interface = ref->obj(); + TQString function = extractQString(exec, args, 0); + TQStringList argTypes = JSDCOPClient::getTypes( function ); if( args.size() > 1) for( int idx = 1; idx < args.size(); ++idx) @@ -182,12 +182,12 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: if ( args.size() < 1 ) return KJS::Boolean(false); - QByteArray data; - QString app = ref->app(); - QString interface = ref->obj(); - QString function = extractQString(exec, args, 0); + TQByteArray data; + TQString app = ref->app(); + TQString interface = ref->obj(); + TQString function = extractQString(exec, args, 0); - QStringList argTypes = JSDCOPClient::getTypes( function ); + TQStringList argTypes = JSDCOPClient::getTypes( function ); if( args.size() > 1) for( int idx = 1; idx < args.size(); ++idx) @@ -215,9 +215,9 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: } case MethodsetRef: { - QString arg0 = extractQString(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); - QString arg2 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); + TQString arg1 = extractQString(exec, args, 1); + TQString arg2 = extractQString(exec, args, 0); ref->setRef(arg0.latin1(), arg1.latin1(), arg2.latin1() ); break; } @@ -304,52 +304,52 @@ KJS::Value JSDCOPClient::call( KJS::ExecState *exec, KJS::Object &self, const KJ break; } case MethodremoteObjects: { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); retValue = convertToValue( exec, remoteObjects(arg0)); break; } case MethodremoteInterfaces: { - QString arg0 = extractQString(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); + TQString arg0 = extractQString(exec, args, 0); + TQString arg1 = extractQString(exec, args, 1); this->remoteInterfaces(arg0, arg1); break; } case MethodremoteFunctions: { - QString arg0 = extractQString(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); + TQString arg0 = extractQString(exec, args, 0); + TQString arg1 = extractQString(exec, args, 1); remoteFunctions(arg0, arg1); break; } case MethodconnectDCOPSignal: { - QString arg0 = extractQString(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); - QString arg2 = extractQString(exec, args, 2); - QString arg3 = extractQString(exec, args, 3); - QString arg4 = extractQString(exec, args, 4); + TQString arg0 = extractQString(exec, args, 0); + TQString arg1 = extractQString(exec, args, 1); + TQString arg2 = extractQString(exec, args, 2); + TQString arg3 = extractQString(exec, args, 3); + TQString arg4 = extractQString(exec, args, 4); bool arg5 = (args.size() > 5) ? args[5].toBoolean(exec) : false; connectDCOPSignal( arg0, arg1, arg2, arg3, arg4, arg5); break; } case MethoddisconnectDCOPSignal: { - QString arg0 = extractQString(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); - QString arg2 = extractQString(exec, args, 2); - QString arg3 = extractQString(exec, args, 3); - QString arg4 = extractQString(exec, args, 4); + TQString arg0 = extractQString(exec, args, 0); + TQString arg1 = extractQString(exec, args, 1); + TQString arg2 = extractQString(exec, args, 2); + TQString arg3 = extractQString(exec, args, 3); + TQString arg4 = extractQString(exec, args, 4); disconnectDCOPSignal(arg0, arg1, arg2, arg3, arg4); break; } case MethodDCOPStart: { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); - retValue = KJS::String( dcopStart( arg0, QStringList() ) ); + retValue = KJS::String( dcopStart( arg0, TQStringList() ) ); break; } case MethodappId: retValue = KJS::String( kapp->dcopClient()->appId().data() ); break; case MethodisApplicationRegistered: { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); retValue = KJS::Boolean( kapp->dcopClient()->isApplicationRegistered( arg0.latin1() ) ); break; } @@ -387,20 +387,20 @@ KJS::Value JSDCOPClient::dcopCall( KJS::ExecState * exec, KJS::Object &, const K if ( args.size() < 3 ) return KJS::Boolean(false); - QStringList types; - QByteArray data, replyData; - QDataStream ds( replyData, IO_ReadOnly); - QCString type; + TQStringList types; + TQByteArray data, replyData; + TQDataStream ds( replyData, IO_ReadOnly); + TQCString type; - QString app = extractQString(exec, args, 0); - QString interface = extractQString(exec, args, 1); - QString function = extractQString(exec, args, 2); - QStringList argTypes = getTypes( function ); + TQString app = extractQString(exec, args, 0); + TQString interface = extractQString(exec, args, 1); + TQString function = extractQString(exec, args, 2); + TQStringList argTypes = getTypes( function ); if( args.size() > 3) for( int idx = 3; idx < args.size(); ++idx) { - QVariant var = convertToVariant(exec,args[idx] ); + TQVariant var = convertToVariant(exec,args[idx] ); marshall(var, argTypes[idx -3 ], data); } if( !kapp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData)) @@ -414,23 +414,23 @@ KJS::Value JSDCOPClient::dcopSend( KJS::ExecState * exec, KJS::Object &, const K if ( args.size() < 3 ) return KJS::Boolean(false); - QByteArray data; - QString app = extractQString(exec, args, 0); - QString interface = extractQString(exec, args, 1); - QString function = extractQString(exec, args, 2); - QStringList argTypes = getTypes( function ); + TQByteArray data; + TQString app = extractQString(exec, args, 0); + TQString interface = extractQString(exec, args, 1); + TQString function = extractQString(exec, args, 2); + TQStringList argTypes = getTypes( function ); if( args.size() > 3) for( int idx = 3; idx < args.size(); ++idx) { - QVariant var = convertToVariant(exec,args[idx] ); + TQVariant var = convertToVariant(exec,args[idx] ); marshall(var, argTypes[idx - 3], data); } return KJS::Boolean( kapp->dcopClient()->send(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data)); } -KJS::Value JSDCOPClient::demarshall( KJS::ExecState * exec, const QCString& type, QDataStream& data) +KJS::Value JSDCOPClient::demarshall( KJS::ExecState * exec, const TQCString& type, TQDataStream& data) { kdDebug() << "Demarshall " << type << endl; @@ -449,23 +449,23 @@ KJS::Value JSDCOPClient::demarshall( KJS::ExecState * exec, const QCString& type return convertToValue(exec, demarshall(type, data)); } -QStringList JSDCOPClient::getTypes( const QString& function ) +TQStringList JSDCOPClient::getTypes( const TQString& function ) { - QCString myFunction = DCOPClient::normalizeFunctionSignature (function.latin1()); - QString args = myFunction.mid( myFunction.find('(') + 1 ); + TQCString myFunction = DCOPClient::normalizeFunctionSignature (function.latin1()); + TQString args = myFunction.mid( myFunction.find('(') + 1 ); args = args.left( args.length() - 1); - return QStringList::split(',', args); + return TQStringList::split(',', args); } -void JSDCOPClient::marshall( const QVariant& data, const QString& typeName, QByteArray& buffer ) +void JSDCOPClient::marshall( const TQVariant& data, const TQString& typeName, TQByteArray& buffer ) { - QDataStream stream(buffer, IO_WriteOnly | IO_Append); + TQDataStream stream(buffer, IO_WriteOnly | IO_Append); - if ( typeName == "QString" ) + if ( typeName == "TQString" ) { stream << data.toString(); } - else if ( typeName == "QCString") + else if ( typeName == "TQCString") { stream << data.toCString(); } @@ -485,99 +485,99 @@ void JSDCOPClient::marshall( const QVariant& data, const QString& typeName, QByt { stream << data.toDouble(); } - else if ( typeName == "QMap" ) + else if ( typeName == "TQMap" ) { stream << data.toMap(); } - else if ( typeName == "QValueList") + else if ( typeName == "TQValueList") { stream << data.toList(); } - else if ( typeName == "QFont") + else if ( typeName == "TQFont") { stream << data.toFont(); } - else if ( typeName == "QPixmap") + else if ( typeName == "TQPixmap") { stream << data.toPixmap(); } - else if ( typeName == "QBrush") + else if ( typeName == "TQBrush") { stream << data.toBrush(); } - else if ( typeName == "QRect") + else if ( typeName == "TQRect") { stream << data.toRect(); } - else if ( typeName == "QSize") + else if ( typeName == "TQSize") { stream << data.toSize(); } - else if ( typeName == "QColor") + else if ( typeName == "TQColor") { stream << data.toColor(); } - else if ( typeName == "QPalette") + else if ( typeName == "TQPalette") { stream << data.toPalette(); } - else if ( typeName == "QColorGroup") + else if ( typeName == "TQColorGroup") { stream << data.toColorGroup(); } - /*else if ( typeName == "QIconSet") + /*else if ( typeName == "TQIconSet") { stream << data.toIconSet(); }*/ - else if ( typeName == "QPoint") + else if ( typeName == "TQPoint") { stream << data.toPoint(); } - else if ( typeName == "QImage") + else if ( typeName == "TQImage") { stream << data.toImage(); } - else if ( typeName == "QPointArray") + else if ( typeName == "TQPointArray") { stream << data.toPointArray(); } - else if ( typeName == "QRegion") + else if ( typeName == "TQRegion") { stream << data.toRegion(); } - else if ( typeName == "QBitmap") + else if ( typeName == "TQBitmap") { stream << data.toBitmap(); } - else if ( typeName == "QCursor") + else if ( typeName == "TQCursor") { stream << data.toCursor(); } - /*else if ( typeName == "QSizePolicy") + /*else if ( typeName == "TQSizePolicy") { stream << data.toSizePolicy(); }*/ - else if ( typeName == "QDate") + else if ( typeName == "TQDate") { stream << data.toDate(); } - else if ( typeName == "QTime") + else if ( typeName == "TQTime") { stream << data.toTime(); } - else if ( typeName == "QDateTime") + else if ( typeName == "TQDateTime") { stream << data.toDateTime(); } - else if ( typeName == "QByteArray") + else if ( typeName == "TQByteArray") { stream << data.toByteArray(); } - else if ( typeName == "QBitArray") + else if ( typeName == "TQBitArray") { stream << data.toBitArray(); } - else if ( typeName == "QKeySequence") + else if ( typeName == "TQKeySequence") { stream << data.toKeySequence(); } @@ -591,18 +591,18 @@ void JSDCOPClient::marshall( const QVariant& data, const QString& typeName, QByt } -QString JSDCOPClient::dcopStart( const QString &appName, const QStringList& args ) +TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& args ) { - QString error; - QString startFunction; + TQString error; + TQString startFunction; if (appName.endsWith(".desktop")) - startFunction = "start_service_by_desktop_path(QString,QStringList)"; + startFunction = "start_service_by_desktop_path(TQString,TQStringList)"; else - startFunction = "start_service_by_desktop_name(QString,QStringList)"; + startFunction = "start_service_by_desktop_name(TQString,TQStringList)"; - QByteArray data, replyData; - QCString replyType; - QDataStream arg(data, IO_WriteOnly); + TQByteArray data, replyData; + TQCString replyType; + TQDataStream arg(data, IO_WriteOnly); arg << appName << args; if ( !kapp->dcopClient()->call( "klauncher", "klauncher", startFunction.latin1(), data, replyType, replyData) ) @@ -611,7 +611,7 @@ QString JSDCOPClient::dcopStart( const QString &appName, const QStringList& args } else { - QDataStream reply(replyData, IO_ReadOnly); + TQDataStream reply(replyData, IO_ReadOnly); if ( replyType != "serviceResult" ) { @@ -620,8 +620,8 @@ QString JSDCOPClient::dcopStart( const QString &appName, const QStringList& args else { int result; - QCString dcopName; - QString error; + TQCString dcopName; + TQString error; reply >> result >> dcopName >> error; if (result != 0) { @@ -640,57 +640,57 @@ QString JSDCOPClient::dcopStart( const QString &appName, const QStringList& args } -QStringList JSDCOPClient::remoteFunctions( const QString & remApp, const QString & remObj ) +TQStringList JSDCOPClient::remoteFunctions( const TQString & remApp, const TQString & remObj ) { - QStringList returnList; + TQStringList returnList; QCStringList lst = kapp->dcopClient()->remoteFunctions(remApp.local8Bit(), remObj.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; } -QStringList JSDCOPClient::remoteInterfaces( const QString & remApp, const QString & remObj ) +TQStringList JSDCOPClient::remoteInterfaces( const TQString & remApp, const TQString & remObj ) { - QStringList returnList; + TQStringList returnList; QCStringList lst = kapp->dcopClient()->remoteInterfaces(remApp.local8Bit(), remObj.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; } -QStringList JSDCOPClient::remoteObjects( const QString & remApp ) +TQStringList JSDCOPClient::remoteObjects( const TQString & remApp ) { - QStringList returnList; + TQStringList returnList; QCStringList lst = kapp->dcopClient()->remoteObjects(remApp.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; } -QStringList JSDCOPClient::registeredApplications( ) +TQStringList JSDCOPClient::registeredApplications( ) { - QStringList returnList; + TQStringList returnList; QCStringList lst = kapp->dcopClient()->registeredApplications( ); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; } -bool JSDCOPClient::connectDCOPSignal (const QString &sender, const QString &senderObj, const QString &signal, const QString &receiverObj, const QString &slot, bool Volatile) +bool JSDCOPClient::connectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot, bool Volatile) { return kapp->dcopClient()->connectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1(), Volatile); } -bool JSDCOPClient::disconnectDCOPSignal (const QString &sender, const QString &senderObj, const QString &signal, const QString &receiverObj, const QString &slot) +bool JSDCOPClient::disconnectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot) { return kapp->dcopClient()->disconnectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1()); } KJS::Object JSDCOPInterfacerLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const { - QObject *parent = extractQObject(exec, args, 0); - QString name = extractQString(exec, args, 1); - QObject *obj = new JSDCOPInterface(jspart->interpreter(),parent, name.latin1() ); + TQObject *parent = extractQObject(exec, args, 0); + TQString name = extractQString(exec, args, 1); + TQObject *obj = new JSDCOPInterface(jspart->interpreter(),parent, name.latin1() ); JSObjectProxy *prxy = new JSObjectProxy(jspart, obj); KJS::Object object(prxy); addBindings(jspart,exec,object); @@ -704,7 +704,7 @@ void JSDCOPInterfacerLoader::addBindings( KJSEmbedPart *jspart, KJS::ExecState * prx->addBindings( exec, proxy ); } -void JSDCOPInterface::publish( const QString & signature ) +void JSDCOPInterface::publish( const TQString & signature ) { if( m_Members.find(signature.latin1() ) == m_Members.end()) m_Members.append(signature.latin1() ); @@ -714,7 +714,7 @@ JSDCOPInterface::~ JSDCOPInterface( ) { } -JSDCOPInterface::JSDCOPInterface( KJS::Interpreter *js, QObject * parent, const char * name ) +JSDCOPInterface::JSDCOPInterface( KJS::Interpreter *js, TQObject * parent, const char * name ) : BindingObject( parent, name ),DCOPObject(name), m_js(js) { m_Members.clear(); @@ -725,11 +725,11 @@ QCStringList JSDCOPInterface::functionsDynamic( ) return m_Members; } -bool JSDCOPInterface::processDynamic( const QCString & rawFunction, const QByteArray & data, QCString & replyType, QByteArray & replyData ) +bool JSDCOPInterface::processDynamic( const TQCString & rawFunction, const TQByteArray & data, TQCString & replyType, TQByteArray & replyData ) { bool isOkay = false; - QRegExp reg = QRegExp("([_\\d\\w]+)(\\()(.*)(\\))"); + TQRegExp reg = TQRegExp("([_\\d\\w]+)(\\()(.*)(\\))"); reg.search(rawFunction); kdDebug() << "Raw function: " << rawFunction << endl; @@ -737,9 +737,9 @@ bool JSDCOPInterface::processDynamic( const QCString & rawFunction, const QByteA kdDebug() << "Signature: " << reg.cap(1) << endl; kdDebug() << "Args: " << reg.cap(3) << endl; - QString signature = reg.cap(1); + TQString signature = reg.cap(1); - QStringList argStrings = QStringList::split(',', reg.cap(3), false); + TQStringList argStrings = TQStringList::split(',', reg.cap(3), false); kdDebug() << argStrings.count() << " args..." << endl; KJS::ExecState *exec = m_js->globalExec(); @@ -751,7 +751,7 @@ bool JSDCOPInterface::processDynamic( const QCString & rawFunction, const QByteA if ( fun.implementsCall() ) { - QDataStream ds( data, IO_ReadOnly ); + TQDataStream ds( data, IO_ReadOnly ); KJS::List args; for( uint idx = 0; idx < argStrings.count(); ++idx) { @@ -779,7 +779,7 @@ bool JSDCOPInterface::processDynamic( const QCString & rawFunction, const QByteA if( oprx ) { replyType = "DCOPRef"; - QDataStream refStream( replyData, IO_WriteOnly ); + TQDataStream refStream( replyData, IO_WriteOnly ); if( oprx->typeName() == "DCOPRef" ) { DCOPRef ref(*oprx->toNative<DCOPRef>()); @@ -790,7 +790,7 @@ bool JSDCOPInterface::processDynamic( const QCString & rawFunction, const QByteA } else { - QVariant returnVariant = convertToVariant(exec, retValue); + TQVariant returnVariant = convertToVariant(exec, retValue); JSDCOPClient::marshall(returnVariant,returnVariant.typeName(), replyData); replyType = returnVariant.typeName(); isOkay = true; @@ -800,216 +800,216 @@ bool JSDCOPInterface::processDynamic( const QCString & rawFunction, const QByteA return isOkay; } -QVariant JSDCOPClient::demarshall( const QCString & type, QDataStream & reply ) +TQVariant JSDCOPClient::demarshall( const TQCString & type, TQDataStream & reply ) { kdDebug() << "Type: '" << type << "'"<< endl; - /*if ( type == "QMap" ) // ? dont handle? + /*if ( type == "TQMap" ) // ? dont handle? { - QMap<QVariant, QVariant> result; + TQMap<TQVariant, TQVariant> result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QValueList") // ? dont handle? + else if ( type == "TQValueList") // ? dont handle? { - QValueList<QVariant> result; + TQValueList<TQVariant> result; reply >> result; - return QVariant(result); + return TQVariant(result); }else if ( type == "QVariantList") { QVariantList result; reply >> result; - return QVariant(result); + return TQVariant(result); } else */ - if ( type == "QString") + if ( type == "TQString") { - QString result; + TQString result; reply >> result; - return QVariant(result); + return TQVariant(result); } else if ( type == "int") { int result; reply >> result; kdDebug() << "Result: " << result << endl; - return QVariant(result); + return TQVariant(result); } else if ( type == "uint") { uint result; reply >> result; - return QVariant(result); + return TQVariant(result); } else if ( type == "bool") { bool result; reply >> result; - return QVariant(result); + return TQVariant(result); } else if ( type == "double") { double result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QCString") + else if ( type == "TQCString") { - QCString result; + TQCString result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QVariant") + else if ( type == "TQVariant") { - QVariant result; + TQVariant result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QFont") + else if ( type == "TQFont") { - QFont result; + TQFont result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QPixmap") + else if ( type == "TQPixmap") { - QPixmap result; + TQPixmap result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QBrush") + else if ( type == "TQBrush") { - QBrush result; + TQBrush result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QRect") + else if ( type == "TQRect") { - QRect result; + TQRect result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QSize") + else if ( type == "TQSize") { - QSize result; + TQSize result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QColor") + else if ( type == "TQColor") { - QColor result; + TQColor result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QPalette") + else if ( type == "TQPalette") { - QPalette result; + TQPalette result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QColorGroup") + else if ( type == "TQColorGroup") { - QColorGroup result; + TQColorGroup result; reply >> result; - return QVariant(result); + return TQVariant(result); } - /*else if ( type == "QIconSet") + /*else if ( type == "TQIconSet") { - QIconSet result; + TQIconSet result; reply >> result; - return QVariant(result); + return TQVariant(result); }*/ - else if ( type == "QPoint") + else if ( type == "TQPoint") { - QPoint result; + TQPoint result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QImage") + else if ( type == "TQImage") { - QImage result; + TQImage result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QPointArray") + else if ( type == "TQPointArray") { - QPointArray result; + TQPointArray result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QRegion") + else if ( type == "TQRegion") { - QRegion result; + TQRegion result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QBitmap") + else if ( type == "TQBitmap") { - QBitmap result; + TQBitmap result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QCursor") + else if ( type == "TQCursor") { - QCursor result; + TQCursor result; reply >> result; - return QVariant(result); + return TQVariant(result); } - /*else if ( type == "QSizePolicy") + /*else if ( type == "TQSizePolicy") { - QSizePolicy result; + TQSizePolicy result; reply >> result; - return QVariant(result); + return TQVariant(result); }*/ - else if ( type == "QDate") + else if ( type == "TQDate") { - QDate result; + TQDate result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QTime") + else if ( type == "TQTime") { - QTime result; + TQTime result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QDateTime") + else if ( type == "TQDateTime") { - QDateTime result; + TQDateTime result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QByteArray") + else if ( type == "TQByteArray") { - QByteArray result; + TQByteArray result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QBitArray") + else if ( type == "TQBitArray") { - QBitArray result; + TQBitArray result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QKeySequence") + else if ( type == "TQKeySequence") { - QKeySequence result; + TQKeySequence result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QStringList") + else if ( type == "TQStringList") { - QStringList result; + TQStringList result; reply >> result; - return QVariant(result); + return TQVariant(result); } else if ( type == "QCStringList") { - QStringList result; + TQStringList result; reply >> result; - return QVariant(result); + return TQVariant(result); } else - return QVariant(); + return TQVariant(); } } // namespace Bindings diff --git a/kjsembed/bindings/dcop_imp.h b/kjsembed/bindings/dcop_imp.h index 56466a11..6a821028 100644 --- a/kjsembed/bindings/dcop_imp.h +++ b/kjsembed/bindings/dcop_imp.h @@ -30,8 +30,8 @@ class DCOPClient; #include <kdatastream.h> -#include <qvariant.h> -#include <qstring.h> +#include <tqvariant.h> +#include <tqstring.h> namespace KJS { @@ -48,19 +48,19 @@ class JSDCOPInterfacerLoader : public JSBindingBase }; /** -* QObject Binding for a DCOP interface +* TQObject Binding for a DCOP interface */ class JSDCOPInterface : public BindingObject, public DCOPObject { Q_OBJECT public: - JSDCOPInterface( KJS::Interpreter *js, QObject *parent, const char *name=0 ); + JSDCOPInterface( KJS::Interpreter *js, TQObject *parent, const char *name=0 ); virtual ~JSDCOPInterface(); QCStringList functionsDynamic(); - bool processDynamic (const QCString &fun, const QByteArray &data, QCString &replyType, QByteArray &replyData); + bool processDynamic (const TQCString &fun, const TQByteArray &data, TQCString &replyType, TQByteArray &replyData); public slots: - void publish(const QString& signature); + void publish(const TQString& signature); private: QCStringList m_Members; @@ -123,23 +123,23 @@ public: /** Invokes the call function. */ virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); - static KJS::Value demarshall( KJS::ExecState * exec, const QCString& type, QDataStream& data); - static QVariant demarshall( const QCString &type, QDataStream &ds); - static void marshall( const QVariant& data, const QString &typeName, QByteArray& buffer ); - static QStringList getTypes( const QString& function); + static KJS::Value demarshall( KJS::ExecState * exec, const TQCString& type, TQDataStream& data); + static TQVariant demarshall( const TQCString &type, TQDataStream &ds); + static void marshall( const TQVariant& data, const TQString &typeName, TQByteArray& buffer ); + static TQStringList getTypes( const TQString& function); bool attach() const; bool detach() const; bool isAttached() const; - QString dcopStart( const QString& appName, const QStringList& args); - QStringList registeredApplications(); - QStringList remoteObjects( const QString& remApp); - QStringList remoteInterfaces( const QString& remApp, const QString& remObj ); - QStringList remoteFunctions( const QString& remApp, const QString& remObj); - bool connectDCOPSignal (const QString &sender, const QString &senderObj, const QString &signal, const QString &receiverObj, const QString &slot, bool Volatile = false); - bool disconnectDCOPSignal (const QString &sender, const QString &senderObj, const QString &signal, const QString &receiverObj, const QString &slot); + TQString dcopStart( const TQString& appName, const TQStringList& args); + TQStringList registeredApplications(); + TQStringList remoteObjects( const TQString& remApp); + TQStringList remoteInterfaces( const TQString& remApp, const TQString& remObj ); + TQStringList remoteFunctions( const TQString& remApp, const TQString& remObj); + bool connectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot, bool Volatile = false); + bool disconnectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot); KJS::Value dcopCall(KJS::ExecState *exec, KJS::Object &, const KJS::List &args); KJS::Value dcopSend(KJS::ExecState *exec, KJS::Object &, const KJS::List &args); private: diff --git a/kjsembed/bindings/iconset_imp.cpp b/kjsembed/bindings/iconset_imp.cpp index 3575cc94..96879546 100644 --- a/kjsembed/bindings/iconset_imp.cpp +++ b/kjsembed/bindings/iconset_imp.cpp @@ -22,9 +22,9 @@ #include <kjsembed/global.h> #include <kjsembed/jsvalueproxy.h> #include <kjsembed/jsbinding.h> -#include <qvariant.h> -#include <qiconset.h> -#include <qpixmap.h> +#include <tqvariant.h> +#include <tqiconset.h> +#include <tqpixmap.h> #include "iconset_imp.h" @@ -109,29 +109,29 @@ KJS::Value IconsetImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS: return KJS::Value(); } - if ( op->typeName() != "QIconSet" ) { + if ( op->typeName() != "TQIconSet" ) { kdWarning() << "IconsetImp::call() failed, type is " << op->typeName() << endl; return KJS::Value(); } - QIconSet iconset = op->toVariant().toIconSet(); + TQIconSet iconset = op->toVariant().toIconSet(); KJS::Value retValue = KJS::Value(); switch ( mid ) { case MethodReset: { - QPixmap pix = extractQPixmap(exec, args, 0); - QIconSet::Size size = (QIconSet::Size) extractInt(exec, args, 1 ); + TQPixmap pix = extractQPixmap(exec, args, 0); + TQIconSet::Size size = (TQIconSet::Size) extractInt(exec, args, 1 ); iconset.reset(pix,size); break; } case MethodSetPixmap: { - QPixmap pix = extractQPixmap( exec, args, 0); - QString fname = extractQString( exec, args, 0); - QIconSet::Size size = (QIconSet::Size) extractInt(exec, args, 1 ); - QIconSet::Mode mode = (QIconSet::Mode) extractInt( exec, args, 2 ); - QIconSet::State state = (QIconSet::State) extractInt( exec, args, 3); + TQPixmap pix = extractQPixmap( exec, args, 0); + TQString fname = extractQString( exec, args, 0); + TQIconSet::Size size = (TQIconSet::Size) extractInt(exec, args, 1 ); + TQIconSet::Mode mode = (TQIconSet::Mode) extractInt( exec, args, 2 ); + TQIconSet::State state = (TQIconSet::State) extractInt( exec, args, 3); if( pix.isNull() ) iconset.setPixmap( fname, size, mode, state ); else @@ -140,13 +140,13 @@ KJS::Value IconsetImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS: } case MethodPixmap: { - QPixmap pix; + TQPixmap pix; if( args.size() == 3 ) { - QIconSet::Size size = (QIconSet::Size)extractInt( exec, args, 0 ); - QIconSet::Mode mode = (QIconSet::Mode)extractInt( exec, args, 1 ); - QIconSet::State state = (QIconSet::State)extractInt( exec, args, 1 ); + TQIconSet::Size size = (TQIconSet::Size)extractInt( exec, args, 0 ); + TQIconSet::Mode mode = (TQIconSet::Mode)extractInt( exec, args, 1 ); + TQIconSet::State state = (TQIconSet::State)extractInt( exec, args, 1 ); pix = iconset.pixmap( size, mode, state ); } else diff --git a/kjsembed/bindings/image_imp.cpp b/kjsembed/bindings/image_imp.cpp index 7f6abdca..65dd10eb 100644 --- a/kjsembed/bindings/image_imp.cpp +++ b/kjsembed/bindings/image_imp.cpp @@ -19,12 +19,12 @@ * Boston, MA 02110-1301, USA. */ -#include <qfile.h> +#include <tqfile.h> #include <kjsembed/global.h> #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsvalueproxy.h> #include <kjsembed/jsbinding.h> -#include <qvariant.h> +#include <tqvariant.h> #include "image_imp.h" @@ -43,7 +43,7 @@ ImageImp::~ImageImp() void ImageImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "QImage") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQImage") ) return; JSProxy::MethodTable methods[] = { { Methodwidth, "width" }, @@ -68,7 +68,7 @@ void ImageImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) { } KJS::Value ImageImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "QImage") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQImage") ) return KJS::Value(); JSValueProxy *op = JSProxy::toValueProxy( self.imp() ); img = op->toVariant().toImage(); @@ -99,18 +99,18 @@ KJS::Value ImageImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L } case Methodload: { - QString arg0 = extractQString( exec, args, 0); + TQString arg0 = extractQString( exec, args, 0); retValue = KJS::Boolean( load( arg0 )); break; } case Methodsave: { - QString arg0 = extractQString( exec, args, 0); - QString arg1 = extractQString( exec, args, 1); + TQString arg0 = extractQString( exec, args, 0); + TQString arg1 = extractQString( exec, args, 1); retValue = KJS::Boolean( save( arg0, arg1 )); break; } case MethodsetFormat: { - QString arg0 = extractQString( exec, args, 0); + TQString arg0 = extractQString( exec, args, 0); setFormat( arg0 ); break; } @@ -127,7 +127,7 @@ KJS::Value ImageImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L break; } case MethodsetPixmap: { - QPixmap pix = extractQPixmap(exec, args, 0); + TQPixmap pix = extractQPixmap(exec, args, 0); setPixmap(pix); break; } @@ -184,50 +184,50 @@ bool ImageImp::isOk() const { return !img.isNull(); } -QPixmap ImageImp::pixmap() const { +TQPixmap ImageImp::pixmap() const { if ( img.isNull() ) - return QPixmap(); + return TQPixmap(); - QPixmap pix; + TQPixmap pix; pix.convertFromImage( img ); return pix; } -void ImageImp::setPixmap( const QPixmap &pix ) { +void ImageImp::setPixmap( const TQPixmap &pix ) { if ( img.isNull() ) - img = QImage(); + img = TQImage(); img = pix.convertToImage(); } -QString ImageImp::format() const { +TQString ImageImp::format() const { return fmt; } -QString ImageImp::filename() const { +TQString ImageImp::filename() const { return nm; } -void ImageImp::setFormat( const QString &f ) { +void ImageImp::setFormat( const TQString &f ) { fmt = f; } -bool ImageImp::load( const QString &filename ) { +bool ImageImp::load( const TQString &filename ) { if ( !img.isNull() ) - img = QImage(); + img = TQImage(); nm = filename; - fmt = QImageIO::imageFormat( filename ); + fmt = TQImageIO::imageFormat( filename ); bool ok = img.load( filename ); if ( !ok ) { kdWarning() << "Error loading " << filename << endl; - img = QImage(); + img = TQImage(); } return ok; } -bool ImageImp::save( const QString &filename, const QString &fmt ) { +bool ImageImp::save( const TQString &filename, const TQString &fmt ) { if ( img.isNull() ) { kdWarning() << "Attempt to save a null image to '" << filename << "'" << endl; @@ -250,7 +250,7 @@ void ImageImp::smoothScale( int w, int h ) { void ImageImp::smoothScaleMin( int w, int h ) { if ( img.isNull()) return; - img = img.smoothScale( w, h, QImage::ScaleMin ); + img = img.smoothScale( w, h, TQImage::ScaleMin ); } diff --git a/kjsembed/bindings/image_imp.h b/kjsembed/bindings/image_imp.h index 4104d3b5..39cb7031 100644 --- a/kjsembed/bindings/image_imp.h +++ b/kjsembed/bindings/image_imp.h @@ -24,15 +24,15 @@ #include <kjsembed/jsobjectproxy_imp.h> -#include <qimage.h> -#include <qpixmap.h> +#include <tqimage.h> +#include <tqpixmap.h> namespace KJSEmbed { namespace Bindings { /** - * Methods for the QImage binding. + * Methods for the TQImage binding. * * @author Richard Moore, rich@kde.org * @version $Id$ @@ -66,27 +66,27 @@ public: private: - QString filename() const; - QString format() const; + TQString filename() const; + TQString format() const; int width() const; int height() const; int depth() const; bool isOk() const; - QPixmap pixmap() const; + TQPixmap pixmap() const; - bool load( const QString &filename ); - bool save( const QString &filename, const QString &fmt ); - void setFormat( const QString &fmt ); + bool load( const TQString &filename ); + bool save( const TQString &filename, const TQString &fmt ); + void setFormat( const TQString &fmt ); void smoothScale( int w, int h ); void smoothScaleMin( int w, int h ); - void setPixmap( const QPixmap &pix ); + void setPixmap( const TQPixmap &pix ); int mid; - QImage img; // this is a temp!!! - QString nm; - QString fmt; + TQImage img; // this is a temp!!! + TQString nm; + TQString fmt; }; } // namespace diff --git a/kjsembed/bindings/kconfig_imp.cpp b/kjsembed/bindings/kconfig_imp.cpp index f45e4d42..d4f2a290 100644 --- a/kjsembed/bindings/kconfig_imp.cpp +++ b/kjsembed/bindings/kconfig_imp.cpp @@ -27,12 +27,12 @@ #include <kapplication.h> #include "kconfig_imp.moc" #else -#include <qsettings.h> +#include <tqsettings.h> #endif namespace KJSEmbed { namespace Bindings { -Config::Config( QObject *parent, const char *name) +Config::Config( TQObject *parent, const char *name) : BindingObject(parent, name) { @@ -46,21 +46,21 @@ Config::Config( QObject *parent, const char *name) kdWarning( 80001 ) << "Could not write to config file." << endl; } #else - m_config = new QSettings(); + m_config = new TQSettings(); if( name == 0) m_name = "qjcmd"; else m_name = name; - m_config->setPath( "QJSEmbed",m_name, QSettings::User ); + m_config->setPath( "QJSEmbed",m_name, TQSettings::User ); m_forceGlobal = false; #endif } /* -Config::Config( QObject *parent, const char *name , const QString& confName) +Config::Config( TQObject *parent, const char *name , const TQString& confName) : BindingObject(parent, name) { - QString fileName = ::locate("kde_config", confName); + TQString fileName = ::locate("kde_config", confName); m_config = new KConfig(fileName); } */ @@ -82,7 +82,7 @@ void Config::setDesktopGroup() #endif } -void Config::setGroup(const QString& group) +void Config::setGroup(const TQString& group) { #ifndef QT_ONLY m_config->setGroup(group); @@ -92,12 +92,12 @@ void Config::setGroup(const QString& group) #endif } -QString Config::group() +TQString Config::group() { return m_config->group(); } -QStringList Config::groupList() +TQStringList Config::groupList() { #ifndef QT_ONLY return m_config->groupList(); @@ -107,7 +107,7 @@ QStringList Config::groupList() #endif } -QString Config::locale() +TQString Config::locale() { #ifndef QT_ONLY return m_config->locale(); @@ -122,7 +122,7 @@ void Config::setForceGlobal( bool force ) m_config->setForceGlobal(force); #else m_forceGlobal = force; - m_config->setPath( "QJSEmbed",m_name, (force)?QSettings::Global:QSettings::User ); + m_config->setPath( "QJSEmbed",m_name, (force)?TQSettings::Global:TQSettings::User ); #endif } @@ -203,7 +203,7 @@ void Config::sync() m_config->sync(); } -bool Config::hasKey( const QString& key ) const +bool Config::hasKey( const TQString& key ) const { #ifndef QT_ONLY return m_config->hasKey(key); @@ -212,7 +212,7 @@ bool Config::hasKey( const QString& key ) const #endif } -bool Config::entryIsImmutable(const QString &key) const +bool Config::entryIsImmutable(const TQString &key) const { #ifndef QT_ONLY return m_config->entryIsImmutable(key); @@ -222,7 +222,7 @@ bool Config::entryIsImmutable(const QString &key) const #endif } -void Config::revertToDefault(const QString &key) +void Config::revertToDefault(const TQString &key) { #ifndef QT_ONLY m_config->revertToDefault(key); @@ -231,7 +231,7 @@ void Config::revertToDefault(const QString &key) #endif } -bool Config::hasDefault(const QString &key) const +bool Config::hasDefault(const TQString &key) const { #ifndef QT_ONLY return m_config->hasDefault(key); @@ -250,28 +250,28 @@ void Config::setFileWriteMode(int mode) #endif } -QString Config::readEntry(const QString& pKey, const QString& aDefault ) const +TQString Config::readEntry(const TQString& pKey, const TQString& aDefault ) const { return m_config->readEntry(pKey,aDefault); } -QVariant Config::readPropertyEntry( const QString& pKey, const QVariant &pDefault) const +TQVariant Config::readPropertyEntry( const TQString& pKey, const TQVariant &pDefault) const { #ifndef QT_ONLY return m_config->readPropertyEntry(pKey,pDefault); #else - QVariant returnVariant; + TQVariant returnVariant; returnVariant = m_config->readEntry(pKey, pDefault.toString()); return returnVariant; #endif } -QStringList Config::readListEntry( const QString& pKey ) const +TQStringList Config::readListEntry( const TQString& pKey ) const { return m_config->readListEntry(pKey); } -QString Config::readPathEntry( const QString& pKey, const QString & aDefault ) const +TQString Config::readPathEntry( const TQString& pKey, const TQString & aDefault ) const { #ifndef QT_ONLY return m_config->readPathEntry(pKey,aDefault); @@ -280,7 +280,7 @@ QString Config::readPathEntry( const QString& pKey, const QString & aDefault ) c #endif } -QStringList Config::readPathListEntry( const QString& pKey ) const +TQStringList Config::readPathListEntry( const TQString& pKey ) const { #ifndef QT_ONLY return m_config->readPathListEntry(pKey); @@ -290,12 +290,12 @@ QStringList Config::readPathListEntry( const QString& pKey ) const } -int Config::readNumEntry( const QString& pKey, int nDefault) const +int Config::readNumEntry( const TQString& pKey, int nDefault) const { return m_config->readNumEntry(pKey,nDefault); } -uint Config::readUnsignedNumEntry( const QString& pKey, uint nDefault) const +uint Config::readUnsignedNumEntry( const TQString& pKey, uint nDefault) const { #ifndef QT_ONLY return m_config->readUnsignedNumEntry(pKey,nDefault); @@ -304,7 +304,7 @@ uint Config::readUnsignedNumEntry( const QString& pKey, uint nDefault) const #endif } -long Config::readLongNumEntry( const QString& pKey, long nDefault) const +long Config::readLongNumEntry( const TQString& pKey, long nDefault) const { #ifndef QT_ONLY return m_config->readLongNumEntry(pKey,nDefault); @@ -313,7 +313,7 @@ long Config::readLongNumEntry( const QString& pKey, long nDefault) const #endif } -double Config::readDoubleNumEntry( const QString& pKey, double nDefault ) const +double Config::readDoubleNumEntry( const TQString& pKey, double nDefault ) const { #ifndef QT_ONLY return m_config->readDoubleNumEntry(pKey,nDefault); @@ -322,66 +322,66 @@ double Config::readDoubleNumEntry( const QString& pKey, double nDefault ) const #endif } -QFont Config::readFontEntry( const QString& pKey, const QFont* pDefault ) const +TQFont Config::readFontEntry( const TQString& pKey, const TQFont* pDefault ) const { #ifndef QT_ONLY return m_config->readFontEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,QVariant(*pDefault)).toFont(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toFont(); #endif } -bool Config::readBoolEntry( const QString& pKey, const bool bDefault ) const +bool Config::readBoolEntry( const TQString& pKey, const bool bDefault ) const { return m_config->readBoolEntry(pKey,bDefault); } -QRect Config::readRectEntry( const QString& pKey, const QRect* pDefault ) const +TQRect Config::readRectEntry( const TQString& pKey, const TQRect* pDefault ) const { #ifndef QT_ONLY return m_config->readRectEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,QVariant(*pDefault)).toRect(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toRect(); #endif } -QPoint Config::readPointEntry( const QString& pKey, const QPoint* pDefault ) const +TQPoint Config::readPointEntry( const TQString& pKey, const TQPoint* pDefault ) const { #ifndef QT_ONLY return m_config->readPointEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,QVariant(*pDefault)).toPoint(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toPoint(); #endif } -QSize Config::readSizeEntry( const QString& pKey, const QSize* pDefault ) const +TQSize Config::readSizeEntry( const TQString& pKey, const TQSize* pDefault ) const { #ifndef QT_ONLY return m_config->readSizeEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,QVariant(*pDefault)).toSize(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toSize(); #endif } -QColor Config::readColorEntry( const QString& pKey, const QColor* pDefault ) const +TQColor Config::readColorEntry( const TQString& pKey, const TQColor* pDefault ) const { #ifndef QT_ONLY return m_config->readColorEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,QVariant(*pDefault)).toColor(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toColor(); #endif } -QDateTime Config::readDateTimeEntry( const QString& pKey, const QDateTime* pDefault) const +TQDateTime Config::readDateTimeEntry( const TQString& pKey, const TQDateTime* pDefault) const { #ifndef QT_ONLY return m_config->readDateTimeEntry(pKey,pDefault); #else - return readPropertyEntry(pKey,QVariant(*pDefault)).toDateTime(); + return readPropertyEntry(pKey,TQVariant(*pDefault)).toDateTime(); #endif } -QString Config::readEntryUntranslated( const QString& pKey, const QString& aDefault ) const +TQString Config::readEntryUntranslated( const TQString& pKey, const TQString& aDefault ) const { #ifndef QT_ONLY return m_config->readEntryUntranslated(pKey,aDefault); @@ -389,12 +389,12 @@ QString Config::readEntryUntranslated( const QString& pKey, const QString& aDefa return m_config->readEntry(pKey,aDefault); #endif } -void Config::writeEntry( const QString& pKey, const QString& pValue ) +void Config::writeEntry( const TQString& pKey, const TQString& pValue ) { m_config->writeEntry(pKey,pValue); } -void Config::writePropertyEntry( const QString& pKey, const QVariant& pValue ) +void Config::writePropertyEntry( const TQString& pKey, const TQVariant& pValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, pValue ); @@ -403,7 +403,7 @@ void Config::writePropertyEntry( const QString& pKey, const QVariant& pValue ) #endif } -void Config::writeListEntry( const QString& pKey, const QStringList &rValue ) +void Config::writeListEntry( const TQString& pKey, const TQStringList &rValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rValue ); @@ -412,7 +412,7 @@ void Config::writeListEntry( const QString& pKey, const QStringList &rValue ) #endif } -void Config::writeNumEntry( const QString& pKey, int nValue ) +void Config::writeNumEntry( const TQString& pKey, int nValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, nValue ); @@ -420,7 +420,7 @@ void Config::writeNumEntry( const QString& pKey, int nValue ) m_config->writeEntry(pKey,nValue); #endif } -void Config::writeUnsignedNumEntry( const QString& pKey, uint nValue ) +void Config::writeUnsignedNumEntry( const TQString& pKey, uint nValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, nValue ); @@ -428,7 +428,7 @@ void Config::writeUnsignedNumEntry( const QString& pKey, uint nValue ) writeNumEntry(pKey, (int)nValue ); #endif } -void Config::writeLongNumEntry( const QString& pKey, unsigned long nValue ) +void Config::writeLongNumEntry( const TQString& pKey, unsigned long nValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, nValue ); @@ -436,15 +436,15 @@ void Config::writeLongNumEntry( const QString& pKey, unsigned long nValue ) writeNumEntry(pKey, (int)nValue); #endif } -void Config::writeDoubleNumEntry( const QString& pKey, double nValue ) +void Config::writeDoubleNumEntry( const TQString& pKey, double nValue ) { m_config->writeEntry(pKey,nValue); } -void Config::writeBoolEntry( const QString& pKey, bool bValue ) +void Config::writeBoolEntry( const TQString& pKey, bool bValue ) { m_config->writeEntry(pKey,bValue); } -void Config::writeFontEntry( const QString& pKey, const QFont& rFont ) +void Config::writeFontEntry( const TQString& pKey, const TQFont& rFont ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rFont ); @@ -453,7 +453,7 @@ void Config::writeFontEntry( const QString& pKey, const QFont& rFont ) #endif } -void Config::writeColorEntry( const QString& pKey, const QColor& rColor ) +void Config::writeColorEntry( const TQString& pKey, const TQColor& rColor ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rColor ); @@ -462,7 +462,7 @@ void Config::writeColorEntry( const QString& pKey, const QColor& rColor ) #endif } -void Config::writeDateTimeEntry( const QString& pKey, const QDateTime& rDateTime ) +void Config::writeDateTimeEntry( const TQString& pKey, const TQDateTime& rDateTime ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rDateTime ); @@ -471,7 +471,7 @@ void Config::writeDateTimeEntry( const QString& pKey, const QDateTime& rDateTime #endif } -void Config::writeRectEntry( const QString& pKey, const QRect& rValue ) +void Config::writeRectEntry( const TQString& pKey, const TQRect& rValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rValue ); @@ -480,7 +480,7 @@ void Config::writeRectEntry( const QString& pKey, const QRect& rValue ) #endif } -void Config::writePointEntry( const QString& pKey, const QPoint& rValue ) +void Config::writePointEntry( const TQString& pKey, const TQPoint& rValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rValue ); @@ -489,7 +489,7 @@ void Config::writePointEntry( const QString& pKey, const QPoint& rValue ) #endif } -void Config::writeSizeEntry( const QString& pKey, const QSize& rValue ) +void Config::writeSizeEntry( const TQString& pKey, const TQSize& rValue ) { #ifndef QT_ONLY m_config->writeEntry(pKey, rValue ); @@ -497,7 +497,7 @@ void Config::writeSizeEntry( const QString& pKey, const QSize& rValue ) writePropertyEntry(pKey,rValue); #endif } -void Config::writePathEntry( const QString& pKey, const QString & path ) +void Config::writePathEntry( const TQString& pKey, const TQString & path ) { #ifndef QT_ONLY m_config->writePathEntry(pKey,path); @@ -505,7 +505,7 @@ void Config::writePathEntry( const QString& pKey, const QString & path ) writeEntry(pKey,path); #endif } -void Config::writePathListEntry( const QString& pKey, const QStringList &rValue ) +void Config::writePathListEntry( const TQString& pKey, const TQStringList &rValue ) { #ifndef QT_ONLY m_config->writePathEntry(pKey,rValue); @@ -513,7 +513,7 @@ void Config::writePathListEntry( const QString& pKey, const QStringList &rValue writeListEntry(pKey,rValue); #endif } -void Config::deleteEntry( const QString& pKey, bool bNLS , bool bGlobal ) +void Config::deleteEntry( const TQString& pKey, bool bNLS , bool bGlobal ) { #ifndef QT_ONLY m_config->deleteEntry(pKey,bNLS,bGlobal); @@ -523,7 +523,7 @@ void Config::deleteEntry( const QString& pKey, bool bNLS , bool bGlobal ) m_config->removeEntry(pKey); #endif } -bool Config::deleteGroup( const QString& group, bool bDeep , bool bGlobal ) +bool Config::deleteGroup( const TQString& group, bool bDeep , bool bGlobal ) { #ifndef QT_ONLY return m_config->deleteGroup(group,bDeep,bGlobal); diff --git a/kjsembed/bindings/kconfig_imp.h b/kjsembed/bindings/kconfig_imp.h index 55f58e34..9daf5f17 100644 --- a/kjsembed/bindings/kconfig_imp.h +++ b/kjsembed/bindings/kconfig_imp.h @@ -22,14 +22,14 @@ #ifndef KJSEMBED_CONFIG_IMP_H #define KJSEMBED_CONFIG_IMP_H -#include <qdatetime.h> -#include <qfont.h> -#include <qvariant.h> -#include <qpoint.h> -#include <qrect.h> -#include <qsize.h> -#include <qcolor.h> -#include <qstringlist.h> +#include <tqdatetime.h> +#include <tqfont.h> +#include <tqvariant.h> +#include <tqpoint.h> +#include <tqrect.h> +#include <tqsize.h> +#include <tqcolor.h> +#include <tqstringlist.h> #include "bindingobject.h" @@ -51,9 +51,9 @@ class Config : public BindingObject Q_PROPERTY( bool readDefaults READ readDefaults WRITE setReadDefaults ) public: - Config( QObject *parent=0, const char *name=0); + Config( TQObject *parent=0, const char *name=0); /* - Config( QObject *parent, const char *name, const QString& confName ); + Config( TQObject *parent, const char *name, const TQString& confName ); */ virtual ~Config(); @@ -70,62 +70,62 @@ public slots: // Group void setDesktopGroup(); - void setGroup(const QString&); - QString group(); - QStringList groupList(); - QString locale(); + void setGroup(const TQString&); + TQString group(); + TQStringList groupList(); + TQString locale(); void rollback( bool bDeep ); void sync(); - bool hasKey( const QString& key ) const; - bool entryIsImmutable(const QString &key) const; - void revertToDefault(const QString &key); - bool hasDefault(const QString &key) const; + bool hasKey( const TQString& key ) const; + bool entryIsImmutable(const TQString &key) const; + void revertToDefault(const TQString &key); + bool hasDefault(const TQString &key) const; void setFileWriteMode(int mode); - QString readEntry(const QString& pKey, const QString& aDefault ) const; - QVariant readPropertyEntry( const QString& pKey, const QVariant &var) const; - QStringList readListEntry( const QString& pKey ) const; - QString readPathEntry( const QString& pKey, const QString & aDefault) const; - QStringList readPathListEntry( const QString& pKey ) const; - int readNumEntry( const QString& pKey, int nDefault ) const; - uint readUnsignedNumEntry( const QString& pKey, uint nDefault ) const; - long readLongNumEntry( const QString& pKey, long nDefault ) const; - double readDoubleNumEntry( const QString& pKey, double nDefault ) const; - QFont readFontEntry( const QString& pKey, const QFont* pDefault) const; - bool readBoolEntry( const QString& pKey, const bool bDefault ) const; - QRect readRectEntry( const QString& pKey, const QRect* pDefault) const; - QPoint readPointEntry( const QString& pKey, const QPoint* pDefault) const; - QSize readSizeEntry( const QString& pKey, const QSize* pDefault) const; - QColor readColorEntry( const QString& pKey, const QColor* pDefault) const; - QDateTime readDateTimeEntry( const QString& pKey, const QDateTime* pDefault) const; - QString readEntryUntranslated( const QString& pKey, const QString& aDefault ) const; - - void writeEntry( const QString& pKey, const QString& pValue ); - void writePropertyEntry( const QString& pKey, const QVariant& pValue ); - void writeListEntry( const QString& pKey, const QStringList &rValue ); - void writeNumEntry( const QString& pKey, int nValue ); - void writeUnsignedNumEntry( const QString& pKey, uint nValue ); - void writeLongNumEntry( const QString& pKey, unsigned long nValue ); - void writeDoubleNumEntry( const QString& pKey, double nValue ); - void writeBoolEntry( const QString& pKey, bool bValue ); - void writeFontEntry( const QString& pKey, const QFont& rFont ); - void writeColorEntry( const QString& pKey, const QColor& rColor ); - void writeDateTimeEntry( const QString& pKey, const QDateTime& rDateTime ); - void writeRectEntry( const QString& pKey, const QRect& rValue ); - void writePointEntry( const QString& pKey, const QPoint& rValue ); - void writeSizeEntry( const QString& pKey, const QSize& rValue ); - void writePathEntry( const QString& pKey, const QString & path ); - void writePathListEntry( const QString& pKey, const QStringList &rValue); - void deleteEntry( const QString& pKey, bool bNLS , bool bGlobal ); - bool deleteGroup( const QString& group, bool bDeep , bool bGlobal ); + TQString readEntry(const TQString& pKey, const TQString& aDefault ) const; + TQVariant readPropertyEntry( const TQString& pKey, const TQVariant &var) const; + TQStringList readListEntry( const TQString& pKey ) const; + TQString readPathEntry( const TQString& pKey, const TQString & aDefault) const; + TQStringList readPathListEntry( const TQString& pKey ) const; + int readNumEntry( const TQString& pKey, int nDefault ) const; + uint readUnsignedNumEntry( const TQString& pKey, uint nDefault ) const; + long readLongNumEntry( const TQString& pKey, long nDefault ) const; + double readDoubleNumEntry( const TQString& pKey, double nDefault ) const; + TQFont readFontEntry( const TQString& pKey, const TQFont* pDefault) const; + bool readBoolEntry( const TQString& pKey, const bool bDefault ) const; + TQRect readRectEntry( const TQString& pKey, const TQRect* pDefault) const; + TQPoint readPointEntry( const TQString& pKey, const TQPoint* pDefault) const; + TQSize readSizeEntry( const TQString& pKey, const TQSize* pDefault) const; + TQColor readColorEntry( const TQString& pKey, const TQColor* pDefault) const; + TQDateTime readDateTimeEntry( const TQString& pKey, const TQDateTime* pDefault) const; + TQString readEntryUntranslated( const TQString& pKey, const TQString& aDefault ) const; + + void writeEntry( const TQString& pKey, const TQString& pValue ); + void writePropertyEntry( const TQString& pKey, const TQVariant& pValue ); + void writeListEntry( const TQString& pKey, const TQStringList &rValue ); + void writeNumEntry( const TQString& pKey, int nValue ); + void writeUnsignedNumEntry( const TQString& pKey, uint nValue ); + void writeLongNumEntry( const TQString& pKey, unsigned long nValue ); + void writeDoubleNumEntry( const TQString& pKey, double nValue ); + void writeBoolEntry( const TQString& pKey, bool bValue ); + void writeFontEntry( const TQString& pKey, const TQFont& rFont ); + void writeColorEntry( const TQString& pKey, const TQColor& rColor ); + void writeDateTimeEntry( const TQString& pKey, const TQDateTime& rDateTime ); + void writeRectEntry( const TQString& pKey, const TQRect& rValue ); + void writePointEntry( const TQString& pKey, const TQPoint& rValue ); + void writeSizeEntry( const TQString& pKey, const TQSize& rValue ); + void writePathEntry( const TQString& pKey, const TQString & path ); + void writePathListEntry( const TQString& pKey, const TQStringList &rValue); + void deleteEntry( const TQString& pKey, bool bNLS , bool bGlobal ); + bool deleteGroup( const TQString& group, bool bDeep , bool bGlobal ); private: #ifndef QT_ONLY KConfig *m_config; #else - QSettings *m_config; - QString m_name; + TQSettings *m_config; + TQString m_name; bool m_forceGlobal; #endif }; diff --git a/kjsembed/bindings/movie_imp.cpp b/kjsembed/bindings/movie_imp.cpp index 8a5ced01..7f786c52 100644 --- a/kjsembed/bindings/movie_imp.cpp +++ b/kjsembed/bindings/movie_imp.cpp @@ -19,7 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qpixmap.h> +#include <tqpixmap.h> #include <kjsembed/global.h> #include "movie_imp.h" @@ -27,21 +27,21 @@ namespace KJSEmbed { namespace Bindings { -Movie::Movie( QObject *parent, const char *name ) : BindingObject(parent, name) +Movie::Movie( TQObject *parent, const char *name ) : BindingObject(parent, name) { - movie = QMovie(); + movie = TQMovie(); } Movie::~Movie() { } -QColor Movie::backgroundColor() const +TQColor Movie::backgroundColor() const { if( movie.isNull() ) - return QColor(); + return TQColor(); return movie.backgroundColor(); } -void Movie::setBackgroundColor( const QColor &c ) +void Movie::setBackgroundColor( const TQColor &c ) { if( movie.isNull() ) return; @@ -59,30 +59,30 @@ void Movie::setSpeed( int percent ) return; movie.setSpeed(percent); } -bool Movie::load( const QString &filename, int bufsize) +bool Movie::load( const TQString &filename, int bufsize) { - movie = QMovie( filename, bufsize); + movie = TQMovie( filename, bufsize); if ( movie.isNull() ) return false; else return true; } -QRect Movie::getValidRect() +TQRect Movie::getValidRect() { if( movie.isNull() ) - return QRect(); + return TQRect(); return movie.getValidRect(); } -QPixmap Movie::framePixmap() +TQPixmap Movie::framePixmap() { if( movie.isNull() ) - return QPixmap(); + return TQPixmap(); return movie.framePixmap(); } -QImage Movie::frameImage() +TQImage Movie::frameImage() { if( movie.isNull() ) - return QImage(); + return TQImage(); return movie.frameImage(); } bool Movie::isNull() diff --git a/kjsembed/bindings/movie_imp.h b/kjsembed/bindings/movie_imp.h index 2b3024e4..74508e99 100644 --- a/kjsembed/bindings/movie_imp.h +++ b/kjsembed/bindings/movie_imp.h @@ -23,14 +23,14 @@ #define KJSEMBED_MOVIE_IMP_H #include "bindingobject.h" -#include <qmovie.h> -#include <qimage.h> +#include <tqmovie.h> +#include <tqimage.h> namespace KJSEmbed { namespace Bindings { /** - * QObject Binding for QMovie. + * TQObject Binding for TQMovie. * * @author Ian Reinhart Geiser, geiseri@kde.org * @version $Id$ @@ -39,22 +39,22 @@ class Movie : public BindingObject { Q_OBJECT - Q_PROPERTY( QColor setBackgroundColor READ backgroundColor ) + Q_PROPERTY( TQColor setBackgroundColor READ backgroundColor ) Q_PROPERTY( int setSpeed READ speed ) public: - Movie( QObject *parent=0, const char *name=0 ); + Movie( TQObject *parent=0, const char *name=0 ); virtual ~Movie(); - QColor backgroundColor() const; - void setBackgroundColor( const QColor &c ); + TQColor backgroundColor() const; + void setBackgroundColor( const TQColor &c ); int speed() const; void setSpeed ( int percent ); public slots: - bool load( const QString &filename, int bufsize = 1024); - QRect getValidRect(); - QPixmap framePixmap(); - QImage frameImage(); + bool load( const TQString &filename, int bufsize = 1024); + TQRect getValidRect(); + TQPixmap framePixmap(); + TQImage frameImage(); bool isNull(); int frameNumber(); int steps(); @@ -68,7 +68,7 @@ public slots: void restart(); private: - QMovie movie; + TQMovie movie; }; } // namespace diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp index b2d6cce7..6f7be24e 100644 --- a/kjsembed/bindings/netaccess_imp.cpp +++ b/kjsembed/bindings/netaccess_imp.cpp @@ -32,7 +32,7 @@ namespace KJSEmbed { namespace Bindings { -NetAccess::NetAccess( QObject *parent, const char *name ) +NetAccess::NetAccess( TQObject *parent, const char *name ) : BindingObject( parent, name ) { } @@ -41,9 +41,9 @@ NetAccess::~NetAccess() { } -bool NetAccess::download( const KURL& src, const QString& loc ) +bool NetAccess::download( const KURL& src, const TQString& loc ) { - QString mloc = loc; + TQString mloc = loc; #if KDE_IS_VERSION(3,1,90) return KIO::NetAccess::download( src, mloc, 0 ); #else @@ -51,19 +51,19 @@ bool NetAccess::download( const KURL& src, const QString& loc ) #endif } -QString NetAccess::createTempFile( const QString& prefix, const QString& ext, uint mode ) +TQString NetAccess::createTempFile( const TQString& prefix, const TQString& ext, uint mode ) { KTempFile tmpFile = KTempFile(prefix, ext, mode); tmpFile.setAutoDelete(false); return tmpFile.name(); } -void NetAccess::removeTempFile( const QString& name ) +void NetAccess::removeTempFile( const TQString& name ) { KIO::NetAccess::removeTempFile( name ); } -bool NetAccess::upload( const QString& src, const KURL& dest ) +bool NetAccess::upload( const TQString& src, const KURL& dest ) { #if KDE_IS_VERSION(3,1,90) return KIO::NetAccess::upload( src, dest, 0 ); @@ -124,17 +124,17 @@ int NetAccess::propertiesDialog( const KURL &url ) return dlg.exec(); } -QString NetAccess::fish_execute( const KURL& url, const QString& command ) +TQString NetAccess::fish_execute( const KURL& url, const TQString& command ) { #if KDE_IS_VERSION(3,1,90) return KIO::NetAccess::fish_execute( url, command, 0 ); #else kdWarning() << "NetAccess::fish_execute(url,command) is not supported on 3.1" << endl; - return QString::null; + return TQString::null; #endif } -QString NetAccess::mimetype( const KURL& url ) +TQString NetAccess::mimetype( const KURL& url ) { kdDebug()<<"mimetype CALLED "<<endl; @@ -145,7 +145,7 @@ QString NetAccess::mimetype( const KURL& url ) #endif } -QString NetAccess::lastErrorString() +TQString NetAccess::lastErrorString() { return KIO::NetAccess::lastErrorString(); } diff --git a/kjsembed/bindings/netaccess_imp.h b/kjsembed/bindings/netaccess_imp.h index c2c01bfe..8a788af4 100644 --- a/kjsembed/bindings/netaccess_imp.h +++ b/kjsembed/bindings/netaccess_imp.h @@ -22,7 +22,7 @@ #ifndef KJSEMBED_NETACCESS_IMP_H #define KJSEMBED_NETACCESS_IMP_H -#include <qstring.h> +#include <tqstring.h> #include "bindingobject.h" class KURL; @@ -37,13 +37,13 @@ class NetAccess : public BindingObject { Q_OBJECT public: - NetAccess( QObject *parent, const char *name=0 ); + NetAccess( TQObject *parent, const char *name=0 ); virtual ~NetAccess(); public slots: - bool download( const KURL& src, const QString & loc ); - QString createTempFile(const QString& prefix, const QString& ext, uint mode ); - void removeTempFile( const QString& name ); - bool upload( const QString& src, const KURL& dest ); + bool download( const KURL& src, const TQString & loc ); + TQString createTempFile(const TQString& prefix, const TQString& ext, uint mode ); + void removeTempFile( const TQString& name ); + bool upload( const TQString& src, const KURL& dest ); bool copy( const KURL& src, const KURL& target ); bool dircopy( const KURL& src, const KURL& target ); bool move( const KURL& src, const KURL& target ); @@ -51,9 +51,9 @@ public slots: bool del( const KURL& url ); int propertiesDialog( const KURL &url ); - QString fish_execute( const KURL& url, const QString& command ); - QString mimetype( const KURL& url ); - QString lastErrorString(); + TQString fish_execute( const KURL& url, const TQString& command ); + TQString mimetype( const KURL& url ); + TQString lastErrorString(); }; } // namespace Bindings diff --git a/kjsembed/bindings/painter_imp.cpp b/kjsembed/bindings/painter_imp.cpp index 8fa77de0..ef2f9ddd 100644 --- a/kjsembed/bindings/painter_imp.cpp +++ b/kjsembed/bindings/painter_imp.cpp @@ -19,14 +19,14 @@ * Boston, MA 02110-1301, USA. */ -#include <qpainter.h> -#include <qpixmap.h> -#include <qimage.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqimage.h> #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsobjectproxy.h> #include <kjsembed/jsvalueproxy.h> #include <kjsembed/jsbinding.h> -#include <qfont.h> +#include <tqfont.h> #include <kjsembed/global.h> #include "painter_imp.h" @@ -38,15 +38,15 @@ namespace Bindings { { PainterRef * p = new PainterRef(); /* - QWidget *w = extractQWidget(exec, args, 0); - QPixmap pix = extractQPixmap(exec, args, 0); + TQWidget *w = extractQWidget(exec, args, 0); + TQPixmap pix = extractQPixmap(exec, args, 0); if( w ) { p->setDevice(w); p->setCanDelete(false); } else if( !pix.isNull() ) - p->setDevice( new QPixmap(pix) ); + p->setDevice( new TQPixmap(pix) ); */ JSOpaqueProxy *prx = new JSOpaqueProxy( p, "Painter" ); prx->setOwner( JSProxy::JavaScript ); @@ -74,17 +74,17 @@ PainterRef::~PainterRef() delete m_painter; } -QPainter *PainterRef::painter() +TQPainter *PainterRef::painter() { return m_painter; } -QPaintDevice *PainterRef::device() +TQPaintDevice *PainterRef::device() { return m_device; } -void PainterRef::setDevice(QPaintDevice *d) +void PainterRef::setDevice(TQPaintDevice *d) { if( m_device && m_canDelete) { @@ -162,17 +162,17 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li } else { - QString msg = i18n( "Paintdevice was not a valid widget." ); + TQString msg = i18n( "Paintdevice was not a valid widget." ); throwError(exec,msg); retValue = KJS::Boolean(false); } } else if ( vp ) { - QPixmap *p = new QPixmap(vp->toVariant().toPixmap()); + TQPixmap *p = new TQPixmap(vp->toVariant().toPixmap()); if( p->isNull() ) { - QString msg = i18n( "Cannto paint to a null pixmap." ).arg( op->typeName() ); + TQString msg = i18n( "Cannto paint to a null pixmap." ).arg( op->typeName() ); throwError(exec,msg); retValue = KJS::Boolean(false); } @@ -183,22 +183,22 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li retValue = KJS::Boolean( begin() ); } } - else if ( op && op->typeName() == "QPaintDevice" ) + else if ( op && op->typeName() == "TQPaintDevice" ) { - pr->setDevice( op->toNative<QPaintDevice>() ); + pr->setDevice( op->toNative<TQPaintDevice>() ); pr->setCanDelete(false); retValue = KJS::Boolean( begin() ); } else { - QString msg = i18n( "Paintdevice of type '%1' is not supported." ).arg( op->typeName() ); + TQString msg = i18n( "Paintdevice of type '%1' is not supported." ).arg( op->typeName() ); throwError(exec,msg); retValue = KJS::Boolean(false); } } else { - QString msg = i18n( "Incorrect number of arguements '%1'." ).arg( args.size() ); + TQString msg = i18n( "Incorrect number of arguements '%1'." ).arg( args.size() ); throwError(exec,msg); retValue = KJS::Boolean(false); } @@ -216,7 +216,7 @@ KJS::Value Painter::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li break; case MethodsetPen: { - QPen pn = extractQPen(exec, args, 0); + TQPen pn = extractQPen(exec, args, 0); setPen(pn); break; } @@ -367,7 +367,7 @@ bool Painter::begin() { return pr->painter()->begin(pr->device()); } -bool Painter::begin(QPaintDevice *dev) +bool Painter::begin(TQPaintDevice *dev) { return pr->painter()->begin(dev); } @@ -377,29 +377,29 @@ bool Painter::end() return pr->painter()->end(); } -QPixmap Painter::pixmap() const +TQPixmap Painter::pixmap() const { - QPixmap *pix = dynamic_cast<QPixmap *>(pr->device()); + TQPixmap *pix = dynamic_cast<TQPixmap *>(pr->device()); if( pix ) { return *pix; } - return QPixmap(); + return TQPixmap(); } -void Painter::setPen( const QPen& pn ) +void Painter::setPen( const TQPen& pn ) { pr->painter()->setPen(pn); } -QPen Painter::pen() const +TQPen Painter::pen() const { return pr->painter()->pen(); } -QRect Painter::textBox(const QString &text) +TQRect Painter::textBox(const TQString &text) { - QFontMetrics fnt = pr->painter()->fontMetrics(); + TQFontMetrics fnt = pr->painter()->fontMetrics(); return fnt.boundingRect(text); } @@ -438,7 +438,7 @@ void Painter::drawEllipse( int x, int y, int w, int h ) pr->painter()->drawEllipse( x, y, w, h ); } -void Painter::drawText( int x, int y, const QString &txt ) +void Painter::drawText( int x, int y, const TQString &txt ) { pr->painter()->drawText( x, y, txt ); } @@ -451,15 +451,15 @@ void Painter::drawPie ( int x, int y, int w, int h, int a, int alen ) { pr->painter()->drawPie( x, y, w, h, a, alen); } -void Painter::drawPixmap ( int x, int y, const QPixmap & pixmap, int sx, int sy, int sw, int sh ) +void Painter::drawPixmap ( int x, int y, const TQPixmap & pixmap, int sx, int sy, int sw, int sh ) { pr->painter()->drawPixmap( x, y, pixmap, sx, sy, sw, sh ); } -void Painter::drawImage ( int x, int y, const QImage &image, int sx , int sy, int sw , int sh, int conversionFlags) +void Painter::drawImage ( int x, int y, const TQImage &image, int sx , int sy, int sw , int sh, int conversionFlags) { pr->painter()->drawImage( x, y, image, sx, sy, sw, sh, conversionFlags ); } -void Painter::drawTiledPixmap ( int x, int y, int w, int h, const QPixmap & pixmap, int sx, int sy ) +void Painter::drawTiledPixmap ( int x, int y, int w, int h, const TQPixmap & pixmap, int sx, int sy ) { pr->painter()->drawTiledPixmap( x, y, w, h, pixmap, sx, sy ); } @@ -481,22 +481,22 @@ void Painter::translate ( double dx, double dy ) pr->painter()->translate( dx, dy ); } -void KJSEmbed::Bindings::Painter::setFont( const QFont & font ) +void KJSEmbed::Bindings::Painter::setFont( const TQFont & font ) { pr->painter()->setFont(font); } -QFont KJSEmbed::Bindings::Painter::font( ) const +TQFont KJSEmbed::Bindings::Painter::font( ) const { return pr->painter()->font(); } -QColor KJSEmbed::Bindings::Painter::backgroundColor( ) const +TQColor KJSEmbed::Bindings::Painter::backgroundColor( ) const { return pr->painter()->backgroundColor(); } -void KJSEmbed::Bindings::Painter::setBackgroundColor( const QColor & color ) +void KJSEmbed::Bindings::Painter::setBackgroundColor( const TQColor & color ) { pr->painter()->setBackgroundColor(color); } @@ -505,12 +505,12 @@ void KJSEmbed::Bindings::Painter::setBackgroundColor( const QColor & color ) } // namespace KJSEmbed -void KJSEmbed::Bindings::Painter::setBrush( const QColor & brush ) +void KJSEmbed::Bindings::Painter::setBrush( const TQColor & brush ) { pr->painter()->setBrush(brush); } -QColor KJSEmbed::Bindings::Painter::brush( ) const +TQColor KJSEmbed::Bindings::Painter::brush( ) const { return pr->painter()->brush().color(); } diff --git a/kjsembed/bindings/painter_imp.h b/kjsembed/bindings/painter_imp.h index 0660a7ba..8b71a191 100644 --- a/kjsembed/bindings/painter_imp.h +++ b/kjsembed/bindings/painter_imp.h @@ -24,8 +24,8 @@ #include <kjsembed/jsbindingbase.h> #include <kjsembed/jsproxy_imp.h> -#include <qpen.h> -#include <qpainter.h> +#include <tqpen.h> +#include <tqpainter.h> class QPixmap; @@ -46,22 +46,22 @@ class PainterRef PainterRef(); ~PainterRef(); - QPainter *painter(); + TQPainter *painter(); - QPaintDevice *device(); - void setDevice(QPaintDevice *d); + TQPaintDevice *device(); + void setDevice(TQPaintDevice *d); void setCanDelete(bool can ) {m_canDelete = can;} bool canDelete() const { return m_canDelete;} private: - QPainter *m_painter; - QPaintDevice *m_device; + TQPainter *m_painter; + TQPaintDevice *m_device; bool m_canDelete; }; /** - * JSProxyImp binding for painting on a QPixmap. + * JSProxyImp binding for painting on a TQPixmap. * * @author Richard Moore, rich@kde.org */ @@ -84,12 +84,12 @@ public: private: bool begin(); - bool begin(QPaintDevice *dev); + bool begin(TQPaintDevice *dev); bool end(); - QPixmap pixmap() const; - void setPen( const QPen& pn); - QPen pen() const; - QRect textBox(const QString &text); + TQPixmap pixmap() const; + void setPen( const TQPen& pn); + TQPen pen() const; + TQRect textBox(const TQString &text); void moveTo( int x, int y ); void lineTo( int x, int y ); void drawPoint( int x, int y ); @@ -97,22 +97,22 @@ private: void drawRect( int x, int y, int w, int h ); void drawRoundRect( int x, int y, int w, int h, int, int); void drawEllipse( int x, int y, int w, int h ); - void drawText( int x, int y, const QString &txt ); + void drawText( int x, int y, const TQString &txt ); void drawArc( int x, int y, int w, int h, int a, int alen ); void drawPie( int x, int y, int w, int h, int a, int alen ); - void drawPixmap ( int x, int y, const QPixmap &pixmap, int sx, int sy, int sw, int sh ); - void drawImage ( int x, int y, const QImage &image, int sx, int sy, int sw, int sh, int conversionFlags ); - void drawTiledPixmap ( int x, int y, int w, int h, const QPixmap &pixmap, int sx, int sy); + void drawPixmap ( int x, int y, const TQPixmap &pixmap, int sx, int sy, int sw, int sh ); + void drawImage ( int x, int y, const TQImage &image, int sx, int sy, int sw, int sh, int conversionFlags ); + void drawTiledPixmap ( int x, int y, int w, int h, const TQPixmap &pixmap, int sx, int sy); void scale ( double sx, double sy ); void shear ( double sh, double sv ); void rotate ( double a ); void translate ( double dx, double dy ); - void setFont( const QFont &font); - QFont font() const; - void setBrush( const QColor &brush ); - QColor brush() const; - QColor backgroundColor() const; - void setBackgroundColor(const QColor &color); + void setFont( const TQFont &font); + TQFont font() const; + void setBrush( const TQColor &brush ); + TQColor brush() const; + TQColor backgroundColor() const; + void setBackgroundColor(const TQColor &color); private: int mid; diff --git a/kjsembed/bindings/pen_imp.cpp b/kjsembed/bindings/pen_imp.cpp index 67ada965..25a38eee 100644 --- a/kjsembed/bindings/pen_imp.cpp +++ b/kjsembed/bindings/pen_imp.cpp @@ -19,10 +19,10 @@ * Boston, MA 02110-1301, USA. */ -#include <qpainter.h> -#include <qpixmap.h> +#include <tqpainter.h> +#include <tqpixmap.h> #include <kjsembed/global.h> -#include <qpen.h> +#include <tqpen.h> #include "pen_imp.h" #include <kjsembed/jsvalueproxy.h> #include <kjsembed/jsbinding.h> @@ -40,7 +40,7 @@ Pen::~Pen() } void Pen::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "QPen") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQPen") ) return; JSProxy::MethodTable methods[] = { { Methodwidth, "width"}, @@ -80,9 +80,9 @@ void Pen::addBindings( KJS::ExecState *exec, KJS::Object &object ) { KJS::Value Pen::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "QPen") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQPen") ) return KJS::Value(); JSValueProxy *op = JSProxy::toValueProxy( self.imp() ); - QPen pen = op->toVariant().toPen(); + TQPen pen = op->toVariant().toPen(); KJS::Value retValue = KJS::Value(); switch ( mid ) { @@ -104,7 +104,7 @@ KJS::Value Pen::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List & } case MethodsetColor: { - QColor color = extractQColor(exec, args, 0); + TQColor color = extractQColor(exec, args, 0); pen.setColor(color); break; } diff --git a/kjsembed/bindings/pixmap_imp.cpp b/kjsembed/bindings/pixmap_imp.cpp index 68e93658..def51e3e 100644 --- a/kjsembed/bindings/pixmap_imp.cpp +++ b/kjsembed/bindings/pixmap_imp.cpp @@ -19,13 +19,13 @@ * Boston, MA 02110-1301, USA. */ -#include <qpixmap.h> -#include <qbitmap.h> +#include <tqpixmap.h> +#include <tqbitmap.h> #include <kjsembed/global.h> #include <kjsembed/jsvalueproxy.h> #include <kjsembed/jsbinding.h> -#include <qvariant.h> +#include <tqvariant.h> #include "pixmap_imp.h" @@ -43,7 +43,7 @@ Pixmap::~Pixmap() void Pixmap::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType( object, JSProxy::ValueProxy, "QPixmap") ) + if( !JSProxy::checkType( object, JSProxy::ValueProxy, "TQPixmap") ) return; JSProxy::MethodTable methods[] = { @@ -68,7 +68,7 @@ void Pixmap::addBindings( KJS::ExecState *exec, KJS::Object &object ) { KJS::Value Pixmap::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType( self, JSProxy::ValueProxy, "QPixmap") ) + if( !JSProxy::checkType( self, JSProxy::ValueProxy, "TQPixmap") ) return KJS::Value(); JSValueProxy *op = JSProxy::toValueProxy( self.imp() ); @@ -144,35 +144,35 @@ void Pixmap::resize( int w, int h ) pix.resize( w, h ); } -void Pixmap::resize( const QSize &size ) +void Pixmap::resize( const TQSize &size ) { pix.resize( size ); } -void Pixmap::fill( const QColor &c ) +void Pixmap::fill( const TQColor &c ) { pix.fill( c ); } void Pixmap::grabWindow(int winID, int x, int y, int w, int h) { - pix = QPixmap::grabWindow((WId)winID, x, y, w, h); + pix = TQPixmap::grabWindow((WId)winID, x, y, w, h); } -QPixmap Pixmap::mask() +TQPixmap Pixmap::mask() { return *(pix.mask()); } -void Pixmap::setMask(const QPixmap& mask) +void Pixmap::setMask(const TQPixmap& mask) { - QBitmap bm; + TQBitmap bm; bm = mask; pix.setMask(bm); } -QPixmap Pixmap::createHeuristicMask ( bool clipTight ) +TQPixmap Pixmap::createHeuristicMask ( bool clipTight ) { - return (QPixmap)pix.createHeuristicMask(clipTight); + return (TQPixmap)pix.createHeuristicMask(clipTight); } } // namespace KJSEmbed::Bindings diff --git a/kjsembed/bindings/pixmap_imp.h b/kjsembed/bindings/pixmap_imp.h index 994c2699..08baa96c 100644 --- a/kjsembed/bindings/pixmap_imp.h +++ b/kjsembed/bindings/pixmap_imp.h @@ -24,13 +24,13 @@ #include <kjsembed/jsobjectproxy_imp.h> -#include <qpixmap.h> +#include <tqpixmap.h> namespace KJSEmbed { namespace Bindings { /** - * QObject Binding for QPixmap. + * TQObject Binding for TQPixmap. * * @author Richard Moore, rich@kde.org * @version $Id$ @@ -60,25 +60,25 @@ private: int width() const { return pix.width(); } int height() const { return pix.height(); } - QSize size() const { return pix.size(); } - QRect rect() const { return pix.rect(); } + TQSize size() const { return pix.size(); } + TQRect rect() const { return pix.rect(); } int depth() const { return pix.depth(); } void resize( int w, int h ); - void resize( const QSize &size ); - void fill( const QColor &color ); + void resize( const TQSize &size ); + void fill( const TQColor &color ); - QPixmap mask(); - void setMask(const QPixmap& mask); - QPixmap createHeuristicMask ( bool clipTight ); + TQPixmap mask(); + void setMask(const TQPixmap& mask); + TQPixmap createHeuristicMask ( bool clipTight ); // Image Capture void grabWindow(int winID, int x =0, int y = 0, int w = -1, int h = -1); private: int mid; - QPixmap pix; + TQPixmap pix; }; } // namespace diff --git a/kjsembed/bindings/point_imp.cpp b/kjsembed/bindings/point_imp.cpp index 9eeb5c6a..fff93aad 100644 --- a/kjsembed/bindings/point_imp.cpp +++ b/kjsembed/bindings/point_imp.cpp @@ -21,7 +21,7 @@ #include <kjsembed/global.h> #include "point_imp.h" -#include <qpoint.h> +#include <tqpoint.h> #include <kjsembed/jsvalueproxy.h> #include <kjsembed/jsbinding.h> @@ -38,7 +38,7 @@ namespace Bindings { } void Point::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "QPoint") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQPoint") ) return; JSProxy::MethodTable methods[] = { { Methodx, "x"}, @@ -53,10 +53,10 @@ namespace Bindings { } KJS::Value Point::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "QPoint") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQPoint") ) return KJS::Value(); JSValueProxy *vp = JSProxy::toValueProxy( self.imp() ); KJS::Value retValue = KJS::Value(); - QPoint val = vp->toVariant().toPoint(); + TQPoint val = vp->toVariant().toPoint(); switch ( mid ) { case Methodx: @@ -75,7 +75,7 @@ namespace Bindings { retValue = KJS::Number(val.manhattanLength()); break; default: - QString msg = i18n( "Point has no method %1" ).arg(mid); + TQString msg = i18n( "Point has no method %1" ).arg(mid); return throwError(exec, msg); break; } diff --git a/kjsembed/bindings/rect_imp.cpp b/kjsembed/bindings/rect_imp.cpp index 82b5268b..eb392722 100644 --- a/kjsembed/bindings/rect_imp.cpp +++ b/kjsembed/bindings/rect_imp.cpp @@ -21,7 +21,7 @@ #include <kjsembed/global.h> #include "rect_imp.h" -#include <qrect.h> +#include <tqrect.h> #include <kjsembed/jsvalueproxy.h> #include <kjsembed/jsbinding.h> @@ -38,7 +38,7 @@ namespace Bindings { } void Rect::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "QRect") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQRect") ) return; JSProxy::MethodTable methods[] = { { Methodx, "x" }, @@ -58,12 +58,12 @@ namespace Bindings { } KJS::Value Rect::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "QRect") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQRect") ) return KJS::Value(); KJS::Value retValue = KJS::Value(); JSValueProxy *vp = JSProxy::toValueProxy( self.imp() ); - QRect val = vp->toVariant().toRect(); + TQRect val = vp->toVariant().toRect(); switch ( mid ) { case Methodx: @@ -94,7 +94,7 @@ namespace Bindings { retValue = convertToValue( exec, val.contains( extractQRect(exec, args, 0), extractBool(exec, args, 1)) ); break; default: - QString msg = i18n( "Rect has no method %1" ).arg(mid); + TQString msg = i18n( "Rect has no method %1" ).arg(mid); return throwError(exec, msg); break; } diff --git a/kjsembed/bindings/size_imp.cpp b/kjsembed/bindings/size_imp.cpp index 09c01427..d773507d 100644 --- a/kjsembed/bindings/size_imp.cpp +++ b/kjsembed/bindings/size_imp.cpp @@ -21,7 +21,7 @@ #include <kjsembed/global.h> #include "size_imp.h" -#include <qsize.h> +#include <tqsize.h> #include <kjsembed/jsvalueproxy.h> #include <kjsembed/jsbinding.h> @@ -38,7 +38,7 @@ Size::~Size() } void Size::addBindings( KJS::ExecState *exec, KJS::Object &object ) { - if( !JSProxy::checkType(object, JSProxy::ValueProxy, "QSize") ) return; + if( !JSProxy::checkType(object, JSProxy::ValueProxy, "TQSize") ) return; JSProxy::MethodTable methods[] = { { Methodwidth, "width"}, @@ -58,9 +58,9 @@ void Size::addBindings( KJS::ExecState *exec, KJS::Object &object ) { // JSProxy::EnumTable enums[] = { - { "ScaleFree", (int)QSize::ScaleFree }, - { "ScaleMin", (int)QSize::ScaleMin }, - { "ScaleMax", (int)QSize::ScaleMax }, + { "ScaleFree", (int)TQSize::ScaleFree }, + { "ScaleMin", (int)TQSize::ScaleMin }, + { "ScaleMax", (int)TQSize::ScaleMax }, { 0, 0 } }; @@ -68,10 +68,10 @@ void Size::addBindings( KJS::ExecState *exec, KJS::Object &object ) { } KJS::Value Size::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - if( !JSProxy::checkType(self, JSProxy::ValueProxy, "QSize") ) return KJS::Value(); + if( !JSProxy::checkType(self, JSProxy::ValueProxy, "TQSize") ) return KJS::Value(); KJS::Value retValue = KJS::Value(); JSValueProxy *vp = JSProxy::toValueProxy( self.imp() ); - QSize val = vp->toVariant().toSize(); + TQSize val = vp->toVariant().toSize(); switch ( mid ) { case Methodwidth: @@ -89,14 +89,14 @@ KJS::Value Size::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List case Methodscale: { if( args.size() == 2 ) { - QSize sz = extractQSize(exec, args, 0); + TQSize sz = extractQSize(exec, args, 0); int mode = extractInt(exec, args, 1); - val.scale(sz, (QSize::ScaleMode)mode); + val.scale(sz, (TQSize::ScaleMode)mode); } else { int x = extractInt(exec, args, 0); int y = extractInt(exec, args, 1); int mode = extractInt(exec, args, 2); - val.scale(x,y, (QSize::ScaleMode)mode); + val.scale(x,y, (TQSize::ScaleMode)mode); } break; } @@ -105,18 +105,18 @@ KJS::Value Size::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List break; case MethodexpandedTo: { - QSize sz = extractQSize(exec, args, 0); + TQSize sz = extractQSize(exec, args, 0); retValue = convertToValue( exec, val.expandedTo(sz) ); break; } case MethodboundedTo: { - QSize sz = extractQSize(exec, args, 0); + TQSize sz = extractQSize(exec, args, 0); retValue = convertToValue( exec, val.boundedTo(sz) ); break; } default: - QString msg = i18n( "Size has no method %1" ).arg(mid); + TQString msg = i18n( "Size has no method %1" ).arg(mid); return throwError(exec, msg); break; } diff --git a/kjsembed/bindings/sql_imp.cpp b/kjsembed/bindings/sql_imp.cpp index 31c7f53c..5fa9782f 100644 --- a/kjsembed/bindings/sql_imp.cpp +++ b/kjsembed/bindings/sql_imp.cpp @@ -20,9 +20,9 @@ */ #include <kjsembed/global.h> -#include <qsqldatabase.h> -#include <qsqlquery.h> -#include <qsqlerror.h> +#include <tqsqldatabase.h> +#include <tqsqlquery.h> +#include <tqsqlerror.h> #include "sql_imp.h" @@ -30,44 +30,44 @@ namespace KJSEmbed { namespace Bindings { -SqlDatabase::SqlDatabase( QObject *parent, const char *name): BindingObject(parent, name) +SqlDatabase::SqlDatabase( TQObject *parent, const char *name): BindingObject(parent, name) { connectionName = "defaultConnection"; setJSClassName( "SqlDatabase" ); } SqlDatabase::~SqlDatabase() { - QSqlDatabase::removeDatabase(connectionName); + TQSqlDatabase::removeDatabase(connectionName); } -bool SqlDatabase::addDatabase ( const QString &type, const QString &conn ) +bool SqlDatabase::addDatabase ( const TQString &type, const TQString &conn ) { connectionName = conn; - QSqlDatabase *db = QSqlDatabase::addDatabase(type, connectionName); + TQSqlDatabase *db = TQSqlDatabase::addDatabase(type, connectionName); if ( !db ) return false; return true; } -QStringList SqlDatabase::drivers () +TQStringList SqlDatabase::drivers () { - return QSqlDatabase::drivers(); + return TQSqlDatabase::drivers(); } bool SqlDatabase::open ( ) { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->open(); return false; } -bool SqlDatabase::open ( const QString &user, const QString &password ) +bool SqlDatabase::open ( const TQString &user, const TQString &password ) { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->open(user, password); return false; } void SqlDatabase::close () { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) { db->close(); @@ -75,28 +75,28 @@ void SqlDatabase::close () } bool SqlDatabase::isOpen () { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->isOpen(); return false; } bool SqlDatabase::isOpenError () { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->isOpenError(); return true; } -QStringList SqlDatabase::tables () +TQStringList SqlDatabase::tables () { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->tables(); - return QStringList(); + return TQStringList(); } -SqlQuery *SqlDatabase::exec (const QString &query ) +SqlQuery *SqlDatabase::exec (const TQString &query ) { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) { kdDebug() <<" exec query " << query << endl; @@ -108,9 +108,9 @@ SqlQuery *SqlDatabase::exec (const QString &query ) } return 0L; } -QString SqlDatabase::lastError () const +TQString SqlDatabase::lastError () const { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) { return db->lastError().text(); @@ -119,105 +119,105 @@ QString SqlDatabase::lastError () const } bool SqlDatabase::transaction () { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->transaction(); return false; } bool SqlDatabase::commit () { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->commit(); return false; } bool SqlDatabase::rollback () { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->rollback(); return false; } -void SqlDatabase::setDatabaseName (const QString &name ) +void SqlDatabase::setDatabaseName (const TQString &name ) { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) db->setDatabaseName(name); } -void SqlDatabase::setUserName (const QString &name ) +void SqlDatabase::setUserName (const TQString &name ) { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) db->setUserName(name); } -void SqlDatabase::setPassword (const QString &password ) +void SqlDatabase::setPassword (const TQString &password ) { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) db->setPassword(password); } -void SqlDatabase::setHostName (const QString &host ) +void SqlDatabase::setHostName (const TQString &host ) { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) db->setHostName(host); } void SqlDatabase::setPort ( int p ) { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) db->setPort(p); } -QString SqlDatabase::databaseName () const +TQString SqlDatabase::databaseName () const { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->databaseName(); return ""; } -QString SqlDatabase::userName () const +TQString SqlDatabase::userName () const { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->userName(); return ""; } -QString SqlDatabase::password () const +TQString SqlDatabase::password () const { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->password(); return ""; } -QString SqlDatabase::hostName () const +TQString SqlDatabase::hostName () const { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->hostName(); return ""; } -QString SqlDatabase::driverName () const +TQString SqlDatabase::driverName () const { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->driverName(); return ""; } int SqlDatabase::port () const { - QSqlDatabase *db = QSqlDatabase::database(connectionName,false); + TQSqlDatabase *db = TQSqlDatabase::database(connectionName,false); if ( db ) return db->port(); return 0; } -SqlQuery::SqlQuery( QObject *parent, const char *name ): BindingObject(parent, name) +SqlQuery::SqlQuery( TQObject *parent, const char *name ): BindingObject(parent, name) { kdDebug() << "New null SQL Query" << endl; - m_query = QSqlQuery(); + m_query = TQSqlQuery(); setJSClassName( "SqlQuery" ); } -SqlQuery::SqlQuery( QObject *parent, const char *name, const QSqlQuery &q ): BindingObject(parent, name) +SqlQuery::SqlQuery( TQObject *parent, const char *name, const TQSqlQuery &q ): BindingObject(parent, name) { kdDebug() << "New SQL Query with argument" << endl; m_query = q; @@ -252,7 +252,7 @@ int SqlQuery::at () const { return m_query.at(); } -QString SqlQuery::lastQuery () const +TQString SqlQuery::lastQuery () const { kdDebug() << "Last query error: " << m_query.lastQuery() << endl; return m_query.lastQuery(); @@ -261,7 +261,7 @@ int SqlQuery::numRowsAffected () const { return m_query.numRowsAffected(); } -QString SqlQuery::lastError () const +TQString SqlQuery::lastError () const { return m_query.lastError().text(); } @@ -273,11 +273,11 @@ int SqlQuery::size () const { return m_query.size(); } -bool SqlQuery::exec ( const QString & query ) +bool SqlQuery::exec ( const TQString & query ) { return m_query.exec( query ); } -QVariant SqlQuery::value ( int i ) +TQVariant SqlQuery::value ( int i ) { return m_query.value(i); } diff --git a/kjsembed/bindings/sql_imp.h b/kjsembed/bindings/sql_imp.h index 78e54756..f2fa6e6d 100644 --- a/kjsembed/bindings/sql_imp.h +++ b/kjsembed/bindings/sql_imp.h @@ -21,14 +21,14 @@ #define KJSEMBED_SQL_IMP_H #include "bindingobject.h" -#include <qsqlquery.h> -#include <qsqldatabase.h> +#include <tqsqlquery.h> +#include <tqsqldatabase.h> namespace KJSEmbed { namespace Bindings { /** - * QObject Binding for QSQLQuery. + * TQObject Binding for QSQLQuery. * * @author Ian Reinhart Geiser, geiseri@kde.org * @version $Id$ @@ -42,17 +42,17 @@ class SqlQuery : public BindingObject Q_PROPERTY( bool select READ isSelect) Q_PROPERTY( bool valid READ isValid) Q_PROPERTY( bool active READ isActive) - Q_PROPERTY( QString lastError READ lastError) - Q_PROPERTY( QString lastQuery READ lastQuery) + Q_PROPERTY( TQString lastError READ lastError) + Q_PROPERTY( TQString lastQuery READ lastQuery) public: - SqlQuery( QObject *parent=0, const char *name=0 ); - SqlQuery( QObject *parent, const char *name, const QSqlQuery &q ); + SqlQuery( TQObject *parent=0, const char *name=0 ); + SqlQuery( TQObject *parent, const char *name, const TQSqlQuery &q ); //SqlQuery( const SqlQuery ©); virtual ~SqlQuery(); - QSqlQuery query(){ return m_query; } - void setQuery(const QSqlQuery &q) {m_query = QSqlQuery(q); } + TQSqlQuery query(){ return m_query; } + void setQuery(const TQSqlQuery &q) {m_query = TQSqlQuery(q); } int size () const; bool isSelect () const; @@ -60,16 +60,16 @@ public: bool isActive () const; int at () const; int numRowsAffected () const; - QString lastError () const; - QString lastQuery () const; + TQString lastError () const; + TQString lastQuery () const; public slots: bool isNull ( int field ); - bool exec ( const QString & m_query ); - QVariant value ( int i ); + bool exec ( const TQString & m_query ); + TQVariant value ( int i ); bool seek ( int i, bool relative = FALSE ); bool next (); bool prev (); @@ -77,11 +77,11 @@ public slots: bool last (); private: - QSqlQuery m_query; + TQSqlQuery m_query; }; /** - * QObject Binding for QSQLDatabase. + * TQObject Binding for QSQLDatabase. * * @author Ian Reinhart Geiser, geiseri@kde.org * @version $Id$ @@ -89,49 +89,49 @@ private: class SqlDatabase : public BindingObject { Q_OBJECT - Q_PROPERTY( QString databaseName READ databaseName WRITE setDatabaseName) - Q_PROPERTY( QString userName READ userName WRITE setUserName) - Q_PROPERTY( QString password READ password WRITE setPassword) - Q_PROPERTY( QString hostName READ hostName WRITE setHostName) + Q_PROPERTY( TQString databaseName READ databaseName WRITE setDatabaseName) + Q_PROPERTY( TQString userName READ userName WRITE setUserName) + Q_PROPERTY( TQString password READ password WRITE setPassword) + Q_PROPERTY( TQString hostName READ hostName WRITE setHostName) Q_PROPERTY( int port READ port WRITE setPort) - Q_PROPERTY( QString driverName READ driverName) - Q_PROPERTY( QString lastError READ lastError) + Q_PROPERTY( TQString driverName READ driverName) + Q_PROPERTY( TQString lastError READ lastError) public: - SqlDatabase( QObject *parent=0, const char *name=0 ); + SqlDatabase( TQObject *parent=0, const char *name=0 ); virtual ~SqlDatabase(); public slots: - void setDatabaseName (const QString &name ); - void setUserName (const QString &name ); - void setPassword (const QString &password ); - void setHostName (const QString &host ); + void setDatabaseName (const TQString &name ); + void setUserName (const TQString &name ); + void setPassword (const TQString &password ); + void setHostName (const TQString &host ); void setPort ( int p ); - QString databaseName () const; - QString userName () const; - QString password () const; - QString hostName () const; + TQString databaseName () const; + TQString userName () const; + TQString password () const; + TQString hostName () const; int port () const; - QString driverName () const; + TQString driverName () const; - bool addDatabase ( const QString & type, const QString & connectionName = QSqlDatabase::defaultConnection ); - QStringList drivers (); + bool addDatabase ( const TQString & type, const TQString & connectionName = TQSqlDatabase::defaultConnection ); + TQStringList drivers (); bool open (); - bool open ( const QString &user, const QString &password ); + bool open ( const TQString &user, const TQString &password ); void close (); bool isOpen (); bool isOpenError (); - QStringList tables (); - SqlQuery *exec( const QString &query ); - QString lastError () const; + TQStringList tables (); + SqlQuery *exec( const TQString &query ); + TQString lastError () const; bool transaction (); bool commit (); bool rollback (); private: - QString connectionName; - //QSqlDatabase *db; + TQString connectionName; + //TQSqlDatabase *db; }; diff --git a/kjsembed/builtins/qdir_imp.cpp b/kjsembed/builtins/qdir_imp.cpp index 32d79d14..55895a59 100644 --- a/kjsembed/builtins/qdir_imp.cpp +++ b/kjsembed/builtins/qdir_imp.cpp @@ -14,7 +14,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qdir.h> +#include <tqdir.h> #include "qdir_imp.h" /** @@ -26,10 +26,10 @@ namespace Bindings { { JSOpaqueProxy * prx; if ( args.size() == 0 ) { - prx = new JSOpaqueProxy( new QDir( QDir::current() ), "QDir" ); + prx = new JSOpaqueProxy( new TQDir( TQDir::current() ), "TQDir" ); } else { - QString arg0 = ( args.size() >= 1 ) ? args[ 0 ].toString( exec ).qstring() : QString::null; - prx = new JSOpaqueProxy( new QDir( arg0 ), "QDir" ); + TQString arg0 = ( args.size() >= 1 ) ? args[ 0 ].toString( exec ).qstring() : TQString::null; + prx = new JSOpaqueProxy( new TQDir( arg0 ), "TQDir" ); } prx->setOwner( JSProxy::JavaScript ); KJS::Object proxyObj( prx ); @@ -177,31 +177,31 @@ void QDirImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) EnumValue enums[] = { // enum FilterSpec - { "Dirs", QDir::Dirs }, - { "Files", QDir::Files }, - { "Drives", QDir::Drives }, - { "NoSymLinks", QDir::NoSymLinks }, - { "All", QDir::All }, - { "TypeMask", QDir::TypeMask }, - { "Readable", QDir::Readable }, - { "Writable", QDir::Writable }, - { "Executable", QDir::Executable }, - { "RWEMask", QDir::RWEMask }, - { "Modified", QDir::Modified }, - { "Hidden", QDir::Hidden }, - { "System", QDir::System }, - { "AccessMask", QDir::AccessMask }, - { "DefaultFilter", QDir::DefaultFilter }, + { "Dirs", TQDir::Dirs }, + { "Files", TQDir::Files }, + { "Drives", TQDir::Drives }, + { "NoSymLinks", TQDir::NoSymLinks }, + { "All", TQDir::All }, + { "TypeMask", TQDir::TypeMask }, + { "Readable", TQDir::Readable }, + { "Writable", TQDir::Writable }, + { "Executable", TQDir::Executable }, + { "RWEMask", TQDir::RWEMask }, + { "Modified", TQDir::Modified }, + { "Hidden", TQDir::Hidden }, + { "System", TQDir::System }, + { "AccessMask", TQDir::AccessMask }, + { "DefaultFilter", TQDir::DefaultFilter }, // enum SortSpec - { "Name", QDir::Name }, - { "Time", QDir::Time }, - { "Size", QDir::Size }, - { "Unsorted", QDir::Unsorted }, - { "SortByMask", QDir::SortByMask }, - { "DirsFirst", QDir::DirsFirst }, - { "Reversed", QDir::Reversed }, - { "IgnoreCase", QDir::IgnoreCase }, - { "DefaultSort", QDir::DefaultSort }, + { "Name", TQDir::Name }, + { "Time", TQDir::Time }, + { "Size", TQDir::Size }, + { "Unsorted", TQDir::Unsorted }, + { "SortByMask", TQDir::SortByMask }, + { "DirsFirst", TQDir::DirsFirst }, + { "Reversed", TQDir::Reversed }, + { "IgnoreCase", TQDir::IgnoreCase }, + { "DefaultSort", TQDir::DefaultSort }, { 0, 0 } }; @@ -222,12 +222,12 @@ KJS::Value QDirImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li return KJS::Value(); } - if ( op->typeName() != "QDir" ) { + if ( op->typeName() != "TQDir" ) { kdWarning() << "QDirImp::call() failed, type is " << op->typeName() << endl; return KJS::Value(); } - instance = op->toNative<QDir>(); + instance = op->toNative<TQDir>(); switch( mid ) { @@ -431,7 +431,7 @@ KJS::Value QDirImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li break; } - QString msg = i18n( "QDirImp has no method with id '%1'." ).arg( mid ); + TQString msg = i18n( "QDirImp has no method with id '%1'." ).arg( mid ); return throwError(exec, msg,KJS::ReferenceError); } @@ -439,7 +439,7 @@ KJS::Value QDirImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li KJS::Value QDirImp::setPath_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; instance->setPath( arg0 ); @@ -450,7 +450,7 @@ KJS::Value QDirImp::setPath_7( KJS::ExecState *exec, KJS::Object &obj, const KJS KJS::Value QDirImp::path_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->path( ); return KJS::String( ret ); @@ -459,7 +459,7 @@ KJS::Value QDirImp::path_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::L KJS::Value QDirImp::absPath_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->absPath( ); return KJS::String( ret ); @@ -468,7 +468,7 @@ KJS::Value QDirImp::absPath_9( KJS::ExecState *exec, KJS::Object &obj, const KJS KJS::Value QDirImp::canonicalPath_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->canonicalPath( ); return KJS::String( ret ); @@ -477,7 +477,7 @@ KJS::Value QDirImp::canonicalPath_10( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QDirImp::dirName_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->dirName( ); return KJS::String( ret ); @@ -486,11 +486,11 @@ KJS::Value QDirImp::dirName_11( KJS::ExecState *exec, KJS::Object &obj, const KJ KJS::Value QDirImp::filePath_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; - QString ret; + TQString ret; ret = instance->filePath( arg0, arg1 ); @@ -501,11 +501,11 @@ KJS::Value QDirImp::filePath_12( KJS::ExecState *exec, KJS::Object &obj, const K KJS::Value QDirImp::absFilePath_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; - QString ret; + TQString ret; ret = instance->absFilePath( arg0, arg1 ); @@ -516,7 +516,7 @@ KJS::Value QDirImp::absFilePath_13( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value QDirImp::cd_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -540,7 +540,7 @@ KJS::Value QDirImp::cdUp_15( KJS::ExecState *exec, KJS::Object &obj, const KJS:: KJS::Value QDirImp::nameFilter_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->nameFilter( ); return KJS::String( ret ); @@ -549,7 +549,7 @@ KJS::Value QDirImp::nameFilter_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QDirImp::setNameFilter_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; instance->setNameFilter( arg0 ); @@ -641,7 +641,7 @@ KJS::Value QDirImp::encodedEntryList_26( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QDirImp::encodedEntryList_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1; @@ -662,7 +662,7 @@ KJS::Value QDirImp::entryList_28( KJS::ExecState *exec, KJS::Object &obj, const int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1; - QStringList ret; + TQStringList ret; ret = instance->entryList( arg0, arg1 ); @@ -674,13 +674,13 @@ KJS::Value QDirImp::entryList_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QDirImp::entryList_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1; int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1; - QStringList ret; + TQStringList ret; ret = instance->entryList( arg0, arg1, @@ -707,7 +707,7 @@ KJS::Value QDirImp::entryInfoList_30( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QDirImp::entryInfoList_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1; @@ -724,7 +724,7 @@ KJS::Value QDirImp::entryInfoList_31( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QDirImp::mkdir_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -739,7 +739,7 @@ KJS::Value QDirImp::mkdir_32( KJS::ExecState *exec, KJS::Object &obj, const KJS: KJS::Value QDirImp::rmdir_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -798,7 +798,7 @@ KJS::Value QDirImp::convertToAbs_38( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value QDirImp::remove_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -813,9 +813,9 @@ KJS::Value QDirImp::remove_41( KJS::ExecState *exec, KJS::Object &obj, const KJS KJS::Value QDirImp::rename_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; - QString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : QString::null; + TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null; bool arg2 = (args.size() >= 3) ? args[2].toBoolean(exec) : false; @@ -831,7 +831,7 @@ KJS::Value QDirImp::rename_42( KJS::ExecState *exec, KJS::Object &obj, const KJS KJS::Value QDirImp::exists_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -854,9 +854,9 @@ KJS::Value QDirImp::refresh_44( KJS::ExecState *exec, KJS::Object &obj, const KJ KJS::Value QDirImp::convertSeparators_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; - QString ret; + TQString ret; ret = instance->convertSeparators( arg0 ); return KJS::String( ret ); @@ -882,7 +882,7 @@ KJS::Value QDirImp::separator_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QDirImp::setCurrent_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool ret; ret = instance->setCurrent( @@ -918,7 +918,7 @@ KJS::Value QDirImp::root_51( KJS::ExecState *exec, KJS::Object &obj, const KJS:: KJS::Value QDirImp::currentDirPath_52( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->currentDirPath( ); return KJS::String( ret ); @@ -927,7 +927,7 @@ KJS::Value QDirImp::currentDirPath_52( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value QDirImp::homeDirPath_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->homeDirPath( ); return KJS::String( ret ); @@ -936,7 +936,7 @@ KJS::Value QDirImp::homeDirPath_53( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value QDirImp::rootDirPath_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->rootDirPath( ); return KJS::String( ret ); @@ -945,12 +945,12 @@ KJS::Value QDirImp::rootDirPath_54( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value QDirImp::match_55( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QStringList arg0; + TQStringList arg0; if ( args.size() >= 1 ) { // TODO: populate the list } - QString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : QString::null; + TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null; bool ret; ret = instance->match( @@ -963,9 +963,9 @@ KJS::Value QDirImp::match_55( KJS::ExecState *exec, KJS::Object &obj, const KJS: KJS::Value QDirImp::match_56( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; - QString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : QString::null; + TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null; bool ret; ret = instance->match( @@ -978,9 +978,9 @@ KJS::Value QDirImp::match_56( KJS::ExecState *exec, KJS::Object &obj, const KJS: KJS::Value QDirImp::cleanDirPath_57( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; - QString ret; + TQString ret; ret = instance->cleanDirPath( arg0 ); return KJS::String( ret ); @@ -990,7 +990,7 @@ KJS::Value QDirImp::cleanDirPath_57( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value QDirImp::isRelativePath_58( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool ret; ret = instance->isRelativePath( diff --git a/kjsembed/builtins/qdir_imp.h b/kjsembed/builtins/qdir_imp.h index f78850e7..7a8aa86b 100644 --- a/kjsembed/builtins/qdir_imp.h +++ b/kjsembed/builtins/qdir_imp.h @@ -25,7 +25,7 @@ namespace Bindings { }; } /** - * Wrapper class for QDir methods. + * Wrapper class for TQDir methods. * * @author Richard Moore, rich@kde.org */ @@ -157,7 +157,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QDir *instance; // Temp + TQDir *instance; // Temp int mid; }; diff --git a/kjsembed/builtins/qfile_imp.cpp b/kjsembed/builtins/qfile_imp.cpp index d404e239..abc38d09 100644 --- a/kjsembed/builtins/qfile_imp.cpp +++ b/kjsembed/builtins/qfile_imp.cpp @@ -1,9 +1,9 @@ -#include <qcstring.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #ifndef QT_ONLY #include <klocale.h> @@ -17,7 +17,7 @@ #include <kjsembed/jsbinding.h> #include <kjsembed/global.h> -#include <qfile.h> +#include <tqfile.h> #include "qfile_imp.h" /** @@ -71,7 +71,7 @@ void QFileImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; do { if ( lastName != methods[idx].name ) { @@ -85,23 +85,23 @@ void QFileImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } -QFile *QFileImp::toQFile( KJS::Object &self ) +TQFile *QFileImp::toQFile( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QFile *>( obj ); + return dynamic_cast<TQFile *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QFile" ) + if ( op->typeName() != "TQFile" ) return 0; - return op->toNative<QFile>(); + return op->toNative<TQFile>(); } @@ -121,7 +121,7 @@ KJS::Object QFileImp::construct( KJS::ExecState *exec, const KJS::List &args ) break; } - QString msg = i18n("QFileCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QFileCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -135,7 +135,7 @@ KJS::Object QFileImp::QFile_2( KJS::ExecState *exec, const KJS::List &args ) { // TODO - QWidget *arg0 = 0L; + TQWidget *arg0 = 0L; return KJS::Object(); } @@ -266,7 +266,7 @@ KJS::Value QFileImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L break; } - QString msg = i18n( "QFileImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QFileImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg, KJS::ReferenceError ); } @@ -274,7 +274,7 @@ KJS::Value QFileImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::L KJS::Value QFileImp::name_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->name( ); return KJS::String( ret ); @@ -283,7 +283,7 @@ KJS::Value QFileImp::name_4( KJS::ExecState *exec, KJS::Object &obj, const KJS:: KJS::Value QFileImp::setName_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; instance->setName( arg0 ); @@ -389,7 +389,7 @@ KJS::Value QFileImp::at_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::L KJS::Value QFileImp::at_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QFile::Offset arg0 = 0; // TODO (hack for qfile) + TQFile::Offset arg0 = 0; // TODO (hack for qfile) bool ret; ret = instance->at( @@ -447,7 +447,7 @@ KJS::Value QFileImp::writeBlock_18( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value QFileImp::writeBlock_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QByteArray arg0; // TODO (hack for qfile) + TQByteArray arg0; // TODO (hack for qfile) instance->writeBlock( arg0 ); @@ -478,7 +478,7 @@ KJS::Value QFileImp::readLine_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QFileImp::readLine_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; // Unsupported parameter Q_ULONG return KJS::Value(); @@ -537,7 +537,7 @@ KJS::Value QFileImp::handle_25( KJS::ExecState *exec, KJS::Object &obj, const KJ KJS::Value QFileImp::errorString_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->errorString( ); return KJS::String( ret ); @@ -546,7 +546,7 @@ KJS::Value QFileImp::errorString_26( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value QFileImp::encodeName_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; instance->encodeName( arg0 ); @@ -557,9 +557,9 @@ KJS::Value QFileImp::encodeName_27( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value QFileImp::decodeName_28( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - const QCString arg0 = (args.size() >= 1) ? args[0].toString(exec).ascii() : 0; + const TQCString arg0 = (args.size() >= 1) ? args[0].toString(exec).ascii() : 0; - QString ret; + TQString ret; ret = instance->decodeName( arg0 ); return KJS::String( ret ); @@ -569,7 +569,7 @@ KJS::Value QFileImp::decodeName_28( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value QFileImp::setEncodingFunction_29( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QFile::EncoderFn arg0 = 0; // TODO (hack for qfile) + TQFile::EncoderFn arg0 = 0; // TODO (hack for qfile) instance->setEncodingFunction( arg0 ); @@ -580,7 +580,7 @@ KJS::Value QFileImp::setEncodingFunction_29( KJS::ExecState *exec, KJS::Object & KJS::Value QFileImp::setDecodingFunction_30( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QFile::DecoderFn arg0 = 0; // TODO (hack for qfile) + TQFile::DecoderFn arg0 = 0; // TODO (hack for qfile) instance->setDecodingFunction( arg0 ); @@ -591,7 +591,7 @@ KJS::Value QFileImp::setDecodingFunction_30( KJS::ExecState *exec, KJS::Object & KJS::Value QFileImp::exists_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool ret; ret = instance->exists( @@ -603,7 +603,7 @@ KJS::Value QFileImp::exists_31( KJS::ExecState *exec, KJS::Object &obj, const KJ KJS::Value QFileImp::remove_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; bool ret; ret = instance->remove( diff --git a/kjsembed/builtins/qfile_imp.h b/kjsembed/builtins/qfile_imp.h index ae88dd52..d116040e 100644 --- a/kjsembed/builtins/qfile_imp.h +++ b/kjsembed/builtins/qfile_imp.h @@ -17,7 +17,7 @@ class QFile; namespace KJSEmbed { /** - * Wrapper class for QFile methods. + * Wrapper class for TQFile methods. * * @author Richard Moore, rich@kde.org */ @@ -72,7 +72,7 @@ public: static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QFile *toQFile( KJS::Object &object ); + static TQFile *toQFile( KJS::Object &object ); // // Constructors implemented by this class. @@ -132,7 +132,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QFile *instance; // Temp + TQFile *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/builtins/resources.cpp b/kjsembed/builtins/resources.cpp index 14912303..84128f69 100644 --- a/kjsembed/builtins/resources.cpp +++ b/kjsembed/builtins/resources.cpp @@ -24,8 +24,8 @@ #include <jsproxy.h> #include <jsbinding.h> #include <jsfactory.h> -#include <qdir.h> -#include <qapplication.h> +#include <tqdir.h> +#include <tqapplication.h> #include "resources.h" namespace KJSEmbed { @@ -70,75 +70,75 @@ void StdDirsImp::addBindings( KJS::ExecState *exec, KJS::Object &parent ) KJS::Value StdDirsImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, const KJS::List &args ) { -// QString arg0 = extractQString(exec, args, 0); -// QString arg1 = extractQString(exec, args, 1); +// TQString arg0 = extractQString(exec, args, 0); +// TQString arg1 = extractQString(exec, args, 1); switch( id ) { case StdDirsImp::findResource: { - QString arg0 = extractQString(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); - QString path = KGlobal::dirs ()->findResource(arg0.latin1(), arg1); + TQString arg0 = extractQString(exec, args, 0); + TQString arg1 = extractQString(exec, args, 1); + TQString path = KGlobal::dirs ()->findResource(arg0.latin1(), arg1); return KJS::String( path ); } case StdDirsImp::addResourceType: { - QString arg0 = extractQString(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); + TQString arg0 = extractQString(exec, args, 0); + TQString arg1 = extractQString(exec, args, 1); bool isOk = KGlobal::dirs ()->addResourceType(arg0.latin1(), arg1); return KJS::Boolean( isOk ); } case StdDirsImp::kde_default: { - QString arg0 = extractQString(exec, args, 0); - QString path = KGlobal::dirs ()->kde_default(arg0.latin1()); + TQString arg0 = extractQString(exec, args, 0); + TQString path = KGlobal::dirs ()->kde_default(arg0.latin1()); return KJS::String( path ); } case StdDirsImp::addResourceDir: { - QString arg0 = extractQString(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); + TQString arg0 = extractQString(exec, args, 0); + TQString arg1 = extractQString(exec, args, 1); bool isOk = KGlobal::dirs ()->addResourceDir(arg0.latin1(), arg1); return KJS::Boolean( isOk ); } case StdDirsImp::findResourceDir: { - QString arg0 = extractQString(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); - QString path = KGlobal::dirs ()->findResourceDir(arg0.latin1(), arg1); + TQString arg0 = extractQString(exec, args, 0); + TQString arg1 = extractQString(exec, args, 1); + TQString path = KGlobal::dirs ()->findResourceDir(arg0.latin1(), arg1); return KJS::String( path ); } case StdDirsImp::saveLocation: { - QString arg0 = extractQString(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); + TQString arg0 = extractQString(exec, args, 0); + TQString arg1 = extractQString(exec, args, 1); bool arg2 = (args.size() > 2) ? args[2].toBoolean(exec) : true; - QString path = KGlobal::dirs ()->saveLocation(arg0.latin1(), arg1, arg2); + TQString path = KGlobal::dirs ()->saveLocation(arg0.latin1(), arg1, arg2); return KJS::String( path ); } case StdDirsImp::makeDir: { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); int arg1 = (args.size() > 1) ? args[1].toInteger(exec) : 0755; bool isOk = KStandardDirs::makeDir(arg0, arg1); return KJS::Boolean( isOk ); } case StdDirsImp::exists: { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); bool isOk = KStandardDirs::exists(arg0); return KJS::Boolean( isOk ); } case StdDirsImp::realPath: { - QString arg0 = extractQString(exec, args, 0); - QString path = KStandardDirs::realPath(arg0); + TQString arg0 = extractQString(exec, args, 0); + TQString path = KStandardDirs::realPath(arg0); return KJS::String( path ); } case StdDirsImp::currentDirPath: - return KJS::String(QDir::currentDirPath()); + return KJS::String(TQDir::currentDirPath()); case StdDirsImp::homeDirPath: - return KJS::String(QDir::homeDirPath()); + return KJS::String(TQDir::homeDirPath()); case StdDirsImp::applicationDirPath: return KJS::String(qApp->applicationDirPath()); default: @@ -178,14 +178,14 @@ void StdIconsImp::addBindings( JSFactory *fact, KJS::ExecState *exec, KJS::Obje } -KJS::Value StdIconsImp::wrapPixmap(KJS::ExecState *exec, const QPixmap &icon) +KJS::Value StdIconsImp::wrapPixmap(KJS::ExecState *exec, const TQPixmap &icon) { return convertToValue(exec, icon); } KJS::Value StdIconsImp::call( KJS::ExecState *exec, KJS::Object &/*obj*/, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); // Name + TQString arg0 = extractQString(exec, args, 0); // Name int arg1 = extractInt(exec, args, 1); // Size 0, 16, 24, 32, 48, 64, 128 int arg2 = extractInt(exec, args, 2); // State 0 DefaultState, 1 ActiveState, 2 DisabledState, 3 LastState @@ -212,7 +212,7 @@ KJS::Value StdIconsImp::call( KJS::ExecState *exec, KJS::Object &/*obj*/, const } case StdIconsImp::MimeSourceIcon: { - return wrapPixmap( exec, QPixmap::fromMimeSource(arg0)); + return wrapPixmap( exec, TQPixmap::fromMimeSource(arg0)); } default: kdWarning() << "StdDirsImp has no method " << id << endl; diff --git a/kjsembed/builtins/resources.h b/kjsembed/builtins/resources.h index d83cd0b3..cfd589ce 100644 --- a/kjsembed/builtins/resources.h +++ b/kjsembed/builtins/resources.h @@ -22,7 +22,7 @@ #ifndef KJSEMBED_RESOURCES_H #define KJSEMBED_RESOURCES_H -#include <qpixmap.h> +#include <tqpixmap.h> #include <kjs/interpreter.h> #include <kjs/object.h> @@ -87,8 +87,8 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - /** wrap a QPixmap **/ - KJS::Value wrapPixmap(KJS::ExecState *exec,const QPixmap &icon); + /** wrap a TQPixmap **/ + KJS::Value wrapPixmap(KJS::ExecState *exec,const TQPixmap &icon); uint id; JSFactory *jsfact; }; diff --git a/kjsembed/builtins/saxhandler.cpp b/kjsembed/builtins/saxhandler.cpp index d4a6f5f3..ff0334bf 100644 --- a/kjsembed/builtins/saxhandler.cpp +++ b/kjsembed/builtins/saxhandler.cpp @@ -23,7 +23,7 @@ namespace KJSEmbed { namespace BuiltIns { SaxHandler::SaxHandler( KJS::ExecState *execstate ) - : QXmlDefaultHandler(), exec(execstate), error( ErrorNone ) + : TQXmlDefaultHandler(), exec(execstate), error( ErrorNone ) { } @@ -45,7 +45,7 @@ bool SaxHandler::startDocument() KJS::Identifier funName("startDocument"); if ( !jshandler.hasProperty(exec, funName) ) - return QXmlDefaultHandler::startDocument(); + return TQXmlDefaultHandler::startDocument(); KJS::Object fun = jshandler.get(exec, funName).toObject( exec ); if ( !fun.implementsCall() ) { @@ -66,7 +66,7 @@ bool SaxHandler::endDocument() KJS::Identifier funName("endDocument"); if ( !jshandler.hasProperty(exec, funName) ) - return QXmlDefaultHandler::endDocument(); + return TQXmlDefaultHandler::endDocument(); KJS::Object fun = jshandler.get(exec, funName).toObject( exec ); if ( !fun.implementsCall() ) { @@ -78,8 +78,8 @@ bool SaxHandler::endDocument() return ret.toBoolean( exec ); } -bool SaxHandler::startElement( const QString &ns, const QString &ln, const QString &qn, - const QXmlAttributes &attrs ) +bool SaxHandler::startElement( const TQString &ns, const TQString &ln, const TQString &qn, + const TQXmlAttributes &attrs ) { if ( !jshandler.isValid() ) { error = ErrorNoHandler; @@ -88,7 +88,7 @@ bool SaxHandler::startElement( const QString &ns, const QString &ln, const QStri KJS::Identifier funName("startElement"); if ( !jshandler.hasProperty(exec, funName) ) - return QXmlDefaultHandler::startElement( ns, ln, qn, attrs ); + return TQXmlDefaultHandler::startElement( ns, ln, qn, attrs ); KJS::Object fun = jshandler.get(exec, funName).toObject( exec ); if ( !fun.implementsCall() ) { @@ -106,7 +106,7 @@ bool SaxHandler::startElement( const QString &ns, const QString &ln, const QStri return ret.toBoolean( exec ); } -bool SaxHandler::endElement( const QString &ns, const QString &ln, const QString &qn ) +bool SaxHandler::endElement( const TQString &ns, const TQString &ln, const TQString &qn ) { if ( !jshandler.isValid() ) { error = ErrorNoHandler; @@ -115,7 +115,7 @@ bool SaxHandler::endElement( const QString &ns, const QString &ln, const QString KJS::Identifier funName("endElement"); if ( !jshandler.hasProperty(exec, funName) ) - return QXmlDefaultHandler::endElement( ns, ln, qn ); + return TQXmlDefaultHandler::endElement( ns, ln, qn ); KJS::Object fun = jshandler.get(exec, funName).toObject( exec ); if ( !fun.implementsCall() ) { @@ -132,7 +132,7 @@ bool SaxHandler::endElement( const QString &ns, const QString &ln, const QString return ret.toBoolean( exec ); } -bool SaxHandler::characters( const QString &chars ) +bool SaxHandler::characters( const TQString &chars ) { if ( !jshandler.isValid() ) { error = ErrorNoHandler; @@ -141,7 +141,7 @@ bool SaxHandler::characters( const QString &chars ) KJS::Identifier funName("characters"); if ( !jshandler.hasProperty(exec, funName) ) - return QXmlDefaultHandler::characters( chars ); + return TQXmlDefaultHandler::characters( chars ); KJS::Object fun = jshandler.get(exec, funName).toObject( exec ); if ( !fun.implementsCall() ) { @@ -156,15 +156,15 @@ bool SaxHandler::characters( const QString &chars ) return ret.toBoolean( exec ); } -QString SaxHandler::errorString() +TQString SaxHandler::errorString() { switch( error ) { case ErrorNoHandler: - return QString("No handler specified"); + return TQString("No handler specified"); break; case ErrorNotCallable: - return QString("One of the callbacks of the handler is not callable"); + return TQString("One of the callbacks of the handler is not callable"); break; case ErrorNone: // This only means that no error occured in the JS dispatch, there @@ -175,7 +175,7 @@ QString SaxHandler::errorString() break; } - return QXmlDefaultHandler::errorString(); + return TQXmlDefaultHandler::errorString(); } } // namespace KJSEmbed::BuiltIns diff --git a/kjsembed/builtins/saxhandler.h b/kjsembed/builtins/saxhandler.h index f396dbfe..fbf3e512 100644 --- a/kjsembed/builtins/saxhandler.h +++ b/kjsembed/builtins/saxhandler.h @@ -22,7 +22,7 @@ #ifndef KJSEMBED_SAXHANDLER_H #define KJSEMBED_SAXHANDLER_H -#include <qxml.h> +#include <tqxml.h> #include <kjs/object.h> namespace KJSEmbed { @@ -57,12 +57,12 @@ public: virtual bool startDocument(); virtual bool endDocument(); - virtual bool startElement( const QString &ns, const QString &ln, const QString &qn, - const QXmlAttributes &attrs ); - virtual bool endElement( const QString &ns, const QString &ln, const QString &qn ); - virtual bool characters( const QString &chars ); + virtual bool startElement( const TQString &ns, const TQString &ln, const TQString &qn, + const TQXmlAttributes &attrs ); + virtual bool endElement( const TQString &ns, const TQString &ln, const TQString &qn ); + virtual bool characters( const TQString &chars ); - virtual QString errorString(); + virtual TQString errorString(); private: KJS::ExecState *exec; diff --git a/kjsembed/builtins/stdaction_imp.cpp b/kjsembed/builtins/stdaction_imp.cpp index 1361acf8..cad81bfe 100644 --- a/kjsembed/builtins/stdaction_imp.cpp +++ b/kjsembed/builtins/stdaction_imp.cpp @@ -75,12 +75,12 @@ KJS::Value StdActionImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, cons return KJS::Null(); // recv, slot, parent, name? - QObject *recv = extractQObject( exec, args, 0); + TQObject *recv = extractQObject( exec, args, 0); - QString sl = extractQString( exec, args, 1 ); + TQString sl = extractQString( exec, args, 1 ); const char *slc = sl.isNull() ? "" : sl.ascii(); - QObject *parentobj = extractQObject( exec, args, 2 ); + TQObject *parentobj = extractQObject( exec, args, 2 ); KActionCollection *parent = parentobj ? dynamic_cast<KActionCollection *>( parentobj ) : 0; KStdAction::StdAction actid = static_cast<KStdAction::StdAction>(id); diff --git a/kjsembed/builtins/stddialog_imp.cpp b/kjsembed/builtins/stddialog_imp.cpp index 1b45c5e0..48bb468d 100644 --- a/kjsembed/builtins/stddialog_imp.cpp +++ b/kjsembed/builtins/stddialog_imp.cpp @@ -25,7 +25,7 @@ #else -#include <qfiledialog.h> +#include <tqfiledialog.h> #define KFileDialog QFileDialog #endif // QT_ONLY @@ -76,32 +76,32 @@ void StdDialogImp::addBindings( KJS::ExecState *exec, KJS::Object &parent ) KJS::Value StdDialogImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, const KJS::List &args ) { - QString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : QString::null; - QString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null; + TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null; switch( id ) { case MethodGetOpenFileName: { - QString s = KFileDialog::getOpenFileName( arg0, arg1 ); + TQString s = KFileDialog::getOpenFileName( arg0, arg1 ); return KJS::String( s ); } case MethodGetSaveFileName: { - QString s = KFileDialog::getSaveFileName( arg0, arg1 ); + TQString s = KFileDialog::getSaveFileName( arg0, arg1 ); return KJS::String( s ); } case MethodGetExistingDirectory: { - QString s = KFileDialog::getExistingDirectory( arg0 ); + TQString s = KFileDialog::getExistingDirectory( arg0 ); return KJS::String( s ); } #ifndef QT_ONLY case MethodGetColor: { - QColor col; + TQColor col; int res = KColorDialog::getColor( col ); - if ( res == QDialog::Accepted ) - return convertToValue( exec, QVariant(col) ); + if ( res == TQDialog::Accepted ) + return convertToValue( exec, TQVariant(col) ); } case MethodGetOpenURL: { diff --git a/kjsembed/builtins/textstream_imp.cpp b/kjsembed/builtins/textstream_imp.cpp index 6be24dd9..4ab3aeb1 100644 --- a/kjsembed/builtins/textstream_imp.cpp +++ b/kjsembed/builtins/textstream_imp.cpp @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#include <qtextstream.h> -#include <qiodevice.h> +#include <tqtextstream.h> +#include <tqiodevice.h> #include <kjsembed/global.h> #include <kjsembed/jsbinding.h> @@ -28,7 +28,7 @@ namespace KJSEmbed { namespace BuiltIns { -TextStreamImp::TextStreamImp( KJS::ExecState *exec, int mid, QTextStream *textstream ) +TextStreamImp::TextStreamImp( KJS::ExecState *exec, int mid, TQTextStream *textstream ) : JSProxyImp(exec), id(mid), ts(textstream) { } @@ -47,7 +47,7 @@ void TextStreamImp::addBindings( KJS::ExecState *exec, KJS::Object &parent ) return; } - QTextStream *ts = op->toTextStream(); + TQTextStream *ts = op->toTextStream(); if ( !ts ) { kdWarning() << "TextStreamImp::addBindings() failed, type is " << op->typeName() << endl; return; @@ -73,12 +73,12 @@ void TextStreamImp::addBindings( KJS::ExecState *exec, KJS::Object &parent ) KJS::Value TextStreamImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, const KJS::List &args ) { - QString not_readable = i18n( "Attempt to read from a write-only text stream." ); - QString not_writable = i18n( "Attempt to write to a read-only text stream." ); + TQString not_readable = i18n( "Attempt to read from a write-only text stream." ); + TQString not_writable = i18n( "Attempt to write to a read-only text stream." ); - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); - QIODevice *dev = ts->device(); + TQIODevice *dev = ts->device(); KJS::Object err; switch ( id ) { @@ -102,7 +102,7 @@ KJS::Value TextStreamImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, con break; case MethodReadLine: if ( dev->isReadable() ) { - QString line = ts->readLine(); + TQString line = ts->readLine(); if ( line.isNull() ) return KJS::Null(); else diff --git a/kjsembed/builtins/textstream_imp.h b/kjsembed/builtins/textstream_imp.h index ca46fc37..055cbe9d 100644 --- a/kjsembed/builtins/textstream_imp.h +++ b/kjsembed/builtins/textstream_imp.h @@ -51,7 +51,7 @@ public: MethodFlush }; - TextStreamImp( KJS::ExecState *exec, int id, QTextStream *ts ); + TextStreamImp( KJS::ExecState *exec, int id, TQTextStream *ts ); ~TextStreamImp(); static void addBindings( KJS::ExecState *exec, KJS::Object &object ); @@ -64,7 +64,7 @@ public: private: int id; - QTextStream *ts; + TQTextStream *ts; class TextStreamImpPrivate *d; }; diff --git a/kjsembed/cpptests/jsaccess/jsaccess.cpp b/kjsembed/cpptests/jsaccess/jsaccess.cpp index 5693ceea..6d22b412 100644 --- a/kjsembed/cpptests/jsaccess/jsaccess.cpp +++ b/kjsembed/cpptests/jsaccess/jsaccess.cpp @@ -47,7 +47,7 @@ int main( int argc, char **argv ) KJS::Interpreter *js = part->interpreter(); KJS::ExecState *exec = js->globalExec(); - QString script = "var foobar = \"test from javascript.\";" + TQString script = "var foobar = \"test from javascript.\";" "function testNoArgsFunction( ){ return foobar; }" "function testNoReturnFunction( value ){ foobar = value; }" "function testFunction( value ){ return \"testFunction dorks with \" + value;}"; @@ -58,7 +58,7 @@ int main( int argc, char **argv ) /** * Test extraction of a Variant from javascript */ - QString value = part->getVariant("foobar").toString(); + TQString value = part->getVariant("foobar").toString(); if( value != "test from javascript." ) kdWarning() << "Get variant failed with: " << value << endl; diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp index 8dd9fc24..104915d8 100644 --- a/kjsembed/customobject_imp.cpp +++ b/kjsembed/customobject_imp.cpp @@ -17,28 +17,28 @@ * Boston, MA 02110-1301, USA. */ #include "global.h" -#include <qapplication.h> -#include <qobject.h> -#include <qobjectlist.h> -#include <qcombobox.h> -#include <qpopupmenu.h> -#include <qdialog.h> -#include <qhbox.h> -#include <qlayout.h> -#include <qlistbox.h> -#include <qlistview.h> -#include <qmetaobject.h> -#include <qpainter.h> -#include <qregexp.h> -#include <qsignal.h> -#include <qstrlist.h> -#include <qtabwidget.h> -#include <qtimer.h> -#include <qvariant.h> -#include <qcanvas.h> -#include <qsplashscreen.h> -#include <qtoolbox.h> -#include <qmenudata.h> +#include <tqapplication.h> +#include <tqobject.h> +#include <tqobjectlist.h> +#include <tqcombobox.h> +#include <tqpopupmenu.h> +#include <tqdialog.h> +#include <tqhbox.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqlistview.h> +#include <tqmetaobject.h> +#include <tqpainter.h> +#include <tqregexp.h> +#include <tqsignal.h> +#include <tqstrlist.h> +#include <tqtabwidget.h> +#include <tqtimer.h> +#include <tqvariant.h> +#include <tqcanvas.h> +#include <tqsplashscreen.h> +#include <tqtoolbox.h> +#include <tqmenudata.h> #include <private/qucom_p.h> #include <private/qucomextra_p.h> @@ -102,8 +102,8 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) if ( !proxy ) return; kdDebug() << "CustomObjectImp::addBindings is a proxy" << endl; - QObject *qobj = proxy->object(); - QWidget *widget = proxy->widget(); + TQObject *qobj = proxy->object(); + TQWidget *widget = proxy->widget(); #ifndef QT_ONLY if ( qobj ) { @@ -126,13 +126,13 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) obj = new CustomObjectImp( exec, WidgetDrawText, proxy ); object.put( exec, "drawText", KJS::Object(obj) ); - QListBox *listbox = dynamic_cast<QListBox *>( widget ); + TQListBox *listbox = dynamic_cast<TQListBox *>( widget ); if ( listbox ) { obj = new CustomObjectImp( exec, ListBoxInsertItem, proxy ); object.put( exec, "insertItem", KJS::Object(obj) ); } - QListView *listview = dynamic_cast<QListView *>( widget ); + TQListView *listview = dynamic_cast<TQListView *>( widget ); if ( listview ) { obj = new CustomObjectImp( exec, ListViewAddColumn, proxy ); object.put( exec, "addColumn", KJS::Object(obj) ); @@ -149,7 +149,7 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) obj = new CustomObjectImp( exec, ListViewCurrentItem, proxy ); object.put( exec, "currentItem", KJS::Object(obj) ); } - QSplashScreen *splashscreen = dynamic_cast<QSplashScreen *>(widget); + TQSplashScreen *splashscreen = dynamic_cast<TQSplashScreen *>(widget); if( splashscreen ) { obj = new CustomObjectImp(exec, QSplashScreenSetPixmap, proxy ); @@ -189,13 +189,13 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) #endif // QT_ONLY - QTabWidget *tw = dynamic_cast<QTabWidget *>( widget ); + TQTabWidget *tw = dynamic_cast<TQTabWidget *>( widget ); if ( tw ) { obj = new CustomObjectImp( exec, TabWidgetAddTab, proxy ); object.put( exec, "addTab", KJS::Object(obj) ); } - QScrollView *sv = dynamic_cast<QScrollView *>( widget ); + TQScrollView *sv = dynamic_cast<TQScrollView *>( widget ); if ( sv ) { obj = new CustomObjectImp( exec, ScrollViewViewport, proxy ); object.put( exec, "viewport", KJS::Object(obj) ); @@ -213,17 +213,17 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) ADDBINDING( QCanvasView, widget ) /* - QMenuData *md = dynamic_cast<QMenuData *>( widget ); + TQMenuData *md = dynamic_cast<TQMenuData *>( widget ); if ( md ) { QMenuDataImp::addBindings( exec, object ); } - QMenuItem *mitem = dynamic_cast<QMenuItem *>( widget ); + TQMenuItem *mitem = dynamic_cast<TQMenuItem *>( widget ); if ( mitem ) { QMenuItemImp::addBindings( exec, object ); } */ - QMenuData *menuData = dynamic_cast<QMenuData*>(widget); + TQMenuData *menuData = dynamic_cast<TQMenuData*>(widget); if( menuData ) { obj = new CustomObjectImp( exec, QMenuDataInsertItem, proxy ); @@ -234,12 +234,12 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) object.put( exec, "insertSeparator", KJS::Object(obj) ); } - QHBox *hbox = dynamic_cast<QHBox *>( widget ); + TQHBox *hbox = dynamic_cast<TQHBox *>( widget ); if ( hbox ) { obj = new CustomObjectImp( exec, HBoxSpacing, proxy ); object.put( exec, "setSpacing", KJS::Object(obj) ); } - QToolBox *tb = dynamic_cast<QToolBox *>( qobj ); + TQToolBox *tb = dynamic_cast<TQToolBox *>( qobj ); if ( tb ) { obj = new CustomObjectImp( exec, QToolBoxAddItem, proxy ); object.put( exec, "addItem", KJS::Object(obj) ); @@ -262,7 +262,7 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } if ( qobj ) { - QApplication *app = dynamic_cast<QApplication *>( qobj ); + TQApplication *app = dynamic_cast<TQApplication *>( qobj ); if ( app ) { obj = new CustomObjectImp( exec, ApplicationExec, proxy ); object.put( exec, "exec", KJS::Object(obj) ); @@ -292,7 +292,7 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) #endif // QT_ONLY - QTimer *timer = dynamic_cast<QTimer *>( qobj ); + TQTimer *timer = dynamic_cast<TQTimer *>( qobj ); if ( timer ) { obj = new CustomObjectImp( exec, TimerIsActive, proxy ); object.put( exec, "isActive", KJS::Object(obj) ); @@ -302,7 +302,7 @@ void CustomObjectImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) object.put( exec, "stop", KJS::Object(obj) ); } - QBoxLayout *box = dynamic_cast<QBoxLayout *>( qobj ); + TQBoxLayout *box = dynamic_cast<TQBoxLayout *>( qobj ); if ( box ) { obj = new CustomObjectImp( exec, BoxLayoutAddWidget, proxy ); object.put( exec, "addWidget", KJS::Object(obj) ); @@ -529,10 +529,10 @@ KJS::Value CustomObjectImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Value CustomObjectImp::qsplashScreenSetPixmap(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QSplashScreen *ss = dynamic_cast<QSplashScreen*>(proxy->widget()); + TQSplashScreen *ss = dynamic_cast<TQSplashScreen*>(proxy->widget()); if ( ss ) { - QPixmap pix = extractQPixmap(exec, args, 0 ); + TQPixmap pix = extractQPixmap(exec, args, 0 ); ss->setPixmap(pix); } return KJS::Value(); @@ -540,10 +540,10 @@ KJS::Value CustomObjectImp::qsplashScreenSetPixmap(KJS::ExecState *exec, KJS::Ob KJS::Value CustomObjectImp::qsplashScreenPixmap(KJS::ExecState *exec, KJS::Object &, const KJS::List & ) { - QSplashScreen *ss = dynamic_cast<QSplashScreen*>(proxy->widget()); + TQSplashScreen *ss = dynamic_cast<TQSplashScreen*>(proxy->widget()); if ( ss ) { - QPixmap pix = *(ss->pixmap()); + TQPixmap pix = *(ss->pixmap()); return convertToValue(exec, pix); } return KJS::Value(); @@ -551,10 +551,10 @@ KJS::Value CustomObjectImp::qsplashScreenPixmap(KJS::ExecState *exec, KJS::Objec KJS::Value CustomObjectImp::qsplashScreenFinish(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QSplashScreen *ss = dynamic_cast<QSplashScreen*>(proxy->widget()); + TQSplashScreen *ss = dynamic_cast<TQSplashScreen*>(proxy->widget()); if ( ss ) { - QWidget *w = extractQWidget(exec, args, 0 ); + TQWidget *w = extractQWidget(exec, args, 0 ); ss->finish(w); } return KJS::Value(); @@ -562,7 +562,7 @@ KJS::Value CustomObjectImp::qsplashScreenFinish(KJS::ExecState *exec, KJS::Objec KJS::Value CustomObjectImp::qsplashScreenRepaint(KJS::ExecState *exec, KJS::Object &, const KJS::List & ) { - QSplashScreen *ss = dynamic_cast<QSplashScreen*>(proxy->widget()); + TQSplashScreen *ss = dynamic_cast<TQSplashScreen*>(proxy->widget()); if ( ss ) { ss->repaint(); @@ -573,10 +573,10 @@ KJS::Value CustomObjectImp::qsplashScreenRepaint(KJS::ExecState *exec, KJS::Obje KJS::Value CustomObjectImp::widgetGrabWidget(KJS::ExecState *exec, KJS::Object &, const KJS::List & ) { - QWidget *w = proxy->widget(); + TQWidget *w = proxy->widget(); if ( !w ) return KJS::Value(); - QVariant pix(QPixmap::grabWidget(w) ); + TQVariant pix(TQPixmap::grabWidget(w) ); return convertToValue( exec, pix ); } @@ -585,7 +585,7 @@ void CustomObjectImp::widgetDrawLine( KJS::ExecState *exec, KJS::Object &, const if ( args.size() != 4 ) return; - QWidget *w = proxy->widget(); + TQWidget *w = proxy->widget(); if ( !w ) return; @@ -594,7 +594,7 @@ void CustomObjectImp::widgetDrawLine( KJS::ExecState *exec, KJS::Object &, const int x1 = extractInt( exec, args, 2 ); int y1 = extractInt( exec, args, 3 ); - QPainter p(w); + TQPainter p(w); p.drawLine(x,y,x1,y1); } @@ -603,13 +603,13 @@ void CustomObjectImp::widgetDrawText( KJS::ExecState *exec, KJS::Object &, const if ( args.size() != 3 ) return; - QWidget *w = proxy->widget(); + TQWidget *w = proxy->widget(); if ( !w ) return; int x = extractInt( exec, args, 0 ); int y = extractInt( exec, args, 1 ); - QString s = extractQString( exec, args, 2 ); + TQString s = extractQString( exec, args, 2 ); w->drawText( x, y, s ); } @@ -618,11 +618,11 @@ void CustomObjectImp::listBoxInsertItem( KJS::ExecState *exec, KJS::Object &, co if ( args.size() != 1 ) return; - QListBox *lb = dynamic_cast<QListBox *>( proxy->object() ); + TQListBox *lb = dynamic_cast<TQListBox *>( proxy->object() ); if ( !lb ) return; - QString s = extractQString( exec, args, 0 ); + TQString s = extractQString( exec, args, 0 ); lb->insertItem( s ); } @@ -631,11 +631,11 @@ void CustomObjectImp::listViewAddColumn( KJS::ExecState *exec, KJS::Object &, co if ( args.size() != 1 ) return; - QListView *lv = dynamic_cast<QListView *>( proxy->object() ); + TQListView *lv = dynamic_cast<TQListView *>( proxy->object() ); if ( !lv ) return; - QString s = extractQString( exec, args, 0 ); + TQString s = extractQString( exec, args, 0 ); lv->addColumn( s ); } @@ -651,10 +651,10 @@ void CustomObjectImp::listViewInsertItem( KJS::ExecState *exec, KJS::Object &, c KListViewItem *lvm = new KListViewItem(klv); for( int idx = 0; idx < args.size(); ++idx){ - QVariant arg = convertToVariant(exec, args[idx]); - if( arg.canCast(QVariant::String) ) + TQVariant arg = convertToVariant(exec, args[idx]); + if( arg.canCast(TQVariant::String) ) lvm->setText(idx, arg.toString()); - else if ( arg.canCast(QVariant::Pixmap) ) + else if ( arg.canCast(TQVariant::Pixmap) ) lvm->setPixmap(idx, arg.toPixmap()); } return; @@ -662,15 +662,15 @@ void CustomObjectImp::listViewInsertItem( KJS::ExecState *exec, KJS::Object &, c #endif // QT_ONLY - QListView *lv = dynamic_cast<QListView *>( proxy->object() ); + TQListView *lv = dynamic_cast<TQListView *>( proxy->object() ); if ( lv ) { - QListViewItem *lvm = new QListViewItem(lv); + TQListViewItem *lvm = new TQListViewItem(lv); for( int idx = 0; idx < args.size(); ++idx){ - QVariant arg = convertToVariant(exec, args[idx]); - if( arg.canCast(QVariant::String) ) + TQVariant arg = convertToVariant(exec, args[idx]); + if( arg.canCast(TQVariant::String) ) lvm->setText(idx, arg.toString()); - else if ( arg.canCast(QVariant::Pixmap) ) + else if ( arg.canCast(TQVariant::Pixmap) ) lvm->setPixmap(idx, arg.toPixmap()); } @@ -682,23 +682,23 @@ KJS::Value CustomObjectImp::listViewSelectedItem( KJS::ExecState *exec, KJS::Obj if ( args.size() ) return KJS::Value(); - QListView *lv = dynamic_cast<QListView *>( proxy->object() ); + TQListView *lv = dynamic_cast<TQListView *>( proxy->object() ); if ( !lv ) return KJS::Value(); - QListViewItem *lvi = lv->selectedItem(); + TQListViewItem *lvi = lv->selectedItem(); if ( !lvi ) return KJS::Null(); - QCheckListItem *cli = dynamic_cast<QCheckListItem *>( lvi ); + TQCheckListItem *cli = dynamic_cast<TQCheckListItem *>( lvi ); if ( cli ) { - JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "QCheckListItem" ); + JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "TQCheckListItem" ); KJS::Object proxyObj(prx); proxy->part()->factory()->extendOpaqueProxy(exec, proxyObj); return proxyObj; } - JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "QListViewItem" ); + JSOpaqueProxy *prx = new JSOpaqueProxy( lvi, "TQListViewItem" ); KJS::Object proxyObj(prx); proxy->part()->factory()->extendOpaqueProxy(exec, proxyObj); return proxyObj; @@ -710,7 +710,7 @@ void CustomObjectImp::listViewHideColumn( KJS::ExecState *exec, KJS::Object &, c if ( args.size() != 1 ) return; - QListView *lv = dynamic_cast<QListView *>( proxy->object() ); + TQListView *lv = dynamic_cast<TQListView *>( proxy->object() ); if ( !lv ) return; @@ -728,7 +728,7 @@ void CustomObjectImp::mainWinSetCentralWidget( KJS::ExecState *exec, KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *cwproxy = JSProxy::toObjectProxy( jsobj.imp() ); - QWidget *cw = cwproxy ? cwproxy->widget() : 0; + TQWidget *cw = cwproxy ? cwproxy->widget() : 0; if ( !cw ) return; KMainWindow *mw = dynamic_cast<KMainWindow *>( proxy->object() ); @@ -793,7 +793,7 @@ KJS::Value CustomObjectImp::mainWinMenuBar( KJS::ExecState *exec, KJS::Object &, return KJS::Value(); } - QObject *obj = mw->menuBar(); + TQObject *obj = mw->menuBar(); return proxy->part()->factory()->createProxy( exec, obj, proxy ); #else // QT_ONLY @@ -812,7 +812,7 @@ KJS::Value CustomObjectImp::mainWinStatusBar( KJS::ExecState *exec, KJS::Object return KJS::Value(); } - QObject *obj = mw->statusBar(); + TQObject *obj = mw->statusBar(); return proxy->part()->factory()->createProxy( exec, obj, proxy ); #else // QT_ONLY @@ -853,13 +853,13 @@ void CustomObjectImp::tabWidgetAddTab( KJS::ExecState *exec, KJS::Object&, const if ( args.size() < 2 ) return; - QTabWidget *tw = dynamic_cast<QTabWidget *>( proxy->object() ); + TQTabWidget *tw = dynamic_cast<TQTabWidget *>( proxy->object() ); if ( !tw ) return; KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *tproxy = JSProxy::toObjectProxy( jsobj.imp() ); - QWidget *w = tproxy ? tproxy->widget() : 0; + TQWidget *w = tproxy ? tproxy->widget() : 0; if ( !w ) return; @@ -868,13 +868,13 @@ void CustomObjectImp::tabWidgetAddTab( KJS::ExecState *exec, KJS::Object&, const KJS::Value CustomObjectImp::scrollViewViewport( KJS::ExecState *exec, KJS::Object&, const KJS::List &args ) { - QScrollView *sv = dynamic_cast<QScrollView *>( proxy->object() ); + TQScrollView *sv = dynamic_cast<TQScrollView *>( proxy->object() ); if ( !sv ) return KJS::Value(); KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *sproxy = JSProxy::toObjectProxy( jsobj.imp() ); - QWidget *w = sproxy ? sproxy->widget() : 0; + TQWidget *w = sproxy ? sproxy->widget() : 0; if ( !w ) return KJS::Value(); @@ -886,13 +886,13 @@ void CustomObjectImp::scrollViewAddChild( KJS::ExecState *exec, KJS::Object&, co if ( args.size() < 1 ) return; - QScrollView *sv = dynamic_cast<QScrollView *>( proxy->object() ); + TQScrollView *sv = dynamic_cast<TQScrollView *>( proxy->object() ); if ( !sv ) return; KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *sproxy = JSProxy::toObjectProxy( jsobj.imp() ); - QWidget *w = sproxy ? sproxy->widget() : 0; + TQWidget *w = sproxy ? sproxy->widget() : 0; if ( !w ) return; @@ -904,7 +904,7 @@ void CustomObjectImp::scrollViewAddChild( KJS::ExecState *exec, KJS::Object&, co KJS::Value CustomObjectImp::applicationExec( KJS::ExecState *, KJS::Object&, const KJS::List& ) { - QApplication *app = dynamic_cast<QApplication *>( proxy->object() ); + TQApplication *app = dynamic_cast<TQApplication *>( proxy->object() ); if ( !app ) return KJS::Value(); @@ -913,7 +913,7 @@ KJS::Value CustomObjectImp::applicationExec( KJS::ExecState *, KJS::Object&, con KJS::Value CustomObjectImp::timerIsActive( KJS::ExecState *, KJS::Object &, const KJS::List & ) { - QTimer *timer = dynamic_cast<QTimer *>( proxy->object() ); + TQTimer *timer = dynamic_cast<TQTimer *>( proxy->object() ); if ( !timer ) return KJS::Value(); @@ -922,7 +922,7 @@ KJS::Value CustomObjectImp::timerIsActive( KJS::ExecState *, KJS::Object &, cons KJS::Value CustomObjectImp::timerStart( KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QTimer *timer = dynamic_cast<QTimer *>( proxy->object() ); + TQTimer *timer = dynamic_cast<TQTimer *>( proxy->object() ); if ( !timer ) return KJS::Value(); @@ -939,7 +939,7 @@ KJS::Value CustomObjectImp::timerStart( KJS::ExecState *exec, KJS::Object &, con KJS::Value CustomObjectImp::timerStop( KJS::ExecState *, KJS::Object &, const KJS::List & ) { - QTimer *timer = dynamic_cast<QTimer *>( proxy->object() ); + TQTimer *timer = dynamic_cast<TQTimer *>( proxy->object() ); if ( !timer ) return KJS::Value(); @@ -952,13 +952,13 @@ void CustomObjectImp::boxLayoutAddWidget( KJS::ExecState *exec, KJS::Object &, c if ( (args.size() < 1) || (args.size() > 3) ) return; - QBoxLayout *box = dynamic_cast<QBoxLayout *>( proxy->object() ); + TQBoxLayout *box = dynamic_cast<TQBoxLayout *>( proxy->object() ); if ( !box ) return; KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *proxy = JSProxy::toObjectProxy( jsobj.imp() ); - QWidget *w = proxy ? proxy->widget() : 0; + TQWidget *w = proxy ? proxy->widget() : 0; if ( !w ) return; @@ -975,7 +975,7 @@ void CustomObjectImp::boxLayoutAddSpacing( KJS::ExecState *exec, KJS::Object &, if ( args.size() != 1 ) return; - QBoxLayout *box = dynamic_cast<QBoxLayout *>( proxy->object() ); + TQBoxLayout *box = dynamic_cast<TQBoxLayout *>( proxy->object() ); if ( !box ) return; @@ -987,7 +987,7 @@ void CustomObjectImp::boxLayoutAddStretch( KJS::ExecState *exec, KJS::Object &, if ( args.size() > 1 ) return; - QBoxLayout *box = dynamic_cast<QBoxLayout *>( proxy->object() ); + TQBoxLayout *box = dynamic_cast<TQBoxLayout *>( proxy->object() ); if ( !box ) return; @@ -1002,13 +1002,13 @@ void CustomObjectImp::boxLayoutAddLayout( KJS::ExecState *exec, KJS::Object &, c if ( (args.size() < 1) || (args.size() > 2) ) return; - QBoxLayout *box = dynamic_cast<QBoxLayout *>( proxy->object() ); + TQBoxLayout *box = dynamic_cast<TQBoxLayout *>( proxy->object() ); if ( !box ) return; KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *proxy = JSProxy::toObjectProxy( jsobj.imp() ); - QLayout *l = proxy ? (dynamic_cast<QLayout *>(proxy->object())) : 0; + TQLayout *l = proxy ? (dynamic_cast<TQLayout *>(proxy->object())) : 0; if ( !l ) return; @@ -1051,7 +1051,7 @@ KJS::Value CustomObjectImp::kroPartWriteStream( KJS::ExecState *exec, KJS::Objec if ( !ro ) return KJS::Boolean( false ); - QCString s = extractQString( exec, args, 0 ).latin1(); + TQCString s = extractQString( exec, args, 0 ).latin1(); bool ok = ro->writeStream( s ); return KJS::Boolean( ok ); @@ -1087,7 +1087,7 @@ void CustomObjectImp::hboxSpacing( KJS::ExecState *exec, KJS::Object &, const KJ if ( args.size() != 1 ) return; - QHBox *box = dynamic_cast<QHBox *>( proxy->object() ); + TQHBox *box = dynamic_cast<TQHBox *>( proxy->object() ); if ( !box ) return; @@ -1167,7 +1167,7 @@ KJS::Value CustomObjectImp::ksystemtrayLoadIcon( KJS::ExecState *exec, KJS::Obje if ( args.size() != 1 ) return KJS::Value(); - QVariant pix( KSystemTray::loadIcon( extractQString( exec, args, 0 ) ) ); + TQVariant pix( KSystemTray::loadIcon( extractQString( exec, args, 0 ) ) ); return convertToValue( exec, pix ); #endif // QT_ONLY return KJS::Null(); @@ -1175,7 +1175,7 @@ return KJS::Null(); KJS::Value CustomObjectImp::qcanvasViewCanvas( KJS::ExecState *exec, KJS::Object&, const KJS::List &args ) { - QCanvasView *cv = dynamic_cast<QCanvasView *>( proxy->object() ); + TQCanvasView *cv = dynamic_cast<TQCanvasView *>( proxy->object() ); if ( !cv ) return KJS::Value(); @@ -1184,28 +1184,28 @@ KJS::Value CustomObjectImp::qcanvasViewCanvas( KJS::ExecState *exec, KJS::Object void CustomObjectImp::qcanvasViewSetCanvas( KJS::ExecState *exec, KJS::Object&, const KJS::List &args ) { - QCanvasView *cv = dynamic_cast<QCanvasView *>( proxy->object() ); + TQCanvasView *cv = dynamic_cast<TQCanvasView *>( proxy->object() ); if ( !cv ) return; KJS::Object jsobj = args[0].toObject(exec); JSObjectProxy *proxy = JSProxy::toObjectProxy( jsobj.imp() ); - QObject *obj = proxy->object(); + TQObject *obj = proxy->object(); if ( !obj ) return; - QCanvas *c = (QCanvas *) obj; + TQCanvas *c = (TQCanvas *) obj; cv->setCanvas(c); } KJS::Value Bindings::CustomObjectImp::qlistViewTakeItem( KJS::ExecState * exec, KJS::Object &, const KJS::List &args ) { - QListView *lv = dynamic_cast<QListView *>( proxy->object() ); + TQListView *lv = dynamic_cast<TQListView *>( proxy->object() ); if( !lv ) return KJS::Boolean(false); KJS::Object lviObj = args[0].toObject(exec); JSOpaqueProxy *prxy = JSProxy::toOpaqueProxy(lviObj.imp() ); - QListViewItem *itm = prxy->toNative<QListViewItem>(); + TQListViewItem *itm = prxy->toNative<TQListViewItem>(); if( !itm ) { // Trow an error... @@ -1217,42 +1217,42 @@ KJS::Value Bindings::CustomObjectImp::qlistViewTakeItem( KJS::ExecState * exec, KJS::Value Bindings::CustomObjectImp::qlistViewFirstChild( KJS::ExecState * exec, KJS::Object &, const KJS::List &args ) { - QListView *lv = dynamic_cast<QListView *>( proxy->object() ); + TQListView *lv = dynamic_cast<TQListView *>( proxy->object() ); if( !lv ) return KJS::Boolean(false); - QListViewItem *itm = lv->firstChild(); - KJS::Object jsObject( new JSOpaqueProxy( itm, "QListViewItem") ); + TQListViewItem *itm = lv->firstChild(); + KJS::Object jsObject( new JSOpaqueProxy( itm, "TQListViewItem") ); proxy->part()->factory()->extendOpaqueProxy(exec, jsObject); return jsObject; } KJS::Value Bindings::CustomObjectImp::qlistViewCurrentItem( KJS::ExecState * exec, KJS::Object &, const KJS::List &args ) { - QListView *lv = dynamic_cast<QListView *>( proxy->object() ); + TQListView *lv = dynamic_cast<TQListView *>( proxy->object() ); if( !lv ) return KJS::Boolean(false); - QListViewItem *itm = lv->currentItem(); - KJS::Object jsObject( new JSOpaqueProxy( itm, "QListViewItem") ); + TQListViewItem *itm = lv->currentItem(); + KJS::Object jsObject( new JSOpaqueProxy( itm, "TQListViewItem") ); proxy->part()->factory()->extendOpaqueProxy(exec, jsObject); return jsObject; } KJS::Value Bindings::CustomObjectImp::qtoolBoxAddItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args) { - QToolBox *tb = dynamic_cast<QToolBox *>( proxy->object() ); + TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() ); if( !tb ) return KJS::Boolean(false); if( args.size() == 2) { - QWidget *w = extractQWidget( exec, args, 0 ); - QString lab = extractQString( exec, args, 1 ); + TQWidget *w = extractQWidget( exec, args, 0 ); + TQString lab = extractQString( exec, args, 1 ); return KJS::Number( tb->addItem(w,lab) ); } if( args.size() == 3) { - QWidget *w = extractQWidget( exec, args, 0 ); - QIconSet ico = extractQPixmap( exec, args, 1 ); - QString lab = extractQString( exec, args, 2 ); + TQWidget *w = extractQWidget( exec, args, 0 ); + TQIconSet ico = extractQPixmap( exec, args, 1 ); + TQString lab = extractQString( exec, args, 2 ); return KJS::Number( tb->addItem(w,ico,lab) ); } return KJS::Boolean(false); @@ -1260,22 +1260,22 @@ KJS::Value Bindings::CustomObjectImp::qtoolBoxAddItem(KJS::ExecState *exec, KJS: KJS::Value Bindings::CustomObjectImp::qtoolBoxInsertItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QToolBox *tb = dynamic_cast<QToolBox *>( proxy->object() ); + TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() ); if( !tb ) return KJS::Boolean(false); if( args.size() == 3) { int idx = extractInt(exec, args, 0); - QWidget *w = extractQWidget( exec, args, 1 ); - QString lab = extractQString( exec, args, 2 ); + TQWidget *w = extractQWidget( exec, args, 1 ); + TQString lab = extractQString( exec, args, 2 ); return KJS::Number( tb->insertItem(idx,w,lab) ); } if( args.size() == 4) { int idx = extractInt(exec, args, 0); - QWidget *w = extractQWidget( exec, args, 1 ); - QIconSet ico = extractQPixmap( exec, args, 2 ); - QString lab = extractQString( exec, args, 3 ); + TQWidget *w = extractQWidget( exec, args, 1 ); + TQIconSet ico = extractQPixmap( exec, args, 2 ); + TQString lab = extractQString( exec, args, 3 ); return KJS::Number( tb->insertItem(idx,w,ico,lab) ); } return KJS::Boolean(false); @@ -1283,16 +1283,16 @@ KJS::Value Bindings::CustomObjectImp::qtoolBoxInsertItem(KJS::ExecState *exec, K void Bindings::CustomObjectImp::qtoolBoxRemoveItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QToolBox *tb = dynamic_cast<QToolBox *>( proxy->object() ); + TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() ); if( !tb ) return; - QWidget *w = extractQWidget(exec, args, 0); + TQWidget *w = extractQWidget(exec, args, 0); tb->removeItem(w); } KJS::Value Bindings::CustomObjectImp::qtoolBoxItemLabel(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QToolBox *tb = dynamic_cast<QToolBox *>( proxy->object() ); + TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() ); if( !tb ) return KJS::Boolean(false); int idx = extractInt(exec, args, 0); @@ -1301,63 +1301,63 @@ KJS::Value Bindings::CustomObjectImp::qtoolBoxItemLabel(KJS::ExecState *exec, KJ void Bindings::CustomObjectImp::qtoolBoxSetItemLabel(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QToolBox *tb = dynamic_cast<QToolBox *>( proxy->object() ); + TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() ); if( !tb ) return; int idx = extractInt(exec, args, 0); - QString lab = extractQString( exec, args, 1 ); + TQString lab = extractQString( exec, args, 1 ); tb->setItemLabel(idx,lab); } KJS::Value Bindings::CustomObjectImp::qtoolBoxItemIconSet(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QToolBox *tb = dynamic_cast<QToolBox *>( proxy->object() ); + TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() ); if( !tb ) return KJS::Boolean(false); int idx = extractInt(exec, args, 0); - QPixmap pix = tb->itemIconSet(idx).pixmap(); + TQPixmap pix = tb->itemIconSet(idx).pixmap(); return convertToValue( exec, pix ); } void Bindings::CustomObjectImp::qtoolBoxSetItemIconSet(KJS::ExecState *exec, KJS::Object &, const KJS::List &args) { - QToolBox *tb = dynamic_cast<QToolBox *>( proxy->object() ); + TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() ); if( !tb ) return; int idx = extractInt(exec, args, 0); - QIconSet ico = extractQPixmap( exec, args, 1); + TQIconSet ico = extractQPixmap( exec, args, 1); tb->setItemIconSet(idx,ico); } KJS::Value Bindings::CustomObjectImp::qtoolBoxItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QToolBox *tb = dynamic_cast<QToolBox *>( proxy->object() ); + TQToolBox *tb = dynamic_cast<TQToolBox *>( proxy->object() ); if( !tb ) return KJS::Boolean(false); int idx = extractInt(exec, args, 0); return proxy->part()->factory()->createProxy( exec, tb->item(idx), proxy ); } -QPopupMenu *getMenu(const KJS::Object &obj) +TQPopupMenu *getMenu(const KJS::Object &obj) { JSObjectProxy *jsproxy = JSProxy::toObjectProxy( obj.imp() ); - return dynamic_cast<QPopupMenu *>( jsproxy->object() ); + return dynamic_cast<TQPopupMenu *>( jsproxy->object() ); } KJS::Value Bindings::CustomObjectImp::qmenuDataInsertItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QMenuData *menu = dynamic_cast<QMenuData *>( proxy->object() ); + TQMenuData *menu = dynamic_cast<TQMenuData *>( proxy->object() ); if( !menu ) return KJS::Boolean(false); int offset = 0; - QString text = extractQString(exec,args, offset); - QPixmap pix = extractQPixmap(exec,args, offset); + TQString text = extractQString(exec,args, offset); + TQPixmap pix = extractQPixmap(exec,args, offset); int id = -1; int idx = -1; int newIndex = 0; - QPopupMenu *parentMenu = 0; + TQPopupMenu *parentMenu = 0; if( !pix.isNull() ) { @@ -1419,7 +1419,7 @@ KJS::Value Bindings::CustomObjectImp::qmenuDataInsertItem(KJS::ExecState *exec, void Bindings::CustomObjectImp::qmenuDataRemoveItem(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QMenuData *menu = dynamic_cast<QMenuData *>( proxy->object() ); + TQMenuData *menu = dynamic_cast<TQMenuData *>( proxy->object() ); if( !menu ) return; int idx = extractInt(exec, args, 0); @@ -1428,7 +1428,7 @@ void Bindings::CustomObjectImp::qmenuDataRemoveItem(KJS::ExecState *exec, KJS::O KJS::Value Bindings::CustomObjectImp::qmenuDataInsertSeparator(KJS::ExecState *exec, KJS::Object &, const KJS::List &args ) { - QMenuData *menu = dynamic_cast<QMenuData *>( proxy->object() ); + TQMenuData *menu = dynamic_cast<TQMenuData *>( proxy->object() ); if( !menu ) return KJS::Boolean(false); int idx = extractInt(exec, args, 0); diff --git a/kjsembed/design.h b/kjsembed/design.h index d255aeef..cf156222 100644 --- a/kjsembed/design.h +++ b/kjsembed/design.h @@ -38,7 +38,7 @@ * A widget that provides an interactive JS console. * * @ref KJSEmbed::JSObjectProxy : - * A Javascript object that can access the properties of a QObject, + * A Javascript object that can access the properties of a TQObject, * * @ref KJSEmbed::SecurityPolicy : * Defines a security policy for @ref JSObjectProxy. @@ -71,12 +71,12 @@ * class, but is more easily used via the addObject(...) methods of @ref KJSEmbedPart. * * The following code shows how easy it is to make an object available for - * scripting. It creates a QVBox containing two QLabels then makes them visible + * scripting. It creates a TQVBox containing two QLabels then makes them visible * to KJSEmbed: * <pre> - * QVBox *toplevel = new QVBox( 0, "box" ); - * QLabel *title = new QLabel( "Some Title", toplevel, "title"); - * QLabel *main = new QLabel( "Some text, more text.", toplevel, "main" ); + * TQVBox *toplevel = new TQVBox( 0, "box" ); + * TQLabel *title = new TQLabel( "Some Title", toplevel, "title"); + * TQLabel *main = new TQLabel( "Some text, more text.", toplevel, "main" ); * * js->addObject( title ); * js->addObject( main, "text" ); @@ -92,14 +92,14 @@ * </pre> * The script above would set the text of the label to 'Hello World'. * - * The slots of a QObject bound to the interpreter are made available to + * The slots of a TQObject bound to the interpreter are made available to * scripts as if they normal methods. In the example above, we could conceal * the label 'main' entirely by calling its hide() slot: * <pre> * main.hide() * </pre> * - * @section tree Access To the QObject Tree + * @section tree Access To the TQObject Tree * * As well as providing script access to an individual widget, KJSEmbed * allows scripts to walk the object tree and access others. If we @@ -134,7 +134,7 @@ * To embed the interpreter we can just create a new KJSEmbed part. * @skipline m_part * To publish the objects we can then call @ref KJSEmbed::KJSEmbedPart::addObject on our part. - * This will then add any QObject based class the the global scope of the + * This will then add any TQObject based class the the global scope of the * javascript interperter. * @skipline addObject * Once you have your objects published you can then execute javascript code from a file. @@ -148,10 +148,10 @@ * @ref KJS::List. This is just a list of @ref KJS::Value objects and can be created from * QVariants or from custom @ref KJS::Object based classes. * Once you have the data back from the method you can convert it easily from the @ref KJS::Value - * type to a QVariant with the @ref KJSEmbed::convertToVariant method. + * type to a TQVariant with the @ref KJSEmbed::convertToVariant method. * @line personalData * @until notes: - * Complex arrays or @ref KJS::Objects are transparently converted to QVariant::Map types so + * Complex arrays or @ref KJS::Objects are transparently converted to TQVariant::Map types so * they can easily be manipulated from C++. * The KJSEmbed::console is also easy to add to applications. An example of a method that * will toggle the console is below. diff --git a/kjsembed/docs/embedding/qtembed/main.cpp b/kjsembed/docs/embedding/qtembed/main.cpp index b2d7d3d1..fbf8541b 100644 --- a/kjsembed/docs/embedding/qtembed/main.cpp +++ b/kjsembed/docs/embedding/qtembed/main.cpp @@ -5,12 +5,12 @@ // // -#include <qapplication.h> +#include <tqapplication.h> #include "posviewimp.h" int main ( int argc, char ** argv ) { - QApplication app( argc, argv ); + TQApplication app( argc, argv ); POSViewImp *view = new POSViewImp; app.setMainWidget(view); view->show(); diff --git a/kjsembed/docs/embedding/qtembed/posviewimp.cpp b/kjsembed/docs/embedding/qtembed/posviewimp.cpp index 7d4aebc9..a9c3c289 100644 --- a/kjsembed/docs/embedding/qtembed/posviewimp.cpp +++ b/kjsembed/docs/embedding/qtembed/posviewimp.cpp @@ -10,11 +10,11 @@ #include <kjsembed/jsconsolewidget.h> #include <kjsembed/jsbinding.h> -#include <qgroupbox.h> -#include <qdatetime.h> -#include <qcolor.h> +#include <tqgroupbox.h> +#include <tqdatetime.h> +#include <tqcolor.h> -POSViewImp::POSViewImp(QWidget *parent, const char *name) +POSViewImp::POSViewImp(TQWidget *parent, const char *name) :POSViewBase(parent, name) { m_part = new KJSEmbed::KJSEmbedPart(0, "kjsembed_part", this,"JSEmbed"); diff --git a/kjsembed/docs/embedding/qtembed/posviewimp.h b/kjsembed/docs/embedding/qtembed/posviewimp.h index 3fce0965..764ac813 100644 --- a/kjsembed/docs/embedding/qtembed/posviewimp.h +++ b/kjsembed/docs/embedding/qtembed/posviewimp.h @@ -15,7 +15,7 @@ namespace KJSEmbed { class POSViewImp: public POSViewBase { Q_OBJECT public: - POSViewImp( QWidget *parent = 0, const char *name = 0 ); + POSViewImp( TQWidget *parent = 0, const char *name = 0 ); public slots: void loadScript(); diff --git a/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp b/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp index a1355909..b71521d5 100644 --- a/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp +++ b/kjsembed/docs/embedding/simple-embed/embedviewimp.cpp @@ -10,12 +10,12 @@ #include "embedviewimp.h" #include <klineedit.h> -#include <qgroupbox.h> +#include <tqgroupbox.h> -#include <qdatetime.h> -#include <qcolor.h> +#include <tqdatetime.h> +#include <tqcolor.h> -EmbedViewImp::EmbedViewImp(QWidget *parent, const char *name) +EmbedViewImp::EmbedViewImp(TQWidget *parent, const char *name) :EmbedView(parent, name) { m_part = new KJSEmbed::KJSEmbedPart(0, "kjsembed_part", this,"JSEmbed"); @@ -30,10 +30,10 @@ void EmbedViewImp::okClicked() { KJS::List args; KJS::Value val = m_part->callMethod("handleOk", args); - QMap<QString, QVariant> personalData = KJSEmbed::convertToVariant(m_part->globalExec(), val).toMap(); - QDate birthday = personalData["birthday"].toDate(); - QColor eyecolor = personalData["eyeColor"].toColor(); - QString notes = personalData["notes"].toString(); + TQMap<TQString, TQVariant> personalData = KJSEmbed::convertToVariant(m_part->globalExec(), val).toMap(); + TQDate birthday = personalData["birthday"].toDate(); + TQColor eyecolor = personalData["eyeColor"].toColor(); + TQString notes = personalData["notes"].toString(); kdDebug() << "birthday: " << birthday << endl; kdDebug() << "eyecolor: " << eyecolor << endl; @@ -53,23 +53,23 @@ void EmbedViewImp::consoleClicked() m_part->view()->setHidden(!m_part->view()->isHidden()); } -bool EmbedViewImp::runScript( const QString &file ) +bool EmbedViewImp::runScript( const TQString &file ) { return m_part->runFile(file, m_part->globalObject() ); } -QVariant EmbedViewImp::someValue() const +TQVariant EmbedViewImp::someValue() const { - QMap<QString,QVariant> returnMap; + TQMap<TQString,TQVariant> returnMap; returnMap["name"] = m_name->text(); returnMap["title"] = m_title->text(); returnMap["dept"] = m_dept->text(); - return QVariant(returnMap); + return TQVariant(returnMap); } -void EmbedViewImp::setSomeValue( const QVariant &val ) +void EmbedViewImp::setSomeValue( const TQVariant &val ) { - QMap<QString,QVariant> map = val.toMap(); + TQMap<TQString,TQVariant> map = val.toMap(); m_name->setText(map["name"].toString()); m_title->setText(map["title"].toString()); m_dept->setText(map["dept"].toString()); diff --git a/kjsembed/docs/embedding/simple-embed/embedviewimp.h b/kjsembed/docs/embedding/simple-embed/embedviewimp.h index c56f078c..7c678a32 100644 --- a/kjsembed/docs/embedding/simple-embed/embedviewimp.h +++ b/kjsembed/docs/embedding/simple-embed/embedviewimp.h @@ -16,17 +16,17 @@ class EmbedViewImp: public EmbedView { Q_OBJECT public: - EmbedViewImp( QWidget *parent = 0, const char *name = 0 ); + EmbedViewImp( TQWidget *parent = 0, const char *name = 0 ); - bool runScript( const QString &file ); + bool runScript( const TQString &file ); public slots: virtual void cancelClicked(); virtual void okClicked(); virtual void consoleClicked(); - QVariant someValue() const; - void setSomeValue( const QVariant &var ); + TQVariant someValue() const; + void setSomeValue( const TQVariant &var ); private: KJSEmbed::KJSEmbedPart *m_part; }; diff --git a/kjsembed/docs/examples/html2text/test.htm b/kjsembed/docs/examples/html2text/test.htm index 457327d0..2a060c2d 100644 --- a/kjsembed/docs/examples/html2text/test.htm +++ b/kjsembed/docs/examples/html2text/test.htm @@ -53,7 +53,7 @@ pre { <li>Scripts can access the properties and slots of QObjects as if they were normal Javascript properties and methods.</li> <li>Scripts can load dialogs and widgets created with Qt Designer.</li> - <li>Scripts can create instances of anu QWidget subclass supported by QWidgetFactory.</li> + <li>Scripts can create instances of anu TQWidget subclass supported by TQWidgetFactory.</li> <li>Making your own QObjects/QWidgets available for scripting is one-liner.</li> <li>Scripts can traverse the widget tree, so your entire application can be made scriptable without explicitly binding every object.</li> @@ -87,11 +87,11 @@ JSConsoleWidget (KJSEmbed::JSConsoleWidget) kjs> console.childCount() 4 kjs> console.childAt(1) -CmdEdit (QComboBox) +CmdEdit (TQComboBox) kjs> console.childAt(2) -RunButton (QPushButton) +RunButton (TQPushButton) kjs> console.child(&quot;RunButton&quot;) -RunButton (QPushButton) +RunButton (TQPushButton) kjs> console.child(&quot;RunButton&quot;).text = &quot;Go!&quot; Go! kjs> console.caption = &quot;Different Title&quot; @@ -145,7 +145,7 @@ print( cmd ); <p class="precaption">Listing 1: A Script That Displays the Grep Dialog</p> <p>In order to find out what the user asked us to search for we need to extract the contents of the various fields in our dialog. We know that the field for - entering the text to be searched for is a QLineEdit called 'search_edit', so + entering the text to be searched for is a TQLineEdit called 'search_edit', so we can use the child() method to get hold of it (this method searches through the children of an object until it finds one with a matching name). Once we've found the right object getting hold of the text is easy because all QLineEdits diff --git a/kjsembed/docs/examples/imageinfo/example.html b/kjsembed/docs/examples/imageinfo/example.html index c5b5fd69..82af5e0b 100644 --- a/kjsembed/docs/examples/imageinfo/example.html +++ b/kjsembed/docs/examples/imageinfo/example.html @@ -10,7 +10,7 @@ <tr> <td align="center"><a href="example1.png"><img border=0 width=197 height=160 src=thumb-example1.png></a></td> <td width="60%" valign="top" align="justify"><b><a href="example1.png">example1.png</a></b> (848x686)<p>This image shows the results of running the imagegallery script. As you can -see the script automatically creates thumbnails (using QImage::smoothScale() +see the script automatically creates thumbnails (using TQImage::smoothScale() for quality) and includes image descriptions if present. The descriptions can include HTML markup <b>like</b> <i>this</i>, and even <a href="http://xmelegance.org/kjsembed/">links</a>. diff --git a/kjsembed/docs/examples/imageinfo/example1.htm b/kjsembed/docs/examples/imageinfo/example1.htm index b18ff23c..bbe9bb0b 100644 --- a/kjsembed/docs/examples/imageinfo/example1.htm +++ b/kjsembed/docs/examples/imageinfo/example1.htm @@ -1,5 +1,5 @@ This image shows the results of running the imagegallery script. As you can -see the script automatically creates thumbnails (using QImage::smoothScale() +see the script automatically creates thumbnails (using TQImage::smoothScale() for quality) and includes image descriptions if present. The descriptions can include HTML markup <b>like</b> <i>this</i>, and even <a href="http://xmelegance.org/kjsembed/">links</a>. diff --git a/kjsembed/docs/examples/imageinfo/thumbs.html b/kjsembed/docs/examples/imageinfo/thumbs.html index 674dcfe5..663246a0 100644 --- a/kjsembed/docs/examples/imageinfo/thumbs.html +++ b/kjsembed/docs/examples/imageinfo/thumbs.html @@ -10,7 +10,7 @@ <tr> <td align="center"><a href="example1.png"><img border=0 width=197 height=160 src="thumb-example1.png"></a></td> <td width="60%" valign="top" align="justify"><b><a href="example1.png">example1.png</a></b> (848x686)<p>This image shows the results of running the imagegallery script. As you can -see the script automatically creates thumbnails (using QImage::smoothScale() +see the script automatically creates thumbnails (using TQImage::smoothScale() for quality) and includes image descriptions if present. The descriptions can include HTML markup <b>like</b> <i>this</i>, and even <a href="http://xmelegance.org/kjsembed/">links</a>. diff --git a/kjsembed/docs/examples/index.html b/kjsembed/docs/examples/index.html index bed4b787..4b48cc31 100644 --- a/kjsembed/docs/examples/index.html +++ b/kjsembed/docs/examples/index.html @@ -75,21 +75,21 @@ facilities. <td>Two examples that create a graphical tree. One from a JS data structure, the other from the widget tree of a ui file.</td></tr> <tr><td><a href="qobject-dom">qobject-dom</a></td> -<td>Illustrates the QObject DOM API.</td></tr> +<td>Illustrates the TQObject DOM API.</td></tr> <tr><td><a href="connect-cpp">connect-cpp</a></td> <td>Connects a signal to slot.</td></tr> <tr><td><a href="connect">connect</a></td> <td>Connects signals of various types to JS methods.</td></tr> <tr><td><a href="imageviewer">imageviewer</a></td> -<td>Illustrates the use of QPixmap values.</td></tr> +<td>Illustrates the use of TQPixmap values.</td></tr> <tr><td><a href="netaccess">netaccess</a></td> <td>Illustrates the bindings to KIO::NetAccess.</td></tr> <tr><td><a href="listview">listview</a></td> <td>Creates a simple KListView.</td></tr> <tr><td><a href="frame">frame</a></td> -<td>Shows off QFrame support and the use of enums.</td></tr> +<td>Shows off TQFrame support and the use of enums.</td></tr> <tr><td><a href="timer">timer</a></td> -<td>Creates a flashing LED using QTimer.</td></tr> +<td>Creates a flashing LED using TQTimer.</td></tr> <tr><td><a href="actions">Actions</a></td> <td>A simple KAction demo.</td></tr> <tr><td><a href="builtins">Built-In Messages</a></td> @@ -108,8 +108,8 @@ from a JS data structure, the other from the widget tree of a ui file.</td></tr> <td>Opaque types.</td></tr> <tr><td><a href="stdicons">Standard Icons</a></td> <td>Loading standard icons.</td></tr> -<tr><td><a href="combobox">QComboBox</a></td> -<td>A simple demo of QComboBox.</td></tr> +<tr><td><a href="combobox">TQComboBox</a></td> +<td>A simple demo of TQComboBox.</td></tr> <tr><td><a href="multipart">Embedding several KParts</a></td> <td>Shows how to embed multiple parts in the same script.</td></tr> <tr><td><a href="livedata">Writing data directly to a KPart</a></td> diff --git a/kjsembed/docs/features.html b/kjsembed/docs/features.html index 676b4a51..5da39771 100644 --- a/kjsembed/docs/features.html +++ b/kjsembed/docs/features.html @@ -12,14 +12,14 @@ This document is a high-level summary of the feature set of KJSEmbed. <h2>Qt Integration</h2> <ul> -<li>Generic proxy class providing access to any QObject. +<li>Generic proxy class providing access to any TQObject. <li>Call slots from scripts as if they are JS methods. <li>Connect signals to JS methods as if they are slots. -<li>Navigate the QObject tree using a DOM compatible API. +<li>Navigate the TQObject tree using a DOM compatible API. <li>Load designer's UI files to dynamically load dialogs and widgets. -<li>Create any QWidget supported by QWidgetFactory. -<li>Custom factory for creating QObjects (such as QTimer). -<li>An opaque wrapper handling any QVariant value and any pointer. +<li>Create any TQWidget supported by TQWidgetFactory. +<li>Custom factory for creating QObjects (such as TQTimer). +<li>An opaque wrapper handling any TQVariant value and any pointer. </ul> <h2>KDE Integration</h2> diff --git a/kjsembed/docs/tutorial/kjsembed.html b/kjsembed/docs/tutorial/kjsembed.html index a304c3de..dc769dc3 100644 --- a/kjsembed/docs/tutorial/kjsembed.html +++ b/kjsembed/docs/tutorial/kjsembed.html @@ -54,7 +54,7 @@ pre { <li>Scripts can access the properties and slots of QObjects as if they were normal Javascript properties and methods.</li> <li>Scripts can load dialogs and widgets created with Qt Designer.</li> - <li>Scripts can create instances of anu QWidget subclass supported by QWidgetFactory.</li> + <li>Scripts can create instances of anu TQWidget subclass supported by TQWidgetFactory.</li> <li>Making your own QObjects/QWidgets available for scripting is one-liner.</li> <li>Scripts can traverse the widget tree, so your entire application can be made scriptable without explicitly binding every object.</li> @@ -88,11 +88,11 @@ JSConsoleWidget (KJSEmbed::JSConsoleWidget) kjs> console.childCount() 4 kjs> console.child(1) -CmdEdit (QComboBox) +CmdEdit (TQComboBox) kjs> console.child(2) -RunButton (QPushButton) +RunButton (TQPushButton) kjs> console.child("RunButton") -RunButton (QPushButton) +RunButton (TQPushButton) kjs> console.child("RunButton").text = "Go!" Go! kjs> console.caption = "Different Title" @@ -149,7 +149,7 @@ print( cmd ); <p class="precaption">Listing 1: A Script That Displays the Grep Dialog</p> <p>In order to find out what the user asked us to search for we need to extract the contents of the various fields in our dialog. We know that the field for - entering the text to be searched for is a QLineEdit called 'search_edit', so + entering the text to be searched for is a TQLineEdit called 'search_edit', so we can use the child() method to get hold of it (this method searches through the children of an object until it finds one with a matching name). Once we've found the right object getting hold of the text is easy because all QLineEdits diff --git a/kjsembed/docs/types.html b/kjsembed/docs/types.html index 1b3f2120..59701605 100644 --- a/kjsembed/docs/types.html +++ b/kjsembed/docs/types.html @@ -38,8 +38,8 @@ continue to be supported. <h3>Strings</h3> <ul> -<li>QString -> String -<li>QCString -> String +<li>TQString -> String +<li>TQCString -> String <li>const char * -> String <li>String -> QString <li>String -> QCString @@ -48,66 +48,66 @@ continue to be supported. <h2>Qt Object Types</h2> -<h3>QColor</h3> +<h3>TQColor</h3> Represents a color, possibly including an alpha channel. <ul> -<li>QColor -> '#rrggbb' +<li>TQColor -> '#rrggbb' <li>'#rrggbb' -> QColor <li>'#rrggbbaa' -> QColor </ul> -<h3>QPoint</h3> +<h3>TQPoint</h3> Represents a point. <ul> -<li>QPoint -> [x,y] +<li>TQPoint -> [x,y] <li>[x,y] -> QPoint <li>obj.x obj.y -> QPoint </ul> -<h3>QSize</h3> +<h3>TQSize</h3> Represents a size. <ul> -<li>QSize -> [w,h] +<li>TQSize -> [w,h] <li>[w,h] -> QSize <li>obj.w obj.h -> QSize </ul> -<h3>QRect</h3> +<h3>TQRect</h3> Represents a rectangle. <ul> -<li>QRect -> [x,y,w,h] +<li>TQRect -> [x,y,w,h] <li>[x,y,w,h] -> QRect <li>obj.x obj.y obj.w obj.h -> QRect </ul> -<h3>QDate</h3> +<h3>TQDate</h3> Represents a date. <ul> -<li>QDate -> '' +<li>TQDate -> '' </ul> -<h3>QTime</h3> +<h3>TQTime</h3> Represents a time. <ul> -<li>QTime -> '' +<li>TQTime -> '' </ul> -<h3>QDateTime</h3> +<h3>TQDateTime</h3> Represents a date/time pair. <ul> -<li>QDateTime -> '' +<li>TQDateTime -> '' </ul> -<h3>QKeySequence</h3> +<h3>TQKeySequence</h3> Represents a sequence of keys, eg. it is used for accelerators. <ul> -<li>QKeySequence -> '' +<li>TQKeySequence -> '' </ul> -<h3>QFont</h3> +<h3>TQFont</h3> Represents a font. <ul> -<li>QFont -> '' +<li>TQFont -> '' </ul> <h2>KDE Object Types</h2> diff --git a/kjsembed/doxygen_fakes.h b/kjsembed/doxygen_fakes.h index 653f0ec4..676d2496 100644 --- a/kjsembed/doxygen_fakes.h +++ b/kjsembed/doxygen_fakes.h @@ -1,17 +1,17 @@ /** An object that supports signals and slots. */ -class QObject {}; +class TQObject {}; /** Base-class of all widgets. */ -class QWidget : public QObject {}; +class TQWidget : public TQObject {}; /** A widget that has a frame. */ -class QFrame : public QWidget {}; +class TQFrame : public TQWidget {}; /** Namespace for the KParts framework. */ namespace KParts { /** A base-class for plugins that extend a KPart. */ - class Plugin : public QObject, public XMLGUIClient {}; + class Plugin : public TQObject, public XMLGUIClient {}; /** A base-class for KParts. */ - class Part : public QObject, public XMLGUIClient {}; + class Part : public TQObject, public XMLGUIClient {}; /** A base-class for KParts that provide a read-only view. */ class ReadOnlyPart : public Part {}; }; diff --git a/kjsembed/global.cpp b/kjsembed/global.cpp index 1f424dcd..4d6937cb 100644 --- a/kjsembed/global.cpp +++ b/kjsembed/global.cpp @@ -21,20 +21,20 @@ # include "global.h" #ifdef QT_ONLY -# include <qobject.h> +# include <tqobject.h> # include <cstdio> # ifdef _WIN32 # include <windows.h> # include <fcntl.h> # include <io.h> # include <iostream.h> -# include <qfile.h> +# include <tqfile.h> # endif #endif -static QTextStream *kjsembed_err = 0L; -static QTextStream *kjsembed_in = 0L; -static QTextStream *kjsembed_out = 0L; +static TQTextStream *kjsembed_err = 0L; +static TQTextStream *kjsembed_in = 0L; +static TQTextStream *kjsembed_out = 0L; #ifndef _WIN32 char *itoa(int num, char *str, int radix) @@ -66,9 +66,9 @@ char *itoa(int num, char *str, int radix) #endif #ifdef _WIN32 -static QFile win32_stdin; -static QFile win32_stdout; -static QFile win32_stderr; +static TQFile win32_stdin; +static TQFile win32_stdout; +static TQFile win32_stderr; static const WORD MAX_CONSOLE_LINES = 500; @@ -102,23 +102,23 @@ void RedirectIOToConsole() { #endif -QTextStream &consoleOut( ) +TQTextStream &consoleOut( ) { return *KJSEmbed::conout(); } -QTextStream &consoleError( ) +TQTextStream &consoleError( ) { return *KJSEmbed::conerr(); } -QTextStream &consoleIn( ) +TQTextStream &consoleIn( ) { return *KJSEmbed::conin(); } #ifdef QT_ONLY -QTextStream &kdDebug( int area ) +TQTextStream &kdDebug( int area ) { #ifndef QT_DEBUG return consoleError() << "DEBUG: (" << area << ") "; @@ -128,50 +128,50 @@ QTextStream &kdDebug( int area ) } -QTextStream &kdWarning( int area ) +TQTextStream &kdWarning( int area ) { return consoleOut() << "WARNING: (" << area << ") "; } -QString i18n( const char *string ) +TQString i18n( const char *string ) { - return QObject::tr( string, "qjsembed string"); + return TQObject::tr( string, "qjsembed string"); } #endif -QTextStream *KJSEmbed::conin() +TQTextStream *KJSEmbed::conin() { if ( !kjsembed_in ) { #ifdef _WIN32 - kjsembed_in = new QTextStream( &win32_stdin ); + kjsembed_in = new TQTextStream( &win32_stdin ); #else - kjsembed_in = new QTextStream( stdin, IO_ReadOnly ); + kjsembed_in = new TQTextStream( stdin, IO_ReadOnly ); #endif } return kjsembed_in; } -QTextStream *KJSEmbed::conout() +TQTextStream *KJSEmbed::conout() { if ( !kjsembed_out ) { #ifdef _WIN32 - kjsembed_out = new QTextStream( &win32_stdout ); + kjsembed_out = new TQTextStream( &win32_stdout ); #else - kjsembed_out = new QTextStream( stdout, IO_WriteOnly ); + kjsembed_out = new TQTextStream( stdout, IO_WriteOnly ); #endif } return kjsembed_out; } -QTextStream *KJSEmbed::conerr() +TQTextStream *KJSEmbed::conerr() { if ( !kjsembed_err ) { #ifdef _WIN32 - kjsembed_err = new QTextStream( &win32_stderr ); + kjsembed_err = new TQTextStream( &win32_stderr ); #else - kjsembed_err = new QTextStream( stderr, IO_WriteOnly ); + kjsembed_err = new TQTextStream( stderr, IO_WriteOnly ); #endif } return kjsembed_err; diff --git a/kjsembed/global.h b/kjsembed/global.h index fe9447a1..e2e4a652 100644 --- a/kjsembed/global.h +++ b/kjsembed/global.h @@ -53,11 +53,11 @@ KJSEMBED_EXPORT void RedirectIOToConsole(); char *itoa(int num, char *str, int radix = 10); #endif -#include <qtextstream.h> +#include <tqtextstream.h> namespace KJSEmbed { -KJSEMBED_EXPORT QTextStream *conin(); -KJSEMBED_EXPORT QTextStream *conout(); -KJSEMBED_EXPORT QTextStream *conerr(); +KJSEMBED_EXPORT TQTextStream *conin(); +KJSEMBED_EXPORT TQTextStream *conout(); +KJSEMBED_EXPORT TQTextStream *conerr(); } #ifndef QT_ONLY @@ -75,13 +75,13 @@ KJSEMBED_EXPORT QTextStream *conerr(); * These are the custom definitions used when we only have Qt. */ -KJSEMBED_EXPORT QTextStream &kdDebug( int area=0 ); -KJSEMBED_EXPORT QTextStream &kdWarning( int area=0 ); +KJSEMBED_EXPORT TQTextStream &kdDebug( int area=0 ); +KJSEMBED_EXPORT TQTextStream &kdWarning( int area=0 ); #ifndef NO_I18N -KJSEMBED_EXPORT QString i18n( const char *string ); +KJSEMBED_EXPORT TQString i18n( const char *string ); #else -#define i18n(x) QString(x) +#define i18n(x) TQString(x) #endif // NO_I18N #endif // QT_ONLY diff --git a/kjsembed/jsbinding.cpp b/kjsembed/jsbinding.cpp index df34caf7..7abddf2c 100644 --- a/kjsembed/jsbinding.cpp +++ b/kjsembed/jsbinding.cpp @@ -1,12 +1,12 @@ -#include <qmetaobject.h> +#include <tqmetaobject.h> #include <private/qucom_p.h> -#include <qpen.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qvariant.h> -#include <qdatetime.h> -#include <qsize.h> +#include <tqpen.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqvariant.h> +#include <tqdatetime.h> +#include <tqsize.h> #include <kjs/interpreter.h> #include <kjs/ustring.h> @@ -41,7 +41,7 @@ namespace KJSEmbed { // ========= // // Bool, Double, CString, String, StringList, Int, UInt, Date, Time, DateTime, - // Rect, Size, Point, Pixmap, Image, Brush, Pen, Size, Rect, Point, QValueList<QVariant> + // Rect, Size, Point, Pixmap, Image, Brush, Pen, Size, Rect, Point, TQValueList<TQVariant> // // Opqaue // ====== @@ -51,7 +51,7 @@ namespace KJSEmbed { // ByteArray, BitArray // - KJS::Value convertToValue( KJS::ExecState *exec, const QVariant &val ) { + KJS::Value convertToValue( KJS::ExecState *exec, const TQVariant &val ) { if ( !val.isValid() ) return KJS::Undefined(); @@ -61,23 +61,23 @@ namespace KJSEmbed { switch( type ) { - case QVariant::String: - case QVariant::CString: + case TQVariant::String: + case TQVariant::CString: return KJS::String( val.toString() ); break; - case QVariant::Int: + case TQVariant::Int: return KJS::Number( val.toInt() ); break; - case QVariant::UInt: + case TQVariant::UInt: return KJS::Number( val.toUInt() ); break; - case QVariant::Double: + case TQVariant::Double: return KJS::Number( val.toDouble() ); break; - case QVariant::Bool: + case TQVariant::Bool: return KJS::Boolean( val.toBool() ); break; - case QVariant::Rect: + case TQVariant::Rect: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -86,14 +86,14 @@ namespace KJSEmbed { return proxyObj; break; } - case QVariant::Date: - case QVariant::DateTime: - case QVariant::Time: + case TQVariant::Date: + case TQVariant::DateTime: + case TQVariant::Time: { - QDateTime dt = QDateTime::currentDateTime(); - if ( type == QVariant::Date ) + TQDateTime dt = TQDateTime::currentDateTime(); + if ( type == TQVariant::Date ) dt.setDate( val.toDate() ); - else if ( type == QVariant::Time ) + else if ( type == TQVariant::Time ) dt.setTime( val.toTime() ); else dt = val.toDateTime(); @@ -107,7 +107,7 @@ namespace KJSEmbed { return KJS::Object( exec->interpreter() ->builtinDate().construct( exec, items ) ); break; } - case QVariant::Point: + case TQVariant::Point: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -116,37 +116,37 @@ namespace KJSEmbed { return proxyObj; break; } - case QVariant::StringList: + case TQVariant::StringList: { - QStringList lst = val.toStringList(); - QStringList::Iterator idx = lst.begin(); + TQStringList lst = val.toStringList(); + TQStringList::Iterator idx = lst.begin(); for ( ; idx != lst.end(); ++idx ) items.append( KJS::String( ( *idx ) ) ); return KJS::Object( exec->interpreter() ->builtinArray().construct( exec, items ) ); break; } - case QVariant::List: -// case QVariant::StringList: + case TQVariant::List: +// case TQVariant::StringList: // This will cause an extra conversion step for a QStrinList so use the above case. { - QValueList<QVariant> lst = val.toList(); - QValueList<QVariant>::Iterator idx = lst.begin(); + TQValueList<TQVariant> lst = val.toList(); + TQValueList<TQVariant>::Iterator idx = lst.begin(); for ( ; idx != lst.end(); ++idx ) items.append( convertToValue( exec, ( *idx ) ) ); return KJS::Object( exec->interpreter() ->builtinArray().construct( exec, items ) ); break; } - case QVariant::Map: + case TQVariant::Map: { - QMap<QString,QVariant> map = val.toMap(); - QMap<QString,QVariant>::Iterator idx = map.begin(); + TQMap<TQString,TQVariant> map = val.toMap(); + TQMap<TQString,TQVariant>::Iterator idx = map.begin(); KJS::Object array( exec->interpreter() ->builtinArray().construct( exec, 0 ) ); for ( ; idx != map.end(); ++idx ) array.put(exec, KJS::Identifier(idx.key().latin1()), convertToValue( exec, idx.data() ) ); return array; break; } - case QVariant::Pixmap: + case TQVariant::Pixmap: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -155,7 +155,7 @@ namespace KJSEmbed { return proxyObj; break; } - case QVariant::Brush: + case TQVariant::Brush: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -163,7 +163,7 @@ namespace KJSEmbed { Bindings::BrushImp::addBindings( exec, proxyObj ); return proxyObj; } - case QVariant::Image: + case TQVariant::Image: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -172,7 +172,7 @@ namespace KJSEmbed { return proxyObj; break; } - case QVariant::Pen: + case TQVariant::Pen: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -181,7 +181,7 @@ namespace KJSEmbed { return proxyObj; break; } - case QVariant::Size: + case TQVariant::Size: { JSValueProxy * prx = new JSValueProxy( ); prx->setValue( val ); @@ -192,7 +192,7 @@ namespace KJSEmbed { } default: { - if ( val.canCast( QVariant::String ) ) + if ( val.canCast( TQVariant::String ) ) return KJS::String( val.toString() ); else { @@ -209,8 +209,8 @@ namespace KJSEmbed { } } - QVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v ) { - QVariant val; + TQVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v ) { + TQVariant val; KJS::Type type = v.type(); kdDebug( 80001 ) << "Convert a value of type " << type << " to a variant" << endl; switch( type ) @@ -253,12 +253,12 @@ namespace KJSEmbed { */ /*if ( prx ) { - QObject * o = prx->object(); - QCString cs( o ? o->className() : "" ); + TQObject * o = prx->object(); + TQCString cs( o ? o->className() : "" ); if ( obj.implementsConstruct() ) - val = QString( "new %1();" ).arg( obj.className().qstring() ); + val = TQString( "new %1();" ).arg( obj.className().qstring() ); else if ( obj.implementsCall() ) - val = QString( "%1(...);" ).arg( obj.className().qstring() ); + val = TQString( "%1(...);" ).arg( obj.className().qstring() ); kdDebug( 80001 ) << "convertToVariant() got a JSObjectProxy" << endl; } else */if ( vprx ) { kdDebug( 80001 ) << "convertToVariant() got a variant JSValueProxy" << endl; @@ -267,7 +267,7 @@ namespace KJSEmbed { /* kdDebug( 80001 ) << "convertToVariant() got a JSProxy" << endl; val = prxy->typeName(); */ - } else { // Last resort map the object to a QMap<QString,QVariant> + } else { // Last resort map the object to a TQMap<TQString,TQVariant> kdDebug( 80001 ) << "convertToVariant() map to struct." << endl; val = convertArrayToMap(exec, v); } @@ -276,7 +276,7 @@ namespace KJSEmbed { } default: { - QString msg = i18n( "Unsupported KJS::Value, type %1" ).arg( ( int ) v.type() ); + TQString msg = i18n( "Unsupported KJS::Value, type %1" ).arg( ( int ) v.type() ); throwError(exec, msg); val = msg; break; @@ -286,8 +286,8 @@ namespace KJSEmbed { return val; } - QStringList dumpCompletion( KJS::ExecState *exec, KJS::Object &obj ) { - QStringList returnList; + TQStringList dumpCompletion( KJS::ExecState *exec, KJS::Object &obj ) { + TQStringList returnList; if ( !obj.isValid() ) { return returnList; } @@ -300,16 +300,16 @@ namespace KJSEmbed { if ( obj.hasProperty( exec, name ) ) { KJS::Value v = obj.get( exec, name ); KJS::Object vobj = v.toObject( exec ); - QString nm( name.ustring().qstring() ); - QString vl; + TQString nm( name.ustring().qstring() ); + TQString vl; if ( vobj.implementsConstruct() ) { if ( vobj.prototype().toString( exec ).qstring() == "[function]" ) - returnList << QString( "%1(...)" ).arg( nm ); + returnList << TQString( "%1(...)" ).arg( nm ); } else if ( vobj.implementsCall() ) { - returnList << QString( "%1(...)" ).arg( nm ); + returnList << TQString( "%1(...)" ).arg( nm ); } else { - QVariant val = convertToVariant( exec, v ); + TQVariant val = convertToVariant( exec, v ); vl = val.toString(); returnList << nm; } @@ -319,17 +319,17 @@ namespace KJSEmbed { } JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() ); - QObject *qo = proxy ? proxy->object() : 0; - QMetaObject *mo = qo ? qo->metaObject() : 0; + TQObject *qo = proxy ? proxy->object() : 0; + TQMetaObject *mo = qo ? qo->metaObject() : 0; // QObject if ( proxy ) { // QProperties - QStrList propList( mo->propertyNames( true ) ); - for ( QStrListIterator iter1( propList ); iter1.current(); ++iter1 ) { + TQStrList propList( mo->propertyNames( true ) ); + for ( TQStrListIterator iter1( propList ); iter1.current(); ++iter1 ) { - QCString name = iter1.current(); + TQCString name = iter1.current(); int propid = mo->findProperty( name.data(), true ); if ( propid == -1 ) continue; @@ -338,11 +338,11 @@ namespace KJSEmbed { // Slots KJS::List items; - QStrList slotList( mo->slotNames( true ) ); + TQStrList slotList( mo->slotNames( true ) ); - for ( QStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) { - QCString name = iter2.current(); - QString nm( name ); + for ( TQStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) { + TQCString name = iter2.current(); + TQString nm( name ); int slotid = mo->findSlot( name.data(), true ); if ( slotid != -1 ) { @@ -353,12 +353,12 @@ namespace KJSEmbed { return returnList; } - QString dumpObject( KJS::ExecState *exec, KJS::Object &obj ) { + TQString dumpObject( KJS::ExecState *exec, KJS::Object &obj ) { if ( !obj.isValid() ) - return QString( "Invalid object\n" ); + return TQString( "Invalid object\n" ); - QStringList properties; - QStringList methods; + TQStringList properties; + TQStringList methods; KJS::ReferenceList l = obj.propList( exec, true ); KJS::ReferenceListIterator propIt = l.begin(); @@ -371,7 +371,7 @@ namespace KJSEmbed { KJS::Value v = obj.get( exec, name ); KJS::Object vobj = v.toObject( exec ); - QString nm( name.ustring().qstring() ); + TQString nm( name.ustring().qstring() ); kdDebug( 80001 ) << "Getting: " << name.ustring().qstring() << " " << vobj.prototype().toString( exec ).qstring() << endl; @@ -392,21 +392,21 @@ namespace KJSEmbed { propIt++; } - QString s; + TQString s; // JS properties - s += QString( "<h2>Properties</h2>\n" ); + s += TQString( "<h2>Properties</h2>\n" ); if ( !properties.isEmpty() ) { s += "<table width=\"90%\">\n"; s += "<tr><th>Type</th><th>Name</th><th>Value</th></tr>\n"; properties.sort(); - for ( QStringList::Iterator iter = properties.begin(); iter != properties.end(); ++iter ) { + for ( TQStringList::Iterator iter = properties.begin(); iter != properties.end(); ++iter ) { KJS::Value v = obj.get( exec, KJS::Identifier( KJS::UString( *iter ) ) ); - QVariant val = convertToVariant( exec, v ); + TQVariant val = convertToVariant( exec, v ); - s += QString( "<tr><td align=\"center\">%1</td><td><b>%2</b></td><td align=\"center\">%3</td></tr>\n" ) + s += TQString( "<tr><td align=\"center\">%1</td><td><b>%2</b></td><td align=\"center\">%3</td></tr>\n" ) .arg( val.typeName() ).arg( *iter ).arg( val.toString() ); } @@ -415,12 +415,12 @@ namespace KJSEmbed { s += "<i>None</i>\n"; // Methods - s += QString( "<h2>Methods</h2>\n" ); + s += TQString( "<h2>Methods</h2>\n" ); if ( !methods.isEmpty() ) { s += "<table width=\"90%\">"; methods.sort(); - for ( QStringList::Iterator iter = methods.begin(); iter != methods.end(); ++iter ) { + for ( TQStringList::Iterator iter = methods.begin(); iter != methods.end(); ++iter ) { s += "<tr><td><b>"; s += *iter; s += "(...)</b></td></tr>"; @@ -433,22 +433,22 @@ namespace KJSEmbed { return s; } - QString dumpQObject( KJS::ExecState * /*exec*/, KJS::Object &obj ) { + TQString dumpQObject( KJS::ExecState * /*exec*/, KJS::Object &obj ) { if ( !obj.isValid() ) - return QString( "Invalid object\n" ); + return TQString( "Invalid object\n" ); - QString s( "" ); + TQString s( "" ); JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() ); - QObject *qo = proxy ? proxy->object() : 0; - QMetaObject *mo = qo ? qo->metaObject() : 0; + TQObject *qo = proxy ? proxy->object() : 0; + TQMetaObject *mo = qo ? qo->metaObject() : 0; // QObject if ( proxy ) { // QProperties - s += QString( "<h2>Qt Properties</h2>\n" ); + s += TQString( "<h2>Qt Properties</h2>\n" ); - QStrList propList( mo->propertyNames( true ) ); + TQStrList propList( mo->propertyNames( true ) ); if ( !propList.isEmpty() ) { @@ -456,15 +456,15 @@ namespace KJSEmbed { s += "<tr><th>Type</th><th>Name</th><th>Value</th></tr>\n"; propList.sort(); - for ( QStrListIterator iter( propList ); iter.current(); ++iter ) { + for ( TQStrListIterator iter( propList ); iter.current(); ++iter ) { - QCString name = iter.current(); + TQCString name = iter.current(); int propid = mo->findProperty( name.data(), true ); if ( propid == -1 ) continue; - QVariant vl = qo->property( name.data() ); - s += QString( "<tr><td align=\"center\">%1</td><td><b>%2</b></td><td align=\"center\">%3</td></tr>\n" ) + TQVariant vl = qo->property( name.data() ); + s += TQString( "<tr><td align=\"center\">%1</td><td><b>%2</b></td><td align=\"center\">%3</td></tr>\n" ) .arg( mo->property( propid, true ) ->type() ).arg( name ).arg( vl.toString() ); } @@ -474,20 +474,20 @@ namespace KJSEmbed { } // Signals - s += QString( "<h2>Qt Signals</h2>\n" ); + s += TQString( "<h2>Qt Signals</h2>\n" ); s += "<table width=\"90%\">"; - QStrList signalList( mo->signalNames( true ) ); + TQStrList signalList( mo->signalNames( true ) ); signalList.sort(); - for ( QStrListIterator iter1( signalList ); iter1.current(); ++iter1 ) { + for ( TQStrListIterator iter1( signalList ); iter1.current(); ++iter1 ) { - QCString name = iter1.current(); - QString nm( name ); + TQCString name = iter1.current(); + TQString nm( name ); int signalid = mo->findSignal( name.data(), true ); if ( signalid != -1 ) - s += QString( "<tr><td><b>%1</b></td></tr>\n" ).arg( nm ); + s += TQString( "<tr><td><b>%1</b></td></tr>\n" ).arg( nm ); } s += "</table>"; @@ -495,33 +495,33 @@ namespace KJSEmbed { s += "<i>None</i>"; // Slots - s += QString( "<h2>Qt Slots</h2>\n" ); + s += TQString( "<h2>Qt Slots</h2>\n" ); s += "<table width=\"90%\">"; KJS::List items; - QStrList slotList( mo->slotNames( true ) ); + TQStrList slotList( mo->slotNames( true ) ); slotList.sort(); - for ( QStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) { + for ( TQStrListIterator iter2( slotList ); iter2.current(); ++iter2 ) { - QCString name = iter2.current(); - QString nm( name ); + TQCString name = iter2.current(); + TQString nm( name ); int slotid = mo->findSlot( name.data(), true ); if ( slotid != -1 ) { const QMetaData * md = mo->slot( slotid, true ); const QUMethod *method = md->method; if ( method->count && ( method->parameters->inOut == QUParameter::Out ) ) { - QCString typenm( method->parameters->type->desc() ); + TQCString typenm( method->parameters->type->desc() ); if ( typenm == "ptr" ) { - s += QString( "<tr><td>%1</td><td><b>%2</b></td></tr>\n" ) + s += TQString( "<tr><td>%1</td><td><b>%2</b></td></tr>\n" ) .arg( ( const char * ) method->parameters->typeExtra ).arg( nm ); } else { - s += QString( "<tr><td>%1</td><td><b>%2</b></td></tr>\n" ) + s += TQString( "<tr><td>%1</td><td><b>%2</b></td></tr>\n" ) .arg( typenm.data() ).arg( nm ); } } else - s += QString( "<tr><td>void</td><td><b>%1</b></td></tr>\n" ).arg( nm ); + s += TQString( "<tr><td>void</td><td><b>%1</b></td></tr>\n" ).arg( nm ); } } @@ -535,44 +535,44 @@ namespace KJSEmbed { - QPen extractQPen( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPen() : QPen(); + TQPen extractQPen( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPen() : TQPen(); } - QBrush extractQBrush( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toBrush() : QBrush(); + TQBrush extractQBrush( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toBrush() : TQBrush(); } - QFont extractQFont( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toFont() : QFont(); + TQFont extractQFont( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toFont() : TQFont(); } - QPixmap extractQPixmap( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPixmap() : QPixmap(); + TQPixmap extractQPixmap( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPixmap() : TQPixmap(); } - QImage extractQImage( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toImage() : QImage(); + TQImage extractQImage( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toImage() : TQImage(); } - QPalette extractQPalette( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPalette() : QPalette(); + TQPalette extractQPalette( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPalette() : TQPalette(); } - QString extractQString( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? args[ idx ].toString( exec ).qstring() : QString::null; + TQString extractQString( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? args[ idx ].toString( exec ).qstring() : TQString::null; } int extractInt( KJS::ExecState *exec, const KJS::List &args, int idx ) { return ( args.size() > idx ) ? args[ idx ].toInteger( exec ) : 0; } - QColor extractQColor( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toColor() : QColor(); + TQColor extractQColor( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toColor() : TQColor(); } - QSize extractQSize( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toSize() : QSize(); + TQSize extractQSize( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toSize() : TQSize(); } bool extractBool( KJS::ExecState *exec, const KJS::List &args, int idx ) { @@ -587,8 +587,8 @@ namespace KJSEmbed { return ( args.size() > idx ) ? args[ idx ].toUInt32( exec ) : 0; } - QStringList extractQStringList( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertArrayToStringList( exec, args[ idx ] ) : QStringList(); + TQStringList extractQStringList( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertArrayToStringList( exec, args[ idx ] ) : TQStringList(); } /** @@ -628,8 +628,8 @@ namespace KJSEmbed { return None; } - QMap<QString, QVariant> convertArrayToMap( KJS::ExecState *exec, const KJS::Value &value ) { - QMap<QString, QVariant> returnMap; + TQMap<TQString, TQVariant> convertArrayToMap( KJS::ExecState *exec, const KJS::Value &value ) { + TQMap<TQString, TQVariant> returnMap; KJS::Object obj = value.toObject(exec); // if( obj.className().qstring() == "Array" ) { KJS::ReferenceList lst = obj.propList(exec,false); @@ -644,8 +644,8 @@ namespace KJSEmbed { return returnMap; } - QValueList<QVariant> convertArrayToList( KJS::ExecState *exec, const KJS::Value &value ) { - QValueList<QVariant> returnList; + TQValueList<TQVariant> convertArrayToList( KJS::ExecState *exec, const KJS::Value &value ) { + TQValueList<TQVariant> returnList; KJS::Object obj = value.toObject( exec ); if ( obj.className().qstring() == "Array" ) { int length = obj.get( exec, KJS::Identifier( "length" ) ).toInteger( exec ); @@ -661,8 +661,8 @@ namespace KJSEmbed { return returnList; } - QStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) { - QStringList returnList; + TQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) { + TQStringList returnList; KJS::Object obj = value.toObject( exec ); if ( obj.className().qstring() == "Array" ) { int length = obj.get( exec, KJS::Identifier( "length" ) ).toInteger( exec ); @@ -679,8 +679,8 @@ namespace KJSEmbed { return returnList; } /* - QStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) { - QStringList returnList; + TQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value ) { + TQStringList returnList; KJS::Object obj = value.toObject( exec ); if ( obj.className().qstring() == "Array" ) { @@ -693,9 +693,9 @@ namespace KJSEmbed { return returnList; } */ - QDateTime convertDateToDateTime( KJS::ExecState *exec, const KJS::Value &value ) { + TQDateTime convertDateToDateTime( KJS::ExecState *exec, const KJS::Value &value ) { KJS::List args; - QDateTime returnDateTime; + TQDateTime returnDateTime; KJS::Object obj = value.toObject( exec ); if ( obj.className().qstring() == "Date" ) { @@ -706,8 +706,8 @@ namespace KJSEmbed { int day = obj.get( exec, KJS::Identifier( "getDate" ) ).toObject( exec ).call( exec, obj, args ).toInteger( exec ); int year = obj.get( exec, KJS::Identifier( "getFullYear" ) ).toObject( exec ).call( exec, obj, args ).toInteger( exec ); - returnDateTime.setDate( QDate( year, month + 1, day ) ); - returnDateTime.setTime( QTime( hours, minutes, seconds ) ); + returnDateTime.setDate( TQDate( year, month + 1, day ) ); + returnDateTime.setTime( TQTime( hours, minutes, seconds ) ); } else { kdWarning() << "convertDateToDateTime() received a " << obj.className().qstring() << " instead of a Date" << endl; } @@ -715,32 +715,32 @@ namespace KJSEmbed { return returnDateTime; } - QDateTime extractQDateTime( KJS::ExecState * exec, const KJS::List & args, int idx ) { - return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ) : QDateTime(); + TQDateTime extractQDateTime( KJS::ExecState * exec, const KJS::List & args, int idx ) { + return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ) : TQDateTime(); } - QDate extractQDate( KJS::ExecState * exec, const KJS::List & args, int idx ) { - return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).date() : QDate(); + TQDate extractQDate( KJS::ExecState * exec, const KJS::List & args, int idx ) { + return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).date() : TQDate(); } - QTime extractQTime( KJS::ExecState * exec, const KJS::List & args, int idx ) { - return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).time() : QTime(); + TQTime extractQTime( KJS::ExecState * exec, const KJS::List & args, int idx ) { + return ( args.size() > idx ) ? convertDateToDateTime( exec, args[ idx ] ).time() : TQTime(); } - QRect extractQRect( KJS::ExecState * exec, const KJS::List & args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toRect() : QRect(); + TQRect extractQRect( KJS::ExecState * exec, const KJS::List & args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toRect() : TQRect(); } - QPoint extractQPoint( KJS::ExecState * exec, const KJS::List & args, int idx ) { - return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPoint() : QPoint(); + TQPoint extractQPoint( KJS::ExecState * exec, const KJS::List & args, int idx ) { + return ( args.size() > idx ) ? convertToVariant( exec, args[ idx ] ).toPoint() : TQPoint(); } - QStrList extractQStrList( KJS::ExecState *exec, const KJS::List &args, int idx ) { - return ( args.size() > idx ) ? convertArrayToStrList( exec, args[ idx ] ) : QStrList(); + TQStrList extractQStrList( KJS::ExecState *exec, const KJS::List &args, int idx ) { + return ( args.size() > idx ) ? convertArrayToStrList( exec, args[ idx ] ) : TQStrList(); } - QStrList convertArrayToStrList( KJS::ExecState *exec, const KJS::Value &value ) { - QStrList returnList; + TQStrList convertArrayToStrList( KJS::ExecState *exec, const KJS::Value &value ) { + TQStrList returnList; KJS::Object obj = value.toObject( exec ); if ( obj.className().qstring() == "Array" ) { @@ -753,7 +753,7 @@ namespace KJSEmbed { return returnList; } - QObject *extractQObject( KJS::ExecState *exec, const KJS::List &args, int idx ) { + TQObject *extractQObject( KJS::ExecState *exec, const KJS::List &args, int idx ) { KJS::Object obj = args[ idx ].toObject( exec ); JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() ); if ( !proxy ) @@ -762,7 +762,7 @@ namespace KJSEmbed { } - QWidget *extractQWidget( KJS::ExecState *exec, const KJS::List &args, int idx ) { + TQWidget *extractQWidget( KJS::ExecState *exec, const KJS::List &args, int idx ) { KJS::Object obj = args[ idx ].toObject( exec ); JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() ); if ( !proxy ) @@ -775,7 +775,7 @@ namespace KJSEmbed { return JSProxy::toOpaqueProxy( obj.imp() ); } - KJS::Object throwError( KJS::ExecState *exec, const QString &error, KJS::ErrorType type ) + KJS::Object throwError( KJS::ExecState *exec, const TQString &error, KJS::ErrorType type ) { int sourceId = exec->context().sourceId(); int startLine = exec->context().curStmtFirstLine(); diff --git a/kjsembed/jsbinding.h b/kjsembed/jsbinding.h index 40e2f11e..cd79cdc7 100644 --- a/kjsembed/jsbinding.h +++ b/kjsembed/jsbinding.h @@ -22,9 +22,9 @@ #ifndef KJSEMBEDJSBINDING_H #define KJSEMBEDJSBINDING_H #include "global.h" -#include <qstring.h> -#include <qvariant.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqvariant.h> +#include <tqwidget.h> #include <kjs/interpreter.h> #include <kjs/object.h> @@ -38,7 +38,7 @@ */ namespace KJS { - inline UString::UString( const QString &d ) + inline UString::UString( const TQString &d ) { uint len = d.length(); UChar *dat = new UChar[len]; @@ -46,19 +46,19 @@ namespace KJS { rep = UString::Rep::create(dat, len); } - inline QString UString::qstring() const + inline TQString UString::qstring() const { - return QString((QChar*) data(), size()); + return TQString((TQChar*) data(), size()); } - inline QConstString UString::qconststring() const + inline TQConstString UString::qconststring() const { - return QConstString((QChar*) data(), size()); + return TQConstString((TQChar*) data(), size()); } - inline QString Identifier::qstring() const + inline TQString Identifier::qstring() const { - return QString((QChar*) data(), size()); + return TQString((TQChar*) data(), size()); } } @@ -71,64 +71,64 @@ namespace KJSEmbed { KJSEMBED_EXPORT JavaScriptArrayType checkArray( KJS::ExecState *exec, const KJS::Value &val ); - /** Converts a QVariant to the closest possible KJS::Value. */ - KJSEMBED_EXPORT KJS::Value convertToValue( KJS::ExecState *exec, const QVariant &val); + /** Converts a TQVariant to the closest possible KJS::Value. */ + KJSEMBED_EXPORT KJS::Value convertToValue( KJS::ExecState *exec, const TQVariant &val); - /** Converts a KJS::Value to the closest possible QVariant. */ - KJSEMBED_EXPORT QVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v ); + /** Converts a KJS::Value to the closest possible TQVariant. */ + KJSEMBED_EXPORT TQVariant convertToVariant( KJS::ExecState *exec, const KJS::Value &v ); /** Returns HTML that documents the specified object. */ - KJSEMBED_EXPORT QString dumpObject( KJS::ExecState *exec, KJS::Object &obj ); + KJSEMBED_EXPORT TQString dumpObject( KJS::ExecState *exec, KJS::Object &obj ); - /** Returns HTML that documents the QObject facilities of the specified object. */ - KJSEMBED_EXPORT QString dumpQObject( KJS::ExecState *exec, KJS::Object &obj ); + /** Returns HTML that documents the TQObject facilities of the specified object. */ + KJSEMBED_EXPORT TQString dumpQObject( KJS::ExecState *exec, KJS::Object &obj ); - /** Returns a QStringList that contains all possible properties, + /** Returns a TQStringList that contains all possible properties, * methods and slots for use with a completion object */ - KJSEMBED_EXPORT QStringList dumpCompletion( KJS::ExecState *exec, KJS::Object &obj); - - KJSEMBED_EXPORT QPen extractQPen(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QFont extractQFont(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QBrush extractQBrush(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QPalette extractQPalette(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QPixmap extractQPixmap( KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QImage extractQImage( KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QString extractQString( KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQStringList dumpCompletion( KJS::ExecState *exec, KJS::Object &obj); + + KJSEMBED_EXPORT TQPen extractQPen(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQFont extractQFont(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQBrush extractQBrush(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQPalette extractQPalette(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQPixmap extractQPixmap( KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQImage extractQImage( KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQString extractQString( KJS::ExecState *exec, const KJS::List &args, int idx); KJSEMBED_EXPORT int extractInt( KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QColor extractQColor(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QSize extractQSize(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQColor extractQColor(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQSize extractQSize(KJS::ExecState *exec, const KJS::List &args, int idx); KJSEMBED_EXPORT bool extractBool(KJS::ExecState *exec, const KJS::List &args, int idx); KJSEMBED_EXPORT double extractDouble(KJS::ExecState *exec, const KJS::List &args, int idx); KJSEMBED_EXPORT uint extractUInt(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QStringList extractQStringList(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQStringList extractQStringList(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QDateTime extractQDateTime(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QDate extractQDate(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QTime extractQTime(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QRect extractQRect(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QPoint extractQPoint(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQDateTime extractQDateTime(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQDate extractQDate(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQTime extractQTime(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQRect extractQRect(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQPoint extractQPoint(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QFont extractQFont(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QStrList extractQStrList(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQFont extractQFont(KJS::ExecState *exec, const KJS::List &args, int idx); + KJSEMBED_EXPORT TQStrList extractQStrList(KJS::ExecState *exec, const KJS::List &args, int idx); - KJSEMBED_EXPORT QObject *extractQObject( KJS::ExecState *exec, const KJS::List &args, int idx ); - KJSEMBED_EXPORT QWidget *extractQWidget( KJS::ExecState *exec, const KJS::List &args, int idx ); + KJSEMBED_EXPORT TQObject *extractQObject( KJS::ExecState *exec, const KJS::List &args, int idx ); + KJSEMBED_EXPORT TQWidget *extractQWidget( KJS::ExecState *exec, const KJS::List &args, int idx ); KJSEMBED_EXPORT JSOpaqueProxy *extractOpaqueProxy( KJS::ExecState *exec, const KJS::List &args, int idx ); // Helpers for Variant conversions.... - KJSEMBED_EXPORT QStrList convertArrayToStrList( KJS::ExecState *exec, const KJS::Value &value); - KJSEMBED_EXPORT QStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value); - KJSEMBED_EXPORT QDateTime convertDateToDateTime(KJS::ExecState *exec, const KJS::Value &value); - KJSEMBED_EXPORT QValueList<QVariant> convertArrayToList( KJS::ExecState *exec, const KJS::Value &value ); - KJSEMBED_EXPORT QMap<QString, QVariant> convertArrayToMap( KJS::ExecState *exec, const KJS::Value &value ); + KJSEMBED_EXPORT TQStrList convertArrayToStrList( KJS::ExecState *exec, const KJS::Value &value); + KJSEMBED_EXPORT TQStringList convertArrayToStringList( KJS::ExecState *exec, const KJS::Value &value); + KJSEMBED_EXPORT TQDateTime convertDateToDateTime(KJS::ExecState *exec, const KJS::Value &value); + KJSEMBED_EXPORT TQValueList<TQVariant> convertArrayToList( KJS::ExecState *exec, const KJS::Value &value ); + KJSEMBED_EXPORT TQMap<TQString, TQVariant> convertArrayToMap( KJS::ExecState *exec, const KJS::Value &value ); /** * This will throw an exception with the error string. * @returns An error object. */ - KJS::Object throwError( KJS::ExecState *exec, const QString &error, KJS::ErrorType type = KJS::GeneralError ); + KJS::Object throwError( KJS::ExecState *exec, const TQString &error, KJS::ErrorType type = KJS::GeneralError ); } #endif // KJSEMBEDJSBINDING_H diff --git a/kjsembed/jsbindingbase.h b/kjsembed/jsbindingbase.h index 20ed0490..cca40fc3 100644 --- a/kjsembed/jsbindingbase.h +++ b/kjsembed/jsbindingbase.h @@ -38,7 +38,7 @@ class KJSEmbedPart; public: /** * This method is called by the KJSFactory to bootstrap the plugin. - * Plugin developers will want to use this method to create their QObject binding, + * Plugin developers will want to use this method to create their TQObject binding, * or call their addBindings() method in their JSOpaque proxy or JSValueProxy. * * The value returned from ths function is the KJS::Object that represents the diff --git a/kjsembed/jsbindingplugin.cpp b/kjsembed/jsbindingplugin.cpp index f81bde4d..4edacf5e 100644 --- a/kjsembed/jsbindingplugin.cpp +++ b/kjsembed/jsbindingplugin.cpp @@ -26,7 +26,7 @@ namespace KJSEmbed { namespace Bindings { -JSBindingPlugin::JSBindingPlugin( QObject *parent, const char *name, const QStringList &/*args*/ ): QObject(parent,name) +JSBindingPlugin::JSBindingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ): TQObject(parent,name) { } diff --git a/kjsembed/jsbindingplugin.h b/kjsembed/jsbindingplugin.h index 6755621b..fb7d6361 100644 --- a/kjsembed/jsbindingplugin.h +++ b/kjsembed/jsbindingplugin.h @@ -21,7 +21,7 @@ #ifndef KJSEMBEDBINDINGPLUGIN_H #define KJSEMBEDBINDINGPLUGIN_H -#include <qobject.h> +#include <tqobject.h> #include <kjs/interpreter.h> #include <kjs/identifier.h> #include <kjs/types.h> @@ -39,14 +39,14 @@ namespace KJSEmbed { * @author Ian Reinhart Geiser, geiseri@kde.org * @version $Id$ */ - class KJSEMBED_EXPORT JSBindingPlugin : public QObject { + class KJSEMBED_EXPORT JSBindingPlugin : public TQObject { Q_OBJECT public: - JSBindingPlugin( QObject *parent, const char *name, const QStringList &args ); + JSBindingPlugin( TQObject *parent, const char *name, const TQStringList &args ); virtual ~JSBindingPlugin(); /** * This method is called by the KJSFactory to bootstrap the plugin. - * Plugin developers will want to use this method to create their QObject binding, + * Plugin developers will want to use this method to create their TQObject binding, * or call their addBindings() method in their JSOpaque proxy or JSValueProxy. * * The value returned from ths function is the KJS::Object that represents the diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp index c916a986..8a54cabf 100644 --- a/kjsembed/jsbuiltin_imp.cpp +++ b/kjsembed/jsbuiltin_imp.cpp @@ -20,9 +20,9 @@ // #define HAVE_KSPY 1 #include <stdio.h> -#include <qobject.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqobject.h> +#include <tqfile.h> +#include <tqtextstream.h> #ifndef QT_ONLY @@ -35,8 +35,8 @@ #else -#include <qinputdialog.h> -#include <qmessagebox.h> +#include <tqinputdialog.h> +#include <tqmessagebox.h> #endif // QT_ONLY @@ -61,7 +61,7 @@ namespace KJSEmbed { namespace Bindings { -JSBuiltInImp::JSBuiltInImp( JSBuiltIn *builtin, int mid, const QString &p ) +JSBuiltInImp::JSBuiltInImp( JSBuiltIn *builtin, int mid, const TQString &p ) : JSProxyImp(builtin->part()->globalExec()), part(builtin->part()), id(mid), param(p) { setName( KJS::Identifier( KJS::UString(param) ) ); @@ -71,8 +71,8 @@ JSBuiltInImp::~JSBuiltInImp() {} KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - QString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : QString::null; - QString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null; + TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null; if ( id == MethodLoadScript ) { @@ -85,7 +85,7 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ return KJS::Boolean( ok ); } else { - QString msg = i18n( "Method requires 1 or 2 arguments, received %1." ).arg( args.size() ); + TQString msg = i18n( "Method requires 1 or 2 arguments, received %1." ).arg( args.size() ); return throwError(exec, msg); } } @@ -109,45 +109,45 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ } else if ( id == MethodReadLine ) { - QString line = conin()->readLine(); + TQString line = conin()->readLine(); if ( !line.isNull() ) return KJS::String( line ); } else if ( id == MethodOpenFile ) { // #warning "This is leaked!!!!!" -// QFile *f=new QFile( arg0 ); +// TQFile *f=new TQFile( arg0 ); // int mode = 0; -// if ( arg1 == QString("ro") ) +// if ( arg1 == TQString("ro") ) // mode = IO_ReadOnly; -// else if ( arg1 == QString("wo") ) +// else if ( arg1 == TQString("wo") ) // mode = IO_WriteOnly; // if ( !f->open( mode ) ) // return KJS::Boolean(false); -// Bindings::TextStream *ts = new Bindings::TextStream( part, "file", new QTextStream(f) ); +// Bindings::TextStream *ts = new Bindings::TextStream( part, "file", new TQTextStream(f) ); // return KJS::Object( ts ); return KJS::Null(); } else if ( id == MethodReadFile ) { - QFile f( arg0 ); + TQFile f( arg0 ); if ( !f.open( IO_ReadOnly ) ) { - QString msg = i18n( "Could not open file '%1'." ).arg(arg0); + TQString msg = i18n( "Could not open file '%1'." ).arg(arg0); return throwError(exec, msg); } - QString s = f.readAll(); + TQString s = f.readAll(); return KJS::String( s ); } else if ( id == MethodWriteFile ) { - QFile f( arg0 ); + TQFile f( arg0 ); if ( !f.open( IO_WriteOnly ) ) return KJS::Boolean( false ); - QTextStream ts( &f ); + TQTextStream ts( &f ); ts << arg1; return KJS::Boolean( true ); @@ -171,16 +171,16 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ } else if ( id == MethodSaxLoadFile ) { if ( args.size() != 2 ) { - QString msg = i18n( "Method requires 2 arguments, received %1." ).arg( args.size() ); + TQString msg = i18n( "Method requires 2 arguments, received %1." ).arg( args.size() ); return throwError(exec, msg); } BuiltIns::SaxHandler sax( exec ); sax.setHandler( args[0].toObject(exec) ); - QFile f( arg1 ); - QXmlInputSource src( &f ); - QXmlSimpleReader reader; + TQFile f( arg1 ); + TQXmlInputSource src( &f ); + TQXmlSimpleReader reader; reader.setContentHandler( &sax ); bool ok = reader.parse( src ); @@ -193,11 +193,11 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ else if ( id == MethodDumpCompletion ) { KJS::Object obj = obj.isValid() ? args[0].toObject(exec) : KJS::Object(); if ( !obj.isValid() ) { - QString msg = i18n( "Method requires an object." ); + TQString msg = i18n( "Method requires an object." ); return throwError(exec, msg,KJS::TypeError); } - QVariant v = dumpCompletion( exec, obj ); + TQVariant v = dumpCompletion( exec, obj ); return convertToValue( exec, v ); // FIXME: This will crash if the type is wrong } else if ( id == MethodAlert ) { @@ -205,7 +205,7 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ #ifndef QT_ONLY KMessageBox::information( 0L, arg0 ); #else // QT_ONLY - QMessageBox::information( 0L, i18n("Information"), arg0 ); + TQMessageBox::information( 0L, i18n("Information"), arg0 ); #endif // QT_ONLY return KJS::Undefined(); @@ -216,24 +216,24 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ #ifndef QT_ONLY answer = KMessageBox::questionYesNo( 0L, arg0 ); #else // QT_ONLY - answer = QMessageBox::question(0L, i18n("Question"), arg0 ); + answer = TQMessageBox::question(0L, i18n("Question"), arg0 ); #endif // QT_ONLY return KJS::Number( answer ); } else if ( id == MethodPrompt ) { - QString text; + TQString text; #ifndef QT_ONLY text = KInputDialog::getText( arg0, arg0, arg1 ); #else // QT_ONLY - text = QInputDialog::getText( arg0, arg0, QLineEdit::Normal, arg1 ); + text = QInputDialog::getText( arg0, arg0, TQLineEdit::Normal, arg1 ); #endif // QT_ONLY return KJS::String( text ); } else if ( id == MethodI18n ) { - QString retString(i18n(arg0.latin1())); + TQString retString(i18n(arg0.latin1())); return KJS::String( retString ); } else if ( id == MethodImport ) { @@ -242,11 +242,11 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ // Scan $KDEDIRS/share/apps/$APPNAME/ // Scan $KDEDIRS/share/apps/kjsembed/ KGlobal::dirs()->addResourceType("kjsembed", KStandardDirs::kde_default("data") +"/kjsembed/"); - QString fname = KGlobal::dirs ()->findResource ("kjsembed", QString(arg0)); + TQString fname = KGlobal::dirs ()->findResource ("kjsembed", TQString(arg0)); kdDebug(80001) << "Loading: " << fname << endl; - //QString code = part->loadFile(fname); + //TQString code = part->loadFile(fname); return KJS::Boolean( part->runFile(fname, part->globalObject())); #else // QT_ONLY @@ -269,7 +269,7 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ kdWarning() << "JSBuiltInImp has no method " << id << endl; } - QString msg = i18n( "JSBuiltInImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "JSBuiltInImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } diff --git a/kjsembed/jsbuiltin_imp.h b/kjsembed/jsbuiltin_imp.h index e94588b2..6d833457 100644 --- a/kjsembed/jsbuiltin_imp.h +++ b/kjsembed/jsbuiltin_imp.h @@ -55,10 +55,10 @@ public: MethodShell,CustomMethod=0x1000 }; - JSBuiltInImp( JSBuiltIn *builtin, int id, const QString ¶m=QString::null ); + JSBuiltInImp( JSBuiltIn *builtin, int id, const TQString ¶m=TQString::null ); ~JSBuiltInImp(); - QString parameter() const { return param; } + TQString parameter() const { return param; } /** Returns true iff this object implements the call function. */ virtual bool implementsCall() const { return true; } @@ -69,7 +69,7 @@ public: private: KJSEmbedPart *part; uint id; - QString param; + TQString param; class JSBuiltInImpPrivate *d; }; diff --git a/kjsembed/jsbuiltinproxy.cpp b/kjsembed/jsbuiltinproxy.cpp index 9df97214..8ee39143 100644 --- a/kjsembed/jsbuiltinproxy.cpp +++ b/kjsembed/jsbuiltinproxy.cpp @@ -18,7 +18,7 @@ */ #include "jsbuiltinproxy.h" namespace KJSEmbed { -JSBuiltinProxy::JSBuiltinProxy( const QString &name ) : JSProxy( JSProxy::BuiltinProxy ), m_name(name) +JSBuiltinProxy::JSBuiltinProxy( const TQString &name ) : JSProxy( JSProxy::BuiltinProxy ), m_name(name) { } @@ -28,7 +28,7 @@ JSBuiltinProxy::~JSBuiltinProxy() } -QString JSBuiltinProxy::typeName() const +TQString JSBuiltinProxy::typeName() const { return m_name; } @@ -41,7 +41,7 @@ bool JSBuiltinProxy::inherits( const char *clazz ) KJS::UString JSBuiltinProxy::toString( KJS::ExecState */*exec*/ ) const { - QString s( "%1 (%2)" ); + TQString s( "%1 (%2)" ); return KJS::UString( s.arg("JSBuiltinProxy").arg(m_name).latin1() ); } diff --git a/kjsembed/jsbuiltinproxy.h b/kjsembed/jsbuiltinproxy.h index e143f868..6eacd4ac 100644 --- a/kjsembed/jsbuiltinproxy.h +++ b/kjsembed/jsbuiltinproxy.h @@ -35,11 +35,11 @@ namespace KJSEmbed { class KJSEMBED_EXPORT JSBuiltinProxy : public JSProxy { public: - JSBuiltinProxy( const QString &name ); + JSBuiltinProxy( const TQString &name ); virtual ~JSBuiltinProxy(); - virtual QString typeName() const; + virtual TQString typeName() const; virtual bool inherits( const char *clazz ); @@ -50,7 +50,7 @@ public: /** Reimplemented to return the name and class of the target. */ virtual KJS::UString toString( KJS::ExecState *exec ) const; private: - QString m_name; + TQString m_name; }; } // namespace KJSEmbed diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp index 4816e335..b494f55d 100644 --- a/kjsembed/jsconsolewidget.cpp +++ b/kjsembed/jsconsolewidget.cpp @@ -17,11 +17,11 @@ * Boston, MA 02110-1301, USA. */ -#include <qfile.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqfile.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <kdebug.h> #include <kdialog.h> @@ -50,11 +50,11 @@ class JSConsoleWidgetPrivate { }; -JSConsoleWidget::JSConsoleWidget( KJSEmbedPart *jspart, QWidget *parent, const char *name ) - : QFrame( parent, name ? name : "jsconsole_widget" ), +JSConsoleWidget::JSConsoleWidget( KJSEmbedPart *jspart, TQWidget *parent, const char *name ) + : TQFrame( parent, name ? name : "jsconsole_widget" ), js(jspart), proc(0), d(0) { - setFocusPolicy( QWidget::StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); createView(); } @@ -64,8 +64,8 @@ JSConsoleWidget::~JSConsoleWidget() void JSConsoleWidget::createView() { - QPixmap px( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeSmall) ); - QPixmap pxl( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeLarge) ); + TQPixmap px( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeSmall) ); + TQPixmap pxl( KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, KIcon::SizeLarge) ); setIcon( px ); KWin::setIcons( winId(), pxl, px ); @@ -77,32 +77,32 @@ void JSConsoleWidget::createView() log->setReadOnly( true ); log->setUndoRedoEnabled( false ); log->setTextFormat( Qt::RichText ); - log->setWrapPolicy( QTextEdit::Anywhere ); + log->setWrapPolicy( TQTextEdit::Anywhere ); log->setText( "<qt><pre>" ); - log->setFocusPolicy( QWidget::NoFocus ); + log->setFocusPolicy( TQWidget::NoFocus ); // Command entry section - cmdBox = new QHBox( this, "cmd_box" ); + cmdBox = new TQHBox( this, "cmd_box" ); cmdBox->setSpacing( KDialog::spacingHint() ); - QLabel *prompt = new QLabel( i18n("&KJS>"), cmdBox, "prompt" ); + TQLabel *prompt = new TQLabel( i18n("&KJS>"), cmdBox, "prompt" ); cmd = new KLineEdit( cmdBox, "cmd_edit" ); - cmd->setFocusPolicy( QWidget::StrongFocus ); + cmd->setFocusPolicy( TQWidget::StrongFocus ); cmd->setFocus(); prompt->setBuddy( cmd ); - go = new QPushButton( i18n("&Run"), cmdBox, "run_button" ); + go = new TQPushButton( i18n("&Run"), cmdBox, "run_button" ); go->setFixedSize( go->sizeHint() ); - connect( cmd, SIGNAL(returnPressed(const QString&)), go, SLOT( animateClick() ) ); - connect( go, SIGNAL( clicked() ), SLOT( invoke() ) ); + connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), go, TQT_SLOT( animateClick() ) ); + connect( go, TQT_SIGNAL( clicked() ), TQT_SLOT( invoke() ) ); // Setup completion KCompletion *comp = cmd->completionObject(); - connect( cmd, SIGNAL(returnPressed(const QString&)), comp, SLOT(addItem(const QString&)) ); + connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), comp, TQT_SLOT(addItem(const TQString&)) ); // Layout - QVBoxLayout *vert = new QVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); + TQVBoxLayout *vert = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); vert->addWidget( ttl ); vert->addWidget( log ); vert->addWidget( cmdBox ); @@ -110,17 +110,17 @@ void JSConsoleWidget::createView() void JSConsoleWidget::invoke() { - QString code( cmd->text() ); - println( QString( "<b><font color=\"#888888\">KJS></font> %1</b>" ).arg( code ) ); + TQString code( cmd->text() ); + println( TQString( "<b><font color=\"#888888\">KJS></font> %1</b>" ).arg( code ) ); execute( code ); } -bool JSConsoleWidget::execute( const QString &cmd ) +bool JSConsoleWidget::execute( const TQString &cmd ) { return execute( cmd, KJS::Null() ); } -bool JSConsoleWidget::execute( const QString &cmd, const KJS::Value &self ) +bool JSConsoleWidget::execute( const TQString &cmd, const KJS::Value &self ) { KJS::Completion jsres; bool ok = js->execute( jsres, cmd, self ); @@ -141,8 +141,8 @@ bool JSConsoleWidget::execute( const QString &cmd, const KJS::Value &self ) return ok; } - QString txt = s.qstring(); - txt = txt.replace( QChar('\n'), "<br>" ); + TQString txt = s.qstring(); + txt = txt.replace( TQChar('\n'), "<br>" ); println( txt ); return ok; @@ -166,15 +166,15 @@ bool JSConsoleWidget::execute( const QString &cmd, const KJS::Value &self ) return ok; } -void JSConsoleWidget::println( const QString &msg ) +void JSConsoleWidget::println( const TQString &msg ) { log->append( msg ); log->scrollToBottom(); } -void JSConsoleWidget::warn( const QString &msg ) +void JSConsoleWidget::warn( const TQString &msg ) { - QString err( "<font color=\"red\"><b>%1</b></font>" ); + TQString err( "<font color=\"red\"><b>%1</b></font>" ); println( err.arg(msg) ); } @@ -182,7 +182,7 @@ void JSConsoleWidget::warn( const QString &msg ) // Process Handling // -bool JSConsoleWidget::run( const QString &cmd ) +bool JSConsoleWidget::run( const TQString &cmd ) { kdDebug(80001) << "JSConsoleWidget::run(" << cmd << ")" << endl; @@ -192,11 +192,11 @@ bool JSConsoleWidget::run( const QString &cmd ) proc = new KShellProcess("/bin/sh"); *proc << cmd; - connect( proc, SIGNAL( processExited(KProcess *) ), SLOT( childExited() ) ); - connect( proc, SIGNAL( receivedStdout(KProcess *, char *, int) ), - this, SLOT( receivedStdOutput(KProcess *, char *, int) ) ); - connect( proc, SIGNAL( receivedStderr(KProcess *, char *, int) ), - this, SLOT( receivedStdError(KProcess *, char *, int) ) ); + connect( proc, TQT_SIGNAL( processExited(KProcess *) ), TQT_SLOT( childExited() ) ); + connect( proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int) ), + this, TQT_SLOT( receivedStdOutput(KProcess *, char *, int) ) ); + connect( proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int) ), + this, TQT_SLOT( receivedStdError(KProcess *, char *, int) ) ); return proc->start( KProcess::NotifyOnExit, KProcess::Communication( KProcess::Stdout|KProcess::Stderr )); @@ -205,7 +205,7 @@ bool JSConsoleWidget::run( const QString &cmd ) void JSConsoleWidget::childExited() { - QString s; + TQString s; if ( proc->normalExit() ) { if ( proc->exitStatus() ) s = i18n( "<b>[Exited with status %1]</b>\n" ).arg( proc->exitStatus() ); @@ -224,14 +224,14 @@ void JSConsoleWidget::childExited() void JSConsoleWidget::receivedStdOutput( KProcess *, char *buffer, int buflen ) { - QCString buf = QCString( buffer, buflen+1 ); - println( QString(buf) ); + TQCString buf = TQCString( buffer, buflen+1 ); + println( TQString(buf) ); } void JSConsoleWidget::receivedStdError( KProcess *, char *buffer, int buflen ) { - QCString buf = QCString( buffer, buflen+1 ); - warn( QString(buf) ); + TQCString buf = TQCString( buffer, buflen+1 ); + warn( TQString(buf) ); } diff --git a/kjsembed/jsconsolewidget.h b/kjsembed/jsconsolewidget.h index cd173080..bf7100df 100644 --- a/kjsembed/jsconsolewidget.h +++ b/kjsembed/jsconsolewidget.h @@ -22,7 +22,7 @@ #ifndef KJSEMBEDJSCONSOLEWIDGET_H #define KJSEMBEDJSCONSOLEWIDGET_H -#include <qframe.h> +#include <tqframe.h> #include <kjsembed/global.h> class QPushButton; @@ -43,7 +43,7 @@ namespace KJSEmbed { class KJSEmbedPart; /** - * A QWidget that provides a console for executing Javascript commands. Creating + * A TQWidget that provides a console for executing Javascript commands. Creating * a JS console is easy, as you can see below: * * <pre> @@ -64,7 +64,7 @@ class KJSEMBED_EXPORT JSConsoleWidget : public QFrame Q_OBJECT public: - JSConsoleWidget( KJSEmbedPart *js, QWidget *parent=0, const char *name=0 ); + JSConsoleWidget( KJSEmbedPart *js, TQWidget *parent=0, const char *name=0 ); virtual ~JSConsoleWidget(); public slots: @@ -78,28 +78,28 @@ public slots: KPopupTitle *title() const { return ttl; } /** - * Returns the QHBox used to layout the entry part of the console. This + * Returns the TQHBox used to layout the entry part of the console. This * can be used by clients to hide and show the interactive parts of the * console, or to add new buttons etc. */ - QHBox *commandBox() const { return cmdBox; } + TQHBox *commandBox() const { return cmdBox; } /** Invokes the content of the command entry field. */ void invoke(); /** Invokes the specified command string. */ - virtual bool execute( const QString &cmd ); + virtual bool execute( const TQString &cmd ); - bool execute( const QString &cmd, const KJS::Value &self ); + bool execute( const TQString &cmd, const KJS::Value &self ); /** Prints the specified string to the console. */ - virtual void println( const QString &text ); + virtual void println( const TQString &text ); /** * Prints the specified string to the console as a warning, the default * implementation prints the text in red. */ - virtual void warn( const QString &text ); + virtual void warn( const TQString &text ); /** * Runs the specified command using KShellProcess. The output of the @@ -115,7 +115,7 @@ public slots: * to ensure that you only expose safe objects and methods to the * interpreter. */ - virtual bool run( const QString &shellCmd ); + virtual bool run( const TQString &shellCmd ); protected: /** Creates the console view. */ @@ -136,9 +136,9 @@ private: KShellProcess *proc; KTextEdit *log; - QHBox *cmdBox; + TQHBox *cmdBox; KLineEdit *cmd; - QPushButton *go; + TQPushButton *go; KPopupTitle *ttl; class JSConsoleWidgetPrivate *d; diff --git a/kjsembed/jseventmapper.cpp b/kjsembed/jseventmapper.cpp index eaa2aab7..000353d3 100644 --- a/kjsembed/jseventmapper.cpp +++ b/kjsembed/jseventmapper.cpp @@ -19,52 +19,52 @@ #include "global.h" #include "jseventmapper.h" -#include <qevent.h> +#include <tqevent.h> namespace KJSEmbed { /** Used internally for the event handler table. */ struct EventType { - EventType( KJS::Identifier _id, QEvent::Type _type ) : + EventType( KJS::Identifier _id, TQEvent::Type _type ) : id(_id), type(_type) {;} const KJS::Identifier id; - const QEvent::Type type; + const TQEvent::Type type; }; static EventType events[] = { - EventType(KJS::Identifier("timerEvent"), QEvent::Timer), + EventType(KJS::Identifier("timerEvent"), TQEvent::Timer), #ifdef ENABLE_CHILDEVENTS - EventType( KJS::Identifier("childInsertEvent"), QEvent::ChildInserted ), - EventType( KJS::Identifier("childRemoveEvent"), QEvent::ChildRemoved ), + EventType( KJS::Identifier("childInsertEvent"), TQEvent::ChildInserted ), + EventType( KJS::Identifier("childRemoveEvent"), TQEvent::ChildRemoved ), #endif - EventType( KJS::Identifier("mouseReleaseEvent"), QEvent::MouseButtonRelease ), - EventType( KJS::Identifier("mouseMoveEvent"), QEvent::MouseMove ), - EventType( KJS::Identifier("mouseDoubleClickEvent"), QEvent::MouseButtonDblClick ), - EventType( KJS::Identifier("mousePressEvent"), QEvent::MouseButtonPress ), + EventType( KJS::Identifier("mouseReleaseEvent"), TQEvent::MouseButtonRelease ), + EventType( KJS::Identifier("mouseMoveEvent"), TQEvent::MouseMove ), + EventType( KJS::Identifier("mouseDoubleClickEvent"), TQEvent::MouseButtonDblClick ), + EventType( KJS::Identifier("mousePressEvent"), TQEvent::MouseButtonPress ), - EventType( KJS::Identifier("keyPressEvent"), QEvent::KeyPress ), - EventType( KJS::Identifier("keyReleaseEvent"), QEvent::KeyRelease ), + EventType( KJS::Identifier("keyPressEvent"), TQEvent::KeyPress ), + EventType( KJS::Identifier("keyReleaseEvent"), TQEvent::KeyRelease ), - EventType( KJS::Identifier("paintEvent"), QEvent::Paint ), + EventType( KJS::Identifier("paintEvent"), TQEvent::Paint ), - EventType( KJS::Identifier("moveEvent"), QEvent::Move ), - EventType( KJS::Identifier("resizeEvent"), QEvent::Resize ), + EventType( KJS::Identifier("moveEvent"), TQEvent::Move ), + EventType( KJS::Identifier("resizeEvent"), TQEvent::Resize ), - EventType( KJS::Identifier("closeEvent"), QEvent::Close ), + EventType( KJS::Identifier("closeEvent"), TQEvent::Close ), - EventType( KJS::Identifier("showEvent"), QEvent::Show ), - EventType( KJS::Identifier("hideEvent"), QEvent::Hide ), + EventType( KJS::Identifier("showEvent"), TQEvent::Show ), + EventType( KJS::Identifier("hideEvent"), TQEvent::Hide ), - EventType( KJS::Identifier("dragEnterEvent"), QEvent::DragEnter ), - EventType( KJS::Identifier("dragMoveEvent"), QEvent::DragMove ), - EventType( KJS::Identifier("dragLeaveEvent"), QEvent::DragLeave ), - EventType( KJS::Identifier("dragResponseEvent"), QEvent::DragResponse ), - EventType( KJS::Identifier("dropEvent"), QEvent::Drop ), + EventType( KJS::Identifier("dragEnterEvent"), TQEvent::DragEnter ), + EventType( KJS::Identifier("dragMoveEvent"), TQEvent::DragMove ), + EventType( KJS::Identifier("dragLeaveEvent"), TQEvent::DragLeave ), + EventType( KJS::Identifier("dragResponseEvent"), TQEvent::DragResponse ), + EventType( KJS::Identifier("dropEvent"), TQEvent::Drop ), - EventType( KJS::Identifier(), QEvent::None ) + EventType( KJS::Identifier(), TQEvent::None ) }; JSEventMapper::JSEventMapper() @@ -73,23 +73,23 @@ JSEventMapper::JSEventMapper() do { addEvent( events[i].id, events[i].type ); i++; - } while( events[i].type != QEvent::None ); + } while( events[i].type != TQEvent::None ); } JSEventMapper::~JSEventMapper() { } -void JSEventMapper::addEvent( const KJS::Identifier &name, QEvent::Type t ) +void JSEventMapper::addEvent( const KJS::Identifier &name, TQEvent::Type t ) { handlerToEvent.insert( name.qstring(), (const uint *) t ); eventToHandler.insert( (long) t, &name ); } -QEvent::Type JSEventMapper::findEventType( const KJS::Identifier &name ) const +TQEvent::Type JSEventMapper::findEventType( const KJS::Identifier &name ) const { uint evt = (uint)(long)handlerToEvent[ name.qstring() ]; - return static_cast<QEvent::Type>( evt ); + return static_cast<TQEvent::Type>( evt ); } } // namespace KJSEmbed diff --git a/kjsembed/jseventmapper.h b/kjsembed/jseventmapper.h index cdcb4630..3539e94a 100644 --- a/kjsembed/jseventmapper.h +++ b/kjsembed/jseventmapper.h @@ -22,9 +22,9 @@ #ifndef JSEVENTMAPPER_H #define JSEVENTMAPPER_H -#include <qdict.h> -#include <qevent.h> -#include <qintdict.h> +#include <tqdict.h> +#include <tqevent.h> +#include <tqintdict.h> #include <kjs/identifier.h> #include <kjsembed/jsbinding.h> @@ -32,7 +32,7 @@ namespace KJSEmbed { /** - * Maintains a map between the types of QEvent and the names of their event + * Maintains a map between the types of TQEvent and the names of their event * handlers. * * @author Richard Moore, rich@kde.org @@ -47,7 +47,7 @@ public: * Adds an event to the map. The event handler has the specified name, and * the event has the specified type. */ - void addEvent( const KJS::Identifier &name, QEvent::Type t ); + void addEvent( const KJS::Identifier &name, TQEvent::Type t ); /** Returns true iff the specified name is the identifier for an event handler. */ bool isEventHandler( const KJS::Identifier &name ) const { @@ -55,13 +55,13 @@ public: } /** Returns the type of the events handled by the specified handler. */ - QEvent::Type findEventType( const KJS::Identifier &name ) const; + TQEvent::Type findEventType( const KJS::Identifier &name ) const; - KJS::Identifier *findEventHandler( QEvent::Type t ) const { return eventToHandler.find(t); } + KJS::Identifier *findEventHandler( TQEvent::Type t ) const { return eventToHandler.find(t); } private: - QDict<uint> handlerToEvent; - QIntDict<KJS::Identifier> eventToHandler; + TQDict<uint> handlerToEvent; + TQIntDict<KJS::Identifier> eventToHandler; class JSEventMapperPrivate *d; }; diff --git a/kjsembed/jseventutils.cpp b/kjsembed/jseventutils.cpp index 0c53ebe9..4c5bbd13 100644 --- a/kjsembed/jseventutils.cpp +++ b/kjsembed/jseventutils.cpp @@ -33,15 +33,15 @@ JSFactory *JSEventUtils::factory( const JSObjectProxy *prx ) } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QMouseEvent *ev, const JSObjectProxy *context ) + const TQMouseEvent *ev, const JSObjectProxy *context ) { - KJS::Object mev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object mev = convertEvent( exec, (TQEvent *)ev, context); - mev.put( exec, "pos", convertToValue( exec, QVariant(ev->pos()) ) ); + mev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) ) ); mev.put( exec, "x", KJS::Number(ev->x()) ); mev.put( exec, "y", KJS::Number(ev->y()) ); - mev.put( exec, "globalPos", convertToValue( exec, QVariant(ev->globalPos()) ) ); + mev.put( exec, "globalPos", convertToValue( exec, TQVariant(ev->globalPos()) ) ); mev.put( exec, "globalX", KJS::Number(ev->globalX()) ); mev.put( exec, "globalY", KJS::Number(ev->globalY()) ); @@ -53,19 +53,19 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QPaintEvent *ev, const JSObjectProxy *context ) + const TQPaintEvent *ev, const JSObjectProxy *context ) { - KJS::Object pev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object pev = convertEvent( exec, (TQEvent *)ev, context); - pev.put( exec, "rect", convertToValue( exec, QVariant(ev->rect()) ) ); - pev.put( exec, "erased", convertToValue( exec, QVariant(ev->erased()) ) ); + pev.put( exec, "rect", convertToValue( exec, TQVariant(ev->rect()) ) ); + pev.put( exec, "erased", convertToValue( exec, TQVariant(ev->erased()) ) ); return pev; } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QKeyEvent *ev, const JSObjectProxy *context ) + const TQKeyEvent *ev, const JSObjectProxy *context ) { - KJS::Object kev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object kev = convertEvent( exec, (TQEvent *)ev, context); kev.put( exec, "key", KJS::Number(ev->key()) ); kev.put( exec, "ascii", KJS::Number(ev->ascii()) ); @@ -75,37 +75,37 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, kev.put( exec, "text", KJS::String(ev->text())); kev.put( exec, "isAutoRepeat", KJS::Boolean(ev->isAutoRepeat()) ); kev.put( exec, "count", KJS::Number( ev->count()) ); - //kev.put( exec, "accept", KJS::Void( exec, QVariant(ev->accept()), context ) ); - //kev.put( exec, "ignore", KJS::Void( exec, QVariant(ev->ignore()), context ) ); + //kev.put( exec, "accept", KJS::Void( exec, TQVariant(ev->accept()), context ) ); + //kev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) ); return kev; } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QIMEvent *ev, const JSObjectProxy *context ) + const TQIMEvent *ev, const JSObjectProxy *context ) { - KJS::Object qev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object qev = convertEvent( exec, (TQEvent *)ev, context); qev.put( exec, "text", KJS::String(ev->text()) ); qev.put( exec, "cursorPos", KJS::Number(ev->cursorPos()) ); qev.put( exec, "isAccepted", KJS::Boolean(ev->isAccepted()) ); - //qev.put( exec, "accept", KJS::Void( exec, QVariant(ev->accept()), context ) ); - //qev.put( exec, "ignore", KJS::Void( exec, QVariant(ev->ignore()), context ) ); + //qev.put( exec, "accept", KJS::Void( exec, TQVariant(ev->accept()), context ) ); + //qev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) ); return qev; } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QResizeEvent *ev, const JSObjectProxy *context ) + const TQResizeEvent *ev, const JSObjectProxy *context ) { - KJS::Object rev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object rev = convertEvent( exec, (TQEvent *)ev, context); - rev.put( exec, "size", convertToValue( exec, QVariant(ev->size()) )); - rev.put( exec, "oldSize", convertToValue( exec, QVariant(ev->oldSize()) )); + rev.put( exec, "size", convertToValue( exec, TQVariant(ev->size()) )); + rev.put( exec, "oldSize", convertToValue( exec, TQVariant(ev->oldSize()) )); return rev; } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QFocusEvent *ev, const JSObjectProxy *context ) + const TQFocusEvent *ev, const JSObjectProxy *context ) { - KJS::Object fev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object fev = convertEvent( exec, (TQEvent *)ev, context); fev.put( exec, "gotFocus", KJS::Boolean(ev->gotFocus()) ); fev.put( exec, "lostFocus", KJS::Boolean(ev->lostFocus()) ); @@ -113,21 +113,21 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QCloseEvent *ev, const JSObjectProxy *context ) + const TQCloseEvent *ev, const JSObjectProxy *context ) { - KJS::Object cev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object cev = convertEvent( exec, (TQEvent *)ev, context); cev.put( exec, "isAccepted", KJS::Boolean(ev->isAccepted()) ); - //cev.put( exec, "accept", KJS::Void( exec, QVariant(ev->accept()), context ) ); - //cev.put( exec, "ignore", KJS::Void( exec, QVariant(ev->ignore()), context ) ); + //cev.put( exec, "accept", KJS::Void( exec, TQVariant(ev->accept()), context ) ); + //cev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) ); return cev; } #ifdef ENABLE_CHILDEVENTS KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QChildEvent *ev, const JSObjectProxy *context ) + const TQChildEvent *ev, const JSObjectProxy *context ) { - KJS::Object cev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object cev = convertEvent( exec, (TQEvent *)ev, context); cev.put( exec, "inserted", KJS::Boolean(ev->inserted()) ); cev.put( exec, "removed", KJS::Boolean(ev->removed()) ); @@ -138,23 +138,23 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, #endif KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QMoveEvent *ev, const JSObjectProxy *context ) + const TQMoveEvent *ev, const JSObjectProxy *context ) { - KJS::Object mev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object mev = convertEvent( exec, (TQEvent *)ev, context); - mev.put( exec, "pos", convertToValue( exec, QVariant(ev->pos()) )); - mev.put( exec, "oldPos", convertToValue( exec, QVariant(ev->oldPos()) )); + mev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) )); + mev.put( exec, "oldPos", convertToValue( exec, TQVariant(ev->oldPos()) )); return mev; } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QWheelEvent *ev, const JSObjectProxy *context ) + const TQWheelEvent *ev, const JSObjectProxy *context ) { - KJS::Object wev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object wev = convertEvent( exec, (TQEvent *)ev, context); wev.put( exec, "delta", KJS::Number(ev->delta()) ); - wev.put( exec, "pos", convertToValue( exec, QVariant(ev->pos()) ) ); - wev.put( exec, "globalPos", convertToValue( exec, QVariant(ev->globalPos()) ) ); + wev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) ) ); + wev.put( exec, "globalPos", convertToValue( exec, TQVariant(ev->globalPos()) ) ); wev.put( exec, "x", KJS::Number(ev->x()) ); wev.put( exec, "y", KJS::Number(ev->y()) ); wev.put( exec, "globalX", KJS::Number(ev->globalX()) ); @@ -163,13 +163,13 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, wev.put( exec, "state", KJS::Number(ev->state()) ); wev.put( exec, "orientation", KJS::Number(ev->orientation()) ); wev.put( exec, "isAccepted", KJS::Boolean(ev->isAccepted()) ); - //wev.put( exec, "accept", KJS::Void( exec, QVariant(ev->accept()), context ) ); - //wev.put( exec, "ignore", KJS::Void( exec, QVariant(ev->ignore()), context ) ); + //wev.put( exec, "accept", KJS::Void( exec, TQVariant(ev->accept()), context ) ); + //wev.put( exec, "ignore", KJS::Void( exec, TQVariant(ev->ignore()), context ) ); return wev; } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QEvent *ev, const JSObjectProxy * /*context*/) + const TQEvent *ev, const JSObjectProxy * /*context*/) { KJS::Object evnt( new JSOpaqueProxy(ev) ); evnt.put( exec, "type", KJS::Number( (int) ev->type()) ); @@ -177,10 +177,10 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, return evnt; } -KJS::Object JSEventUtils::convertEvent( KJS::ExecState * exec, const QDropEvent * ev, const JSObjectProxy * context ) +KJS::Object JSEventUtils::convertEvent( KJS::ExecState * exec, const TQDropEvent * ev, const JSObjectProxy * context ) { - KJS::Object dev = convertEvent( exec, (QEvent *)ev, context); - dev.put( exec, "pos", convertToValue( exec, QVariant(ev->pos()) ) ); + KJS::Object dev = convertEvent( exec, (TQEvent *)ev, context); + dev.put( exec, "pos", convertToValue( exec, TQVariant(ev->pos()) ) ); dev.put( exec, "isAccepted", KJS::Boolean(ev->isAccepted()) ); dev.put( exec, "isActionAccepted", KJS::Boolean(ev->isActionAccepted()) ); dev.put( exec, "source", factory(context)->createProxy(exec, ev->source(), context) ); @@ -189,31 +189,31 @@ KJS::Object JSEventUtils::convertEvent( KJS::ExecState * exec, const QDropEvent } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QDragMoveEvent *ev, const JSObjectProxy *context ) + const TQDragMoveEvent *ev, const JSObjectProxy *context ) { - KJS::Object mev = convertEvent(exec, (QDropEvent *)ev, context); - mev.put( exec, "answerRect", convertToValue( exec, QVariant(ev->answerRect()) ) ); + KJS::Object mev = convertEvent(exec, (TQDropEvent *)ev, context); + mev.put( exec, "answerRect", convertToValue( exec, TQVariant(ev->answerRect()) ) ); return mev; } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QTimerEvent *ev, const JSObjectProxy *context ) + const TQTimerEvent *ev, const JSObjectProxy *context ) { - KJS::Object dev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object dev = convertEvent( exec, (TQEvent *)ev, context); dev.put( exec, "timerId", KJS::Number(ev->timerId()) ); return dev; } KJS::Object JSEventUtils::convertEvent( KJS::ExecState *exec, - const QContextMenuEvent *ev, const JSObjectProxy *context ) + const TQContextMenuEvent *ev, const JSObjectProxy *context ) { - KJS::Object cxev = convertEvent( exec, (QEvent *)ev, context); + KJS::Object cxev = convertEvent( exec, (TQEvent *)ev, context); cxev.put( exec, "x", KJS::Number(ev->x()) ); cxev.put( exec, "y", KJS::Number(ev->y()) ); cxev.put( exec, "globalX", KJS::Number(ev->globalX()) ); cxev.put( exec, "globalY", KJS::Number(ev->globalY()) ); - cxev.put( exec, "pos",convertToValue( exec, QVariant(ev->pos()) ) ); - cxev.put( exec, "globalPos", convertToValue( exec, QVariant(ev->globalPos()) ) ); + cxev.put( exec, "pos",convertToValue( exec, TQVariant(ev->pos()) ) ); + cxev.put( exec, "globalPos", convertToValue( exec, TQVariant(ev->globalPos()) ) ); cxev.put( exec, "state", KJS::Number( (int) ev->state()) ); cxev.put( exec, "isAccepted", KJS::Boolean(ev->isAccepted()) ); cxev.put( exec, "isConsumed", KJS::Boolean(ev->isConsumed()) ); diff --git a/kjsembed/jseventutils.h b/kjsembed/jseventutils.h index f736478b..2d2044e9 100644 --- a/kjsembed/jseventutils.h +++ b/kjsembed/jseventutils.h @@ -22,7 +22,7 @@ #ifndef KJSEMBED_JSEVENTUTILS_H #define KJSEMBED_JSEVENTUTILS_H #include "global.h" -#include <qevent.h> +#include <tqevent.h> #include <kjs/object.h> namespace KJSEmbed { @@ -37,51 +37,51 @@ class KJSEMBED_EXPORT JSEventUtils { public: static KJS::Object convertEvent( KJS::ExecState *exec, - const QMouseEvent *ev, const JSObjectProxy *context ); + const TQMouseEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QPaintEvent *ev, const JSObjectProxy *context ); + const TQPaintEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QKeyEvent *ev, const JSObjectProxy *context ); + const TQKeyEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QIMEvent *ev, const JSObjectProxy *context ); + const TQIMEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QResizeEvent *ev, const JSObjectProxy *context ); + const TQResizeEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QFocusEvent *ev, const JSObjectProxy *context ); + const TQFocusEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QCloseEvent *ev, const JSObjectProxy *context ); + const TQCloseEvent *ev, const JSObjectProxy *context ); #ifdef ENABLE_CHILDEVENTS static KJS::Object convertEvent( KJS::ExecState *exec, - const QChildEvent *ev, const JSObjectProxy *context ); + const TQChildEvent *ev, const JSObjectProxy *context ); #endif static KJS::Object convertEvent( KJS::ExecState *exec, - const QMoveEvent *ev, const JSObjectProxy *context ); + const TQMoveEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QWheelEvent *ev, const JSObjectProxy *context ); + const TQWheelEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QEvent *ev, const JSObjectProxy *context ); + const TQEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QDropEvent *ev, const JSObjectProxy *context ); + const TQDropEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QDragMoveEvent *ev, const JSObjectProxy *context ); + const TQDragMoveEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QTimerEvent *ev, const JSObjectProxy *context ); + const TQTimerEvent *ev, const JSObjectProxy *context ); static KJS::Object convertEvent( KJS::ExecState *exec, - const QContextMenuEvent *ev, const JSObjectProxy *context ); + const TQContextMenuEvent *ev, const JSObjectProxy *context ); diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp index ff298b43..ebb4bf26 100644 --- a/kjsembed/jsfactory.cpp +++ b/kjsembed/jsfactory.cpp @@ -21,25 +21,25 @@ #include <string.h> #include <errno.h> -#include <qobject.h> -#include <qcombobox.h> -#include <qdialog.h> -#include <qdir.h> -#include <qfile.h> -#include <qimage.h> -#include <qlistview.h> -#include <qmainwindow.h> -//#include <qpainter.h> -#include <qprogressdialog.h> -#include <qtextstream.h> -#include <qtimer.h> -#include <qwidget.h> -#include <qwidgetfactory.h> -#include <qsplitter.h> -#include <qscrollview.h> -#include <qcanvas.h> -#include <qlayout.h> -#include <qsplashscreen.h> +#include <tqobject.h> +#include <tqcombobox.h> +#include <tqdialog.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqimage.h> +#include <tqlistview.h> +#include <tqmainwindow.h> +//#include <tqpainter.h> +#include <tqprogressdialog.h> +#include <tqtextstream.h> +#include <tqtimer.h> +#include <tqwidget.h> +#include <tqwidgetfactory.h> +#include <tqsplitter.h> +#include <tqscrollview.h> +#include <tqcanvas.h> +#include <tqlayout.h> +#include <tqsplashscreen.h> #ifndef QT_ONLY @@ -137,9 +137,9 @@ namespace KJSEmbed { class JSFactoryPrivate { public: - QDict<KJSEmbed::Bindings::JSBindingPlugin> plugins; - QDict<KJSEmbed::Bindings::JSBindingBase> opaqueTypes; - QDict<KJSEmbed::Bindings::JSBindingBase> objectTypes; + TQDict<KJSEmbed::Bindings::JSBindingPlugin> plugins; + TQDict<KJSEmbed::Bindings::JSBindingBase> opaqueTypes; + TQDict<KJSEmbed::Bindings::JSBindingBase> objectTypes; }; @@ -147,9 +147,9 @@ namespace KJSEmbed { : jspart( part ) { evmapper = new JSEventMapper(); d = new JSFactoryPrivate; - registerOpaqueType("QDir", new Bindings::QDirLoader()); - registerOpaqueType("QCheckListItem", new Bindings::QCheckListItemLoader()); - registerOpaqueType("QListViewItem", new Bindings::QListViewItemLoader()); + registerOpaqueType("TQDir", new Bindings::QDirLoader()); + registerOpaqueType("TQCheckListItem", new Bindings::QCheckListItemLoader()); + registerOpaqueType("TQListViewItem", new Bindings::QListViewItemLoader()); registerOpaqueType("Painter", new Bindings::PainterLoader()); #ifndef QT_ONLY @@ -174,7 +174,7 @@ namespace KJSEmbed { KTrader::OfferListIterator itr = offers.begin(); while ( itr != offers.end() ) { - QString classname = ( *itr ) ->name(); + TQString classname = ( *itr ) ->name(); JSFactoryImp *cons = new JSFactoryImp( exec, this, JSFactoryImp::NewInstance, classname ); parent.put( exec, KJS::Identifier( cons->parameter() ), KJS::Object( cons ) ); addType( classname, TypePlugin ); @@ -187,19 +187,19 @@ namespace KJSEmbed { } - bool JSFactory::isBindingPlugin( const QString &classname ) const { + bool JSFactory::isBindingPlugin( const TQString &classname ) const { if ( !isSupported( classname ) ) return false; return ( objtypes[ classname ] & TypePlugin ); } - KJS::Object JSFactory::createBindingPlugin( KJS::ExecState *exec, const QString &classname, const KJS::List &args ) { + KJS::Object JSFactory::createBindingPlugin( KJS::ExecState *exec, const TQString &classname, const KJS::List &args ) { #ifndef QT_ONLY Bindings::JSBindingPlugin * plugin = d->plugins[ classname ]; if ( plugin == 0L ) { - QString query = "JSBindingPlugin/Binding"; - QString constraint = "[Name] == '" + classname + "'"; + TQString query = "JSBindingPlugin/Binding"; + TQString constraint = "[Name] == '" + classname + "'"; plugin = KParts::ComponentFactory::createInstanceFromQuery<Bindings::JSBindingPlugin>( query, constraint ); if ( plugin != 0L ) d->plugins.insert( classname, plugin ); @@ -219,10 +219,10 @@ namespace KJSEmbed { return KJS::Object(); } - KJS::Object JSFactory::create( KJS::ExecState *exec, const QString &classname, const KJS::List &args ) { + KJS::Object JSFactory::create( KJS::ExecState *exec, const TQString &classname, const KJS::List &args ) { KJS::Object returnObject; if ( !isSupported( classname ) ) { - QString msg = i18n( "Object of type '%1' is not supported." ).arg( classname ); + TQString msg = i18n( "Object of type '%1' is not supported." ).arg( classname ); return throwError(exec, msg,KJS::TypeError); } if ( isQObject( classname ) ) { @@ -232,15 +232,15 @@ namespace KJSEmbed { returnObject = factory->createBinding( jspart, exec, args ); JSProxy::toProxy( returnObject.imp() ) ->setOwner( JSProxy::JavaScript ); } else { - QObject *parent = extractQObject(exec, args, 0); - QString name = extractQString(exec, args, 1); + TQObject *parent = extractQObject(exec, args, 0); + TQString name = extractQString(exec, args, 1); - QObject *obj = create( classname, parent, name.latin1() ); + TQObject *obj = create( classname, parent, name.latin1() ); if ( obj ) { returnObject = createProxy( exec, obj ); JSProxy::toProxy( returnObject.imp() ) ->setOwner( JSProxy::JavaScript ); } else { - QString msg = i18n( "QObject of type '%1' could not be created." ).arg( classname ); + TQString msg = i18n( "TQObject of type '%1' could not be created." ).arg( classname ); returnObject = throwError(exec, msg,KJS::TypeError); } } @@ -253,30 +253,30 @@ namespace KJSEmbed { returnObject = createOpaque( exec, classname, args ); if ( !returnObject.isValid() ) { - QString msg = i18n( "Opaque object of type '%1' could not be created." ).arg( classname ); + TQString msg = i18n( "Opaque object of type '%1' could not be created." ).arg( classname ); returnObject = throwError(exec, msg,KJS::TypeError); } } else if ( isValue( classname ) ) { returnObject = createValue( exec, classname, args ); if ( !returnObject.isValid() ) { - QString msg = i18n( "Value object of type '%1' could not be created." ).arg( classname ); + TQString msg = i18n( "Value object of type '%1' could not be created." ).arg( classname ); returnObject = throwError(exec, msg,KJS::TypeError); } } else if ( isBindingPlugin( classname ) ) { returnObject = createBindingPlugin( exec, classname, args ); if ( !returnObject.isValid() ) { - QString msg = i18n( "Plugin object of type '%1' could not be created." ).arg( classname ); + TQString msg = i18n( "Plugin object of type '%1' could not be created." ).arg( classname ); returnObject = throwError(exec, msg,KJS::TypeError); } else JSProxy::toProxy( returnObject.imp() ) ->setOwner( JSProxy::JavaScript ); } else { - QString msg = i18n( "Could not create object of type '%1'." ).arg( classname ); + TQString msg = i18n( "Could not create object of type '%1'." ).arg( classname ); returnObject = throwError(exec, msg,KJS::TypeError); } return returnObject; } - KJS::Object JSFactory::createProxy( KJS::ExecState *exec, QObject *target, + KJS::Object JSFactory::createProxy( KJS::ExecState *exec, TQObject *target, const JSObjectProxy *ctx ) const { kdDebug( 80001 ) << "JSFactory::createProxy: Target '" << target->name() << "' type " << target->className() << endl; @@ -301,7 +301,7 @@ namespace KJSEmbed { } KJS::Object JSFactory::createProxy( KJS::ExecState *exec, - QTextStream *target, const JSObjectProxy *context ) const { + TQTextStream *target, const JSObjectProxy *context ) const { Q_UNUSED( context ) kdDebug( 80001 ) << "TextStream proxy created" << endl; @@ -314,74 +314,74 @@ namespace KJSEmbed { } KJS::Object JSFactory::createProxy( KJS::ExecState *exec, - QEvent *target, const JSObjectProxy *context ) const { + TQEvent *target, const JSObjectProxy *context ) const { switch ( target->type() ) { - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseMove: - case QEvent::MouseButtonDblClick: - return JSEventUtils::convertEvent( exec, ( QMouseEvent * ) target, context ); + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + case TQEvent::MouseMove: + case TQEvent::MouseButtonDblClick: + return JSEventUtils::convertEvent( exec, ( TQMouseEvent * ) target, context ); break; - case QEvent::KeyPress: - case QEvent::KeyRelease: - case QEvent::Accel: - case QEvent::AccelOverride: - return JSEventUtils::convertEvent( exec, ( QKeyEvent * ) target, context ); + case TQEvent::KeyPress: + case TQEvent::KeyRelease: + case TQEvent::Accel: + case TQEvent::AccelOverride: + return JSEventUtils::convertEvent( exec, ( TQKeyEvent * ) target, context ); break; - case QEvent::IMStart: - case QEvent::IMCompose: - case QEvent::IMEnd: - return JSEventUtils::convertEvent( exec, ( QIMEvent * ) target, context ); + case TQEvent::IMStart: + case TQEvent::IMCompose: + case TQEvent::IMEnd: + return JSEventUtils::convertEvent( exec, ( TQIMEvent * ) target, context ); break; - case QEvent::Paint: - return JSEventUtils::convertEvent( exec, ( QPaintEvent * ) target, context ); + case TQEvent::Paint: + return JSEventUtils::convertEvent( exec, ( TQPaintEvent * ) target, context ); break; - case QEvent::Resize: - return JSEventUtils::convertEvent( exec, ( QResizeEvent * ) target, context ); + case TQEvent::Resize: + return JSEventUtils::convertEvent( exec, ( TQResizeEvent * ) target, context ); break; - case QEvent::FocusIn: - case QEvent::FocusOut: - return JSEventUtils::convertEvent( exec, ( QFocusEvent * ) target, context ); + case TQEvent::FocusIn: + case TQEvent::FocusOut: + return JSEventUtils::convertEvent( exec, ( TQFocusEvent * ) target, context ); break; - case QEvent::Close: - return JSEventUtils::convertEvent( exec, ( QCloseEvent * ) target, context ); + case TQEvent::Close: + return JSEventUtils::convertEvent( exec, ( TQCloseEvent * ) target, context ); break; - case QEvent::ChildInserted: - case QEvent::ChildRemoved: - return JSEventUtils::convertEvent( exec, ( QChildEvent * ) target, context ); + case TQEvent::ChildInserted: + case TQEvent::ChildRemoved: + return JSEventUtils::convertEvent( exec, ( TQChildEvent * ) target, context ); break; - case QEvent::Move: - return JSEventUtils::convertEvent( exec, ( QMoveEvent * ) target, context ); + case TQEvent::Move: + return JSEventUtils::convertEvent( exec, ( TQMoveEvent * ) target, context ); break; - case QEvent::Wheel: - return JSEventUtils::convertEvent( exec, ( QWheelEvent * ) target, context ); + case TQEvent::Wheel: + return JSEventUtils::convertEvent( exec, ( TQWheelEvent * ) target, context ); break; - case QEvent::Timer: - return JSEventUtils::convertEvent( exec, ( QTimerEvent * ) target, context ); + case TQEvent::Timer: + return JSEventUtils::convertEvent( exec, ( TQTimerEvent * ) target, context ); break; - case QEvent::ContextMenu: - return JSEventUtils::convertEvent( exec, ( QContextMenuEvent * ) target, context ); + case TQEvent::ContextMenu: + return JSEventUtils::convertEvent( exec, ( TQContextMenuEvent * ) target, context ); break; - case QEvent::DragMove: - case QEvent::DragEnter: - return JSEventUtils::convertEvent( exec, ( QDragMoveEvent * ) target, context ); + case TQEvent::DragMove: + case TQEvent::DragEnter: + return JSEventUtils::convertEvent( exec, ( TQDragMoveEvent * ) target, context ); break; - case QEvent::Drop: - return JSEventUtils::convertEvent( exec, ( QDropEvent * ) target, context ); + case TQEvent::Drop: + return JSEventUtils::convertEvent( exec, ( TQDropEvent * ) target, context ); break; - case QEvent::Enter: - case QEvent::Leave: - case QEvent::Clipboard: - case QEvent::DragLeave: - case QEvent::Show: - case QEvent::Hide: - return JSEventUtils::convertEvent( exec, ( QEvent * ) target, context ); + case TQEvent::Enter: + case TQEvent::Leave: + case TQEvent::Clipboard: + case TQEvent::DragLeave: + case TQEvent::Show: + case TQEvent::Hide: + return JSEventUtils::convertEvent( exec, ( TQEvent * ) target, context ); break; default: break; } - return JSEventUtils::convertEvent( exec, ( QEvent * ) target, context ); + return JSEventUtils::convertEvent( exec, ( TQEvent * ) target, context ); } KJS::Object JSFactory::extendProxy( KJS::ExecState *exec, KJS::Object &target ) const { @@ -402,8 +402,8 @@ namespace KJSEmbed { Bindings::JSBindingPlugin *plugin = d->plugins[ proxy->object() ->className() ]; if ( plugin == 0L ) { - QString query = "JSBindingPlugin/Binding"; - QString constraint = "[Name] == '" + QString::fromUtf8( proxy->object() ->className() ) + "'"; + TQString query = "JSBindingPlugin/Binding"; + TQString constraint = "[Name] == '" + TQString::fromUtf8( proxy->object() ->className() ) + "'"; plugin = KParts::ComponentFactory::createInstanceFromQuery<Bindings::JSBindingPlugin>( query, constraint ); if ( plugin != 0L ) d->plugins.insert( proxy->object() ->className(), plugin ); @@ -424,7 +424,7 @@ namespace KJSEmbed { } - QObject *JSFactory::createBinding( const QString &cname, QObject *parent, const char *name ) { + TQObject *JSFactory::createBinding( const TQString &cname, TQObject *parent, const char *name ) { #ifndef QT_ONLY // Bindings @@ -446,15 +446,15 @@ namespace KJSEmbed { return 0; } - QObject *JSFactory::createObject( const QString &cname, QObject *parent, const char *name ) { + TQObject *JSFactory::createObject( const TQString &cname, TQObject *parent, const char *name ) { // QObjects defined by Qt - if ( cname == "QObject" ) - return new QObject( parent, name ); - else if ( cname == "QTimer" ) - return new QTimer( parent, name ); - else if ( cname == "QCanvas" ) - return new QCanvas( parent, name ); + if ( cname == "TQObject" ) + return new TQObject( parent, name ); + else if ( cname == "TQTimer" ) + return new TQTimer( parent, name ); + else if ( cname == "TQCanvas" ) + return new TQCanvas( parent, name ); #ifndef QT_ONLY // QObjects defined by KDE @@ -464,20 +464,20 @@ namespace KJSEmbed { return new KToggleAction( parent, name ); #endif // QT_ONLY - QWidget *w = dynamic_cast<QWidget *>( parent ); + TQWidget *w = dynamic_cast<TQWidget *>( parent ); if ( !w ) return 0; - if ( cname == "QHBoxLayout" ) - return new QHBoxLayout( w, 0, -1, name ); - else if ( cname == "QVBoxLayout" ) - return new QVBoxLayout( w, 0, -1, name ); + if ( cname == "TQHBoxLayout" ) + return new TQHBoxLayout( w, 0, -1, name ); + else if ( cname == "TQVBoxLayout" ) + return new TQVBoxLayout( w, 0, -1, name ); return 0; } - KJS::Object JSFactory::createOpaque( KJS::ExecState *exec, const QString &cname, const KJS::List &args ) { + KJS::Object JSFactory::createOpaque( KJS::ExecState *exec, const TQString &cname, const KJS::List &args ) { - if ( cname == "QCanvasText" ) { + if ( cname == "TQCanvasText" ) { kdDebug( 80001 ) << "Creating canvas item, type is " << cname << endl; JSOpaqueProxy *prx = 0; @@ -490,11 +490,11 @@ namespace KJSEmbed { if ( arg0 ) { - QObject * obj0 = arg0->object(); + TQObject * obj0 = arg0->object(); - if ( obj0->inherits( "QCanvas" ) ) { - QCanvas * parent = ( QCanvas * ) ( obj0 ); - prx = new JSOpaqueProxy( new QCanvasText( parent ), "QCanvasText" ); + if ( obj0->inherits( "TQCanvas" ) ) { + TQCanvas * parent = ( TQCanvas * ) ( obj0 ); + prx = new JSOpaqueProxy( new TQCanvasText( parent ), "TQCanvasText" ); KJS::Object proxyObj( prx ); QCanvasItemImp::addBindings( exec, proxyObj ); @@ -511,17 +511,17 @@ namespace KJSEmbed { } else if ( args.size() == 2 ) { - QString arg0 = args[ 0 ].toString( exec ).qstring(); + TQString arg0 = args[ 0 ].toString( exec ).qstring(); JSObjectProxy *arg1 = JSProxy::toObjectProxy( args[ 1 ].imp() ); if ( arg1 ) { - QString arg0 = args[ 0 ].toString( exec ).qstring(); - QObject *obj1 = arg1->object(); + TQString arg0 = args[ 0 ].toString( exec ).qstring(); + TQObject *obj1 = arg1->object(); - if ( obj1->inherits( "QCanvas" ) ) { - QCanvas * parent = ( QCanvas * ) ( obj1 ); - prx = new JSOpaqueProxy( new QCanvasText( parent ), "QCanvasText" ); + if ( obj1->inherits( "TQCanvas" ) ) { + TQCanvas * parent = ( TQCanvas * ) ( obj1 ); + prx = new JSOpaqueProxy( new TQCanvasText( parent ), "TQCanvasText" ); KJS::Object proxyObj( prx ); QCanvasItemImp::addBindings( exec, proxyObj ); @@ -542,9 +542,9 @@ namespace KJSEmbed { return KJS::Object(); } - KJS::Object JSFactory::createValue( KJS::ExecState *exec, const QString &cname, const KJS::List & args ) { + KJS::Object JSFactory::createValue( KJS::ExecState *exec, const TQString &cname, const KJS::List & args ) { if ( cname == "Image" ) { - QImage img = QImage(); + TQImage img = TQImage(); JSValueProxy *prx = new JSValueProxy( ); prx->setValue( img ); KJS::Object proxyObj( prx ); @@ -552,7 +552,7 @@ namespace KJSEmbed { return proxyObj; } if ( cname == "Pixmap" ) { - QPixmap pix = QPixmap(); + TQPixmap pix = TQPixmap(); JSValueProxy *prx = new JSValueProxy( ); prx->setValue( pix ); KJS::Object proxyObj( prx ); @@ -560,7 +560,7 @@ namespace KJSEmbed { return proxyObj; } if ( cname == "Brush" ) { - QBrush brsh; + TQBrush brsh; JSValueProxy *prx = new JSValueProxy( ); prx->setValue( brsh ); KJS::Object proxyObj( prx ); @@ -568,7 +568,7 @@ namespace KJSEmbed { return proxyObj; } if ( cname == "Pen" ) { - QPen pen; + TQPen pen; JSValueProxy *prx = new JSValueProxy( ); prx->setValue( pen ); KJS::Object proxyObj( prx ); @@ -576,7 +576,7 @@ namespace KJSEmbed { return proxyObj; } if ( cname == "Rect" ) { - QRect rect; + TQRect rect; if ( args.size() == 4 ) { rect.setX( extractInt( exec, args, 0 ) ); rect.setY( extractInt( exec, args, 1 ) ); @@ -590,7 +590,7 @@ namespace KJSEmbed { return proxyObj; } if ( cname == "Point" ) { - QPoint point; + TQPoint point; if ( args.size() == 2 ) { point.setX( extractInt( exec, args, 0 ) ); point.setY( extractInt( exec, args, 1 ) ); @@ -602,7 +602,7 @@ namespace KJSEmbed { return proxyObj; } if ( cname == "Size" ) { - QSize size; + TQSize size; if ( args.size() == 2 ) { size.setWidth( extractInt( exec, args, 0 ) ); size.setHeight( extractInt( exec, args, 1 ) ); @@ -618,21 +618,21 @@ namespace KJSEmbed { return KJS::Object(); } - QWidget *JSFactory::createWidget( const QString &cname, QWidget *pw, const char *name ) { - if ( cname == "QSplitter" ) - return new QSplitter( pw, name ); - else if ( cname == "QMainWindow" ) - return new QMainWindow( pw, name ); - else if ( cname == "QProgressDialog" ) - return new QProgressDialog( pw, name ); - else if ( cname == "QScrollView" ) - return new QScrollView( pw, name ); - else if ( cname == "QCanvasView" ) - return new QCanvasView( pw, name ); - else if ( cname == "QSplashScreen" ) { - QPixmap pix( 16, 16 ); + TQWidget *JSFactory::createWidget( const TQString &cname, TQWidget *pw, const char *name ) { + if ( cname == "TQSplitter" ) + return new TQSplitter( pw, name ); + else if ( cname == "TQMainWindow" ) + return new TQMainWindow( pw, name ); + else if ( cname == "TQProgressDialog" ) + return new TQProgressDialog( pw, name ); + else if ( cname == "TQScrollView" ) + return new TQScrollView( pw, name ); + else if ( cname == "TQCanvasView" ) + return new TQCanvasView( pw, name ); + else if ( cname == "TQSplashScreen" ) { + TQPixmap pix( 16, 16 ); pix.fill(); - return new QSplashScreen( pix ); + return new TQSplashScreen( pix ); } #ifndef QT_ONLY else if ( cname == "KMainWindow" ) @@ -646,19 +646,19 @@ namespace KJSEmbed { return 0; } - QObject *JSFactory::create( const QString &cname, QObject *parent, const char *name ) { + TQObject *JSFactory::create( const TQString &cname, TQObject *parent, const char *name ) { kdDebug( 80001 ) << "KJSEmbedPart::create() name " << name << " class " << cname << endl; // Factory widgets - QWidgetFactory wf; - QWidget *pw = ( parent && parent->isWidgetType() ) ? static_cast<QWidget *>( parent ) : 0; - QWidget *w = wf.createWidget( cname, pw, name ); + TQWidgetFactory wf; + TQWidget *pw = ( parent && parent->isWidgetType() ) ? static_cast<TQWidget *>( parent ) : 0; + TQWidget *w = wf.createWidget( cname, pw, name ); if ( w ) { kdDebug( 80001 ) << "Created from factory" << endl; return w; } // Custom widgets - QObject *obj; + TQObject *obj; obj = createWidget( cname, pw, name ); if ( obj ) { if ( !isQObject( obj->className() ) ) @@ -689,22 +689,22 @@ namespace KJSEmbed { return 0; } - KParts::ReadOnlyPart *JSFactory::createROPart( const QString &svc, QObject *parent, const char *name ) { + KParts::ReadOnlyPart *JSFactory::createROPart( const TQString &svc, TQObject *parent, const char *name ) { kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " parent " << ( long ) parent << endl; return createROPart( svc, "'KParts/ReadOnlyPart' in ServiceTypes", parent, name ); } - KParts::ReadOnlyPart *JSFactory::createROPart( const QString &svc, const QString &con, - QObject *parent, const char *name ) { + KParts::ReadOnlyPart *JSFactory::createROPart( const TQString &svc, const TQString &con, + TQObject *parent, const char *name ) { kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " constraint " << con << " parent " << ( long ) parent << endl; - return createROPart( svc, con, parent, name, QStringList() ); + return createROPart( svc, con, parent, name, TQStringList() ); } - KParts::ReadOnlyPart *JSFactory::createROPart( const QString &svc, const QString &con, - QObject *parent, const char *name, - const QStringList &args ) { + KParts::ReadOnlyPart *JSFactory::createROPart( const TQString &svc, const TQString &con, + TQObject *parent, const char *name, + const TQStringList &args ) { #ifndef QT_ONLY kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " constraint " << con << " parent " << ( long ) parent @@ -721,7 +721,7 @@ namespace KJSEmbed { return 0; } - QObject *obj = fact->create( parent, name, "KParts::ReadOnlyPart", args ); + TQObject *obj = fact->create( parent, name, "KParts::ReadOnlyPart", args ); addType( obj->className() ); return static_cast<KParts::ReadOnlyPart *>( obj ); #else // QT_ONLY @@ -736,22 +736,22 @@ namespace KJSEmbed { } - KParts::ReadWritePart *JSFactory::createRWPart( const QString &svc, QObject *parent, const char *name ) { + KParts::ReadWritePart *JSFactory::createRWPart( const TQString &svc, TQObject *parent, const char *name ) { kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " parent " << ( long ) parent << endl; return createRWPart( svc, "'KParts/ReadWritePart' in ServiceTypes", parent, name ); } - KParts::ReadWritePart *JSFactory::createRWPart( const QString &svc, const QString &con, - QObject *parent, const char *name ) { + KParts::ReadWritePart *JSFactory::createRWPart( const TQString &svc, const TQString &con, + TQObject *parent, const char *name ) { kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " constraint " << con << " parent " << ( long ) parent << endl; - return createRWPart( svc, con, parent, name, QStringList() ); + return createRWPart( svc, con, parent, name, TQStringList() ); } - KParts::ReadWritePart *JSFactory::createRWPart( const QString &svc, const QString &con, - QObject *parent, const char *name, - const QStringList &args ) { + KParts::ReadWritePart *JSFactory::createRWPart( const TQString &svc, const TQString &con, + TQObject *parent, const char *name, + const TQStringList &args ) { #ifndef QT_ONLY kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " constraint " << con << " parent " << ( long ) parent @@ -768,7 +768,7 @@ namespace KJSEmbed { return 0; } - QObject *obj = fact->create( parent, name, "KParts::ReadWritePart", args ); + TQObject *obj = fact->create( parent, name, "KParts::ReadWritePart", args ); addType( obj->className() ); return static_cast<KParts::ReadWritePart *>( obj ); #else // QT_ONLY @@ -783,15 +783,15 @@ namespace KJSEmbed { } - QWidget *JSFactory::loadUI( const QString &uiFile, QObject *connector, QWidget *parent, const char *name ) { - return QWidgetFactory::create( uiFile, connector, parent, name ); + TQWidget *JSFactory::loadUI( const TQString &uiFile, TQObject *connector, TQWidget *parent, const char *name ) { + return TQWidgetFactory::create( uiFile, connector, parent, name ); } - QStringList JSFactory::listBindingPlugins( KJS::ExecState *exec, KJS::Object &self ) { + TQStringList JSFactory::listBindingPlugins( KJS::ExecState *exec, KJS::Object &self ) { Q_UNUSED( exec ) Q_UNUSED( self ) - QStringList pluginList; - QStringList allTypes = objtypes.keys(); + TQStringList pluginList; + TQStringList allTypes = objtypes.keys(); for ( uint idx = 0; idx < allTypes.count(); ++idx ) { if ( objtypes[ allTypes[ idx ] ] & TypePlugin ) pluginList.append( allTypes[ idx ] ); @@ -799,34 +799,34 @@ namespace KJSEmbed { return pluginList; } - bool JSFactory::isQObject( const QString &clazz ) const { + bool JSFactory::isQObject( const TQString &clazz ) const { if ( !isSupported( clazz ) ) return false; return ( objtypes[ clazz ] & TypeQObject ); } - bool JSFactory::isValue( const QString &clazz ) const { + bool JSFactory::isValue( const TQString &clazz ) const { if ( !isSupported( clazz ) ) return false; return objtypes[ clazz ] == TypeValue; } - bool JSFactory::isOpaque( const QString &clazz ) const { + bool JSFactory::isOpaque( const TQString &clazz ) const { if ( !isSupported( clazz ) ) return false; return objtypes[ clazz ] == TypeOpaque; } - void JSFactory::addQObjectPlugin( const QString &classname, KJSEmbed::Bindings::JSBindingPlugin* plugin ) { + void JSFactory::addQObjectPlugin( const TQString &classname, KJSEmbed::Bindings::JSBindingPlugin* plugin ) { if ( plugin ) { addType( classname, TypeQObjectPlugin ); d->plugins.insert( classname, plugin ); } } - void JSFactory::addType( const QString &clazz, uint prxtype ) { + void JSFactory::addType( const TQString &clazz, uint prxtype ) { if ( prxtype == TypeInvalid ) { objtypes.remove( clazz ); return ; @@ -835,12 +835,12 @@ namespace KJSEmbed { objtypes[ clazz ] = prxtype; } - bool JSFactory::isSupported( const QString &clazz ) const { + bool JSFactory::isSupported( const TQString &clazz ) const { kdDebug() << "Checking " << clazz << endl; return objtypes.contains( clazz ); } - uint JSFactory::proxyType( const QString &clazz ) const { + uint JSFactory::proxyType( const TQString &clazz ) const { if ( !isSupported( clazz ) ) return TypeInvalid; return objtypes[ clazz ]; @@ -856,14 +856,14 @@ namespace KJSEmbed { addBindingPluginTypes( exec, parent ); } - QStringList JSFactory::types() const { + TQStringList JSFactory::types() const { return objtypes.keys(); } void JSFactory::addWidgetFactoryTypes( KJS::ExecState *exec, KJS::Object &parent ) { - QStringList sl = QWidgetFactory::widgets(); + TQStringList sl = TQWidgetFactory::widgets(); - for ( QStringList::Iterator it = sl.begin(); it != sl.end(); ++it ) { + for ( TQStringList::Iterator it = sl.begin(); it != sl.end(); ++it ) { JSFactoryImp *cons = new JSFactoryImp( exec, this, JSFactoryImp::NewInstance, *it ); parent.put( exec, KJS::Identifier( KJS::UString( cons->parameter() ) ), KJS::Object( cons ) ); addType( *it ); @@ -873,9 +873,9 @@ namespace KJSEmbed { void JSFactory::addCustomTypes( KJS::ExecState *exec, KJS::Object &parent ) { const char * classes[] = { - "QSplitter", "QScrollView", "QCanvasView", "QCanvas", - "QObject", "QTimer", "QSplashScreen", "QProgressDialog", - "QLayout", "QBoxLayout", "QHBoxLayout", "QVBoxLayout", + "TQSplitter", "TQScrollView", "TQCanvasView", "TQCanvas", + "TQObject", "TQTimer", "TQSplashScreen", "TQProgressDialog", + "TQLayout", "TQBoxLayout", "TQHBoxLayout", "TQVBoxLayout", #ifndef QT_ONLY "KMainWindow", "KXMLGUIClient", "KSystemTray", "KAction", "KToggleAction", @@ -920,10 +920,10 @@ namespace KJSEmbed { void JSFactory::addOpaqueTypes( KJS::ExecState *exec, KJS::Object &parent ) { const char * classes[] = { - "QTextStream", + "TQTextStream", "TextStream", - "QCanvasItem", - "QCanvasText", + "TQCanvasItem", + "TQCanvasText", 0 }; @@ -934,7 +934,7 @@ namespace KJSEmbed { } // Create the custom added types. - QDictIterator<KJSEmbed::Bindings::JSBindingBase> idx( d->opaqueTypes ); + TQDictIterator<KJSEmbed::Bindings::JSBindingBase> idx( d->opaqueTypes ); for( ; idx.current(); ++idx){ JSFactoryImp *cons = new JSFactoryImp( exec, this, JSFactoryImp::NewInstance, idx.currentKey() ); parent.put( exec, KJS::Identifier( KJS::UString( cons->parameter() ) ), KJS::Object( cons ) ); @@ -964,100 +964,100 @@ namespace KJSEmbed { void JSFactory::addObjectTypes( KJS::ExecState *exec, KJS::Object & parent ) { const char * classes[] = { - "QAccel", - "QAccessibleObject", - "QAction", - "QActionGroup", - "QApplication", + "TQAccel", + "TQAccessibleObject", + "TQAction", + "TQActionGroup", + "TQApplication", "QAquaStyle", "QAssistantClient", "QAxObject", "QAxWidget", - "QButton", - "QCDEStyle", + "TQButton", + "TQCDEStyle", "QClipboard", "QColorDialog", - "QColorDrag", - "QComboBox", - "QCommonStyle", + "TQColorDrag", + "TQComboBox", + "TQCommonStyle", "QCopChannel", - "QDataPump", - "QDateTimeEditBase", - "QDesktopWidget", - "QDns", - "QDockArea", - "QDockWindow", - "QDoubleValidator", - "QDragObject", - "QEditorFactory", - "QErrorMessage", - "QEventLoop", - "QFileDialog", - "QFileIconProvider", + "TQDataPump", + "TQDateTimeEditBase", + "TQDesktopWidget", + "TQDns", + "TQDockArea", + "TQDockWindow", + "TQDoubleValidator", + "TQDragObject", + "TQEditorFactory", + "TQErrorMessage", + "TQEventLoop", + "TQFileDialog", + "TQFileIconProvider", "QFontDialog", - "QFtp", - "QGLWidget", - "QGridLayout", - "QGridView", - "QHButtonGroup", - "QHGroupBox", - "QHeader", - "QHttp", - "QIconDrag", - "QImageDrag", + "TQFtp", + "TQGLWidget", + "TQGridLayout", + "TQGridView", + "TQHButtonGroup", + "TQHGroupBox", + "TQHeader", + "TQHttp", + "TQIconDrag", + "TQImageDrag", "QInputDialog", - "QIntValidator", - "QLocalFs", + "TQIntValidator", + "TQLocalFs", "QMacStyle", - "QMenuBar", - "QMessageBox", + "TQMenuBar", + "TQMessageBox", "QMotif", "QMotifDialog", - "QMotifPlusStyle", - "QMotifStyle", + "TQMotifPlusStyle", + "TQMotifStyle", "QMotifWidget", - "QNPInstance", - "QNPWidget", - "QNetworkOperation", - "QNetworkProtocol", - "QObjectCleanupHandler", - "QPlatinumStyle", - "QProcess", - "QPopupMenu", - "QProgressDialog", - "QRegExpValidator", - "QSGIStyle", - "QServerSocket", + "TQNPInstance", + "TQNPWidget", + "TQNetworkOperation", + "TQNetworkProtocol", + "TQObjectCleanupHandler", + "TQPlatinumStyle", + "TQProcess", + "TQPopupMenu", + "TQProgressDialog", + "TQRegExpValidator", + "TQSGIStyle", + "TQServerSocket", "QSessionManager", - "QSignal", - "QSignalMapper", - "QSizeGrip", - "QSocket", - "QSocketNotifier", - "QSound", - "QSqlDatabase", - "QSqlDriver", - "QSqlEditorFactory", - "QSqlForm", - "QStatusBar", - "QStoredDrag", - "QStyle", - "QStyleSheet", - "QTabBar", - "QTabDialog", - "QTextDrag", - "QToolBar", - "QToolTipGroup", + "TQSignal", + "TQSignalMapper", + "TQSizeGrip", + "TQSocket", + "TQSocketNotifier", + "TQSound", + "TQSqlDatabase", + "TQSqlDriver", + "TQSqlEditorFactory", + "TQSqlForm", + "TQStatusBar", + "TQStoredDrag", + "TQStyle", + "TQStyleSheet", + "TQTabBar", + "TQTabDialog", + "TQTextDrag", + "TQToolBar", + "TQToolTipGroup", "QTranslator", - "QUriDrag", - "QUrlOperator", - "QVButtonGroup", - "QVGroupBox", - "QValidator", + "TQUriDrag", + "TQUrlOperator", + "TQVButtonGroup", + "TQVGroupBox", + "TQValidator", "QWSKeyboardHandler", - "QWindowsStyle", + "TQWindowsStyle", "QWindowsXPStyle", - "QWorkspace", + "TQWorkspace", "QXtWidget", 0 @@ -1068,7 +1068,7 @@ namespace KJSEmbed { addType( classes[ i ] ); } // Create the custom added types. - QDictIterator<KJSEmbed::Bindings::JSBindingBase> idx( d->objectTypes ); + TQDictIterator<KJSEmbed::Bindings::JSBindingBase> idx( d->objectTypes ); for( ; idx.current(); ++idx){ JSFactoryImp *cons = new JSFactoryImp( exec, this, JSFactoryImp::NewInstance, idx.currentKey() ); parent.put( exec, KJS::Identifier( KJS::UString( cons->parameter() ) ), KJS::Object( cons ) ); @@ -1076,12 +1076,12 @@ namespace KJSEmbed { } } - void JSFactory::registerOpaqueType( const QString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory ) + void JSFactory::registerOpaqueType( const TQString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory ) { d->opaqueTypes.insert(className,bindingFactory); } - void JSFactory::unregisterOpaqueType( const QString & className ) + void JSFactory::unregisterOpaqueType( const TQString & className ) { d->opaqueTypes.remove(className); } @@ -1100,12 +1100,12 @@ namespace KJSEmbed { } } } - void JSFactory::registerObjectType( const QString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory ) + void JSFactory::registerObjectType( const TQString & className, KJSEmbed::Bindings::JSBindingBase * bindingFactory ) { d->objectTypes.insert(className,bindingFactory); } - void JSFactory::unregisterObjectType( const QString & className ) + void JSFactory::unregisterObjectType( const TQString & className ) { d->objectTypes.remove(className); } diff --git a/kjsembed/jsfactory.h b/kjsembed/jsfactory.h index d2c77cbd..9bef7f82 100644 --- a/kjsembed/jsfactory.h +++ b/kjsembed/jsfactory.h @@ -22,9 +22,9 @@ #ifndef KJSEMBEDFACTORY_H #define KJSEMBEDFACTORY_H #include "global.h" -#include <qmap.h> -#include <qdict.h> -#include <qstringlist.h> +#include <tqmap.h> +#include <tqdict.h> +#include <tqstringlist.h> #include <kjs/interpreter.h> #include <kjs/object.h> @@ -96,18 +96,18 @@ public: // /** Creates an object of the specified class, then returns a proxy. */ - KJS::Object create( KJS::ExecState *exec, const QString &classname, const KJS::List &args ); + KJS::Object create( KJS::ExecState *exec, const TQString &classname, const KJS::List &args ); /** Creates a proxy object for the specified target with the specified context. */ - KJS::Object createProxy( KJS::ExecState *exec, QObject *target, + KJS::Object createProxy( KJS::ExecState *exec, TQObject *target, const JSObjectProxy *context=0 ) const; /** Creates a proxy object for the specified target with the specified context. */ - KJS::Object createProxy( KJS::ExecState *exec, QTextStream *target, + KJS::Object createProxy( KJS::ExecState *exec, TQTextStream *target, const JSObjectProxy *context=0 ) const; /** Creates a proxy object for the specified target with the specified context. */ - KJS::Object createProxy( KJS::ExecState *exec, QEvent *target, + KJS::Object createProxy( KJS::ExecState *exec, TQEvent *target, const JSObjectProxy *context ) const; @@ -115,12 +115,12 @@ public: * Registers an opaque proxy factory with the with the factory. * To add an opaque type to the system you need to provide a factory based off of @ref KJSEmbed::Bindings::JSBindingBase */ - void registerOpaqueType( const QString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory); + void registerOpaqueType( const TQString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory); /** * Remove an opaque type from the system. */ - void unregisterOpaqueType( const QString &className ); + void unregisterOpaqueType( const TQString &className ); /** * When passed an object for a type handled by an Opaque proxy this method @@ -130,15 +130,15 @@ public: void extendOpaqueProxy( KJS::ExecState *exec, KJS::Object &proxy) const; /** - * Registers a QObject proxy factory with the with the factory. + * Registers a TQObject proxy factory with the with the factory. * To add an opaque type to the system you need to provide a factory based off of @ref KJSEmbed::Bindings::JSBindingBase */ - void registerObjectType( const QString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory); + void registerObjectType( const TQString &className, KJSEmbed::Bindings::JSBindingBase *bindingFactory); /** * Remove an opaque type from the system. */ - void unregisterObjectType( const QString &className ); + void unregisterObjectType( const TQString &className ); /** * When passed an object for a type handled by an Opaque proxy this method @@ -158,22 +158,22 @@ public: * created is the first offer returned by the trader, and will have the * specified parent and name. */ - KParts::ReadOnlyPart *createROPart( const QString &svc, QObject *parent=0, const char *name=0 ); + KParts::ReadOnlyPart *createROPart( const TQString &svc, TQObject *parent=0, const char *name=0 ); /** * Creates a ReadOnlyPart that views the specified service type and matches * the specified constraint. */ - KParts::ReadOnlyPart *createROPart( const QString &svc, const QString &constraint, - QObject *parent=0, const char *name=0 ); + KParts::ReadOnlyPart *createROPart( const TQString &svc, const TQString &constraint, + TQObject *parent=0, const char *name=0 ); /** * Creates a ReadOnlyPart that views the specified service type and matches * the specified constraint. */ - KParts::ReadOnlyPart *createROPart( const QString &svc, const QString &constraint, - QObject *parent, const char *name, - const QStringList &args ); + KParts::ReadOnlyPart *createROPart( const TQString &svc, const TQString &constraint, + TQObject *parent, const char *name, + const TQStringList &args ); /** * Creates a ReadWritePart that edits the specified service type. The @@ -181,34 +181,34 @@ public: * created is the first offer returned by the trader, and will have the * specified parent and name. */ - KParts::ReadWritePart *createRWPart( const QString &svc, QObject *parent=0, const char *name=0 ); + KParts::ReadWritePart *createRWPart( const TQString &svc, TQObject *parent=0, const char *name=0 ); /** * Creates a ReadWritePart that edits the specified service type and matches * the specified constraint. */ - KParts::ReadWritePart *createRWPart( const QString &svc, const QString &constraint, - QObject *parent=0, const char *name=0 ); + KParts::ReadWritePart *createRWPart( const TQString &svc, const TQString &constraint, + TQObject *parent=0, const char *name=0 ); /** * Creates a ReadWritePart that edits the specified service type and matches * the specified constraint. */ - KParts::ReadWritePart *createRWPart( const QString &svc, const QString &constraint, - QObject *parent, const char *name, - const QStringList &args ); + KParts::ReadWritePart *createRWPart( const TQString &svc, const TQString &constraint, + TQObject *parent, const char *name, + const TQStringList &args ); /** * Loads the widget defined in the specified .ui file. If the widget * cannot be created then 0 is returned. */ - QWidget *loadUI( const QString &uiFile, QObject *connector=0, QWidget *parent=0, const char *name=0 ); + 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. *If the binding was added the object is returned, otherwise a KJS::Null is. */ - QStringList listBindingPlugins( KJS::ExecState *exec, KJS::Object &self); + TQStringList listBindingPlugins( KJS::ExecState *exec, KJS::Object &self); // // Methods that tell the factory how to handle different classes. // @@ -216,48 +216,48 @@ public: * Adds a binding plugin type to the list of available types the factory can create. */ void addBindingPluginTypes(KJS::ExecState *exec, KJS::Object &parent); - bool isBindingPlugin(const QString &classname) const; + bool isBindingPlugin(const TQString &classname) const; /** * Creates the actual object from the binding plugin. */ - KJS::Object createBindingPlugin(KJS::ExecState *exec, const QString &classname, const KJS::List &args ); + KJS::Object createBindingPlugin(KJS::ExecState *exec, const TQString &classname, const KJS::List &args ); /** * Returns true iff the factory knows the type of proxy to use for the * class with the name specified. */ - bool isSupported( const QString &clazz ) const; + bool isSupported( const TQString &clazz ) const; /** * Returns true iff the class with the specified name is handled with the - * QObject proxy type. + * TQObject proxy type. */ - bool isQObject( const QString &clazz ) const; + bool isQObject( const TQString &clazz ) const; /** * Returns true iff the class with the specified name is handled with the * value proxy type. */ - bool isValue( const QString &clazz ) const; + bool isValue( const TQString &clazz ) const; /** * Returns true iff the class with the specified name is handled with the * opaque proxy type. */ - bool isOpaque( const QString &clazz ) const; + bool isOpaque( const TQString &clazz ) const; /** * Returns the ProxyType of the class with the specified name. If the * named class is not known to the interpreter then TypeInvalid is * returned. */ - uint proxyType( const QString &clazz ) const; + uint proxyType( const TQString &clazz ) const; /** *Allows adding of an already loaded binding plugin for a certain class type * */ - void addQObjectPlugin(const QString &classname, KJSEmbed::Bindings::JSBindingPlugin* plugin); + void addQObjectPlugin(const TQString &classname, KJSEmbed::Bindings::JSBindingPlugin* plugin); void addBindingsPlugin(KJS::ExecState *exec, KJS::Object &target) const; @@ -266,58 +266,58 @@ public: * class. Note that you can remove support for a type by using this method * with TypeInvalid. */ - void addType( const QString &clazz, uint proxytype=JSFactory::TypeQObject ); + void addType( const TQString &clazz, uint proxytype=JSFactory::TypeQObject ); /** Adds the types defined by the factory to the specified parent. */ void addTypes( KJS::ExecState *exec, KJS::Object &parent ); - QStringList types() const; + TQStringList types() const; protected: /** Adds custom bindings to the specified proxy object. */ KJS::Object extendProxy( KJS::ExecState *exec, KJS::Object &target ) const; /** Creates an instance of the named class and returns it in a JSValueProxy. */ - KJS::Object createValue( KJS::ExecState *exec, const QString &cname, const KJS::List &args ); + KJS::Object createValue( KJS::ExecState *exec, const TQString &cname, const KJS::List &args ); /** - * Creates an instance of a QObject subclass. If the instance cannot be + * Creates an instance of a TQObject subclass. If the instance cannot be * created then 0 is returned. */ - QObject *create( const QString &classname, QObject *parent=0, const char *name=0 ); + TQObject *create( const TQString &classname, TQObject *parent=0, const char *name=0 ); /** Creates an instance of the named class and returns it in a JSOpaqueProxy. */ - KJS::Object createOpaque( KJS::ExecState *exec, const QString &cname, const KJS::List &args ); + KJS::Object createOpaque( KJS::ExecState *exec, const TQString &cname, const KJS::List &args ); - /** Creates an instance of the named binding QObject. */ - QObject *createBinding( const QString &cname, QObject *parent, const char *name ); + /** Creates an instance of the named binding TQObject. */ + TQObject *createBinding( const TQString &cname, TQObject *parent, const char *name ); /** - * Creates an instance of the named QObject. This method is only used for + * Creates an instance of the named TQObject. This method is only used for * non-widget objects. */ - QObject *createObject( const QString &cname, QObject *parent, const char *name ); + TQObject *createObject( const TQString &cname, TQObject *parent, const char *name ); /** - * Creates an instance of the named QWidget. Note that this method is only - * used to create widgets that are not supported by QWidgetFactory. + * Creates an instance of the named TQWidget. Note that this method is only + * used to create widgets that are not supported by TQWidgetFactory. */ - QWidget *createWidget( const QString &cname, QWidget *parent, const char *name ); + TQWidget *createWidget( const TQString &cname, TQWidget *parent, const char *name ); private: - /** Adds the types defined by QWidgetFactory to the specified parent. */ + /** Adds the types defined by TQWidgetFactory to the specified parent. */ void addWidgetFactoryTypes( KJS::ExecState *exec, KJS::Object &parent ); - /** Adds support for custom QObject types to the specified parent. */ + /** Adds support for custom TQObject types to the specified parent. */ void addCustomTypes( KJS::ExecState *exec, KJS::Object &parent ); - /** Adds support for QObject binding types to the specified parent. */ + /** Adds support for TQObject binding types to the specified parent. */ void addBindingTypes( KJS::ExecState *exec, KJS::Object &parent ); /** - * Adds support for any QObject types that are known about, but have no + * Adds support for any TQObject types that are known about, but have no * custom support (and no constructor). */ void addObjectTypes( KJS::ExecState *exec, KJS::Object &parent ); @@ -329,7 +329,7 @@ private: private: KJSEmbedPart *jspart; JSEventMapper *evmapper; - QMap<QString,uint> objtypes; + TQMap<TQString,uint> objtypes; class JSFactoryPrivate *d; }; diff --git a/kjsembed/jsfactory_imp.cpp b/kjsembed/jsfactory_imp.cpp index c1f1f5b7..4c9fea00 100644 --- a/kjsembed/jsfactory_imp.cpp +++ b/kjsembed/jsfactory_imp.cpp @@ -17,12 +17,12 @@ * Boston, MA 02110-1301, USA. */ -#include <qwidget.h> -#include <qwidgetfactory.h> -#include <qobjectlist.h> -#include <qtoolbox.h> -#include <qtabwidget.h> -#include <qwizard.h> +#include <tqwidget.h> +#include <tqwidgetfactory.h> +#include <tqobjectlist.h> +#include <tqtoolbox.h> +#include <tqtabwidget.h> +#include <tqwizard.h> #include "global.h" #include "jsproxy.h" @@ -35,7 +35,7 @@ namespace KJSEmbed { namespace Bindings { -JSFactoryImp::JSFactoryImp( KJS::ExecState *exec, JSFactory *jsfact, int mid, const QString &p ) +JSFactoryImp::JSFactoryImp( KJS::ExecState *exec, JSFactory *jsfact, int mid, const TQString &p ) : JSProxyImp(exec), fact(jsfact), id(mid), param(p), defaultVal() { setName( KJS::Identifier(KJS::UString(param)) ); @@ -50,7 +50,7 @@ KJS::Object JSFactoryImp::construct( KJS::ExecState *exec, const KJS::List &args if ( id != NewInstance ) { kdDebug(80001) << "JSFactoryImp has no such constructor, id " << id << endl; - QString msg = i18n( "JSFactoryImp has no constructor with id '%1'." ).arg( id ); + TQString msg = i18n( "JSFactoryImp has no constructor with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -71,8 +71,8 @@ KJS::Value JSFactoryImp::defaultValue( KJS::ExecState *exec, KJS::Type hint ) co KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - QString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : QString::null; - QString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null; + TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null; kdDebug( 80001 ) << "JSFactoryImp::call() " << id << endl; KJS::Object err; @@ -81,20 +81,20 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ case MethodLoadUI: { JSObjectProxy *cproxy = JSProxy::toObjectProxy( args[1].imp() ); - QObject *cqo = cproxy ? cproxy->object() : 0; + TQObject *cqo = cproxy ? cproxy->object() : 0; JSObjectProxy *proxy = JSProxy::toObjectProxy( args[2].imp() ); - QWidget *qw = proxy ? proxy->widget() : 0; - QWidget *obj = fact->loadUI( arg0, cqo, qw, arg1.latin1() ); + TQWidget *qw = proxy ? proxy->widget() : 0; + TQWidget *obj = fact->loadUI( arg0, cqo, qw, arg1.latin1() ); if ( obj ) { KJS::Object parentObject = fact->createProxy( exec, obj ); // Add properties for child widgets. - const QObjectList *lst = obj->children(); + const TQObjectList *lst = obj->children(); if ( lst ) { - QObjectListIt it( *lst ); - QObject *child; + TQObjectListIt it( *lst ); + TQObject *child; while ( (child = it.current()) != 0 ) { publishChildren( child, parentObject); @@ -104,7 +104,7 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ return parentObject; } - QString msg = i18n( "Unable to create ui from file '%1'." ).arg(arg0); + TQString msg = i18n( "Unable to create ui from file '%1'." ).arg(arg0); err = throwError(exec, msg,KJS::ReferenceError); break; } @@ -112,8 +112,8 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ { kdDebug(80001) << "MethodCreateROPart called, args.size is " << args.size() << endl; - QObject *qo = 0; - QObject *ropart = 0; + TQObject *qo = 0; + TQObject *ropart = 0; if ( args.size() == 3 ) { JSObjectProxy *proxy = JSProxy::toObjectProxy( args[1].imp() ); @@ -128,7 +128,7 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ else if ( args.size() == 5 ) { JSObjectProxy *proxy = JSProxy::toObjectProxy( args[2].imp() ); qo = proxy ? proxy->object() : 0; - QStringList slist = extractQStringList( exec, args, 4 ); + TQStringList slist = extractQStringList( exec, args, 4 ); ropart = fact->createROPart( arg0, arg1, qo, args[3].toString(exec).ascii(), slist ); } @@ -141,7 +141,7 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ if ( ropart ) return fact->createProxy( exec, ropart ); - QString msg = i18n( "Unable to create read-only part for service '%1'." ).arg(arg0); + TQString msg = i18n( "Unable to create read-only part for service '%1'." ).arg(arg0); err = throwError(exec, msg,KJS::ReferenceError); break; } @@ -155,8 +155,8 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ { KJS::List l; - QStringList widgets = QWidgetFactory::widgets(); - for ( QStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) { + TQStringList widgets = TQWidgetFactory::widgets(); + for ( TQStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) { l.append( KJS::String( *it ) ); } @@ -186,8 +186,8 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ case MethodTypes: { KJS::List l; - QStringList types = fact->types(); - for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it ) { + TQStringList types = fact->types(); + for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) { l.append( KJS::String( *it ) ); } @@ -203,8 +203,8 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ { kdDebug(80001) << "MethodCreateRWPart called, args.size is " << args.size() << endl; - QObject *qo = 0; - QObject *rwpart = 0; + TQObject *qo = 0; + TQObject *rwpart = 0; if ( args.size() == 3 ) { JSObjectProxy *proxy = JSProxy::toObjectProxy( args[1].imp() ); @@ -226,7 +226,7 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ if ( rwpart ) return fact->createProxy( exec, rwpart ); - QString msg = i18n( "Unable to create read-write part for service '%1'." ).arg(arg0); + TQString msg = i18n( "Unable to create read-write part for service '%1'." ).arg(arg0); err = throwError(exec, msg,KJS::ReferenceError); break; } @@ -245,7 +245,7 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ default: { kdWarning() << "JSBuiltInImp has no method " << id << endl; - QString msg = i18n( "JSFactoryImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "JSFactoryImp has no method with id '%1'." ).arg( id ); err = throwError(exec, msg,KJS::ReferenceError); } } @@ -253,9 +253,9 @@ KJS::Value JSFactoryImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ } -void JSFactoryImp::publishChildren(QObject *obj, KJS::Object &parent) +void JSFactoryImp::publishChildren(TQObject *obj, KJS::Object &parent) { - QString name = obj->name(); + TQString name = obj->name(); name.remove(":"); name.remove(" "); name.remove("<"); @@ -264,9 +264,9 @@ void JSFactoryImp::publishChildren(QObject *obj, KJS::Object &parent) JSProxy::toProxy( newParent.imp() ) ->setOwner( JSProxy::JavaScript ); // Hack to publish QToolBoxes children - QToolBox *box = dynamic_cast<QToolBox*>(obj); - QTabWidget *tab = dynamic_cast<QTabWidget*>(obj); - QWizard *wiz = dynamic_cast<QWizard*>(obj); + TQToolBox *box = dynamic_cast<TQToolBox*>(obj); + TQTabWidget *tab = dynamic_cast<TQTabWidget*>(obj); + TQWizard *wiz = dynamic_cast<TQWizard*>(obj); if( box ) { int count = box->count(); @@ -281,10 +281,10 @@ void JSFactoryImp::publishChildren(QObject *obj, KJS::Object &parent) for( int idx = 0; idx < count; ++idx) publishChildren(wiz->page(idx),newParent); } else { - const QObjectList *lst = obj->children(); + const TQObjectList *lst = obj->children(); if ( lst ) { - QObjectListIt it( *lst ); - QObject *child; + TQObjectListIt it( *lst ); + TQObject *child; while ( (child = it.current()) != 0 ) { publishChildren( child, newParent); ++it; diff --git a/kjsembed/jsfactory_imp.h b/kjsembed/jsfactory_imp.h index a576aa03..53ea1143 100644 --- a/kjsembed/jsfactory_imp.h +++ b/kjsembed/jsfactory_imp.h @@ -60,10 +60,10 @@ public: MethodCreateObject }; - JSFactoryImp( KJS::ExecState *exec, JSFactory *fact, int id, const QString ¶m=QString::null ); + JSFactoryImp( KJS::ExecState *exec, JSFactory *fact, int id, const TQString ¶m=TQString::null ); ~JSFactoryImp(); - QString parameter() const { return param; } + TQString parameter() const { return param; } /** Returns true iff this object implements the construct function. */ virtual bool implementsConstruct() const { return true; } @@ -83,10 +83,10 @@ public: JSFactory *factory() const { return fact; } private: - void publishChildren(QObject *obj, KJS::Object &parent); + void publishChildren(TQObject *obj, KJS::Object &parent); JSFactory *fact; uint id; - QString param; + TQString param; KJS::Value defaultVal; class JSFactoryImpPrivate *d; }; diff --git a/kjsembed/jsobjecteventproxy.cpp b/kjsembed/jsobjecteventproxy.cpp index ad29608f..b817b42d 100644 --- a/kjsembed/jsobjecteventproxy.cpp +++ b/kjsembed/jsobjecteventproxy.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qvariant.h> +#include <tqvariant.h> #include "global.h" #include "jsfactory.h" @@ -34,10 +34,10 @@ namespace KJSEmbed { // We'll need to increase this if we need to support any custom events -static const QEvent::Type QEVENT_TYPE_MAX = QEvent::TabletRelease; +static const TQEvent::Type QEVENT_TYPE_MAX = TQEvent::TabletRelease; JSObjectEventProxy::JSObjectEventProxy( JSObjectProxy *parent, const char *name ) - : QObject( parent->object(), name ? name : "jsobjecteventproxy" ), + : TQObject( parent->object(), name ? name : "jsobjecteventproxy" ), proxy( parent ), eventMask( QEVENT_TYPE_MAX ), refcount(0) { eventMask.fill( false ); @@ -47,12 +47,12 @@ JSObjectEventProxy::~JSObjectEventProxy() { } -bool JSObjectEventProxy::isFiltered( QEvent::Type t ) const +bool JSObjectEventProxy::isFiltered( TQEvent::Type t ) const { return eventMask.testBit( t ); } -void JSObjectEventProxy::addFilter( QEvent::Type t ) +void JSObjectEventProxy::addFilter( TQEvent::Type t ) { if ( !refcount ) proxy->object()->installEventFilter( this ); @@ -65,7 +65,7 @@ void JSObjectEventProxy::addFilter( QEvent::Type t ) kdDebug(80001) << "JSObjectEventProxy::addFilter done" << endl; } -void JSObjectEventProxy::removeFilter( QEvent::Type t ) +void JSObjectEventProxy::removeFilter( TQEvent::Type t ) { eventMask.clearBit( t ); refcount--; @@ -77,7 +77,7 @@ void JSObjectEventProxy::removeFilter( QEvent::Type t ) kdDebug(80001) << "JSObjectEventProxy::removeFilter done" << endl; } -bool JSObjectEventProxy::eventFilter( QObject * /*watched*/, QEvent *e ) +bool JSObjectEventProxy::eventFilter( TQObject * /*watched*/, TQEvent *e ) { if ( isFiltered(e->type()) ) callHandler( e ); @@ -85,7 +85,7 @@ bool JSObjectEventProxy::eventFilter( QObject * /*watched*/, QEvent *e ) return false; } -KJS::Value JSObjectEventProxy::callHandler( QEvent *e ) +KJS::Value JSObjectEventProxy::callHandler( TQEvent *e ) { // Be careful enabling this as if there are a lot of events then the event loop times // out and the app crashes with 'Alarm Clock'. @@ -98,7 +98,7 @@ KJS::Value JSObjectEventProxy::callHandler( QEvent *e ) KJS::Object fun = jsobj.get(exec, *id ).toObject( exec ); if ( !fun.implementsCall() ) { - QString msg = i18n( "Bad event handler: Object %1 Identifier %2 Method %3 Type: %4." ) + TQString msg = i18n( "Bad event handler: Object %1 Identifier %2 Method %3 Type: %4." ) .arg(jsobj.className().ascii()).arg(id->ascii()).arg(fun.className().ascii()).arg(e->type()); return throwError(exec, msg, KJS::TypeError ); } diff --git a/kjsembed/jsobjecteventproxy.h b/kjsembed/jsobjecteventproxy.h index de9f2e11..2ef662ae 100644 --- a/kjsembed/jsobjecteventproxy.h +++ b/kjsembed/jsobjecteventproxy.h @@ -22,8 +22,8 @@ #ifndef KJSEMBED_JSOBJECTEVENTPROXY_H #define KJSEMBED_JSOBJECTEVENTPROXY_H -#include <qbitarray.h> -#include <qobject.h> +#include <tqbitarray.h> +#include <tqobject.h> #include <kjs/object.h> #include <global.h> @@ -32,7 +32,7 @@ namespace KJSEmbed { class JSObjectProxy; /** - * Filters events for a QObject and forwards them to a JS handler. + * Filters events for a TQObject and forwards them to a JS handler. * * @version $Id$ * @author Richard Moore, rich@kde.org @@ -46,26 +46,26 @@ public: virtual ~JSObjectEventProxy(); /** Returns true iff we forward the event type to JS. */ - bool isFiltered( QEvent::Type t ) const; + bool isFiltered( TQEvent::Type t ) const; /** Adds an event type to those we forward to JS. */ - void addFilter( QEvent::Type t ); + void addFilter( TQEvent::Type t ); /** * Removes an event type from those we forward to JS. If there are no * event types left to forward then we self-destruct. */ - void removeFilter( QEvent::Type t ); + void removeFilter( TQEvent::Type t ); /** Reimplemented to forward events to JS. */ - bool eventFilter ( QObject *watched, QEvent *e ); + bool eventFilter ( TQObject *watched, TQEvent *e ); protected: - KJS::Value callHandler( QEvent *e ); + KJS::Value callHandler( TQEvent *e ); private: JSObjectProxy *proxy; - QBitArray eventMask; + TQBitArray eventMask; uint refcount; class JSObjectEventProxyPrivate *d; }; diff --git a/kjsembed/jsobjectproxy.cpp b/kjsembed/jsobjectproxy.cpp index c8b43a5d..8b7d3cb7 100644 --- a/kjsembed/jsobjectproxy.cpp +++ b/kjsembed/jsobjectproxy.cpp @@ -17,13 +17,13 @@ * Boston, MA 02110-1301, USA. */ -#include <qobject.h> -#include <qobjectlist.h> -#include <qmetaobject.h> -#include <qregexp.h> -#include <qsignal.h> -#include <qstrlist.h> -#include <qvariant.h> +#include <tqobject.h> +#include <tqobjectlist.h> +#include <tqmetaobject.h> +#include <tqregexp.h> +#include <tqsignal.h> +#include <tqstrlist.h> +#include <tqvariant.h> #include <private/qucomextra_p.h> @@ -53,19 +53,19 @@ namespace KJSEmbed { typedef Bindings::JSObjectProxyImp JSObjectProxyImp; - JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, QObject *target, QObject *r, const JSSecurityPolicy *sp ) + JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TQObject *target, TQObject *r, const JSSecurityPolicy *sp ) : JSProxy( JSProxy::ObjectProxy ), jspart( part ), js( part->interpreter() ), obj( target ), root( r ) { policy = sp ? sp : JSSecurityPolicy::defaultPolicy(); } - JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, QObject *target, QObject *r ) + JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TQObject *target, TQObject *r ) : JSProxy( JSProxy::ObjectProxy ), jspart( part ), js( part->interpreter() ), obj( target ), root( r ) { policy = JSSecurityPolicy::defaultPolicy(); } - JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, QObject *target ) + JSObjectProxy::JSObjectProxy( KJSEmbedPart *part, TQObject *target ) : JSProxy( JSProxy::ObjectProxy ), jspart( part ), js( part->interpreter() ), obj( target ), root( target ) { policy = JSSecurityPolicy::defaultPolicy(); @@ -93,7 +93,7 @@ namespace KJSEmbed { return KJS::UString(); } - QString s( "%1 (%2)" ); + TQString s( "%1 (%2)" ); s = s.arg( obj ? obj->name() : "Dead Object" ); s = s.arg( obj ? obj->className() : "" ); return KJS::UString( s ); @@ -115,11 +115,11 @@ namespace KJSEmbed { kdDebug( 80001 ) << "JS getting '" << p.ascii() << endl; // Properties - QString prop = p.ustring().qstring(); - QMetaObject *meta = obj->metaObject(); + TQString prop = p.ustring().qstring(); + TQMetaObject *meta = obj->metaObject(); if ( meta->findProperty( p.ascii(), true ) != -1 ) { - QVariant val = obj->property( prop.ascii() ); + TQVariant val = obj->property( prop.ascii() ); kdDebug( 80001 ) << "JS getting '" << p.ascii() << "' ( " << val.typeName() << ")" << endl; return convertToValue( exec, val ); @@ -149,10 +149,10 @@ namespace KJSEmbed { } // Properties - QMetaObject *meta = obj->metaObject(); + TQMetaObject *meta = obj->metaObject(); int propIndex = meta->findProperty( p.ascii(), true ); if ( propIndex != -1 ) { - QVariant val = convertToVariant( exec, v ); + TQVariant val = convertToVariant( exec, v ); if ( meta->property(propIndex, true)->isEnumType() ) { obj->setProperty( p.ascii(), val.toUInt() ); } else if ( val.isValid() ) { @@ -199,7 +199,7 @@ namespace KJSEmbed { void JSObjectProxy::addBindingsClass( KJS::ExecState *exec, KJS::Object & /*object*/ ) { KJS::Identifier clazzid; - QObject *o = obj; + TQObject *o = obj; Bindings::BindingObject *bo = dynamic_cast<Bindings::BindingObject *>( o ); if ( bo ) { clazzid = KJS::Identifier( bo->jsClassName() ? bo->jsClassName() : obj->className() ); @@ -227,14 +227,14 @@ namespace KJSEmbed { } void JSObjectProxy::addBindingsEnum( KJS::ExecState *exec, KJS::Object &object ) { - QMetaObject * mo = obj->metaObject(); - QStrList enumList = mo->enumeratorNames( true ); + TQMetaObject * mo = obj->metaObject(); + TQStrList enumList = mo->enumeratorNames( true ); - for ( QStrListIterator iter( enumList ); iter.current(); ++iter ) { + for ( TQStrListIterator iter( enumList ); iter.current(); ++iter ) { const QMetaEnum *me = mo->enumerator( iter.current(), true ); for ( uint i = 0 ; i < me->count ; i++ ) { - QCString key( ( me->items ) [ i ].key ); + TQCString key( ( me->items ) [ i ].key ); int val = ( me->items ) [ i ].value; object.put( exec, key.data(), KJS::Number( val ), KJS::ReadOnly ); } @@ -243,16 +243,16 @@ namespace KJSEmbed { void JSObjectProxy::addBindingsSlots( KJS::ExecState *exec, KJS::Object &object ) { // Publish slots with supported signatures as methods. - QMetaObject * mo = obj->metaObject(); - QStrList slotList( mo->slotNames( true ) ); - for ( QStrListIterator iter( slotList ); iter.current(); ++iter ) { + TQMetaObject * mo = obj->metaObject(); + TQStrList slotList( mo->slotNames( true ) ); + for ( TQStrListIterator iter( slotList ); iter.current(); ++iter ) { addSlotBinding( iter.current(), exec, object ); } } - void JSObjectProxy::addSlotBinding( const QCString &name, KJS::ExecState *exec, KJS::Object &object ) { + void JSObjectProxy::addSlotBinding( const TQCString &name, KJS::ExecState *exec, KJS::Object &object ) { // Lookup and bind slot - QMetaObject * mo = obj->metaObject(); + TQMetaObject * mo = obj->metaObject(); int slotid = mo->findSlot( name.data(), true ); if ( slotid == -1 ) return ; @@ -267,14 +267,14 @@ namespace KJSEmbed { if ( id < 0 ) return ; - QCString jsname = name; + TQCString jsname = name; jsname.detach(); - jsname.replace( QRegExp( "\\([^\\)]*\\)" ), "" ); + jsname.replace( TQRegExp( "\\([^\\)]*\\)" ), "" ); // Find the return type, we only care if it is a pointer type const QUMethod *m = md->method; const char *retclass = 0; - QCString ptr( "ptr" ); + TQCString ptr( "ptr" ); if ( m->count && ( m->parameters->inOut == QUParameter::Out ) && ( ptr == m->parameters->type->desc() ) ) { @@ -291,8 +291,8 @@ namespace KJSEmbed { object.put( exec, KJS::Identifier( jsname.data() ), KJS::Object( imp ) ); } else { // The identifier has already been used - QString s( name ); - QCString cs = QString( "%1%2" ).arg( jsname ).arg( s.contains( ',' ) + 1 ).ascii(); + TQString s( name ); + TQCString cs = TQString( "%1%2" ).arg( jsname ).arg( s.contains( ',' ) + 1 ).ascii(); //kdDebug(80001) << "Method " << jsname << " exists, using " << cs << " for " << s << endl; object.put( exec, KJS::Identifier( cs.data() ), KJS::Object( imp ) ); } diff --git a/kjsembed/jsobjectproxy.h b/kjsembed/jsobjectproxy.h index b302d4ad..8e620e2a 100644 --- a/kjsembed/jsobjectproxy.h +++ b/kjsembed/jsobjectproxy.h @@ -22,9 +22,9 @@ #ifndef KJSEMBEDJSOBJECTPROXY_H #define KJSEMBEDJSOBJECTPROXY_H #include "global.h" -#include <qguardedptr.h> -#include <qcstring.h> -#include <qwidget.h> +#include <tqguardedptr.h> +#include <tqcstring.h> +#include <tqwidget.h> #include <kjs/object.h> #include <kjsembed/jsproxy.h> @@ -41,19 +41,19 @@ class KJSEmbedPart; class JSObjectEventProxy; /** - * A JS object that provides a binding to a QObject. + * A JS object that provides a binding to a TQObject. * <h3>Introduction</h3> * This class defines a @ref KJS::ObjectImp that allows scripts to access - * the properties of a QObject. The scripts can also create child objects, + * the properties of a TQObject. The scripts can also create child objects, * load dialogs from .ui files created by Designer and navigate the object - * tree in a similar manner to the DCOP/QObject bridge. + * tree in a similar manner to the DCOP/TQObject bridge. * <h3>Example Usage</h3> * The following example creates a @ref KJS::ObjectImp that provides - * a binding to the properties of a @ref QLineEdit . This binding is + * a binding to the properties of a @ref TQLineEdit . This binding is * then used to create a property 'edit' for the object 'jsparent'. * <pre> * - * QLineEdit *edit = new QLineEdit(); + * TQLineEdit *edit = new TQLineEdit(); * KJSEmbed::JSObjectProxy *proxy = new KJSEmbed::JSObjectProxy( js, edit ); * jsparent.put( js->globalExec(), "edit", proxy ); * @@ -82,24 +82,24 @@ class KJSEMBED_EXPORT JSObjectProxy : public JSProxy public: /** * Create a JS binding to the target object. The binding will allow scripts to - * access any QObject that is descended the target and no others. + * access any TQObject that is descended the target and no others. */ - JSObjectProxy( KJSEmbedPart *part, QObject *target ); + JSObjectProxy( KJSEmbedPart *part, TQObject *target ); /** * Create a JS binding to the target object. The binding will allow scripts to - * access any QObject that is descended from the specified root. If the specified + * access any TQObject that is descended from the specified root. If the specified * root is 0 then access is granted to all objects. */ - JSObjectProxy( KJSEmbedPart *part, QObject *target, QObject *root ); + JSObjectProxy( KJSEmbedPart *part, TQObject *target, TQObject *root ); /** * Create a JS binding to the target object. The binding will allow scripts to - * access any QObject that is descended from the specified root, according to + * access any TQObject that is descended from the specified root, according to * the specified @ref JSSecurityPolicy . If the specified root is 0 then access * is granted to all objects. */ - JSObjectProxy( KJSEmbedPart *part, QObject *target, QObject *root, const JSSecurityPolicy *sp ); + JSObjectProxy( KJSEmbedPart *part, TQObject *target, TQObject *root, const JSSecurityPolicy *sp ); virtual ~JSObjectProxy(); @@ -110,24 +110,24 @@ public: KJS::Interpreter *interpreter() const { return js; } /** Returns the root object that defines the limit of the scope of this proxy. */ - QObject *rootObject() const { return root; } + TQObject *rootObject() const { return root; } - /** Returns the QObject the proxy is attached to. */ - QObject *object() const { return obj; } + /** Returns the TQObject the proxy is attached to. */ + TQObject *object() const { return obj; } /** Returns the className of the proxied object */ - QString typeName() const { return obj->className(); } + TQString typeName() const { return obj->className(); } - /** Returns the associated QWidget, or 0 if the object is not a widget. */ - QWidget *widget() const + /** Returns the associated TQWidget, or 0 if the object is not a widget. */ + TQWidget *widget() const { - QObject *w = obj; - return (w && w->isWidgetType()) ? static_cast<QWidget *>(w) : 0; + TQObject *w = obj; + return (w && w->isWidgetType()) ? static_cast<TQWidget *>(w) : 0; } //void *toVoidStar() { return obj; } //template<class T> - //T *toNative(){ return dynamic_cast<QObject*>(obj); } + //T *toNative(){ return dynamic_cast<TQObject*>(obj); } /** Returns true iff the content of this proxy inherits the specified base-class. */ bool inherits( const char *clazz ) { return obj->isA( clazz ); } @@ -152,7 +152,7 @@ public: virtual KJS::UString toString( KJS::ExecState *exec ) const; /** - * Adds methods for traversing the QObject tree to the specified + * Adds methods for traversing the TQObject tree to the specified * @ref KJS::Object . Only QObjects descended from the root specified * in the constructor can be reached through JS proxies created with * these bindings. @@ -180,14 +180,14 @@ protected: private: bool isAllowed( KJS::Interpreter *js ) const; - void addSlotBinding( const QCString &name, KJS::ExecState *exec, KJS::Object &object ); + void addSlotBinding( const TQCString &name, KJS::ExecState *exec, KJS::Object &object ); private: KJSEmbedPart *jspart; KJS::Interpreter *js; - QGuardedPtr<QObject> obj; - QGuardedPtr<QObject> root; - QGuardedPtr<JSObjectEventProxy> evproxy; + TQGuardedPtr<TQObject> obj; + TQGuardedPtr<TQObject> root; + TQGuardedPtr<JSObjectEventProxy> evproxy; const JSSecurityPolicy *policy; class JSObjectProxyPrivate *d; friend class Bindings::JSObjectProxyImp; diff --git a/kjsembed/jsobjectproxy_imp.cpp b/kjsembed/jsobjectproxy_imp.cpp index a17190b5..dc94aa73 100644 --- a/kjsembed/jsobjectproxy_imp.cpp +++ b/kjsembed/jsobjectproxy_imp.cpp @@ -17,18 +17,18 @@ * Boston, MA 02110-1301, USA. */ -#include <qobject.h> -#include <qobjectlist.h> -#include <qdialog.h> -#include <qlistbox.h> -#include <qlistview.h> -#include <qmetaobject.h> -#include <qregexp.h> -#include <qsignal.h> -#include <qstrlist.h> -#include <qtabwidget.h> -#include <qtimer.h> -#include <qvariant.h> +#include <tqobject.h> +#include <tqobjectlist.h> +#include <tqdialog.h> +#include <tqlistbox.h> +#include <tqlistview.h> +#include <tqmetaobject.h> +#include <tqregexp.h> +#include <tqsignal.h> +#include <tqstrlist.h> +#include <tqtabwidget.h> +#include <tqtimer.h> +#include <tqvariant.h> #include <private/qucom_p.h> #include <private/qucomextra_p.h> @@ -129,19 +129,19 @@ JSObjectProxyImp::JSObjectProxyImp( KJS::ExecState *exec, int mid, JSObjectProxy } JSObjectProxyImp::JSObjectProxyImp( KJS::ExecState *exec, - int mid, const QCString &name, JSObjectProxy *parent ) + int mid, const TQCString &name, JSObjectProxy *parent ) : JSProxyImp(exec), id(mid), slotname(name), proxy(parent), obj(parent->obj) { } JSObjectProxyImp::JSObjectProxyImp( KJS::ExecState *exec, - int mid, int sid, const QCString &name, JSObjectProxy *parent ) + int mid, int sid, const TQCString &name, JSObjectProxy *parent ) : JSProxyImp(exec), id(mid), sigid(sid), slotname(name), proxy(parent), obj(parent->obj) { } JSObjectProxyImp::JSObjectProxyImp( KJS::ExecState *exec, - int mid, const char *ret, int sid, const QCString &name, + int mid, const char *ret, int sid, const TQCString &name, JSObjectProxy *parent ) : JSProxyImp(exec), id(mid), rettype(ret), sigid(sid), slotname(name), proxy(parent), obj(parent->obj) { @@ -154,14 +154,14 @@ JSObjectProxyImp::JSObjectProxyImp( KJS::ExecState *exec, KJS::Value JSObjectProxyImp::children( KJS::ExecState *exec, KJS::Object &, const KJS::List & ) { KJS::List items; - const QObjectList *kids = obj->children(); + const TQObjectList *kids = obj->children(); if ( kids ) { - QObjectList l( *kids ); + TQObjectList l( *kids ); for ( uint i = 0 ; i < l.count() ; i++ ) { - QObject *child = l.at( i ); - QCString nm = ( child ? child->name() : "<null>" ); - items.append( KJS::String( QString(nm) ) ); + TQObject *child = l.at( i ); + TQCString nm = ( child ? child->name() : "<null>" ); + items.append( KJS::String( TQString(nm) ) ); } } @@ -171,15 +171,15 @@ KJS::Value JSObjectProxyImp::children( KJS::ExecState *exec, KJS::Object &, cons KJS::Value JSObjectProxyImp::properties( KJS::ExecState *exec, KJS::Object &, const KJS::List & ) { KJS::List items; - QMetaObject *mo = obj->metaObject(); - QStrList propList( mo->propertyNames( true ) ); + TQMetaObject *mo = obj->metaObject(); + TQStrList propList( mo->propertyNames( true ) ); - for ( QStrListIterator iter(propList); iter.current(); ++iter ) { + for ( TQStrListIterator iter(propList); iter.current(); ++iter ) { - QCString name = iter.current(); + TQCString name = iter.current(); int propid = mo->findProperty( name.data(), true ); if ( propid != -1 ) { - items.append( KJS::String( QString(name) ) ); + items.append( KJS::String( TQString(name) ) ); } } @@ -215,7 +215,7 @@ KJS::Value JSObjectProxyImp::call( KJS::ExecState *exec, KJS::Object &self, cons switch( id ) { case MethodParent: { - QObject *po = obj->parent(); + TQObject *po = obj->parent(); if ( po && proxy->securityPolicy()->isObjectAllowed( proxy, po ) ) return proxy->part()->factory()->createProxy( exec, po, proxy ); @@ -224,7 +224,7 @@ KJS::Value JSObjectProxyImp::call( KJS::ExecState *exec, KJS::Object &self, cons break; case MethodChildCount: { - const QObjectList *kids = obj->children(); + const TQObjectList *kids = obj->children(); return kids ? KJS::Number( kids->count() ) : KJS::Number(0); } break; @@ -295,13 +295,13 @@ KJS::Value JSObjectProxyImp::call( KJS::ExecState *exec, KJS::Object &self, cons KJS::Value JSObjectProxyImp::signalz( KJS::ExecState *exec, KJS::Object &, const KJS::List & ) { KJS::List items; - QMetaObject *mo = obj->metaObject(); - QStrList signalList( mo->signalNames( true ) ); + TQMetaObject *mo = obj->metaObject(); + TQStrList signalList( mo->signalNames( true ) ); - for ( QStrListIterator iter(signalList); iter.current(); ++iter ) { + for ( TQStrListIterator iter(signalList); iter.current(); ++iter ) { - QCString name = iter.current(); - QString nm( name ); + TQCString name = iter.current(); + TQString nm( name ); int signalid = mo->findSignal( name.data(), true ); if ( (signalid != -1) && (mo->signal( signalid, true )->access == QMetaData::Public) ) @@ -314,13 +314,13 @@ KJS::Value JSObjectProxyImp::signalz( KJS::ExecState *exec, KJS::Object &, const KJS::Value JSObjectProxyImp::slotz( KJS::ExecState *exec, KJS::Object &, const KJS::List & ) { KJS::List items; - QMetaObject *mo = obj->metaObject(); - QStrList slotList( mo->slotNames( true ) ); + TQMetaObject *mo = obj->metaObject(); + TQStrList slotList( mo->slotNames( true ) ); - for ( QStrListIterator iter(slotList); iter.current(); ++iter ) { + for ( TQStrListIterator iter(slotList); iter.current(); ++iter ) { - QCString name = iter.current(); - QString nm( name ); + TQCString name = iter.current(); + TQString nm( name ); int slotid = mo->findSlot( name.data(), true ); if ( (slotid != -1) && (mo->slot( slotid, true )->access == QMetaData::Public) ) @@ -341,12 +341,12 @@ KJS::Boolean JSObjectProxyImp::connect( KJS::ExecState *exec, // Source object and signal JSObjectProxy *sendproxy = JSProxy::toObjectProxy( args[0].imp() ); - QObject *sender = sendproxy ? sendproxy->object() : 0; - QString sig = args[1].toString(exec).qstring(); + TQObject *sender = sendproxy ? sendproxy->object() : 0; + TQString sig = args[1].toString(exec).qstring(); kdDebug( 80001 ) << "connecting C++ signal" << sig << endl; // Receiver and slot/signal KJS::Object recvObj; - QString dest; + TQString dest; if ( args.size() == 3 ) { recvObj = self.toObject(exec); dest = args[2].toString(exec).qstring(); @@ -359,7 +359,7 @@ KJS::Boolean JSObjectProxyImp::connect( KJS::ExecState *exec, // Try to connect to C++ slot JSObjectProxy *recvproxy = JSProxy::toObjectProxy( recvObj.imp() ); if ( recvproxy ) { - QObject *recv = recvproxy ? recvproxy->object() : 0; + TQObject *recv = recvproxy ? recvproxy->object() : 0; bool ok = JSSlotUtils::connect( sender, sig.ascii(), recv, dest.ascii() ); if ( ok ) return KJS::Boolean(true); @@ -368,8 +368,8 @@ KJS::Boolean JSObjectProxyImp::connect( KJS::ExecState *exec, return connect( sender, sig.ascii(), recvObj, dest ); } -KJS::Boolean JSObjectProxyImp::connect( QObject *sender, const char *sig, - const KJS::Object &recv, const QString &dest ) +KJS::Boolean JSObjectProxyImp::connect( TQObject *sender, const char *sig, + const KJS::Object &recv, const TQString &dest ) { kdDebug(80001) << "Trying signature '" << sig << "'." << endl; // Try to connect to JS method @@ -409,28 +409,28 @@ KJS::Boolean JSObjectProxyImp::connect( QObject *sender, const char *sig, ok = JSSlotUtils::connect( sender, sig, slotp, "slot_double(double)" ); break; case JSSlotUtils::SignatureString: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_string(const QString&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_string(const TQString&)" ); break; case JSSlotUtils::SignatureCString: ok = JSSlotUtils::connect( sender, sig, slotp, "slot_charstar(const char*)" ); break; case JSSlotUtils::SignatureColor: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_color(const QColor&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_color(const TQColor&)" ); break; case JSSlotUtils::SignatureFont: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_font(const QFont&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_font(const TQFont&)" ); break; case JSSlotUtils::SignaturePoint: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_point(const QPoint&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_point(const TQPoint&)" ); break; case JSSlotUtils::SignatureRect: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_rect(const QRect&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_rect(const TQRect&)" ); break; case JSSlotUtils::SignatureSize: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_size(const QSize&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_size(const TQSize&)" ); break; case JSSlotUtils::SignaturePixmap: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_pixmap(const QPixmap&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_pixmap(const TQPixmap&)" ); break; case JSSlotUtils::SignatureURL: ok = JSSlotUtils::connect( sender, sig, slotp, "slot_url(const KURL&)" ); @@ -446,29 +446,29 @@ KJS::Boolean JSObjectProxyImp::connect( QObject *sender, const char *sig, break; case JSSlotUtils::SignatureDate: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_date(const QDate&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_date(const TQDate&)" ); break; case JSSlotUtils::SignatureTime: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_time(const QTime&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_time(const TQTime&)" ); break; case JSSlotUtils::SignatureDateTime: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datetime(const QDateTime&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datetime(const TQDateTime&)" ); break; case JSSlotUtils::SignatureImage: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_image(const QImage&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_image(const TQImage&)" ); break; case JSSlotUtils::SignatureQWidget: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_widget(QWidget*)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_widget(TQWidget*)" ); break; case JSSlotUtils::SignatureDateDate: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datedate(const QDate&, const QDate& )" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_datedate(const TQDate&, const TQDate& )" ); break; case JSSlotUtils::SignatureColorString: - ok = JSSlotUtils::connect( sender, sig, slotp, "slot_colorstring(const QColor&, const QString&)" ); + ok = JSSlotUtils::connect( sender, sig, slotp, "slot_colorstring(const TQColor&, const TQString&)" ); break; case JSSlotUtils::SignatureCustom: { - QString mangledSig = sig; + TQString mangledSig = sig; mangledSig.remove(' ') .remove("const") .remove('&') @@ -501,12 +501,12 @@ KJS::Boolean JSObjectProxyImp::disconnect( KJS::ExecState *exec, KJS::Object &se // Source object and signal JSObjectProxy *sendproxy = JSProxy::toObjectProxy( args[0].imp() ); - QObject *sender = sendproxy ? sendproxy->object() : 0; - QString sig = args[1].toString(exec).qstring(); + TQObject *sender = sendproxy ? sendproxy->object() : 0; + TQString sig = args[1].toString(exec).qstring(); // Receiver and slot/signal - QObject *recv=0; - QString dest; + TQObject *recv=0; + TQString dest; if ( args.size() == 3 ) { JSObjectProxy *recvproxy = JSProxy::toObjectProxy( self.imp() ); recv = recvproxy ? recvproxy->object() : 0; @@ -530,7 +530,7 @@ KJS::Value JSObjectProxyImp::getParentNode( KJS::ExecState *exec, KJS::Object &, if ( args.size()) return KJS::Null(); - QObject *parent = obj->parent(); + TQObject *parent = obj->parent(); if ( parent && proxy->securityPolicy()->isObjectAllowed( proxy, parent ) ) return proxy->part()->factory()->createProxy( exec, parent, proxy ); @@ -542,12 +542,12 @@ KJS::Value JSObjectProxyImp::getElementById( KJS::ExecState *exec, KJS::Object & if ( !args.size() ) return KJS::Null(); - const QObjectList *kids = obj->children(); + const TQObjectList *kids = obj->children(); if ( !kids ) return KJS::Null(); - QObjectList l( *kids ); - QObject *child = 0; + TQObjectList l( *kids ); + TQObject *child = 0; if ( args[0].isA( KJS::NumberType ) ) { uint i = args[0].toUInt32( exec ); @@ -558,7 +558,7 @@ KJS::Value JSObjectProxyImp::getElementById( KJS::ExecState *exec, KJS::Object & child = l.at( i ); } else { - QString s = args[0].toString( exec ).qstring(); + TQString s = args[0].toString( exec ).qstring(); child = obj->child( s.ascii() ); } @@ -580,8 +580,8 @@ KJS::Value JSObjectProxyImp::hasAttribute( KJS::ExecState *exec, KJS::Object &, if ( !args.size() ) return KJS::Null(); - QMetaObject *meta = obj->metaObject(); - QString s = args[0].toString(exec).qstring(); + TQMetaObject *meta = obj->metaObject(); + TQString s = args[0].toString(exec).qstring(); if ( meta->findProperty( s.ascii(), true ) != -1 ) return KJS::Boolean(true); else @@ -592,20 +592,20 @@ KJS::Value JSObjectProxyImp::getAttribute( KJS::ExecState *exec, KJS::Object &, { if ( !args.size() ) { - QString msg = i18n( "No property was defined." ); + TQString msg = i18n( "No property was defined." ); return throwError(exec, msg); } - QMetaObject *meta = obj->metaObject(); - QString s = args[0].toString(exec).qstring(); + TQMetaObject *meta = obj->metaObject(); + TQString s = args[0].toString(exec).qstring(); kdDebug(80001) << "Get property " << s << " from " << obj->name() << endl; if ( meta->findProperty( s.ascii(), true ) == -1 ) { - QString msg = i18n( "Property '%1' could not be found." ).arg( s ); + TQString msg = i18n( "Property '%1' could not be found." ).arg( s ); return throwError(exec, msg,KJS::ReferenceError); } - QVariant val = obj->property( s.ascii() ); + TQVariant val = obj->property( s.ascii() ); return convertToValue( exec, val ); } @@ -614,16 +614,16 @@ KJS::Value JSObjectProxyImp::setAttribute( KJS::ExecState *exec, KJS::Object &, if ( args.size() != 2 ) return KJS::Boolean(false); - QMetaObject *meta = obj->metaObject(); - QString s = args[0].toString(exec).qstring(); + TQMetaObject *meta = obj->metaObject(); + TQString s = args[0].toString(exec).qstring(); if ( meta->findProperty( s.ascii(), true ) == -1 ) { - QString msg = i18n( "Property '%1' could not be found." ).arg( s ); + TQString msg = i18n( "Property '%1' could not be found." ).arg( s ); return throwError(exec, msg,KJS::GeneralError); } kdDebug(80001) << "Set property " << s << " from " << obj->name() << endl; - QVariant val = convertToVariant( exec, args[1] ); + TQVariant val = convertToVariant( exec, args[1] ); bool ok = obj->setProperty( s.ascii(), val ); return KJS::Boolean(ok); diff --git a/kjsembed/jsobjectproxy_imp.h b/kjsembed/jsobjectproxy_imp.h index b967c362..2c1cefb6 100644 --- a/kjsembed/jsobjectproxy_imp.h +++ b/kjsembed/jsobjectproxy_imp.h @@ -22,7 +22,7 @@ #ifndef KJSEMBEDJSOBJECTPROXYIMP_H #define KJSEMBEDJSOBJECTPROXYIMP_H -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kjs/interpreter.h> #include <kjsembed/jsproxy_imp.h> @@ -115,11 +115,11 @@ public: JSObjectProxyImp( KJS::ExecState *exec, int id, JSObjectProxy *parent ); JSObjectProxyImp( KJS::ExecState *exec, - int id, const QCString &name, JSObjectProxy *parent ); + int id, const TQCString &name, JSObjectProxy *parent ); JSObjectProxyImp( KJS::ExecState *exec, - int id, int sigid, const QCString &name, JSObjectProxy *parent ); + int id, int sigid, const TQCString &name, JSObjectProxy *parent ); JSObjectProxyImp( KJS::ExecState *exec, - int id, const char *ret, int sig, const QCString &name, JSObjectProxy *parent ); + int id, const char *ret, int sig, const TQCString &name, JSObjectProxy *parent ); ~JSObjectProxyImp() {} /** Implements the object tree interface. */ @@ -153,7 +153,7 @@ public: KJS::Boolean connect( KJS::ExecState *exec, const KJS::Object &self, const KJS::List &args ); KJS::Boolean disconnect( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); - KJS::Boolean connect( QObject *sender, const char *sig, const KJS::Object &recv, const QString &dest ); + KJS::Boolean connect( TQObject *sender, const char *sig, const KJS::Object &recv, const TQString &dest ); /*}*/ virtual bool implementsCall() const { return true; } @@ -170,12 +170,12 @@ protected: private: int id; - QCString rettype; // return type + TQCString rettype; // return type int sigid; // signatureid int slotid; - QCString slotname; + TQCString slotname; JSObjectProxy *proxy; - QGuardedPtr<QObject> obj; + TQGuardedPtr<TQObject> obj; class JSObjectProxyImpPrivate *d; }; diff --git a/kjsembed/jsopaqueproxy.cpp b/kjsembed/jsopaqueproxy.cpp index c5c2600d..5abd9558 100644 --- a/kjsembed/jsopaqueproxy.cpp +++ b/kjsembed/jsopaqueproxy.cpp @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#include <qevent.h> -#include <qtextstream.h> +#include <tqevent.h> +#include <tqtextstream.h> #include "global.h" @@ -43,13 +43,13 @@ JSOpaqueProxy::JSOpaqueProxy() { } -JSOpaqueProxy::JSOpaqueProxy( QTextStream *ts ) +JSOpaqueProxy::JSOpaqueProxy( TQTextStream *ts ) : JSProxy( JSProxy::OpaqueProxy ), ptr(0) { setValue( ts ); } -JSOpaqueProxy::JSOpaqueProxy( const QEvent *ev ) +JSOpaqueProxy::JSOpaqueProxy( const TQEvent *ev ) : JSProxy( JSProxy::OpaqueProxy ), ptr(0) { setValue( ev ); @@ -66,7 +66,7 @@ JSOpaqueProxy::~JSOpaqueProxy() } } -QString JSOpaqueProxy::typeName() const +TQString JSOpaqueProxy::typeName() const { return ptrtype; } @@ -76,34 +76,34 @@ bool JSOpaqueProxy::inherits( const char *clazz ) return (ptrtype == clazz); } -void JSOpaqueProxy::setValue( QTextStream *ts ) +void JSOpaqueProxy::setValue( TQTextStream *ts ) { if( ptr ) { if(owner() == JavaScript) ptr->cleanup(); delete ptr; } - ptr = new Pointer<QTextStream>(ts); - ptrtype = "QTextStream"; + ptr = new Pointer<TQTextStream>(ts); + ptrtype = "TQTextStream"; } -void JSOpaqueProxy::setValue( const QEvent *ev ) +void JSOpaqueProxy::setValue( const TQEvent *ev ) { if( ptr ) { if(owner() == JavaScript) ptr->cleanup(); delete ptr; } - ptr = new Pointer<const QEvent>(ev); - ptrtype = "QEvent"; + ptr = new Pointer<const TQEvent>(ev); + ptrtype = "TQEvent"; } -QTextStream *JSOpaqueProxy::toTextStream() +TQTextStream *JSOpaqueProxy::toTextStream() { - return toNative<QTextStream>(); + return toNative<TQTextStream>(); } -const QEvent *JSOpaqueProxy::toEvent() +const TQEvent *JSOpaqueProxy::toEvent() { - return toNative<QEvent>(); + return toNative<TQEvent>(); } void JSOpaqueProxy::addBindings( KJS::ExecState *exec, KJS::Object &object ) @@ -124,7 +124,7 @@ void JSOpaqueProxy::addBindings( KJS::ExecState *exec, KJS::Object &object ) KJS::UString JSOpaqueProxy::toString( KJS::ExecState */*exec*/ ) const { - QString s( "%1 (%2)" ); + TQString s( "%1 (%2)" ); return KJS::UString( s.arg("JSOpaqueProxy").arg(ptrtype) ); } diff --git a/kjsembed/jsopaqueproxy.h b/kjsembed/jsopaqueproxy.h index f29458cf..e5a4c1f0 100644 --- a/kjsembed/jsopaqueproxy.h +++ b/kjsembed/jsopaqueproxy.h @@ -22,8 +22,8 @@ #ifndef KJSEMBEDJSOPAQUEPROXY_H #define KJSEMBEDJSOPAQUEPROXY_H -#include <qcstring.h> -#include <qevent.h> +#include <tqcstring.h> +#include <tqevent.h> #include <kjs/object.h> #include <kjsembed/jsproxy.h> @@ -57,16 +57,16 @@ public: } /** Creates an opaque proxy. */ - JSOpaqueProxy( QTextStream *ts ); + JSOpaqueProxy( TQTextStream *ts ); /** Creates an opaque proxy. */ - JSOpaqueProxy( const QEvent *ev ); + JSOpaqueProxy( const TQEvent *ev ); /** Cleans up. */ virtual ~JSOpaqueProxy(); /** Returns the type of the wrapped object.*/ - QString typeName() const; + TQString typeName() const; /** Sets the value of the proxy and its type. */ template<typename T> @@ -79,11 +79,11 @@ public: ptrtype = ptype ? ptype : "void"; } - /** Sets the value of the proxy to a QTextStream. */ - void setValue( QTextStream *ts ); + /** Sets the value of the proxy to a TQTextStream. */ + void setValue( TQTextStream *ts ); - /** Sets the value of the proxy to a QEvent. */ - void setValue( const QEvent *ev ); + /** Sets the value of the proxy to a TQEvent. */ + void setValue( const TQEvent *ev ); /** Returns the proxy value as a pointer. */ template<typename T> @@ -98,12 +98,12 @@ public: bool inherits( const char *clazz ); /** - * Returns the QTextStream stored in the proxy. If proxy does not contain - * a value of type QTextStream then 0 is returned. + * Returns the TQTextStream stored in the proxy. If proxy does not contain + * a value of type TQTextStream then 0 is returned. */ - QTextStream *toTextStream(); + TQTextStream *toTextStream(); - const QEvent *toEvent(); + const TQEvent *toEvent(); /** Adds the bindings for the opaque proxy to the specified js object. */ virtual void addBindings( KJS::ExecState *state, KJS::Object &object ); @@ -113,9 +113,9 @@ public: private: - QTextStream *textstream; - const QEvent *event; - QCString ptrtype; + TQTextStream *textstream; + const TQEvent *event; + TQCString ptrtype; class JSOpaqueProxyPrivate *d; diff --git a/kjsembed/jsopaqueproxy_imp.cpp b/kjsembed/jsopaqueproxy_imp.cpp index 65ff14cc..6aef5494 100644 --- a/kjsembed/jsopaqueproxy_imp.cpp +++ b/kjsembed/jsopaqueproxy_imp.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qvariant.h> +#include <tqvariant.h> #include "global.h" #include <kjs/interpreter.h> diff --git a/kjsembed/jsopaqueproxy_imp.h b/kjsembed/jsopaqueproxy_imp.h index b6dda2f1..5518385d 100644 --- a/kjsembed/jsopaqueproxy_imp.h +++ b/kjsembed/jsopaqueproxy_imp.h @@ -22,7 +22,7 @@ #ifndef KJSEMBEDJSOPAQUEPROXYIMP_H #define KJSEMBEDJSOPAQUEPROXYIMP_H -#include <qcstring.h> +#include <tqcstring.h> #include <kjs/object.h> #include <kjsembed/jsproxy_imp.h> diff --git a/kjsembed/jsproxy.cpp b/kjsembed/jsproxy.cpp index 838cbd65..cbf3a5e3 100644 --- a/kjsembed/jsproxy.cpp +++ b/kjsembed/jsproxy.cpp @@ -67,7 +67,7 @@ void JSProxy::setOwner( Owner state ) JSProxy::Owner JSProxy::owner( ) const { return ownership; } -bool JSProxy::checkType( const KJS::Object &object, ProxyType prxyType, const QString & classname ) +bool JSProxy::checkType( const KJS::Object &object, ProxyType prxyType, const TQString & classname ) { JSProxy *prxy = toProxy(object.imp()); if( !prxy ) diff --git a/kjsembed/jsproxy.h b/kjsembed/jsproxy.h index df7615eb..db22acf6 100644 --- a/kjsembed/jsproxy.h +++ b/kjsembed/jsproxy.h @@ -98,14 +98,14 @@ public: * @param classname - the name of the class you want. * @returns if the two above conditions are met. */ - static bool checkType( const KJS::Object &object, ProxyType prxyType, const QString &classname); + static bool checkType( const KJS::Object &object, ProxyType prxyType, const TQString &classname); JSProxy( int type ); virtual ~JSProxy(); /** Returns the string value of the class name **/ - virtual QString typeName() const = 0; + virtual TQString typeName() const = 0; /** Returns true iff the content of this proxy inherits the specified base-class. */ virtual bool inherits( const char *clazz ) = 0; /** Returns the type of the proxy. */ diff --git a/kjsembed/jssecuritypolicy.cpp b/kjsembed/jssecuritypolicy.cpp index 8630c2c5..872fb00f 100644 --- a/kjsembed/jssecuritypolicy.cpp +++ b/kjsembed/jssecuritypolicy.cpp @@ -69,7 +69,7 @@ bool JSSecurityPolicy::isInterpreterAllowed( const JSObjectProxy *prx, const KJS return false; } -bool JSSecurityPolicy::isObjectAllowed( const JSObjectProxy *prx, const QObject *obj ) const +bool JSSecurityPolicy::isObjectAllowed( const JSObjectProxy *prx, const TQObject *obj ) const { if ( !obj ) return false; @@ -83,13 +83,13 @@ bool JSSecurityPolicy::isObjectAllowed( const JSObjectProxy *prx, const QObject } bool JSSecurityPolicy::isPropertyAllowed( const JSObjectProxy *prx, - const QObject *obj, const char * /*prop*/ ) const + const TQObject *obj, const char * /*prop*/ ) const { return hasCapability( CapabilityGetProperties|CapabilitySetProperties ) && isObjectAllowed( prx, obj ); } -bool JSSecurityPolicy::isCreateAllowed( const JSObjectProxy *prx, const QObject *parent, - const QString &/*clazz*/, const QString &/*name*/ ) const +bool JSSecurityPolicy::isCreateAllowed( const JSObjectProxy *prx, const TQObject *parent, + const TQString &/*clazz*/, const TQString &/*name*/ ) const { if ( hasCapability(CapabilityFactory) && isObjectAllowed( prx, parent ) ) return true; diff --git a/kjsembed/jssecuritypolicy.h b/kjsembed/jssecuritypolicy.h index 0709b214..26e55881 100644 --- a/kjsembed/jssecuritypolicy.h +++ b/kjsembed/jssecuritypolicy.h @@ -36,7 +36,7 @@ class JSObjectProxy; * A SecurityPolicy must define tests for the following situations: * <ul> * <li>Does this request come from the correct @ref KJS::Interpreter ? - * <li>Is the script allowed to access the specified QObject ? + * <li>Is the script allowed to access the specified TQObject ? * <li>Is the script allowed to access the specified property ? * </ul> * The various isAllowed() methods are called automatically by @ref JSObjectProxy @@ -107,20 +107,20 @@ public: virtual bool isInterpreterAllowed( const JSObjectProxy *prx, const KJS::Interpreter *interp ) const; /** - * Returns true if scripts are allowed to see the specified QObject. + * Returns true if scripts are allowed to see the specified TQObject. */ - virtual bool isObjectAllowed( const JSObjectProxy *prx, const QObject *obj ) const; + virtual bool isObjectAllowed( const JSObjectProxy *prx, const TQObject *obj ) const; /** * Returns true if scripts are allowed to see the specified property. */ - virtual bool isPropertyAllowed( const JSObjectProxy *prx, const QObject *obj, const char *prop ) const; + virtual bool isPropertyAllowed( const JSObjectProxy *prx, const TQObject *obj, const char *prop ) const; /** * Returns true if scripts are allowed to create the specified child object. */ - virtual bool isCreateAllowed( const JSObjectProxy *prx, const QObject *parent, - const QString &clazz, const QString &name ) const; + virtual bool isCreateAllowed( const JSObjectProxy *prx, const TQObject *parent, + const TQString &clazz, const TQString &name ) const; /** * Returns the default SecurityPolicy. diff --git a/kjsembed/jsvalueproxy.cpp b/kjsembed/jsvalueproxy.cpp index 2e440cbb..cbc75b34 100644 --- a/kjsembed/jsvalueproxy.cpp +++ b/kjsembed/jsvalueproxy.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qvariant.h> +#include <tqvariant.h> #include "global.h" #include <kjs/interpreter.h> @@ -44,18 +44,18 @@ JSValueProxy::~JSValueProxy() { } -QString JSValueProxy::typeName() const +TQString JSValueProxy::typeName() const { return val.typeName(); } -void JSValueProxy::setValue( const QVariant &var ) +void JSValueProxy::setValue( const TQVariant &var ) { kdDebug(80001) << "JSValueProxy::setValue() variant, type is " << var.typeName() << endl; val = var; } -QVariant JSValueProxy::toVariant() const +TQVariant JSValueProxy::toVariant() const { kdDebug(80001) << "JSValueProxy::toVariant() variant, type is " << val.typeName() << endl; return val; @@ -78,7 +78,7 @@ void JSValueProxy::addBindings( KJS::ExecState *exec, KJS::Object &object ) KJS::UString JSValueProxy::toString( KJS::ExecState * /*exec*/ ) const { - QString s( "%1 (%2)" ); + TQString s( "%1 (%2)" ); return KJS::UString( s.arg("JSValueProxy").arg(val.typeName()) ); } diff --git a/kjsembed/jsvalueproxy.h b/kjsembed/jsvalueproxy.h index fe85c7df..4500fe02 100644 --- a/kjsembed/jsvalueproxy.h +++ b/kjsembed/jsvalueproxy.h @@ -22,8 +22,8 @@ #ifndef KJSEMBEDJSVALUEPROXY_H #define KJSEMBEDJSVALUEPROXY_H #include "global.h" -#include <qcstring.h> -#include <qvariant.h> +#include <tqcstring.h> +#include <tqvariant.h> #include <kjs/object.h> #include <kjsembed/jsproxy.h> @@ -40,13 +40,13 @@ public: JSValueProxy(); virtual ~JSValueProxy(); - QString typeName() const; + TQString typeName() const; /** Returns true iff the content of this proxy inherits the specified base-class. */ bool inherits( const char *clazz ); - void setValue( const QVariant &var ); + void setValue( const TQVariant &var ); - QVariant toVariant() const; + TQVariant toVariant() const; virtual void addBindings( KJS::ExecState *state, KJS::Object &object ); @@ -54,7 +54,7 @@ public: virtual KJS::UString toString( KJS::ExecState *exec ) const; private: - QVariant val; + TQVariant val; class JSValueProxyPrivate *d; }; diff --git a/kjsembed/jsvalueproxy_imp.cpp b/kjsembed/jsvalueproxy_imp.cpp index 9159e160..e3e30df3 100644 --- a/kjsembed/jsvalueproxy_imp.cpp +++ b/kjsembed/jsvalueproxy_imp.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qvariant.h> +#include <tqvariant.h> #include "global.h" #include <kjs/interpreter.h> diff --git a/kjsembed/jsvalueproxy_imp.h b/kjsembed/jsvalueproxy_imp.h index ad3c85ad..f0a88ab4 100644 --- a/kjsembed/jsvalueproxy_imp.h +++ b/kjsembed/jsvalueproxy_imp.h @@ -22,7 +22,7 @@ #ifndef KJSEMBEDJSVALUEPROXYIMP_H #define KJSEMBEDJSVALUEPROXYIMP_H -#include <qcstring.h> +#include <tqcstring.h> #include <kjs/object.h> #include <kjsembed/jsproxy_imp.h> diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp index 6caccdc3..4b6604cf 100644 --- a/kjsembed/kjscmd.cpp +++ b/kjsembed/kjscmd.cpp @@ -20,9 +20,9 @@ #include <stdio.h> #include <errno.h> -#include <qstring.h> +#include <tqstring.h> -#include <qregexp.h> +#include <tqregexp.h> #include <kaboutdata.h> #include <kapplication.h> @@ -55,11 +55,11 @@ int main( int argc, char **argv ) { bool nogui = false; bool doexec = false; - QCString appName = "kjscmd"; + TQCString appName = "kjscmd"; // Set the name of the instance for ( int i = 1 ; i < argc ; i++ ) { - QCString arg( argv[i] ); + TQCString arg( argv[i] ); if ( arg[0] != '-' ) { appName = arg.mid( arg.findRev('/') ); if ( !appName ) @@ -99,7 +99,7 @@ int main( int argc, char **argv ) } else { app = new KApplication; - app->connect( app, SIGNAL( lastWindowClosed() ), SLOT(quit()) ); + app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); } // Setup the rest @@ -144,8 +144,8 @@ int main( int argc, char **argv ) bool ok = part->runFile( args->arg(0) ); KJS::Completion jsres = part->completion(); if ( jsres.complType() != KJS::Normal) { - QTextStream err( stderr, IO_WriteOnly ); - QTextStream out( stdout, IO_WriteOnly ); + TQTextStream err( stderr, IO_WriteOnly ); + TQTextStream out( stdout, IO_WriteOnly ); switch ( jsres.complType() ) { case KJS::Break: @@ -162,8 +162,8 @@ int main( int argc, char **argv ) KJS::Object exception = jsres.value().toObject(exec); int line = exception.get(exec,KJS::Identifier("line")).toNumber(exec); - QString type = exception.get(exec,KJS::Identifier("name")).toString(exec).qstring(); - QString message = exception.get(exec,KJS::Identifier("message")).toString(exec).qstring(); + TQString type = exception.get(exec,KJS::Identifier("name")).toString(exec).qstring(); + TQString message = exception.get(exec,KJS::Identifier("message")).toString(exec).qstring(); err << "Uncaught " << type << " exception at: " << line << endl; err << message << endl; @@ -183,7 +183,7 @@ int main( int argc, char **argv ) result = app->exec(); if ( args->isSet( "interactive" ) ) { - part->execute( QString("include('cmdline.js');") ); + part->execute( TQString("include('cmdline.js');") ); } return result; diff --git a/kjsembed/kjsembedpart.cpp b/kjsembed/kjsembedpart.cpp index 319bfde8..b39b8813 100644 --- a/kjsembed/kjsembedpart.cpp +++ b/kjsembed/kjsembedpart.cpp @@ -21,12 +21,12 @@ #include <string.h> #include <errno.h> -#include <qobject.h> -#include <qdialog.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qwidget.h> -#include <qwidgetfactory.h> +#include <tqobject.h> +#include <tqdialog.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqwidget.h> +#include <tqwidgetfactory.h> #ifndef QT_ONLY #include <kaction.h> @@ -89,7 +89,7 @@ namespace KJSEmbed { // KPart // -KJSEmbedPart::KJSEmbedPart( QObject *parent, const char *name ) +KJSEmbedPart::KJSEmbedPart( TQObject *parent, const char *name ) : KParts::ReadOnlyPart( parent, name ? name : "kjsembed_part" ), jsConsole(0), jsfactory(0), widgetparent(0), widgetname(name ? name : "kjsembed_part"), deletejs(false) @@ -99,7 +99,7 @@ KJSEmbedPart::KJSEmbedPart( QObject *parent, const char *name ) createActionClient(); } -KJSEmbedPart::KJSEmbedPart( QWidget *wparent, const char *wname, QObject *parent, const char *name ) +KJSEmbedPart::KJSEmbedPart( TQWidget *wparent, const char *wname, TQObject *parent, const char *name ) : KParts::ReadOnlyPart( parent, name ? name : (wname?wname:"jsembed_part") ), jsConsole(0), jsfactory(0), widgetparent(wparent), widgetname(wname), deletejs(false) @@ -109,8 +109,8 @@ KJSEmbedPart::KJSEmbedPart( QWidget *wparent, const char *wname, QObject *parent createActionClient(); } -KJSEmbedPart::KJSEmbedPart( KJS::Interpreter *jsi, QWidget *wparent, const char *wname, - QObject *parent, const char *name ) +KJSEmbedPart::KJSEmbedPart( KJS::Interpreter *jsi, TQWidget *wparent, const char *wname, + TQObject *parent, const char *name ) : KParts::ReadOnlyPart( parent, name ? name : (wname?wname:"jsembed_part") ), jsConsole(0), jsfactory(0), builtins(0), widgetparent(wparent), widgetname(wname), js(jsi), deletejs(false) @@ -161,7 +161,7 @@ JSConsoleWidget *KJSEmbedPart::view() { #ifndef QT_ONLY if ( !jsConsole ) { - QCString name = widgetname ? widgetname : QCString("jsembed_console"); + TQCString name = widgetname ? widgetname : TQCString("jsembed_console"); jsConsole = new JSConsoleWidget( this, widgetparent, name ); setWidget( jsConsole ); jsfactory->addType( jsConsole->className() ); @@ -171,9 +171,9 @@ JSConsoleWidget *KJSEmbedPart::view() return 0L; } -QStringList KJSEmbedPart::constructorNames() const +TQStringList KJSEmbedPart::constructorNames() const { - QStringList classes; + TQStringList classes; KJS::List cons = constructorList(); KJS::ListIterator it = cons.begin(); @@ -224,9 +224,9 @@ KJS::List KJSEmbedPart::constructorList() const // Version information // -QCString KJSEmbedPart::versionString() const +TQCString KJSEmbedPart::versionString() const { - return QCString(KJSEMBED_VERSION_STRING); + return TQCString(KJSEMBED_VERSION_STRING); } int KJSEmbedPart::versionMajor() const @@ -243,7 +243,7 @@ int KJSEmbedPart::versionMinor() const // Execute a JS script. // -KJS::Value KJSEmbedPart::evaluate( const QString &script, const KJS::Value &self ) +KJS::Value KJSEmbedPart::evaluate( const TQString &script, const KJS::Value &self ) { if ( execute( res, script, self ) ) return res.value(); @@ -251,12 +251,12 @@ KJS::Value KJSEmbedPart::evaluate( const QString &script, const KJS::Value &self return KJS::Null(); } -bool KJSEmbedPart::execute( const QString &script, const KJS::Value &self ) +bool KJSEmbedPart::execute( const TQString &script, const KJS::Value &self ) { return execute( res, script, self ); } -bool KJSEmbedPart::execute( KJS::Completion &result, const QString &script, const KJS::Value &self ) +bool KJSEmbedPart::execute( KJS::Completion &result, const TQString &script, const KJS::Value &self ) { KJS::Value val( self ); result = js->evaluate( script, self.isNull() ? partobj : val ); @@ -269,13 +269,13 @@ bool KJSEmbedPart::openURL( const KURL &url ) // kdDebug(80001) << "KJSEmbedPart: openURL '" << url.url() << "' is javascript" << endl; #ifndef QT_ONLY - QString cmd = url.url(); + TQString cmd = url.url(); #else - QString cmd = url.toString(); + TQString cmd = url.toString(); #endif - QString js( "javascript:" ); - cmd = cmd.replace( 0, js.length(), QString("") ); + TQString js( "javascript:" ); + cmd = cmd.replace( 0, js.length(), TQString("") ); // kdDebug(80001) << "KJSEmbedPart: JS command is '" << cmd << "'" << endl; return execute( cmd ); @@ -287,14 +287,14 @@ bool KJSEmbedPart::openURL( const KURL &url ) // Invoke a script file. // -bool KJSEmbedPart::runFile( const QString &name, const KJS::Value &self ) +bool KJSEmbedPart::runFile( const TQString &name, const KJS::Value &self ) { kdDebug(80001) << "KJSEmbedPart::runFile(): file is '" << name << "'" << endl; - QString script = loadFile( name ); + TQString script = loadFile( name ); return execute( script, self ); } -bool KJSEmbedPart::loadActionSet( const QString &file ) +bool KJSEmbedPart::loadActionSet( const TQString &file ) { #ifndef QT_ONLY return xmlclient->load( file ); @@ -304,23 +304,23 @@ bool KJSEmbedPart::loadActionSet( const QString &file ) #endif // QT_ONLY } -QString KJSEmbedPart::loadFile( const QString &src ) +TQString KJSEmbedPart::loadFile( const TQString &src ) { - QString script; + TQString script; if ( src == "-" ) { - QTextStream ts( stdin, IO_ReadOnly ); + TQTextStream ts( stdin, IO_ReadOnly ); script = ts.read(); } else { - QFile file( src ); + TQFile file( src ); if ( file.open( IO_ReadOnly ) ) { - script = QString( file.readAll() ); + script = TQString( file.readAll() ); } else { kdWarning() << "Could not open file '" << src << "', " << strerror( errno ) << endl; - return QString::null; + return TQString::null; } } @@ -337,14 +337,14 @@ QString KJSEmbedPart::loadFile( const QString &src ) // Publishing objects. // -KJS::Object KJSEmbedPart::bind( QObject *obj ) +KJS::Object KJSEmbedPart::bind( TQObject *obj ) { KJS::Object jsobj = jsfactory->createProxy( js->globalExec(), obj ); JSProxy::toObjectProxy(jsobj.imp() )->setOwner(JSProxy::Native); return jsobj; } -KJS::Object KJSEmbedPart::addObject( QObject *obj, KJS::Object &parent, const char *name ) +KJS::Object KJSEmbedPart::addObject( TQObject *obj, KJS::Object &parent, const char *name ) { KJS::Object jsobj = bind( obj ); parent.put( js->globalExec(), name ? name : obj->name(), jsobj ); @@ -352,7 +352,7 @@ KJS::Object KJSEmbedPart::addObject( QObject *obj, KJS::Object &parent, const ch return jsobj; } -KJS::Object KJSEmbedPart::addObject( QObject *obj, const char *name ) +KJS::Object KJSEmbedPart::addObject( TQObject *obj, const char *name ) { return addObject( obj, js->globalObject(), name ); } @@ -362,10 +362,10 @@ void KJSEmbedPart::virtual_hook( int /*id*/, void * /*data*/ ) } -static KJS::Object scopeWalker( KJS::ExecState *exec, const KJS::Object &root, const QString &objectString ) +static KJS::Object scopeWalker( KJS::ExecState *exec, const KJS::Object &root, const TQString &objectString ) { KJS::Object returnObject = root; - QStringList objects = QStringList::split(".", objectString); + TQStringList objects = TQStringList::split(".", objectString); for( uint idx = 0; idx < objects.count(); ++idx) { KJS::Identifier id = KJS::Identifier( KJS::UString( objects[idx] )); @@ -376,7 +376,7 @@ static KJS::Object scopeWalker( KJS::ExecState *exec, const KJS::Object &root, c return returnObject; } -KJS::Value KJSEmbedPart::callMethod( const QString & methodName, const KJS::List & args ) const +KJS::Value KJSEmbedPart::callMethod( const TQString & methodName, const KJS::List & args ) const { KJS::ExecState *exec = js->globalExec(); KJS::Identifier id = KJS::Identifier( KJS::UString(methodName.latin1() )); @@ -406,7 +406,7 @@ KJS::Value KJSEmbedPart::callMethod( const QString & methodName, const KJS::List return retValue; } -KJS::Value KJSEmbedPart::getValue( const QString & valueName ) const +KJS::Value KJSEmbedPart::getValue( const TQString & valueName ) const { KJS::ExecState *exec = js->globalExec(); KJS::Identifier id = KJS::Identifier( KJS::UString(valueName.latin1() )); @@ -414,7 +414,7 @@ KJS::Value KJSEmbedPart::getValue( const QString & valueName ) const return obj.get(exec, id ); } -void KJSEmbedPart::putValue( const QString & valueName, const KJS::Value & value ) +void KJSEmbedPart::putValue( const TQString & valueName, const KJS::Value & value ) { KJS::ExecState *exec = js->globalExec(); KJS::Identifier id = KJS::Identifier( KJS::UString(valueName.latin1() )); @@ -422,18 +422,18 @@ void KJSEmbedPart::putValue( const QString & valueName, const KJS::Value & value obj.put(exec, id, value); } -void KJSEmbedPart::putVariant( const QString & valueName, const QVariant & value ) +void KJSEmbedPart::putVariant( const TQString & valueName, const TQVariant & value ) { KJS::Value val = convertToValue( js->globalExec(), value); putValue( valueName, val ); } -QVariant KJSEmbedPart::getVariant( const QString & valueName ) const +TQVariant KJSEmbedPart::getVariant( const TQString & valueName ) const { return convertToVariant( js->globalExec(), getValue( valueName ) ); } -bool KJSEmbedPart::hasMethod( const QString & methodName ) +bool KJSEmbedPart::hasMethod( const TQString & methodName ) { KJS::ExecState *exec = js->globalExec(); KJS::Identifier id = KJS::Identifier( KJS::UString(methodName.latin1() )); diff --git a/kjsembed/kjsembedpart.h b/kjsembed/kjsembedpart.h index 4645cf60..e9be3efc 100644 --- a/kjsembed/kjsembedpart.h +++ b/kjsembed/kjsembedpart.h @@ -22,7 +22,7 @@ #ifndef KJSEMBEDJSCONSOLEPART_H #define KJSEMBEDJSCONSOLEPART_H #include "global.h" -#include <qstringlist.h> +#include <tqstringlist.h> #ifndef QT_ONLY #include <kparts/part.h> @@ -63,25 +63,25 @@ class JSBuiltIn; * @author Richard Moore, rich@kde.org * This is the easiest class for interacting and embedding the interpreter. To use KJSEmbed in yours * application you can simply create a new KJSEmbedPart. Once you have this object you can expose your - * QObect based classes with a few simple methods. The interface also allows for the manipulation of QVariant data + * QObect based classes with a few simple methods. The interface also allows for the manipulation of TQVariant data * structures between Javascript and C++. Complex Javascript arrays are transparently converted to QMaps and QValueLists - * depending on the type of the Array. KJSEmbed also provides transparent access to most QVariant datatypes between - * C++ and Javascript. The easiest way to integrate KJSEmbed into your application is to create a QObject based class + * depending on the type of the Array. KJSEmbed also provides transparent access to most TQVariant datatypes between + * C++ and Javascript. The easiest way to integrate KJSEmbed into your application is to create a TQObject based class * that will be your interface between C++ and Javascript. This object than can expose C++ methods via Qt slots, and - * QVariant datatypes via Qt properties. This class will also have an interface where C++ objects can call Javascript + * TQVariant datatypes via Qt properties. This class will also have an interface where C++ objects can call Javascript * methods. */ class KJSEMBED_EXPORT KJSEmbedPart : public KParts::ReadOnlyPart { Q_OBJECT - Q_PROPERTY( QStringList constructorNames READ constructorNames ) - Q_PROPERTY( QCString versionString READ versionString ) + Q_PROPERTY( TQStringList constructorNames READ constructorNames ) + Q_PROPERTY( TQCString versionString READ versionString ) Q_PROPERTY( int versionMajor READ versionMajor ) Q_PROPERTY( int versionMinor READ versionMinor ) public: /** Create a KJSEmbedPart. */ - KJSEmbedPart( QObject *parent=0, const char *name=0 ); + KJSEmbedPart( TQObject *parent=0, const char *name=0 ); /** * Creates a KJSEmbedPart for which the parents of the view and part are different. @@ -92,15 +92,15 @@ public: * constructor. This results in the widget trying to do GUI related things * after the QPaint stuff is destroyed. */ - KJSEmbedPart( QWidget *wparent, const char *wname=0, QObject *parent=0, const char *name=0 ); + KJSEmbedPart( TQWidget *wparent, const char *wname=0, TQObject *parent=0, const char *name=0 ); /** * Create a KJSEmbedPart with the specified interpreter. * * See warning above. */ - KJSEmbedPart( KJS::Interpreter *js, QWidget *wparent, const char *wname=0, - QObject *parent=0, const char *name=0 ); + KJSEmbedPart( KJS::Interpreter *js, TQWidget *wparent, const char *wname=0, + TQObject *parent=0, const char *name=0 ); /** Cleans up. */ virtual ~KJSEmbedPart(); @@ -110,7 +110,7 @@ public: // /** Returns the version of KJSEmbed. */ - QCString versionString() const; + TQCString versionString() const; /** Returns the minor version number of KJSEmbed. */ int versionMajor() const; @@ -129,53 +129,53 @@ public: * else * ... // function not present. */ - bool hasMethod( const QString &methodName ); + bool hasMethod( const TQString &methodName ); /** Calls a method from Javascript starting from the global context. * @code * KJS::List args; * args.append(KJS::String("String Arg") ); * args.append(KJS::Number(10) ); - * args.append(KJSEmbed::convertToValue(js->globalExec(), QColor("blue" ) ) ); + * args.append(KJSEmbed::convertToValue(js->globalExec(), TQColor("blue" ) ) ); * KJS::Value val = js->callMethod("javascriptFunction", args ); - * QString myString = val.toString().qstring(); + * TQString myString = val.toString().qstring(); * @endcode */ - KJS::Value callMethod(const QString &methodName, const KJS::List &args) const; + KJS::Value callMethod(const TQString &methodName, const KJS::List &args) const; /** Gets a value from Javascript starting from the global context. * @code * KJS::Value val = js->getValue("someValue"); - * QString myString = val.toString().qstring(); + * TQString myString = val.toString().qstring(); * @endcode */ - KJS::Value getValue( const QString &valueName ) const; + KJS::Value getValue( const TQString &valueName ) const; /** Sets a value in a Javascript starting from the global context. * Note if this value is not present in the javascript context it will * become defined once this method is called. * @code - * KJS::Value val = KJSEmbed::convertToValue(js->globalExec(), QColor("blue")); + * KJS::Value val = KJSEmbed::convertToValue(js->globalExec(), TQColor("blue")); * js->putValue("myVar", val); * @endcode */ - void putValue( const QString &valueName, const KJS::Value &value); + void putValue( const TQString &valueName, const KJS::Value &value); /** Convinence method that wraps around @ref putValue that only handles values - * that are supported by QVariant. + * that are supported by TQVariant. * @code - * js->putVariant( "myVar", QColor("blue") ); + * js->putVariant( "myVar", TQColor("blue") ); * @endcode */ - void putVariant( const QString &valueName, const QVariant &value); + void putVariant( const TQString &valueName, const TQVariant &value); /** Convinence method that wraps around @ref getValue that only handles values - * that are supported by QVariant. + * that are supported by TQVariant. * @code - * QColor value = js->getVariant( "myVar").toColor(); + * TQColor value = js->getVariant( "myVar").toColor(); * @endcode */ - QVariant getVariant( const QString &valueName ) const; + TQVariant getVariant( const TQString &valueName ) const; /** Returns the global object of the interpreter. */ KJS::Object globalObject() const { return js->globalObject(); } @@ -191,7 +191,7 @@ public: * not specified then the name property of 'obj' is used instead. * @code * // In C++ - * QObject *myClass = new QObjectBasedClass(this, "jsObject"); + * TQObject *myClass = new QObjectBasedClass(this, "jsObject"); * js->addObject( myClass ); * // In Javascript * jsObject.someProperty = "Test Property"; @@ -199,23 +199,23 @@ public: * kdDebug() << "New Value: " << myClass->someProperty() << endl; // displays "Test Property" * @endcode */ - KJS::Object addObject( QObject *obj, const char *name=0 ); + KJS::Object addObject( TQObject *obj, const char *name=0 ); /** * Publishes 'obj' as property 'name' of object 'parent'. The binding is defined * using @ref JSObjectProxy, and is subject to the current default SecurityPolicy. */ - KJS::Object addObject( QObject *obj, KJS::Object &parent, const char *name=0 ); + KJS::Object addObject( TQObject *obj, KJS::Object &parent, const char *name=0 ); - /** Returns a JS::Object that provides a binding to the specified QObject. */ - KJS::Object bind( QObject *obj ); + /** Returns a JS::Object that provides a binding to the specified TQObject. */ + KJS::Object bind( TQObject *obj ); // // Query the supported types // /** Returns a list of the names of the constructors of this interpreter. */ - QStringList constructorNames() const; + TQStringList constructorNames() const; /** Returns a JS Array of the constructors of this interpreter. */ KJS::Value constructors() const; @@ -242,7 +242,7 @@ public slots: KJSEmbed::XMLActionClient *actionClient() const { return xmlclient; } /** Loads the XML actions defined in the specified file to the default XMLActionClient. */ - bool loadActionSet( const QString &file ); + bool loadActionSet( const TQString &file ); // // Script environemnt @@ -258,26 +258,26 @@ public slots: JSFactory *factory() const { return jsfactory; } /** Evaluates the specified string, with the specified value as 'this'. */ - virtual KJS::Value evaluate( const QString &script, const KJS::Value &self=KJS::Null() ); + virtual KJS::Value evaluate( const TQString &script, const KJS::Value &self=KJS::Null() ); /** Executes the specified string, with the specified value as 'this'. */ - bool execute( const QString &script, const KJS::Value &self=KJS::Null() ); + bool execute( const TQString &script, const KJS::Value &self=KJS::Null() ); /** * Executes the specified string, with the specified value as 'this' and sets * result to the completion object returned by the interpreter. */ - virtual bool execute( KJS::Completion &result, const QString &script, const KJS::Value &self ); + virtual bool execute( KJS::Completion &result, const TQString &script, const KJS::Value &self ); /** Loads and runs the specified file. */ - virtual bool runFile( const QString &filename, const KJS::Value &self=KJS::Null() ); + virtual bool runFile( const TQString &filename, const KJS::Value &self=KJS::Null() ); /** * Loads but does not execute the specified script file. If the * first line of the file starts with the string '#!' then that * line will be omitted from the returned string. */ - QString loadFile( const QString &file ); + TQString loadFile( const TQString &file ); protected: /** Creates the interpreter. */ @@ -306,8 +306,8 @@ private: JSConsoleWidget *jsConsole; JSFactory *jsfactory; JSBuiltIn *builtins; - QWidget *widgetparent; - QCString widgetname; + TQWidget *widgetparent; + TQCString widgetname; KJS::Object partobj; KJS::Completion res; diff --git a/kjsembed/kjsembedpart_imp.cpp b/kjsembed/kjsembedpart_imp.cpp index 98c74859..abd28782 100644 --- a/kjsembed/kjsembedpart_imp.cpp +++ b/kjsembed/kjsembedpart_imp.cpp @@ -29,7 +29,7 @@ namespace KJSEmbed { namespace Bindings { -KJSEmbedPartImp::KJSEmbedPartImp( KJS::ExecState *exec, KJSEmbedPart *jsp, int mid, const QString &p ) +KJSEmbedPartImp::KJSEmbedPartImp( KJS::ExecState *exec, KJSEmbedPart *jsp, int mid, const TQString &p ) : JSProxyImp(exec), part(jsp), id(mid), param(p) { } @@ -38,8 +38,8 @@ KJSEmbedPartImp::~KJSEmbedPartImp() {} KJS::Value KJSEmbedPartImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, const KJS::List &args ) { - QString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : QString::null; -// QString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() > 0) ? args[0].toString(exec).qstring() : TQString::null; +// TQString arg1 = (args.size() > 1) ? args[1].toString(exec).qstring() : TQString::null; if ( id == MethodCreate ) { return part->factory()->create( exec, arg0.latin1(), args.copyTail() ); @@ -48,7 +48,7 @@ KJS::Value KJSEmbedPartImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, c kdWarning() << "KJSEmbedPartImp has no method " << id << endl; } - QString msg = i18n( "KJSEmbedPartImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "KJSEmbedPartImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } diff --git a/kjsembed/kjsembedpart_imp.h b/kjsembed/kjsembedpart_imp.h index a7ca1f83..ae743fed 100644 --- a/kjsembed/kjsembedpart_imp.h +++ b/kjsembed/kjsembedpart_imp.h @@ -47,10 +47,10 @@ public: CustomMethod=0x1000 }; - KJSEmbedPartImp( KJS::ExecState *exec, KJSEmbedPart *part, int id, const QString ¶m=QString::null ); + KJSEmbedPartImp( KJS::ExecState *exec, KJSEmbedPart *part, int id, const TQString ¶m=TQString::null ); ~KJSEmbedPartImp(); - QString parameter() const { return param; } + TQString parameter() const { return param; } /** Returns true iff this object implements the call function. */ virtual bool implementsCall() const { return true; } @@ -61,7 +61,7 @@ public: private: KJSEmbedPart *part; uint id; - QString param; + TQString param; class KJSEmbedPartImpPrivate *d; }; diff --git a/kjsembed/kscript/javascript.cpp b/kjsembed/kscript/javascript.cpp index 31976981..22de1aef 100644 --- a/kjsembed/kscript/javascript.cpp +++ b/kjsembed/kscript/javascript.cpp @@ -31,7 +31,7 @@ typedef KGenericFactory<JavaScript, KScriptClientInterface> JavaScriptFactory; K_EXPORT_COMPONENT_FACTORY( libjavascript, JavaScriptFactory( "JavaScript" ) ) -JavaScript::JavaScript(KScriptClientInterface *parent, const char *name, const QStringList &args ) +JavaScript::JavaScript(KScriptClientInterface *parent, const char *name, const TQStringList &args ) { ScriptClientInterface = parent; m_jsembed = new KJSEmbed::KJSEmbedPart(this, "kjsembed_part"); @@ -45,25 +45,25 @@ JavaScript::~JavaScript() { } -QString JavaScript::script() const +TQString JavaScript::script() const { return m_scriptLoc; } -void JavaScript::setScript( const QString &scriptFile ) +void JavaScript::setScript( const TQString &scriptFile ) { m_scriptLoc = scriptFile; } -void JavaScript::setScript( const QString &scriptFile, const QString &method ) +void JavaScript::setScript( const TQString &scriptFile, const TQString &method ) { m_scriptLoc = scriptFile; m_method = method; } -void JavaScript::run(QObject *context, const QVariant &arg) +void JavaScript::run(TQObject *context, const TQVariant &arg) { - QVariant retVal; + TQVariant retVal; if( context ) m_jsembed->addObject(context); m_jsembed->runFile(m_scriptLoc, m_jsembed->globalObject() ); @@ -78,17 +78,17 @@ void JavaScript::run(QObject *context, const QVariant &arg) ScriptClientInterface->done(KScriptClientInterface::ResultSuccess, retVal); } -void JavaScript::writeLine( const QString &msg ) +void JavaScript::writeLine( const TQString &msg ) { ScriptClientInterface->output(msg); } -void JavaScript::writeWarning( const QString &msg ) +void JavaScript::writeWarning( const TQString &msg ) { ScriptClientInterface->warning(msg); } -void JavaScript::writeError( const QString &msg ) +void JavaScript::writeError( const TQString &msg ) { ScriptClientInterface->error(msg); } @@ -98,7 +98,7 @@ void JavaScript::setProgress( int percent ) ScriptClientInterface->progress(percent); } -QString JavaScript::appID() const +TQString JavaScript::appID() const { return kapp->dcopClient()->appId(); } diff --git a/kjsembed/kscript/javascript.h b/kjsembed/kscript/javascript.h index 7b5143a7..fa76a341 100644 --- a/kjsembed/kscript/javascript.h +++ b/kjsembed/kscript/javascript.h @@ -20,8 +20,8 @@ #define __javascript_h__ #include <scriptinterface.h> -#include <qvariant.h> -#include <qobject.h> +#include <tqvariant.h> +#include <tqobject.h> namespace KJSEmbed { class KJSEmbedPart; @@ -31,30 +31,30 @@ namespace KJSEmbed { class JavaScript : public KScriptInterface { Q_OBJECT - Q_PROPERTY( QString appID READ appID ) + Q_PROPERTY( TQString appID READ appID ) public: - JavaScript(KScriptClientInterface *parent, const char *name, const QStringList &args); + JavaScript(KScriptClientInterface *parent, const char *name, const TQStringList &args); virtual ~JavaScript(); - QString script() const; - void setScript( const QString &scriptFile ); - void setScript( const QString &scriptLibFile, const QString &method ); - void run(QObject *context = 0, const QVariant &arg = 0); + TQString script() const; + void setScript( const TQString &scriptFile ); + void setScript( const TQString &scriptLibFile, const TQString &method ); + void run(TQObject *context = 0, const TQVariant &arg = 0); void kill(); - QString appID() const; + TQString appID() const; public slots: - void writeLine( const QString &msg ); - void writeWarning( const QString &msg ); - void writeError( const QString &msg ); + void writeLine( const TQString &msg ); + void writeWarning( const TQString &msg ); + void writeError( const TQString &msg ); void setProgress( int percent ); private: KScriptClientInterface *ScriptClientInterface; KJSEmbed::KJSEmbedPart *m_jsembed; - QString m_method; - QString m_scriptLoc; + TQString m_method; + TQString m_scriptLoc; }; #endif diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp index ace19fcc..212566ec 100644 --- a/kjsembed/ksimpleprocess.cpp +++ b/kjsembed/ksimpleprocess.cpp @@ -19,27 +19,27 @@ * Boston, MA 02110-1301, USA. */ #include "ksimpleprocess.h" -#include <qapplication.h> +#include <tqapplication.h> #include <klocale.h> -static QStringList splitArgList( const QString &args) +static TQStringList splitArgList( const TQString &args) { - QStringList returnArgs = QStringList::split( ' ', args); + TQStringList returnArgs = TQStringList::split( ' ', args); return returnArgs; } -QString KSimpleProcess::exec( const QString &args, bool addStdErr ) +TQString KSimpleProcess::exec( const TQString &args, bool addStdErr ) { KSimpleProcess proc; return proc.execInternal( args, addStdErr); } -QString KSimpleProcess::execInternal( const QString &args, bool addStdError) +TQString KSimpleProcess::execInternal( const TQString &args, bool addStdError) { m_proc->setArguments( splitArgList( args )); - connect(m_proc, SIGNAL(processExited()), this, SLOT(slotProcessExited())); - connect(m_proc, SIGNAL(readyReadStdout()), this, SLOT(slotReceivedStdout())); + connect(m_proc, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotProcessExited())); + connect(m_proc, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(slotReceivedStdout())); if( addStdError ) - connect(m_proc, SIGNAL(readyReadStderr()), this, SLOT(slotReceivedStderr())); + connect(m_proc, TQT_SIGNAL(readyReadStderr()), this, TQT_SLOT(slotReceivedStderr())); if ( !m_proc->start() ) return i18n("Could not run command '%1'.").arg( args.latin1() ); @@ -47,11 +47,11 @@ QString KSimpleProcess::execInternal( const QString &args, bool addStdError) return m_currBuffer; } -KSimpleProcess::KSimpleProcess() : QObject(0,0) +KSimpleProcess::KSimpleProcess() : TQObject(0,0) { m_currBuffer = ""; m_stdErrOn = false; - m_proc = new QProcess(this); + m_proc = new TQProcess(this); } KSimpleProcess::~KSimpleProcess() @@ -61,13 +61,13 @@ KSimpleProcess::~KSimpleProcess() // If a troll sees this, he kills david not me -void qt_enter_modal( QWidget *widget ); -void qt_leave_modal( QWidget *widget ); +void qt_enter_modal( TQWidget *widget ); +void qt_leave_modal( TQWidget *widget ); void KSimpleProcess::enter_loop() { - QWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( QWidget::NoFocus ); + TQWidget dummy(0,0,WType_Dialog | WShowModal); + dummy.setFocusPolicy( TQWidget::NoFocus ); qt_enter_modal(&dummy); qApp->enter_loop(); qt_leave_modal(&dummy); diff --git a/kjsembed/ksimpleprocess.h b/kjsembed/ksimpleprocess.h index 12b20805..cc825f05 100644 --- a/kjsembed/ksimpleprocess.h +++ b/kjsembed/ksimpleprocess.h @@ -22,8 +22,8 @@ #ifndef KSIMPLE_PROCESS_H #define KSIMPLE_PROCESS_H -#include <qobject.h> -#include <qprocess.h> +#include <tqobject.h> +#include <tqprocess.h> /** * Very simple class that allows one to run a command and get the @@ -43,21 +43,21 @@ public: * in value. * Example: *\code - * QString myProc = KSimpleProcess::exec( "ps -uh" ); + * TQString myProc = KSimpleProcess::exec( "ps -uh" ); * kdDebug() << "Running Processes\n" << myProc << endl; *\endcode */ - static QString exec( const QString &args, bool addStdErr = false ); + static TQString exec( const TQString &args, bool addStdErr = false ); private: KSimpleProcess(); ~KSimpleProcess(); void enter_loop(); - QString execInternal( const QString &args, bool addStdError); + TQString execInternal( const TQString &args, bool addStdError); - QString m_currBuffer; + TQString m_currBuffer; bool m_stdErrOn; - QProcess *m_proc; + TQProcess *m_proc; public slots: void slotProcessExited(); diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp index 132eead5..f53afc0c 100644 --- a/kjsembed/plugin/jsconsoleplugin.cpp +++ b/kjsembed/plugin/jsconsoleplugin.cpp @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( libjsconsoleplugin, JSConsolePluginFactory( "jsconso // namespace KJSEmbed { -JSConsolePlugin::JSConsolePlugin( QObject *parent, const char *name, const QStringList & ) +JSConsolePlugin::JSConsolePlugin( TQObject *parent, const char *name, const TQStringList & ) : KParts::Plugin( parent, name ) { js = 0; @@ -51,7 +51,7 @@ JSConsolePlugin::JSConsolePlugin( QObject *parent, const char *name, const QStri menu->setDelayed( false ); menu->insert( new KAction( i18n("&Console"), 0, - this, SLOT( showConsole() ), + this, TQT_SLOT( showConsole() ), actionCollection(), "jsconsole_show") ); } diff --git a/kjsembed/plugin/jsconsoleplugin.h b/kjsembed/plugin/jsconsoleplugin.h index 6f4bc54b..18a17ed9 100644 --- a/kjsembed/plugin/jsconsoleplugin.h +++ b/kjsembed/plugin/jsconsoleplugin.h @@ -39,7 +39,7 @@ class JSConsolePlugin : public KParts::Plugin Q_OBJECT public: - JSConsolePlugin( QObject *parent, const char *name, const QStringList & ); + JSConsolePlugin( TQObject *parent, const char *name, const TQStringList & ); ~JSConsolePlugin(); private slots: diff --git a/kjsembed/plugins/customobject_plugin.cpp b/kjsembed/plugins/customobject_plugin.cpp index 7c188cba..b883ff66 100644 --- a/kjsembed/plugins/customobject_plugin.cpp +++ b/kjsembed/plugins/customobject_plugin.cpp @@ -26,8 +26,8 @@ #include <kjsembed/jsfactory_imp.h> #include <kjsembed/kjsembedpart.h> #include <kjsembed/customobject_imp.h> -#include <qvariant.h> -#include <qbrush.h> +#include <tqvariant.h> +#include <tqbrush.h> #include "customobject_plugin.h" @@ -39,10 +39,10 @@ class MyCustomObject public: enum Mode { On, Off }; Mode mode; - QString thing; + TQString thing; }; -MyCustomObjectLoader::MyCustomObjectLoader( QObject *parent, const char *name, const QStringList &args ) : +MyCustomObjectLoader::MyCustomObjectLoader( TQObject *parent, const char *name, const TQStringList &args ) : JSBindingPlugin(parent, name, args) { } @@ -170,9 +170,9 @@ int MyCustomObjectImp::extractInt( KJS::ExecState *exec, const KJS::List &args, { return (args.size() > idx) ? args[idx].toInteger(exec) : 0; } -QString MyCustomObjectImp::extractString(KJS::ExecState *exec, const KJS::List &args, int idx) +TQString MyCustomObjectImp::extractString(KJS::ExecState *exec, const KJS::List &args, int idx) { - return (args.size() > idx) ? args[idx].toString(exec).qstring() : QString::null; + return (args.size() > idx) ? args[idx].toString(exec).qstring() : TQString::null; } } // namespace KJSEmbed::Bindings diff --git a/kjsembed/plugins/customobject_plugin.h b/kjsembed/plugins/customobject_plugin.h index 2cea3415..5f417e69 100644 --- a/kjsembed/plugins/customobject_plugin.h +++ b/kjsembed/plugins/customobject_plugin.h @@ -31,7 +31,7 @@ namespace Bindings { class KJSEMBED_EXPORT MyCustomObjectLoader : public JSBindingPlugin { public: - MyCustomObjectLoader( QObject *parent, const char *name, const QStringList &args ); + MyCustomObjectLoader( TQObject *parent, const char *name, const TQStringList &args ); KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const; }; @@ -58,7 +58,7 @@ public: private: int extractInt( KJS::ExecState *exec, const KJS::List &args, int idx); - QString extractString(KJS::ExecState *exec, const KJS::List &args, int idx); + TQString extractString(KJS::ExecState *exec, const KJS::List &args, int idx); int mid; }; diff --git a/kjsembed/plugins/customqobject_plugin.cpp b/kjsembed/plugins/customqobject_plugin.cpp index f8c45a60..6d1fccc7 100644 --- a/kjsembed/plugins/customqobject_plugin.cpp +++ b/kjsembed/plugins/customqobject_plugin.cpp @@ -24,7 +24,7 @@ #include <kjsembed/jsbinding.h> #include <kjsembed/kjsembedpart.h> #include <kjsembed/customobject_imp.h> -#include <qvariant.h> +#include <tqvariant.h> #include "customqobject_plugin.h" @@ -32,7 +32,7 @@ namespace KJSEmbed { namespace Bindings { -MyCustomQObjectLoader::MyCustomQObjectLoader( QObject *parent, const char *name, const QStringList &args ) : +MyCustomQObjectLoader::MyCustomQObjectLoader( TQObject *parent, const char *name, const TQStringList &args ) : JSBindingPlugin(parent, name, args) { } @@ -41,7 +41,7 @@ KJS::Object MyCustomQObjectLoader::createBinding(KJSEmbedPart *jspart, KJS::Exec { kdDebug() << "Loading a custom object" << endl; - QObject *parent = 0L; + TQObject *parent = 0L; JSObjectProxy *proxy = JSProxy::toObjectProxy( args[0].imp() ); if ( proxy ) parent = proxy->object(); @@ -54,8 +54,8 @@ KJS::Object MyCustomQObjectLoader::createBinding(KJSEmbedPart *jspart, KJS::Exec return proxyObj; } -MyCustomQObjectImp::MyCustomQObjectImp(QObject *parent, const char *name ) - : QObject(parent, name) +MyCustomQObjectImp::MyCustomQObjectImp(TQObject *parent, const char *name ) + : TQObject(parent, name) { kdDebug() << "New MyCustomQObjectImp " << endl; } @@ -74,12 +74,12 @@ void MyCustomQObjectImp::setMode( Mode md) kdDebug() << "setMode() " << endl; m_mode = md; } -QString MyCustomQObjectImp::thing() const +TQString MyCustomQObjectImp::thing() const { kdDebug() << "thing()" << endl; return m_thing; } -void MyCustomQObjectImp::setThing( const QString &t) +void MyCustomQObjectImp::setThing( const TQString &t) { kdDebug() << "setThing() " << t << endl; m_thing = t; diff --git a/kjsembed/plugins/customqobject_plugin.h b/kjsembed/plugins/customqobject_plugin.h index bd419b59..b80ac67a 100644 --- a/kjsembed/plugins/customqobject_plugin.h +++ b/kjsembed/plugins/customqobject_plugin.h @@ -24,7 +24,7 @@ #include <kjsembed/jsbindingplugin.h> #include <kjsembed/jsproxy_imp.h> -#include <qobject.h> +#include <tqobject.h> namespace KJSEmbed { namespace Bindings { @@ -32,33 +32,33 @@ namespace Bindings { class MyCustomQObjectLoader : public JSBindingPlugin { public: - MyCustomQObjectLoader( QObject *parent, const char *name, const QStringList &args ); + MyCustomQObjectLoader( TQObject *parent, const char *name, const TQStringList &args ); virtual ~MyCustomQObjectLoader(){;} KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const; }; -class MyCustomQObjectImp : public QObject { +class MyCustomQObjectImp : public TQObject { Q_OBJECT /** Identifiers for the methods provided by this class. */ enum Mode { On, Off }; Q_PROPERTY(Mode mode READ mode WRITE setMode) - Q_PROPERTY(QString thing READ thing WRITE setThing) + Q_PROPERTY(TQString thing READ thing WRITE setThing) Q_ENUMS(Mode) public: - MyCustomQObjectImp( QObject *parent, const char *name); + MyCustomQObjectImp( TQObject *parent, const char *name); virtual ~MyCustomQObjectImp(); public slots: Mode mode() const; void setMode( Mode md); - QString thing() const; - void setThing( const QString &t); + TQString thing() const; + void setThing( const TQString &t); private: Mode m_mode; - QString m_thing; + TQString m_thing; }; diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp index 903c7655..ba2181cc 100644 --- a/kjsembed/plugins/imagefx_plugin.cpp +++ b/kjsembed/plugins/imagefx_plugin.cpp @@ -27,8 +27,8 @@ #include <kjsembed/jsfactory_imp.h> #include <kjsembed/kjsembedpart.h> #include <kjsembed/customobject_imp.h> -#include <qvariant.h> -#include <qbrush.h> +#include <tqvariant.h> +#include <tqbrush.h> #include "imagefx_plugin.h" @@ -36,7 +36,7 @@ namespace KJSEmbed { namespace Bindings { -ImageFXLoader::ImageFXLoader( QObject *parent, const char *name, const QStringList &args ) : +ImageFXLoader::ImageFXLoader( TQObject *parent, const char *name, const TQStringList &args ) : JSBindingPlugin(parent, name, args) { } @@ -206,116 +206,116 @@ KJS::Value ImageFX::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li KJS::Value retValue = KJS::Value(); switch ( mid ) { case Methodgradient: { - QSize size = extractQSize(exec, args, 0); - QColor ca = extractQColor(exec, args, 1); - QColor cb = extractQColor(exec, args, 2); + TQSize size = extractQSize(exec, args, 0); + TQColor ca = extractQColor(exec, args, 1); + TQColor cb = extractQColor(exec, args, 2); int type = extractInt( exec, args, 3); int ncols = extractInt( exec, args, 4); - QImage img = KImageEffect::gradient(size, ca, cb, (KImageEffect::GradientType)type, ncols); + TQImage img = KImageEffect::gradient(size, ca, cb, (KImageEffect::GradientType)type, ncols); retValue = convertToValue(exec, img); break; } case MethodunbalancedGradient: { - QSize size = extractQSize(exec, args, 0); - QColor ca = extractQColor(exec, args, 1); - QColor cb = extractQColor(exec, args, 2); + TQSize size = extractQSize(exec, args, 0); + TQColor ca = extractQColor(exec, args, 1); + TQColor cb = extractQColor(exec, args, 2); int type = extractInt( exec, args, 3); int xfactor = extractInt( exec, args, 4); int yfactor = extractInt( exec, args, 5); int ncols = extractInt( exec, args, 6); - QImage img = KImageEffect::unbalancedGradient(size, ca, cb, (KImageEffect::GradientType)type, xfactor, yfactor, ncols); + TQImage img = KImageEffect::unbalancedGradient(size, ca, cb, (KImageEffect::GradientType)type, xfactor, yfactor, ncols); retValue = convertToValue(exec, img); break; } case MethodblendColor: { - QColor clr = extractQColor(exec, args, 0); - QImage dst = extractQImage(exec, args, 1); + TQColor clr = extractQColor(exec, args, 0); + TQImage dst = extractQImage(exec, args, 1); float opacity = (float)extractDouble(exec, args, 2); - QImage img = KImageEffect::blend(clr, dst, opacity); + TQImage img = KImageEffect::blend(clr, dst, opacity); retValue = convertToValue(exec, img); break; } case MethodblendImage: { - QImage src = extractQImage(exec, args, 0); - QImage dst = extractQImage(exec, args, 1); + TQImage src = extractQImage(exec, args, 0); + TQImage dst = extractQImage(exec, args, 1); float opacity = (float)extractDouble(exec, args, 2); - QImage img = KImageEffect::blend(src, dst, opacity); + TQImage img = KImageEffect::blend(src, dst, opacity); retValue = convertToValue(exec, img); break; } case MethodcomputeDestinationRect: { - QSize lowerSize = extractQSize(exec, args, 0); + TQSize lowerSize = extractQSize(exec, args, 0); int disposition = extractInt(exec, args, 1); - QImage upper = extractQImage(exec, args, 2); - QRect rect = KImageEffect::computeDestinationRect(lowerSize, (KImageEffect::Disposition) disposition, upper); + TQImage upper = extractQImage(exec, args, 2); + TQRect rect = KImageEffect::computeDestinationRect(lowerSize, (KImageEffect::Disposition) disposition, upper); retValue = convertToValue(exec, rect); break; } case MethodchannelIntensity: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); float percent = (float)extractDouble(exec, args, 1); int channel = extractInt(exec, args, 2); - QImage img = KImageEffect::channelIntensity(image, percent, (KImageEffect::RGBComponent)channel); + TQImage img = KImageEffect::channelIntensity(image, percent, (KImageEffect::RGBComponent)channel); retValue = convertToValue(exec, img); break; } case Methodfade: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); float val = (float)extractDouble(exec, args, 1); - QColor color = extractQColor(exec, args, 2); - QImage img = KImageEffect::fade(image, val, color); + TQColor color = extractQColor(exec, args, 2); + TQImage img = KImageEffect::fade(image, val, color); retValue = convertToValue(exec, img); break; } case Methodflatten: { - QImage image = extractQImage(exec, args, 0); - QColor ca = extractQColor(exec, args, 1); - QColor cb = extractQColor(exec, args, 2); + TQImage image = extractQImage(exec, args, 0); + TQColor ca = extractQColor(exec, args, 1); + TQColor cb = extractQColor(exec, args, 2); int ncols = extractInt(exec, args, 3); - QImage img = KImageEffect::flatten(image, ca, cb, ncols); + TQImage img = KImageEffect::flatten(image, ca, cb, ncols); retValue = convertToValue(exec, img); break; } case Methodhash: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); int lite = extractInt(exec, args, 1); int spacing = extractInt(exec, args, 2); - QImage img = KImageEffect::hash(image, (KImageEffect::Lighting)lite, spacing); + TQImage img = KImageEffect::hash(image, (KImageEffect::Lighting)lite, spacing); retValue = convertToValue(exec, img); break; } case Methodintensity: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); float percent = (float)extractDouble(exec, args, 1); - QImage img = KImageEffect::intensity(image, percent); + TQImage img = KImageEffect::intensity(image, percent); retValue = convertToValue(exec, img); break; } case Methodmodulate: { - QImage image = extractQImage(exec, args, 0); - QImage modImage = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); + TQImage modImage = extractQImage(exec, args, 0); bool reverse = extractBool(exec, args, 1); int type = extractInt(exec, args, 2); int factor = extractInt(exec, args, 3); int channel = extractInt(exec, args, 4); - QImage img = KImageEffect::modulate(image, modImage, reverse, (KImageEffect::ModulationType)type, factor, (KImageEffect::RGBComponent)channel); + TQImage img = KImageEffect::modulate(image, modImage, reverse, (KImageEffect::ModulationType)type, factor, (KImageEffect::RGBComponent)channel); retValue = convertToValue(exec, img); break; } case MethodtoGray: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); bool fast = extractBool(exec, args, 1); - QImage img = KImageEffect::toGray(image, fast); + TQImage img = KImageEffect::toGray(image, fast); retValue = convertToValue(exec, img); break; } case Methoddesaturate: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); float desat = (float)extractDouble(exec, args, 1); - QImage img = KImageEffect::desaturate(image, desat); + TQImage img = KImageEffect::desaturate(image, desat); retValue = convertToValue(exec, img); break; } @@ -326,193 +326,193 @@ KJS::Value ImageFX::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Li } case MethodselectedImage: { - QImage image = extractQImage(exec, args, 0); - QColor col = extractQColor(exec, args, 1); - QImage img = KImageEffect::selectedImage(image, col); + TQImage image = extractQImage(exec, args, 0); + TQColor col = extractQColor(exec, args, 1); + TQImage img = KImageEffect::selectedImage(image, col); retValue = convertToValue(exec, img); break; } case MethodcontrastHSV: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); bool sharpen = extractBool(exec, args, 1); KImageEffect::contrastHSV(image, sharpen); retValue = convertToValue(exec, image); break; } case Methodnormalize: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); KImageEffect::normalize(image); retValue = convertToValue(exec, image); break; } case Methodequalize: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); KImageEffect::equalize(image); retValue = convertToValue(exec, image); break; } case Methodthreshold: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); uint value = extractUInt(exec, args, 1); KImageEffect::threshold(image, value); retValue = convertToValue(exec, image); break; } case Methodsolarize: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double factor = extractDouble(exec, args, 1); KImageEffect::solarize(image, factor); retValue = convertToValue(exec, image); break; } case Methodemboss: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double radius = extractDouble(exec, args, 1); double sigma = extractDouble(exec, args, 2); - QImage img = KImageEffect::emboss(image, radius, sigma); + TQImage img = KImageEffect::emboss(image, radius, sigma); retValue = convertToValue(exec, img); break; } case Methoddespeckle: { - QImage image = extractQImage(exec, args, 0); - QImage img = KImageEffect::despeckle(image); + TQImage image = extractQImage(exec, args, 0); + TQImage img = KImageEffect::despeckle(image); retValue = convertToValue(exec, img); break; } case Methodcharcoal: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double factor = extractDouble(exec, args, 1); - QImage img = KImageEffect::charcoal( image, factor); + TQImage img = KImageEffect::charcoal( image, factor); retValue = convertToValue(exec, img); break; } case Methodcharcoal2: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double radius = extractDouble(exec, args, 1); double sigma = extractDouble(exec, args, 2); - QImage img = KImageEffect::charcoal(image, radius, sigma); + TQImage img = KImageEffect::charcoal(image, radius, sigma); retValue = convertToValue(exec, img); break; } case Methodrotate: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); int r = extractInt(exec, args, 1); - QImage img = KImageEffect::rotate(image, (KImageEffect::RotateDirection) r); + TQImage img = KImageEffect::rotate(image, (KImageEffect::RotateDirection) r); retValue = convertToValue(exec, img); break; } case Methodsample: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); int width = extractInt(exec, args, 1); int height = extractInt(exec, args, 2); - QImage img = KImageEffect::sample(image, width, height); + TQImage img = KImageEffect::sample(image, width, height); retValue = convertToValue(exec, img); break; } case MethodaddNoise: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); int type = extractInt(exec, args, 1); - QImage img = KImageEffect::addNoise(image, (KImageEffect::NoiseType) type); + TQImage img = KImageEffect::addNoise(image, (KImageEffect::NoiseType) type); retValue = convertToValue(exec, img); break; } case Methodblur: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double radius = extractDouble(exec, args, 1); double sigma = extractDouble(exec, args, 2); - QImage img = KImageEffect::blur(image, radius, sigma); + TQImage img = KImageEffect::blur(image, radius, sigma); retValue = convertToValue(exec, img); break; } case Methodedge: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double radius = extractDouble(exec, args, 1); - QImage img = KImageEffect::edge(image, radius); + TQImage img = KImageEffect::edge(image, radius); retValue = convertToValue(exec, img); break; } case Methodimplode: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double factor = extractDouble(exec, args, 1); uint background = extractUInt(exec, args, 2); - QImage img = KImageEffect::implode(image, factor, background); + TQImage img = KImageEffect::implode(image, factor, background); retValue = convertToValue(exec, img); break; } case MethodoilPaintConvolve: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double radius = extractDouble(exec, args, 1); - QImage img = KImageEffect::oilPaintConvolve(image, radius); + TQImage img = KImageEffect::oilPaintConvolve(image, radius); retValue = convertToValue(exec, img); break; } case MethodoilPaint: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); int radius = extractInt(exec, args, 1); - QImage img = KImageEffect::oilPaint(image, radius); + TQImage img = KImageEffect::oilPaint(image, radius); retValue = convertToValue(exec, img); break; } case Methodsharpen: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double factor = extractDouble(exec, args, 1); - QImage img = KImageEffect::sharpen(image, factor); + TQImage img = KImageEffect::sharpen(image, factor); retValue = convertToValue(exec, img); break; } case Methodsharpen2: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double radius = extractDouble(exec, args, 1); double sigma = extractDouble(exec, args, 2); - QImage img = KImageEffect::sharpen(image, radius, sigma); + TQImage img = KImageEffect::sharpen(image, radius, sigma); retValue = convertToValue(exec, img); break; } case Methodspread: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); uint amount = extractUInt(exec, args, 1); - QImage img = KImageEffect::spread(image, amount); + TQImage img = KImageEffect::spread(image, amount); retValue = convertToValue(exec, img); break; } case Methodshade: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); bool color_shading = extractBool(exec, args, 1); double azimuth = extractDouble(exec, args, 2); double elevation = extractDouble(exec, args, 3); - QImage img = KImageEffect::shade(image, color_shading, azimuth, elevation); + TQImage img = KImageEffect::shade(image, color_shading, azimuth, elevation); retValue = convertToValue(exec, img); break; } case Methodswirl: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double degrees = extractDouble(exec, args, 1); uint background = extractUInt(exec, args, 2); - QImage img = KImageEffect::swirl(image, degrees, background); + TQImage img = KImageEffect::swirl(image, degrees, background); retValue = convertToValue(exec, img); break; } case Methodwave: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); double amplitude = extractDouble(exec, args, 1); double frequency = extractDouble(exec, args, 2); uint background = extractUInt(exec, args, 3); - QImage img = KImageEffect::wave(image, amplitude, frequency, background); + TQImage img = KImageEffect::wave(image, amplitude, frequency, background); retValue = convertToValue(exec, img); break; } case Methodcontrast: { - QImage image = extractQImage(exec, args, 0); + TQImage image = extractQImage(exec, args, 0); int c = extractInt(exec, args, 1); - QImage img = KImageEffect::contrast(image, c); + TQImage img = KImageEffect::contrast(image, c); retValue = convertToValue(exec, img); break; } case MethodbumpMap: { - QImage mask = extractQImage(exec, args, 0); - QImage img = bumpmap(img, + TQImage mask = extractQImage(exec, args, 0); + TQImage img = bumpmap(img, mask, extractDouble(exec, args, 1), extractDouble(exec, args, 2), @@ -771,12 +771,12 @@ static void bumpmap_row( uint *src, * @return The destination image (dst) containing the result. * @author Zack Rusin <zack@kde.org> */ -QImage ImageFX::bumpmap(QImage &img, QImage &map, double azimuth, double elevation, +TQImage ImageFX::bumpmap(TQImage &img, TQImage &map, double azimuth, double elevation, int depth, int xofs, int yofs, int waterlevel, int ambient, bool compensate, bool invert, BumpmapType type, bool tiled) { - QImage dst; + TQImage dst; if ( img.depth() != 32 || img.depth() != 32 ) { qWarning( "Bump-mapping effect works only with 32 bit images"); diff --git a/kjsembed/plugins/imagefx_plugin.h b/kjsembed/plugins/imagefx_plugin.h index 7acfed44..b4f4c6a6 100644 --- a/kjsembed/plugins/imagefx_plugin.h +++ b/kjsembed/plugins/imagefx_plugin.h @@ -26,7 +26,7 @@ #include <kjsembed/jsproxy_imp.h> #include <kimageeffect.h> -#include <qimage.h> +#include <tqimage.h> namespace KJSEmbed { namespace Bindings { @@ -34,7 +34,7 @@ namespace Bindings { class ImageFXLoader : public JSBindingPlugin { public: - ImageFXLoader( QObject *parent, const char *name, const QStringList &args ); + ImageFXLoader( TQObject *parent, const char *name, const TQStringList &args ); KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const; }; enum BumpmapType { @@ -76,23 +76,23 @@ class ImageFX : JSProxyImp private: // Image effects - void gradient(const QSize &size, const QColor &ca, const QColor &cb, KImageEffect::GradientType type, int ncols); - void unbalancedGradient(const QSize &size, const QColor &ca,const QColor &cb, KImageEffect::GradientType type, int xfactor,int yfactor, int ncols); - void blendColor(const QColor& clr, float opacity); - void blendImage(QImage& blendImage, float opacity); - QRect computeDestinationRect(const QSize &lowerSize,KImageEffect::Disposition disposition); + void gradient(const TQSize &size, const TQColor &ca, const TQColor &cb, KImageEffect::GradientType type, int ncols); + void unbalancedGradient(const TQSize &size, const TQColor &ca,const TQColor &cb, KImageEffect::GradientType type, int xfactor,int yfactor, int ncols); + void blendColor(const TQColor& clr, float opacity); + void blendImage(TQImage& blendImage, float opacity); + TQRect computeDestinationRect(const TQSize &lowerSize,KImageEffect::Disposition disposition); void channelIntensity(float percent,KImageEffect::RGBComponent channel); - void fade(float val, const QColor &color); - void flatten(const QColor &ca,const QColor &cb, int ncols); + void fade(float val, const TQColor &color); + void flatten(const TQColor &ca,const TQColor &cb, int ncols); void hash(KImageEffect::Lighting lite,uint spacing); void intensity(float percent); - void modulate(QImage &modImage, bool reverse,KImageEffect::ModulationType type, int factor, KImageEffect::RGBComponent channel); + void modulate(TQImage &modImage, bool reverse,KImageEffect::ModulationType type, int factor, KImageEffect::RGBComponent channel); void toGray(bool fast); void desaturate(float desat); void contrast(int c); - void dither(const QColor *palette, int size); - void selectedImage( const QColor &col ); + void dither(const TQColor *palette, int size); + void selectedImage( const TQColor &col ); void contrastHSV( bool sharpen); void normalize(); void equalize(); @@ -118,7 +118,7 @@ class ImageFX : JSProxyImp void swirl(double degrees, uint background); void wave(double amplitude, double frequency,uint background); - QImage bumpmap(QImage &img, QImage &map, double azimuth=135.0, double elevation=45.0, int depth=3, int xofs=0, int yofs=0, int waterlevel=0, int ambient=0, bool compensate=false, bool invert=false, BumpmapType type=Linear, bool tiled=false); + TQImage bumpmap(TQImage &img, TQImage &map, double azimuth=135.0, double elevation=45.0, int depth=3, int xofs=0, int yofs=0, int waterlevel=0, int ambient=0, bool compensate=false, bool invert=false, BumpmapType type=Linear, bool tiled=false); int mid; }; diff --git a/kjsembed/plugins/kfileitemloader.cpp b/kjsembed/plugins/kfileitemloader.cpp index 0972e20a..55e86f76 100644 --- a/kjsembed/plugins/kfileitemloader.cpp +++ b/kjsembed/plugins/kfileitemloader.cpp @@ -31,7 +31,7 @@ namespace KJSEmbed { namespace Bindings { -KFileItemLoader::KFileItemLoader(QObject *parent, const char *name, const QStringList &args) +KFileItemLoader::KFileItemLoader(TQObject *parent, const char *name, const TQStringList &args) : JSBindingPlugin(parent, name, args) { } @@ -147,13 +147,13 @@ KJS::Value KJSEmbed::Bindings::KFileItemImp::call( KJS::ExecState * exec, KJS::O break; case Methodurl: { - QString url = obj->url().url(); + TQString url = obj->url().url(); retValue = KJS::String(url); break; } case MethodsetUrl: { - QString url = extractQString(exec, args, 0); + TQString url = extractQString(exec, args, 0); obj->setURL(url); break; } diff --git a/kjsembed/plugins/kfileitemloader.h b/kjsembed/plugins/kfileitemloader.h index bca77dc5..384379f3 100644 --- a/kjsembed/plugins/kfileitemloader.h +++ b/kjsembed/plugins/kfileitemloader.h @@ -34,7 +34,7 @@ namespace Bindings { class KFileItemLoader : public JSBindingPlugin { public: - KFileItemLoader(QObject *parent, const char *name, const QStringList &args); + KFileItemLoader(TQObject *parent, const char *name, const TQStringList &args); ~KFileItemLoader(); diff --git a/kjsembed/plugins/qprocess_plugin.cpp b/kjsembed/plugins/qprocess_plugin.cpp index 497022e1..3106fd8f 100644 --- a/kjsembed/plugins/qprocess_plugin.cpp +++ b/kjsembed/plugins/qprocess_plugin.cpp @@ -24,7 +24,7 @@ #include <kjsembed/jsbinding.h> #include <kjsembed/kjsembedpart.h> #include <kjsembed/customobject_imp.h> -#include <qvariant.h> +#include <tqvariant.h> #include "qprocess_plugin.h" @@ -32,7 +32,7 @@ namespace KJSEmbed { namespace Bindings { -ProcessLoader::ProcessLoader( QObject *parent, const char *name, const QStringList &args ) : +ProcessLoader::ProcessLoader( TQObject *parent, const char *name, const TQStringList &args ) : JSBindingPlugin(parent, name, args) { } @@ -41,7 +41,7 @@ KJS::Object ProcessLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *e { kdDebug() << "Loading a process object" << endl; - QObject *parent = 0L; + TQObject *parent = 0L; JSObjectProxy *proxy = JSProxy::toObjectProxy( args[0].imp() ); if ( proxy ) parent = proxy->object(); @@ -54,8 +54,8 @@ KJS::Object ProcessLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *e return proxyObj; } -ProcessImp::ProcessImp(QObject *parent, const char *name ) - : QProcess(parent, name) +ProcessImp::ProcessImp(TQObject *parent, const char *name ) + : TQProcess(parent, name) { kdDebug() << "New ProcessImp " << endl; } @@ -64,73 +64,73 @@ ProcessImp::~ProcessImp() { } -QStringList ProcessImp::arguments() const +TQStringList ProcessImp::arguments() const { - return QProcess::arguments(); + return TQProcess::arguments(); } -void ProcessImp::setArguments( const QStringList args) +void ProcessImp::setArguments( const TQStringList args) { - QProcess::setArguments( args ); + TQProcess::setArguments( args ); } ProcessImp::Communication ProcessImp::communication() const { - return (ProcessImp::Communication)QProcess::communication(); + return (ProcessImp::Communication)TQProcess::communication(); } void ProcessImp::setCommunication( Communication comm) { - QProcess::setCommunication( comm ); + TQProcess::setCommunication( comm ); } bool ProcessImp::canReadLineStdout() const { - return QProcess::canReadLineStdout(); + return TQProcess::canReadLineStdout(); } bool ProcessImp::canReadLineStderr() const { - return QProcess::canReadLineStderr(); + return TQProcess::canReadLineStderr(); } bool ProcessImp::isRunning() const { - return QProcess::isRunning(); + return TQProcess::isRunning(); } bool ProcessImp::normalExit() const { - return QProcess::normalExit(); + return TQProcess::normalExit(); } int ProcessImp::exitStatus() const { - return QProcess::exitStatus(); + return TQProcess::exitStatus(); } bool ProcessImp::start() { - return QProcess::start( ); + return TQProcess::start( ); } -QString ProcessImp::readLineStdout () +TQString ProcessImp::readLineStdout () { - return QProcess::readLineStdout(); + return TQProcess::readLineStdout(); } -QString ProcessImp::readLineStderr () +TQString ProcessImp::readLineStderr () { - return QProcess::readLineStderr(); + return TQProcess::readLineStderr(); } -QDir ProcessImp::workingDirectory () const +TQDir ProcessImp::workingDirectory () const { - return QProcess::workingDirectory(); + return TQProcess::workingDirectory(); } -void ProcessImp::setWorkingDirectory ( const QDir & dir ) +void ProcessImp::setWorkingDirectory ( const TQDir & dir ) { - QProcess::setWorkingDirectory( dir ); + TQProcess::setWorkingDirectory( dir ); } -void ProcessImp::addArgument ( const QString & arg ) +void ProcessImp::addArgument ( const TQString & arg ) { - QProcess::addArgument( arg ); + TQProcess::addArgument( arg ); } } // namespace KJSEmbed::Bindings diff --git a/kjsembed/plugins/qprocess_plugin.h b/kjsembed/plugins/qprocess_plugin.h index 8b0608a5..c5ffe4a5 100644 --- a/kjsembed/plugins/qprocess_plugin.h +++ b/kjsembed/plugins/qprocess_plugin.h @@ -24,8 +24,8 @@ #include <kjsembed/jsbindingplugin.h> #include <kjsembed/jsproxy_imp.h> -#include <qprocess.h> -#include <qdir.h> +#include <tqprocess.h> +#include <tqdir.h> namespace KJSEmbed { namespace Bindings { @@ -33,20 +33,20 @@ namespace Bindings { class ProcessLoader : public JSBindingPlugin { public: - ProcessLoader( QObject *parent, const char *name, const QStringList &args ); + ProcessLoader( TQObject *parent, const char *name, const TQStringList &args ); virtual ~ProcessLoader(){;} KJS::Object createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const; }; -class ProcessImp : public QProcess { +class ProcessImp : public TQProcess { Q_OBJECT /** Identifiers for the methods provided by this class. */ enum Communication { Stdin = 0x01, Stdout = 0x02, Stderr = 0x04, DupStderr = 0x08 }; - Q_PROPERTY(QStringList arguments READ arguments WRITE setArguments ) + Q_PROPERTY(TQStringList arguments READ arguments WRITE setArguments ) Q_PROPERTY(Communication communication READ communication WRITE setCommunication) Q_PROPERTY(bool canReadLineStdout READ canReadLineStdout ) Q_PROPERTY(bool canReadLineStderr READ canReadLineStderr ) @@ -56,11 +56,11 @@ Q_OBJECT Q_ENUMS(Communication) public: - ProcessImp( QObject *parent = 0, const char *name = 0); + ProcessImp( TQObject *parent = 0, const char *name = 0); virtual ~ProcessImp(); - QStringList arguments() const; - void setArguments( const QStringList args); + TQStringList arguments() const; + void setArguments( const TQStringList args); Communication communication() const; void setCommunication( Communication comm); @@ -73,11 +73,11 @@ public: public slots: bool start(); - virtual QString readLineStdout (); - virtual QString readLineStderr (); - QDir workingDirectory () const; - void setWorkingDirectory ( const QDir & dir ); - void addArgument ( const QString & arg ); + virtual TQString readLineStdout (); + virtual TQString readLineStderr (); + TQDir workingDirectory () const; + void setWorkingDirectory ( const TQDir & dir ); + void addArgument ( const TQString & arg ); }; } // namespace diff --git a/kjsembed/qjscmd.cpp b/kjsembed/qjscmd.cpp index f8a95ce6..005d0b9e 100644 --- a/kjsembed/qjscmd.cpp +++ b/kjsembed/qjscmd.cpp @@ -20,10 +20,10 @@ #include <stdio.h> #include <errno.h> -#include <qstring.h> -#include <qregexp.h> -#include <qapplication.h> -#include <qmainwindow.h> +#include <tqstring.h> +#include <tqregexp.h> +#include <tqapplication.h> +#include <tqmainwindow.h> #include <kjs/interpreter.h> #include <kjs/ustring.h> @@ -41,9 +41,9 @@ int main( int argc, char **argv ) # endif #endif // Setup QApplication - QApplication *app; - app = new QApplication( argc, argv ); - app->connect( app, SIGNAL( lastWindowClosed() ), SLOT(quit()) ); + TQApplication *app; + app = new TQApplication( argc, argv ); + app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); // Setup Interpreter KJSEmbed::JSSecurityPolicy::setDefaultPolicy( KJSEmbed::JSSecurityPolicy::CapabilityAll ); @@ -73,7 +73,7 @@ int main( int argc, char **argv ) } int result = 0; - part->execute( QString("include('cmdline.js');") ); + part->execute( TQString("include('cmdline.js');") ); return result; } diff --git a/kjsembed/qtbindings/qcanvas_imp.cpp b/kjsembed/qtbindings/qcanvas_imp.cpp index 65192798..f653416b 100644 --- a/kjsembed/qtbindings/qcanvas_imp.cpp +++ b/kjsembed/qtbindings/qcanvas_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvas_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -116,7 +116,7 @@ void QCanvasImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -129,25 +129,25 @@ void QCanvasImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QCanvas pointer from an Object. + * Extract a TQCanvas pointer from an Object. */ -QCanvas *QCanvasImp::toQCanvas( KJS::Object &self ) +TQCanvas *QCanvasImp::toQCanvas( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvas *>( obj ); + return dynamic_cast<TQCanvas *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvas" ) + if ( op->typeName() != "TQCanvas" ) return 0; - return op->toNative<QCanvas>(); + return op->toNative<TQCanvas>(); } /** @@ -173,7 +173,7 @@ KJS::Object QCanvasImp::construct( KJS::ExecState *exec, const KJS::List &args ) break; } - QString msg = i18n("QCanvasCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -181,21 +181,21 @@ KJS::Object QCanvasImp::construct( KJS::ExecState *exec, const KJS::List &args ) KJS::Object QCanvasImp::QCanvas_1( KJS::ExecState *exec, const KJS::List &args ) { - // Unsupported parameter QObject * + // Unsupported parameter TQObject * - QObject * arg0 = extractQObject(exec,args,0); + TQObject * arg0 = extractQObject(exec,args,0); const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0; - // We should now create an instance of the QCanvas object + // We should now create an instance of the TQCanvas object - QCanvas *ret = new QCanvas( + TQCanvas *ret = new TQCanvas( arg0, arg1 ); - JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "QCanvas"); + JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas"); return KJS::Object( prx ); } @@ -207,13 +207,13 @@ KJS::Object QCanvasImp::QCanvas_2( KJS::ExecState *exec, const KJS::List &args ) int arg1 = extractInt(exec, args, 1); - // We should now create an instance of the QCanvas object + // We should now create an instance of the TQCanvas object - QCanvas *ret = new QCanvas( + TQCanvas *ret = new TQCanvas( arg0, arg1 ); - JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "QCanvas"); + JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas"); return KJS::Object( prx ); } @@ -223,7 +223,7 @@ KJS::Object QCanvasImp::QCanvas_3( KJS::ExecState *exec, const KJS::List &args ) // Unsupported parameter QPixmap - QPixmap arg0 = extractQPixmap(exec, args, 0); + TQPixmap arg0 = extractQPixmap(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -234,9 +234,9 @@ KJS::Object QCanvasImp::QCanvas_3( KJS::ExecState *exec, const KJS::List &args ) int arg4 = extractInt(exec, args, 4); - // We should now create an instance of the QCanvas object + // We should now create an instance of the TQCanvas object - QCanvas *ret = new QCanvas( + TQCanvas *ret = new TQCanvas( arg0, arg1, @@ -244,7 +244,7 @@ KJS::Object QCanvasImp::QCanvas_3( KJS::ExecState *exec, const KJS::List &args ) arg3, arg4 ); - JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "QCanvas"); + JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas"); return KJS::Object( prx ); } @@ -450,7 +450,7 @@ KJS::Value QCanvasImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS: break; } - QString msg = i18n( "QCanvasImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -461,7 +461,7 @@ KJS::Value QCanvasImp::setTiles_5( KJS::ExecState *exec, KJS::Object &obj, const // Unsupported parameter QPixmap return KJS::Value(); - QPixmap arg0; // Dummy + TQPixmap arg0; // Dummy int arg1 = extractInt(exec, args, 1); @@ -484,7 +484,7 @@ KJS::Value QCanvasImp::setTiles_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QCanvasImp::setBackgroundPixmap_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPixmap arg0 = extractQPixmap(exec, args, 0); + TQPixmap arg0 = extractQPixmap(exec, args, 0); instance->setBackgroundPixmap( arg0 ); @@ -494,7 +494,7 @@ KJS::Value QCanvasImp::setBackgroundPixmap_6( KJS::ExecState *exec, KJS::Object KJS::Value QCanvasImp::backgroundPixmap_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPixmap ret; + TQPixmap ret; ret = instance->backgroundPixmap( ); return convertToValue( exec, ret ); @@ -504,7 +504,7 @@ KJS::Value QCanvasImp::backgroundPixmap_7( KJS::ExecState *exec, KJS::Object &ob KJS::Value QCanvasImp::setBackgroundColor_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QColor arg0 = extractQColor(exec, args, 0); + TQColor arg0 = extractQColor(exec, args, 0); instance->setBackgroundColor( arg0 ); @@ -622,7 +622,7 @@ KJS::Value QCanvasImp::height_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QCanvasImp::size_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QSize ret; + TQSize ret; ret = instance->size( ); return convertToValue( exec, ret ); @@ -631,7 +631,7 @@ KJS::Value QCanvasImp::size_19( KJS::ExecState *exec, KJS::Object &obj, const KJ KJS::Value QCanvasImp::rect_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect ret; + TQRect ret; ret = instance->rect( ); return convertToValue( exec, ret ); @@ -656,7 +656,7 @@ KJS::Value QCanvasImp::onCanvas_21( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value QCanvasImp::onCanvas_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPoint arg0 = extractQPoint(exec, args, 0); + TQPoint arg0 = extractQPoint(exec, args, 0); bool ret; ret = instance->onCanvas( @@ -683,7 +683,7 @@ KJS::Value QCanvasImp::validChunk_23( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QCanvasImp::validChunk_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPoint arg0 = extractQPoint(exec, args, 0); + TQPoint arg0 = extractQPoint(exec, args, 0); bool ret; ret = instance->validChunk( @@ -775,7 +775,7 @@ KJS::Value QCanvasImp::setAllChanged_30( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QCanvasImp::setChanged_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect arg0 = extractQRect(exec, args, 0); + TQRect arg0 = extractQRect(exec, args, 0); instance->setChanged( arg0 ); @@ -786,7 +786,7 @@ KJS::Value QCanvasImp::setChanged_31( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QCanvasImp::setUnchanged_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect arg0 = extractQRect(exec, args, 0); + TQRect arg0 = extractQRect(exec, args, 0); instance->setUnchanged( arg0 ); @@ -797,10 +797,10 @@ KJS::Value QCanvasImp::setUnchanged_32( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QCanvasImp::addItemToChunk_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasItem * + // Unsupported parameter TQCanvasItem * return KJS::Value(); - QCanvasItem * arg0; // Dummy + TQCanvasItem * arg0; // Dummy int arg1 = extractInt(exec, args, 1); @@ -817,10 +817,10 @@ KJS::Value QCanvasImp::addItemToChunk_33( KJS::ExecState *exec, KJS::Object &obj KJS::Value QCanvasImp::removeItemFromChunk_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasItem * + // Unsupported parameter TQCanvasItem * return KJS::Value(); - QCanvasItem * arg0; // Dummy + TQCanvasItem * arg0; // Dummy int arg1 = extractInt(exec, args, 1); @@ -837,10 +837,10 @@ KJS::Value QCanvasImp::removeItemFromChunk_34( KJS::ExecState *exec, KJS::Object KJS::Value QCanvasImp::addItemToChunkContaining_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasItem * + // Unsupported parameter TQCanvasItem * return KJS::Value(); - QCanvasItem * arg0; // Dummy + TQCanvasItem * arg0; // Dummy int arg1 = extractInt(exec, args, 1); @@ -857,10 +857,10 @@ KJS::Value QCanvasImp::addItemToChunkContaining_35( KJS::ExecState *exec, KJS::O KJS::Value QCanvasImp::removeItemFromChunkContaining_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasItem * + // Unsupported parameter TQCanvasItem * return KJS::Value(); - QCanvasItem * arg0; // Dummy + TQCanvasItem * arg0; // Dummy int arg1 = extractInt(exec, args, 1); @@ -885,7 +885,7 @@ KJS::Value QCanvasImp::allItems_37( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value QCanvasImp::collisions_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPoint arg0 = extractQPoint(exec, args, 0); + TQPoint arg0 = extractQPoint(exec, args, 0); instance->collisions( arg0 ); @@ -896,7 +896,7 @@ KJS::Value QCanvasImp::collisions_38( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QCanvasImp::collisions_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect arg0 = extractQRect(exec, args, 0); + TQRect arg0 = extractQRect(exec, args, 0); instance->collisions( arg0 ); @@ -907,12 +907,12 @@ KJS::Value QCanvasImp::collisions_39( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QCanvasImp::collisions_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPointArray arg0; // TODO (hack for qcanvas) + TQPointArray arg0; // TODO (hack for qcanvas) - // Unsupported parameter const QCanvasItem * + // Unsupported parameter const TQCanvasItem * return KJS::Value(); - const QCanvasItem * arg1; // Dummy + const TQCanvasItem * arg1; // Dummy bool arg2 = extractBool(exec, args, 2); @@ -927,12 +927,12 @@ KJS::Value QCanvasImp::collisions_40( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QCanvasImp::drawArea_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect arg0 = extractQRect(exec, args, 0); + TQRect arg0 = extractQRect(exec, args, 0); - // Unsupported parameter QPainter * + // Unsupported parameter TQPainter * return KJS::Value(); - QPainter * arg1; // Dummy + TQPainter * arg1; // Dummy bool arg2 = extractBool(exec, args, 2); @@ -947,10 +947,10 @@ KJS::Value QCanvasImp::drawArea_41( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value QCanvasImp::addView_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasView * + // Unsupported parameter TQCanvasView * return KJS::Value(); - QCanvasView * arg0; // Dummy + TQCanvasView * arg0; // Dummy instance->addView( arg0 ); @@ -961,10 +961,10 @@ KJS::Value QCanvasImp::addView_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QCanvasImp::removeView_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasView * + // Unsupported parameter TQCanvasView * return KJS::Value(); - QCanvasView * arg0; // Dummy + TQCanvasView * arg0; // Dummy instance->removeView( arg0 ); @@ -975,12 +975,12 @@ KJS::Value QCanvasImp::removeView_43( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QCanvasImp::drawCanvasArea_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect arg0 = extractQRect(exec, args, 0); + TQRect arg0 = extractQRect(exec, args, 0); - // Unsupported parameter QPainter * + // Unsupported parameter TQPainter * return KJS::Value(); - QPainter * arg1; // Dummy + TQPainter * arg1; // Dummy bool arg2 = extractBool(exec, args, 2); @@ -995,17 +995,17 @@ KJS::Value QCanvasImp::drawCanvasArea_44( KJS::ExecState *exec, KJS::Object &obj KJS::Value QCanvasImp::drawViewArea_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasView * + // Unsupported parameter TQCanvasView * return KJS::Value(); - QCanvasView * arg0; // Dummy + TQCanvasView * arg0; // Dummy - // Unsupported parameter QPainter * + // Unsupported parameter TQPainter * return KJS::Value(); - QPainter * arg1; // Dummy + TQPainter * arg1; // Dummy - QRect arg2 = extractQRect(exec, args, 2); + TQRect arg2 = extractQRect(exec, args, 2); bool arg3 = extractBool(exec, args, 3); @@ -1021,10 +1021,10 @@ KJS::Value QCanvasImp::drawViewArea_45( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QCanvasImp::addItem_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasItem * + // Unsupported parameter TQCanvasItem * return KJS::Value(); - QCanvasItem * arg0; // Dummy + TQCanvasItem * arg0; // Dummy instance->addItem( arg0 ); @@ -1035,10 +1035,10 @@ KJS::Value QCanvasImp::addItem_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QCanvasImp::addAnimation_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasItem * + // Unsupported parameter TQCanvasItem * return KJS::Value(); - QCanvasItem * arg0; // Dummy + TQCanvasItem * arg0; // Dummy instance->addAnimation( arg0 ); @@ -1049,10 +1049,10 @@ KJS::Value QCanvasImp::addAnimation_47( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QCanvasImp::removeItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasItem * + // Unsupported parameter TQCanvasItem * return KJS::Value(); - QCanvasItem * arg0; // Dummy + TQCanvasItem * arg0; // Dummy instance->removeItem( arg0 ); @@ -1063,10 +1063,10 @@ KJS::Value QCanvasImp::removeItem_48( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QCanvasImp::removeAnimation_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasItem * + // Unsupported parameter TQCanvasItem * return KJS::Value(); - QCanvasItem * arg0; // Dummy + TQCanvasItem * arg0; // Dummy instance->removeAnimation( arg0 ); diff --git a/kjsembed/qtbindings/qcanvas_imp.h b/kjsembed/qtbindings/qcanvas_imp.h index 9bd167bb..4521bfe8 100644 --- a/kjsembed/qtbindings/qcanvas_imp.h +++ b/kjsembed/qtbindings/qcanvas_imp.h @@ -17,7 +17,7 @@ class QCanvas; namespace KJSEmbed { /** - * Wrapper class for QCanvas methods. + * Wrapper class for TQCanvas methods. * * @author Richard Moore, rich@kde.org */ @@ -102,7 +102,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvas *toQCanvas( KJS::Object &object ); + static TQCanvas *toQCanvas( KJS::Object &object ); // // Constructors implemented by this class. @@ -182,7 +182,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvas *instance; // Temp + TQCanvas *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.cpp b/kjsembed/qtbindings/qcanvasellipse_imp.cpp index 6c4fbff3..6d9311e7 100644 --- a/kjsembed/qtbindings/qcanvasellipse_imp.cpp +++ b/kjsembed/qtbindings/qcanvasellipse_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvasellipse_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasEllipseImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -77,7 +77,7 @@ void QCanvasEllipseImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -90,25 +90,25 @@ void QCanvasEllipseImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QCanvasEllipse pointer from an Object. + * Extract a TQCanvasEllipse pointer from an Object. */ -QCanvasEllipse *QCanvasEllipseImp::toQCanvasEllipse( KJS::Object &self ) +TQCanvasEllipse *QCanvasEllipseImp::toQCanvasEllipse( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasEllipse *>( obj ); + return dynamic_cast<TQCanvasEllipse *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasEllipse" ) + if ( op->typeName() != "TQCanvasEllipse" ) return 0; - return op->toNative<QCanvasEllipse>(); + return op->toNative<TQCanvasEllipse>(); } /** @@ -134,7 +134,7 @@ KJS::Object QCanvasEllipseImp::construct( KJS::ExecState *exec, const KJS::List break; } - QString msg = i18n("QCanvasEllipseCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasEllipseCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -142,15 +142,15 @@ KJS::Object QCanvasEllipseImp::construct( KJS::ExecState *exec, const KJS::List KJS::Object QCanvasEllipseImp::QCanvasEllipse_1( KJS::ExecState *exec, const KJS::List &args ) { - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg0; // Dummy + TQCanvas * arg0; // Dummy - // We should now create an instance of the QCanvasEllipse object + // We should now create an instance of the TQCanvasEllipse object - QCanvasEllipse *ret = new QCanvasEllipse( + TQCanvasEllipse *ret = new TQCanvasEllipse( arg0 ); @@ -164,15 +164,15 @@ KJS::Object QCanvasEllipseImp::QCanvasEllipse_2( KJS::ExecState *exec, const KJS int arg1 = extractInt(exec, args, 1); - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg2; // Dummy + TQCanvas * arg2; // Dummy - // We should now create an instance of the QCanvasEllipse object + // We should now create an instance of the TQCanvasEllipse object - QCanvasEllipse *ret = new QCanvasEllipse( + TQCanvasEllipse *ret = new TQCanvasEllipse( arg0, arg1, @@ -192,15 +192,15 @@ KJS::Object QCanvasEllipseImp::QCanvasEllipse_3( KJS::ExecState *exec, const KJS int arg3 = extractInt(exec, args, 3); - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg4; // Dummy + TQCanvas * arg4; // Dummy - // We should now create an instance of the QCanvasEllipse object + // We should now create an instance of the TQCanvasEllipse object - QCanvasEllipse *ret = new QCanvasEllipse( + TQCanvasEllipse *ret = new TQCanvasEllipse( arg0, arg1, @@ -257,7 +257,7 @@ KJS::Value QCanvasEllipseImp::call( KJS::ExecState *exec, KJS::Object &self, con break; } - QString msg = i18n( "QCanvasEllipseImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasEllipseImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -337,10 +337,10 @@ KJS::Value QCanvasEllipseImp::areaPoints_11( KJS::ExecState *exec, KJS::Object & KJS::Value QCanvasEllipseImp::collidesWith_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QCanvasItem * + // Unsupported parameter const TQCanvasItem * return KJS::Value(); - const QCanvasItem * arg0; // Dummy + const TQCanvasItem * arg0; // Dummy bool ret; ret = instance->collidesWith( diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.h b/kjsembed/qtbindings/qcanvasellipse_imp.h index 052f41cf..0d15d67b 100644 --- a/kjsembed/qtbindings/qcanvasellipse_imp.h +++ b/kjsembed/qtbindings/qcanvasellipse_imp.h @@ -17,7 +17,7 @@ class QCanvasEllipse; namespace KJSEmbed { /** - * Wrapper class for QCanvasEllipse methods. + * Wrapper class for TQCanvasEllipse methods. * * @author Richard Moore, rich@kde.org */ @@ -63,7 +63,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasEllipse *toQCanvasEllipse( KJS::Object &object ); + static TQCanvasEllipse *toQCanvasEllipse( KJS::Object &object ); // // Constructors implemented by this class. @@ -104,7 +104,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasEllipse *instance; // Temp + TQCanvasEllipse *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvasitem_imp.cpp b/kjsembed/qtbindings/qcanvasitem_imp.cpp index f2e1c0e0..c11b3780 100644 --- a/kjsembed/qtbindings/qcanvasitem_imp.cpp +++ b/kjsembed/qtbindings/qcanvasitem_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvasitem_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -66,15 +66,15 @@ void QCanvasItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec EnumValue enums[] = { // enum RttiValues - { "Rtti_Item", QCanvasItem::Rtti_Item }, - { "Rtti_Sprite", QCanvasItem::Rtti_Sprite }, - { "Rtti_PolygonalItem", QCanvasItem::Rtti_PolygonalItem }, - { "Rtti_Text", QCanvasItem::Rtti_Text }, - { "Rtti_Polygon", QCanvasItem::Rtti_Polygon }, - { "Rtti_Rectangle", QCanvasItem::Rtti_Rectangle }, - { "Rtti_Ellipse", QCanvasItem::Rtti_Ellipse }, - { "Rtti_Line", QCanvasItem::Rtti_Line }, - { "Rtti_Spline", QCanvasItem::Rtti_Spline }, + { "Rtti_Item", TQCanvasItem::Rtti_Item }, + { "Rtti_Sprite", TQCanvasItem::Rtti_Sprite }, + { "Rtti_PolygonalItem", TQCanvasItem::Rtti_PolygonalItem }, + { "Rtti_Text", TQCanvasItem::Rtti_Text }, + { "Rtti_Polygon", TQCanvasItem::Rtti_Polygon }, + { "Rtti_Rectangle", TQCanvasItem::Rtti_Rectangle }, + { "Rtti_Ellipse", TQCanvasItem::Rtti_Ellipse }, + { "Rtti_Line", TQCanvasItem::Rtti_Line }, + { "Rtti_Spline", TQCanvasItem::Rtti_Spline }, { 0, 0 } }; @@ -135,7 +135,7 @@ void QCanvasItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -148,28 +148,28 @@ void QCanvasItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QCanvasItem pointer from an Object. + * Extract a TQCanvasItem pointer from an Object. */ -QCanvasItem *QCanvasItemImp::toQCanvasItem( KJS::Object &self ) +TQCanvasItem *QCanvasItemImp::toQCanvasItem( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasItem *>( obj ); + return dynamic_cast<TQCanvasItem *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; /* - if ( !op->inherits("QCanvasItem") ) { + if ( !op->inherits("TQCanvasItem") ) { kdDebug() << "Typename of opaque canvas item is " << op->typeName() << endl; // Check superclasses return 0; } */ - return op->toNative<QCanvasItem>(); + return op->toNative<TQCanvasItem>(); } /** @@ -187,7 +187,7 @@ KJS::Object QCanvasItemImp::construct( KJS::ExecState *exec, const KJS::List &ar break; } - QString msg = i18n("QCanvasItemCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasItemCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -197,15 +197,15 @@ KJS::Object QCanvasItemImp::QCanvasItem_1( KJS::ExecState *exec, const KJS::List #if 0 // This constructor has been disabled by the XSL template - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg0; // Dummy + TQCanvas * arg0; // Dummy - // We should now create an instance of the QCanvasItem object + // We should now create an instance of the TQCanvasItem object - QCanvasItem *ret = new QCanvasItem( + TQCanvasItem *ret = new TQCanvasItem( arg0 ); @@ -221,7 +221,7 @@ KJS::Value QCanvasItemImp::call( KJS::ExecState *exec, KJS::Object &self, const /* if ( !instance ) { - QString msg = i18n( "QCanvasItemImp was not valid" ); + TQString msg = i18n( "QCanvasItemImp was not valid" ); return throwError(exec, msg,KJS::ReferenceError); } */ @@ -384,7 +384,7 @@ KJS::Value QCanvasItemImp::call( KJS::ExecState *exec, KJS::Object &self, const break; } - QString msg = i18n( "QCanvasItemImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasItemImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -565,10 +565,10 @@ KJS::Value QCanvasItemImp::advance_18( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value QCanvasItemImp::collidesWith_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QCanvasItem * + // Unsupported parameter const TQCanvasItem * return KJS::Value(); - const QCanvasItem * arg0; // Dummy + const TQCanvasItem * arg0; // Dummy bool ret; ret = instance->collidesWith( @@ -591,10 +591,10 @@ KJS::Value QCanvasItemImp::collisions_20( KJS::ExecState *exec, KJS::Object &obj KJS::Value QCanvasItemImp::setCanvas_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Value(); - QCanvas * arg0; // Dummy + TQCanvas * arg0; // Dummy instance->setCanvas( arg0 ); @@ -605,7 +605,7 @@ KJS::Value QCanvasItemImp::setCanvas_21( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QCanvasItemImp::draw_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPainter arg0; // TODO (hack for qcanvas) + TQPainter arg0; // TODO (hack for qcanvas) instance->draw( arg0 ); @@ -756,7 +756,7 @@ KJS::Value QCanvasItemImp::rtti_37( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value QCanvasItemImp::boundingRect_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect ret; + TQRect ret; ret = instance->boundingRect( ); return convertToValue( exec, ret ); @@ -765,7 +765,7 @@ KJS::Value QCanvasItemImp::boundingRect_38( KJS::ExecState *exec, KJS::Object &o KJS::Value QCanvasItemImp::boundingRectAdvanced_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect ret; + TQRect ret; ret = instance->boundingRectAdvanced( ); return convertToValue( exec, ret ); @@ -776,7 +776,7 @@ KJS::Value QCanvasItemImp::canvas_40( KJS::ExecState *exec, KJS::Object &obj, co { instance->canvas( ); - return KJS::Value(); // Returns 'QCanvas *' + return KJS::Value(); // Returns 'TQCanvas *' } diff --git a/kjsembed/qtbindings/qcanvasitem_imp.h b/kjsembed/qtbindings/qcanvasitem_imp.h index 5af88785..8951eda0 100644 --- a/kjsembed/qtbindings/qcanvasitem_imp.h +++ b/kjsembed/qtbindings/qcanvasitem_imp.h @@ -17,7 +17,7 @@ class QCanvasItem; namespace KJSEmbed { /** - * Wrapper class for QCanvasItem methods. + * Wrapper class for TQCanvasItem methods. * * @author Richard Moore, rich@kde.org */ @@ -90,7 +90,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasItem *toQCanvasItem( KJS::Object &object ); + static TQCanvasItem *toQCanvasItem( KJS::Object &object ); // // Constructors implemented by this class. @@ -158,7 +158,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasItem *instance; // Temp + TQCanvasItem *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp index 293aa5f3..fd87e511 100644 --- a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp +++ b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvasitemlist_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasItemListImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &o }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -70,7 +70,7 @@ void QCanvasItemListImp::addBindings( KJS::ExecState *exec, KJS::Object &object }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -83,25 +83,25 @@ void QCanvasItemListImp::addBindings( KJS::ExecState *exec, KJS::Object &object } /** - * Extract a QCanvasItemList pointer from an Object. + * Extract a TQCanvasItemList pointer from an Object. */ -QCanvasItemList *QCanvasItemListImp::toQCanvasItemList( KJS::Object &self ) +TQCanvasItemList *QCanvasItemListImp::toQCanvasItemList( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasItemList *>( obj ); + return dynamic_cast<TQCanvasItemList *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasItemList" ) + if ( op->typeName() != "TQCanvasItemList" ) return 0; - return op->toNative<QCanvasItemList>(); + return op->toNative<TQCanvasItemList>(); } /** @@ -115,7 +115,7 @@ KJS::Object QCanvasItemListImp::construct( KJS::ExecState *exec, const KJS::List break; } - QString msg = i18n("QCanvasItemListCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasItemListCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -138,7 +138,7 @@ KJS::Value QCanvasItemListImp::call( KJS::ExecState *exec, KJS::Object &self, co break; } - QString msg = i18n( "QCanvasItemListImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasItemListImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -154,7 +154,7 @@ KJS::Value QCanvasItemListImp::sort_1( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value QCanvasItemListImp::drawUnique_2( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPainter arg0; // TODO (hack for qcanvas) + TQPainter arg0; // TODO (hack for qcanvas) instance->drawUnique( arg0 ); diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.h b/kjsembed/qtbindings/qcanvasitemlist_imp.h index dad12e1a..f6b7a0cc 100644 --- a/kjsembed/qtbindings/qcanvasitemlist_imp.h +++ b/kjsembed/qtbindings/qcanvasitemlist_imp.h @@ -17,7 +17,7 @@ class QCanvasItemList; namespace KJSEmbed { /** - * Wrapper class for QCanvasItemList methods. + * Wrapper class for TQCanvasItemList methods. * * @author Richard Moore, rich@kde.org */ @@ -53,7 +53,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasItemList *toQCanvasItemList( KJS::Object &object ); + static TQCanvasItemList *toQCanvasItemList( KJS::Object &object ); // // Constructors implemented by this class. @@ -84,7 +84,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasItemList *instance; // Temp + TQCanvasItemList *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvasline_imp.cpp b/kjsembed/qtbindings/qcanvasline_imp.cpp index 6ddf7c5d..429321f3 100644 --- a/kjsembed/qtbindings/qcanvasline_imp.cpp +++ b/kjsembed/qtbindings/qcanvasline_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvasline_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasLineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -74,7 +74,7 @@ void QCanvasLineImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -87,25 +87,25 @@ void QCanvasLineImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QCanvasLine pointer from an Object. + * Extract a TQCanvasLine pointer from an Object. */ -QCanvasLine *QCanvasLineImp::toQCanvasLine( KJS::Object &self ) +TQCanvasLine *QCanvasLineImp::toQCanvasLine( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasLine *>( obj ); + return dynamic_cast<TQCanvasLine *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasLine" ) + if ( op->typeName() != "TQCanvasLine" ) return 0; - return op->toNative<QCanvasLine>(); + return op->toNative<TQCanvasLine>(); } /** @@ -123,7 +123,7 @@ KJS::Object QCanvasLineImp::construct( KJS::ExecState *exec, const KJS::List &ar break; } - QString msg = i18n("QCanvasLineCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasLineCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -131,15 +131,15 @@ KJS::Object QCanvasLineImp::construct( KJS::ExecState *exec, const KJS::List &ar KJS::Object QCanvasLineImp::QCanvasLine_1( KJS::ExecState *exec, const KJS::List &args ) { - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg0; // Dummy + TQCanvas * arg0; // Dummy - // We should now create an instance of the QCanvasLine object + // We should now create an instance of the TQCanvasLine object - QCanvasLine *ret = new QCanvasLine( + TQCanvasLine *ret = new TQCanvasLine( arg0 ); @@ -180,7 +180,7 @@ KJS::Value QCanvasLineImp::call( KJS::ExecState *exec, KJS::Object &self, const break; } - QString msg = i18n( "QCanvasLineImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasLineImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -207,7 +207,7 @@ KJS::Value QCanvasLineImp::setPoints_3( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QCanvasLineImp::startPoint_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPoint ret; + TQPoint ret; ret = instance->startPoint( ); return convertToValue( exec, ret ); @@ -216,7 +216,7 @@ KJS::Value QCanvasLineImp::startPoint_4( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QCanvasLineImp::endPoint_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPoint ret; + TQPoint ret; ret = instance->endPoint( ); return convertToValue( exec, ret ); @@ -238,7 +238,7 @@ KJS::Value QCanvasLineImp::setPen_7( KJS::ExecState *exec, KJS::Object &obj, con // Unsupported parameter QPen return KJS::Value(); - QPen arg0; // Dummy + TQPen arg0; // Dummy instance->setPen( arg0 ); diff --git a/kjsembed/qtbindings/qcanvasline_imp.h b/kjsembed/qtbindings/qcanvasline_imp.h index 5ce51a7e..94b8f1ad 100644 --- a/kjsembed/qtbindings/qcanvasline_imp.h +++ b/kjsembed/qtbindings/qcanvasline_imp.h @@ -17,7 +17,7 @@ class QCanvasLine; namespace KJSEmbed { /** - * Wrapper class for QCanvasLine methods. + * Wrapper class for TQCanvasLine methods. * * @author Richard Moore, rich@kde.org */ @@ -58,7 +58,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasLine *toQCanvasLine( KJS::Object &object ); + static TQCanvasLine *toQCanvasLine( KJS::Object &object ); // // Constructors implemented by this class. @@ -94,7 +94,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasLine *instance; // Temp + TQCanvasLine *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp index 846f90fc..505cdb1f 100644 --- a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvaspixmap_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasPixmapImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -71,7 +71,7 @@ void QCanvasPixmapImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -84,25 +84,25 @@ void QCanvasPixmapImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QCanvasPixmap pointer from an Object. + * Extract a TQCanvasPixmap pointer from an Object. */ -QCanvasPixmap *QCanvasPixmapImp::toQCanvasPixmap( KJS::Object &self ) +TQCanvasPixmap *QCanvasPixmapImp::toQCanvasPixmap( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasPixmap *>( obj ); + return dynamic_cast<TQCanvasPixmap *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasPixmap" ) + if ( op->typeName() != "TQCanvasPixmap" ) return 0; - return op->toNative<QCanvasPixmap>(); + return op->toNative<TQCanvasPixmap>(); } /** @@ -128,7 +128,7 @@ KJS::Object QCanvasPixmapImp::construct( KJS::ExecState *exec, const KJS::List & break; } - QString msg = i18n("QCanvasPixmapCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasPixmapCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -136,12 +136,12 @@ KJS::Object QCanvasPixmapImp::construct( KJS::ExecState *exec, const KJS::List & KJS::Object QCanvasPixmapImp::QCanvasPixmap_1( KJS::ExecState *exec, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); - // We should now create an instance of the QCanvasPixmap object + // We should now create an instance of the TQCanvasPixmap object - QCanvasPixmap *ret = new QCanvasPixmap( + TQCanvasPixmap *ret = new TQCanvasPixmap( arg0 ); @@ -151,12 +151,12 @@ KJS::Object QCanvasPixmapImp::QCanvasPixmap_1( KJS::ExecState *exec, const KJS:: KJS::Object QCanvasPixmapImp::QCanvasPixmap_2( KJS::ExecState *exec, const KJS::List &args ) { - QImage arg0 = extractQImage(exec, args, 0); + TQImage arg0 = extractQImage(exec, args, 0); - // We should now create an instance of the QCanvasPixmap object + // We should now create an instance of the TQCanvasPixmap object - QCanvasPixmap *ret = new QCanvasPixmap( + TQCanvasPixmap *ret = new TQCanvasPixmap( arg0 ); @@ -167,14 +167,14 @@ KJS::Object QCanvasPixmapImp::QCanvasPixmap_2( KJS::ExecState *exec, const KJS:: KJS::Object QCanvasPixmapImp::QCanvasPixmap_3( KJS::ExecState *exec, const KJS::List &args ) { - QPixmap arg0 = extractQPixmap(exec, args, 0); + TQPixmap arg0 = extractQPixmap(exec, args, 0); - QPoint arg1 = extractQPoint(exec, args, 1); + TQPoint arg1 = extractQPoint(exec, args, 1); - // We should now create an instance of the QCanvasPixmap object + // We should now create an instance of the TQCanvasPixmap object - QCanvasPixmap *ret = new QCanvasPixmap( + TQCanvasPixmap *ret = new TQCanvasPixmap( arg0, arg1 ); @@ -205,7 +205,7 @@ KJS::Value QCanvasPixmapImp::call( KJS::ExecState *exec, KJS::Object &self, cons break; } - QString msg = i18n( "QCanvasPixmapImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasPixmapImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.h b/kjsembed/qtbindings/qcanvaspixmap_imp.h index 38f8be81..6e9525f0 100644 --- a/kjsembed/qtbindings/qcanvaspixmap_imp.h +++ b/kjsembed/qtbindings/qcanvaspixmap_imp.h @@ -17,7 +17,7 @@ class QCanvasPixmap; namespace KJSEmbed { /** - * Wrapper class for QCanvasPixmap methods. + * Wrapper class for TQCanvasPixmap methods. * * @author Richard Moore, rich@kde.org */ @@ -57,7 +57,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasPixmap *toQCanvasPixmap( KJS::Object &object ); + static TQCanvasPixmap *toQCanvasPixmap( KJS::Object &object ); // // Constructors implemented by this class. @@ -92,7 +92,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasPixmap *instance; // Temp + TQCanvasPixmap *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp index dbb41a18..d3f249d9 100644 --- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvaspixmaparray_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasPixmapArrayImp::addStaticBindings( KJS::ExecState *exec, KJS::Object }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -74,7 +74,7 @@ void QCanvasPixmapArrayImp::addBindings( KJS::ExecState *exec, KJS::Object &obje }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -87,25 +87,25 @@ void QCanvasPixmapArrayImp::addBindings( KJS::ExecState *exec, KJS::Object &obje } /** - * Extract a QCanvasPixmapArray pointer from an Object. + * Extract a TQCanvasPixmapArray pointer from an Object. */ -QCanvasPixmapArray *QCanvasPixmapArrayImp::toQCanvasPixmapArray( KJS::Object &self ) +TQCanvasPixmapArray *QCanvasPixmapArrayImp::toQCanvasPixmapArray( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasPixmapArray *>( obj ); + return dynamic_cast<TQCanvasPixmapArray *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasPixmapArray" ) + if ( op->typeName() != "TQCanvasPixmapArray" ) return 0; - return op->toNative<QCanvasPixmapArray>(); + return op->toNative<TQCanvasPixmapArray>(); } /** @@ -135,7 +135,7 @@ KJS::Object QCanvasPixmapArrayImp::construct( KJS::ExecState *exec, const KJS::L break; } - QString msg = i18n("QCanvasPixmapArrayCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasPixmapArrayCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -144,9 +144,9 @@ KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_1( KJS::ExecState *exec, c { - // We should now create an instance of the QCanvasPixmapArray object + // We should now create an instance of the TQCanvasPixmapArray object - QCanvasPixmapArray *ret = new QCanvasPixmapArray( + TQCanvasPixmapArray *ret = new TQCanvasPixmapArray( ); return KJS::Object(); @@ -155,14 +155,14 @@ KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_1( KJS::ExecState *exec, c KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_2( KJS::ExecState *exec, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); int arg1 = extractInt(exec, args, 1); - // We should now create an instance of the QCanvasPixmapArray object + // We should now create an instance of the TQCanvasPixmapArray object - QCanvasPixmapArray *ret = new QCanvasPixmapArray( + TQCanvasPixmapArray *ret = new TQCanvasPixmapArray( arg0, arg1 ); @@ -173,20 +173,20 @@ KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_2( KJS::ExecState *exec, c KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_3( KJS::ExecState *exec, const KJS::List &args ) { - // Unsupported parameter QPtrList< QPixmap > + // Unsupported parameter TQPtrList< TQPixmap > return KJS::Object(); - QPtrList< QPixmap > arg0; // Dummy + TQPtrList< TQPixmap > arg0; // Dummy - // Unsupported parameter QPtrList< QPoint > + // Unsupported parameter TQPtrList< TQPoint > return KJS::Object(); - QPtrList< QPoint > arg1; // Dummy + TQPtrList< TQPoint > arg1; // Dummy - // We should now create an instance of the QCanvasPixmapArray object + // We should now create an instance of the TQCanvasPixmapArray object - QCanvasPixmapArray *ret = new QCanvasPixmapArray( + TQCanvasPixmapArray *ret = new TQCanvasPixmapArray( arg0, arg1 ); @@ -197,20 +197,20 @@ KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_3( KJS::ExecState *exec, c KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_4( KJS::ExecState *exec, const KJS::List &args ) { - // Unsupported parameter QValueList< QPixmap > + // Unsupported parameter TQValueList< TQPixmap > return KJS::Object(); - QValueList< QPixmap > arg0; // Dummy + TQValueList< TQPixmap > arg0; // Dummy // Unsupported parameter QPointArray return KJS::Object(); - QPointArray arg1; // Dummy + TQPointArray arg1; // Dummy - // We should now create an instance of the QCanvasPixmapArray object + // We should now create an instance of the TQCanvasPixmapArray object - QCanvasPixmapArray *ret = new QCanvasPixmapArray( + TQCanvasPixmapArray *ret = new TQCanvasPixmapArray( arg0, arg1 ); @@ -252,7 +252,7 @@ KJS::Value QCanvasPixmapArrayImp::call( KJS::ExecState *exec, KJS::Object &self, break; } - QString msg = i18n( "QCanvasPixmapArrayImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasPixmapArrayImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -260,7 +260,7 @@ KJS::Value QCanvasPixmapArrayImp::call( KJS::ExecState *exec, KJS::Object &self, KJS::Value QCanvasPixmapArrayImp::readPixmaps_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -275,7 +275,7 @@ KJS::Value QCanvasPixmapArrayImp::readPixmaps_6( KJS::ExecState *exec, KJS::Obje KJS::Value QCanvasPixmapArrayImp::readCollisionMasks_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); bool ret; ret = instance->readCollisionMasks( @@ -300,7 +300,7 @@ KJS::Value QCanvasPixmapArrayImp::image_10( KJS::ExecState *exec, KJS::Object &o instance->image( arg0 ); - return KJS::Value(); // Returns 'QCanvasPixmap *' + return KJS::Value(); // Returns 'TQCanvasPixmap *' } @@ -309,10 +309,10 @@ KJS::Value QCanvasPixmapArrayImp::setImage_11( KJS::ExecState *exec, KJS::Object int arg0 = extractInt(exec, args, 0); - // Unsupported parameter QCanvasPixmap * + // Unsupported parameter TQCanvasPixmap * return KJS::Value(); - QCanvasPixmap * arg1; // Dummy + TQCanvasPixmap * arg1; // Dummy instance->setImage( arg0, diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h index 2b37d93a..16f842a5 100644 --- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h +++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h @@ -17,7 +17,7 @@ class QCanvasPixmapArray; namespace KJSEmbed { /** - * Wrapper class for QCanvasPixmapArray methods. + * Wrapper class for TQCanvasPixmapArray methods. * * @author Richard Moore, rich@kde.org */ @@ -61,7 +61,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasPixmapArray *toQCanvasPixmapArray( KJS::Object &object ); + static TQCanvasPixmapArray *toQCanvasPixmapArray( KJS::Object &object ); // // Constructors implemented by this class. @@ -100,7 +100,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasPixmapArray *instance; // Temp + TQCanvasPixmapArray *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp index d735fd7a..4064e3f0 100644 --- a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvaspolygon_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasPolygonImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -73,7 +73,7 @@ void QCanvasPolygonImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -86,25 +86,25 @@ void QCanvasPolygonImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QCanvasPolygon pointer from an Object. + * Extract a TQCanvasPolygon pointer from an Object. */ -QCanvasPolygon *QCanvasPolygonImp::toQCanvasPolygon( KJS::Object &self ) +TQCanvasPolygon *QCanvasPolygonImp::toQCanvasPolygon( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasPolygon *>( obj ); + return dynamic_cast<TQCanvasPolygon *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasPolygon" ) + if ( op->typeName() != "TQCanvasPolygon" ) return 0; - return op->toNative<QCanvasPolygon>(); + return op->toNative<TQCanvasPolygon>(); } /** @@ -122,7 +122,7 @@ KJS::Object QCanvasPolygonImp::construct( KJS::ExecState *exec, const KJS::List break; } - QString msg = i18n("QCanvasPolygonCons has no constructor with id '%1',").arg(id); + TQString msg = i18n("QCanvasPolygonCons has no constructor with id '%1',").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -130,15 +130,15 @@ KJS::Object QCanvasPolygonImp::construct( KJS::ExecState *exec, const KJS::List KJS::Object QCanvasPolygonImp::QCanvasPolygon_1( KJS::ExecState *exec, const KJS::List &args ) { - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg0; // Dummy + TQCanvas * arg0; // Dummy - // We should now create an instance of the QCanvasPolygon object + // We should now create an instance of the TQCanvasPolygon object - QCanvasPolygon *ret = new QCanvasPolygon( + TQCanvasPolygon *ret = new TQCanvasPolygon( arg0 ); @@ -175,7 +175,7 @@ KJS::Value QCanvasPolygonImp::call( KJS::ExecState *exec, KJS::Object &self, con break; } - QString msg = i18n( "QCanvasPolygonImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasPolygonImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -186,7 +186,7 @@ KJS::Value QCanvasPolygonImp::setPoints_3( KJS::ExecState *exec, KJS::Object &ob // Unsupported parameter QPointArray return KJS::Value(); - QPointArray arg0; // Dummy + TQPointArray arg0; // Dummy instance->setPoints( arg0 ); diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.h b/kjsembed/qtbindings/qcanvaspolygon_imp.h index 0e1e3255..9bb1a99e 100644 --- a/kjsembed/qtbindings/qcanvaspolygon_imp.h +++ b/kjsembed/qtbindings/qcanvaspolygon_imp.h @@ -17,7 +17,7 @@ class QCanvasPolygon; namespace KJSEmbed { /** - * Wrapper class for QCanvasPolygon methods. + * Wrapper class for TQCanvasPolygon methods. * * @author Richard Moore, rich@kde.org */ @@ -57,7 +57,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasPolygon *toQCanvasPolygon( KJS::Object &object ); + static TQCanvasPolygon *toQCanvasPolygon( KJS::Object &object ); // // Constructors implemented by this class. @@ -92,7 +92,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasPolygon *instance; // Temp + TQCanvasPolygon *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp index 325260ba..64500a9b 100644 --- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvaspolygonalitem_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasPolygonalItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Obje }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -77,7 +77,7 @@ void QCanvasPolygonalItemImp::addBindings( KJS::ExecState *exec, KJS::Object &ob }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -90,25 +90,25 @@ void QCanvasPolygonalItemImp::addBindings( KJS::ExecState *exec, KJS::Object &ob } /** - * Extract a QCanvasPolygonalItem pointer from an Object. + * Extract a TQCanvasPolygonalItem pointer from an Object. */ -QCanvasPolygonalItem *QCanvasPolygonalItemImp::toQCanvasPolygonalItem( KJS::Object &self ) +TQCanvasPolygonalItem *QCanvasPolygonalItemImp::toQCanvasPolygonalItem( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasPolygonalItem *>( obj ); + return dynamic_cast<TQCanvasPolygonalItem *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasPolygonalItem" ) + if ( op->typeName() != "TQCanvasPolygonalItem" ) return 0; - return op->toNative<QCanvasPolygonalItem>(); + return op->toNative<TQCanvasPolygonalItem>(); } /** @@ -126,7 +126,7 @@ KJS::Object QCanvasPolygonalItemImp::construct( KJS::ExecState *exec, const KJS: break; } - QString msg = i18n("QCanvasPolygonalItemCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasPolygonalItemCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -136,15 +136,15 @@ KJS::Object QCanvasPolygonalItemImp::QCanvasPolygonalItem_1( KJS::ExecState *exe #if 0 // This constructor has been disabled by the XSL template - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg0; // Dummy + TQCanvas * arg0; // Dummy - // We should now create an instance of the QCanvasPolygonalItem object + // We should now create an instance of the TQCanvasPolygonalItem object - QCanvasPolygonalItem *ret = new QCanvasPolygonalItem( + TQCanvasPolygonalItem *ret = new TQCanvasPolygonalItem( arg0 ); @@ -199,7 +199,7 @@ KJS::Value QCanvasPolygonalItemImp::call( KJS::ExecState *exec, KJS::Object &sel break; } - QString msg = i18n( "QCanvasPolygonalItemImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasPolygonalItemImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -207,10 +207,10 @@ KJS::Value QCanvasPolygonalItemImp::call( KJS::ExecState *exec, KJS::Object &sel KJS::Value QCanvasPolygonalItemImp::collidesWith_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QCanvasItem * + // Unsupported parameter const TQCanvasItem * return KJS::Value(); - const QCanvasItem * arg0; // Dummy + const TQCanvasItem * arg0; // Dummy bool ret; ret = instance->collidesWith( @@ -225,7 +225,7 @@ KJS::Value QCanvasPolygonalItemImp::setPen_4( KJS::ExecState *exec, KJS::Object // Unsupported parameter QPen return KJS::Value(); - QPen arg0; // Dummy + TQPen arg0; // Dummy instance->setPen( arg0 ); @@ -239,7 +239,7 @@ KJS::Value QCanvasPolygonalItemImp::setBrush_5( KJS::ExecState *exec, KJS::Objec // Unsupported parameter QBrush return KJS::Value(); - QBrush arg0; // Dummy + TQBrush arg0; // Dummy instance->setBrush( arg0 ); @@ -249,7 +249,7 @@ KJS::Value QCanvasPolygonalItemImp::setBrush_5( KJS::ExecState *exec, KJS::Objec KJS::Value QCanvasPolygonalItemImp::pen_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPen ret; + TQPen ret; ret = instance->pen( ); return convertToValue( exec, ret ); @@ -258,7 +258,7 @@ KJS::Value QCanvasPolygonalItemImp::pen_6( KJS::ExecState *exec, KJS::Object &ob KJS::Value QCanvasPolygonalItemImp::brush_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QBrush ret; + TQBrush ret; ret = instance->brush( ); return convertToValue( exec, ret ); @@ -283,7 +283,7 @@ KJS::Value QCanvasPolygonalItemImp::areaPointsAdvanced_9( KJS::ExecState *exec, KJS::Value QCanvasPolygonalItemImp::boundingRect_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect ret; + TQRect ret; ret = instance->boundingRect( ); return convertToValue( exec, ret ); diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h index fabda144..2316e7f9 100644 --- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h +++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h @@ -17,7 +17,7 @@ class QCanvasPolygonalItem; namespace KJSEmbed { /** - * Wrapper class for QCanvasPolygonalItem methods. + * Wrapper class for TQCanvasPolygonalItem methods. * * @author Richard Moore, rich@kde.org */ @@ -61,7 +61,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasPolygonalItem *toQCanvasPolygonalItem( KJS::Object &object ); + static TQCanvasPolygonalItem *toQCanvasPolygonalItem( KJS::Object &object ); // // Constructors implemented by this class. @@ -100,7 +100,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasPolygonalItem *instance; // Temp + TQCanvasPolygonalItem *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp index 809d571b..72c7ee08 100644 --- a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp +++ b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvasrectangle_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasRectangleImp::addStaticBindings( KJS::ExecState *exec, KJS::Object & }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -76,7 +76,7 @@ void QCanvasRectangleImp::addBindings( KJS::ExecState *exec, KJS::Object &object }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -89,25 +89,25 @@ void QCanvasRectangleImp::addBindings( KJS::ExecState *exec, KJS::Object &object } /** - * Extract a QCanvasRectangle pointer from an Object. + * Extract a TQCanvasRectangle pointer from an Object. */ -QCanvasRectangle *QCanvasRectangleImp::toQCanvasRectangle( KJS::Object &self ) +TQCanvasRectangle *QCanvasRectangleImp::toQCanvasRectangle( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasRectangle *>( obj ); + return dynamic_cast<TQCanvasRectangle *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasRectangle" ) + if ( op->typeName() != "TQCanvasRectangle" ) return 0; - return op->toNative<QCanvasRectangle>(); + return op->toNative<TQCanvasRectangle>(); } /** @@ -133,7 +133,7 @@ KJS::Object QCanvasRectangleImp::construct( KJS::ExecState *exec, const KJS::Lis break; } - QString msg = i18n("QCanvasRectangleCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasRectangleCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -141,15 +141,15 @@ KJS::Object QCanvasRectangleImp::construct( KJS::ExecState *exec, const KJS::Lis KJS::Object QCanvasRectangleImp::QCanvasRectangle_1( KJS::ExecState *exec, const KJS::List &args ) { - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg0; // Dummy + TQCanvas * arg0; // Dummy - // We should now create an instance of the QCanvasRectangle object + // We should now create an instance of the TQCanvasRectangle object - QCanvasRectangle *ret = new QCanvasRectangle( + TQCanvasRectangle *ret = new TQCanvasRectangle( arg0 ); @@ -159,17 +159,17 @@ KJS::Object QCanvasRectangleImp::QCanvasRectangle_1( KJS::ExecState *exec, const KJS::Object QCanvasRectangleImp::QCanvasRectangle_2( KJS::ExecState *exec, const KJS::List &args ) { - QRect arg0 = extractQRect(exec, args, 0); + TQRect arg0 = extractQRect(exec, args, 0); - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg1; // Dummy + TQCanvas * arg1; // Dummy - // We should now create an instance of the QCanvasRectangle object + // We should now create an instance of the TQCanvasRectangle object - QCanvasRectangle *ret = new QCanvasRectangle( + TQCanvasRectangle *ret = new TQCanvasRectangle( arg0, arg1 ); @@ -188,15 +188,15 @@ KJS::Object QCanvasRectangleImp::QCanvasRectangle_3( KJS::ExecState *exec, const int arg3 = extractInt(exec, args, 3); - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg4; // Dummy + TQCanvas * arg4; // Dummy - // We should now create an instance of the QCanvasRectangle object + // We should now create an instance of the TQCanvasRectangle object - QCanvasRectangle *ret = new QCanvasRectangle( + TQCanvasRectangle *ret = new TQCanvasRectangle( arg0, arg1, @@ -249,7 +249,7 @@ KJS::Value QCanvasRectangleImp::call( KJS::ExecState *exec, KJS::Object &self, c break; } - QString msg = i18n( "QCanvasRectangleImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasRectangleImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -288,7 +288,7 @@ KJS::Value QCanvasRectangleImp::setSize_7( KJS::ExecState *exec, KJS::Object &ob KJS::Value QCanvasRectangleImp::size_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QSize ret; + TQSize ret; ret = instance->size( ); return convertToValue( exec, ret ); @@ -305,7 +305,7 @@ KJS::Value QCanvasRectangleImp::areaPoints_9( KJS::ExecState *exec, KJS::Object KJS::Value QCanvasRectangleImp::rect_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect ret; + TQRect ret; ret = instance->rect( ); return convertToValue( exec, ret ); @@ -315,10 +315,10 @@ KJS::Value QCanvasRectangleImp::rect_10( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QCanvasRectangleImp::collidesWith_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QCanvasItem * + // Unsupported parameter const TQCanvasItem * return KJS::Value(); - const QCanvasItem * arg0; // Dummy + const TQCanvasItem * arg0; // Dummy bool ret; ret = instance->collidesWith( diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.h b/kjsembed/qtbindings/qcanvasrectangle_imp.h index 0ba72f37..b2ff92a3 100644 --- a/kjsembed/qtbindings/qcanvasrectangle_imp.h +++ b/kjsembed/qtbindings/qcanvasrectangle_imp.h @@ -17,7 +17,7 @@ class QCanvasRectangle; namespace KJSEmbed { /** - * Wrapper class for QCanvasRectangle methods. + * Wrapper class for TQCanvasRectangle methods. * * @author Richard Moore, rich@kde.org */ @@ -62,7 +62,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasRectangle *toQCanvasRectangle( KJS::Object &object ); + static TQCanvasRectangle *toQCanvasRectangle( KJS::Object &object ); // // Constructors implemented by this class. @@ -102,7 +102,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasRectangle *instance; // Temp + TQCanvasRectangle *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvasspline_imp.cpp b/kjsembed/qtbindings/qcanvasspline_imp.cpp index 57ea74b1..54edeb8f 100644 --- a/kjsembed/qtbindings/qcanvasspline_imp.cpp +++ b/kjsembed/qtbindings/qcanvasspline_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvasspline_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasSplineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -72,7 +72,7 @@ void QCanvasSplineImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -85,25 +85,25 @@ void QCanvasSplineImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QCanvasSpline pointer from an Object. + * Extract a TQCanvasSpline pointer from an Object. */ -QCanvasSpline *QCanvasSplineImp::toQCanvasSpline( KJS::Object &self ) +TQCanvasSpline *QCanvasSplineImp::toQCanvasSpline( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasSpline *>( obj ); + return dynamic_cast<TQCanvasSpline *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasSpline" ) + if ( op->typeName() != "TQCanvasSpline" ) return 0; - return op->toNative<QCanvasSpline>(); + return op->toNative<TQCanvasSpline>(); } /** @@ -121,7 +121,7 @@ KJS::Object QCanvasSplineImp::construct( KJS::ExecState *exec, const KJS::List & break; } - QString msg = i18n("QCanvasSplineCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasSplineCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -129,15 +129,15 @@ KJS::Object QCanvasSplineImp::construct( KJS::ExecState *exec, const KJS::List & KJS::Object QCanvasSplineImp::QCanvasSpline_1( KJS::ExecState *exec, const KJS::List &args ) { - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg0; // Dummy + TQCanvas * arg0; // Dummy - // We should now create an instance of the QCanvasSpline object + // We should now create an instance of the TQCanvasSpline object - QCanvasSpline *ret = new QCanvasSpline( + TQCanvasSpline *ret = new TQCanvasSpline( arg0 ); @@ -170,7 +170,7 @@ KJS::Value QCanvasSplineImp::call( KJS::ExecState *exec, KJS::Object &self, cons break; } - QString msg = i18n( "QCanvasSplineImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasSplineImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -181,7 +181,7 @@ KJS::Value QCanvasSplineImp::setControlPoints_3( KJS::ExecState *exec, KJS::Obje // Unsupported parameter QPointArray return KJS::Value(); - QPointArray arg0; // Dummy + TQPointArray arg0; // Dummy bool arg1 = extractBool(exec, args, 1); diff --git a/kjsembed/qtbindings/qcanvasspline_imp.h b/kjsembed/qtbindings/qcanvasspline_imp.h index dc4d4ed8..28679bcb 100644 --- a/kjsembed/qtbindings/qcanvasspline_imp.h +++ b/kjsembed/qtbindings/qcanvasspline_imp.h @@ -17,7 +17,7 @@ class QCanvasSpline; namespace KJSEmbed { /** - * Wrapper class for QCanvasSpline methods. + * Wrapper class for TQCanvasSpline methods. * * @author Richard Moore, rich@kde.org */ @@ -56,7 +56,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasSpline *toQCanvasSpline( KJS::Object &object ); + static TQCanvasSpline *toQCanvasSpline( KJS::Object &object ); // // Constructors implemented by this class. @@ -90,7 +90,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasSpline *instance; // Temp + TQCanvasSpline *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvassprite_imp.cpp b/kjsembed/qtbindings/qcanvassprite_imp.cpp index 6268e75c..7d9898b3 100644 --- a/kjsembed/qtbindings/qcanvassprite_imp.cpp +++ b/kjsembed/qtbindings/qcanvassprite_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvassprite_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasSpriteImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -66,8 +66,8 @@ void QCanvasSpriteImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj EnumValue enums[] = { // enum FrameAnimationType - { "Cycle", QCanvasSprite::Cycle }, - { "Oscillate", QCanvasSprite::Oscillate }, + { "Cycle", TQCanvasSprite::Cycle }, + { "Oscillate", TQCanvasSprite::Oscillate }, { 0, 0 } }; @@ -115,7 +115,7 @@ void QCanvasSpriteImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -128,25 +128,25 @@ void QCanvasSpriteImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QCanvasSprite pointer from an Object. + * Extract a TQCanvasSprite pointer from an Object. */ -QCanvasSprite *QCanvasSpriteImp::toQCanvasSprite( KJS::Object &self ) +TQCanvasSprite *QCanvasSpriteImp::toQCanvasSprite( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasSprite *>( obj ); + return dynamic_cast<TQCanvasSprite *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasSprite" ) + if ( op->typeName() != "TQCanvasSprite" ) return 0; - return op->toNative<QCanvasSprite>(); + return op->toNative<TQCanvasSprite>(); } /** @@ -164,7 +164,7 @@ KJS::Object QCanvasSpriteImp::construct( KJS::ExecState *exec, const KJS::List & break; } - QString msg = i18n("QCanvasSpriteCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasSpriteCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -172,20 +172,20 @@ KJS::Object QCanvasSpriteImp::construct( KJS::ExecState *exec, const KJS::List & KJS::Object QCanvasSpriteImp::QCanvasSprite_1( KJS::ExecState *exec, const KJS::List &args ) { - // Unsupported parameter QCanvasPixmapArray * + // Unsupported parameter TQCanvasPixmapArray * return KJS::Object(); - QCanvasPixmapArray * arg0; // Dummy + TQCanvasPixmapArray * arg0; // Dummy - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg1; // Dummy + TQCanvas * arg1; // Dummy - // We should now create an instance of the QCanvasSprite object + // We should now create an instance of the TQCanvasSprite object - QCanvasSprite *ret = new QCanvasSprite( + TQCanvasSprite *ret = new TQCanvasSprite( arg0, arg1 ); @@ -303,7 +303,7 @@ KJS::Value QCanvasSpriteImp::call( KJS::ExecState *exec, KJS::Object &self, cons break; } - QString msg = i18n( "QCanvasSpriteImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasSpriteImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -311,10 +311,10 @@ KJS::Value QCanvasSpriteImp::call( KJS::ExecState *exec, KJS::Object &self, cons KJS::Value QCanvasSpriteImp::setSequence_2( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvasPixmapArray * + // Unsupported parameter TQCanvasPixmapArray * return KJS::Value(); - QCanvasPixmapArray * arg0; // Dummy + TQCanvasPixmapArray * arg0; // Dummy instance->setSequence( arg0 ); @@ -367,7 +367,7 @@ KJS::Value QCanvasSpriteImp::setFrame_6( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QCanvasSpriteImp::setFrameAnimation_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QCanvasSprite::FrameAnimationType arg0 = QCanvasSprite::Cycle; // TODO (hack for QCanvasSprite) + TQCanvasSprite::FrameAnimationType arg0 = TQCanvasSprite::Cycle; // TODO (hack for TQCanvasSprite) int arg1 = extractInt(exec, args, 1); @@ -411,10 +411,10 @@ KJS::Value QCanvasSpriteImp::rtti_10( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QCanvasSpriteImp::collidesWith_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QCanvasItem * + // Unsupported parameter const TQCanvasItem * return KJS::Value(); - const QCanvasItem * arg0; // Dummy + const TQCanvasItem * arg0; // Dummy bool ret; ret = instance->collidesWith( @@ -425,7 +425,7 @@ KJS::Value QCanvasSpriteImp::collidesWith_11( KJS::ExecState *exec, KJS::Object KJS::Value QCanvasSpriteImp::boundingRect_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect ret; + TQRect ret; ret = instance->boundingRect( ); return convertToValue( exec, ret ); @@ -538,7 +538,7 @@ KJS::Value QCanvasSpriteImp::image_23( KJS::ExecState *exec, KJS::Object &obj, c { instance->image( ); - return KJS::Value(); // Returns 'QCanvasPixmap *' + return KJS::Value(); // Returns 'TQCanvasPixmap *' } @@ -546,7 +546,7 @@ KJS::Value QCanvasSpriteImp::imageAdvanced_24( KJS::ExecState *exec, KJS::Object { instance->imageAdvanced( ); - return KJS::Value(); // Returns 'QCanvasPixmap *' + return KJS::Value(); // Returns 'TQCanvasPixmap *' } @@ -557,7 +557,7 @@ KJS::Value QCanvasSpriteImp::image_25( KJS::ExecState *exec, KJS::Object &obj, c instance->image( arg0 ); - return KJS::Value(); // Returns 'QCanvasPixmap *' + return KJS::Value(); // Returns 'TQCanvasPixmap *' } @@ -575,7 +575,7 @@ KJS::Value QCanvasSpriteImp::advance_26( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QCanvasSpriteImp::draw_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPainter arg0; // TODO (hack for qcanvas) + TQPainter arg0; // TODO (hack for qcanvas) instance->draw( arg0 ); diff --git a/kjsembed/qtbindings/qcanvassprite_imp.h b/kjsembed/qtbindings/qcanvassprite_imp.h index 5f597077..c62f86db 100644 --- a/kjsembed/qtbindings/qcanvassprite_imp.h +++ b/kjsembed/qtbindings/qcanvassprite_imp.h @@ -17,7 +17,7 @@ class QCanvasSprite; namespace KJSEmbed { /** - * Wrapper class for QCanvasSprite methods. + * Wrapper class for TQCanvasSprite methods. * * @author Richard Moore, rich@kde.org */ @@ -77,7 +77,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasSprite *toQCanvasSprite( KJS::Object &object ); + static TQCanvasSprite *toQCanvasSprite( KJS::Object &object ); // // Constructors implemented by this class. @@ -132,7 +132,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasSprite *instance; // Temp + TQCanvasSprite *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvastext_imp.cpp b/kjsembed/qtbindings/qcanvastext_imp.cpp index 84548eea..44db9795 100644 --- a/kjsembed/qtbindings/qcanvastext_imp.cpp +++ b/kjsembed/qtbindings/qcanvastext_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvastext_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasTextImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -80,7 +80,7 @@ void QCanvasTextImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -93,25 +93,25 @@ void QCanvasTextImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QCanvasText pointer from an Object. + * Extract a TQCanvasText pointer from an Object. */ -QCanvasText *QCanvasTextImp::toQCanvasText( KJS::Object &self ) +TQCanvasText *QCanvasTextImp::toQCanvasText( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasText *>( obj ); + return dynamic_cast<TQCanvasText *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasText" ) + if ( op->typeName() != "TQCanvasText" ) return 0; - return op->toNative<QCanvasText>(); + return op->toNative<TQCanvasText>(); } /** @@ -137,7 +137,7 @@ KJS::Object QCanvasTextImp::construct( KJS::ExecState *exec, const KJS::List &ar break; } - QString msg = i18n("QCanvasTextCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasTextCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -145,15 +145,15 @@ KJS::Object QCanvasTextImp::construct( KJS::ExecState *exec, const KJS::List &ar KJS::Object QCanvasTextImp::QCanvasText_1( KJS::ExecState *exec, const KJS::List &args ) { - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg0; // Dummy + TQCanvas * arg0; // Dummy - // We should now create an instance of the QCanvasText object + // We should now create an instance of the TQCanvasText object - QCanvasText *ret = new QCanvasText( + TQCanvasText *ret = new TQCanvasText( arg0 ); @@ -163,17 +163,17 @@ KJS::Object QCanvasTextImp::QCanvasText_1( KJS::ExecState *exec, const KJS::List KJS::Object QCanvasTextImp::QCanvasText_2( KJS::ExecState *exec, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg1; // Dummy + TQCanvas * arg1; // Dummy - // We should now create an instance of the QCanvasText object + // We should now create an instance of the TQCanvasText object - QCanvasText *ret = new QCanvasText( + TQCanvasText *ret = new TQCanvasText( arg0, arg1 ); @@ -184,22 +184,22 @@ KJS::Object QCanvasTextImp::QCanvasText_2( KJS::ExecState *exec, const KJS::List KJS::Object QCanvasTextImp::QCanvasText_3( KJS::ExecState *exec, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); // Unsupported parameter QFont return KJS::Object(); - QFont arg1; // Dummy + TQFont arg1; // Dummy - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Object(); - QCanvas * arg2; // Dummy + TQCanvas * arg2; // Dummy - // We should now create an instance of the QCanvasText object + // We should now create an instance of the TQCanvasText object - QCanvasText *ret = new QCanvasText( + TQCanvasText *ret = new TQCanvasText( arg0, arg1, @@ -266,7 +266,7 @@ KJS::Value QCanvasTextImp::call( KJS::ExecState *exec, KJS::Object &self, const break; } - QString msg = i18n( "QCanvasTextImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasTextImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -274,7 +274,7 @@ KJS::Value QCanvasTextImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::Value QCanvasTextImp::setText_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); instance->setText( arg0 ); @@ -285,7 +285,7 @@ KJS::Value QCanvasTextImp::setText_5( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QCanvasTextImp::setFont_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QFont arg0 = extractQFont(exec, args, 0); + TQFont arg0 = extractQFont(exec, args, 0); instance->setFont( arg0 ); @@ -296,7 +296,7 @@ KJS::Value QCanvasTextImp::setFont_6( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QCanvasTextImp::setColor_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QColor arg0 = extractQColor(exec, args, 0); + TQColor arg0 = extractQColor(exec, args, 0); instance->setColor( arg0 ); @@ -307,7 +307,7 @@ KJS::Value QCanvasTextImp::setColor_7( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value QCanvasTextImp::text_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->text( ); return KJS::String( ret ); @@ -365,7 +365,7 @@ KJS::Value QCanvasTextImp::setTextFlags_13( KJS::ExecState *exec, KJS::Object &o KJS::Value QCanvasTextImp::boundingRect_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QRect ret; + TQRect ret; ret = instance->boundingRect( ); return convertToValue( exec, ret ); @@ -375,10 +375,10 @@ KJS::Value QCanvasTextImp::boundingRect_14( KJS::ExecState *exec, KJS::Object &o KJS::Value QCanvasTextImp::collidesWith_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QCanvasItem * + // Unsupported parameter const TQCanvasItem * return KJS::Value(); - const QCanvasItem * arg0; // Dummy + const TQCanvasItem * arg0; // Dummy bool ret; ret = instance->collidesWith( diff --git a/kjsembed/qtbindings/qcanvastext_imp.h b/kjsembed/qtbindings/qcanvastext_imp.h index 56fa2b6a..bf2049bd 100644 --- a/kjsembed/qtbindings/qcanvastext_imp.h +++ b/kjsembed/qtbindings/qcanvastext_imp.h @@ -17,7 +17,7 @@ class QCanvasText; namespace KJSEmbed { /** - * Wrapper class for QCanvasText methods. + * Wrapper class for TQCanvasText methods. * * @author Richard Moore, rich@kde.org */ @@ -66,7 +66,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasText *toQCanvasText( KJS::Object &object ); + static TQCanvasText *toQCanvasText( KJS::Object &object ); // // Constructors implemented by this class. @@ -110,7 +110,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasText *instance; // Temp + TQCanvasText *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcanvasview_imp.cpp b/kjsembed/qtbindings/qcanvasview_imp.cpp index f51e7f0c..bf190920 100644 --- a/kjsembed/qtbindings/qcanvasview_imp.cpp +++ b/kjsembed/qtbindings/qcanvasview_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcanvas.h> +#include <tqcanvas.h> #include "qcanvasview_imp.h" /** @@ -43,7 +43,7 @@ void QCanvasViewImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -73,7 +73,7 @@ void QCanvasViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -86,25 +86,25 @@ void QCanvasViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QCanvasView pointer from an Object. + * Extract a TQCanvasView pointer from an Object. */ -QCanvasView *QCanvasViewImp::toQCanvasView( KJS::Object &self ) +TQCanvasView *QCanvasViewImp::toQCanvasView( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCanvasView *>( obj ); + return dynamic_cast<TQCanvasView *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QCanvasView" ) + if ( op->typeName() != "TQCanvasView" ) return 0; - return op->toNative<QCanvasView>(); + return op->toNative<TQCanvasView>(); } /** @@ -126,7 +126,7 @@ KJS::Object QCanvasViewImp::construct( KJS::ExecState *exec, const KJS::List &ar break; } - QString msg = i18n("QCanvasViewCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCanvasViewCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -134,50 +134,50 @@ KJS::Object QCanvasViewImp::construct( KJS::ExecState *exec, const KJS::List &ar KJS::Object QCanvasViewImp::QCanvasView_1( KJS::ExecState *exec, const KJS::List &args ) { - QWidget *arg0 = extractQWidget(exec, args, 0); + TQWidget *arg0 = extractQWidget(exec, args, 0); const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0; - Qt::WFlags arg2 = 0; // TODO (hack for QCanvasView) + Qt::WFlags arg2 = 0; // TODO (hack for TQCanvasView) - // We should now create an instance of the QCanvasView object + // We should now create an instance of the TQCanvasView object - QCanvasView *ret = new QCanvasView( + TQCanvasView *ret = new TQCanvasView( arg0, arg1, arg2 ); - JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "QCanvasView"); + JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvasView"); return KJS::Object( prx ); } KJS::Object QCanvasViewImp::QCanvasView_2( KJS::ExecState *exec, const KJS::List &args ) { - QCanvas * arg0 = 0L;; + TQCanvas * arg0 = 0L;; KJS::Object obj = args[0].toObject(exec); JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() ); - if ( proxy ) arg0 = dynamic_cast<QCanvas *>( proxy->widget() ); + if ( proxy ) arg0 = dynamic_cast<TQCanvas *>( proxy->widget() ); - QWidget * arg1 = extractQWidget(exec, args, 1); + TQWidget * arg1 = extractQWidget(exec, args, 1); const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0; - Qt::WFlags arg3 = 0; // TODO (hack for QCanvasView) + Qt::WFlags arg3 = 0; // TODO (hack for TQCanvasView) - // We should now create an instance of the QCanvasView object + // We should now create an instance of the TQCanvasView object - QCanvasView *ret = new QCanvasView( + TQCanvasView *ret = new TQCanvasView( arg0, arg1, arg2, arg3 ); - JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "QCanvasView"); + JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvasView"); return KJS::Object( prx ); } @@ -211,7 +211,7 @@ KJS::Value QCanvasViewImp::call( KJS::ExecState *exec, KJS::Object &self, const break; } - QString msg = i18n( "QCanvasViewImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCanvasViewImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -220,17 +220,17 @@ KJS::Value QCanvasViewImp::canvas_4( KJS::ExecState *exec, KJS::Object &obj, con { instance->canvas( ); - return KJS::Value(); // Returns 'QCanvas *' + return KJS::Value(); // Returns 'TQCanvas *' } KJS::Value QCanvasViewImp::setCanvas_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCanvas * + // Unsupported parameter TQCanvas * return KJS::Value(); - QCanvas * arg0; // Dummy + TQCanvas * arg0; // Dummy instance->setCanvas( arg0 ); @@ -242,7 +242,7 @@ KJS::Value QCanvasViewImp::worldMatrix_6( KJS::ExecState *exec, KJS::Object &obj { instance->worldMatrix( ); - return KJS::Value(); // Returns 'const QWMatrix &' + return KJS::Value(); // Returns 'const TQWMatrix &' } @@ -250,14 +250,14 @@ KJS::Value QCanvasViewImp::inverseWorldMatrix_7( KJS::ExecState *exec, KJS::Obje { instance->inverseWorldMatrix( ); - return KJS::Value(); // Returns 'const QWMatrix &' + return KJS::Value(); // Returns 'const TQWMatrix &' } KJS::Value QCanvasViewImp::setWorldMatrix_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QWMatrix arg0; // TODO (hack for qcanvasview) + TQWMatrix arg0; // TODO (hack for qcanvasview) bool ret; ret = instance->setWorldMatrix( diff --git a/kjsembed/qtbindings/qcanvasview_imp.h b/kjsembed/qtbindings/qcanvasview_imp.h index 59024535..03fac913 100644 --- a/kjsembed/qtbindings/qcanvasview_imp.h +++ b/kjsembed/qtbindings/qcanvasview_imp.h @@ -17,7 +17,7 @@ class QCanvasView; namespace KJSEmbed { /** - * Wrapper class for QCanvasView methods. + * Wrapper class for TQCanvasView methods. * * @author Richard Moore, rich@kde.org */ @@ -58,7 +58,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCanvasView *toQCanvasView( KJS::Object &object ); + static TQCanvasView *toQCanvasView( KJS::Object &object ); // // Constructors implemented by this class. @@ -94,7 +94,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCanvasView *instance; // Temp + TQCanvasView *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qchecklistitem_imp.cpp b/kjsembed/qtbindings/qchecklistitem_imp.cpp index afa32dab..508861f5 100644 --- a/kjsembed/qtbindings/qchecklistitem_imp.cpp +++ b/kjsembed/qtbindings/qchecklistitem_imp.cpp @@ -1,10 +1,10 @@ -#include <qcstring.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -13,7 +13,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qlistview.h> +#include <tqlistview.h> #include "qchecklistitem_imp.h" #include "qlistviewitem_imp.h" /** @@ -28,21 +28,21 @@ namespace Bindings { // FALL THRU } else { JSOpaqueProxy * arg0 = JSProxy::toOpaqueProxy( args[ 0 ].imp() ); - QString arg1 = ( args.size() >= 2 ) ? args[ 1 ].toString( exec ).qstring() : QString::null; + TQString arg1 = ( args.size() >= 2 ) ? args[ 1 ].toString( exec ).qstring() : TQString::null; JSOpaqueProxy *prx = 0; if ( arg0 ) { - if ( arg0->typeName() == "QListViewItem" ) { - QListViewItem * parent = arg0->toNative<QListViewItem>(); - prx = new JSOpaqueProxy( new QCheckListItem( parent, arg1 ), "QCheckListItem" ); + if ( arg0->typeName() == "TQListViewItem" ) { + TQListViewItem * parent = arg0->toNative<TQListViewItem>(); + prx = new JSOpaqueProxy( new TQCheckListItem( parent, arg1 ), "TQCheckListItem" ); } else { return KJS::Object(); } } else { JSObjectProxy *arg0 = JSProxy::toObjectProxy( args[ 0 ].imp() ); if ( arg0 ) { - QListView * parent = ( QListView * ) ( arg0->widget() ); - prx = new JSOpaqueProxy( new QCheckListItem( parent, arg1 ), "QCheckListItem" ); + TQListView * parent = ( TQListView * ) ( arg0->widget() ); + prx = new JSOpaqueProxy( new TQCheckListItem( parent, arg1 ), "TQCheckListItem" ); } else { return KJS::Object(); } @@ -92,7 +92,7 @@ void QCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].id ) { if ( lastName != methods[idx].name ) { @@ -115,15 +115,15 @@ void QCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) EnumValue enums[] = { // enum Type - { "RadioButton", QCheckListItem::RadioButton }, - { "CheckBox", QCheckListItem::CheckBox }, - { "Controller", QCheckListItem::Controller }, - { "RadioButtonController", QCheckListItem::RadioButtonController }, - { "CheckBoxController", QCheckListItem::CheckBoxController }, + { "RadioButton", TQCheckListItem::RadioButton }, + { "CheckBox", TQCheckListItem::CheckBox }, + { "Controller", TQCheckListItem::Controller }, + { "RadioButtonController", TQCheckListItem::RadioButtonController }, + { "CheckBoxController", TQCheckListItem::CheckBoxController }, // enum ToggleState - { "Off", QCheckListItem::Off }, - { "NoChange", QCheckListItem::NoChange }, - { "On", QCheckListItem::On }, + { "Off", TQCheckListItem::Off }, + { "NoChange", TQCheckListItem::NoChange }, + { "On", TQCheckListItem::On }, { 0, 0 } }; @@ -135,19 +135,19 @@ void QCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } -QCheckListItem *QCheckListItemImp::toQCheckListItem( KJS::Object &self ) +TQCheckListItem *QCheckListItemImp::toQCheckListItem( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QCheckListItem *>( obj ); + return dynamic_cast<TQCheckListItem *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - return op->toNative<QCheckListItem>(); + return op->toNative<TQCheckListItem>(); } @@ -191,7 +191,7 @@ KJS::Object QCheckListItemImp::construct( KJS::ExecState *exec, const KJS::List break; } - QString msg = i18n("QCheckListItemCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QCheckListItemCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -199,11 +199,11 @@ KJS::Object QCheckListItemImp::construct( KJS::ExecState *exec, const KJS::List KJS::Object QCheckListItemImp::QCheckListItem_1( KJS::ExecState *exec, const KJS::List &args ) { - QWidget *arg0 = extractQWidget(exec,args,0); + TQWidget *arg0 = extractQWidget(exec,args,0); - QWidget *arg1 = extractQWidget(exec,args,1); + TQWidget *arg1 = extractQWidget(exec,args,1); - QWidget *arg2 = extractQWidget(exec,args,2); + TQWidget *arg2 = extractQWidget(exec,args,2); return KJS::Object( ); } @@ -212,16 +212,16 @@ KJS::Object QCheckListItemImp::QCheckListItem_2( KJS::ExecState *exec, const KJS { // TODO - QWidget *arg0 = extractQWidget(exec,args,0); + TQWidget *arg0 = extractQWidget(exec,args,0); // TODO - QWidget *arg1 = extractQWidget(exec,args,0); + TQWidget *arg1 = extractQWidget(exec,args,0); // TODO - QWidget *arg2 = extractQWidget(exec,args,0); + TQWidget *arg2 = extractQWidget(exec,args,0); // TODO - QWidget *arg3 = extractQWidget(exec,args,0); + TQWidget *arg3 = extractQWidget(exec,args,0); return KJS::Object(); } @@ -230,13 +230,13 @@ KJS::Object QCheckListItemImp::QCheckListItem_3( KJS::ExecState *exec, const KJS { // TODO - QWidget *arg0 = extractQWidget(exec,args,0); + TQWidget *arg0 = extractQWidget(exec,args,0); // TODO - QWidget *arg1 = extractQWidget(exec,args,0); + TQWidget *arg1 = extractQWidget(exec,args,0); // TODO - QWidget *arg2 = extractQWidget(exec,args,0); + TQWidget *arg2 = extractQWidget(exec,args,0); return KJS::Object(); } @@ -245,16 +245,16 @@ KJS::Object QCheckListItemImp::QCheckListItem_4( KJS::ExecState *exec, const KJS { // TODO - QWidget *arg0 = extractQWidget(exec,args,0); + TQWidget *arg0 = extractQWidget(exec,args,0); // TODO - QWidget *arg1 = extractQWidget(exec,args,0); + TQWidget *arg1 = extractQWidget(exec,args,0); // TODO - QWidget *arg2 = extractQWidget(exec,args,0); + TQWidget *arg2 = extractQWidget(exec,args,0); // TODO - QWidget *arg3 = extractQWidget(exec,args,0); + TQWidget *arg3 = extractQWidget(exec,args,0); return KJS::Object(); } @@ -263,13 +263,13 @@ KJS::Object QCheckListItemImp::QCheckListItem_5( KJS::ExecState *exec, const KJS { // TODO - QWidget *arg0 = extractQWidget(exec,args,0); + TQWidget *arg0 = extractQWidget(exec,args,0); // TODO - QWidget *arg1 = extractQWidget(exec,args,0); + TQWidget *arg1 = extractQWidget(exec,args,0); // TODO - QWidget *arg2 = extractQWidget(exec,args,0); + TQWidget *arg2 = extractQWidget(exec,args,0); return KJS::Object(); } @@ -278,16 +278,16 @@ KJS::Object QCheckListItemImp::QCheckListItem_6( KJS::ExecState *exec, const KJS { // TODO - QWidget *arg0 = extractQWidget(exec,args,0); + TQWidget *arg0 = extractQWidget(exec,args,0); // TODO - QWidget *arg1 = extractQWidget(exec,args,0); + TQWidget *arg1 = extractQWidget(exec,args,0); // TODO - QWidget *arg2 = extractQWidget(exec,args,0); + TQWidget *arg2 = extractQWidget(exec,args,0); // TODO - QWidget *arg3 = extractQWidget(exec,args,0); + TQWidget *arg3 = extractQWidget(exec,args,0); return KJS::Object(); } @@ -296,13 +296,13 @@ KJS::Object QCheckListItemImp::QCheckListItem_7( KJS::ExecState *exec, const KJS { // TODO - QWidget *arg0 = extractQWidget(exec,args,0); + TQWidget *arg0 = extractQWidget(exec,args,0); // TODO - QWidget *arg1 = extractQWidget(exec,args,0); + TQWidget *arg1 = extractQWidget(exec,args,0); // TODO - QWidget *arg2 = extractQWidget(exec,args,0); + TQWidget *arg2 = extractQWidget(exec,args,0); return KJS::Object(); } @@ -311,13 +311,13 @@ KJS::Object QCheckListItemImp::QCheckListItem_8( KJS::ExecState *exec, const KJS { // TODO - QWidget *arg0 = extractQWidget(exec,args,0); + TQWidget *arg0 = extractQWidget(exec,args,0); // TODO - QWidget *arg1 = extractQWidget(exec,args,0); + TQWidget *arg1 = extractQWidget(exec,args,0); // TODO - QWidget *arg2 = extractQWidget(exec,args,0); + TQWidget *arg2 = extractQWidget(exec,args,0); return KJS::Object(); } @@ -388,7 +388,7 @@ KJS::Value QCheckListItemImp::call( KJS::ExecState *exec, KJS::Object &self, con break; } - QString msg = i18n( "QCheckListItemImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QCheckListItemImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -396,15 +396,15 @@ KJS::Value QCheckListItemImp::call( KJS::ExecState *exec, KJS::Object &self, con KJS::Value QCheckListItemImp::paintCell_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QPainter * + // Unsupported parameter TQPainter * return KJS::Value(); - QPainter * arg0; // Dummy + TQPainter * arg0; // Dummy - // Unsupported parameter const QColorGroup & + // Unsupported parameter const TQColorGroup & return KJS::Value(); #if 0 - const QColorGroup & arg1; // Dummy + const TQColorGroup & arg1; // Dummy int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1; @@ -425,17 +425,17 @@ KJS::Value QCheckListItemImp::paintCell_10( KJS::ExecState *exec, KJS::Object &o KJS::Value QCheckListItemImp::paintFocus_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QPainter * + // Unsupported parameter TQPainter * return KJS::Value(); #if 0 - QPainter * arg0; // Dummy + TQPainter * arg0; // Dummy - // Unsupported parameter const QColorGroup & + // Unsupported parameter const TQColorGroup & return KJS::Value(); - const QColorGroup & arg1; // Dummy + const TQColorGroup & arg1; // Dummy - QRect arg2 = extractQRect(exec, args, 2); + TQRect arg2 = extractQRect(exec, args, 2); instance->paintFocus( arg0, @@ -448,15 +448,15 @@ KJS::Value QCheckListItemImp::paintFocus_11( KJS::ExecState *exec, KJS::Object & KJS::Value QCheckListItemImp::width_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QFontMetrics & + // Unsupported parameter const TQFontMetrics & return KJS::Value(); #if 0 - const QFontMetrics & arg0; // Dummy + const TQFontMetrics & arg0; // Dummy - // Unsupported parameter const QListView * + // Unsupported parameter const TQListView * return KJS::Value(); - const QListView * arg1; // Dummy + const TQListView * arg1; // Dummy int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1; @@ -508,7 +508,7 @@ KJS::Value QCheckListItemImp::type_16( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value QCheckListItemImp::text_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->text( ); return KJS::String( ret ); @@ -519,7 +519,7 @@ KJS::Value QCheckListItemImp::text_18( KJS::ExecState *exec, KJS::Object &obj, c int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1; - QString ret; + TQString ret; ret = instance->text( arg0 ); return KJS::String( ret ); diff --git a/kjsembed/qtbindings/qchecklistitem_imp.h b/kjsembed/qtbindings/qchecklistitem_imp.h index a1030d2a..5bc5bcd8 100644 --- a/kjsembed/qtbindings/qchecklistitem_imp.h +++ b/kjsembed/qtbindings/qchecklistitem_imp.h @@ -26,7 +26,7 @@ namespace Bindings { }; } /** - * Wrapper class for QCheckListItem methods. + * Wrapper class for TQCheckListItem methods. * * @author Richard Moore, rich@kde.org */ @@ -72,7 +72,7 @@ public: static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QCheckListItem *toQCheckListItem( KJS::Object &object ); + static TQCheckListItem *toQCheckListItem( KJS::Object &object ); // // Constructors implemented by this class. @@ -123,7 +123,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QCheckListItem *instance; // Temp + TQCheckListItem *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qcombobox_imp.cpp b/kjsembed/qtbindings/qcombobox_imp.cpp index 56407cb7..330da994 100644 --- a/kjsembed/qtbindings/qcombobox_imp.cpp +++ b/kjsembed/qtbindings/qcombobox_imp.cpp @@ -1,10 +1,10 @@ -#include <qcstring.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -13,7 +13,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qcombobox.h> +#include <tqcombobox.h> #include "qcombobox_imp.h" /** @@ -41,7 +41,7 @@ void QComboBoxImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -64,12 +64,12 @@ void QComboBoxImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object EnumValue enums[] = { // enum Policy - { "NoInsertion", QComboBox::NoInsertion }, - { "AtTop", QComboBox::AtTop }, - { "AtCurrent", QComboBox::AtCurrent }, - { "AtBottom", QComboBox::AtBottom }, - { "AfterCurrent", QComboBox::AfterCurrent }, - { "BeforeCurrent", QComboBox::BeforeCurrent }, + { "NoInsertion", TQComboBox::NoInsertion }, + { "AtTop", TQComboBox::AtTop }, + { "AtCurrent", TQComboBox::AtCurrent }, + { "AtBottom", TQComboBox::AtBottom }, + { "AfterCurrent", TQComboBox::AfterCurrent }, + { "BeforeCurrent", TQComboBox::BeforeCurrent }, { 0, 0 } }; @@ -137,7 +137,7 @@ void QComboBoxImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -150,25 +150,25 @@ void QComboBoxImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QComboBox pointer from an Object. + * Extract a TQComboBox pointer from an Object. */ -QComboBox *QComboBoxImp::toQComboBox( KJS::Object &self ) +TQComboBox *QComboBoxImp::toQComboBox( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QComboBox *>( obj ); + return dynamic_cast<TQComboBox *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QComboBox" ) + if ( op->typeName() != "TQComboBox" ) return 0; - return op->toNative<QComboBox>(); + return op->toNative<TQComboBox>(); } /** @@ -190,7 +190,7 @@ KJS::Object QComboBoxImp::construct( KJS::ExecState *exec, const KJS::List &args break; } - QString msg = i18n("QComboBoxCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QComboBoxCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -198,15 +198,15 @@ KJS::Object QComboBoxImp::construct( KJS::ExecState *exec, const KJS::List &args KJS::Object QComboBoxImp::QComboBox_1( KJS::ExecState *exec, const KJS::List &args ) { #if 0 - // Unsupported parameter QWidget * + // Unsupported parameter TQWidget * return KJS::Value(); - QWidget * arg0; // Dummy + TQWidget * arg0; // Dummy const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0; - // We should now create an object of type QComboBoxQComboBox *ret = new QComboBox( + // We should now create an object of type QComboBoxQComboBox *ret = new TQComboBox( arg0, arg1 ); @@ -219,15 +219,15 @@ KJS::Object QComboBoxImp::QComboBox_2( KJS::ExecState *exec, const KJS::List &ar #if 0 bool arg0 = extractBool(exec, args, 0); - // Unsupported parameter QWidget * + // Unsupported parameter TQWidget * return KJS::Value(); - QWidget * arg1; // Dummy + TQWidget * arg1; // Dummy const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0; - // We should now create an object of type QComboBoxQComboBox *ret = new QComboBox( + // We should now create an object of type QComboBoxQComboBox *ret = new TQComboBox( arg0, arg1, @@ -427,7 +427,7 @@ KJS::Value QComboBoxImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ break; } - QString msg = i18n( "QComboBoxImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QComboBoxImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -444,7 +444,7 @@ KJS::Value QComboBoxImp::count_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QComboBoxImp::insertStringList_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QStringList arg0 = extractQStringList(exec, args, 0); + TQStringList arg0 = extractQStringList(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -458,7 +458,7 @@ KJS::Value QComboBoxImp::insertStringList_5( KJS::ExecState *exec, KJS::Object & KJS::Value QComboBoxImp::insertStrList_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QStrList arg0 = extractQStrList(exec, args, 0); + TQStrList arg0 = extractQStrList(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -472,10 +472,10 @@ KJS::Value QComboBoxImp::insertStrList_6( KJS::ExecState *exec, KJS::Object &obj KJS::Value QComboBoxImp::insertStrList_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QStrList * + // Unsupported parameter const TQStrList * return KJS::Value(); - const QStrList * arg0; // Dummy + const TQStrList * arg0; // Dummy int arg1 = extractInt(exec, args, 1); @@ -509,7 +509,7 @@ KJS::Value QComboBoxImp::insertStrList_8( KJS::ExecState *exec, KJS::Object &obj KJS::Value QComboBoxImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -523,7 +523,7 @@ KJS::Value QComboBoxImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value QComboBoxImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPixmap arg0 = extractQPixmap(exec, args, 0); + TQPixmap arg0 = extractQPixmap(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -537,9 +537,9 @@ KJS::Value QComboBoxImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QComboBoxImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPixmap arg0 = extractQPixmap(exec, args, 0); + TQPixmap arg0 = extractQPixmap(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); + TQString arg1 = extractQString(exec, args, 1); int arg2 = extractInt(exec, args, 2); @@ -585,7 +585,7 @@ KJS::Value QComboBoxImp::setCurrentItem_14( KJS::ExecState *exec, KJS::Object &o KJS::Value QComboBoxImp::currentText_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->currentText( ); return KJS::String( ret ); @@ -594,7 +594,7 @@ KJS::Value QComboBoxImp::currentText_15( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QComboBoxImp::setCurrentText_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); instance->setCurrentText( arg0 ); @@ -607,7 +607,7 @@ KJS::Value QComboBoxImp::text_17( KJS::ExecState *exec, KJS::Object &obj, const int arg0 = extractInt(exec, args, 0); - QString ret; + TQString ret; ret = instance->text( arg0 ); return KJS::String( ret ); @@ -621,14 +621,14 @@ KJS::Value QComboBoxImp::pixmap_18( KJS::ExecState *exec, KJS::Object &obj, cons instance->pixmap( arg0 ); - return KJS::Value(); // Returns 'const QPixmap *' + return KJS::Value(); // Returns 'const TQPixmap *' } KJS::Value QComboBoxImp::changeItem_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -642,7 +642,7 @@ KJS::Value QComboBoxImp::changeItem_19( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QComboBoxImp::changeItem_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPixmap arg0 = extractQPixmap(exec, args, 0); + TQPixmap arg0 = extractQPixmap(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -656,9 +656,9 @@ KJS::Value QComboBoxImp::changeItem_20( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QComboBoxImp::changeItem_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPixmap arg0 = extractQPixmap(exec, args, 0); + TQPixmap arg0 = extractQPixmap(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); + TQString arg1 = extractQString(exec, args, 1); int arg2 = extractInt(exec, args, 2); @@ -692,7 +692,7 @@ KJS::Value QComboBoxImp::setAutoResize_23( KJS::ExecState *exec, KJS::Object &ob KJS::Value QComboBoxImp::sizeHint_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QSize ret; + TQSize ret; ret = instance->sizeHint( ); return convertToValue( exec, ret ); @@ -702,7 +702,7 @@ KJS::Value QComboBoxImp::sizeHint_24( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QComboBoxImp::setPalette_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPalette arg0 = extractQPalette(exec, args, 0); + TQPalette arg0 = extractQPalette(exec, args, 0); instance->setPalette( arg0 ); @@ -713,7 +713,7 @@ KJS::Value QComboBoxImp::setPalette_25( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QComboBoxImp::setFont_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QFont arg0 = extractQFont(exec, args, 0); + TQFont arg0 = extractQFont(exec, args, 0); instance->setFont( arg0 ); @@ -775,7 +775,7 @@ KJS::Value QComboBoxImp::maxCount_31( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QComboBoxImp::setInsertionPolicy_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QComboBox::Policy arg0 = QComboBox::AtBottom; // TODO (hack for combo box) + TQComboBox::Policy arg0 = TQComboBox::AtBottom; // TODO (hack for combo box) instance->setInsertionPolicy( arg0 ); @@ -794,10 +794,10 @@ KJS::Value QComboBoxImp::insertionPolicy_33( KJS::ExecState *exec, KJS::Object & KJS::Value QComboBoxImp::setValidator_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QValidator * + // Unsupported parameter const TQValidator * return KJS::Value(); - const QValidator * arg0; // Dummy + const TQValidator * arg0; // Dummy instance->setValidator( arg0 ); @@ -809,17 +809,17 @@ KJS::Value QComboBoxImp::validator_35( KJS::ExecState *exec, KJS::Object &obj, c { instance->validator( ); - return KJS::Value(); // Returns 'const QValidator *' + return KJS::Value(); // Returns 'const TQValidator *' } KJS::Value QComboBoxImp::setListBox_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListBox * + // Unsupported parameter TQListBox * return KJS::Value(); - QListBox * arg0; // Dummy + TQListBox * arg0; // Dummy instance->setListBox( arg0 ); @@ -831,17 +831,17 @@ KJS::Value QComboBoxImp::listBox_37( KJS::ExecState *exec, KJS::Object &obj, con { instance->listBox( ); - return KJS::Value(); // Returns 'QListBox *' + return KJS::Value(); // Returns 'TQListBox *' } KJS::Value QComboBoxImp::setLineEdit_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QLineEdit * + // Unsupported parameter TQLineEdit * return KJS::Value(); - QLineEdit * arg0; // Dummy + TQLineEdit * arg0; // Dummy instance->setLineEdit( arg0 ); @@ -853,7 +853,7 @@ KJS::Value QComboBoxImp::lineEdit_39( KJS::ExecState *exec, KJS::Object &obj, co { instance->lineEdit( ); - return KJS::Value(); // Returns 'QLineEdit *' + return KJS::Value(); // Returns 'TQLineEdit *' } @@ -880,15 +880,15 @@ KJS::Value QComboBoxImp::autoCompletion_41( KJS::ExecState *exec, KJS::Object &o KJS::Value QComboBoxImp::eventFilter_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QObject * + // Unsupported parameter TQObject * return KJS::Value(); - QObject * arg0; // Dummy + TQObject * arg0; // Dummy - // Unsupported parameter QEvent * + // Unsupported parameter TQEvent * return KJS::Value(); - QEvent * arg1; // Dummy + TQEvent * arg1; // Dummy bool ret; ret = instance->eventFilter( diff --git a/kjsembed/qtbindings/qcombobox_imp.h b/kjsembed/qtbindings/qcombobox_imp.h index 56653345..255e5323 100644 --- a/kjsembed/qtbindings/qcombobox_imp.h +++ b/kjsembed/qtbindings/qcombobox_imp.h @@ -17,7 +17,7 @@ class QComboBox; namespace KJSEmbed { /** - * Wrapper class for QComboBox methods. + * Wrapper class for TQComboBox methods. * * @author Richard Moore, rich@kde.org */ @@ -98,7 +98,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QComboBox *toQComboBox( KJS::Object &object ); + static TQComboBox *toQComboBox( KJS::Object &object ); // // Constructors implemented by this class. @@ -174,7 +174,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QComboBox *instance; // Temp + TQComboBox *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qframe_imp.cpp b/kjsembed/qtbindings/qframe_imp.cpp index 92254a8b..146e6bb2 100644 --- a/kjsembed/qtbindings/qframe_imp.cpp +++ b/kjsembed/qtbindings/qframe_imp.cpp @@ -5,7 +5,7 @@ #include <kjsembed/jsobjectproxy.h> #include <kjsembed/jsbinding.h> -#include <qframe.h> +#include <tqframe.h> #include "qframe_imp.h" /** @@ -25,25 +25,25 @@ void QFrameImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) EnumValue enums[] = { // enum Shape - { "NoFrame", QFrame::NoFrame }, - { "Box", QFrame::Box }, - { "Panel", QFrame::Panel }, - { "WinPanel", QFrame::WinPanel }, - { "HLine", QFrame::HLine }, - { "VLine", QFrame::VLine }, - { "StyledPanel", QFrame::StyledPanel }, - { "PopupPanel", QFrame::PopupPanel }, - { "MenuBarPanel", QFrame::MenuBarPanel }, - { "ToolBarPanel", QFrame::ToolBarPanel }, - { "LineEditPanel", QFrame::LineEditPanel }, - { "TabWidgetPanel", QFrame::TabWidgetPanel }, - { "GroupBoxPanel", QFrame::GroupBoxPanel }, - { "MShape", QFrame::MShape }, + { "NoFrame", TQFrame::NoFrame }, + { "Box", TQFrame::Box }, + { "Panel", TQFrame::Panel }, + { "WinPanel", TQFrame::WinPanel }, + { "HLine", TQFrame::HLine }, + { "VLine", TQFrame::VLine }, + { "StyledPanel", TQFrame::StyledPanel }, + { "PopupPanel", TQFrame::PopupPanel }, + { "MenuBarPanel", TQFrame::MenuBarPanel }, + { "ToolBarPanel", TQFrame::ToolBarPanel }, + { "LineEditPanel", TQFrame::LineEditPanel }, + { "TabWidgetPanel", TQFrame::TabWidgetPanel }, + { "GroupBoxPanel", TQFrame::GroupBoxPanel }, + { "MShape", TQFrame::MShape }, // enum Shadow - { "Plain", QFrame::Plain }, - { "Raised", QFrame::Raised }, - { "Sunken", QFrame::Sunken }, - { "MShadow", QFrame::MShadow }, + { "Plain", TQFrame::Plain }, + { "Raised", TQFrame::Raised }, + { "Sunken", TQFrame::Sunken }, + { "MShadow", TQFrame::MShadow }, { 0, 0 } }; diff --git a/kjsembed/qtbindings/qframe_imp.h b/kjsembed/qtbindings/qframe_imp.h index 0f227605..3d386e23 100644 --- a/kjsembed/qtbindings/qframe_imp.h +++ b/kjsembed/qtbindings/qframe_imp.h @@ -14,7 +14,7 @@ namespace KJSEmbed { /** - * Wrapper class for QFrame enums. + * Wrapper class for TQFrame enums. * * @author Ian Reinhart Geiser, geiseri@kde.org */ diff --git a/kjsembed/qtbindings/qlistview_imp.cpp b/kjsembed/qtbindings/qlistview_imp.cpp index a5f4c022..ef670d95 100644 --- a/kjsembed/qtbindings/qlistview_imp.cpp +++ b/kjsembed/qtbindings/qlistview_imp.cpp @@ -1,11 +1,11 @@ -#include <qcstring.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> -#include <qiconset.h> +#include <tqcstring.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> +#include <tqiconset.h> #include <kjs/object.h> @@ -14,7 +14,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qlistview.h> +#include <tqlistview.h> #include "qlistview_imp.h" /** @@ -108,7 +108,7 @@ void QListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].id ) { if ( lastName != methods[idx].name ) { @@ -131,20 +131,20 @@ void QListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) EnumValue enums[] = { // enum WidthMode - { "Manual", QListView::Manual }, - { "Maximum", QListView::Maximum }, + { "Manual", TQListView::Manual }, + { "Maximum", TQListView::Maximum }, // enum SelectionMode - { "Single", QListView::Single }, - { "Multi", QListView::Multi }, - { "Extended", QListView::Extended }, - { "NoSelection", QListView::NoSelection }, + { "Single", TQListView::Single }, + { "Multi", TQListView::Multi }, + { "Extended", TQListView::Extended }, + { "NoSelection", TQListView::NoSelection }, // enum ResizeMode - { "NoColumn", QListView::NoColumn }, - { "AllColumns", QListView::AllColumns }, - { "LastColumn", QListView::LastColumn }, + { "NoColumn", TQListView::NoColumn }, + { "AllColumns", TQListView::AllColumns }, + { "LastColumn", TQListView::LastColumn }, // enum RenameAction - { "Accept", QListView::Accept }, - { "Reject", QListView::Reject }, + { "Accept", TQListView::Accept }, + { "Reject", TQListView::Reject }, { 0, 0 } }; @@ -156,23 +156,23 @@ void QListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } -QListView *QListViewImp::toQListView( KJS::Object &self ) +TQListView *QListViewImp::toQListView( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QListView *>( obj ); + return dynamic_cast<TQListView *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QListView" ) + if ( op->typeName() != "TQListView" ) return 0; - return op->toNative<QListView>(); + return op->toNative<TQListView>(); } @@ -188,7 +188,7 @@ KJS::Object QListViewImp::construct( KJS::ExecState *exec, const KJS::List &args break; } - QString msg = i18n("QListViewCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QListViewCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -197,13 +197,13 @@ KJS::Object QListViewImp::QListView_1( KJS::ExecState *exec, const KJS::List &ar { // TODO - QWidget *arg0 = 0L; + TQWidget *arg0 = 0L; // TODO - QWidget *arg1 = 0L; + TQWidget *arg1 = 0L; // TODO - QWidget *arg2 = 0L; + TQWidget *arg2 = 0L; } @@ -493,7 +493,7 @@ KJS::Value QListViewImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ break; } - QString msg = i18n( "QListViewImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QListViewImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -521,10 +521,10 @@ KJS::Value QListViewImp::setTreeStepSize_4( KJS::ExecState *exec, KJS::Object &o KJS::Value QListViewImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy instance->insertItem( arg0 ); @@ -535,10 +535,10 @@ KJS::Value QListViewImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value QListViewImp::takeItem_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy instance->takeItem( arg0 ); @@ -549,10 +549,10 @@ KJS::Value QListViewImp::takeItem_6( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value QListViewImp::removeItem_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy instance->removeItem( arg0 ); @@ -564,14 +564,14 @@ KJS::Value QListViewImp::header_8( KJS::ExecState *exec, KJS::Object &obj, const { instance->header( ); - return KJS::Value(); // Returns 'QHeader *' + return KJS::Value(); // Returns 'TQHeader *' } KJS::Value QListViewImp::addColumn_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1; @@ -589,9 +589,9 @@ KJS::Value QListViewImp::addColumn_10( KJS::ExecState *exec, KJS::Object &obj, c // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg0; // Dummy + const TQIconSet arg0; // Dummy - QString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : QString::null; + TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null; int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1; @@ -620,7 +620,7 @@ KJS::Value QListViewImp::setColumnText_12( KJS::ExecState *exec, KJS::Object &ob int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1; - QString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : QString::null; + TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null; instance->setColumnText( arg0, @@ -637,9 +637,9 @@ KJS::Value QListViewImp::setColumnText_13( KJS::ExecState *exec, KJS::Object &ob // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg1; // Dummy + const TQIconSet arg1; // Dummy - QString arg2 = (args.size() >= 3) ? args[2].toString(exec).qstring() : QString::null; + TQString arg2 = (args.size() >= 3) ? args[2].toString(exec).qstring() : TQString::null; instance->setColumnText( arg0, @@ -654,7 +654,7 @@ KJS::Value QListViewImp::columnText_14( KJS::ExecState *exec, KJS::Object &obj, int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1; - QString ret; + TQString ret; ret = instance->columnText( arg0 ); return KJS::String( ret ); @@ -761,24 +761,24 @@ KJS::Value QListViewImp::show_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QListViewImp::itemAt_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QPoint & + // Unsupported parameter const TQPoint & return KJS::Value(); - const QPoint & arg0; // Dummy + const TQPoint & arg0; // Dummy instance->itemAt( arg0 ); - return KJS::Value(); // Returns 'QListViewItem *' + return KJS::Value(); // Returns 'TQListViewItem *' } KJS::Value QListViewImp::itemRect_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QListViewItem * + // Unsupported parameter const TQListViewItem * return KJS::Value(); - const QListViewItem * arg0; // Dummy + const TQListViewItem * arg0; // Dummy instance->itemRect( arg0 ); @@ -789,10 +789,10 @@ KJS::Value QListViewImp::itemRect_24( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QListViewImp::itemPos_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QListViewItem * + // Unsupported parameter const TQListViewItem * return KJS::Value(); - const QListViewItem * arg0; // Dummy + const TQListViewItem * arg0; // Dummy int ret; ret = instance->itemPos( @@ -804,10 +804,10 @@ KJS::Value QListViewImp::itemPos_25( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value QListViewImp::ensureItemVisible_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QListViewItem * + // Unsupported parameter const TQListViewItem * return KJS::Value(); - const QListViewItem * arg0; // Dummy + const TQListViewItem * arg0; // Dummy instance->ensureItemVisible( arg0 ); @@ -818,10 +818,10 @@ KJS::Value QListViewImp::ensureItemVisible_26( KJS::ExecState *exec, KJS::Object KJS::Value QListViewImp::repaintItem_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QListViewItem * + // Unsupported parameter const TQListViewItem * return KJS::Value(); - const QListViewItem * arg0; // Dummy + const TQListViewItem * arg0; // Dummy instance->repaintItem( arg0 ); @@ -882,10 +882,10 @@ KJS::Value QListViewImp::clearSelection_32( KJS::ExecState *exec, KJS::Object &o KJS::Value QListViewImp::setSelected_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -899,10 +899,10 @@ KJS::Value QListViewImp::setSelected_33( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QListViewImp::setSelectionAnchor_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy instance->setSelectionAnchor( arg0 ); @@ -913,10 +913,10 @@ KJS::Value QListViewImp::setSelectionAnchor_34( KJS::ExecState *exec, KJS::Objec KJS::Value QListViewImp::isSelected_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QListViewItem * + // Unsupported parameter const TQListViewItem * return KJS::Value(); - const QListViewItem * arg0; // Dummy + const TQListViewItem * arg0; // Dummy bool ret; ret = instance->isSelected( @@ -929,17 +929,17 @@ KJS::Value QListViewImp::selectedItem_36( KJS::ExecState *exec, KJS::Object &obj { instance->selectedItem( ); - return KJS::Value(); // Returns 'QListViewItem *' + return KJS::Value(); // Returns 'TQListViewItem *' } KJS::Value QListViewImp::setOpen_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false; @@ -953,10 +953,10 @@ KJS::Value QListViewImp::setOpen_37( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value QListViewImp::isOpen_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QListViewItem * + // Unsupported parameter const TQListViewItem * return KJS::Value(); - const QListViewItem * arg0; // Dummy + const TQListViewItem * arg0; // Dummy bool ret; ret = instance->isOpen( @@ -968,10 +968,10 @@ KJS::Value QListViewImp::isOpen_38( KJS::ExecState *exec, KJS::Object &obj, cons KJS::Value QListViewImp::setCurrentItem_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy instance->setCurrentItem( arg0 ); @@ -983,7 +983,7 @@ KJS::Value QListViewImp::currentItem_40( KJS::ExecState *exec, KJS::Object &obj, { instance->currentItem( ); - return KJS::Value(); // Returns 'QListViewItem *' + return KJS::Value(); // Returns 'TQListViewItem *' } @@ -991,7 +991,7 @@ KJS::Value QListViewImp::firstChild_41( KJS::ExecState *exec, KJS::Object &obj, { instance->firstChild( ); - return KJS::Value(); // Returns 'QListViewItem *' + return KJS::Value(); // Returns 'TQListViewItem *' } @@ -999,7 +999,7 @@ KJS::Value QListViewImp::lastItem_42( KJS::ExecState *exec, KJS::Object &obj, co { instance->lastItem( ); - return KJS::Value(); // Returns 'QListViewItem *' + return KJS::Value(); // Returns 'TQListViewItem *' } @@ -1139,7 +1139,7 @@ KJS::Value QListViewImp::sort_55( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QListViewImp::setFont_56( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QFont arg0; // TODO + TQFont arg0; // TODO instance->setFont( arg0 ); @@ -1150,7 +1150,7 @@ KJS::Value QListViewImp::setFont_56( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value QListViewImp::setPalette_57( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPalette arg0; // TODO + TQPalette arg0; // TODO instance->setPalette( arg0 ); @@ -1161,15 +1161,15 @@ KJS::Value QListViewImp::setPalette_57( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QListViewImp::eventFilter_58( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QObject * + // Unsupported parameter TQObject * return KJS::Value(); - QObject * arg0; // Dummy + TQObject * arg0; // Dummy - // Unsupported parameter QEvent * + // Unsupported parameter TQEvent * return KJS::Value(); - QEvent * arg1; // Dummy + TQEvent * arg1; // Dummy bool ret; ret = instance->eventFilter( @@ -1260,7 +1260,7 @@ KJS::Value QListViewImp::resizeMode_66( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QListViewImp::findItem_67( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null; + TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1; @@ -1273,7 +1273,7 @@ KJS::Value QListViewImp::findItem_67( KJS::ExecState *exec, KJS::Object &obj, co arg0, arg1, arg2 ); - return KJS::Value(); // Returns 'QListViewItem *' + return KJS::Value(); // Returns 'TQListViewItem *' } diff --git a/kjsembed/qtbindings/qlistview_imp.h b/kjsembed/qtbindings/qlistview_imp.h index 0c1edf2d..7fbee199 100644 --- a/kjsembed/qtbindings/qlistview_imp.h +++ b/kjsembed/qtbindings/qlistview_imp.h @@ -17,7 +17,7 @@ class QListView; namespace KJSEmbed { /** - * Wrapper class for QListView methods. + * Wrapper class for TQListView methods. * * @author Richard Moore, rich@kde.org */ @@ -111,7 +111,7 @@ public: static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QListView *toQListView( KJS::Object &object ); + static TQListView *toQListView( KJS::Object &object ); // // Constructors implemented by this class. @@ -210,7 +210,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QListView *instance; // Temp + TQListView *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qlistviewitem_imp.cpp b/kjsembed/qtbindings/qlistviewitem_imp.cpp index b7e18820..13765e2b 100644 --- a/kjsembed/qtbindings/qlistviewitem_imp.cpp +++ b/kjsembed/qtbindings/qlistviewitem_imp.cpp @@ -1,10 +1,10 @@ -#include <qcstring.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -13,7 +13,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qlistview.h> +#include <tqlistview.h> #include "qlistviewitem_imp.h" /** @@ -31,17 +31,17 @@ namespace Bindings { JSOpaqueProxy *prx = 0; if ( arg0 ) { - if ( arg0->typeName() == "QListViewItem" ) { - QListViewItem * parent = arg0->toNative<QListViewItem>(); - prx = new JSOpaqueProxy( new QListViewItem( parent ), "QListViewItem" ); + if ( arg0->typeName() == "TQListViewItem" ) { + TQListViewItem * parent = arg0->toNative<TQListViewItem>(); + prx = new JSOpaqueProxy( new TQListViewItem( parent ), "TQListViewItem" ); } else { return KJS::Object(); } } else { JSObjectProxy *arg0 = JSProxy::toObjectProxy( args[ 0 ].imp() ); if ( arg0 ) { - QListView * parent = ( QListView * ) ( arg0->widget() ); - prx = new JSOpaqueProxy( new QListViewItem( parent ), "QListViewItem" ); + TQListView * parent = ( TQListView * ) ( arg0->widget() ); + prx = new JSOpaqueProxy( new TQListViewItem( parent ), "TQListViewItem" ); } else { return KJS::Object(); } @@ -80,7 +80,7 @@ void QListViewItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -159,7 +159,7 @@ void QListViewItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -172,21 +172,21 @@ void QListViewItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QListViewItem pointer from an Object. + * Extract a TQListViewItem pointer from an Object. */ -QListViewItem *QListViewItemImp::toQListViewItem( KJS::Object &self ) +TQListViewItem *QListViewItemImp::toQListViewItem( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QListViewItem *>( obj ); + return dynamic_cast<TQListViewItem *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - return op->toNative<QListViewItem>(); + return op->toNative<TQListViewItem>(); } /** @@ -232,7 +232,7 @@ KJS::Object QListViewItemImp::construct( KJS::ExecState *exec, const KJS::List & break; } - QString msg = i18n("QListViewItemCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QListViewItemCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -240,13 +240,13 @@ KJS::Object QListViewItemImp::construct( KJS::ExecState *exec, const KJS::List & KJS::Object QListViewItemImp::QListViewItem_1( KJS::ExecState *exec, const KJS::List &args ) { #if 0 - // Unsupported parameter QListView * + // Unsupported parameter TQListView * return KJS::Value(); - QListView * arg0; // Dummy + TQListView * arg0; // Dummy - // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem( + // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem( arg0 ); #endif @@ -257,13 +257,13 @@ return KJS::Object(); KJS::Object QListViewItemImp::QListViewItem_2( KJS::ExecState *exec, const KJS::List &args ) { #if 0 - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy - // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem( + // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem( arg0 ); #endif @@ -274,18 +274,18 @@ KJS::Object QListViewItemImp::QListViewItem_3( KJS::ExecState *exec, const KJS:: { #if 0 - // Unsupported parameter QListView * + // Unsupported parameter TQListView * return KJS::Value(); - QListView * arg0; // Dummy + TQListView * arg0; // Dummy - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg1; // Dummy + TQListViewItem * arg1; // Dummy - // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem( + // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem( arg0, arg1 ); @@ -297,18 +297,18 @@ KJS::Object QListViewItemImp::QListViewItem_4( KJS::ExecState *exec, const KJS:: { #if 0 - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg1; // Dummy + TQListViewItem * arg1; // Dummy - // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem( + // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem( arg0, arg1 ); @@ -321,29 +321,29 @@ KJS::Object QListViewItemImp::QListViewItem_5( KJS::ExecState *exec, const KJS:: { #if 0 - // Unsupported parameter QListView * + // Unsupported parameter TQListView * return KJS::Value(); - QListView * arg0; // Dummy + TQListView * arg0; // Dummy - QString arg1 = extractQString(exec, args, 1); + TQString arg1 = extractQString(exec, args, 1); - QString arg2 = extractQString(exec, args, 2); + TQString arg2 = extractQString(exec, args, 2); - QString arg3 = extractQString(exec, args, 3); + TQString arg3 = extractQString(exec, args, 3); - QString arg4 = extractQString(exec, args, 4); + TQString arg4 = extractQString(exec, args, 4); - QString arg5 = extractQString(exec, args, 5); + TQString arg5 = extractQString(exec, args, 5); - QString arg6 = extractQString(exec, args, 6); + TQString arg6 = extractQString(exec, args, 6); - QString arg7 = extractQString(exec, args, 7); + TQString arg7 = extractQString(exec, args, 7); - QString arg8 = extractQString(exec, args, 8); + TQString arg8 = extractQString(exec, args, 8); - // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem( + // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem( arg0, arg1, @@ -363,29 +363,29 @@ KJS::Object QListViewItemImp::QListViewItem_6( KJS::ExecState *exec, const KJS:: { #if 0 - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy - QString arg1 = extractQString(exec, args, 1); + TQString arg1 = extractQString(exec, args, 1); - QString arg2 = extractQString(exec, args, 2); + TQString arg2 = extractQString(exec, args, 2); - QString arg3 = extractQString(exec, args, 3); + TQString arg3 = extractQString(exec, args, 3); - QString arg4 = extractQString(exec, args, 4); + TQString arg4 = extractQString(exec, args, 4); - QString arg5 = extractQString(exec, args, 5); + TQString arg5 = extractQString(exec, args, 5); - QString arg6 = extractQString(exec, args, 6); + TQString arg6 = extractQString(exec, args, 6); - QString arg7 = extractQString(exec, args, 7); + TQString arg7 = extractQString(exec, args, 7); - QString arg8 = extractQString(exec, args, 8); + TQString arg8 = extractQString(exec, args, 8); - // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem( + // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem( arg0, arg1, @@ -405,34 +405,34 @@ return KJS::Object(); KJS::Object QListViewItemImp::QListViewItem_7( KJS::ExecState *exec, const KJS::List &args ) { #if 0 - // Unsupported parameter QListView * + // Unsupported parameter TQListView * return KJS::Value(); - QListView * arg0; // Dummy + TQListView * arg0; // Dummy - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg1; // Dummy + TQListViewItem * arg1; // Dummy - QString arg2 = extractQString(exec, args, 2); + TQString arg2 = extractQString(exec, args, 2); - QString arg3 = extractQString(exec, args, 3); + TQString arg3 = extractQString(exec, args, 3); - QString arg4 = extractQString(exec, args, 4); + TQString arg4 = extractQString(exec, args, 4); - QString arg5 = extractQString(exec, args, 5); + TQString arg5 = extractQString(exec, args, 5); - QString arg6 = extractQString(exec, args, 6); + TQString arg6 = extractQString(exec, args, 6); - QString arg7 = extractQString(exec, args, 7); + TQString arg7 = extractQString(exec, args, 7); - QString arg8 = extractQString(exec, args, 8); + TQString arg8 = extractQString(exec, args, 8); - QString arg9 = extractQString(exec, args, 9); + TQString arg9 = extractQString(exec, args, 9); - // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem( + // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem( arg0, arg1, @@ -452,34 +452,34 @@ return KJS::Object(); KJS::Object QListViewItemImp::QListViewItem_8( KJS::ExecState *exec, const KJS::List &args ) { #if 0 - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg1; // Dummy + TQListViewItem * arg1; // Dummy - QString arg2 = extractQString(exec, args, 2); + TQString arg2 = extractQString(exec, args, 2); - QString arg3 = extractQString(exec, args, 3); + TQString arg3 = extractQString(exec, args, 3); - QString arg4 = extractQString(exec, args, 4); + TQString arg4 = extractQString(exec, args, 4); - QString arg5 = extractQString(exec, args, 5); + TQString arg5 = extractQString(exec, args, 5); - QString arg6 = extractQString(exec, args, 6); + TQString arg6 = extractQString(exec, args, 6); - QString arg7 = extractQString(exec, args, 7); + TQString arg7 = extractQString(exec, args, 7); - QString arg8 = extractQString(exec, args, 8); + TQString arg8 = extractQString(exec, args, 8); - QString arg9 = extractQString(exec, args, 9); + TQString arg9 = extractQString(exec, args, 9); - // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem( + // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem( arg0, arg1, @@ -722,7 +722,7 @@ KJS::Value QListViewItemImp::call( KJS::ExecState *exec, KJS::Object &self, cons break; } - QString msg = i18n( "QListViewItemImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QListViewItemImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -730,10 +730,10 @@ KJS::Value QListViewItemImp::call( KJS::ExecState *exec, KJS::Object &self, cons KJS::Value QListViewItemImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy instance->insertItem( arg0 ); @@ -744,10 +744,10 @@ KJS::Value QListViewItemImp::insertItem_10( KJS::ExecState *exec, KJS::Object &o KJS::Value QListViewItemImp::takeItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy instance->takeItem( arg0 ); @@ -758,10 +758,10 @@ KJS::Value QListViewItemImp::takeItem_11( KJS::ExecState *exec, KJS::Object &obj KJS::Value QListViewItemImp::removeItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy instance->removeItem( arg0 ); @@ -798,15 +798,15 @@ KJS::Value QListViewItemImp::totalHeight_15( KJS::ExecState *exec, KJS::Object & KJS::Value QListViewItemImp::width_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { #if 0 - // Unsupported parameter const QFontMetrics & + // Unsupported parameter const TQFontMetrics & return KJS::Value(); - const QFontMetrics & arg0; // Dummy + const TQFontMetrics & arg0; // Dummy - // Unsupported parameter const QListView * + // Unsupported parameter const TQListView * return KJS::Value(); - const QListView * arg1; // Dummy + const TQListView * arg1; // Dummy int arg2 = extractInt(exec, args, 2); @@ -846,7 +846,7 @@ KJS::Value QListViewItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj, int arg0 = extractInt(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); + TQString arg1 = extractQString(exec, args, 1); instance->setText( arg0, @@ -860,7 +860,7 @@ KJS::Value QListViewItemImp::text_20( KJS::ExecState *exec, KJS::Object &obj, co int arg0 = extractInt(exec, args, 0); - QString ret; + TQString ret; ret = instance->text( arg0 ); return KJS::String( ret ); @@ -872,7 +872,7 @@ KJS::Value QListViewItemImp::setPixmap_21( KJS::ExecState *exec, KJS::Object &ob int arg0 = extractInt(exec, args, 0); - QPixmap arg1 = extractQPixmap(exec, args, 1); + TQPixmap arg1 = extractQPixmap(exec, args, 1); instance->setPixmap( arg0, @@ -888,7 +888,7 @@ KJS::Value QListViewItemImp::pixmap_22( KJS::ExecState *exec, KJS::Object &obj, instance->pixmap( arg0 ); - return KJS::Value(); // Returns 'const QPixmap *' + return KJS::Value(); // Returns 'const TQPixmap *' } @@ -899,7 +899,7 @@ KJS::Value QListViewItemImp::key_23( KJS::ExecState *exec, KJS::Object &obj, con bool arg1 = extractBool(exec, args, 1); - QString ret; + TQString ret; ret = instance->key( arg0, arg1 ); @@ -910,10 +910,10 @@ KJS::Value QListViewItemImp::key_23( KJS::ExecState *exec, KJS::Object &obj, con KJS::Value QListViewItemImp::compare_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy int arg1 = extractInt(exec, args, 1); @@ -1002,15 +1002,15 @@ KJS::Value QListViewItemImp::isSelected_31( KJS::ExecState *exec, KJS::Object &o KJS::Value QListViewItemImp::paintCell_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { #if 0 - // Unsupported parameter QPainter * + // Unsupported parameter TQPainter * return KJS::Value(); - QPainter * arg0; // Dummy + TQPainter * arg0; // Dummy - // Unsupported parameter const QColorGroup & + // Unsupported parameter const TQColorGroup & return KJS::Value(); - const QColorGroup & arg1; // Dummy + const TQColorGroup & arg1; // Dummy int arg2 = extractInt(exec, args, 2); @@ -1033,15 +1033,15 @@ return KJS::Object(); KJS::Value QListViewItemImp::paintBranches_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { #if 0 - // Unsupported parameter QPainter * + // Unsupported parameter TQPainter * return KJS::Value(); - QPainter * arg0; // Dummy + TQPainter * arg0; // Dummy - // Unsupported parameter const QColorGroup & + // Unsupported parameter const TQColorGroup & return KJS::Value(); - const QColorGroup & arg1; // Dummy + const TQColorGroup & arg1; // Dummy int arg2 = extractInt(exec, args, 2); @@ -1064,17 +1064,17 @@ return KJS::Object(); KJS::Value QListViewItemImp::paintFocus_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { #if 0 - // Unsupported parameter QPainter * + // Unsupported parameter TQPainter * return KJS::Value(); - QPainter * arg0; // Dummy + TQPainter * arg0; // Dummy - // Unsupported parameter const QColorGroup & + // Unsupported parameter const TQColorGroup & return KJS::Value(); - const QColorGroup & arg1; // Dummy + const TQColorGroup & arg1; // Dummy - QRect arg2 = extractQRect(exec, args, 2); + TQRect arg2 = extractQRect(exec, args, 2); instance->paintFocus( arg0, @@ -1089,10 +1089,10 @@ return KJS::Object(); KJS::Value QListViewItemImp::firstChild_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QListViewItem *item = instance->firstChild( ); + TQListViewItem *item = instance->firstChild( ); if( item ) { - JSOpaqueProxy *prx = new JSOpaqueProxy( item, "QListViewItem" ); + JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" ); prx->setOwner( JSProxy::Native ); KJS::Object proxyObj( prx ); addBindings(exec,proxyObj); @@ -1106,10 +1106,10 @@ KJS::Value QListViewItemImp::firstChild_35( KJS::ExecState *exec, KJS::Object &o KJS::Value QListViewItemImp::nextSibling_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QListViewItem *item = instance->nextSibling( ); + TQListViewItem *item = instance->nextSibling( ); if( item ) { - JSOpaqueProxy *prx = new JSOpaqueProxy( item, "QListViewItem" ); + JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" ); prx->setOwner( JSProxy::Native ); KJS::Object proxyObj( prx ); addBindings(exec,proxyObj); @@ -1123,10 +1123,10 @@ KJS::Value QListViewItemImp::nextSibling_36( KJS::ExecState *exec, KJS::Object & KJS::Value QListViewItemImp::parent_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QListViewItem *item = instance->parent( ); + TQListViewItem *item = instance->parent( ); if( item ) { - JSOpaqueProxy *prx = new JSOpaqueProxy( item, "QListViewItem" ); + JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" ); prx->setOwner( JSProxy::Native ); KJS::Object proxyObj( prx ); addBindings(exec,proxyObj); @@ -1140,10 +1140,10 @@ KJS::Value QListViewItemImp::parent_37( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QListViewItemImp::itemAbove_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QListViewItem *item = instance->itemAbove( ); + TQListViewItem *item = instance->itemAbove( ); if( item ) { - JSOpaqueProxy *prx = new JSOpaqueProxy( item, "QListViewItem" ); + JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" ); prx->setOwner( JSProxy::Native ); KJS::Object proxyObj( prx ); addBindings(exec,proxyObj); @@ -1157,10 +1157,10 @@ KJS::Value QListViewItemImp::itemAbove_38( KJS::ExecState *exec, KJS::Object &ob KJS::Value QListViewItemImp::itemBelow_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QListViewItem *item = instance->itemBelow( ); + TQListViewItem *item = instance->itemBelow( ); if( item ) { - JSOpaqueProxy *prx = new JSOpaqueProxy( item, "QListViewItem" ); + JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" ); prx->setOwner( JSProxy::Native ); KJS::Object proxyObj( prx ); addBindings(exec,proxyObj); @@ -1184,7 +1184,7 @@ KJS::Value QListViewItemImp::listView_41( KJS::ExecState *exec, KJS::Object &obj { instance->listView( ); - return KJS::Value(); // Returns 'QListView *' + return KJS::Value(); // Returns 'TQListView *' } @@ -1247,10 +1247,10 @@ KJS::Value QListViewItemImp::sort_47( KJS::ExecState *exec, KJS::Object &obj, co KJS::Value QListViewItemImp::moveItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QListViewItem * + // Unsupported parameter TQListViewItem * return KJS::Value(); - QListViewItem * arg0; // Dummy + TQListViewItem * arg0; // Dummy instance->moveItem( arg0 ); @@ -1301,10 +1301,10 @@ KJS::Value QListViewItemImp::dropEnabled_52( KJS::ExecState *exec, KJS::Object & KJS::Value QListViewItemImp::acceptDrop_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter const QMimeSource * + // Unsupported parameter const TQMimeSource * return KJS::Value(); - const QMimeSource * arg0; // Dummy + const TQMimeSource * arg0; // Dummy bool ret; ret = instance->acceptDrop( diff --git a/kjsembed/qtbindings/qlistviewitem_imp.h b/kjsembed/qtbindings/qlistviewitem_imp.h index 590cde36..9f05bf89 100644 --- a/kjsembed/qtbindings/qlistviewitem_imp.h +++ b/kjsembed/qtbindings/qlistviewitem_imp.h @@ -26,7 +26,7 @@ namespace Bindings { }; } /** - * Wrapper class for QListViewItem methods. + * Wrapper class for TQListViewItem methods. * * @author Richard Moore, rich@kde.org */ @@ -122,7 +122,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QListViewItem *toQListViewItem( KJS::Object &object ); + static TQListViewItem *toQListViewItem( KJS::Object &object ); // // Constructors implemented by this class. @@ -213,7 +213,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QListViewItem *instance; // Temp + TQListViewItem *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qmenudata_imp.cpp b/kjsembed/qtbindings/qmenudata_imp.cpp index aecd1808..da91f8dd 100644 --- a/kjsembed/qtbindings/qmenudata_imp.cpp +++ b/kjsembed/qtbindings/qmenudata_imp.cpp @@ -1,13 +1,13 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> -#include <qkeysequence.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> +#include <tqkeysequence.h> #include <kjs/object.h> #include <kjsembed/global.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qmenudata.h> +#include <tqmenudata.h> #include "qmenudata_imp.h" /** @@ -43,7 +43,7 @@ void QMenuDataImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -121,7 +121,7 @@ void QMenuDataImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -134,25 +134,25 @@ void QMenuDataImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QMenuData pointer from an Object. + * Extract a TQMenuData pointer from an Object. */ -QMenuData *QMenuDataImp::toQMenuData( KJS::Object &self ) +TQMenuData *QMenuDataImp::toQMenuData( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QMenuData *>( obj ); + return dynamic_cast<TQMenuData *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QMenuData" ) + if ( op->typeName() != "TQMenuData" ) return 0; - return op->toNative<QMenuData>(); + return op->toNative<TQMenuData>(); } /** @@ -170,7 +170,7 @@ KJS::Object QMenuDataImp::construct( KJS::ExecState *exec, const KJS::List &args break; } - QString msg = i18n("QMenuDataCons has no constructor with id '%1'").arg(id); + TQString msg = i18n("QMenuDataCons has no constructor with id '%1'").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -179,9 +179,9 @@ KJS::Object QMenuDataImp::QMenuData_1( KJS::ExecState *exec, const KJS::List &ar { - // We should now create an instance of the QMenuData object + // We should now create an instance of the TQMenuData object - QMenuData *ret = new QMenuData( + TQMenuData *ret = new TQMenuData( ); return KJS::Object(); @@ -409,7 +409,7 @@ KJS::Value QMenuDataImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ break; } - QString msg = i18n( "QMenuDataImp has no method with id '%1'" ).arg( id ); + TQString msg = i18n( "QMenuDataImp has no method with id '%1'" ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -426,19 +426,19 @@ KJS::Value QMenuDataImp::count_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QMenuDataImp::insertItem_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); - // Unsupported parameter const QObject * + // Unsupported parameter const TQObject * return KJS::Value(); - const QObject * arg1; // Dummy + const TQObject * arg1; // Dummy const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0; // Unsupported parameter const QKeySequence return KJS::Value(); - const QKeySequence arg3; // Dummy + const TQKeySequence arg3; // Dummy int arg4 = extractInt(exec, args, 4); @@ -462,21 +462,21 @@ KJS::Value QMenuDataImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, c // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg0; // Dummy + const TQIconSet arg0; // Dummy - QString arg1 = extractQString(exec, args, 1); + TQString arg1 = extractQString(exec, args, 1); - // Unsupported parameter const QObject * + // Unsupported parameter const TQObject * return KJS::Value(); - const QObject * arg2; // Dummy + const TQObject * arg2; // Dummy const char *arg3 = (args.size() >= 4) ? args[3].toString(exec).ascii() : 0; // Unsupported parameter const QKeySequence return KJS::Value(); - const QKeySequence arg4; // Dummy + const TQKeySequence arg4; // Dummy int arg5 = extractInt(exec, args, 5); @@ -498,19 +498,19 @@ KJS::Value QMenuDataImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value QMenuDataImp::insertItem_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPixmap arg0 = extractQPixmap(exec, args, 0); + TQPixmap arg0 = extractQPixmap(exec, args, 0); - // Unsupported parameter const QObject * + // Unsupported parameter const TQObject * return KJS::Value(); - const QObject * arg1; // Dummy + const TQObject * arg1; // Dummy const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0; // Unsupported parameter const QKeySequence return KJS::Value(); - const QKeySequence arg3; // Dummy + const TQKeySequence arg3; // Dummy int arg4 = extractInt(exec, args, 4); @@ -534,21 +534,21 @@ KJS::Value QMenuDataImp::insertItem_7( KJS::ExecState *exec, KJS::Object &obj, c // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg0; // Dummy + const TQIconSet arg0; // Dummy - QPixmap arg1 = extractQPixmap(exec, args, 1); + TQPixmap arg1 = extractQPixmap(exec, args, 1); - // Unsupported parameter const QObject * + // Unsupported parameter const TQObject * return KJS::Value(); - const QObject * arg2; // Dummy + const TQObject * arg2; // Dummy const char *arg3 = (args.size() >= 4) ? args[3].toString(exec).ascii() : 0; // Unsupported parameter const QKeySequence return KJS::Value(); - const QKeySequence arg4; // Dummy + const TQKeySequence arg4; // Dummy int arg5 = extractInt(exec, args, 5); @@ -570,7 +570,7 @@ KJS::Value QMenuDataImp::insertItem_7( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value QMenuDataImp::insertItem_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -591,9 +591,9 @@ KJS::Value QMenuDataImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, c // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg0; // Dummy + const TQIconSet arg0; // Dummy - QString arg1 = extractQString(exec, args, 1); + TQString arg1 = extractQString(exec, args, 1); int arg2 = extractInt(exec, args, 2); @@ -612,12 +612,12 @@ KJS::Value QMenuDataImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, c KJS::Value QMenuDataImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); - // Unsupported parameter QPopupMenu * + // Unsupported parameter TQPopupMenu * return KJS::Value(); - QPopupMenu * arg1; // Dummy + TQPopupMenu * arg1; // Dummy int arg2 = extractInt(exec, args, 2); @@ -639,14 +639,14 @@ KJS::Value QMenuDataImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj, // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg0; // Dummy + const TQIconSet arg0; // Dummy - QString arg1 = extractQString(exec, args, 1); + TQString arg1 = extractQString(exec, args, 1); - // Unsupported parameter QPopupMenu * + // Unsupported parameter TQPopupMenu * return KJS::Value(); - QPopupMenu * arg2; // Dummy + TQPopupMenu * arg2; // Dummy int arg3 = extractInt(exec, args, 3); @@ -666,7 +666,7 @@ KJS::Value QMenuDataImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QMenuDataImp::insertItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPixmap arg0 = extractQPixmap(exec, args, 0); + TQPixmap arg0 = extractQPixmap(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -687,9 +687,9 @@ KJS::Value QMenuDataImp::insertItem_13( KJS::ExecState *exec, KJS::Object &obj, // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg0; // Dummy + const TQIconSet arg0; // Dummy - QPixmap arg1 = extractQPixmap(exec, args, 1); + TQPixmap arg1 = extractQPixmap(exec, args, 1); int arg2 = extractInt(exec, args, 2); @@ -708,12 +708,12 @@ KJS::Value QMenuDataImp::insertItem_13( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QMenuDataImp::insertItem_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPixmap arg0 = extractQPixmap(exec, args, 0); + TQPixmap arg0 = extractQPixmap(exec, args, 0); - // Unsupported parameter QPopupMenu * + // Unsupported parameter TQPopupMenu * return KJS::Value(); - QPopupMenu * arg1; // Dummy + TQPopupMenu * arg1; // Dummy int arg2 = extractInt(exec, args, 2); @@ -735,14 +735,14 @@ KJS::Value QMenuDataImp::insertItem_15( KJS::ExecState *exec, KJS::Object &obj, // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg0; // Dummy + const TQIconSet arg0; // Dummy - QPixmap arg1 = extractQPixmap(exec, args, 1); + TQPixmap arg1 = extractQPixmap(exec, args, 1); - // Unsupported parameter QPopupMenu * + // Unsupported parameter TQPopupMenu * return KJS::Value(); - QPopupMenu * arg2; // Dummy + TQPopupMenu * arg2; // Dummy int arg3 = extractInt(exec, args, 3); @@ -762,10 +762,10 @@ KJS::Value QMenuDataImp::insertItem_15( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QMenuDataImp::insertItem_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QWidget * + // Unsupported parameter TQWidget * return KJS::Value(); - QWidget * arg0; // Dummy + TQWidget * arg0; // Dummy int arg1 = extractInt(exec, args, 1); @@ -786,12 +786,12 @@ KJS::Value QMenuDataImp::insertItem_17( KJS::ExecState *exec, KJS::Object &obj, // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg0; // Dummy + const TQIconSet arg0; // Dummy - // Unsupported parameter QCustomMenuItem * + // Unsupported parameter TQCustomMenuItem * return KJS::Value(); - QCustomMenuItem * arg1; // Dummy + TQCustomMenuItem * arg1; // Dummy int arg2 = extractInt(exec, args, 2); @@ -810,10 +810,10 @@ KJS::Value QMenuDataImp::insertItem_17( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QMenuDataImp::insertItem_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QCustomMenuItem * + // Unsupported parameter TQCustomMenuItem * return KJS::Value(); - QCustomMenuItem * arg0; // Dummy + TQCustomMenuItem * arg0; // Dummy int arg1 = extractInt(exec, args, 1); @@ -887,7 +887,7 @@ KJS::Value QMenuDataImp::setAccel_24( KJS::ExecState *exec, KJS::Object &obj, co // Unsupported parameter const QKeySequence return KJS::Value(); - const QKeySequence arg0; // Dummy + const TQKeySequence arg0; // Dummy int arg1 = extractInt(exec, args, 1); @@ -905,7 +905,7 @@ KJS::Value QMenuDataImp::iconSet_25( KJS::ExecState *exec, KJS::Object &obj, con instance->iconSet( arg0 ); - return KJS::Value(); // Returns 'QIconSet *' + return KJS::Value(); // Returns 'TQIconSet *' } @@ -914,7 +914,7 @@ KJS::Value QMenuDataImp::text_26( KJS::ExecState *exec, KJS::Object &obj, const int arg0 = extractInt(exec, args, 0); - QString ret; + TQString ret; ret = instance->text( arg0 ); return KJS::String( ret ); @@ -928,7 +928,7 @@ KJS::Value QMenuDataImp::pixmap_27( KJS::ExecState *exec, KJS::Object &obj, cons instance->pixmap( arg0 ); - return KJS::Value(); // Returns 'QPixmap *' + return KJS::Value(); // Returns 'TQPixmap *' } @@ -937,7 +937,7 @@ KJS::Value QMenuDataImp::setWhatsThis_28( KJS::ExecState *exec, KJS::Object &obj int arg0 = extractInt(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); + TQString arg1 = extractQString(exec, args, 1); instance->setWhatsThis( arg0, @@ -951,7 +951,7 @@ KJS::Value QMenuDataImp::whatsThis_29( KJS::ExecState *exec, KJS::Object &obj, c int arg0 = extractInt(exec, args, 0); - QString ret; + TQString ret; ret = instance->whatsThis( arg0 ); return KJS::String( ret ); @@ -963,7 +963,7 @@ KJS::Value QMenuDataImp::changeItem_30( KJS::ExecState *exec, KJS::Object &obj, int arg0 = extractInt(exec, args, 0); - QString arg1 = extractQString(exec, args, 1); + TQString arg1 = extractQString(exec, args, 1); instance->changeItem( arg0, @@ -977,7 +977,7 @@ KJS::Value QMenuDataImp::changeItem_31( KJS::ExecState *exec, KJS::Object &obj, int arg0 = extractInt(exec, args, 0); - QPixmap arg1 = extractQPixmap(exec, args, 1); + TQPixmap arg1 = extractQPixmap(exec, args, 1); instance->changeItem( arg0, @@ -994,9 +994,9 @@ KJS::Value QMenuDataImp::changeItem_32( KJS::ExecState *exec, KJS::Object &obj, // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg1; // Dummy + const TQIconSet arg1; // Dummy - QString arg2 = extractQString(exec, args, 2); + TQString arg2 = extractQString(exec, args, 2); instance->changeItem( arg0, @@ -1014,9 +1014,9 @@ KJS::Value QMenuDataImp::changeItem_33( KJS::ExecState *exec, KJS::Object &obj, // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg1; // Dummy + const TQIconSet arg1; // Dummy - QPixmap arg2 = extractQPixmap(exec, args, 2); + TQPixmap arg2 = extractQPixmap(exec, args, 2); instance->changeItem( arg0, @@ -1029,7 +1029,7 @@ KJS::Value QMenuDataImp::changeItem_33( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QMenuDataImp::changeItem_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -1043,7 +1043,7 @@ KJS::Value QMenuDataImp::changeItem_34( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QMenuDataImp::changeItem_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPixmap arg0 = extractQPixmap(exec, args, 0); + TQPixmap arg0 = extractQPixmap(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -1060,9 +1060,9 @@ KJS::Value QMenuDataImp::changeItem_36( KJS::ExecState *exec, KJS::Object &obj, // Unsupported parameter const QIconSet return KJS::Value(); - const QIconSet arg0; // Dummy + const TQIconSet arg0; // Dummy - QString arg1 = extractQString(exec, args, 1); + TQString arg1 = extractQString(exec, args, 1); int arg2 = extractInt(exec, args, 2); @@ -1218,10 +1218,10 @@ KJS::Value QMenuDataImp::connectItem_48( KJS::ExecState *exec, KJS::Object &obj, int arg0 = extractInt(exec, args, 0); - // Unsupported parameter const QObject * + // Unsupported parameter const TQObject * return KJS::Value(); - const QObject * arg1; // Dummy + const TQObject * arg1; // Dummy const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0; @@ -1239,10 +1239,10 @@ KJS::Value QMenuDataImp::disconnectItem_49( KJS::ExecState *exec, KJS::Object &o int arg0 = extractInt(exec, args, 0); - // Unsupported parameter const QObject * + // Unsupported parameter const TQObject * return KJS::Value(); - const QObject * arg1; // Dummy + const TQObject * arg1; // Dummy const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0; @@ -1289,7 +1289,7 @@ KJS::Value QMenuDataImp::findItem_52( KJS::ExecState *exec, KJS::Object &obj, co instance->findItem( arg0 ); - return KJS::Value(); // Returns 'QMenuItem *' + return KJS::Value(); // Returns 'TQMenuItem *' } @@ -1298,25 +1298,25 @@ KJS::Value QMenuDataImp::findItem_53( KJS::ExecState *exec, KJS::Object &obj, co int arg0 = extractInt(exec, args, 0); - // Unsupported parameter QMenuData ** + // Unsupported parameter TQMenuData ** return KJS::Value(); - QMenuData ** arg1; // Dummy + TQMenuData ** arg1; // Dummy instance->findItem( arg0, arg1 ); - return KJS::Value(); // Returns 'QMenuItem *' + return KJS::Value(); // Returns 'TQMenuItem *' } KJS::Value QMenuDataImp::findPopup_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - // Unsupported parameter QPopupMenu * + // Unsupported parameter TQPopupMenu * return KJS::Value(); - QPopupMenu * arg0; // Dummy + TQPopupMenu * arg0; // Dummy // Unsupported parameter int * return KJS::Value(); @@ -1326,7 +1326,7 @@ KJS::Value QMenuDataImp::findPopup_54( KJS::ExecState *exec, KJS::Object &obj, c instance->findPopup( arg0, arg1 ); - return KJS::Value(); // Returns 'QMenuItem *' + return KJS::Value(); // Returns 'TQMenuItem *' } diff --git a/kjsembed/qtbindings/qmenudata_imp.h b/kjsembed/qtbindings/qmenudata_imp.h index f5ed75b4..b6b50fa7 100644 --- a/kjsembed/qtbindings/qmenudata_imp.h +++ b/kjsembed/qtbindings/qmenudata_imp.h @@ -17,7 +17,7 @@ class QMenuData; namespace KJSEmbed { /** - * Wrapper class for QMenuData methods. + * Wrapper class for TQMenuData methods. * * @author Richard Moore, rich@kde.org */ @@ -105,7 +105,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QMenuData *toQMenuData( KJS::Object &object ); + static TQMenuData *toQMenuData( KJS::Object &object ); // // Constructors implemented by this class. @@ -188,7 +188,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QMenuData *instance; // Temp + TQMenuData *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qmenuitem_imp.cpp b/kjsembed/qtbindings/qmenuitem_imp.cpp index fa994b21..c2be558c 100644 --- a/kjsembed/qtbindings/qmenuitem_imp.cpp +++ b/kjsembed/qtbindings/qmenuitem_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qmenudata.h> +#include <tqmenudata.h> #include "qmenuitem_imp.h" /** @@ -43,7 +43,7 @@ void QMenuItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -91,24 +91,24 @@ void QMenuItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QMenuItem pointer from an Object. + * Extract a TQMenuItem pointer from an Object. */ -QMenuItem *QMenuItemImp::toQMenuItem( KJS::Object &self ) +TQMenuItem *QMenuItemImp::toQMenuItem( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QMenuItem *>( obj ); + return dynamic_cast<TQMenuItem *>( obj ); } - if( !JSProxy::checkType(self, JSProxy::ObjectProxy, "QMenuItem") ) { - QObject *obj = JSProxy::toObjectProxy( self.imp() )->object(); - return dynamic_cast<QMenuItem *>( obj ); + if( !JSProxy::checkType(self, JSProxy::ObjectProxy, "TQMenuItem") ) { + TQObject *obj = JSProxy::toObjectProxy( self.imp() )->object(); + return dynamic_cast<TQMenuItem *>( obj ); } - if( !JSProxy::checkType(self, JSProxy::OpaqueProxy, "QMenuItem") ) { - return JSProxy::toOpaqueProxy( self.imp() )->toNative<QMenuItem>(); + if( !JSProxy::checkType(self, JSProxy::OpaqueProxy, "TQMenuItem") ) { + return JSProxy::toOpaqueProxy( self.imp() )->toNative<TQMenuItem>(); } return 0; @@ -129,7 +129,7 @@ KJS::Object QMenuItemImp::construct( KJS::ExecState *exec, const KJS::List &args break; } - QString msg = i18n("QMenuItemCons has no constructor with id '%1'").arg(id); + TQString msg = i18n("QMenuItemCons has no constructor with id '%1'").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -138,9 +138,9 @@ KJS::Object QMenuItemImp::QMenuItem_1( KJS::ExecState *exec, const KJS::List &ar { - // We should now create an instance of the QMenuItem object + // We should now create an instance of the TQMenuItem object - QMenuItem *ret = new QMenuItem( + TQMenuItem *ret = new TQMenuItem( ); return KJS::Object(); @@ -236,7 +236,7 @@ KJS::Value QMenuItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ break; } - QString msg = i18n( "QMenuItemImp has no method with id '%1'" ).arg( id ); + TQString msg = i18n( "QMenuItemImp has no method with id '%1'" ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -254,14 +254,14 @@ KJS::Value QMenuItemImp::iconSet_4( KJS::ExecState *exec, KJS::Object &obj, cons { instance->iconSet( ); - return KJS::Value(); // Returns 'QIconSet *' + return KJS::Value(); // Returns 'TQIconSet *' } KJS::Value QMenuItemImp::text_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->text( ); return KJS::String( ret ); @@ -270,7 +270,7 @@ KJS::Value QMenuItemImp::text_5( KJS::ExecState *exec, KJS::Object &obj, const K KJS::Value QMenuItemImp::whatsThis_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString ret; + TQString ret; ret = instance->whatsThis( ); return KJS::String( ret ); @@ -287,7 +287,7 @@ KJS::Value QMenuItemImp::popup_8( KJS::ExecState *exec, KJS::Object &obj, const { instance->popup( ); - return KJS::Value(); // Returns 'QPopupMenu *' + return KJS::Value(); // Returns 'TQPopupMenu *' } @@ -295,7 +295,7 @@ KJS::Value QMenuItemImp::widget_9( KJS::ExecState *exec, KJS::Object &obj, const { instance->widget( ); - return KJS::Value(); // Returns 'QWidget *' + return KJS::Value(); // Returns 'TQWidget *' } @@ -303,7 +303,7 @@ KJS::Value QMenuItemImp::custom_10( KJS::ExecState *exec, KJS::Object &obj, cons { instance->custom( ); - return KJS::Value(); // Returns 'QCustomMenuItem *' + return KJS::Value(); // Returns 'TQCustomMenuItem *' } @@ -318,7 +318,7 @@ KJS::Value QMenuItemImp::signal_12( KJS::ExecState *exec, KJS::Object &obj, cons { instance->signal( ); - return KJS::Value(); // Returns 'QSignal *' + return KJS::Value(); // Returns 'TQSignal *' } @@ -379,7 +379,7 @@ KJS::Value QMenuItemImp::isEnabledAndVisible_18( KJS::ExecState *exec, KJS::Obje KJS::Value QMenuItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); instance->setText( arg0 ); @@ -412,7 +412,7 @@ KJS::Value QMenuItemImp::setVisible_21( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QMenuItemImp::setWhatsThis_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QString arg0 = extractQString(exec, args, 0); + TQString arg0 = extractQString(exec, args, 0); instance->setWhatsThis( arg0 ); diff --git a/kjsembed/qtbindings/qmenuitem_imp.h b/kjsembed/qtbindings/qmenuitem_imp.h index 3b1935d2..7af67bd6 100644 --- a/kjsembed/qtbindings/qmenuitem_imp.h +++ b/kjsembed/qtbindings/qmenuitem_imp.h @@ -17,7 +17,7 @@ class QMenuItem; namespace KJSEmbed { /** - * Wrapper class for QMenuItem methods. + * Wrapper class for TQMenuItem methods. * * @author Richard Moore, rich@kde.org */ @@ -72,7 +72,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QMenuItem *toQMenuItem( KJS::Object &object ); + static TQMenuItem *toQMenuItem( KJS::Object &object ); // // Constructors implemented by this class. @@ -122,7 +122,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QMenuItem *instance; // Temp + TQMenuItem *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qpopupmenu_imp.cpp b/kjsembed/qtbindings/qpopupmenu_imp.cpp index 14430351..7b652422 100644 --- a/kjsembed/qtbindings/qpopupmenu_imp.cpp +++ b/kjsembed/qtbindings/qpopupmenu_imp.cpp @@ -1,12 +1,12 @@ -#include <qcstring.h> -#include <qimage.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqimage.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -15,7 +15,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include "qpopupmenu_imp.h" /** @@ -43,7 +43,7 @@ void QPopupMenuImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -85,7 +85,7 @@ void QPopupMenuImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -98,25 +98,25 @@ void QPopupMenuImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a QPopupMenu pointer from an Object. + * Extract a TQPopupMenu pointer from an Object. */ -QPopupMenu *QPopupMenuImp::toQPopupMenu( KJS::Object &self ) +TQPopupMenu *QPopupMenuImp::toQPopupMenu( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QPopupMenu *>( obj ); + return dynamic_cast<TQPopupMenu *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); if ( !op ) return 0; - if ( op->typeName() != "QPopupMenu" ) + if ( op->typeName() != "TQPopupMenu" ) return 0; - return op->toNative<QPopupMenu>(); + return op->toNative<TQPopupMenu>(); } /** @@ -134,7 +134,7 @@ KJS::Object QPopupMenuImp::construct( KJS::ExecState *exec, const KJS::List &arg break; } - QString msg = i18n("QPopupMenuCons has no constructor with id '%1'").arg(id); + TQString msg = i18n("QPopupMenuCons has no constructor with id '%1'").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -142,17 +142,17 @@ KJS::Object QPopupMenuImp::construct( KJS::ExecState *exec, const KJS::List &arg KJS::Object QPopupMenuImp::QPopupMenu_1( KJS::ExecState *exec, const KJS::List &args ) { - // Unsupported parameter QWidget * + // Unsupported parameter TQWidget * return KJS::Object(); - QWidget * arg0; // Dummy + TQWidget * arg0; // Dummy const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0; - // We should now create an instance of the QPopupMenu object + // We should now create an instance of the TQPopupMenu object - QPopupMenu *ret = new QPopupMenu( + TQPopupMenu *ret = new TQPopupMenu( arg0, arg1 ); @@ -238,7 +238,7 @@ KJS::Value QPopupMenuImp::call( KJS::ExecState *exec, KJS::Object &self, const K break; } - QString msg = i18n( "QPopupMenuImp has no method with id '%1'" ).arg( id ); + TQString msg = i18n( "QPopupMenuImp has no method with id '%1'" ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } @@ -246,7 +246,7 @@ KJS::Value QPopupMenuImp::call( KJS::ExecState *exec, KJS::Object &self, const K KJS::Value QPopupMenuImp::popup_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPoint arg0 = extractQPoint(exec, args, 0); + TQPoint arg0 = extractQPoint(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -291,7 +291,7 @@ KJS::Value QPopupMenuImp::isCheckable_6( KJS::ExecState *exec, KJS::Object &obj, KJS::Value QPopupMenuImp::setFont_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QFont arg0 = extractQFont(exec, args, 0); + TQFont arg0 = extractQFont(exec, args, 0); instance->setFont( arg0 ); @@ -327,7 +327,7 @@ KJS::Value QPopupMenuImp::exec_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QPopupMenuImp::exec_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPoint arg0 = extractQPoint(exec, args, 0); + TQPoint arg0 = extractQPoint(exec, args, 0); int arg1 = extractInt(exec, args, 1); @@ -352,7 +352,7 @@ KJS::Value QPopupMenuImp::setActiveItem_12( KJS::ExecState *exec, KJS::Object &o KJS::Value QPopupMenuImp::sizeHint_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QSize ret; + TQSize ret; ret = instance->sizeHint( ); return convertToValue( exec, ret ); @@ -374,7 +374,7 @@ KJS::Value QPopupMenuImp::idAt_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::Value QPopupMenuImp::idAt_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args ) { - QPoint arg0 = extractQPoint(exec, args, 0); + TQPoint arg0 = extractQPoint(exec, args, 0); int ret; ret = instance->idAt( @@ -422,7 +422,7 @@ KJS::Value QPopupMenuImp::itemGeometry_19( KJS::ExecState *exec, KJS::Object &ob { int arg0 = extractInt(exec, args, 0); - QRect ret; + TQRect ret; ret = instance->itemGeometry( arg0 ); diff --git a/kjsembed/qtbindings/qpopupmenu_imp.h b/kjsembed/qtbindings/qpopupmenu_imp.h index 6695f486..9bb16af9 100644 --- a/kjsembed/qtbindings/qpopupmenu_imp.h +++ b/kjsembed/qtbindings/qpopupmenu_imp.h @@ -17,7 +17,7 @@ class QPopupMenu; namespace KJSEmbed { /** - * Wrapper class for QPopupMenu methods. + * Wrapper class for TQPopupMenu methods. * * @author Richard Moore, rich@kde.org */ @@ -69,7 +69,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static QPopupMenu *toQPopupMenu( KJS::Object &object ); + static TQPopupMenu *toQPopupMenu( KJS::Object &object ); // // Constructors implemented by this class. @@ -116,7 +116,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - QPopupMenu *instance; // Temp + TQPopupMenu *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/qtbindings/qt_imp.cpp b/kjsembed/qtbindings/qt_imp.cpp index ba72c824..99cae783 100644 --- a/kjsembed/qtbindings/qt_imp.cpp +++ b/kjsembed/qtbindings/qt_imp.cpp @@ -1,10 +1,10 @@ -#include <qcstring.h> -#include <qpalette.h> -#include <qpixmap.h> -#include <qfont.h> +#include <tqcstring.h> +#include <tqpalette.h> +#include <tqpixmap.h> +#include <tqfont.h> #include <kjs/object.h> @@ -13,7 +13,7 @@ #include <kjsembed/jsopaqueproxy.h> #include <kjsembed/jsbinding.h> -#include <qnamespace.h> +#include <tqnamespace.h> #include "qt_imp.h" /** @@ -41,7 +41,7 @@ void QtImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -705,7 +705,7 @@ void QtImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) }; int idx = 0; - QCString lastName; + TQCString lastName; while( methods[idx].name ) { if ( lastName != methods[idx].name ) { @@ -724,7 +724,7 @@ Qt *QtImp::toQt( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) return dynamic_cast<Qt *>( obj ); } @@ -750,7 +750,7 @@ KJS::Object QtImp::construct( KJS::ExecState *exec, const KJS::List &args ) break; } - QString msg = i18n("QtCons has no constructor with id '%1'.").arg(id); + TQString msg = i18n("QtCons has no constructor with id '%1'.").arg(id); return throwError(exec, msg,KJS::ReferenceError); } @@ -765,7 +765,7 @@ KJS::Value QtImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List break; } - QString msg = i18n( "QtImp has no method with id '%1'." ).arg( id ); + TQString msg = i18n( "QtImp has no method with id '%1'." ).arg( id ); return throwError(exec, msg,KJS::ReferenceError); } diff --git a/kjsembed/qtstubs.cpp b/kjsembed/qtstubs.cpp index 0e78237a..d925f0dd 100644 --- a/kjsembed/qtstubs.cpp +++ b/kjsembed/qtstubs.cpp @@ -28,8 +28,8 @@ namespace KParts { -ReadOnlyPart::ReadOnlyPart( QObject *parent, const char *name ) - : QObject( parent, name ), m_widget(0) +ReadOnlyPart::ReadOnlyPart( TQObject *parent, const char *name ) + : TQObject( parent, name ), m_widget(0) { } @@ -37,7 +37,7 @@ ReadOnlyPart::~ReadOnlyPart() { } -ReadWritePart::ReadWritePart( QObject *parent, const char *name ) +ReadWritePart::ReadWritePart( TQObject *parent, const char *name ) : ReadOnlyPart( parent, name ) { } diff --git a/kjsembed/qtstubs.h b/kjsembed/qtstubs.h index 24ddd739..5b646d02 100644 --- a/kjsembed/qtstubs.h +++ b/kjsembed/qtstubs.h @@ -24,12 +24,12 @@ #include "global.h" #ifdef QT_ONLY -#include <qobject.h> -#include <qurl.h> +#include <tqobject.h> +#include <tqurl.h> class QWidget; -typedef QUrl KURL; +typedef TQUrl KURL; namespace KParts { @@ -38,13 +38,13 @@ class KJSEMBED_EXPORT ReadOnlyPart : public QObject Q_OBJECT public: - ReadOnlyPart( QObject *parent, const char *name=0 ); + ReadOnlyPart( TQObject *parent, const char *name=0 ); virtual ~ReadOnlyPart(); - void setWidget( QWidget *w ) { m_widget = w; } + void setWidget( TQWidget *w ) { m_widget = w; } private: - QWidget *m_widget; + TQWidget *m_widget; }; class KJSEMBED_EXPORT ReadWritePart : public ReadOnlyPart @@ -52,7 +52,7 @@ class KJSEMBED_EXPORT ReadWritePart : public ReadOnlyPart Q_OBJECT public: - ReadWritePart( QObject *parent, const char *name=0 ); + ReadWritePart( TQObject *parent, const char *name=0 ); virtual ~ReadWritePart(); }; diff --git a/kjsembed/slotproxy.cpp b/kjsembed/slotproxy.cpp index 7a99f056..dc5d7c2b 100644 --- a/kjsembed/slotproxy.cpp +++ b/kjsembed/slotproxy.cpp @@ -40,14 +40,14 @@ namespace KJSEmbed { -JSSlotProxy::JSSlotProxy( QObject *parent, const char *name ) - : QObject( parent, name ? name : "slot_proxy" ), +JSSlotProxy::JSSlotProxy( TQObject *parent, const char *name ) + : TQObject( parent, name ? name : "slot_proxy" ), proxy(0), js(0) { } -JSSlotProxy::JSSlotProxy( QObject *parent, const char *name, JSObjectProxy *prx ) - : QObject( parent, name ? name : "slot_proxy" ), +JSSlotProxy::JSSlotProxy( TQObject *parent, const char *name, JSObjectProxy *prx ) + : TQObject( parent, name ? name : "slot_proxy" ), proxy(prx), js( prx ? prx->interpreter() : 0 ) { } @@ -68,7 +68,7 @@ void JSSlotProxy::slot_bool( bool b ) execute( args ); } -void JSSlotProxy::slot_string( const QString &s ) +void JSSlotProxy::slot_string( const TQString &s ) { KJS::List args; args.append( KJS::String(s) ); @@ -110,14 +110,14 @@ void JSSlotProxy::slot_double( double d ) execute( args ); } -void JSSlotProxy::slot_color( const QColor &color ) +void JSSlotProxy::slot_color( const TQColor &color ) { KJS::List args; args.append( convertToValue(js->globalExec(), color) ); execute( args ); } -void JSSlotProxy::slot_font( const QFont &font ) +void JSSlotProxy::slot_font( const TQFont &font ) { KJS::List args; args.append( convertToValue(js->globalExec(), font) ); @@ -126,31 +126,31 @@ void JSSlotProxy::slot_font( const QFont &font ) }// namespace KJSEmbed -void KJSEmbed::JSSlotProxy::slot_point( const QPoint & point ) +void KJSEmbed::JSSlotProxy::slot_point( const TQPoint & point ) { KJS::List args; args.append( convertToValue(js->globalExec(), point) ); execute( args ); } -void KJSEmbed::JSSlotProxy::slot_rect( const QRect & rec ) +void KJSEmbed::JSSlotProxy::slot_rect( const TQRect & rec ) { KJS::List args; args.append( convertToValue(js->globalExec(), rec) ); execute( args ); } -void KJSEmbed::JSSlotProxy::slot_size( const QSize & size ) +void KJSEmbed::JSSlotProxy::slot_size( const TQSize & size ) { KJS::List args; args.append( convertToValue(js->globalExec(), size) ); execute( args ); } -void KJSEmbed::JSSlotProxy::slot_pixmap( const QPixmap & pix ) +void KJSEmbed::JSSlotProxy::slot_pixmap( const TQPixmap & pix ) { KJS::List args; - args.append( convertToValue(js->globalExec(), QVariant( pix ) ) ); + args.append( convertToValue(js->globalExec(), TQVariant( pix ) ) ); execute( args ); } @@ -211,7 +211,7 @@ void KJSEmbed::JSSlotProxy::execute( const KJS::List &args ) } } -void KJSEmbed::JSSlotProxy::slot_widget( QWidget * widget ) +void KJSEmbed::JSSlotProxy::slot_widget( TQWidget * widget ) { KJS::List args; if ( widget ) @@ -222,22 +222,22 @@ void KJSEmbed::JSSlotProxy::slot_widget( QWidget * widget ) execute( args ); } -void KJSEmbed::JSSlotProxy::slot_datetime( const QDateTime & dateTime ) +void KJSEmbed::JSSlotProxy::slot_datetime( const TQDateTime & dateTime ) { KJS::List args; - args.append( convertToValue(js->globalExec(), QVariant( dateTime ) )); + args.append( convertToValue(js->globalExec(), TQVariant( dateTime ) )); execute( args ); } -void KJSEmbed::JSSlotProxy::slot_datedate( const QDate & date1, const QDate & date2 ) +void KJSEmbed::JSSlotProxy::slot_datedate( const TQDate & date1, const TQDate & date2 ) { KJS::List args; - args.append( convertToValue(js->globalExec(), QVariant( date1 ) )); - args.append( convertToValue(js->globalExec(), QVariant( date2 ) )); + args.append( convertToValue(js->globalExec(), TQVariant( date1 ) )); + args.append( convertToValue(js->globalExec(), TQVariant( date2 ) )); execute( args ); } -void KJSEmbed::JSSlotProxy::slot_colorstring( const QColor & color, const QString & string ) +void KJSEmbed::JSSlotProxy::slot_colorstring( const TQColor & color, const TQString & string ) { KJS::List args; args.append( convertToValue(js->globalExec(), color )); @@ -245,28 +245,28 @@ void KJSEmbed::JSSlotProxy::slot_colorstring( const QColor & color, const QStrin execute( args ); } -void KJSEmbed::JSSlotProxy::slot_image( const QImage & image ) +void KJSEmbed::JSSlotProxy::slot_image( const TQImage & image ) { KJS::List args; - args.append( convertToValue(js->globalExec(), QVariant( image ) )); + args.append( convertToValue(js->globalExec(), TQVariant( image ) )); execute( args ); } -void KJSEmbed::JSSlotProxy::slot_date( const QDate & date ) +void KJSEmbed::JSSlotProxy::slot_date( const TQDate & date ) { KJS::List args; - args.append( convertToValue(js->globalExec(), QVariant( date ) )); + args.append( convertToValue(js->globalExec(), TQVariant( date ) )); execute( args ); } -void KJSEmbed::JSSlotProxy::slot_time( const QTime &time ) +void KJSEmbed::JSSlotProxy::slot_time( const TQTime &time ) { KJS::List args; - args.append( convertToValue(js->globalExec(), QVariant( time ) )); + args.append( convertToValue(js->globalExec(), TQVariant( time ) )); execute( args ); } -void KJSEmbed::JSSlotProxy::slot_variant( const QVariant & variant ) +void KJSEmbed::JSSlotProxy::slot_variant( const TQVariant & variant ) { KJS::List args; args.append( convertToValue(js->globalExec(), variant ) ); diff --git a/kjsembed/slotproxy.h b/kjsembed/slotproxy.h index 3df42215..4ed96b24 100644 --- a/kjsembed/slotproxy.h +++ b/kjsembed/slotproxy.h @@ -24,7 +24,7 @@ #include <kjsembed/global.h> #include <kjs/object.h> -#include <qobject.h> +#include <tqobject.h> #ifndef QT_ONLY #include <kurl.h> @@ -54,53 +54,53 @@ class KJSEMBED_EXPORT JSSlotProxy : public QObject Q_OBJECT public: - JSSlotProxy( QObject *parent, const char *name=0 ); - JSSlotProxy( QObject *parent, const char *name, JSObjectProxy *prx ); + JSSlotProxy( TQObject *parent, const char *name=0 ); + JSSlotProxy( TQObject *parent, const char *name, JSObjectProxy *prx ); virtual ~JSSlotProxy(); void setInterpreter( KJS::Interpreter *js ) { this->js = js; } void setProxy( JSObjectProxy *proxy ) { this->proxy = proxy; } void setObject( const KJS::Object &obj ) { this->obj = obj; } - void setMethod( const QString &method ) { this->method = method; } + void setMethod( const TQString &method ) { this->method = method; } public slots: void slot_void(); void slot_bool( bool b ); - void slot_string( const QString &s ); + void slot_string( const TQString &s ); void slot_int( int i ); void slot_uint( uint i ); void slot_long( long i ); void slot_ulong( ulong i ); void slot_double( double d ); - void slot_font( const QFont &font ); - void slot_color( const QColor &color ); - void slot_point( const QPoint &point ); - void slot_rect( const QRect &rec ); - void slot_size( const QSize &size ); - void slot_pixmap( const QPixmap &pix ); + void slot_font( const TQFont &font ); + void slot_color( const TQColor &color ); + void slot_point( const TQPoint &point ); + void slot_rect( const TQRect &rec ); + void slot_size( const TQSize &size ); + void slot_pixmap( const TQPixmap &pix ); void slot_url( const KURL &url ); void slot_intint( int , int ); void slot_intbool( int , bool ); void slot_intintint( int , int , int ); - void slot_date(const QDate& date); - void slot_time(const QTime& time); - void slot_datetime( const QDateTime &dateTime ); - void slot_datedate( const QDate &date1, const QDate &date2 ); - void slot_colorstring( const QColor &color, const QString &string); - void slot_image( const QImage &image ); + void slot_date(const TQDate& date); + void slot_time(const TQTime& time); + void slot_datetime( const TQDateTime &dateTime ); + void slot_datedate( const TQDate &date1, const TQDate &date2 ); + void slot_colorstring( const TQColor &color, const TQString &string); + void slot_image( const TQImage &image ); - void slot_variant( const QVariant &variant ); + void slot_variant( const TQVariant &variant ); - void slot_widget( QWidget *widget ); + void slot_widget( TQWidget *widget ); private: void execute( const KJS::List &args ); JSObjectProxy *proxy; KJS::Interpreter *js; KJS::Object obj; - QString method; + TQString method; class SlotProxyPrivate *d; }; diff --git a/kjsembed/slotutils.cpp b/kjsembed/slotutils.cpp index 58670e21..217d97a0 100644 --- a/kjsembed/slotutils.cpp +++ b/kjsembed/slotutils.cpp @@ -17,19 +17,19 @@ * Boston, MA 02110-1301, USA. */ -#include <qobject.h> -#include <qobjectlist.h> -#include <qdialog.h> -#include <qlistbox.h> -#include <qlistview.h> -#include <qmetaobject.h> -#include <qregexp.h> -#include <qsignal.h> -#include <qstrlist.h> -#include <qtimer.h> -#include <qvariant.h> -#include <qdatetime.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqobjectlist.h> +#include <tqdialog.h> +#include <tqlistbox.h> +#include <tqlistview.h> +#include <tqmetaobject.h> +#include <tqregexp.h> +#include <tqsignal.h> +#include <tqstrlist.h> +#include <tqtimer.h> +#include <tqvariant.h> +#include <tqdatetime.h> +#include <tqstringlist.h> #include <private/qucom_p.h> #include <private/qucomextra_p.h> @@ -69,33 +69,33 @@ JSSlotUtils::~JSSlotUtils() { } -bool JSSlotUtils::connect( QObject *sender, const char *sig, QObject *recv, const char *dest ) +bool JSSlotUtils::connect( TQObject *sender, const char *sig, TQObject *recv, const char *dest ) { if ( (!sender) || (!recv) ) return false; // Source - QString si = QString("2%1").arg(sig); + TQString si = TQString("2%1").arg(sig); const char *sigc = si.ascii(); // Connect to slot if ( recv->metaObject()->findSlot(dest, true) >= 0 ) { - QString sl = QString("1%1").arg(dest); + TQString sl = TQString("1%1").arg(dest); const char *slotc = sl.ascii(); //kdDebug(80001) << "connect: "<<sender->name()<<" "<<sigc<<", slot "<<recv->name()<<" "<<slotc<< endl; - bool ok = QObject::connect( sender, sigc, recv, slotc ); + bool ok = TQObject::connect( sender, sigc, recv, slotc ); if (ok) return true; } // Connect to signal if ( recv->metaObject()->findSignal(dest, true) >= 0 ) { - QString si2 = QString("2%1").arg(dest); + TQString si2 = TQString("2%1").arg(dest); const char *sig2c = si2.ascii(); kdDebug(80001) << "connect: "<<sender->name()<<" "<<sigc<<", sig "<<recv->name()<<" "<<sig2c<< endl; - bool ok = QObject::connect( sender, sigc, recv, sig2c ); + bool ok = TQObject::connect( sender, sigc, recv, sig2c ); if (ok) return true; } @@ -104,8 +104,8 @@ bool JSSlotUtils::connect( QObject *sender, const char *sig, QObject *recv, cons } KJS::Boolean JSSlotUtils::disconnect( KJS::ExecState */*exec*/, KJS::Object &/*self*/, - QObject *sender, const char *sig, - QObject *recv, const char *dest ) + TQObject *sender, const char *sig, + TQObject *recv, const char *dest ) { if ( (!sender) || (!recv) ) return KJS::Boolean(false); @@ -113,28 +113,28 @@ KJS::Boolean JSSlotUtils::disconnect( KJS::ExecState */*exec*/, KJS::Object &/*s bool ok; // Source - QString si = QString("2%1").arg(sig); + TQString si = TQString("2%1").arg(sig); const char *sigc = si.ascii(); // Disconnect from slot if ( recv->metaObject()->findSlot(dest, true) >= 0 ) { - QString sl = QString("1%1").arg(dest); + TQString sl = TQString("1%1").arg(dest); const char *slotc = sl.ascii(); //kdDebug(80001) << "disconnect: "<<sender->name()<<" "<<sigc<<", slot "<<recv->name()<<" "<<slotc<< endl; - ok = QObject::disconnect( sender, sigc, recv, slotc ); + ok = TQObject::disconnect( sender, sigc, recv, slotc ); if (ok) return KJS::Boolean(ok); } // Disonnect to signal if ( recv->metaObject()->findSignal(dest, true) >= 0 ) { - QString si2("2"); + TQString si2("2"); si2 = si2 + dest; const char *sig2c = si2.ascii(); //kdDebug(80001)<< "disconnect: "<<sender->name()<<" "<<sigc<<", sig "<<recv->name()<<" "<<sig2c<< endl; - ok = QObject::disconnect( sender, sigc, recv, sig2c ); + ok = TQObject::disconnect( sender, sigc, recv, sig2c ); if (ok) return KJS::Boolean(ok); } @@ -144,7 +144,7 @@ KJS::Boolean JSSlotUtils::disconnect( KJS::ExecState */*exec*/, KJS::Object &/*s KJS::Value JSSlotUtils::extractValue( KJS::ExecState *exec, QUObject *uo, JSObjectProxy *parent ) { - QCString typenm( uo->type->desc() ); + TQCString typenm( uo->type->desc() ); kdDebug(80001) << "JSSlotUtils:extractValue() " << typenm << endl; if ( typenm == "null" ) @@ -157,22 +157,22 @@ KJS::Value JSSlotUtils::extractValue( KJS::ExecState *exec, QUObject *uo, JSObje return KJS::Number( static_QUType_double.get(uo) ); else if ( typenm == "charstar" ) return KJS::String( static_QUType_charstar.get(uo) ); - else if ( typenm == "QString" ) + else if ( typenm == "TQString" ) return KJS::String( static_QUType_QString.get(uo) ); - else if ( typenm == "QVariant" ) + else if ( typenm == "TQVariant" ) return convertToValue( exec, static_QUType_QVariant.get(uo) ); else if ( typenm == "ptr" ) { void *ptr = static_QUType_ptr.get(uo); - // If it's a QObject and we know the parent + // If it's a TQObject and we know the parent if ( ptr && parent ) { - QObject *qobj = (QObject *)(ptr); // Crash in kst + TQObject *qobj = (TQObject *)(ptr); // Crash in kst return parent->part()->factory()->createProxy( exec, qobj, parent); } } kdWarning(80001) << "JSSlotUtils:extractValue() Failed (" << typenm << ")" << endl; - QString msg = i18n( "Value of type (%1) is not supported." ).arg( typenm ); + TQString msg = i18n( "Value of type (%1) is not supported." ).arg( typenm ); throwError(exec, msg,KJS::TypeError); return KJS::Null(); } @@ -213,18 +213,18 @@ void JSSlotUtils::implantCString( KJS::ExecState *exec, QUObject *uo, const KJS: void JSSlotUtils::implantURL( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v,KURL *url ) { - *url = QString( v.toString(exec).qstring() ); + *url = TQString( v.toString(exec).qstring() ); static_QUType_ptr.set( uo, url ); } -void JSSlotUtils::implantColor( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QColor *color ) +void JSSlotUtils::implantColor( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQColor *color ) { bool ok; - QString s( v.toString(exec).qstring() ); + TQString s( v.toString(exec).qstring() ); if ( s.startsWith("#") ) { - QRegExp re("#([0-9a-f][0-9a-f]){3,4}"); + TQRegExp re("#([0-9a-f][0-9a-f]){3,4}"); re.setCaseSensitive( false ); if ( re.search(s) != -1 ) { @@ -233,7 +233,7 @@ void JSSlotUtils::implantColor( KJS::ExecState *exec, QUObject *uo, const KJS::V uint b = re.cap(3).toUInt(&ok, 16); if ( re.numCaptures() == 3 ) - *color = QColor(r,g,b); + *color = TQColor(r,g,b); else if ( re.numCaptures() == 4 ) { uint a = re.cap(4).toUInt(&ok, 16); uint pix = r; @@ -244,20 +244,20 @@ void JSSlotUtils::implantColor( KJS::ExecState *exec, QUObject *uo, const KJS::V pix = pix << 8; pix = pix | a; - *color = QColor( qRgba(r,g,b,a), pix ); + *color = TQColor( qRgba(r,g,b,a), pix ); } } } else { // Try for a named color - *color = QColor( s ); + *color = TQColor( s ); } static_QUType_ptr.set( uo, color ); } -void JSSlotUtils::implantPoint( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QPoint *point ) +void JSSlotUtils::implantPoint( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQPoint *point ) { KJS::Object o = v.toObject( exec ); if ( !o.isValid() ) @@ -277,11 +277,11 @@ void JSSlotUtils::implantPoint( KJS::ExecState *exec, QUObject *uo, const KJS::V else return; - *point = QPoint( x, y ); + *point = TQPoint( x, y ); static_QUType_ptr.set( uo, point ); } -void JSSlotUtils::implantSize( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QSize *size ) +void JSSlotUtils::implantSize( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQSize *size ) { KJS::Object o = v.toObject( exec ); if ( !o.isValid() ) @@ -301,11 +301,11 @@ void JSSlotUtils::implantSize( KJS::ExecState *exec, QUObject *uo, const KJS::Va else return; - *size = QSize( w, h ); + *size = TQSize( w, h ); static_QUType_ptr.set( uo, size ); } -void JSSlotUtils::implantRect( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QRect *rect ) +void JSSlotUtils::implantRect( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQRect *rect ) { KJS::Object o = v.toObject( exec ); if ( !o.isValid() ) @@ -332,39 +332,39 @@ void JSSlotUtils::implantRect( KJS::ExecState *exec, QUObject *uo, const KJS::Va else return; - *rect = QRect( x, y, w, h ); + *rect = TQRect( x, y, w, h ); static_QUType_ptr.set( uo, rect ); } -void JSSlotUtils::implantDate( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QDate *date ) +void JSSlotUtils::implantDate( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQDate *date ) { - QDateTime jsDate = convertDateToDateTime(exec, v); + TQDateTime jsDate = convertDateToDateTime(exec, v); date->setYMD( jsDate.date().year(), jsDate.date().month(), jsDate.date().day() ); static_QUType_ptr.set( uo, date ); } -void JSSlotUtils::implantStringList(KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QStringList *lst ) +void JSSlotUtils::implantStringList(KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQStringList *lst ) { *lst = convertArrayToStringList(exec,v); static_QUType_ptr.set(uo,lst); } -void JSSlotUtils::implantTime( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QTime *time ) +void JSSlotUtils::implantTime( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQTime *time ) { - QDateTime jsDate = convertDateToDateTime(exec, v); + TQDateTime jsDate = convertDateToDateTime(exec, v); time->setHMS( jsDate.time().hour(), jsDate.time().minute(), jsDate.time().second() ); static_QUType_ptr.set( uo, time ); } -void JSSlotUtils::implantDateTime( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QDateTime *datetime ) +void JSSlotUtils::implantDateTime( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQDateTime *datetime ) { - QDateTime jsDate = convertDateToDateTime(exec, v); + TQDateTime jsDate = convertDateToDateTime(exec, v); datetime->setDate( jsDate.date() ); datetime->setTime( jsDate.time() ); static_QUType_ptr.set( uo, datetime ); } -void JSSlotUtils::implantPixmap( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QPixmap *pix ) +void JSSlotUtils::implantPixmap( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQPixmap *pix ) { *pix = convertToVariant(exec, v).toPixmap() ; static_QUType_ptr.set( uo, pix ); @@ -382,7 +382,7 @@ bool JSSlotUtils::implantQVariant( KJS::ExecState *, QUObject *uo, const KJS::Va } bool JSSlotUtils::implantValueProxy( KJS::ExecState *, QUObject *uo, - const KJS::Value &val, const QString &clazz ) + const KJS::Value &val, const TQString &clazz ) { JSValueProxy *prx = JSProxy::toValueProxy( val.imp() ); if ( !prx ) @@ -391,14 +391,14 @@ bool JSSlotUtils::implantValueProxy( KJS::ExecState *, QUObject *uo, return false; kdDebug(80001) << "We got a " << prx->typeName() << " and is valid " << prx->toVariant().isValid() << endl; - QVariant var = prx->toVariant(); + TQVariant var = prx->toVariant(); kdDebug(80001) << "We got a " << var.typeName()<< " and is valid " << var.isValid() << endl; static_QUType_QVariant.set( uo, var ); return var.isValid(); } bool JSSlotUtils::implantOpaqueProxy( KJS::ExecState *, QUObject *uo, - const KJS::Value &v, const QString &clazz ) + const KJS::Value &v, const TQString &clazz ) { JSOpaqueProxy *prx = JSProxy::toOpaqueProxy( v.imp() ); if ( !prx ) @@ -411,7 +411,7 @@ bool JSSlotUtils::implantOpaqueProxy( KJS::ExecState *, QUObject *uo, } bool JSSlotUtils::implantObjectProxy( KJS::ExecState *, QUObject *uo, - const KJS::Value &v, const QString &clazz ) + const KJS::Value &v, const TQString &clazz ) { JSObjectProxy *prx = JSProxy::toObjectProxy( v.imp() ); if ( !prx ) @@ -424,7 +424,7 @@ bool JSSlotUtils::implantObjectProxy( KJS::ExecState *, QUObject *uo, return true; } -int JSSlotUtils::findSignature( const QString &sig ) +int JSSlotUtils::findSignature( const TQString &sig ) { // No args if ( sig.contains("()") ) @@ -444,46 +444,46 @@ int JSSlotUtils::findSignature( const QString &sig ) else if ( sig.contains("(double)") ) return SignatureDouble; - else if ( sig.contains("(const QString&)") ) + else if ( sig.contains("(const TQString&)") ) return SignatureString; - else if ( sig.contains("(const QCString&)") ) + else if ( sig.contains("(const TQCString&)") ) return SignatureCString; else if ( sig.contains("(const char*)") ) return SignatureCString; else if ( sig.contains("(const KURL&)") ) return SignatureURL; - else if ( sig.contains("(const QColor&)") ) + else if ( sig.contains("(const TQColor&)") ) return SignatureColor; - else if ( sig.contains("(const QPoint&)") ) + else if ( sig.contains("(const TQPoint&)") ) return SignaturePoint; - else if ( sig.contains("(const QRect&)") ) + else if ( sig.contains("(const TQRect&)") ) return SignatureRect; - else if ( sig.contains("(const QSize&)") ) + else if ( sig.contains("(const TQSize&)") ) return SignatureSize; - else if ( sig.contains("(const QPixmap&)") ) + else if ( sig.contains("(const TQPixmap&)") ) return SignaturePixmap; - else if ( sig.contains("(const QFont&)") ) + else if ( sig.contains("(const TQFont&)") ) return SignatureFont; - else if ( sig.contains("(const QDate&)") ) + else if ( sig.contains("(const TQDate&)") ) return SignatureDate; - else if ( sig.contains("(const QTime&)") ) + else if ( sig.contains("(const TQTime&)") ) return SignatureTime; - else if ( sig.contains("(const QDateTime&)") ) + else if ( sig.contains("(const TQDateTime&)") ) return SignatureDateTime; - else if ( sig.contains("(const QImage&)") ) + else if ( sig.contains("(const TQImage&)") ) return SignatureImage; - else if ( sig.contains("(QWidget*)") ) + else if ( sig.contains("(TQWidget*)") ) return SignatureQWidget; // Two args - else if ( sig.contains("(const QDate&, const QDate&)") ) + else if ( sig.contains("(const TQDate&, const TQDate&)") ) return SignatureDateDate; - else if ( sig.contains("(const QColor&, const QString&)") ) + else if ( sig.contains("(const TQColor&, const TQString&)") ) return SignatureColorString; - else if ( sig.contains("(const QString&,const QString&,const QString&)") ) + else if ( sig.contains("(const TQString&,const TQString&,const TQString&)") ) return SignatureStringStringString; - else if ( sig.contains("(const QString&,const QString&)") ) + else if ( sig.contains("(const TQString&,const TQString&)") ) return SignatureStringString; else if ( sig.contains("(int,int)") ) return SignatureIntInt; @@ -494,57 +494,57 @@ int JSSlotUtils::findSignature( const QString &sig ) else if ( sig.contains("(int,int,int,int,bool)") ) return SignatureIntIntIntIntBool; - else if ( sig.contains("(const QString&,int)") ) + else if ( sig.contains("(const TQString&,int)") ) return SignatureStringInt; - else if ( sig.contains("(const QString&,uint)") ) + else if ( sig.contains("(const TQString&,uint)") ) return SignatureStringInt; else if ( sig.contains("(const KURL&,const KURL&)") ) return SignatureURLURL; - else if ( sig.contains("(const KURL&,const QString&)") ) + else if ( sig.contains("(const KURL&,const TQString&)") ) return SignatureURLString; - else if ( sig.contains("(const QString&,const KURL&)") ) + else if ( sig.contains("(const TQString&,const KURL&)") ) return SignatureStringURL; - else if ( sig.contains("(const QRect&,bool)") ) + else if ( sig.contains("(const TQRect&,bool)") ) return SignatureRectBool; - else if ( sig.contains("(const QString&,bool)") ) + else if ( sig.contains("(const TQString&,bool)") ) return SignatureStringBool; else if ( sig.contains("(int,bool)") ) return SignatureIntBool; else if ( sig.contains("(int,int,bool)") ) return SignatureIntIntBool; - else if ( sig.contains("(int,int,const QString&)") ) + else if ( sig.contains("(int,int,const TQString&)") ) return SignatureIntIntString; - else if ( sig.contains("(const QString&,bool,int)") ) + else if ( sig.contains("(const TQString&,bool,int)") ) return SignatureStringBoolInt; - else if ( sig.contains("(const QString&,bool,bool)") ) + else if ( sig.contains("(const TQString&,bool,bool)") ) return SignatureStringBoolBool; - else if ( sig.contains("(const QString&,int,int)") ) + else if ( sig.contains("(const TQString&,int,int)") ) return SignatureStringIntInt; - else if ( sig.contains("(int,const QColor&,bool)") ) + else if ( sig.contains("(int,const TQColor&,bool)") ) return SignatureIntColorBool; - else if ( sig.contains("(int,const QColor&)") ) + else if ( sig.contains("(int,const TQColor&)") ) return SignatureIntColor; else if ( sig.contains("(int,int,float,float)") ) return SignatureIntIntFloatFloat; - else if ( sig.contains("(const QString&,bool,bool,bool)") ) + else if ( sig.contains("(const TQString&,bool,bool,bool)") ) return SignatureStringBoolBoolBool; else if ( sig.contains("(int,int,int,int,int,int)") ) return SignatureIntIntIntIntIntInt; // Handle anything that falls through - if ( sig.contains("QString") || sig.contains("QColor") || + if ( sig.contains("TQString") || sig.contains("TQColor") || sig.contains("int") || sig.contains("bool") || sig.contains("float") || sig.contains("KURL") || - sig.contains("QVariant") || sig.contains("QSize") || - sig.contains("QRect") || sig.contains("QPixmap") || - sig.contains("QCString") || sig.contains("QPoint") || - sig.contains("double") || sig.contains("QFont") || - sig.contains("QDate") || sig.contains("QTime") || - sig.contains("QDateTime") || sig.contains("QStringList") || - sig.contains("QWidget") || sig.contains("QObject") || - sig.contains("QPen") || sig.contains("QImage") ) + sig.contains("TQVariant") || sig.contains("TQSize") || + sig.contains("TQRect") || sig.contains("TQPixmap") || + sig.contains("TQCString") || sig.contains("TQPoint") || + sig.contains("double") || sig.contains("TQFont") || + sig.contains("TQDate") || sig.contains("TQTime") || + sig.contains("TQDateTime") || sig.contains("TQStringList") || + sig.contains("TQWidget") || sig.contains("TQObject") || + sig.contains("TQPen") || sig.contains("TQImage") ) return SignatureCustom; kdWarning(80001) << "findSignature: not supported type " << sig << endl; @@ -563,34 +563,34 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K KJS::Value retValue; JSObjectProxy *proxy = proxyimp->objectProxy(); - QCString slotname( proxyimp->slotName() ); + TQCString slotname( proxyimp->slotName() ); int sigid = proxyimp->signature(); - QPtrList<uint> uintlist; + TQPtrList<uint> uintlist; uintlist.setAutoDelete(true); - QObject *obj = proxy->object(); + TQObject *obj = proxy->object(); int slotid = obj->metaObject()->findSlot( slotname, true ); if ( slotid == -1 ) { - QString msg = i18n( "Slot %1 was not found." ).arg( slotname ); + TQString msg = i18n( "Slot %1 was not found." ).arg( slotname ); return throwError(exec, msg,KJS::ReferenceError); } if ( args.size() > MAX_SUPPORTED_ARGS ) { - QString msg = i18n( "Slots with more than %1 arguments are not supported." ).arg( MAX_SUPPORTED_ARGS ); + TQString msg = i18n( "Slots with more than %1 arguments are not supported." ).arg( MAX_SUPPORTED_ARGS ); return throwError(exec, msg,KJS::ReferenceError); } // Keep args in scope for duration of the method. KURL url[MAX_SUPPORTED_ARGS]; - QColor color[MAX_SUPPORTED_ARGS]; - QPoint point[MAX_SUPPORTED_ARGS]; - QSize size[MAX_SUPPORTED_ARGS]; - QRect rect[MAX_SUPPORTED_ARGS]; - QDate date[MAX_SUPPORTED_ARGS]; - QDateTime datetime[MAX_SUPPORTED_ARGS]; - QTime time[MAX_SUPPORTED_ARGS]; - QPixmap pix[MAX_SUPPORTED_ARGS]; - QStringList slst[MAX_SUPPORTED_ARGS]; + TQColor color[MAX_SUPPORTED_ARGS]; + TQPoint point[MAX_SUPPORTED_ARGS]; + TQSize size[MAX_SUPPORTED_ARGS]; + TQRect rect[MAX_SUPPORTED_ARGS]; + TQDate date[MAX_SUPPORTED_ARGS]; + TQDateTime datetime[MAX_SUPPORTED_ARGS]; + TQTime time[MAX_SUPPORTED_ARGS]; + TQPixmap pix[MAX_SUPPORTED_ARGS]; + TQStringList slst[MAX_SUPPORTED_ARGS]; bool notsupported = true; @@ -735,17 +735,17 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K notsupported = false; int argsStart = slotname.find('('); int argsEnd = slotname.find(')'); - QString fargs = slotname.mid( argsStart+1, argsEnd-argsStart-1 ); + TQString fargs = slotname.mid( argsStart+1, argsEnd-argsStart-1 ); // Iterate over the parameters - QStringList argList = QStringList::split(',', fargs, true); + TQStringList argList = TQStringList::split(',', fargs, true); uint count = QMIN( argList.count(), MAX_SUPPORTED_ARGS ); kdDebug( 80001 ) << "======== arg count " << count << endl; for( uint idx = 0; idx < count; idx++ ) { kdDebug( 80001 ) << "======== Handling arg " << idx << endl; - QString arg = argList[idx]; + TQString arg = argList[idx]; arg = arg.replace("const", ""); arg = arg.replace("&", ""); arg = arg.simplifyWhiteSpace(); @@ -761,40 +761,40 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K implantInt( exec, uo+1+idx, args[idx] ); else if ( arg.contains("double") == 1 ) implantDouble(exec, uo+1+idx, args[idx]); - else if ( arg.contains("QStringList") == 1 ) + else if ( arg.contains("TQStringList") == 1 ) implantStringList( exec, uo+1+idx, args[idx], &slst[idx] ); - else if ( arg.contains("QString") == 1 ) + else if ( arg.contains("TQString") == 1 ) implantQString(exec, uo+1+idx, args[idx] ); - else if ( arg.contains("QCString") == 1 ) + else if ( arg.contains("TQCString") == 1 ) implantCString(exec, uo+1+idx, args[idx] ); else if ( arg.contains("bool") == 1 ) implantBool( exec, uo+1+idx, args[idx] ); else if ( arg.contains("KURL") == 1 ) implantURL( exec, uo+1+idx, args[idx], &url[idx] ); - else if ( arg.contains("QColor") == 1 ) + else if ( arg.contains("TQColor") == 1 ) implantColor( exec, uo+1+idx, args[idx], &color[idx] ); - else if ( arg.contains("QPoint") == 1 ) + else if ( arg.contains("TQPoint") == 1 ) implantPoint( exec, uo+1+idx, args[idx], &point[idx] ); - else if ( arg.contains("QSize") == 1 ) + else if ( arg.contains("TQSize") == 1 ) implantSize( exec, uo+1+idx, args[idx], &size[idx] ); - else if ( arg.contains("QRect") == 1 ) + else if ( arg.contains("TQRect") == 1 ) implantRect( exec, uo+1+idx, args[idx], &rect[idx] ); - else if ( arg.contains("QDate") == 1 ) + else if ( arg.contains("TQDate") == 1 ) implantDate( exec, uo+1+idx, args[idx], &date[idx] ); - else if ( arg.contains("QTime") == 1 ) + else if ( arg.contains("TQTime") == 1 ) implantTime( exec, uo+1+idx, args[idx], &time[idx] ); - else if ( arg.contains("QDateTime") == 1 ) + else if ( arg.contains("TQDateTime") == 1 ) implantDateTime( exec, uo+1+idx, args[idx], &datetime[idx] ); - else if ( arg.contains("QPixmap") == 1 ) + else if ( arg.contains("TQPixmap") == 1 ) implantPixmap( exec, uo+1+idx, args[idx], &pix[idx] ); else if ( arg.contains("char") == 1) implantCharStar( exec, uo+1+idx, args[idx] ); - else if ( ( arg.contains("QObject") == 1 ) || ( arg.contains("QWidget") == 1 ) ) + else if ( ( arg.contains("TQObject") == 1 ) || ( arg.contains("TQWidget") == 1 ) ) { - kdDebug( 80001 ) << "Doing a QObject" << endl; - notsupported = !implantObjectProxy( exec, uo+1+idx, args[idx], "QObject" ); + kdDebug( 80001 ) << "Doing a TQObject" << endl; + notsupported = !implantObjectProxy( exec, uo+1+idx, args[idx], "TQObject" ); } - else if ( QVariant::nameToType(arg.latin1()) != QVariant::Invalid ) { + else if ( TQVariant::nameToType(arg.latin1()) != TQVariant::Invalid ) { bool ok = implantValueProxy( exec, uo+1+idx, args[idx], arg ); if ( !ok ) { notsupported = true; @@ -805,15 +805,15 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K kdDebug( 80001 ) << "Implanted the variant " << static_QUType_QVariant.get(uo+1+idx).isValid() << endl; } } - /* else if ( ( arg.contains("QVariant") == 1 ) || - ( arg.contains("QPen") == 1 ) || (arg.contains("QFont") == 1 ) || - ( arg.contains("QBrush") == 1 )) + /* else if ( ( arg.contains("TQVariant") == 1 ) || + ( arg.contains("TQPen") == 1 ) || (arg.contains("TQFont") == 1 ) || + ( arg.contains("TQBrush") == 1 )) if(!implantQVariant(exec, uo+1+idx, args[idx] )){ notsupported = true; break; } */ else if ( arg.contains("*") == 1 ) { - QRegExp re("(\\w+)\\*"); + TQRegExp re("(\\w+)\\*"); if ( re.search(arg) >= 0 ) { bool ok = implantObjectProxy( exec, uo+1+idx, args[idx], re.cap(1) ); if ( !ok ) { @@ -844,7 +844,7 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K obj->qt_invoke( slotid, uo ); } // Handle return types - QCString ret( proxyimp->returnType() ); + TQCString ret( proxyimp->returnType() ); if ( ret.isEmpty() ) { // Basic type (void, int etc.) return extractValue( exec, uo ); @@ -854,7 +854,7 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K kdDebug(80001) << "Handling a pointer return of type " << ret << endl; if ( proxy->part()->factory()->isQObject(ret) ) { - kdDebug(80001) << "Return type is QObject " << ret << endl; + kdDebug(80001) << "Return type is TQObject " << ret << endl; return extractValue( exec, uo, proxy ); } diff --git a/kjsembed/slotutils.h b/kjsembed/slotutils.h index ff43a95a..7043e590 100644 --- a/kjsembed/slotutils.h +++ b/kjsembed/slotutils.h @@ -82,13 +82,13 @@ public: * Returns the method id for the specified slot signature. If there is no match * then -1 is returned. */ - static int findSignature( const QString &sig ); + static int findSignature( const TQString &sig ); /** Connects the specified signal to the specified slot. */ - static bool connect( QObject *sender, const char *sig, QObject *recv, const char *dest ); + static bool connect( TQObject *sender, const char *sig, TQObject *recv, const char *dest ); static KJS::Boolean disconnect( KJS::ExecState *exec, KJS::Object &self, - QObject *sender, const char *sig, QObject *recv, const char *dest ); + TQObject *sender, const char *sig, TQObject *recv, const char *dest ); static KJS::Value invokeSlot( KJS::ExecState *exec, KJS::Object &self, const KJS::List&args, JSObjectProxyImp *proxyimp ); @@ -98,7 +98,7 @@ public: /** Implant an int into a QUObject. */ static void implantInt( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v ); - /** Implant a QString into a QUObject. */ + /** Implant a TQString into a QUObject. */ static void implantQString( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v ); /** Implant a bool into a QUObject. */ static void implantBool( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v ); @@ -109,32 +109,32 @@ public: /** Implant a KURL into a QUObject. */ static void implantURL( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, KURL *url ); - /** Implant a QColor into a QUObject. */ - static void implantColor( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QColor *color ); - /** Implant a QPoint into a QUObject. */ - static void implantPoint( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QPoint *point ); - /** Implant a QRect into a QUObject. */ - static void implantRect( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QRect *rect ); - /** Implant a QSize into a QUObject. */ - static void implantSize( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QSize *size ); - - /** Implant a QDate into a QUObject. */ - static void implantDate( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QDate *date ); - /** Implant a QTime into a QUObject. */ - static void implantTime( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QTime *time ); - /** Implant a QDateTime into a QUObject. */ - static void implantDateTime( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QDateTime *datetime ); - /** Implant a QPixmap into a QUObject. */ - static void implantPixmap( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, QPixmap *pix ); + /** Implant a TQColor into a QUObject. */ + static void implantColor( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQColor *color ); + /** Implant a TQPoint into a QUObject. */ + static void implantPoint( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQPoint *point ); + /** Implant a TQRect into a QUObject. */ + static void implantRect( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQRect *rect ); + /** Implant a TQSize into a QUObject. */ + static void implantSize( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQSize *size ); + + /** Implant a TQDate into a QUObject. */ + static void implantDate( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQDate *date ); + /** Implant a TQTime into a QUObject. */ + static void implantTime( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQTime *time ); + /** Implant a TQDateTime into a QUObject. */ + static void implantDateTime( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQDateTime *datetime ); + /** Implant a TQPixmap into a QUObject. */ + static void implantPixmap( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v, TQPixmap *pix ); /** * Implant a value proxy into a QUObject. The type specified in the clazz parameter * must match the type of the proxy'd value for the method to succeed. */ static bool implantValueProxy( KJS::ExecState *exec, QUObject *uo, - const KJS::Value &v, const QString &clazz); + const KJS::Value &v, const TQString &clazz); - /** Implant a QVariant into a QUObject. */ + /** Implant a TQVariant into a QUObject. */ static bool implantQVariant( KJS::ExecState *exec, QUObject *uo,const KJS::Value &v); /** @@ -143,17 +143,17 @@ public: * to succeed. */ static bool implantOpaqueProxy( KJS::ExecState *, QUObject *uo, - const KJS::Value &v, const QString &clazz ); + const KJS::Value &v, const TQString &clazz ); /** * Implant an object proxy into a QUObject. The object proxy'd by the specified value * must inherit the class specified for the converstion to succeed. */ static bool implantObjectProxy( KJS::ExecState *exec, QUObject *uo, - const KJS::Value &v, const QString &clazz ); - /** Implant a QString into a QUObject. */ + const KJS::Value &v, const TQString &clazz ); + /** Implant a TQString into a QUObject. */ static void implantStringList(KJS::ExecState *exec, QUObject *uo, - const KJS::Value &v, QStringList *lst ); + const KJS::Value &v, TQStringList *lst ); /** Implant a char* into a QUObject. */ static void implantCharStar( KJS::ExecState *exec, QUObject *uo, const KJS::Value &v ); diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp index 228e1093..47065ab7 100644 --- a/kjsembed/testkjsembed.cpp +++ b/kjsembed/testkjsembed.cpp @@ -49,7 +49,7 @@ int main( int argc, char **argv ) // Setup Window app.setMainWidget( console ); - app.connect( &app, SIGNAL( lastWindowClosed() ), SLOT(quit()) ); + app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); console->resize( 600, 450 ); console->show(); diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp index 8cb33adc..f97d6b1c 100644 --- a/kjsembed/tests/testkjsembed.cpp +++ b/kjsembed/tests/testkjsembed.cpp @@ -52,7 +52,7 @@ int main( int argc, char **argv ) // Setup Window app.setMainWidget( console ); - app.connect( &app, SIGNAL( lastWindowClosed() ), SLOT(quit()) ); + app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); console->resize( 600, 450 ); console->show(); diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h index 16e4f3db..e85f0750 100644 --- a/kjsembed/tools/headers/qbrush.h +++ b/kjsembed/tools/headers/qbrush.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** -** Definition of QBrush class +** Definition of TQBrush class ** ** Created : 940112 ** @@ -39,38 +39,38 @@ #define QBRUSH_H #ifndef QT_H -#include "qcolor.h" -#include "qshared.h" +#include "tqcolor.h" +#include "tqshared.h" #endif // QT_H -class Q_EXPORT QBrush: public Qt +class Q_EXPORT TQBrush: public Qt { friend class QPainter; public: - QBrush(); - QBrush( BrushStyle ); - QBrush( const QColor &, BrushStyle=SolidPattern ); - QBrush( const QColor &, const QPixmap & ); - QBrush( const QBrush & ); - ~QBrush(); - QBrush &operator=( const QBrush & ); + TQBrush(); + TQBrush( BrushStyle ); + TQBrush( const TQColor &, BrushStyle=SolidPattern ); + TQBrush( const TQColor &, const TQPixmap & ); + TQBrush( const TQBrush & ); + ~TQBrush(); + TQBrush &operator=( const TQBrush & ); BrushStyle style() const { return data->style; } void setStyle( BrushStyle ); - const QColor &color()const { return data->color; } - void setColor( const QColor & ); - QPixmap *pixmap() const { return data->pixmap; } - void setPixmap( const QPixmap & ); + const TQColor &color()const { return data->color; } + void setColor( const TQColor & ); + TQPixmap *pixmap() const { return data->pixmap; } + void setPixmap( const TQPixmap & ); - bool operator==( const QBrush &p ) const; - bool operator!=( const QBrush &b ) const + bool operator==( const TQBrush &p ) const; + bool operator!=( const TQBrush &b ) const { return !(operator==(b)); } private: QBrush copy() const; void detach(); - void init( const QColor &, BrushStyle ); + void init( const TQColor &, BrushStyle ); struct QBrushData : public QShared { // brush data BrushStyle style; QColor color; @@ -80,12 +80,12 @@ private: /***************************************************************************** - QBrush stream functions + TQBrush stream functions *****************************************************************************/ #ifndef QT_NO_DATASTREAM -Q_EXPORT QDataStream &operator<<( QDataStream &, const QBrush & ); -Q_EXPORT QDataStream &operator>>( QDataStream &, QBrush & ); +Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & ); +Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & ); #endif #endif // QBRUSH_H diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h index 62a33b65..797c4bd3 100644 --- a/kjsembed/tools/headers/qcanvas.h +++ b/kjsembed/tools/headers/qcanvas.h @@ -1,7 +1,7 @@ /********************************************************************** ** ** -** Definition of QCanvas classes +** Definition of TQCanvas classes ** ** Created : 991211 ** @@ -39,13 +39,13 @@ #define QCANVAS_H #ifndef QT_H -#include "qscrollview.h" -#include "qpixmap.h" -#include "qptrlist.h" -#include "qbrush.h" -#include "qpen.h" -#include "qvaluelist.h" -#include "qpointarray.h" +#include "tqscrollview.h" +#include "tqpixmap.h" +#include "tqptrlist.h" +#include "tqbrush.h" +#include "tqpen.h" +#include "tqvaluelist.h" +#include "tqpointarray.h" #endif // QT_H #if !defined( QT_MODULE_CANVAS ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_CANVAS ) @@ -73,20 +73,20 @@ class QCanvasView; class QCanvasPixmap; -class QM_EXPORT_CANVAS QCanvasItemList : public QValueList<QCanvasItem*> { +class QM_EXPORT_CANVAS TQCanvasItemList : public TQValueList<TQCanvasItem*> { public: void sort(); - void drawUnique( QPainter& painter ); + void drawUnique( TQPainter& painter ); }; class QCanvasItemExtra; -class QM_EXPORT_CANVAS QCanvasItem : public Qt +class QM_EXPORT_CANVAS TQCanvasItem : public Qt { public: - QCanvasItem(QCanvas* canvas); - virtual ~QCanvasItem(); + TQCanvasItem(TQCanvas* canvas); + virtual ~TQCanvasItem(); double x() const { return myx; } @@ -110,13 +110,13 @@ public: double yVelocity() const; virtual void advance(int stage); - virtual bool collidesWith( const QCanvasItem* ) const=0; + virtual bool collidesWith( const TQCanvasItem* ) const=0; - QCanvasItemList collisions(bool exact /* NO DEFAULT */ ) const; + TQCanvasItemList collisions(bool exact /* NO DEFAULT */ ) const; - virtual void setCanvas(QCanvas*); + virtual void setCanvas(TQCanvas*); - virtual void draw(QPainter&)=0; + virtual void draw(TQPainter&)=0; void show(); void hide(); @@ -159,10 +159,10 @@ public: virtual int rtti() const; static int RTTI; - virtual QRect boundingRect() const=0; - virtual QRect boundingRectAdvanced() const; + virtual TQRect boundingRect() const=0; + virtual TQRect boundingRectAdvanced() const; - QCanvas* canvas() const + TQCanvas* canvas() const { return cnv; } protected: @@ -179,22 +179,22 @@ private: friend class QCanvasText; friend class QCanvasLine; - virtual QPointArray chunks() const; + virtual TQPointArray chunks() const; virtual void addToChunks(); virtual void removeFromChunks(); virtual void changeChunks(); - virtual bool collidesWith( const QCanvasSprite*, - const QCanvasPolygonalItem*, - const QCanvasRectangle*, - const QCanvasEllipse*, - const QCanvasText* ) const = 0; + virtual bool collidesWith( const TQCanvasSprite*, + const TQCanvasPolygonalItem*, + const TQCanvasRectangle*, + const TQCanvasEllipse*, + const TQCanvasText* ) const = 0; // End of friend stuff - QCanvas* cnv; - static QCanvas* current_canvas; + TQCanvas* cnv; + static TQCanvas* current_canvas; double myx,myy,myz; - QCanvasItemExtra *ext; - QCanvasItemExtra& extra(); + TQCanvasItemExtra *ext; + TQCanvasItemExtra& extra(); uint ani:1; uint vis:1; uint val:1; @@ -206,23 +206,23 @@ private: class QCanvasData; -class QM_EXPORT_CANVAS QCanvas : public QObject +class QM_EXPORT_CANVAS TQCanvas : public QObject { Q_OBJECT public: - QCanvas( QObject* parent = 0, const char* name = 0 ); - QCanvas(int w, int h); - QCanvas( QPixmap p, int h, int v, int tilewidth, int tileheight ); + TQCanvas( TQObject* parent = 0, const char* name = 0 ); + TQCanvas(int w, int h); + TQCanvas( TQPixmap p, int h, int v, int tilewidth, int tileheight ); - virtual ~QCanvas(); + virtual ~TQCanvas(); - virtual void setTiles( QPixmap tiles, int h, int v, + virtual void setTiles( TQPixmap tiles, int h, int v, int tilewidth, int tileheight ); - virtual void setBackgroundPixmap( const QPixmap& p ); - QPixmap backgroundPixmap() const; + virtual void setBackgroundPixmap( const TQPixmap& p ); + TQPixmap backgroundPixmap() const; - virtual void setBackgroundColor( const QColor& c ); - QColor backgroundColor() const; + virtual void setBackgroundColor( const TQColor& c ); + TQColor backgroundColor() const; virtual void setTile( int x, int y, int tilenum ); int tile( int x, int y ) const @@ -243,17 +243,17 @@ public: { return awidth; } int height() const { return aheight; } - QSize size() const - { return QSize(awidth,aheight); } - QRect rect() const - { return QRect( 0, 0, awidth, aheight ); } + TQSize size() const + { return TQSize(awidth,aheight); } + TQRect rect() const + { return TQRect( 0, 0, awidth, aheight ); } bool onCanvas( int x, int y ) const { return x>=0 && y>=0 && x<awidth && y<aheight; } - bool onCanvas( const QPoint& p ) const + bool onCanvas( const TQPoint& p ) const { return onCanvas(p.x(),p.y()); } bool validChunk( int x, int y ) const { return x>=0 && y>=0 && x<chwidth && y<chheight; } - bool validChunk( const QPoint& p ) const + bool validChunk( const TQPoint& p ) const { return validChunk(p.x(),p.y()); } int chunkSize() const @@ -265,34 +265,34 @@ public: virtual void setChangedChunk(int i, int j); virtual void setChangedChunkContaining(int x, int y); virtual void setAllChanged(); - virtual void setChanged(const QRect& area); - virtual void setUnchanged(const QRect& area); + virtual void setChanged(const TQRect& area); + virtual void setUnchanged(const TQRect& area); // These call setChangedChunk. - void addItemToChunk(QCanvasItem*, int i, int j); - void removeItemFromChunk(QCanvasItem*, int i, int j); - void addItemToChunkContaining(QCanvasItem*, int x, int y); - void removeItemFromChunkContaining(QCanvasItem*, int x, int y); - - QCanvasItemList allItems(); - QCanvasItemList collisions( const QPoint&) const; - QCanvasItemList collisions( const QRect&) const; - QCanvasItemList collisions( const QPointArray& pa, const QCanvasItem* item, + void addItemToChunk(TQCanvasItem*, int i, int j); + void removeItemFromChunk(TQCanvasItem*, int i, int j); + void addItemToChunkContaining(TQCanvasItem*, int x, int y); + void removeItemFromChunkContaining(TQCanvasItem*, int x, int y); + + TQCanvasItemList allItems(); + TQCanvasItemList collisions( const TQPoint&) const; + TQCanvasItemList collisions( const TQRect&) const; + TQCanvasItemList collisions( const TQPointArray& pa, const TQCanvasItem* item, bool exact) const; - void drawArea(const QRect&, QPainter* p, bool double_buffer=FALSE); + void drawArea(const TQRect&, TQPainter* p, bool double_buffer=FALSE); - // These are for QCanvasView to call - virtual void addView(QCanvasView*); - virtual void removeView(QCanvasView*); - void drawCanvasArea(const QRect&, QPainter* p=0, bool double_buffer=TRUE); - void drawViewArea( QCanvasView* view, QPainter* p, const QRect& r, bool dbuf ); + // These are for TQCanvasView to call + virtual void addView(TQCanvasView*); + virtual void removeView(TQCanvasView*); + void drawCanvasArea(const TQRect&, TQPainter* p=0, bool double_buffer=TRUE); + void drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& r, bool dbuf ); - // These are for QCanvasItem to call - virtual void addItem(QCanvasItem*); - virtual void addAnimation(QCanvasItem*); - virtual void removeItem(QCanvasItem*); - virtual void removeAnimation(QCanvasItem*); + // These are for TQCanvasItem to call + virtual void addItem(TQCanvasItem*); + virtual void addAnimation(TQCanvasItem*); + virtual void removeItem(TQCanvasItem*); + virtual void removeAnimation(TQCanvasItem*); virtual void setAdvancePeriod(int ms); virtual void setUpdatePeriod(int ms); @@ -307,77 +307,77 @@ public slots: virtual void update(); protected: - virtual void drawBackground(QPainter&, const QRect& area); - virtual void drawForeground(QPainter&, const QRect& area); + virtual void drawBackground(TQPainter&, const TQRect& area); + virtual void drawForeground(TQPainter&, const TQRect& area); private: void init(int w, int h, int chunksze=16, int maxclust=100); - QCanvasChunk& chunk(int i, int j) const; - QCanvasChunk& chunkContaining(int x, int y) const; + TQCanvasChunk& chunk(int i, int j) const; + TQCanvasChunk& chunkContaining(int x, int y) const; - QRect changeBounds(const QRect& inarea); - void drawChanges(const QRect& inarea); + TQRect changeBounds(const TQRect& inarea); + void drawChanges(const TQRect& inarea); void ensureOffScrSize( int osw, int osh ); - QPixmap offscr; + TQPixmap offscr; int awidth,aheight; int chunksize; int maxclusters; int chwidth,chheight; - QCanvasChunk* chunks; + TQCanvasChunk* chunks; - QCanvasData* d; + TQCanvasData* d; - void initTiles(QPixmap p, int h, int v, int tilewidth, int tileheight); + void initTiles(TQPixmap p, int h, int v, int tilewidth, int tileheight); ushort *grid; ushort htiles; ushort vtiles; ushort tilew; ushort tileh; bool oneone; - QPixmap pm; - QTimer* update_timer; - QColor bgcolor; + TQPixmap pm; + TQTimer* update_timer; + TQColor bgcolor; bool debug_redraw_areas; bool dblbuf; - friend void qt_unview(QCanvas* c); + friend void qt_unview(TQCanvas* c); #if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator= - QCanvas( const QCanvas & ); - QCanvas &operator=( const QCanvas & ); + TQCanvas( const TQCanvas & ); + TQCanvas &operator=( const TQCanvas & ); #endif }; class QCanvasViewData; -class QM_EXPORT_CANVAS QCanvasView : public QScrollView +class QM_EXPORT_CANVAS TQCanvasView : public QScrollView { Q_OBJECT public: - QCanvasView(QWidget* parent=0, const char* name=0, WFlags f=0); - QCanvasView(QCanvas* viewing, QWidget* parent=0, const char* name=0, WFlags f=0); - ~QCanvasView(); + TQCanvasView(TQWidget* parent=0, const char* name=0, WFlags f=0); + TQCanvasView(TQCanvas* viewing, TQWidget* parent=0, const char* name=0, WFlags f=0); + ~TQCanvasView(); - QCanvas* canvas() const + TQCanvas* canvas() const { return viewing; } - void setCanvas(QCanvas* v); + void setCanvas(TQCanvas* v); - const QWMatrix &worldMatrix() const; - const QWMatrix &inverseWorldMatrix() const; - bool setWorldMatrix( const QWMatrix & ); + const TQWMatrix &worldMatrix() const; + const TQWMatrix &inverseWorldMatrix() const; + bool setWorldMatrix( const TQWMatrix & ); protected: - void drawContents( QPainter*, int cx, int cy, int cw, int ch ); - QSize sizeHint() const; + void drawContents( TQPainter*, int cx, int cy, int cw, int ch ); + TQSize sizeHint() const; private: - void drawContents( QPainter* ); - QCanvas* viewing; - QCanvasViewData* d; - friend void qt_unview(QCanvas* c); + void drawContents( TQPainter* ); + TQCanvas* viewing; + TQCanvasViewData* d; + friend void qt_unview(TQCanvas* c); private slots: void cMoving(int,int); @@ -385,21 +385,21 @@ private slots: private: #if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator= - QCanvasView( const QCanvasView & ); - QCanvasView &operator=( const QCanvasView & ); + TQCanvasView( const TQCanvasView & ); + TQCanvasView &operator=( const TQCanvasView & ); #endif }; -class QM_EXPORT_CANVAS QCanvasPixmap : public QPixmap +class QM_EXPORT_CANVAS TQCanvasPixmap : public QPixmap { public: #ifndef QT_NO_IMAGEIO - QCanvasPixmap(const QString& datafilename); + TQCanvasPixmap(const TQString& datafilename); #endif - QCanvasPixmap(const QImage& image); - QCanvasPixmap(const QPixmap&, const QPoint& hotspot); - ~QCanvasPixmap(); + TQCanvasPixmap(const TQImage& image); + TQCanvasPixmap(const TQPixmap&, const TQPoint& hotspot); + ~TQCanvasPixmap(); int offsetX() const { return hotx; } @@ -409,73 +409,73 @@ public: private: #if defined(Q_DISABLE_COPY) - QCanvasPixmap( const QCanvasPixmap & ); - QCanvasPixmap &operator=( const QCanvasPixmap & ); + TQCanvasPixmap( const TQCanvasPixmap & ); + TQCanvasPixmap &operator=( const TQCanvasPixmap & ); #endif - void init(const QImage&); - void init(const QPixmap& pixmap, int hx, int hy); + void init(const TQImage&); + void init(const TQPixmap& pixmap, int hx, int hy); friend class QCanvasSprite; friend class QCanvasPixmapArray; - friend bool qt_testCollision(const QCanvasSprite* s1, const QCanvasSprite* s2); + friend bool qt_testCollision(const TQCanvasSprite* s1, const TQCanvasSprite* s2); int hotx,hoty; - QImage* collision_mask; + TQImage* collision_mask; }; class QM_EXPORT_CANVAS QCanvasPixmapArray { public: - QCanvasPixmapArray(); + TQCanvasPixmapArray(); #ifndef QT_NO_IMAGEIO - QCanvasPixmapArray(const QString& datafilenamepattern, int framecount=0); + TQCanvasPixmapArray(const TQString& datafilenamepattern, int framecount=0); #endif // this form is deprecated - QCanvasPixmapArray(QPtrList<QPixmap>, QPtrList<QPoint> hotspots); + TQCanvasPixmapArray(TQPtrList<TQPixmap>, TQPtrList<TQPoint> hotspots); - QCanvasPixmapArray(QValueList<QPixmap>, QPointArray hotspots = QPointArray() ); - ~QCanvasPixmapArray(); + TQCanvasPixmapArray(TQValueList<TQPixmap>, TQPointArray hotspots = TQPointArray() ); + ~TQCanvasPixmapArray(); #ifndef QT_NO_IMAGEIO - bool readPixmaps(const QString& datafilenamepattern, int framecount=0); - bool readCollisionMasks(const QString& filenamepattern); + bool readPixmaps(const TQString& datafilenamepattern, int framecount=0); + bool readCollisionMasks(const TQString& filenamepattern); #endif // deprecated bool operator!(); // Failure check. bool isValid() const; - QCanvasPixmap* image(int i) const + TQCanvasPixmap* image(int i) const { return img ? img[i] : 0; } - void setImage(int i, QCanvasPixmap* p); + void setImage(int i, TQCanvasPixmap* p); uint count() const { return (uint)framecount; } private: #if defined(Q_DISABLE_COPY) - QCanvasPixmapArray( const QCanvasPixmapArray & ); - QCanvasPixmapArray &operator=( const QCanvasPixmapArray & ); + TQCanvasPixmapArray( const TQCanvasPixmapArray & ); + TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & ); #endif #ifndef QT_NO_IMAGEIO - bool readPixmaps(const QString& datafilenamepattern, int framecount, bool maskonly); + bool readPixmaps(const TQString& datafilenamepattern, int framecount, bool maskonly); #endif void reset(); int framecount; - QCanvasPixmap** img; + TQCanvasPixmap** img; }; -class QM_EXPORT_CANVAS QCanvasSprite : public QCanvasItem +class QM_EXPORT_CANVAS TQCanvasSprite : public QCanvasItem { public: - QCanvasSprite(QCanvasPixmapArray* array, QCanvas* canvas); + TQCanvasSprite(TQCanvasPixmapArray* array, TQCanvas* canvas); - void setSequence(QCanvasPixmapArray* seq); + void setSequence(TQCanvasPixmapArray* seq); - virtual ~QCanvasSprite(); + virtual ~TQCanvasSprite(); void move(double x, double y); virtual void move(double x, double y, int frame); @@ -490,9 +490,9 @@ public: int rtti() const; static int RTTI; - bool collidesWith( const QCanvasItem* ) const; + bool collidesWith( const TQCanvasItem* ) const; - QRect boundingRect() const; + TQRect boundingRect() const; // is there a reason for these to be protected? Lars //protected: @@ -509,20 +509,20 @@ public: int topEdge(int ny) const; int rightEdge(int nx) const; int bottomEdge(int ny) const; - QCanvasPixmap* image() const + TQCanvasPixmap* image() const { return images->image(frm); } - virtual QCanvasPixmap* imageAdvanced() const; - QCanvasPixmap* image(int f) const + virtual TQCanvasPixmap* imageAdvanced() const; + TQCanvasPixmap* image(int f) const { return images->image(f); } virtual void advance(int stage); public: - void draw(QPainter& painter); + void draw(TQPainter& painter); private: #if defined(Q_DISABLE_COPY) - QCanvasSprite( const QCanvasSprite & ); - QCanvasSprite &operator=( const QCanvasSprite & ); + TQCanvasSprite( const TQCanvasSprite & ); + TQCanvasSprite &operator=( const TQCanvasSprite & ); #endif void addToChunks(); void removeFromChunks(); @@ -532,46 +532,46 @@ private: ushort anim_val; uint anim_state:2; uint anim_type:14; - bool collidesWith( const QCanvasSprite*, - const QCanvasPolygonalItem*, - const QCanvasRectangle*, - const QCanvasEllipse*, - const QCanvasText* ) const; + bool collidesWith( const TQCanvasSprite*, + const TQCanvasPolygonalItem*, + const TQCanvasRectangle*, + const TQCanvasEllipse*, + const TQCanvasText* ) const; - friend bool qt_testCollision( const QCanvasSprite* s1, - const QCanvasSprite* s2 ); + friend bool qt_testCollision( const TQCanvasSprite* s1, + const TQCanvasSprite* s2 ); - QCanvasPixmapArray* images; + TQCanvasPixmapArray* images; }; class QPolygonalProcessor; -class QM_EXPORT_CANVAS QCanvasPolygonalItem : public QCanvasItem +class QM_EXPORT_CANVAS TQCanvasPolygonalItem : public QCanvasItem { public: - QCanvasPolygonalItem(QCanvas* canvas); - virtual ~QCanvasPolygonalItem(); + TQCanvasPolygonalItem(TQCanvas* canvas); + virtual ~TQCanvasPolygonalItem(); - bool collidesWith( const QCanvasItem* ) const; + bool collidesWith( const TQCanvasItem* ) const; - virtual void setPen(QPen p); - virtual void setBrush(QBrush b); + virtual void setPen(TQPen p); + virtual void setBrush(TQBrush b); - QPen pen() const + TQPen pen() const { return pn; } - QBrush brush() const + TQBrush brush() const { return br; } - virtual QPointArray areaPoints() const=0; - virtual QPointArray areaPointsAdvanced() const; - QRect boundingRect() const; + virtual TQPointArray areaPoints() const=0; + virtual TQPointArray areaPointsAdvanced() const; + TQRect boundingRect() const; int rtti() const; static int RTTI; protected: - void draw(QPainter &); - virtual void drawShape(QPainter &) = 0; + void draw(TQPainter &); + virtual void drawShape(TQPainter &) = 0; bool winding() const; void setWinding(bool); @@ -581,88 +581,88 @@ protected: { return (bool)val; } private: - void scanPolygon( const QPointArray& pa, int winding, - QPolygonalProcessor& process ) const; - QPointArray chunks() const; - - bool collidesWith( const QCanvasSprite*, - const QCanvasPolygonalItem*, - const QCanvasRectangle*, - const QCanvasEllipse*, - const QCanvasText* ) const; - - QBrush br; - QPen pn; + void scanPolygon( const TQPointArray& pa, int winding, + TQPolygonalProcessor& process ) const; + TQPointArray chunks() const; + + bool collidesWith( const TQCanvasSprite*, + const TQCanvasPolygonalItem*, + const TQCanvasRectangle*, + const TQCanvasEllipse*, + const TQCanvasText* ) const; + + TQBrush br; + TQPen pn; uint wind:1; }; -class QM_EXPORT_CANVAS QCanvasRectangle : public QCanvasPolygonalItem +class QM_EXPORT_CANVAS TQCanvasRectangle : public QCanvasPolygonalItem { public: - QCanvasRectangle(QCanvas* canvas); - QCanvasRectangle(const QRect&, QCanvas* canvas); - QCanvasRectangle(int x, int y, int width, int height, QCanvas* canvas); + TQCanvasRectangle(TQCanvas* canvas); + TQCanvasRectangle(const TQRect&, TQCanvas* canvas); + TQCanvasRectangle(int x, int y, int width, int height, TQCanvas* canvas); - ~QCanvasRectangle(); + ~TQCanvasRectangle(); int width() const; int height() const; void setSize(int w, int h); - QSize size() const - { return QSize(w,h); } - QPointArray areaPoints() const; - QRect rect() const - { return QRect(int(x()),int(y()),w,h); } + TQSize size() const + { return TQSize(w,h); } + TQPointArray areaPoints() const; + TQRect rect() const + { return TQRect(int(x()),int(y()),w,h); } - bool collidesWith( const QCanvasItem* ) const; + bool collidesWith( const TQCanvasItem* ) const; int rtti() const; static int RTTI; protected: - void drawShape(QPainter &); - QPointArray chunks() const; + void drawShape(TQPainter &); + TQPointArray chunks() const; private: - bool collidesWith( const QCanvasSprite*, - const QCanvasPolygonalItem*, - const QCanvasRectangle*, - const QCanvasEllipse*, - const QCanvasText* ) const; + bool collidesWith( const TQCanvasSprite*, + const TQCanvasPolygonalItem*, + const TQCanvasRectangle*, + const TQCanvasEllipse*, + const TQCanvasText* ) const; int w, h; }; -class QM_EXPORT_CANVAS QCanvasPolygon : public QCanvasPolygonalItem +class QM_EXPORT_CANVAS TQCanvasPolygon : public QCanvasPolygonalItem { public: - QCanvasPolygon(QCanvas* canvas); - ~QCanvasPolygon(); - void setPoints(QPointArray); - QPointArray points() const; + TQCanvasPolygon(TQCanvas* canvas); + ~TQCanvasPolygon(); + void setPoints(TQPointArray); + TQPointArray points() const; void moveBy(double dx, double dy); - QPointArray areaPoints() const; + TQPointArray areaPoints() const; int rtti() const; static int RTTI; protected: - void drawShape(QPainter &); - QPointArray poly; + void drawShape(TQPainter &); + TQPointArray poly; }; -class QM_EXPORT_CANVAS QCanvasSpline : public QCanvasPolygon +class QM_EXPORT_CANVAS TQCanvasSpline : public QCanvasPolygon { public: - QCanvasSpline(QCanvas* canvas); - ~QCanvasSpline(); + TQCanvasSpline(TQCanvas* canvas); + ~TQCanvasSpline(); - void setControlPoints(QPointArray, bool closed=TRUE); - QPointArray controlPoints() const; + void setControlPoints(TQPointArray, bool closed=TRUE); + TQPointArray controlPoints() const; bool closed() const; int rtti() const; @@ -670,47 +670,47 @@ public: private: void recalcPoly(); - QPointArray bez; + TQPointArray bez; bool cl; }; -class QM_EXPORT_CANVAS QCanvasLine : public QCanvasPolygonalItem +class QM_EXPORT_CANVAS TQCanvasLine : public QCanvasPolygonalItem { public: - QCanvasLine(QCanvas* canvas); - ~QCanvasLine(); + TQCanvasLine(TQCanvas* canvas); + ~TQCanvasLine(); void setPoints(int x1, int y1, int x2, int y2); - QPoint startPoint() const - { return QPoint(x1,y1); } - QPoint endPoint() const - { return QPoint(x2,y2); } + TQPoint startPoint() const + { return TQPoint(x1,y1); } + TQPoint endPoint() const + { return TQPoint(x2,y2); } int rtti() const; static int RTTI; - void setPen(QPen p); + void setPen(TQPen p); protected: - void drawShape(QPainter &); - QPointArray areaPoints() const; + void drawShape(TQPainter &); + TQPointArray areaPoints() const; private: int x1,y1,x2,y2; }; -class QM_EXPORT_CANVAS QCanvasEllipse : public QCanvasPolygonalItem +class QM_EXPORT_CANVAS TQCanvasEllipse : public QCanvasPolygonalItem { public: - QCanvasEllipse( QCanvas* canvas ); - QCanvasEllipse( int width, int height, QCanvas* canvas ); - QCanvasEllipse( int width, int height, int startangle, int angle, - QCanvas* canvas ); + TQCanvasEllipse( TQCanvas* canvas ); + TQCanvasEllipse( int width, int height, TQCanvas* canvas ); + TQCanvasEllipse( int width, int height, int startangle, int angle, + TQCanvas* canvas ); - ~QCanvasEllipse(); + ~TQCanvasEllipse(); int width() const; int height() const; @@ -720,22 +720,22 @@ public: { return a1; } int angleLength() const { return a2; } - QPointArray areaPoints() const; + TQPointArray areaPoints() const; - bool collidesWith( const QCanvasItem* ) const; + bool collidesWith( const TQCanvasItem* ) const; int rtti() const; static int RTTI; protected: - void drawShape(QPainter &); + void drawShape(TQPainter &); private: - bool collidesWith( const QCanvasSprite*, - const QCanvasPolygonalItem*, - const QCanvasRectangle*, - const QCanvasEllipse*, - const QCanvasText* ) const; + bool collidesWith( const TQCanvasSprite*, + const TQCanvasPolygonalItem*, + const TQCanvasRectangle*, + const TQCanvasEllipse*, + const TQCanvasText* ) const; int w, h; int a1, a2; }; @@ -743,21 +743,21 @@ private: class QCanvasTextExtra; -class QM_EXPORT_CANVAS QCanvasText : public QCanvasItem +class QM_EXPORT_CANVAS TQCanvasText : public QCanvasItem { public: - QCanvasText(QCanvas* canvas); - QCanvasText(const QString&, QCanvas* canvas); - QCanvasText(const QString&, QFont, QCanvas* canvas); + TQCanvasText(TQCanvas* canvas); + TQCanvasText(const TQString&, TQCanvas* canvas); + TQCanvasText(const TQString&, TQFont, TQCanvas* canvas); - virtual ~QCanvasText(); + virtual ~TQCanvasText(); - void setText( const QString& ); - void setFont( const QFont& ); - void setColor( const QColor& ); - QString text() const; - QFont font() const; - QColor color() const; + void setText( const TQString& ); + void setFont( const TQFont& ); + void setColor( const TQColor& ); + TQString text() const; + TQFont font() const; + TQColor color() const; void moveBy(double dx, double dy); @@ -765,42 +765,42 @@ public: { return flags; } void setTextFlags(int); - QRect boundingRect() const; + TQRect boundingRect() const; - bool collidesWith( const QCanvasItem* ) const; + bool collidesWith( const TQCanvasItem* ) const; int rtti() const; static int RTTI; protected: - virtual void draw(QPainter&); + virtual void draw(TQPainter&); private: #if defined(Q_DISABLE_COPY) - QCanvasText( const QCanvasText & ); - QCanvasText &operator=( const QCanvasText & ); + TQCanvasText( const TQCanvasText & ); + TQCanvasText &operator=( const TQCanvasText & ); #endif void addToChunks(); void removeFromChunks(); void changeChunks(); void setRect(); - QRect brect; - QString txt; + TQRect brect; + TQString txt; int flags; - QFont fnt; - QColor col; - QCanvasTextExtra* extra; - - bool collidesWith( const QCanvasSprite*, - const QCanvasPolygonalItem*, - const QCanvasRectangle*, - const QCanvasEllipse*, - const QCanvasText* ) const; + TQFont fnt; + TQColor col; + TQCanvasTextExtra* extra; + + bool collidesWith( const TQCanvasSprite*, + const TQCanvasPolygonalItem*, + const TQCanvasRectangle*, + const TQCanvasEllipse*, + const TQCanvasText* ) const; }; #define Q_DEFINED_QCANVAS -#include "qwinexport.h" +#include "tqwinexport.h" #endif // QT_NO_CANVAS #endif // QCANVAS_H diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h index b5e1f5d0..2056828e 100644 --- a/kjsembed/tools/headers/qdir.h +++ b/kjsembed/tools/headers/qdir.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** -** Definition of QDir class +** Definition of TQDir class ** ** Created : 950427 ** @@ -39,15 +39,15 @@ #define QDIR_H #ifndef QT_H -#include "qglobal.h" -#include "qstrlist.h" -#include "qfileinfo.h" +#include "tqglobal.h" +#include "tqstrlist.h" +#include "tqfileinfo.h" #endif // QT_H #ifndef QT_NO_DIR -typedef QPtrList<QFileInfo> QFileInfoList; -typedef QPtrListIterator<QFileInfo> QFileInfoListIterator; +typedef TQPtrList<TQFileInfo> QFileInfoList; +typedef TQPtrListIterator<TQFileInfo> QFileInfoListIterator; class QStringList; template <class T> class QDeepCopy; @@ -85,34 +85,34 @@ public: IgnoreCase = 0x10, DefaultSort = -1 }; - QDir(); - QDir( const QString &path, const QString &nameFilter = QString::null, + TQDir(); + TQDir( const TQString &path, const TQString &nameFilter = TQString::null, int sortSpec = Name | IgnoreCase, int filterSpec = All ); - QDir( const QDir & ); + TQDir( const TQDir & ); - virtual ~QDir(); + virtual ~TQDir(); - QDir &operator=( const QDir & ); - QDir &operator=( const QString &path ); + TQDir &operator=( const TQDir & ); + TQDir &operator=( const TQString &path ); - virtual void setPath( const QString &path ); - virtual QString path() const; - virtual QString absPath() const; - virtual QString canonicalPath() const; + virtual void setPath( const TQString &path ); + virtual TQString path() const; + virtual TQString absPath() const; + virtual TQString canonicalPath() const; - virtual QString dirName() const; - virtual QString filePath( const QString &fileName, + virtual TQString dirName() const; + virtual TQString filePath( const TQString &fileName, bool acceptAbsPath = TRUE ) const; - virtual QString absFilePath( const QString &fileName, + virtual TQString absFilePath( const TQString &fileName, bool acceptAbsPath = TRUE ) const; - static QString convertSeparators( const QString &pathName ); + static TQString convertSeparators( const TQString &pathName ); - virtual bool cd( const QString &dirName, bool acceptAbsPath = TRUE ); + virtual bool cd( const TQString &dirName, bool acceptAbsPath = TRUE ); virtual bool cdUp(); QString nameFilter() const; - virtual void setNameFilter( const QString &nameFilter ); + virtual void setNameFilter( const TQString &nameFilter ); FilterSpec filter() const; virtual void setFilter( int filterSpec ); SortSpec sorting() const; @@ -124,28 +124,28 @@ public: uint count() const; QString operator[]( int ) const; - virtual QStrList encodedEntryList( int filterSpec = DefaultFilter, + virtual TQStrList encodedEntryList( int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; - virtual QStrList encodedEntryList( const QString &nameFilter, + virtual TQStrList encodedEntryList( const TQString &nameFilter, int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; - virtual QStringList entryList( int filterSpec = DefaultFilter, + virtual TQStringList entryList( int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; - virtual QStringList entryList( const QString &nameFilter, + virtual TQStringList entryList( const TQString &nameFilter, int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; virtual const QFileInfoList *entryInfoList( int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; - virtual const QFileInfoList *entryInfoList( const QString &nameFilter, + virtual const QFileInfoList *entryInfoList( const TQString &nameFilter, int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; static const QFileInfoList *drives(); - virtual bool mkdir( const QString &dirName, + virtual bool mkdir( const TQString &dirName, bool acceptAbsPath = TRUE ) const; - virtual bool rmdir( const QString &dirName, + virtual bool rmdir( const TQString &dirName, bool acceptAbsPath = TRUE ) const; virtual bool isReadable() const; @@ -155,45 +155,45 @@ public: virtual bool isRelative() const; virtual void convertToAbs(); - virtual bool operator==( const QDir & ) const; - virtual bool operator!=( const QDir & ) const; + virtual bool operator==( const TQDir & ) const; + virtual bool operator!=( const TQDir & ) const; - virtual bool remove( const QString &fileName, + virtual bool remove( const TQString &fileName, bool acceptAbsPath = TRUE ); - virtual bool rename( const QString &name, const QString &newName, + virtual bool rename( const TQString &name, const TQString &newName, bool acceptAbsPaths = TRUE ); - virtual bool exists( const QString &name, + virtual bool exists( const TQString &name, bool acceptAbsPath = TRUE ); static char separator(); - static bool setCurrent( const QString &path ); - static QDir current(); - static QDir home(); - static QDir root(); - static QString currentDirPath(); - static QString homeDirPath(); - static QString rootDirPath(); - - static bool match( const QStringList &filters, const QString &fileName ); - static bool match( const QString &filter, const QString &fileName ); - static QString cleanDirPath( const QString &dirPath ); - static bool isRelativePath( const QString &path ); + static bool setCurrent( const TQString &path ); + static TQDir current(); + static TQDir home(); + static TQDir root(); + static TQString currentDirPath(); + static TQString homeDirPath(); + static TQString rootDirPath(); + + static bool match( const TQStringList &filters, const TQString &fileName ); + static bool match( const TQString &filter, const TQString &fileName ); + static TQString cleanDirPath( const TQString &dirPath ); + static bool isRelativePath( const TQString &path ); void refresh() const; private: #ifdef Q_OS_MAC typedef struct FSSpec FSSpec; - static FSSpec *make_spec(const QString &); + static FSSpec *make_spec(const TQString &); #endif void init(); - virtual bool readDirEntries( const QString &nameFilter, + virtual bool readDirEntries( const TQString &nameFilter, int FilterSpec, int SortSpec ); - static void slashify( QString & ); + static void slashify( TQString & ); QString dPath; - QStringList *fList; + TQStringList *fList; QFileInfoList *fiList; QString nameFilt; FilterSpec filtS; @@ -202,44 +202,44 @@ private: uint allDirs : 1; void detach(); - friend class QDeepCopy< QDir >; + friend class TQDeepCopy< TQDir >; }; -inline QString QDir::path() const +inline TQString TQDir::path() const { return dPath; } -inline QString QDir::nameFilter() const +inline TQString TQDir::nameFilter() const { return nameFilt; } -inline QDir::FilterSpec QDir::filter() const +inline TQDir::FilterSpec TQDir::filter() const { return filtS; } -inline QDir::SortSpec QDir::sorting() const +inline TQDir::SortSpec TQDir::sorting() const { return sortS; } -inline bool QDir::matchAllDirs() const +inline bool TQDir::matchAllDirs() const { return allDirs; } -inline bool QDir::operator!=( const QDir &d ) const +inline bool TQDir::operator!=( const TQDir &d ) const { return !(*this == d); } struct QDirSortItem { - QString filename_cache; - QFileInfo* item; + TQString filename_cache; + TQFileInfo* item; }; #endif // QT_NO_DIR diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h index 38befc90..7db9325e 100644 --- a/kjsembed/tools/headers/qpen.h +++ b/kjsembed/tools/headers/qpen.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** -** Definition of QPen class +** Definition of TQPen class ** ** Created : 940112 ** @@ -39,35 +39,35 @@ #define QPEN_H #ifndef QT_H -#include "qcolor.h" -#include "qshared.h" +#include "tqcolor.h" +#include "tqshared.h" #endif // QT_H -class Q_EXPORT QPen: public Qt +class Q_EXPORT TQPen: public Qt { public: - QPen(); - QPen( PenStyle ); - QPen( const QColor &color, uint width=0, PenStyle style=SolidLine ); - QPen( const QColor &cl, uint w, PenStyle s, PenCapStyle c, PenJoinStyle j); - QPen( const QPen & ); - ~QPen(); - QPen &operator=( const QPen & ); + TQPen(); + TQPen( PenStyle ); + TQPen( const TQColor &color, uint width=0, PenStyle style=SolidLine ); + TQPen( const TQColor &cl, uint w, PenStyle s, PenCapStyle c, PenJoinStyle j); + TQPen( const TQPen & ); + ~TQPen(); + TQPen &operator=( const TQPen & ); PenStyle style() const { return data->style; } void setStyle( PenStyle ); uint width() const { return data->width; } void setWidth( uint ); - const QColor &color() const { return data->color; } - void setColor( const QColor & ); + const TQColor &color() const { return data->color; } + void setColor( const TQColor & ); PenCapStyle capStyle() const; void setCapStyle( PenCapStyle ); PenJoinStyle joinStyle() const; void setJoinStyle( PenJoinStyle ); - bool operator==( const QPen &p ) const; - bool operator!=( const QPen &p ) const + bool operator==( const TQPen &p ) const; + bool operator!=( const TQPen &p ) const { return !(operator==(p)); } private: @@ -78,7 +78,7 @@ private: QPen copy() const; void detach(); - void init( const QColor &, uint, uint ); + void init( const TQColor &, uint, uint ); struct QPenData : public QShared { // pen data PenStyle style; uint width; @@ -89,11 +89,11 @@ private: /***************************************************************************** - QPen stream functions + TQPen stream functions *****************************************************************************/ #ifndef QT_NO_DATASTREAM -Q_EXPORT QDataStream &operator<<( QDataStream &, const QPen & ); -Q_EXPORT QDataStream &operator>>( QDataStream &, QPen & ); +Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & ); +Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & ); #endif #endif // QPEN_H diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h index b662470d..311e5e08 100644 --- a/kjsembed/tools/headers/qtimer.h +++ b/kjsembed/tools/headers/qtimer.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** -** Definition of QTimer class +** Definition of TQTimer class ** ** Created : 931111 ** @@ -39,16 +39,16 @@ #define QTIMER_H #ifndef QT_H -#include "qobject.h" +#include "tqobject.h" #endif // QT_H -class Q_EXPORT QTimer : public QObject +class Q_EXPORT TQTimer : public QObject { Q_OBJECT public: - QTimer( QObject *parent=0, const char *name=0 ); - ~QTimer(); + TQTimer( TQObject *parent=0, const char *name=0 ); + ~TQTimer(); bool isActive() const; @@ -56,7 +56,7 @@ public: void changeInterval( int msec ); void stop(); - static void singleShot( int msec, QObject *receiver, const char *member ); + static void singleShot( int msec, TQObject *receiver, const char *member ); int timerId() const { return id; } @@ -64,7 +64,7 @@ signals: void timeout(); protected: - bool event( QEvent * ); + bool event( TQEvent * ); private: int id; @@ -73,13 +73,13 @@ private: private: // Disabled copy constructor and operator= #if defined(Q_DISABLE_COPY) - QTimer( const QTimer & ); - QTimer &operator=( const QTimer & ); + TQTimer( const TQTimer & ); + TQTimer &operator=( const TQTimer & ); #endif }; -inline bool QTimer::isActive() const +inline bool TQTimer::isActive() const { return id >= 0; } diff --git a/kjsembed/xmlactionclient.cpp b/kjsembed/xmlactionclient.cpp index eb470f3d..390d5fd2 100644 --- a/kjsembed/xmlactionclient.cpp +++ b/kjsembed/xmlactionclient.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qfile.h> +#include <tqfile.h> #include <kaction.h> #include <kdebug.h> #include <kstdaction.h> @@ -31,27 +31,27 @@ namespace KJSEmbed { // XML Tags and Attributes // -QString tag_header("header"); -QString tag_action("action"); -QString tag_type( "type" ); -QString tag_label( "label" ); -QString tag_icons( "icons" ); -QString tag_shortcut( "shortcut" ); -QString tag_name( "name" ); -QString tag_group( "group" ); -QString tag_text( "text" ); -QString tag_statustext( "statustext" ); -QString tag_whatsthis( "whatsthis" ); -QString tag_script( "script" ); -QString tag_data( "data" ); -QString tag_item( "item" ); - -QString attr_type( "type" ); -QString attr_src( "src" ); -QString attr_exclusive( "exclusive" ); - -QString type_include( "include" ); -QString type_debug( "debug" ); +TQString tag_header("header"); +TQString tag_action("action"); +TQString tag_type( "type" ); +TQString tag_label( "label" ); +TQString tag_icons( "icons" ); +TQString tag_shortcut( "shortcut" ); +TQString tag_name( "name" ); +TQString tag_group( "group" ); +TQString tag_text( "text" ); +TQString tag_statustext( "statustext" ); +TQString tag_whatsthis( "whatsthis" ); +TQString tag_script( "script" ); +TQString tag_data( "data" ); +TQString tag_item( "item" ); + +TQString attr_type( "type" ); +TQString attr_src( "src" ); +TQString attr_exclusive( "exclusive" ); + +TQString type_include( "include" ); +TQString type_debug( "debug" ); // // Default Runner @@ -77,8 +77,8 @@ bool XMLActionRunner::run( XMLActionClient *client, const XMLActionClient::XMLAc // Main Client Class // -XMLActionClient::XMLActionClient( QObject *parent, const char *name ) - : QObject( parent, name ? name : "XMLActionClient" ), +XMLActionClient::XMLActionClient( TQObject *parent, const char *name ) + : TQObject( parent, name ? name : "XMLActionClient" ), ac(0), actrun(0) { } @@ -87,18 +87,18 @@ XMLActionClient::~XMLActionClient() { } -bool XMLActionClient::load( const QString &filename ) +bool XMLActionClient::load( const TQString &filename ) { XMLActionHandler h( this ); return load( &h, filename ); } -bool XMLActionClient::load( XMLActionHandler *hand, const QString &filename ) +bool XMLActionClient::load( XMLActionHandler *hand, const TQString &filename ) { - QFile f( filename ); - QXmlInputSource src( &f ); + TQFile f( filename ); + TQXmlInputSource src( &f ); - QXmlSimpleReader reader; + TQXmlSimpleReader reader; reader.setContentHandler( hand ); bool ok = reader.parse( src ); if ( !ok ) { @@ -108,7 +108,7 @@ bool XMLActionClient::load( XMLActionHandler *hand, const QString &filename ) return ok; } -bool XMLActionClient::bind( const QString &name, const XMLActionScript &s ) +bool XMLActionClient::bind( const TQString &name, const XMLActionScript &s ) { // kdWarning() << "Runner:bind called, name=" << name << " type=" << s.type // << " text=" << s.text << " src=" << s.src << endl; @@ -125,11 +125,11 @@ bool XMLActionClient::bind( KAction *act, const XMLActionScript &s ) // kdWarning() << "Runner:bind called, action=" << act->name() << " type=" << s.type // << " text=" << s.text << " src=" << s.src << endl; - connect( act, SIGNAL( activated() ), this, SLOT( action_activated() ) ); + connect( act, TQT_SIGNAL( activated() ), this, TQT_SLOT( action_activated() ) ); return bind( act->name(), s ); } -bool XMLActionClient::run( const QString &name ) +bool XMLActionClient::run( const TQString &name ) { if ( scripts.contains( name ) ) return run( scripts[name] ); @@ -149,7 +149,7 @@ bool XMLActionClient::run( const XMLActionScript &s ) void XMLActionClient::action_activated() { - const QObject *sender = QObject::sender(); + const TQObject *sender = TQObject::sender(); if ( !sender ) return; @@ -161,29 +161,29 @@ void XMLActionClient::action_activated() // XMLActionHandler::XMLActionHandler( XMLActionClient *client ) - : QXmlDefaultHandler(), actclient( client ) + : TQXmlDefaultHandler(), actclient( client ) { } -bool XMLActionHandler::characters( const QString &chars ) +bool XMLActionHandler::characters( const TQString &chars ) { cdata = cdata + chars; return true; } -bool XMLActionHandler::startElement( const QString &, const QString &, const QString &qn, - const QXmlAttributes &attrs ) +bool XMLActionHandler::startElement( const TQString &, const TQString &, const TQString &qn, + const TQXmlAttributes &attrs ) { - cdata = QString::null; + cdata = TQString::null; if ( qn == tag_script ) { ad.script.type = attrs.value( attr_type ); ad.script.src = attrs.value( attr_src ); } else if ( qn == tag_group ) { - QString ex = attrs.value( attr_exclusive ); - if ( ex == QString("true") ) + TQString ex = attrs.value( attr_exclusive ); + if ( ex == TQString("true") ) ad.exclusive = true; } else if ( qn == tag_action ) @@ -192,7 +192,7 @@ bool XMLActionHandler::startElement( const QString &, const QString &, const QSt return true; } -bool XMLActionHandler::endElement( const QString &, const QString &, const QString &qn ) +bool XMLActionHandler::endElement( const TQString &, const TQString &, const TQString &qn ) { if ( qn == tag_action ) { defineAction(); @@ -200,49 +200,49 @@ bool XMLActionHandler::endElement( const QString &, const QString &, const QStri } else if ( qn == tag_type ) { ad.type = cdata; - cdata = QString::null; + cdata = TQString::null; } else if ( qn == tag_label ) { ad.text = cdata; - cdata = QString::null; + cdata = TQString::null; } else if ( qn == tag_text ) { // Nothing } else if ( qn == tag_icons ) { ad.icons = cdata; - cdata = QString::null; + cdata = TQString::null; } else if ( qn == tag_shortcut ) { ad.keys = cdata; - cdata = QString::null; + cdata = TQString::null; } else if ( qn == tag_name ) { ad.name = cdata.latin1(); - cdata = QString::null; + cdata = TQString::null; } else if ( qn == tag_group ) { ad.group = cdata.latin1(); - cdata = QString::null; + cdata = TQString::null; } else if ( qn == tag_whatsthis ) { ad.whatsthis = cdata; - cdata = QString::null; + cdata = TQString::null; } else if ( qn == tag_statustext ) { ad.status = cdata; - cdata = QString::null; + cdata = TQString::null; } else if ( qn == tag_script ) { ad.script.text = cdata; - cdata = QString::null; + cdata = TQString::null; if ( !inAction && ad.script.isValid() ) actclient->run( ad.script ); } else if ( qn == tag_item ) { ad.items += cdata; - cdata = QString::null; + cdata = TQString::null; } return true; @@ -263,7 +263,7 @@ void XMLActionHandler::defineAction() actclient->bind( act, ad.script ); ad.clear(); - cdata = QString::null; + cdata = TQString::null; } KAction *XMLActionHandler::createAction( KActionCollection *parent ) @@ -307,7 +307,7 @@ KAction *XMLActionHandler::createAction( KActionCollection *parent ) else if ( ad.type == "KActionMenu" ) { KActionMenu *am = new KActionMenu( ad.text, ad.icons, parent, ad.name.latin1() ); - for ( QStringList::Iterator it = ad.items.begin() ; it != ad.items.end() ; ++it ) { + for ( TQStringList::Iterator it = ad.items.begin() ; it != ad.items.end() ; ++it ) { KAction *a = parent->action( (*it).latin1() ); if ( a ) am->insert( a ); @@ -331,7 +331,7 @@ KAction *XMLActionHandler::createAction( KActionCollection *parent ) act->setStatusText( ad.status ); act->setWhatsThis( ad.whatsthis ); - QObject::connect( actclient, SIGNAL( destroyed() ), act, SLOT( deleteLater() ) ); + TQObject::connect( actclient, TQT_SIGNAL( destroyed() ), act, TQT_SLOT( deleteLater() ) ); return act; } diff --git a/kjsembed/xmlactionclient.h b/kjsembed/xmlactionclient.h index 1af501ab..8b2a801b 100644 --- a/kjsembed/xmlactionclient.h +++ b/kjsembed/xmlactionclient.h @@ -22,9 +22,9 @@ #ifndef XMLACTIONCLIENT_H #define XMLACTIONCLIENT_H -#include <qobject.h> -#include <qxml.h> -#include <qmap.h> +#include <tqobject.h> +#include <tqxml.h> +#include <tqmap.h> class KActionCollection; class KAction; @@ -62,15 +62,15 @@ public: * Clears this script object. After this method has been called, * isValid() will return false. */ - void clear() { src = type = text = QString::null; } + void clear() { src = type = text = TQString::null; } - QString src; - QString type; - QString text; + TQString src; + TQString type; + TQString text; }; /** Creates an XMLActionClient. */ - XMLActionClient( QObject *parent=0, const char *name=0 ); + XMLActionClient( TQObject *parent=0, const char *name=0 ); /** * Cleans up. When the object is deleted, any actions it has created will @@ -91,22 +91,22 @@ public: void setRunner( XMLActionRunner *r ) { actrun = r; } /** Loads actions from the named XML file. Returns true on success. */ - bool load( const QString &filename ); + bool load( const TQString &filename ); /** Loads actions from the named XML file. Returns true on success. */ - bool load( XMLActionHandler *handler, const QString &filename ); + bool load( XMLActionHandler *handler, const TQString &filename ); /** Runs the named script. */ - bool run( const QString &name ); + bool run( const TQString &name ); /** Returns the named script. */ - XMLActionScript script( const QString &name ) const { return scripts[name]; } + XMLActionScript script( const TQString &name ) const { return scripts[name]; } /** Calls XMLActionRunner::run(). */ bool run( const XMLActionScript &script ); /** Binds a name to a script. */ - virtual bool bind( const QString &name, const XMLActionScript &script ); + virtual bool bind( const TQString &name, const XMLActionScript &script ); /** Binds an action to a script. */ virtual bool bind( KAction *act, const XMLActionScript &script ); @@ -121,7 +121,7 @@ protected slots: private: KActionCollection *ac; XMLActionRunner *actrun; - QMap<QString, XMLActionScript> scripts; + TQMap<TQString, XMLActionScript> scripts; class XMLActionClientPrivate *d; }; @@ -177,10 +177,10 @@ class XMLActionHandler : public QXmlDefaultHandler public: XMLActionHandler( XMLActionClient *actclient ); - virtual bool startElement( const QString &ns, const QString &ln, const QString &qn, - const QXmlAttributes &attrs ); - virtual bool endElement( const QString &ns, const QString &ln, const QString &qn ); - virtual bool characters( const QString &chars ); + virtual bool startElement( const TQString &ns, const TQString &ln, const TQString &qn, + const TQXmlAttributes &attrs ); + virtual bool endElement( const TQString &ns, const TQString &ln, const TQString &qn ); + virtual bool characters( const TQString &chars ); /** Called when an action tag is closed. */ void defineAction(); @@ -198,29 +198,29 @@ private: XMLActionData() { clear(); } void clear() { - text = icons = keys = name = group = whatsthis = status = QString::null; + text = icons = keys = name = group = whatsthis = status = TQString::null; exclusive = false; script.clear(); } - QString type; - QString text; - QString icons; - QString keys; - QString name; - QString group; + TQString type; + TQString text; + TQString icons; + TQString keys; + TQString name; + TQString group; bool exclusive; - QString status; - QString whatsthis; + TQString status; + TQString whatsthis; XMLActionClient::XMLActionScript script; - QStringList items; + TQStringList items; }; XMLActionData *actionData() { return &ad; } private: XMLActionClient *actclient; - QString cdata; + TQString cdata; bool inAction; XMLActionData ad; class XMLActionHandlerPrivate *d; |