1 files changed, 27 insertions, 27 deletions

diff --git a/dcoppython/shell/pcop.h b/dcoppython/shell/pcop.h
index f9c2d26b..ee4e3094 100644
--- a/dcoppython/shell/pcop.h
+++ b/dcoppython/shell/pcop.h
@@ -20,7 +20,7 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 
-class TQDataStream;
+class TTQDataStream;
 
 namespace PythonDCOP {
   class Client;
@@ -41,7 +41,7 @@ namespace PythonDCOP {
 
   // helpers...
   void delete_dcop_object(void *vp);
-  PyObject *make_py_list(const QCStringList &qt_list);
+  PyObject *make_py_list(const TQCStringList &qt_list);
 
   /**
    * Used by the Python interface to talk to DCOP
@@ -58,7 +58,7 @@ namespace PythonDCOP {
     DCOPClient *m_dcop;
 //     ImportedModules *m_module;
     static Client *s_instance;
-    TQApplication *m_qapp;
+    TTQApplication *m_qapp;
   };
 
   /**
@@ -85,19 +85,19 @@ namespace PythonDCOP {
      * Process method fun, whose arguments are marshalled in data.
      * Set replyType to be the reply type and marshall the reply data into replyData.
      */
-    virtual bool process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData);
+    virtual bool process(const TTQCString &fun, const TTQByteArray &data, TTQCString& replyType, TTQByteArray &replyData);
 
     /**
      * Return list of supported functions (methods).
      */
-    virtual QCStringList functions();
+    virtual TQCStringList functions();
 
     /**
      * Set the list of methods that this object handles.
      * The key of the QT dictionary is the method signature; the data in
      * the dictionary is a pointer to the python method to which it corresponds.
      */
-    virtual bool setMethodList(TQAsciiDict<PyObject> meth_list);
+    virtual bool setMethodList(TTQAsciiDict<PyObject> meth_list);
 
     /**
      * Returns the current list of methods, as set by setMethodList.
@@ -108,10 +108,10 @@ namespace PythonDCOP {
      * Matches an 'incoming' method signature (fun) and returns a PCOPMethod pointer,
      * or NULL if none match.
      */
-    PCOPMethod *matchMethod(const TQCString &fun);
+    PCOPMethod *matchMethod(const TTQCString &fun);
 
   private:
-    virtual bool py_process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData);
+    virtual bool py_process(const TTQCString &fun, const TTQByteArray &data, TTQCString& replyType, TTQByteArray &replyData);
 
     /**
      * The Python object holding this CObject.
@@ -121,7 +121,7 @@ namespace PythonDCOP {
     /**
      * The list of methods this object supports.
      */
-    TQAsciiDict<PCOPMethod> m_methods;
+    TTQAsciiDict<PCOPMethod> m_methods;
 
   };
 
@@ -131,23 +131,23 @@ namespace PythonDCOP {
   class PCOPType
   {
   public:
-    PCOPType( const TQCString& dcop_representation);
+    PCOPType( const TTQCString& dcop_representation);
     ~PCOPType();
 
-    TQCString signature() const;
+    TTQCString signature() const;
 
-    PyObject* demarshal( TQDataStream& str ) const;
-    bool marshal( PyObject* obj, TQDataStream& str ) const;
+    PyObject* demarshal( TTQDataStream& str ) const;
+    bool marshal( PyObject* obj, TTQDataStream& str ) const;
 
     // checks if the given PyObject can be marshalled as this PCOPType
     bool isMarshallable( PyObject *obj ) const;
 
-    const TQCString &type() const { return m_type; }
+    const TTQCString &type() const { return m_type; }
     const PCOPType *leftType() const { return m_leftType; }
     const PCOPType *rightType() const { return m_rightType; }
 
     // TODO: make these private
-    TQCString m_type;
+    TTQCString m_type;
     PCOPType* m_leftType;
     PCOPType* m_rightType;
 
@@ -159,25 +159,25 @@ namespace PythonDCOP {
   class PCOPMethod
   {
   public:
-    PCOPMethod( const TQCString& dcop_signature );
+    PCOPMethod( const TTQCString& dcop_signature );
     ~PCOPMethod();
 
     int paramCount() const;
-//     TQCString signature() const;
-//     TQCString name() const;
+//     TTQCString signature() const;
+//     TTQCString name() const;
     PCOPType* param( int );
     const PCOPType* param( int ) const;
 
     bool setPythonMethod(PyObject *py_method);
     PyObject *pythonMethod() const { return m_py_method; }
-    const TQCString &signature() const { return m_signature; }
-    const TQCString &name() const { return m_name; }
+    const TTQCString &signature() const { return m_signature; }
+    const TTQCString &name() const { return m_name; }
     const PCOPType *type() const { return m_type; }
 
-    TQCString m_signature;
-    TQCString m_name;
+    TTQCString m_signature;
+    TTQCString m_name;
     PCOPType* m_type;
-    QList<PCOPType> m_params;
+    TQList<PCOPType> m_params;
   private:
     PyObject *m_py_method;
   };
@@ -188,13 +188,13 @@ namespace PythonDCOP {
   class PCOPClass
   {
   public:
-    PCOPClass( const QCStringList& dcop_style_methods);
+    PCOPClass( const TQCStringList& dcop_style_methods);
     ~PCOPClass();
 
-    const PCOPMethod* method( const TQCString &name, PyObject *argTuple = 0 );
+    const PCOPMethod* method( const TTQCString &name, PyObject *argTuple = 0 );
 
-    QCStringList m_ifaces;
-    TQAsciiDict<PCOPMethod> m_methods;
+    TQCStringList m_ifaces;
+    TTQAsciiDict<PCOPMethod> m_methods;
   };
 
 }