summaryrefslogtreecommitdiffstats
path: root/dcoppython/shell
diff options
context:
space:
mode:
Diffstat (limited to 'dcoppython/shell')
-rw-r--r--dcoppython/shell/marshaller.cpp4
-rw-r--r--dcoppython/shell/pcop.cpp26
-rw-r--r--dcoppython/shell/pcop.h8
3 files changed, 19 insertions, 19 deletions
diff --git a/dcoppython/shell/marshaller.cpp b/dcoppython/shell/marshaller.cpp
index ff018021..1aaebc38 100644
--- a/dcoppython/shell/marshaller.cpp
+++ b/dcoppython/shell/marshaller.cpp
@@ -50,7 +50,7 @@ namespace PythonDCOP {
if (ty=="TQStringList")
return marshalList(PCOPType("TQString"), obj, str);
- if (ty=="TQCStringList")
+ if (ty=="QCStringList")
return marshalList(PCOPType("TQCString"), obj, str);
if (ty=="TQValueList" && type.leftType())
return marshalList(*type.leftType(), obj, str);
@@ -68,7 +68,7 @@ namespace PythonDCOP {
if (ty=="TQStringList")
return demarshalList(PCOPType("TQString"), str);
- if (ty=="TQCStringList")
+ if (ty=="QCStringList")
return demarshalList(PCOPType("TQCString"), str);
if (ty=="TQValueList" && type.leftType())
return demarshalList(*type.leftType(), str);
diff --git a/dcoppython/shell/pcop.cpp b/dcoppython/shell/pcop.cpp
index ea2d53ba..88e26cc1 100644
--- a/dcoppython/shell/pcop.cpp
+++ b/dcoppython/shell/pcop.cpp
@@ -165,8 +165,8 @@ namespace PythonDCOP {
return ok;
}
- TQCStringList PCOPObject::functions() {
- TQCStringList funcs = DCOPObject::functions();
+ QCStringList PCOPObject::functions() {
+ QCStringList funcs = DCOPObject::functions();
for(TQAsciiDictIterator<PCOPMethod> it(m_methods);
it.current(); ++it) {
PCOPMethod *meth = it.current();
@@ -385,11 +385,11 @@ namespace PythonDCOP {
return ((PCOPMethod*)this)->m_params.at( i );
}
- PCOPClass::PCOPClass( const TQCStringList& methods )
+ PCOPClass::PCOPClass( const QCStringList& methods )
{
m_methods.setAutoDelete( true );
- TQCStringList::ConstIterator it = methods.begin();
+ QCStringList::ConstIterator it = methods.begin();
for( ; it != methods.end(); ++it )
{
PCOPMethod* m = new PCOPMethod( *it );
@@ -511,14 +511,14 @@ namespace PythonDCOP {
// Determine which functions are available.
//
bool ok = false;
- TQCStringList funcs = dcop->remoteFunctions( appname, objname, &ok );
+ QCStringList funcs = dcop->remoteFunctions( appname, objname, &ok );
if ( !ok )
{
PyErr_SetString( PyExc_RuntimeError, "Object is not accessible." );
return NULL;
}
- // for ( TQCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) {
+ // for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) {
// qDebug( "%s", (*it).data() );
// }
@@ -585,12 +585,12 @@ namespace PythonDCOP {
PyObject* application_list( PyObject */*self*/, PyObject */*args*/ )
{
- TQCStringList apps = Client::instance()->dcop()->registeredApplications();
+ QCStringList apps = Client::instance()->dcop()->registeredApplications();
PyObject *l = PyList_New( apps.count() );
- TQCStringList::ConstIterator it = apps.begin();
- TQCStringList::ConstIterator end = apps.end();
+ QCStringList::ConstIterator it = apps.begin();
+ QCStringList::ConstIterator end = apps.end();
unsigned int i = 0;
for (; it != end; ++it, i++ )
PyList_SetItem( l, i, PyString_FromString( (*it).data() ) );
@@ -601,7 +601,7 @@ namespace PythonDCOP {
PyObject *object_list( PyObject */*self*/, PyObject *args) {
const char *app;
if (PyArg_ParseTuple(args, (char*)"s", &app)) {
- TQCStringList objects = Client::instance()->dcop()->remoteObjects(TQCString(app));
+ QCStringList objects = Client::instance()->dcop()->remoteObjects(TQCString(app));
return make_py_list(objects);
}
return NULL;
@@ -610,7 +610,7 @@ namespace PythonDCOP {
PyObject *method_list( PyObject */*self*/, PyObject *args) {
const char *app, *obj;
if (PyArg_ParseTuple(args, (char*)"ss", &app, &obj)) {
- TQCStringList methods = Client::instance()->dcop()->remoteFunctions(TQCString(app), TQCString(obj) );
+ QCStringList methods = Client::instance()->dcop()->remoteFunctions(TQCString(app), TQCString(obj) );
return make_py_list(methods);
}
return NULL;
@@ -730,10 +730,10 @@ namespace PythonDCOP {
// helpers
- PyObject *make_py_list( const TQCStringList &qt_list) {
+ PyObject *make_py_list( const QCStringList &qt_list) {
PyObject *l = PyList_New(qt_list.count());
uint c=0;
- for(TQCStringList::ConstIterator it = qt_list.begin();
+ for(QCStringList::ConstIterator it = qt_list.begin();
it!=qt_list.end();
++it,c++)
PyList_SetItem(l, c, PyString_FromString( (*it).data() ) );
diff --git a/dcoppython/shell/pcop.h b/dcoppython/shell/pcop.h
index 35beef1c..f1ce9c2b 100644
--- a/dcoppython/shell/pcop.h
+++ b/dcoppython/shell/pcop.h
@@ -41,7 +41,7 @@ namespace PythonDCOP {
// helpers...
void delete_dcop_object(void *vp);
- PyObject *make_py_list(const TQCStringList &qt_list);
+ PyObject *make_py_list(const QCStringList &qt_list);
/**
* Used by the Python interface to talk to DCOP
@@ -90,7 +90,7 @@ namespace PythonDCOP {
/**
* Return list of supported functions (methods).
*/
- virtual TQCStringList functions();
+ virtual QCStringList functions();
/**
* Set the list of methods that this object handles.
@@ -188,12 +188,12 @@ namespace PythonDCOP {
class PCOPClass
{
public:
- PCOPClass( const TQCStringList& dcop_style_methods);
+ PCOPClass( const QCStringList& dcop_style_methods);
~PCOPClass();
const PCOPMethod* method( const TQCString &name, PyObject *argTuple = 0 );
- TQCStringList m_ifaces;
+ QCStringList m_ifaces;
TQAsciiDict<PCOPMethod> m_methods;
};