summaryrefslogtreecommitdiffstats
path: root/kjsembed/bindings
diff options
context:
space:
mode:
Diffstat (limited to 'kjsembed/bindings')
-rw-r--r--kjsembed/bindings/bindingobject.h2
-rw-r--r--kjsembed/bindings/dcop_imp.cpp36
-rw-r--r--kjsembed/bindings/dcop_imp.h2
-rw-r--r--kjsembed/bindings/movie_imp.h2
-rw-r--r--kjsembed/bindings/netaccess_imp.h2
-rw-r--r--kjsembed/bindings/sql_imp.h6
-rw-r--r--kjsembed/bindings/tdeconfig_imp.cpp6
-rw-r--r--kjsembed/bindings/tdeconfig_imp.h2
8 files changed, 29 insertions, 29 deletions
diff --git a/kjsembed/bindings/bindingobject.h b/kjsembed/bindings/bindingobject.h
index bded72ac..17b51fa5 100644
--- a/kjsembed/bindings/bindingobject.h
+++ b/kjsembed/bindings/bindingobject.h
@@ -35,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/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp
index 579ad99a..b30ee508 100644
--- a/kjsembed/bindings/dcop_imp.cpp
+++ b/kjsembed/bindings/dcop_imp.cpp
@@ -169,7 +169,7 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS::
{
JSDCOPClient::marshall(convertToVariant(exec,args[idx] ), argTypes[idx - 1], data);
}
- if( !kapp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData))
+ if( !tdeApp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData))
retValue = KJS::Boolean(false);
else
retValue = JSDCOPClient::demarshall(exec, type, ds);
@@ -192,7 +192,7 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS::
{
JSDCOPClient::marshall(convertToVariant(exec,args[idx] ), argTypes[idx - 1], data);
}
- retValue = KJS::Boolean( kapp->dcopClient()->send(app.local8Bit(), interface.local8Bit(),
+ retValue = KJS::Boolean( tdeApp->dcopClient()->send(app.local8Bit(), interface.local8Bit(),
function.local8Bit(), data));
break;
}
@@ -231,7 +231,7 @@ KJS::Value JSDCOPRef::call( KJS::ExecState *exec, KJS::Object &self, const KJS::
KJS::Object JSDCOPClientLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &/*args*/) const
{
- JSOpaqueProxy * prx = new JSOpaqueProxy( kapp->dcopClient(), "DCOPClient" );
+ JSOpaqueProxy * prx = new JSOpaqueProxy( tdeApp->dcopClient(), "DCOPClient" );
prx->setOwner( JSProxy::Native );
KJS::Object proxyObj( prx );
addBindings( jspart, exec, proxyObj );
@@ -344,11 +344,11 @@ KJS::Value JSDCOPClient::call( KJS::ExecState *exec, KJS::Object &self, const KJ
break;
}
case MethodappId:
- retValue = KJS::String( kapp->dcopClient()->appId().data() );
+ retValue = KJS::String( tdeApp->dcopClient()->appId().data() );
break;
case MethodisApplicationRegistered: {
TQString arg0 = extractTQString(exec, args, 0);
- retValue = KJS::Boolean( kapp->dcopClient()->isApplicationRegistered( arg0.latin1() ) );
+ retValue = KJS::Boolean( tdeApp->dcopClient()->isApplicationRegistered( arg0.latin1() ) );
break;
}
case Methodsend:
@@ -366,18 +366,18 @@ KJS::Value JSDCOPClient::call( KJS::ExecState *exec, KJS::Object &self, const KJ
bool JSDCOPClient::attach() const
{
- if( !kapp->dcopClient()->isAttached() )
- return kapp->dcopClient()->attach();
+ if( !tdeApp->dcopClient()->isAttached() )
+ return tdeApp->dcopClient()->attach();
return true;
}
bool JSDCOPClient::detach() const
-{ return kapp->dcopClient()->detach();
+{ return tdeApp->dcopClient()->detach();
}
bool JSDCOPClient::isAttached() const
{
- return kapp->dcopClient()->isAttached();
+ return tdeApp->dcopClient()->isAttached();
}
KJS::Value JSDCOPClient::dcopCall( KJS::ExecState * exec, KJS::Object &, const KJS::List & args )
@@ -401,7 +401,7 @@ KJS::Value JSDCOPClient::dcopCall( KJS::ExecState * exec, KJS::Object &, const K
TQVariant var = convertToVariant(exec,args[idx] );
marshall(var, argTypes[idx -3 ], data);
}
- if( !kapp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData))
+ if( !tdeApp->dcopClient()->call(app.local8Bit(), interface.local8Bit(), function.local8Bit(), data, type, replyData))
return KJS::Boolean(false);
else
return demarshall(exec, type, ds);
@@ -424,7 +424,7 @@ KJS::Value JSDCOPClient::dcopSend( KJS::ExecState * exec, KJS::Object &, const K
TQVariant var = convertToVariant(exec,args[idx] );
marshall(var, argTypes[idx - 3], data);
}
- return KJS::Boolean( kapp->dcopClient()->send(app.local8Bit(), interface.local8Bit(),
+ return KJS::Boolean( tdeApp->dcopClient()->send(app.local8Bit(), interface.local8Bit(),
function.local8Bit(), data));
}
@@ -603,7 +603,7 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a
TQDataStream arg(data, IO_WriteOnly);
arg << appName << args;
- if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", startFunction.latin1(), data, replyType, replyData) )
+ if ( !tdeApp->dcopClient()->call( "tdelauncher", "tdelauncher", startFunction.latin1(), data, replyType, replyData) )
{
kdWarning() << "Error: Dcop call failed" << endl;
}
@@ -641,7 +641,7 @@ TQString JSDCOPClient::dcopStart( const TQString &appName, const TQStringList& a
TQStringList JSDCOPClient::remoteFunctions( const TQString & remApp, const TQString & remObj )
{
TQStringList returnList;
- QCStringList lst = kapp->dcopClient()->remoteFunctions(remApp.local8Bit(), remObj.local8Bit());
+ QCStringList lst = tdeApp->dcopClient()->remoteFunctions(remApp.local8Bit(), remObj.local8Bit());
for(uint idx = 0; idx < lst.count(); ++idx)
returnList += lst[idx];
return returnList;
@@ -650,7 +650,7 @@ TQStringList JSDCOPClient::remoteFunctions( const TQString & remApp, const TQStr
TQStringList JSDCOPClient::remoteInterfaces( const TQString & remApp, const TQString & remObj )
{
TQStringList returnList;
- QCStringList lst = kapp->dcopClient()->remoteInterfaces(remApp.local8Bit(), remObj.local8Bit());
+ QCStringList lst = tdeApp->dcopClient()->remoteInterfaces(remApp.local8Bit(), remObj.local8Bit());
for(uint idx = 0; idx < lst.count(); ++idx)
returnList += lst[idx];
return returnList;
@@ -659,7 +659,7 @@ TQStringList JSDCOPClient::remoteInterfaces( const TQString & remApp, const TQSt
TQStringList JSDCOPClient::remoteObjects( const TQString & remApp )
{
TQStringList returnList;
- QCStringList lst = kapp->dcopClient()->remoteObjects(remApp.local8Bit());
+ QCStringList lst = tdeApp->dcopClient()->remoteObjects(remApp.local8Bit());
for(uint idx = 0; idx < lst.count(); ++idx)
returnList += lst[idx];
return returnList;
@@ -668,7 +668,7 @@ TQStringList JSDCOPClient::remoteObjects( const TQString & remApp )
TQStringList JSDCOPClient::registeredApplications( )
{
TQStringList returnList;
- QCStringList lst = kapp->dcopClient()->registeredApplications( );
+ QCStringList lst = tdeApp->dcopClient()->registeredApplications( );
for(uint idx = 0; idx < lst.count(); ++idx)
returnList += lst[idx];
return returnList;
@@ -676,12 +676,12 @@ TQStringList JSDCOPClient::registeredApplications( )
bool JSDCOPClient::connectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot, bool Volatile)
{
- return kapp->dcopClient()->connectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1(), Volatile);
+ return tdeApp->dcopClient()->connectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1(), Volatile);
}
bool JSDCOPClient::disconnectDCOPSignal (const TQString &sender, const TQString &senderObj, const TQString &signal, const TQString &receiverObj, const TQString &slot)
{
- return kapp->dcopClient()->disconnectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1());
+ return tdeApp->dcopClient()->disconnectDCOPSignal(sender.latin1(), senderObj.latin1(), signal.latin1(), receiverObj.latin1(), slot.latin1());
}
KJS::Object JSDCOPInterfacerLoader::createBinding(KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const
diff --git a/kjsembed/bindings/dcop_imp.h b/kjsembed/bindings/dcop_imp.h
index 19575e31..c843b2f1 100644
--- a/kjsembed/bindings/dcop_imp.h
+++ b/kjsembed/bindings/dcop_imp.h
@@ -50,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/movie_imp.h b/kjsembed/bindings/movie_imp.h
index 9a76c51b..59c58463 100644
--- a/kjsembed/bindings/movie_imp.h
+++ b/kjsembed/bindings/movie_imp.h
@@ -35,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.h b/kjsembed/bindings/netaccess_imp.h
index 962572dd..9acd4bb0 100644
--- a/kjsembed/bindings/netaccess_imp.h
+++ b/kjsembed/bindings/netaccess_imp.h
@@ -34,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/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 4c954fbe..36ceec36 100644
--- a/kjsembed/bindings/tdeconfig_imp.h
+++ b/kjsembed/bindings/tdeconfig_imp.h
@@ -42,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 )