From 479f5f799523bffbcc83dff581a2299c047c6fff Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:44:01 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1157645 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kjsembed/kscript/javascript.cpp | 20 ++++++++++---------- kjsembed/kscript/javascript.h | 28 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'kjsembed/kscript') diff --git a/kjsembed/kscript/javascript.cpp b/kjsembed/kscript/javascript.cpp index 31976981..22de1aef 100644 --- a/kjsembed/kscript/javascript.cpp +++ b/kjsembed/kscript/javascript.cpp @@ -31,7 +31,7 @@ typedef KGenericFactory JavaScriptFactory; K_EXPORT_COMPONENT_FACTORY( libjavascript, JavaScriptFactory( "JavaScript" ) ) -JavaScript::JavaScript(KScriptClientInterface *parent, const char *name, const QStringList &args ) +JavaScript::JavaScript(KScriptClientInterface *parent, const char *name, const TQStringList &args ) { ScriptClientInterface = parent; m_jsembed = new KJSEmbed::KJSEmbedPart(this, "kjsembed_part"); @@ -45,25 +45,25 @@ JavaScript::~JavaScript() { } -QString JavaScript::script() const +TQString JavaScript::script() const { return m_scriptLoc; } -void JavaScript::setScript( const QString &scriptFile ) +void JavaScript::setScript( const TQString &scriptFile ) { m_scriptLoc = scriptFile; } -void JavaScript::setScript( const QString &scriptFile, const QString &method ) +void JavaScript::setScript( const TQString &scriptFile, const TQString &method ) { m_scriptLoc = scriptFile; m_method = method; } -void JavaScript::run(QObject *context, const QVariant &arg) +void JavaScript::run(TQObject *context, const TQVariant &arg) { - QVariant retVal; + TQVariant retVal; if( context ) m_jsembed->addObject(context); m_jsembed->runFile(m_scriptLoc, m_jsembed->globalObject() ); @@ -78,17 +78,17 @@ void JavaScript::run(QObject *context, const QVariant &arg) ScriptClientInterface->done(KScriptClientInterface::ResultSuccess, retVal); } -void JavaScript::writeLine( const QString &msg ) +void JavaScript::writeLine( const TQString &msg ) { ScriptClientInterface->output(msg); } -void JavaScript::writeWarning( const QString &msg ) +void JavaScript::writeWarning( const TQString &msg ) { ScriptClientInterface->warning(msg); } -void JavaScript::writeError( const QString &msg ) +void JavaScript::writeError( const TQString &msg ) { ScriptClientInterface->error(msg); } @@ -98,7 +98,7 @@ void JavaScript::setProgress( int percent ) ScriptClientInterface->progress(percent); } -QString JavaScript::appID() const +TQString JavaScript::appID() const { return kapp->dcopClient()->appId(); } diff --git a/kjsembed/kscript/javascript.h b/kjsembed/kscript/javascript.h index 7b5143a7..fa76a341 100644 --- a/kjsembed/kscript/javascript.h +++ b/kjsembed/kscript/javascript.h @@ -20,8 +20,8 @@ #define __javascript_h__ #include -#include -#include +#include +#include namespace KJSEmbed { class KJSEmbedPart; @@ -31,30 +31,30 @@ namespace KJSEmbed { class JavaScript : public KScriptInterface { Q_OBJECT - Q_PROPERTY( QString appID READ appID ) + Q_PROPERTY( TQString appID READ appID ) public: - JavaScript(KScriptClientInterface *parent, const char *name, const QStringList &args); + JavaScript(KScriptClientInterface *parent, const char *name, const TQStringList &args); virtual ~JavaScript(); - QString script() const; - void setScript( const QString &scriptFile ); - void setScript( const QString &scriptLibFile, const QString &method ); - void run(QObject *context = 0, const QVariant &arg = 0); + TQString script() const; + void setScript( const TQString &scriptFile ); + void setScript( const TQString &scriptLibFile, const TQString &method ); + void run(TQObject *context = 0, const TQVariant &arg = 0); void kill(); - QString appID() const; + TQString appID() const; public slots: - void writeLine( const QString &msg ); - void writeWarning( const QString &msg ); - void writeError( const QString &msg ); + void writeLine( const TQString &msg ); + void writeWarning( const TQString &msg ); + void writeError( const TQString &msg ); void setProgress( int percent ); private: KScriptClientInterface *ScriptClientInterface; KJSEmbed::KJSEmbedPart *m_jsembed; - QString m_method; - QString m_scriptLoc; + TQString m_method; + TQString m_scriptLoc; }; #endif -- cgit v1.2.1