summaryrefslogtreecommitdiffstats
path: root/dcoppython/shell/marshaller.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dcoppython/shell/marshaller.cpp')
-rw-r--r--dcoppython/shell/marshaller.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/dcoppython/shell/marshaller.cpp b/dcoppython/shell/marshaller.cpp
index f2dd4d03..1aaebc38 100644
--- a/dcoppython/shell/marshaller.cpp
+++ b/dcoppython/shell/marshaller.cpp
@@ -13,13 +13,13 @@
#include "pcop.h"
#include "importedmodules.h"
-#include <qdatastream.h>
+#include <tqdatastream.h>
-#include <qrect.h>
-#include <qfont.h>
-#include <qcolor.h>
-#include <qpointarray.h>
-#include <qdatetime.h>
+#include <tqrect.h>
+#include <tqfont.h>
+#include <tqcolor.h>
+#include <tqpointarray.h>
+#include <tqdatetime.h>
#include <dcopref.h>
#include <kurl.h>
@@ -43,18 +43,18 @@ namespace PythonDCOP {
bool Marshaller::marsh_private(const PCOPType &type,
PyObject *obj,
- QDataStream *str) const
+ TQDataStream *str) const
{
- QString ty = type.type();
+ TQString ty = type.type();
- if (ty=="QStringList")
- return marshalList(PCOPType("QString"), obj, str);
+ if (ty=="TQStringList")
+ return marshalList(PCOPType("TQString"), obj, str);
if (ty=="QCStringList")
- return marshalList(PCOPType("QCString"), obj, str);
- if (ty=="QValueList" && type.leftType())
+ return marshalList(PCOPType("TQCString"), obj, str);
+ if (ty=="TQValueList" && type.leftType())
return marshalList(*type.leftType(), obj, str);
- if (ty=="QMap" && 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,
- QDataStream *str) const
+ TQDataStream *str) const
{
- QString ty = type.type();
+ TQString ty = type.type();
- if (ty=="QStringList")
- return demarshalList(PCOPType("QString"), str);
+ if (ty=="TQStringList")
+ return demarshalList(PCOPType("TQString"), str);
if (ty=="QCStringList")
- return demarshalList(PCOPType("QCString"), str);
- if (ty=="QValueList" && type.leftType())
+ return demarshalList(PCOPType("TQCString"), str);
+ if (ty=="TQValueList" && type.leftType())
return demarshalList(*type.leftType(), str);
- if (ty=="QMap" && 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,
- QDataStream *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,
- QDataStream *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,
- QDataStream *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,
- QDataStream *str) const {
+ TQDataStream *str) const {
PyObject *obj = PyDict_New();
Q_INT32 count;
(*str) >> count;