From 949476e1ff69d5f9e10aafea3d2c72096a8d120b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 6 Dec 2011 01:54:41 -0600
Subject: Fix marshall_Q

---
 qtruby/rubylib/qtruby/handlers.cpp | 96 +++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

(limited to 'qtruby')

diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index c3feee77..30341fd1 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -854,7 +854,7 @@ rstringFromTQString(TQString * s) {
 		return rb_str_new2(s->local8Bit());
 }
 
-static void marshall_QString(Marshall *m) {
+static void marshall_TQString(Marshall *m) {
 	switch(m->action()) {
 	case Marshall::FromVALUE:
 	{
@@ -934,7 +934,7 @@ static const char *not_ascii(const char *s, uint &len)
 }
 #endif
 
-static void marshall_QCString(Marshall *m) {
+static void marshall_TQCString(Marshall *m) {
     switch(m->action()) {
       case Marshall::FromVALUE:
 	{
@@ -998,7 +998,7 @@ static void marshall_QCString(Marshall *m) {
     }
 }
 
-static void marshall_QCOORD_array(Marshall *m) {
+static void marshall_TQCOORD_array(Marshall *m) {
     switch(m->action()) {
       case Marshall::FromVALUE:
 	{
@@ -1197,7 +1197,7 @@ static void marshall_charP_array(Marshall *m) {
     }
 }
 
-void marshall_QStringList(Marshall *m) {
+void marshall_TQStringList(Marshall *m) {
     switch(m->action()) {
       case Marshall::FromVALUE: 
 	{
@@ -1259,7 +1259,7 @@ void marshall_QStringList(Marshall *m) {
     }
 }
 
-void marshall_QStrList(Marshall *m) {
+void marshall_TQStrList(Marshall *m) {
     switch(m->action()) {
       case Marshall::FromVALUE: 
 	{
@@ -1412,7 +1412,7 @@ void marshall_ItemList(Marshall *m) {
     }
 }
 
-void marshall_QValueListInt(Marshall *m) {
+void marshall_TQValueListInt(Marshall *m) {
     switch(m->action()) {
       case Marshall::FromVALUE:
 	{
@@ -1498,7 +1498,7 @@ void marshall_voidP(Marshall *m) {
     }
 }
 
-void marshall_QMapTQStringTQString(Marshall *m) {
+void marshall_TQMapTQStringTQString(Marshall *m) {
     switch(m->action()) {
       case Marshall::FromVALUE:
 	{
@@ -1554,7 +1554,7 @@ void marshall_QMapTQStringTQString(Marshall *m) {
     }
 }
 
-void marshall_QMapTQStringTQVariant(Marshall *m) {
+void marshall_TQMapTQStringTQVariant(Marshall *m) {
     switch(m->action()) {
       case Marshall::FromVALUE:
 	{
@@ -1637,7 +1637,7 @@ void marshall_QMapTQStringTQVariant(Marshall *m) {
     }
 }
 
-void marshall_QUObject(Marshall *m) {
+void marshall_TQUObject(Marshall *m) {
     switch(m->action()) {
       case Marshall::FromVALUE:
 	{
@@ -1664,7 +1664,7 @@ void marshall_QUObject(Marshall *m) {
     }
 }
 
-void marshall_QRgb_array(Marshall *m) {
+void marshall_TQRgb_array(Marshall *m) {
     switch(m->action()) {
       case Marshall::FromVALUE:
 	{
@@ -1697,7 +1697,7 @@ void marshall_QRgb_array(Marshall *m) {
     }
 }
 
-void marshall_QPairintint(Marshall *m) {
+void marshall_TQPairintint(Marshall *m) {
     switch(m->action()) {
       case Marshall::FromVALUE:
 	{
@@ -1880,18 +1880,18 @@ DEF_VALUELIST_MARSHALLER( TQTranslatorMessageList, TQValueList<TQTranslatorMessa
 DEF_VALUELIST_MARSHALLER( TQHostAddressList, TQValueList<TQHostAddress>, TQHostAddress, TQValueList<TQHostAddress>::Iterator )
 
 TypeHandler Qt_handlers[] = {
-    { "TQString", marshall_QString },
-    { "TQString&", marshall_QString },
-    { "TQString*", marshall_QString },
-    { "TQCString", marshall_QCString },
-    { "TQCString&", marshall_QCString },
-    { "TQCString*", marshall_QCString },
-    { "TQStringList", marshall_QStringList },
-    { "TQStringList&", marshall_QStringList },
-    { "TQStringList*", marshall_QStringList },
-    { "TQStrList", marshall_QStrList },
-    { "TQStrList&", marshall_QStrList },
-    { "TQStrList*", marshall_QStrList },
+    { "TQString", marshall_TQString },
+    { "TQString&", marshall_TQString },
+    { "TQString*", marshall_TQString },
+    { "TQCString", marshall_TQCString },
+    { "TQCString&", marshall_TQCString },
+    { "TQCString*", marshall_TQCString },
+    { "TQStringList", marshall_TQStringList },
+    { "TQStringList&", marshall_TQStringList },
+    { "TQStringList*", marshall_TQStringList },
+    { "TQStrList", marshall_TQStrList },
+    { "TQStrList&", marshall_TQStrList },
+    { "TQStrList*", marshall_TQStrList },
     { "long long int", marshall_longlong },
     { "long long int&", marshall_longlong },
     { "Q_INT64", marshall_longlong },
@@ -1914,39 +1914,39 @@ TypeHandler Qt_handlers[] = {
     { "char*", marshall_charP },
     { "char**", marshall_charP_array },
     { "uchar*", marshall_ucharP },
-    { "TQRgb*", marshall_QRgb_array },
-    { "TQPair<int,int>&", marshall_QPairintint },
-    { "TQUObject*", marshall_QUObject },
-    { "const TQCOORD*", marshall_QCOORD_array },
+    { "TQRgb*", marshall_TQRgb_array },
+    { "TQPair<int,int>&", marshall_TQPairintint },
+    { "TQUObject*", marshall_TQUObject },
+    { "const TQCOORD*", marshall_TQCOORD_array },
     { "void", marshall_void },
-    { "TQValueList<int>", marshall_QValueListInt },
-    { "TQValueList<int>&", marshall_QValueListInt },
-    { "TQValueList<TQVariant>", marshall_QVariantList },
-    { "TQValueList<TQVariant>&", marshall_QVariantList },
-    { "TQValueList<TQPixmap>", marshall_QPixmapList },
-    { "TQValueList<TQIconDragItem>&", marshall_QIconDragItemList },
-    { "TQValueList<TQImageTextKeyLang>", marshall_QImageTextKeyLangList },
-    { "TQValueList<TQUrlInfo>&", marshall_QUrlInfoList },
-    { "TQValueList<TQTranslatorMessage>", marshall_QTranslatorMessageList },
-    { "TQValueList<TQHostAddress>", marshall_QHostAddressList },
+    { "TQValueList<int>", marshall_TQValueListInt },
+    { "TQValueList<int>&", marshall_TQValueListInt },
+    { "TQValueList<TQVariant>", marshall_TQVariantList },
+    { "TQValueList<TQVariant>&", marshall_TQVariantList },
+    { "TQValueList<TQPixmap>", marshall_TQPixmapList },
+    { "TQValueList<TQIconDragItem>&", marshall_TQIconDragItemList },
+    { "TQValueList<TQImageTextKeyLang>", marshall_TQImageTextKeyLangList },
+    { "TQValueList<TQUrlInfo>&", marshall_TQUrlInfoList },
+    { "TQValueList<TQTranslatorMessage>", marshall_TQTranslatorMessageList },
+    { "TQValueList<TQHostAddress>", marshall_TQHostAddressList },
     { "TQCanvasItemList", marshall_TQCanvasItemList },
-    { "TQMap<TQString,TQString>", marshall_QMapTQStringTQString },
-    { "TQMap<TQString,TQString>&", marshall_QMapTQStringTQString },
-    { "TQMap<TQString,TQVariant>", marshall_QMapTQStringTQVariant },
-    { "TQMap<TQString,TQVariant>&", marshall_QMapTQStringTQVariant },
+    { "TQMap<TQString,TQString>", marshall_TQMapTQStringTQString },
+    { "TQMap<TQString,TQString>&", marshall_TQMapTQStringTQString },
+    { "TQMap<TQString,TQVariant>", marshall_TQMapTQStringTQVariant },
+    { "TQMap<TQString,TQVariant>&", marshall_TQMapTQStringTQVariant },
 #if QT_VERSION >= 0x030200
     { "TQWidgetList", marshall_TQWidgetList },
     { "TQWidgetList*", marshall_TQWidgetList },
     { "TQWidgetList&", marshall_TQWidgetList },
     { "TQObjectList*", marshall_TQObjectList },
     { "TQObjectList&", marshall_TQObjectList },
-    { "TQFileInfoList*", marshall_QFileInfoList },
-    { "TQPtrList<TQToolBar>", marshall_QPtrListTQToolBar },
-    { "TQPtrList<TQTab>*", marshall_QPtrListTQTab },
-    { "TQPtrList<TQDockWindow>", marshall_QPtrListTQDockWindow },
-    { "TQPtrList<TQDockWindow>*", marshall_QPtrListTQDockWindow },
-    { "TQPtrList<TQNetworkOperation>", marshall_QPtrListTQNetworkOperation },
-    { "TQPtrList<TQNetworkOperation>&", marshall_QPtrListTQNetworkOperation },
+    { "TQFileInfoList*", marshall_TQFileInfoList },
+    { "TQPtrList<TQToolBar>", marshall_TQPtrListTQToolBar },
+    { "TQPtrList<TQTab>*", marshall_TQPtrListTQTab },
+    { "TQPtrList<TQDockWindow>", marshall_TQPtrListTQDockWindow },
+    { "TQPtrList<TQDockWindow>*", marshall_TQPtrListTQDockWindow },
+    { "TQPtrList<TQNetworkOperation>", marshall_TQPtrListTQNetworkOperation },
+    { "TQPtrList<TQNetworkOperation>&", marshall_TQPtrListTQNetworkOperation },
 #endif
     { 0, 0 }
 };
-- 
cgit v1.2.1