diff options
Diffstat (limited to 'kjsembed/bindings')
29 files changed, 29 insertions, 104 deletions
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 ) |