Timothy Pearson 7 anni fa
parent
commit
7522746090
20 ha cambiato i file con 78 aggiunte e 78 eliminazioni
  1. 17
    17
      ChangeLog
  2. 3
    3
      LICENSE
  3. 7
    7
      NEWS
  4. 1
    1
      README
  5. 2
    2
      build.py
  6. 6
    6
      configure.py
  7. 4
    4
      doc/PyQt.html
  8. 5
    5
      doc/PyQt.sgml
  9. 4
    4
      doc/qtdocs.sip
  10. 1
    1
      examples3/biff.py
  11. 3
    3
      pylupdate3/LICENSE.GPL
  12. 3
    3
      pyuic2/COPYING
  13. 7
    7
      pyuic2/uic.cpp
  14. 3
    3
      pyuic3/LICENSE.GPL
  15. 7
    7
      pyuic3/form.cpp
  16. 1
    1
      pyuic3/object.cpp
  17. 1
    1
      sip/qt/qmemarray.sip
  18. 1
    1
      sip/qt/qnamespace.sip
  19. 1
    1
      sip/qt/qobject.sip
  20. 1
    1
      sip/qt/qsemaphore.sip

+ 17
- 17
ChangeLog Vedi File

@@ -86,7 +86,7 @@ Replaced sipFreeConnection() with sipFreeSipslot().
86 86
 
87 87
 
88 88
 2009/01/12 22:42:00  phil
89
-Changes retquired by recent changes to the TQt support API.
89
+Changes required by recent changes to the TQt support API.
90 90
 
91 91
 
92 92
 2008/12/17 17:24:12  phil
@@ -119,7 +119,7 @@ Updated the NEWS file.
119 119
 
120 120
 
121 121
 2008/10/14 10:53:17  phil
122
-Added the /Constrained/ enum annotations retquired by the latest SIP.
122
+Added the /Constrained/ enum annotations required by the latest SIP.
123 123
 
124 124
 
125 125
 2008/10/11 13:58:59  phil
@@ -179,7 +179,7 @@ Released as v3.17.1.
179 179
 
180 180
 2007/04/02 15:27:03  phil
181 181
 Updated the NEWS file.
182
-SIP v4.6 is now retquired.
182
+SIP v4.6 is now required.
183 183
 The TQLayoutItem sub-class code no longer handles TQLayout and leaves it to the
184 184
 TQObject sub-class code to deal with.
185 185
 
@@ -436,7 +436,7 @@ Removed all uses of newly deprecated calls.
436 436
 
437 437
 
438 438
 2006/01/26 16:40:38  phil
439
-Changed the signal/slot support retquired by the latest SIP changes.
439
+Changed the signal/slot support required by the latest SIP changes.
440 440
 
441 441
 
442 442
 2006/01/16 18:58:26  phil
@@ -460,7 +460,7 @@ Updated all handwritten convertor code for the latest SIP changes.
460 460
 
461 461
 
462 462
 2005/12/24 17:02:31  phil
463
-Changes retquired by the introduction of sipSelfWasArg in the SIP snapshot.
463
+Changes required by the introduction of sipSelfWasArg in the SIP snapshot.
464 464
 
465 465
 
466 466
 2005/12/22 16:22:48  phil
@@ -502,7 +502,7 @@ Added the missing /ReleaseGIL/ to TQThread.exit().
502 502
 
503 503
 
504 504
 2005/11/24 17:22:31  phil
505
-Changes retquired for the modified mapped type template syntax.
505
+Changes required for the modified mapped type template syntax.
506 506
 
507 507
 
508 508
 2005/11/20 18:41:02  phil
@@ -675,7 +675,7 @@ wrongly expecting a tuple result from a Python reimplementation.
675 675
 
676 676
 
677 677
 2005/05/04 18:41:49  phil
678
-Fixed pyuic bug where a retquired TQIconSet ctor wasn't being generated.
678
+Fixed pyuic bug where a required TQIconSet ctor wasn't being generated.
679 679
 
680 680
 
681 681
 2005/04/17 09:04:01  phil
@@ -708,7 +708,7 @@ Fixed the TQCustomEvent %GCClear code.
708 708
 
709 709
 2005/04/02 22:28:50  phil
710 710
 Added the new %GCTraverseCode and %GCClearCode to TQCustomEvent.
711
-Now retquires SIP v4.3.
711
+Now requires SIP v4.3.
712 712
 
713 713
 
714 714
 2005/04/02 09:53:27  phil
@@ -784,7 +784,7 @@ Synced pyuic with TQt v3.3.4.
784 784
 
785 785
 
786 786
 2005/01/22 18:13:35  phil
787
-PyTQt now retquires SIP v4.2 or later.
787
+PyTQt now requires SIP v4.2 or later.
788 788
 
789 789
 
790 790
 2005/01/22 11:54:13  phil
@@ -1031,7 +1031,7 @@ Changed the build system to deal with the evaluation version of PyTQt.
1031 1031
 
1032 1032
 
1033 1033
 2004/04/13 18:24:04  phil
1034
-TQAssistantClient is disabled for the Professional Edition because it retquires
1034
+TQAssistantClient is disabled for the Professional Edition because it requires
1035 1035
 code from the Enterprise Edition (only seems to affect Windows though).
1036 1036
 
1037 1037
 
@@ -1647,7 +1647,7 @@ Tracked the latest TQScintilla changes.
1647 1647
 
1648 1648
 2003/04/16 11:42:45  phil
1649 1649
 Fixed build.py for when SIP v4 is used.
1650
-Python v2.3 is now retquired if SIP v4 is being used.
1650
+Python v2.3 is now required if SIP v4 is being used.
1651 1651
 Changed TQCustomEvent.data() to deal with the changed support of SIP_PYOBJECT.
1652 1652
 
1653 1653
 
@@ -2463,7 +2463,7 @@ Updated the documentation regarding support for void *.
2463 2463
 
2464 2464
 2002/04/30 07:52:35  phil
2465 2465
 configure will now search fro TQt v3.0.4.
2466
-Changes retquired for TQt v3.0.4.
2466
+Changes required for TQt v3.0.4.
2467 2467
 Another minor bug fix related to X11 support and TQt/E.
2468 2468
 
2469 2469
 
@@ -2561,7 +2561,7 @@ use the very latest TQt library.
2561 2561
 configure will now use qt-mt in preference to qt if it finds both.
2562 2562
 Removed build.py from the distribution until it is finished.
2563 2563
 Added /Transfer/ to TQThread.postEvent().
2564
-Added /ReleaseLock/ to TQThread.postEvent(), which might not be retquired but
2564
+Added /ReleaseLock/ to TQThread.postEvent(), which might not be required but
2565 2565
 shouldn't do any harm.
2566 2566
 
2567 2567
 
@@ -2693,7 +2693,7 @@ to be specified.
2693 2693
 
2694 2694
 2001/12/27 12:28:07  phil
2695 2695
 Fixed all TQt3 writeBlock() methods.
2696
-Changes retquired by the latest SIP.
2696
+Changes required by the latest SIP.
2697 2697
 Support for TQt/Embedded on the Sharp Zaurus.
2698 2698
 Removed the TQDragResponseEvent internal class.
2699 2699
 Added the missing TQImageTextKeyLang class.
@@ -2790,7 +2790,7 @@ Ported the remaining examples.
2790 2790
 2001/10/12 22:46:59  phil
2791 2791
 Minor fixes to get the SQL module to build.
2792 2792
 Created a separate examples directory for TQt3.
2793
-Changes retquired for the final release of TQt v3.0.0.
2793
+Changes required for the final release of TQt v3.0.0.
2794 2794
 
2795 2795
 
2796 2796
 2001/10/12 10:19:27  phil
@@ -2839,7 +2839,7 @@ Changes to get pyuic to compile against TQt3.
2839 2839
 
2840 2840
 2001/09/28 23:13:01  phil
2841 2841
 Upgraded to TQt v3.0.0Beta6.
2842
-Changes retquired to handwritten code by the new sipParseArgs().
2842
+Changes required to handwritten code by the new sipParseArgs().
2843 2843
 Added the missing TQObject.connect() variant.
2844 2844
 Renamed TQDate.isValidDate() to TQDate.isValid().
2845 2845
 Renamed TQTime.isValidTime() to TQTime.isValid().
@@ -2849,7 +2849,7 @@ Renamed TQFile.removeFile() to TQFile.remove().
2849 2849
 
2850 2850
 2001/09/23 20:04:21  phil
2851 2851
 Re-added TQInterlaceStyle.
2852
-Changes retquired by TQt v3.0.0 Beta5.
2852
+Changes required by TQt v3.0.0 Beta5.
2853 2853
 Implemented TQMenuItem as an opaque class.
2854 2854
 Added the missing TQSGIStyle class.
2855 2855
 Added the missing TQMenuData.findItem(), TQMotifPlusStyle.drawMenuBarItem(),

+ 3
- 3
LICENSE Vedi 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 retquired to print an announcement.)
112
+    the Program is not required to print an announcement.)
113 113
 
114
-These retquirements apply to the modified work as a whole.  If
114
+These requirements 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 retquired to accept this License, since you have not
180
+  5. You are not required 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

+ 7
- 7
NEWS Vedi File

@@ -25,7 +25,7 @@ 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 retquires SIP v4.6 (or later).
28
+  - This version requires SIP v4.6 (or later).
29 29
   - Changes to ensure compatibility with future SIP releases.
30 30
 
31 31
 v3.17 4th November 2006
@@ -36,7 +36,7 @@ v3.17 4th November 2006
36 36
   - Updated the TQScintilla bindings for v1.17.
37 37
 
38 38
 v3.16 24th March 2006
39
-  - This version retquires SIP v4.4 (or later).
39
+  - This version requires SIP v4.4 (or later).
40 40
   - PyTQt3 can be installed alongside PyTQt4.
41 41
   - Concatenating Python strings and TQStrings is now supported.
42 42
   - TQString now supports the * and *= operators that behave as they do for
@@ -64,7 +64,7 @@ v3.15.1 14th November 2005
64 64
     default it is recreated).
65 65
 
66 66
 v3.15 30th August 2005
67
-  - This version retquires SIP v4.3 (or later).
67
+  - This version requires SIP v4.3 (or later).
68 68
   - Added registerWeakActiveObject() and revokeActiveObject() to TQAxBase.
69 69
   - Added the missing TQString + operator.
70 70
   - PyTQt classes now support Python's cyclic garbage collector.
@@ -83,7 +83,7 @@ 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 retquires SIP v4.2 (or later) or SIP v3.12 (or later).
86
+  - This version requires SIP v4.2 (or later) or SIP v3.12 (or later).
87 87
   - Added the qInstallMsgHandler() function.
88 88
   - Added support for TQScintilla v1.5.
89 89
   - Added support for the VendorID package.
@@ -114,7 +114,7 @@ v3.10 16th January 2004
114 114
     TQHttpResponseHeader, TQLocalFs classes.
115 115
 
116 116
 v3.9 7th December 2003
117
-  - This version retquires SIP v3.9 (or later) or SIP v4.0rc1 (or later).
117
+  - This version requires SIP v3.9 (or later) or SIP v4.0rc1 (or later).
118 118
   - TQLayoutIterator.next() is now documented.
119 119
   - Added the TQImageIO and TQListViewItemIterator classes.
120 120
   - Added the TQDockArea << and >> operators.
@@ -260,12 +260,12 @@ v3.1 23rd March 2002
260 260
     and TQImage.setText() methods.
261 261
   - Added support for TQt/Embedded on the Sharp Zaurus.
262 262
   - Added the start of the qtpe (TQt Palmtop Environment) module.
263
-  - Changes retquired for TQt v3.0.1 and v3.0.2.
263
+  - Changes required 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 267
   - configure now searches for TQt v3.0.1, v3.0.2 and v3.0.3.
268
-  - Changes retquired by the latest SIP.
268
+  - Changes required 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.

+ 1
- 1
README Vedi File

@@ -44,7 +44,7 @@ The next step is to build PyTQt using your platform's make command.
44 44
 	make
45 45
 
46 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.)
47
+on your system you may require root or administrator privileges.)
48 48
 
49 49
 	make install
50 50
 

+ 2
- 2
build.py Vedi File

@@ -289,7 +289,7 @@ def generateFeatures(featfile):
289 289
     sipconfig.inform("Generating the features file.")
290 290
 
291 291
     # The features that a given TQt configuration may or may not support.  Note
292
-    # that STYLE_WINDOWSXP retquires special handling.
292
+    # that STYLE_WINDOWSXP requires 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",
@@ -528,7 +528,7 @@ def main(argv):
528 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("PyTQt for MacOS/X retquires TQt v3.1.0 or later.\n")
531
+            sipconfig.error("PyTQt for MacOS/X requires 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):

+ 6
- 6
configure.py Vedi File

@@ -121,7 +121,7 @@ def usage(rcode = 2):
121 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 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")
124
+    sys.stdout.write("  -u      build with debugging symbols (requires a debug build of Python on Windows\n")
125 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 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")
@@ -665,7 +665,7 @@ def create_features_file(name):
665 665
     name is the name of the features file in the current directory.
666 666
     """
667 667
     # The features that a given TQt configuration may or may not support.  Note
668
-    # that STYLE_WINDOWSXP and ASSISTANTCLIENT retquire special handling.
668
+    # that STYLE_WINDOWSXP and ASSISTANTCLIENT require 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",
@@ -1114,16 +1114,16 @@ def check_qt_installation(macros):
1114 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("PyTQt for MacOS/X retquires TQt v3.1.0 or later.")
1117
+        sipconfig.error("PyTQt for MacOS/X requires TQt v3.1.0 or later.")
1118 1118
 
1119 1119
     # The way SIP v4.2 and later handle connections between signals and Python
1120 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("TQt v2.x and earlier retquire SIP v3.x.")
1123
+        sipconfig.error("TQt v2.x and earlier require SIP v3.x.")
1124 1124
 
1125 1125
     if qt_version >= 0x040000:
1126
-        sipconfig.error("TQt v4.x retquires PyTQt v4.x.")
1126
+        sipconfig.error("TQt v4.x requires PyTQt v4.x.")
1127 1127
 
1128 1128
     # Try and work out which edition it is.
1129 1129
     global qt_edition
@@ -1307,7 +1307,7 @@ def main(argv):
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 PyTQt retquires SIP v%s or later" % sipconfig.version_to_string(sip_min_version))
1310
+            sipconfig.error("This version of PyTQt requires SIP v%s or later" % sipconfig.version_to_string(sip_min_version))
1311 1311
 
1312 1312
     # Parse the command line.
1313 1313
     try:

+ 4
- 4
doc/PyQt.html Vedi File

@@ -72,7 +72,7 @@ educational license for use with the educational version of TQt.</P
72 72
 C++ class libraries).  SIP v4.6 or later must be installed in order to build
73 73
 and run this version of PyTQt.</P
74 74
 ><P
75
->PyTQt for MacOS/X retquires TQt v3.1.0 or later and Python v2.3 or later.</P
75
+>PyTQt for MacOS/X requires TQt v3.1.0 or later and Python v2.3 or later.</P
76 76
 ><P
77 77
 >The bindings are implemented as a number of Python modules</P
78 78
 ><P
@@ -236,7 +236,7 @@ custom widgets, <TT
236 236
 CLASS="LITERAL"
237 237
 >pyuic</TT
238 238
 > has no way of knowing the name of the
239
-Python module containing the widget and so cannot generate the retquired
239
+Python module containing the widget and so cannot generate the required
240 240
 <TT
241 241
 CLASS="LITERAL"
242 242
 >import</TT
@@ -1870,7 +1870,7 @@ means that using lambda expressions as slots will not work unless you keep a
1870 1870
 separate reference to the expression to prevent it from being immediately
1871 1871
 garbage collected.</P
1872 1872
 ><P
1873
->TQt allows a signal to be connected to a slot that retquires fewer arguments than
1873
+>TQt allows a signal to be connected to a slot that requires fewer arguments than
1874 1874
 the signal passes.  The extra arguments are tquietly discarded.  Python slots
1875 1875
 can be used in the same way. </P
1876 1876
 ></DIV
@@ -7354,7 +7354,7 @@ CLASS="LITERAL"
7354 7354
 and <TT
7355 7355
 CLASS="LITERAL"
7356 7356
 >-=</TT
7357
-> operators have also been implemented, but retquire
7357
+> operators have also been implemented, but require
7358 7358
 Python v2.0 or later.</P
7359 7359
 ></DIV
7360 7360
 ><DIV

+ 5
- 5
doc/PyQt.sgml Vedi File

@@ -44,7 +44,7 @@ and run this version of PyTQt.
44 44
 </Para>
45 45
 
46 46
 <Para>
47
-PyTQt for MacOS/X retquires TQt v3.1.0 or later and Python v2.3 or later.
47
+PyTQt for MacOS/X requires TQt v3.1.0 or later and Python v2.3 or later.
48 48
 </Para>
49 49
 
50 50
 <Para>
@@ -147,7 +147,7 @@ The changes visible to the Python programmer in this release are as follows.
147 147
 
148 148
 <ListItem>
149 149
 <Para>
150
-This version retquires SIP v4.4 (or later).
150
+This version requires SIP v4.4 (or later).
151 151
 </Para>
152 152
 </ListItem>
153 153
 
@@ -231,7 +231,7 @@ same XML. The Python code is self contained and can be executed immediately.
231 231
 It is sometimes useful to be able to include some specific Python code in the
232 232
 output generated by <Literal>pyuic</Literal>. For example, if you are using
233 233
 custom widgets, <Literal>pyuic</Literal> has no way of knowing the name of the
234
-Python module containing the widget and so cannot generate the retquired
234
+Python module containing the widget and so cannot generate the required
235 235
 <Literal>import</Literal> statement. To help get around this,
236 236
 <Literal>pyuic</Literal> will extract any lines entered in the
237 237
 <Literal>Comment</Literal> field of TQt Designer's
@@ -1176,7 +1176,7 @@ garbage collected.
1176 1176
 </Para>
1177 1177
 
1178 1178
 <Para>
1179
-TQt allows a signal to be connected to a slot that retquires fewer arguments than
1179
+TQt allows a signal to be connected to a slot that requires fewer arguments than
1180 1180
 the signal passes.  The extra arguments are tquietly discarded.  Python slots
1181 1181
 can be used in the same way. 
1182 1182
 </Para>
@@ -3549,7 +3549,7 @@ values. (TQt v2+)
3549 3549
 <Sect2><Title>TQSemaphore (TQt v2.2+)</Title>
3550 3550
 <Para>
3551 3551
 <Literal>TQSemaphore</Literal> is fully implemented.  The <Literal>+=</Literal>
3552
-and <Literal>-=</Literal> operators have also been implemented, but retquire
3552
+and <Literal>-=</Literal> operators have also been implemented, but require
3553 3553
 Python v2.0 or later.
3554 3554
 </Para>
3555 3555
 </Sect2>

+ 4
- 4
doc/qtdocs.sip Vedi File

@@ -73,7 +73,7 @@ and run this version of PyTQt.
73 73
 </Para>
74 74
 
75 75
 <Para>
76
-PyTQt for MacOS/X retquires TQt v3.1.0 or later and Python v2.3 or later.
76
+PyTQt for MacOS/X requires TQt v3.1.0 or later and Python v2.3 or later.
77 77
 </Para>
78 78
 
79 79
 <Para>
@@ -176,7 +176,7 @@ The changes visible to the Python programmer in this release are as follows.
176 176
 
177 177
 <ListItem>
178 178
 <Para>
179
-This version retquires SIP v4.4 (or later).
179
+This version requires SIP v4.4 (or later).
180 180
 </Para>
181 181
 </ListItem>
182 182
 
@@ -260,7 +260,7 @@ same XML. The Python code is self contained and can be executed immediately.
260 260
 It is sometimes useful to be able to include some specific Python code in the
261 261
 output generated by <Literal>pyuic</Literal>. For example, if you are using
262 262
 custom widgets, <Literal>pyuic</Literal> has no way of knowing the name of the
263
-Python module containing the widget and so cannot generate the retquired
263
+Python module containing the widget and so cannot generate the required
264 264
 <Literal>import</Literal> statement. To help get around this,
265 265
 <Literal>pyuic</Literal> will extract any lines entered in the
266 266
 <Literal>Comment</Literal> field of TQt Designer's
@@ -1209,7 +1209,7 @@ garbage collected.
1209 1209
 </Para>
1210 1210
 
1211 1211
 <Para>
1212
-TQt allows a signal to be connected to a slot that retquires fewer arguments than
1212
+TQt allows a signal to be connected to a slot that requires fewer arguments than
1213 1213
 the signal passes.  The extra arguments are tquietly discarded.  Python slots
1214 1214
 can be used in the same way. 
1215 1215
 </Para>

+ 1
- 1
examples3/biff.py Vedi File

@@ -5,7 +5,7 @@ from qt import *
5 5
 
6 6
 
7 7
 if QT_VERSION < 0x030100:
8
-    print "This example retquires TQt v3.1.0 or later."
8
+    print "This example requires TQt v3.1.0 or later."
9 9
     sys.exit(1)
10 10
 
11 11
 

+ 3
- 3
pylupdate3/LICENSE.GPL Vedi 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 retquired to print an announcement.)
112
+    the Program is not required to print an announcement.)
113 113
 
114
-These retquirements apply to the modified work as a whole.  If
114
+These requirements 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 retquired to accept this License, since you have not
180
+  5. You are not required 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

+ 3
- 3
pyuic2/COPYING Vedi 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 retquired to print an announcement.)
112
+    the Program is not required to print an announcement.)
113 113
 
114
-These retquirements apply to the modified work as a whole.  If
114
+These requirements 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 retquired to accept this License, since you have not
180
+  5. You are not required 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

+ 7
- 7
pyuic2/uic.cpp Vedi File

@@ -260,11 +260,11 @@ void Uic::createFormImpl( const TQDomElement &e )
260 260
 	}
261 261
     }
262 262
 
263
-    // find out what images are retquired
264
-    TQStringList retquiredImages;
263
+    // find out what images are required
264
+    TQStringList requiredImages;
265 265
     nl = e.elementsByTagName( "pixmap" );
266 266
     for ( int j = 0; j < (int) nl.length(); j++ ) {
267
-	retquiredImages += nl.item(j).firstChild().toText().data();
267
+	requiredImages += nl.item(j).firstChild().toText().data();
268 268
     }
269 269
  
270 270
     TQStringList images;
@@ -277,7 +277,7 @@ void Uic::createFormImpl( const TQDomElement &e )
277 277
 		for ( i = 0; i < (int) nl.length(); i++ ) {
278 278
 		    TQDomElement tmp = nl.item(i).firstChild().toElement();
279 279
 		    TQString img = registerObject( tmp.firstChild().toText().data() );
280
-		    if ( !retquiredImages.contains( img ) )
280
+		    if ( !requiredImages.contains( img ) )
281 281
 			continue;
282 282
 		    tmp = tmp.nextSibling().toElement();
283 283
 		    TQString format = tmp.attribute("format", "PNG" );
@@ -424,7 +424,7 @@ void Uic::createFormImpl( const TQDomElement &e )
424 424
     }
425 425
 
426 426
 
427
-    // create all children, some forms have special retquirements
427
+    // create all children, some forms have special requirements
428 428
 
429 429
     if ( objClass == "TQWizard" ) {
430 430
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
@@ -540,7 +540,7 @@ void Uic::createFormImpl( const TQDomElement &e )
540 540
     // end of constructor
541 541
     popIndent();
542 542
 
543
-    // handle application font changes if retquired
543
+    // handle application font changes if required
544 544
     nl = e.elementsByTagName( "widget" );
545 545
     bool needEventHandler = FALSE;
546 546
     for ( i = 0; i < (int) nl.length(); i++ ) {
@@ -734,7 +734,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
734 734
 	}
735 735
     }
736 736
 
737
-    // create all children, some widgets have special retquirements
737
+    // create all children, some widgets have special requirements
738 738
 
739 739
     if ( objClass == "TQTabWidget" ) {
740 740
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {

+ 3
- 3
pyuic3/LICENSE.GPL Vedi 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 retquired to print an announcement.)
112
+    the Program is not required to print an announcement.)
113 113
 
114
-These retquirements apply to the modified work as a whole.  If
114
+These requirements 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 retquired to accept this License, since you have not
180
+  5. You are not required 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

+ 7
- 7
pyuic3/form.cpp Vedi File

@@ -118,7 +118,7 @@ void Uic::createFormImpl( const TQDomElement &e )
118 118
 	return;
119 119
     TQString objName = getObjectName( e );
120 120
 
121
-    // generate local and local includes retquired
121
+    // generate local and local includes required
122 122
     TQStringList globalIncludes;
123 123
     TQStringList::Iterator it;
124 124
     TQStringList sqlClasses;
@@ -319,8 +319,8 @@ void Uic::createFormImpl( const TQDomElement &e )
319 319
 
320 320
     out << endl;
321 321
 
322
-    // find out what images are retquired
323
-    TQStringList retquiredImages;
322
+    // find out what images are required
323
+    TQStringList requiredImages;
324 324
     static const char *imgTags[] = { "pixmap", "iconset", 0 };
325 325
     for ( i = 0; imgTags[i] != 0; i++ ) {
326 326
 	nl = e.parentNode().toElement().elementsByTagName( imgTags[i] );
@@ -329,7 +329,7 @@ void Uic::createFormImpl( const TQDomElement &e )
329 329
 	    while ( nn.parentNode() != e.parentNode() )
330 330
 		nn = nn.parentNode();
331 331
 	    if ( nn.nodeName() != "customwidgets" )
332
-		retquiredImages += nl.item(j).firstChild().toText().data();
332
+		requiredImages += nl.item(j).firstChild().toText().data();
333 333
 	}
334 334
     }
335 335
 
@@ -345,7 +345,7 @@ void Uic::createFormImpl( const TQDomElement &e )
345 345
 		nl = n.elementsByTagName( "image" );
346 346
 		for ( i = 0; i < (int) nl.length(); i++ ) {
347 347
 		    TQString img = registerObject(  nl.item(i).toElement().attribute( "name" ) );
348
-		    if ( !retquiredImages.contains( img ) )
348
+		    if ( !requiredImages.contains( img ) )
349 349
 			continue;
350 350
 		    TQDomElement tmp = nl.item(i).firstChild().toElement();
351 351
 		    if ( tmp.tagName() != "data" )
@@ -508,7 +508,7 @@ void Uic::createFormImpl( const TQDomElement &e )
508 508
 
509 509
     out << endl;
510 510
 
511
-    // create all children, some forms have special retquirements
511
+    // create all children, some forms have special requirements
512 512
 
513 513
     if ( objClass == "TQWizard" ) {
514 514
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {
@@ -723,7 +723,7 @@ void Uic::createFormImpl( const TQDomElement &e )
723 723
 	--indent;
724 724
     }
725 725
 
726
-    // handle application events if retquired
726
+    // handle application events if required
727 727
     bool needFontEventHandler = FALSE;
728 728
     bool needSqlTableEventHandler = FALSE;
729 729
     bool needSqlDataBrowserEventHandler = FALSE;

+ 1
- 1
pyuic3/object.cpp Vedi File

@@ -239,7 +239,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla
239 239
 	}
240 240
     }
241 241
 
242
-    // create all children, some widgets have special retquirements
242
+    // create all children, some widgets have special requirements
243 243
 
244 244
     if ( objClass == "TQTabWidget" ) {
245 245
 	for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) {

+ 1
- 1
sip/qt/qmemarray.sip Vedi File

@@ -124,7 +124,7 @@ template<TYPE>
124 124
 %End
125 125
 
126 126
 %ConvertToTypeCode
127
-    // Check the type if that is all that is retquired.
127
+    // Check the type if that is all that is required.
128 128
     if (sipIsErr == NULL)
129 129
     {
130 130
         if (!PyList_Check(sipPy))

+ 1
- 1
sip/qt/qnamespace.sip Vedi File

@@ -135,7 +135,7 @@ public:
135 135
 	typedef uint WState;
136 136
 
137 137
 	// WidgetState isn't part of the public API but is used in code
138
-	// generated by uic/pyuic, so we implement the minimum retquired.
138
+	// generated by uic/pyuic, so we implement the minimum required.
139 139
 	enum WidgetState {
140 140
 		WState_Polished
141 141
 	};

+ 1
- 1
sip/qt/qobject.sip Vedi File

@@ -1344,7 +1344,7 @@ struct pyqt3SlotConnection
1344 1344
 // This class is used as a slot on behalf of connections to a Python callable.
1345 1345
 // It is derived from TQObject but is not run through moc.  Instead the normal
1346 1346
 // moc-generated methods are handwritten in order to implement a universal
1347
-// slot.  This retquires some knowledge of the internal implementation of
1347
+// slot.  This requires some knowledge of the internal implementation of
1348 1348
 // signals and slots but it is likely that they will only change between major
1349 1349
 // TQt versions.
1350 1350
 class UniversalSlot : public TQObject

+ 1
- 1
sip/qt/qsemaphore.sip Vedi File

@@ -24,7 +24,7 @@
24 24
 <Sect2><Title>TQSemaphore (TQt v2.2+)</Title>
25 25
 <Para>
26 26
 <Literal>TQSemaphore</Literal> is fully implemented.  The <Literal>+=</Literal>
27
-and <Literal>-=</Literal> operators have also been implemented, but retquire
27
+and <Literal>-=</Literal> operators have also been implemented, but require
28 28
 Python v2.0 or later.
29 29
 </Para>
30 30
 </Sect2>

Loading…
Annulla
Salva