diff options
Diffstat (limited to 'dcoppython/shell/marshaller.cpp')
| -rw-r--r-- | dcoppython/shell/marshaller.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/dcoppython/shell/marshaller.cpp b/dcoppython/shell/marshaller.cpp index ff9843d4..ff018021 100644 --- a/dcoppython/shell/marshaller.cpp +++ b/dcoppython/shell/marshaller.cpp @@ -43,18 +43,18 @@ namespace PythonDCOP { bool Marshaller::marsh_private(const PCOPType &type, PyObject *obj, - TTQDataStream *str) const + TQDataStream *str) const { - TTQString ty = type.type(); + TQString ty = type.type(); - if (ty=="TTQStringList") - return marshalList(PCOPType("TTQString"), obj, str); + if (ty=="TQStringList") + return marshalList(PCOPType("TQString"), obj, str); if (ty=="TQCStringList") - return marshalList(PCOPType("TTQCString"), obj, str); - if (ty=="TTQValueList" && type.leftType()) + return marshalList(PCOPType("TQCString"), obj, str); + if (ty=="TQValueList" && type.leftType()) return marshalList(*type.leftType(), obj, str); - if (ty=="TTQMap" && type.leftType() && type.rightType()) + if (ty=="TQMap" && type.leftType() && type.rightType()) return marshalDict(*type.leftType(), *type.rightType(), obj, str); if (!m_marsh_funcs.contains(ty)) return false; @@ -62,17 +62,17 @@ namespace PythonDCOP { } PyObject *Marshaller::demarsh_private(const PCOPType &type, - TTQDataStream *str) const + TQDataStream *str) const { - TTQString ty = type.type(); + TQString ty = type.type(); - if (ty=="TTQStringList") - return demarshalList(PCOPType("TTQString"), str); + if (ty=="TQStringList") + return demarshalList(PCOPType("TQString"), str); if (ty=="TQCStringList") - return demarshalList(PCOPType("TTQCString"), str); - if (ty=="TTQValueList" && type.leftType()) + return demarshalList(PCOPType("TQCString"), str); + if (ty=="TQValueList" && type.leftType()) return demarshalList(*type.leftType(), str); - if (ty=="TTQMap" && type.leftType() && type.rightType()) + if (ty=="TQMap" && type.leftType() && type.rightType()) return demarshalDict(*type.leftType(), *type.rightType(), str); if (!m_demarsh_funcs.contains(ty)) { @@ -91,7 +91,7 @@ namespace PythonDCOP { bool Marshaller::marshalList(const PCOPType &list_type, PyObject *obj, - TTQDataStream *str) const { + TQDataStream *str) const { if (!PyList_Check(obj)) return false; int count = PyList_Size(obj); @@ -110,7 +110,7 @@ namespace PythonDCOP { } PyObject *Marshaller::demarshalList(const PCOPType &list_type, - TTQDataStream *str) const { + TQDataStream *str) const { Q_UINT32 count; (*str) >> count; @@ -124,7 +124,7 @@ namespace PythonDCOP { bool Marshaller::marshalDict(const PCOPType &key_type, const PCOPType &value_type, PyObject *obj, - TTQDataStream *str) const { + TQDataStream *str) const { if (!PyDict_Check(obj)) return false; @@ -149,7 +149,7 @@ namespace PythonDCOP { PyObject *Marshaller::demarshalDict(const PCOPType &key_type, const PCOPType &value_type, - TTQDataStream *str) const { + TQDataStream *str) const { PyObject *obj = PyDict_New(); Q_INT32 count; (*str) >> count; |