diff options
Diffstat (limited to 'dcopperl')
| -rw-r--r-- | dcopperl/DCOP.pm | 4 | ||||
| -rw-r--r-- | dcopperl/DCOP.xs | 20 | ||||
| -rw-r--r-- | dcopperl/test.pl | 2 | ||||
| -rw-r--r-- | dcopperl/typemap | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/dcopperl/DCOP.pm b/dcopperl/DCOP.pm index c71e1f91..f5b7cddf 100644 --- a/dcopperl/DCOP.pm +++ b/dcopperl/DCOP.pm @@ -233,7 +233,7 @@ sub remoteFunctions($app, $object) returns a reference to an array with the names of the functions the specified interface supports. The functions are returned as their signatures with parameter names and return type like - TQCStringList functions() + QCStringList functions() sub normalizeSignature($signature) @@ -260,7 +260,7 @@ mapped to scalar =item * TQString (no Unicode support yet, just latin 1) mapped to scalar -=item * TQCStringList +=item * QCStringList mapped to a reference to an array of scalars. =item * TQStringList diff --git a/dcopperl/DCOP.xs b/dcopperl/DCOP.xs index cfcd1dbd..7c6280dc 100644 --- a/dcopperl/DCOP.xs +++ b/dcopperl/DCOP.xs @@ -110,22 +110,22 @@ SV *TQStringToSV(const TQString &data, SV * self = 0) return data.isNull() ? &PL_sv_undef : newSVpv((char *)data.latin1(), 0); } -TQCStringList TQCStringListFromSV(SV *data) +QCStringList QCStringListFromSV(SV *data) { if (!SvROK(data)) croak("DCOP: Not reference"); if (SvTYPE(SvRV(data)) != SVt_PVAV) croak("DCOP: Not an array reference"); - TQCStringList result; + QCStringList result; for (int i = 0; i <= av_len((AV*)SvRV(data)); i++) result.append(TQCStringFromSV(av_fetch((AV*)SvRV(data), i, 0)[0])); return result; } -SV *TQCStringListToSV(const TQCStringList &data, SV * self = 0) +SV *QCStringListToSV(const QCStringList &data, SV * self = 0) { AV *result = newAV(); - for (TQCStringList::ConstIterator i = data.begin(); i != data.end(); i++) + for (QCStringList::ConstIterator i = data.begin(); i != data.end(); i++) av_push(result, TQCStringToSV(*i)); return newRV((SV*)result); } @@ -277,7 +277,7 @@ TQByteArray mapArgs(const TQCString &func, SV **data, int n) else CHECK_ARG(bool) else CHECK_ARG(TQCString) else CHECK_ARG(TQString) - else CHECK_ARG(TQCStringList) + else CHECK_ARG(QCStringList) else CHECK_ARG(TQStringList) else CHECK_ARG(TQPoint) else CHECK_ARG(TQSize) @@ -302,7 +302,7 @@ SV* mapReply(const TQCString &replyType, const TQByteArray &replyData, SV *self) else CHECK_REPLY(bool) else CHECK_REPLY(TQCString) else CHECK_REPLY(TQString) - else CHECK_REPLY(TQCStringList) + else CHECK_REPLY(QCStringList) else CHECK_REPLY(TQStringList) else CHECK_REPLY(TQPoint) else CHECK_REPLY(TQSize) @@ -452,25 +452,25 @@ DCOPClient::isApplicationRegistered(app) OUTPUT: RETVAL -TQCStringList +QCStringList DCOPClient::registeredApplications() OUTPUT: RETVAL -TQCStringList +QCStringList DCOPClient::remoteObjects(app) TQCString app OUTPUT: RETVAL -TQCStringList +QCStringList DCOPClient::remoteInterfaces(app, obj) TQCString app TQCString obj OUTPUT: RETVAL -TQCStringList +QCStringList DCOPClient::remoteFunctions(app, obj) TQCString app TQCString obj diff --git a/dcopperl/test.pl b/dcopperl/test.pl index 29187a2e..0402395e 100644 --- a/dcopperl/test.pl +++ b/dcopperl/test.pl @@ -62,7 +62,7 @@ sub query { print "[$#$list]"; check ($list = $client->remoteFunctions("kdesktop", "qt")); print "[$#$list]"; - check grep /^TQCStringList functions\(\)$/, @$list; + check grep /^QCStringList functions\(\)$/, @$list; } sub calls { diff --git a/dcopperl/typemap b/dcopperl/typemap index a1628254..fddbf55b 100644 --- a/dcopperl/typemap +++ b/dcopperl/typemap @@ -1,7 +1,7 @@ TYPEMAP DCOPClient * O_OBJECT TQCString T_QCSTRING -TQCStringList T_QCSTRINGLIST +QCStringList T_QCSTRINGLIST INPUT O_OBJECT @@ -20,4 +20,4 @@ O_OBJECT T_QCSTRING sv_setsv($arg, TQCStringToSV($var)); T_QCSTRINGLIST - sv_setsv($arg, TQCStringListToSV($var)); + sv_setsv($arg, QCStringListToSV($var)); |