diff options
Diffstat (limited to 'kjsembed')
31 files changed, 81 insertions, 99 deletions
diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp index 579ad99a..b30ee508 100644 --- a/kjsembed/bindings/dcop_imp.cpp +++ b/kjsembed/bindings/dcop_imp.cpp @@ -169,7 +169,7 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: { JSDCOPClient::marshall(convertToVariant(exec,args[idx] ), argTypes[idx - 1], data); } - if( !kapp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData)) + if( !tdeApp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData)) retValue = KJS::Boolean(false); else retValue = JSDCOPClient::demarshall(exec, type, ds); @@ -192,7 +192,7 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: { JSDCOPClient::marshall(convertToVariant(exec,args[idx] ), argTypes[idx - 1], data); } - retValue = KJS::Boolean( kapp->dcopClient()->send(app.local8Bit(), interface.local8Bit(), + retValue = KJS::Boolean( tdeApp->dcopClient()->send(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data)); break; } @@ -231,7 +231,7 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS:: KJS::Object JSDCOPClientLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &/*args*/) const { - JSOpaqueProxy * prx = new JSOpaqueProxy( kapp->dcopClient(), "DCOPClient" ); + JSOpaqueProxy * prx = new JSOpaqueProxy( tdeApp->dcopClient(), "DCOPClient" ); prx->setOwner( JSProxy::Native ); KJS::Object proxyObj( prx ); addBindings( jspart, exec, proxyObj ); @@ -344,11 +344,11 @@ KJS::Value JSDCOPClient::call( KJS::ExecState *exec, KJS::Object &self, const KJ break; } case MethodappId: - retValue = KJS::String( kapp->dcopClient()->appId().data() ); + retValue = KJS::String( tdeApp->dcopClient()->appId().data() ); break; case MethodisApplicationRegistered: { TQString arg0 = extractTQString(exec, args, 0); - retValue = KJS::Boolean( kapp->dcopClient()->isApplicationRegistered( arg0.latin1() ) ); + retValue = KJS::Boolean( tdeApp->dcopClient()->isApplicationRegistered( arg0.latin1() ) ); break; } case Methodsend: @@ -366,18 +366,18 @@ KJS::Value JSDCOPClient::call( KJS::ExecState *exec, KJS::Object &self, const KJ bool JSDCOPClient::attach() const { - if( !kapp->dcopClient()->isAttached() ) - return kapp->dcopClient()->attach(); + if( !tdeApp->dcopClient()->isAttached() ) + return tdeApp->dcopClient()->attach(); return true; } bool JSDCOPClient::detach() const -{ return kapp->dcopClient()->detach(); +{ return tdeApp->dcopClient()->detach(); } bool JSDCOPClient::isAttached() const { - return kapp->dcopClient()->isAttached(); + return tdeApp->dcopClient()->isAttached(); } KJS::Value JSDCOPClient::dcopCall( KJS::ExecState * exec, KJS::Object &, const KJS::List & args ) @@ -401,7 +401,7 @@ KJS::Value JSDCOPClient::dcopCall( KJS::ExecState * exec, KJS::Object &, const K 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)) + if( !tdeApp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData)) return KJS::Boolean(false); else return demarshall(exec, type, ds); @@ -424,7 +424,7 @@ KJS::Value JSDCOPClient::dcopSend( KJS::ExecState * exec, KJS::Object &, const K TQVariant var = convertToVariant(exec,args[idx] ); marshall(var, argTypes[idx - 3], data); } - return KJS::Boolean( kapp->dcopClient()->send(app.local8Bit(), interface.local8Bit(), + return KJS::Boolean( tdeApp->dcopClient()->send(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data)); } @@ -603,7 +603,7 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a TQDataStream arg(data, IO_WriteOnly); arg << appName << args; - if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", startFunction.latin1(), data, replyType, replyData) ) + if ( !tdeApp->dcopClient()->call( "tdelauncher", "tdelauncher", startFunction.latin1(), data, replyType, replyData) ) { kdWarning() << "Error: Dcop call failed" << endl; } @@ -641,7 +641,7 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a TQStringList JSDCOPClient::remoteFunctions( const TQString & remApp, const TQString & remObj ) { TQStringList returnList; - QCStringList lst = kapp->dcopClient()->remoteFunctions(remApp.local8Bit(), remObj.local8Bit()); + QCStringList lst = tdeApp->dcopClient()->remoteFunctions(remApp.local8Bit(), remObj.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; @@ -650,7 +650,7 @@ TQStringList JSDCOPClient::remoteFunctions( const TQString & remApp, const TQStr TQStringList JSDCOPClient::remoteInterfaces( const TQString & remApp, const TQString & remObj ) { TQStringList returnList; - QCStringList lst = kapp->dcopClient()->remoteInterfaces(remApp.local8Bit(), remObj.local8Bit()); + QCStringList lst = tdeApp->dcopClient()->remoteInterfaces(remApp.local8Bit(), remObj.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; @@ -659,7 +659,7 @@ TQStringList JSDCOPClient::remoteInterfaces( const TQString & remApp, const TQSt TQStringList JSDCOPClient::remoteObjects( const TQString & remApp ) { TQStringList returnList; - QCStringList lst = kapp->dcopClient()->remoteObjects(remApp.local8Bit()); + QCStringList lst = tdeApp->dcopClient()->remoteObjects(remApp.local8Bit()); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; @@ -668,7 +668,7 @@ TQStringList JSDCOPClient::remoteObjects( const TQString & remApp ) TQStringList JSDCOPClient::registeredApplications( ) { TQStringList returnList; - QCStringList lst = kapp->dcopClient()->registeredApplications( ); + QCStringList lst = tdeApp->dcopClient()->registeredApplications( ); for(uint idx = 0; idx < lst.count(); ++idx) returnList += lst[idx]; return returnList; @@ -676,12 +676,12 @@ TQStringList JSDCOPClient::registeredApplications( ) 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); + return tdeApp->dcopClient()->connectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1(), Volatile); } 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()); + return tdeApp->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 diff --git a/kjsembed/bindings/sql_imp.h b/kjsembed/bindings/sql_imp.h index 3f287a13..037733a4 100644 --- a/kjsembed/bindings/sql_imp.h +++ b/kjsembed/bindings/sql_imp.h @@ -70,7 +70,7 @@ public slots: bool isNull ( int field ); bool exec ( const TQString & m_query ); TQVariant value ( int i ); - bool seek ( int i, bool relative = FALSE ); + bool seek ( int i, bool relative = false ); bool next (); bool prev (); bool first (); diff --git a/kjsembed/bindings/tdeconfig_imp.cpp b/kjsembed/bindings/tdeconfig_imp.cpp index 12db7cfd..1e2adce5 100644 --- a/kjsembed/bindings/tdeconfig_imp.cpp +++ b/kjsembed/bindings/tdeconfig_imp.cpp @@ -23,7 +23,7 @@ #ifndef QT_ONLY #include <tdeconfig.h> -#include <kstddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include "tdeconfig_imp.moc" #else @@ -38,7 +38,7 @@ Config::Config( TQObject *parent, const char *name) #ifndef QT_ONLY if( name == 0) - m_config = kapp->config(); + m_config = tdeApp->config(); else m_config = new TDEConfig(name); if( !m_config->checkConfigFilesWritable(true) ) @@ -67,7 +67,7 @@ Config::Config( TQObject *parent, const char *name , const TQString& confName) Config::~Config() { #ifndef QT_ONLY - if( kapp->config() != m_config ) + if( tdeApp->config() != m_config ) #endif delete m_config; } diff --git a/kjsembed/builtins/resources.cpp b/kjsembed/builtins/resources.cpp index bed7cd55..77723d60 100644 --- a/kjsembed/builtins/resources.cpp +++ b/kjsembed/builtins/resources.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdeglobal.h> #include <kdebug.h> diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp index d2311562..5cb85c63 100644 --- a/kjsembed/customobject_imp.cpp +++ b/kjsembed/customobject_imp.cpp @@ -40,8 +40,8 @@ #include <tqtoolbox.h> #include <tqmenudata.h> -#include <private/qucom_p.h> -#include <private/qucomextra_p.h> +#include <private/tqucom_p.h> +#include <private/tqucomextra_p.h> #ifndef QT_ONLY diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog index c8e11eb3..831be532 100644 --- a/kjsembed/docs/ChangeLog +++ b/kjsembed/docs/ChangeLog @@ -510,7 +510,7 @@ 2004-11-24 Wednesday 01:59 staikos TQT_NO_COMPAT fix (untested, but at least it compiles now): - int match ( const TQString & str, int index = 0, int * len = 0, bool indexIsStart = TRUE ) const (obsolete) + int match ( const TQString & str, int index = 0, int * len = 0, bool indexIsStart = true ) const (obsolete) int search ( const TQString & str, int offset = 0, CaretMode caretMode = CaretAtZero ) const 2004-11-24 Wednesday 01:36 geiseri diff --git a/kjsembed/global.h b/kjsembed/global.h index bacbe957..7017f180 100644 --- a/kjsembed/global.h +++ b/kjsembed/global.h @@ -21,7 +21,7 @@ #ifndef KJSEMBED_GLOBAL_H #define KJSEMBED_GLOBAL_H -#include <kdemacros.h> +#include <tdemacros.h> #ifdef WIN32 # ifdef KJSEMBED_DLL @@ -34,8 +34,8 @@ # define KJSEMBED_EXPORT # endif // KJSEMBED_DLL #else -# ifdef KDE_EXPORT -# define KJSEMBED_EXPORT KDE_EXPORT +# ifdef TDE_EXPORT +# define KJSEMBED_EXPORT TDE_EXPORT # else # define KJSEMBED_EXPORT # endif diff --git a/kjsembed/jsbinding.cpp b/kjsembed/jsbinding.cpp index d015e7b5..8d4a5b8e 100644 --- a/kjsembed/jsbinding.cpp +++ b/kjsembed/jsbinding.cpp @@ -1,5 +1,5 @@ #include <tqmetaobject.h> -#include <private/qucom_p.h> +#include <private/tqucom_p.h> #include <tqpen.h> #include <tqpixmap.h> diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp index 0b68c63a..dab7378f 100644 --- a/kjsembed/jsbuiltin_imp.cpp +++ b/kjsembed/jsbuiltin_imp.cpp @@ -30,7 +30,7 @@ #include <tdelocale.h> #include <kinputdialog.h> #include <tdemessagebox.h> -#include <kstddirs.h> +#include <tdestandarddirs.h> #include "ksimpleprocess.h" #else diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp index 594cfce8..e4d3e16c 100644 --- a/kjsembed/jsconsolewidget.cpp +++ b/kjsembed/jsconsolewidget.cpp @@ -30,7 +30,7 @@ #include <klineedit.h> #include <tdelocale.h> #include <tdepopupmenu.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <ktextedit.h> #include <twin.h> @@ -94,12 +94,12 @@ void JSConsoleWidget::createView() go = new TQPushButton( i18n("&Run"), cmdBox, "run_button" ); go->setFixedSize( go->sizeHint() ); - connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), go, TQT_SLOT( animateClick() ) ); - connect( go, TQT_SIGNAL( clicked() ), TQT_SLOT( invoke() ) ); + connect( cmd, TQ_SIGNAL(returnPressed(const TQString&)), go, TQ_SLOT( animateClick() ) ); + connect( go, TQ_SIGNAL( clicked() ), TQ_SLOT( invoke() ) ); // Setup completion TDECompletion *comp = cmd->completionObject(); - connect( cmd, TQT_SIGNAL(returnPressed(const TQString&)), comp, TQT_SLOT(addItem(const TQString&)) ); + connect( cmd, TQ_SIGNAL(returnPressed(const TQString&)), comp, TQ_SLOT(addItem(const TQString&)) ); // Layout TQVBoxLayout *vert = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); @@ -192,11 +192,11 @@ bool JSConsoleWidget::run( const TQString &cmd ) proc = new KShellProcess("/bin/sh"); *proc << cmd; - connect( proc, TQT_SIGNAL( processExited(TDEProcess *) ), TQT_SLOT( childExited() ) ); - connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT( receivedStdOutput(TDEProcess *, char *, int) ) ); - connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), - this, TQT_SLOT( receivedStdError(TDEProcess *, char *, int) ) ); + connect( proc, TQ_SIGNAL( processExited(TDEProcess *) ), TQ_SLOT( childExited() ) ); + connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT( receivedStdOutput(TDEProcess *, char *, int) ) ); + connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), + this, TQ_SLOT( receivedStdError(TDEProcess *, char *, int) ) ); return proc->start( TDEProcess::NotifyOnExit, TDEProcess::Communication( TDEProcess::Stdout|TDEProcess::Stderr )); diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp index 3443a1c4..f7c148fa 100644 --- a/kjsembed/jsfactory.cpp +++ b/kjsembed/jsfactory.cpp @@ -1011,13 +1011,8 @@ namespace KJSEmbed { "TQMacStyle", "TQMenuBar", "TQMessageBox", - "TQMotif", - "TQMotifDialog", "TQMotifPlusStyle", "TQMotifStyle", - "TQMotifWidget", - "TQNPInstance", - "TQNPWidget", "TQNetworkOperation", "TQNetworkProtocol", "TQObjectCleanupHandler", @@ -1058,7 +1053,6 @@ namespace KJSEmbed { "TQWindowsStyle", "TQWindowsXPStyle", "TQWorkspace", - "TQXtWidget", 0 }; diff --git a/kjsembed/jsobjectproxy.cpp b/kjsembed/jsobjectproxy.cpp index 3b5c327d..08ba67bd 100644 --- a/kjsembed/jsobjectproxy.cpp +++ b/kjsembed/jsobjectproxy.cpp @@ -25,7 +25,7 @@ #include <tqstrlist.h> #include <tqvariant.h> -#include <private/qucomextra_p.h> +#include <private/tqucomextra_p.h> #include <kjs/interpreter.h> #include <kjs/types.h> diff --git a/kjsembed/jsobjectproxy_imp.cpp b/kjsembed/jsobjectproxy_imp.cpp index bfceb419..c9365502 100644 --- a/kjsembed/jsobjectproxy_imp.cpp +++ b/kjsembed/jsobjectproxy_imp.cpp @@ -30,8 +30,8 @@ #include <tqtimer.h> #include <tqvariant.h> -#include <private/qucom_p.h> -#include <private/qucomextra_p.h> +#include <private/tqucom_p.h> +#include <private/tqucomextra_p.h> #include <kjs/interpreter.h> #include <kjs/types.h> diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp index 316944ed..d8ee0817 100644 --- a/kjsembed/kjscmd.cpp +++ b/kjsembed/kjscmd.cpp @@ -99,7 +99,7 @@ int main( int argc, char **argv ) } else { app = new TDEApplication; - app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app->connect( app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); } // Setup the rest diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp index 96d3fea3..8777c2b9 100644 --- a/kjsembed/ksimpleprocess.cpp +++ b/kjsembed/ksimpleprocess.cpp @@ -34,10 +34,10 @@ TQString KSimpleProcess::exec( const TQString &args, bool addStdErr ) TQString KSimpleProcess::execInternal( const TQString &args, bool addStdError) { m_proc->setArguments( splitArgList( args )); - connect(m_proc, TQT_SIGNAL(processExited()), this, TQT_SLOT(slotProcessExited())); - connect(m_proc, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(slotReceivedStdout())); + connect(m_proc, TQ_SIGNAL(processExited()), this, TQ_SLOT(slotProcessExited())); + connect(m_proc, TQ_SIGNAL(readyReadStdout()), this, TQ_SLOT(slotReceivedStdout())); if( addStdError ) - connect(m_proc, TQT_SIGNAL(readyReadStderr()), this, TQT_SLOT(slotReceivedStderr())); + connect(m_proc, TQ_SIGNAL(readyReadStderr()), this, TQ_SLOT(slotReceivedStderr())); if ( !m_proc->start() ) return i18n("Could not run command '%1'.").arg( args.latin1() ); diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp index 3dc8d7cf..33804e8f 100644 --- a/kjsembed/plugin/jsconsoleplugin.cpp +++ b/kjsembed/plugin/jsconsoleplugin.cpp @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdeparts/part.h> @@ -51,7 +51,7 @@ JSConsolePlugin::JSConsolePlugin( TQObject *parent, const char *name, const TQSt menu->setDelayed( false ); menu->insert( new TDEAction( i18n("&Console"), 0, - this, TQT_SLOT( showConsole() ), + this, TQ_SLOT( showConsole() ), actionCollection(), "jsconsole_show") ); } @@ -64,7 +64,7 @@ void JSConsolePlugin::init() KJS::Object global( interp->globalObject() ); js->addObject( js->view(), global, "console" ); js->addObject( parent(), global, "plugin_parent" ); - js->addObject( TDEApplication::kApplication(), global, "application" ); + js->addObject( tdeApp, global, "application" ); if ( parent()->inherits("KParts::Part") ) { KParts::Part *part = static_cast<KParts::Part *>( parent() ); diff --git a/kjsembed/qjscmd.cpp b/kjsembed/qjscmd.cpp index f621374e..ae4fe736 100644 --- a/kjsembed/qjscmd.cpp +++ b/kjsembed/qjscmd.cpp @@ -43,7 +43,7 @@ int main( int argc, char **argv ) // Setup TQApplication TQApplication *app; app = new TQApplication( argc, argv ); - app->connect( app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app->connect( app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); // Setup Interpreter KJSEmbed::JSSecurityPolicy::setDefaultPolicy( KJSEmbed::JSSecurityPolicy::CapabilityAll ); diff --git a/kjsembed/qtbindings/qt_imp.cpp b/kjsembed/qtbindings/qt_imp.cpp index d7b2ed2e..899710f2 100644 --- a/kjsembed/qtbindings/qt_imp.cpp +++ b/kjsembed/qtbindings/qt_imp.cpp @@ -718,15 +718,15 @@ void QtImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } /** - * Extract a Qt pointer from an Object. + * Extract a TQt pointer from an Object. */ -Qt *QtImp::toQt( KJS::Object &self ) +TQt *QtImp::toTQt( KJS::Object &self ) { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<Qt *>( obj ); + return dynamic_cast<TQt *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); @@ -736,7 +736,7 @@ Qt *QtImp::toQt( KJS::Object &self ) if ( op->typeName() != "Qt" ) return 0; - return op->toNative<Qt>(); + return op->toNative<TQt>(); } /** @@ -757,7 +757,7 @@ KJS::Object QtImp::construct( KJS::ExecState *exec, const KJS::List &args ) KJS::Value QtImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ) { - instance = QtImp::toQt( self ); + instance = QtImp::toTQt( self ); switch( id ) { diff --git a/kjsembed/qtbindings/qt_imp.h b/kjsembed/qtbindings/qt_imp.h index 4dfbfc3c..5faa7be5 100644 --- a/kjsembed/qtbindings/qt_imp.h +++ b/kjsembed/qtbindings/qt_imp.h @@ -51,7 +51,7 @@ public: */ static void addBindings( KJS::ExecState *exec, KJS::Object &object ); - static Qt *toQt( KJS::Object &object ); + static TQt *toTQt( KJS::Object &object ); // // Constructors implemented by this class. @@ -80,7 +80,7 @@ public: virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); private: - Qt *instance; // Temp + TQt *instance; // Temp int id; bool cons; }; diff --git a/kjsembed/slotutils.cpp b/kjsembed/slotutils.cpp index 8f6a8f98..bf1fe509 100644 --- a/kjsembed/slotutils.cpp +++ b/kjsembed/slotutils.cpp @@ -31,8 +31,8 @@ #include <tqdatetime.h> #include <tqstringlist.h> -#include <private/qucom_p.h> -#include <private/qucomextra_p.h> +#include <private/tqucom_p.h> +#include <private/tqucomextra_p.h> #ifndef QT_ONLY #include <tdelistview.h> diff --git a/kjsembed/tdescript/javascript.cpp b/kjsembed/tdescript/javascript.cpp index eab5ad58..281cb5e7 100644 --- a/kjsembed/tdescript/javascript.cpp +++ b/kjsembed/tdescript/javascript.cpp @@ -100,7 +100,7 @@ void JavaScript::setProgress( int percent ) TQString JavaScript::appID() const { - return kapp->dcopClient()->appId(); + return tdeApp->dcopClient()->appId(); } void JavaScript::kill() diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp index 42f3ad07..4b138e8e 100644 --- a/kjsembed/testkjsembed.cpp +++ b/kjsembed/testkjsembed.cpp @@ -49,7 +49,7 @@ int main( int argc, char **argv ) // Setup Window app.setMainWidget( console ); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); console->resize( 600, 450 ); console->show(); diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp index 1986cc2d..7018497f 100644 --- a/kjsembed/tests/testkjsembed.cpp +++ b/kjsembed/tests/testkjsembed.cpp @@ -52,7 +52,7 @@ int main( int argc, char **argv ) // Setup Window app.setMainWidget( console ); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); console->resize( 600, 450 ); console->show(); diff --git a/kjsembed/tools/coverage/allqobjects.txt b/kjsembed/tools/coverage/allqobjects.txt index 107d7a34..500dc9d4 100644 --- a/kjsembed/tools/coverage/allqobjects.txt +++ b/kjsembed/tools/coverage/allqobjects.txt @@ -70,14 +70,9 @@ TQMacStyle TQMainWindow TQMenuBar TQMessageBox -TQMotif -TQMotifDialog TQMotifPlusStyle TQMotifStyle -TQMotifWidget TQMultiLineEdit -TQNPInstance -TQNPWidget TQNetworkOperation TQNetworkProtocol TQObject @@ -142,4 +137,3 @@ TQWindowsStyle TQWindowsXPStyle TQWizard TQWorkspace -TQXtWidget diff --git a/kjsembed/tools/coverage/unsupported.txt b/kjsembed/tools/coverage/unsupported.txt index 055ca045..60ec689d 100644 --- a/kjsembed/tools/coverage/unsupported.txt +++ b/kjsembed/tools/coverage/unsupported.txt @@ -45,13 +45,8 @@ TQLocalFs MISSING TQMacStyle MISSING TQMenuBar MISSING TQMessageBox MISSING -TQMotif MISSING -TQMotifDialog MISSING TQMotifPlusStyle MISSING TQMotifStyle MISSING -TQMotifWidget MISSING -TQNPInstance MISSING -TQNPWidget MISSING TQNetworkOperation MISSING TQNetworkProtocol MISSING TQObjectCleanupHandler MISSING @@ -92,4 +87,3 @@ TQWSKeyboardHandler MISSING TQWindowsStyle MISSING TQWindowsXPStyle MISSING TQWorkspace MISSING -TQXtWidget MISSING diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h index 5c5fb034..60f7f638 100644 --- a/kjsembed/tools/headers/qbrush.h +++ b/kjsembed/tools/headers/qbrush.h @@ -44,7 +44,7 @@ #endif // QT_H -class TQ_EXPORT TQBrush: public Qt +class TQ_EXPORT TQBrush: public TQt { friend class TQPainter; public: diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h index dbdd6548..fade5e2c 100644 --- a/kjsembed/tools/headers/qcanvas.h +++ b/kjsembed/tools/headers/qcanvas.h @@ -82,7 +82,7 @@ public: class TQCanvasItemExtra; -class TQM_EXPORT_CANVAS TQCanvasItem : public Qt +class TQM_EXPORT_CANVAS TQCanvasItem : public TQt { public: TQCanvasItem(TQCanvas* canvas); @@ -270,12 +270,12 @@ public: TQCanvasItemList collisions( const TQPointArray& pa, const TQCanvasItem* item, bool exact) const; - void drawArea(const TQRect&, TQPainter* p, bool double_buffer=FALSE); + void drawArea(const TQRect&, TQPainter* p, bool double_buffer=false); // These are for TQCanvasView to call virtual void addView(TQCanvasView*); virtual void removeView(TQCanvasView*); - void drawCanvasArea(const TQRect&, TQPainter* p=0, bool double_buffer=TRUE); + void drawCanvasArea(const TQRect&, TQPainter* p=0, bool double_buffer=true); void drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& r, bool dbuf ); // These are for TQCanvasItem to call @@ -651,7 +651,7 @@ public: TQCanvasSpline(TQCanvas* canvas); ~TQCanvasSpline(); - void setControlPoints(TQPointArray, bool closed=TRUE); + void setControlPoints(TQPointArray, bool closed=true); TQPointArray controlPoints() const; bool closed() const; diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h index 88c42ce3..5542fd0e 100644 --- a/kjsembed/tools/headers/qdir.h +++ b/kjsembed/tools/headers/qdir.h @@ -102,13 +102,13 @@ public: virtual TQString dirName() const; virtual TQString filePath( const TQString &fileName, - bool acceptAbsPath = TRUE ) const; + bool acceptAbsPath = true ) const; virtual TQString absFilePath( const TQString &fileName, - bool acceptAbsPath = TRUE ) const; + bool acceptAbsPath = true ) const; static TQString convertSeparators( const TQString &pathName ); - virtual bool cd( const TQString &dirName, bool acceptAbsPath = TRUE ); + virtual bool cd( const TQString &dirName, bool acceptAbsPath = true ); virtual bool cdUp(); TQString nameFilter() const; @@ -144,9 +144,9 @@ public: static const TQFileInfoList *drives(); virtual bool mkdir( const TQString &dirName, - bool acceptAbsPath = TRUE ) const; + bool acceptAbsPath = true ) const; virtual bool rmdir( const TQString &dirName, - bool acceptAbsPath = TRUE ) const; + bool acceptAbsPath = true ) const; virtual bool isReadable() const; virtual bool exists() const; @@ -159,11 +159,11 @@ public: virtual bool operator!=( const TQDir & ) const; virtual bool remove( const TQString &fileName, - bool acceptAbsPath = TRUE ); + bool acceptAbsPath = true ); virtual bool rename( const TQString &name, const TQString &newName, - bool acceptAbsPaths = TRUE ); + bool acceptAbsPaths = true ); virtual bool exists( const TQString &name, - bool acceptAbsPath = TRUE ); + bool acceptAbsPath = true ); static char separator(); diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h index 28158a8b..7532f50b 100644 --- a/kjsembed/tools/headers/qpen.h +++ b/kjsembed/tools/headers/qpen.h @@ -44,7 +44,7 @@ #endif // QT_H -class TQ_EXPORT TQPen: public Qt +class TQ_EXPORT TQPen: public TQt { public: TQPen(); @@ -72,7 +72,7 @@ public: private: friend class TQPainter; -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN friend class TQFontEngineWin; #endif diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h index b1ce519e..35fd16b5 100644 --- a/kjsembed/tools/headers/qtimer.h +++ b/kjsembed/tools/headers/qtimer.h @@ -52,7 +52,7 @@ public: bool isActive() const; - int start( int msec, bool sshot = FALSE ); + int start( int msec, bool sshot = false ); void changeInterval( int msec ); void stop(); diff --git a/kjsembed/xmlactionclient.cpp b/kjsembed/xmlactionclient.cpp index 88bfab97..43872b30 100644 --- a/kjsembed/xmlactionclient.cpp +++ b/kjsembed/xmlactionclient.cpp @@ -125,7 +125,7 @@ bool XMLActionClient::bind( TDEAction *act, const XMLActionScript &s ) // kdWarning() << "Runner:bind called, action=" << act->name() << " type=" << s.type // << " text=" << s.text << " src=" << s.src << endl; - connect( act, TQT_SIGNAL( activated() ), this, TQT_SLOT( action_activated() ) ); + connect( act, TQ_SIGNAL( activated() ), this, TQ_SLOT( action_activated() ) ); return bind( act->name(), s ); } @@ -331,7 +331,7 @@ TDEAction *XMLActionHandler::createAction( TDEActionCollection *parent ) act->setStatusText( ad.status ); act->setWhatsThis( ad.whatsthis ); - TQObject::connect( actclient, TQT_SIGNAL( destroyed() ), act, TQT_SLOT( deleteLater() ) ); + TQObject::connect( actclient, TQ_SIGNAL( destroyed() ), act, TQ_SLOT( deleteLater() ) ); return act; } |