Initial TQt conversion

1 files changed, 64 insertions, 64 deletions

diff --git a/sip/tdecore/kmacroexpander.sip b/sip/tdecore/kmacroexpander.sip
index 6316a9d..b70d2df 100644
--- a/sip/tdecore/kmacroexpander.sip
+++ b/sip/tdecore/kmacroexpander.sip
@@ -38,16 +38,16 @@ class KMacroExpanderBase
 
 
 public:
-                         KMacroExpanderBase (QChar = '%');
-    void                 expandMacros (QString&);
-    bool                 expandMacrosShellQuote (QString&, uint& /In, Out/);
-    bool                 expandMacrosShellQuote (QString&);
-    void                 setEscapeChar (QChar);
-    QChar                escapeChar () const;
+                         KMacroExpanderBase (TQChar = '%');
+    void                 expandMacros (TQString&);
+    bool                 expandMacrosShellQuote (TQString&, uint& /In, Out/);
+    bool                 expandMacrosShellQuote (TQString&);
+    void                 setEscapeChar (TQChar);
+    TQChar                escapeChar () const;
 
 protected:
-    virtual int          expandPlainMacro (const QString&, uint, QStringList&);
-    virtual int          expandEscapedMacro (const QString&, uint, QStringList&);
+    virtual int          expandPlainMacro (const TQString&, uint, TQStringList&);
+    virtual int          expandEscapedMacro (const TQString&, uint, TQStringList&);
 
 };  // class KMacroExpanderBase
 
@@ -64,12 +64,12 @@ class KWordMacroExpander : KMacroExpanderBase
 
 
 public:
-                         KWordMacroExpander (QChar = '%');
+                         KWordMacroExpander (TQChar = '%');
 
 protected:
-    virtual int          expandPlainMacro (const QString&, uint, QStringList&);
-    virtual int          expandEscapedMacro (const QString&, uint, QStringList&);
-    virtual bool         expandMacro (const QString&, QStringList&)  = 0;
+    virtual int          expandPlainMacro (const TQString&, uint, TQStringList&);
+    virtual int          expandEscapedMacro (const TQString&, uint, TQStringList&);
+    virtual bool         expandMacro (const TQString&, TQStringList&)  = 0;
 
 };  // class KWordMacroExpander
 
@@ -86,12 +86,12 @@ class KCharMacroExpander : KMacroExpanderBase
 
 
 public:
-                         KCharMacroExpander (QChar = '%');
+                         KCharMacroExpander (TQChar = '%');
 
 protected:
-    virtual int          expandPlainMacro (const QString&, uint, QStringList&);
-    virtual int          expandEscapedMacro (const QString&, uint, QStringList&);
-    virtual bool         expandMacro (QChar, QStringList&)  = 0;
+    virtual int          expandPlainMacro (const TQString&, uint, TQStringList&);
+    virtual int          expandEscapedMacro (const TQString&, uint, TQStringList&);
+    virtual bool         expandMacro (TQChar, TQStringList&)  = 0;
 
 };  // class KCharMacroExpander
 
@@ -101,22 +101,22 @@ protected:
 %If ( KDE_3_2_0 -  )
 namespace KMacroExpander
 {
-QString              expandMacros (const QString&, const QMap<QChar,QString>&, QChar = '%');
-QString              expandMacrosShellQuote (const QString&, const QMap<QChar,QString>&, QChar = '%');
-QString              expandMacros (const QString&, const QMap<QString,QString>&, QChar = '%');
-QString              expandMacrosShellQuote (const QString&, const QMap<QString,QString>&, QChar = '%');
-QString              expandMacros (const QString&, const QMap<QChar,QStringList>&, QChar = '%');
-QString              expandMacros (const QString&, const QMap<QString,QStringList>&, QChar = '%');
-QString              expandMacrosShellQuote (const QString&, const QMap<QChar,QStringList>&, QChar = '%');
-QString              expandMacrosShellQuote (const QString&, const QMap<QString,QStringList>&, QChar = '%');
+TQString              expandMacros (const TQString&, const TQMap<TQChar,TQString>&, TQChar = '%');
+TQString              expandMacrosShellQuote (const TQString&, const TQMap<TQChar,TQString>&, TQChar = '%');
+TQString              expandMacros (const TQString&, const TQMap<TQString,TQString>&, TQChar = '%');
+TQString              expandMacrosShellQuote (const TQString&, const TQMap<TQString,TQString>&, TQChar = '%');
+TQString              expandMacros (const TQString&, const TQMap<TQChar,TQStringList>&, TQChar = '%');
+TQString              expandMacros (const TQString&, const TQMap<TQString,TQStringList>&, TQChar = '%');
+TQString              expandMacrosShellQuote (const TQString&, const TQMap<TQChar,TQStringList>&, TQChar = '%');
+TQString              expandMacrosShellQuote (const TQString&, const TQMap<TQString,TQStringList>&, TQChar = '%');
 };  // namespace KMacroExpander
 
 %End
 
 
 
-%MappedType QMap<QChar,QString>
-//converts a Python dict of QChar:QString
+%MappedType TQMap<TQChar,TQString>
+//converts a Python dict of TQChar:TQString
 {
 %TypeHeaderCode
 #include <qmap.h>
@@ -137,15 +137,15 @@ QString              expandMacrosShellQuote (const QString&, const QMap<QString,
 
     // Get it.
 
-    const QMap<QChar,QString> map = *sipCpp;
-    QMap<QChar,QString>::ConstIterator it;
+    const TQMap<TQChar,TQString> map = *sipCpp;
+    TQMap<TQChar,TQString>::ConstIterator it;
 
     for (it = map.begin (); it != map.end (); ++it)
     {
-        QChar acpp = it.key ();
-        PyObject *binst = PyString_FromString ((char *)((QString *)&it.data ()));
+        TQChar acpp = it.key ();
+        PyObject *binst = PyString_FromString ((char *)((TQString *)&it.data ()));
         PyObject *ainst;
-        if (((ainst = sipConvertFromNewType(new QChar(acpp), sipType_QChar, sipTransferObj)) == NULL)
+        if (((ainst = sipConvertFromNewType(new TQChar(acpp), sipType_QChar, sipTransferObj)) == NULL)
             || (binst == NULL)
             || (PyDict_SetItem (dict, ainst, binst) < 0))
         {
@@ -161,24 +161,24 @@ QString              expandMacrosShellQuote (const QString&, const QMap<QString,
 
 
 %ConvertToTypeCode
-// Convert a Python dictionary to a QMap<QChar, QString>
+// Convert a Python dictionary to a TQMap<TQChar, TQString>
 
     if (sipIsErr == NULL)
         return PyDict_Check(sipPy);
 
-    QMap<QChar,QString> *map = new QMap<QChar,QString>;
+    TQMap<TQChar,TQString> *map = new TQMap<TQChar,TQString>;
 
     PyObject *key, *value;
     SIP_SSIZE_T pos = 0;
-    QChar *cKey;
-    QString *sData;
+    TQChar *cKey;
+    TQString *sData;
 
     while (PyDict_Next(sipPy, &pos, &key, &value))
     {
         int iserr = 0, cKey_state, sData_state;
 
-        cKey  = (QChar *)sipForceConvertToType(key, sipType_QChar, sipTransferObj, SIP_NOT_NONE, &cKey_state, &iserr);
-        sData = (QString *)sipForceConvertToType(value, sipType_QString, sipTransferObj, SIP_NOT_NONE, &sData_state, &iserr);
+        cKey  = (TQChar *)sipForceConvertToType(key, sipType_QChar, sipTransferObj, SIP_NOT_NONE, &cKey_state, &iserr);
+        sData = (TQString *)sipForceConvertToType(value, sipType_QString, sipTransferObj, SIP_NOT_NONE, &sData_state, &iserr);
 
         if (iserr)
         {
@@ -203,8 +203,8 @@ QString              expandMacrosShellQuote (const QString&, const QMap<QString,
 };
 
 
-%MappedType QMap<QString,QStringList>
-//converts a Python dict of QString:QStringList
+%MappedType TQMap<TQString,TQStringList>
+//converts a Python dict of TQString:TQStringList
 {
 %TypeHeaderCode
 #include <qmap.h>
@@ -226,15 +226,15 @@ QString              expandMacrosShellQuote (const QString&, const QMap<QString,
 
     // Get it.
 
-    const QMap<QString, QStringList> map = *sipCpp;
-    QMap<QString, QStringList>::ConstIterator it;
+    const TQMap<TQString, TQStringList> map = *sipCpp;
+    TQMap<TQString, TQStringList>::ConstIterator it;
 
     for (it = map.begin (); it != map.end (); ++it)
     {
-        QStringList bcpp = it.data ();
-        PyObject *ainst = PyString_FromString ((char *)((QString *)&it.key ()));
+        TQStringList bcpp = it.data ();
+        PyObject *ainst = PyString_FromString ((char *)((TQString *)&it.key ()));
         PyObject *binst;
-        if (((binst = sipConvertFromNewType(new QStringList(bcpp), sipType_QStringList, sipTransferObj)) == NULL)
+        if (((binst = sipConvertFromNewType(new TQStringList(bcpp), sipType_QStringList, sipTransferObj)) == NULL)
             || (ainst == NULL)
             || (PyDict_SetItem (dict, ainst, binst) < 0))
         {
@@ -250,24 +250,24 @@ QString              expandMacrosShellQuote (const QString&, const QMap<QString,
 
 
 %ConvertToTypeCode
-// Convert a Python dictionary to a QMap<QString, QStringList> on the heap.
+// Convert a Python dictionary to a TQMap<TQString, TQStringList> on the heap.
 
     if (sipIsErr == NULL)
         return PyDict_Check(sipPy);
 
-    QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
+    TQMap<TQString, TQStringList> *map = new TQMap<TQString, TQStringList>;
 
     PyObject *key, *value;
     SIP_SSIZE_T pos = 0;
-    QString *sKey;
-    QStringList *slData;
+    TQString *sKey;
+    TQStringList *slData;
 
     while (PyDict_Next(sipPy, &pos, &key, &value))
     {
         int iserr = 0, sKey_state, slData_state;
 
-        sKey = (QString *)sipForceConvertToType(key, sipType_QString, sipTransferObj, SIP_NOT_NONE, &sKey_state, &iserr);
-        slData = (QStringList *)sipForceConvertToType(value, sipType_QStringList, sipTransferObj, SIP_NOT_NONE, &slData_state, &iserr);
+        sKey = (TQString *)sipForceConvertToType(key, sipType_QString, sipTransferObj, SIP_NOT_NONE, &sKey_state, &iserr);
+        slData = (TQStringList *)sipForceConvertToType(value, sipType_QStringList, sipTransferObj, SIP_NOT_NONE, &slData_state, &iserr);
 
         if (iserr)
         {
@@ -292,8 +292,8 @@ QString              expandMacrosShellQuote (const QString&, const QMap<QString,
 };
 
 
-%MappedType QMap<QChar,QStringList>
-//converts a Python dict of QChar:QStringList
+%MappedType TQMap<TQChar,TQStringList>
+//converts a Python dict of TQChar:TQStringList
 {
 %TypeHeaderCode
 #include <qmap.h>
@@ -315,17 +315,17 @@ QString              expandMacrosShellQuote (const QString&, const QMap<QString,
 
     // Get it.
 
-    const QMap<QChar,QStringList> map = *sipCpp;
-    QMap<QChar,QStringList>::ConstIterator it;
+    const TQMap<TQChar,TQStringList> map = *sipCpp;
+    TQMap<TQChar,TQStringList>::ConstIterator it;
 
     for (it = map.begin (); it != map.end (); ++it)
     {
-        QChar acpp = it.key ();
-        QStringList bcpp = it.data ();
+        TQChar acpp = it.key ();
+        TQStringList bcpp = it.data ();
         PyObject *binst;
         PyObject *ainst;
-        if (((ainst = sipConvertFromNewType(new QChar(acpp), sipType_QChar, sipTransferObj)) == NULL)
-            || (binst = sipConvertFromNewType(new QStringList(bcpp), sipType_QStringList, sipTransferObj))
+        if (((ainst = sipConvertFromNewType(new TQChar(acpp), sipType_QChar, sipTransferObj)) == NULL)
+            || (binst = sipConvertFromNewType(new TQStringList(bcpp), sipType_QStringList, sipTransferObj))
             || (PyDict_SetItem (dict, ainst, binst) < 0))
         {
             Py_XDECREF (ainst);
@@ -340,24 +340,24 @@ QString              expandMacrosShellQuote (const QString&, const QMap<QString,
 
 
 %ConvertToTypeCode
-// Convert a Python dictionary to a QMap<QChar, QStringList> on the heap.
+// Convert a Python dictionary to a TQMap<TQChar, TQStringList> on the heap.
 
     if (sipIsErr == NULL)
         return PyDict_Check(sipPy);
 
-    QMap<QChar,QStringList> *map = new QMap<QChar,QStringList>;
+    TQMap<TQChar,TQStringList> *map = new TQMap<TQChar,TQStringList>;
 
     PyObject *key, *value;
     SIP_SSIZE_T pos = 0;
-    QChar *cKey;
-    QStringList *slData;
+    TQChar *cKey;
+    TQStringList *slData;
 
     while (PyDict_Next(sipPy, &pos, &key, &value))
     {
         int iserr = 0, cKey_state, slData_state;
 
-        cKey = (QChar *)sipForceConvertToType(key, sipType_QChar, sipTransferObj, SIP_NOT_NONE, &cKey_state, &iserr);
-        slData = (QStringList *)sipForceConvertToType(value, sipType_QStringList, sipTransferObj, SIP_NOT_NONE, &slData_state, &iserr);
+        cKey = (TQChar *)sipForceConvertToType(key, sipType_QChar, sipTransferObj, SIP_NOT_NONE, &cKey_state, &iserr);
+        slData = (TQStringList *)sipForceConvertToType(value, sipType_QStringList, sipTransferObj, SIP_NOT_NONE, &slData_state, &iserr);
 
         if (iserr)
         {