Initial TQt conversion

1 files changed, 18 insertions, 18 deletions

diff --git a/dcoppython/shell/marshaller.h b/dcoppython/shell/marshaller.h
index 6cb16d89..5eefc800 100644
--- a/dcoppython/shell/marshaller.h
+++ b/dcoppython/shell/marshaller.h
@@ -15,7 +15,7 @@
 #include <Python.h>
 #include <tqstring.h>
 
-class TQDataStream;
+class TTQDataStream;
 
 namespace PythonDCOP {
 //   class Marshaller;
@@ -25,23 +25,23 @@ namespace PythonDCOP {
   public:
     Marshaller();
     ~Marshaller();
-    bool marshal(const PCOPType &type, PyObject *obj, TQDataStream &str) const
+    bool marshal(const PCOPType &type, PyObject *obj, TTQDataStream &str) const
       { return marsh_private(type,obj,&str); }
     bool canMarshal(const PCOPType &type, PyObject *obj) const
       { return marsh_private(type,obj,NULL); }
-    bool marshalList(const PCOPType &list_type, PyObject *obj, TQDataStream *str) const;
-    PyObject *demarshal(const PCOPType &type, TQDataStream &str) const
+    bool marshalList(const PCOPType &list_type, PyObject *obj, TTQDataStream *str) const;
+    PyObject *demarshal(const PCOPType &type, TTQDataStream &str) const
       { return demarsh_private(type, &str); }
-    PyObject *demarshalList(const PCOPType &list_type, TQDataStream *str) const;
+    PyObject *demarshalList(const PCOPType &list_type, TTQDataStream *str) const;
     bool marshalDict(const PCOPType &key_type, const PCOPType &value_type,
-                     PyObject *obj, TQDataStream *str) const;
+                     PyObject *obj, TTQDataStream *str) const;
     PyObject *demarshalDict(const PCOPType &key_type,
                             const PCOPType &value_type,
-                            TQDataStream *str) const;
+                            TTQDataStream *str) const;
     static Marshaller *instance() { return m_instance; }
   protected:
-    TQMap<TQString,bool(*)(PyObject*,TQDataStream*)> m_marsh_funcs;
-    TQMap<TQString,PyObject*(*)(TQDataStream*)> m_demarsh_funcs;
+    TTQMap<TTQString,bool(*)(PyObject*,TTQDataStream*)> m_marsh_funcs;
+    TTQMap<TTQString,PyObject*(*)(TTQDataStream*)> m_demarsh_funcs;
 
     static Marshaller *m_instance;
 
@@ -49,21 +49,21 @@ namespace PythonDCOP {
   private:
     bool marsh_private(const PCOPType &type,
                        PyObject *obj,
-                       TQDataStream *str) const;
+                       TTQDataStream *str) const;
     PyObject *demarsh_private(const PCOPType &type,
-                              TQDataStream *str) const;
+                              TTQDataStream *str) const;
 
 
 
   };
 
-//   bool marshall_bool(PyObject *obj, TQDataStream *str);
-//   bool marshall_int(PyObject *obj, TQDataStream *str);
-//   bool marshall_uint(PyObject *obj, TQDataStream *str);
-//   bool marshall_double(PyObject *obj, TQDataStream *str);
-//   bool marshall_QByteArray(PyObject *obj, TQDataStream *str);
-//   bool marshall_QString(PyObject *obj, TQDataStream *str);
-//   bool marshall_QCString(PyObject *obj, TQDataStream *str);
+//   bool marshall_bool(PyObject *obj, TTQDataStream *str);
+//   bool marshall_int(PyObject *obj, TTQDataStream *str);
+//   bool marshall_uint(PyObject *obj, TTQDataStream *str);
+//   bool marshall_double(PyObject *obj, TTQDataStream *str);
+//   bool marshall_QByteArray(PyObject *obj, TTQDataStream *str);
+//   bool marshall_QString(PyObject *obj, TTQDataStream *str);
+//   bool marshall_QCString(PyObject *obj, TTQDataStream *str);
 
 
 }