1 files changed, 42 insertions, 42 deletions

diff --git a/dcoppython/shell/marshal_funcs.data b/dcoppython/shell/marshal_funcs.data
index abb3a43e..22b36c26 100644
--- a/dcoppython/shell/marshal_funcs.data
+++ b/dcoppython/shell/marshal_funcs.data
@@ -1,14 +1,14 @@
 // This file contains the C++ code necessary marshal and demarshal
 // all the _simple_ types that dcoppython can understand.
 // "Simple" types are types that do not contain other types.
-// So, int and QString are simple types; QDict, QMap and QStringList are not.
+// So, int and TQString are simple types; TQDict, TQMap and TQStringList are not.
 // This file is processed by gen_marshal_code.py to produce a header
 // file, which is included by marshaller.cpp
 //
 // Marshalling:
 //   The code in the "marshal" section has the following variables available:
 //     PyObject * obj; // the object to marshal
-//     QDataStream *str; // the stream to marshal to
+//     TQDataStream *str; // the stream to marshal to
 //   The function should return true if the object can be marshalled.
 //   str may be NULL. If so, the function should ignore the actually marshalling
 //   and merely return true or false, depending on whether the object _could_
@@ -16,7 +16,7 @@
 //
 // Demarshalling:
 //   The code in the "demarshal" section has the following variables available:
-//     QDataStream *str; // the stream to demarshal from
+//     TQDataStream *str; // the stream to demarshal from
 //   The function should return a PyObject* which is a reference to the
 //   newly created object. Ownership of the reference should be passed to
 //   the caller. The function can return null if for any reason it
@@ -175,7 +175,7 @@ type:char
 %%
 
 
-type:QByteArray
+type:TQByteArray
 %% marshal
   {
     PyBufferProcs *pb = obj->ob_type->tp_as_buffer;
@@ -198,7 +198,7 @@ type:QByteArray
         return false;
 
       if (str) {
-        QByteArray a;
+        TQByteArray a;
         a.setRawData( (const char*)data, size );
         (*str) << a;
         a.resetRawData( (const char*)data, size );
@@ -213,7 +213,7 @@ type:QByteArray
 %% demarshal
   {
     // Demarshal to a writable buffer object
-    QByteArray a;
+    TQByteArray a;
     (*str) >> a;
 
     uint size = a.size();
@@ -241,51 +241,51 @@ type:QByteArray
   }
 %%
 
-type:QString
+type:TQString
 %doc as str s
 %% marshal
   {
     if (!PyString_Check(obj)) return false;
     if (str) {
-      QString s( PyString_AsString(obj) );
+      TQString s( PyString_AsString(obj) );
       (*str) << s;
     }
     return true;
   }
 %% demarshal
   {
-    QString s;
+    TQString s;
     (*str) >> s;
     return PyString_FromString( s.utf8().data() );
   }
 %%
 
-type:QCString
+type:TQCString
 %doc as str s
 %% marshal
   {
     if (!PyString_Check(obj)) return false;
     if (str) {
-      QCString s( PyString_AsString(obj) );
+      TQCString s( PyString_AsString(obj) );
       (*str) << s;
     }
     return true;
   }
 %% demarshal
   {
-    QCString s;
+    TQCString s;
     (*str) >> s;
     return PyString_FromString( s.data() );
   }
 %%
 
-type:QRect
+type:TQRect
 %doc as ( (int x1, int y1), (int x2, int y2) )
 %doc as ( int x1, int y1, int x2, int y2 )
 %% from_pyobj
 {
   int xp1, yp1, xp2, yp2;
-  QRect r;
+  TQRect r;
   *ok=false;
   if (!PyTuple_Check(obj)) return r;
   if (!PyArg_ParseTuple(obj, (char*)"(ii)(ii)", &xp1, &yp1, &xp2, &yp2) &&
@@ -308,12 +308,12 @@ type:QRect
 %defaultcode
 %%
 
-type:QPoint
+type:TQPoint
 %doc as (int x, int y)
 %% from_pyobj
 {
   int x,y;
-  QPoint p;
+  TQPoint p;
   *ok=false;
   if (!PyTuple_Check(obj)) return p;
   if (!PyArg_ParseTuple(obj, (char*)"ii", &x, &y))
@@ -333,12 +333,12 @@ type:QPoint
 %defaultcode
 %%
 
-type:QSize
+type:TQSize
 %doc as (int width, int height)
 %% from_pyobj
 {
   int w,h;
-  QSize sz;
+  TQSize sz;
   *ok=false;
   if (!PyTuple_Check(obj)) return sz;
   if (!PyArg_ParseTuple(obj, (char*)"ii", &w, &h))
@@ -358,12 +358,12 @@ type:QSize
 %defaultcode
 %%
 
-type:QColor
+type:TQColor
 %doc as (int red, int green, int blue)
 %% from_pyobj
 {
   int r,g,b;
-  QColor c;
+  TQColor c;
   *ok=false;
   if (!PyTuple_Check(obj)) return c;
   if (!PyArg_ParseTuple(obj, (char*)"iii", &r, &g, &b))
@@ -382,16 +382,16 @@ type:QColor
 %defaultcode
 %%
 
-type:QPointArray
+type:TQPointArray
 %doc as [ (int x, int y), (int x, int y), (int x, int y), ... ]
 %% from_pyobj
 {
   *ok=false;
-  if (!PyList_Check(obj)) return QPointArray();
+  if (!PyList_Check(obj)) return TQPointArray();
   int size = PyList_Size(obj);
-  QPointArray pa(size);
+  TQPointArray pa(size);
   for(int c=0;c<size;c++) {
-    QPoint p = fromPyObject_QPoint(PyList_GetItem(obj,c), ok);
+    TQPoint p = fromPyObject_QPoint(PyList_GetItem(obj,c), ok);
     if (!*ok) return false;
     pa.setPoint(c,p);
   }
@@ -415,17 +415,17 @@ type:QPointArray
 %defaultcode
 %%
 
-type:QDate
+type:TQDate
 %doc as (int year, int month, int day)
 %% from_pyobj
 {
   *ok=false;
-  if (!PyTuple_Check(obj)) return QDate();
+  if (!PyTuple_Check(obj)) return TQDate();
   int y,m,d;
   if (!PyArg_ParseTuple(obj, (char*)"iii", &y, &m, &d))
-    return QDate();
+    return TQDate();
   *ok=true;
-  return QDate(y,m,d);
+  return TQDate(y,m,d);
 }
 %% to_pyobj
 {
@@ -437,17 +437,17 @@ type:QDate
 %defaultcode
 %%
 
-type:QTime
+type:TQTime
 %doc as (int hour, int minute, int second=0, int millisecond=0)
 %% from_pyobj
 {
   *ok=false;
-  if (!PyTuple_Check(obj)) return QTime();
+  if (!PyTuple_Check(obj)) return TQTime();
   int h,m,s=0,ms=0;
   if (!PyArg_ParseTuple(obj, (char*)"ii|ii", &h, &m, &s, &ms))
-    return QTime();
+    return TQTime();
   *ok=true;
-  return QTime(h,m,s,ms);
+  return TQTime(h,m,s,ms);
 }
 %% to_pyobj
 {
@@ -459,7 +459,7 @@ type:QTime
 %defaultcode
 %%
 
-type:QDateTime
+type:TQDateTime
 %doc as ( (int year, int month, int day), (int hour, int minute, int second=0, int millsecond=0) )
 %doc as long unixDate
 %% from_pyobj
@@ -468,27 +468,27 @@ type:QDateTime
 
   if (PyLong_Check(obj)) {
     *ok=true;
-    QDateTime dt;
+    TQDateTime dt;
     dt.setTime_t( (uint)PyLong_AsLong(obj) );
     return dt;
   }
 
   if (PyInt_Check(obj)) {
     *ok=true;
-    QDateTime dt;
+    TQDateTime dt;
     dt.setTime_t( (uint)PyInt_AsLong(obj) );
     return dt;
   }
 
   PyObject *date_tuple, *time_tuple;
   if (PyArg_ParseTuple(obj, (char*)"OO", &date_tuple, &time_tuple)) {
-    QDateTime dt;
+    TQDateTime dt;
     dt.setTime( fromPyObject_QTime(time_tuple, ok) );
     if (*ok) dt.setDate( fromPyObject_QDate(date_tuple, ok) );
     return dt;
   }
 
-  return QDateTime();
+  return TQDateTime();
 }
 %% to_pyobj
 {
@@ -509,7 +509,7 @@ type:KURL
   *ok=false;
   if (!PyString_Check(obj)) return KURL();
   *ok=true;
-  return KURL( QString(PyString_AsString(obj)) );
+  return KURL( TQString(PyString_AsString(obj)) );
 }
 %% to_pyobj
 {
@@ -533,7 +533,7 @@ type:DCOPRef
       char *c_appname = PyString_AsString(appname);
       char *c_name = PyString_AsString(name);
       DCOPRef ref;
-      ref.setRef(QCString(c_appname), QCString(c_name) );
+      ref.setRef(TQCString(c_appname), TQCString(c_name) );
       Py_DECREF(appname);
       Py_DECREF(name);
       *ok=true;
@@ -570,10 +570,10 @@ type:DCOPRef
 //   if (PyArg_ParseTuple(obj,(char*)"ss|s", &dcopref_app, &dcopref_obj, &dcopref_type)) {
 //     *ok=true;
 //     if (dcopref_type) {
-//       DCOPRef dr(QCString(dcopref_app), QCString(dcopref_obj), QCString(dcopref_type));
+//       DCOPRef dr(TQCString(dcopref_app), TQCString(dcopref_obj), TQCString(dcopref_type));
 //       return dr;
 //     }
-//     DCOPRef dr(QCString(dcopref_app), QCString(dcopref_obj));
+//     DCOPRef dr(TQCString(dcopref_app), TQCString(dcopref_obj));
 //     return dr;
 //   }
 //   return DCOPRef();
@@ -588,7 +588,7 @@ type:DCOPRef
 // %defaultcode
 // %%
 
-// type:QFont
+// type:TQFont
 // %% marshal
 // %constructor ("default")
 // %dict-map family:string,rawName:string