Browse Source

Initial TQt conversion

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
8a055d66f4
100 changed files with 5545 additions and 5537 deletions
  1. 687
    687
      ChangeLog
  2. 6
    6
      LICENSE
  3. 285
    285
      NEWS
  4. 11
    11
      README
  5. 7
    7
      README.AIX
  6. 11
    11
      README.SunOS
  7. 6
    6
      THANKS
  8. 85
    85
      build.py
  9. 157
    157
      configure.py
  10. 1058
    1058
      doc/PyQt.html
  11. 1101
    1101
      doc/PyQt.sgml
  12. 203
    203
      doc/qtdocs.sip
  13. 2
    2
      examples2/README
  14. 13
    13
      examples2/aclock.py
  15. 58
    58
      examples2/addressbook.py
  16. 38
    38
      examples2/application.py
  17. 23
    23
      examples2/buttongroups.py
  18. 8
    8
      examples2/dclock.py
  19. 22
    22
      examples2/desktop.py
  20. 10
    10
      examples2/dirview.py
  21. 18
    18
      examples2/dragdrop.py
  22. 26
    26
      examples2/dropsite.py
  23. 6
    6
      examples2/gears.py
  24. 46
    46
      examples2/menu.py
  25. 10
    10
      examples2/secret.py
  26. 33
    33
      examples2/semaphore.py
  27. 13
    13
      examples2/splitter.py
  28. 8
    8
      examples2/table.py
  29. 309
    309
      examples2/themes.py
  30. BIN
      examples2/trolltech.bmp
  31. BIN
      examples2/trolltech.gif
  32. BIN
      examples2/tt-logo.png
  33. 3
    3
      examples2/tut1.py
  34. 24
    24
      examples2/tut10.py
  35. 35
    35
      examples2/tut11.py
  36. 45
    45
      examples2/tut12.py
  37. 55
    55
      examples2/tut13.py
  38. 67
    67
      examples2/tut14.py
  39. 5
    5
      examples2/tut2.py
  40. 6
    6
      examples2/tut3.py
  41. 6
    6
      examples2/tut4.py
  42. 8
    8
      examples2/tut5.py
  43. 11
    11
      examples2/tut6.py
  44. 11
    11
      examples2/tut7.py
  45. 17
    17
      examples2/tut8.py
  46. 22
    22
      examples2/tut9.py
  47. 124
    124
      examples2/widgets.py
  48. 2
    2
      examples3/README
  49. 14
    14
      examples3/SQL/README
  50. 17
    17
      examples3/SQL/connect.ui
  51. 3
    3
      examples3/SQL/connect.ui.h
  52. 10
    10
      examples3/SQL/dbconnect.py
  53. 2
    2
      examples3/SQL/dbpar.py
  54. 2
    2
      examples3/SQL/form1.ui
  55. 28
    28
      examples3/SQL/form2.ui
  56. 29
    29
      examples3/SQL/frmconnect.py
  57. 14
    14
      examples3/SQL/frmconnect.ui
  58. 2
    2
      examples3/SQL/runform1.py
  59. 2
    2
      examples3/SQL/runform2.py
  60. 23
    23
      examples3/SQL/runsqlex.py
  61. 17
    17
      examples3/SQL/sqlcustom1.py
  62. 20
    20
      examples3/SQL/sqlex.ui
  63. 4
    4
      examples3/SQL/sqlex.ui.h
  64. 34
    34
      examples3/SQL/sqlsubclass5.py
  65. 25
    25
      examples3/SQL/sqltable4.py
  66. 12
    4
      examples3/SQL/testdb_pg.sql
  67. 13
    13
      examples3/aclock.py
  68. 58
    58
      examples3/addressbook.py
  69. 38
    38
      examples3/application.py
  70. 9
    9
      examples3/biff.py
  71. 4
    4
      examples3/bigtable.py
  72. 26
    26
      examples3/buttongroups.py
  73. BIN
      examples3/canvas/butterfly.png
  74. 131
    131
      examples3/canvas/canvas.py
  75. BIN
      examples3/canvas/qtlogo.png
  76. 24
    24
      examples3/checklists.py
  77. 16
    16
      examples3/cursor.py
  78. 8
    8
      examples3/dclock.py
  79. 24
    24
      examples3/desktop.py
  80. 64
    64
      examples3/dirview.py
  81. 18
    18
      examples3/dragdrop.py
  82. 10
    10
      examples3/drawlines.py
  83. 26
    26
      examples3/dropsite.py
  84. 38
    38
      examples3/fontdisplayer.py
  85. 32
    32
      examples3/fonts.py
  86. 6
    6
      examples3/gears.py
  87. 17
    17
      examples3/i18n/i18n.py
  88. 12
    12
      examples3/i18n/mywidget.py
  89. 2
    2
      examples3/i18n/mywidget_cs.ts
  90. 1
    1
      examples3/i18n/mywidget_de.ts
  91. 1
    1
      examples3/i18n/mywidget_el.ts
  92. 1
    1
      examples3/i18n/mywidget_en.ts
  93. 1
    1
      examples3/i18n/mywidget_eo.ts
  94. 1
    1
      examples3/i18n/mywidget_fr.ts
  95. 1
    1
      examples3/i18n/mywidget_it.ts
  96. 1
    1
      examples3/i18n/mywidget_jp.ts
  97. 1
    1
      examples3/i18n/mywidget_ko.ts
  98. 1
    1
      examples3/i18n/mywidget_no.ts
  99. 1
    1
      examples3/i18n/mywidget_ru.ts
  100. 0
    0
      examples3/i18n/mywidget_zh.ts

+ 687
- 687
ChangeLog
File diff suppressed because it is too large
View File


+ 6
- 6
LICENSE View File

@@ -109,9 +109,9 @@ above, provided that you also meet all of these conditions:
109 109
     these conditions, and telling the user how to view a copy of this
110 110
     License.  (Exception: if the Program itself is interactive but
111 111
     does not normally print such an announcement, your work based on
112
-    the Program is not required to print an announcement.)
112
+    the Program is not retquired to print an announcement.)
113 113
 
114
-These requirements apply to the modified work as a whole.  If
114
+These retquirements apply to the modified work as a whole.  If
115 115
 identifiable sections of that work are not derived from the Program,
116 116
 and can be reasonably considered independent and separate works in
117 117
 themselves, then this License, and its terms, do not apply to those
@@ -177,7 +177,7 @@ However, parties who have received copies, or rights, from you under
177 177
 this License will not have their licenses terminated so long as such
178 178
 parties remain in full compliance.
179 179
 
180
-  5. You are not required to accept this License, since you have not
180
+  5. You are not retquired to accept this License, since you have not
181 181
 signed it.  However, nothing else grants you permission to modify or
182 182
 distribute the Program or its derivative works.  These actions are
183 183
 prohibited by law if you do not accept this License.  Therefore, by
@@ -263,14 +263,14 @@ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
263 263
 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
264 264
 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
265 265
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
266
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
266
+TO THE TQUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
267 267
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
268 268
 REPAIR OR CORRECTION.
269 269
 
270
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
270
+  12. IN NO EVENT UNLESS RETQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
271 271
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
272 272
 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
273
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
273
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSETQUENTIAL DAMAGES ARISING
274 274
 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
275 275
 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
276 276
 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER

+ 285
- 285
NEWS View File

@@ -10,9 +10,9 @@ v3.17.6 17th November 2008
10 10
 v3.17.5 8th November 2008
11 11
   - Added the /Constrained/ argument annotations for enums needed by SIP v4.7.8
12 12
     and later.
13
-  - Added the missing QRegion.rects() (based on a patch from Hans-Peter
13
+  - Added the missing TQRegion.rects() (based on a patch from Hans-Peter
14 14
     Jansen).
15
-  - Added the missing QWidget.stackUnder() slot.
15
+  - Added the missing TQWidget.stackUnder() slot.
16 16
 
17 17
 v3.17.4 6th December 2007
18 18
   - Changes to be able to be built by SIP v4.7.2 and later.
@@ -25,100 +25,100 @@ v3.17.2 25th April 2007
25 25
   - A minor bug fix release for a regression in v3.17.1.
26 26
 
27 27
 v3.17.1 10th April 2007
28
-  - This version requires SIP v4.6 (or later).
28
+  - This version retquires SIP v4.6 (or later).
29 29
   - Changes to ensure compatibility with future SIP releases.
30 30
 
31 31
 v3.17 4th November 2006
32 32
   - Added support for Python v2.5.
33
-  - Added the missing QImage.bitBlt() function.
34
-  - Added the missing QListView.setSelectionAnchor() method.
35
-  - Added the missing QStringList.__iadd__(QString) method.
36
-  - Updated the QScintilla bindings for v1.17.
33
+  - Added the missing TQImage.bitBlt() function.
34
+  - Added the missing TQListView.setSelectionAnchor() method.
35
+  - Added the missing TQStringList.__iadd__(TQString) method.
36
+  - Updated the TQScintilla bindings for v1.17.
37 37
 
38 38
 v3.16 24th March 2006
39
-  - This version requires SIP v4.4 (or later).
40
-  - PyQt3 can be installed alongside PyQt4.
41
-  - Concatenating Python strings and QStrings is now supported.
42
-  - QString now supports the * and *= operators that behave as they do for
39
+  - This version retquires SIP v4.4 (or later).
40
+  - PyTQt3 can be installed alongside PyTQt4.
41
+  - Concatenating Python strings and TQStrings is now supported.
42
+  - TQString now supports the * and *= operators that behave as they do for
43 43
     Python strings.
44
-  - Removed some QString methods that weren't appropriate in a Python context
44
+  - Removed some TQString methods that weren't appropriate in a Python context
45 45
     and would have caused problems had they ever been used.
46
-  - QString is more interoperable with Python string and unicode objects.  For
46
+  - TQString is more interoperable with Python string and unicode objects.  For
47 47
     example they can be passed as arguments to open() and to most (but not all)
48 48
     string methods.
49
-  - QObject.sender() now handles Python signals.
49
+  - TQObject.sender() now handles Python signals.
50 50
   - Added the missing MacintoshVersion enum.
51 51
   - The convention for converting between a C/C++ null pointer and Python's
52 52
     None object has now been universally applied.  In previous versions a null
53
-    pointer to, for example, a Qt list container would often be converted to an
53
+    pointer to, for example, a TQt list container would often be converted to an
54 54
     empty list rather than None.
55 55
   - PYQT_BUILD has been removed.
56
-  - QPopupMenu (and sub-classes) instances now transfer ownership of the menu
56
+  - TQPopupMenu (and sub-classes) instances now transfer ownership of the menu
57 57
     to Python in the call to exec_loop().  This means the menu's resources are
58 58
     all released when the Python wrapper is garbage collected without needing
59
-    to call QObject.deleteLater().
59
+    to call TQObject.deleteLater().
60 60
 
61 61
 v3.15.1 14th November 2005
62
-  - Added the missing QApplication constructor.
62
+  - Added the missing TQApplication constructor.
63 63
   - Added the -f flag to configure.py to use any existing features file (by
64 64
     default it is recreated).
65 65
 
66 66
 v3.15 30th August 2005
67
-  - This version requires SIP v4.3 (or later).
68
-  - Added registerWeakActiveObject() and revokeActiveObject() to QAxBase.
69
-  - Added the missing QString + operator.
70
-  - PyQt classes now support Python's cyclic garbage collector.
71
-  - QDialog (and sub-classes) instances now transfer ownership of the dialog to
67
+  - This version retquires SIP v4.3 (or later).
68
+  - Added registerWeakActiveObject() and revokeActiveObject() to TQAxBase.
69
+  - Added the missing TQString + operator.
70
+  - PyTQt classes now support Python's cyclic garbage collector.
71
+  - TQDialog (and sub-classes) instances now transfer ownership of the dialog to
72 72
     Python in the call to exec_loop().  This means the dialog's resources are
73 73
     all released when the Python wrapper is garbage collected without needing
74
-    to call QObject.deleteLater().
74
+    to call TQObject.deleteLater().
75 75
   - Automatic type conversion to more specific sub-classes using available
76 76
     real-time type information has been improved so that, if a sub-class isn't
77 77
     recognised then the most specific sub-class is used rather than the base
78 78
     class.
79
-  - Automatic type conversion for QLayoutItem and sub-classes has been added.
80
-  - Added support for QScintilla v1.6.
79
+  - Automatic type conversion for TQLayoutItem and sub-classes has been added.
80
+  - Added support for TQScintilla v1.6.
81 81
 
82 82
 v3.14.1 6th March 2005
83 83
   - A minor bug fix release.
84 84
 
85 85
 v3.14 19th February 2005
86
-  - This version requires SIP v4.2 (or later) or SIP v3.12 (or later).
86
+  - This version retquires SIP v4.2 (or later) or SIP v3.12 (or later).
87 87
   - Added the qInstallMsgHandler() function.
88
-  - Added support for QScintilla v1.5.
88
+  - Added support for TQScintilla v1.5.
89 89
   - Added support for the VendorID package.
90 90
   - Added the qdir.py example.
91 91
 
92 92
 v3.13 21st September 2004
93
-  - Added the QUuid, QMetaObject and QMetaProperty classes.
94
-  - Added metaObject() to QObject.
95
-  - Added the comparison operators between QChar and QChar and char.
96
-  - Added all the QDataStream << and >> operators for classes.
97
-  - Added support for QScintilla v1.4.
98
-  - Added explicit support for QScintilla to pyuic.
93
+  - Added the TQUuid, TQMetaObject and TQMetaProperty classes.
94
+  - Added metaObject() to TQObject.
95
+  - Added the comparison operators between TQChar and TQChar and char.
96
+  - Added all the TQDataStream << and >> operators for classes.
97
+  - Added support for TQScintilla v1.4.
98
+  - Added explicit support for TQScintilla to pyuic.
99 99
 
100 100
 v3.12 25th May 2004
101
-  - QValueList<QVariant> is implemented as a Python list of QVariant instances.
102
-  - Added support for QScintilla v1.3.
101
+  - TQValueList<TQVariant> is implemented as a Python list of TQVariant instances.
102
+  - Added support for TQScintilla v1.3.
103 103
   - Compiler error messages are suppressed during configuration but can be seen
104 104
     using the new -w flag to configure.py.
105 105
 
106 106
 v3.11 11th March 2004
107
-  - Added the QIconDragEvent and QLocale classes from Qt v3.3.0.
108
-  - Updated all existing classes to Qt v3.3.1.
109
-  - Added the missing QSocketDevice class.
110
-  - Added the missing QString += operators.
107
+  - Added the TQIconDragEvent and TQLocale classes from TQt v3.3.0.
108
+  - Updated all existing classes to TQt v3.3.1.
109
+  - Added the missing TQSocketDevice class.
110
+  - Added the missing TQString += operators.
111 111
 
112 112
 v3.10 16th January 2004
113
-  - Added the QFtp, QHttp, QHttpHeader, QHttpRequestHeader,
114
-    QHttpResponseHeader, QLocalFs classes.
113
+  - Added the TQFtp, TQHttp, TQHttpHeader, TQHttpRequestHeader,
114
+    TQHttpResponseHeader, TQLocalFs classes.
115 115
 
116 116
 v3.9 7th December 2003
117
-  - This version requires SIP v3.9 (or later) or SIP v4.0rc1 (or later).
118
-  - QLayoutIterator.next() is now documented.
119
-  - Added the QImageIO and QListViewItemIterator classes.
120
-  - Added the QDockArea << and >> operators.
121
-  - Added readBoolEntry() to QSettings.
117
+  - This version retquires SIP v3.9 (or later) or SIP v4.0rc1 (or later).
118
+  - TQLayoutIterator.next() is now documented.
119
+  - Added the TQImageIO and TQListViewItemIterator classes.
120
+  - Added the TQDockArea << and >> operators.
121
+  - Added readBoolEntry() to TQSettings.
122 122
   - Added qInstallPath(), qInstallPathDocs(), qInstallPathHeaders(),
123 123
     qInstallPathLibs(), qInstallPathBins(), qInstallPathPlugins(),
124 124
     qInstallPathData(), qInstallPathTranslations(), qInstallPathSysconf().
@@ -130,33 +130,33 @@ v3.9 7th December 2003
130 130
     .sip files.
131 131
 
132 132
 v3.8.1 6th September 2003
133
-  - Added the missing QWMatrix.mapRect() * operators.
134
-  - The supported educational version is now Qt v3.2.0.
133
+  - Added the missing TQWMatrix.mapRect() * operators.
134
+  - The supported educational version is now TQt v3.2.0.
135 135
 
136 136
 v3.8 17th August 2003
137
-  - Added the -k flag to build.py to build the PyQt modules as static
137
+  - Added the -k flag to build.py to build the PyTQt modules as static
138 138
     libraries.
139
-  - Added operators to QBrush, QColor, QDate, QDateTime, QDir, QDomeNode,
140
-    QFont, QImage, QKeySequence, QPalette, QPen, QPoint, QRect, QRegExp,
141
-    QRegion, QSize, QString, QTime, QUrl and QWMatrix (thanks to Torsten
139
+  - Added operators to TQBrush, TQColor, TQDate, TQDateTime, TQDir, TQDomeNode,
140
+    TQFont, TQImage, TQKeySequence, TQPalette, TQPen, TQPoint, TQRect, TQRegExp,
141
+    TQRegion, TQSize, TQString, TQTime, TQUrl and TQWMatrix (thanks to Torsten
142 142
     Marek).
143
-  - Added the missing Qt.MetaButton.
144
-  - Updated all classes for Qt v3.2.0.
145
-  - Added the QSplashScreen, QSqlSelectCursor and QToolBox classes for Qt
143
+  - Added the missing TQt.MetaButton.
144
+  - Updated all classes for TQt v3.2.0.
145
+  - Added the TQSplashScreen, TQSqlSelectCursor and TQToolBox classes for TQt
146 146
     v3.2.0.
147
-  - Added support for QScintilla v1.2.
147
+  - Added support for TQScintilla v1.2.
148 148
 
149 149
 v3.7 5th July 2003
150 150
   - Implemented __setitem__(), __delitem__(), __add__(), __iadd__(), __mul__(),
151
-    __imul__(), __eq__() and __ne__() for QStringList.
151
+    __imul__(), __eq__() and __ne__() for TQStringList.
152 152
   - Lots of new examples from Jorge Arroyo.
153
-  - dir() of a PyQt class now returns all attributes.
154
-  - Added bits(), scanLine(), jumpTable() and colorTable() to QImage.
153
+  - dir() of a PyTQt class now returns all attributes.
154
+  - Added bits(), scanLine(), jumpTable() and colorTable() to TQImage.
155 155
   - Added toShort(), toUShort(), toInt(), toUInt(), toLong(), toULong(),
156
-    toFloat() and toDouble() to QCString and QString.
157
-  - Added the QWindowsXPStyle (Windows XP only), QextScintillaLexerHTML,
158
-    QextScintillaLexerSQL and QSignalMapper classes.
159
-  - pyuic (for Qt v3) now accepts a "-test" command line argument to allow
156
+    toFloat() and toDouble() to TQCString and TQString.
157
+  - Added the TQWindowsXPStyle (Windows XP only), QextScintillaLexerHTML,
158
+    QextScintillaLexerSQL and TQSignalMapper classes.
159
+  - pyuic (for TQt v3) now accepts a "-test" command line argument to allow
160 160
     generated code to be run to completion without needing any user
161 161
     interaction.
162 162
   - Added modificationAttempted() to QextScintilla.
@@ -164,33 +164,33 @@ v3.7 5th July 2003
164 164
 v3.6 26th April 2003
165 165
   - Added the QextScintillaAPIs, QextScintillaCommand, QextScintillaCommandSet,
166 166
     QextScintillaMacros and QextScintillaPrinter classes to the qtext module.
167
-  - Added the QCopEnvelope class to the qtpe module.
168
-  - QString.startsWith() was missing for Qt v2 starting with Qt v2.2.0.
169
-  - Implemented the QTextStream << QMainWindow and QTextStream >> QMainWindow
167
+  - Added the TQCopEnvelope class to the qtpe module.
168
+  - TQString.startsWith() was missing for TQt v2 starting with TQt v2.2.0.
169
+  - Implemented the TQTextStream << TQMainWindow and TQTextStream >> TQMainWindow
170 170
     operators.
171 171
   - pyuic will now extract Python code from the comments section of a .ui file.
172 172
   - pyuic now supports PEP 263.
173 173
   - Added the biff.py, checklists.py, drawlines.py and modified buttongroups.py
174 174
     examples from Oleksandr Yakovlyev.
175 175
   - Added the qtui module (thanks to Hans-Peter Jansen).
176
-  - Support for Qt v3.1.2 added.
176
+  - Support for TQt v3.1.2 added.
177 177
   - PYQT_VERSION is now the version encoded as a hexadecimal value.
178 178
   - Added PYQT_VERSION_STR.
179 179
 
180 180
 v3.5 11th December 2002
181
-  - Added the qtext module containing the bindings for QScintilla.
182
-  - Added the missing QDockWindow.drawFrame(), QGLWidget.reparent() and
183
-    QMainWindow.lineUpDockWindows() methods.
184
-  - Added the missing QGLColorMap class.
185
-  - Support for Qt v3.0.6, v3.1.0 and v3.1.1 added.
186
-  - Added the Qt v3.1.x QAssistantClient, QEventLoop, QIconFactory,
187
-  - QIMComposeEvent, QMutexLocker and QSyntaxHighlighter classes, and
181
+  - Added the qtext module containing the bindings for TQScintilla.
182
+  - Added the missing TQDockWindow.drawFrame(), TQGLWidget.reparent() and
183
+    TQMainWindow.lineUpDockWindows() methods.
184
+  - Added the missing TQGLColorMap class.
185
+  - Support for TQt v3.0.6, v3.1.0 and v3.1.1 added.
186
+  - Added the TQt v3.1.x TQAssistantClient, TQEventLoop, TQIconFactory,
187
+  - TQIMComposeEvent, TQMutexLocker and TQSyntaxHighlighter classes, and
188 188
     qCompress() and qUncompress functions.
189 189
   - Removed eric from the distribution as it is now packaged separately.
190 190
   - The SQL examples now support PostgreSQL as well as MySQL.
191
-  - Added the Qtopia v1.5.0 AppLnk, AppLnkSet, Config, DateFormat, DocLnk,
191
+  - Added the TQtopia v1.5.0 AppLnk, AppLnkSet, Config, DateFormat, DocLnk,
192 192
     DocLnkSet, FileManager, FileSelector, FileSelectorItem, FontDatabase,
193
-    Global, MenuButton, QDawg, QList<AppLnk>, QList<DocLnk> and Resource
193
+    Global, MenuButton, TQDawg, TQList<AppLnk>, TQList<DocLnk> and Resource
194 194
     classes.
195 195
 
196 196
 v3.4 10th September 2002
@@ -199,33 +199,33 @@ v3.4 10th September 2002
199 199
   - Added the progress.py example from Hans-Peter Jansen.
200 200
   - Added the mdi.py and canvas.py examples from Sadi Kose.
201 201
   - Added QT_TR_NOOP() and QT_TRANSLATE_NOOP().
202
-  - Added QApplication.winEventFilter(), QWidget.winEvent(), MSG and POINT
202
+  - Added TQApplication.winEventFilter(), TQWidget.winEvent(), MSG and POINT
203 203
     under Windows.
204
-  - PyQt is now licensed under several licenses including the GPL and a
204
+  - PyTQt is now licensed under several licenses including the GPL and a
205 205
     commercial license.
206 206
 
207 207
 v3.3.2 12th July 2002
208 208
   - Build system changes.
209 209
 
210 210
 v3.3.1 9th July 2002
211
-  - Support for Qt v3.0.5 added.
211
+  - Support for TQt v3.0.5 added.
212 212
 
213 213
 v3.3 7th July 2002
214 214
   - Added README.SunOS.
215
-  - QValueList<QPixmap> is now fully implemented as a mapping to a Python list
216
-    of QPixmap instances.
217
-  - QSqlRecordInfo is now implemented as a Python list of QSqlFieldInfo
215
+  - TQValueList<TQPixmap> is now fully implemented as a mapping to a Python list
216
+    of TQPixmap instances.
217
+  - TQSqlRecordInfo is now implemented as a Python list of TQSqlFieldInfo
218 218
     instances.
219
-  - Added the missing QDoubleValidator.setBottom(),
220
-    QDoubleValidator.setDecimals(), QDoubleValidator.setTop,
221
-    QFontMetrics.boundingRect(), QFontMetrics.size(),
222
-    QIntValidator.setBottom(), QIntValidator.setTop(), QString.compare() and
223
-    QString.localeAwareCompare().
219
+  - Added the missing TQDoubleValidator.setBottom(),
220
+    TQDoubleValidator.setDecimals(), TQDoubleValidator.setTop,
221
+    TQFontMetrics.boundingRect(), TQFontMetrics.size(),
222
+    TQIntValidator.setBottom(), TQIntValidator.setTop(), TQString.compare() and
223
+    TQString.localeAwareCompare().
224 224
   - Added the qmake based build system.
225 225
   - Added lots of eric patches from Detlev Offenbach.  (eric should now work
226 226
     again and has new features.)
227 227
   - Added the SQL examples from Hans-Peter Jansen.
228
-  - pyuic for Qt v3 can now extract Python code from .ui files (thanks to
228
+  - pyuic for TQt v3 can now extract Python code from .ui files (thanks to
229 229
     Christian Bird).
230 230
 
231 231
 v3.2.4 18th May 2002
@@ -239,332 +239,332 @@ v3.2.1 5th May 2002
239 239
   - Bug fixes only from the latest SIP.
240 240
 
241 241
 v3.2 5th May 2002
242
-  - Instances that are sub-classes of QObject and created by Qt (by factory
242
+  - Instances that are sub-classes of TQObject and created by TQt (by factory
243 243
     methods, or plugin managers for example) will now have the correct Python
244 244
     class.
245
-  - Added the missing QToolTip.setEnabled() and QToolTip.enabled().
245
+  - Added the missing TQToolTip.setEnabled() and TQToolTip.enabled().
246 246
   - Added support for MacOS X.
247
-  - Added PYQT_VERSION as the PyQt release number as a string.
247
+  - Added PYQT_VERSION as the PyTQt release number as a string.
248 248
   - Added the semaphore.py example.
249
-  - Any Python object can now be passed as the data element of a QCustomEvent.
250
-  - configure now searches for Qt v3.0.4.
249
+  - Any Python object can now be passed as the data element of a TQCustomEvent.
250
+  - configure now searches for TQt v3.0.4.
251 251
 
252 252
 v3.1 23rd March 2002
253
-  - Removed the internal QDateTimeEditBase and QDragResponseEvent classes.
254
-  - Added the QValueList<QImageTextLangKey> mapped class.
255
-  - Added the missing QImageTextLangKey class.
256
-  - Added the missing QActionGroup.add(), QActionGroup.addSeparator(),
257
-    QImage.dotsPerMeterX(), QImage.dotsPerMeterY(), QImage.setDotsPerMeterX(),
258
-    QImage.setDotsPerMeterY(), QImage.offset(), QImage.setOffset(),
259
-    QImage.textList(), QImage.textLanguages(), QImage.textKeys(), QImage.text()
260
-    and QImage.setText() methods.
261
-  - Added support for Qt/Embedded on the Sharp Zaurus.
262
-  - Added the start of the qtpe (Qt Palmtop Environment) module.
263
-  - Changes required for Qt v3.0.1 and v3.0.2.
253
+  - Removed the internal TQDateTimeEditBase and TQDragResponseEvent classes.
254
+  - Added the TQValueList<TQImageTextLangKey> mapped class.
255
+  - Added the missing TQImageTextLangKey class.
256
+  - Added the missing TQActionGroup.add(), TQActionGroup.addSeparator(),
257
+    TQImage.dotsPerMeterX(), TQImage.dotsPerMeterY(), TQImage.setDotsPerMeterX(),
258
+    TQImage.setDotsPerMeterY(), TQImage.offset(), TQImage.setOffset(),
259
+    TQImage.textList(), TQImage.textLanguages(), TQImage.textKeys(), TQImage.text()
260
+    and TQImage.setText() methods.
261
+  - Added support for TQt/Embedded on the Sharp Zaurus.
262
+  - Added the start of the qtpe (TQt Palmtop Environment) module.
263
+  - Changes retquired for TQt v3.0.1 and v3.0.2.
264 264
   - configure now allows the location of zlib to be specified.
265 265
   - configure now allows the directory to where the Python modules are
266 266
     installed to be specified.
267
-  - configure now searches for Qt v3.0.1, v3.0.2 and v3.0.3.
268
-  - Changes required by the latest SIP.
267
+  - configure now searches for TQt v3.0.1, v3.0.2 and v3.0.3.
268
+  - Changes retquired by the latest SIP.
269 269
   - Added the dragdrop example from Issac Trotts.
270 270
   - Added /ReleaseLock/ to everything that might block.
271 271
   - Upgraded to autoconf-2.53 and automake-1.6.
272 272
 
273 273
 v3.0 17th November 2001
274
-  - Added the missing QChar.nbsp class variable.
275
-  - Added the missing QChar.isLetterOrNumber(), QChar.mirroredChar(),
276
-    QColorDialog.customColor(), QCustomDialog.customCount(),
277
-    QColorDialog.getRgba(), QCustomDialog.setCustomColor(), QFileDialog.done(),
278
-    QHeader.setUpdatesEnabled(), QHeader.showEvent(), QIconView.dropped(),
279
-    QIconViewItem.dropped(), QImage.inputFormatList(),
280
-    QImage.outputFormatList(), QLayoutIterator.next(), QLineEdit.displayText(),
281
-    QListBox.isRubberSelecting(), QMenuBar.activateItemAt(),
282
-    QMenuBar.focusInEvent(), QMenuBar.isDefaultUp(), QMenuBar.minimumSize(),
283
-    QMenuBar.minimumSizeHint(), QMenuBar.setDefaultUp(), QMenuData.findItem(),
284
-    QMimeSourceFactory.filePath(), QMimeSourceFactory.addFilePath(),
285
-    QMotifPlusStyle.drawMenuBarItem(), QMotifPlusStyle.drawPopupMenuItem(),
286
-    QMotifStyle.drawPopupMenuItem(), QMotifStyle.extraPopupMenuItemWidth(),
287
-    QMotifStyle.popupMenuItemHeight(), QNetworkProtocol.newChildren(),
288
-    QPlatinumStyle.drawPopupMenuItem(),
289
-    QPlatinumStyle.extraPopupMenuItemWidth(),
290
-    QPlatinumStyle.popupMenuItemHeight(), QPainter.pos(), QPalette.inactive(),
291
-    QPopupMenu.drawItem(), QPopupMenu.itemHeight(), QPrintDialog.addButton(),
292
-    QProgressDialog.forceShow(), QScrollBar.lineStep(), QScrollBar.maxValue(),
293
-    QScrollBar.minValue(), QScrollBar.pageStep(), QScrollBar.setLineStep(),
294
-    QScrollBar.setMaxValue(), QScrollBar.setMinValue(),
295
-    QScrollBar.setPageStep(), QScrollBar.setValue(), QScrollBar.value(),
296
-    QStyle.drawPopupMenuItem(), QStyle.drawMenuBarItem(),
297
-    QStyle.extraPopupMenuItemWidth(), QStyle.popupMenuItemHeight(),
298
-    QToolTip.hide(), QToolTipGroup.enabled(), QToolTipGroup.setEnabled(),
299
-    QTranslator.messages(), QUrlOperator.newChildren(),
300
-    QUrlOperator.startNextCopy(), QWindowsStyle.drawPopupMenuItem(),
301
-    QWindowsStyle.extraPopupMenuItemWidth() and
302
-    QWindowsStyle.popupMenuItemHeight() methods.
303
-  - Added all missing methods that use QDataStream.
304
-  - Added the missing QDir.match(), QObject.connect(), QRect.contains(),
305
-    QString.append() and QString.prepend() variants.
306
-  - Added the missing QAccel and QImage ctors.
307
-  - Added the missing QColorDrag, QDns, QIconDrag, QIconDragItem, QMenuItem,
308
-    QSGIStyle and QSound classes.
309
-  - Renamed QDate.isValidDate() to QDate.isValid(), QFile.fileExists() to
310
-    QFile.exists(), QFile.removeFile() to QFile.remove(), QLineEdit.del() to
311
-    QLineEdit.delChar(), QMultiLineEdit.deleteChar() to
312
-    QMultiLineEdit.delChar(), and QTime.IsValidTime() to QTime.isValid().
313
-  - Added the QCanvasSpline, QCheckTableItem, QComboTableItem,
314
-    QCustomMenuEvent, QDataBrowser, QDataTable, QDataView, QDateEdit,
315
-    QDateTimeEdit, QDesktopWidget, QDockArea, QDockWindow, QEditorFactory,
316
-    QErrorMessage, QGridView, QIMEvent, QKeySequence, QLibrary,
317
-    QObjectCleanupHandler, QPixmapCache, QProcess, QRegExpValidator, QSettings,
318
-    QSql, QSqlCursor, QSqlDatabase, QSqlDriver, QSqlEditorFactory, QSqlError,
319
-    QSqlField, QSqlFieldInfo, QSqlForm, QSqlIndex, QSqlPropertyMap, QSqlQuery,
320
-    QSqlRecord, QSqlRecordInfo, QSqlResult, QStyleFactory, QStyleOption,
321
-    QTabletEvent, QTextEdit, QTimeEdit and QWindowsMime Qt3 classes.
274
+  - Added the missing TQChar.nbsp class variable.
275
+  - Added the missing TQChar.isLetterOrNumber(), TQChar.mirroredChar(),
276
+    TQColorDialog.customColor(), TQCustomDialog.customCount(),
277
+    TQColorDialog.getRgba(), TQCustomDialog.setCustomColor(), TQFileDialog.done(),
278
+    TQHeader.setUpdatesEnabled(), TQHeader.showEvent(), TQIconView.dropped(),
279
+    TQIconViewItem.dropped(), TQImage.inputFormatList(),
280
+    TQImage.outputFormatList(), TQLayoutIterator.next(), TQLineEdit.displayText(),
281
+    TQListBox.isRubberSelecting(), TQMenuBar.activateItemAt(),
282
+    TQMenuBar.focusInEvent(), TQMenuBar.isDefaultUp(), TQMenuBar.minimumSize(),
283
+    TQMenuBar.minimumSizeHint(), TQMenuBar.setDefaultUp(), TQMenuData.findItem(),
284
+    TQMimeSourceFactory.filePath(), TQMimeSourceFactory.addFilePath(),
285
+    TQMotifPlusStyle.drawMenuBarItem(), TQMotifPlusStyle.drawPopupMenuItem(),
286
+    TQMotifStyle.drawPopupMenuItem(), TQMotifStyle.extraPopupMenuItemWidth(),
287
+    TQMotifStyle.popupMenuItemHeight(), TQNetworkProtocol.newChildren(),
288
+    TQPlatinumStyle.drawPopupMenuItem(),
289
+    TQPlatinumStyle.extraPopupMenuItemWidth(),
290
+    TQPlatinumStyle.popupMenuItemHeight(), TQPainter.pos(), TQPalette.inactive(),
291
+    TQPopupMenu.drawItem(), TQPopupMenu.itemHeight(), TQPrintDialog.addButton(),
292
+    TQProgressDialog.forceShow(), TQScrollBar.lineStep(), TQScrollBar.maxValue(),
293
+    TQScrollBar.minValue(), TQScrollBar.pageStep(), TQScrollBar.setLineStep(),
294
+    TQScrollBar.setMaxValue(), TQScrollBar.setMinValue(),
295
+    TQScrollBar.setPageStep(), TQScrollBar.setValue(), TQScrollBar.value(),
296
+    TQStyle.drawPopupMenuItem(), TQStyle.drawMenuBarItem(),
297
+    TQStyle.extraPopupMenuItemWidth(), TQStyle.popupMenuItemHeight(),
298
+    TQToolTip.hide(), TQToolTipGroup.enabled(), TQToolTipGroup.setEnabled(),
299
+    TQTranslator.messages(), TQUrlOperator.newChildren(),
300
+    TQUrlOperator.startNextCopy(), TQWindowsStyle.drawPopupMenuItem(),
301
+    TQWindowsStyle.extraPopupMenuItemWidth() and
302
+    TQWindowsStyle.popupMenuItemHeight() methods.
303
+  - Added all missing methods that use TQDataStream.
304
+  - Added the missing TQDir.match(), TQObject.connect(), TQRect.contains(),
305
+    TQString.append() and TQString.prepend() variants.
306
+  - Added the missing TQAccel and TQImage ctors.
307
+  - Added the missing TQColorDrag, TQDns, TQIconDrag, TQIconDragItem, TQMenuItem,
308
+    TQSGIStyle and TQSound classes.
309
+  - Renamed TQDate.isValidDate() to TQDate.isValid(), TQFile.fileExists() to
310
+    TQFile.exists(), TQFile.removeFile() to TQFile.remove(), TQLineEdit.del() to
311
+    TQLineEdit.delChar(), TQMultiLineEdit.deleteChar() to
312
+    TQMultiLineEdit.delChar(), and TQTime.IsValidTime() to TQTime.isValid().
313
+  - Added the TQCanvasSpline, TQCheckTableItem, TQComboTableItem,
314
+    TQCustomMenuEvent, TQDataBrowser, TQDataTable, TQDataView, TQDateEdit,
315
+    TQDateTimeEdit, TQDesktopWidget, TQDockArea, TQDockWindow, TQEditorFactory,
316
+    TQErrorMessage, TQGridView, TQIMEvent, TQKeySequence, TQLibrary,
317
+    TQObjectCleanupHandler, TQPixmapCache, TQProcess, TQRegExpValidator, TQSettings,
318
+    TQSql, TQSqlCursor, TQSqlDatabase, TQSqlDriver, TQSqlEditorFactory, TQSqlError,
319
+    TQSqlField, TQSqlFieldInfo, TQSqlForm, TQSqlIndex, TQSqlPropertyMap, TQSqlQuery,
320
+    TQSqlRecord, TQSqlRecordInfo, TQSqlResult, TQStyleFactory, TQStyleOption,
321
+    TQTabletEvent, TQTextEdit, TQTimeEdit and TQWindowsMime TQt3 classes.
322 322
   - Added the missing qInitNetworkProtocols() function to the qtnetwork module.
323
-  - Removed the QTableHeader class and QTabWidget.selected() as they are not
323
+  - Removed the TQTableHeader class and TQTabWidget.selected() as they are not
324 324
     part of the documented API.
325
-  - Removed the /Transfer/ flag on the QWidget parameters of
326
-    QBoxLayout.addWidget(), QBoxLayout.insertWidget(),
327
-    QGridLayout.addMultiCellWidget(), QGridLayout.addWidget() and
328
-    QLayout.add().
329
-  - QObject.className() now works with Python classes that sub-class from
330
-    QObject derived classes.
325
+  - Removed the /Transfer/ flag on the TQWidget parameters of
326
+    TQBoxLayout.addWidget(), TQBoxLayout.insertWidget(),
327
+    TQGridLayout.addMultiCellWidget(), TQGridLayout.addWidget() and
328
+    TQLayout.add().
329
+  - TQObject.className() now works with Python classes that sub-class from
330
+    TQObject derived classes.
331 331
   - pyuic now generates double quoted strings rather than single quoted strings
332
-    (to help Qt Linguist).
332
+    (to help TQt Linguist).
333 333
   - Moved the Canvas module classes to the new qtcanvas module.
334 334
   - Moved the Network module classes to the new qtnetwork module.
335 335
   - Moved the Table module classes to the new qttable module.
336 336
   - Moved the XML module classes to the new qtxml module.
337
-  - configure now handles Qt-mt.
337
+  - configure now handles TQt-mt.
338 338
   - Upgraded to autoconf-2.52, automake-1.5 and libtool-1.4.1.
339 339
 
340 340
 v2.5 11th August 2001
341 341
 	Minor configuration changes.  Added the missing variants of
342
-	QPixmap.save(), QWidget.reparent() and QInputDialog.getText().  Added
342
+	TQPixmap.save(), TQWidget.reparent() and TQInputDialog.getText().  Added
343 343
 	the qtgl module and the gears.py example script (thanks to Toby J
344
-	Sargeant).  QObject.sender() will now return an appropriate value.
345
-	Fixed QTextView.setText() and QScrollView.addChild().  Fixed the
344
+	Sargeant).  TQObject.sender() will now return an appropriate value.
345
+	Fixed TQTextView.setText() and TQScrollView.addChild().  Fixed the
346 346
 	problems with overloads with different C++ signatures but similar
347
-	Python signatures - QCString.setNum(), QLabel.setNum(),
348
-	QLCDNumber.checkOverflow(), QString.arg(), QString.number(),
349
-	QString.setNum(), QVariant() and QWMatrix.map().  Added the missing
350
-	QTranslator methods.  Added the QTranslatorMessage class.  configure
351
-	will now look for Qt v2.3.1.  QInterlaceStyle is enabled only for Qt
347
+	Python signatures - TQCString.setNum(), TQLabel.setNum(),
348
+	TQLCDNumber.checkOverflow(), TQString.arg(), TQString.number(),
349
+	TQString.setNum(), TQVariant() and TQWMatrix.map().  Added the missing
350
+	TQTranslator methods.  Added the TQTranslatorMessage class.  configure
351
+	will now look for TQt v2.3.1.  TQInterlaceStyle is enabled only for TQt
352 352
 	v2.3.1+ as it is broken in 2.3.0 on Windows.  Fixed problems with
353
-	QLineEdit.event() and QMultiLineEdit.event().  Added post-hooks to
354
-	complement the existing pre-hooks.  Added the Pizza example from the Qt
353
+	TQLineEdit.event() and TQMultiLineEdit.event().  Added post-hooks to
354
+	complement the existing pre-hooks.  Added the Pizza example from the TQt
355 355
 	Designer manual.  Removed the Version keyword for the latest SIP.
356 356
 	Fixed the memory leaks related to sipMapCppToSelf() in handwritten
357
-	code.  Changed the build system to handle different versions of PyQt
358
-	for different versions of Qt.  NULL QCanvasItemList, QFileInfoList,
359
-	QObjectList, QStrList and QWidgetList pointers are now converted to an
360
-	empty Python list rather than None.  Added QDataStream and the QDom
357
+	code.  Changed the build system to handle different versions of PyTQt
358
+	for different versions of TQt.  NULL TQCanvasItemList, TQFileInfoList,
359
+	TQObjectList, TQStrList and TQWidgetList pointers are now converted to an
360
+	empty Python list rather than None.  Added TQDataStream and the TQDom
361 361
 	classes (thanks to Jim Bublitz).  Added the qt_xdisplay(), qt_xscreen()
362
-	and qt_xrootwin() functions.  Added the QColor.getHsv(),
363
-	QPaintDevice.x11Display(), QPaintDevice.x11AppDisplay(),
364
-	QPaintDevice.x11SetAppDpiX(), QPaintDevice.x11SetAppDpiY() and
365
-	QWidget.customEvent() methods.
362
+	and qt_xrootwin() functions.  Added the TQColor.getHsv(),
363
+	TQPaintDevice.x11Display(), TQPaintDevice.x11AppDisplay(),
364
+	TQPaintDevice.x11SetAppDpiX(), TQPaintDevice.x11SetAppDpiY() and
365
+	TQWidget.customEvent() methods.
366 366
 
367 367
 v2.4 22nd April 2001
368
-	Added the missing QFileDialog.getExistingDirectory(),
369
-	QLineEdit.setReadOnly(), QLineEdit.readOnly(),
370
-	QMotifStyle.comboButtonFocusRect(), QMotifStyle.comboButtonRect() and
371
-	QMotifStyle.drawComboButton() methods.  Added the missing
372
-	QFileDialog.DirectoryOnly and QPalette.Inactive enum values.  Updated
368
+	Added the missing TQFileDialog.getExistingDirectory(),
369
+	TQLineEdit.setReadOnly(), TQLineEdit.readOnly(),
370
+	TQMotifStyle.comboButtonFocusRect(), TQMotifStyle.comboButtonRect() and
371
+	TQMotifStyle.drawComboButton() methods.  Added the missing
372
+	TQFileDialog.DirectoryOnly and TQPalette.Inactive enum values.  Updated
373 373
 	the themes.py example.  configure now uses the python executable to get
374
-	the various Python locations.  Added support of Qt v2.3.0, ie.
375
-	QApplication.type(), QFontDatabase.isFixedPitch(),
376
-	QScrollView.AutoOneFit, QToolBar.styleChange() and QInterlaceStyle.
377
-	Added the missing final argument to QMultiLineEdit.insertAt().  Added
378
-	the QCustomEvent class.  Upgraded to automake v1.4d and libtool v1.3d.
374
+	the various Python locations.  Added support of TQt v2.3.0, ie.
375
+	TQApplication.type(), TQFontDatabase.isFixedPitch(),
376
+	TQScrollView.AutoOneFit, TQToolBar.styleChange() and TQInterlaceStyle.
377
+	Added the missing final argument to TQMultiLineEdit.insertAt().  Added
378
+	the TQCustomEvent class.  Upgraded to automake v1.4d and libtool v1.3d.
379 379
 
380 380
 v2.3 4th February 2001
381
-	Added the missing QMessage.setTextFormat(), QMessage.textFormat(),
382
-	QPushButton.isFlat(), QPushButton.setFlat() and QMenuData.insertItem()
383
-	methods.  Added the QCustomMenuItem class.  pyuic assumes that custom
381
+	Added the missing TQMessage.setTextFormat(), TQMessage.textFormat(),
382
+	TQPushButton.isFlat(), TQPushButton.setFlat() and TQMenuData.insertItem()
383
+	methods.  Added the TQCustomMenuItem class.  pyuic assumes that custom
384 384
 	widgets are in another module and generates code to import them.  Other
385
-	pyuic bug fixes and changes to keep track with Qt v2.2.4.  eric bug
385
+	pyuic bug fixes and changes to keep track with TQt v2.2.4.  eric bug
386 386
 	fixes.  Added the addressbook.py, buttongroups.py and menu.py examples.
387
-	Updated all the tutorial scripts to match those in Qt v2.x.  Removed
388
-	the Qt v1.x specific examples.  Removed the deprecated behaviour of
389
-	repr() for QString, QCString and QByteArray. The Python objects that
390
-	correspond to C++ instances that are "owned" by Qt are now kept alive
387
+	Updated all the tutorial scripts to match those in TQt v2.x.  Removed
388
+	the TQt v1.x specific examples.  Removed the deprecated behaviour of
389
+	repr() for TQString, TQCString and TQByteArray. The Python objects that
390
+	correspond to C++ instances that are "owned" by TQt are now kept alive
391 391
 	without the Python program having to keep an explicit reference.
392 392
 	configure now looks for Python 2.1.
393 393
 
394 394
 v2.2 6th November 2000
395 395
 	Added the %Copying directive.  Added the missing %HeaderCode in
396
-	qsizepolicy.sip.  Added classes QServerSocket, QSocket and
397
-	QHostAddress.  Added hooks to the QApplication ctors to tell the
398
-	debugger when it is safe to create QSocketNotifiers (with UNIX you can
399
-	create QSocketNotifiers before you create the QApplication, with
396
+	qsizepolicy.sip.  Added classes TQServerSocket, TQSocket and
397
+	TQHostAddress.  Added hooks to the TQApplication ctors to tell the
398
+	debugger when it is safe to create TQSocketNotifiers (with UNIX you can
399
+	create TQSocketNotifiers before you create the TQApplication, with
400 400
 	Windows you can't).  Other fixes to eric to get it working with
401
-	Windows.  Implemented __str__ of QByteArray, QCString and QString to
401
+	Windows.  Implemented __str__ of TQByteArray, TQCString and TQString to
402 402
 	return an empty string for null instances.  Changed __repr__ of the
403 403
 	same classes to return a descriptive string for null instances.  Added
404
-	the missing QPalette.setInactive().  Colour related fixes to pyuic
404
+	the missing TQPalette.setInactive().  Colour related fixes to pyuic
405 405
 	(thanks to Robert Roy).  Added the documentation section on Python
406
-	strings, Qt strings and Unicode.
406
+	strings, TQt strings and Unicode.
407 407
 
408 408
 v2.1 18th October 2000
409
-	Added support for Qt v2.2.1.  Added the widgets.py example.  Added the
410
-	eric debugger.  Added the missing QCanvasPixmapArray ctor.  Added the
411
-	missing QMenuData.setItemParameter(), QMenuData.itemParameter(),
412
-	QMenuData.activateItemAt(), QWidget.isHidden(), QWidget.isMaximized(),
413
-	QMultiLineEdit.getCursorPosition() and QButton.keyReleaseEvent().  Add
414
-	the len, [] and in operators to QStringList.  Various other bug fixes
409
+	Added support for TQt v2.2.1.  Added the widgets.py example.  Added the
410
+	eric debugger.  Added the missing TQCanvasPixmapArray ctor.  Added the
411
+	missing TQMenuData.setItemParameter(), TQMenuData.itemParameter(),
412
+	TQMenuData.activateItemAt(), TQWidget.isHidden(), TQWidget.isMaximized(),
413
+	TQMultiLineEdit.getCursorPosition() and TQButton.keyReleaseEvent().  Add
414
+	the len, [] and in operators to TQStringList.  Various other bug fixes
415 415
 	(see ChangeLog).
416 416
 
417 417
 v2.0 14th September 2000
418 418
 	*NOTE* The implementation of enums has changed meaning that your
419
-	scripts will be need to be changed.  Also repr() of a QString will
419
+	scripts will be need to be changed.  Also repr() of a TQString will
420 420
 	return a unicode object (rather than a string) with versions of Python
421 421
 	that support Unicode.
422
-	Added /Transfer/ to QObject.insertChild().  Added /TransferBack/ to
423
-	QObject.removeChild() and QTabBar.removeTab().  Changes needed by the
424
-	latest SIP.  Fixed QFontInfo.family() for Qt v2.x (thanks to Joerg
425
-	Kollmann).  Added /Transfer/ etc. to several places in QScrollView,
426
-	QObject, QHeader, QListView and QListViewItem (thanks to Pete Ware).
427
-	Updated everything for Qt v2.2.0.  Added pyuic.  Updated the examples
422
+	Added /Transfer/ to TQObject.insertChild().  Added /TransferBack/ to
423
+	TQObject.removeChild() and TQTabBar.removeTab().  Changes needed by the
424
+	latest SIP.  Fixed TQFontInfo.family() for TQt v2.x (thanks to Joerg
425
+	Kollmann).  Added /Transfer/ etc. to several places in TQScrollView,
426
+	TQObject, TQHeader, TQListView and TQListViewItem (thanks to Pete Ware).
427
+	Updated everything for TQt v2.2.0.  Added pyuic.  Updated the examples
428 428
 	to handle to new form of enums.  Added full support for Windows.
429 429
 	Install in site-packages if it exists.  Changes to handwritten code to
430
-	support Python 1.6.  Integrate QString with Python's Unicode support.
430
+	support Python 1.6.  Integrate TQString with Python's Unicode support.
431 431
 
432 432
 v0.12 18th May 2000
433
-	The versions of the examples specific to Qt v1.x now get installed in
434
-	RPMs.  Added QListBoxItem.selected(), QStringList.append() and
435
-	QStringList.prepend().  Added /Transfer/ to QApplication.setStyle(),
436
-	QLayout.addItem(), QBoxLayout.addItem() and QGridLayout.addItem().
433
+	The versions of the examples specific to TQt v1.x now get installed in
434
+	RPMs.  Added TQListBoxItem.selected(), TQStringList.append() and
435
+	TQStringList.prepend().  Added /Transfer/ to TQApplication.setStyle(),
436
+	TQLayout.addItem(), TQBoxLayout.addItem() and TQGridLayout.addItem().
437 437
 	Added themes.py to the examples.  Clarified the software license.
438 438
 	Changes needed by the latest SIP.
439 439
 
440 440
 v0.11.1 1st April 2000
441
-	Fixed the documentation for QPixmap::fill().  Code now compiles with
441
+	Fixed the documentation for TQPixmap::fill().  Code now compiles with
442 442
 	gcc v2.95.2.
443 443
 
444 444
 v0.11 28th March 2000
445
-	Added Qt v2.x classes QCDEStyle, QChar, QColorDialog, QCommonStyle,
446
-	QCString, QFontDialog, QGLayoutIterator, QGrid, QHBox, QHButtonGroup,
447
-	QHGroupBox, QLayoutItem, QLayoutIterator, QMimeSource,
448
-	QMimeSourceFactory, QMotifStyle, QPlatinumStyle, QSessionManager,
449
-	QSimpleRichText, QSizeGrip, QSizePolicy, QSpacerItem, QStringList,
450
-	QStyle, QStyleSheet, QStyleSheetItem, Qt, QTabWidget, QTextBrowser,
451
-	QTextCodec, QTextDecoder, QTextEncoder, QTextIStream, QTextOStream,
452
-	QTextStream, QTextView, QTranslator, QUriDrag, QVBox, QVButtonGroup,
453
-	QVGroupBox, QWheelEvent, QWidgetItem, QWindowsStyle and QWizard.  Many
454
-	other smaller changes for Qt v2.x.  Added TransferThis where needed.
445
+	Added TQt v2.x classes TQCDEStyle, TQChar, TQColorDialog, TQCommonStyle,
446
+	TQCString, TQFontDialog, TQGLayoutIterator, TQGrid, TQHBox, TQHButtonGroup,
447
+	TQHGroupBox, TQLayoutItem, TQLayoutIterator, TQMimeSource,
448
+	TQMimeSourceFactory, TQMotifStyle, TQPlatinumStyle, TQSessionManager,
449
+	TQSimpleRichText, TQSizeGrip, TQSizePolicy, TQSpacerItem, TQStringList,
450
+	TQStyle, TQStyleSheet, TQStyleSheetItem, TQt, TQTabWidget, TQTextBrowser,
451
+	TQTextCodec, TQTextDecoder, TQTextEncoder, TQTextIStream, TQTextOStream,
452
+	TQTextStream, TQTextView, TQTranslator, TQUriDrag, TQVBox, TQVButtonGroup,
453
+	TQVGroupBox, TQWheelEvent, TQWidgetItem, TQWindowsStyle and TQWizard.  Many
454
+	other smaller changes for TQt v2.x.  Added TransferThis where needed.
455 455
 
456 456
 v0.10.1 21st January 2000
457
-	Fixed a bug in the repr() functions for QString and QByteArray by
457
+	Fixed a bug in the repr() functions for TQString and TQByteArray by
458 458
 	generating the code using the latest SIP.
459 459
 
460 460
 v0.10 19th December 1999
461 461
 	The .pyc files are now created by the installation process.  Added
462
-	qAppName(), QCursor.handle(), QFont.handle(), QPaintDevice.handle(),
463
-	QPainter.handle().  Added most of the typedefs.  Changed
462
+	qAppName(), TQCursor.handle(), TQFont.handle(), TQPaintDevice.handle(),
463
+	TQPainter.handle().  Added most of the typedefs.  Changed
464 464
 	examples/application.py so as not to use the obsolete (and
465
-	unimplemented) QMessageBox.message().  Fixed bug in QPixmap ctor.
465
+	unimplemented) TQMessageBox.message().  Fixed bug in TQPixmap ctor.
466 466
 	Changed the format of version qualifiers for the latest SIP.  Various
467
-	small changes to port to Windows.  Added ReleaseLock to QDialog.exec().
468
-	Fixed a bug in QRect.coords().  Changed QString and QByteArray from
467
+	small changes to port to Windows.  Added ReleaseLock to TQDialog.exec().
468
+	Fixed a bug in TQRect.coords().  Changed TQString and TQByteArray from
469 469
 	being mapped classes to being regular classes.  Changed
470 470
 	examples/application.py, examples/dclock.py and examples/dirview.py to
471
-	explicitly convert from QString where needed.
471
+	explicitly convert from TQString where needed.
472 472
 
473 473
 v0.9 6th September 1999
474
-	Separated the Qt and KDE bindings.  These are the Qt bindings.  Various
474
+	Separated the TQt and KDE bindings.  These are the TQt bindings.  Various
475 475
 	changes needed by the latest SIP.  Re-introduced SLOT().  Changed the
476
-	examples to use SLOT() where possible.  Added QObject.disconnect(),
477
-	QAccel.disconnectItem(), QMenuData.disconnectItem(),
478
-	QMovie.disconnectResize(), QMovie.disconnectStatus(),
479
-	QMovie.disconnectUpdate() and QApplication.clipboard().  Added the
480
-	QClipboard and QSocketNotifier classes.  QEvent is automatically
481
-	converted to the correct sub-class.  The Qt event loop now cooperates
482
-	with Python threads.  Tested with Qt v1.44, Python v1.5.2, egcs v1.1.2
476
+	examples to use SLOT() where possible.  Added TQObject.disconnect(),
477
+	TQAccel.disconnectItem(), TQMenuData.disconnectItem(),
478
+	TQMovie.disconnectResize(), TQMovie.disconnectStatus(),
479
+	TQMovie.disconnectUpdate() and TQApplication.clipboard().  Added the
480
+	TQClipboard and TQSocketNotifier classes.  TQEvent is automatically
481
+	converted to the correct sub-class.  The TQt event loop now cooperates
482
+	with Python threads.  Tested with TQt v1.44, Python v1.5.2, egcs v1.1.2
483 483
 	and glibc v2.1.
484 484
 
485 485
 v0.8 29th May 1999
486
-	Hopefully fixed the SuSE configuration problems.  Fixed the QPointArray
487
-	ctor and QPointArray.setPoints() that took a list of points.  Removed
486
+	Hopefully fixed the SuSE configuration problems.  Fixed the TQPointArray
487
+	ctor and TQPointArray.setPoints() that took a list of points.  Removed
488 488
 	the section in the documentation referring to the inability to handle
489 489
 	C++ references.  Added lots of const keywords to suppress new warning
490 490
 	messages from the compiler.  Changed the handwritten code for mapped
491 491
 	classes to follow the new NULL/None conventions, and for the
492 492
 	introduction of sipParseArgs().  Added Drag-and-Drop support to kmyapp.
493
-	Added Matt Gerassimoff's Qt examples.  Added the QCursor global
494
-	cursors.  Added QPainter.boundingRect(), KApplication.addDropZone(),
493
+	Added Matt Gerassimoff's TQt examples.  Added the TQCursor global
494
+	cursors.  Added TQPainter.boundingRect(), KApplication.addDropZone(),
495 495
 	KApplication.removeDropZone, KApplication.setRootDropZone(). Added
496
-	QDragEnterEvent, QDragLeaveEvent, QDragMoveEvent, QDragObject,
497
-	QDragResponseEvent, QDropEvent, QDropSite, QHideEvent, QImageDrag,
498
-	QPaintDeviceMetrics, QShowEvent, QStoredDrag, QTextDrag, QTimer,
499
-	QUrlDrag, QWindow, KDNDDropZone, KDNDIcon, KDNDWidget, KPath, KSpell,
500
-	KSpellConfig, KSpellDlg, KTreeList, KTreeListItem.  Tested with Qt
496
+	TQDragEnterEvent, TQDragLeaveEvent, TQDragMoveEvent, TQDragObject,
497
+	TQDragResponseEvent, TQDropEvent, TQDropSite, TQHideEvent, TQImageDrag,
498
+	TQPaintDeviceMetrics, TQShowEvent, TQStoredDrag, TQTextDrag, TQTimer,
499
+	TQUrlDrag, TQWindow, KDNDDropZone, KDNDIcon, KDNDWidget, KPath, KSpell,
500
+	KSpellConfig, KSpellDlg, KTreeList, KTreeListItem.  Tested with TQt
501 501
 	v1.44, KDE v1.1.1, Python v1.5.2, egcs v1.1.2 and glibc v2.1.1.
502 502
 
503 503
 v0.7.1 3rd May 1999
504 504
 	Fixed the detection of -fno-exceptions support.  Added the necessary
505
-	Py_DECREF(sipArgs) to all handwritten code.  Tested with Qt v1.44, KDE
505
+	Py_DECREF(sipArgs) to all handwritten code.  Tested with TQt v1.44, KDE
506 506
 	v1.1.1, Python v1.5.2, egcs v1.1.2 and glibc v2.1.
507 507
 
508 508
 v0.7 16th April 1999
509 509
 	Build with -fno-exceptions if supported.  Converted the documentation
510
-	to SGML.  Replaced QT_VERSION and KDE_VERSION with the proper Qt and
511
-	KDE version constants.  Fixed a bad bug converting from QStrings to
510
+	to SGML.  Replaced QT_VERSION and KDE_VERSION with the proper TQt and
511
+	KDE version constants.  Fixed a bad bug converting from TQStrings to
512 512
 	Python strings.  The "connect" convenience function has been removed.
513 513
 	Added the class variables for all supported classes.  Removed SLOT()
514
-	from all examples.  Renamed some static functions in QDate, QTime and
515
-	QFile (needed because of the new implementation of static member
514
+	from all examples.  Renamed some static functions in TQDate, TQTime and
515
+	TQFile (needed because of the new implementation of static member
516 516
 	functions).  Added the ordinary functions related to supported classes.
517
-	Added QListView, QListViewItem, QCheckListItem, KButton, KButtonBox,
517
+	Added TQListView, TQListViewItem, TQCheckListItem, KButton, KButtonBox,
518 518
 	KContainerLayout, KContainerLayoutItem, KControlApplication,
519 519
 	KControlDialog, KConfigWidget, KDatePicker, KDateTable, KDialog,
520 520
 	KDirectionButton, KGradientSelector, KIntegerLine, KLed, KLedLamp,
521 521
 	KListSpinBox, KNewPanner, KNumericSpinBox, KPanner, KPopupMenu,
522 522
 	KQuickHelp, KQuickHelpWindow, KRestrictedLine, KRuler, KSelector,
523 523
 	KSeparator, KSlider, KSpinBox, KTabBar, KTabButton, KTabCtl,
524
-	KToolBoxManager, KWizard, KWizardPage, KXYSelector.  Tested with Qt
524
+	KToolBoxManager, KWizard, KWizardPage, KXYSelector.  Tested with TQt
525 525
 	v1.44, KDE v1.1, Python v1.5.2, egcs v1.1.2 and glibc v2.1.
526 526
 
527 527
 v0.6 20th February 1999
528 528
 	Removed some handwritten code now that SIP automatically handles mapped
529
-	classes and slots.  Changed QString to be mapped to/from Python
529
+	classes and slots.  Changed TQString to be mapped to/from Python
530 530
 	strings.  Added the static member functions for all supported classes.
531
-	Added new member functions for KDE v1.1.  Added QBoxLayout,
532
-	QButtonGroup, QChain, QCheckBox, QChildEvent, QDate, QDateTime,
533
-	QDialog, QDir, QFileDialog, QFileIconProvider, QFileInfo,
534
-	QFileInfoList, QGManager, QGroupBox, QGridLayout, QHBoxLayout, QHeader,
535
-	QIconSet, QLayout, QMainWindow, QMessageBox, QMovie, QMultiLineEdit,
536
-	QObjectList, QPrintDialog, QPrinter, QProgressBar, QProgressDialog,
537
-	QRadioButton, QScrollView, QSemiModal, QSpinBox, QSplitter, QStatusBar,
538
-	QTab, QTabBar, QTabDialog, QTime, QToolBar, QToolButton, QToolTip,
539
-	QToolTipGroup, QVBoxLayout, QWhatsThis, QWidgetList, QWidgetStack.
531
+	Added new member functions for KDE v1.1.  Added TQBoxLayout,
532
+	TQButtonGroup, TQChain, TQCheckBox, TQChildEvent, TQDate, TQDateTime,
533
+	TQDialog, TQDir, TQFileDialog, TQFileIconProvider, TQFileInfo,
534
+	TQFileInfoList, TQGManager, TQGroupBox, TQGridLayout, TQHBoxLayout, TQHeader,
535
+	TQIconSet, TQLayout, TQMainWindow, TQMessageBox, TQMovie, TQMultiLineEdit,
536
+	TQObjectList, TQPrintDialog, TQPrinter, TQProgressBar, TQProgressDialog,
537
+	TQRadioButton, TQScrollView, TQSemiModal, TQSpinBox, TQSplitter, TQStatusBar,
538
+	TQTab, TQTabBar, TQTabDialog, TQTime, TQToolBar, TQToolButton, TQToolTip,
539
+	TQToolTipGroup, TQVBoxLayout, TQWhatsThis, TQWidgetList, TQWidgetStack.
540 540
 	Added DlgLocation, KColorButton, KColorCombo, KColorDialog,
541 541
 	KColorGroup, KDirDialog, KDirEntry, KEdit, KFM, KFileBaseDialog,
542 542
 	KFileBookmark, KFileDialog, KFileInfo, KFileInfoContents,
543 543
 	KFileInfoList, KFontDialog, KHTMLView, KIconLoaderButton,
544 544
 	KIconLoaderDialog, KMsgBox, KPixmap, KProgress, KRadioGroup,
545
-	KSimpleConfig, KURL.  Tested with Qt v1.42, KDE v1.1, egcs v1.1.1 and
545
+	KSimpleConfig, KURL.  Tested with TQt v1.42, KDE v1.1, egcs v1.1.1 and
546 546
 	glibc v2.1.
547 547
 
548 548
 v0.5 21st January 1999
549 549
 	The bindings are now packaged with autoconf configure scripts.  The
550
-	enum in QFrame is now unnamed as it is in Qt.  All the examples changed
550
+	enum in TQFrame is now unnamed as it is in TQt.  All the examples changed
551 551
 	to use the new form of enums.  Added support for qApp, the global
552
-	QColors, kapp, i18n(), Icon() and ICON().  Same test environment as
552
+	TQColors, kapp, i18n(), Icon() and ICON().  Same test environment as
553 553
 	v0.4.
554 554
 
555 555
 v0.4 9th January 1999
556
-	Enough Qt and KDE classes to implement the 14 Qt tutorials and KMyApp,
556
+	Enough TQt and KDE classes to implement the 14 TQt tutorials and KMyApp,
557 557
 	but still not that many that implement user interface widgets.  Tested
558
-	with Qt v1.42, KDE v1.0 and gcc v2.8.1.
558
+	with TQt v1.42, KDE v1.0 and gcc v2.8.1.
559 559
 
560 560
 v0.3 9th December 1998
561
-	Many more Qt classes, but still not many that implement user interface
561
+	Many more TQt classes, but still not many that implement user interface
562 562
 	widgets.  Those classes that are implemented are almost all fully
563
-	implemented.  Tested with Qt v1.42.
563
+	implemented.  Tested with TQt v1.42.
564 564
 
565 565
 v0.2 5th December 1999
566 566
 	Added the definitions of protected and virtual member functions.
567 567
 
568 568
 v0.1 1st November 1998
569 569
 	First release (with a very small set of classes implemented) to give
570
-	people a flavour.  Tested with Qt v1.41.
570
+	people a flavour.  Tested with TQt v1.41.

+ 11
- 11
README View File

@@ -1,9 +1,9 @@
1
-                    PyQt - Python Bindings for the Qt Toolkit
1
+                    PyTQt - Python Bindings for the TQt Toolkit
2 2
 
3 3
 
4 4
 INTRODUCTION
5 5
 
6
-These are the Python bindings for Qt.  You must also have the SIP Python
6
+These are the Python bindings for TQt.  You must also have the SIP Python
7 7
 bindings generator installed.
8 8
 
9 9
 The homepage is http://www.riverbankcomputing.co.uk/pyqt/.
@@ -13,9 +13,9 @@ The homepage of SIP is http://www.riverbankcomputing.co.uk/sip/.
13 13
 
14 14
 COMMERCIAL VERSION
15 15
 
16
-If you have the Commercial version of PyQt then you should also have a
16
+If you have the Commercial version of PyTQt then you should also have a
17 17
 license file that you downloaded separately.  The license file must be copied
18
-to the "sip" directory before starting to build PyQt.
18
+to the "sip" directory before starting to build PyTQt.
19 19
 
20 20
 
21 21
 INSTALLATION
@@ -24,7 +24,7 @@ Check for any other README files in this directory that relate to your
24 24
 particular platform.  Feel free to contribute a README for your platform or to
25 25
 provide updates to any existing documentation.
26 26
 
27
-The first step is to configure PyQt by running the following command.
27
+The first step is to configure PyTQt by running the following command.
28 28
 
29 29
 	python configure.py
30 30
 
@@ -39,21 +39,21 @@ interpreter for which you wish to generate bindings for.
39 39
 The configure.py script takes many options.  Use the "-h" command line option
40 40
 to display a full list of the available options.
41 41
 
42
-The next step is to build PyQt using your platform's make command.
42
+The next step is to build PyTQt using your platform's make command.
43 43
 
44 44
 	make
45 45
 
46
-The final step is to install PyQt by running the following command.  (Depending
47
-on your system you may require root or administrator privileges.)
46
+The final step is to install PyTQt by running the following command.  (Depending
47
+on your system you may retquire root or administrator privileges.)
48 48
 
49 49
 	make install
50 50
 
51 51
 
52 52
 THE REST OF THE DISTRIBUTION
53 53
 
54
-The "examples2" and "examples3" directories contain some examples (for Qt v2.x
55
-and Qt v3.x respectively) of Python scripts, including versions of the standard
56
-Qt tutorials and examples.
54
+The "examples2" and "examples3" directories contain some examples (for TQt v2.x
55
+and TQt v3.x respectively) of Python scripts, including versions of the standard
56
+TQt tutorials and examples.
57 57
 
58 58
 The "doc" directory contains SGML and HTML documentation for the bindings.
59 59
 This documentation includes a section describing the differences visible to

+ 7
- 7
README.AIX View File

@@ -1,16 +1,16 @@
1
-This file describes some things to be aware of when building SIP (and PyQt)
1
+This file describes some things to be aware of when building SIP (and PyTQt)
2 2
 under AIX.
3 3
 
4
-I had success building SIP V3/V4 (and PyQt) on AIX 4.3.3 and on AIX 5.1 with
4
+I had success building SIP V3/V4 (and PyTQt) on AIX 4.3.3 and on AIX 5.1 with
5 5
 VisualAge C++ and with gcc.
6 6
  
7 7
 VisualAge C++ was version 6.0 but it should also work with version 5.x.
8 8
 The GNU compiler was version 3.3.2 downloaded as a binary from
9 9
 http://aixpdslib.seas.ucla.edu/aixpdslib.html
10 10
 
11
-The Qt-Version was 3.2.3 but it should also work with previous versions.
11
+The TQt-Version was 3.2.3 but it should also work with previous versions.
12 12
 
13
-If you are using Python version 2.3.3 or higher, SIP (and PyQt) should build
13
+If you are using Python version 2.3.3 or higher, SIP (and PyTQt) should build
14 14
 out of the box without any changes.
15 15
 
16 16
 If you are using a Python version before 2.3.3, you have to patch Python,
@@ -57,11 +57,11 @@ diff -uNr Python-2.3.2.orig/configure Python-2.3.2/configure
57 57
  	Darwin/*) DYNLOADFILE="dynload_next.o";;
58 58
 ---8<-------------------------------------------------------------------->8---
59 59
 
60
-Note: I did not mix the compilers when building Qt, Python, SIP and PyQt. At
61
-least Qt, SIP and PyQt must be built with the same compiler because of
60
+Note: I did not mix the compilers when building TQt, Python, SIP and PyTQt. At
61
+least TQt, SIP and PyTQt must be built with the same compiler because of
62 62
 different name mangling schemes.
63 63
 
64
-If you have any problems or questions on building SIP or PyQt on AIX, either
64
+If you have any problems or questions on building SIP or PyTQt on AIX, either
65 65
 send an email to ulrich.berning@desys.de or use the PyKDE mailing list.
66 66
 
67 67
 Ulrich Berning

+ 11
- 11
README.SunOS View File

@@ -13,29 +13,29 @@
13 13
    types in overloaded method signatures and issues a compiler error.
14 14
    In this case bool is declared in qt/include/qglobal.h as
15 15
    'typedef int bool;'.  To workaround this '#if 0' out the the declaration
16
-   and body of 'proxySlot(bool)' in PyQt/qt/sipqtProxyqt.h and
17
-   PyQt/qt/qtcmodule.cpp.  This resolves the compiler error but breaks
16
+   and body of 'proxySlot(bool)' in PyTQt/qt/sipqtProxyqt.h and
17
+   PyTQt/qt/qtcmodule.cpp.  This resolves the compiler error but breaks
18 18
    any 'sig(bool)' type signals.  To workaround this, save the
19
-   PyQt/qt/sipqtProxyqt.moc generated after fixing the compiler error and
19
+   PyTQt/qt/sipqtProxyqt.moc generated after fixing the compiler error and
20 20
    add the following bits of code:
21 21
 
22 22
     ...
23
-    static const QUParameter param_slot_42[] = {
24
-             { 0, &static_QUType_bool, 0, QUParameter::In }
23
+    static const TQUParameter param_slot_42[] = {
24
+             { 0, &static_QUType_bool, 0, TQUParameter::In }
25 25
     };
26
-    static const QUMethod slot_42 = {"proxySlot", 1, param_slot_42 };
27
-    static const QMetaData slot_tbl[] = {
26
+    static const TQUMethod slot_42 = {"proxySlot", 1, param_slot_42 };
27
+    static const TQMetaData slot_tbl[] = {
28 28
         ...
29
-        { "proxySlot(bool)", &slot_42, QMetaData::Public }
29
+        { "proxySlot(bool)", &slot_42, TQMetaData::Public }
30 30
     };
31
-    metaObj = QMetaObject::new_metaobject(
31
+    metaObj = TQMetaObject::new_metaobject(
32 32
              "sipProxyqt", parentObject,
33 33
              slot_tbl, 43,
34 34
         ...
35 35
     case 42: proxySlot(static_QUType_bool.get(_o+1)); break;
36 36
 
37
-   You will need to comment out the line in PyQt/qt/Makefile that re-generates
38
-   PyQt/qt/sipqtProxyqt.moc with moc to avoid the above changes from being
37
+   You will need to comment out the line in PyTQt/qt/Makefile that re-generates
38
+   PyTQt/qt/sipqtProxyqt.moc with moc to avoid the above changes from being
39 39
    overwritten.
40 40
 
41 41
    In order to test that everything has been done correctly, create a 

+ 6
- 6
THANKS View File

@@ -1,6 +1,6 @@
1 1
 Torsten Marek
2
-	For going through the Qt classes and adding applicable operators to
3
-	PyQt.
2
+	For going through the TQt classes and adding applicable operators to
3
+	PyTQt.
4 4
 
5 5
 Detlev Offenbach
6 6
 	For picking up and enhancing eric.
@@ -13,20 +13,20 @@ Dimitri Papadopoulos-Orfanos
13 13
 	For all the help with the MacOS X port.
14 14
 
15 15
 Jim Bublitz
16
-	For QDataStream and the QDom classes, and picking up PyKDE.
16
+	For TQDataStream and the TQDom classes, and picking up PyKDE.
17 17
 
18 18
 Pete Ware
19
-	For lots of patches for Qt v2.1+.
19
+	For lots of patches for TQt v2.1+.
20 20
 
21 21
 Boudewijn Rempt
22 22
 	For evangelising and providing so much support to other users.  Oh, and
23 23
 	writing a book about it all.
24 24
 
25 25
 Toby J Sargeant
26
-	For QSocketNotifier and getting Python threads working with Qt.
26
+	For TQSocketNotifier and getting Python threads working with TQt.
27 27
 
28 28
 Matt Gerassimoff
29
-	For his Python versions of many of the Qt example programs.
29
+	For his Python versions of many of the TQt example programs.
30 30
 
31 31
 Matt Gerassimoff, John Filo, Boudewijn Rempt
32 32
 	For testing and excellent bug reports.

+ 85
- 85
build.py View File

@@ -1,23 +1,23 @@
1 1
 # Copyright (c) 2007
2 2
 # 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
3 3
 # 
4
-# This file is part of PyQt.
4
+# This file is part of PyTQt.
5 5
 # 
6
-# This copy of PyQt is free software; you can redistribute it and/or modify it
6
+# This copy of PyTQt is free software; you can redistribute it and/or modify it
7 7
 # under the terms of the GNU General Public License as published by the Free
8 8
 # Software Foundation; either version 2, or (at your option) any later
9 9
 # version.
10 10
 # 
11
-# PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
11
+# PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
12 12
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
13 13
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
14 14
 # details.
15 15
 # 
16 16
 # You should have received a copy of the GNU General Public License along with
17
-# PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
17
+# PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
18 18
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19 19
 #
20
-# This is the build script for PyQt.  It should be run in the top level
20
+# This is the build script for PyTQt.  It should be run in the top level
21 21
 # directory of the source distribution and by the Python interpreter for which
22 22
 # it is being built.  It uses either qmake or tmake to do the hard work of
23 23
 # generating the platform specific Makefiles.
@@ -41,7 +41,7 @@ except:
41 41
     print "SIP v3.9 or later installed."
42 42
     sys.exit(1)
43 43
 
44
-config = sipconfig.SIPConfig("PyQt 3.18.1")
44
+config = sipconfig.SIPConfig("PyTQt 3.18.1")
45 45
 
46 46
 
47 47
 # Initialise the globals.
@@ -74,13 +74,13 @@ def usage(rcode = 2):
74 74
     print "    -a tag  explicitly enable the qtpe module"
75 75
     print "    -b dir  where pyuic and pylupdate will be installed [default %s]" % config.default_bin_dir
76 76
     print "    -c      concatenate each module's C++ source files"
77
-    print "    -d dir  where the PyQt modules will be installed [default %s]" % config.default_mod_dir
77
+    print "    -d dir  where the PyTQt modules will be installed [default %s]" % config.default_mod_dir
78 78
     print "    -g      always release the GIL (SIP v3.x behaviour)"
79 79
     print "    -j #    split the concatenated C++ source files into # pieces [default 1]"
80
-    print "    -n dir  the directory containing the QScintilla header files [default %s]" % config.qt_inc_dir
81
-    print "    -o dir  the directory containing the QScintilla library [default %s]" % config.qt_lib_dir
80
+    print "    -n dir  the directory containing the TQScintilla header files [default %s]" % config.qt_inc_dir
81
+    print "    -o dir  the directory containing the TQScintilla library [default %s]" % config.qt_lib_dir
82 82
     print "    -r      generate code with tracing enabled [default disabled]"
83
-    print "    -v dir  where the PyQt .sip files will be installed [default %s]" % config.default_sip_dir
83
+    print "    -v dir  where the PyTQt .sip files will be installed [default %s]" % config.default_sip_dir
84 84
 
85 85
     sys.exit(rcode)
86 86
 
@@ -117,7 +117,7 @@ SOURCES = qttest.cpp
117 117
 LIBS += @TEST_QUI_LIB@ @TEST_QSCINTILLA_LIB@
118 118
 """)
119 119
 
120
-        # Disable OpenGL, qui and QScintilla support by default.
120
+        # Disable OpenGL, tqui and TQScintilla support by default.
121 121
         config.patches["@TEST_OPENGL@"] = ""
122 122
         config.patches["@TEST_QUI_LIB@"] = ""
123 123
         config.patches["@TEST_QSCINTILLA_INC@"] = ""
@@ -137,11 +137,11 @@ LIBS += @TEST_QUI_LIB@ @TEST_QSCINTILLA_LIB@
137 137
 
138 138
 
139 139
 def tryModule(maindir, mname, incfile, ctor):
140
-    """See if a PyQt module should be built and update the buildModules list
140
+    """See if a PyTQt module should be built and update the buildModules list
141 141
     accordingly.
142 142
 
143 143
     maindir is the directory containing this script.
144
-    mname is the name of the PyQt module.
144
+    mname is the name of the PyTQt module.
145 145
     incfile is the C++ header file that defines the class being used for the
146 146
     test.
147 147
     ctor is the constructor of the class being used for the test.
@@ -170,10 +170,10 @@ int main(int argc,char **argv)
170 170
     sipconfig.run_make("clean")
171 171
 
172 172
 
173
-def checkQScintilla():
174
-    """See if QScintilla can be found and what its version is.
173
+def checkTQScintilla():
174
+    """See if TQScintilla can be found and what its version is.
175 175
     """
176
-    # Find the QScintilla header files.
176
+    # Find the TQScintilla header files.
177 177
     sciglobal = os.path.join(sciIncDir, "qextscintillaglobal.h")
178 178
 
179 179
     if os.access(sciglobal,os.F_OK):
@@ -181,26 +181,26 @@ def checkQScintilla():
181 181
 
182 182
         sipconfig.inform("%s contains qextscintillaglobal.h." % (sciIncDir))
183 183
 
184
-        # Get the QScintilla version number.
184
+        # Get the TQScintilla version number.
185 185
         global sciVersion
186 186
 
187
-        sciVersion, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
187
+        sciVersion, sciversstr = sipconfig.read_version(sciglobal, "TQScintilla", "TQSCINTILLA_VERSION", "TQSCINTILLA_VERSION_STR")
188 188
 
189
-        sipconfig.inform("QScintilla %s is being used." % (sciversstr))
189
+        sipconfig.inform("TQScintilla %s is being used." % (sciversstr))
190 190
 
191 191
         # If we find a snapshot then set the version number to 0 as a special
192 192
         # case.
193 193
         if sciversstr[:8] == "snapshot":
194 194
             sciVersion = 0
195 195
 
196
-        # Find the QScintilla library.
196
+        # Find the TQScintilla library.
197 197
         if sys.platform == "win32":
198 198
             lpatt = "qscintilla.lib"
199 199
         else:
200 200
             lpatt = "libqscintilla.*"
201 201
 
202 202
         if len(glob.glob(os.path.join(sciLibDir, lpatt))):
203
-            sipconfig.inform("%s contains the QScintilla library." % sciLibDir)
203
+            sipconfig.inform("%s contains the TQScintilla library." % sciLibDir)
204 204
 
205 205
             global sciLib
206 206
 
@@ -211,57 +211,57 @@ def checkQScintilla():
211 211
 
212 212
             config.patches["@PYQT_QSCINTILLA_LIB@"] = sciLib
213 213
         else:
214
-            sipconfig.inform("The QScintilla library could not be found in %s and so the qtext module will not be built. If QScintilla is installed then use the -o argument to explicitly specify the correct directory." % (sciLibDir))
214
+            sipconfig.inform("The TQScintilla library could not be found in %s and so the qtext module will not be built. If TQScintilla is installed then use the -o argument to explicitly specify the correct directory." % (sciLibDir))
215 215
 
216 216
             sciVersion = -1
217 217
     else:
218
-        sipconfig.inform("qextscintillaglobal.h could not be found in %s and so the qtext module will not be built. If QScintilla is installed then use the -n argument to explicitly specify the correct directory." % sciIncDir)
218
+        sipconfig.inform("qextscintillaglobal.h could not be found in %s and so the qtext module will not be built. If TQScintilla is installed then use the -n argument to explicitly specify the correct directory." % sciIncDir)
219 219
 
220 220
         sciVersion = -1
221 221
 
222 222
 
223 223
 def moduleChecks(maindir):
224
-    """See which PyQt modules to build.
224
+    """See which PyTQt modules to build.
225 225
     """
226
-    sipconfig.inform("Checking which additional PyQt modules to build.");
226
+    sipconfig.inform("Checking which additional PyTQt modules to build.");
227 227
 
228
-    tryModule(maindir,"qtcanvas", "qcanvas.h", "QCanvas()")
229
-    tryModule(maindir,"qtnetwork", "qsocket.h", "QSocket()")
230
-    tryModule(maindir,"qttable", "qtable.h", "QTable()")
231
-    tryModule(maindir,"qtxml", "qdom.h", "QDomImplementation()")
228
+    tryModule(maindir,"qtcanvas", "qcanvas.h", "TQCanvas()")
229
+    tryModule(maindir,"qtnetwork", "qsocket.h", "TQSocket()")
230
+    tryModule(maindir,"qttable", "qtable.h", "TQTable()")
231
+    tryModule(maindir,"qtxml", "qdom.h", "TQDomImplementation()")
232 232
 
233 233
     if config.qt_version >= 0x030000:
234
-        tryModule(maindir,"qtsql", "qsql.h", "QSql()")
234
+        tryModule(maindir,"qtsql", "qsql.h", "TQSql()")
235 235
 
236 236
     # We need a different Makefile for the qtgl module.
237 237
     config.patches["@TEST_OPENGL@"] = "opengl"
238 238
     config.create_makefile("qttest.pro")
239 239
 
240
-    tryModule(maindir,"qtgl", "qgl.h", "QGLWidget()")
240
+    tryModule(maindir,"qtgl", "qgl.h", "TQGLWidget()")
241 241
 
242 242
     # Put things back.
243 243
     config.patches["@TEST_OPENGL@"] = ""
244 244
     config.create_makefile("qttest.pro")
245 245
 
246
-    # Check for the qui library.
246
+    # Check for the tqui library.
247 247
     if config.qt_version >= 0x030000:
248 248
         if sys.platform == "win32":
249
-            quilib = r"$(QTDIR)\lib\qui.lib"
249
+            tquilib = r"$(QTDIR)\lib\tqui.lib"
250 250
         else:
251
-            quilib = "-lqui"
251
+            tquilib = "-ltqui"
252 252
 
253
-        config.patches["@PYQT_QUI_LIB@"] = quilib
253
+        config.patches["@PYQT_QUI_LIB@"] = tquilib
254 254
 
255
-        config.patches["@TEST_QUI_LIB@"] = quilib
255
+        config.patches["@TEST_QUI_LIB@"] = tquilib
256 256
         config.create_makefile("qttest.pro")
257 257
 
258
-        tryModule(maindir,"qtui", "qwidgetfactory.h", "QWidgetFactory()")
258
+        tryModule(maindir,"qtui", "qwidgetfactory.h", "TQWidgetFactory()")
259 259
 
260 260
         # Put things back.
261 261
         config.patches["@TEST_QUI_LIB@"] = ""
262 262
         config.create_makefile("qttest.pro")
263 263
 
264
-    # Check for the QScintilla library.
264
+    # Check for the TQScintilla library.
265 265
     if sciVersion >= 0:
266 266
         config.patches["@TEST_QSCINTILLA_INC@"] = sciIncDir
267 267
         config.patches["@TEST_QSCINTILLA_LIB@"] = sciLib
@@ -276,7 +276,7 @@ def moduleChecks(maindir):
276 276
 
277 277
 
278 278
 def generateFeatures(featfile):
279
-    """Generate the header file describing the Qt features that are enabled if
279
+    """Generate the header file describing the TQt features that are enabled if
280 280
     it doesn't already exist.  (If it already exists then we are probably cross
281 281
     compiling and generated the file through other means.)
282 282
 
@@ -288,8 +288,8 @@ def generateFeatures(featfile):
288 288
 
289 289
     sipconfig.inform("Generating the features file.")
290 290
 
291
-    # The features that a given Qt configuration may or may not support.  Note
292
-    # that STYLE_WINDOWSXP requires special handling.
291
+    # The features that a given TQt configuration may or may not support.  Note
292
+    # that STYLE_WINDOWSXP retquires special handling.
293 293
     flist = ["ACTION", "CLIPBOARD", "CODECS", "COLORDIALOG", "DATASTREAM",
294 294
              "DIAL", "DNS", "DOM", "DRAGANDDROP", "ICONVIEW", "IMAGE_TEXT",
295 295
              "INPUTDIALOG", "FILEDIALOG", "FONTDATABASE", "FONTDIALOG",
@@ -315,7 +315,7 @@ def generateFeatures(featfile):
315 315
 int main(int argc,char **argv)
316 316
 {
317 317
     FILE *fp;
318
-    QApplication app(argc,argv,0);
318
+    TQApplication app(argc,argv,0);
319 319
 
320 320
     if ((fp = fopen("%s","w")) == NULL)
321 321
     {
@@ -324,12 +324,12 @@ int main(int argc,char **argv)
324 324
     }
325 325
 
326 326
 #if !defined(QT_THREAD_SUPPORT)
327
-    fprintf(fp,"-x Qt_THREAD_SUPPORT\\n");
327
+    fprintf(fp,"-x TQt_THREAD_SUPPORT\\n");
328 328
 #endif
329 329
 
330 330
 #if (defined(Q_OS_WIN32) || defined(Q_OS_WIN64)) && QT_VERSION >= 0x030000
331
-    if (qWinVersion() != Qt::WV_XP)
332
-        fprintf(fp,"-x Qt_STYLE_WINDOWSXP\\n");
331
+    if (qWinVersion() != TQt::WV_XP)
332
+        fprintf(fp,"-x TQt_STYLE_WINDOWSXP\\n");
333 333
 #endif
334 334
 """ % (ffstr, ffstr))
335 335
 
@@ -337,7 +337,7 @@ int main(int argc,char **argv)
337 337
         f.write(
338 338
 """
339 339
 #if defined(QT_NO_%s)
340
-    fprintf(fp,"-x Qt_%s\\n");
340
+    fprintf(fp,"-x TQt_%s\\n");
341 341
 #endif
342 342
 """ % (feat, feat))
343 343
 
@@ -359,11 +359,11 @@ int main(int argc,char **argv)
359 359
 
360 360
 
361 361
 def generateSource(mname, plattag, qttag, xtrtag):
362
-    """Generate the C++ source code for a particular PyQt module.
362
+    """Generate the C++ source code for a particular PyTQt module.
363 363
 
364 364
     mname is the name of the module.
365 365
     plattag is the SIP tag for the platform.
366
-    qttag is the SIP tag for the Qt version.
366
+    qttag is the SIP tag for the TQt version.
367 367
     xtrtag is an optional extra SIP tag.
368 368
     """
369 369
     sipconfig.inform("Generating the C++ source for the %s module." % mname)
@@ -521,22 +521,22 @@ def main(argv):
521 521
         else:
522 522
             sipconfig.error("Please copy the license file %s to the sip directory.\n" % config.license_file)
523 523
 
524
-    # Check the Qt version.
524
+    # Check the TQt version.
525 525
     if config.qt_version == 0:
526
-            sipconfig.error("SIP has been built with Qt support disabled.\n")
526
+            sipconfig.error("SIP has been built with TQt support disabled.\n")
527 527
 
528
-    # Early versions of Qt for the Mac didn't include everything.  Rather than
528
+    # Early versions of TQt for the Mac didn't include everything.  Rather than
529 529
     # maintain these in the future we just mandate a later version.
530 530
     if sys.platform == "darwin" and config.qt_version < 0x030100:
531
-            sipconfig.error("PyQt for MacOS/X requires Qt v3.1.0 or later.\n")
531
+            sipconfig.error("PyTQt for MacOS/X retquires TQt v3.1.0 or later.\n")
532 532
 
533 533
     # Check the installation directory is valid and add it as a patch.
534 534
     if not os.access(modDir,os.F_OK):
535
-        sipconfig.error("The %s PyQt destination directory does not seem to exist. Use the -d argument to set the correct directory." % (modDir))
535
+        sipconfig.error("The %s PyTQt destination directory does not seem to exist. Use the -d argument to set the correct directory." % (modDir))
536 536
 
537 537
     config.patches["@PYQT_MODDIR@"] = sipconfig.escape(modDir)
538 538
 
539
-    sipconfig.inform("%s is the PyQt installation directory." % (modDir))
539
+    sipconfig.inform("%s is the PyTQt installation directory." % (modDir))
540 540
 
541 541
     # Enable warnings for SIP v4 generated code.
542 542
     if sipMajorVersion >= 4:
@@ -573,7 +573,7 @@ def main(argv):
573 573
 
574 574
     config.patches["@PYQT_RBPROF@"] = rbprof
575 575
 
576
-    # Link in the qassistantclient library for Qt v3.1+.
576
+    # Link in the qassistantclient library for TQt v3.1+.
577 577
     qaclib = ""
578 578
 
579 579
     if config.qt_version >= 0x030100:
@@ -584,9 +584,9 @@ def main(argv):
584 584
 
585 585
     config.patches["@PYQT_QASSISTANTCLIENT_LIB@"] = qaclib
586 586
 
587
-    # Check for QScintilla.
587
+    # Check for TQScintilla.
588 588
     if config.qt_version >= 0x030000:
589
-        checkQScintilla()
589
+        checkTQScintilla()
590 590
 
591 591
     # Create a build directory that we can compile test programs.
592 592
     maindir = mkTempBuildDir()
@@ -595,7 +595,7 @@ def main(argv):
595 595
     if config.qt_version >= 0x020000:
596 596
         moduleChecks(maindir)
597 597
 
598
-    # Work out the platform and Qt version tags to pass to SIP to generate the
598
+    # Work out the platform and TQt version tags to pass to SIP to generate the
599 599
     # code we need.
600 600
     if config.qt_lib == "qte":
601 601
         plattag = "WS_QWS"
@@ -607,36 +607,36 @@ def main(argv):
607 607
         plattag = "WS_X11"
608 608
 
609 609
     qttags = {
610
-        0x020000: "Qt_1_43",
611
-        0x020100: "Qt_2_00",
612
-        0x020200: "Qt_2_1_0",
613
-        0x020300: "Qt_2_2_0",
614
-        0x020301: "Qt_2_3_0",
615
-        0x030000: "Qt_2_3_1",
616
-        0x030001: "Qt_3_0_0",
617
-        0x030002: "Qt_3_0_1",
618
-        0x030004: "Qt_3_0_2",
619
-        0x030005: "Qt_3_0_4",
620
-        0x030006: "Qt_3_0_5",
621
-        0x030100: "Qt_3_0_6",
622
-        0x030101: "Qt_3_1_0",
623
-        0x030102: "Qt_3_1_1",
624
-        0x030200: "Qt_3_1_2",
625
-        0x030300: "Qt_3_2_0",
626
-        0x040000: "Qt_3_3_0"
610
+        0x020000: "TQt_1_43",
611
+        0x020100: "TQt_2_00",
612
+        0x020200: "TQt_2_1_0",
613
+        0x020300: "TQt_2_2_0",
614
+        0x020301: "TQt_2_3_0",
615
+        0x030000: "TQt_2_3_1",
616
+        0x030001: "TQt_3_0_0",
617
+        0x030002: "TQt_3_0_1",
618
+        0x030004: "TQt_3_0_2",
619
+        0x030005: "TQt_3_0_4",
620
+        0x030006: "TQt_3_0_5",
621
+        0x030100: "TQt_3_0_6",
622
+        0x030101: "TQt_3_1_0",
623
+        0x030102: "TQt_3_1_1",
624
+        0x030200: "TQt_3_1_2",
625
+        0x030300: "TQt_3_2_0",
626
+        0x040000: "TQt_3_3_0"
627 627
     }
628 628
 
629
-    qttag = versionToTag(config.qt_version, qttags, "Qt")
629
+    qttag = versionToTag(config.qt_version, qttags, "TQt")
630 630
 
631
-    # Work out the QScintilla tag.
631
+    # Work out the TQScintilla tag.
632 632
     if sciVersion >= 0:
633 633
         scitags = {
634
-            0x010100: "QScintilla_1_0",
635
-            0x010200: "QScintilla_1_1",
636
-            0x020000: "QScintilla_1_2"
634
+            0x010100: "TQScintilla_1_0",
635
+            0x010200: "TQScintilla_1_1",
636
+            0x020000: "TQScintilla_1_2"
637 637
         }
638 638
 
639
-        scitag = versionToTag(sciVersion, scitags, "QScintilla")
639
+        scitag = versionToTag(sciVersion, scitags, "TQScintilla")
640 640
     else:
641 641
         scitag = None
642 642
 
@@ -697,7 +697,7 @@ def main(argv):
697 697
     config.create_makefile("pyuic.pro", [])
698 698
     sipconfig.pop_dir(olddir)
699 699
 
700
-    # Build pylupdate if Qt v3.0 or later.
700
+    # Build pylupdate if TQt v3.0 or later.
701 701
     if config.qt_version >= 0x030000:
702 702
         sipconfig.inform("Creating Makefile for pylupdate3.")
703 703
         subdirs.append("pylupdate3")
@@ -708,11 +708,11 @@ def main(argv):
708 708
 
709 709
     # Generate the top-level Makefile.
710 710
     sipconfig.inform("Creating top level Makefile.")
711
-    sipconfig.copy_to_file("PyQt.pro.in", "TEMPLATE = subdirs\nSUBDIRS = " + string.join(subdirs) + "\n")
712
-    config.create_makefile("PyQt.pro")
711
+    sipconfig.copy_to_file("PyTQt.pro.in", "TEMPLATE = subdirs\nSUBDIRS = " + string.join(subdirs) + "\n")
712
+    config.create_makefile("PyTQt.pro")
713 713
 
714 714
     # Tell the user what to do next.
715
-    msg = "The build of the PyQt source code for your system is now complete. To compile and install PyQt run \"%s\" and \"%s install\" with appropriate user privileges." % (config.make_bin, config.make_bin)
715
+    msg = "The build of the PyTQt source code for your system is now complete. To compile and install PyTQt run \"%s\" and \"%s install\" with appropriate user privileges." % (config.make_bin, config.make_bin)
716 716
 
717 717
     sipconfig.inform(msg)
718 718
 

+ 157
- 157
configure.py View File

@@ -1,22 +1,22 @@
1
-# This script generates the PyQt configuration and generates the Makefiles.
1
+# This script generates the PyTQt configuration and generates the Makefiles.
2 2
 #
3 3
 # Copyright (c) 2007
4 4
 # 	Riverbank Computing Limited <info@riverbankcomputing.co.uk>
5 5
 # 
6
-# This file is part of PyQt.
6
+# This file is part of PyTQt.
7 7
 # 
8
-# This copy of PyQt is free software; you can redistribute it and/or modify it
8
+# This copy of PyTQt is free software; you can redistribute it and/or modify it
9 9
 # under the terms of the GNU General Public License as published by the Free
10 10
 # Software Foundation; either version 2, or (at your option) any later
11 11
 # version.
12 12
 # 
13
-# PyQt is supplied in the hope that it will be useful, but WITHOUT ANY
13
+# PyTQt is supplied in the hope that it will be useful, but WITHOUT ANY
14 14
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
15 15
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
16 16
 # details.
17 17
 # 
18 18
 # You should have received a copy of the GNU General Public License along with
19
-# PyQt; see the file LICENSE.  If not, write to the Free Software Foundation,
19
+# PyTQt; see the file LICENSE.  If not, write to the Free Software Foundation,
20 20
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21 21
 
22 22
 
@@ -39,7 +39,7 @@ pyqt_version_str = "3.18.1"
39 39
 sip_min_version = 0x040800
40 40
 
41 41
 
42
-# Try and find a Qt installation to use as the default.
42
+# Try and find a TQt installation to use as the default.
43 43
 try:
44 44
     qt_dir = os.environ["QTDIR"]
45 45
 except KeyError:
@@ -62,7 +62,7 @@ qsci_version = 0
62 62
 disabled_classes = []
63 63
 
64 64
 if sys.platform == "win32":
65
-    qsci_define = "QEXTSCINTILLA_DLL"
65
+    qsci_define = "TQEXTSCINTILLA_DLL"
66 66
 else:
67 67
     qsci_define = ""
68 68
 
@@ -108,29 +108,29 @@ def usage(rcode = 2):
108 108
     sys.stdout.write("  -a tag  explicitly enable the qtpe module\n")
109 109
     sys.stdout.write("  -b dir  where pyuic and pylupdate will be installed [default %s]\n" % opt_pyqtbindir)
110 110
     sys.stdout.write("  -c      concatenate each module's C/C++ source files\n")
111
-    sys.stdout.write("  -d dir  where the PyQt modules will be installed [default %\ns]" % opt_pyqtmoddir)
111
+    sys.stdout.write("  -d dir  where the PyTQt modules will be installed [default %\ns]" % opt_pyqtmoddir)
112 112
     sys.stdout.write("  -f      keep any existing features file (when cross-compiling) [default remove]\n")
113
-    sys.stdout.write("  -g dir  where the Qt qconfig.h file can be found [default Qt include directory]\n")
113
+    sys.stdout.write("  -g dir  where the TQt qconfig.h file can be found [default TQt include directory]\n")
114 114
     sys.stdout.write("  -i      enable checking of signed interpreters using the VendorID package [default disabled]\n")
115 115
     sys.stdout.write("  -j #    split the concatenated C++ source files into # pieces [default 1]\n")
116
-    sys.stdout.write("  -k      build the PyQt modules as static libraries\n")
116
+    sys.stdout.write("  -k      build the PyTQt modules as static libraries\n")
117 117
     sys.stdout.write("  -l dir  the directory containing the VendorID header file [default %s]\n" % opt_vendincdir)
118 118
     sys.stdout.write("  -m dir  the directory containing the VendorID library [default %s]\n" % opt_vendlibdir)
119
-    sys.stdout.write("  -n dir  the directory containing the QScintilla header files [default Qt include directory]\n")
120
-    sys.stdout.write("  -o dir  the directory containing the QScintilla library [default Qt lib directory]\n")
121
-    sys.stdout.write("  -q dir  the root directory of the Qt installation [default %s]\n" % def_qt_dir)
119
+    sys.stdout.write("  -n dir  the directory containing the TQScintilla header files [default TQt include directory]\n")
120
+    sys.stdout.write("  -o dir  the directory containing the TQScintilla library [default TQt lib directory]\n")
121
+    sys.stdout.write("  -q dir  the root directory of the TQt installation [default %s]\n" % def_qt_dir)
122 122
     sys.stdout.write("  -r      generate code with tracing enabled [default disabled]\n")
123
-    sys.stdout.write("  -s      QScintilla is a static library and not a DLL (Windows only)\n")
124
-    sys.stdout.write("  -u      build with debugging symbols (requires a debug build of Python on Windows\n")
125
-    sys.stdout.write("  -v dir  where the PyQt .sip files will be installed [default %s]\n" % opt_pyqtsipdir)
123
+    sys.stdout.write("  -s      TQScintilla is a static library and not a DLL (Windows only)\n")
124
+    sys.stdout.write("  -u      build with debugging symbols (retquires a debug build of Python on Windows\n")
125
+    sys.stdout.write("  -v dir  where the PyTQt .sip files will be installed [default %s]\n" % opt_pyqtsipdir)
126 126
     sys.stdout.write("  -w      don't suppress compiler output during configuration\n")
127
-    sys.stdout.write("  -y lib  explicitly specify the type of Qt library, either qt, qt-mt, qte, qte-mt or qtmt\n")
127
+    sys.stdout.write("  -y lib  explicitly specify the type of TQt library, either qt, qt-mt, qte, qte-mt, qtmt, tqt, tqt-mt, tqte, tqte-mt or tqtmt\n")
128 128
 
129 129
     sys.exit(rcode)
130 130
 
131 131
 
132 132
 class ConfigureBase:
133
-    """This is the base class for all PyQt version specific configurer classes.
133
+    """This is the base class for all PyTQt version specific configurer classes.
134 134
     Anything here is common to all configurers.
135 135
     """
136 136
     def check_modules(self):
@@ -192,26 +192,26 @@ class ConfigureBase:
192 192
         return opt_pyqtsipdir
193 193
 
194 194
 
195
-class ConfigurePyQt3(ConfigureBase):
196
-    """This class defines the methods to configure PyQt v3.
195
+class ConfigurePyTQt3(ConfigureBase):
196
+    """This class defines the methods to configure PyTQt v3.
197 197
     """
198 198
     def check_modules(self):
199 199
         pyqt_modules.append("qt")
200 200
 
201
-        check_module("qtcanvas", "qcanvas.h", "QCanvas()")
202
-        check_module("qtnetwork", "qsocket.h", "QSocket()")
203
-        check_module("qttable", "qtable.h", "QTable()")
204
-        check_module("qtxml", "qdom.h", "QDomImplementation()")
205
-        check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
201
+        check_module("qtcanvas", "qcanvas.h", "TQCanvas()")
202
+        check_module("qtnetwork", "qsocket.h", "TQSocket()")
203
+        check_module("qttable", "qtable.h", "TQTable()")
204
+        check_module("qtxml", "qdom.h", "TQDomImplementation()")
205
+        check_module("qtgl", "qgl.h", "TQGLWidget()", opengl=1)
206 206
 
207 207
         if qt_version >= 0x030000:
208
-            check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
208
+            check_module("qtui", "qwidgetfactory.h", "TQWidgetFactory()", lib="tqui")
209 209
 
210 210
             if qt_edition in ("enterprise", "free"):
211
-                check_module("qtsql", "qsql.h", "QSql()")
211
+                check_module("qtsql", "qsql.h", "TQSql()")
212 212
 
213 213
                 if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
214
-                    check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
214
+                    check_module("qtaxcontainer", "qaxobject.h", "TQAxObject()", lib="qaxcontainer")
215 215
 
216 216
         if qsci_version:
217 217
             check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
@@ -222,12 +222,12 @@ class ConfigurePyQt3(ConfigureBase):
222 222
         qtmod_lib = None
223 223
 
224 224
         if qt_version >= 0x030100:
225
-            sipconfig.inform("Checking to see if the QAssistantClient class is available...")
225
+            sipconfig.inform("Checking to see if the TQAssistantClient class is available...")
226 226
 
227
-            if check_class("qassistantclient.h", "QAssistantClient(\"foo\")", lib="qassistantclient"):
227
+            if check_class("qassistantclient.h", "TQAssistantClient(\"foo\")", lib="qassistantclient"):
228 228
                 qtmod_lib = "qassistantclient"
229 229
             else:
230
-                disabled_classes.append("QAssistantClient")
230
+                disabled_classes.append("TQAssistantClient")
231 231
 
232 232
         return qtmod_lib
233 233
 
@@ -237,25 +237,25 @@ class ConfigurePyQt3(ConfigureBase):
237 237
     def qt_version_tags(self):
238 238
         return {
239 239
             0x010403: None,
240
-            0x020000: "Qt_1_43",
241
-            0x020100: "Qt_2_00",
242
-            0x020200: "Qt_2_1_0",
243
-            0x020300: "Qt_2_2_0",
244
-            0x020301: "Qt_2_3_0",
245
-            0x030000: "Qt_2_3_1",
246
-            0x030001: "Qt_3_0_0",
247
-            0x030002: "Qt_3_0_1",
248
-            0x030004: "Qt_3_0_2",
249
-            0x030005: "Qt_3_0_4",
250
-            0x030006: "Qt_3_0_5",
251
-            0x030100: "Qt_3_0_6",
252
-            0x030101: "Qt_3_1_0",
253
-            0x030102: "Qt_3_1_1",
254
-            0x030200: "Qt_3_1_2",
255
-            0x030300: "Qt_3_2_0",
256
-            0x030305: "Qt_3_3_0",
257
-            0x030306: "Qt_3_3_5",
258
-            0x040000: "Qt_3_3_6"
240
+            0x020000: "TQt_1_43",
241
+            0x020100: "TQt_2_00",
242
+            0x020200: "TQt_2_1_0",
243
+            0x020300: "TQt_2_2_0",
244
+            0x020301: "TQt_2_3_0",
245
+            0x030000: "TQt_2_3_1",
246
+            0x030001: "TQt_3_0_0",
247
+            0x030002: "TQt_3_0_1",
248
+            0x030004: "TQt_3_0_2",
249
+            0x030005: "TQt_3_0_4",
250
+            0x030006: "TQt_3_0_5",
251
+            0x030100: "TQt_3_0_6",
252
+            0x030101: "TQt_3_1_0",
253
+            0x030102: "TQt_3_1_1",
254
+            0x030200: "TQt_3_1_2",
255
+            0x030300: "TQt_3_2_0",
256
+            0x030305: "TQt_3_3_0",
257
+            0x030306: "TQt_3_3_5",
258
+            0x040000: "TQt_3_3_6"
259 259
         }
260 260
 
261 261
     def code(self, extra_include_dirs, extra_lib_dir, extra_libs):
@@ -271,7 +271,7 @@ class ConfigurePyQt3(ConfigureBase):
271 271
             generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags)
272 272
 
273 273
         if "qtui" in pyqt_modules:
274
-            generate_code("qtui", extra_libs=["qui"])
274
+            generate_code("qtui", extra_libs=["tqui"])
275 275
 
276 276
         if "qtaxcontainer" in pyqt_modules:
277 277
             generate_code("qtaxcontainer", extra_libs=["qaxcontainer"])
@@ -379,18 +379,18 @@ def inform_user():
379 379
     else:
380 380
         edstr = ""
381 381
 
382
-    sipconfig.inform("Qt v%s %sis being used." % (sipconfig.version_to_string(qt_version), edstr))
382
+    sipconfig.inform("TQt v%s %sis being used." % (sipconfig.version_to_string(qt_version), edstr))
383 383
     sipconfig.inform("SIP %s is being used." % sipcfg.sip_version_str)
384
-    sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
384
+    sipconfig.inform("These PyTQt modules will be built: %s." % string.join(pyqt_modules))
385 385
 
386 386
     if disabled_classes:
387
-        sipconfig.inform("Support for these Qt classes has been disabled: %s." % string.join(disabled_classes))
387
+        sipconfig.inform("Support for these TQt classes has been disabled: %s." % string.join(disabled_classes))
388 388
 
389
-    sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir)
390
-    sipconfig.inform("The PyQt .sip files will be installed in %s." % opt_pyqtsipdir)
389
+    sipconfig.inform("The PyTQt modules will be installed in %s." % opt_pyqtmoddir)
390
+    sipconfig.inform("The PyTQt .sip files will be installed in %s." % opt_pyqtsipdir)
391 391
 
392
-    sipconfig.inform("The Qt header files are in %s." % qt_incdir)
393
-    sipconfig.inform("The %s Qt library is in %s." % (opt_qtlib, qt_libdir))
392
+    sipconfig.inform("The TQt header files are in %s." % qt_incdir)
393
+    sipconfig.inform("The %s TQt library is in %s." % (opt_qtlib, qt_libdir))
394 394
 
395 395
     if qt_version >= 0x020000:
396 396
         sipconfig.inform("pyuic will be installed in %s." % opt_pyqtbindir)
@@ -399,11 +399,11 @@ def inform_user():
399 399
         sipconfig.inform("pylupdate will be installed in %s." % opt_pyqtbindir)
400 400
 
401 401
     if opt_vendorcheck:
402
-        sipconfig.inform("PyQt will only be usable with signed interpreters.")
402
+        sipconfig.inform("PyTQt will only be usable with signed interpreters.")
403 403
 
404 404
 
405 405
 def create_config(module, template, macros):
406
-    """Create the PyQt configuration module so that it can be imported by build
406
+    """Create the PyTQt configuration module so that it can be imported by build
407 407
     scripts.
408 408
 
409 409
     module is the module file name.
@@ -471,7 +471,7 @@ def create_config(module, template, macros):
471 471
 
472 472
 
473 473
 def compile_qt_program(name, define=None, include_dir=None, lib_dir=None, lib=None, opengl=0, python=0, debug=0):
474
-    """Compile a simple Qt application.
474
+    """Compile a simple TQt application.
475 475
 
476 476
     name is the name of the single source file.
477 477
     define is a name to add to the list of preprocessor defines.
@@ -544,7 +544,7 @@ def compile_qt_program(name, define=None, include_dir=None, lib_dir=None, lib=No
544 544
 
545 545
 
546 546
 def check_qscintilla():
547
-    """See if QScintilla can be found and what its version is.
547
+    """See if TQScintilla can be found and what its version is.
548 548
     """
549 549
     # Set the defaults if they haven't been explicitly specified.
550 550
     global opt_qsciincdir, opt_qscilibdir
@@ -555,26 +555,26 @@ def check_qscintilla():
555 555
     if opt_qscilibdir is None:
556 556
         opt_qscilibdir = qt_libdir
557 557
 
558
-    # Find the QScintilla header files.
558
+    # Find the TQScintilla header files.
559 559
     sciglobal = os.path.join(opt_qsciincdir, "qextscintillaglobal.h")
560 560
 
561 561
     if os.access(sciglobal, os.F_OK):
562
-        # Get the QScintilla version number.
562
+        # Get the TQScintilla version number.
563 563
         global qsci_version
564 564
 
565
-        qsci_version, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
565
+        qsci_version, sciversstr = sipconfig.read_version(sciglobal, "TQScintilla", "TQSCINTILLA_VERSION", "TQSCINTILLA_VERSION_STR")
566 566
 
567 567
         if glob.glob(os.path.join(opt_qscilibdir, "*qscintilla*")):
568
-            sipconfig.inform("QScintilla %s is being used." % sciversstr)
568
+            sipconfig.inform("TQScintilla %s is being used." % sciversstr)
569 569
 
570 570
             # If we find a snapshot then set a negative version number as a
571 571
             # special case.
572 572
             if string.find(sciversstr, "snapshot") >= 0:
573 573
                 qsci_version = -1
574 574
         else:
575
-            sipconfig.inform("The QScintilla library could not be found in %s and so the qtext module will not be built. If QScintilla is installed then use the -o argument to explicitly specify the correct directory." % opt_qscilibdir)
575
+            sipconfig.inform("The TQScintilla library could not be found in %s and so the qtext module will not be built. If TQScintilla is installed then use the -o argument to explicitly specify the correct directory." % opt_qscilibdir)
576 576
     else:
577
-        sipconfig.inform("qextscintillaglobal.h could not be found in %s and so the qtext module will not be built. If QScintilla is installed then use the -n argument to explicitly specify the correct directory." % opt_qsciincdir)
577
+        sipconfig.inform("qextscintillaglobal.h could not be found in %s and so the qtext module will not be built. If TQScintilla is installed then use the -n argument to explicitly specify the correct directory." % opt_qsciincdir)
578 578
 
579 579
 
580 580
 def check_vendorid():
@@ -648,7 +648,7 @@ int main(int argc, char **argv)
648 648
 
649 649
 
650 650
 def check_plugin(cname, incfile):
651
-    """Return non-zero if a class that might be a plugin is in the main Qt
651
+    """Return non-zero if a class that might be a plugin is in the main TQt
652 652
     library.
653 653
 
654 654
     cname is the name of the class.
@@ -664,8 +664,8 @@ def create_features_file(name):
664 664
 
665 665
     name is the name of the features file in the current directory.
666 666
     """
667
-    # The features that a given Qt configuration may or may not support.  Note
668
-    # that STYLE_WINDOWSXP and ASSISTANTCLIENT require special handling.
667
+    # The features that a given TQt configuration may or may not support.  Note
668
+    # that STYLE_WINDOWSXP and ASSISTANTCLIENT retquire special handling.
669 669
     flist = ["ACTION", "CLIPBOARD", "CODECS", "COLORDIALOG", "DATASTREAM",
670 670
              "DIAL", "DNS", "DOM", "DRAGANDDROP", "ICONVIEW", "IMAGE_TEXT",
671 671
              "INPUTDIALOG", "FILEDIALOG", "FONTDATABASE", "FONTDIALOG",
@@ -691,7 +691,7 @@ def create_features_file(name):
691 691
 int main(int argc,char **argv)
692 692
 {
693 693
     FILE *fp;
694
-    QApplication app(argc,argv,0);
694
+    TQApplication app(argc,argv,0);
695 695
 
696 696
     if ((fp = fopen("%s","w")) == NULL)
697 697
     {
@@ -700,15 +700,15 @@ int main(int argc,char **argv)
700 700
     }
701 701
 
702 702
 #if !defined(WITH_THREAD) || !defined(QT_THREAD_SUPPORT)
703
-    fprintf(fp,"-x Qt_THREAD_SUPPORT\\n");
703
+    fprintf(fp,"-x TQt_THREAD_SUPPORT\\n");
704 704
 #endif
705 705
 
706 706
 #if !defined(Q_WS_WIN) || QT_VERSION < 0x030000 || defined(QT_NO_STYLE_WINDOWSXP)
707
-    fprintf(fp,"-x Qt_STYLE_WINDOWSXP\\n");
707
+    fprintf(fp,"-x TQt_STYLE_WINDOWSXP\\n");
708 708
 #endif
709 709
 
710 710
 #if defined(Q_OS_WIN64)
711
-    fprintf(fp,"-x Qt_Q_LONG_IS_long\\n");
711
+    fprintf(fp,"-x TQt_Q_LONG_IS_long\\n");
712 712
 #endif
713 713
 """ % (name, name))
714 714
 
@@ -716,15 +716,15 @@ int main(int argc,char **argv)
716 716
         f.write(
717 717
 """
718 718
 #if defined(QT_NO_%s)
719
-    fprintf(fp,"-x Qt_%s\\n");
719
+    fprintf(fp,"-x TQt_%s\\n");
720 720
 #endif
721 721
 """ % (feat, feat))
722 722
 
723
-    # Disable QAssistantClient for the Professional Edition.
724
-    if "QAssistantClient" in disabled_classes:
723
+    # Disable TQAssistantClient for the Professional Edition.
724
+    if "TQAssistantClient" in disabled_classes:
725 725
         f.write(
726 726
 """
727
-    fprintf(fp,"-x Qt_ASSISTANTCLIENT\\n");
727
+    fprintf(fp,"-x TQt_ASSISTANTCLIENT\\n");
728 728
 """)
729 729
 
730 730
     f.write(
@@ -749,27 +749,27 @@ int main(int argc,char **argv)
749 749
         sipconfig.error("There was an error creating the features file.")
750 750
 
751 751
     # Check what features have been implemented as plugins and disable them.
752
-    plugins = [("STYLE_CDE",       "qcdestyle.h",       "QCDEStyle"),
753
-               ("STYLE_INTERLACE", "qinterlacestyle.h", "QInterlaceStyle"),
754
-               ("STYLE_MOTIF",     "qmotifstyle.h",     "QMotifStyle"),
755
-               ("STYLE_MOTIFPLUS", "qmotifplusstyle.h", "QMotifPlusStyle"),
756
-               ("STYLE_PLATINUM",  "qplatinumstyle.h",  "QPlatinumStyle"),
757
-               ("STYLE_SGI",       "qsgistyle.h",       "QSGIStyle"),
758
-               ("STYLE_WINDOWSXP", "qwindowsxpstyle.h", "QWindowsXPStyle"),
759
-               ("STYLE_WINDOWS",   "qwindowsstyle.h",   "QWindowsStyle")]
752
+    plugins = [("STYLE_CDE",       "qcdestyle.h",       "TQCDEStyle"),
753
+               ("STYLE_INTERLACE", "qinterlacestyle.h", "TQInterlaceStyle"),
754
+               ("STYLE_MOTIF",     "qmotifstyle.h",     "TQMotifStyle"),
755
+               ("STYLE_MOTIFPLUS", "qmotifplusstyle.h", "TQMotifPlusStyle"),
756
+               ("STYLE_PLATINUM",  "qplatinumstyle.h",  "TQPlatinumStyle"),
757
+               ("STYLE_SGI",       "qsgistyle.h",       "TQSGIStyle"),
758
+               ("STYLE_WINDOWSXP", "qwindowsxpstyle.h", "TQWindowsXPStyle"),
759
+               ("STYLE_WINDOWS",   "qwindowsstyle.h",   "TQWindowsStyle")]
760 760
 
761 761
     f = open(name, "a")
762 762
 
763 763
     for (feat, incfile, cname) in plugins:
764 764
         if not check_plugin(cname, incfile):
765
-            f.write("-x Qt_%s\n" % feat)
765
+            f.write("-x TQt_%s\n" % feat)
766 766
             disabled_classes.append(cname)
767 767
 
768 768
     f.close()
769 769
 
770 770
 
771 771
 def get_feature_flags():
772
-    """Return the list of SIP flags that exclude unsupported Qt features.
772
+    """Return the list of SIP flags that exclude unsupported TQt features.
773 773
     """
774 774
     featfile = "features"
775 775
 
@@ -791,7 +791,7 @@ def get_feature_flags():
791 791
         line = ff.readline()
792 792
 
793 793
     if sipcfg.sip_version >= 0x040702:
794
-        flags.extend(['-x', 'Qt_SIP_PRE_4_7_2'])
794
+        flags.extend(['-x', 'TQt_SIP_PRE_4_7_2'])
795 795
 
796 796
     return flags
797 797
 
@@ -823,8 +823,8 @@ def set_sip_flags():
823 823
     qt_sip_flags.append("-t")
824 824
     qt_sip_flags.append(plattag)
825 825
 
826
-    # Handle the Qt version tag.
827
-    verstag = sipconfig.version_to_sip_tag(qt_version, pyqt.qt_version_tags(), "Qt")
826
+    # Handle the TQt version tag.
827
+    verstag = sipconfig.version_to_sip_tag(qt_version, pyqt.qt_version_tags(), "TQt")
828 828
 
829 829
     if verstag:
830 830
         qt_sip_flags.append("-t")
@@ -835,26 +835,26 @@ def set_sip_flags():
835 835
         qtext_sip_flags.append(f)
836 836
         qtpe_sip_flags.append(f)
837 837
 
838
-    # Handle the QScintilla version tag.
838
+    # Handle the TQScintilla version tag.
839 839
     if qsci_version:
840 840
         qscitags = {
841 841
             0x010100: None,
842
-            0x010200: "QScintilla_1_1",
843
-            0x010300: "QScintilla_1_2",
844
-            0x010400: "QScintilla_1_3",
845
-            0x010500: "QScintilla_1_4",
846
-            0x010600: "QScintilla_1_5",
847
-            0x010700: "QScintilla_1_6",
848
-            0x020000: "QScintilla_1_7"
842
+            0x010200: "TQScintilla_1_1",
843
+            0x010300: "TQScintilla_1_2",
844
+            0x010400: "TQScintilla_1_3",
845
+            0x010500: "TQScintilla_1_4",
846
+            0x010600: "TQScintilla_1_5",
847
+            0x010700: "TQScintilla_1_6",
848
+            0x020000: "TQScintilla_1_7"
849 849
         }
850 850
 
851
-        verstag = sipconfig.version_to_sip_tag(qsci_version, qscitags, "QScintilla")
851
+        verstag = sipconfig.version_to_sip_tag(qsci_version, qscitags, "TQScintilla")
852 852
 
853 853
         if verstag:
854 854
             qtext_sip_flags.append("-t")
855 855
             qtext_sip_flags.append(verstag)
856 856
 
857
-    # Handle the Qtopia tag.
857
+    # Handle the TQtopia tag.
858 858
     if opt_qtpetag:
859 859
         qtpe_sip_flags.append("-t")
860 860
         qtpe_sip_flags.append(opt_qtpetag)
@@ -972,7 +972,7 @@ def generate_code(mname, extra_cflags=None, extra_cxxflags=None, extra_define=No
972 972
 
973 973
 
974 974
 def check_license():
975
-    """Handle the validation of the PyQt license.
975
+    """Handle the validation of the PyTQt license.
976 976
     """
977 977
     try:
978 978
         import license
@@ -991,11 +991,11 @@ def check_license():
991 991
         lname = "GNU General Public License"
992 992
         lfile = None
993 993
 
994
-    sipconfig.inform("This is the %s version of PyQt %s (licensed under the %s) for Python %s on %s." % (ltype, pyqt_version_str, lname, string.split(sys.version)[0], sys.platform))
994
+    sipconfig.inform("This is the %s version of PyTQt %s (licensed under the %s) for Python %s on %s." % (ltype, pyqt_version_str, lname, string.split(sys.version)[0], sys.platform))
995 995
 
996 996
     # Common checks.
997 997
     if ltype == "GPL" and sys.platform == "win32":
998
-        error("You cannot use the GPL version of PyQt under Windows.")
998
+        error("You cannot use the GPL version of PyTQt under Windows.")
999 999
 
1000 1000
     try:
1001 1001
         qted = qt_edition
@@ -1004,7 +1004,7 @@ def check_license():
1004 1004
 
1005 1005
     if qted and ltype != "internal":
1006 1006
         if (qted == "free" and ltype != "GPL") or (qted != "free" and ltype == "GPL"):
1007
-            sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qted)
1007
+            sipconfig.error("This version of PyTQt and the %s edition of TQt have incompatible licenses." % qted)
1008 1008
 
1009 1009
     # Confirm the license.
1010 1010
     sys.stdout.write("""
@@ -1040,7 +1040,7 @@ Type 'no' to decline the terms of the license.
1040 1040
 
1041 1041
 
1042 1042
 def get_build_macros(overrides):
1043
-    """Return the dictionary of platform specific build macros from the Qt
1043
+    """Return the dictionary of platform specific build macros from the TQt
1044 1044
     installation.  Return None if any of the overrides was invalid.
1045 1045
 
1046 1046
     overrides is a list of macros overrides from the user.
@@ -1054,7 +1054,7 @@ def get_build_macros(overrides):
1054 1054
         if not os.access(fname, os.F_OK):
1055 1055
             sipconfig.error("Unable to find the default configuration file %s. You can use the QMAKESPEC environment variable to specify the correct platform instead of \"default\"." % fname)
1056 1056
 
1057
-    # Add the Qt specific macros to the default.
1057
+    # Add the TQt specific macros to the default.
1058 1058
     names = sipcfg.build_macros().keys()
1059 1059
     names.append("INCDIR_QT")
1060 1060
     names.append("LIBDIR_QT")
@@ -1073,14 +1073,14 @@ def get_build_macros(overrides):
1073 1073
 
1074 1074
 
1075 1075
 def check_qt_installation(macros):
1076
-    """Check the Qt installation and get the version number and edition.
1076
+    """Check the TQt installation and get the version number and edition.
1077 1077
 
1078 1078
     macros is the dictionary of build macros.
1079 1079
     """
1080 1080
     # Get the Makefile generator.
1081 1081
     generator = macros["MAKEFILE_GENERATOR"]
1082 1082
 
1083
-    # Set the Qt include and lib directories.
1083
+    # Set the TQt include and lib directories.
1084 1084
     global qt_incdir, qt_libdir
1085 1085
 
1086 1086
     qt_incdir = macros["INCDIR_QT"]
@@ -1095,8 +1095,8 @@ def check_qt_installation(macros):
1095 1095
         qt_libdir = os.path.join(qt_dir, "lib")
1096 1096
         macros["LIBDIR_QT"] = qt_libdir
1097 1097
 
1098
-    # Check the Qt header files have been installed.  Quietly check for Qt v4.
1099
-    qt4_d = os.path.join(qt_incdir, "QtCore")
1098
+    # Check the TQt header files have been installed.  Quietly check for TQt v4.
1099
+    qt4_d = os.path.join(qt_incdir, "TQtCore")
1100 1100
 
1101 1101
     qglobal = os.path.join(qt4_d, "qglobal.h")
1102 1102
 
@@ -1106,24 +1106,24 @@ def check_qt_installation(macros):
1106 1106
         if not os.access(qglobal, os.F_OK):
1107 1107
             sipconfig.error("qglobal.h could not be found in %s." % qt_incdir)
1108 1108
 
1109
-    # Get the Qt version number.
1109
+    # Get the TQt version number.
1110 1110
     global qt_version
1111 1111
 
1112
-    qt_version, ignore = sipconfig.read_version(qglobal, "Qt", "QT_VERSION")
1112
+    qt_version, ignore = sipconfig.read_version(qglobal, "TQt", "QT_VERSION")
1113 1113
 
1114
-    # Early versions of Qt for the Mac didn't include everything.  Rather than
1114
+    # Early versions of TQt for the Mac didn't include everything.  Rather than
1115 1115
     # maintain these in the future we just mandate a later version.
1116 1116
     if sys.platform == "darwin" and qt_version < 0x030100:
1117
-        sipconfig.error("PyQt for MacOS/X requires Qt v3.1.0 or later.")
1117
+        sipconfig.error("PyTQt for MacOS/X retquires TQt v3.1.0 or later.")
1118 1118
 
1119 1119
     # The way SIP v4.2 and later handle connections between signals and Python
1120
-    # slots only works with Qt v3 and later.  Therefore Qt v2 and earlier needs
1120
+    # slots only works with TQt v3 and later.  Therefore TQt v2 and earlier needs
1121 1121
     # SIP v3.
1122 1122
     if qt_version < 0x030000:
1123
-        sipconfig.error("Qt v2.x and earlier require SIP v3.x.")
1123
+        sipconfig.error("TQt v2.x and earlier retquire SIP v3.x.")
1124 1124
 
1125 1125
     if qt_version >= 0x040000:
1126
-        sipconfig.error("Qt v4.x requires PyQt v4.x.")
1126
+        sipconfig.error("TQt v4.x retquires PyTQt v4.x.")
1127 1127
 
1128 1128
     # Try and work out which edition it is.
1129 1129
     global qt_edition
@@ -1153,14 +1153,14 @@ def check_qt_installation(macros):
1153 1153
         f.close()
1154 1154
 
1155 1155
         if not qt_edition:
1156
-            sipconfig.error("The Qt edition could not be determined by parsing %s." % qconfig)
1156
+            sipconfig.error("The TQt edition could not be determined by parsing %s." % qconfig)
1157 1157
     elif qt_version == 0x020300 and sys.platform == "win32":
1158
-        # See if we have the Qt v2 non-commercial version.
1158
+        # See if we have the TQt v2 non-commercial version.
1159 1159
         if os.access(os.path.join(qt_libdir, "qt-mt230nc.lib"), os.F_OK):
1160 1160
             qt_edition = "non-commercial"
1161 1161
 
1162 1162
     if sys.platform == "win32":
1163
-        # Work out how Qt was built on Windows.
1163
+        # Work out how TQt was built on Windows.
1164 1164
 
1165 1165
         global qt_winconfig
1166 1166
 
@@ -1181,19 +1181,19 @@ def check_qt_installation(macros):
1181 1181
             # Assume it was built as a DLL.
1182 1182
             qt_winconfig = "shared"
1183 1183
 
1184
-    # Determine the Qt library to link against and if it has thread support.
1184
+    # Determine the TQt library to link against and if it has thread support.
1185 1185
     global qt_threaded
1186 1186
 
1187 1187
     resolve_qt3_library(generator)
1188 1188
 
1189
-    if opt_qtlib in ("qt-mt", "qt-mtedu", "qt-mteval", "qte-mt", "qtmt", "qtmtedu", "qtmteval"):
1189
+    if opt_qtlib in ("qt-mt", "qt-mtedu", "qt-mteval", "qte-mt", "qtmt", "qtmtedu", "qtmteval", "tqt-mt", "tqt-mtedu", "tqt-mteval", "tqte-mt", "tqtmt", "tqtmtedu", "tqtmteval"):
1190 1190
         qt_threaded = 1
1191 1191
 
1192 1192
     global pyqt
1193 1193
 
1194
-    pyqt = ConfigurePyQt3()
1194
+    pyqt = ConfigurePyTQt3()
1195 1195
 
1196
-    # We haven't yet factored out sipconfig's knowledge of how to build Qt
1196
+    # We haven't yet factored out sipconfig's knowledge of how to build TQt
1197 1197
     # binaries and it is expecting to find these in the configuration when it
1198 1198
     # generates the Makefiles.
1199 1199
     sipcfg.qt_version = qt_version
@@ -1207,7 +1207,7 @@ def check_qt_installation(macros):
1207 1207
 
1208 1208
 
1209 1209
 def resolve_qt3_library(generator):
1210
-    """See which version of the Qt v3 library can be found.  (We can't trust
1210
+    """See which version of the TQt v3 library can be found.  (We can't trust
1211 1211
     the configuration files.)
1212 1212
 
1213 1213
     generator is the name of the Makefile generator.
@@ -1216,67 +1216,67 @@ def resolve_qt3_library(generator):
1216 1216
 
1217 1217
     if opt_qtlib:
1218 1218
         if not is_qt_library(generator, opt_qtlib):
1219
-            sipconfig.error("The %s Qt library could not be found in %s." % (opt_qtlib, qt_libdir))
1219
+            sipconfig.error("The %s TQt library could not be found in %s." % (opt_qtlib, qt_libdir))
1220 1220
     else:
1221
-        stlib = is_qt_library(generator, "qt")
1222
-        mtlib = is_qt_library(generator, "qt-mt")
1223
-        edlib = is_qt_library(generator, "qt-mtedu")
1224
-        evlib = is_qt_library(generator, "qt-mteval")
1225
-        emlib = is_qt_library(generator, "qte")
1226
-        etlib = is_qt_library(generator, "qte-mt")
1221
+        stlib = is_qt_library(generator, "tqt")
1222
+        mtlib = is_qt_library(generator, "tqt-mt")
1223
+        edlib = is_qt_library(generator, "tqt-mtedu")
1224
+        evlib = is_qt_library(generator, "tqt-mteval")
1225
+        emlib = is_qt_library(generator, "tqte")
1226
+        etlib = is_qt_library(generator, "tqte-mt")
1227 1227
 
1228 1228
         # Borland likes to be a little different.
1229
-        bmtlib = is_qt_library(generator, "qtmt")
1230
-        bedlib = is_qt_library(generator, "qtmtedu")
1231
-        bevlib = is_qt_library(generator, "qtmteval")
1229
+        bmtlib = is_qt_library(generator, "tqtmt")
1230
+        bedlib = is_qt_library(generator, "tqtmtedu")
1231
+        bevlib = is_qt_library(generator, "tqtmteval")
1232 1232
 
1233 1233
         names = []
1234 1234
 
1235 1235
         if stlib:
1236
-            opt_qtlib = "qt"
1236
+            opt_qtlib = "tqt"
1237 1237
             names.append(opt_qtlib)
1238 1238
 
1239 1239
         if mtlib:
1240
-            opt_qtlib = "qt-mt"
1240
+            opt_qtlib = "tqt-mt"
1241 1241
             names.append(opt_qtlib)
1242 1242
 
1243 1243
         if edlib:
1244
-            opt_qtlib = "qt-mtedu"
1244
+            opt_qtlib = "tqt-mtedu"
1245 1245
             names.append(opt_qtlib)
1246 1246
 
1247 1247
         if evlib:
1248
-            opt_qtlib = "qt-mteval"
1248
+            opt_qtlib = "tqt-mteval"
1249 1249
             names.append(opt_qtlib)
1250 1250
 
1251 1251
         if emlib:
1252
-            opt_qtlib = "qte"
1252
+            opt_qtlib = "tqte"
1253 1253
             names.append(opt_qtlib)
1254 1254
 
1255 1255
         if etlib:
1256
-            opt_qtlib = "qte-mt"
1256
+            opt_qtlib = "tqte-mt"
1257 1257
             names.append(opt_qtlib)
1258 1258
 
1259 1259
         if bmtlib:
1260
-            opt_qtlib = "qtmt"
1260
+            opt_qtlib = "tqtmt"
1261 1261
             names.append(opt_qtlib)
1262 1262
 
1263 1263
         if bedlib:
1264
-            opt_qtlib = "qtmtedu"
1264
+            opt_qtlib = "tqtmtedu"
1265 1265
             names.append(opt_qtlib)
1266 1266
 
1267 1267
         if bevlib:
1268
-            opt_qtlib = "qtmteval"
1268
+            opt_qtlib = "tqtmteval"
1269 1269
             names.append(opt_qtlib)
1270 1270
 
1271 1271
         if not names:
1272
-            sipconfig.error("No Qt libraries could be found in %s." % qt_libdir)
1272
+            sipconfig.error("No TQt libraries could be found in %s." % qt_libdir)
1273 1273
 
1274 1274
         if len(names) > 1:
1275
-            sipconfig.error("These Qt libraries were found: %s. Use the -y argument to explicitly specify which you want to use." % string.join(names))
1275
+            sipconfig.error("These TQt libraries were found: %s. Use the -y argument to explicitly specify which you want to use." % string.join(names))
1276 1276
 
1277 1277
 
1278 1278
 def is_qt_library(generator, lib):
1279
-    """See if a particular Qt library is installed.
1279
+    """See if a particular TQt library is installed.
1280 1280
 
1281 1281
     generator is the name of the Makefile generator.
1282 1282
     lib is the name of the library.
@@ -1302,12 +1302,12 @@ def main(argv):
1302 1302
     """
1303 1303
     # Check Python isn't too new.
1304 1304
     if sipcfg.py_version >= 0x030000:
1305
-        sipconfig.error("PyQt v3.x does not support Python v3.x")
1305
+        sipconfig.error("PyTQt v3.x does not support Python v3.x")
1306 1306
 
1307 1307
     # Check SIP is new enough.
1308 1308
     if sipcfg.sip_version_str[:8] != "snapshot":
1309 1309
         if sipcfg.sip_version < sip_min_version:
1310
-            sipconfig.error("This version of PyQt requires SIP v%s or later" % sipconfig.version_to_string(sip_min_version))
1310
+            sipconfig.error("This version of PyTQt retquires SIP v%s or later" % sipconfig.version_to_string(sip_min_version))
1311 1311
 
1312 1312
     # Parse the command line.
1313 1313
     try:
@@ -1367,21 +1367,21 @@ def main(argv):
1367 1367
         elif opt == "-w":
1368 1368
             opt_verbose = 1
1369 1369
         elif opt == "-y":
1370
-            if arg in ("qt", "qt-mt", "qt-mtedu", "qt-mteval", "qte", "qte-mt", "qtmt", "qtmtedu"):
1370
+            if arg in ("qt", "qt-mt", "qt-mtedu", "qt-mteval", "qte", "qte-mt", "qtmt", "qtmtedu", "tqt", "tqt-mt", "tqt-mtedu", "tqt-mteval", "tqte", "tqte-mt", "tqtmt", "tqtmtedu"):
1371 1371
                 opt_qtlib = arg
1372 1372
             else:
1373 1373
                 usage()
1374 1374
 
1375
-    # Check that we know the name of the Qt root directory.
1375
+    # Check that we know the name of the TQt root directory.
1376 1376
     if not qt_dir:
1377
-        sipconfig.error("A Qt installation could not be found. Use use the -q argument or the QTDIR environment variable to explicitly specify the correct directory.")
1377
+        sipconfig.error("A TQt installation could not be found. Use use the -q argument or the QTDIR environment variable to explicitly specify the correct directory.")
1378 1378
 
1379 1379
     # When building static libraries, signed interpreter checking makes no
1380 1380
     # sense.
1381 1381
     if opt_vendorcheck and opt_static:
1382 1382
         sipconfig.error("Using the VendorID package when building static libraries makes no sense.")
1383 1383
 
1384
-    # Replace the existing build macros with the ones from the Qt installation.
1384
+    # Replace the existing build macros with the ones from the TQt installation.
1385 1385
     macros = get_build_macros(args)
1386 1386
 
1387 1387
     if macros is None:
@@ -1389,13 +1389,13 @@ def main(argv):
1389 1389
 
1390 1390
     sipcfg.set_build_macros(macros)
1391 1391
 
1392
-    # Check Qt is what we need.
1392
+    # Check TQt is what we need.
1393 1393
     check_qt_installation(macros)
1394 1394
 
1395 1395
     # Check the licenses are compatible.
1396 1396
     check_license()
1397 1397
 
1398
-    # Check for QScintilla.
1398
+    # Check for TQScintilla.
1399 1399
     check_qscintilla()
1400 1400
 
1401 1401
     # Check which modules to build.

+ 1058
- 1058
doc/PyQt.html
File diff suppressed because it is too large
View File


+ 1101
- 1101
doc/PyQt.sgml
File diff suppressed because it is too large
View File


+ 203
- 203
doc/qtdocs.sip
File diff suppressed because it is too large
View File


+ 2
- 2
examples2/README View File

@@ -2,9 +2,9 @@ To run these examples, make sure you have your PYTHONPATH environment variable
2 2
 set if needed and explicitly set the path to python at the top of each script
3 3
 if you don't have /usr/bin/env.
4 4
 
5
-The examples are written for Qt v2.x.
5
+The examples are written for TQt v2.x.
6 6