From 479f5f799523bffbcc83dff581a2299c047c6fff Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:44:01 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1157645 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kjsembed/bindings/bindingobject.cpp | 4 +- kjsembed/bindings/bindingobject.h | 10 +- kjsembed/bindings/brush_imp.cpp | 12 +- kjsembed/bindings/dcop_imp.cpp | 460 ++++++++++++++++++------------------ kjsembed/bindings/dcop_imp.h | 34 +-- kjsembed/bindings/iconset_imp.cpp | 32 +-- kjsembed/bindings/image_imp.cpp | 46 ++-- kjsembed/bindings/image_imp.h | 26 +- kjsembed/bindings/kconfig_imp.cpp | 114 ++++----- kjsembed/bindings/kconfig_imp.h | 112 ++++----- kjsembed/bindings/movie_imp.cpp | 28 +-- kjsembed/bindings/movie_imp.h | 24 +- kjsembed/bindings/netaccess_imp.cpp | 20 +- kjsembed/bindings/netaccess_imp.h | 18 +- kjsembed/bindings/painter_imp.cpp | 72 +++--- kjsembed/bindings/painter_imp.h | 46 ++-- kjsembed/bindings/pen_imp.cpp | 14 +- kjsembed/bindings/pixmap_imp.cpp | 26 +- kjsembed/bindings/pixmap_imp.h | 20 +- kjsembed/bindings/point_imp.cpp | 10 +- kjsembed/bindings/rect_imp.cpp | 10 +- kjsembed/bindings/size_imp.cpp | 26 +- kjsembed/bindings/sql_imp.cpp | 104 ++++---- kjsembed/bindings/sql_imp.h | 78 +++--- 24 files changed, 673 insertions(+), 673 deletions(-) (limited to 'kjsembed/bindings') 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 +#include 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 #include #include -#include -#include +#include +#include #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 #include #include -#include +#include #include "dcop_imp.h" #include "dcop_imp.moc" #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -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()); @@ -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 result; + TQMap result; reply >> result; - return QVariant(result); + return TQVariant(result); } - else if ( type == "QValueList") // ? dont handle? + else if ( type == "TQValueList") // ? dont handle? { - QValueList result; + TQValueList 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 -#include -#include +#include +#include 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 #include #include -#include -#include -#include +#include +#include +#include #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 +#include #include #include #include #include -#include +#include #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 -#include -#include +#include +#include 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 #include "kconfig_imp.moc" #else -#include +#include #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 -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #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 +#include #include #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 -#include +#include +#include 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 "< +#include #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 -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include #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() ); + pr->setDevice( op->toNative() ); 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(pr->device()); + TQPixmap *pix = dynamic_cast(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 #include -#include -#include +#include +#include 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 -#include +#include +#include #include -#include +#include #include "pen_imp.h" #include #include @@ -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 -#include +#include +#include #include #include #include -#include +#include #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 -#include +#include 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 #include "point_imp.h" -#include +#include #include #include @@ -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 #include "rect_imp.h" -#include +#include #include #include @@ -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 #include "size_imp.h" -#include +#include #include #include @@ -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 -#include -#include -#include +#include +#include +#include #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 -#include +#include +#include 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; }; -- cgit v1.2.1