diff options
Diffstat (limited to 'kjsembed')
189 files changed, 162 insertions, 1003 deletions
diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am index 1c8b3477..f98ad856 100644 --- a/kjsembed/Makefile.am +++ b/kjsembed/Makefile.am @@ -61,8 +61,6 @@ kjscmd_SOURCES = kjscmd.cpp kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS) kjscmd_LDADD = libkjsembed.la -man_MANS = kjscmd.1 - xdg_apps_DATA = kjscmd.desktop plugintypedir = $(kde_servicetypesdir) diff --git a/kjsembed/bindings/bindingobject.h b/kjsembed/bindings/bindingobject.h index 60cb32c2..17b51fa5 100644 --- a/kjsembed/bindings/bindingobject.h +++ b/kjsembed/bindings/bindingobject.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -37,7 +35,7 @@ namespace Bindings { */ class BindingObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: BindingObject( TQObject *parent, const char *name=0 ); diff --git a/kjsembed/bindings/brush_imp.cpp b/kjsembed/bindings/brush_imp.cpp index ab2eee3f..8daa3897 100644 --- a/kjsembed/bindings/brush_imp.cpp +++ b/kjsembed/bindings/brush_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/brush_imp.h b/kjsembed/bindings/brush_imp.h index 040c73b6..d9f4423e 100644 --- a/kjsembed/bindings/brush_imp.h +++ b/kjsembed/bindings/brush_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp index f4d68972..b30ee508 100644 --- a/kjsembed/bindings/dcop_imp.cpp +++ b/kjsembed/bindings/dcop_imp.cpp @@ -1,6 +1,4 @@ // $Id$ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * @@ -171,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); @@ -194,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; } @@ -233,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 ); @@ -346,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: @@ -368,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 ) @@ -403,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); @@ -426,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)); } @@ -605,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; } @@ -643,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; @@ -652,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; @@ -661,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; @@ -670,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; @@ -678,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/dcop_imp.h b/kjsembed/bindings/dcop_imp.h index 6a821028..c843b2f1 100644 --- a/kjsembed/bindings/dcop_imp.h +++ b/kjsembed/bindings/dcop_imp.h @@ -1,6 +1,4 @@ // $Id$ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * @@ -52,7 +50,7 @@ class JSDCOPInterfacerLoader : public JSBindingBase */ class JSDCOPInterface : public BindingObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: JSDCOPInterface( KJS::Interpreter *js, TQObject *parent, const char *name=0 ); diff --git a/kjsembed/bindings/iconset_imp.cpp b/kjsembed/bindings/iconset_imp.cpp index 43ec0f83..90e41ae8 100644 --- a/kjsembed/bindings/iconset_imp.cpp +++ b/kjsembed/bindings/iconset_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/iconset_imp.h b/kjsembed/bindings/iconset_imp.h index d758f0b5..9b44ab90 100644 --- a/kjsembed/bindings/iconset_imp.h +++ b/kjsembed/bindings/iconset_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/image_imp.cpp b/kjsembed/bindings/image_imp.cpp index eb428ab3..962befdd 100644 --- a/kjsembed/bindings/image_imp.cpp +++ b/kjsembed/bindings/image_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/image_imp.h b/kjsembed/bindings/image_imp.h index 39cb7031..af6ee98e 100644 --- a/kjsembed/bindings/image_imp.h +++ b/kjsembed/bindings/image_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/movie_imp.cpp b/kjsembed/bindings/movie_imp.cpp index 7f786c52..3613849b 100644 --- a/kjsembed/bindings/movie_imp.cpp +++ b/kjsembed/bindings/movie_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/movie_imp.h b/kjsembed/bindings/movie_imp.h index 5a3bfcee..59c58463 100644 --- a/kjsembed/bindings/movie_imp.h +++ b/kjsembed/bindings/movie_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * @@ -37,7 +35,7 @@ namespace Bindings { */ class Movie : public BindingObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQColor setBackgroundColor READ backgroundColor ) TQ_PROPERTY( int setSpeed READ speed ) diff --git a/kjsembed/bindings/netaccess_imp.cpp b/kjsembed/bindings/netaccess_imp.cpp index 024a8764..a5a32769 100644 --- a/kjsembed/bindings/netaccess_imp.cpp +++ b/kjsembed/bindings/netaccess_imp.cpp @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /** * netaccess_imp.cpp * diff --git a/kjsembed/bindings/netaccess_imp.h b/kjsembed/bindings/netaccess_imp.h index d22d72a0..9acd4bb0 100644 --- a/kjsembed/bindings/netaccess_imp.h +++ b/kjsembed/bindings/netaccess_imp.h @@ -1,4 +1,3 @@ -// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- /** * netaccess.h * @@ -35,7 +34,7 @@ namespace Bindings { */ class NetAccess : public BindingObject { - Q_OBJECT + TQ_OBJECT public: NetAccess( TQObject *parent, const char *name=0 ); virtual ~NetAccess(); diff --git a/kjsembed/bindings/painter_imp.cpp b/kjsembed/bindings/painter_imp.cpp index 9a8d36a9..cacadf90 100644 --- a/kjsembed/bindings/painter_imp.cpp +++ b/kjsembed/bindings/painter_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -514,8 +512,3 @@ TQColor KJSEmbed::Bindings::Painter::brush( ) const { return pr->painter()->brush().color(); } -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/bindings/painter_imp.h b/kjsembed/bindings/painter_imp.h index f831b7fd..b26f990a 100644 --- a/kjsembed/bindings/painter_imp.h +++ b/kjsembed/bindings/painter_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/pen_imp.cpp b/kjsembed/bindings/pen_imp.cpp index 63344a52..b85615b3 100644 --- a/kjsembed/bindings/pen_imp.cpp +++ b/kjsembed/bindings/pen_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -119,9 +117,3 @@ KJS::Value Pen::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List & } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/bindings/pen_imp.h b/kjsembed/bindings/pen_imp.h index 2068a6a5..1c8e8928 100644 --- a/kjsembed/bindings/pen_imp.h +++ b/kjsembed/bindings/pen_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/pixmap_imp.cpp b/kjsembed/bindings/pixmap_imp.cpp index 5fead7ce..ad41138d 100644 --- a/kjsembed/bindings/pixmap_imp.cpp +++ b/kjsembed/bindings/pixmap_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/pixmap_imp.h b/kjsembed/bindings/pixmap_imp.h index 08baa96c..730eaf65 100644 --- a/kjsembed/bindings/pixmap_imp.h +++ b/kjsembed/bindings/pixmap_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/bindings/point_imp.cpp b/kjsembed/bindings/point_imp.cpp index fff93aad..c6988dea 100644 --- a/kjsembed/bindings/point_imp.cpp +++ b/kjsembed/bindings/point_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * @@ -86,7 +84,3 @@ namespace Bindings { } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/bindings/point_imp.h b/kjsembed/bindings/point_imp.h index 950cce7d..d112a77f 100644 --- a/kjsembed/bindings/point_imp.h +++ b/kjsembed/bindings/point_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/rect_imp.cpp b/kjsembed/bindings/rect_imp.cpp index 2614197b..739a80ae 100644 --- a/kjsembed/bindings/rect_imp.cpp +++ b/kjsembed/bindings/rect_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * @@ -105,7 +103,3 @@ namespace Bindings { } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/bindings/rect_imp.h b/kjsembed/bindings/rect_imp.h index 16910e4e..4c95cb92 100644 --- a/kjsembed/bindings/rect_imp.h +++ b/kjsembed/bindings/rect_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/size_imp.cpp b/kjsembed/bindings/size_imp.cpp index 1e41e60a..48ce2d7f 100644 --- a/kjsembed/bindings/size_imp.cpp +++ b/kjsembed/bindings/size_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * @@ -127,7 +125,3 @@ KJS::Value Size::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/bindings/size_imp.h b/kjsembed/bindings/size_imp.h index 9a1fb4eb..fc9aadc5 100644 --- a/kjsembed/bindings/size_imp.h +++ b/kjsembed/bindings/size_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004 Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/sql_imp.cpp b/kjsembed/bindings/sql_imp.cpp index 5fa9782f..6e317216 100644 --- a/kjsembed/bindings/sql_imp.cpp +++ b/kjsembed/bindings/sql_imp.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/bindings/sql_imp.h b/kjsembed/bindings/sql_imp.h index 08555e84..037733a4 100644 --- a/kjsembed/bindings/sql_imp.h +++ b/kjsembed/bindings/sql_imp.h @@ -35,7 +35,7 @@ namespace Bindings { */ class SqlQuery : public BindingObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int size READ size) TQ_PROPERTY( int at READ at) TQ_PROPERTY( int numRowsAffected READ numRowsAffected ) @@ -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 (); @@ -88,7 +88,7 @@ private: */ class SqlDatabase : public BindingObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString databaseName READ databaseName WRITE setDatabaseName) TQ_PROPERTY( TQString userName READ userName WRITE setUserName) TQ_PROPERTY( TQString password READ password WRITE setPassword) 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/bindings/tdeconfig_imp.h b/kjsembed/bindings/tdeconfig_imp.h index 75bf3bfd..36ceec36 100644 --- a/kjsembed/bindings/tdeconfig_imp.h +++ b/kjsembed/bindings/tdeconfig_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * @@ -44,7 +42,7 @@ namespace Bindings { class Config : public BindingObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool forceGlobal READ forceGlobal WRITE setForceGlobal ) TQ_PROPERTY( bool dollarExpansion READ isDollarExpansion WRITE setDollarExpansion ) TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) diff --git a/kjsembed/bindwizard/binding_wizard.ui b/kjsembed/bindwizard/binding_wizard.ui index baacdca5..352b68d8 100644 --- a/kjsembed/bindwizard/binding_wizard.ui +++ b/kjsembed/bindwizard/binding_wizard.ui @@ -476,15 +476,10 @@ files of the C++ classes you want to make available to Javascript are located.</ </widget> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kled.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kled.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kjsembed/bindwizard/doxygen2imp_cpp.xsl b/kjsembed/bindwizard/doxygen2imp_cpp.xsl index 903f16b2..c16c47e8 100644 --- a/kjsembed/bindwizard/doxygen2imp_cpp.xsl +++ b/kjsembed/bindwizard/doxygen2imp_cpp.xsl @@ -551,10 +551,5 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object </xsl:for-each> } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/bindwizard/doxygen2imp_h.xsl b/kjsembed/bindwizard/doxygen2imp_h.xsl index d5aaa8d2..bb4c982f 100644 --- a/kjsembed/bindwizard/doxygen2imp_h.xsl +++ b/kjsembed/bindwizard/doxygen2imp_h.xsl @@ -119,10 +119,5 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_<xsl:value-of select="compoundname" />_H - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/builtins/qdir_imp.cpp b/kjsembed/builtins/qdir_imp.cpp index b2f50cba..376d448d 100644 --- a/kjsembed/builtins/qdir_imp.cpp +++ b/kjsembed/builtins/qdir_imp.cpp @@ -1001,9 +1001,3 @@ KJS::Value TQDirImp::isRelativePath_58( KJS::ExecState *exec, KJS::Object &obj, } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/builtins/qdir_imp.h b/kjsembed/builtins/qdir_imp.h index 55c319a5..fab17807 100644 --- a/kjsembed/builtins/qdir_imp.h +++ b/kjsembed/builtins/qdir_imp.h @@ -164,9 +164,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QDir_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/builtins/qfile_imp.cpp b/kjsembed/builtins/qfile_imp.cpp index 1ead6bbf..f12f531f 100644 --- a/kjsembed/builtins/qfile_imp.cpp +++ b/kjsembed/builtins/qfile_imp.cpp @@ -614,9 +614,3 @@ KJS::Value TQFileImp::remove_32( KJS::ExecState *exec, KJS::Object &obj, const K } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/builtins/qfile_imp.h b/kjsembed/builtins/qfile_imp.h index 69d28e9d..f4882bb8 100644 --- a/kjsembed/builtins/qfile_imp.h +++ b/kjsembed/builtins/qfile_imp.h @@ -140,9 +140,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QFile_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/builtins/resources.cpp b/kjsembed/builtins/resources.cpp index 22a6917c..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> @@ -225,7 +225,3 @@ KJS::Value StdIconsImp::call( KJS::ExecState *exec, KJS::Object &/*obj*/, const } // namespace KJSEmbed::BuiltIns } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/resources.h b/kjsembed/builtins/resources.h index a93332b9..860ce4dd 100644 --- a/kjsembed/builtins/resources.h +++ b/kjsembed/builtins/resources.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/builtins/saxhandler.cpp b/kjsembed/builtins/saxhandler.cpp index ff0334bf..89e7fd91 100644 --- a/kjsembed/builtins/saxhandler.cpp +++ b/kjsembed/builtins/saxhandler.cpp @@ -180,7 +180,3 @@ TQString SaxHandler::errorString() } // namespace KJSEmbed::BuiltIns } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/saxhandler.h b/kjsembed/builtins/saxhandler.h index 5feeef58..e6aa56f6 100644 --- a/kjsembed/builtins/saxhandler.h +++ b/kjsembed/builtins/saxhandler.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/builtins/stdaction_imp.cpp b/kjsembed/builtins/stdaction_imp.cpp index 7950161e..74083d01 100644 --- a/kjsembed/builtins/stdaction_imp.cpp +++ b/kjsembed/builtins/stdaction_imp.cpp @@ -93,7 +93,3 @@ KJS::Value StdActionImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, cons } // namespace KJSEmbed::BuiltIns } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/stdaction_imp.h b/kjsembed/builtins/stdaction_imp.h index 9a64174b..5829814c 100644 --- a/kjsembed/builtins/stdaction_imp.h +++ b/kjsembed/builtins/stdaction_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -62,7 +60,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_STDACTION_IMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/stddialog_imp.cpp b/kjsembed/builtins/stddialog_imp.cpp index 56c9919c..85b2cfaa 100644 --- a/kjsembed/builtins/stddialog_imp.cpp +++ b/kjsembed/builtins/stddialog_imp.cpp @@ -141,7 +141,3 @@ KJS::Value StdDialogImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, cons } // namespace KJSEmbed::BuiltIns } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/stddialog_imp.h b/kjsembed/builtins/stddialog_imp.h index ea70db73..23f99405 100644 --- a/kjsembed/builtins/stddialog_imp.h +++ b/kjsembed/builtins/stddialog_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -75,7 +73,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_STDDIALOG_IMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/textstream_imp.cpp b/kjsembed/builtins/textstream_imp.cpp index d28bb46c..3d72d30b 100644 --- a/kjsembed/builtins/textstream_imp.cpp +++ b/kjsembed/builtins/textstream_imp.cpp @@ -128,7 +128,3 @@ KJS::Value TextStreamImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, con } // namespace KJSEmbed::BuiltIns } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/builtins/textstream_imp.h b/kjsembed/builtins/textstream_imp.h index c08470fc..e308ee21 100644 --- a/kjsembed/builtins/textstream_imp.h +++ b/kjsembed/builtins/textstream_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -73,7 +71,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDTEXTSTREAMIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp index 906e0691..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 @@ -1437,8 +1437,3 @@ KJS::Value Bindings::CustomObjectImp::qmenuDataInsertSeparator(KJS::ExecState *e } // namespace KJSEmbed::Bindings }// namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/customobject_imp.h b/kjsembed/customobject_imp.h index 28a5a07f..9aa2e067 100644 --- a/kjsembed/customobject_imp.h +++ b/kjsembed/customobject_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2004, Richard J. Moore <rich@kde.org> * @@ -218,7 +216,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDCUSTOMOBJECTIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: 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/docs/embedding/qtembed/posviewbase.ui b/kjsembed/docs/embedding/qtembed/posviewbase.ui index 4916d505..6c55b01e 100644 --- a/kjsembed/docs/embedding/qtembed/posviewbase.ui +++ b/kjsembed/docs/embedding/qtembed/posviewbase.ui @@ -137,9 +137,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -154,9 +151,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kjsembed/docs/embedding/qtembed/posviewimp.h b/kjsembed/docs/embedding/qtembed/posviewimp.h index 764ac813..cd629a0f 100644 --- a/kjsembed/docs/embedding/qtembed/posviewimp.h +++ b/kjsembed/docs/embedding/qtembed/posviewimp.h @@ -13,7 +13,7 @@ namespace KJSEmbed { }; class POSViewImp: public POSViewBase { - Q_OBJECT + TQ_OBJECT public: POSViewImp( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kjsembed/docs/embedding/simple-embed/embedview.ui b/kjsembed/docs/embedding/simple-embed/embedview.ui index 44985f72..58c75064 100644 --- a/kjsembed/docs/embedding/simple-embed/embedview.ui +++ b/kjsembed/docs/embedding/simple-embed/embedview.ui @@ -96,9 +96,6 @@ <property name="text"> <string>Console</string> </property> - <property name="accel"> - <string></string> - </property> <property name="stdItem" stdset="0"> <number>0</number> </property> @@ -172,12 +169,8 @@ <slot>consoleClicked()</slot> </slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kjsembed/docs/embedding/simple-embed/embedviewimp.h b/kjsembed/docs/embedding/simple-embed/embedviewimp.h index 7c678a32..d8b96572 100644 --- a/kjsembed/docs/embedding/simple-embed/embedviewimp.h +++ b/kjsembed/docs/embedding/simple-embed/embedviewimp.h @@ -13,7 +13,7 @@ namespace KJSEmbed { } class EmbedViewImp: public EmbedView { - Q_OBJECT + TQ_OBJECT public: EmbedViewImp( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui index 3af30e5e..7ffe890d 100644 --- a/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui +++ b/kjsembed/docs/examples/buttonmaker/ButtonMakerUI.ui @@ -570,23 +570,13 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>tdefontrequester.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>kdualcolorbutton.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> + <include location="global" impldecl="in implementation">kdualcolorbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">tdefontrequester.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/connect/connect.ui b/kjsembed/docs/examples/connect/connect.ui index 5c33501e..153f264b 100644 --- a/kjsembed/docs/examples/connect/connect.ui +++ b/kjsembed/docs/examples/connect/connect.ui @@ -152,9 +152,9 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>ktextbrowser.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> + <include location="global" impldecl="in implementation">ktextbrowser.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/docviewer/docviewer.ui b/kjsembed/docs/examples/docviewer/docviewer.ui index b27ac94b..bcefe398 100644 --- a/kjsembed/docs/examples/docviewer/docviewer.ui +++ b/kjsembed/docs/examples/docviewer/docviewer.ui @@ -62,8 +62,8 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistbox.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui index 14bf9f99..fb1e84ac 100644 --- a/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui +++ b/kjsembed/docs/examples/envelopemaker/EnvelopeMakerUI.ui @@ -551,18 +551,9 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>tdefontrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdefontrequester.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/imagefun/bump.ui b/kjsembed/docs/examples/imagefun/bump.ui index eb342eac..fb91050b 100644 --- a/kjsembed/docs/examples/imagefun/bump.ui +++ b/kjsembed/docs/examples/imagefun/bump.ui @@ -313,15 +313,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/imunge/effectbrowser.ui b/kjsembed/docs/examples/imunge/effectbrowser.ui index 09dcac7b..95373c2c 100644 --- a/kjsembed/docs/examples/imunge/effectbrowser.ui +++ b/kjsembed/docs/examples/imunge/effectbrowser.ui @@ -145,7 +145,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/imunge/resizeparams.ui b/kjsembed/docs/examples/imunge/resizeparams.ui index a7dbfd0a..ec0cecf3 100644 --- a/kjsembed/docs/examples/imunge/resizeparams.ui +++ b/kjsembed/docs/examples/imunge/resizeparams.ui @@ -141,9 +141,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -158,9 +155,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -184,10 +178,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/madminute/configdialog.ui b/kjsembed/docs/examples/madminute/configdialog.ui index 968c9b1f..8e7e6de5 100644 --- a/kjsembed/docs/examples/madminute/configdialog.ui +++ b/kjsembed/docs/examples/madminute/configdialog.ui @@ -176,9 +176,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -193,9 +190,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -267,8 +261,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kjsembed/docs/examples/madminute/madminute.ui b/kjsembed/docs/examples/madminute/madminute.ui index 1154312a..e9c84652 100644 --- a/kjsembed/docs/examples/madminute/madminute.ui +++ b/kjsembed/docs/examples/madminute/madminute.ui @@ -321,9 +321,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> diff --git a/kjsembed/docs/examples/qdocviewer/docviewer.ui b/kjsembed/docs/examples/qdocviewer/docviewer.ui index 94b7458b..b9bb38d7 100644 --- a/kjsembed/docs/examples/qdocviewer/docviewer.ui +++ b/kjsembed/docs/examples/qdocviewer/docviewer.ui @@ -414,9 +414,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -479,9 +476,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> </actions> <images> diff --git a/kjsembed/global.h b/kjsembed/global.h index 7ab55e96..7017f180 100644 --- a/kjsembed/global.h +++ b/kjsembed/global.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /*************************************************************************** * Copyright (C) 2004 by Richard Moore * * rich@kde.org * @@ -22,7 +21,7 @@ #ifndef KJSEMBED_GLOBAL_H #define KJSEMBED_GLOBAL_H -#include <kdemacros.h> +#include <tdemacros.h> #ifdef WIN32 # ifdef KJSEMBED_DLL @@ -35,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/jsbinding.h b/kjsembed/jsbinding.h index 74c4b140..87e42184 100644 --- a/kjsembed/jsbinding.h +++ b/kjsembed/jsbinding.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2002, Richard J. Moore <rich@kde.org> * @@ -132,7 +130,3 @@ namespace KJSEmbed { } #endif // KJSEMBEDJSBINDING_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsbindingbase.h b/kjsembed/jsbindingbase.h index cca40fc3..ab653dd2 100644 --- a/kjsembed/jsbindingbase.h +++ b/kjsembed/jsbindingbase.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jsbindingplugin.cpp b/kjsembed/jsbindingplugin.cpp index 4edacf5e..48d52f44 100644 --- a/kjsembed/jsbindingplugin.cpp +++ b/kjsembed/jsbindingplugin.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jsbindingplugin.h b/kjsembed/jsbindingplugin.h index fb7d6361..eec80d6d 100644 --- a/kjsembed/jsbindingplugin.h +++ b/kjsembed/jsbindingplugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -40,7 +38,7 @@ namespace KJSEmbed { * @version $Id$ */ class KJSEMBED_EXPORT JSBindingPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: JSBindingPlugin( TQObject *parent, const char *name, const TQStringList &args ); virtual ~JSBindingPlugin(); diff --git a/kjsembed/jsbuiltin.h b/kjsembed/jsbuiltin.h index 26f82bdf..f8e35a02 100644 --- a/kjsembed/jsbuiltin.h +++ b/kjsembed/jsbuiltin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp index 4aebd73d..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 @@ -275,7 +275,3 @@ KJS::Value JSBuiltInImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ } // namespace KJSEmbed::Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsbuiltin_imp.h b/kjsembed/jsbuiltin_imp.h index 6d833457..45b260dc 100644 --- a/kjsembed/jsbuiltin_imp.h +++ b/kjsembed/jsbuiltin_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -77,7 +75,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDBUILTINIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsbuiltinproxy.h b/kjsembed/jsbuiltinproxy.h index 6eacd4ac..cdbfc4e4 100644 --- a/kjsembed/jsbuiltinproxy.h +++ b/kjsembed/jsbuiltinproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2004, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp index 57015a6d..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 )); @@ -236,7 +236,3 @@ void JSConsoleWidget::receivedStdError( TDEProcess *, char *buffer, int buflen ) } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsconsolewidget.h b/kjsembed/jsconsolewidget.h index 71a79a3c..328fd43f 100644 --- a/kjsembed/jsconsolewidget.h +++ b/kjsembed/jsconsolewidget.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -61,7 +59,7 @@ class KJSEmbedPart; */ class KJSEMBED_EXPORT JSConsoleWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT public: JSConsoleWidget( KJSEmbedPart *js, TQWidget *parent=0, const char *name=0 ); @@ -147,7 +145,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSCONSOLEWIDGET_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jseventmapper.cpp b/kjsembed/jseventmapper.cpp index 000353d3..3b4f282a 100644 --- a/kjsembed/jseventmapper.cpp +++ b/kjsembed/jseventmapper.cpp @@ -93,7 +93,3 @@ TQEvent::Type JSEventMapper::findEventType( const KJS::Identifier &name ) const } } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jseventmapper.h b/kjsembed/jseventmapper.h index 3539e94a..322a4ac1 100644 --- a/kjsembed/jseventmapper.h +++ b/kjsembed/jseventmapper.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jseventutils.h b/kjsembed/jseventutils.h index 2d2044e9..687865c6 100644 --- a/kjsembed/jseventutils.h +++ b/kjsembed/jseventutils.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp index faac7212..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 }; @@ -1126,7 +1120,3 @@ namespace KJSEmbed { } }// namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsfactory.h b/kjsembed/jsfactory.h index 9bfe3e3d..ab0b5c8f 100644 --- a/kjsembed/jsfactory.h +++ b/kjsembed/jsfactory.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2004, Richard J. Moore <rich@kde.org> * @@ -336,7 +334,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDFACTORY_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsfactory_imp.cpp b/kjsembed/jsfactory_imp.cpp index e987d020..f58ae5f6 100644 --- a/kjsembed/jsfactory_imp.cpp +++ b/kjsembed/jsfactory_imp.cpp @@ -295,7 +295,3 @@ void JSFactoryImp::publishChildren(TQObject *obj, KJS::Object &parent) } // namespace KJSEmbed::Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsfactory_imp.h b/kjsembed/jsfactory_imp.h index ee4c59f0..977b5294 100644 --- a/kjsembed/jsfactory_imp.h +++ b/kjsembed/jsfactory_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2004, Richard J. Moore <rich@kde.org> * @@ -95,7 +93,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_JSFACTORYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsobjecteventproxy.h b/kjsembed/jsobjecteventproxy.h index e21e4cb8..c9613e79 100644 --- a/kjsembed/jsobjecteventproxy.h +++ b/kjsembed/jsobjecteventproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -39,7 +37,7 @@ class JSObjectProxy; */ class KJSEMBED_EXPORT JSObjectEventProxy : public TQObject { - Q_OBJECT + TQ_OBJECT public: JSObjectEventProxy( JSObjectProxy *parent, const char *name=0 ); diff --git a/kjsembed/jsobjectproxy.cpp b/kjsembed/jsobjectproxy.cpp index 7011e338..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> @@ -299,8 +299,3 @@ namespace KJSEmbed { } } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsobjectproxy.h b/kjsembed/jsobjectproxy.h index 90b215fd..d2823dbb 100644 --- a/kjsembed/jsobjectproxy.h +++ b/kjsembed/jsobjectproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -196,7 +194,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSOBJECTPROXY_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsobjectproxy_imp.cpp b/kjsembed/jsobjectproxy_imp.cpp index 5d025bf3..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> @@ -631,8 +631,3 @@ KJS::Value JSObjectProxyImp::setAttribute( KJS::ExecState *exec, KJS::Object &, } // namespace KJSEmbed::Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsobjectproxy_imp.h b/kjsembed/jsobjectproxy_imp.h index 2c1cefb6..cc598ef3 100644 --- a/kjsembed/jsobjectproxy_imp.h +++ b/kjsembed/jsobjectproxy_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -183,7 +181,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSOBJECTPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsopaqueproxy.cpp b/kjsembed/jsopaqueproxy.cpp index 5abd9558..5d88a490 100644 --- a/kjsembed/jsopaqueproxy.cpp +++ b/kjsembed/jsopaqueproxy.cpp @@ -130,8 +130,3 @@ KJS::UString JSOpaqueProxy::toString( KJS::ExecState */*exec*/ ) const } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsopaqueproxy.h b/kjsembed/jsopaqueproxy.h index 73da0efc..fbafb139 100644 --- a/kjsembed/jsopaqueproxy.h +++ b/kjsembed/jsopaqueproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -166,7 +164,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSOPATQUEPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsopaqueproxy_imp.cpp b/kjsembed/jsopaqueproxy_imp.cpp index 6aef5494..6da44198 100644 --- a/kjsembed/jsopaqueproxy_imp.cpp +++ b/kjsembed/jsopaqueproxy_imp.cpp @@ -58,8 +58,3 @@ KJS::Value JSOpaqueProxyImp::call( KJS::ExecState *exec, KJS::Object &self, cons } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsopaqueproxy_imp.h b/kjsembed/jsopaqueproxy_imp.h index 7d2d5157..ff661c62 100644 --- a/kjsembed/jsopaqueproxy_imp.h +++ b/kjsembed/jsopaqueproxy_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -60,7 +58,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSOPATQUEPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsproxy.cpp b/kjsembed/jsproxy.cpp index cbf3a5e3..787bb183 100644 --- a/kjsembed/jsproxy.cpp +++ b/kjsembed/jsproxy.cpp @@ -116,7 +116,3 @@ void JSProxy::addEnums( KJS::ExecState * exec, EnumTable * table, KJS::Object & } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsproxy.h b/kjsembed/jsproxy.h index db22acf6..67adedb1 100644 --- a/kjsembed/jsproxy.h +++ b/kjsembed/jsproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2004, Richard J. Moore <rich@kde.org> * @@ -178,7 +176,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsproxy_imp.cpp b/kjsembed/jsproxy_imp.cpp index 9af07152..bd8fb060 100644 --- a/kjsembed/jsproxy_imp.cpp +++ b/kjsembed/jsproxy_imp.cpp @@ -35,8 +35,3 @@ JSProxyImp::~JSProxyImp() //} // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsproxy_imp.h b/kjsembed/jsproxy_imp.h index e46391ad..bda51a89 100644 --- a/kjsembed/jsproxy_imp.h +++ b/kjsembed/jsproxy_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -47,7 +45,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jssecuritypolicy.h b/kjsembed/jssecuritypolicy.h index a14f099c..bdbb5cc6 100644 --- a/kjsembed/jssecuritypolicy.h +++ b/kjsembed/jssecuritypolicy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/jsvalueproxy.cpp b/kjsembed/jsvalueproxy.cpp index cbc75b34..8dbaddd5 100644 --- a/kjsembed/jsvalueproxy.cpp +++ b/kjsembed/jsvalueproxy.cpp @@ -90,8 +90,3 @@ bool JSValueProxy::inherits( const char * clazz ) } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsvalueproxy.h b/kjsembed/jsvalueproxy.h index 4500fe02..3a4774ce 100644 --- a/kjsembed/jsvalueproxy.h +++ b/kjsembed/jsvalueproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -61,7 +59,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSVALUEPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/jsvalueproxy_imp.cpp b/kjsembed/jsvalueproxy_imp.cpp index e3e30df3..ff88d9f2 100644 --- a/kjsembed/jsvalueproxy_imp.cpp +++ b/kjsembed/jsvalueproxy_imp.cpp @@ -59,8 +59,3 @@ KJS::Value JSValueProxyImp::call( KJS::ExecState *exec, KJS::Object &self, const } // namespace Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/jsvalueproxy_imp.h b/kjsembed/jsvalueproxy_imp.h index f0a88ab4..5096999d 100644 --- a/kjsembed/jsvalueproxy_imp.h +++ b/kjsembed/jsvalueproxy_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -60,7 +58,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSVALUEPROXYIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/kjscmd.1 b/kjsembed/kjscmd.1 deleted file mode 100644 index c0765aeb..00000000 --- a/kjsembed/kjscmd.1 +++ /dev/null @@ -1,34 +0,0 @@ -.TH "kjscmd" 1 -.SH NAME -kjscmd \- A tool for running KJSEmbed scripts from the command line -.SH SYNOPSIS -.B kjscmd -kjscmd [Qt-options] [TDE-options] [options] [file] -.SH DESCRIPTION -kjscmd is a tool for launching KJSEmbed scripts from the command line, and -can also provide a console for running commands interactively. It will run -the named file using KJSEmbed (or read a file from stdin if '-' is -specified). -.SH OPTIONS -.TP -.B \-\-console \-c -Enables the graphical console. The console will not be visible unless the -script enters the event loop or the --exec parameter is used. If no script -was specified on the command line then the event loop is entered -automatically. -.TP -.B \-\-interactive \-i -Enables the interactive command line prompt. -.TP -.B \-\-exec -Tells kjscmd to enter the event loop after executing the script. This option -is rarely used, but it can be handy if you want to use the console to examine -the state of the interpreter after a non-graphical script has executed. -.TP -.B \-\-nogui -Tells kjscmd not to create an X connection. This allows you to use scripts -without needing an X server (though with reduced functionality). -.SH BUGS -There are probably lots of bugs. Use http://bugs.trinitydesktop.org/ to report them. - - diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp index ed8718ea..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 @@ -188,7 +188,3 @@ int main( int argc, char **argv ) return result; } - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/kjsembedpart.cpp b/kjsembed/kjsembedpart.cpp index 8d1f4d0c..007a5146 100644 --- a/kjsembed/kjsembedpart.cpp +++ b/kjsembed/kjsembedpart.cpp @@ -443,7 +443,3 @@ bool KJSEmbedPart::hasMethod( const TQString & methodName ) } }// namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/kjsembedpart.h b/kjsembed/kjsembedpart.h index 3e4b3afb..676e27c2 100644 --- a/kjsembed/kjsembedpart.h +++ b/kjsembed/kjsembedpart.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -73,7 +71,7 @@ class JSBuiltIn; */ class KJSEMBED_EXPORT KJSEmbedPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQStringList constructorNames READ constructorNames ) TQ_PROPERTY( TQCString versionString READ versionString ) TQ_PROPERTY( int versionMajor READ versionMajor ) @@ -321,8 +319,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSCONSOLEPART_H - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/kjsembedpart_imp.cpp b/kjsembed/kjsembedpart_imp.cpp index abd28782..28d4c1ab 100644 --- a/kjsembed/kjsembedpart_imp.cpp +++ b/kjsembed/kjsembedpart_imp.cpp @@ -54,7 +54,3 @@ KJS::Value KJSEmbedPartImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, c } // namespace KJSEmbed::Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/kjsembedpart_imp.h b/kjsembed/kjsembedpart_imp.h index ae743fed..f4cdc379 100644 --- a/kjsembed/kjsembedpart_imp.h +++ b/kjsembed/kjsembedpart_imp.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -69,7 +67,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDPARTIMP_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp index c65449ee..8777c2b9 100644 --- a/kjsembed/ksimpleprocess.cpp +++ b/kjsembed/ksimpleprocess.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004, Ian Reinhart Geiser <geiseri@kde.org> * @@ -36,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/ksimpleprocess.h b/kjsembed/ksimpleprocess.h index c066490e..de11e24a 100644 --- a/kjsembed/ksimpleprocess.h +++ b/kjsembed/ksimpleprocess.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2004, Ian Reinhart Geiser <geiseri@kde.org> * @@ -33,7 +31,7 @@ */ class KSimpleProcess : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kjsembed/plugin/jsconsoleplugin.cpp b/kjsembed/plugin/jsconsoleplugin.cpp index b896481c..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() ); @@ -89,11 +89,3 @@ void JSConsolePlugin::showConsole() } } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - - - diff --git a/kjsembed/plugin/jsconsoleplugin.h b/kjsembed/plugin/jsconsoleplugin.h index c8ea7aef..17e0b6a9 100644 --- a/kjsembed/plugin/jsconsoleplugin.h +++ b/kjsembed/plugin/jsconsoleplugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -36,7 +34,7 @@ namespace KJSEmbed { */ class JSConsolePlugin : public KParts::Plugin { - Q_OBJECT + TQ_OBJECT public: JSConsolePlugin( TQObject *parent, const char *name, const TQStringList & ); @@ -55,7 +53,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDJSCONSOLEPLUGIN_H - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/plugins/customobject_plugin.cpp b/kjsembed/plugins/customobject_plugin.cpp index b883ff66..d5594eb0 100644 --- a/kjsembed/plugins/customobject_plugin.cpp +++ b/kjsembed/plugins/customobject_plugin.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/plugins/customobject_plugin.h b/kjsembed/plugins/customobject_plugin.h index 5f417e69..381016af 100644 --- a/kjsembed/plugins/customobject_plugin.h +++ b/kjsembed/plugins/customobject_plugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * diff --git a/kjsembed/plugins/customqobject_plugin.cpp b/kjsembed/plugins/customqobject_plugin.cpp index 74d39bc3..037346f6 100644 --- a/kjsembed/plugins/customqobject_plugin.cpp +++ b/kjsembed/plugins/customqobject_plugin.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/plugins/customqobject_plugin.h b/kjsembed/plugins/customqobject_plugin.h index d1e9608e..0d6f2aac 100644 --- a/kjsembed/plugins/customqobject_plugin.h +++ b/kjsembed/plugins/customqobject_plugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Richard J. Moore <rich@kde.org> * @@ -40,7 +38,7 @@ public: class MyCustomTQObjectImp : public TQObject { -Q_OBJECT +TQ_OBJECT /** Identifiers for the methods provided by this class. */ enum Mode { On, Off }; diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp index e311dfff..80acf335 100644 --- a/kjsembed/plugins/imagefx_plugin.cpp +++ b/kjsembed/plugins/imagefx_plugin.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/plugins/imagefx_plugin.h b/kjsembed/plugins/imagefx_plugin.h index b4f4c6a6..ae6c6f4f 100644 --- a/kjsembed/plugins/imagefx_plugin.h +++ b/kjsembed/plugins/imagefx_plugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/plugins/qprocess_plugin.cpp b/kjsembed/plugins/qprocess_plugin.cpp index 3106fd8f..61d6c708 100644 --- a/kjsembed/plugins/qprocess_plugin.cpp +++ b/kjsembed/plugins/qprocess_plugin.cpp @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * diff --git a/kjsembed/plugins/qprocess_plugin.h b/kjsembed/plugins/qprocess_plugin.h index fa1825ed..5993e0f9 100644 --- a/kjsembed/plugins/qprocess_plugin.h +++ b/kjsembed/plugins/qprocess_plugin.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003, Ian Reinhart Geiser <geiseri@kde.org> * @@ -41,7 +39,7 @@ public: class ProcessImp : public TQProcess { -Q_OBJECT +TQ_OBJECT /** Identifiers for the methods provided by this class. */ enum Communication { Stdin = 0x01, Stdout = 0x02, Stderr = 0x04, DupStderr = 0x08 }; diff --git a/kjsembed/qjscmd.cpp b/kjsembed/qjscmd.cpp index 18da9bec..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 ); @@ -77,7 +77,3 @@ int main( int argc, char **argv ) return result; } - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/qtbindings/qcanvas_imp.cpp b/kjsembed/qtbindings/qcanvas_imp.cpp index 22e8c40b..0a2c93d5 100644 --- a/kjsembed/qtbindings/qcanvas_imp.cpp +++ b/kjsembed/qtbindings/qcanvas_imp.cpp @@ -1109,9 +1109,3 @@ KJS::Value TQCanvasImp::setDoubleBuffering_52( KJS::ExecState *exec, KJS::Object } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvas_imp.h b/kjsembed/qtbindings/qcanvas_imp.h index 8f4e6b21..6a416066 100644 --- a/kjsembed/qtbindings/qcanvas_imp.h +++ b/kjsembed/qtbindings/qcanvas_imp.h @@ -190,9 +190,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvas_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.cpp b/kjsembed/qtbindings/qcanvasellipse_imp.cpp index 3f4d53a5..7f630f3b 100644 --- a/kjsembed/qtbindings/qcanvasellipse_imp.cpp +++ b/kjsembed/qtbindings/qcanvasellipse_imp.cpp @@ -360,9 +360,3 @@ KJS::Value TQCanvasEllipseImp::rtti_13( KJS::ExecState *exec, KJS::Object &obj, } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.h b/kjsembed/qtbindings/qcanvasellipse_imp.h index 5699f867..2ae7f361 100644 --- a/kjsembed/qtbindings/qcanvasellipse_imp.h +++ b/kjsembed/qtbindings/qcanvasellipse_imp.h @@ -112,9 +112,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasEllipse_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasitem_imp.cpp b/kjsembed/qtbindings/qcanvasitem_imp.cpp index 68c73667..36105a92 100644 --- a/kjsembed/qtbindings/qcanvasitem_imp.cpp +++ b/kjsembed/qtbindings/qcanvasitem_imp.cpp @@ -163,7 +163,7 @@ TQCanvasItem *TQCanvasItemImp::toTQCanvasItem( KJS::Object &self ) if ( !op ) return 0; /* - if ( !op->inherits(TQCANVASITEM_OBJECT_NAME_STRING) ) { + if ( !op->inherits("TQCanvasItem") ) { kdDebug() << "Typename of opaque canvas item is " << op->typeName() << endl; // Check superclasses return 0; @@ -782,9 +782,3 @@ KJS::Value TQCanvasItemImp::canvas_40( KJS::ExecState *exec, KJS::Object &obj, c } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasitem_imp.h b/kjsembed/qtbindings/qcanvasitem_imp.h index a8970762..295c8a58 100644 --- a/kjsembed/qtbindings/qcanvasitem_imp.h +++ b/kjsembed/qtbindings/qcanvasitem_imp.h @@ -166,9 +166,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasItem_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp index f92f0d33..ef890efd 100644 --- a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp +++ b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp @@ -164,9 +164,3 @@ KJS::Value TQCanvasItemListImp::drawUnique_2( KJS::ExecState *exec, KJS::Object } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.h b/kjsembed/qtbindings/qcanvasitemlist_imp.h index 7ff08639..da316a9b 100644 --- a/kjsembed/qtbindings/qcanvasitemlist_imp.h +++ b/kjsembed/qtbindings/qcanvasitemlist_imp.h @@ -92,9 +92,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasItemList_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasline_imp.cpp b/kjsembed/qtbindings/qcanvasline_imp.cpp index 907573f0..2ee55a7c 100644 --- a/kjsembed/qtbindings/qcanvasline_imp.cpp +++ b/kjsembed/qtbindings/qcanvasline_imp.cpp @@ -262,9 +262,3 @@ KJS::Value TQCanvasLineImp::moveBy_8( KJS::ExecState *exec, KJS::Object &obj, co } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasline_imp.h b/kjsembed/qtbindings/qcanvasline_imp.h index 330502c4..11111c5c 100644 --- a/kjsembed/qtbindings/qcanvasline_imp.h +++ b/kjsembed/qtbindings/qcanvasline_imp.h @@ -102,9 +102,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasLine_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp index 9fcf2718..603ad612 100644 --- a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp @@ -244,9 +244,3 @@ KJS::Value TQCanvasPixmapImp::setOffset_7( KJS::ExecState *exec, KJS::Object &ob } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.h b/kjsembed/qtbindings/qcanvaspixmap_imp.h index 68ec582e..3c4b544d 100644 --- a/kjsembed/qtbindings/qcanvaspixmap_imp.h +++ b/kjsembed/qtbindings/qcanvaspixmap_imp.h @@ -100,9 +100,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasPixmap_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp index 8d5a8b79..33aa5ba1 100644 --- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp @@ -332,9 +332,3 @@ KJS::Value TQCanvasPixmapArrayImp::count_12( KJS::ExecState *exec, KJS::Object & } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h index d58ba012..a4bd25f7 100644 --- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h +++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h @@ -108,9 +108,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasPixmapArray_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp index 9af85744..d355dceb 100644 --- a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp @@ -235,9 +235,3 @@ KJS::Value TQCanvasPolygonImp::rtti_7( KJS::ExecState *exec, KJS::Object &obj, c } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.h b/kjsembed/qtbindings/qcanvaspolygon_imp.h index 6cca713c..ed5d7666 100644 --- a/kjsembed/qtbindings/qcanvaspolygon_imp.h +++ b/kjsembed/qtbindings/qcanvaspolygon_imp.h @@ -100,9 +100,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasPolygon_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp index 4f09509d..e28590bb 100644 --- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp +++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp @@ -301,9 +301,3 @@ KJS::Value TQCanvasPolygonalItemImp::rtti_11( KJS::ExecState *exec, KJS::Object } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h index 0d9e5a11..a6fd46ec 100644 --- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h +++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h @@ -108,9 +108,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasPolygonalItem_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp index 55f1f14d..2f46b410 100644 --- a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp +++ b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp @@ -338,9 +338,3 @@ KJS::Value TQCanvasRectangleImp::rtti_12( KJS::ExecState *exec, KJS::Object &obj } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.h b/kjsembed/qtbindings/qcanvasrectangle_imp.h index ee39af19..c45fc5dd 100644 --- a/kjsembed/qtbindings/qcanvasrectangle_imp.h +++ b/kjsembed/qtbindings/qcanvasrectangle_imp.h @@ -110,9 +110,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasRectangle_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasspline_imp.cpp b/kjsembed/qtbindings/qcanvasspline_imp.cpp index 7809002c..277b3290 100644 --- a/kjsembed/qtbindings/qcanvasspline_imp.cpp +++ b/kjsembed/qtbindings/qcanvasspline_imp.cpp @@ -220,9 +220,3 @@ KJS::Value TQCanvasSplineImp::rtti_6( KJS::ExecState *exec, KJS::Object &obj, co } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasspline_imp.h b/kjsembed/qtbindings/qcanvasspline_imp.h index fbf9eac3..30fc5b51 100644 --- a/kjsembed/qtbindings/qcanvasspline_imp.h +++ b/kjsembed/qtbindings/qcanvasspline_imp.h @@ -98,9 +98,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasSpline_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvassprite_imp.cpp b/kjsembed/qtbindings/qcanvassprite_imp.cpp index 98a4a428..b084d80a 100644 --- a/kjsembed/qtbindings/qcanvassprite_imp.cpp +++ b/kjsembed/qtbindings/qcanvassprite_imp.cpp @@ -585,9 +585,3 @@ KJS::Value TQCanvasSpriteImp::draw_27( KJS::ExecState *exec, KJS::Object &obj, c } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvassprite_imp.h b/kjsembed/qtbindings/qcanvassprite_imp.h index 15eef7b6..e0c97396 100644 --- a/kjsembed/qtbindings/qcanvassprite_imp.h +++ b/kjsembed/qtbindings/qcanvassprite_imp.h @@ -140,9 +140,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasSprite_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvastext_imp.cpp b/kjsembed/qtbindings/qcanvastext_imp.cpp index d0528647..c40d7813 100644 --- a/kjsembed/qtbindings/qcanvastext_imp.cpp +++ b/kjsembed/qtbindings/qcanvastext_imp.cpp @@ -398,9 +398,3 @@ KJS::Value TQCanvasTextImp::rtti_16( KJS::ExecState *exec, KJS::Object &obj, con } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvastext_imp.h b/kjsembed/qtbindings/qcanvastext_imp.h index 2dcf157c..ce6357c5 100644 --- a/kjsembed/qtbindings/qcanvastext_imp.h +++ b/kjsembed/qtbindings/qcanvastext_imp.h @@ -118,9 +118,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasText_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasview_imp.cpp b/kjsembed/qtbindings/qcanvasview_imp.cpp index f32faef7..5713f579 100644 --- a/kjsembed/qtbindings/qcanvasview_imp.cpp +++ b/kjsembed/qtbindings/qcanvasview_imp.cpp @@ -268,9 +268,3 @@ KJS::Value TQCanvasViewImp::setWorldMatrix_8( KJS::ExecState *exec, KJS::Object } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcanvasview_imp.h b/kjsembed/qtbindings/qcanvasview_imp.h index 2625365e..a59d0213 100644 --- a/kjsembed/qtbindings/qcanvasview_imp.h +++ b/kjsembed/qtbindings/qcanvasview_imp.h @@ -102,9 +102,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCanvasView_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qchecklistitem_imp.cpp b/kjsembed/qtbindings/qchecklistitem_imp.cpp index 9aa28e41..01e7b48e 100644 --- a/kjsembed/qtbindings/qchecklistitem_imp.cpp +++ b/kjsembed/qtbindings/qchecklistitem_imp.cpp @@ -579,9 +579,3 @@ KJS::Value TQCheckListItemImp::rtti_23( KJS::ExecState *exec, KJS::Object &obj, } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qchecklistitem_imp.h b/kjsembed/qtbindings/qchecklistitem_imp.h index f9dca63f..04444988 100644 --- a/kjsembed/qtbindings/qchecklistitem_imp.h +++ b/kjsembed/qtbindings/qchecklistitem_imp.h @@ -131,9 +131,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QCheckListItem_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcombobox_imp.cpp b/kjsembed/qtbindings/qcombobox_imp.cpp index 6ee231b8..d0e9626a 100644 --- a/kjsembed/qtbindings/qcombobox_imp.cpp +++ b/kjsembed/qtbindings/qcombobox_imp.cpp @@ -956,9 +956,3 @@ KJS::Value TQComboBoxImp::hide_48( KJS::ExecState *exec, KJS::Object &obj, const } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qcombobox_imp.h b/kjsembed/qtbindings/qcombobox_imp.h index 56a43d5c..ae413f74 100644 --- a/kjsembed/qtbindings/qcombobox_imp.h +++ b/kjsembed/qtbindings/qcombobox_imp.h @@ -182,9 +182,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QComboBox_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qframe_imp.cpp b/kjsembed/qtbindings/qframe_imp.cpp index 767928a6..907a61ef 100644 --- a/kjsembed/qtbindings/qframe_imp.cpp +++ b/kjsembed/qtbindings/qframe_imp.cpp @@ -56,9 +56,3 @@ void TQFrameImp::addBindings( KJS::ExecState *exec, KJS::Object &object ) } } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qframe_imp.h b/kjsembed/qtbindings/qframe_imp.h index a0ef9138..74bd78a5 100644 --- a/kjsembed/qtbindings/qframe_imp.h +++ b/kjsembed/qtbindings/qframe_imp.h @@ -27,9 +27,3 @@ public: } // namespace KJSEmbed #endif // KJSEMBED_QFrame_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qlistview_imp.cpp b/kjsembed/qtbindings/qlistview_imp.cpp index 2536351c..9c6d4aff 100644 --- a/kjsembed/qtbindings/qlistview_imp.cpp +++ b/kjsembed/qtbindings/qlistview_imp.cpp @@ -1321,9 +1321,3 @@ KJS::Value TQListViewImp::hideColumn_71( KJS::ExecState *exec, KJS::Object &obj, } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qlistview_imp.h b/kjsembed/qtbindings/qlistview_imp.h index 0ded4900..80f2db16 100644 --- a/kjsembed/qtbindings/qlistview_imp.h +++ b/kjsembed/qtbindings/qlistview_imp.h @@ -218,9 +218,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QListView_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qlistviewitem_imp.cpp b/kjsembed/qtbindings/qlistviewitem_imp.cpp index f1ed55c2..12a322ed 100644 --- a/kjsembed/qtbindings/qlistviewitem_imp.cpp +++ b/kjsembed/qtbindings/qlistviewitem_imp.cpp @@ -1421,9 +1421,3 @@ KJS::Value TQListViewItemImp::multiLinesEnabled_63( KJS::ExecState *exec, KJS::O } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qlistviewitem_imp.h b/kjsembed/qtbindings/qlistviewitem_imp.h index 72dfdd6e..eb2f65cf 100644 --- a/kjsembed/qtbindings/qlistviewitem_imp.h +++ b/kjsembed/qtbindings/qlistviewitem_imp.h @@ -221,9 +221,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QListViewItem_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qmenudata_imp.cpp b/kjsembed/qtbindings/qmenudata_imp.cpp index 22b16d3e..e584b1a1 100644 --- a/kjsembed/qtbindings/qmenudata_imp.cpp +++ b/kjsembed/qtbindings/qmenudata_imp.cpp @@ -1343,9 +1343,3 @@ KJS::Value TQMenuDataImp::activateItemAt_55( KJS::ExecState *exec, KJS::Object & } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qmenudata_imp.h b/kjsembed/qtbindings/qmenudata_imp.h index dfab42e8..8f7c24d6 100644 --- a/kjsembed/qtbindings/qmenudata_imp.h +++ b/kjsembed/qtbindings/qmenudata_imp.h @@ -196,9 +196,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QMenuData_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qmenuitem_imp.cpp b/kjsembed/qtbindings/qmenuitem_imp.cpp index f65fa910..60c73db3 100644 --- a/kjsembed/qtbindings/qmenuitem_imp.cpp +++ b/kjsembed/qtbindings/qmenuitem_imp.cpp @@ -422,9 +422,3 @@ KJS::Value TQMenuItemImp::setWhatsThis_22( KJS::ExecState *exec, KJS::Object &ob } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qmenuitem_imp.h b/kjsembed/qtbindings/qmenuitem_imp.h index 9739d078..57acb6d0 100644 --- a/kjsembed/qtbindings/qmenuitem_imp.h +++ b/kjsembed/qtbindings/qmenuitem_imp.h @@ -130,9 +130,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QMenuItem_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qpopupmenu_imp.cpp b/kjsembed/qtbindings/qpopupmenu_imp.cpp index 1c94776a..46714278 100644 --- a/kjsembed/qtbindings/qpopupmenu_imp.cpp +++ b/kjsembed/qtbindings/qpopupmenu_imp.cpp @@ -432,9 +432,3 @@ KJS::Value TQPopupMenuImp::itemGeometry_19( KJS::ExecState *exec, KJS::Object &o } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qpopupmenu_imp.h b/kjsembed/qtbindings/qpopupmenu_imp.h index f1d0a92f..fd9daf6a 100644 --- a/kjsembed/qtbindings/qpopupmenu_imp.h +++ b/kjsembed/qtbindings/qpopupmenu_imp.h @@ -124,9 +124,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_QPopupMenu_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qt_imp.cpp b/kjsembed/qtbindings/qt_imp.cpp index 0f6bf134..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 ) { @@ -772,9 +772,3 @@ KJS::Value QtImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtbindings/qt_imp.h b/kjsembed/qtbindings/qt_imp.h index 6bc3b489..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; }; @@ -88,9 +88,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_Qt_H - -// Local Variables: -// c-basic-offset: 4 -// End: - - diff --git a/kjsembed/qtstubs.h b/kjsembed/qtstubs.h index 5a467705..96c1f058 100644 --- a/kjsembed/qtstubs.h +++ b/kjsembed/qtstubs.h @@ -1,4 +1,3 @@ -// -*- c++ -*- /*************************************************************************** * Copyright (C) 2004 by Richard Moore * * rich@kde.org * @@ -35,7 +34,7 @@ namespace KParts { class KJSEMBED_EXPORT ReadOnlyPart : public TQObject { - Q_OBJECT + TQ_OBJECT public: ReadOnlyPart( TQObject *parent, const char *name=0 ); @@ -49,7 +48,7 @@ private: class KJSEMBED_EXPORT ReadWritePart : public ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: ReadWritePart( TQObject *parent, const char *name=0 ); diff --git a/kjsembed/slotproxy.h b/kjsembed/slotproxy.h index 18f4a272..90cb57dd 100644 --- a/kjsembed/slotproxy.h +++ b/kjsembed/slotproxy.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2003-2004, Richard J. Moore <rich@kde.org> * @@ -51,7 +49,7 @@ class JSObjectProxy; */ class KJSEMBED_EXPORT JSSlotProxy : public TQObject { - Q_OBJECT + TQ_OBJECT public: JSSlotProxy( TQObject *parent, const char *name=0 ); diff --git a/kjsembed/slotutils.cpp b/kjsembed/slotutils.cpp index 0a73c43f..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> @@ -872,8 +872,3 @@ KJS::Value JSSlotUtils::invokeSlot( KJS::ExecState *exec, KJS::Object &, const K } // namespace KJSEmbed::Bindings } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - diff --git a/kjsembed/slotutils.h b/kjsembed/slotutils.h index 3c7b3bea..2ee88652 100644 --- a/kjsembed/slotutils.h +++ b/kjsembed/slotutils.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2001-2003, Richard J. Moore <rich@kde.org> * @@ -169,7 +167,3 @@ private: } // namespace KJSEmbed #endif // KJSEMBEDSLOTUTILS_H - -// Local Variables: -// c-basic-offset: 4 -// End: 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/tdescript/javascript.h b/kjsembed/tdescript/javascript.h index 9ca87f24..e1116a73 100644 --- a/kjsembed/tdescript/javascript.h +++ b/kjsembed/tdescript/javascript.h @@ -30,7 +30,7 @@ namespace KJSEmbed { //using namespace KScriptInterface; class JavaScript : public KScriptInterface { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString appID READ appID ) public: diff --git a/kjsembed/tdescript/swaptabs.ui b/kjsembed/tdescript/swaptabs.ui index f7f5e973..d9f9a4d8 100644 --- a/kjsembed/tdescript/swaptabs.ui +++ b/kjsembed/tdescript/swaptabs.ui @@ -126,9 +126,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -143,9 +140,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp index 9ad274b4..4b138e8e 100644 --- a/kjsembed/testkjsembed.cpp +++ b/kjsembed/testkjsembed.cpp @@ -49,13 +49,9 @@ 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(); return app.exec(); } - -// Local Variables: -// c-basic-offset: 4 -// End: diff --git a/kjsembed/tests/test.ui b/kjsembed/tests/test.ui index 477d8c2d..4c031d9b 100644 --- a/kjsembed/tests/test.ui +++ b/kjsembed/tests/test.ui @@ -105,7 +105,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp index b3ff219e..7018497f 100644 --- a/kjsembed/tests/testkjsembed.cpp +++ b/kjsembed/tests/testkjsembed.cpp @@ -52,13 +52,9 @@ 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(); return app.exec(); } - -// Local Variables: -// c-basic-offset: 4 -// End: 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/doxygen2cons_cpp.xsl b/kjsembed/tools/doxygen2cons_cpp.xsl index f23e5e80..455fd3e3 100644 --- a/kjsembed/tools/doxygen2cons_cpp.xsl +++ b/kjsembed/tools/doxygen2cons_cpp.xsl @@ -90,10 +90,5 @@ KJS::Object <xsl:value-of select="$clazz" />Cons::<xsl:value-of select="$cons_na </xsl:for-each> } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/tools/doxygen2cons_h.xsl b/kjsembed/tools/doxygen2cons_h.xsl index 8140d52e..fa13f5e3 100644 --- a/kjsembed/tools/doxygen2cons_h.xsl +++ b/kjsembed/tools/doxygen2cons_h.xsl @@ -70,10 +70,5 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_<xsl:value-of select="compoundname" />_H - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/tools/doxygen2imp_cpp.xsl b/kjsembed/tools/doxygen2imp_cpp.xsl index a2be08d4..46586512 100644 --- a/kjsembed/tools/doxygen2imp_cpp.xsl +++ b/kjsembed/tools/doxygen2imp_cpp.xsl @@ -290,10 +290,5 @@ KJS::Value <xsl:value-of select="$method" />( KJS::ExecState *exec, KJS::Object </xsl:for-each> } // namespace KJSEmbed - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/tools/doxygen2imp_h.xsl b/kjsembed/tools/doxygen2imp_h.xsl index ce00e7a1..5b901c15 100644 --- a/kjsembed/tools/doxygen2imp_h.xsl +++ b/kjsembed/tools/doxygen2imp_h.xsl @@ -77,10 +77,5 @@ private: } // namespace KJSEmbed #endif // KJSEMBED_<xsl:value-of select="compoundname" />_H - -// Local Variables: -// c-basic-offset: 4 -// End: - </xsl:template> </xsl:stylesheet> diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h index 6fc18ccf..60f7f638 100644 --- a/kjsembed/tools/headers/qbrush.h +++ b/kjsembed/tools/headers/qbrush.h @@ -44,7 +44,7 @@ #endif // QT_H -class Q_EXPORT TQBrush: public Qt +class TQ_EXPORT TQBrush: public TQt { friend class TQPainter; public: @@ -84,8 +84,8 @@ private: *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & ); #endif #endif // TQBRUSH_H diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h index bbd97489..fade5e2c 100644 --- a/kjsembed/tools/headers/qcanvas.h +++ b/kjsembed/tools/headers/qcanvas.h @@ -52,7 +52,7 @@ #define TQM_EXPORT_CANVAS #define TQM_TEMPLATE_EXTERN_CANVAS #else -#define TQM_EXPORT_CANVAS Q_EXPORT +#define TQM_EXPORT_CANVAS TQ_EXPORT #define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN #endif @@ -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); @@ -133,16 +133,6 @@ public: virtual void setActive(bool yes); bool isActive() const { return (bool)act; } -#ifndef TQT_NO_COMPAT - bool visible() const - { return (bool)vis; } - bool selected() const - { return (bool)sel; } - bool enabled() const - { return (bool)ena; } - bool active() const - { return (bool)act; } -#endif enum RttiValues { Rtti_Item = 0, @@ -208,7 +198,7 @@ class TQCanvasData; class TQM_EXPORT_CANVAS TQCanvas : public TQObject { - Q_OBJECT + TQ_OBJECT public: TQCanvas( TQObject* parent = 0, const char* name = 0 ); TQCanvas(int w, int h); @@ -280,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 @@ -354,7 +344,7 @@ class TQCanvasViewData; class TQM_EXPORT_CANVAS TQCanvasView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: TQCanvasView(TQWidget* parent=0, const char* name=0, WFlags f=0); @@ -661,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 7fda3222..5542fd0e 100644 --- a/kjsembed/tools/headers/qdir.h +++ b/kjsembed/tools/headers/qdir.h @@ -52,7 +52,7 @@ class TQStringList; template <class T> class TQDeepCopy; -class Q_EXPORT TQDir +class TQ_EXPORT TQDir { public: enum FilterSpec { Dirs = 0x001, @@ -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 40e9767e..7532f50b 100644 --- a/kjsembed/tools/headers/qpen.h +++ b/kjsembed/tools/headers/qpen.h @@ -44,7 +44,7 @@ #endif // QT_H -class Q_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 @@ -92,8 +92,8 @@ private: TQPen stream functions *****************************************************************************/ #ifndef TQT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & ); +TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & ); +TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & ); #endif #endif // TQPEN_H diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h index 1f7115f2..35fd16b5 100644 --- a/kjsembed/tools/headers/qtimer.h +++ b/kjsembed/tools/headers/qtimer.h @@ -43,16 +43,16 @@ #endif // QT_H -class Q_EXPORT TQTimer : public TQObject +class TQ_EXPORT TQTimer : public TQObject { - Q_OBJECT + TQ_OBJECT public: TQTimer( TQObject *parent=0, const char *name=0 ); ~TQTimer(); 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; } diff --git a/kjsembed/xmlactionclient.h b/kjsembed/xmlactionclient.h index 6b3d1b94..4220403d 100644 --- a/kjsembed/xmlactionclient.h +++ b/kjsembed/xmlactionclient.h @@ -1,5 +1,3 @@ -// -*- c++ -*- - /* * Copyright (C) 2002-2003, Richard J. Moore <rich@kde.org> * @@ -42,7 +40,7 @@ class XMLActionScript; */ class XMLActionClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** |