From a5ebcd697325e8e6ac9756cc96857d9298d2c114 Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Wed, 20 Jun 2012 01:09:59 -0500
Subject: Update for recent TQ changes.

---
 dcoppython/shell/marshal_funcs.data | 20 ++++++++++----------
 dcoppython/shell/marshaller.cpp     | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'dcoppython')

diff --git a/dcoppython/shell/marshal_funcs.data b/dcoppython/shell/marshal_funcs.data
index fe22e414..6cf4d34f 100644
--- a/dcoppython/shell/marshal_funcs.data
+++ b/dcoppython/shell/marshal_funcs.data
@@ -53,13 +53,13 @@ type: bool
     if (str) {
       bool ok;
       bool b = fromPyObject_bool(obj,&ok);
-      (*str) << (Q_INT8)b;
+      (*str) << (TQ_INT8)b;
     }
     return true;
   }
 %% demarshal
   {
-    Q_INT8 i;
+    TQ_INT8 i;
     (*str) >> i;
     return toPyObject_bool(i!=0);
   }
@@ -71,13 +71,13 @@ type:int
   {
     if (!PyInt_Check(obj)) return false;
     if (str) {
-      (*str) << (Q_INT32)PyInt_AsLong(obj);
+      (*str) << (TQ_INT32)PyInt_AsLong(obj);
     }
     return true;
   }
 %% demarshal
   {
-    Q_INT32 i;
+    TQ_INT32 i;
     (*str) >> i;
     return PyInt_FromLong( (long)i );
   }
@@ -89,13 +89,13 @@ type:uint
   {
     if (!PyInt_Check(obj)) return false;
     if (str) {
-      (*str) << (Q_INT32)PyInt_AsLong(obj);
+      (*str) << (TQ_INT32)PyInt_AsLong(obj);
     }
     return true;
   }
 %% demarshal
   {
-    Q_INT32 i;
+    TQ_INT32 i;
     (*str) >> i;
     return PyInt_FromLong( (long)i );
   }
@@ -135,7 +135,7 @@ type:uchar
     if (PyInt_Check(obj)) {
       if (str) {
         long l = PyInt_AsLong(obj);
-        Q_UINT8 c = (Q_UINT8)(l & 0xff);
+        TQ_UINT8 c = (TQ_UINT8)(l & 0xff);
         (*str) << c;
       }
       return true;
@@ -145,7 +145,7 @@ type:uchar
   }
 %%demarshal
   {
-    Q_UINT8 c;
+    TQ_UINT8 c;
     (*str) >> c;
     return PyString_FromStringAndSize((const char *)(&c),1);
   }
@@ -158,7 +158,7 @@ type:char
     if (PyInt_Check(obj)) {
       if (str) {
         long l = PyInt_AsLong(obj);
-        Q_INT8 c = (Q_INT8)(l & 0xff);
+        TQ_INT8 c = (TQ_INT8)(l & 0xff);
         (*str) << c;
       }
       return true;
@@ -168,7 +168,7 @@ type:char
   }
 %%demarshal
   {
-    Q_INT8 c;
+    TQ_INT8 c;
     (*str) >> c;
     return PyInt_FromLong((long)c);
   }
diff --git a/dcoppython/shell/marshaller.cpp b/dcoppython/shell/marshaller.cpp
index 1aaebc38..5b15aded 100644
--- a/dcoppython/shell/marshaller.cpp
+++ b/dcoppython/shell/marshaller.cpp
@@ -101,7 +101,7 @@ namespace PythonDCOP {
         return false;
 
     if (str) {
-      (*str) << (Q_INT32)count;
+      (*str) << (TQ_INT32)count;
       for(int c=0; c<count; c++)
         list_type.marshal( PyList_GetItem(obj,c), *str );
     }
@@ -111,11 +111,11 @@ namespace PythonDCOP {
 
   PyObject *Marshaller::demarshalList(const PCOPType &list_type,
                                       TQDataStream *str) const {
-    Q_UINT32 count;
+    TQ_UINT32 count;
     (*str) >> count;
 
     PyObject *obj = PyList_New(count);
-    for(Q_UINT32 c=0;c<count;c++) {
+    for(TQ_UINT32 c=0;c<count;c++) {
       PyList_SetItem(obj, c, list_type.demarshal(*str));
     }
     return obj;
@@ -136,7 +136,7 @@ namespace PythonDCOP {
         return false;
 
     if (str) {
-      Q_INT32 count = (Q_INT32)PyDict_Size(obj);
+      TQ_INT32 count = (TQ_INT32)PyDict_Size(obj);
       (*str) << count;
       c=0;
       while (PyDict_Next(obj, &c, &key, &val)==1) {
@@ -151,9 +151,9 @@ namespace PythonDCOP {
                                       const PCOPType &value_type,
                                       TQDataStream *str) const {
     PyObject *obj = PyDict_New();
-    Q_INT32 count;
+    TQ_INT32 count;
     (*str) >> count;
-    for(Q_INT32 c=0;c<count;c++) {
+    for(TQ_INT32 c=0;c<count;c++) {
       PyObject *key = key_type.demarshal(*str);
       PyObject *value = value_type.demarshal(*str);
       PyDict_SetItem(obj,key,value);
-- 
cgit v1.2.1