From e63beeb5bdb82987b1e00bc35178667786fbad48 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 5 Dec 2011 16:20:48 -0600
Subject: Fix incorrect conversion

---
 dcopperl/DCOP.xs | 32 ++++++++++++++++----------------
 dcopperl/typemap |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'dcopperl')

diff --git a/dcopperl/DCOP.xs b/dcopperl/DCOP.xs
index 02a8b19b..cfcd1dbd 100644
--- a/dcopperl/DCOP.xs
+++ b/dcopperl/DCOP.xs
@@ -82,7 +82,7 @@ SV *boolToSV(bool data, SV *self = 0)
 	return newSViv(data ? 1 : 0);
 }
 
-TTQCString TQCStringFromSV(SV *data)
+TQCString TQCStringFromSV(SV *data)
 {
     if (!SvOK(data))
         return TQCString();
@@ -96,7 +96,7 @@ SV *TQCStringToSV(const TQCString &data, SV * self = 0)
     return data.isNull() ? &PL_sv_undef : newSVpv(data.data(), 0);
 }
 
-TTQString TQStringFromSV(SV *data)
+TQString TQStringFromSV(SV *data)
 {
     if (!SvOK(data))
         return TQString::null;
@@ -110,7 +110,7 @@ SV *TQStringToSV(const TQString &data, SV * self = 0)
     return data.isNull() ? &PL_sv_undef : newSVpv((char *)data.latin1(), 0);
 }
 
-TTQCStringList TQCStringListFromSV(SV *data)
+TQCStringList TQCStringListFromSV(SV *data)
 {
     if (!SvROK(data))
         croak("DCOP: Not reference");
@@ -130,7 +130,7 @@ SV *TQCStringListToSV(const TQCStringList &data, SV * self = 0)
     return newRV((SV*)result);
 }
 
-TTQStringList TQStringListFromSV(SV *data)
+TQStringList TQStringListFromSV(SV *data)
 {
     if (!SvROK(data))
         croak("DCOP: Not reference");
@@ -150,7 +150,7 @@ SV *TQStringListToSV(const TQStringList &data, SV * self = 0)
     return newRV((SV*)result);
 }
 
-TTQPoint TQPointFromSV(SV *data)
+TQPoint TQPointFromSV(SV *data)
 {
     if (!SvROK(data))
         croak("DCOP: Not reference");
@@ -171,7 +171,7 @@ SV *TQPointToSV(const TQPoint &data, SV * self = 0)
     return newRV((SV*)av_make(2, pts));
 }
 
-TTQSize TQSizeFromSV(SV *data)
+TQSize TQSizeFromSV(SV *data)
 {
     if (!SvROK(data))
         croak("DCOP: Not reference");
@@ -192,7 +192,7 @@ SV *TQSizeToSV(const TQSize &data, SV * self = 0)
     return newRV((SV*)av_make(2, ext));
 }
 
-TTQRect TQRectFromSV(SV *data)
+TQRect TQRectFromSV(SV *data)
 {
     if (!SvROK(data))
         croak("DCOP: Not a reference");
@@ -258,7 +258,7 @@ SV *DCOPRefToSV(const DCOPRef &data, SV * self)
 
 #define DATA(func, argn) mapArgs(func, &ST(argn), items - argn)
 
-TTQByteArray mapArgs(const TQCString &func, SV **data, int n)
+TQByteArray mapArgs(const TQCString &func, SV **data, int n)
 {
     int p = func.find('('),
         q = func.find(')');
@@ -317,7 +317,7 @@ bool isMultiWordType(const TQString &type)
 	return type == "unsigned" || type == "signed" || type == "long";
 }
 
-TTQCString canonicalizeSignature(const TQCString &sig)
+TQCString canonicalizeSignature(const TQCString &sig)
 {
     TQCString normal = DCOPClient::normalizeFunctionSignature(sig);
 	int p = normal.find('('), q = normal.find(')');
@@ -370,7 +370,7 @@ DCOPClient::isAttached()
         RETVAL
 
 #if 0
-TTQCString
+TQCString
 DCOPClient::registerAs(appId, ...)
         TQCString appId
     PREINIT:
@@ -391,7 +391,7 @@ DCOPClient::isRegistered()
 
 #endif
 
-TTQCString
+TQCString
 DCOPClient::appId()
     OUTPUT:
         RETVAL
@@ -452,25 +452,25 @@ DCOPClient::isApplicationRegistered(app)
     OUTPUT:
         RETVAL
 
-TTQCStringList
+TQCStringList
 DCOPClient::registeredApplications()
     OUTPUT:
         RETVAL
 
-TTQCStringList
+TQCStringList
 DCOPClient::remoteObjects(app)
         TQCString app
     OUTPUT:
         RETVAL
 
-TTQCStringList
+TQCStringList
 DCOPClient::remoteInterfaces(app, obj)
         TQCString app
         TQCString obj
     OUTPUT:
         RETVAL
 
-TTQCStringList
+TQCStringList
 DCOPClient::remoteFunctions(app, obj)
         TQCString app
         TQCString obj
@@ -483,7 +483,7 @@ DCOPClient::normalizeFunctionSignature(sig)
     OUTPUT:
         RETVAL
 
-TTQCString
+TQCString
 canonicalizeSignature(sig)
         TQCString sig
     CODE:
diff --git a/dcopperl/typemap b/dcopperl/typemap
index 62af8ae1..a1628254 100644
--- a/dcopperl/typemap
+++ b/dcopperl/typemap
@@ -1,7 +1,7 @@
 TYPEMAP
 DCOPClient *    O_OBJECT
-TTQCString        T_QCSTRING
-TTQCStringList    T_QCSTRINGLIST
+TQCString        T_QCSTRING
+TQCStringList    T_QCSTRINGLIST
 
 INPUT
 O_OBJECT
-- 
cgit v1.2.3