diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:44:01 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:44:01 +0000 |
| commit | 479f5f799523bffbcc83dff581a2299c047c6fff (patch) | |
| tree | 186aae707ed02aac6c7cab2fb14e97f72aca5e36 /python/pyqt | |
| parent | f1dbff6145c98324ff82e34448b7483727e8ace4 (diff) | |
| download | tdebindings-479f5f799523bffbcc83dff581a2299c047c6fff.tar.gz tdebindings-479f5f799523bffbcc83dff581a2299c047c6fff.zip | |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1157645 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'python/pyqt')
33 files changed, 2408 insertions, 2408 deletions
diff --git a/python/pyqt/doc/PyQt.html b/python/pyqt/doc/PyQt.html index c2768f33..78c04c2a 100644 --- a/python/pyqt/doc/PyQt.html +++ b/python/pyqt/doc/PyQt.html @@ -340,7 +340,7 @@ CLASS="PROGRAMLISTING" >void DebMainWindowFrm::browsePushButtonClicked() { if self.debugging: - QMessageBox.critical(self, "Event", "browse pushbutton was clicked!") + TQMessageBox.critical(self, "Event", "browse pushbutton was clicked!") }</PRE ></TD ></TR @@ -358,11 +358,11 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->class DebMainWindowFrm(QMainWindow): +>class DebMainWindowFrm(TQMainWindow): ...stuff... def browsePushButtonClicked(self): if self.debugging: - QMessageBox.critical(self, "Event", "browse pushbutton was clicked!")</PRE + TQMessageBox.critical(self, "Event", "browse pushbutton was clicked!")</PRE ></TD ></TR ></TABLE @@ -1231,18 +1231,18 @@ NAME="AEN467" >Unicode support was added to Qt in v2.0 and to Python in v1.6. In Qt, Unicode support is implemented using the <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > class. It is important to understand that <TT CLASS="LITERAL" ->QString</TT +>TQString</TT >s, Python string objects and Python Unicode objects are all different but conversions between them are automatic in many cases and easy to achieve manually when needed.</P ><P >Whenever PyQt expects a <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > as a function argument, a Python string object or a Python Unicode object can be provided instead, and PyQt will do the necessary conversion automatically.</P @@ -1250,10 +1250,10 @@ PyQt will do the necessary conversion automatically.</P >You may also manually convert Python string and Unicode objects to <TT CLASS="LITERAL" ->QString</TT +>TQString</TT >s by using the <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > constructor as demonstrated in the following code fragment.</P ><TABLE @@ -1264,15 +1264,15 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->qs1 = QString('Converted Python string object') -qs2 = QString(u'Converted Python Unicode object')</PRE +>qs1 = TQString('Converted Python string object') +qs2 = TQString(u'Converted Python Unicode object')</PRE ></TD ></TR ></TABLE ><P >In order to convert a <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > to a Python string object use the Python <TT CLASS="LITERAL" @@ -1283,16 +1283,16 @@ CLASS="LITERAL" >str()</TT > to a null <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > and an empty <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > both result in an empty Python string object.</P ><P >In order to convert a <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > to a Python Unicode object use the Python <TT CLASS="LITERAL" @@ -1303,11 +1303,11 @@ CLASS="LITERAL" >unicode()</TT > to a null <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > and an empty <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > both result in an empty Python Unicode object.</P ></DIV ><DIV @@ -1474,8 +1474,8 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->c = new QColor(); -c = new QColor();</PRE +>c = new TQColor(); +c = new TQColor();</PRE ></TD ></TR ></TABLE @@ -1493,8 +1493,8 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->c = QColor() -c = QColor()</PRE +>c = TQColor() +c = TQColor()</PRE ></TD ></TR ></TABLE @@ -1509,8 +1509,8 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->self.c1 = QColor() -self.c2 = QColor()</PRE +>self.c1 = TQColor() +self.c2 = TQColor()</PRE ></TD ></TR ></TABLE @@ -1519,7 +1519,7 @@ self.c2 = QColor()</PRE will eventually call the destructor of that second instance. The most common example is that a <TT CLASS="LITERAL" ->QObject</TT +>TQObject</TT > (and any of its sub-classes) keeps pointers to its children and will automatically call their destructors. In these cases, the corresponding Python object will also keep a reference to the @@ -1527,7 +1527,7 @@ corresponding child objects.</P ><P >So, in the following Python fragment, the first <TT CLASS="LITERAL" ->QLabel</TT +>TQLabel</TT > is not destroyed when the second is assigned to <TT CLASS="LITERAL" @@ -1535,7 +1535,7 @@ CLASS="LITERAL" > because the parent <TT CLASS="LITERAL" ->QWidget</TT +>TQWidget</TT > still has a reference to it.</P ><TABLE BORDER="0" @@ -1545,9 +1545,9 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->p = QWidget() -l = QLabel('First label',p) -l = QLabel('Second label',p)</PRE +>p = TQWidget() +l = TQLabel('First label',p) +l = TQLabel('Second label',p)</PRE ></TD ></TR ></TABLE @@ -1571,9 +1571,9 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->tab = QTab() +>tab = TQTab() tab.label = "First Tab" -tab.r = QRect(10,10,75,30)</PRE +tab.r = TQRect(10,10,75,30)</PRE ></TD ></TR ></TABLE @@ -1613,14 +1613,14 @@ CLASS="LITERAL" > class, and the <TT CLASS="LITERAL" ->QApplication::translate()</TT +>TQApplication::translate()</TT >, <TT CLASS="LITERAL" ->QObject::tr()</TT +>TQObject::tr()</TT > and <TT CLASS="LITERAL" ->QObject::trUtf8()</TT +>TQObject::trUtf8()</TT > methods. Usually the <TT CLASS="LITERAL" @@ -1637,7 +1637,7 @@ CLASS="LITERAL" > and uses the hardcoded class name as the context. On the other hand, <TT CLASS="LITERAL" ->QApplication::translate()</TT +>TQApplication::translate()</TT > allows to context to be explicitly stated.</P ><P @@ -1669,9 +1669,9 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->class A(QObject): +>class A(TQObject): def __init__(self): - QObject.__init__(self) + TQObject.__init__(self) def hello(self): return self.tr("Hello") @@ -1712,7 +1712,7 @@ CLASS="LITERAL" >The PyQt behaviour is unsatisfactory and may be changed in the future. It is recommended that <TT CLASS="LITERAL" ->QApplication.translate()</TT +>TQApplication.translate()</TT > be used in preference to <TT CLASS="LITERAL" @@ -1729,7 +1729,7 @@ CLASS="LITERAL" > that uses <TT CLASS="LITERAL" ->QApplication.translate()</TT +>TQApplication.translate()</TT >.</P ><TABLE BORDER="0" @@ -1739,9 +1739,9 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->class A(QObject): +>class A(TQObject): def __init__(self): - QObject.__init__(self) + TQObject.__init__(self) def hello(self): return qApp.translate("A","Hello")</PRE @@ -1755,7 +1755,7 @@ CLASS="LITERAL" > uses <TT CLASS="LITERAL" ->QApplication.translate()</TT +>TQApplication.translate()</TT >.</P ></DIV ></DIV @@ -1771,25 +1771,25 @@ NAME="AEN589" >A signal may be either a Qt signal (specified using <TT CLASS="LITERAL" ->SIGNAL()</TT +>TQT_SIGNAL()</TT >) or a Python signal (specified using <TT CLASS="LITERAL" ->PYSIGNAL()</TT +>PYQT_SIGNAL()</TT >).</P ><P >A slot can be either a Python callable object, a Qt signal (specified using <TT CLASS="LITERAL" ->SIGNAL()</TT +>TQT_SIGNAL()</TT >), a Python signal (specified using <TT CLASS="LITERAL" ->PYSIGNAL()</TT +>PYQT_SIGNAL()</TT >), or a Qt slot (specified using <TT CLASS="LITERAL" ->SLOT()</TT +>TQT_SLOT()</TT >).</P ><P >You connect signals to slots (and other signals) as you would from C++. For @@ -1802,14 +1802,14 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->QObject.connect(a,SIGNAL("QtSig()"),pyFunction) -QObject.connect(a,SIGNAL("QtSig()"),pyClass.pyMethod) -QObject.connect(a,SIGNAL("QtSig()"),PYSIGNAL("PySig")) -QObject.connect(a,SIGNAL("QtSig()"),SLOT("QtSlot()")) -QObject.connect(a,PYSIGNAL("PySig"),pyFunction) -QObject.connect(a,PYSIGNAL("PySig"),pyClass.pyMethod) -QObject.connect(a,PYSIGNAL("PySig"),SIGNAL("QtSig()")) -QObject.connect(a,PYSIGNAL("PySig"),SLOT("QtSlot()"))</PRE +>TQObject.connect(a,TQT_SIGNAL("QtSig()"),pyFunction) +TQObject.connect(a,TQT_SIGNAL("QtSig()"),pyClass.pyMethod) +TQObject.connect(a,TQT_SIGNAL("QtSig()"),PYQT_SIGNAL("PySig")) +TQObject.connect(a,TQT_SIGNAL("QtSig()"),TQT_SLOT("QtSlot()")) +TQObject.connect(a,PYQT_SIGNAL("PySig"),pyFunction) +TQObject.connect(a,PYQT_SIGNAL("PySig"),pyClass.pyMethod) +TQObject.connect(a,PYQT_SIGNAL("PySig"),TQT_SIGNAL("QtSig()")) +TQObject.connect(a,PYQT_SIGNAL("PySig"),TQT_SLOT("QtSlot()"))</PRE ></TD ></TR ></TABLE @@ -1825,11 +1825,11 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->sbar = QScrollBar() -lcd = QLCDNumber() +>sbar = TQScrollBar() +lcd = TQLCDNumber() -QObject.connect(sbar,SIGNAL("valueChanged(int)"),lcd.display) -QObject.connect(sbar,SIGNAL("valueChanged(int)"),lcd,SLOT("display(int)"))</PRE +TQObject.connect(sbar,TQT_SIGNAL("valueChanged(int)"),lcd.display) +TQObject.connect(sbar,TQT_SIGNAL("valueChanged(int)"),lcd,TQT_SLOT("display(int)"))</PRE ></TD ></TR ></TABLE @@ -1841,7 +1841,7 @@ more efficient.</P ><P >Any instance of a class that is derived from the <TT CLASS="LITERAL" ->QObject</TT +>TQObject</TT > class can emit a signal using the <TT CLASS="LITERAL" @@ -1857,8 +1857,8 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->a.emit(SIGNAL("clicked()"),()) -a.emit(PYSIGNAL("pySig"),("Hello","World"))</PRE +>a.emit(TQT_SIGNAL("clicked()"),()) +a.emit(PYQT_SIGNAL("pySig"),("Hello","World"))</PRE ></TD ></TR ></TABLE @@ -1887,18 +1887,18 @@ NAME="AEN610" For example the C++ static member function <TT CLASS="LITERAL" ->QObject::connect()</TT +>TQObject::connect()</TT > is called from Python as <TT CLASS="LITERAL" ->QObject.connect()</TT +>TQObject.connect()</TT > or <TT CLASS="LITERAL" >self.connect()</TT > if called from a sub-class of <TT CLASS="LITERAL" ->QObject</TT +>TQObject</TT >.</P ></DIV ><DIV @@ -1924,8 +1924,8 @@ WIDTH="100%" ><PRE CLASS="PROGRAMLISTING" >Qt.SolidPattern -QWidget.TabFocus -QFrame.TabFocus</PRE +TQWidget.TabFocus +TQFrame.TabFocus</PRE ></TD ></TR ></TABLE @@ -2016,12 +2016,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN642" ->QAccel</A +>TQAccel</A ></H3 ><P ><TT CLASS="LITERAL" ->QAccel</TT +>TQAccel</TT > is fully implemented.</P ></DIV ><DIV @@ -2030,12 +2030,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN646" ->QAction (Qt v2.2+)</A +>TQAction (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QAction</TT +>TQAction</TT > is fully implemented.</P ></DIV ><DIV @@ -2044,12 +2044,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN650" ->QActionGroup (Qt v2.2+)</A +>TQActionGroup (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QActionGroup</TT +>TQActionGroup</TT > is fully implemented.</P ></DIV ><DIV @@ -2058,7 +2058,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN654" ->QApplication</A +>TQApplication</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -2069,7 +2069,7 @@ NAME="AEN656" ></A ><CODE CLASS="FUNCDEF" ->QApplication</CODE +>TQApplication</CODE >(int &argc, char **argv);<P ></P ></DIV @@ -2085,7 +2085,7 @@ NAME="AEN664" ></A ><CODE CLASS="FUNCDEF" ->QApplication</CODE +>TQApplication</CODE >(int &argc, char **argv, bool GUIenabled);<P ></P ></DIV @@ -2101,7 +2101,7 @@ NAME="AEN674" ></A ><CODE CLASS="FUNCDEF" ->QApplication</CODE +>TQApplication</CODE >(int &argc, char **argv, Type type);<P ></P ></DIV @@ -2147,12 +2147,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN694" ->QBitmap</A +>TQBitmap</A ></H3 ><P ><TT CLASS="LITERAL" ->QBitmap</TT +>TQBitmap</TT > is fully implemented.</P ></DIV ><DIV @@ -2161,12 +2161,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN698" ->QBrush</A +>TQBrush</A ></H3 ><P ><TT CLASS="LITERAL" ->QBrush</TT +>TQBrush</TT > is fully implemented, including the Python <TT CLASS="LITERAL" @@ -2182,12 +2182,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN704" ->QButton</A +>TQButton</A ></H3 ><P ><TT CLASS="LITERAL" ->QButton</TT +>TQButton</TT > is fully implemented.</P ></DIV ><DIV @@ -2196,12 +2196,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN708" ->QButtonGroup</A +>TQButtonGroup</A ></H3 ><P ><TT CLASS="LITERAL" ->QButtonGroup</TT +>TQButtonGroup</TT > is fully implemented.</P ></DIV ><DIV @@ -2210,16 +2210,16 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN712" ->QByteArray</A +>TQByteArray</A ></H3 ><P >A Python string can be used whenever a <TT CLASS="LITERAL" ->QByteArray</TT +>TQByteArray</TT > can be used. A <TT CLASS="LITERAL" ->QByteArray</TT +>TQByteArray</TT > can be converted to a Python string using the Python <TT CLASS="LITERAL" @@ -2234,7 +2234,7 @@ NAME="AEN718" ></A ><CODE CLASS="FUNCDEF" ->QByteArray &assign</CODE +>TQByteArray &assign</CODE >(const char *data, uint size);<P ></P ></DIV @@ -2324,7 +2324,7 @@ NAME="AEN762" ></A ><CODE CLASS="FUNCDEF" ->QByteArray &setRawData</CODE +>TQByteArray &setRawData</CODE >(const char *data, uintsize);<P ></P ></DIV @@ -2337,12 +2337,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN770" ->QCDEStyle (Qt v2+)</A +>TQCDEStyle (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCDEStyle</TT +>TQCDEStyle</TT > is fully implemented.</P ></DIV ><DIV @@ -2351,12 +2351,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN774" ->QCheckBox</A +>TQCheckBox</A ></H3 ><P ><TT CLASS="LITERAL" ->QCheckBox</TT +>TQCheckBox</TT > is fully implemented.</P ></DIV ><DIV @@ -2404,7 +2404,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN794" ->QColor</A +>TQColor</A ></H3 ><P >The Python <TT @@ -2534,7 +2534,7 @@ NAME="AEN853" ><CODE CLASS="FUNCDEF" >static QRgb getRgba</CODE ->(QRgb initial, bool *ok, QWidget *parent = 0, const char *name = 0);<P +>(QRgb initial, bool *ok, TQWidget *parent = 0, const char *name = 0);<P ></P ></DIV ><P @@ -2563,12 +2563,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN870" ->QColorGroup</A +>TQColorGroup</A ></H3 ><P ><TT CLASS="LITERAL" ->QColorGroup</TT +>TQColorGroup</TT > is fully implemented.</P ></DIV ><DIV @@ -2577,12 +2577,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN874" ->QComboBox</A +>TQComboBox</A ></H3 ><P ><TT CLASS="LITERAL" ->QComboBox</TT +>TQComboBox</TT > is fully implemented.</P ></DIV ><DIV @@ -2591,7 +2591,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN878" ->QCommonStyle (Qt v2+)</A +>TQCommonStyle (Qt v2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -2625,7 +2625,7 @@ NAME="AEN890" ><CODE CLASS="FUNCDEF" >virtual void tabbarMetrics</CODE ->(const QTabBar *t, int &hframe, int &vframe, int &overlap);<P +>(const TQTabBar *t, int &hframe, int &vframe, int &overlap);<P ></P ></DIV ><P @@ -2651,16 +2651,16 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN906" ->QCString (Qt v2+)</A +>TQCString (Qt v2+)</A ></H3 ><P >A Python string can be used whenever a <TT CLASS="LITERAL" ->QCString</TT +>TQCString</TT > can be used. A <TT CLASS="LITERAL" ->QCString</TT +>TQCString</TT > can be converted to a Python string using the Python <TT CLASS="LITERAL" @@ -2675,7 +2675,7 @@ NAME="AEN912" ></A ><CODE CLASS="FUNCDEF" ->QCString &sprintf</CODE +>TQCString &sprintf</CODE >(const char *format, ...);<P ></P ></DIV @@ -2864,12 +2864,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN983" ->QCursor</A +>TQCursor</A ></H3 ><P ><TT CLASS="LITERAL" ->QCursor</TT +>TQCursor</TT > is fully implemented.</P ></DIV ><DIV @@ -2878,7 +2878,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN987" ->QDataStream</A +>TQDataStream</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -2889,14 +2889,14 @@ NAME="AEN989" ></A ><CODE CLASS="FUNCDEF" ->QDataStream &readBytes</CODE +>TQDataStream &readBytes</CODE >(const char *&s, uint &l);<P ></P ></DIV ><P >This takes no parameters. The <TT CLASS="LITERAL" ->QDataStream</TT +>TQDataStream</TT > result and the data read are returned as a tuple.</P ><DIV @@ -2908,7 +2908,7 @@ NAME="AEN998" ></A ><CODE CLASS="FUNCDEF" ->QDataStream &readRawBytes</CODE +>TQDataStream &readRawBytes</CODE >(const char *s, uint l);<P ></P ></DIV @@ -2919,7 +2919,7 @@ CLASS="LITERAL" > parameter. The <TT CLASS="LITERAL" ->QDataStream</TT +>TQDataStream</TT > result and the data read are returned as a tuple.</P ><DIV @@ -2931,7 +2931,7 @@ NAME="AEN1008" ></A ><CODE CLASS="FUNCDEF" ->QDataStream &writeBytes</CODE +>TQDataStream &writeBytes</CODE >(const char *s, uint len);<P ></P ></DIV @@ -2953,7 +2953,7 @@ NAME="AEN1018" ></A ><CODE CLASS="FUNCDEF" ->QDataStream &writeRawBytes</CODE +>TQDataStream &writeRawBytes</CODE >(const char *s, uint len);<P ></P ></DIV @@ -2973,7 +2973,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1028" ->QDate</A +>TQDate</A ></H3 ><P >The Python @@ -3026,12 +3026,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1044" ->QDateTime</A +>TQDateTime</A ></H3 ><P ><TT CLASS="LITERAL" ->QDateTime</TT +>TQDateTime</TT > is fully implemented, including the Python <TT CLASS="LITERAL" @@ -3066,12 +3066,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1055" ->QTime</A +>TQTime</A ></H3 ><P ><TT CLASS="LITERAL" ->QTime</TT +>TQTime</TT > is fully implemented, including the Python <TT CLASS="LITERAL" @@ -3148,12 +3148,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1078" ->QDesktopWidget (Qt v3+)</A +>TQDesktopWidget (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDesktopWidget</TT +>TQDesktopWidget</TT > is fully implemented.</P ></DIV ><DIV @@ -3162,12 +3162,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1082" ->QDial (Qt v2.2+)</A +>TQDial (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDial</TT +>TQDial</TT > is fully implemented.</P ></DIV ><DIV @@ -3176,7 +3176,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1086" ->QDialog</A +>TQDialog</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -3203,7 +3203,7 @@ Python wrapper is garbage collected. Although this is a little inconsistent, it ensures that the dialog is deleted without having to explicity code it using <TT CLASS="LITERAL" ->QObject.deleteLater()</TT +>TQObject.deleteLater()</TT > or other techniques.</P ></DIV ><DIV @@ -3212,12 +3212,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1096" ->QDir</A +>TQDir</A ></H3 ><P ><TT CLASS="LITERAL" ->QDir</TT +>TQDir</TT > is fully implemented, including the Python <TT CLASS="LITERAL" @@ -3254,7 +3254,7 @@ CLASS="LITERAL" the return type of a function or the type of an argument, a Python list of <TT CLASS="LITERAL" ->QFileInfo</TT +>TQFileInfo</TT > instances is used instead.</P ></DIV ><DIV @@ -3263,7 +3263,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1110" ->QDockArea (Qt v3+)</A +>TQDockArea (Qt v3+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -3275,7 +3275,7 @@ NAME="AEN1112" ><CODE CLASS="FUNCDEF" >bool hasDockWindow const</CODE ->(QDockWindow *w, int *index = 0);<P +>(TQDockWindow *w, int *index = 0);<P ></P ></DIV ><P @@ -3283,7 +3283,7 @@ CLASS="FUNCDEF" CLASS="LITERAL" >w</TT > parameter and returns the index of the -QDockWIndow or -1 if the QDockArea does not contain the QDockWindow.</P +QDockWIndow or -1 if the TQDockArea does not contain the TQDockWindow.</P ></DIV ><DIV CLASS="SECT2" @@ -3291,12 +3291,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1121" ->QDockWindow (Qt v3+)</A +>TQDockWindow (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDockWindow</TT +>TQDockWindow</TT > is fully implemented.</P ></DIV ><DIV @@ -3305,12 +3305,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1125" ->QColorDrag (Qt v2.1+)</A +>TQColorDrag (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QColorDrag</TT +>TQColorDrag</TT > is fully implemented.</P ></DIV ><DIV @@ -3319,12 +3319,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1129" ->QDragObject</A +>TQDragObject</A ></H3 ><P ><TT CLASS="LITERAL" ->QDragObject</TT +>TQDragObject</TT > is fully implemented.</P ></DIV ><DIV @@ -3333,12 +3333,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1133" ->QImageDrag</A +>TQImageDrag</A ></H3 ><P ><TT CLASS="LITERAL" ->QImageDrag</TT +>TQImageDrag</TT > is fully implemented.</P ></DIV ><DIV @@ -3347,12 +3347,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1137" ->QStoredDrag</A +>TQStoredDrag</A ></H3 ><P ><TT CLASS="LITERAL" ->QStoredDrag</TT +>TQStoredDrag</TT > is fully implemented.</P ></DIV ><DIV @@ -3361,12 +3361,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1141" ->QTextDrag</A +>TQTextDrag</A ></H3 ><P ><TT CLASS="LITERAL" ->QTextDrag</TT +>TQTextDrag</TT > is fully implemented.</P ></DIV ><DIV @@ -3375,12 +3375,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1145" ->QUriDrag (Qt v2+)</A +>TQUriDrag (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QUriDrag</TT +>TQUriDrag</TT > is fully implemented.</P ></DIV ><DIV @@ -3403,12 +3403,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1153" ->QDropSite</A +>TQDropSite</A ></H3 ><P ><TT CLASS="LITERAL" ->QDropSite</TT +>TQDropSite</TT > is fully implemented.</P ></DIV ><DIV @@ -3417,12 +3417,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1157" ->QErrorMessage (Qt v3+)</A +>TQErrorMessage (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QErrorMessage</TT +>TQErrorMessage</TT > is fully implemented.</P ></DIV ><DIV @@ -3431,17 +3431,17 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1161" ->QEvent</A +>TQEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QEvent</TT +>TQEvent</TT > is fully implemented.</P ><P >Instances of <TT CLASS="LITERAL" ->QEvent</TT +>TQEvent</TT >s are automatically converted to the correct sub-class.</P ></DIV @@ -3451,12 +3451,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1167" ->QChildEvent</A +>TQChildEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QChildEvent</TT +>TQChildEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3465,12 +3465,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1171" ->QCloseEvent</A +>TQCloseEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QCloseEvent</TT +>TQCloseEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3479,12 +3479,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1175" ->QIconDragEvent (Qt v3.3+)</A +>TQIconDragEvent (Qt v3.3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QIconDragEvent</TT +>TQIconDragEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3493,12 +3493,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1179" ->QContextMenuEvent (Qt v3+)</A +>TQContextMenuEvent (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QContextMenuEvent</TT +>TQContextMenuEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3507,12 +3507,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1183" ->QCustomEvent</A +>TQCustomEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QCustomEvent</TT +>TQCustomEvent</TT > is fully implemented. Any Python object can be passed as the event data and its reference count is increased.</P ></DIV @@ -3522,12 +3522,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1187" ->QDragEnterEvent</A +>TQDragEnterEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QDragEnterEvent</TT +>TQDragEnterEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3536,12 +3536,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1191" ->QDragLeaveEvent</A +>TQDragLeaveEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QDragLeaveEvent</TT +>TQDragLeaveEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3550,12 +3550,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1195" ->QDragMoveEvent</A +>TQDragMoveEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QDragMoveEvent</TT +>TQDragMoveEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3564,12 +3564,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1199" ->QDropEvent</A +>TQDropEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QDropEvent</TT +>TQDropEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3578,12 +3578,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1203" ->QFocusEvent</A +>TQFocusEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QFocusEvent</TT +>TQFocusEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3592,12 +3592,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1207" ->QHideEvent</A +>TQHideEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QHideEvent</TT +>TQHideEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3606,12 +3606,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1211" ->QIMComposeEvent (Qt v3.1+)</A +>TQIMComposeEvent (Qt v3.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QIMComposeEvent</TT +>TQIMComposeEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3620,12 +3620,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1215" ->QIMEvent (Qt v3+)</A +>TQIMEvent (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QIMEvent</TT +>TQIMEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3634,12 +3634,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1219" ->QKeyEvent</A +>TQKeyEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QKeyEvent</TT +>TQKeyEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3648,12 +3648,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1223" ->QMouseEvent</A +>TQMouseEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QMouseEvent</TT +>TQMouseEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3662,12 +3662,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1227" ->QMoveEvent</A +>TQMoveEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QMoveEvent</TT +>TQMoveEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3676,12 +3676,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1231" ->QPaintEvent</A +>TQPaintEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QPaintEvent</TT +>TQPaintEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3690,12 +3690,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1235" ->QResizeEvent</A +>TQResizeEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QResizeEvent</TT +>TQResizeEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3704,12 +3704,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1239" ->QShowEvent</A +>TQShowEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QShowEvent</TT +>TQShowEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3718,12 +3718,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1243" ->QTabletEvent (Qt v3+)</A +>TQTabletEvent (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QTabletEvent</TT +>TQTabletEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3732,12 +3732,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1247" ->QTimerEvent</A +>TQTimerEvent</A ></H3 ><P ><TT CLASS="LITERAL" ->QTimerEvent</TT +>TQTimerEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3746,12 +3746,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1251" ->QWheelEvent (Qt v2+)</A +>TQWheelEvent (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QWheelEvent</TT +>TQWheelEvent</TT > is fully implemented.</P ></DIV ><DIV @@ -3760,7 +3760,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1255" ->QEventLoop (Qt v3.1+)</A +>TQEventLoop (Qt v3.1+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -3787,7 +3787,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1263" ->QFile</A +>TQFile</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -3915,12 +3915,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1317" ->QFileDialog</A +>TQFileDialog</A ></H3 ><P ><TT CLASS="LITERAL" ->QFileDialog</TT +>TQFileDialog</TT > is fully implemented.</P ></DIV ><DIV @@ -3929,12 +3929,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1321" ->QFileIconProvider</A +>TQFileIconProvider</A ></H3 ><P ><TT CLASS="LITERAL" ->QFileIconProvider</TT +>TQFileIconProvider</TT > is fully implemented.</P ></DIV ><DIV @@ -3943,12 +3943,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1325" ->QFilePreview</A +>TQFilePreview</A ></H3 ><P ><TT CLASS="LITERAL" ->QFilePreview</TT +>TQFilePreview</TT > is fully implemented. However it cannot be used from Python in the same way as it is used from C++ because PyQt does not support multiple inheritance involving more than one wrapped class. A trick @@ -3962,19 +3962,19 @@ WIDTH="100%" ><TD ><PRE CLASS="PROGRAMLISTING" ->class FilePreview(QFilePreview): +>class FilePreview(TQFilePreview): pass -class Preview(QLabel): +class Preview(TQLabel): def __init__(self, parent=None): - QLabel.__init__(self, parent) + TQLabel.__init__(self, parent) self.preview = FilePreview() self.preview.previewUrl = self.previewUrl</PRE ></TD ></TR ></TABLE ><P ->Note that QFilePreview cannot be instantiated directly because it is abstract. +>Note that TQFilePreview cannot be instantiated directly because it is abstract. Thanks to Hans-Peter Jansen for this trick.</P ></DIV ><DIV @@ -3983,12 +3983,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1331" ->QFileInfo</A +>TQFileInfo</A ></H3 ><P ><TT CLASS="LITERAL" ->QFileInfo</TT +>TQFileInfo</TT > is fully implemented.</P ></DIV ><DIV @@ -3997,12 +3997,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1335" ->QFont</A +>TQFont</A ></H3 ><P ><TT CLASS="LITERAL" ->QFont</TT +>TQFont</TT > is fully implemented, including the Python <TT CLASS="LITERAL" @@ -4018,12 +4018,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1341" ->QFontDatabase (Qt v2.1+)</A +>TQFontDatabase (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QFontDatabase</TT +>TQFontDatabase</TT > is fully implemented.</P ></DIV ><DIV @@ -4043,8 +4043,8 @@ NAME="AEN1347" ></A ><CODE CLASS="FUNCDEF" ->static QFont getFont</CODE ->(bool *ok, const QFont &def, QWidget *parent = 0, const char *name = 0);<P +>static TQFont getFont</CODE +>(bool *ok, const TQFont &def, TQWidget *parent = 0, const char *name = 0);<P ></P ></DIV ><P @@ -4061,7 +4061,7 @@ CLASS="LITERAL" > parameters and returns a tuple containing the <TT CLASS="LITERAL" ->QFont</TT +>TQFont</TT > result and the <TT CLASS="LITERAL" >ok</TT @@ -4075,8 +4075,8 @@ NAME="AEN1364" ></A ><CODE CLASS="FUNCDEF" ->static QFont getFont</CODE ->(bool *ok, QWidget *parent = 0, const char *name = 0);<P +>static TQFont getFont</CODE +>(bool *ok, TQWidget *parent = 0, const char *name = 0);<P ></P ></DIV ><P @@ -4089,7 +4089,7 @@ CLASS="LITERAL" > parameters and returns a tuple containing the <TT CLASS="LITERAL" ->QFont</TT +>TQFont</TT > result and the <TT CLASS="LITERAL" @@ -4102,12 +4102,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1378" ->QFontInfo</A +>TQFontInfo</A ></H3 ><P ><TT CLASS="LITERAL" ->QFontInfo</TT +>TQFontInfo</TT > is fully implemented.</P ></DIV ><DIV @@ -4116,7 +4116,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1382" ->QFontMetrics</A +>TQFontMetrics</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -4127,8 +4127,8 @@ NAME="AEN1384" ></A ><CODE CLASS="FUNCDEF" ->QRect boundingRect</CODE ->(int x, int y, int w, int h, int flags, const QString &str, int len = -1, int tabstops = 0, int *tabarray = 0);<P +>TQRect boundingRect</CODE +>(int x, int y, int w, int h, int flags, const TQString &str, int len = -1, int tabstops = 0, int *tabarray = 0);<P ></P ></DIV ><P @@ -4145,8 +4145,8 @@ NAME="AEN1407" ></A ><CODE CLASS="FUNCDEF" ->QSize size</CODE ->(int flags, const QString &str, int len = -1, int tabstops = 0, int *tabarray = 0);<P +>TQSize size</CODE +>(int flags, const TQString &str, int len = -1, int tabstops = 0, int *tabarray = 0);<P ></P ></DIV ><P @@ -4161,12 +4161,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1422" ->QFrame</A +>TQFrame</A ></H3 ><P ><TT CLASS="LITERAL" ->QFrame</TT +>TQFrame</TT > is fully implemented.</P ></DIV ><DIV @@ -4203,12 +4203,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1434" ->QGrid (Qt v2+)</A +>TQGrid (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QGrid</TT +>TQGrid</TT > is fully implemented.</P ></DIV ><DIV @@ -4217,12 +4217,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1438" ->QGridView (Qt v3+)</A +>TQGridView (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QGridView</TT +>TQGridView</TT > is fully implemented.</P ></DIV ><DIV @@ -4231,12 +4231,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1442" ->QGroupBox</A +>TQGroupBox</A ></H3 ><P ><TT CLASS="LITERAL" ->QGroupBox</TT +>TQGroupBox</TT > is fully implemented.</P ></DIV ><DIV @@ -4245,12 +4245,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1446" ->QHBox (Qt v2+)</A +>TQHBox (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QHBox</TT +>TQHBox</TT > is fully implemented.</P ></DIV ><DIV @@ -4259,12 +4259,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1450" ->QHButtonGroup (Qt v2+)</A +>TQHButtonGroup (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QHButtonGroup</TT +>TQHButtonGroup</TT > is fully implemented.</P ></DIV ><DIV @@ -4273,12 +4273,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1454" ->QHeader</A +>TQHeader</A ></H3 ><P ><TT CLASS="LITERAL" ->QHeader</TT +>TQHeader</TT > is fully implemented.</P ></DIV ><DIV @@ -4287,12 +4287,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1458" ->QHGroupBox (Qt v2+)</A +>TQHGroupBox (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QHGroupBox</TT +>TQHGroupBox</TT > is fully implemented.</P ></DIV ><DIV @@ -4301,12 +4301,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1462" ->QIconSet</A +>TQIconSet</A ></H3 ><P ><TT CLASS="LITERAL" ->QIconSet</TT +>TQIconSet</TT > is fully implemented.</P ></DIV ><DIV @@ -4315,12 +4315,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1466" ->QIconFactory (Qt v3.1+)</A +>TQIconFactory (Qt v3.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QIconFactory</TT +>TQIconFactory</TT > is fully implemented.</P ></DIV ><DIV @@ -4329,7 +4329,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1470" ->QIconView (Qt v2.1+)</A +>TQIconView (Qt v2.1+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -4340,8 +4340,8 @@ NAME="AEN1472" ></A ><CODE CLASS="FUNCDEF" ->QIconViewItem *makeRowLayout</CODE ->(QIconViewItem *begin, int &y);<P +>TQIconViewItem *makeRowLayout</CODE +>(TQIconViewItem *begin, int &y);<P ></P ></DIV ><P @@ -4353,12 +4353,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1480" ->QIconViewItem (Qt v2.1+)</A +>TQIconViewItem (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QIconViewItem</TT +>TQIconViewItem</TT > is fully implemented.</P ></DIV ><DIV @@ -4367,12 +4367,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1484" ->QIconDrag (Qt v2.1+)</A +>TQIconDrag (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QIconDrag</TT +>TQIconDrag</TT > is fully implemented.</P ></DIV ><DIV @@ -4381,12 +4381,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1488" ->QIconDragItem (Qt v2.1+)</A +>TQIconDragItem (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QIconDragItem</TT +>TQIconDragItem</TT > is fully implemented.</P ></DIV ><DIV @@ -4395,7 +4395,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1492" ->QImage</A +>TQImage</A ></H3 ><P >The Python <TT @@ -4415,7 +4415,7 @@ NAME="AEN1497" ></A ><CODE CLASS="FUNCDEF" ->QImage</CODE +>TQImage</CODE >(const char *xpm[]);<P ></P ></DIV @@ -4430,7 +4430,7 @@ NAME="AEN1503" ></A ><CODE CLASS="FUNCDEF" ->QImage</CODE +>TQImage</CODE >(uchar *data, int w, int h, int depth, QRgb *colorTable, int numColors, Endian bitOrder);<P ></P ></DIV @@ -4487,7 +4487,7 @@ NAME="AEN1534" ></A ><CODE CLASS="FUNCDEF" ->QImage convertDepthWithPalette</CODE +>TQImage convertDepthWithPalette</CODE >(int, QRgb *p, int pc, int cf = 0);<P ></P ></DIV @@ -4560,7 +4560,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1572" ->QImageIO</A +>TQImageIO</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -4584,12 +4584,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1588" ->QImageTextKeyLang</A +>TQImageTextKeyLang</A ></H3 ><P ><TT CLASS="LITERAL" ->QImageTextKeyLang</TT +>TQImageTextKeyLang</TT > is fully implemented.</P ></DIV ><DIV @@ -4609,8 +4609,8 @@ NAME="AEN1594" ></A ><CODE CLASS="FUNCDEF" ->static QString getText</CODE ->(const QString &caption, const QString &label, const QString &text = QString::null, bool *ok = 0, QWidget *parent = 0, const char *name = 0);<P +>static TQString getText</CODE +>(const TQString &caption, const TQString &label, const TQString &text = TQString::null, bool *ok = 0, TQWidget *parent = 0, const char *name = 0);<P ></P ></DIV ><P @@ -4620,7 +4620,7 @@ CLASS="LITERAL" > is not passed and the returned value is a tuple of the <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > result and the <TT CLASS="LITERAL" >ok</TT @@ -4635,8 +4635,8 @@ NAME="AEN1613" ></A ><CODE CLASS="FUNCDEF" ->static QString getText</CODE ->(const QString &caption, const QString &label, QLineEdit::EchoModeecho, const QString &text = QString::null, bool *ok = 0, QWidget *parent = 0, const char *name = 0);<P +>static TQString getText</CODE +>(const TQString &caption, const TQString &label, TQLineEdit::EchoModeecho, const TQString &text = TQString::null, bool *ok = 0, TQWidget *parent = 0, const char *name = 0);<P ></P ></DIV ><P @@ -4646,7 +4646,7 @@ CLASS="LITERAL" > is not passed and the returned value is a tuple of the <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > result and the <TT CLASS="LITERAL" >ok</TT @@ -4661,8 +4661,8 @@ NAME="AEN1634" ></A ><CODE CLASS="FUNCDEF" ->static QString getText</CODE ->(const QString &caption, const QString &label, QLineEdit::EchoModeecho = QLineEdit::Normal, const QString &text = QString::null, bool *ok = 0, QWidget *parent = 0, const char *name = 0);<P +>static TQString getText</CODE +>(const TQString &caption, const TQString &label, TQLineEdit::EchoModeecho = TQLineEdit::Normal, const TQString &text = TQString::null, bool *ok = 0, TQWidget *parent = 0, const char *name = 0);<P ></P ></DIV ><P @@ -4672,7 +4672,7 @@ CLASS="LITERAL" > is not passed and the returned value is a tuple of the <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > result and the <TT CLASS="LITERAL" >ok</TT @@ -4688,7 +4688,7 @@ NAME="AEN1655" ><CODE CLASS="FUNCDEF" >static int getInteger</CODE ->(const QString &caption, const QString &label, int num = 0, int from = -2147483647, int to = 2147483647, int step = 1, bool *ok = 0, QWidget *parent = 0, const char *name = 0);<P +>(const TQString &caption, const TQString &label, int num = 0, int from = -2147483647, int to = 2147483647, int step = 1, bool *ok = 0, TQWidget *parent = 0, const char *name = 0);<P ></P ></DIV ><P @@ -4713,7 +4713,7 @@ NAME="AEN1680" ><CODE CLASS="FUNCDEF" >static double getDouble</CODE ->(const QString &caption, const QString &label, double num = 0, double from = -2147483647, double to = 2147483647, int step = 1, bool *ok = 0, QWidget *parent = 0, const char *name = 0);<P +>(const TQString &caption, const TQString &label, double num = 0, double from = -2147483647, double to = 2147483647, int step = 1, bool *ok = 0, TQWidget *parent = 0, const char *name = 0);<P ></P ></DIV ><P @@ -4737,8 +4737,8 @@ NAME="AEN1705" ></A ><CODE CLASS="FUNCDEF" ->static QString getItem</CODE ->(const QString &caption, const QString &label, const QStringList &list, int current = 0, bool editable = TRUE, bool *ok = 0, QWidget *parent = 0, const char *name = 0);<P +>static TQString getItem</CODE +>(const TQString &caption, const TQString &label, const TQStringList &list, int current = 0, bool editable = TRUE, bool *ok = 0, TQWidget *parent = 0, const char *name = 0);<P ></P ></DIV ><P @@ -4748,7 +4748,7 @@ CLASS="LITERAL" > is not passed and the returned value is a tuple of the <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > result and the <TT CLASS="LITERAL" >ok</TT @@ -4772,7 +4772,7 @@ NAME="AEN1730" ><CODE CLASS="FUNCDEF" >void scrollBarMetrics</CODE ->(const QTabBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P +>(const TQTabBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P ></P ></DIV ><P @@ -4801,12 +4801,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1749" ->QIODevice</A +>TQIODevice</A ></H3 ><P ><TT CLASS="LITERAL" ->QIODevice</TT +>TQIODevice</TT > is fully implemented.</P ></DIV ><DIV @@ -4815,12 +4815,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1753" ->QKeySequence (Qt v3+)</A +>TQKeySequence (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QKeySequence</TT +>TQKeySequence</TT > is fully implemented including the operators <TT CLASS="LITERAL" @@ -4830,18 +4830,18 @@ CLASS="LITERAL" >!=</TT >, <TT CLASS="LITERAL" ->QString()</TT +>TQString()</TT > and <TT CLASS="LITERAL" >int()</TT >. A <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > instance or a Python integer may be used whenever a <TT CLASS="LITERAL" ->QKeySequence</TT +>TQKeySequence</TT > can be used.</P ></DIV ><DIV @@ -4850,12 +4850,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1763" ->QLabel</A +>TQLabel</A ></H3 ><P ><TT CLASS="LITERAL" ->QLabel</TT +>TQLabel</TT > is fully implemented.</P ></DIV ><DIV @@ -4864,12 +4864,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1767" ->QLayout</A +>TQLayout</A ></H3 ><P ><TT CLASS="LITERAL" ->QLayout</TT +>TQLayout</TT > is fully implemented.</P ></DIV ><DIV @@ -4878,12 +4878,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1771" ->QBoxLayout</A +>TQBoxLayout</A ></H3 ><P ><TT CLASS="LITERAL" ->QBoxLayout</TT +>TQBoxLayout</TT > is fully implemented.</P ></DIV ><DIV @@ -4892,12 +4892,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1775" ->QGLayoutIterator (Qt v2+)</A +>TQGLayoutIterator (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QGLayoutIterator</TT +>TQGLayoutIterator</TT > is fully implemented.</P ></DIV ><DIV @@ -4906,7 +4906,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1779" ->QGridLayout</A +>TQGridLayout</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -4918,7 +4918,7 @@ NAME="AEN1781" ><CODE CLASS="FUNCDEF" >bool findWidget</CODE ->(QWidget *w, int *row, int *col);<P +>(TQWidget *w, int *row, int *col);<P ></P ></DIV ><P @@ -4944,12 +4944,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1795" ->QHBoxLayout</A +>TQHBoxLayout</A ></H3 ><P ><TT CLASS="LITERAL" ->QHBoxLayout</TT +>TQHBoxLayout</TT > is fully implemented.</P ></DIV ><DIV @@ -4958,12 +4958,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1799" ->QLayoutItem (Qt v2+)</A +>TQLayoutItem (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QLayoutItem</TT +>TQLayoutItem</TT > is fully implemented.</P ></DIV ><DIV @@ -4972,7 +4972,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1803" ->QLayoutIterator (Qt v2+)</A +>TQLayoutIterator (Qt v2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -4983,14 +4983,14 @@ NAME="AEN1805" ></A ><CODE CLASS="FUNCDEF" ->QLayoutItem *next</CODE +>TQLayoutItem *next</CODE >();<P ></P ></DIV ><P >This is a wrapper around the <TT CLASS="LITERAL" ->QLayoutIterator</TT +>TQLayoutIterator</TT > <TT CLASS="LITERAL" @@ -5003,12 +5003,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1812" ->QSpacerItem (Qt v2+)</A +>TQSpacerItem (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSpacerItem</TT +>TQSpacerItem</TT > is fully implemented.</P ></DIV ><DIV @@ -5017,12 +5017,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1816" ->QVBoxLayout</A +>TQVBoxLayout</A ></H3 ><P ><TT CLASS="LITERAL" ->QVBoxLayout</TT +>TQVBoxLayout</TT > is fully implemented.</P ></DIV ><DIV @@ -5031,12 +5031,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1820" ->QWidgetItem (Qt v2+)</A +>TQWidgetItem (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QWidgetItem</TT +>TQWidgetItem</TT > is fully implemented.</P ></DIV ><DIV @@ -5045,12 +5045,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1824" ->QLCDNumber</A +>TQLCDNumber</A ></H3 ><P ><TT CLASS="LITERAL" ->QLCDNumber</TT +>TQLCDNumber</TT > is fully implemented.</P ></DIV ><DIV @@ -5059,12 +5059,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1828" ->QLibrary (Qt v3+)</A +>TQLibrary (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QLibrary</TT +>TQLibrary</TT > is fully implemented.</P ></DIV ><DIV @@ -5073,7 +5073,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1832" ->QLineEdit</A +>TQLineEdit</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -5085,7 +5085,7 @@ NAME="AEN1834" ><CODE CLASS="FUNCDEF" >int characterAt</CODE ->(int xpos, QChar *chr);<P +>(int xpos, TQChar *chr);<P ></P ></DIV ><P @@ -5160,7 +5160,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1864" ->QListBox</A +>TQListBox</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -5195,12 +5195,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1877" ->QListBoxItem</A +>TQListBoxItem</A ></H3 ><P ><TT CLASS="LITERAL" ->QListBoxItem</TT +>TQListBoxItem</TT > is fully implemented.</P ></DIV ><DIV @@ -5209,12 +5209,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1881" ->QListBoxPixmap</A +>TQListBoxPixmap</A ></H3 ><P ><TT CLASS="LITERAL" ->QListBoxPixmap</TT +>TQListBoxPixmap</TT > is fully implemented.</P ></DIV ><DIV @@ -5223,12 +5223,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1885" ->QListBoxText</A +>TQListBoxText</A ></H3 ><P ><TT CLASS="LITERAL" ->QListBoxText</TT +>TQListBoxText</TT > is fully implemented.</P ></DIV ><DIV @@ -5237,17 +5237,17 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1889" ->QListView</A +>TQListView</A ></H3 ><P ><TT CLASS="LITERAL" ->QListView</TT +>TQListView</TT > is fully implemented.</P ><P >Note that to remove a child <TT CLASS="LITERAL" ->QListViewItem</TT +>TQListViewItem</TT > you must first call <TT CLASS="LITERAL" @@ -5263,17 +5263,17 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1897" ->QListViewItem</A +>TQListViewItem</A ></H3 ><P ><TT CLASS="LITERAL" ->QListViewItem</TT +>TQListViewItem</TT > is fully implemented.</P ><P >Note that to remove a child <TT CLASS="LITERAL" ->QListViewItem</TT +>TQListViewItem</TT > you must first call <TT CLASS="LITERAL" @@ -5289,12 +5289,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1905" ->QCheckListItem</A +>TQCheckListItem</A ></H3 ><P ><TT CLASS="LITERAL" ->QCheckListItem</TT +>TQCheckListItem</TT > is fully implemented.</P ></DIV ><DIV @@ -5303,12 +5303,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1909" ->QListViewItemIterator (Qt v2+)</A +>TQListViewItemIterator (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QListViewItemIterator</TT +>TQListViewItemIterator</TT > is fully implemented.</P ></DIV ><DIV @@ -5317,7 +5317,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1913" ->QLocale (Qt v3.3+)</A +>TQLocale (Qt v3.3+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -5502,7 +5502,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1979" ->QMainWindow</A +>TQMainWindow</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -5513,8 +5513,8 @@ NAME="AEN1981" ></A ><CODE CLASS="FUNCDEF" ->QTextStream &operator<<</CODE ->(QTextStream &, const QMainWindow &);<P +>TQTextStream &operator<<</CODE +>(TQTextStream &, const TQMainWindow &);<P ></P ></DIV ><P @@ -5528,8 +5528,8 @@ NAME="AEN1989" ></A ><CODE CLASS="FUNCDEF" ->QTextStream &operator>></CODE ->(QTextStream &, QMainWindow &);<P +>TQTextStream &operator>></CODE +>(TQTextStream &, TQMainWindow &);<P ></P ></DIV ><P @@ -5544,7 +5544,7 @@ NAME="AEN1997" ><CODE CLASS="FUNCDEF" >bool getLocation</CODE ->(QToolBar *tb, ToolBarDock &dock, int &index, bool &nl, int &extraOffset);<P +>(TQToolBar *tb, ToolBarDock &dock, int &index, bool &nl, int &extraOffset);<P ></P ></DIV ><P @@ -5575,14 +5575,14 @@ NAME="AEN2016" ></A ><CODE CLASS="FUNCDEF" ->QList<QToolBar> toolBars</CODE +>QList<TQToolBar> toolBars</CODE >(ToolBarDock dock);<P ></P ></DIV ><P >This returns a list of <TT CLASS="LITERAL" ->QToolBar</TT +>TQToolBar</TT > instances. (Qt v2.1.0+)</P ></DIV ><DIV @@ -5591,12 +5591,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2023" ->QMemArray<type> (Qt v3+)</A +>TQMemArray<type> (Qt v3+)</A ></H3 ><P >Types based on the <TT CLASS="LITERAL" ->QMemArray</TT +>TQMemArray</TT > template are automatically converted to and from Python lists of the type.</P ></DIV @@ -5606,12 +5606,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2027" ->QMenuBar</A +>TQMenuBar</A ></H3 ><P ><TT CLASS="LITERAL" ->QMenuBar</TT +>TQMenuBar</TT > is fully implemented.</P ></DIV ><DIV @@ -5620,7 +5620,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2031" ->QMenuData</A +>TQMenuData</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -5631,8 +5631,8 @@ NAME="AEN2033" ></A ><CODE CLASS="FUNCDEF" ->QMenuItem *findItem</CODE ->(int id, QMenuData **parent);<P +>TQMenuItem *findItem</CODE +>(int id, TQMenuData **parent);<P ></P ></DIV ><P @@ -5644,12 +5644,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2041" ->QCustomMenuItem (Qt v2.1+)</A +>TQCustomMenuItem (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCustomMenuItem</TT +>TQCustomMenuItem</TT > is fully implemented.</P ></DIV ><DIV @@ -5658,12 +5658,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2045" ->QMenuItem</A +>TQMenuItem</A ></H3 ><P ><TT CLASS="LITERAL" ->QMenuItem</TT +>TQMenuItem</TT > is an internal Qt class.</P ></DIV ><DIV @@ -5672,12 +5672,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2049" ->QMessageBox</A +>TQMessageBox</A ></H3 ><P ><TT CLASS="LITERAL" ->QMessageBox</TT +>TQMessageBox</TT > is fully implemented.</P ></DIV ><DIV @@ -5686,7 +5686,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2053" ->QMetaObject</A +>TQMetaObject</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -5725,12 +5725,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2067" ->QMetaProperty</A +>TQMetaProperty</A ></H3 ><P ><TT CLASS="LITERAL" ->QMetaProperty</TT +>TQMetaProperty</TT > is fully implemented.</P ></DIV ><DIV @@ -5739,12 +5739,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2071" ->QMimeSource (Qt v2+)</A +>TQMimeSource (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QMimeSource</TT +>TQMimeSource</TT > is fully implemented.</P ></DIV ><DIV @@ -5753,12 +5753,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2075" ->QMimeSourceFactory (Qt v2+)</A +>TQMimeSourceFactory (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QMimeSourceFactory</TT +>TQMimeSourceFactory</TT > is fully implemented.</P ></DIV ><DIV @@ -5767,12 +5767,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2079" ->QWindowsMime (Qt v3+)</A +>TQWindowsMime (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QWindowsMime</TT +>TQWindowsMime</TT > is fully implemented.</P ></DIV ><DIV @@ -5781,7 +5781,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2083" ->QMotifPlusStyle (Qt v2.2+)</A +>TQMotifPlusStyle (Qt v2.2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -5815,7 +5815,7 @@ NAME="AEN2095" ><CODE CLASS="FUNCDEF" >void scrollBarMetrics</CODE ->(const QScrollBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P +>(const TQScrollBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P ></P ></DIV ><P @@ -5845,7 +5845,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2114" ->QMotifStyle (Qt v2+)</A +>TQMotifStyle (Qt v2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -5857,7 +5857,7 @@ NAME="AEN2116" ><CODE CLASS="FUNCDEF" >void scrollBarMetrics</CODE ->(const QTabBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P +>(const TQTabBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P ></P ></DIV ><P @@ -5890,7 +5890,7 @@ NAME="AEN2135" ><CODE CLASS="FUNCDEF" >void tabbarMetrics</CODE ->(const QTabBar *t, int &hframe, int &vframe, int &overlap);<P +>(const TQTabBar *t, int &hframe, int &vframe, int &overlap);<P ></P ></DIV ><P @@ -5916,7 +5916,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2151" ->QMovie</A +>TQMovie</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -5927,8 +5927,8 @@ NAME="AEN2153" ></A ><CODE CLASS="FUNCDEF" ->QMovie</CODE ->(QDataSource *src, int bufsize = 1024);<P +>TQMovie</CODE +>(TQDataSource *src, int bufsize = 1024);<P ></P ></DIV ><P @@ -5962,7 +5962,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2171" ->QMultiLineEdit</A +>TQMultiLineEdit</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -6062,12 +6062,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2215" ->QMutex (Qt v2.2+)</A +>TQMutex (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QMutex</TT +>TQMutex</TT > is fully implemented.</P ></DIV ><DIV @@ -6076,12 +6076,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2219" ->QMutexLocker (Qt v3.1+)</A +>TQMutexLocker (Qt v3.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QMutexLocker</TT +>TQMutexLocker</TT > is fully implemented.</P ></DIV ><DIV @@ -6090,12 +6090,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2223" ->QNetworkOperation (Qt v2.1+)</A +>TQNetworkOperation (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QNetworkOperation</TT +>TQNetworkOperation</TT > is fully implemented.</P ></DIV ><DIV @@ -6104,12 +6104,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2227" ->QNetworkProtocol (Qt v2.1+)</A +>TQNetworkProtocol (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QNetworkProtocol</TT +>TQNetworkProtocol</TT > is fully implemented.</P ></DIV ><DIV @@ -6118,12 +6118,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2231" ->QNetworkProtocolFactoryBase (Qt v2.1+)</A +>TQNetworkProtocolFactoryBase (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QNetworkProtocolFactoryBase</TT +>TQNetworkProtocolFactoryBase</TT > is fully implemented.</P ></DIV ><DIV @@ -6132,7 +6132,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2235" ->QObject</A +>TQObject</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -6144,7 +6144,7 @@ NAME="AEN2237" ><CODE CLASS="FUNCDEF" >bool disconnect</CODE ->(const QObject *receiver, const char *member = 0);<P +>(const TQObject *receiver, const char *member = 0);<P ></P ></DIV ><P @@ -6159,7 +6159,7 @@ NAME="AEN2245" ><CODE CLASS="FUNCDEF" >bool disconnect</CODE ->(const char *signal = 0, const QObject *receiver = 0, const char *member = 0);<P +>(const char *signal = 0, const TQObject *receiver = 0, const char *member = 0);<P ></P ></DIV ><P @@ -6174,7 +6174,7 @@ NAME="AEN2255" ><CODE CLASS="FUNCDEF" >static bool disconnect</CODE ->(const QObject *sender, const char *signal, const QObject *receiver, const char *member);<P +>(const TQObject *sender, const char *signal, const TQObject *receiver, const char *member);<P ></P ></DIV ><P @@ -6195,12 +6195,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2269" ->QObjectCleanupHandler (Qt v3+)</A +>TQObjectCleanupHandler (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QObjectCleanupHandler</TT +>TQObjectCleanupHandler</TT > is fully implemented.</P ></DIV ><DIV @@ -6209,17 +6209,17 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2273" ->QObjectList</A +>TQObjectList</A ></H3 ><P >This class isn't implemented. Whenever a <TT CLASS="LITERAL" ->QObjectList</TT +>TQObjectList</TT > is the return type of a function or the type of an argument, a Python list of <TT CLASS="LITERAL" ->QObject</TT +>TQObject</TT > instances is used instead.</P ></DIV ><DIV @@ -6228,12 +6228,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2278" ->QPaintDeviceMetrics</A +>TQPaintDeviceMetrics</A ></H3 ><P ><TT CLASS="LITERAL" ->QPaintDeviceMetrics</TT +>TQPaintDeviceMetrics</TT > is fully implemented.</P ></DIV ><DIV @@ -6242,7 +6242,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2282" ->QPaintDevice</A +>TQPaintDevice</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -6254,7 +6254,7 @@ NAME="AEN2284" ><CODE CLASS="FUNCDEF" >virtual bool cmd</CODE ->(int, QPainter *, QPDevCmdParam *);<P +>(int, TQPainter *, QPDevCmdParam *);<P ></P ></DIV ><P @@ -6266,7 +6266,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2291" ->QPainter</A +>TQPainter</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -6277,7 +6277,7 @@ NAME="AEN2293" ></A ><CODE CLASS="FUNCDEF" ->QRect boundingRect</CODE +>TQRect boundingRect</CODE >(int x, int y, int w, int h, int flags, const char *str, int len = -1, char **intern = 0);<P ></P ></DIV @@ -6295,8 +6295,8 @@ NAME="AEN2314" ></A ><CODE CLASS="FUNCDEF" ->QRect boundingRect</CODE ->(const QRect&, int flags, const char *str, int len = -1, char **intern = 0);<P +>TQRect boundingRect</CODE +>(const TQRect&, int flags, const char *str, int len = -1, char **intern = 0);<P ></P ></DIV ><P @@ -6314,7 +6314,7 @@ NAME="AEN2328" ><CODE CLASS="FUNCDEF" >void drawText</CODE ->(int x, int y, int w, int h, int flags, const char *str, int len = -1, QRect *br = 0, char **intern = 0);<P +>(int x, int y, int w, int h, int flags, const char *str, int len = -1, TQRect *br = 0, char **intern = 0);<P ></P ></DIV ><P @@ -6332,7 +6332,7 @@ NAME="AEN2351" ><CODE CLASS="FUNCDEF" >void drawText</CODE ->(const QRect&, int flags, const char *str, int len = -1, QRect *br = 0, char **intern = 0);<P +>(const TQRect&, int flags, const char *str, int len = -1, TQRect *br = 0, char **intern = 0);<P ></P ></DIV ><P @@ -6377,12 +6377,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2378" ->QPalette</A +>TQPalette</A ></H3 ><P ><TT CLASS="LITERAL" ->QPalette</TT +>TQPalette</TT > is fully implemented, including the Python <TT CLASS="LITERAL" @@ -6398,7 +6398,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2384" ->QPixmap</A +>TQPixmap</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -6409,7 +6409,7 @@ NAME="AEN2386" ></A ><CODE CLASS="FUNCDEF" ->QPixmap</CODE +>TQPixmap</CODE >(const char *xpm[]);<P ></P ></DIV @@ -6459,12 +6459,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2418" ->QPixmapCache (Qt v3+)</A +>TQPixmapCache (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QPixmapCache</TT +>TQPixmapCache</TT > is fully implemented.</P ></DIV ><DIV @@ -6488,12 +6488,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2426" ->QPen</A +>TQPen</A ></H3 ><P ><TT CLASS="LITERAL" ->QPen</TT +>TQPen</TT > is fully implemented, including the Python <TT CLASS="LITERAL" @@ -6509,7 +6509,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2432" ->QPicture</A +>TQPicture</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -6555,7 +6555,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2449" ->QPlatinumStyle (Qt v2+)</A +>TQPlatinumStyle (Qt v2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -6567,7 +6567,7 @@ NAME="AEN2451" ><CODE CLASS="FUNCDEF" >void scrollBarMetrics</CODE ->(const QTabBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P +>(const TQTabBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P ></P ></DIV ><P @@ -6597,7 +6597,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2470" ->QPoint</A +>TQPoint</A ></H3 ><P >The Python @@ -6680,7 +6680,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2495" ->QPointArray</A +>TQPointArray</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -6691,7 +6691,7 @@ NAME="AEN2497" ></A ><CODE CLASS="FUNCDEF" ->QPointArray</CODE +>TQPointArray</CODE >(int nPoints, const QCOORD *points);<P ></P ></DIV @@ -6792,7 +6792,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2561" ->QPopupMenu</A +>TQPopupMenu</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -6822,7 +6822,7 @@ NAME="AEN2569" ><CODE CLASS="FUNCDEF" >int exec</CODE ->(const QPoint &pos, int indexAtPoint = 0);<P +>(const TQPoint &pos, int indexAtPoint = 0);<P ></P ></DIV ><P @@ -6837,12 +6837,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2578" ->QPrintDialog (X11)</A +>TQPrintDialog (X11)</A ></H3 ><P ><TT CLASS="LITERAL" ->QPrintDialog</TT +>TQPrintDialog</TT > is fully implemented.</P ></DIV ><DIV @@ -6851,12 +6851,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2582" ->QPrinter</A +>TQPrinter</A ></H3 ><P ><TT CLASS="LITERAL" ->QPrinter</TT +>TQPrinter</TT > is fully implemented.</P ></DIV ><DIV @@ -6865,12 +6865,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2586" ->QProcess (Qt v3+)</A +>TQProcess (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QProcess</TT +>TQProcess</TT > is fully implemented.</P ></DIV ><DIV @@ -6879,12 +6879,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2590" ->QProgressBar</A +>TQProgressBar</A ></H3 ><P ><TT CLASS="LITERAL" ->QProgressBar</TT +>TQProgressBar</TT > is fully implemented.</P ></DIV ><DIV @@ -6893,12 +6893,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2594" ->QProgressDialog</A +>TQProgressDialog</A ></H3 ><P ><TT CLASS="LITERAL" ->QProgressDialog</TT +>TQProgressDialog</TT > is fully implemented. value.</P ></DIV @@ -6908,12 +6908,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2598" ->QPtrList<type> (Qt v3+)</A +>TQPtrList<type> (Qt v3+)</A ></H3 ><P >Types based on the <TT CLASS="LITERAL" ->QPtrList</TT +>TQPtrList</TT > template are automatically converted to and from Python lists of the type.</P ></DIV @@ -6923,12 +6923,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2602" ->QPushButton</A +>TQPushButton</A ></H3 ><P ><TT CLASS="LITERAL" ->QPushButton</TT +>TQPushButton</TT > is fully implemented.</P ></DIV ><DIV @@ -6937,12 +6937,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2606" ->QRadioButton</A +>TQRadioButton</A ></H3 ><P ><TT CLASS="LITERAL" ->QRadioButton</TT +>TQRadioButton</TT > is fully implemented.</P ></DIV ><DIV @@ -6951,12 +6951,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2610" ->QRangeControl</A +>TQRangeControl</A ></H3 ><P ><TT CLASS="LITERAL" ->QRangeControl</TT +>TQRangeControl</TT > is fully implemented.</P ></DIV ><DIV @@ -6965,7 +6965,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2614" ->QRect</A +>TQRect</A ></H3 ><P >The Python @@ -7094,7 +7094,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2669" ->QRegExp</A +>TQRegExp</A ></H3 ><P >The Python <TT @@ -7144,7 +7144,7 @@ NAME="AEN2688" ><CODE CLASS="FUNCDEF" >int match</CODE ->(const QString &str, int index = 0, int *len = 0);<P +>(const TQString &str, int index = 0, int *len = 0);<P ></P ></DIV ><P @@ -7170,7 +7170,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2702" ->QRegion</A +>TQRegion</A ></H3 ><P >The Python @@ -7232,7 +7232,7 @@ NAME="AEN2719" ></A ><CODE CLASS="FUNCDEF" ->QArray<QRect> rects</CODE +>QArray<TQRect> rects</CODE >();<P ></P ></DIV @@ -7248,7 +7248,7 @@ NAME="AEN2724" ><CODE CLASS="FUNCDEF" >void setRects</CODE ->(QRect *rects, int num);<P +>(TQRect *rects, int num);<P ></P ></DIV ><P @@ -7260,12 +7260,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2732" ->QScrollBar</A +>TQScrollBar</A ></H3 ><P ><TT CLASS="LITERAL" ->QScrollBar</TT +>TQScrollBar</TT > is fully implemented.</P ></DIV ><DIV @@ -7274,7 +7274,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2736" ->QScrollView</A +>TQScrollView</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -7341,12 +7341,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2770" ->QSemaphore (Qt v2.2+)</A +>TQSemaphore (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSemaphore</TT +>TQSemaphore</TT > is fully implemented. The <TT CLASS="LITERAL" >+=</TT @@ -7363,12 +7363,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2776" ->QSemiModal (Qt v1, v2)</A +>TQSemiModal (Qt v1, v2)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSemiModal</TT +>TQSemiModal</TT > is fully implemented.</P ></DIV ><DIV @@ -7391,7 +7391,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2784" ->QSettings (Qt v3+)</A +>TQSettings (Qt v3+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -7403,7 +7403,7 @@ NAME="AEN2786" ><CODE CLASS="FUNCDEF" >bool readBoolEntry</CODE ->(const QString &key, bool def = 0, bool *ok = 0);<P +>(const TQString &key, bool def = 0, bool *ok = 0);<P ></P ></DIV ><P @@ -7428,7 +7428,7 @@ NAME="AEN2799" ><CODE CLASS="FUNCDEF" >double readDoubleEntry</CODE ->(const QString &key, double def = 0, bool *ok = 0);<P +>(const TQString &key, double def = 0, bool *ok = 0);<P ></P ></DIV ><P @@ -7452,8 +7452,8 @@ NAME="AEN2812" ></A ><CODE CLASS="FUNCDEF" ->QString readEntry</CODE ->(const QString &key, const QString &def = QString::null, bool *ok = 0);<P +>TQString readEntry</CODE +>(const TQString &key, const TQString &def = TQString::null, bool *ok = 0);<P ></P ></DIV ><P @@ -7463,7 +7463,7 @@ CLASS="LITERAL" > is not passed and the returned value is a tuple of the <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > result and the <TT CLASS="LITERAL" >ok</TT @@ -7477,8 +7477,8 @@ NAME="AEN2825" ></A ><CODE CLASS="FUNCDEF" ->QStringList readListEntry</CODE ->(const QString &key, bool *ok = 0);<P +>TQStringList readListEntry</CODE +>(const TQString &key, bool *ok = 0);<P ></P ></DIV ><P @@ -7488,7 +7488,7 @@ CLASS="LITERAL" > is not passed and the returned value is a tuple of the <TT CLASS="LITERAL" ->QStringList</TT +>TQStringList</TT > result and the <TT CLASS="LITERAL" >ok</TT @@ -7502,8 +7502,8 @@ NAME="AEN2836" ></A ><CODE CLASS="FUNCDEF" ->QStringList readListEntry</CODE ->(const QString &key, const QChar &separator, bool *ok = 0);<P +>TQStringList readListEntry</CODE +>(const TQString &key, const TQChar &separator, bool *ok = 0);<P ></P ></DIV ><P @@ -7513,7 +7513,7 @@ CLASS="LITERAL" > is not passed and the returned value is a tuple of the <TT CLASS="LITERAL" ->QStringList</TT +>TQStringList</TT > result and the <TT CLASS="LITERAL" >ok</TT @@ -7528,7 +7528,7 @@ NAME="AEN2849" ><CODE CLASS="FUNCDEF" >int readNumEntry</CODE ->(const QString &key, int def = 0, bool *ok = 0);<P +>(const TQString &key, int def = 0, bool *ok = 0);<P ></P ></DIV ><P @@ -7553,7 +7553,7 @@ NAME="AEN2862" ><CODE CLASS="FUNCDEF" >bool writeEntry</CODE ->(const QString &key, bool value);<P +>(const TQString &key, bool value);<P ></P ></DIV ><P @@ -7565,7 +7565,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2870" ->QSGIStyle (Qt v2.2+)</A +>TQSGIStyle (Qt v2.2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -7577,7 +7577,7 @@ NAME="AEN2872" ><CODE CLASS="FUNCDEF" >void scrollBarMetrics</CODE ->(const QScrollBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P +>(const TQScrollBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P ></P ></DIV ><P @@ -7607,12 +7607,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2891" ->QSignalMapper</A +>TQSignalMapper</A ></H3 ><P ><TT CLASS="LITERAL" ->QSignalMapper</TT +>TQSignalMapper</TT > is fully implemented.</P ></DIV ><DIV @@ -7621,12 +7621,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2895" ->QSimpleRichText (Qt v2+)</A +>TQSimpleRichText (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSimpleRichText</TT +>TQSimpleRichText</TT > is fully implemented.</P ></DIV ><DIV @@ -7635,7 +7635,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2899" ->QSize</A +>TQSize</A ></H3 ><P >The Python @@ -7715,12 +7715,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2923" ->QSizeGrip (Qt v2+)</A +>TQSizeGrip (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSizeGrip</TT +>TQSizeGrip</TT > is fully implemented.</P ></DIV ><DIV @@ -7729,12 +7729,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2927" ->QSizePolicy (Qt v2+)</A +>TQSizePolicy (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSizePolicy</TT +>TQSizePolicy</TT > is fully implemented.</P ></DIV ><DIV @@ -7743,12 +7743,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2931" ->QSlider</A +>TQSlider</A ></H3 ><P ><TT CLASS="LITERAL" ->QSlider</TT +>TQSlider</TT > is fully implemented.</P ></DIV ><DIV @@ -7757,12 +7757,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2935" ->QSocketNotifier</A +>TQSocketNotifier</A ></H3 ><P ><TT CLASS="LITERAL" ->QSocketNotifier</TT +>TQSocketNotifier</TT > is fully implemented.</P ></DIV ><DIV @@ -7771,12 +7771,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2939" ->QSound (Qt v2.2+)</A +>TQSound (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSound</TT +>TQSound</TT > is fully implemented.</P ></DIV ><DIV @@ -7785,7 +7785,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2943" ->QSpinBox</A +>TQSpinBox</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -7816,12 +7816,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2953" ->QSplashScreen (Qt v3.2.0+)</A +>TQSplashScreen (Qt v3.2.0+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSplashScreen</TT +>TQSplashScreen</TT > is fully implemented.</P ></DIV ><DIV @@ -7830,7 +7830,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2957" ->QSplitter</A +>TQSplitter</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -7864,12 +7864,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2972" ->QStatusBar</A +>TQStatusBar</A ></H3 ><P ><TT CLASS="LITERAL" ->QStatusBar</TT +>TQStatusBar</TT > is fully implemented.</P ></DIV ><DIV @@ -7878,7 +7878,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2976" ->QChar (Qt v2+)</A +>TQChar (Qt v2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -7917,16 +7917,16 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN2988" ->QString</A +>TQString</A ></H3 ><P >A Python string object (or Unicode object) can be used whenever a <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > can be used. A <TT CLASS="LITERAL" ->QString</TT +>TQString</TT > can be converted to a Python string object using the Python <TT CLASS="LITERAL" @@ -7962,7 +7962,7 @@ NAME="AEN3000" ></A ><CODE CLASS="FUNCDEF" ->QCharRef at</CODE +>TQCharRef at</CODE >(uint i);<P ></P ></DIV @@ -7977,7 +7977,7 @@ NAME="AEN3006" ></A ><CODE CLASS="FUNCDEF" ->QChar constref const</CODE +>TQChar constref const</CODE >(uint i);<P ></P ></DIV @@ -7992,7 +7992,7 @@ NAME="AEN3012" ></A ><CODE CLASS="FUNCDEF" ->QChar &ref</CODE +>TQChar &ref</CODE >(uint i);<P ></P ></DIV @@ -8007,7 +8007,7 @@ NAME="AEN3018" ></A ><CODE CLASS="FUNCDEF" ->QString &setUnicodeCodes</CODE +>TQString &setUnicodeCodes</CODE >(const ushort *unicode_as_shorts, uint len);<P ></P ></DIV @@ -8022,7 +8022,7 @@ NAME="AEN3026" ></A ><CODE CLASS="FUNCDEF" ->QString &sprintf</CODE +>TQString &sprintf</CODE >(const char *format, ...);<P ></P ></DIV @@ -8211,7 +8211,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3097" ->QStringList (Qt v2+)</A +>TQStringList (Qt v2+)</A ></H3 ><P >The Python <TT @@ -8259,7 +8259,7 @@ NAME="AEN3110" ><CODE CLASS="FUNCDEF" >Iterator append</CODE ->(const QString &x);<P +>(const TQString &x);<P ></P ></DIV ><P @@ -8274,7 +8274,7 @@ NAME="AEN3116" ><CODE CLASS="FUNCDEF" >Iterator prepend</CODE ->(const QString &x);<P +>(const TQString &x);<P ></P ></DIV ><P @@ -8286,12 +8286,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3122" ->QStrList</A +>TQStrList</A ></H3 ><P >This class isn't implemented. Whenever a <TT CLASS="LITERAL" ->QStrList</TT +>TQStrList</TT > is the return type of a function or the type of an argument, a Python list of strings is used instead.</P @@ -8302,7 +8302,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3126" ->QStyle (Qt v2+)</A +>TQStyle (Qt v2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -8336,7 +8336,7 @@ NAME="AEN3138" ><CODE CLASS="FUNCDEF" >virtual void scrollBarMetrics</CODE ->(const QScrollBar *b, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P +>(const TQScrollBar *b, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P ></P ></DIV ><P @@ -8369,7 +8369,7 @@ NAME="AEN3157" ><CODE CLASS="FUNCDEF" >virtual void tabbarMetrics</CODE ->(const QTabBar *t, int &hframe, int &vframe, int &overlap);<P +>(const TQTabBar *t, int &hframe, int &vframe, int &overlap);<P ></P ></DIV ><P @@ -8395,12 +8395,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3173" ->QStyleOption (Qt v3+)</A +>TQStyleOption (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QStyleOption</TT +>TQStyleOption</TT > is fully implemented.</P ></DIV ><DIV @@ -8409,12 +8409,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3177" ->QStyleSheet (Qt v2+)</A +>TQStyleSheet (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QStyleSheet</TT +>TQStyleSheet</TT > is fully implemented.</P ></DIV ><DIV @@ -8423,12 +8423,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3181" ->QStyleSheetItem (Qt v2+)</A +>TQStyleSheetItem (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QStyleSheetItem</TT +>TQStyleSheetItem</TT > is fully implemented.</P ></DIV ><DIV @@ -8437,12 +8437,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3185" ->QSyntaxHighlighter (Qt v3.1+)</A +>TQSyntaxHighlighter (Qt v3.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSyntaxHighlighter</TT +>TQSyntaxHighlighter</TT > is fully implemented.</P ></DIV ><DIV @@ -8451,12 +8451,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3189" ->QTab</A +>TQTab</A ></H3 ><P ><TT CLASS="LITERAL" ->QTab</TT +>TQTab</TT > is fully implemented.</P ></DIV ><DIV @@ -8465,7 +8465,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3193" ->QTabBar</A +>TQTabBar</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -8476,14 +8476,14 @@ NAME="AEN3195" ></A ><CODE CLASS="FUNCDEF" ->QList<QTab> tabList</CODE +>QList<TQTab> tabList</CODE >();<P ></P ></DIV ><P >This returns a list of <TT CLASS="LITERAL" ->QTab</TT +>TQTab</TT > instances.</P ></DIV ><DIV @@ -8492,12 +8492,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3201" ->QTabDialog</A +>TQTabDialog</A ></H3 ><P ><TT CLASS="LITERAL" ->QTabDialog</TT +>TQTabDialog</TT > is fully implemented.</P ></DIV ><DIV @@ -8565,12 +8565,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3229" ->QTabWidget (Qt v2+)</A +>TQTabWidget (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QTabWidget</TT +>TQTabWidget</TT > is fully implemented.</P ></DIV ><DIV @@ -8579,12 +8579,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3233" ->QTextBrowser (Qt v2+)</A +>TQTextBrowser (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QTextBrowser</TT +>TQTextBrowser</TT > is fully implemented.</P ></DIV ><DIV @@ -8593,7 +8593,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3237" ->QTextCodec (Qt v2+)</A +>TQTextCodec (Qt v2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -8604,14 +8604,14 @@ NAME="AEN3239" ></A ><CODE CLASS="FUNCDEF" ->virtual QCString fromUnicode</CODE ->(const QString &uc, int &lenInOut);<P +>virtual TQCString fromUnicode</CODE +>(const TQString &uc, int &lenInOut);<P ></P ></DIV ><P >The returned value is a tuple of the <TT CLASS="LITERAL" ->QCString</TT +>TQCString</TT > result and the updated <TT CLASS="LITERAL" @@ -8624,12 +8624,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3249" ->QTextDecoder (Qt v2+)</A +>TQTextDecoder (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QTextDecoder</TT +>TQTextDecoder</TT > is fully implemented.</P ></DIV ><DIV @@ -8638,7 +8638,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3253" ->QTextEncoder (Qt v2+)</A +>TQTextEncoder (Qt v2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -8649,14 +8649,14 @@ NAME="AEN3255" ></A ><CODE CLASS="FUNCDEF" ->virtual QCString fromUnicode = 0</CODE ->(const QString &uc, int &lenInOut);<P +>virtual TQCString fromUnicode = 0</CODE +>(const TQString &uc, int &lenInOut);<P ></P ></DIV ><P >The returned value is a tuple of the <TT CLASS="LITERAL" ->QCString</TT +>TQCString</TT > result and the updated <TT CLASS="LITERAL" @@ -8669,7 +8669,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3265" ->QTextEdit (Qt v3+)</A +>TQTextEdit (Qt v3+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -8681,7 +8681,7 @@ NAME="AEN3267" ><CODE CLASS="FUNCDEF" >int charAt</CODE ->(const QPoint &pos, int *para = 0);<P +>(const TQPoint &pos, int *para = 0);<P ></P ></DIV ><P @@ -8721,7 +8721,7 @@ NAME="AEN3283" ><CODE CLASS="FUNCDEF" >virtual bool find</CODE ->(const QString &expr, bool cs, bool wo, bool forward = TRUE, int *para = 0, int *index = 0);<P +>(const TQString &expr, bool cs, bool wo, bool forward = TRUE, int *para = 0, int *index = 0);<P ></P ></DIV ><P @@ -8802,7 +8802,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3332" ->QTextStream</A +>TQTextStream</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -8813,7 +8813,7 @@ NAME="AEN3334" ></A ><CODE CLASS="FUNCDEF" ->QTextStream</CODE +>TQTextStream</CODE >(FILE *fp, int mode);<P ></P ></DIV @@ -8828,7 +8828,7 @@ NAME="AEN3342" ></A ><CODE CLASS="FUNCDEF" ->QTextStream &readRawBytes</CODE +>TQTextStream &readRawBytes</CODE >(char *buf, uint len);<P ></P ></DIV @@ -8843,7 +8843,7 @@ NAME="AEN3350" ></A ><CODE CLASS="FUNCDEF" ->QTextStream &writeRawBytes</CODE +>TQTextStream &writeRawBytes</CODE >(const char *buf, uint len);<P ></P ></DIV @@ -8856,7 +8856,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3358" ->QTextIStream (Qt v2+)</A +>TQTextIStream (Qt v2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -8867,7 +8867,7 @@ NAME="AEN3360" ></A ><CODE CLASS="FUNCDEF" ->QTextIStream</CODE +>TQTextIStream</CODE >(FILE *fp, int mode);<P ></P ></DIV @@ -8880,7 +8880,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3368" ->QTextOStream (Qt v2+)</A +>TQTextOStream (Qt v2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -8891,7 +8891,7 @@ NAME="AEN3370" ></A ><CODE CLASS="FUNCDEF" ->QTextOStream</CODE +>TQTextOStream</CODE >(FILE *fp, int mode);<P ></P ></DIV @@ -8904,12 +8904,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3378" ->QTextView (Qt v2+)</A +>TQTextView (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QTextView</TT +>TQTextView</TT > is fully implemented.</P ></DIV ><DIV @@ -8918,12 +8918,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3382" ->QThread (Qt v2.2+)</A +>TQThread (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QThread</TT +>TQThread</TT > is fully implemented.</P ></DIV ><DIV @@ -8932,12 +8932,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3386" ->QTimer</A +>TQTimer</A ></H3 ><P ><TT CLASS="LITERAL" ->QTimer</TT +>TQTimer</TT > is fully implemented.</P ></DIV ><DIV @@ -8946,12 +8946,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3390" ->QToolBar</A +>TQToolBar</A ></H3 ><P ><TT CLASS="LITERAL" ->QToolBar</TT +>TQToolBar</TT > is fully implemented.</P ></DIV ><DIV @@ -8960,12 +8960,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3394" ->QToolBox (Qt v3.2.0+)</A +>TQToolBox (Qt v3.2.0+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QToolBox</TT +>TQToolBox</TT > is fully implemented.</P ></DIV ><DIV @@ -8974,12 +8974,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3398" ->QToolButton</A +>TQToolButton</A ></H3 ><P ><TT CLASS="LITERAL" ->QToolButton</TT +>TQToolButton</TT > is fully implemented.</P ></DIV ><DIV @@ -8988,12 +8988,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3402" ->QToolTip</A +>TQToolTip</A ></H3 ><P ><TT CLASS="LITERAL" ->QToolTip</TT +>TQToolTip</TT > is fully implemented.</P ></DIV ><DIV @@ -9002,12 +9002,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3406" ->QToolTipGroup</A +>TQToolTipGroup</A ></H3 ><P ><TT CLASS="LITERAL" ->QToolTipGroup</TT +>TQToolTipGroup</TT > is fully implemented.</P ></DIV ><DIV @@ -9044,16 +9044,16 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3418" ->QUrl (Qt v2.1+)</A +>TQUrl (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QUrl</TT +>TQUrl</TT > is fully implemented, including the <TT CLASS="LITERAL" ->QString()</TT +>TQString()</TT >, <TT CLASS="LITERAL" >==</TT @@ -9069,12 +9069,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3425" ->QUrlInfo (Qt v2.1+)</A +>TQUrlInfo (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QUrlInfo</TT +>TQUrlInfo</TT > is fully implemented.</P ></DIV ><DIV @@ -9083,7 +9083,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3429" ->QUrlOperator (Qt v2.1+)</A +>TQUrlOperator (Qt v2.1+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -9128,7 +9128,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3443" ->QValidator</A +>TQValidator</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -9140,7 +9140,7 @@ NAME="AEN3445" ><CODE CLASS="FUNCDEF" >virtual State validate</CODE ->(QString& input, int& pos);<P +>(TQString& input, int& pos);<P ></P ></DIV ><P @@ -9159,7 +9159,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3455" ->QDoubleValidator</A +>TQDoubleValidator</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -9171,7 +9171,7 @@ NAME="AEN3457" ><CODE CLASS="FUNCDEF" >State validate</CODE ->(QString& input, int& pos);<P +>(TQString& input, int& pos);<P ></P ></DIV ><P @@ -9190,7 +9190,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3467" ->QIntValidator</A +>TQIntValidator</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -9202,7 +9202,7 @@ NAME="AEN3469" ><CODE CLASS="FUNCDEF" >State validate</CODE ->(QString& input, int& pos);<P +>(TQString& input, int& pos);<P ></P ></DIV ><P @@ -9221,7 +9221,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3479" ->QRegExpValidator (Qt v3+)</A +>TQRegExpValidator (Qt v3+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -9233,7 +9233,7 @@ NAME="AEN3481" ><CODE CLASS="FUNCDEF" >virtual State validate</CODE ->(QString& input, int& pos);<P +>(TQString& input, int& pos);<P ></P ></DIV ><P @@ -9252,12 +9252,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3491" ->QValueList<type> (Qt v2+)</A +>TQValueList<type> (Qt v2+)</A ></H3 ><P >Types based on the <TT CLASS="LITERAL" ->QValueList</TT +>TQValueList</TT > template are automatically converted to and from Python lists of the type.</P ></DIV @@ -9267,7 +9267,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3495" ->QVariant (Qt v2.1+)</A +>TQVariant (Qt v2.1+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -9278,7 +9278,7 @@ NAME="AEN3497" ></A ><CODE CLASS="FUNCDEF" ->QVariant</CODE +>TQVariant</CODE >(const char *val);<P ></P ></DIV @@ -9293,8 +9293,8 @@ NAME="AEN3503" ></A ><CODE CLASS="FUNCDEF" ->QVariant</CODE ->(const QBitArray &val);<P +>TQVariant</CODE +>(const TQBitArray &val);<P ></P ></DIV ><P @@ -9308,8 +9308,8 @@ NAME="AEN3509" ></A ><CODE CLASS="FUNCDEF" ->QVariant</CODE ->(const QValueList<QVariant> &val);<P +>TQVariant</CODE +>(const TQValueList<TQVariant> &val);<P ></P ></DIV ><P @@ -9323,8 +9323,8 @@ NAME="AEN3515" ></A ><CODE CLASS="FUNCDEF" ->QVariant</CODE ->(const QMap<QString,QVariant> &val);<P +>TQVariant</CODE +>(const TQMap<TQString,TQVariant> &val);<P ></P ></DIV ><P @@ -9338,7 +9338,7 @@ NAME="AEN3521" ></A ><CODE CLASS="FUNCDEF" ->QBitArray &asBitArray</CODE +>TQBitArray &asBitArray</CODE >();<P ></P ></DIV @@ -9398,7 +9398,7 @@ NAME="AEN3541" ></A ><CODE CLASS="FUNCDEF" ->QValueList<QVariant> &asList</CODE +>TQValueList<TQVariant> &asList</CODE >();<P ></P ></DIV @@ -9413,7 +9413,7 @@ NAME="AEN3546" ></A ><CODE CLASS="FUNCDEF" ->QMap<QString,QVariant> &asMap</CODE +>TQMap<TQString,TQVariant> &asMap</CODE >();<P ></P ></DIV @@ -9443,7 +9443,7 @@ NAME="AEN3556" ></A ><CODE CLASS="FUNCDEF" ->QValueListConstIterator<QVariant>listBegin const</CODE +>TQValueListConstIterator<TQVariant>listBegin const</CODE >();<P ></P ></DIV @@ -9458,7 +9458,7 @@ NAME="AEN3561" ></A ><CODE CLASS="FUNCDEF" ->QValueListConstIterator<QVariant>listEnd const</CODE +>TQValueListConstIterator<TQVariant>listEnd const</CODE >();<P ></P ></DIV @@ -9473,7 +9473,7 @@ NAME="AEN3566" ></A ><CODE CLASS="FUNCDEF" ->QMapConstIterator<QString,QVariant>mapBegin const</CODE +>TQMapConstIterator<TQString,TQVariant>mapBegin const</CODE >();<P ></P ></DIV @@ -9488,7 +9488,7 @@ NAME="AEN3571" ></A ><CODE CLASS="FUNCDEF" ->QMapConstIterator<QString,QVariant>mapEnd const</CODE +>TQMapConstIterator<TQString,TQVariant>mapEnd const</CODE >();<P ></P ></DIV @@ -9503,8 +9503,8 @@ NAME="AEN3576" ></A ><CODE CLASS="FUNCDEF" ->QMapConstIterator<QString,QVariant>mapFind const</CODE ->(const QString &key);<P +>TQMapConstIterator<TQString,TQVariant>mapFind const</CODE +>(const TQString &key);<P ></P ></DIV ><P @@ -9518,7 +9518,7 @@ NAME="AEN3582" ></A ><CODE CLASS="FUNCDEF" ->QValueListConstIterator<QString>stringListBegin const</CODE +>TQValueListConstIterator<TQString>stringListBegin const</CODE >();<P ></P ></DIV @@ -9533,7 +9533,7 @@ NAME="AEN3587" ></A ><CODE CLASS="FUNCDEF" ->QValueListConstIterator<QString>stringListEnd const</CODE +>TQValueListConstIterator<TQString>stringListEnd const</CODE >();<P ></P ></DIV @@ -9548,7 +9548,7 @@ NAME="AEN3592" ></A ><CODE CLASS="FUNCDEF" ->const QBitArray toBitArray const</CODE +>const TQBitArray toBitArray const</CODE >();<P ></P ></DIV @@ -9563,7 +9563,7 @@ NAME="AEN3597" ></A ><CODE CLASS="FUNCDEF" ->const QValueList<QVariant>toList const</CODE +>const TQValueList<TQVariant>toList const</CODE >();<P ></P ></DIV @@ -9578,7 +9578,7 @@ NAME="AEN3602" ></A ><CODE CLASS="FUNCDEF" ->const QMap<QString,QVariant>toMap const</CODE +>const TQMap<TQString,TQVariant>toMap const</CODE >();<P ></P ></DIV @@ -9591,12 +9591,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3607" ->QVBox (Qt v2+)</A +>TQVBox (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QVBox</TT +>TQVBox</TT > is fully implemented.</P ></DIV ><DIV @@ -9605,12 +9605,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3611" ->QVButtonGroup (Qt v2+)</A +>TQVButtonGroup (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QVButtonGroup</TT +>TQVButtonGroup</TT > is fully implemented.</P ></DIV ><DIV @@ -9619,12 +9619,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3615" ->QVGroupBox (Qt v2+)</A +>TQVGroupBox (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QVGroupBox</TT +>TQVGroupBox</TT > is fully implemented.</P ></DIV ><DIV @@ -9633,12 +9633,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3619" ->QWaitCondition (Qt v2.2+)</A +>TQWaitCondition (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QWaitCondition</TT +>TQWaitCondition</TT > is fully implemented.</P ></DIV ><DIV @@ -9647,12 +9647,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3623" ->QWhatsThis</A +>TQWhatsThis</A ></H3 ><P ><TT CLASS="LITERAL" ->QWhatsThis</TT +>TQWhatsThis</TT > is fully implemented.</P ></DIV ><DIV @@ -9661,7 +9661,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3627" ->QWidget</A +>TQWidget</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -9687,7 +9687,7 @@ NAME="AEN3634" ></A ><CODE CLASS="FUNCDEF" ->QFocusData *focusData</CODE +>TQFocusData *focusData</CODE >();<P ></P ></DIV @@ -9736,12 +9736,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3651" ->QWidgetList</A +>TQWidgetList</A ></H3 ><P >This class isn't implemented. Whenever a <TT CLASS="LITERAL" ->QWidgetList</TT +>TQWidgetList</TT > is the return type of a function or the type of an argument, a Python list of instances is used instead.</P @@ -9752,12 +9752,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3655" ->QWidgetStack</A +>TQWidgetStack</A ></H3 ><P ><TT CLASS="LITERAL" ->QWidgetStack</TT +>TQWidgetStack</TT > is fully implemented.</P ></DIV ><DIV @@ -9780,7 +9780,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3663" ->QWindowsStyle (Qt v2+)</A +>TQWindowsStyle (Qt v2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -9814,7 +9814,7 @@ NAME="AEN3675" ><CODE CLASS="FUNCDEF" >void scrollBarMetrics</CODE ->(const QTabBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P +>(const TQTabBar *sb, int &sliderMin, int &sliderMax, int &sliderLength, int &buttonDim);<P ></P ></DIV ><P @@ -9847,7 +9847,7 @@ NAME="AEN3694" ><CODE CLASS="FUNCDEF" >void tabbarMetrics</CODE ->(const QTabBar *t, int &hframe, int &vframe, int &overlap);<P +>(const TQTabBar *t, int &hframe, int &vframe, int &overlap);<P ></P ></DIV ><P @@ -9887,12 +9887,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3714" ->QWizard (Qt v2+)</A +>TQWizard (Qt v2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QWizard</TT +>TQWizard</TT > is fully implemented.</P ></DIV ><DIV @@ -9901,7 +9901,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3718" ->QWMatrix</A +>TQWMatrix</A ></H3 ><P >The Python <TT @@ -9924,14 +9924,14 @@ NAME="AEN3724" ></A ><CODE CLASS="FUNCDEF" ->QWMatrix invert const</CODE +>TQWMatrix invert const</CODE >(bool *invertible = 0);<P ></P ></DIV ><P >This takes no parameters and returns a tuple of the <TT CLASS="LITERAL" ->QWMatrix</TT +>TQWMatrix</TT > result and the <TT CLASS="LITERAL" @@ -10031,12 +10031,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3780" ->QWorkspace (Qt v2.1+)</A +>TQWorkspace (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QWorkspace</TT +>TQWorkspace</TT > is fully implemented.</P ></DIV ></DIV @@ -10129,7 +10129,7 @@ NAME="AEN3814" ><CODE CLASS="FUNCDEF" >unsigned long registerWeakActiveObject</CODE ->(const QString &guid);<P +>(const TQString &guid);<P ></P ></DIV ><P @@ -10204,7 +10204,7 @@ NAME="AEN3838" ><CODE CLASS="FUNCDEF" >QAxObject</CODE ->(IUnknown *iface, QObject *parent = 0, const char *name = 0);<P +>(IUnknown *iface, TQObject *parent = 0, const char *name = 0);<P ></P ></DIV ><P @@ -10228,7 +10228,7 @@ NAME="AEN3850" ><CODE CLASS="FUNCDEF" >QAxWidget</CODE ->(IUnknown *iface, QWidget *parent = 0, const char *name = 0);<P +>(IUnknown *iface, TQWidget *parent = 0, const char *name = 0);<P ></P ></DIV ><P @@ -10252,12 +10252,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3863" ->QCanvas (Qt v2.2+)</A +>TQCanvas (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvas</TT +>TQCanvas</TT > is fully implemented.</P ></DIV ><DIV @@ -10266,12 +10266,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3867" ->QCanvasEllipse (Qt v2.2+)</A +>TQCanvasEllipse (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvasEllipse</TT +>TQCanvasEllipse</TT > is fully implemented.</P ></DIV ><DIV @@ -10280,12 +10280,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3871" ->QCanvasItem (Qt v2.2+)</A +>TQCanvasItem (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvasItem</TT +>TQCanvasItem</TT > is fully implemented.</P ></DIV ><DIV @@ -10294,17 +10294,17 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3875" ->QCanvasItemList (Qt v2.2+)</A +>TQCanvasItemList (Qt v2.2+)</A ></H3 ><P >This class isn't implemented. Whenever a <TT CLASS="LITERAL" ->QCanvasItemList</TT +>TQCanvasItemList</TT > is the return type of a function or the type of an argument, a Python list of <TT CLASS="LITERAL" ->QCanvasItem</TT +>TQCanvasItem</TT > instances is used instead.</P ></DIV ><DIV @@ -10313,12 +10313,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3880" ->QCanvasLine (Qt v2.2+)</A +>TQCanvasLine (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvasLine</TT +>TQCanvasLine</TT > is fully implemented.</P ></DIV ><DIV @@ -10327,12 +10327,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3884" ->QCanvasPixmap (Qt v2.2+)</A +>TQCanvasPixmap (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvasPixmap</TT +>TQCanvasPixmap</TT > is fully implemented.</P ></DIV ><DIV @@ -10341,7 +10341,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3888" ->QCanvasPixmapArray (Qt v2.2+)</A +>TQCanvasPixmapArray (Qt v2.2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -10353,14 +10353,14 @@ NAME="AEN3890" ><CODE CLASS="FUNCDEF" >QPixmapArray</CODE ->(QList<QPixmap> pixmaps, QList<QPoint> hotspots);<P +>(QList<TQPixmap> pixmaps, QList<TQPoint> hotspots);<P ></P ></DIV ><P >The <TT CLASS="LITERAL" >pixmaps</TT -> argument is a Python list of QPixmap instances, +> argument is a Python list of TQPixmap instances, and the <TT CLASS="LITERAL" >hotspots</TT @@ -10376,14 +10376,14 @@ NAME="AEN3900" ><CODE CLASS="FUNCDEF" >QPixmapArray</CODE ->(QValueList<QPixmap> pixmaps, QPointArray hotspots = QPointArray());<P +>(TQValueList<TQPixmap> pixmaps, TQPointArray hotspots = TQPointArray());<P ></P ></DIV ><P >The <TT CLASS="LITERAL" >pixmaps</TT -> argument is a Python list of QPixmap instances. +> argument is a Python list of TQPixmap instances. (Qt v3+)</P ></DIV ><DIV @@ -10392,12 +10392,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3909" ->QCanvasPolygon (Qt v2.2+)</A +>TQCanvasPolygon (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvasPolygon</TT +>TQCanvasPolygon</TT > is fully implemented.</P ></DIV ><DIV @@ -10406,12 +10406,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3913" ->QCanvasPolygonalItem (Qt v2.2+)</A +>TQCanvasPolygonalItem (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvasPolygonalItem</TT +>TQCanvasPolygonalItem</TT > is fully implemented.</P ></DIV ><DIV @@ -10420,12 +10420,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3917" ->QCanvasRectangle (Qt v2.2+)</A +>TQCanvasRectangle (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvasRectangle</TT +>TQCanvasRectangle</TT > is fully implemented.</P ></DIV ><DIV @@ -10434,12 +10434,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3921" ->QCanvasSpline (Qt v3.0+)</A +>TQCanvasSpline (Qt v3.0+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvasSpline</TT +>TQCanvasSpline</TT > is fully implemented.</P ></DIV ><DIV @@ -10448,12 +10448,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3925" ->QCanvasSprite (Qt v2.2+)</A +>TQCanvasSprite (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvasSprite</TT +>TQCanvasSprite</TT > is fully implemented.</P ></DIV ><DIV @@ -10462,12 +10462,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3929" ->QCanvasText (Qt v2.2+)</A +>TQCanvasText (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvasText</TT +>TQCanvasText</TT > is fully implemented.</P ></DIV ><DIV @@ -10476,12 +10476,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN3933" ->QCanvasView (Qt v2.2+)</A +>TQCanvasView (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCanvasView</TT +>TQCanvasView</TT > is fully implemented.</P ></DIV ></DIV @@ -10952,12 +10952,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4079" ->QGL</A +>TQGL</A ></H3 ><P ><TT CLASS="LITERAL" ->QGL</TT +>TQGL</TT > is fully implemented.</P ></DIV ><DIV @@ -10966,12 +10966,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4083" ->QGLContext</A +>TQGLContext</A ></H3 ><P ><TT CLASS="LITERAL" ->QGLContext</TT +>TQGLContext</TT > is fully implemented.</P ></DIV ><DIV @@ -10980,12 +10980,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4087" ->QGLFormat</A +>TQGLFormat</A ></H3 ><P ><TT CLASS="LITERAL" ->QGLFormat</TT +>TQGLFormat</TT > is fully implemented.</P ></DIV ><DIV @@ -10994,12 +10994,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4091" ->QGLWidget</A +>TQGLWidget</A ></H3 ><P ><TT CLASS="LITERAL" ->QGLWidget</TT +>TQGLWidget</TT > is fully implemented.</P ></DIV ><DIV @@ -11008,7 +11008,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4095" ->QGLColormap (Qt v3.0+)</A +>TQGLColormap (Qt v3.0+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -11044,12 +11044,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4110" ->QDns (Qt v2.2+)</A +>TQDns (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDns</TT +>TQDns</TT > is fully implemented.</P ></DIV ><DIV @@ -11058,7 +11058,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4114" ->QFtp (Qt v2.2+)</A +>TQFtp (Qt v2.2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -11093,7 +11093,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4127" ->QHostAddress (Qt v2.2+)</A +>TQHostAddress (Qt v2.2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -11104,7 +11104,7 @@ NAME="AEN4129" ></A ><CODE CLASS="FUNCDEF" ->QHostAddress</CODE +>TQHostAddress</CODE >(Q_UINT8 *ip6Addr);<P ></P ></DIV @@ -11119,7 +11119,7 @@ NAME="AEN4135" ></A ><CODE CLASS="FUNCDEF" ->QHostAddress</CODE +>TQHostAddress</CODE >(const Q_IPV6ADDR &ip6Addr);<P ></P ></DIV @@ -11162,7 +11162,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4153" ->QHttp (Qt v3+)</A +>TQHttp (Qt v3+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -11197,12 +11197,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4166" ->QHttpHeader (Qt v3.1+)</A +>TQHttpHeader (Qt v3.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QHttpHeader</TT +>TQHttpHeader</TT > is fully implemented.</P ></DIV ><DIV @@ -11211,12 +11211,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4170" ->QHttpRequestHeader (Qt v3.1+)</A +>TQHttpRequestHeader (Qt v3.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QHttpRequestHeader</TT +>TQHttpRequestHeader</TT > is fully implemented.</P ></DIV ><DIV @@ -11225,12 +11225,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4174" ->QHttpResponseHeader (Qt v3.1+)</A +>TQHttpResponseHeader (Qt v3.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QHttpResponseHeader</TT +>TQHttpResponseHeader</TT > is fully implemented.</P ></DIV ><DIV @@ -11239,12 +11239,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4178" ->QLocalFs (Qt v2.1+)</A +>TQLocalFs (Qt v2.1+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QLocalFs</TT +>TQLocalFs</TT > is fully implemented.</P ></DIV ><DIV @@ -11253,12 +11253,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4182" ->QServerSocket (Qt v2.2+)</A +>TQServerSocket (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QServerSocket</TT +>TQServerSocket</TT > is fully implemented.</P ></DIV ><DIV @@ -11267,7 +11267,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4186" ->QSocket (Qt v2.2+)</A +>TQSocket (Qt v2.2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -11350,7 +11350,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4220" ->QSocketDevice (Qt v2.2+)</A +>TQSocketDevice (Qt v2.2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -11430,7 +11430,7 @@ NAME="AEN4248" ></A ><CODE CLASS="FUNCDEF" ->QApplication</CODE +>TQApplication</CODE >(int& argc, char **argv, Type type);<P ></P ></DIV @@ -11473,7 +11473,7 @@ NAME="AEN4266" ></A ><CODE CLASS="FUNCDEF" ->virtual QString exec const</CODE +>virtual TQString exec const</CODE >();<P ></P ></DIV @@ -11542,7 +11542,7 @@ NAME="AEN4286" ></A ><CODE CLASS="FUNCDEF" ->QString exec const</CODE +>TQString exec const</CODE >();<P ></P ></DIV @@ -11748,7 +11748,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4346" ->QDataBrowser (Qt v3+)</A +>TQDataBrowser (Qt v3+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -11775,12 +11775,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4354" ->QDataTable (Qt v3+)</A +>TQDataTable (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDataTable</TT +>TQDataTable</TT > is fully implemented.</P ></DIV ><DIV @@ -11789,12 +11789,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4358" ->QDataView (Qt v3+)</A +>TQDataView (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDataView</TT +>TQDataView</TT > is fully implemented.</P ></DIV ><DIV @@ -11803,12 +11803,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4362" ->QEditorFactory (Qt v3+)</A +>TQEditorFactory (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QEditorFactory</TT +>TQEditorFactory</TT > is fully implemented.</P ></DIV ><DIV @@ -11817,12 +11817,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4366" ->QSql (Qt v3+)</A +>TQSql (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSql</TT +>TQSql</TT > is fully implemented.</P ></DIV ><DIV @@ -11831,7 +11831,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4370" ->QSqlCursor (Qt v3+)</A +>TQSqlCursor (Qt v3+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -11861,7 +11861,7 @@ NAME="AEN4379" ><CODE CLASS="FUNCDEF" >virtual int del</CODE ->(const QString &filter, bool invalidate = TRUE);<P +>(const TQString &filter, bool invalidate = TRUE);<P ></P ></DIV ><P @@ -11879,7 +11879,7 @@ NAME="AEN4388" ><CODE CLASS="FUNCDEF" >bool exec</CODE ->(const QString &query);<P +>(const TQString &query);<P ></P ></DIV ><P @@ -11894,7 +11894,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4395" ->QSqlDatabase (Qt v3+)</A +>TQSqlDatabase (Qt v3+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -11905,8 +11905,8 @@ NAME="AEN4397" ></A ><CODE CLASS="FUNCDEF" ->QSqlQuery exec</CODE ->(const QString &query = QString::null);<P +>TQSqlQuery exec</CODE +>(const TQString &query = TQString::null);<P ></P ></DIV ><P @@ -11921,12 +11921,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4404" ->QSqlDriver (Qt v3+)</A +>TQSqlDriver (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSqlDriver</TT +>TQSqlDriver</TT > is fully implemented.</P ></DIV ><DIV @@ -11935,12 +11935,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4408" ->QSqlEditorFactory (Qt v3+)</A +>TQSqlEditorFactory (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSqlEditorFactory</TT +>TQSqlEditorFactory</TT > is fully implemented.</P ></DIV ><DIV @@ -11949,12 +11949,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4412" ->QSqlError (Qt v3+)</A +>TQSqlError (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSqlError</TT +>TQSqlError</TT > is fully implemented.</P ></DIV ><DIV @@ -11963,12 +11963,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4416" ->QSqlField (Qt v3+)</A +>TQSqlField (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSqlField</TT +>TQSqlField</TT > is fully implemented.</P ></DIV ><DIV @@ -11977,12 +11977,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4420" ->QSqlFieldInfo (Qt v3+)</A +>TQSqlFieldInfo (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSqlFieldInfo</TT +>TQSqlFieldInfo</TT > is fully implemented.</P ></DIV ><DIV @@ -11991,12 +11991,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4424" ->QSqlForm (Qt v3+)</A +>TQSqlForm (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSqlForm</TT +>TQSqlForm</TT > is fully implemented.</P ></DIV ><DIV @@ -12005,12 +12005,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4428" ->QSqlIndex (Qt v3+)</A +>TQSqlIndex (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSqlIndex</TT +>TQSqlIndex</TT > is fully implemented.</P ></DIV ><DIV @@ -12019,12 +12019,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4432" ->QSqlPropertyMap (Qt v3+)</A +>TQSqlPropertyMap (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSqlPropertyMap</TT +>TQSqlPropertyMap</TT > is fully implemented. However, because PyQt does not allow new properties to be defined, it is not possible to implement custom editor widgets in Python and add them to a property map. This will @@ -12038,7 +12038,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4437" ->QSqlQuery (Qt v3+)</A +>TQSqlQuery (Qt v3+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -12049,7 +12049,7 @@ NAME="AEN4439" ></A ><CODE CLASS="FUNCDEF" ->QMap<QString,QVariant> boundValues const</CODE +>TQMap<TQString,TQVariant> boundValues const</CODE >();<P ></P ></DIV @@ -12065,7 +12065,7 @@ NAME="AEN4444" ><CODE CLASS="FUNCDEF" >virtual bool exec</CODE ->(const QString &query);<P +>(const TQString &query);<P ></P ></DIV ><P @@ -12098,12 +12098,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4457" ->QSqlRecord (Qt v3+)</A +>TQSqlRecord (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSqlRecord</TT +>TQSqlRecord</TT > is fully implemented.</P ></DIV ><DIV @@ -12112,16 +12112,16 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4461" ->QSqlRecordInfo (Qt v3+)</A +>TQSqlRecordInfo (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSqlRecordInfo</TT +>TQSqlRecordInfo</TT > is implemented as a Python list of <TT CLASS="LITERAL" ->QSqlFieldInfo</TT +>TQSqlFieldInfo</TT > instances.</P ></DIV ><DIV @@ -12130,12 +12130,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4466" ->QSqlResult (Qt v3+)</A +>TQSqlResult (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QSqlResult</TT +>TQSqlResult</TT > is fully implemented.</P ></DIV ><DIV @@ -12144,7 +12144,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4470" ->QSqlSelectCursor (Qt v3.2.0+)</A +>TQSqlSelectCursor (Qt v3.2.0+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -12174,7 +12174,7 @@ NAME="AEN4479" ><CODE CLASS="FUNCDEF" >bool exec</CODE ->(const QString &query);<P +>(const TQString &query);<P ></P ></DIV ><P @@ -12201,12 +12201,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4489" ->QTable (Qt v2.2+)</A +>TQTable (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QTable</TT +>TQTable</TT > is fully implemented.</P ></DIV ><DIV @@ -12215,12 +12215,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4493" ->QTableItem (Qt v2.2+)</A +>TQTableItem (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QTableItem</TT +>TQTableItem</TT > is fully implemented.</P ></DIV ><DIV @@ -12229,12 +12229,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4497" ->QCheckTableItem (Qt v3+)</A +>TQCheckTableItem (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QCheckTableItem</TT +>TQCheckTableItem</TT > is fully implemented.</P ></DIV ><DIV @@ -12243,12 +12243,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4501" ->QComboTableItem (Qt v3+)</A +>TQComboTableItem (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QComboTableItem</TT +>TQComboTableItem</TT > is fully implemented.</P ></DIV ><DIV @@ -12257,12 +12257,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4505" ->QTableSelection (Qt v2.2+)</A +>TQTableSelection (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QTableSelection</TT +>TQTableSelection</TT > is fully implemented.</P ></DIV ></DIV @@ -12283,12 +12283,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4512" ->QWidgetFactory (Qt v3+)</A +>TQWidgetFactory (Qt v3+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QWidgetFactory</TT +>TQWidgetFactory</TT > is fully implemented.</P ></DIV ></DIV @@ -12309,12 +12309,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4519" ->QDomImplementation (Qt v2.2+)</A +>TQDomImplementation (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomImplementation</TT +>TQDomImplementation</TT > is fully implemented.</P ></DIV ><DIV @@ -12323,12 +12323,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4523" ->QDomNode (Qt v2.2+)</A +>TQDomNode (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomNode</TT +>TQDomNode</TT > is fully implemented, including the Python <TT CLASS="LITERAL" @@ -12344,12 +12344,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4529" ->QDomNodeList (Qt v2.2+)</A +>TQDomNodeList (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomNodeList</TT +>TQDomNodeList</TT > is fully implemented.</P ></DIV ><DIV @@ -12358,7 +12358,7 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4533" ->QDomDocument (Qt v2.2+)</A +>TQDomDocument (Qt v2.2+)</A ></H3 ><DIV CLASS="FUNCSYNOPSIS" @@ -12370,7 +12370,7 @@ NAME="AEN4535" ><CODE CLASS="FUNCDEF" >bool setContent</CODE ->(const QCString &buffer, bool namespaceProcessing, QString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P +>(const TQCString &buffer, bool namespaceProcessing, TQString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P ></P ></DIV ><P @@ -12407,7 +12407,7 @@ NAME="AEN4555" ><CODE CLASS="FUNCDEF" >bool setContent</CODE ->(const QByteArray &buffer, bool namespaceProcessing, QString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P +>(const TQByteArray &buffer, bool namespaceProcessing, TQString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P ></P ></DIV ><P @@ -12444,7 +12444,7 @@ NAME="AEN4575" ><CODE CLASS="FUNCDEF" >bool setContent</CODE ->(const QString &text, bool namespaceProcessing, QString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P +>(const TQString &text, bool namespaceProcessing, TQString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P ></P ></DIV ><P @@ -12481,7 +12481,7 @@ NAME="AEN4595" ><CODE CLASS="FUNCDEF" >bool setContent</CODE ->(const QIODevice *dev, bool namespaceProcessing, QString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P +>(const TQIODevice *dev, bool namespaceProcessing, TQString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P ></P ></DIV ><P @@ -12518,7 +12518,7 @@ NAME="AEN4615" ><CODE CLASS="FUNCDEF" >bool setContent</CODE ->(const QCString &buffer, QString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P +>(const TQCString &buffer, TQString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P ></P ></DIV ><P @@ -12551,7 +12551,7 @@ NAME="AEN4632" ><CODE CLASS="FUNCDEF" >bool setContent</CODE ->(const QByteArray &buffer, QString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P +>(const TQByteArray &buffer, TQString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P ></P ></DIV ><P @@ -12584,7 +12584,7 @@ NAME="AEN4649" ><CODE CLASS="FUNCDEF" >bool setContent</CODE ->(const QString &text, QString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P +>(const TQString &text, TQString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P ></P ></DIV ><P @@ -12617,7 +12617,7 @@ NAME="AEN4666" ><CODE CLASS="FUNCDEF" >bool setContent</CODE ->(const QIODevice *dev, QString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P +>(const TQIODevice *dev, TQString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P ></P ></DIV ><P @@ -12650,7 +12650,7 @@ NAME="AEN4683" ><CODE CLASS="FUNCDEF" >bool setContent</CODE ->(QXmlInputSource *source, QXmlReader *reader, QString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P +>(TQXmlInputSource *source, TQXmlReader *reader, TQString *errorMsg = 0, int *errorLine = 0, int *errorColumn = 0);<P ></P ></DIV ><P @@ -12662,12 +12662,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4697" ->QDomDocumentFragment (Qt v2.2+)</A +>TQDomDocumentFragment (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomDocumentFragment</TT +>TQDomDocumentFragment</TT > is fully implemented.</P ></DIV ><DIV @@ -12676,12 +12676,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4701" ->QDomDocumentType (Qt v2.2+)</A +>TQDomDocumentType (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomDocumentType</TT +>TQDomDocumentType</TT > is fully implemented.</P ></DIV ><DIV @@ -12690,12 +12690,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4705" ->QDomNamedNodeMap (Qt v2.2+)</A +>TQDomNamedNodeMap (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomNamedNodeMap</TT +>TQDomNamedNodeMap</TT > is fully implemented.</P ></DIV ><DIV @@ -12704,12 +12704,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4709" ->QDomCharacterData (Qt v2.2+)</A +>TQDomCharacterData (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomCharacterData</TT +>TQDomCharacterData</TT > is fully implemented.</P ></DIV ><DIV @@ -12718,12 +12718,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4713" ->QDomAttr (Qt v2.2+)</A +>TQDomAttr (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomAttr</TT +>TQDomAttr</TT > is fully implemented.</P ></DIV ><DIV @@ -12732,12 +12732,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4717" ->QDomElement (Qt v2.2+)</A +>TQDomElement (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomElement</TT +>TQDomElement</TT > is fully implemented.</P ></DIV ><DIV @@ -12746,12 +12746,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4721" ->QDomText (Qt v2.2+)</A +>TQDomText (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomText</TT +>TQDomText</TT > is fully implemented.</P ></DIV ><DIV @@ -12760,12 +12760,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4725" ->QDomComment (Qt v2.2+)</A +>TQDomComment (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomComment</TT +>TQDomComment</TT > is fully implemented.</P ></DIV ><DIV @@ -12774,12 +12774,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4729" ->QDomCDATASection (Qt v2.2+)</A +>TQDomCDATASection (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomCDATASection</TT +>TQDomCDATASection</TT > is fully implemented.</P ></DIV ><DIV @@ -12788,12 +12788,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4733" ->QDomNotation (Qt v2.2+)</A +>TQDomNotation (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomNotation</TT +>TQDomNotation</TT > is fully implemented.</P ></DIV ><DIV @@ -12802,12 +12802,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4737" ->QDomEntity (Qt v2.2+)</A +>TQDomEntity (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomEntity</TT +>TQDomEntity</TT > is fully implemented.</P ></DIV ><DIV @@ -12816,12 +12816,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4741" ->QDomEntityReference (Qt v2.2+)</A +>TQDomEntityReference (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomEntityReference</TT +>TQDomEntityReference</TT > is fully implemented.</P ></DIV ><DIV @@ -12830,12 +12830,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN4745" ->QDomProcessingInstruction (Qt v2.2+)</A +>TQDomProcessingInstruction (Qt v2.2+)</A ></H3 ><P ><TT CLASS="LITERAL" ->QDomProcessingInstruction</TT +>TQDomProcessingInstruction</TT > is fully implemented.</P ></DIV ></DIV diff --git a/python/pyqt/examples3/SQL/connect.ui.h b/python/pyqt/examples3/SQL/connect.ui.h index cbeeabdc..ee6e5a95 100644 --- a/python/pyqt/examples3/SQL/connect.ui.h +++ b/python/pyqt/examples3/SQL/connect.ui.h @@ -12,7 +12,7 @@ void ConnectDialog::init() from qtsql import QSqlDatabase #qDebug("ConnectDialog init") self.comboDriver.clear() -self.comboDriver.insertStringList(QSqlDatabase.drivers()) +self.comboDriver.insertStringList(TQSqlDatabase.drivers()) } void ConnectDialog::destroy() diff --git a/python/pyqt/examples3/SQL/sqlex.ui.h b/python/pyqt/examples3/SQL/sqlex.ui.h index 1acdc5d4..f1acd9ec 100644 --- a/python/pyqt/examples3/SQL/sqlex.ui.h +++ b/python/pyqt/examples3/SQL/sqlex.ui.h @@ -10,8 +10,8 @@ void SqlEx::init() { self.hsplit.setSizes([250]) -self.hsplit.setResizeMode(self.lv, QSplitter.KeepSize) -self.vsplit.setResizeMode(self.gb, QSplitter.KeepSize) +self.hsplit.setResizeMode(self.lv, TQSplitter.KeepSize) +self.vsplit.setResizeMode(self.gb, TQSplitter.KeepSize) self.submitBtn.setEnabled(0) } @@ -22,7 +22,7 @@ void SqlEx::dbConnect() } -void SqlEx::showTable( QListViewItem * ) +void SqlEx::showTable( TQListViewItem * ) { } diff --git a/python/pyqt/pylupdate3/fetchtr.cpp b/python/pyqt/pylupdate3/fetchtr.cpp index 609dbc18..600b3a07 100644 --- a/python/pyqt/pylupdate3/fetchtr.cpp +++ b/python/pyqt/pylupdate3/fetchtr.cpp @@ -29,23 +29,23 @@ ** **********************************************************************/ -#include <qfile.h> -#include <qregexp.h> -#include <qstring.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqregexp.h> +#include <tqstring.h> +#include <tqtextstream.h> #include <ctype.h> #include <errno.h> #include <metatranslator.h> #include <stdio.h> #include <string.h> -/*#include <qxml.h>*/ +/*#include <tqxml.h>*/ static const char MagicComment[] = "TRANSLATOR "; -static QMap<QCString, int> needs_Q_OBJECT; -static QMap<QCString, int> lacks_Q_OBJECT; +static TQMap<TQCString, int> needs_Q_OBJECT; +static TQMap<TQCString, int> lacks_Q_OBJECT; /* The first part of this source file is the python tokenizer. We skip @@ -62,7 +62,7 @@ enum { Tok_Eof, Tok_class, Tok_return, Tok_tr, The tokenizer maintains the following global variables. The names should be self-explanatory. */ -static QCString yyFileName; +static TQCString yyFileName; static int yyCh; static char yyIdent[128]; static size_t yyIdentLen; @@ -78,7 +78,7 @@ static int yyCurLineNo; static FILE *yyInFile; // the string to read from and current position in the string (otherwise) -static QString yyInStr; +static TQString yyInStr; static int yyInPos; static int buf; @@ -225,7 +225,7 @@ static int getToken() yyCh = getChar(); if ( yyCh == 'x' ) { - QCString hex = "0"; + TQCString hex = "0"; yyCh = getChar(); while ( isxdigit(yyCh) ) { @@ -236,7 +236,7 @@ static int getToken() if ( yyStringLen < sizeof(yyString) - 1 ) yyString[yyStringLen++] = (char) n; } else if ( yyCh >= '0' && yyCh < '8' ) { - QCString oct = ""; + TQCString oct = ""; do { oct += (char) yyCh; @@ -316,7 +316,7 @@ static bool match( int t ) return matches; } -static bool matchString( QCString *s ) +static bool matchString( TQCString *s ) { bool matches = ( yyTok == Tok_String ); *s = ""; @@ -330,10 +330,10 @@ static bool matchString( QCString *s ) static bool matchEncoding( bool *utf8 ) { if ( yyTok == Tok_Ident ) { - if ( strcmp(yyIdent, "QApplication") == 0 ) { + if ( strcmp(yyIdent, "TQApplication") == 0 ) { yyTok = getToken(); } - *utf8 = QString( yyIdent ).endsWith( QString("UTF8") ); + *utf8 = TQString( yyIdent ).endsWith( TQString("UTF8") ); yyTok = getToken(); return TRUE; } else { @@ -344,12 +344,12 @@ static bool matchEncoding( bool *utf8 ) static void parse( MetaTranslator *tor, const char *initialContext, const char *defaultContext ) { - QMap<QCString, QCString> qualifiedContexts; - QCString context; - QCString text; - QCString com; - QCString functionContext = initialContext; - QCString prefix; + TQMap<TQCString, TQCString> qualifiedContexts; + TQCString context; + TQCString text; + TQCString com; + TQCString functionContext = initialContext; + TQCString prefix; bool utf8 = FALSE; yyTok = getToken(); @@ -380,7 +380,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, if ( qualifiedContexts.contains(context) ) context = qualifiedContexts[context]; tor->insert( MetaTranslatorMessage(context, text, com, - QString::null, utf8) ); + TQString::null, utf8) ); } } break; @@ -400,7 +400,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, matchEncoding(&utf8) && match(Tok_RightParen))) ) tor->insert( MetaTranslatorMessage(context, text, com, - QString::null, utf8) ); + TQString::null, utf8) ); } break; case Tok_Ident: @@ -423,7 +423,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, context = com.left( k ); com.remove( 0, k + 1 ); tor->insert( MetaTranslatorMessage(context, "", com, - QString::null, FALSE) ); + TQString::null, FALSE) ); } } yyTok = getToken(); diff --git a/python/pyqt/pylupdate3/main.cpp b/python/pyqt/pylupdate3/main.cpp index 427fed51..bd3d7612 100644 --- a/python/pyqt/pylupdate3/main.cpp +++ b/python/pyqt/pylupdate3/main.cpp @@ -29,10 +29,10 @@ ** **********************************************************************/ -#include <qfile.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqtextstream.h> #include <errno.h> #include <metatranslator.h> @@ -47,7 +47,7 @@ extern void fetchtr_py( const char *fileName, MetaTranslator *tor, extern void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose ); -typedef QValueList<MetaTranslatorMessage> TML; +typedef TQValueList<MetaTranslatorMessage> TML; static void printUsage() { @@ -85,39 +85,39 @@ int main( int argc, char **argv ) } numProFiles++; - QFile f( argv[i] ); + TQFile f( argv[i] ); if ( !f.open(IO_ReadOnly) ) { qWarning( "pylupdate error: Cannot open project file '%s': %s", argv[i], strerror(errno) ); return 1; } - QTextStream t( &f ); - QString fullText = t.read(); + TQTextStream t( &f ); + TQString fullText = t.read(); f.close(); MetaTranslator fetchedTor; - QString defaultContext = "@default"; - QCString codec; - QStringList translatorFiles; - QStringList::Iterator tf; + TQString defaultContext = "@default"; + TQCString codec; + TQStringList translatorFiles; + TQStringList::Iterator tf; - QMap<QString, QString> tagMap = proFileTagMap( fullText ); - QMap<QString, QString>::Iterator it; + TQMap<TQString, TQString> tagMap = proFileTagMap( fullText ); + TQMap<TQString, TQString>::Iterator it; for ( it = tagMap.begin(); it != tagMap.end(); ++it ) { - QStringList toks = QStringList::split( QChar(' '), it.data() ); - QStringList::Iterator t; + TQStringList toks = TQStringList::split( TQChar(' '), it.data() ); + TQStringList::Iterator t; for ( t = toks.begin(); t != toks.end(); ++t ) { - if ( it.key() == QString("SOURCES") ) { + if ( it.key() == TQString("SOURCES") ) { fetchtr_py( *t, &fetchedTor, defaultContext, TRUE ); metSomething = TRUE; - } else if ( it.key() == QString("TRANSLATIONS") ) { + } else if ( it.key() == TQString("TRANSLATIONS") ) { translatorFiles.append( *t ); metSomething = TRUE; - } else if ( it.key() == QString("CODEC") ) { + } else if ( it.key() == TQString("CODEC") ) { codec = (*t).latin1(); } } diff --git a/python/pyqt/pylupdate3/merge.cpp b/python/pyqt/pylupdate3/merge.cpp index c569c938..6ae9673d 100644 --- a/python/pyqt/pylupdate3/merge.cpp +++ b/python/pyqt/pylupdate3/merge.cpp @@ -21,7 +21,7 @@ extern void applyNumberHeuristic( MetaTranslator *tor, bool verbose ); // defined in sametexth.cpp extern void applySameTextHeuristic( MetaTranslator *tor, bool verbose ); -typedef QValueList<MetaTranslatorMessage> TML; +typedef TQValueList<MetaTranslatorMessage> TML; /* Merges two MetaTranslator objects into the first one. The first one is a set @@ -47,7 +47,7 @@ void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose ) MetaTranslatorMessage m = *it; // skip context comment - if ( !QCString((*it).sourceText()).isEmpty() ) { + if ( !TQCString((*it).sourceText()).isEmpty() ) { if ( !virginTor->contains((*it).context(), (*it).sourceText(), (*it).comment()) ) { newType = MetaTranslatorMessage::Obsolete; @@ -86,7 +86,7 @@ void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose ) if ( !tor->contains((*it).context(), (*it).sourceText(), (*it).comment()) ) { tor->insert( *it ); - if ( !QCString((*it).sourceText()).isEmpty() ) + if ( !TQCString((*it).sourceText()).isEmpty() ) neww++; } } diff --git a/python/pyqt/pylupdate3/metatranslator.cpp b/python/pyqt/pylupdate3/metatranslator.cpp index c3d06738..24a23f4b 100644 --- a/python/pyqt/pylupdate3/metatranslator.cpp +++ b/python/pyqt/pylupdate3/metatranslator.cpp @@ -14,25 +14,25 @@ ** **********************************************************************/ -#include <qapplication.h> -#include <qcstring.h> -#include <qfile.h> -#include <qmessagebox.h> -#include <qregexp.h> -#include <qtextcodec.h> -#include <qtextstream.h> -#include <qxml.h> +#include <tqapplication.h> +#include <tqcstring.h> +#include <tqfile.h> +#include <tqmessagebox.h> +#include <tqregexp.h> +#include <tqtextcodec.h> +#include <tqtextstream.h> +#include <tqxml.h> #include "metatranslator.h" -static bool encodingIsUtf8( const QXmlAttributes& atts ) +static bool encodingIsUtf8( const TQXmlAttributes& atts ) { for ( int i = 0; i < atts.length(); i++ ) { // utf8="true" is a pre-3.0 syntax - if ( atts.qName(i) == QString("utf8") ) { - return ( atts.value(i) == QString("true") ); - } else if ( atts.qName(i) == QString("encoding") ) { - return ( atts.value(i) == QString("UTF-8") ); + if ( atts.qName(i) == TQString("utf8") ) { + return ( atts.value(i) == TQString("true") ); + } else if ( atts.qName(i) == TQString("encoding") ) { + return ( atts.value(i) == TQString("UTF-8") ); } } return FALSE; @@ -46,38 +46,38 @@ public: inMessage( FALSE ), ferrorCount( 0 ), contextIsUtf8( FALSE ), messageIsUtf8( FALSE ) { } - virtual bool startElement( const QString& namespaceURI, - const QString& localName, const QString& qName, - const QXmlAttributes& atts ); - virtual bool endElement( const QString& namespaceURI, - const QString& localName, const QString& qName ); - virtual bool characters( const QString& ch ); - virtual bool fatalError( const QXmlParseException& exception ); + virtual bool startElement( const TQString& namespaceURI, + const TQString& localName, const TQString& qName, + const TQXmlAttributes& atts ); + virtual bool endElement( const TQString& namespaceURI, + const TQString& localName, const TQString& qName ); + virtual bool characters( const TQString& ch ); + virtual bool fatalError( const TQXmlParseException& exception ); private: MetaTranslator *tor; MetaTranslatorMessage::Type type; bool inMessage; - QString context; - QString source; - QString comment; - QString translation; + TQString context; + TQString source; + TQString comment; + TQString translation; - QString accum; + TQString accum; int ferrorCount; bool contextIsUtf8; bool messageIsUtf8; }; -bool TsHandler::startElement( const QString& /* namespaceURI */, - const QString& /* localName */, - const QString& qName, - const QXmlAttributes& atts ) +bool TsHandler::startElement( const TQString& /* namespaceURI */, + const TQString& /* localName */, + const TQString& qName, + const TQXmlAttributes& atts ) { - if ( qName == QString("byte") ) { + if ( qName == TQString("byte") ) { for ( int i = 0; i < atts.length(); i++ ) { - if ( atts.qName(i) == QString("value") ) { - QString value = atts.value( i ); + if ( atts.qName(i) == TQString("value") ) { + TQString value = atts.value( i ); int base = 10; if ( value.startsWith("x") ) { base = 16; @@ -85,29 +85,29 @@ bool TsHandler::startElement( const QString& /* namespaceURI */, } int n = value.toUInt( 0, base ); if ( n != 0 ) - accum += QChar( n ); + accum += TQChar( n ); } } } else { - if ( qName == QString("context") ) { + if ( qName == TQString("context") ) { context.truncate( 0 ); source.truncate( 0 ); comment.truncate( 0 ); translation.truncate( 0 ); contextIsUtf8 = encodingIsUtf8( atts ); - } else if ( qName == QString("message") ) { + } else if ( qName == TQString("message") ) { inMessage = TRUE; type = MetaTranslatorMessage::Finished; source.truncate( 0 ); comment.truncate( 0 ); translation.truncate( 0 ); messageIsUtf8 = encodingIsUtf8( atts ); - } else if ( qName == QString("translation") ) { + } else if ( qName == TQString("translation") ) { for ( int i = 0; i < atts.length(); i++ ) { - if ( atts.qName(i) == QString("type") ) { - if ( atts.value(i) == QString("unfinished") ) + if ( atts.qName(i) == TQString("type") ) { + if ( atts.value(i) == TQString("unfinished") ) type = MetaTranslatorMessage::Unfinished; - else if ( atts.value(i) == QString("obsolete") ) + else if ( atts.value(i) == TQString("obsolete") ) type = MetaTranslatorMessage::Obsolete; else type = MetaTranslatorMessage::Finished; @@ -119,33 +119,33 @@ bool TsHandler::startElement( const QString& /* namespaceURI */, return TRUE; } -bool TsHandler::endElement( const QString& /* namespaceURI */, - const QString& /* localName */, - const QString& qName ) +bool TsHandler::endElement( const TQString& /* namespaceURI */, + const TQString& /* localName */, + const TQString& qName ) { - if ( qName == QString("codec") || qName == QString("defaultcodec") ) { + if ( qName == TQString("codec") || qName == TQString("defaultcodec") ) { // "codec" is a pre-3.0 syntax tor->setCodec( accum ); - } else if ( qName == QString("name") ) { + } else if ( qName == TQString("name") ) { context = accum; - } else if ( qName == QString("source") ) { + } else if ( qName == TQString("source") ) { source = accum; - } else if ( qName == QString("comment") ) { + } else if ( qName == TQString("comment") ) { if ( inMessage ) { comment = accum; } else { if ( contextIsUtf8 ) tor->insert( MetaTranslatorMessage(context.utf8(), "", - accum.utf8(), QString::null, TRUE, + accum.utf8(), TQString::null, TRUE, MetaTranslatorMessage::Unfinished) ); else tor->insert( MetaTranslatorMessage(context.ascii(), "", - accum.ascii(), QString::null, FALSE, + accum.ascii(), TQString::null, FALSE, MetaTranslatorMessage::Unfinished) ); } - } else if ( qName == QString("translation") ) { + } else if ( qName == TQString("translation") ) { translation = accum; - } else if ( qName == QString("message") ) { + } else if ( qName == TQString("message") ) { if ( messageIsUtf8 ) tor->insert( MetaTranslatorMessage(context.utf8(), source.utf8(), comment.utf8(), translation, @@ -159,56 +159,56 @@ bool TsHandler::endElement( const QString& /* namespaceURI */, return TRUE; } -bool TsHandler::characters( const QString& ch ) +bool TsHandler::characters( const TQString& ch ) { - QString t = ch; - t.replace( QRegExp(QChar('\r')), "" ); + TQString t = ch; + t.replace( TQRegExp(TQChar('\r')), "" ); accum += t; return TRUE; } -bool TsHandler::fatalError( const QXmlParseException& exception ) +bool TsHandler::fatalError( const TQXmlParseException& exception ) { if ( ferrorCount++ == 0 ) { - QString msg; + TQString msg; msg.sprintf( "Parse error at line %d, column %d (%s).", exception.lineNumber(), exception.columnNumber(), exception.message().latin1() ); if ( qApp == 0 ) qWarning( "XML error: %s", msg.latin1() ); else - QMessageBox::information( qApp->mainWidget(), - QObject::tr("Qt Linguist"), msg ); + TQMessageBox::information( qApp->mainWidget(), + TQObject::tr("Qt Linguist"), msg ); } return FALSE; } -static QString numericEntity( int ch ) +static TQString numericEntity( int ch ) { - return QString( ch <= 0x20 ? "<byte value=\"x%1\"/>" : "&#x%1;" ) + return TQString( ch <= 0x20 ? "<byte value=\"x%1\"/>" : "&#x%1;" ) .arg( ch, 0, 16 ); } -static QString protect( const QCString& str ) +static TQString protect( const TQCString& str ) { - QString result; + TQString result; int len = (int) str.length(); for ( int k = 0; k < len; k++ ) { switch( str[k] ) { case '\"': - result += QString( """ ); + result += TQString( """ ); break; case '&': - result += QString( "&" ); + result += TQString( "&" ); break; case '>': - result += QString( ">" ); + result += TQString( ">" ); break; case '<': - result += QString( "<" ); + result += TQString( "<" ); break; case '\'': - result += QString( "'" ); + result += TQString( "'" ); break; default: if ( (uchar) str[k] < 0x20 && str[k] != '\n' ) @@ -220,19 +220,19 @@ static QString protect( const QCString& str ) return result; } -static QString evilBytes( const QCString& str, bool utf8 ) +static TQString evilBytes( const TQCString& str, bool utf8 ) { if ( utf8 ) { return protect( str ); } else { - QString result; - QCString t = protect( str ).latin1(); + TQString result; + TQCString t = protect( str ).latin1(); int len = (int) t.length(); for ( int k = 0; k < len; k++ ) { if ( (uchar) t[k] >= 0x7f ) result += numericEntity( (uchar) t[k] ); else - result += QChar( t[k] ); + result += TQChar( t[k] ); } return result; } @@ -246,7 +246,7 @@ MetaTranslatorMessage::MetaTranslatorMessage() MetaTranslatorMessage::MetaTranslatorMessage( const char *context, const char *sourceText, const char *comment, - const QString& translation, + const TQString& translation, bool utf8, Type type ) : QTranslatorMessage( context, sourceText, comment, translation ), utfeight( FALSE ), ty( type ) @@ -330,23 +330,23 @@ MetaTranslator& MetaTranslator::operator=( const MetaTranslator& tor ) return *this; } -bool MetaTranslator::load( const QString& filename ) +bool MetaTranslator::load( const TQString& filename ) { mm.clear(); - QFile f( filename ); + TQFile f( filename ); if ( !f.open(IO_ReadOnly) ) return FALSE; - QTextStream t( &f ); - QXmlInputSource in( t ); - QXmlSimpleReader reader; + TQTextStream t( &f ); + TQXmlInputSource in( t ); + TQXmlSimpleReader reader; // don't click on these! reader.setFeature( "http://xml.org/sax/features/namespaces", FALSE ); reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", TRUE ); reader.setFeature( "http://trolltech.com/xml/features/report-whitespace" "-only-CharData", FALSE ); - QXmlDefaultHandler *hand = new TsHandler( this ); + TQXmlDefaultHandler *hand = new TsHandler( this ); reader.setContentHandler( hand ); reader.setErrorHandler( hand ); @@ -360,14 +360,14 @@ bool MetaTranslator::load( const QString& filename ) return ok; } -bool MetaTranslator::save( const QString& filename ) const +bool MetaTranslator::save( const TQString& filename ) const { - QFile f( filename ); + TQFile f( filename ); if ( !f.open(IO_WriteOnly) ) return FALSE; - QTextStream t( &f ); - t.setCodec( QTextCodec::codecForName("ISO-8859-1") ); + TQTextStream t( &f ); + t.setCodec( TQTextCodec::codecForName("ISO-8859-1") ); t << "<!DOCTYPE TS><TS>\n"; if ( codecName != "ISO-8859-1" ) @@ -377,19 +377,19 @@ bool MetaTranslator::save( const QString& filename ) const TMMInv inv; TMMInv::Iterator i; bool contextIsUtf8 = m.key().utf8(); - QCString context = m.key().context(); - QCString comment = ""; + TQCString context = m.key().context(); + TQCString comment = ""; do { - if ( QCString(m.key().sourceText()).isEmpty() ) { + if ( TQCString(m.key().sourceText()).isEmpty() ) { if ( m.key().type() != MetaTranslatorMessage::Obsolete ) { contextIsUtf8 = m.key().utf8(); - comment = QCString( m.key().comment() ); + comment = TQCString( m.key().comment() ); } } else { inv.insert( *m, m.key() ); } - } while ( ++m != mm.end() && QCString(m.key().context()) == context ); + } while ( ++m != mm.end() && TQCString(m.key().context()) == context ); t << "<context"; if ( contextIsUtf8 ) @@ -409,7 +409,7 @@ bool MetaTranslator::save( const QString& filename ) const << " <source>" << evilBytes( (*i).sourceText(), (*i).utf8() ) << "</source>\n"; - if ( !QCString((*i).comment()).isEmpty() ) + if ( !TQCString((*i).comment()).isEmpty() ) t << " <comment>" << evilBytes( (*i).comment(), (*i).utf8() ) << "</comment>\n"; @@ -429,7 +429,7 @@ bool MetaTranslator::save( const QString& filename ) const return TRUE; } -bool MetaTranslator::release( const QString& filename, bool verbose ) const +bool MetaTranslator::release( const TQString& filename, bool verbose ) const { QTranslator tor( 0 ); int finished = 0; @@ -494,7 +494,7 @@ void MetaTranslator::stripEmptyContexts() TMM::Iterator m = mm.begin(); while ( m != mm.end() ) { - if ( QCString(m.key().sourceText()).isEmpty() ) { + if ( TQCString(m.key().sourceText()).isEmpty() ) { TMM::Iterator n = m; ++n; // the context comment is followed by other messages @@ -514,22 +514,22 @@ void MetaTranslator::setCodec( const char *name ) const int latin1 = 4; codecName = name; - codec = QTextCodec::codecForName( name ); + codec = TQTextCodec::codecForName( name ); if ( codec == 0 || codec->mibEnum() == latin1 ) codec = 0; } -QString MetaTranslator::toUnicode( const char *str, bool utf8 ) const +TQString MetaTranslator::toUnicode( const char *str, bool utf8 ) const { if ( utf8 ) - return QString::fromUtf8( str ); + return TQString::fromUtf8( str ); else if ( codec == 0 ) - return QString( str ); + return TQString( str ); else return codec->toUnicode( str ); } -QValueList<MetaTranslatorMessage> MetaTranslator::messages() const +TQValueList<MetaTranslatorMessage> MetaTranslator::messages() const { int n = mm.count(); TMM::ConstIterator *t = new TMM::ConstIterator[n + 1]; @@ -537,7 +537,7 @@ QValueList<MetaTranslatorMessage> MetaTranslator::messages() const for ( m = mm.begin(); m != mm.end(); ++m ) t[*m] = m; - QValueList<MetaTranslatorMessage> val; + TQValueList<MetaTranslatorMessage> val; for ( int i = 0; i < n; i++ ) val.append( t[i].key() ); @@ -545,9 +545,9 @@ QValueList<MetaTranslatorMessage> MetaTranslator::messages() const return val; } -QValueList<MetaTranslatorMessage> MetaTranslator::translatedMessages() const +TQValueList<MetaTranslatorMessage> MetaTranslator::translatedMessages() const { - QValueList<MetaTranslatorMessage> val; + TQValueList<MetaTranslatorMessage> val; TMM::ConstIterator m; for ( m = mm.begin(); m != mm.end(); ++m ) { if ( m.key().type() == MetaTranslatorMessage::Finished ) diff --git a/python/pyqt/pylupdate3/metatranslator.h b/python/pyqt/pylupdate3/metatranslator.h index a071207e..eb2a645d 100644 --- a/python/pyqt/pylupdate3/metatranslator.h +++ b/python/pyqt/pylupdate3/metatranslator.h @@ -17,10 +17,10 @@ #ifndef METATRANSLATOR_H #define METATRANSLATOR_H -#include <qmap.h> -#include <qstring.h> -#include <qtranslator.h> -#include <qvaluelist.h> +#include <tqmap.h> +#include <tqstring.h> +#include <tqtranslator.h> +#include <tqvaluelist.h> class QTextCodec; @@ -32,7 +32,7 @@ public: MetaTranslatorMessage(); MetaTranslatorMessage( const char *context, const char *sourceText, const char *comment, - const QString& translation = QString::null, + const TQString& translation = TQString::null, bool utf8 = FALSE, Type type = Unfinished ); MetaTranslatorMessage( const MetaTranslatorMessage& m ); @@ -66,9 +66,9 @@ public: MetaTranslator& operator=( const MetaTranslator& tor ); - bool load( const QString& filename ); - bool save( const QString& filename ) const; - bool release( const QString& filename, bool verbose = FALSE ) const; + bool load( const TQString& filename ); + bool save( const TQString& filename ) const; + bool release( const TQString& filename, bool verbose = FALSE ) const; bool contains( const char *context, const char *sourceText, const char *comment ) const; @@ -78,18 +78,18 @@ public: void stripEmptyContexts(); void setCodec( const char *name ); - QString toUnicode( const char *str, bool utf8 ) const; + TQString toUnicode( const char *str, bool utf8 ) const; - QValueList<MetaTranslatorMessage> messages() const; - QValueList<MetaTranslatorMessage> translatedMessages() const; + TQValueList<MetaTranslatorMessage> messages() const; + TQValueList<MetaTranslatorMessage> translatedMessages() const; private: - typedef QMap<MetaTranslatorMessage, int> TMM; - typedef QMap<int, MetaTranslatorMessage> TMMInv; + typedef TQMap<MetaTranslatorMessage, int> TMM; + typedef TQMap<int, MetaTranslatorMessage> TMMInv; TMM mm; - QCString codecName; - QTextCodec *codec; + TQCString codecName; + TQTextCodec *codec; }; #endif diff --git a/python/pyqt/pylupdate3/numberh.cpp b/python/pyqt/pylupdate3/numberh.cpp index 67048031..2280ba27 100644 --- a/python/pyqt/pylupdate3/numberh.cpp +++ b/python/pyqt/pylupdate3/numberh.cpp @@ -14,16 +14,16 @@ ** **********************************************************************/ -#include <qmemarray.h> -#include <qcstring.h> -#include <qmap.h> -#include <qstringlist.h> +#include <tqmemarray.h> +#include <tqcstring.h> +#include <tqmap.h> +#include <tqstringlist.h> #include <ctype.h> #include <metatranslator.h> -typedef QMap<QCString, MetaTranslatorMessage> TMM; -typedef QValueList<MetaTranslatorMessage> TML; +typedef TQMap<TQCString, MetaTranslatorMessage> TMM; +typedef TQValueList<MetaTranslatorMessage> TML; static bool isDigitFriendly( int c ) { @@ -49,9 +49,9 @@ static int numberLength( const char *s ) Returns a version of 'key' where all numbers have been replaced by zeroes. If there were none, returns "". */ -static QCString zeroKey( const char *key ) +static TQCString zeroKey( const char *key ) { - QCString zeroed( strlen(key) + 1 ); + TQCString zeroed( strlen(key) + 1 ); char *z = zeroed.data(); int i = 0, j = 0; int len; @@ -75,17 +75,17 @@ static QCString zeroKey( const char *key ) return ""; } -static QString translationAttempt( const QString& oldTranslation, +static TQString translationAttempt( const TQString& oldTranslation, const char *oldSource, const char *newSource ) { int p = zeroKey( oldSource ).contains( '0' ); int oldSourceLen = qstrlen( oldSource ); - QString attempt; - QStringList oldNumbers; - QStringList newNumbers; - QMemArray<bool> met( p ); - QMemArray<int> matchedYet( p ); + TQString attempt; + TQStringList oldNumbers; + TQStringList newNumbers; + TQMemArray<bool> met( p ); + TQMemArray<int> matchedYet( p ); int i, j; int k = 0, ell, best; int m, n; @@ -103,8 +103,8 @@ static QString translationAttempt( const QString& oldTranslation, m = numberLength( oldSource + i ); n = numberLength( newSource + j ); if ( m > 0 ) { - oldNumbers.append( QCString(oldSource + i, m + 1) ); - newNumbers.append( QCString(newSource + j, n + 1) ); + oldNumbers.append( TQCString(oldSource + i, m + 1) ); + newNumbers.append( TQCString(newSource + j, n + 1) ); i += m; j += n; met[k] = FALSE; @@ -168,7 +168,7 @@ static QString translationAttempt( const QString& oldTranslation, */ for ( k = 0; k < p; k++ ) { if ( !met[k] ) - attempt += QString( " {" ) + newNumbers[k] + QString( "?}" ); + attempt += TQString( " {" ) + newNumbers[k] + TQString( "?}" ); } /* @@ -180,8 +180,8 @@ static QString translationAttempt( const QString& oldTranslation, for ( ell = 0; ell < p; ell++ ) { if ( k != ell && oldNumbers[k] == oldNumbers[ell] && newNumbers[k] < newNumbers[ell] ) - attempt += QString( " {" ) + newNumbers[k] + QString( " or " ) + - newNumbers[ell] + QString( "?}" ); + attempt += TQString( " {" ) + newNumbers[k] + TQString( " or " ) + + newNumbers[ell] + TQString( "?}" ); } } return attempt; diff --git a/python/pyqt/pylupdate3/proparser.cpp b/python/pyqt/pylupdate3/proparser.cpp index f018b4c3..6010cbeb 100644 --- a/python/pyqt/pylupdate3/proparser.cpp +++ b/python/pyqt/pylupdate3/proparser.cpp @@ -14,58 +14,58 @@ ** **********************************************************************/ -#include <qregexp.h> -#include <qstringlist.h> +#include <tqregexp.h> +#include <tqstringlist.h> #include "proparser.h" -QMap<QString, QString> proFileTagMap( const QString& text ) +TQMap<TQString, TQString> proFileTagMap( const TQString& text ) { - QString t = text; + TQString t = text; /* Strip comments, merge lines ending with backslash, add spaces around '=' and '+=', replace '\n' with ';', and simplify white spaces. */ - t.replace( QRegExp(QString("#[^\n]$")), QString(" ") ); - t.replace( QRegExp(QString("\\\\\\s*\n")), QString(" ") ); - t.replace( QRegExp(QString("=")), QString(" = ") ); - t.replace( QRegExp(QString("\\+ =")), QString(" += ") ); - t.replace( QRegExp(QString("\n")), QString(";") ); + t.replace( TQRegExp(TQString("#[^\n]$")), TQString(" ") ); + t.replace( TQRegExp(TQString("\\\\\\s*\n")), TQString(" ") ); + t.replace( TQRegExp(TQString("=")), TQString(" = ") ); + t.replace( TQRegExp(TQString("\\+ =")), TQString(" += ") ); + t.replace( TQRegExp(TQString("\n")), TQString(";") ); t = t.simplifyWhiteSpace(); - QMap<QString, QString> tagMap; + TQMap<TQString, TQString> tagMap; - QStringList lines = QStringList::split( QChar(';'), t ); - QStringList::Iterator line; + TQStringList lines = TQStringList::split( TQChar(';'), t ); + TQStringList::Iterator line; for ( line = lines.begin(); line != lines.end(); ++line ) { - QStringList toks = QStringList::split( QChar(' '), *line ); + TQStringList toks = TQStringList::split( TQChar(' '), *line ); if ( toks.count() >= 3 && - (toks[1] == QString("=") || toks[1] == QString("+=")) ) { - QString tag = toks.first(); - int k = tag.findRev( QChar(':') ); // as in 'unix:' + (toks[1] == TQString("=") || toks[1] == TQString("+=")) ) { + TQString tag = toks.first(); + int k = tag.findRev( TQChar(':') ); // as in 'unix:' if ( k != -1 ) tag = tag.mid( k + 1 ); toks.remove( toks.begin() ); - QString action = toks.first(); + TQString action = toks.first(); toks.remove( toks.begin() ); if ( tagMap.contains(tag) ) { - if ( action == QString("=") ) - tagMap.replace( tag, toks.join(QChar(' ')) ); + if ( action == TQString("=") ) + tagMap.replace( tag, toks.join(TQChar(' ')) ); else - tagMap[tag] += QChar( ' ' ) + toks.join( QChar(' ') ); + tagMap[tag] += TQChar( ' ' ) + toks.join( TQChar(' ') ); } else { - tagMap[tag] = toks.join( QChar(' ') ); + tagMap[tag] = toks.join( TQChar(' ') ); } } } - QRegExp var( "\\$\\$[a-zA-Z0-9_]+" ); - QMap<QString, QString>::Iterator it; + TQRegExp var( "\\$\\$[a-zA-Z0-9_]+" ); + TQMap<TQString, TQString>::Iterator it; for ( it = tagMap.begin(); it != tagMap.end(); ++it ) { int i = 0; diff --git a/python/pyqt/pylupdate3/proparser.h b/python/pyqt/pylupdate3/proparser.h index 2a66c8ab..7d0df31a 100644 --- a/python/pyqt/pylupdate3/proparser.h +++ b/python/pyqt/pylupdate3/proparser.h @@ -17,9 +17,9 @@ #ifndef PROPARSER_H #define PROPARSER_H -#include <qmap.h> -#include <qstring.h> +#include <tqmap.h> +#include <tqstring.h> -QMap<QString, QString> proFileTagMap( const QString& text ); +TQMap<TQString, TQString> proFileTagMap( const TQString& text ); #endif diff --git a/python/pyqt/pylupdate3/sametexth.cpp b/python/pyqt/pylupdate3/sametexth.cpp index 1ee869f2..c007cfc3 100644 --- a/python/pyqt/pylupdate3/sametexth.cpp +++ b/python/pyqt/pylupdate3/sametexth.cpp @@ -14,13 +14,13 @@ ** **********************************************************************/ -#include <qcstring.h> -#include <qmap.h> +#include <tqcstring.h> +#include <tqmap.h> #include <metatranslator.h> -typedef QMap<QCString, MetaTranslatorMessage> TMM; -typedef QValueList<MetaTranslatorMessage> TML; +typedef TQMap<TQCString, MetaTranslatorMessage> TMM; +typedef TQValueList<MetaTranslatorMessage> TML; /* Augments a MetaTranslator with trivially derived translations. @@ -45,7 +45,7 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose ) if ( (*it).translation().isEmpty() ) untranslated.append( *it ); } else { - QCString key = (*it).sourceText(); + TQCString key = (*it).sourceText(); t = translated.find( key ); if ( t != translated.end() ) { /* @@ -63,7 +63,7 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose ) } for ( u = untranslated.begin(); u != untranslated.end(); ++u ) { - QCString key = (*u).sourceText(); + TQCString key = (*u).sourceText(); t = translated.find( key ); if ( t != translated.end() ) { MetaTranslatorMessage m( *u ); diff --git a/python/pyqt/pyuic2/domtool.cpp b/python/pyqt/pyuic2/domtool.cpp index 2b14ee6c..a1ffac47 100644 --- a/python/pyqt/pyuic2/domtool.cpp +++ b/python/pyqt/pyuic2/domtool.cpp @@ -21,12 +21,12 @@ #include "domtool.h" -#include <qsizepolicy.h> -#include <qpalette.h> -#include <qcursor.h> -#include <qrect.h> -#include <qsize.h> -#include <qfont.h> +#include <tqsizepolicy.h> +#include <tqpalette.h> +#include <tqcursor.h> +#include <tqrect.h> +#include <tqsize.h> +#include <tqfont.h> /*! @@ -46,14 +46,14 @@ \sa hasProperty() */ -QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const QVariant& defValue ) +TQVariant DomTool::readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" ) { - QString prop = n2.firstChild().toText().data(); + TQString prop = n2.firstChild().toText().data(); if ( prop == name ) return elementToVariant( n2.nextSibling().toElement(), defValue ); } @@ -67,14 +67,14 @@ QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const \sa readProperty() */ -bool DomTool::hasProperty( const QDomElement& e, const QString& name ) +bool DomTool::hasProperty( const TQDomElement& e, const TQString& name ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" ) { - QString prop = n2.firstChild().toText().data(); + TQString prop = n2.firstChild().toText().data(); if ( prop == name ) return TRUE; } @@ -83,20 +83,20 @@ bool DomTool::hasProperty( const QDomElement& e, const QString& name ) return FALSE; } -QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defValue ) +TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& defValue ) { - QString dummy; + TQString dummy; return elementToVariant( e, defValue, dummy ); } /*! Interprets element \a e as variant and returns the result of the interpretation. */ -QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defValue, QString &comment ) +TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& defValue, TQString &comment ) { - QVariant v; + TQVariant v; if ( e.tagName() == "rect" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0, w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -109,9 +109,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QRect( x, y, w, h ) ); + v = TQVariant( TQRect( x, y, w, h ) ); } else if ( e.tagName() == "point" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -120,9 +120,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal y = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QPoint( x, y ) ); + v = TQVariant( TQPoint( x, y ) ); } else if ( e.tagName() == "size" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) @@ -131,12 +131,12 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QSize( w, h ) ); + v = TQVariant( TQSize( w, h ) ); } else if ( e.tagName() == "color" ) { - v = QVariant( readColor( e ) ); + v = TQVariant( readColor( e ) ); } else if ( e.tagName() == "font" ) { - QDomElement n3 = e.firstChild().toElement(); - QFont f( defValue.toFont() ); + TQDomElement n3 = e.firstChild().toElement(); + TQFont f( defValue.toFont() ); while ( !n3.isNull() ) { if ( n3.tagName() == "family" ) f.setFamily( n3.firstChild().toText().data() ); @@ -152,43 +152,43 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal f.setStrikeOut( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } - v = QVariant( f ); + v = TQVariant( f ); } else if ( e.tagName() == "string" ) { - v = QVariant( e.firstChild().toText().data() ); - QDomElement n = e; + v = TQVariant( e.firstChild().toText().data() ); + TQDomElement n = e; n = n.nextSibling().toElement(); if ( n.tagName() == "comment" ) comment = n.firstChild().toText().data(); } else if ( e.tagName() == "cstring" ) { - v = QVariant( QCString( e.firstChild().toText().data() ) ); + v = TQVariant( TQCString( e.firstChild().toText().data() ) ); } else if ( e.tagName() == "number" ) { - v = QVariant( e.firstChild().toText().data().toInt() ); + v = TQVariant( e.firstChild().toText().data().toInt() ); } else if ( e.tagName() == "bool" ) { - QString t = e.firstChild().toText().data(); - v = QVariant( t == "true" || t == "1", 0 ); + TQString t = e.firstChild().toText().data(); + v = TQVariant( t == "true" || t == "1", 0 ); } else if ( e.tagName() == "pixmap" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "iconset" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "image" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "enum" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "set" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "sizepolicy" ) { - QDomElement n3 = e.firstChild().toElement(); - QSizePolicy sp; + TQDomElement n3 = e.firstChild().toElement(); + TQSizePolicy sp; while ( !n3.isNull() ) { if ( n3.tagName() == "hsizetype" ) - sp.setHorData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setHorData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "vsizetype" ) - sp.setVerData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setVerData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } - v = QVariant( sp ); + v = TQVariant( sp ); } else if ( e.tagName() == "cursor" ) { - v = QVariant( QCursor( e.firstChild().toText().data().toInt() ) ); + v = TQVariant( TQCursor( e.firstChild().toText().data().toInt() ) ); } return v; @@ -198,9 +198,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal /*! Returns the color which is returned in the dom element \a e. */ -QColor DomTool::readColor( const QDomElement &e ) +TQColor DomTool::readColor( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); int r= 0, g = 0, b = 0; while ( !n.isNull() ) { if ( n.tagName() == "red" ) @@ -212,7 +212,7 @@ QColor DomTool::readColor( const QDomElement &e ) n = n.nextSibling().toElement(); } - return QColor( r, g, b ); + return TQColor( r, g, b ); } /*! @@ -222,14 +222,14 @@ QColor DomTool::readColor( const QDomElement &e ) \sa hasAttribute() */ -QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue ) +TQVariant DomTool::readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "attribute" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" ) { - QString prop = n2.firstChild().toText().data(); + TQString prop = n2.firstChild().toText().data(); if ( prop == name ) return elementToVariant( n2.nextSibling().toElement(), defValue ); } @@ -243,14 +243,14 @@ QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, cons \sa readAttribute() */ -bool DomTool::hasAttribute( const QDomElement& e, const QString& name ) +bool DomTool::hasAttribute( const TQDomElement& e, const TQString& name ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "attribute" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" ) { - QString prop = n2.firstChild().toText().data(); + TQString prop = n2.firstChild().toText().data(); if ( prop == name ) return TRUE; } diff --git a/python/pyqt/pyuic2/domtool.h b/python/pyqt/pyuic2/domtool.h index 7230bce8..9d31897b 100644 --- a/python/pyqt/pyuic2/domtool.h +++ b/python/pyqt/pyuic2/domtool.h @@ -19,21 +19,21 @@ #ifndef DOMTOOL_H #define DOMTOOL_H -#include <qnamespace.h> -#include <qvariant.h> -#include <qdom.h> +#include <tqnamespace.h> +#include <tqvariant.h> +#include <tqdom.h> class DomTool : public Qt { public: - static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue ); - static bool hasProperty( const QDomElement& e, const QString& name ); - static QVariant elementToVariant( const QDomElement& e, const QVariant& defValue ); - static QVariant elementToVariant( const QDomElement& e, const QVariant& defValue, QString &comment ); - static QVariant readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue ); - static bool hasAttribute( const QDomElement& e, const QString& name ); - static QColor readColor( const QDomElement &e ); + static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue ); + static bool hasProperty( const TQDomElement& e, const TQString& name ); + static TQVariant elementToVariant( const TQDomElement& e, const TQVariant& defValue ); + static TQVariant elementToVariant( const TQDomElement& e, const TQVariant& defValue, TQString &comment ); + static TQVariant readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue ); + static bool hasAttribute( const TQDomElement& e, const TQString& name ); + static TQColor readColor( const TQDomElement &e ); }; diff --git a/python/pyqt/pyuic2/globaldefs.h b/python/pyqt/pyuic2/globaldefs.h index 700f7d20..e436e5a6 100644 --- a/python/pyqt/pyuic2/globaldefs.h +++ b/python/pyqt/pyuic2/globaldefs.h @@ -21,13 +21,13 @@ #ifndef GLOBALDEFS_H #define GLOBALDEFS_H -#include <qcolor.h> +#include <tqcolor.h> #define BOXLAYOUT_DEFAULT_MARGIN 11 #define BOXLAYOUT_DEFAULT_SPACING 6 -static QColor backColor1( 226, 244, 216 ); -static QColor backColor2( 235, 235, 235 ); -static QColor selectedBack( 192, 192, 192 ); +static TQColor backColor1( 226, 244, 216 ); +static TQColor backColor2( 235, 235, 235 ); +static TQColor selectedBack( 192, 192, 192 ); #endif diff --git a/python/pyqt/pyuic2/uic.cpp b/python/pyqt/pyuic2/uic.cpp index 19fb0794..93c67f6b 100644 --- a/python/pyqt/pyuic2/uic.cpp +++ b/python/pyqt/pyuic2/uic.cpp @@ -18,31 +18,31 @@ **********************************************************************/ #include "uic.h" -#include <qapplication.h> -#include <qfile.h> -#include <qfileinfo.h> +#include <tqapplication.h> +#include <tqfile.h> +#include <tqfileinfo.h> #include <stdio.h> #include <stdlib.h> -#include <qstringlist.h> -#include <qstrlist.h> -#include <qdatetime.h> +#include <tqstringlist.h> +#include <tqstrlist.h> +#include <tqdatetime.h> #include <widgetdatabase.h> #include <domtool.h> #include <globaldefs.h> -#include <qregexp.h> +#include <tqregexp.h> #include <zlib.h> -static QString mkBool( bool b ) +static TQString mkBool( bool b ) { return b? "1" : "0"; } -static QString mkBool( const QString& s ) +static TQString mkBool( const TQString& s ) { return mkBool( s == "true" || s == "1" ); } -static bool toBool( const QString& s ) +static bool toBool( const TQString& s ) { return s == "true" || s.toInt() != 0; } @@ -50,13 +50,13 @@ static bool toBool( const QString& s ) // fixString is only used in conjunction with tr(). We need to write out the // string in utf8 and make sure it's converted from utf8 when created. -static QString fixString( const QString &str ) +static TQString fixString( const TQString &str ) { - QString s( str ); - s.replace( QRegExp( "\\\\" ), "\\\\" ); - s.replace( QRegExp( "\"" ), "\\\"" ); - s.replace( QRegExp( "\n" ), "\\n\"\n\"" ); - s.replace( QRegExp( "\r" ), "\\r" ); + TQString s( str ); + s.replace( TQRegExp( "\\\\" ), "\\\\" ); + s.replace( TQRegExp( "\"" ), "\\\"" ); + s.replace( TQRegExp( "\n" ), "\\n\"\n\"" ); + s.replace( TQRegExp( "\r" ), "\\r" ); bool onlyAscii = TRUE; unsigned int i; @@ -69,13 +69,13 @@ static QString fixString( const QString &str ) if ( onlyAscii ) s = "\"" + s + "\""; else - s = "QString.fromUtf8(\"" + s + "\")"; + s = "TQString.fromUtf8(\"" + s + "\")"; return s; } -static QString mkStdSet( const QString& prop ) +static TQString mkStdSet( const TQString& prop ) { - return QString( "set" ) + prop[0].upper() + prop.mid(1); + return TQString( "set" ) + prop[0].upper() + prop.mid(1); } @@ -86,9 +86,9 @@ static QString mkStdSet( const QString& prop ) The class Uic encapsulates the user interface compiler (uic). */ -static QString className; +static TQString className; -Uic::Uic( QTextStream &outStream, QDomDocument doc, const QString &trm ) +Uic::Uic( TQTextStream &outStream, TQDomDocument doc, const TQString &trm ) : out( outStream ), trmacro( trm ) { item_used = cg_used = pal_used = 0; @@ -101,7 +101,7 @@ Uic::Uic( QTextStream &outStream, QDomDocument doc, const QString &trm ) nameOfClass = getClassName( doc.firstChild().toElement() ); - QDomElement firstWidget = doc.firstChild().firstChild().toElement(); + TQDomElement firstWidget = doc.firstChild().firstChild().toElement(); while ( firstWidget.tagName() != "widget" ) firstWidget = firstWidget.nextSibling().toElement(); @@ -117,13 +117,13 @@ Uic::Uic( QTextStream &outStream, QDomDocument doc, const QString &trm ) /*! Extracts a class name from \a e */ -QString Uic::getClassName( const QDomElement& e ) +TQString Uic::getClassName( const TQDomElement& e ) { - QDomElement n; - QString cn; + TQDomElement n; + TQString cn; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "class" ) { - QString s = n.firstChild().toText().data(); + TQString s = n.firstChild().toText().data(); int i; while ( ( i = s.find(' ' )) != -1 ) s[i] = '_'; @@ -138,35 +138,35 @@ QString Uic::getClassName( const QDomElement& e ) /*! Extracts an object name from \a e. It's stored in the 'name' property. */ -QString Uic::getObjectName( const QDomElement& e ) +TQString Uic::getObjectName( const TQDomElement& e ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" && n2.firstChild().toText().data() == "name" ) { return n2.nextSibling().toElement().firstChild().toText().data(); } } } - return QString::null; + return TQString::null; } /*! Extracts an layout name from \a e. It's stored in the 'name' property of the preceeding sibling (the first child of a QLayoutWidget). */ -QString Uic::getLayoutName( const QDomElement& e ) +TQString Uic::getLayoutName( const TQDomElement& e ) { - QDomElement p = e.parentNode().toElement(); - QString tail = QString::null; + TQDomElement p = e.parentNode().toElement(); + TQString tail = TQString::null; if (getClassName(p) != "QLayoutWidget") tail = "Layout"; - QDomElement n; + TQDomElement n; for ( n = p.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" && n2.firstChild().toText().data() == "name" ) { return n2.nextSibling().toElement().firstChild().toText().data() + tail; } @@ -175,7 +175,7 @@ QString Uic::getLayoutName( const QDomElement& e ) return e.tagName(); } -QByteArray unzipXPM( QString data, ulong& length ) +TQByteArray unzipXPM( TQString data, ulong& length ) { char *ba = new char[ data.length() / 2 ]; for ( int i = 0; i < (int)data.length() / 2; ++i ) { @@ -195,7 +195,7 @@ QByteArray unzipXPM( QString data, ulong& length ) } if ( length < data.length() * 5 ) length = data.length() * 5; - QByteArray baunzip( length ); + TQByteArray baunzip( length ); ::uncompress( (uchar*) baunzip.data(), &length, (uchar*) ba, data.length()/2 ); return baunzip; } @@ -206,16 +206,16 @@ QByteArray unzipXPM( QString data, ulong& length ) \sa createFormDecl(), createObjectImpl() */ -void Uic::createFormImpl( const QDomElement &e ) +void Uic::createFormImpl( const TQDomElement &e ) { - QStringList::Iterator it; - QDomElement n; - QDomNodeList nl; + TQStringList::Iterator it; + TQDomElement n; + TQDomNodeList nl; int i; - QString objClass = getClassName( e ); + TQString objClass = getClassName( e ); if ( objClass.isEmpty() ) return; - QString objName = getObjectName( e ); + TQString objName = getObjectName( e ); // Handle custom widgets. for (n = e; !n.isNull(); n = n.nextSibling().toElement()) @@ -223,14 +223,14 @@ void Uic::createFormImpl( const QDomElement &e ) if (n.tagName() != "customwidgets") continue; - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); while (!n2.isNull()) { if (n2.tagName() == "customwidget") { - QDomElement n3 = n2.firstChild().toElement(); - QString cname, header; + TQDomElement n3 = n2.firstChild().toElement(); + TQString cname, header; while (!n3.isNull()) { @@ -261,27 +261,27 @@ void Uic::createFormImpl( const QDomElement &e ) } // find out what images are required - QStringList requiredImages; + TQStringList requiredImages; nl = e.elementsByTagName( "pixmap" ); for ( int j = 0; j < (int) nl.length(); j++ ) { requiredImages += nl.item(j).firstChild().toText().data(); } - QStringList images; - QStringList xpmImages; + TQStringList images; + TQStringList xpmImages; if ( pixmapLoaderFunction.isEmpty() ) { // create images for ( n = e; !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "images" ) { nl = n.elementsByTagName( "image" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QDomElement tmp = nl.item(i).firstChild().toElement(); - QString img = registerObject( tmp.firstChild().toText().data() ); + TQDomElement tmp = nl.item(i).firstChild().toElement(); + TQString img = registerObject( tmp.firstChild().toText().data() ); if ( !requiredImages.contains( img ) ) continue; tmp = tmp.nextSibling().toElement(); - QString format = tmp.attribute("format", "PNG" ); - QString data = tmp.firstChild().toText().data(); + TQString format = tmp.attribute("format", "PNG" ); + TQString data = tmp.firstChild().toText().data(); out << endl; out << endl; @@ -289,7 +289,7 @@ void Uic::createFormImpl( const QDomElement &e ) if ( format == "XPM.GZ" ) { xpmImages += img; ulong length = tmp.attribute("length").toULong(); - QByteArray baunzip = unzipXPM( data, length ); + TQByteArray baunzip = unzipXPM( data, length ); int a = 0; out << indent << img << "_data = [" << endl; while ( baunzip[a] != '\"' ) @@ -316,11 +316,11 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent << "'"; int a ; for ( a = 0; a < (int) (data.length()/2)-1; a++ ) { - out << "\\x" << QString(data[2*a]) << QString(data[2*a+1]); + out << "\\x" << TQString(data[2*a]) << TQString(data[2*a+1]); if ( a % 12 == 11 ) out << "' \\" << endl << indent << "'"; } - out << "\\x" << QString(data[2*a]) << QString(data[2*a+1]) << "'" << endl; + out << "\\x" << TQString(data[2*a]) << TQString(data[2*a+1]) << "'" << endl; popIndent(); } } @@ -339,11 +339,11 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent << "class " << nameOfClass << "(" << objClass << "):" << endl; pushIndent(); - if ( objClass == "QDialog" || objClass == "QWizard" ) { + if ( objClass == "TQDialog" || objClass == "TQWizard" ) { out << indent << "def __init__(self,parent = None,name = None,modal = 0,fl = 0):" << endl; pushIndent(); out << indent << objClass << ".__init__(self,parent,name,modal,fl)" << endl; - } else if ( objClass == "QWidget" ) { // standard QWidget + } else if ( objClass == "TQWidget" ) { // standard QWidget out << indent << "def __init__(self,parent = None,name = None,fl = 0):" << endl; pushIndent(); out << indent << objClass << ".__init__(self,parent,name,fl)" << endl; @@ -357,9 +357,9 @@ void Uic::createFormImpl( const QDomElement &e ) // create pixmaps for all images if ( !images.isEmpty() ) { - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = images.begin(); it != images.end(); ++it ) { - out << indent << (*it) << " = QPixmap()" << endl; + out << indent << (*it) << " = TQPixmap()" << endl; out << indent << (*it) << ".loadFromData(" << (*it) << "_data,'PNG')" << endl; } @@ -368,7 +368,7 @@ void Uic::createFormImpl( const QDomElement &e ) // create pixmaps for all images if ( !xpmImages.isEmpty() ) { for ( it = xpmImages.begin(); it != xpmImages.end(); ++it ) { - out << indent << (*it) << " = QPixmap(" << (*it) << "_data)" << endl; + out << indent << (*it) << " = TQPixmap(" << (*it) << "_data)" << endl; } out << endl; @@ -379,11 +379,11 @@ void Uic::createFormImpl( const QDomElement &e ) for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { bool stdset = toBool( n.attribute( "stdset" ) ); - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" ) { - QString prop = n2.firstChild().toText().data(); - QString value = setObjectProperty( objClass, QString::null, prop, n2.nextSibling().toElement(), stdset ); + TQString prop = n2.firstChild().toText().data(); + TQString value = setObjectProperty( objClass, TQString::null, prop, n2.nextSibling().toElement(), stdset ); if ( value.isEmpty() ) continue; @@ -396,7 +396,7 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent; if ( prop == "geometry" && n2.nextSibling().toElement().tagName() == "rect") { - QDomElement n3 = n2.nextSibling().toElement().firstChild().toElement(); + TQDomElement n3 = n2.nextSibling().toElement().firstChild().toElement(); int w = 0, h = 0; while ( !n3.isNull() ) { @@ -412,7 +412,7 @@ void Uic::createFormImpl( const QDomElement &e ) if ( stdset ) out << "self." << mkStdSet(prop) << "(" << value << ")" << endl; else - out << "self.setProperty('" << prop << "',QVariant(" << value << "))" << endl; + out << "self.setProperty('" << prop << "',TQVariant(" << value << "))" << endl; } if (prop == "name") { @@ -426,13 +426,13 @@ void Uic::createFormImpl( const QDomElement &e ) // create all children, some forms have special requirements - if ( objClass == "QWizard" ) { + if ( objClass == "TQWizard" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) { - QString page = createObjectImpl( n, objClass, "self" ); - QString label = DomTool::readAttribute( n, "title", "" ).toString(); + TQString page = createObjectImpl( n, objClass, "self" ); + TQString label = DomTool::readAttribute( n, "title", "" ).toString(); out << indent << "self.addPage(" << page << ","<< trmacro << "(" << fixString( label ) << "))" << endl; - QVariant def( FALSE, 0 ); + TQVariant def( FALSE, 0 ); if ( DomTool::hasAttribute( n, "backEnabled" ) ) out << indent << "self.setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ")" << endl; if ( DomTool::hasAttribute( n, "nextEnabled" ) ) @@ -454,11 +454,11 @@ void Uic::createFormImpl( const QDomElement &e ) // Get the list of any user defined slots. - QStringList userSlots; + TQStringList userSlots; for ( n = e; !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "connections" ) { - for ( QDomElement n2 = n.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { + for ( TQDomElement n2 = n.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { if ( n2.tagName() == "slot" ) { userSlots += n2.firstChild().toText().data(); } @@ -472,8 +472,8 @@ void Uic::createFormImpl( const QDomElement &e ) out << endl; nl = n.elementsByTagName( "connection" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QString sender, receiver, signal, slot; - for ( QDomElement n2 = nl.item(i).firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { + TQString sender, receiver, signal, slot; + for ( TQDomElement n2 = nl.item(i).firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { if ( n2.tagName() == "sender" ) sender = n2.firstChild().toText().data(); else if ( n2.tagName() == "receiver" ) @@ -499,20 +499,20 @@ void Uic::createFormImpl( const QDomElement &e ) else receiver = "self." + receiver; - // Note that we never use the SLOT() macro in case we have + // Note that we never use the TQT_SLOT() macro in case we have // custom widgets implemented in Python. out << indent << "self.connect(" << sender - << ",SIGNAL('" << signal << "'),self." + << ",TQT_SIGNAL('" << signal << "'),self." << slot.left(slot.find('(')) << ")" << endl; } } else if ( n.tagName() == "tabstops" ) { // setup tab order out << endl; - QString lastName; - QDomElement n2 = n.firstChild().toElement(); + TQString lastName; + TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "tabstop" ) { - QString name = n2.firstChild().toText().data(); + TQString name = n2.firstChild().toText().data(); name = registeredName( name ); if ( !lastName.isEmpty() ) out << indent << "self.setTabOrder(self." << lastName << ",self." << name << ")" << endl; @@ -526,7 +526,7 @@ void Uic::createFormImpl( const QDomElement &e ) // buddies bool firstBuddy = TRUE; - for ( QValueList<Buddy>::Iterator buddy = buddies.begin(); buddy != buddies.end(); ++buddy ) { + for ( TQValueList<Buddy>::Iterator buddy = buddies.begin(); buddy != buddies.end(); ++buddy ) { if ( isObjectRegistered( (*buddy).buddy ) ) { if ( firstBuddy ) { out << endl; @@ -555,7 +555,7 @@ void Uic::createFormImpl( const QDomElement &e ) pushIndent(); out << indent << "ret = " << objClass << ".event(self,ev)" << endl; out << endl; - out << indent << "if ev.type() == QEvent.ApplicationFontChange:" << endl; + out << indent << "if ev.type() == TQEvent.ApplicationFontChange:" << endl; pushIndent(); for ( i = 0; i < (int) nl.length(); i++ ) { @@ -583,7 +583,7 @@ void Uic::createFormImpl( const QDomElement &e ) // to remove the types - too complicated for the moment, so we just // count them and give them names based on their position. - QString args = (*it).mid(astart + 1,(*it).find(')') - astart - 1).stripWhiteSpace(); + TQString args = (*it).mid(astart + 1,(*it).find(')') - astart - 1).stripWhiteSpace(); if (!args.isEmpty()) { int nrargs = args.contains(',') + 1; @@ -611,11 +611,11 @@ void Uic::createFormImpl( const QDomElement &e ) \sa createObjectDecl() */ -QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout ) +TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout ) { - QDomElement n; - QString objClass, objName, fullObjName; + TQDomElement n; + TQString objClass, objName, fullObjName; if ( layouts.contains( e.tagName() ) ) return createLayoutImpl( e, parentClass, parent, layout ); @@ -625,7 +625,7 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, return objName; objName = getObjectName( e ); - QString definedName = objName; + TQString definedName = objName; bool isTmpObject = objName.isEmpty() || objClass == "QLayoutWidget"; if ( isTmpObject ) { if ( objClass[0] == 'Q' ) @@ -636,17 +636,17 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, bool isLine = objClass == "Line"; if ( isLine ) - objClass = "QFrame"; + objClass = "TQFrame"; out << endl; if ( objClass == "QLayoutWidget" ) { if ( layout.isEmpty() ) { // register the object and unify its name objName = registerObject( objName ); - out << indent << objName << " = QWidget(" << parent << ",'" << definedName << "')" << endl; + out << indent << objName << " = TQWidget(" << parent << ",'" << definedName << "')" << endl; } else { // the layout widget is not necessary, hide it by creating its child in the parent - QString result; + TQString result; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if (tags.contains( n.tagName() ) ) result = createObjectImpl( n, parentClass, parent, layout ); @@ -671,11 +671,11 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { bool stdset = toBool( n.attribute( "stdset" ) ); - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" ) { - QString prop = n2.firstChild().toText().data(); - QString value = setObjectProperty( objClass, objName, prop, n2.nextSibling().toElement(), stdset ); + TQString prop = n2.firstChild().toText().data(); + TQString value = setObjectProperty( objClass, objName, prop, n2.nextSibling().toElement(), stdset ); if ( value.isEmpty() ) continue; @@ -688,12 +688,12 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, if ( isLine && prop == "orientation" ) { prop = "frameStyle"; if ( value.right(10) == "Horizontal" ) - value = "QFrame.HLine | QFrame.Sunken"; + value = "TQFrame.HLine | TQFrame.Sunken"; else - value = "QFrame.VLine | QFrame.Sunken"; + value = "TQFrame.VLine | TQFrame.Sunken"; } if ( prop == "buttonGroupId" ) { - if ( parentClass == "QButtonGroup" ) + if ( parentClass == "TQButtonGroup" ) out << indent << parent << ".insert(" << fullObjName << "," << value << ")" << endl; continue; } @@ -703,31 +703,31 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, if ( stdset ) out << indent << fullObjName << "." << mkStdSet(prop) << "(" << value << ")" << endl; else - out << indent << fullObjName << ".setProperty('" << prop << "',QVariant(" << value << "))" << endl; + out << indent << fullObjName << ".setProperty('" << prop << "',TQVariant(" << value << "))" << endl; } } } else if ( n.tagName() == "item" ) { if ( objClass.mid(1) == "ListBox" ) { - QString s = createListBoxItemImpl( n, fullObjName ); + TQString s = createListBoxItemImpl( n, fullObjName ); if ( !s.isEmpty() ) out << indent << s << endl; } else if ( objClass.mid(1) == "ComboBox" ) { - QString s = createListBoxItemImpl( n, fullObjName ); + TQString s = createListBoxItemImpl( n, fullObjName ); if ( !s.isEmpty() ) out << indent << s << endl; } else if ( objClass.mid(1) == "IconView" ) { - QString s = createIconViewItemImpl( n, fullObjName ); + TQString s = createIconViewItemImpl( n, fullObjName ); if ( !s.isEmpty() ) out << indent << s << endl; } else if ( objClass.mid(1) == "ListView" ) { - QString s = createListViewItemImpl( n, fullObjName, QString::null ); + TQString s = createListViewItemImpl( n, fullObjName, TQString::null ); if ( !s.isEmpty() ) out << s << endl; } } else if ( n.tagName() == "column" ) { if ( objClass.mid(1) == "ListView" ) { - QString s = createListViewColumnImpl( n, fullObjName ); + TQString s = createListViewColumnImpl( n, fullObjName ); if ( !s.isEmpty() ) out << s; } @@ -736,11 +736,11 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, // create all children, some widgets have special requirements - if ( objClass == "QTabWidget" ) { + if ( objClass == "TQTabWidget" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) { - QString page = createObjectImpl( n, objClass, fullObjName ); - QString label = DomTool::readAttribute( n, "title", "" ).toString(); + TQString page = createObjectImpl( n, objClass, fullObjName ); + TQString label = DomTool::readAttribute( n, "title", "" ).toString(); out << indent << fullObjName << ".insertTab(" << page << "," << trmacro << "(" << fixString( label ) << "))" << endl; } } @@ -758,17 +758,17 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, Creates implementation of an listbox item tag. */ -QString Uic::createListBoxItemImpl( const QDomElement &e, const QString &parent ) +TQString Uic::createListBoxItemImpl( const TQDomElement &e, const TQString &parent ) { - QDomElement n = e.firstChild().toElement(); - QString txt; - QString pix; + TQDomElement n = e.firstChild().toElement(); + TQString txt; + TQString pix; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" ) { - QString attrib = n2.firstChild().toText().data(); - QVariant v = DomTool::elementToVariant( n2.nextSibling().toElement(), QVariant() ); + TQString attrib = n2.firstChild().toText().data(); + TQVariant v = DomTool::elementToVariant( n2.nextSibling().toElement(), TQVariant() ); if ( attrib == "text" ) txt = v.toString(); else if ( attrib == "pixmap" ) { @@ -792,17 +792,17 @@ QString Uic::createListBoxItemImpl( const QDomElement &e, const QString &parent Creates implementation of an iconview item tag. */ -QString Uic::createIconViewItemImpl( const QDomElement &e, const QString &parent ) +TQString Uic::createIconViewItemImpl( const TQDomElement &e, const TQString &parent ) { - QDomElement n = e.firstChild().toElement(); - QString txt; - QString pix; + TQDomElement n = e.firstChild().toElement(); + TQString txt; + TQString pix; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" ) { - QString attrib = n2.firstChild().toText().data(); - QVariant v = DomTool::elementToVariant( n2.nextSibling().toElement(), QVariant() ); + TQString attrib = n2.firstChild().toText().data(); + TQVariant v = DomTool::elementToVariant( n2.nextSibling().toElement(), TQVariant() ); if ( attrib == "text" ) txt = v.toString(); else if ( attrib == "pixmap" ) { @@ -818,8 +818,8 @@ QString Uic::createIconViewItemImpl( const QDomElement &e, const QString &parent } if ( pix.isEmpty() ) - return "QIconViewItem(" + parent + "," + trmacro + "(" + fixString( txt ) + "))"; - return "QIconViewItem(" + parent + "," + trmacro + "(" + fixString( txt ) + ")," + pix + ")"; + return "TQIconViewItem(" + parent + "," + trmacro + "(" + fixString( txt ) + "))"; + return "TQIconViewItem(" + parent + "," + trmacro + "(" + fixString( txt ) + ")," + pix + ")"; } @@ -827,15 +827,15 @@ QString Uic::createIconViewItemImpl( const QDomElement &e, const QString &parent Creates implementation of an listview item tag. */ -QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent, - const QString &parentItem ) +TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &parent, + const TQString &parentItem ) { - QString s; + TQString s; - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); bool hasChildren = e.elementsByTagName( "item" ).count() > 0; - QString item; + TQString item; if ( hasChildren ) { item = registerObject( "item" ); @@ -850,22 +850,22 @@ QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent } if ( !parentItem.isEmpty() ) - s += "QListViewItem(" + parentItem + "," + lastItem + ")\n"; + s += "TQListViewItem(" + parentItem + "," + lastItem + ")\n"; else - s += "QListViewItem(" + parent + "," + lastItem + ")\n"; + s += "TQListViewItem(" + parent + "," + lastItem + ")\n"; - QStringList textes; - QStringList pixmaps; + TQStringList textes; + TQStringList pixmaps; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" ) { - QString attrib = n2.firstChild().toText().data(); - QVariant v = DomTool::elementToVariant( n2.nextSibling().toElement(), QVariant() ); + TQString attrib = n2.firstChild().toText().data(); + TQVariant v = DomTool::elementToVariant( n2.nextSibling().toElement(), TQVariant() ); if ( attrib == "text" ) textes << v.toString(); else if ( attrib == "pixmap" ) { - QString pix = v.toString(); + TQString pix = v.toString(); if ( !pix.isEmpty() && !pixmapLoaderFunction.isEmpty() ) { pix.prepend( pixmapLoaderFunction + "( " ); pix.append( " )" ); @@ -882,9 +882,9 @@ QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent for ( int i = 0; i < (int)textes.count(); ++i ) { if ( !textes[ i ].isEmpty() ) - s += indent + item + ".setText(" + QString::number( i ) + "," + trmacro + "(" + fixString( textes[ i ] ) + "))\n"; + s += indent + item + ".setText(" + TQString::number( i ) + "," + trmacro + "(" + fixString( textes[ i ] ) + "))\n"; if ( !pixmaps[ i ].isEmpty() ) - s += indent + item + ".setPixmap(" + QString::number( i ) + "," + pixmaps[ i ] + ")\n"; + s += indent + item + ".setPixmap(" + TQString::number( i ) + "," + pixmaps[ i ] + ")\n"; } lastItem = item; @@ -895,18 +895,18 @@ QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent Creates implementation of an listview column tag. */ -QString Uic::createListViewColumnImpl( const QDomElement &e, const QString &parent ) +TQString Uic::createListViewColumnImpl( const TQDomElement &e, const TQString &parent ) { - QDomElement n = e.firstChild().toElement(); - QString txt; - QString pix; + TQDomElement n = e.firstChild().toElement(); + TQString txt; + TQString pix; bool clickable = FALSE, resizeable = FALSE; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" ) { - QString attrib = n2.firstChild().toText().data(); - QVariant v = DomTool::elementToVariant( n2.nextSibling().toElement(), QVariant() ); + TQString attrib = n2.firstChild().toText().data(); + TQVariant v = DomTool::elementToVariant( n2.nextSibling().toElement(), TQVariant() ); if ( attrib == "text" ) txt = v.toString(); else if ( attrib == "pixmap" ) { @@ -924,7 +924,7 @@ QString Uic::createListViewColumnImpl( const QDomElement &e, const QString &pare n = n.nextSibling().toElement(); } - QString s; + TQString s; s = indent + parent + ".addColumn(" + trmacro + "(" + fixString( txt ) + "))\n"; if ( !pix.isEmpty() ) s += indent + parent + ".header().setLabel(" + parent + ".header().count() - 1," + pix + "," + trmacro + "(" + fixString( txt ) + "))\n"; @@ -939,17 +939,17 @@ QString Uic::createListViewColumnImpl( const QDomElement &e, const QString &pare /*! Creates the implementation of a layout tag. Called from createObjectImpl(). */ -QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout ) +TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout ) { - QDomElement n; - QString objClass, objName; + TQDomElement n; + TQString objClass, objName; objClass = e.tagName(); - QString qlayout = "QVBoxLayout"; + TQString qlayout = "TQVBoxLayout"; if ( objClass == "hbox" ) - qlayout = "QHBoxLayout"; + qlayout = "TQHBoxLayout"; else if ( objClass == "grid" ) - qlayout = "QGridLayout"; + qlayout = "TQGridLayout"; bool isGrid = e.tagName() == "grid" ; objName = registerObject( getLayoutName( e ) ); @@ -957,7 +957,7 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, int margin = DomTool::readProperty( e, "margin", BOXLAYOUT_DEFAULT_MARGIN ).toInt(); int spacing = DomTool::readProperty( e, "spacing", BOXLAYOUT_DEFAULT_SPACING ).toInt(); - if ( (parentClass == "QGroupBox" || parentClass == "QButtonGroup") && layout.isEmpty() ) { + if ( (parentClass == "TQGroupBox" || parentClass == "TQButtonGroup") && layout.isEmpty() ) { // special case for group box out << indent << parent << ".setColumnLayout(0,Qt.Vertical)" << endl; out << indent << parent << ".layout().setSpacing(0)" << endl; @@ -977,10 +977,10 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, if ( !isGrid ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "spacer" ) { - QString child = createSpacerImpl( n, parentClass, parent, objName ); + TQString child = createSpacerImpl( n, parentClass, parent, objName ); out << indent << objName << ".addItem(" << child << ")" << endl; } else if ( tags.contains( n.tagName() ) ) { - QString child = createObjectImpl( n, parentClass, parent, objName ); + TQString child = createObjectImpl( n, parentClass, parent, objName ); if ( isLayout( child ) ) out << indent << objName << ".addLayout(" << child << ")" << endl; else @@ -989,7 +989,7 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, } } else { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - QDomElement ae = n; + TQDomElement ae = n; int row = ae.attribute( "row" ).toInt(); int col = ae.attribute( "column" ).toInt(); int rowspan = ae.attribute( "rowspan" ).toInt(); @@ -999,7 +999,7 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, if ( colspan < 1 ) colspan = 1; if ( n.tagName() == "spacer" ) { - QString child = createSpacerImpl( n, parentClass, parent, objName ); + TQString child = createSpacerImpl( n, parentClass, parent, objName ); if ( rowspan * colspan != 1 ) out << indent << objName << ".addMultiCell(" << child << "," << row << "," << row + rowspan - 1 << "," << col << "," @@ -1008,9 +1008,9 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, out << indent << objName << ".addItem(" << child << "," << row << "," << col << ")" << endl; } else if ( tags.contains( n.tagName() ) ) { - QString child = createObjectImpl( n, parentClass, parent, objName ); + TQString child = createObjectImpl( n, parentClass, parent, objName ); out << endl; - QString o = "Widget"; + TQString o = "Widget"; if ( isLayout( child ) ) o = "Layout"; if ( rowspan * colspan != 1 ) @@ -1028,31 +1028,31 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, -QString Uic::createSpacerImpl( const QDomElement &e, const QString& /*parentClass*/, const QString& /*parent*/, const QString& /*layout*/) +TQString Uic::createSpacerImpl( const TQDomElement &e, const TQString& /*parentClass*/, const TQString& /*parent*/, const TQString& /*layout*/) { - QDomElement n; - QString objClass, objName; + TQDomElement n; + TQString objClass, objName; objClass = e.tagName(); objName = registerObject( "spacer" ); - QSize size = DomTool::readProperty( e, "sizeHint", QSize(0,0) ).toSize(); - QString sizeType = DomTool::readProperty( e, "sizeType", "Expanding" ).toString(); + TQSize size = DomTool::readProperty( e, "sizeHint", TQSize(0,0) ).toSize(); + TQString sizeType = DomTool::readProperty( e, "sizeType", "Expanding" ).toString(); bool isVspacer = DomTool::readProperty( e, "orientation", "Horizontal" ) == "Vertical"; if ( sizeType != "Expanding" && sizeType != "MinimumExpanding" && DomTool::hasProperty( e, "geometry" ) ) { // compatibility Qt 2.2 - QRect geom = DomTool::readProperty( e, "geometry", QRect(0,0,0,0) ).toRect(); + TQRect geom = DomTool::readProperty( e, "geometry", TQRect(0,0,0,0) ).toRect(); size = geom.size(); } if ( isVspacer ) - out << indent << objName << " = QSpacerItem(" + out << indent << objName << " = TQSpacerItem(" << size.width() << "," << size.height() - << ",QSizePolicy.Minimum,QSizePolicy." << sizeType << ")" << endl; + << ",TQSizePolicy.Minimum,TQSizePolicy." << sizeType << ")" << endl; else - out << indent << objName << " = QSpacerItem(" + out << indent << objName << " = TQSpacerItem(" << size.width() << "," << size.height() - << ",QSizePolicy." << sizeType << ",QSizePolicy.Minimum)" << endl; + << ",TQSizePolicy." << sizeType << ",TQSizePolicy.Minimum)" << endl; return objName; } @@ -1067,27 +1067,27 @@ QString Uic::createSpacerImpl( const QDomElement &e, const QString& /*parentClas application font or palette change handlers in createFormImpl(). */ -void Uic::createExclusiveProperty( const QDomElement & e, const QString& exclusiveProp ) +void Uic::createExclusiveProperty( const TQDomElement & e, const TQString& exclusiveProp ) { - QDomElement n; - QString objClass = getClassName( e ); + TQDomElement n; + TQString objClass = getClassName( e ); if ( objClass.isEmpty() ) return; - QString objName = getObjectName( e ); + TQString objName = getObjectName( e ); if ( objClass.isEmpty() ) return; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { bool stdset = toBool( n.attribute( "stdset" ) ); - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == "name" ) { - QString prop = n2.firstChild().toText().data(); + TQString prop = n2.firstChild().toText().data(); if ( prop != exclusiveProp ) continue; - QString value = setObjectProperty( objClass, objName, prop, n2.nextSibling().toElement(), stdset ); + TQString value = setObjectProperty( objClass, objName, prop, n2.nextSibling().toElement(), stdset ); if ( value.isEmpty() ) continue; - out << indent << objName << ".setProperty('" << prop << "',QVariant(" << value << "))" << endl; + out << indent << objName << ".setProperty('" << prop << "',TQVariant(" << value << "))" << endl; } } } @@ -1105,11 +1105,11 @@ const char* const ColorRole[] = { /*! Attention: this function has to be in sync with Resource::setWidgetProperty(). If you change one, change both. */ -QString Uic::setObjectProperty( const QString& objClass, const QString& obj, const QString &prop, const QDomElement &e, bool stdset ) +TQString Uic::setObjectProperty( const TQString& objClass, const TQString& obj, const TQString &prop, const TQDomElement &e, bool stdset ) { - QString v; + TQString v; if ( e.tagName() == "rect" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0, w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -1122,11 +1122,11 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "QRect(%1,%2,%3,%4)"; + v = "TQRect(%1,%2,%3,%4)"; v = v.arg(x).arg(y).arg(w).arg(h); } else if ( e.tagName() == "point" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -1135,10 +1135,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con y = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "QPoint(%1,%2)"; + v = "TQPoint(%1,%2)"; v = v.arg(x).arg(y); } else if ( e.tagName() == "size" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) @@ -1147,10 +1147,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "QSize(%1,%2)"; + v = "TQSize(%1,%2)"; v = v.arg(w).arg(h); } else if ( e.tagName() == "color" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int r= 0, g = 0, b = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "red" ) @@ -1161,16 +1161,16 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con b = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "QColor(%1,%2,%3)"; + v = "TQColor(%1,%2,%3)"; v = v.arg(r).arg(g).arg(b); } else if ( e.tagName() == "font" ) { - QDomElement n3 = e.firstChild().toElement(); - QString fontname = "f"; + TQDomElement n3 = e.firstChild().toElement(); + TQString fontname = "f"; if ( !obj.isEmpty() ) { fontname = obj + "_font"; - out << indent << fontname << " = QFont(self." << obj << ".font())" << endl; + out << indent << fontname << " = TQFont(self." << obj << ".font())" << endl; } else { - out << indent << fontname << " = QFont(self.font())" << endl; + out << indent << fontname << " = TQFont(self.font())" << endl; } while ( !n3.isNull() ) { if ( n3.tagName() == "family" ) @@ -1199,14 +1199,14 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con } else if ( e.tagName() == "string" ) { if ( prop == "toolTip" ) { if ( !obj.isEmpty() ) - out << indent << "QToolTip.add(self." << obj << "," + trmacro + "(" << fixString( e.firstChild().toText().data() ) << "))" << endl; + out << indent << "TQToolTip.add(self." << obj << "," + trmacro + "(" << fixString( e.firstChild().toText().data() ) << "))" << endl; else - out << indent << "QToolTip.add(self," + trmacro + "(" << fixString( e.firstChild().toText().data() ) << "))" << endl; + out << indent << "TQToolTip.add(self," + trmacro + "(" << fixString( e.firstChild().toText().data() ) << "))" << endl; } else if ( prop == "whatsThis" ) { if ( !obj.isEmpty() ) - out << indent << "QWhatsThis.add(self." << obj << "," << trmacro << "(" << fixString( e.firstChild().toText().data() ) << "))" << endl; + out << indent << "TQWhatsThis.add(self." << obj << "," << trmacro << "(" << fixString( e.firstChild().toText().data() ) << "))" << endl; else - out << indent << "QWhatsThis.add(self," << trmacro << "(" << fixString( e.firstChild().toText().data() ) << "))" << endl; + out << indent << "TQWhatsThis.add(self," << trmacro << "(" << fixString( e.firstChild().toText().data() ) << "))" << endl; } else { v = trmacro + "(%1)"; v = v.arg( fixString( e.firstChild().toText().data() ) ); @@ -1230,51 +1230,51 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con v.append( " )" ); } } else if ( e.tagName() == "iconset" ) { - v = "QIconSet(%1)"; + v = "TQIconSet(%1)"; v = v.arg( e.firstChild().toText().data() ); } else if ( e.tagName() == "image" ) { v = e.firstChild().toText().data() + ".convertToImage()"; } else if ( e.tagName() == "enum" ) { v = "%1.%2"; - QString oc = objClass; - QString ev = e.firstChild().toText().data(); - if ( oc == "QListView" && ev == "Manual" ) // #### workaround, rename QListView::Manual of WithMode enum in 3.0 - oc = "QScrollView"; + TQString oc = objClass; + TQString ev = e.firstChild().toText().data(); + if ( oc == "TQListView" && ev == "Manual" ) // #### workaround, rename TQListView::Manual of WithMode enum in 3.0 + oc = "TQScrollView"; v = v.arg( oc ).arg( ev ); } else if ( e.tagName() == "set" ) { - QString keys( e.firstChild().toText().data() ); - QStringList lst = QStringList::split( '|', keys ); + TQString keys( e.firstChild().toText().data() ); + TQStringList lst = TQStringList::split( '|', keys ); v = ""; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { v += objClass + "." + *it; if ( it != lst.fromLast() ) v += " | "; } } else if ( e.tagName() == "sizepolicy" ) { - QDomElement n3 = e.firstChild().toElement(); - QSizePolicy sp; + TQDomElement n3 = e.firstChild().toElement(); + TQSizePolicy sp; while ( !n3.isNull() ) { if ( n3.tagName() == "hsizetype" ) - sp.setHorData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setHorData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "vsizetype" ) - sp.setVerData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setVerData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } - QString tmp; + TQString tmp; if ( !obj.isEmpty() ) tmp = "self." + obj; else tmp = "self"; - v = "QSizePolicy(%1,%2," + tmp + ".sizePolicy().hasHeightForWidth())"; + v = "TQSizePolicy(%1,%2," + tmp + ".sizePolicy().hasHeightForWidth())"; v = v.arg( (int)sp.horData() ).arg( (int)sp.verData() ); } else if ( e.tagName() == "palette" ) { - QPalette pal; + TQPalette pal; bool no_pixmaps = e.elementsByTagName( "pixmap" ).count() == 0; - QDomElement n; + TQDomElement n; if ( no_pixmaps ) { n = e.firstChild().toElement(); while ( !n.isNull() ) { - QColorGroup cg; + TQColorGroup cg; if ( n.tagName() == "active" ) { cg = loadColorGroup( n ); pal.setActive( cg ); @@ -1288,19 +1288,19 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con n = n.nextSibling().toElement(); } } - if ( no_pixmaps && pal == QPalette( pal.active().button(), pal.active().background() ) ) { - v = "QPalette(QColor(%1,%2,%3),QColor(%1,%2,%3))"; + if ( no_pixmaps && pal == TQPalette( pal.active().button(), pal.active().background() ) ) { + v = "TQPalette(TQColor(%1,%2,%3),TQColor(%1,%2,%3))"; v = v.arg( pal.active().button().red() ).arg( pal.active().button().green() ).arg( pal.active().button().blue() ); v = v.arg( pal.active().background().red() ).arg( pal.active().background().green() ).arg( pal.active().background().blue() ); } else { - QString palette = "pal"; + TQString palette = "pal"; if ( !pal_used ) { - out << indent << palette << " = QPalette()" << endl; + out << indent << palette << " = TQPalette()" << endl; pal_used = TRUE; } - QString cg = "cg"; + TQString cg = "cg"; if ( !cg_used ) { - out << indent << cg << " = QColorGroup()" << endl; + out << indent << cg << " = TQColorGroup()" << endl; cg_used = TRUE; } n = e.firstChild().toElement(); @@ -1323,7 +1323,7 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con v = palette; } } else if ( e.tagName() == "cursor" ) { - v = "QCursor(%1)"; + v = "TQCursor(%1)"; v = v.arg( e.firstChild().toText().data() ); } return v; @@ -1334,33 +1334,33 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con /*! Creates a colorgroup with name \a name from the color group \a cg */ -void Uic::createColorGroupImpl( const QString& name, const QDomElement& e ) +void Uic::createColorGroupImpl( const TQString& name, const TQDomElement& e ) { - QColorGroup cg; + TQColorGroup cg; int r = -1; - QDomElement n = e.firstChild().toElement(); - QString color; + TQDomElement n = e.firstChild().toElement(); + TQString color; while ( !n.isNull() ) { if ( n.tagName() == "color" ) { r++; - QColor col = DomTool::readColor( n ); - color = "QColor(%1,%2,%3)"; + TQColor col = DomTool::readColor( n ); + color = "TQColor(%1,%2,%3)"; color = color.arg( col.red() ).arg( col.green() ).arg( col.blue() ); if ( col == white ) color = "Qt.white"; else if ( col == black ) color = "Qt.black"; if ( n.nextSibling().toElement().tagName() != "pixmap" ) { - out << indent << name << ".setColor(QColorGroup." << ColorRole[r] << "," << color << ")" << endl; + out << indent << name << ".setColor(TQColorGroup." << ColorRole[r] << "," << color << ")" << endl; } } else if ( n.tagName() == "pixmap" ) { - QString pixmap = n.firstChild().toText().data(); + TQString pixmap = n.firstChild().toText().data(); if ( !pixmapLoaderFunction.isEmpty() ) { pixmap.prepend( pixmapLoaderFunction + "(" ); pixmap.append( ")" ); } - out << indent << name << ".setBrush(QColorGroup." - << ColorRole[r] << ",QBrush(" << color << "," << pixmap << "))" << endl; + out << indent << name << ".setBrush(TQColorGroup." + << ColorRole[r] << ",TQBrush(" << color << "," << pixmap << "))" << endl; } n = n.nextSibling().toElement(); } @@ -1370,16 +1370,16 @@ void Uic::createColorGroupImpl( const QString& name, const QDomElement& e ) Auxiliary function to load a color group. The colorgroup must not contain pixmaps. */ -QColorGroup Uic::loadColorGroup( const QDomElement &e ) +TQColorGroup Uic::loadColorGroup( const TQDomElement &e ) { - QColorGroup cg; + TQColorGroup cg; int r = -1; - QDomElement n = e.firstChild().toElement(); - QColor col; + TQDomElement n = e.firstChild().toElement(); + TQColor col; while ( !n.isNull() ) { if ( n.tagName() == "color" ) { r++; - cg.setColor( (QColorGroup::ColorRole)r, (col = DomTool::readColor( n ) ) ); + cg.setColor( (TQColorGroup::ColorRole)r, (col = DomTool::readColor( n ) ) ); } n = n.nextSibling().toElement(); } @@ -1396,7 +1396,7 @@ QColorGroup Uic::loadColorGroup( const QDomElement &e ) \sa registeredName(), isObjectRegistered() */ -QString Uic::registerObject( const QString& name ) +TQString Uic::registerObject( const TQString& name ) { if ( objectNames.isEmpty() ) { // some temporary variables we need @@ -1406,7 +1406,7 @@ QString Uic::registerObject( const QString& name ) objectNames += "pal"; } - QString result = name; + TQString result = name; int i; while ( ( i = result.find(' ' )) != -1 ) { result[i] = '_'; @@ -1414,10 +1414,10 @@ QString Uic::registerObject( const QString& name ) if ( objectNames.contains( result ) ) { int i = 2; - while ( objectNames.contains( result + "_" + QString::number(i) ) ) + while ( objectNames.contains( result + "_" + TQString::number(i) ) ) i++; result += "_"; - result += QString::number(i); + result += TQString::number(i); } objectNames += result; objectMapper.insert( name, result ); @@ -1430,7 +1430,7 @@ QString Uic::registerObject( const QString& name ) \sa registerObject(), isObjectRegistered() */ -QString Uic::registeredName( const QString& name ) +TQString Uic::registeredName( const TQString& name ) { if ( !objectMapper.contains( name ) ) return name; @@ -1440,24 +1440,24 @@ QString Uic::registeredName( const QString& name ) /*! Returns whether the object \a name was registered yet or not. */ -bool Uic::isObjectRegistered( const QString& name ) +bool Uic::isObjectRegistered( const TQString& name ) { return objectMapper.contains( name ); } /*! - Unifies the entries in stringlist \a list. Should really be a QStringList feature. + Unifies the entries in stringlist \a list. Should really be a TQStringList feature. */ -QStringList Uic::unique( const QStringList& list ) +TQStringList Uic::unique( const TQStringList& list ) { - QStringList result; + TQStringList result; if (list.isEmpty() ) return result; - QStringList l = list; + TQStringList l = list; l.sort(); result += l.first(); - for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it ) { + for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { if ( *it != result.last() ) result += *it; } @@ -1469,7 +1469,7 @@ QStringList Uic::unique( const QStringList& list ) /*! Creates an instance of class \a objClass, with parent \a parent and name \a objName */ -QString Uic::createObjectInstance( const QString& objClass, const QString& parent, const QString& objName ) +TQString Uic::createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName ) { if ( objClass.mid(1) == "ComboBox" ) { @@ -1478,7 +1478,7 @@ QString Uic::createObjectInstance( const QString& objClass, const QString& paren return objClass + "(" + parent + ",'" + objName + "')"; } -bool Uic::isLayout( const QString& name ) const +bool Uic::isLayout( const TQString& name ) const { return layoutObjects.contains( name ); } @@ -1487,22 +1487,22 @@ bool Uic::isLayout( const QString& name ) const #if defined(BLACKADDER) #include "ba.h" -int BA::compilePython(const QString &fileName,const QString &outputFile, - const QString &trmacro,bool execCode) +int BA::compilePython(const TQString &fileName,const TQString &outputFile, + const TQString &trmacro,bool execCode) { #else int main( int argc, char * argv[] ) { const char *error = 0; - QString fileName; - QString outputFile; - QString trmacro; + TQString fileName; + TQString outputFile; + TQString trmacro; bool execCode = FALSE; for ( int n = 1; n < argc && error == 0; n++ ) { - QCString arg = argv[n]; + TQCString arg = argv[n]; if ( arg[0] == '-' ) { // option - QCString opt = &arg[1]; + TQCString opt = &arg[1]; if ( opt[0] == 'o' ) { // output redirection if ( opt[1] == '\0' ) { if ( !(n < argc-1) ) { @@ -1550,11 +1550,11 @@ int main( int argc, char * argv[] ) } #endif - QFile file( fileName ); + TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) qFatal( "pyuic: Could not open file '%s' ", (const char *)fileName ); - QFile fileOut; + TQFile fileOut; if (!outputFile.isEmpty()) { fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) @@ -1562,16 +1562,16 @@ int main( int argc, char * argv[] ) } else { fileOut.open( IO_WriteOnly, stdout ); } - QTextStream out( &fileOut ); - out.setEncoding( QTextStream::UnicodeUTF8 ); + TQTextStream out( &fileOut ); + out.setEncoding( TQTextStream::UnicodeUTF8 ); - QDomDocument doc; + TQDomDocument doc; if ( !doc.setContent( &file ) ) qFatal( "pyuic: Failed to parse %s\n", (const char *)fileName ); out << "# Form implementation generated from reading ui file '" << fileName << "'" << endl; out << "#" << endl; - out << "# Created: " << QDateTime::currentDateTime().toString() << endl; + out << "# Created: " << TQDateTime::currentDateTime().toString() << endl; out << "# by: The Python User Interface Compiler (pyuic) " << PYQT_VERSION << endl; out << "#" << endl; out << "# WARNING! All changes made in this file will be lost!" << endl; @@ -1583,14 +1583,14 @@ int main( int argc, char * argv[] ) out << "from qt import *" << endl; - Uic( out, doc, trmacro.isEmpty() ? QString("self.tr") : trmacro ); + Uic( out, doc, trmacro.isEmpty() ? TQString("self.tr") : trmacro ); if (execCode) { out << endl; out << endl; out << "if __name__ == '__main__':" << endl; - out << " a = QApplication(sys.argv)" << endl; - out << " QObject.connect(a,SIGNAL('lastWindowClosed()'),a,SLOT('quit()'))" << endl; + out << " a = TQApplication(sys.argv)" << endl; + out << " TQObject.connect(a,TQT_SIGNAL('lastWindowClosed()'),a,TQT_SLOT('quit()'))" << endl; out << " w = " << className << "()" << endl; out << " a.setMainWidget(w)" << endl; out << " w.show()" << endl; diff --git a/python/pyqt/pyuic2/uic.h b/python/pyqt/pyuic2/uic.h index 6c7befc4..50e1d7a3 100644 --- a/python/pyqt/pyuic2/uic.h +++ b/python/pyqt/pyuic2/uic.h @@ -19,13 +19,13 @@ #ifndef UIC_H #define UIC_H -#include <qnamespace.h> -#include <qdom.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qmap.h> -#include <qtextstream.h> -#include <qcolor.h> +#include <tqnamespace.h> +#include <tqdom.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqmap.h> +#include <tqtextstream.h> +#include <tqcolor.h> #define PYQT_VERSION "3.17.2" @@ -34,33 +34,33 @@ class Uic : public Qt { public: - Uic( QTextStream& out, QDomDocument doc, const QString &trm ); - - void createFormImpl( const QDomElement &e ); - - QString createObjectImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout = QString::null ); - QString createLayoutImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout = QString::null ); - QString createObjectInstance( const QString& objClass, const QString& parent, const QString& objName ); - QString createSpacerImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout = QString::null ); - void createExclusiveProperty( const QDomElement & e, const QString& exclusiveProp ); - QString createListBoxItemImpl( const QDomElement &e, const QString &parent ); - QString createIconViewItemImpl( const QDomElement &e, const QString &parent ); - QString createListViewColumnImpl( const QDomElement &e, const QString &parent ); - QString createListViewItemImpl( const QDomElement &e, const QString &parent, - const QString &parentItem ); - void createColorGroupImpl( const QString& cg, const QDomElement& e ); - QColorGroup loadColorGroup( const QDomElement &e ); - - QString getClassName( const QDomElement& e ); - QString getObjectName( const QDomElement& e ); - QString getLayoutName( const QDomElement& e ); - - QString setObjectProperty( const QString& objClass, const QString& obj, const QString &prop, const QDomElement &e, bool stdset ); - - QString registerObject( const QString& name ); - QString registeredName( const QString& name ); - bool isObjectRegistered( const QString& name ); - QStringList unique( const QStringList& ); + Uic( TQTextStream& out, TQDomDocument doc, const TQString &trm ); + + void createFormImpl( const TQDomElement &e ); + + TQString createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null ); + TQString createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null ); + TQString createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName ); + TQString createSpacerImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null ); + void createExclusiveProperty( const TQDomElement & e, const TQString& exclusiveProp ); + TQString createListBoxItemImpl( const TQDomElement &e, const TQString &parent ); + TQString createIconViewItemImpl( const TQDomElement &e, const TQString &parent ); + TQString createListViewColumnImpl( const TQDomElement &e, const TQString &parent ); + TQString createListViewItemImpl( const TQDomElement &e, const TQString &parent, + const TQString &parentItem ); + void createColorGroupImpl( const TQString& cg, const TQDomElement& e ); + TQColorGroup loadColorGroup( const TQDomElement &e ); + + TQString getClassName( const TQDomElement& e ); + TQString getObjectName( const TQDomElement& e ); + TQString getLayoutName( const TQDomElement& e ); + + TQString setObjectProperty( const TQString& objClass, const TQString& obj, const TQString &prop, const TQDomElement &e, bool stdset ); + + TQString registerObject( const TQString& name ); + TQString registeredName( const TQString& name ); + bool isObjectRegistered( const TQString& name ); + TQStringList unique( const TQStringList& ); private: void pushIndent() @@ -90,44 +90,44 @@ private: nrindents = 0; } - QString indent, newindent; + TQString indent, newindent; int nrindents; - QTextStream& out; - QStringList objectNames; - QMap<QString,QString> objectMapper; - QStringList tags; - QStringList layouts; - QString formName; - QString lastItem; - QString trmacro; + TQTextStream& out; + TQStringList objectNames; + TQMap<TQString,TQString> objectMapper; + TQStringList tags; + TQStringList layouts; + TQString formName; + TQString lastItem; + TQString trmacro; struct Buddy { - Buddy( const QString& k, const QString& b ) + Buddy( const TQString& k, const TQString& b ) : key( k ), buddy( b ) {} Buddy(){}; // for valuelist - QString key; - QString buddy; + TQString key; + TQString buddy; bool operator==( const Buddy& other ) const { return (key == other.key); } }; struct CustomInclude { - QString header; - QString location; + TQString header; + TQString location; }; - QValueList<Buddy> buddies; + TQValueList<Buddy> buddies; - QStringList layoutObjects; - bool isLayout( const QString& name ) const; + TQStringList layoutObjects; + bool isLayout( const TQString& name ) const; uint item_used : 1; uint cg_used : 1; uint pal_used : 1; - QString pixmapLoaderFunction; - QString nameOfClass; + TQString pixmapLoaderFunction; + TQString nameOfClass; }; #endif diff --git a/python/pyqt/pyuic2/widgetdatabase.cpp b/python/pyqt/pyuic2/widgetdatabase.cpp index 0733fcef..ced269f3 100644 --- a/python/pyqt/pyuic2/widgetdatabase.cpp +++ b/python/pyqt/pyuic2/widgetdatabase.cpp @@ -18,7 +18,7 @@ ** **********************************************************************/ -#include <qvariant.h> // HP-UX compiler needs this here +#include <tqvariant.h> // HP-UX compiler needs this here #include "widgetdatabase.h" @@ -30,22 +30,22 @@ //#include "../integration/kdevelop/kdewidgets.h" #include <globaldefs.h> -#include <qstrlist.h> -#include <qdict.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqstrlist.h> +#include <tqdict.h> +#include <tqfile.h> +#include <tqtextstream.h> -#include <qmodules.h> +#include <tqmodules.h> const int dbsize = 300; const int dbcustom = 200; const int dbdictsize = 211; static WidgetDatabaseRecord* db[ dbsize ]; -static QDict<int> *className2Id = 0; +static TQDict<int> *className2Id = 0; static int dbcount = 0; static int dbcustomcount = 200; -static QStrList *wGroups; -static QStrList *invisibleGroups; +static TQStrList *wGroups; +static TQStrList *invisibleGroups; static bool whatsThisLoaded = FALSE; @@ -99,14 +99,14 @@ void WidgetDatabase::setupDataBase() invisibleGroups = new QStrList; invisibleGroups->append( "Forms" ); invisibleGroups->append( "Temp" ); - className2Id = new QDict<int>( dbdictsize ); + className2Id = new TQDict<int>( dbdictsize ); className2Id->setAutoDelete( TRUE ); WidgetDatabaseRecord *r = 0; r = new WidgetDatabaseRecord; r->iconSet = "pushbutton.xpm"; - r->name = "QPushButton"; + r->name = "TQPushButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Push Button"; @@ -114,7 +114,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "toolbutton.xpm"; - r->name = "QToolButton"; + r->name = "TQToolButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Tool Button"; @@ -122,7 +122,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "radiobutton.xpm"; - r->name = "QRadioButton"; + r->name = "TQRadioButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Radio Button"; @@ -130,7 +130,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "checkbox.xpm"; - r->name = "QCheckBox"; + r->name = "TQCheckBox"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Check Box"; @@ -140,7 +140,7 @@ void WidgetDatabase::setupDataBase() append( r ); r = new WidgetDatabaseRecord; r->iconSet = "groupbox.xpm"; - r->name = "QGroupBox"; + r->name = "TQGroupBox"; r->group = widgetGroup( "Containers" ); r->toolTip = "Group Box"; r->isContainer = TRUE; @@ -149,7 +149,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "buttongroup.xpm"; - r->name = "QButtonGroup"; + r->name = "TQButtonGroup"; r->group = widgetGroup( "Containers" ); r->toolTip = "Button Group"; r->isContainer = TRUE; @@ -158,7 +158,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "frame.xpm"; - r->name = "QFrame"; + r->name = "TQFrame"; r->group = widgetGroup( "Containers" ); r->toolTip = "Frame"; r->isContainer = TRUE; @@ -167,7 +167,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "tabwidget.xpm"; - r->name = "QTabWidget"; + r->name = "TQTabWidget"; r->group = widgetGroup( "Containers" ); r->toolTip = "Tabwidget"; r->isContainer = TRUE; @@ -177,7 +177,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "listbox.xpm"; - r->name = "QListBox"; + r->name = "TQListBox"; r->group = widgetGroup( "Views" ); r->toolTip = "List Box"; @@ -185,7 +185,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "listview.xpm"; - r->name = "QListView"; + r->name = "TQListView"; r->group = widgetGroup( "Views" ); r->toolTip = "List View"; @@ -194,7 +194,7 @@ void WidgetDatabase::setupDataBase() #if defined(QT_MODULE_ICONVIEW) || defined(UIC) r = new WidgetDatabaseRecord; r->iconSet = "iconview.xpm"; - r->name = "QIconView"; + r->name = "TQIconView"; r->group = widgetGroup( "Views" ); r->toolTip = "Icon View"; @@ -204,7 +204,7 @@ void WidgetDatabase::setupDataBase() #if defined(QT_MODULE_TABLE) r = new WidgetDatabaseRecord; r->iconSet = "table.xpm"; - r->name = "QTable"; + r->name = "TQTable"; r->group = widgetGroup( "Views" ); r->toolTip = "Table"; @@ -214,7 +214,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "lineedit.xpm"; - r->name = "QLineEdit"; + r->name = "TQLineEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Line Edit"; @@ -222,7 +222,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "spinbox.xpm"; - r->name = "QSpinBox"; + r->name = "TQSpinBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Spin Box"; @@ -230,7 +230,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "multilineedit.xpm"; - r->name = "QMultiLineEdit"; + r->name = "TQMultiLineEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Multi Line Edit"; @@ -238,7 +238,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "combobox.xpm"; - r->name = "QComboBox"; + r->name = "TQComboBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Combo Box"; @@ -246,7 +246,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "slider.xpm"; - r->name = "QSlider"; + r->name = "TQSlider"; r->group = widgetGroup( "Input" ); r->toolTip = "Slider"; @@ -254,7 +254,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "dial.xpm"; - r->name = "QDial"; + r->name = "TQDial"; r->group = widgetGroup( "Input" ); r->toolTip = "Dial"; @@ -262,7 +262,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "label.xpm"; - r->name = "QLabel"; + r->name = "TQLabel"; r->group = widgetGroup( "Temp" ); r->toolTip = "Label"; @@ -288,7 +288,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "lcdnumber.xpm"; - r->name = "QLCDNumber"; + r->name = "TQLCDNumber"; r->group = widgetGroup( "Display" ); r->toolTip = "LCD Number"; @@ -299,14 +299,14 @@ void WidgetDatabase::setupDataBase() r->name = "Line"; r->group = widgetGroup( "Display" ); r->toolTip = "Line"; - r->includeFile = "qframe.h"; + r->includeFile = "tqframe.h"; r->whatsThis = "The Line widget provides horizontal and vertical lines."; append( r ); r = new WidgetDatabaseRecord; r->iconSet = "progress.xpm"; - r->name = "QProgressBar"; + r->name = "TQProgressBar"; r->group = widgetGroup( "Display" ); r->toolTip = "Progress Bar"; @@ -314,7 +314,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "textview.xpm"; - r->name = "QTextView"; + r->name = "TQTextView"; r->group = widgetGroup( "Display" ); r->toolTip = "Text View"; @@ -322,7 +322,7 @@ void WidgetDatabase::setupDataBase() r = new WidgetDatabaseRecord; r->iconSet = "textbrowser.xpm"; - r->name = "QTextBrowser"; + r->name = "TQTextBrowser"; r->group = widgetGroup( "Display" ); r->toolTip = "Text Browser"; @@ -338,21 +338,21 @@ void WidgetDatabase::setupDataBase() append( r ); r = new WidgetDatabaseRecord; - r->name = "QWidget"; + r->name = "TQWidget"; r->isContainer = FALSE; r->group = widgetGroup( "Forms" ); append( r ); r = new WidgetDatabaseRecord; - r->name = "QDialog"; + r->name = "TQDialog"; r->group = widgetGroup( "Forms" ); r->isContainer = FALSE; append( r ); r = new WidgetDatabaseRecord; - r->name = "QWizard"; + r->name = "TQWizard"; r->group = widgetGroup( "Forms" ); r->isContainer = TRUE; @@ -424,32 +424,32 @@ int WidgetDatabase::startCustom() id. */ -QIconSet WidgetDatabase::iconSet( int id ) +TQIconSet WidgetDatabase::iconSet( int id ) { setupDataBase(); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QIconSet(); + return TQIconSet(); #if defined(DESIGNER) if ( !r->icon ) - r->icon = new QIconSet( PixmapChooser::loadPixmap( r->iconSet, PixmapChooser::Small ), + r->icon = new TQIconSet( PixmapChooser::loadPixmap( r->iconSet, PixmapChooser::Small ), PixmapChooser::loadPixmap( r->iconSet, PixmapChooser::Large ) ); return *r->icon; #endif - return QIconSet(); + return TQIconSet(); } /*! Returns the classname of the widget which is registered as \a id. */ -QString WidgetDatabase::className( int id ) +TQString WidgetDatabase::className( int id ) { setupDataBase(); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->name; } @@ -457,12 +457,12 @@ QString WidgetDatabase::className( int id ) Returns the group to which the widget registered as \a id belongs. */ -QString WidgetDatabase::group( int id ) +TQString WidgetDatabase::group( int id ) { setupDataBase(); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->group; } @@ -470,12 +470,12 @@ QString WidgetDatabase::group( int id ) id. */ -QString WidgetDatabase::toolTip( int id ) +TQString WidgetDatabase::toolTip( int id ) { setupDataBase(); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->toolTip; } @@ -483,12 +483,12 @@ QString WidgetDatabase::toolTip( int id ) as \a id. */ -QString WidgetDatabase::whatsThis( int id ) +TQString WidgetDatabase::whatsThis( int id ) { setupDataBase(); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->whatsThis; } @@ -496,12 +496,12 @@ QString WidgetDatabase::whatsThis( int id ) Returns the include file if the widget which is registered as \a id. */ -QString WidgetDatabase::includeFile( int id ) +TQString WidgetDatabase::includeFile( int id ) { setupDataBase(); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; if ( r->includeFile.isNull() ) return r->name.lower() + ".h"; return r->includeFile; @@ -520,10 +520,10 @@ bool WidgetDatabase::isContainer( int id ) return r->isContainer; } -QString WidgetDatabase::createWidgetName( int id ) +TQString WidgetDatabase::createWidgetName( int id ) { setupDataBase(); - QString n = className( id ); + TQString n = className( id ); if ( n == "QLayoutWidget" ) n = "Layout"; if ( n[ 0 ] == 'Q' ) @@ -531,13 +531,13 @@ QString WidgetDatabase::createWidgetName( int id ) WidgetDatabaseRecord *r = at( id ); if ( !r ) return n; - n += QString::number( ++r->nameCounter ); + n += TQString::number( ++r->nameCounter ); return n; } /*! Returns the id for \a name or -1 if \a name is unknown. */ -int WidgetDatabase::idFromClassName( const QString &name ) +int WidgetDatabase::idFromClassName( const TQString &name ) { setupDataBase(); if ( name.isEmpty() ) @@ -576,19 +576,19 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) insert( dbcount++, r ); } -QString WidgetDatabase::widgetGroup( const QString &g ) +TQString WidgetDatabase::widgetGroup( const TQString &g ) { if ( wGroups->find( g ) == -1 ) wGroups->append( g ); return g; } -QString WidgetDatabase::widgetGroup( int i ) +TQString WidgetDatabase::widgetGroup( int i ) { setupDataBase(); if ( i >= 0 && i < (int)wGroups->count() ) return wGroups->at( i ); - return QString::null; + return TQString::null; } int WidgetDatabase::numWidgetGroups() @@ -597,7 +597,7 @@ int WidgetDatabase::numWidgetGroups() return wGroups->count(); } -bool WidgetDatabase::isGroupVisible( const QString &g ) +bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase(); return invisibleGroups->find( g ) == -1; @@ -621,16 +621,16 @@ bool WidgetDatabase::isWhatsThisLoaded() return whatsThisLoaded; } -void WidgetDatabase::loadWhatsThis( const QString &docPath ) +void WidgetDatabase::loadWhatsThis( const TQString &docPath ) { - QString whatsthisFile = docPath + "/whatsthis"; - QFile f( whatsthisFile ); + TQString whatsthisFile = docPath + "/whatsthis"; + TQFile f( whatsthisFile ); if ( !f.open( IO_ReadOnly ) ) return; - QTextStream ts( &f ); + TQTextStream ts( &f ); while ( !ts.atEnd() ) { - QString s = ts.readLine(); - QStringList l = QStringList::split( " | ", s ); + TQString s = ts.readLine(); + TQStringList l = TQStringList::split( " | ", s ); int id = idFromClassName( l[ 1 ] ); WidgetDatabaseRecord *r = at( id ); if ( r ) diff --git a/python/pyqt/pyuic2/widgetdatabase.h b/python/pyqt/pyuic2/widgetdatabase.h index a28cd5fb..dd327d7a 100644 --- a/python/pyqt/pyuic2/widgetdatabase.h +++ b/python/pyqt/pyuic2/widgetdatabase.h @@ -21,17 +21,17 @@ #ifndef WIDGETDATABASE_H #define WIDGETDATABASE_H -#include <qiconset.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqiconset.h> +#include <tqstring.h> +#include <tqstringlist.h> struct WidgetDatabaseRecord { WidgetDatabaseRecord(); ~WidgetDatabaseRecord(); - QString iconSet, name, group, toolTip, whatsThis, includeFile; + TQString iconSet, name, group, toolTip, whatsThis, includeFile; uint isContainer : 1; - QIconSet *icon; + TQIconSet *icon; int nameCounter; }; @@ -44,31 +44,31 @@ public: static int count(); static int startCustom(); - static QIconSet iconSet( int id ); - static QString className( int id ); - static QString group( int id ); - static QString toolTip( int id ); - static QString whatsThis( int id ); - static QString includeFile( int id ); + static TQIconSet iconSet( int id ); + static TQString className( int id ); + static TQString group( int id ); + static TQString toolTip( int id ); + static TQString whatsThis( int id ); + static TQString includeFile( int id ); static bool isContainer( int id ); - static int idFromClassName( const QString &name ); - static QString createWidgetName( int id ); + static int idFromClassName( const TQString &name ); + static TQString createWidgetName( int id ); static WidgetDatabaseRecord *at( int index ); static void insert( int index, WidgetDatabaseRecord *r ); static void append( WidgetDatabaseRecord *r ); - static QString widgetGroup( const QString &g ); - static QString widgetGroup( int i ); + static TQString widgetGroup( const TQString &g ); + static TQString widgetGroup( int i ); static int numWidgetGroups(); - static bool isGroupVisible( const QString &g ); + static bool isGroupVisible( const TQString &g ); static int addCustomWidget( WidgetDatabaseRecord *r ); static bool isCustomWidget( int id ); static bool isWhatsThisLoaded(); - static void loadWhatsThis( const QString &docPath ); + static void loadWhatsThis( const TQString &docPath ); }; diff --git a/python/pyqt/pyuic3/domtool.cpp b/python/pyqt/pyuic3/domtool.cpp index b3514a06..d083aaae 100644 --- a/python/pyqt/pyuic3/domtool.cpp +++ b/python/pyqt/pyuic3/domtool.cpp @@ -20,14 +20,14 @@ #include "domtool.h" -#include <qsizepolicy.h> -#include <qcolor.h> -#include <qcursor.h> -#include <qdatetime.h> -#include <qrect.h> -#include <qsize.h> -#include <qfont.h> -#include <qdom.h> +#include <tqsizepolicy.h> +#include <tqcolor.h> +#include <tqcursor.h> +#include <tqdatetime.h> +#include <tqrect.h> +#include <tqsize.h> +#include <tqfont.h> +#include <tqdom.h> /*! \class DomTool domtool.h @@ -45,9 +45,9 @@ \sa hasProperty() */ -QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ) +TQVariant DomTool::readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { if ( n.attribute( "name" ) != name ) @@ -62,9 +62,9 @@ QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const /*! \overload */ -QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const QVariant& defValue ) +TQVariant DomTool::readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue ) { - QString comment; + TQString comment; return readProperty( e, name, defValue, comment ); } @@ -73,9 +73,9 @@ QVariant DomTool::readProperty( const QDomElement& e, const QString& name, const \sa readProperty() */ -bool DomTool::hasProperty( const QDomElement& e, const QString& name ) +bool DomTool::hasProperty( const TQDomElement& e, const TQString& name ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { if ( n.attribute( "name" ) != name ) @@ -86,13 +86,13 @@ bool DomTool::hasProperty( const QDomElement& e, const QString& name ) return FALSE; } -QStringList DomTool::propertiesOfType( const QDomElement& e, const QString& type ) +TQStringList DomTool::propertiesOfType( const TQDomElement& e, const TQString& type ) { - QStringList result; - QDomElement n; + TQStringList result; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { - QDomElement n2 = n.firstChild().toElement(); + TQDomElement n2 = n.firstChild().toElement(); if ( n2.tagName() == type ) result += n.attribute( "name" ); } @@ -101,20 +101,20 @@ QStringList DomTool::propertiesOfType( const QDomElement& e, const QString& type } -QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defValue ) +TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& defValue ) { - QString dummy; + TQString dummy; return elementToVariant( e, defValue, dummy ); } /*! Interprets element \a e as variant and returns the result of the interpretation. */ -QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defValue, QString &comment ) +TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& defValue, TQString &comment ) { - QVariant v; + TQVariant v; if ( e.tagName() == "rect" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0, w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -127,9 +127,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QRect( x, y, w, h ) ); + v = TQVariant( TQRect( x, y, w, h ) ); } else if ( e.tagName() == "point" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -138,9 +138,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal y = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QPoint( x, y ) ); + v = TQVariant( TQPoint( x, y ) ); } else if ( e.tagName() == "size" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) @@ -149,12 +149,12 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QSize( w, h ) ); + v = TQVariant( TQSize( w, h ) ); } else if ( e.tagName() == "color" ) { - v = QVariant( readColor( e ) ); + v = TQVariant( readColor( e ) ); } else if ( e.tagName() == "font" ) { - QDomElement n3 = e.firstChild().toElement(); - QFont f( defValue.toFont() ); + TQDomElement n3 = e.firstChild().toElement(); + TQFont f( defValue.toFont() ); while ( !n3.isNull() ) { if ( n3.tagName() == "family" ) f.setFamily( n3.firstChild().toText().data() ); @@ -170,58 +170,58 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal f.setStrikeOut( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } - v = QVariant( f ); + v = TQVariant( f ); } else if ( e.tagName() == "string" ) { - v = QVariant( e.firstChild().toText().data() ); - QDomElement n = e; + v = TQVariant( e.firstChild().toText().data() ); + TQDomElement n = e; n = n.nextSibling().toElement(); if ( n.tagName() == "comment" ) comment = n.firstChild().toText().data(); } else if ( e.tagName() == "cstring" ) { - v = QVariant( QCString( e.firstChild().toText().data() ) ); + v = TQVariant( TQCString( e.firstChild().toText().data() ) ); } else if ( e.tagName() == "number" ) { bool ok = TRUE; - v = QVariant( e.firstChild().toText().data().toInt( &ok ) ); + v = TQVariant( e.firstChild().toText().data().toInt( &ok ) ); if ( !ok ) - v = QVariant( e.firstChild().toText().data().toDouble() ); + v = TQVariant( e.firstChild().toText().data().toDouble() ); } else if ( e.tagName() == "bool" ) { - QString t = e.firstChild().toText().data(); - v = QVariant( t == "true" || t == "1", 0 ); + TQString t = e.firstChild().toText().data(); + v = TQVariant( t == "true" || t == "1", 0 ); } else if ( e.tagName() == "pixmap" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "iconset" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "image" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "enum" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "set" ) { - v = QVariant( e.firstChild().toText().data() ); + v = TQVariant( e.firstChild().toText().data() ); } else if ( e.tagName() == "sizepolicy" ) { - QDomElement n3 = e.firstChild().toElement(); - QSizePolicy sp; + TQDomElement n3 = e.firstChild().toElement(); + TQSizePolicy sp; while ( !n3.isNull() ) { if ( n3.tagName() == "hsizetype" ) - sp.setHorData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setHorData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "vsizetype" ) - sp.setVerData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setVerData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "horstretch" ) sp.setHorStretch( n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "verstretch" ) sp.setVerStretch( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } - v = QVariant( sp ); + v = TQVariant( sp ); } else if ( e.tagName() == "cursor" ) { - v = QVariant( QCursor( e.firstChild().toText().data().toInt() ) ); + v = TQVariant( TQCursor( e.firstChild().toText().data().toInt() ) ); } else if ( e.tagName() == "stringlist" ) { - QStringList lst; - QDomElement n; + TQStringList lst; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) lst << n.firstChild().toText().data(); - v = QVariant( lst ); + v = TQVariant( lst ); } else if ( e.tagName() == "date" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int y, m, d; y = m = d = 0; while ( !n3.isNull() ) { @@ -233,9 +233,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal d = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QDate( y, m, d ) ); + v = TQVariant( TQDate( y, m, d ) ); } else if ( e.tagName() == "time" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int h, m, s; h = m = s = 0; while ( !n3.isNull() ) { @@ -247,9 +247,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal s = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QTime( h, m, s ) ); + v = TQVariant( TQTime( h, m, s ) ); } else if ( e.tagName() == "datetime" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int h, mi, s, y, mo, d ; h = mi = s = y = mo = d = 0; while ( !n3.isNull() ) { @@ -267,7 +267,7 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal d = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = QVariant( QDateTime( QDate( y, mo, d ), QTime( h, mi, s ) ) ); + v = TQVariant( TQDateTime( TQDate( y, mo, d ), TQTime( h, mi, s ) ) ); } return v; } @@ -276,9 +276,9 @@ QVariant DomTool::elementToVariant( const QDomElement& e, const QVariant& defVal /*! Returns the color which is returned in the dom element \a e. */ -QColor DomTool::readColor( const QDomElement &e ) +TQColor DomTool::readColor( const TQDomElement &e ) { - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); int r= 0, g = 0, b = 0; while ( !n.isNull() ) { if ( n.tagName() == "red" ) @@ -290,7 +290,7 @@ QColor DomTool::readColor( const QDomElement &e ) n = n.nextSibling().toElement(); } - return QColor( r, g, b ); + return TQColor( r, g, b ); } /*! @@ -300,9 +300,9 @@ QColor DomTool::readColor( const QDomElement &e ) \sa hasAttribute() */ -QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ) +TQVariant DomTool::readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "attribute" ) { if ( n.attribute( "name" ) != name ) @@ -316,9 +316,9 @@ QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, cons /*! \overload */ -QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue ) +TQVariant DomTool::readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue ) { - QString comment; + TQString comment; return readAttribute( e, name, defValue, comment ); } @@ -327,9 +327,9 @@ QVariant DomTool::readAttribute( const QDomElement& e, const QString& name, cons \sa readAttribute() */ -bool DomTool::hasAttribute( const QDomElement& e, const QString& name ) +bool DomTool::hasAttribute( const TQDomElement& e, const TQString& name ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "attribute" ) { if ( n.attribute( "name" ) != name ) @@ -340,7 +340,7 @@ bool DomTool::hasAttribute( const QDomElement& e, const QString& name ) return FALSE; } -static bool toBool( const QString& s ) +static bool toBool( const TQString& s ) { return s == "true" || s.toInt() != 0; } @@ -348,11 +348,11 @@ static bool toBool( const QString& s ) /*! Convert Qt 2.x format to Qt 3.0 format if necessary */ -void DomTool::fixDocument( QDomDocument& doc ) +void DomTool::fixDocument( TQDomDocument& doc ) { - QDomElement e; - QDomNode n; - QDomNodeList nl; + TQDomElement e; + TQDomNode n; + TQDomNodeList nl; int i = 0; e = doc.firstChild().toElement(); @@ -368,8 +368,8 @@ void DomTool::fixDocument( QDomDocument& doc ) // in 3.0, we need to fix a spelling error if ( e.hasAttribute("version") && e.attribute("version").toDouble() == 3.0 ) { for ( i = 0; i < (int) nl.length(); i++ ) { - QDomElement el = nl.item(i).toElement(); - QString s = el.attribute( "name" ); + TQDomElement el = nl.item(i).toElement(); + TQString s = el.attribute( "name" ); if ( s == "resizeable" ) { el.removeAttribute( "name" ); el.setAttribute( "name", "resizable" ); @@ -385,8 +385,8 @@ void DomTool::fixDocument( QDomDocument& doc ) e.setAttribute("stdsetdef", 1 ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "name" ) { name = n2.firstChild().toText().data(); if ( name == "resizeable" ) @@ -410,8 +410,8 @@ void DomTool::fixDocument( QDomDocument& doc ) nl = doc.elementsByTagName( "attribute" ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "name" ) { name = n2.firstChild().toText().data(); e.setAttribute( "name", name ); @@ -422,8 +422,8 @@ void DomTool::fixDocument( QDomDocument& doc ) nl = doc.elementsByTagName( "image" ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "name" ) { name = n2.firstChild().toText().data(); e.setAttribute( "name", name ); @@ -434,8 +434,8 @@ void DomTool::fixDocument( QDomDocument& doc ) nl = doc.elementsByTagName( "widget" ); for ( i = 0; i < (int) nl.length(); i++ ) { e = nl.item(i).toElement(); - QString name; - QDomElement n2 = e.firstChild().toElement(); + TQString name; + TQDomElement n2 = e.firstChild().toElement(); if ( n2.tagName() == "class" ) { name = n2.firstChild().toText().data(); e.setAttribute( "class", name ); diff --git a/python/pyqt/pyuic3/domtool.h b/python/pyqt/pyuic3/domtool.h index 25b795d3..a75e3d3f 100644 --- a/python/pyqt/pyuic3/domtool.h +++ b/python/pyqt/pyuic3/domtool.h @@ -21,8 +21,8 @@ #ifndef DOMTOOL_H #define DOMTOOL_H -#include <qvariant.h> -#include <qnamespace.h> +#include <tqvariant.h> +#include <tqnamespace.h> class QDomElement; class QDomDocument; @@ -30,17 +30,17 @@ class QDomDocument; class DomTool : public Qt { public: - static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue ); - static QVariant readProperty( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ); - static bool hasProperty( const QDomElement& e, const QString& name ); - static QStringList propertiesOfType( const QDomElement& e, const QString& type ); - static QVariant elementToVariant( const QDomElement& e, const QVariant& defValue ); - static QVariant elementToVariant( const QDomElement& e, const QVariant& defValue, QString &comment ); - static QVariant readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue ); - static QVariant readAttribute( const QDomElement& e, const QString& name, const QVariant& defValue, QString& comment ); - static bool hasAttribute( const QDomElement& e, const QString& name ); - static QColor readColor( const QDomElement &e ); - static void fixDocument( QDomDocument& ); + static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue ); + static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ); + static bool hasProperty( const TQDomElement& e, const TQString& name ); + static TQStringList propertiesOfType( const TQDomElement& e, const TQString& type ); + static TQVariant elementToVariant( const TQDomElement& e, const TQVariant& defValue ); + static TQVariant elementToVariant( const TQDomElement& e, const TQVariant& defValue, TQString &comment ); + static TQVariant readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue ); + static TQVariant readAttribute( const TQDomElement& e, const TQString& name, const TQVariant& defValue, TQString& comment ); + static bool hasAttribute( const TQDomElement& e, const TQString& name ); + static TQColor readColor( const TQDomElement &e ); + static void fixDocument( TQDomDocument& ); }; diff --git a/python/pyqt/pyuic3/embed.cpp b/python/pyqt/pyuic3/embed.cpp index 04f6494c..da1c1d5c 100644 --- a/python/pyqt/pyuic3/embed.cpp +++ b/python/pyqt/pyuic3/embed.cpp @@ -21,11 +21,11 @@ **********************************************************************/ #include "uic.h" -#include <qfile.h> -#include <qimage.h> -#include <qstringlist.h> -#include <qdatetime.h> -#include <qfileinfo.h> +#include <tqfile.h> +#include <tqimage.h> +#include <tqstringlist.h> +#include <tqdatetime.h> +#include <tqfileinfo.h> #include <stdio.h> #include <ctype.h> @@ -42,17 +42,17 @@ struct EmbedImage int width, height, depth; int numColors; QRgb* colorTable; - QString name; - QString cname; + TQString name; + TQString cname; bool alpha; #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION ulong compressed; #endif }; -static QString convertToCIdentifier( const char *s ) +static TQString convertToCIdentifier( const char *s ) { - QString r = s; + TQString r = s; int len = r.length(); if ( len > 0 && !isalpha( (char)r[0].latin1() ) ) r[0] = '_'; @@ -64,16 +64,16 @@ static QString convertToCIdentifier( const char *s ) } -static ulong embedData( QTextStream& out, const uchar* input, int nbytes ) +static ulong embedData( TQTextStream& out, const uchar* input, int nbytes ) { #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION - QByteArray bazip( qCompress( input, nbytes ) ); + TQByteArray bazip( qCompress( input, nbytes ) ); uint len = bazip.size(); #else uint len = (uint)nbytes; #endif static const char hexdigits[] = "0123456789abcdef"; - QString s; + TQString s; for ( uint i=0; i<len; i++ ) { if ( (i%14) == 0 ) { if (i) @@ -101,7 +101,7 @@ static ulong embedData( QTextStream& out, const uchar* input, int nbytes ) return (ulong)len; } -static void embedData( QTextStream& out, const QRgb* input, int n ) +static void embedData( TQTextStream& out, const QRgb* input, int n ) { out << hex; const QRgb *v = input; @@ -116,26 +116,26 @@ static void embedData( QTextStream& out, const QRgb* input, int n ) out << dec; // back to decimal mode } -void Uic::embed( QTextStream& out, const char* project, const QStringList& images ) +void Uic::embed( TQTextStream& out, const char* project, const TQStringList& images ) { - QString cProject = convertToCIdentifier( project ); + TQString cProject = convertToCIdentifier( project ); - QStringList::ConstIterator it; + TQStringList::ConstIterator it; out << "# Image collection for project '" << project << "'.\n"; out << "#\n"; out << "# Generated from reading image files: \n"; for ( it = images.begin(); it != images.end(); ++it ) out << "# " << *it << "\n"; out << "#\n"; - out << "# Created: " << QDateTime::currentDateTime().toString() << "\n"; + out << "# Created: " << TQDateTime::currentDateTime().toString() << "\n"; out << "# by: The PyQt User Interface Compiler (pyuic) " << PYQT_VERSION << "\n"; out << "#\n"; out << "# WARNING! All changes made in this file will be lost!\n"; out << "\n"; out << "\n"; - out << "from qt import QImage, QMimeSourceFactory"; + out << "from qt import TQImage, TQMimeSourceFactory"; #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION out << ", qUncompress"; #endif @@ -144,11 +144,11 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image out << "\n"; - QPtrList<EmbedImage> list_image; + TQPtrList<EmbedImage> list_image; list_image.setAutoDelete( TRUE ); int image_count = 0; for ( it = images.begin(); it != images.end(); ++it ) { - QImage img; + TQImage img; if ( !img.load( *it ) ) { fprintf( stderr, "pyuic: cannot load image file %s\n", (*it).latin1() ); continue; @@ -161,14 +161,14 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image e->colorTable = new QRgb[e->numColors]; e->alpha = img.hasAlphaBuffer(); memcpy(e->colorTable, img.colorTable(), e->numColors*sizeof(QRgb)); - QFileInfo fi( *it ); + TQFileInfo fi( *it ); e->name = fi.fileName(); - e->cname = QString("image_%1").arg( image_count++); + e->cname = TQString("image_%1").arg( image_count++); list_image.append( e ); out << "# " << *it << "\n"; - QString s; + TQString s; if ( e->depth == 1 ) - img = img.convertBitOrder(QImage::BigEndian); + img = img.convertBitOrder(TQImage::BigEndian); out << s.sprintf( "%s_data =", (const char *)e->cname ); #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION @@ -230,7 +230,7 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image // Keep the data object alive until we have a deep copy of the image. out << indent << "data = qUncompress(data).data()\n"; #endif - out << indent << "img = QImage(data,w,h,depth,colTab,nrCol,QImage.BigEndian).copy()\n"; + out << indent << "img = TQImage(data,w,h,depth,colTab,nrCol,TQImage.BigEndian).copy()\n"; out << "\n"; out << indent << "if alpha:\n"; ++indent; @@ -241,21 +241,21 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image --indent; --indent; out << endl; - out << indent << "return QImage()\n"; + out << indent << "return TQImage()\n"; --indent; out << "\n"; out << "\n"; - out << indent << "class MimeSourceFactory_" << cProject << "(QMimeSourceFactory):\n"; + out << indent << "class MimeSourceFactory_" << cProject << "(TQMimeSourceFactory):\n"; ++indent; out << indent << "def __init__(self):\n"; ++indent; - out << indent << "QMimeSourceFactory.__init__(self)\n"; + out << indent << "TQMimeSourceFactory.__init__(self)\n"; out << "\n"; --indent; out << indent << "def data(self,abs_name):\n"; ++indent; - out << indent << "d = QMimeSourceFactory.data(self,abs_name)\n"; + out << indent << "d = TQMimeSourceFactory.data(self,abs_name)\n"; out << indent << "if d or abs_name.isNull():\n"; ++indent; out << indent << "return d\n"; @@ -267,7 +267,7 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image out << indent << "self.setImage(abs_name,img)\n"; --indent; out << "\n"; - out << indent << "return QMimeSourceFactory.data(self,abs_name)\n"; + out << indent << "return TQMimeSourceFactory.data(self,abs_name)\n"; --indent; --indent; out << "\n"; @@ -283,7 +283,7 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image out << indent << "if factory is None:\n"; ++indent; out << indent << "factory = MimeSourceFactory_" << cProject << "()\n"; - out << indent << "QMimeSourceFactory.defaultFactory().addFactory(factory)\n"; + out << indent << "TQMimeSourceFactory.defaultFactory().addFactory(factory)\n"; --indent; --indent; out << "\n"; @@ -295,7 +295,7 @@ void Uic::embed( QTextStream& out, const char* project, const QStringList& image out << "\n"; out << indent << "if factory is not None:\n"; ++indent; - out << indent << "QMimeSourceFactory.defaultFactory().removeFactory(factory)\n"; + out << indent << "TQMimeSourceFactory.defaultFactory().removeFactory(factory)\n"; out << indent << "factory = None\n"; --indent; --indent; diff --git a/python/pyqt/pyuic3/form.cpp b/python/pyqt/pyuic3/form.cpp index aedb4ac2..ca68db39 100644 --- a/python/pyqt/pyuic3/form.cpp +++ b/python/pyqt/pyuic3/form.cpp @@ -23,10 +23,10 @@ #include "parser.h" #include "widgetdatabase.h" #include "domtool.h" -#include <qstringlist.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qregexp.h> +#include <tqstringlist.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqregexp.h> #define NO_STATIC_COLORS #include <globaldefs.h> @@ -34,7 +34,7 @@ #include <zlib.h> #endif -static QByteArray unzipXPM( QString data, ulong& length ) +static TQByteArray unzipXPM( TQString data, ulong& length ) { #if QT_VERSION >= 0x030100 const int lengthOffset = 4; @@ -61,7 +61,7 @@ static QByteArray unzipXPM( QString data, ulong& length ) ba[1] = ( length & 0x00ff0000 ) >> 16; ba[2] = ( length & 0x0000ff00 ) >> 8; ba[3] = ( length & 0x000000ff ); - QByteArray baunzip = qUncompress( ba, baSize ); + TQByteArray baunzip = qUncompress( ba, baSize ); delete[] ba; return baunzip; #else @@ -94,7 +94,7 @@ static QByteArray unzipXPM( QString data, ulong& length ) // crashes in some cases of slightly corrupt UIC files. if ( length < data.length() * 5 ) length = data.length() * 5; - QByteArray baunzip( length ); + TQByteArray baunzip( length ); ::uncompress( (uchar*) baunzip.data(), &length, ba, data.length()/2 ); delete[] ba; return baunzip; @@ -108,27 +108,27 @@ static QByteArray unzipXPM( QString data, ulong& length ) \sa createFormDecl(), createObjectImpl() */ -void Uic::createFormImpl( const QDomElement &e ) +void Uic::createFormImpl( const TQDomElement &e ) { - QDomElement n; - QDomNodeList nl; + TQDomElement n; + TQDomNodeList nl; int i; - QString objClass = getClassName( e ); + TQString objClass = getClassName( e ); if ( objClass.isEmpty() ) return; - QString objName = getObjectName( e ); + TQString objName = getObjectName( e ); // generate local and local includes required - QStringList globalIncludes; - QStringList::Iterator it; - QStringList sqlClasses; - QStringList axwidgets, databrowsers; + TQStringList globalIncludes; + TQStringList::Iterator it; + TQStringList sqlClasses; + TQStringList axwidgets, databrowsers; - QMap<QString, CustomInclude> customWidgetIncludes; - QMap<QString, QString> functionImpls; + TQMap<TQString, CustomInclude> customWidgetIncludes; + TQMap<TQString, TQString> functionImpls; // find additional slots and functions - QStringList extraSlots; - QStringList extraSlotTypes; + TQStringList extraSlots; + TQStringList extraSlotTypes; nl = e.parentNode().toElement().elementsByTagName( "slot" ); for ( i = 0; i < (int) nl.length(); i++ ) { n = nl.item(i).toElement(); @@ -137,7 +137,7 @@ void Uic::createFormImpl( const QDomElement &e ) continue; if ( n.attribute( "language", "C++" ) != "C++" ) continue; - QString slotName = n.firstChild().toText().data().stripWhiteSpace(); + TQString slotName = n.firstChild().toText().data().stripWhiteSpace(); if ( slotName.endsWith( ";" ) ) slotName = slotName.left( slotName.length() - 1 ); @@ -147,9 +147,9 @@ void Uic::createFormImpl( const QDomElement &e ) for ( n = e; !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "functions" ) { // compatibility - for ( QDomElement n2 = n.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { + for ( TQDomElement n2 = n.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { if ( n2.tagName() == "function" ) { - QString fname = n2.attribute( "name" ); + TQString fname = n2.attribute( "name" ); fname = Parser::cleanArgs( fname ); functionImpls.insert( fname, n2.firstChild().toText().data() ); } @@ -160,11 +160,11 @@ void Uic::createFormImpl( const QDomElement &e ) // additional includes (local or global ) and forward declaractions nl = e.parentNode().toElement().elementsByTagName( "include" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QDomElement n2 = nl.item(i).toElement(); + TQDomElement n2 = nl.item(i).toElement(); - QString s = n2.firstChild().toText().data(); + TQString s = n2.firstChild().toText().data(); if ( n2.attribute( "location" ) != "local" ) { - if ( s.right( 5 ) == ".ui.h" && !QFile::exists( s ) ) + if ( s.right( 5 ) == ".ui.h" && !TQFile::exists( s ) ) continue; if ( n2.attribute( "impldecl", "in implementation" ) != "in implementation" ) continue; @@ -173,32 +173,32 @@ void Uic::createFormImpl( const QDomElement &e ) } // do the local includes afterwards, since global includes have priority on clashes - QFileInfo fi(fileName); + TQFileInfo fi(fileName); for ( i = 0; i < (int) nl.length(); i++ ) { - QDomElement n2 = nl.item(i).toElement(); - QString s = n2.firstChild().toText().data(); + TQDomElement n2 = nl.item(i).toElement(); + TQString s = n2.firstChild().toText().data(); if ( n2.attribute( "location" ) == "local" &&!globalIncludes.contains( s ) ) { if ( s.right( 5 ) != ".ui.h" ) continue; - if ( !QFile::exists( s ) ) + if ( !TQFile::exists( s ) ) { s = fi.dirPath() + "/" + s; - if ( !QFile::exists( s ) ) + if ( !TQFile::exists( s ) ) continue; } - if ( QFile::exists( s ) ) + if ( TQFile::exists( s ) ) { - QFile f(s); + TQFile f(s); f.open(IO_ReadOnly); - QTextStream headerStream(&f); - QString line; - QString functionText; - QString functionName; - QRegExp rx("void .*::(.*\\(.*\\))"); + TQTextStream headerStream(&f); + TQString line; + TQString functionText; + TQString functionName; + TQRegExp rx("void .*::(.*\\(.*\\))"); int pos, inFunction = 0; while (line = headerStream.readLine()) @@ -226,8 +226,8 @@ void Uic::createFormImpl( const QDomElement &e ) // additional custom widget headers nl = e.parentNode().toElement().elementsByTagName( "header" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QDomElement n2 = nl.item(i).toElement(); - QString s = n2.firstChild().toText().data(); + TQDomElement n2 = nl.item(i).toElement(); + TQString s = n2.firstChild().toText().data(); if ( n2.attribute( "location" ) != "local" ) globalIncludes += s; } @@ -236,29 +236,29 @@ void Uic::createFormImpl( const QDomElement &e ) for ( it = tags.begin(); it != tags.end(); ++it ) { nl = e.parentNode().toElement().elementsByTagName( *it ); for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget - QString name = getClassName( nl.item(i).toElement() ); + TQString name = getClassName( nl.item(i).toElement() ); if ( name == "Spacer" ) { - globalIncludes += "qlayout.h"; - globalIncludes += "qapplication.h"; + globalIncludes += "tqlayout.h"; + globalIncludes += "tqapplication.h"; continue; } if ( name.mid( 1 ) == "ListView" ) - globalIncludes += "qheader.h"; + globalIncludes += "tqheader.h"; else if ( name == "QAxWidget" ) axwidgets += getObjectName(nl.item(i).toElement()); - else if ( name == "QDataBrowser" ) + else if ( name == "TQDataBrowser" ) databrowsers += getObjectName(nl.item(i).toElement()); if ( name != objClass ) { int wid = WidgetDatabase::idFromClassName( name ); - QMap<QString, CustomInclude>::Iterator it = customWidgetIncludes.find( name ); + TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.find( name ); if ( it == customWidgetIncludes.end() ) globalIncludes += WidgetDatabase::includeFile( wid ); } } } - if (globalIncludes.findIndex("qtable.h") >= 0) - out << indent << "from qttable import QTable" << endl; + if (globalIncludes.findIndex("tqtable.h") >= 0) + out << indent << "from qttable import TQTable" << endl; if (!axwidgets.empty()) out << indent << "from qtaxcontainer import QAxWidget" << endl; @@ -269,9 +269,9 @@ void Uic::createFormImpl( const QDomElement &e ) registerDatabases( e ); dbConnections = unique( dbConnections ); if ( dbConnections.count() ) - sqlClasses += "QSqlDatabase"; + sqlClasses += "TQSqlDatabase"; if ( dbCursors.count() ) - sqlClasses += "QSqlCursor"; + sqlClasses += "TQSqlCursor"; bool dbForm = FALSE; if ( dbForms[ "(default)" ].count() ) dbForm = TRUE; @@ -285,21 +285,21 @@ void Uic::createFormImpl( const QDomElement &e ) } } if ( dbForm || subDbForms ) { - sqlClasses += "QSqlForm"; - sqlClasses += "QSqlRecord"; + sqlClasses += "TQSqlForm"; + sqlClasses += "TQSqlRecord"; } - if (globalIncludes.findIndex("qdatatable.h") >= 0) - sqlClasses += "QDataTable"; + if (globalIncludes.findIndex("tqdatatable.h") >= 0) + sqlClasses += "TQDataTable"; if (globalIncludes.findIndex("qtableview.h") >= 0) sqlClasses += "QTableView"; - if (globalIncludes.findIndex("qdatabrowser.h") >= 0) - sqlClasses += "QDataBrowser"; + if (globalIncludes.findIndex("tqdatabrowser.h") >= 0) + sqlClasses += "TQDataBrowser"; - if (globalIncludes.findIndex("qdataview.h") >= 0) - sqlClasses += "QDataView"; + if (globalIncludes.findIndex("tqdataview.h") >= 0) + sqlClasses += "TQDataView"; if ( !sqlClasses.empty() ) { out << indent << "from qtsql import"; @@ -320,12 +320,12 @@ void Uic::createFormImpl( const QDomElement &e ) out << endl; // find out what images are required - QStringList requiredImages; + TQStringList requiredImages; static const char *imgTags[] = { "pixmap", "iconset", 0 }; for ( i = 0; imgTags[i] != 0; i++ ) { nl = e.parentNode().toElement().elementsByTagName( imgTags[i] ); for ( int j = 0; j < (int) nl.length(); j++ ) { - QDomNode nn = nl.item(j); + TQDomNode nn = nl.item(j); while ( nn.parentNode() != e.parentNode() ) nn = nn.parentNode(); if ( nn.nodeName() != "customwidgets" ) @@ -336,26 +336,26 @@ void Uic::createFormImpl( const QDomElement &e ) // register the object and unify its name objName = registerObject( objName ); - QStringList images; - QStringList xpmImages; + TQStringList images; + TQStringList xpmImages; if ( pixmapLoaderFunction.isEmpty() && !externPixmaps ) { // create images for ( n = e; !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "images" ) { nl = n.elementsByTagName( "image" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QString img = registerObject( nl.item(i).toElement().attribute( "name" ) ); + TQString img = registerObject( nl.item(i).toElement().attribute( "name" ) ); if ( !requiredImages.contains( img ) ) continue; - QDomElement tmp = nl.item(i).firstChild().toElement(); + TQDomElement tmp = nl.item(i).firstChild().toElement(); if ( tmp.tagName() != "data" ) continue; - QString format = tmp.attribute("format", "PNG" ); - QString data = tmp.firstChild().toText().data(); + TQString format = tmp.attribute("format", "PNG" ); + TQString data = tmp.firstChild().toText().data(); if ( format == "XPM.GZ" ) { xpmImages += img; ulong length = tmp.attribute("length").toULong(); - QByteArray baunzip = unzipXPM( data, length ); + TQByteArray baunzip = unzipXPM( data, length ); length = baunzip.size(); // shouldn't we test the initial `length' against the // resulting `length' to catch corrupt UIC files? @@ -383,11 +383,11 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent << "\""; int a ; for ( a = 0; a < (int) (data.length()/2)-1; a++ ) { - out << "\\x" << QString(data[2*a]) << QString(data[2*a+1]); + out << "\\x" << TQString(data[2*a]) << TQString(data[2*a+1]); if ( a % 12 == 11 ) out << "\" \\" << endl << indent << "\""; } - out << "\\x" << QString(data[2*a]) << QString(data[2*a+1]) << "\"" << endl; + out << "\\x" << TQString(data[2*a]) << TQString(data[2*a+1]) << "\"" << endl; --indent; } } @@ -396,16 +396,16 @@ void Uic::createFormImpl( const QDomElement &e ) out << endl; } else if ( externPixmaps ) { #if QT_VERSION >= 0x030100 - pixmapLoaderFunction = "QPixmap.fromMimeSource"; + pixmapLoaderFunction = "TQPixmap.fromMimeSource"; #else out << indent << "def uic_load_pixmap_" << objName << "(name):" << endl; ++indent; - out << indent << "pix = QPixmap()" << endl; - out << indent << "m = QMimeSourceFactory.defaultFactory().data(name)" << endl; + out << indent << "pix = TQPixmap()" << endl; + out << indent << "m = TQMimeSourceFactory.defaultFactory().data(name)" << endl; out << endl; out << indent << "if m:" << endl; ++indent; - out << indent << "QImageDrag.decode(m,pix)" << endl; + out << indent << "TQImageDrag.decode(m,pix)" << endl; --indent; out << endl; out << indent << "return pix" << endl; @@ -422,15 +422,15 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent << "class " << nameOfClass << "(" << objClass << "):" << endl; ++indent; - if ( objClass == "QDialog" || objClass == "QWizard" ) { + if ( objClass == "TQDialog" || objClass == "TQWizard" ) { out << indent << "def __init__(self,parent = None,name = None,modal = 0,fl = 0):" << endl; ++indent; out << indent << objClass << ".__init__(self,parent,name,modal,fl)" << endl; - } else if ( objClass == "QWidget" ) { + } else if ( objClass == "TQWidget" ) { out << indent << "def __init__(self,parent = None,name = None,fl = 0):" << endl; ++indent; out << indent << objClass << ".__init__(self,parent,name,fl)" << endl; - } else if ( objClass == "QMainWindow" ) { + } else if ( objClass == "TQMainWindow" ) { out << indent << "def __init__(self,parent = None,name = None,fl = 0):" << endl; ++indent; out << indent << objClass << ".__init__(self,parent,name,fl)" << endl; @@ -446,37 +446,37 @@ void Uic::createFormImpl( const QDomElement &e ) // create pixmaps for all images if ( !images.isEmpty() ) { - QStringList::Iterator it; + TQStringList::Iterator it; for ( it = images.begin(); it != images.end(); ++it ) { - out << indent << "self." << (*it) << " = QPixmap()" << endl; + out << indent << "self." << (*it) << " = TQPixmap()" << endl; out << indent << "self." << (*it) << ".loadFromData(" << (*it) << "_data,\"PNG\")" << endl; } } // create pixmaps for all images if ( !xpmImages.isEmpty() ) { for ( it = xpmImages.begin(); it != xpmImages.end(); ++it ) { - out << indent << "self." << (*it) << " = QPixmap(" << (*it) << "_data)" << endl; + out << indent << "self." << (*it) << " = TQPixmap(" << (*it) << "_data)" << endl; } out << endl; } // set the properties - QSize geometry( 0, 0 ); + TQSize geometry( 0, 0 ); for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" ) { bool stdset = stdsetdef; if ( n.hasAttribute( "stdset" ) ) stdset = toBool( n.attribute( "stdset" ) ); - QString prop = n.attribute("name"); - QDomElement n2 = n.firstChild().toElement(); - QString value = setObjectProperty( objClass, QString::null, prop, n2, stdset ); + TQString prop = n.attribute("name"); + TQDomElement n2 = n.firstChild().toElement(); + TQString value = setObjectProperty( objClass, TQString::null, prop, n2, stdset ); if ( value.isEmpty() ) continue; if ( prop == "geometry" && n2.tagName() == "rect") { - QDomElement n3 = n2.firstChild().toElement(); + TQDomElement n3 = n2.firstChild().toElement(); while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) geometry.setWidth( n3.firstChild().toText().data().toInt() ); @@ -485,11 +485,11 @@ void Uic::createFormImpl( const QDomElement &e ) n3 = n3.nextSibling().toElement(); } } else { - QString call; + TQString call; if ( stdset ) call = "self." + mkStdSet( prop ) + "(" + value + ")"; else - call = "self.setProperty(\"" + prop + "\",QVariant(" + value + "))"; + call = "self.setProperty(\"" + prop + "\",TQVariant(" + value + "))"; if ( n2.tagName() == "string" ) { trout << trindent << call << endl; @@ -510,15 +510,15 @@ void Uic::createFormImpl( const QDomElement &e ) // create all children, some forms have special requirements - if ( objClass == "QWizard" ) { + if ( objClass == "TQWizard" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) { - QString page = createObjectImpl( n, objClass, "self" ); - QString comment; - QString label = DomTool::readAttribute( n, "title", "", comment ).toString(); - out << indent << "self.addPage(" << page << ",QString(\"\"))" << endl; + TQString page = createObjectImpl( n, objClass, "self" ); + TQString comment; + TQString label = DomTool::readAttribute( n, "title", "", comment ).toString(); + out << indent << "self.addPage(" << page << ",TQString(\"\"))" << endl; trout << trindent << "self.setTitle(" << page << ","<< trcall( label, comment ) << ")" << endl; - QVariant def( FALSE, 0 ); + TQVariant def( FALSE, 0 ); if ( DomTool::hasAttribute( n, "backEnabled" ) ) out << indent << "self.setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ")" << endl; if ( DomTool::hasAttribute( n, "nextEnabled" ) ) @@ -544,20 +544,20 @@ void Uic::createFormImpl( const QDomElement &e ) out << endl; for ( it = dbConnections.begin(); it != dbConnections.end(); ++it ) { if ( !(*it).isEmpty() && (*it) != "(default)") { - out << indent << "self." << (*it) << "Connection = QSqlDatabase.database(\"" <<(*it) << "\")" << endl; + out << indent << "self." << (*it) << "Connection = TQSqlDatabase.database(\"" <<(*it) << "\")" << endl; } } nl = e.parentNode().toElement().elementsByTagName( "widget" ); for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget n = nl.item(i).toElement(); - QString s = getClassName( n ); - if ( (dbForm || subDbForms) && (s == "QDataBrowser" || s == "QDataView") ) { - QString objName = getObjectName( n ); - QString tab = getDatabaseInfo( n, "table" ); - QString con = getDatabaseInfo( n, "connection" ); - out << indent << objName << "Form = QSqlForm(self,\"" << objName << "Form\")" << endl; - QDomElement n2; + TQString s = getClassName( n ); + if ( (dbForm || subDbForms) && (s == "TQDataBrowser" || s == "TQDataView") ) { + TQString objName = getObjectName( n ); + TQString tab = getDatabaseInfo( n, "table" ); + TQString con = getDatabaseInfo( n, "connection" ); + out << indent << objName << "Form = TQSqlForm(self,\"" << objName << "Form\")" << endl; + TQDomElement n2; for ( n2 = n.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) createFormImpl( n2, objName, con, tab ); out << indent << "self." << objName << ".setForm(" << objName << "Form)" << endl; @@ -605,7 +605,7 @@ void Uic::createFormImpl( const QDomElement &e ) // take minimumSizeHint() into account, for height-for-width widgets if ( !geometry.isNull() ) { - out << indent << "self.resize(QSize(" << geometry.width() << "," + out << indent << "self.resize(TQSize(" << geometry.width() << "," << geometry.height() <<").expandedTo(self.minimumSizeHint()))" << endl; out << indent << "self.clearWState(Qt.WState_Polished)" << endl; } @@ -616,8 +616,8 @@ void Uic::createFormImpl( const QDomElement &e ) out << endl; nl = n.elementsByTagName( "connection" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QString sender, receiver, signal, slot; - for ( QDomElement n2 = nl.item(i).firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { + TQString sender, receiver, signal, slot; + for ( TQDomElement n2 = nl.item(i).firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { if ( n2.tagName() == "sender" ) sender = n2.firstChild().toText().data(); else if ( n2.tagName() == "receiver" ) @@ -656,17 +656,17 @@ void Uic::createFormImpl( const QDomElement &e ) receiver = "self." + receiver; out << indent << "self.connect(" << sender - << ",SIGNAL(\"" << signal << "\")," << receiver; + << ",TQT_SIGNAL(\"" << signal << "\")," << receiver; - // Normally we never use the SLOT() macro in case the + // Normally we never use the TQT_SLOT() macro in case the // connection is to a method of a Python custom widget. The // exception is if the receiver is a QAxWidget where it must be // used because the slots are dynamic. if (isaxwidget) - out << ",SLOT(\"" << slot << "\")"; + out << ",TQT_SLOT(\"" << slot << "\")"; else { - QString mname = slot.left(slot.find('(')); + TQString mname = slot.left(slot.find('(')); // Rename slots that have different names in PyQt. if (isdatabrowser && mname == "del") @@ -680,11 +680,11 @@ void Uic::createFormImpl( const QDomElement &e ) } else if ( n.tagName() == "tabstops" ) { // setup tab order out << endl; - QString lastName; - QDomElement n2 = n.firstChild().toElement(); + TQString lastName; + TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "tabstop" ) { - QString name = n2.firstChild().toText().data(); + TQString name = n2.firstChild().toText().data(); name = registeredName( name ); if ( !lastName.isEmpty() ) out << indent << "self.setTabOrder(self." << lastName << ",self." << name << ")" << endl; @@ -697,7 +697,7 @@ void Uic::createFormImpl( const QDomElement &e ) // buddies bool firstBuddy = TRUE; - for ( QValueList<Buddy>::Iterator buddy = buddies.begin(); buddy != buddies.end(); ++buddy ) { + for ( TQValueList<Buddy>::Iterator buddy = buddies.begin(); buddy != buddies.end(); ++buddy ) { if ( isObjectRegistered( (*buddy).buddy ) ) { if ( firstBuddy ) { out << endl; @@ -731,13 +731,13 @@ void Uic::createFormImpl( const QDomElement &e ) for ( i = 0; i < (int) nl.length(); i++ ) { if ( !DomTool::propertiesOfType( nl.item(i).toElement() , "font" ).isEmpty() ) needFontEventHandler = TRUE; - QString s = getClassName( nl.item(i).toElement() ); - if ( s == "QDataTable" || s == "QDataBrowser" ) { + TQString s = getClassName( nl.item(i).toElement() ); + if ( s == "TQDataTable" || s == "TQDataBrowser" ) { if ( !isFrameworkCodeGenerated( nl.item(i).toElement() ) ) continue; - if ( s == "QDataTable" ) + if ( s == "TQDataTable" ) needSqlTableEventHandler = TRUE; - if ( s == "QDataBrowser" ) + if ( s == "TQDataBrowser" ) needSqlDataBrowserEventHandler = TRUE; } if ( needFontEventHandler && needSqlTableEventHandler && needSqlDataBrowserEventHandler ) @@ -749,15 +749,15 @@ void Uic::createFormImpl( const QDomElement &e ) out << " * Main event handler. Reimplemented to handle" << endl; out << " * application font changes"; out << " */" << endl; - out << "bool " << nameOfClass << "::event( QEvent* ev )" << endl; + out << "bool " << nameOfClass << "::event( TQEvent* ev )" << endl; out << "{" << endl; out << " bool ret = " << objClass << "::event( ev ); " << endl; if ( needFontEventHandler ) { ++indent; - out << " if ( ev->type() == QEvent::ApplicationFontChange ) {" << endl; + out << " if ( ev->type() == TQEvent::ApplicationFontChange ) {" << endl; for ( i = 0; i < (int) nl.length(); i++ ) { n = nl.item(i).toElement(); - QStringList list = DomTool::propertiesOfType( n, "font" ); + TQStringList list = DomTool::propertiesOfType( n, "font" ); for ( it = list.begin(); it != list.end(); ++it ) createExclusiveProperty( n, *it ); } @@ -779,12 +779,12 @@ void Uic::createFormImpl( const QDomElement &e ) ++indent; if ( needSqlTableEventHandler ) { for ( i = 0; i < (int) nl.length(); i++ ) { - QString s = getClassName( nl.item(i).toElement() ); - if ( s == "QDataTable" ) { + TQString s = getClassName( nl.item(i).toElement() ); + if ( s == "TQDataTable" ) { n = nl.item(i).toElement(); - QString c = getObjectName( n ); - QString conn = getDatabaseInfo( n, "connection" ); - QString tab = getDatabaseInfo( n, "table" ); + TQString c = getObjectName( n ); + TQString conn = getDatabaseInfo( n, "connection" ); + TQString tab = getDatabaseInfo( n, "table" ); if ( !( conn.isEmpty() || tab.isEmpty() || !isFrameworkCodeGenerated( nl.item(i).toElement() ) ) ) { out << indent << "if self." << c << ":" << endl; ++indent; @@ -793,19 +793,19 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent << "if not cursor:" << endl; ++indent; if ( conn == "(default)" ) - out << indent << "cursor = QSqlCursor(\"" << tab << "\")" << endl; + out << indent << "cursor = TQSqlCursor(\"" << tab << "\")" << endl; else - out << indent << "cursor = QSqlCursor(\"" << tab << "\",1,self." << conn << "Connection)" << endl; + out << indent << "cursor = TQSqlCursor(\"" << tab << "\",1,self." << conn << "Connection)" << endl; out << indent << "if self." << c << ".isReadOnly():" << endl; ++indent; - out << indent << "cursor.setMode(QSqlCursor.ReadOnly)" << endl; + out << indent << "cursor.setMode(TQSqlCursor.ReadOnly)" << endl; --indent; out << indent << "self." << c << ".setSqlCursor(cursor,0,1)" << endl; --indent; out << endl; out << indent << "if not cursor.isActive():" << endl; ++indent; - out << indent << "self." << c << ".refresh(QDataTable.RefreshAll)" << endl; + out << indent << "self." << c << ".refresh(TQDataTable.RefreshAll)" << endl; --indent; --indent; } @@ -815,12 +815,12 @@ void Uic::createFormImpl( const QDomElement &e ) if ( needSqlDataBrowserEventHandler ) { nl = e.elementsByTagName( "widget" ); for ( i = 0; i < (int) nl.length(); i++ ) { - QString s = getClassName( nl.item(i).toElement() ); - if ( s == "QDataBrowser" ) { - QString obj = getObjectName( nl.item(i).toElement() ); - QString tab = getDatabaseInfo( nl.item(i).toElement(), + TQString s = getClassName( nl.item(i).toElement() ); + if ( s == "TQDataBrowser" ) { + TQString obj = getObjectName( nl.item(i).toElement() ); + TQString tab = getDatabaseInfo( nl.item(i).toElement(), "table" ); - QString conn = getDatabaseInfo( nl.item(i).toElement(), + TQString conn = getDatabaseInfo( nl.item(i).toElement(), "connection" ); if ( !(tab.isEmpty() || !isFrameworkCodeGenerated( nl.item(i).toElement() ) ) ) { out << indent << "if self." << obj << ":" << endl; @@ -828,9 +828,9 @@ void Uic::createFormImpl( const QDomElement &e ) out << indent << "if not self." << obj << ".sqlCursor():" << endl; ++indent; if ( conn == "(default)" ) - out << indent << "cursor = QSqlCursor(\"" << tab << "\")" << endl; + out << indent << "cursor = TQSqlCursor(\"" << tab << "\")" << endl; else - out << indent << "cursor = QSqlCursor(\"" << tab << "\",1,self." << conn << "Connection)" << endl; + out << indent << "cursor = TQSqlCursor(\"" << tab << "\",1,self." << conn << "Connection)" << endl; out << indent << "self." << obj << ".setSqlCursor(cursor,1)" << endl; out << indent << "self." << obj << ".refresh()" << endl; out << indent << "self." << obj << ".first()" << endl; @@ -853,22 +853,22 @@ void Uic::createFormImpl( const QDomElement &e ) // create stubs for additional slots if necessary if ( !extraSlots.isEmpty() && writeFunctImpl ) { - QStringList::ConstIterator cit; + TQStringList::ConstIterator cit; for ( cit = extraSlots.begin(); cit != extraSlots.end(); ++cit ) { pySlot(cit); bool createWarning = TRUE; - QString fname = Parser::cleanArgs( *cit ); - QMap<QString, QString>::Iterator fit = functionImpls.find( fname ); + TQString fname = Parser::cleanArgs( *cit ); + TQMap<TQString, TQString>::Iterator fit = functionImpls.find( fname ); if ( fit != functionImpls.end() ) { int begin = (*fit).find( "{" ); - QString body = (*fit).mid( begin + 1, (*fit).findRev( "}" ) - begin - 1 ); + TQString body = (*fit).mid( begin + 1, (*fit).findRev( "}" ) - begin - 1 ); createWarning = body.simplifyWhiteSpace().isEmpty(); if ( !createWarning ) { ++indent; - QString formatted_body = body.replace(QRegExp("\n"), QString("\n") + QString(indent)); + TQString formatted_body = body.replace(TQRegExp("\n"), TQString("\n") + TQString(indent)); out << formatted_body << endl; --indent; } @@ -895,17 +895,17 @@ void Uic::createFormImpl( const QDomElement &e ) Traverses recursively over all children. */ -void Uic::createFormImpl( const QDomElement& e, const QString& form, const QString& connection, const QString& table ) +void Uic::createFormImpl( const TQDomElement& e, const TQString& form, const TQString& connection, const TQString& table ) { if ( e.tagName() == "widget" && - e.attribute( "class" ) != "QDataTable" ) { - QString field = getDatabaseInfo( e, "field" ); + e.attribute( "class" ) != "TQDataTable" ) { + TQString field = getDatabaseInfo( e, "field" ); if ( !field.isEmpty() ) { if ( isWidgetInTable( e, connection, table ) ) out << indent << form << "Form.insert(self." << getObjectName( e ) << "," << fixString( field ) << ")" << endl; } } - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { createFormImpl( n, form, connection, table ); } @@ -914,7 +914,7 @@ void Uic::createFormImpl( const QDomElement& e, const QString& form, const QStri // Generate a Python slot definition. -void Uic::pySlot(QStringList::ConstIterator &it) +void Uic::pySlot(TQStringList::ConstIterator &it) { out << endl; @@ -925,7 +925,7 @@ void Uic::pySlot(QStringList::ConstIterator &it) // remove the types - too complicated for the moment, so we just count them // and give them names based on their position. - QString args = (*it).mid(astart + 1,(*it).find(')') - astart - 1).stripWhiteSpace(); + TQString args = (*it).mid(astart + 1,(*it).find(')') - astart - 1).stripWhiteSpace(); if (!args.isEmpty()) { int nrargs = args.contains(',') + 1; diff --git a/python/pyqt/pyuic3/globaldefs.h b/python/pyqt/pyuic3/globaldefs.h index 4ae0cd83..87fafbef 100644 --- a/python/pyqt/pyuic3/globaldefs.h +++ b/python/pyqt/pyuic3/globaldefs.h @@ -21,16 +21,16 @@ #ifndef GLOBALDEFS_H #define GLOBALDEFS_H -#include <qcolor.h> -#include <qapplication.h> +#include <tqcolor.h> +#include <tqapplication.h> #define BOXLAYOUT_DEFAULT_MARGIN 11 #define BOXLAYOUT_DEFAULT_SPACING 6 #ifndef NO_STATIC_COLORS -static QColor *backColor1 = 0; -static QColor *backColor2 = 0; -static QColor *selectedBack = 0; +static TQColor *backColor1 = 0; +static TQColor *backColor2 = 0; +static TQColor *selectedBack = 0; static void init_colors() { @@ -38,17 +38,17 @@ static void init_colors() return; #if 0 // a calculated alternative for backColor1 - QColorGroup myCg = qApp->palette().active(); + TQColorGroup myCg = qApp->palette().active(); int h1, s1, v1; int h2, s2, v2; - myCg.color( QColorGroup::Base ).hsv( &h1, &s1, &v1 ); - myCg.color( QColorGroup::Background ).hsv( &h2, &s2, &v2 ); - QColor c( h1, s1, ( v1 + v2 ) / 2, QColor::Hsv ); + myCg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 ); + myCg.color( TQColorGroup::Background ).hsv( &h2, &s2, &v2 ); + TQColor c( h1, s1, ( v1 + v2 ) / 2, TQColor::Hsv ); #endif - backColor1 = new QColor( 250, 248, 235 ); - backColor2 = new QColor( 255, 255, 255 ); - selectedBack = new QColor( 230, 230, 230 ); + backColor1 = new TQColor( 250, 248, 235 ); + backColor2 = new TQColor( 255, 255, 255 ); + selectedBack = new TQColor( 230, 230, 230 ); } #endif diff --git a/python/pyqt/pyuic3/main.cpp b/python/pyqt/pyuic3/main.cpp index 265a536c..fa93b9e3 100644 --- a/python/pyqt/pyuic3/main.cpp +++ b/python/pyqt/pyuic3/main.cpp @@ -23,13 +23,13 @@ #include "parser.h" #include "widgetdatabase.h" #include "domtool.h" -#include <qapplication.h> -#include <qfile.h> -#include <qstringlist.h> -#include <qdatetime.h> +#include <tqapplication.h> +#include <tqfile.h> +#include <tqstringlist.h> +#include <tqdatetime.h> #define NO_STATIC_COLORS #include <globaldefs.h> -#include <qregexp.h> +#include <tqregexp.h> #include <stdio.h> #include <stdlib.h> @@ -39,20 +39,20 @@ int main( int argc, char * argv[] ) bool testCode = FALSE, execCode = FALSE; bool subcl = FALSE; bool imagecollection = FALSE; - QStringList images; + TQStringList images; const char *error = 0; const char* fileName = 0; - QCString outputFile; + TQCString outputFile; const char* projectName = 0; const char* trmacro = 0; bool fix = FALSE; - QApplication app(argc, argv, FALSE); - QString className, uicClass; + TQApplication app(argc, argv, FALSE); + TQString className, uicClass; for ( int n = 1; n < argc && error == 0; n++ ) { - QCString arg = argv[n]; + TQCString arg = argv[n]; if ( arg[0] == '-' ) { // option - QCString opt = &arg[1]; + TQCString opt = &arg[1]; if ( opt[0] == 'o' ) { // output redirection if ( opt[1] == '\0' ) { if ( !(n < argc-1) ) { @@ -107,7 +107,7 @@ int main( int argc, char * argv[] ) error = "Missing Python indent"; break; } - tabstop = QCString(argv[++n]).toUInt(&ok); + tabstop = TQCString(argv[++n]).toUInt(&ok); } else tabstop = opt.mid(1).toUInt(&ok); @@ -150,7 +150,7 @@ int main( int argc, char * argv[] ) "Options:\n" "\t-o file\t\tWrite output to file rather than stdout\n" "\t-p indent\tSet the Python indent in spaces (0 to use a tab)\n" - "\t-tr func\tUse func() rather than QApplication.translate() for i18n\n" + "\t-tr func\tUse func() rather than TQApplication.translate() for i18n\n" "\t-x\t\tGenerate extra code to test and display the class\n" "\t-test\t\tGenerate extra code to test but not display the class\n" "\t-version\tDisplay version of pyuic\n" @@ -161,7 +161,7 @@ int main( int argc, char * argv[] ) Uic::setIndent(indent); - QFile fileOut; + TQFile fileOut; if ( !outputFile.isEmpty() ) { fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) @@ -169,30 +169,30 @@ int main( int argc, char * argv[] ) } else { fileOut.open( IO_WriteOnly, stdout ); } - QTextStream out( &fileOut ); + TQTextStream out( &fileOut ); if ( imagecollection ) { - out.setEncoding( QTextStream::Latin1 ); + out.setEncoding( TQTextStream::Latin1 ); out << "# -*- coding: latin-1 -*-\n\n"; Uic::embed( out, projectName, images ); return 0; } - out.setEncoding( QTextStream::UnicodeUTF8 ); - QFile file( fileName ); + out.setEncoding( TQTextStream::UnicodeUTF8 ); + TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) qFatal( "pyuic: Could not open file '%s' ", fileName ); - QDomDocument doc; - QString errMsg; + TQDomDocument doc; + TQString errMsg; int errLine; if ( !doc.setContent( &file, &errMsg, &errLine ) ) - qFatal( QString("pyuic: Failed to parse %s: ") + errMsg + QString (" in line %d\n"), fileName, errLine ); + qFatal( TQString("pyuic: Failed to parse %s: ") + errMsg + TQString (" in line %d\n"), fileName, errLine ); - QDomElement e = doc.firstChild().toElement(); + TQDomElement e = doc.firstChild().toElement(); if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.3 ) { - qWarning( QString("pyuic: File generated with too recent version of Qt Designer (%s vs. %s)"), + qWarning( TQString("pyuic: File generated with too recent version of Qt Designer (%s vs. %s)"), e.attribute("version").latin1(), QT_VERSION_STR ); return 1; } @@ -209,7 +209,7 @@ int main( int argc, char * argv[] ) if ( !subcl ) { out << "# Form implementation generated from reading ui file '" << fileName << "'" << endl; out << "#" << endl; - out << "# Created: " << QDateTime::currentDateTime().toString() << endl; + out << "# Created: " << TQDateTime::currentDateTime().toString() << endl; out << "# by: The PyQt User Interface Compiler (pyuic) " << PYQT_VERSION << endl; out << "#" << endl; out << "# WARNING! All changes made in this file will be lost!" << endl; @@ -228,8 +228,8 @@ int main( int argc, char * argv[] ) out << endl; out << indent << "if __name__ == \"__main__\":" << endl; ++indent; - out << indent << "a = QApplication(sys.argv)" << endl; - out << indent << "QObject.connect(a,SIGNAL(\"lastWindowClosed()\"),a,SLOT(\"quit()\"))" << endl; + out << indent << "a = TQApplication(sys.argv)" << endl; + out << indent << "TQObject.connect(a,TQT_SIGNAL(\"lastWindowClosed()\"),a,TQT_SLOT(\"quit()\"))" << endl; out << indent << "w = " << (subcl ? className : uicClass) << "()" << endl; out << indent << "a.setMainWidget(w)" << endl; diff --git a/python/pyqt/pyuic3/object.cpp b/python/pyqt/pyuic3/object.cpp index 834427f5..335bce9b 100644 --- a/python/pyqt/pyuic3/object.cpp +++ b/python/pyqt/pyuic3/object.cpp @@ -21,9 +21,9 @@ #include "uic.h" #include "parser.h" #include "domtool.h" -#include <qregexp.h> -#include <qsizepolicy.h> -#include <qstringlist.h> +#include <tqregexp.h> +#include <tqsizepolicy.h> +#include <tqstringlist.h> #define NO_STATIC_COLORS #include <globaldefs.h> @@ -38,17 +38,17 @@ static bool createdCentralWidget = FALSE; -QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, const QString& par, const QString& layout ) +TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& par, const TQString& layout ) { - QString parent( par ); + TQString parent( par ); if ( parent == "self" && isMainWindow ) { if ( !createdCentralWidget ) - out << indent << "self.setCentralWidget(QWidget(self,\"qt_central_widget\"))" << endl; + out << indent << "self.setCentralWidget(TQWidget(self,\"qt_central_widget\"))" << endl; createdCentralWidget = TRUE; parent = "self.centralWidget()"; } - QDomElement n; - QString objClass, objName, fullObjName; + TQDomElement n; + TQString objClass, objName, fullObjName; int numItems = 0; int numColumns = 0; int numRows = 0; @@ -61,7 +61,7 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, return objName; objName = getObjectName( e ); - QString definedName = objName; + TQString definedName = objName; bool isTmpObject = objName.isEmpty() || objClass == "QLayoutWidget"; if ( isTmpObject ) { if ( objClass[0] == 'Q' ) @@ -72,17 +72,17 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, bool isLine = objClass == "Line"; if ( isLine ) - objClass = "QFrame"; + objClass = "TQFrame"; out << endl; if ( objClass == "QLayoutWidget" ) { if ( layout.isEmpty() ) { // register the object and unify its name objName = registerObject( objName ); - out << indent << objName << " = QWidget(" << parent << ",\"" << definedName << "\")" << endl; + out << indent << objName << " = TQWidget(" << parent << ",\"" << definedName << "\")" << endl; } else { // the layout widget is not necessary, hide it by creating its child in the parent - QString result; + TQString result; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if (tags.contains( n.tagName() ) ) result = createObjectImpl( n, parentClass, parent, layout ); @@ -92,7 +92,7 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, // Layouts don't go into the class instance dictionary. fullObjName = objName; - } else if ( objClass != "QToolBar" && objClass != "QMenuBar" ) { + } else if ( objClass != "TQToolBar" && objClass != "TQMenuBar" ) { // register the object and unify its name objName = registerObject( objName ); @@ -105,7 +105,7 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, fullObjName = "self." + objName; if ( objClass == "QAxWidget" ) { - QString controlId; + TQString controlId; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "property" && n.attribute( "name" ) == "control" ) { controlId = n.firstChild().toElement().text(); @@ -122,10 +122,10 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, bool stdset = stdsetdef; if ( n.hasAttribute( "stdset" ) ) stdset = toBool( n.attribute( "stdset" ) ); - QString prop = n.attribute( "name" ); + TQString prop = n.attribute( "name" ); if ( prop == "database" ) continue; - QString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset ); + TQString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset ); if ( value.isEmpty() ) continue; if ( prop == "name" ) @@ -139,35 +139,35 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, if ( isLine && prop == "orientation" ) { prop = "frameShape"; if ( value.right(10) == "Horizontal" ) - value = "QFrame.HLine"; + value = "TQFrame.HLine"; else - value = "QFrame.VLine"; + value = "TQFrame.VLine"; if ( !hadFrameShadow ) { prop = "frameStyle"; - value += " | QFrame.Sunken"; + value += " | TQFrame.Sunken"; } } if ( prop == "buttonGroupId" ) { - if ( parentClass == "QButtonGroup" ) + if ( parentClass == "TQButtonGroup" ) out << indent << parent << ".insert( " << fullObjName << "," << value << ")" << endl; continue; } if ( prop == "frameworkCode" ) continue; - if ( objClass == "QMultiLineEdit" && - QRegExp("echoMode|hMargin|maxLength|maxLines|undoEnabled").exactMatch(prop) ) + if ( objClass == "TQMultiLineEdit" && + TQRegExp("echoMode|hMargin|maxLength|maxLines|undoEnabled").exactMatch(prop) ) continue; - QString call = fullObjName + "."; - QString tail; + TQString call = fullObjName + "."; + TQString tail; if ( stdset ) { call += mkStdSet( prop ) + "("; tail = ")"; } else { - call += "setProperty(\"" + prop + "\",QVariant("; + call += "setProperty(\"" + prop + "\",TQVariant("; tail = "))"; } if ( prop == "accel" ) { - call += "QKeySequence("; + call += "TQKeySequence("; tail += ")"; } call += value + tail; @@ -179,8 +179,8 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, out << indent << call << endl; } } else if ( n.tagName() == "item" ) { - QString call; - QString value; + TQString call; + TQString value; if ( objClass.contains( "ListBox" ) ) { call = createListBoxItemImpl( n, fullObjName ); @@ -204,7 +204,7 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, trout << trindent << call << endl; } } else if ( objClass.contains( "ListView" ) ) { - call = createListViewItemImpl( n, fullObjName, QString::null ); + call = createListViewItemImpl( n, fullObjName, TQString::null ); if ( !call.isEmpty() ) { if ( numItems == 0 ) trout << trindent << fullObjName << ".clear()" << endl; @@ -214,8 +214,8 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, if ( !call.isEmpty() ) numItems++; } else if ( n.tagName() == "column" || n.tagName() == "row" ) { - QString call; - QString value; + TQString call; + TQString value; if ( objClass.contains( "ListView" ) ) { call = createListViewColumnImpl( n, fullObjName, &value ); @@ -224,7 +224,7 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, trout << trindent << fullObjName << ".header().setLabel(" << numColumns++ << "," << value << ")\n"; } - } else if ( objClass == "QTable" || objClass == "QDataTable" ) { + } else if ( objClass == "TQTable" || objClass == "TQDataTable" ) { bool isCols = ( n.tagName() == "column" ); call = createTableRowColumnImpl( n, fullObjName, &value ); if ( !call.isEmpty() ) { @@ -241,37 +241,37 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, // create all children, some widgets have special requirements - if ( objClass == "QTabWidget" ) { + if ( objClass == "TQTabWidget" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) { - QString page = createObjectImpl( n, objClass, fullObjName ); - QString comment; - QString label = DomTool::readAttribute( n, "title", "", comment ).toString(); - out << indent << fullObjName << ".insertTab(" << page << ",QString.fromLatin1(\"\"))" << endl; + TQString page = createObjectImpl( n, objClass, fullObjName ); + TQString comment; + TQString label = DomTool::readAttribute( n, "title", "", comment ).toString(); + out << indent << fullObjName << ".insertTab(" << page << ",TQString.fromLatin1(\"\"))" << endl; trout << trindent << fullObjName << ".changeTab(" << page << "," << trcall( label, comment ) << ")" << endl; } } - } else if ( objClass == "QWidgetStack" ) { + } else if ( objClass == "TQWidgetStack" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) { - QString page = createObjectImpl( n, objClass, fullObjName ); + TQString page = createObjectImpl( n, objClass, fullObjName ); int id = DomTool::readAttribute( n, "id", "" ).toInt(); out << indent << fullObjName << ".addWidget(" << page << "," << id << ")" << endl; } } - } else if ( objClass == "QToolBox" ) { + } else if ( objClass == "TQToolBox" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) { - QString page = createObjectImpl( n, objClass, fullObjName ); - QString comment; - QString label = DomTool::readAttribute( n, "label", "", comment ).toString(); - out << indent << fullObjName << ".addItem(" << page << ",QString.fromLatin1(\"\"))" << endl; + TQString page = createObjectImpl( n, objClass, fullObjName ); + TQString comment; + TQString label = DomTool::readAttribute( n, "label", "", comment ).toString(); + out << indent << fullObjName << ".addItem(" << page << ",TQString.fromLatin1(\"\"))" << endl; trout << trindent << fullObjName << ".setItemLabel(" << fullObjName << ".indexOf(" << page << ")," << trcall( label, comment ) << ")" << endl; } } - } else if ( objClass != "QToolBar" && objClass != "QMenuBar" ) { // standard widgets + } else if ( objClass != "TQToolBar" && objClass != "TQMenuBar" ) { // standard widgets for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( tags.contains( n.tagName() ) ) createObjectImpl( n, objClass, fullObjName ); @@ -293,13 +293,13 @@ QString Uic::createObjectImpl( const QDomElement &e, const QString& parentClass, application font or palette change handlers in createFormImpl(). */ -void Uic::createExclusiveProperty( const QDomElement & e, const QString& exclusiveProp ) +void Uic::createExclusiveProperty( const TQDomElement & e, const TQString& exclusiveProp ) { - QDomElement n; - QString objClass = getClassName( e ); + TQDomElement n; + TQString objClass = getClassName( e ); if ( objClass.isEmpty() ) return; - QString objName = getObjectName( e ); + TQString objName = getObjectName( e ); #if 0 // it's not clear whether this check should be here or not if ( objName.isEmpty() ) return; @@ -309,55 +309,55 @@ void Uic::createExclusiveProperty( const QDomElement & e, const QString& exclusi bool stdset = stdsetdef; if ( n.hasAttribute( "stdset" ) ) stdset = toBool( n.attribute( "stdset" ) ); - QString prop = n.attribute( "name" ); + TQString prop = n.attribute( "name" ); if ( prop != exclusiveProp ) continue; - QString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset ); + TQString value = setObjectProperty( objClass, objName, prop, n.firstChild().toElement(), stdset ); if ( value.isEmpty() ) continue; - out << indent << indent << objName << ".setProperty(\"" << prop << "\",QVariant(" << value << "))" << endl; + out << indent << indent << objName << ".setProperty(\"" << prop << "\",TQVariant(" << value << "))" << endl; } } } -/* Convert a QSizePolicy::SizeType to text. */ -static QString mapSizeType(QSizePolicy::SizeType st) +/* Convert a TQSizePolicy::SizeType to text. */ +static TQString mapSizeType(TQSizePolicy::SizeType st) { const char *txt; switch (st) { - case QSizePolicy::Fixed: - txt = "QSizePolicy.Fixed"; + case TQSizePolicy::Fixed: + txt = "TQSizePolicy.Fixed"; break; - case QSizePolicy::Minimum: - txt = "QSizePolicy.Minimum"; + case TQSizePolicy::Minimum: + txt = "TQSizePolicy.Minimum"; break; - case QSizePolicy::Maximum: - txt = "QSizePolicy.Maximum"; + case TQSizePolicy::Maximum: + txt = "TQSizePolicy.Maximum"; break; - case QSizePolicy::Preferred: - txt = "QSizePolicy.Preferred"; + case TQSizePolicy::Preferred: + txt = "TQSizePolicy.Preferred"; break; - case QSizePolicy::MinimumExpanding: - txt = "QSizePolicy.MinimumExpanding"; + case TQSizePolicy::MinimumExpanding: + txt = "TQSizePolicy.MinimumExpanding"; break; - case QSizePolicy::Expanding: - txt = "QSizePolicy.Expanding"; + case TQSizePolicy::Expanding: + txt = "TQSizePolicy.Expanding"; break; - case QSizePolicy::Ignored: - txt = "QSizePolicy.Ignored"; + case TQSizePolicy::Ignored: + txt = "TQSizePolicy.Ignored"; break; default: - txt = "Invalid QSizePolicy::SizeType"; + txt = "Invalid TQSizePolicy::SizeType"; } return txt; @@ -368,11 +368,11 @@ static QString mapSizeType(QSizePolicy::SizeType st) Resource::saveProperty() and DomTool::elementToVariant. If you change one, change all. */ -QString Uic::setObjectProperty( const QString& objClass, const QString& obj, const QString &prop, const QDomElement &e, bool stdset ) +TQString Uic::setObjectProperty( const TQString& objClass, const TQString& obj, const TQString &prop, const TQDomElement &e, bool stdset ) { - QString v; + TQString v; if ( e.tagName() == "rect" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0, w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -385,11 +385,11 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "QRect(%1,%2,%3,%4)"; + v = "TQRect(%1,%2,%3,%4)"; v = v.arg(x).arg(y).arg(w).arg(h); } else if ( e.tagName() == "point" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int x = 0, y = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "x" ) @@ -398,10 +398,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con y = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "QPoint(%1,%2)"; + v = "TQPoint(%1,%2)"; v = v.arg(x).arg(y); } else if ( e.tagName() == "size" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int w = 0, h = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) @@ -410,10 +410,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con h = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "QSize(%1,%2)"; + v = "TQSize(%1,%2)"; v = v.arg(w).arg(h); } else if ( e.tagName() == "color" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int r = 0, g = 0, b = 0; while ( !n3.isNull() ) { if ( n3.tagName() == "red" ) @@ -424,18 +424,18 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con b = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "QColor(%1,%2,%3)"; + v = "TQColor(%1,%2,%3)"; v = v.arg(r).arg(g).arg(b); } else if ( e.tagName() == "font" ) { - QDomElement n3 = e.firstChild().toElement(); - QString attrname = e.parentNode().toElement().attribute( "name", "font" ); - QString fontname; + TQDomElement n3 = e.firstChild().toElement(); + TQString attrname = e.parentNode().toElement().attribute( "name", "font" ); + TQString fontname; if ( !obj.isEmpty() ) { fontname = registerObject( obj + "_" + attrname ); - out << indent << fontname << " = QFont(self." << obj << ".font())" << endl; + out << indent << fontname << " = TQFont(self." << obj << ".font())" << endl; } else { fontname = registerObject( "f" ); - out << indent << fontname << " = QFont(self.font())" << endl; + out << indent << fontname << " = TQFont(self.font())" << endl; } while ( !n3.isNull() ) { if ( n3.tagName() == "family" ) @@ -462,22 +462,22 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con v = fontname; } } else if ( e.tagName() == "string" ) { - QString txt = e.firstChild().toText().data(); - QString com = getComment( e.parentNode() ); + TQString txt = e.firstChild().toText().data(); + TQString com = getComment( e.parentNode() ); - if ( prop == "toolTip" && objClass != "QAction" && objClass != "QActionGroup" ) { + if ( prop == "toolTip" && objClass != "TQAction" && objClass != "TQActionGroup" ) { if ( !obj.isEmpty() ) - trout << trindent << "QToolTip.add(self." << obj << "," + trout << trindent << "TQToolTip.add(self." << obj << "," << trcall( txt, com ) << ")" << endl; else - trout << trindent << "QToolTip.add(self," + trout << trindent << "TQToolTip.add(self," << trcall( txt, com ) << ")" << endl; - } else if ( prop == "whatsThis" && objClass != "QAction" && objClass != "QActionGroup" ) { + } else if ( prop == "whatsThis" && objClass != "TQAction" && objClass != "TQActionGroup" ) { if ( !obj.isEmpty() ) - trout << trindent << "QWhatsThis.add(self." << obj << "," + trout << trindent << "TQWhatsThis.add(self." << obj << "," << trcall( txt, com ) << ")" << endl; else - trout << trindent << "QWhatsThis.add(self," + trout << trindent << "TQWhatsThis.add(self," << trcall( txt, com ) << ")" << endl; } else { v = trcall( txt, com ); @@ -492,7 +492,7 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con if ( stdset ) v = "%1"; else - v = "QVariant(%1,0)"; + v = "TQVariant(%1,0)"; v = v.arg( mkBool( e.firstChild().toText().data() ) ); } else if ( e.tagName() == "pixmap" ) { v = e.firstChild().toText().data(); @@ -500,19 +500,19 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con if ( pixmapLoaderFunction.isEmpty() ) { v.prepend( "self." ); } else { - v.prepend( pixmapLoaderFunction + "(" + QString( externPixmaps ? "\"" : "" ) ); - v.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + v.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) ); + v.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } } else if ( e.tagName() == "iconset" ) { - v = "QIconSet(%1)"; - QString s = e.firstChild().toText().data(); + v = "TQIconSet(%1)"; + TQString s = e.firstChild().toText().data(); if ( !s.isEmpty() ) { if ( pixmapLoaderFunction.isEmpty() ) { s.prepend( "self." ); } else { - s.prepend( pixmapLoaderFunction + "(" + QString( externPixmaps ? "\"" : "" ) ); - s.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + s.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "" ) ); + s.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } v = v.arg( s ); @@ -520,16 +520,16 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con v = e.firstChild().toText().data() + ".convertToImage()"; } else if ( e.tagName() == "enum" ) { v = "%1.%2"; - QString oc = objClass; - QString ev = e.firstChild().toText().data(); - if ( oc == "QListView" && ev == "Manual" ) // #### workaround, rename QListView::Manual in 4.0 - oc = "QScrollView"; + TQString oc = objClass; + TQString ev = e.firstChild().toText().data(); + if ( oc == "TQListView" && ev == "Manual" ) // #### workaround, rename TQListView::Manual in 4.0 + oc = "TQScrollView"; v = v.arg( oc ).arg( ev ); } else if ( e.tagName() == "set" ) { - QString keys( e.firstChild().toText().data() ); - QStringList lst = QStringList::split( '|', keys ); + TQString keys( e.firstChild().toText().data() ); + TQStringList lst = TQStringList::split( '|', keys ); v = ""; - QStringList::Iterator it = lst.begin(); + TQStringList::Iterator it = lst.begin(); while ( it != lst.end() ) { v += objClass + "." + *it; if ( it != lst.fromLast() ) @@ -537,32 +537,32 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con ++it; } } else if ( e.tagName() == "sizepolicy" ) { - QDomElement n3 = e.firstChild().toElement(); - QSizePolicy sp; + TQDomElement n3 = e.firstChild().toElement(); + TQSizePolicy sp; while ( !n3.isNull() ) { if ( n3.tagName() == "hsizetype" ) - sp.setHorData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setHorData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "vsizetype" ) - sp.setVerData( (QSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); + sp.setVerData( (TQSizePolicy::SizeType)n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "horstretch" ) sp.setHorStretch( n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "verstretch" ) sp.setVerStretch( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } - QString tmp = "self."; + TQString tmp = "self."; if ( !obj.isEmpty() ) tmp += obj + "."; - v = "QSizePolicy(%1,%2,%3,%4," + tmp + "sizePolicy().hasHeightForWidth())"; + v = "TQSizePolicy(%1,%2,%3,%4," + tmp + "sizePolicy().hasHeightForWidth())"; v = v.arg( mapSizeType(sp.horData()) ).arg( mapSizeType(sp.verData()) ).arg( sp.horStretch() ).arg( sp.verStretch() ); } else if ( e.tagName() == "palette" ) { - QPalette pal; + TQPalette pal; bool no_pixmaps = e.elementsByTagName( "pixmap" ).count() == 0; - QDomElement n; + TQDomElement n; if ( no_pixmaps ) { n = e.firstChild().toElement(); while ( !n.isNull() ) { - QColorGroup cg; + TQColorGroup cg; if ( n.tagName() == "active" ) { cg = loadColorGroup( n ); pal.setActive( cg ); @@ -576,19 +576,19 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con n = n.nextSibling().toElement(); } } - if ( no_pixmaps && pal == QPalette( pal.active().button(), pal.active().background() ) ) { - v = "QPalette(QColor(%1,%2,%3),QColor(%1,%2,%3))"; + if ( no_pixmaps && pal == TQPalette( pal.active().button(), pal.active().background() ) ) { + v = "TQPalette(TQColor(%1,%2,%3),TQColor(%1,%2,%3))"; v = v.arg( pal.active().button().red() ).arg( pal.active().button().green() ).arg( pal.active().button().blue() ); v = v.arg( pal.active().background().red() ).arg( pal.active().background().green() ).arg( pal.active().background().blue() ); } else { - QString palette = "pal"; + TQString palette = "pal"; if ( !pal_used ) { - out << indent << palette << " = QPalette()" << endl; + out << indent << palette << " = TQPalette()" << endl; pal_used = TRUE; } - QString cg = "cg"; + TQString cg = "cg"; if ( !cg_used ) { - out << indent << cg << " = QColorGroup()" << endl; + out << indent << cg << " = TQColorGroup()" << endl; cg_used = TRUE; } n = e.firstChild().toElement(); @@ -611,10 +611,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con v = palette; } } else if ( e.tagName() == "cursor" ) { - v = "QCursor(%1)"; + v = "TQCursor(%1)"; v = v.arg( e.firstChild().toText().data() ); } else if ( e.tagName() == "date" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int y, m, d; y = m = d = 0; while ( !n3.isNull() ) { @@ -626,10 +626,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con d = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "QDate(%1,%2,%3)"; + v = "TQDate(%1,%2,%3)"; v = v.arg(y).arg(m).arg(d); } else if ( e.tagName() == "time" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int h, m, s; h = m = s = 0; while ( !n3.isNull() ) { @@ -641,10 +641,10 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con s = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "QTime(%1,%2,%3)"; + v = "TQTime(%1,%2,%3)"; v = v.arg(h).arg(m).arg(s); } else if ( e.tagName() == "datetime" ) { - QDomElement n3 = e.firstChild().toElement(); + TQDomElement n3 = e.firstChild().toElement(); int h, mi, s, y, mo, d; h = mi = s = y = mo = d = 0; while ( !n3.isNull() ) { @@ -662,18 +662,18 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con d = n3.firstChild().toText().data().toInt(); n3 = n3.nextSibling().toElement(); } - v = "QDateTime(QDate(%1,%2,%3),QTime(%4,%5,%6))"; + v = "TQDateTime(TQDate(%1,%2,%3),TQTime(%4,%5,%6))"; v = v.arg(y).arg(mo).arg(d).arg(h).arg(mi).arg(s); } else if ( e.tagName() == "stringlist" ) { - QStringList l; - QDomElement n3 = e.firstChild().toElement(); - QString listname = "l"; + TQStringList l; + TQDomElement n3 = e.firstChild().toElement(); + TQString listname = "l"; if ( !obj.isEmpty() ) { listname = obj + "_stringlist"; listname = registerObject( listname ); - out << indent << listname << " = QStringList()" << endl; + out << indent << listname << " = TQStringList()" << endl; } else { - out << indent << listname << " = QStringList()" << endl; + out << indent << listname << " = TQStringList()" << endl; } while ( !n3.isNull() ) { if ( n3.tagName() == "string" ) @@ -690,9 +690,9 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con /*! Extracts a named object property from \a e. */ -QDomElement Uic::getObjectProperty( const QDomElement& e, const QString& name ) +TQDomElement Uic::getObjectProperty( const TQDomElement& e, const TQString& name ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { diff --git a/python/pyqt/pyuic3/parser.cpp b/python/pyqt/pyuic3/parser.cpp index 4fc13c5f..15374aa5 100644 --- a/python/pyqt/pyuic3/parser.cpp +++ b/python/pyqt/pyuic3/parser.cpp @@ -19,28 +19,28 @@ **********************************************************************/ #include "parser.h" -#include <qobject.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqstringlist.h> class NormalizeObject : public QObject { public: - NormalizeObject() : QObject() {} - static QCString normalizeSignalSlot( const char *signalSlot ) { return QObject::normalizeSignalSlot( signalSlot ); } + NormalizeObject() : TQObject() {} + static TQCString normalizeSignalSlot( const char *signalSlot ) { return TQObject::normalizeSignalSlot( signalSlot ); } }; -QString Parser::cleanArgs( const QString &func ) +TQString Parser::cleanArgs( const TQString &func ) { - QString slot( func ); + TQString slot( func ); int begin = slot.find( "(" ) + 1; - QString args = slot.mid( begin ); + TQString args = slot.mid( begin ); args = args.left( args.find( ")" ) ); - QStringList lst = QStringList::split( ',', args ); - QString res = slot.left( begin ); - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + TQStringList lst = TQStringList::split( ',', args ); + TQString res = slot.left( begin ); + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( it != lst.begin() ) res += ","; - QString arg = *it; + TQString arg = *it; int pos = 0; if ( ( pos = arg.find( "&" ) ) != -1 ) { arg = arg.left( pos + 1 ); @@ -50,7 +50,7 @@ QString Parser::cleanArgs( const QString &func ) arg = arg.simplifyWhiteSpace(); if ( ( pos = arg.find( ':' ) ) != -1 ) arg = arg.left( pos ).simplifyWhiteSpace() + ":" + arg.mid( pos + 1 ).simplifyWhiteSpace(); - QStringList l = QStringList::split( ' ', arg ); + TQStringList l = TQStringList::split( ' ', arg ); if ( l.count() == 2 ) { if ( l[ 0 ] != "const" && l[ 0 ] != "unsigned" && l[ 0 ] != "var" ) arg = l[ 0 ]; @@ -62,5 +62,5 @@ QString Parser::cleanArgs( const QString &func ) } res += ")"; - return QString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); + return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); } diff --git a/python/pyqt/pyuic3/parser.h b/python/pyqt/pyuic3/parser.h index 5a5671ad..ace96d9e 100644 --- a/python/pyqt/pyuic3/parser.h +++ b/python/pyqt/pyuic3/parser.h @@ -21,12 +21,12 @@ #ifndef PARSER_H #define PARSER_H -#include <qstring.h> +#include <tqstring.h> class Parser { public: - static QString cleanArgs( const QString &func ); + static TQString cleanArgs( const TQString &func ); }; diff --git a/python/pyqt/pyuic3/subclassing.cpp b/python/pyqt/pyuic3/subclassing.cpp index 299e0449..251d704f 100644 --- a/python/pyqt/pyuic3/subclassing.cpp +++ b/python/pyqt/pyuic3/subclassing.cpp @@ -22,12 +22,12 @@ #include "parser.h" #include "widgetdatabase.h" #include "domtool.h" -#include <qfile.h> -#include <qstringlist.h> -#include <qdatetime.h> +#include <tqfile.h> +#include <tqstringlist.h> +#include <tqdatetime.h> #define NO_STATIC_COLORS #include <globaldefs.h> -#include <qregexp.h> +#include <tqregexp.h> #include <stdio.h> #include <stdlib.h> @@ -38,17 +38,17 @@ \sa createSubDecl() */ -void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) +void Uic::createSubImpl( const TQDomElement &e, const TQString& subClass ) { - QDomElement n; - QDomNodeList nl; + TQDomElement n; + TQDomNodeList nl; int i; - QString objClass = getClassName( e ); + TQString objClass = getClassName( e ); if ( objClass.isEmpty() ) return; - QString supClsMod = fileName; + TQString supClsMod = fileName; int tail = supClsMod.findRev('.',-1); if (tail >= 0) supClsMod.truncate(tail); @@ -62,7 +62,7 @@ void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) out << endl; // constructor - if ( objClass == "QDialog" || objClass == "QWizard" ) { + if ( objClass == "TQDialog" || objClass == "TQWizard" ) { out << indent << "def __init__(self,parent = None,name = None,modal = 0,fl = 0):" << endl; ++indent; out << indent << nameOfClass << ".__init__(self,parent,name,modal,fl)" << endl; @@ -74,12 +74,12 @@ void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) --indent; // find additional functions - QStringList publicSlots, protectedSlots, privateSlots; - QStringList publicSlotTypes, protectedSlotTypes, privateSlotTypes; - QStringList publicSlotSpecifier, protectedSlotSpecifier, privateSlotSpecifier; - QStringList publicFuncts, protectedFuncts, privateFuncts; - QStringList publicFunctRetTyp, protectedFunctRetTyp, privateFunctRetTyp; - QStringList publicFunctSpec, protectedFunctSpec, privateFunctSpec; + TQStringList publicSlots, protectedSlots, privateSlots; + TQStringList publicSlotTypes, protectedSlotTypes, privateSlotTypes; + TQStringList publicSlotSpecifier, protectedSlotSpecifier, privateSlotSpecifier; + TQStringList publicFuncts, protectedFuncts, privateFuncts; + TQStringList publicFunctRetTyp, protectedFunctRetTyp, privateFunctRetTyp; + TQStringList publicFunctSpec, protectedFunctSpec, privateFunctSpec; nl = e.parentNode().toElement().elementsByTagName( "slot" ); for ( i = 0; i < (int) nl.length(); i++ ) { @@ -89,12 +89,12 @@ void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) continue; if ( n.attribute( "language", "C++" ) != "C++" ) continue; - QString returnType = n.attribute( "returnType", "void" ); - QString functionName = n.firstChild().toText().data().stripWhiteSpace(); + TQString returnType = n.attribute( "returnType", "void" ); + TQString functionName = n.firstChild().toText().data().stripWhiteSpace(); if ( functionName.endsWith( ";" ) ) functionName = functionName.left( functionName.length() - 1 ); - QString specifier = n.attribute( "specifier" ); - QString access = n.attribute( "access" ); + TQString specifier = n.attribute( "specifier" ); + TQString access = n.attribute( "access" ); if ( access == "protected" ) { protectedSlots += functionName; protectedSlotTypes += returnType; @@ -117,12 +117,12 @@ void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) continue; if ( n.attribute( "language", "C++" ) != "C++" ) continue; - QString returnType = n.attribute( "returnType", "void" ); - QString functionName = n.firstChild().toText().data().stripWhiteSpace(); + TQString returnType = n.attribute( "returnType", "void" ); + TQString functionName = n.firstChild().toText().data().stripWhiteSpace(); if ( functionName.endsWith( ";" ) ) functionName = functionName.left( functionName.length() - 1 ); - QString specifier = n.attribute( "specifier" ); - QString access = n.attribute( "access" ); + TQString specifier = n.attribute( "specifier" ); + TQString access = n.attribute( "access" ); if ( access == "protected" ) { protectedFuncts += functionName; protectedFunctRetTyp += returnType; @@ -162,13 +162,13 @@ void Uic::createSubImpl( const QDomElement &e, const QString& subClass ) --indent; } -void Uic::writeFunctionsSubImpl( const QStringList &fuLst, const QStringList &typLst, const QStringList &specLst, - const QString &subClass, const QString &descr ) +void Uic::writeFunctionsSubImpl( const TQStringList &fuLst, const TQStringList &typLst, const TQStringList &specLst, + const TQString &subClass, const TQString &descr ) { - QValueListConstIterator<QString> it, it2, it3; + TQValueListConstIterator<TQString> it, it2, it3; for ( it = fuLst.begin(), it2 = typLst.begin(), it3 = specLst.begin(); it != fuLst.end(); ++it, ++it2, ++it3 ) { - QString type = *it2; + TQString type = *it2; if ( type.isEmpty() ) type = "void"; if ( *it3 == "non virtual" ) diff --git a/python/pyqt/pyuic3/uic.cpp b/python/pyqt/pyuic3/uic.cpp index d3593020..b9e046c5 100644 --- a/python/pyqt/pyuic3/uic.cpp +++ b/python/pyqt/pyuic3/uic.cpp @@ -23,12 +23,12 @@ #include "parser.h" #include "widgetdatabase.h" #include "domtool.h" -#include <qfile.h> -#include <qstringlist.h> -#include <qdatetime.h> +#include <tqfile.h> +#include <tqstringlist.h> +#include <tqdatetime.h> #define NO_STATIC_COLORS #include <globaldefs.h> -#include <qregexp.h> +#include <tqregexp.h> #include <stdio.h> #include <stdlib.h> @@ -52,36 +52,36 @@ void PyIndent::calc() } -QString Uic::getComment( const QDomNode& n ) +TQString Uic::getComment( const TQDomNode& n ) { - QDomNode child = n.firstChild(); + TQDomNode child = n.firstChild(); while ( !child.isNull() ) { if ( child.toElement().tagName() == "comment" ) return child.toElement().firstChild().toText().data(); child = child.nextSibling(); } - return QString::null; + return TQString::null; } -QString Uic::mkBool( bool b ) +TQString Uic::mkBool( bool b ) { return b? "1" : "0"; } -QString Uic::mkBool( const QString& s ) +TQString Uic::mkBool( const TQString& s ) { return mkBool( s == "true" || s == "1" ); } -bool Uic::toBool( const QString& s ) +bool Uic::toBool( const TQString& s ) { return s == "true" || s.toInt() != 0; } -QString Uic::fixString( const QString &str, bool encode ) +TQString Uic::fixString( const TQString &str, bool encode ) { #if QT_VERSION >= 0x030100 - QString s; + TQString s; if ( !encode ) { s = str; s.replace( "\\", "\\\\" ); @@ -89,7 +89,7 @@ QString Uic::fixString( const QString &str, bool encode ) s.replace( "\r", "" ); s.replace( "\n", "\\n\"\n\"" ); } else { - QCString utf8 = str.utf8(); + TQCString utf8 = str.utf8(); const int l = utf8.length(); for ( int i = 0; i < l; ++i ) { @@ -101,25 +101,25 @@ QString Uic::fixString( const QString &str, bool encode ) if (ch <= 0x0f) s += "0"; - s += QString::number( ch, 16 ); + s += TQString::number( ch, 16 ); } } } #else - QString s( str ); - s.replace( QRegExp( "\\\\" ), "\\\\" ); - s.replace( QRegExp( "\"" ), "\\\"" ); - s.replace( QRegExp( "\r?\n" ), "\\n\"\n\"" ); + TQString s( str ); + s.replace( TQRegExp( "\\\\" ), "\\\\" ); + s.replace( TQRegExp( "\"" ), "\\\"" ); + s.replace( TQRegExp( "\r?\n" ), "\\n\"\n\"" ); #endif return "\"" + s + "\""; } -QString Uic::trcall( const QString& sourceText, const QString& comment ) +TQString Uic::trcall( const TQString& sourceText, const TQString& comment ) { if ( sourceText.isEmpty() && comment.isEmpty() ) - return "QString.null"; + return "TQString.null"; - QString t = trmacro; + TQString t = trmacro; bool encode = FALSE; if ( t.isNull() ) { t = "self.__tr"; @@ -145,9 +145,9 @@ QString Uic::trcall( const QString& sourceText, const QString& comment ) } } -QString Uic::mkStdSet( const QString& prop ) +TQString Uic::mkStdSet( const TQString& prop ) { - return QString( "set" ) + prop[0].upper() + prop.mid(1); + return TQString( "set" ) + prop[0].upper() + prop.mid(1); } @@ -158,9 +158,9 @@ QString Uic::mkStdSet( const QString& prop ) The class Uic encapsulates the user interface compiler (uic). */ -Uic::Uic( const QString &fn, const char *outputFn, QTextStream &outStream, - QDomDocument doc, bool subcl, const QString &trm, - const QString& subClass, QString &uicClass ) +Uic::Uic( const TQString &fn, const char *outputFn, TQTextStream &outStream, + TQDomDocument doc, bool subcl, const TQString &trm, + const TQString& subClass, TQString &uicClass ) : out( outStream ), trout (&languageChangeBody ), outputFileName( outputFn ), trmacro( trm ), pyNeedTr(FALSE), pyNeedTrUtf8(FALSE) @@ -191,14 +191,14 @@ Uic::Uic( const QString &fn, const char *outputFn, QTextStream &outStream, return; // Extract any Python code in the comments. - QStringList comm = QStringList::split('\n',getComment(doc.firstChild())); + TQStringList comm = TQStringList::split('\n',getComment(doc.firstChild())); - for (QStringList::Iterator it = comm.begin(); it != comm.end(); ++it) + for (TQStringList::Iterator it = comm.begin(); it != comm.end(); ++it) if ((*it).startsWith("Python:")) pyCode += (*it).mid(7) + "\n"; - QDomElement e = doc.firstChild().firstChild().toElement(); - QDomElement widget; + TQDomElement e = doc.firstChild().firstChild().toElement(); + TQDomElement widget; while ( !e.isNull() ) { if ( e.tagName() == "widget" ) { widget = e; @@ -213,13 +213,13 @@ Uic::Uic( const QString &fn, const char *outputFn, QTextStream &outStream, bool ok; defSpacing.toInt( &ok ); if ( !ok ) { - QString buf = defSpacing.toString(); + TQString buf = defSpacing.toString(); defSpacing = buf.append( "()" ); } defMargin = e.attribute( "margin", defMargin.toString() ); defMargin.toInt( &ok ); if ( !ok ) { - QString buf = defMargin.toString(); + TQString buf = defMargin.toString(); defMargin = buf.append( "()" ); } } @@ -232,7 +232,7 @@ Uic::Uic( const QString &fn, const char *outputFn, QTextStream &outStream, uicClass = nameOfClass; - namespaces = QStringList::split( "::", nameOfClass ); + namespaces = TQStringList::split( "::", nameOfClass ); bareNameOfClass = namespaces.last(); namespaces.remove( namespaces.fromLast() ); @@ -258,7 +258,7 @@ Uic::Uic( const QString &fn, const char *outputFn, QTextStream &outStream, out << "\n"; out << indent << "def __trUtf8(self,s,c = None):\n"; ++indent; - out << indent << "return qApp.translate(\"" << nameOfClass << "\",s,c,QApplication.UnicodeUTF8)\n"; + out << indent << "return qApp.translate(\"" << nameOfClass << "\",s,c,TQApplication.UnicodeUTF8)\n"; --indent; } @@ -267,26 +267,26 @@ Uic::Uic( const QString &fn, const char *outputFn, QTextStream &outStream, /*! Extracts a pixmap loader function from \a e */ -QString Uic::getPixmapLoaderFunction( const QDomElement& e ) +TQString Uic::getPixmapLoaderFunction( const TQDomElement& e ) { - QDomElement n; + TQDomElement n; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "pixmapfunction" ) return n.firstChild().toText().data(); } - return QString::null; + return TQString::null; } /*! Extracts the forms class name from \a e */ -QString Uic::getFormClassName( const QDomElement& e ) +TQString Uic::getFormClassName( const TQDomElement& e ) { - QDomElement n; - QString cn; + TQDomElement n; + TQString cn; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "class" ) { - QString s = n.firstChild().toText().data(); + TQString s = n.firstChild().toText().data(); int i; while ( ( i = s.find(' ' )) != -1 ) s[i] = '_'; @@ -298,24 +298,24 @@ QString Uic::getFormClassName( const QDomElement& e ) /*! Extracts a class name from \a e. */ -QString Uic::getClassName( const QDomElement& e ) +TQString Uic::getClassName( const TQDomElement& e ) { - QString s = e.attribute( "class" ); + TQString s = e.attribute( "class" ); if ( s.isEmpty() && e.tagName() == "toolbar" ) - s = "QToolBar"; + s = "TQToolBar"; else if ( s.isEmpty() && e.tagName() == "menubar" ) - s = "QMenuBar"; + s = "TQMenuBar"; return s; } /*! Returns TRUE if database framework code is generated, else FALSE. */ -bool Uic::isFrameworkCodeGenerated( const QDomElement& e ) +bool Uic::isFrameworkCodeGenerated( const TQDomElement& e ) { - QDomElement n = getObjectProperty( e, "frameworkCode" ); + TQDomElement n = getObjectProperty( e, "frameworkCode" ); if ( n.attribute("name") == "frameworkCode" && - !DomTool::elementToVariant( n.firstChild().toElement(), QVariant( TRUE, 0 ) ).toBool() ) + !DomTool::elementToVariant( n.firstChild().toElement(), TQVariant( TRUE, 0 ) ).toBool() ) return FALSE; return TRUE; } @@ -323,38 +323,38 @@ bool Uic::isFrameworkCodeGenerated( const QDomElement& e ) /*! Extracts an object name from \a e. It's stored in the 'name' property. */ -QString Uic::getObjectName( const QDomElement& e ) +TQString Uic::getObjectName( const TQDomElement& e ) { - QDomElement n = getObjectProperty( e, "name" ); + TQDomElement n = getObjectProperty( e, "name" ); if ( n.firstChild().toElement().tagName() == "cstring" ) return n.firstChild().toElement().firstChild().toText().data(); - return QString::null; + return TQString::null; } /*! Extracts an layout name from \a e. It's stored in the 'name' property of the preceeding sibling (the first child of a QLayoutWidget). */ -QString Uic::getLayoutName( const QDomElement& e ) +TQString Uic::getLayoutName( const TQDomElement& e ) { - QDomElement p = e.parentNode().toElement(); - QString name; + TQDomElement p = e.parentNode().toElement(); + TQString name; if ( getClassName(p) != "QLayoutWidget" ) name = "Layout"; - QDomElement n = getObjectProperty( p, "name" ); + TQDomElement n = getObjectProperty( p, "name" ); if ( n.firstChild().toElement().tagName() == "cstring" ) { name.prepend( n.firstChild().toElement().firstChild().toText().data() ); - return QStringList::split( "::", name ).last(); + return TQStringList::split( "::", name ).last(); } return e.tagName(); } -QString Uic::getDatabaseInfo( const QDomElement& e, const QString& tag ) +TQString Uic::getDatabaseInfo( const TQDomElement& e, const TQString& tag ) { - QDomElement n; - QDomElement n1; + TQDomElement n; + TQDomElement n1; int child = 0; // database info is a stringlist stored in this order if ( tag == "connection" ) @@ -364,65 +364,65 @@ QString Uic::getDatabaseInfo( const QDomElement& e, const QString& tag ) else if ( tag == "field" ) child = 2; else - return QString::null; + return TQString::null; n = getObjectProperty( e, "database" ); if ( n.firstChild().toElement().tagName() == "stringlist" ) { // find correct stringlist entry - QDomElement n1 = n.firstChild().firstChild().toElement(); + TQDomElement n1 = n.firstChild().firstChild().toElement(); for ( int i = 0; i < child && !n1.isNull(); ++i ) n1 = n1.nextSibling().toElement(); if ( n1.isNull() ) - return QString::null; + return TQString::null; return n1.firstChild().toText().data(); } - return QString::null; + return TQString::null; } /*! Returns include file for class \a className or a null string. */ -QString Uic::getInclude( const QString& className ) +TQString Uic::getInclude( const TQString& className ) { int wid = WidgetDatabase::idFromClassName( className ); if ( wid != -1 ) return WidgetDatabase::includeFile( wid ); - return QString::null; + return TQString::null; } -void Uic::createActionImpl( const QDomElement &n, const QString &parent ) +void Uic::createActionImpl( const TQDomElement &n, const TQString &parent ) { - for ( QDomElement ae = n; !ae.isNull(); ae = ae.nextSibling().toElement() ) { - QString objName = registerObject( getObjectName( ae ) ); + for ( TQDomElement ae = n; !ae.isNull(); ae = ae.nextSibling().toElement() ) { + TQString objName = registerObject( getObjectName( ae ) ); if ( ae.tagName() == "action" ) - out << indent << "self." << objName << " = QAction(" << parent << ",\"" << objName << "\")" << endl; + out << indent << "self." << objName << " = TQAction(" << parent << ",\"" << objName << "\")" << endl; else if ( ae.tagName() == "actiongroup" ) - out << indent << "self." << objName << " = QActionGroup(" << parent << ",\"" << objName << "\")" << endl; + out << indent << "self." << objName << " = TQActionGroup(" << parent << ",\"" << objName << "\")" << endl; else continue; bool subActionsDone = FALSE; #if QT_VERSION >= 0x030300 bool hasMenuText = FALSE; - QString actionText; + TQString actionText; #endif - for ( QDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { + for ( TQDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { if ( n2.tagName() == "property" ) { bool stdset = stdsetdef; if ( n2.hasAttribute( "stdset" ) ) stdset = toBool( n2.attribute( "stdset" ) ); - QString prop = n2.attribute("name"); + TQString prop = n2.attribute("name"); if ( prop == "name" ) continue; - QString value = setObjectProperty( "QAction", objName, prop, n2.firstChild().toElement(), stdset ); + TQString value = setObjectProperty( "TQAction", objName, prop, n2.firstChild().toElement(), stdset ); if ( value.isEmpty() ) continue; - QString call = "self." + objName + "."; + TQString call = "self." + objName + "."; if ( stdset ) call += mkStdSet( prop ) + "(" + value + ")"; else - call += "setProperty(\"" + prop + "\",QVariant(" + value + "))"; + call += "setProperty(\"" + prop + "\",TQVariant(" + value + "))"; #if QT_VERSION >= 0x030300 if (prop == "menuText") @@ -442,14 +442,14 @@ void Uic::createActionImpl( const QDomElement &n, const QString &parent ) } } #if QT_VERSION >= 0x030300 - // workaround for loading pre-3.3 files expecting bogus QAction behavior + // workaround for loading pre-3.3 files expecting bogus TQAction behavior if (!hasMenuText && !actionText.isEmpty() && uiFileVersion < "3.3") trout << indent << "self." << objName << ".setMenuText(" << actionText << ")" << endl; #endif } } -QString get_dock( const QString &d ) +TQString get_dock( const TQString &d ) { if ( d == "0" ) return "Qt.DockUnmanaged"; @@ -468,27 +468,27 @@ QString get_dock( const QString &d ) return ""; } -void Uic::createToolbarImpl( const QDomElement &n, const QString &parentClass, const QString &parent ) +void Uic::createToolbarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &parent ) { - QDomNodeList nl = n.elementsByTagName( "toolbar" ); + TQDomNodeList nl = n.elementsByTagName( "toolbar" ); for ( int i = 0; i < (int) nl.length(); i++ ) { - QDomElement ae = nl.item( i ).toElement(); - QString dock = get_dock( ae.attribute( "dock" ) ); - QString objName = getObjectName( ae ); - out << indent << "self." << objName << " = QToolBar(QString(\"\"),self," << dock << ")" << endl; + TQDomElement ae = nl.item( i ).toElement(); + TQString dock = get_dock( ae.attribute( "dock" ) ); + TQString objName = getObjectName( ae ); + out << indent << "self." << objName << " = TQToolBar(TQString(\"\"),self," << dock << ")" << endl; createObjectImpl( ae, parentClass, parent ); - for ( QDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { + for ( TQDomElement n2 = ae.firstChild().toElement(); !n2.isNull(); n2 = n2.nextSibling().toElement() ) { if ( n2.tagName() == "action" ) { out << indent << "self." << n2.attribute( "name" ) << ".addTo(self." << objName << ")" << endl; } else if ( n2.tagName() == "separator" ) { out << indent << "self." << objName << ".addSeparator()" << endl; } else if ( n2.tagName() == "widget" ) { if ( n2.attribute( "class" ) != "Spacer" ) { - createObjectImpl( n2, "QToolBar", "self." + objName ); + createObjectImpl( n2, "TQToolBar", "self." + objName ); } else { - QString child = createSpacerImpl( n2, parentClass, parent, objName ); - out << indent << "QApplication.sendPostedEvents(self." << objName - << ",QEvent.ChildInserted)" << endl; + TQString child = createSpacerImpl( n2, parentClass, parent, objName ); + out << indent << "TQApplication.sendPostedEvents(self." << objName + << ",TQEvent.ChildInserted)" << endl; out << indent << "self." << objName << ".boxLayout().addItem(" << child << ")" << endl; } } @@ -496,22 +496,22 @@ void Uic::createToolbarImpl( const QDomElement &n, const QString &parentClass, c } } -void Uic::createMenuBarImpl( const QDomElement &n, const QString &parentClass, const QString &parent ) +void Uic::createMenuBarImpl( const TQDomElement &n, const TQString &parentClass, const TQString &parent ) { - QString objName = getObjectName( n ); - out << indent << "self." << objName << " = QMenuBar(self,\"" << objName << "\")" << endl; + TQString objName = getObjectName( n ); + out << indent << "self." << objName << " = TQMenuBar(self,\"" << objName << "\")" << endl; createObjectImpl( n, parentClass, parent ); int i = 0; - QDomElement c = n.firstChild().toElement(); + TQDomElement c = n.firstChild().toElement(); while ( !c.isNull() ) { if ( c.tagName() == "item" ) { - QString itemName = "self." + c.attribute( "name" ); + TQString itemName = "self." + c.attribute( "name" ); out << endl; - out << indent << itemName << " = QPopupMenu(self)" << endl; + out << indent << itemName << " = TQPopupMenu(self)" << endl; createPopupMenuImpl( c, parentClass, itemName ); - out << indent << "self." << objName << ".insertItem(QString(\"\")," << itemName << "," << i << ")" << endl; - QString findItem("self." + objName + ".findItem(%1)"); + out << indent << "self." << objName << ".insertItem(TQString(\"\")," << itemName << "," << i << ")" << endl; + TQString findItem("self." + objName + ".findItem(%1)"); findItem = findItem.arg(i); trout << indent << "if " << findItem << ":" << endl; ++indent; @@ -526,16 +526,16 @@ void Uic::createMenuBarImpl( const QDomElement &n, const QString &parentClass, c } } -void Uic::createPopupMenuImpl( const QDomElement &e, const QString &parentClass, const QString &parent ) +void Uic::createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ) { int i = 0; - for ( QDomElement n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { + for ( TQDomElement n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "action" || n.tagName() == "actiongroup" ) { - QDomElement n2 = n.nextSibling().toElement(); + TQDomElement n2 = n.nextSibling().toElement(); if ( n2.tagName() == "item" ) { // the action has a sub menu - QString itemName = "self." + n2.attribute( "name" ); - QString itemText = n2.attribute( "text" ); - out << indent << itemName << " = QPopupMenu(self)" << endl; + TQString itemName = "self." + n2.attribute( "name" ); + TQString itemText = n2.attribute( "text" ); + out << indent << itemName << " = TQPopupMenu(self)" << endl; out << indent << parent << ".setAccel(" << trcall( n2.attribute( "accel" ) ) << ","; out << parent << ".insertItem(" << "self." << n.attribute( "name" ) << ".iconSet(),"; out << trcall( itemText ) << "," << itemName << "))" << endl; @@ -557,17 +557,17 @@ void Uic::createPopupMenuImpl( const QDomElement &e, const QString &parentClass, Creates implementation of an listbox item tag. */ -QString Uic::createListBoxItemImpl( const QDomElement &e, const QString &parent , - QString *value ) +TQString Uic::createListBoxItemImpl( const TQDomElement &e, const TQString &parent , + TQString *value ) { - QDomElement n = e.firstChild().toElement(); - QString txt; - QString com; - QString pix; + TQDomElement n = e.firstChild().toElement(); + TQString txt; + TQString com; + TQString pix; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) { txt = v.toString(); com = getComment( n ); @@ -577,8 +577,8 @@ QString Uic::createListBoxItemImpl( const QDomElement &e, const QString &parent if ( pixmapLoaderFunction.isEmpty() ) { pix.prepend( "self." ); } else { - pix.prepend( pixmapLoaderFunction + "( " + QString( externPixmaps ? "\"" : "self." ) ); - pix.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pix.prepend( pixmapLoaderFunction + "( " + TQString( externPixmaps ? "\"" : "self." ) ); + pix.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } } @@ -599,16 +599,16 @@ QString Uic::createListBoxItemImpl( const QDomElement &e, const QString &parent Creates implementation of an iconview item tag. */ -QString Uic::createIconViewItemImpl( const QDomElement &e, const QString &parent ) +TQString Uic::createIconViewItemImpl( const TQDomElement &e, const TQString &parent ) { - QDomElement n = e.firstChild().toElement(); - QString txt; - QString com; - QString pix; + TQDomElement n = e.firstChild().toElement(); + TQString txt; + TQString com; + TQString pix; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute( "name" ); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute( "name" ); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) { txt = v.toString(); com = getComment( n ); @@ -618,8 +618,8 @@ QString Uic::createIconViewItemImpl( const QDomElement &e, const QString &parent if ( pixmapLoaderFunction.isEmpty() ) { pix.prepend( "self." ); } else { - pix.prepend( pixmapLoaderFunction + "( " + QString( externPixmaps ? "\"" : "self." ) ); - pix.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pix.prepend( pixmapLoaderFunction + "( " + TQString( externPixmaps ? "\"" : "self." ) ); + pix.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } } @@ -628,24 +628,24 @@ QString Uic::createIconViewItemImpl( const QDomElement &e, const QString &parent } if ( pix.isEmpty() ) - return "QIconViewItem(" + parent + "," + trcall( txt, com ) + ")"; + return "TQIconViewItem(" + parent + "," + trcall( txt, com ) + ")"; else - return "QIconViewItem(" + parent + "," + trcall( txt, com ) + "," + pix + ")"; + return "TQIconViewItem(" + parent + "," + trcall( txt, com ) + "," + pix + ")"; } /*! Creates implementation of an listview item tag. */ -QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent, - const QString &parentItem ) +TQString Uic::createListViewItemImpl( const TQDomElement &e, const TQString &parent, + const TQString &parentItem ) { - QString s; + TQString s; - QDomElement n = e.firstChild().toElement(); + TQDomElement n = e.firstChild().toElement(); bool hasChildren = e.elementsByTagName( "item" ).count() > 0; - QString item; + TQString item; if ( hasChildren ) { item = registerObject( "item" ); @@ -656,26 +656,26 @@ QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent s = trindent + item + " = "; if ( !parentItem.isEmpty() ) - s += "QListViewItem(" + parentItem + "," + lastItem + ")\n"; + s += "TQListViewItem(" + parentItem + "," + lastItem + ")\n"; else - s += "QListViewItem(" + parent + "," + lastItem + ")\n"; + s += "TQListViewItem(" + parent + "," + lastItem + ")\n"; - QStringList texts; - QStringList pixmaps; + TQStringList texts; + TQStringList pixmaps; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute("name"); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute("name"); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) texts << v.toString(); else if ( attrib == "pixmap" ) { - QString pix = v.toString(); + TQString pix = v.toString(); if ( !pix.isEmpty() ) { if ( pixmapLoaderFunction.isEmpty() ) { pix.prepend( "self." ); } else { - pix.prepend( pixmapLoaderFunction + "( " + QString( externPixmaps ? "\"" : "self." ) ); - pix.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pix.prepend( pixmapLoaderFunction + "( " + TQString( externPixmaps ? "\"" : "self." ) ); + pix.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } pixmaps << pix; @@ -689,9 +689,9 @@ QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent for ( int i = 0; i < (int)texts.count(); ++i ) { if ( !texts[ i ].isEmpty() ) - s += trindent + item + ".setText(" + QString::number( i ) + "," + trcall( texts[ i ] ) + ")\n"; + s += trindent + item + ".setText(" + TQString::number( i ) + "," + trcall( texts[ i ] ) + ")\n"; if ( !pixmaps[ i ].isEmpty() ) - s += trindent + item + ".setPixmap(" + QString::number( i ) + "," + pixmaps[ i ] + ")\n"; + s += trindent + item + ".setPixmap(" + TQString::number( i ) + "," + pixmaps[ i ] + ")\n"; } lastItem = item; @@ -702,18 +702,18 @@ QString Uic::createListViewItemImpl( const QDomElement &e, const QString &parent Creates implementation of an listview column tag. */ -QString Uic::createListViewColumnImpl( const QDomElement &e, const QString &parent, - QString *value ) +TQString Uic::createListViewColumnImpl( const TQDomElement &e, const TQString &parent, + TQString *value ) { - QDomElement n = e.firstChild().toElement(); - QString txt; - QString com; - QString pix; + TQDomElement n = e.firstChild().toElement(); + TQString txt; + TQString com; + TQString pix; bool clickable = FALSE, resizable = FALSE; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute("name"); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute("name"); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) { txt = v.toString(); com = getComment( n ); @@ -723,8 +723,8 @@ QString Uic::createListViewColumnImpl( const QDomElement &e, const QString &pare if ( pixmapLoaderFunction.isEmpty() ) { pix.prepend( "self." ); } else { - pix.prepend( pixmapLoaderFunction + "( " + QString( externPixmaps ? "\"" : "self." ) ); - pix.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pix.prepend( pixmapLoaderFunction + "( " + TQString( externPixmaps ? "\"" : "self." ) ); + pix.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } } else if ( attrib == "clickable" ) @@ -738,10 +738,10 @@ QString Uic::createListViewColumnImpl( const QDomElement &e, const QString &pare if ( value ) *value = trcall( txt, com ); - QString s; + TQString s; s = indent + parent + ".addColumn(" + trcall( txt, com ) + ")\n"; if ( !pix.isEmpty() ) - s += indent + parent + ".header().setLabel(" + parent + ".header().count() - 1,QIconSet(" + pix + ")," + trcall( txt, com ) + ")\n"; + s += indent + parent + ".header().setLabel(" + parent + ".header().count() - 1,TQIconSet(" + pix + ")," + trcall( txt, com ) + ")\n"; if ( !clickable ) s += indent + parent + ".header().setClickEnabled(0," + parent + ".header().count() - 1)\n"; if ( !resizable ) @@ -749,20 +749,20 @@ QString Uic::createListViewColumnImpl( const QDomElement &e, const QString &pare return s; } -QString Uic::createTableRowColumnImpl( const QDomElement &e, const QString &parent, - QString *value ) +TQString Uic::createTableRowColumnImpl( const TQDomElement &e, const TQString &parent, + TQString *value ) { - QString objClass = getClassName( e.parentNode().toElement() ); - QDomElement n = e.firstChild().toElement(); - QString txt; - QString com; - QString pix; - QString field; + TQString objClass = getClassName( e.parentNode().toElement() ); + TQDomElement n = e.firstChild().toElement(); + TQString txt; + TQString com; + TQString pix; + TQString field; bool isRow = e.tagName() == "row"; while ( !n.isNull() ) { if ( n.tagName() == "property" ) { - QString attrib = n.attribute("name"); - QVariant v = DomTool::elementToVariant( n.firstChild().toElement(), QVariant() ); + TQString attrib = n.attribute("name"); + TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() ); if ( attrib == "text" ) { txt = v.toString(); com = getComment( n ); @@ -772,8 +772,8 @@ QString Uic::createTableRowColumnImpl( const QDomElement &e, const QString &pare if ( pixmapLoaderFunction.isEmpty() ) { pix.prepend( "self." ); } else { - pix.prepend( pixmapLoaderFunction + "( " + QString( externPixmaps ? "\"" : "self." ) ); - pix.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pix.prepend( pixmapLoaderFunction + "( " + TQString( externPixmaps ? "\"" : "self." ) ); + pix.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } } } else if ( attrib == "field" ) @@ -787,32 +787,32 @@ QString Uic::createTableRowColumnImpl( const QDomElement &e, const QString &pare // ### This generated code sucks! We have to set the number of // rows/cols before and then only do setLabel/() - // ### careful, though, since QDataTable has an API which makes this code pretty good + // ### careful, though, since TQDataTable has an API which makes this code pretty good - QString s; + TQString s; if ( isRow ) { s = indent + parent + ".setNumRows(" + parent + ".numRows() + 1)\n"; if ( pix.isEmpty() ) s += indent + parent + ".verticalHeader().setLabel(" + parent + ".numRows() - 1," + trcall( txt, com ) + ")\n"; else - s += indent + parent + ".verticalHeader().setLabel(" + parent + ".numRows() - 1,QIconSet(" + s += indent + parent + ".verticalHeader().setLabel(" + parent + ".numRows() - 1,TQIconSet(" + pix + ")," + trcall( txt, com ) + ")\n"; } else { - if ( objClass == "QTable" ) { + if ( objClass == "TQTable" ) { s = indent + parent + ".setNumCols(" + parent + ".numCols() + 1)\n"; if ( pix.isEmpty() ) s += indent + parent + ".horizontalHeader().setLabel(" + parent + ".numCols() - 1," + trcall( txt, com ) + ")\n"; else - s += indent + parent + ".horizontalHeader().setLabel(" + parent + ".numCols() - 1,QIconSet(" + s += indent + parent + ".horizontalHeader().setLabel(" + parent + ".numCols() - 1,TQIconSet(" + pix + ")," + trcall( txt, com ) + ")\n"; - } else if ( objClass == "QDataTable" ) { + } else if ( objClass == "TQDataTable" ) { if ( !txt.isEmpty() && !field.isEmpty() ) { if ( pix.isEmpty() ) out << indent << parent << ".addColumn(" << fixString( field ) << "," << trcall( txt, com ) << ")" << endl; else - out << indent << parent << ".addColumn(" << fixString( field ) << "," << trcall( txt, com ) << ",QIconSet(" << pix << "))" << endl; + out << indent << parent << ".addColumn(" << fixString( field ) << "," << trcall( txt, com ) << ",TQIconSet(" << pix << "))" << endl; } } } @@ -822,30 +822,30 @@ QString Uic::createTableRowColumnImpl( const QDomElement &e, const QString &pare /*! Creates the implementation of a layout tag. Called from createObjectImpl(). */ -QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout ) +TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout ) { - QDomElement n; - QString objClass, objName; + TQDomElement n; + TQString objClass, objName; objClass = e.tagName(); - QString qlayout = "QVBoxLayout"; + TQString qlayout = "TQVBoxLayout"; if ( objClass == "hbox" ) - qlayout = "QHBoxLayout"; + qlayout = "TQHBoxLayout"; else if ( objClass == "grid" ) - qlayout = "QGridLayout"; + qlayout = "TQGridLayout"; bool isGrid = e.tagName() == "grid" ; objName = registerObject( getLayoutName( e ) ); layoutObjects += objName; - QString margin = DomTool::readProperty( e, "margin", defMargin ).toString(); - QString spacing = DomTool::readProperty( e, "spacing", defSpacing ).toString(); - QString resizeMode = DomTool::readProperty( e, "resizeMode", QString::null ).toString(); + TQString margin = DomTool::readProperty( e, "margin", defMargin ).toString(); + TQString spacing = DomTool::readProperty( e, "spacing", defSpacing ).toString(); + TQString resizeMode = DomTool::readProperty( e, "resizeMode", TQString::null ).toString(); - QString optcells; + TQString optcells; if ( isGrid ) optcells = "1,1,"; - if ( (parentClass == "QGroupBox" || parentClass == "QButtonGroup") && layout.isEmpty() ) { + if ( (parentClass == "TQGroupBox" || parentClass == "TQButtonGroup") && layout.isEmpty() ) { // special case for group box out << indent << parent << ".setColumnLayout(0,Qt.Vertical)" << endl; out << indent << parent << ".layout().setSpacing(" << spacing << ")" << endl; @@ -864,15 +864,15 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, out << "," << optcells << margin << "," << spacing << ",\"" << objName << "\")" << endl; } if ( !resizeMode.isEmpty() ) - out << indent << objName << ".setResizeMode(QLayout." << resizeMode << ")" << endl; + out << indent << objName << ".setResizeMode(TQLayout." << resizeMode << ")" << endl; if ( !isGrid ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { if ( n.tagName() == "spacer" ) { - QString child = createSpacerImpl( n, parentClass, parent, objName ); + TQString child = createSpacerImpl( n, parentClass, parent, objName ); out << indent << objName << ".addItem(" << child << ")" << endl; } else if ( tags.contains( n.tagName() ) ) { - QString child = createObjectImpl( n, parentClass, parent, objName ); + TQString child = createObjectImpl( n, parentClass, parent, objName ); if ( isLayout( child ) ) out << indent << objName << ".addLayout(" << child << ")" << endl; else @@ -881,7 +881,7 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, } } else { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - QDomElement ae = n; + TQDomElement ae = n; int row = ae.attribute( "row" ).toInt(); int col = ae.attribute( "column" ).toInt(); int rowspan = ae.attribute( "rowspan" ).toInt(); @@ -891,7 +891,7 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, if ( colspan < 1 ) colspan = 1; if ( n.tagName() == "spacer" ) { - QString child = createSpacerImpl( n, parentClass, parent, objName ); + TQString child = createSpacerImpl( n, parentClass, parent, objName ); if ( rowspan * colspan != 1 ) out << indent << objName << ".addMultiCell(" << child << "," << row << "," << ( row + rowspan - 1 ) << "," << col << "," << ( col + colspan - 1 ) << ")" << endl; @@ -899,9 +899,9 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, out << indent << objName << ".addItem(" << child << "," << row << "," << col << ")" << endl; } else if ( tags.contains( n.tagName() ) ) { - QString child = createObjectImpl( n, parentClass, parent, objName ); + TQString child = createObjectImpl( n, parentClass, parent, objName ); out << endl; - QString o = "Widget"; + TQString o = "Widget"; if ( isLayout( child ) ) o = "Layout"; if ( rowspan * colspan != 1 ) @@ -919,31 +919,31 @@ QString Uic::createLayoutImpl( const QDomElement &e, const QString& parentClass, -QString Uic::createSpacerImpl( const QDomElement &e, const QString& /*parentClass*/, const QString& /*parent*/, const QString& /*layout*/) +TQString Uic::createSpacerImpl( const TQDomElement &e, const TQString& /*parentClass*/, const TQString& /*parent*/, const TQString& /*layout*/) { - QDomElement n; - QString objClass, objName; + TQDomElement n; + TQString objClass, objName; objClass = e.tagName(); objName = registerObject( getObjectName( e ) ); - QSize size = DomTool::readProperty( e, "sizeHint", QSize( 0, 0 ) ).toSize(); - QString sizeType = DomTool::readProperty( e, "sizeType", "Expanding" ).toString(); + TQSize size = DomTool::readProperty( e, "sizeHint", TQSize( 0, 0 ) ).toSize(); + TQString sizeType = DomTool::readProperty( e, "sizeType", "Expanding" ).toString(); bool isVspacer = DomTool::readProperty( e, "orientation", "Horizontal" ) == "Vertical"; if ( sizeType != "Expanding" && sizeType != "MinimumExpanding" && DomTool::hasProperty( e, "geometry" ) ) { // compatibility Qt 2.2 - QRect geom = DomTool::readProperty( e, "geometry", QRect(0,0,0,0) ).toRect(); + TQRect geom = DomTool::readProperty( e, "geometry", TQRect(0,0,0,0) ).toRect(); size = geom.size(); } if ( isVspacer ) - out << indent << objName << " = QSpacerItem(" + out << indent << objName << " = TQSpacerItem(" << size.width() << "," << size.height() - << ",QSizePolicy.Minimum,QSizePolicy." << sizeType << ")" << endl; + << ",TQSizePolicy.Minimum,TQSizePolicy." << sizeType << ")" << endl; else - out << indent << objName << " = QSpacerItem(" + out << indent << objName << " = TQSpacerItem(" << size.width() << "," << size.height() - << ",QSizePolicy." << sizeType << ",QSizePolicy.Minimum)" << endl; + << ",TQSizePolicy." << sizeType << ",TQSizePolicy.Minimum)" << endl; return objName; } @@ -958,35 +958,35 @@ static const char* const ColorRole[] = { /*! Creates a colorgroup with name \a name from the color group \a cg */ -void Uic::createColorGroupImpl( const QString& name, const QDomElement& e ) +void Uic::createColorGroupImpl( const TQString& name, const TQDomElement& e ) { - QColorGroup cg; + TQColorGroup cg; int r = -1; - QDomElement n = e.firstChild().toElement(); - QString color; + TQDomElement n = e.firstChild().toElement(); + TQString color; while ( !n.isNull() ) { if ( n.tagName() == "color" ) { r++; - QColor col = DomTool::readColor( n ); - color = "QColor(%1,%2,%3)"; + TQColor col = DomTool::readColor( n ); + color = "TQColor(%1,%2,%3)"; color = color.arg( col.red() ).arg( col.green() ).arg( col.blue() ); if ( col == white ) color = "Qt.white"; else if ( col == black ) color = "Qt.black"; if ( n.nextSibling().toElement().tagName() != "pixmap" ) { - out << indent << name << ".setColor(QColorGroup." << ColorRole[r] << "," << color << ")" << endl; + out << indent << name << ".setColor(TQColorGroup." << ColorRole[r] << "," << color << ")" << endl; } } else if ( n.tagName() == "pixmap" ) { - QString pixmap = n.firstChild().toText().data(); + TQString pixmap = n.firstChild().toText().data(); if ( pixmapLoaderFunction.isEmpty() ) { pixmap.prepend( "self." ); } else { - pixmap.prepend( pixmapLoaderFunction + "(" + QString( externPixmaps ? "\"" : "self." ) ); - pixmap.append( QString( externPixmaps ? "\"" : "" ) + ")" ); + pixmap.prepend( pixmapLoaderFunction + "(" + TQString( externPixmaps ? "\"" : "self." ) ); + pixmap.append( TQString( externPixmaps ? "\"" : "" ) + ")" ); } - out << indent << name << ".setBrush(QColorGroup." - << ColorRole[r] << ",QBrush(" << color << "," << pixmap << "))" << endl; + out << indent << name << ".setBrush(TQColorGroup." + << ColorRole[r] << ",TQBrush(" << color << "," << pixmap << "))" << endl; } n = n.nextSibling().toElement(); } @@ -996,16 +996,16 @@ void Uic::createColorGroupImpl( const QString& name, const QDomElement& e ) Auxiliary function to load a color group. The colorgroup must not contain pixmaps. */ -QColorGroup Uic::loadColorGroup( const QDomElement &e ) +TQColorGroup Uic::loadColorGroup( const TQDomElement &e ) { - QColorGroup cg; + TQColorGroup cg; int r = -1; - QDomElement n = e.firstChild().toElement(); - QColor col; + TQDomElement n = e.firstChild().toElement(); + TQColor col; while ( !n.isNull() ) { if ( n.tagName() == "color" ) { r++; - cg.setColor( (QColorGroup::ColorRole)r, (col = DomTool::readColor( n ) ) ); + cg.setColor( (TQColorGroup::ColorRole)r, (col = DomTool::readColor( n ) ) ); } n = n.nextSibling().toElement(); } @@ -1016,10 +1016,10 @@ QColorGroup Uic::loadColorGroup( const QDomElement &e ) the database \a connection and \a table. */ -bool Uic::isWidgetInTable( const QDomElement& e, const QString& connection, const QString& table ) +bool Uic::isWidgetInTable( const TQDomElement& e, const TQString& connection, const TQString& table ) { - QString conn = getDatabaseInfo( e, "connection" ); - QString tab = getDatabaseInfo( e, "table" ); + TQString conn = getDatabaseInfo( e, "connection" ); + TQString tab = getDatabaseInfo( e, "table" ); if ( conn == connection && tab == table ) return TRUE; return FALSE; @@ -1029,17 +1029,17 @@ bool Uic::isWidgetInTable( const QDomElement& e, const QString& connection, cons Registers all database connections, cursors and forms. */ -void Uic::registerDatabases( const QDomElement& e ) +void Uic::registerDatabases( const TQDomElement& e ) { - QDomElement n; - QDomNodeList nl; + TQDomElement n; + TQDomNodeList nl; int i; nl = e.parentNode().toElement().elementsByTagName( "widget" ); for ( i = 0; i < (int) nl.length(); ++i ) { n = nl.item(i).toElement(); - QString conn = getDatabaseInfo( n, "connection" ); - QString tab = getDatabaseInfo( n, "table" ); - QString fld = getDatabaseInfo( n, "field" ); + TQString conn = getDatabaseInfo( n, "connection" ); + TQString tab = getDatabaseInfo( n, "table" ); + TQString fld = getDatabaseInfo( n, "field" ); if ( !conn.isNull() ) { dbConnections += conn; if ( !tab.isNull() ) { @@ -1059,7 +1059,7 @@ void Uic::registerDatabases( const QDomElement& e ) \sa registeredName(), isObjectRegistered() */ -QString Uic::registerObject( const QString& name ) +TQString Uic::registerObject( const TQString& name ) { if ( objectNames.isEmpty() ) { // some temporary variables we need @@ -1069,7 +1069,7 @@ QString Uic::registerObject( const QString& name ) objectNames += "pal"; } - QString result = name; + TQString result = name; int i; while ( ( i = result.find(' ' )) != -1 ) { result[i] = '_'; @@ -1077,10 +1077,10 @@ QString Uic::registerObject( const QString& name ) if ( objectNames.contains( result ) ) { int i = 2; - while ( objectNames.contains( result + "_" + QString::number(i) ) ) + while ( objectNames.contains( result + "_" + TQString::number(i) ) ) i++; result += "_"; - result += QString::number(i); + result += TQString::number(i); } objectNames += result; objectMapper.insert( name, result ); @@ -1093,7 +1093,7 @@ QString Uic::registerObject( const QString& name ) \sa registerObject(), isObjectRegistered() */ -QString Uic::registeredName( const QString& name ) +TQString Uic::registeredName( const TQString& name ) { if ( !objectMapper.contains( name ) ) return name; @@ -1103,22 +1103,22 @@ QString Uic::registeredName( const QString& name ) /*! Returns whether the object \a name was registered yet or not. */ -bool Uic::isObjectRegistered( const QString& name ) +bool Uic::isObjectRegistered( const TQString& name ) { return objectMapper.contains( name ); } /*! - Unifies the entries in stringlist \a list. Should really be a QStringList feature. + Unifies the entries in stringlist \a list. Should really be a TQStringList feature. */ -QStringList Uic::unique( const QStringList& list ) +TQStringList Uic::unique( const TQStringList& list ) { if ( list.isEmpty() ) return list; - QStringList result; - for ( QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { + TQStringList result; + for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { if ( !result.contains(*it) ) result += *it; } @@ -1130,7 +1130,7 @@ QStringList Uic::unique( const QStringList& list ) /*! Creates an instance of class \a objClass, with parent \a parent and name \a objName */ -QString Uic::createObjectInstance( const QString& objClass, const QString& parent, const QString& objName ) +TQString Uic::createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName ) { if ( objClass.mid( 1 ) == "ComboBox" ) { @@ -1139,7 +1139,7 @@ QString Uic::createObjectInstance( const QString& objClass, const QString& paren return objClass + "(" + parent + ",\"" + objName + "\")"; } -bool Uic::isLayout( const QString& name ) const +bool Uic::isLayout( const TQString& name ) const { return layoutObjects.contains( name ); } diff --git a/python/pyqt/pyuic3/uic.h b/python/pyqt/pyuic3/uic.h index ea52ac34..0fceff50 100644 --- a/python/pyqt/pyuic3/uic.h +++ b/python/pyqt/pyuic3/uic.h @@ -21,13 +21,13 @@ #ifndef UIC_H #define UIC_H -#include <qdom.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qmap.h> -#include <qtextstream.h> -#include <qpalette.h> -#include <qvariant.h> +#include <tqdom.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqmap.h> +#include <tqtextstream.h> +#include <tqpalette.h> +#include <tqvariant.h> #define PYQT_VERSION "3.17.2" @@ -42,12 +42,12 @@ public: uint setIndent(uint i) {uint old = current; current = i; calc(); return old;} void operator++() {++current; calc();} void operator--() {--current; calc();} - operator QString() {return indstr;} + operator TQString() {return indstr;} private: uint tabStop; uint current; - QString indstr; + TQString indstr; void calc(); }; @@ -56,86 +56,86 @@ private: class Uic : public Qt { public: - Uic( const QString &fn, const char *outputFn, QTextStream& out, - QDomDocument doc, bool subcl, const QString &trm, - const QString& subclname, QString &uicClass ); + Uic( const TQString &fn, const char *outputFn, TQTextStream& out, + TQDomDocument doc, bool subcl, const TQString &trm, + const TQString& subclname, TQString &uicClass ); static void setIndent(const PyIndent &pyind) {indent = pyind; trindent = pyind;} - void createFormImpl( const QDomElement &e ); - - void createSubImpl( const QDomElement &e, const QString& subclname ); - - void createActionImpl( const QDomElement& e, const QString &parent ); - void createToolbarImpl( const QDomElement &e, const QString &parentClass, const QString &parent ); - void createMenuBarImpl( const QDomElement &e, const QString &parentClass, const QString &parent ); - void createPopupMenuImpl( const QDomElement &e, const QString &parentClass, const QString &parent ); - QString createObjectImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout = QString::null ); - QString createLayoutImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout = QString::null ); - QString createObjectInstance( const QString& objClass, const QString& parent, const QString& objName ); - QString createSpacerImpl( const QDomElement &e, const QString& parentClass, const QString& parent, const QString& layout = QString::null ); - void createExclusiveProperty( const QDomElement & e, const QString& exclusiveProp ); - QString createListBoxItemImpl( const QDomElement &e, const QString &parent, QString *value = 0 ); - QString createIconViewItemImpl( const QDomElement &e, const QString &parent ); - QString createListViewColumnImpl( const QDomElement &e, const QString &parent, QString *value = 0 ); - QString createTableRowColumnImpl( const QDomElement &e, const QString &parent, QString *value = 0 ); - QString createListViewItemImpl( const QDomElement &e, const QString &parent, - const QString &parentItem ); - void createColorGroupImpl( const QString& cg, const QDomElement& e ); - QColorGroup loadColorGroup( const QDomElement &e ); - - QDomElement getObjectProperty( const QDomElement& e, const QString& name ); - QString getPixmapLoaderFunction( const QDomElement& e ); - QString getFormClassName( const QDomElement& e ); - QString getClassName( const QDomElement& e ); - QString getObjectName( const QDomElement& e ); - QString getLayoutName( const QDomElement& e ); - QString getInclude( const QString& className ); - - QString setObjectProperty( const QString& objClass, const QString& obj, const QString &prop, const QDomElement &e, bool stdset ); - - QString registerObject( const QString& name ); - QString registeredName( const QString& name ); - bool isObjectRegistered( const QString& name ); - QStringList unique( const QStringList& ); - - QString trcall( const QString& sourceText, const QString& comment = "" ); - - static void embed( QTextStream& out, const char* project, const QStringList& images ); + void createFormImpl( const TQDomElement &e ); + + void createSubImpl( const TQDomElement &e, const TQString& subclname ); + + void createActionImpl( const TQDomElement& e, const TQString &parent ); + void createToolbarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + void createMenuBarImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + void createPopupMenuImpl( const TQDomElement &e, const TQString &parentClass, const TQString &parent ); + TQString createObjectImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null ); + TQString createLayoutImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null ); + TQString createObjectInstance( const TQString& objClass, const TQString& parent, const TQString& objName ); + TQString createSpacerImpl( const TQDomElement &e, const TQString& parentClass, const TQString& parent, const TQString& layout = TQString::null ); + void createExclusiveProperty( const TQDomElement & e, const TQString& exclusiveProp ); + TQString createListBoxItemImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createIconViewItemImpl( const TQDomElement &e, const TQString &parent ); + TQString createListViewColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createTableRowColumnImpl( const TQDomElement &e, const TQString &parent, TQString *value = 0 ); + TQString createListViewItemImpl( const TQDomElement &e, const TQString &parent, + const TQString &parentItem ); + void createColorGroupImpl( const TQString& cg, const TQDomElement& e ); + TQColorGroup loadColorGroup( const TQDomElement &e ); + + TQDomElement getObjectProperty( const TQDomElement& e, const TQString& name ); + TQString getPixmapLoaderFunction( const TQDomElement& e ); + TQString getFormClassName( const TQDomElement& e ); + TQString getClassName( const TQDomElement& e ); + TQString getObjectName( const TQDomElement& e ); + TQString getLayoutName( const TQDomElement& e ); + TQString getInclude( const TQString& className ); + + TQString setObjectProperty( const TQString& objClass, const TQString& obj, const TQString &prop, const TQDomElement &e, bool stdset ); + + TQString registerObject( const TQString& name ); + TQString registeredName( const TQString& name ); + bool isObjectRegistered( const TQString& name ); + TQStringList unique( const TQStringList& ); + + TQString trcall( const TQString& sourceText, const TQString& comment = "" ); + + static void embed( TQTextStream& out, const char* project, const TQStringList& images ); private: - QTextStream& out; - QTextOStream trout; - QString languageChangeBody; - QCString outputFileName; - QStringList objectNames; - QMap<QString,QString> objectMapper; - QStringList tags; - QStringList layouts; - QString formName; - QString lastItem; - QString trmacro; + TQTextStream& out; + TQTextOStream trout; + TQString languageChangeBody; + TQCString outputFileName; + TQStringList objectNames; + TQMap<TQString,TQString> objectMapper; + TQStringList tags; + TQStringList layouts; + TQString formName; + TQString lastItem; + TQString trmacro; static PyIndent indent, trindent; struct Buddy { - Buddy( const QString& k, const QString& b ) + Buddy( const TQString& k, const TQString& b ) : key( k ), buddy( b ) {} Buddy(){} // for valuelist - QString key; - QString buddy; + TQString key; + TQString buddy; bool operator==( const Buddy& other ) const { return (key == other.key); } }; struct CustomInclude { - QString header; - QString location; + TQString header; + TQString location; }; - QValueList<Buddy> buddies; + TQValueList<Buddy> buddies; - QStringList layoutObjects; - bool isLayout( const QString& name ) const; + TQStringList layoutObjects; + bool isLayout( const TQString& name ) const; uint item_used : 1; uint cg_used : 1; @@ -144,39 +144,39 @@ private: uint externPixmaps : 1; #if QT_VERSION >= 0x030300 - QString uiFileVersion; + TQString uiFileVersion; #endif - QString nameOfClass; - QStringList namespaces; - QString bareNameOfClass; - QString pixmapLoaderFunction; - - void registerDatabases( const QDomElement& e ); - bool isWidgetInTable( const QDomElement& e, const QString& connection, const QString& table ); - bool isFrameworkCodeGenerated( const QDomElement& e ); - QString getDatabaseInfo( const QDomElement& e, const QString& tag ); - void createFormImpl( const QDomElement& e, const QString& form, const QString& connection, const QString& table ); - void writeFunctionsSubImpl( const QStringList &fuLst, const QStringList &typLst, const QStringList &specLst, - const QString &subClass, const QString &descr ); - QStringList dbConnections; - QMap< QString, QStringList > dbCursors; - QMap< QString, QStringList > dbForms; + TQString nameOfClass; + TQStringList namespaces; + TQString bareNameOfClass; + TQString pixmapLoaderFunction; + + void registerDatabases( const TQDomElement& e ); + bool isWidgetInTable( const TQDomElement& e, const TQString& connection, const TQString& table ); + bool isFrameworkCodeGenerated( const TQDomElement& e ); + TQString getDatabaseInfo( const TQDomElement& e, const TQString& tag ); + void createFormImpl( const TQDomElement& e, const TQString& form, const TQString& connection, const TQString& table ); + void writeFunctionsSubImpl( const TQStringList &fuLst, const TQStringList &typLst, const TQStringList &specLst, + const TQString &subClass, const TQString &descr ); + TQStringList dbConnections; + TQMap< TQString, TQStringList > dbCursors; + TQMap< TQString, TQStringList > dbForms; static bool isMainWindow; - static QString mkBool( bool b ); - static QString mkBool( const QString& s ); - bool toBool( const QString& s ); - static QString fixString( const QString &str, bool encode = FALSE ); + static TQString mkBool( bool b ); + static TQString mkBool( const TQString& s ); + bool toBool( const TQString& s ); + static TQString fixString( const TQString &str, bool encode = FALSE ); static bool onlyAscii; - static QString mkStdSet( const QString& prop ); - static QString getComment( const QDomNode& n ); - QVariant defSpacing, defMargin; - QString fileName; + static TQString mkStdSet( const TQString& prop ); + static TQString getComment( const TQDomNode& n ); + TQVariant defSpacing, defMargin; + TQString fileName; bool writeFunctImpl; - void pySlot(QStringList::ConstIterator &it); + void pySlot(TQStringList::ConstIterator &it); - QString pyCode; + TQString pyCode; bool pyNeedTr, pyNeedTrUtf8; }; diff --git a/python/pyqt/pyuic3/widgetdatabase.cpp b/python/pyqt/pyuic3/widgetdatabase.cpp index 6c447d5b..79a2c8b8 100644 --- a/python/pyqt/pyuic3/widgetdatabase.cpp +++ b/python/pyqt/pyuic3/widgetdatabase.cpp @@ -27,15 +27,15 @@ #include "widgetdatabase.h" #include "widgetinterface.h" -#include <qapplication.h> +#include <tqapplication.h> #define NO_STATIC_COLORS #include <globaldefs.h> -#include <qstrlist.h> -#include <qdict.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qcleanuphandler.h> -#include <qfeatures.h> +#include <tqstrlist.h> +#include <tqdict.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqcleanuphandler.h> +#include <tqfeatures.h> #include <stdlib.h> @@ -43,17 +43,17 @@ const int dbsize = 300; const int dbcustom = 200; const int dbdictsize = 211; static WidgetDatabaseRecord* db[ dbsize ]; -static QDict<int> *className2Id = 0; +static TQDict<int> *className2Id = 0; static int dbcount = 0; static int dbcustomcount = 200; -static QStrList *wGroups; -static QStrList *invisibleGroups; +static TQStrList *wGroups; +static TQStrList *invisibleGroups; static bool whatsThisLoaded = FALSE; static QPluginManager<WidgetInterface> *widgetPluginManager = 0; static bool plugins_set_up = FALSE; static bool was_in_setup = FALSE; -QCleanupHandler<QPluginManager<WidgetInterface> > cleanup_manager; +TQCleanupHandler<QPluginManager<WidgetInterface> > cleanup_manager; WidgetDatabaseRecord::WidgetDatabaseRecord() { @@ -121,14 +121,14 @@ void WidgetDatabase::setupDataBase( int id ) invisibleGroups = new QStrList; invisibleGroups->append( "Forms" ); invisibleGroups->append( "Temp" ); - className2Id = new QDict<int>( dbdictsize ); + className2Id = new TQDict<int>( dbdictsize ); className2Id->setAutoDelete( TRUE ); WidgetDatabaseRecord *r = 0; r = new WidgetDatabaseRecord; r->iconSet = "designer_pushbutton.png"; - r->name = "QPushButton"; + r->name = "TQPushButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Push Button"; r->isCommon = TRUE; @@ -137,7 +137,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_toolbutton.png"; - r->name = "QToolButton"; + r->name = "TQToolButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Tool Button"; @@ -145,7 +145,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_radiobutton.png"; - r->name = "QRadioButton"; + r->name = "TQRadioButton"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Radio Button"; r->isCommon = TRUE; @@ -154,7 +154,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_checkbox.png"; - r->name = "QCheckBox"; + r->name = "TQCheckBox"; r->group = widgetGroup( "Buttons" ); r->toolTip = "Check Box"; r->isCommon = TRUE; @@ -163,7 +163,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_groupbox.png"; - r->name = "QGroupBox"; + r->name = "TQGroupBox"; r->group = widgetGroup( "Containers" ); r->toolTip = "Group Box"; r->isContainer = TRUE; @@ -172,7 +172,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_buttongroup.png"; - r->name = "QButtonGroup"; + r->name = "TQButtonGroup"; r->group = widgetGroup( "Containers" ); r->toolTip = "Button Group"; r->isContainer = TRUE; @@ -182,7 +182,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_frame.png"; - r->name = "QFrame"; + r->name = "TQFrame"; r->group = widgetGroup( "Containers" ); r->toolTip = "Frame"; r->isContainer = TRUE; @@ -191,7 +191,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_tabwidget.png"; - r->name = "QTabWidget"; + r->name = "TQTabWidget"; r->group = widgetGroup( "Containers" ); r->toolTip = "Tabwidget"; r->isContainer = TRUE; @@ -200,7 +200,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_widgetstack.png"; - r->name = "QWidgetStack"; + r->name = "TQWidgetStack"; r->group = widgetGroup( "Containers" ); r->toolTip = "Widget Stack"; r->isContainer = TRUE; @@ -209,7 +209,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_toolbox.png"; - r->name = "QToolBox"; + r->name = "TQToolBox"; r->group = widgetGroup( "Containers" ); r->toolTip = "Tool Box"; r->isContainer = TRUE; @@ -218,7 +218,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_listbox.png"; - r->name = "QListBox"; + r->name = "TQListBox"; r->group = widgetGroup( "Views" ); r->toolTip = "List Box"; r->isCommon = TRUE; @@ -227,7 +227,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_listview.png"; - r->name = "QListView"; + r->name = "TQListView"; r->group = widgetGroup( "Views" ); r->toolTip = "List View"; @@ -236,7 +236,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(QT_NO_ICONVIEW) || defined(UIC) r = new WidgetDatabaseRecord; r->iconSet = "designer_iconview.png"; - r->name = "QIconView"; + r->name = "TQIconView"; r->group = widgetGroup( "Views" ); r->toolTip = "Icon View"; @@ -246,7 +246,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(QT_NO_TABLE) r = new WidgetDatabaseRecord; r->iconSet = "designer_table.png"; - r->name = "QTable"; + r->name = "TQTable"; r->group = widgetGroup( "Views" ); r->toolTip = "Table"; @@ -256,8 +256,8 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(QT_NO_SQL) r = new WidgetDatabaseRecord; r->iconSet = "designer_datatable.png"; - r->includeFile = "qdatatable.h"; - r->name = "QDataTable"; + r->includeFile = "tqdatatable.h"; + r->name = "TQDataTable"; r->group = widgetGroup( "Database" ); r->toolTip = "Data Table"; @@ -266,7 +266,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_lineedit.png"; - r->name = "QLineEdit"; + r->name = "TQLineEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Line Edit"; r->isCommon = TRUE; @@ -275,7 +275,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_spinbox.png"; - r->name = "QSpinBox"; + r->name = "TQSpinBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Spin Box"; r->isCommon = TRUE; @@ -287,7 +287,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "QDateEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Date Edit"; - r->includeFile = "qdatetimeedit.h"; + r->includeFile = "tqdatetimeedit.h"; append( r ); @@ -296,7 +296,7 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "QTimeEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Time Edit"; - r->includeFile = "qdatetimeedit.h"; + r->includeFile = "tqdatetimeedit.h"; append( r ); @@ -305,13 +305,13 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "QDateTimeEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Date-Time Edit"; - r->includeFile = "qdatetimeedit.h"; + r->includeFile = "tqdatetimeedit.h"; append( r ); r = new WidgetDatabaseRecord; r->iconSet = "designer_multilineedit.png"; - r->name = "QMultiLineEdit"; + r->name = "TQMultiLineEdit"; r->group = widgetGroup( "Temp" ); r->toolTip = "Multi Line Edit"; @@ -319,7 +319,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_richtextedit.png"; - r->name = "QTextEdit"; + r->name = "TQTextEdit"; r->group = widgetGroup( "Input" ); r->toolTip = "Rich Text Edit"; r->isCommon = TRUE; @@ -328,7 +328,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_combobox.png"; - r->name = "QComboBox"; + r->name = "TQComboBox"; r->group = widgetGroup( "Input" ); r->toolTip = "Combo Box"; r->isCommon = TRUE; @@ -337,7 +337,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_slider.png"; - r->name = "QSlider"; + r->name = "TQSlider"; r->group = widgetGroup( "Input" ); r->toolTip = "Slider"; @@ -345,7 +345,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_scrollbar.png"; - r->name = "QScrollBar"; + r->name = "TQScrollBar"; r->group = widgetGroup( "Input" ); r->toolTip = "Scrollbar"; @@ -353,7 +353,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_dial.png"; - r->name = "QDial"; + r->name = "TQDial"; r->group = widgetGroup( "Input" ); r->toolTip = "Dial"; @@ -361,7 +361,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_label.png"; - r->name = "QLabel"; + r->name = "TQLabel"; r->group = widgetGroup( "Temp" ); r->toolTip = "Label"; @@ -388,7 +388,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_lcdnumber.png"; - r->name = "QLCDNumber"; + r->name = "TQLCDNumber"; r->group = widgetGroup( "Display" ); r->toolTip = "LCD Number"; @@ -399,14 +399,14 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "Line"; r->group = widgetGroup( "Display" ); r->toolTip = "Line"; - r->includeFile = "qframe.h"; + r->includeFile = "tqframe.h"; r->whatsThis = "The Line widget provides horizontal and vertical lines."; append( r ); r = new WidgetDatabaseRecord; r->iconSet = "designer_progress.png"; - r->name = "QProgressBar"; + r->name = "TQProgressBar"; r->group = widgetGroup( "Display" ); r->toolTip = "Progress Bar"; @@ -414,7 +414,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_textview.png"; - r->name = "QTextView"; + r->name = "TQTextView"; r->group = widgetGroup( "Temp" ); r->toolTip = "Text View"; @@ -422,7 +422,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_textbrowser.png"; - r->name = "QTextBrowser"; + r->name = "TQTextBrowser"; r->group = widgetGroup( "Display" ); r->toolTip = "Text Browser"; @@ -438,21 +438,21 @@ void WidgetDatabase::setupDataBase( int id ) append( r ); r = new WidgetDatabaseRecord; - r->name = "QWidget"; + r->name = "TQWidget"; r->isForm = TRUE; r->group = widgetGroup( "Forms" ); append( r ); r = new WidgetDatabaseRecord; - r->name = "QDialog"; + r->name = "TQDialog"; r->group = widgetGroup( "Forms" ); r->isForm = TRUE; append( r ); r = new WidgetDatabaseRecord; - r->name = "QWizard"; + r->name = "TQWizard"; r->group = widgetGroup( "Forms" ); r->isContainer = TRUE; @@ -474,9 +474,9 @@ void WidgetDatabase::setupDataBase( int id ) append( r ); r = new WidgetDatabaseRecord; - r->name = "QSplitter"; + r->name = "TQSplitter"; r->group = widgetGroup( "Temp" ); - r->includeFile = "qsplitter.h"; + r->includeFile = "tqsplitter.h"; r->isContainer = TRUE; append( r ); @@ -507,8 +507,8 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QMainWindow"; - r->includeFile = "qmainwindow.h"; + r->name = "TQMainWindow"; + r->includeFile = "tqmainwindow.h"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -517,7 +517,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; r->name = "QDesignerAction"; - r->includeFile = "qaction.h"; + r->includeFile = "tqaction.h"; r->group = widgetGroup( "Temp" ); r->isContainer = FALSE; @@ -526,7 +526,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; r->name = "QDesignerActionGroup"; - r->includeFile = "qaction.h"; + r->includeFile = "tqaction.h"; r->group = widgetGroup( "Temp" ); r->isContainer = FALSE; @@ -534,8 +534,8 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QScrollView"; - r->includeFile = "qscrollview.h"; + r->name = "TQScrollView"; + r->includeFile = "tqscrollview.h"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -544,8 +544,8 @@ void WidgetDatabase::setupDataBase( int id ) #ifndef QT_NO_SQL r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QDataBrowser"; - r->includeFile = "qdatabrowser.h"; + r->name = "TQDataBrowser"; + r->includeFile = "tqdatabrowser.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data Browser"; r->iconSet = "designer_databrowser.png"; @@ -555,8 +555,8 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QDataView"; - r->includeFile = "qdataview.h"; + r->name = "TQDataView"; + r->includeFile = "tqdataview.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data View"; r->iconSet = "designer_dataview.png"; @@ -575,8 +575,8 @@ void WidgetDatabase::setupPlugins() if ( plugins_set_up ) return; plugins_set_up = TRUE; - QStringList widgets = widgetManager()->featureList(); - for ( QStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) { + TQStringList widgets = widgetManager()->featureList(); + for ( TQStringList::Iterator it = widgets.begin(); it != widgets.end(); ++it ) { if ( hasWidget( *it ) ) continue; WidgetDatabaseRecord *r = new WidgetDatabaseRecord; @@ -586,11 +586,11 @@ void WidgetDatabase::setupPlugins() continue; #ifndef UIC - QIconSet icon = iface->iconSet( *it ); + TQIconSet icon = iface->iconSet( *it ); if ( !icon.pixmap().isNull() ) - r->icon = new QIconSet( icon ); + r->icon = new TQIconSet( icon ); #endif - QString grp = iface->group( *it ); + TQString grp = iface->group( *it ); if ( grp.isEmpty() ) grp = "3rd party widgets"; r->group = widgetGroup( grp ); @@ -629,24 +629,24 @@ int WidgetDatabase::startCustom() Returns the iconset which represents the class registered as \a id. */ -QIconSet WidgetDatabase::iconSet( int id ) +TQIconSet WidgetDatabase::iconSet( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QIconSet(); + return TQIconSet(); #if !defined(UIC) && !defined(RESOURCE) if ( !r->icon ) { if ( r->iconSet.isEmpty() ) - return QIconSet(); - QPixmap pix = QPixmap::fromMimeSource( r->iconSet ); + return TQIconSet(); + TQPixmap pix = TQPixmap::fromMimeSource( r->iconSet ); if ( pix.isNull() ) - pix = QPixmap( r->iconSet ); - r->icon = new QIconSet( pix ); + pix = TQPixmap( r->iconSet ); + r->icon = new TQIconSet( pix ); } return *r->icon; #else - return QIconSet(); + return TQIconSet(); #endif } @@ -654,12 +654,12 @@ QIconSet WidgetDatabase::iconSet( int id ) Returns the classname of the widget which is registered as \a id. */ -QString WidgetDatabase::className( int id ) +TQString WidgetDatabase::className( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->name; } @@ -667,12 +667,12 @@ QString WidgetDatabase::className( int id ) Returns the group the widget registered as \a id belongs to. */ -QString WidgetDatabase::group( int id ) +TQString WidgetDatabase::group( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->group; } @@ -680,12 +680,12 @@ QString WidgetDatabase::group( int id ) Returns the tooltip text of the widget which is registered as \a id. */ -QString WidgetDatabase::toolTip( int id ) +TQString WidgetDatabase::toolTip( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->toolTip; } @@ -693,12 +693,12 @@ QString WidgetDatabase::toolTip( int id ) Returns the what's this? text of the widget which is registered as \a id. */ -QString WidgetDatabase::whatsThis( int id ) +TQString WidgetDatabase::whatsThis( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; return r->whatsThis; } @@ -706,12 +706,12 @@ QString WidgetDatabase::whatsThis( int id ) Returns the include file if the widget which is registered as \a id. */ -QString WidgetDatabase::includeFile( int id ) +TQString WidgetDatabase::includeFile( int id ) { setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return QString::null; + return TQString::null; if ( r->includeFile.isNull() ) return r->name.lower() + ".h"; return r->includeFile; @@ -749,10 +749,10 @@ bool WidgetDatabase::isCommon( int id ) return r->isCommon; } -QString WidgetDatabase::createWidgetName( int id ) +TQString WidgetDatabase::createWidgetName( int id ) { setupDataBase( id ); - QString n = className( id ); + TQString n = className( id ); if ( n == "QLayoutWidget" ) n = "Layout"; if ( n[ 0 ] == 'Q' && n[ 1 ].lower() != n[ 1 ] ) @@ -764,14 +764,14 @@ QString WidgetDatabase::createWidgetName( int id ) WidgetDatabaseRecord *r = at( id ); if ( !r ) return n; - n += QString::number( ++r->nameCounter ); + n += TQString::number( ++r->nameCounter ); n[0] = n[0].lower(); return n; } /*! Returns the id for \a name or -1 if \a name is unknown. */ -int WidgetDatabase::idFromClassName( const QString &name ) +int WidgetDatabase::idFromClassName( const TQString &name ) { setupDataBase( -1 ); if ( name.isEmpty() ) @@ -790,7 +790,7 @@ int WidgetDatabase::idFromClassName( const QString &name ) return -1; } -bool WidgetDatabase::hasWidget( const QString &name ) +bool WidgetDatabase::hasWidget( const TQString &name ) { return className2Id->find( name ) != 0; } @@ -823,14 +823,14 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) insert( dbcount++, r ); } -QString WidgetDatabase::widgetGroup( const QString &g ) +TQString WidgetDatabase::widgetGroup( const TQString &g ) { if ( wGroups->find( g ) == -1 ) wGroups->append( g ); return g; } -bool WidgetDatabase::isGroupEmpty( const QString &grp ) +bool WidgetDatabase::isGroupEmpty( const TQString &grp ) { WidgetDatabaseRecord *r = 0; for ( int i = 0; i < dbcount; ++i ) { @@ -842,12 +842,12 @@ bool WidgetDatabase::isGroupEmpty( const QString &grp ) return TRUE; } -QString WidgetDatabase::widgetGroup( int i ) +TQString WidgetDatabase::widgetGroup( int i ) { setupDataBase( -1 ); if ( i >= 0 && i < (int)wGroups->count() ) return wGroups->at( i ); - return QString::null; + return TQString::null; } int WidgetDatabase::numWidgetGroups() @@ -856,7 +856,7 @@ int WidgetDatabase::numWidgetGroups() return wGroups->count(); } -bool WidgetDatabase::isGroupVisible( const QString &g ) +bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase( -1 ); return invisibleGroups->find( g ) == -1; @@ -868,8 +868,8 @@ int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) return dbcustomcount - 1; } -void WidgetDatabase::customWidgetClassNameChanged( const QString &oldName, - const QString &newName ) +void WidgetDatabase::customWidgetClassNameChanged( const TQString &oldName, + const TQString &newName ) { int id = idFromClassName( oldName ); if ( id == -1 ) @@ -901,16 +901,16 @@ bool WidgetDatabase::isWhatsThisLoaded() return whatsThisLoaded; } -void WidgetDatabase::loadWhatsThis( const QString &docPath ) +void WidgetDatabase::loadWhatsThis( const TQString &docPath ) { - QString whatsthisFile = docPath + "/whatsthis"; - QFile f( whatsthisFile ); + TQString whatsthisFile = docPath + "/whatsthis"; + TQFile f( whatsthisFile ); if ( !f.open( IO_ReadOnly ) ) return; - QTextStream ts( &f ); + TQTextStream ts( &f ); while ( !ts.atEnd() ) { - QString s = ts.readLine(); - QStringList l = QStringList::split( " | ", s ); + TQString s = ts.readLine(); + TQStringList l = TQStringList::split( " | ", s ); int id = idFromClassName( l[ 1 ] ); WidgetDatabaseRecord *r = at( id ); if ( r ) @@ -923,27 +923,27 @@ void WidgetDatabase::loadWhatsThis( const QString &docPath ) // ### Qt 3.1: make these publically accessible via QWidgetDatabase API #if defined(UIC) bool dbnounload = FALSE; -QStringList *dbpaths = 0; +TQStringList *dbpaths = 0; #else -extern QString *qwf_plugin_dir; +extern TQString *qwf_plugin_dir; #endif QPluginManager<WidgetInterface> *widgetManager() { if ( !widgetPluginManager ) { - QString pluginDir = "/designer"; + TQString pluginDir = "/designer"; #if !defined(UIC) if ( qwf_plugin_dir ) pluginDir = *qwf_plugin_dir; #endif - widgetPluginManager = new QPluginManager<WidgetInterface>( IID_Widget, QApplication::libraryPaths(), pluginDir ); + widgetPluginManager = new QPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), pluginDir ); cleanup_manager.add( &widgetPluginManager ); #if defined(UIC) if ( dbnounload ) widgetPluginManager->setAutoUnload( FALSE ); if ( dbpaths ) { - QStringList::ConstIterator it = dbpaths->begin(); + TQStringList::ConstIterator it = dbpaths->begin(); for ( ; it != dbpaths->end(); ++it ) widgetPluginManager->addLibraryPath( *it ); } diff --git a/python/pyqt/pyuic3/widgetdatabase.h b/python/pyqt/pyuic3/widgetdatabase.h index b44ef885..c75c2a59 100644 --- a/python/pyqt/pyuic3/widgetdatabase.h +++ b/python/pyqt/pyuic3/widgetdatabase.h @@ -27,8 +27,8 @@ #ifndef WIDGETDATABASE_H #define WIDGETDATABASE_H -#include <qiconset.h> -#include <qstring.h> +#include <tqiconset.h> +#include <tqstring.h> #include "widgetinterface.h" // up here for GCC 2.7.* compatibility #include <private/qpluginmanager_p.h> @@ -39,12 +39,12 @@ struct WidgetDatabaseRecord { WidgetDatabaseRecord(); ~WidgetDatabaseRecord(); - QString iconSet, name, group, toolTip, whatsThis, includeFile; + TQString iconSet, name, group, toolTip, whatsThis, includeFile; uint isContainer : 1; uint isForm : 1; uint isCommon : 1; uint isPlugin : 1; - QIconSet *icon; + TQIconSet *icon; int nameCounter; }; @@ -58,38 +58,38 @@ public: static int count(); static int startCustom(); - static QIconSet iconSet( int id ); - static QString className( int id ); - static QString group( int id ); - static QString toolTip( int id ); - static QString whatsThis( int id ); - static QString includeFile( int id ); + static TQIconSet iconSet( int id ); + static TQString className( int id ); + static TQString group( int id ); + static TQString toolTip( int id ); + static TQString whatsThis( int id ); + static TQString includeFile( int id ); static bool isForm( int id ); static bool isContainer( int id ); static bool isCommon( int id ); - static int idFromClassName( const QString &name ); - static QString createWidgetName( int id ); + static int idFromClassName( const TQString &name ); + static TQString createWidgetName( int id ); static WidgetDatabaseRecord *at( int index ); static void insert( int index, WidgetDatabaseRecord *r ); static void append( WidgetDatabaseRecord *r ); - static QString widgetGroup( const QString &g ); - static QString widgetGroup( int i ); + static TQString widgetGroup( const TQString &g ); + static TQString widgetGroup( int i ); static int numWidgetGroups(); - static bool isGroupVisible( const QString &g ); - static bool isGroupEmpty( const QString &grp ); + static bool isGroupVisible( const TQString &g ); + static bool isGroupEmpty( const TQString &grp ); static int addCustomWidget( WidgetDatabaseRecord *r ); static bool isCustomWidget( int id ); static bool isCustomPluginWidget( int id ); static bool isWhatsThisLoaded(); - static void loadWhatsThis( const QString &docPath ); + static void loadWhatsThis( const TQString &docPath ); - static bool hasWidget( const QString &name ); - static void customWidgetClassNameChanged( const QString &oldName, const QString &newName ); + static bool hasWidget( const TQString &name ); + static void customWidgetClassNameChanged( const TQString &oldName, const TQString &newName ); }; |