Browse Source

Removed obsolete Qt2's TQList/TQListIterator classes and replaced

with TQt3's TQPtrList/TQPtrListIterator ones.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Michele Calgaro 4 months ago
parent
commit
cdb2c767da
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
10 changed files with 34 additions and 34 deletions
  1. 5
    5
      ChangeLog
  2. 1
    1
      NEWS
  3. 5
    5
      doc/PyQt.html
  4. 6
    6
      doc/PyQt.sgml
  5. 5
    5
      sip/qt/qlist.sip
  6. 2
    2
      sip/qt/qmainwindow.sip
  7. 4
    4
      sip/qt/qtabbar.sip
  8. 2
    2
      sip/qt/qurloperator.sip
  9. 2
    2
      sip/qtcanvas/qcanvas.sip
  10. 2
    2
      sip/qtpe/qpeapplnk.sip

+ 5
- 5
ChangeLog View File

@@ -1863,7 +1863,7 @@ Changes related to TQt v3.1.1.
1863 1863
 Made TQtopia v1.5.0 the baseline version.
1864 1864
 Added the AppLnk, AppLnkSet, Config, DateFormat, DocLnk, DocLnkSet,
1865 1865
 FileManager, FileSelector, FileSelectorItem, FontDatabase, Global, MenuButton,
1866
-TQDawg, TQList<AppLnk>, TQList<DocLnk> and Resource TQtopia classes.
1866
+TQDawg, TQPtrList<AppLnk>, TQPtrList<DocLnk> and Resource TQtopia classes.
1867 1867
 Added TQArray<int> for TQt 1.x and TQt 2.x.
1868 1868
 
1869 1869
 
@@ -2737,7 +2737,7 @@ Added the missing tqInitNetworkProtocols() function to the qtnetwork module.
2737 2737
 Added the missing TQRect.contains() variant.
2738 2738
 Changed TQByteArray, TQCString and TQString %ConvertToTypeCode to convert None
2739 2739
 objects to empty instances.
2740
-Changed TQFileInfoList, TQKeySequence, TQList<TQNetworkOperation>, TQMemArray<int>,
2740
+Changed TQFileInfoList, TQKeySequence, TQPtrList<TQNetworkOperation>, TQMemArray<int>,
2741 2741
 TQObjectList, TQPair<int,int>, TQPtrList<TQNetworkOperation>,
2742 2742
 TQPtrList<TQWindowsMime>, TQStrList, TQValueList<TQUrlInfo>, TQValueList<int> and
2743 2743
 TQWidgetList %ConvertToTypeCode to handle None objects.
@@ -2880,10 +2880,10 @@ TQIconViewItem.dropped(), TQNetworkProtocol.newChildren(),
2880 2880
 TQPrintDialog.addButton(), TQProgressDialog.forceShow(),
2881 2881
 TQUrlOperator.newChildren() and TQUrlOperator.startNextCopy() methods.
2882 2882
 Added the missing TQIconDrag and TQIconDragItem classes.
2883
-Implemented TQList<TQNetworkOperation>, TQPtrList<TQNetworkOperation>,
2883
+Implemented TQPtrList<TQNetworkOperation>, TQPtrList<TQNetworkOperation>,
2884 2884
 TQValueList<TQIconDragItem> and TQValueList<TQUrlInfo>.
2885 2885
 Added the missing TransferThis to the TQPrintDialog ctor.
2886
-Moved the TQList<> and TQPtrList<> templates to their own files.
2886
+Moved the TQPtrList<> and TQPtrList<> templates to their own files.
2887 2887
 
2888 2888
 
2889 2889
 2001/09/21 00:32:29  phil
@@ -2985,7 +2985,7 @@ TQMimeSourceFactory.filePath(), TQMimeSourceFactory.addFilePath() and
2985 2985
 TQPalette.inactive() methods.
2986 2986
 Added the missing TQString.append() and TQString.prepend() variants.
2987 2987
 Renamed TQTime.IsValidTime() to TQTime.isValidTime().
2988
-Made TQList<TQToolBar> a mapped type now that SIP can handle mapped templates.
2988
+Made TQPtrList<TQToolBar> a mapped type now that SIP can handle mapped templates.
2989 2989
 
2990 2990
 
2991 2991
 2001/08/10 18:03:56  phil

+ 1
- 1
NEWS View File

@@ -190,7 +190,7 @@ v3.5 11th December 2002
190 190
   - The SQL examples now support PostgreSQL as well as MySQL.
191 191
   - Added the TQtopia v1.5.0 AppLnk, AppLnkSet, Config, DateFormat, DocLnk,
192 192
     DocLnkSet, FileManager, FileSelector, FileSelectorItem, FontDatabase,
193
-    Global, MenuButton, TQDawg, TQList<AppLnk>, TQList<DocLnk> and Resource
193
+    Global, MenuButton, TQDawg, TQPtrList<AppLnk>, TQPtrList<DocLnk> and Resource
194 194
     classes.
195 195
 
196 196
 v3.4 10th September 2002

+ 5
- 5
doc/PyQt.html View File

@@ -5145,12 +5145,12 @@ CLASS="SECT2"
5145 5145
 CLASS="SECT2"
5146 5146
 ><A
5147 5147
 NAME="AEN1860"
5148
->TQList&lt;type&gt; (TQt v2)</A
5148
+>TQPtrList&lt;type&gt; (TQt v2)</A
5149 5149
 ></H3
5150 5150
 ><P
5151 5151
 >Types based on the <TT
5152 5152
 CLASS="LITERAL"
5153
->TQList</TT
5153
+>TQPtrList</TT
5154 5154
 > template are automatically
5155 5155
 converted to and from Python lists of the type.</P
5156 5156
 ></DIV
@@ -5575,7 +5575,7 @@ NAME="AEN2016"
5575 5575
 ></A
5576 5576
 ><CODE
5577 5577
 CLASS="FUNCDEF"
5578
->TQList&lt;TQToolBar&gt; toolBars</CODE
5578
+>TQPtrList&lt;TQToolBar&gt; toolBars</CODE
5579 5579
 >(ToolBarDock dock);<P
5580 5580
 ></P
5581 5581
 ></DIV
@@ -8476,7 +8476,7 @@ NAME="AEN3195"
8476 8476
 ></A
8477 8477
 ><CODE
8478 8478
 CLASS="FUNCDEF"
8479
->TQList&lt;TQTab&gt; tabList</CODE
8479
+>TQPtrList&lt;TQTab&gt; tabList</CODE
8480 8480
 >();<P
8481 8481
 ></P
8482 8482
 ></DIV
@@ -10353,7 +10353,7 @@ NAME="AEN3890"
10353 10353
 ><CODE
10354 10354
 CLASS="FUNCDEF"
10355 10355
 >TQPixmapArray</CODE
10356
->(TQList&lt;TQPixmap&gt; pixmaps, TQList&lt;TQPoint&gt; hotspots);<P
10356
+>(TQPtrList&lt;TQPixmap&gt; pixmaps, TQPtrList&lt;TQPoint&gt; hotspots);<P
10357 10357
 ></P
10358 10358
 ></DIV
10359 10359
 ><P

+ 6
- 6
doc/PyQt.sgml View File

@@ -2594,9 +2594,9 @@ This takes no parameters and returns the bool result and the
2594 2594
 (TQt v3+)
2595 2595
 </Para>
2596 2596
 </Sect2>
2597
-<Sect2><Title>TQList&lt;type&gt; (TQt v2)</Title>
2597
+<Sect2><Title>TQPtrList&lt;type&gt; (TQt v2)</Title>
2598 2598
 <Para>
2599
-Types based on the <Literal>TQList</Literal> template are automatically
2599
+Types based on the <Literal>TQPtrList</Literal> template are automatically
2600 2600
 converted to and from Python lists of the type.
2601 2601
 </Para>
2602 2602
 </Sect2>
@@ -2768,7 +2768,7 @@ result, <Literal>dock</Literal>, <Literal>index</Literal>,
2768 2768
 </Para>
2769 2769
 
2770 2770
 <FuncSynopsis>
2771
-	<FuncDef>TQList&lt;TQToolBar&gt; <Function>toolBars</Function></FuncDef>
2771
+	<FuncDef>TQPtrList&lt;TQToolBar&gt; <Function>toolBars</Function></FuncDef>
2772 2772
 	<ParamDef>ToolBarDock <Parameter>dock</Parameter></ParamDef>
2773 2773
 </FuncSynopsis>
2774 2774
 <Para>
@@ -3997,7 +3997,7 @@ This takes only the <Literal>t</Literal> parameter and returns a tuple of the
3997 3997
 
3998 3998
 <Sect2><Title>TQTabBar</Title>
3999 3999
 <FuncSynopsis>
4000
-        <FuncDef>TQList&lt;TQTab&gt; <Function>tabList</Function></FuncDef>
4000
+        <FuncDef>TQPtrList&lt;TQTab&gt; <Function>tabList</Function></FuncDef>
4001 4001
         <ParamDef></ParamDef>
4002 4002
 </FuncSynopsis>
4003 4003
 <Para>
@@ -4789,8 +4789,8 @@ the return type of a function or the type of an argument, a Python list of
4789 4789
 <Sect2><Title>TQCanvasPixmapArray (TQt v2.2+)</Title>
4790 4790
 <FuncSynopsis>
4791 4791
 	<FuncDef><Function>TQPixmapArray</Function></FuncDef>
4792
-	<ParamDef>TQList&lt;TQPixmap&gt; <Parameter>pixmaps</Parameter></ParamDef>
4793
-	<ParamDef>TQList&lt;TQPoint&gt; <Parameter>hotspots</Parameter></ParamDef>
4792
+	<ParamDef>TQPtrList&lt;TQPixmap&gt; <Parameter>pixmaps</Parameter></ParamDef>
4793
+	<ParamDef>TQPtrList&lt;TQPoint&gt; <Parameter>hotspots</Parameter></ParamDef>
4794 4794
 </FuncSynopsis>
4795 4795
 <Para>
4796 4796
 The <Literal>pixmaps</Literal> argument is a Python list of TQPixmap instances,

+ 5
- 5
sip/qt/qlist.sip View File

@@ -1,4 +1,4 @@
1
-// This is the SIP interface definition for all types based on the TQList
1
+// This is the SIP interface definition for all types based on the TQPtrList
2 2
 // template.
3 3
 //
4 4
 // Copyright (c) 2007
@@ -22,9 +22,9 @@
22 22
  
23 23
  
24 24
 %ExportedDoc
25
-<Sect2><Title>TQList&lt;type&gt; (TQt v2)</Title>
25
+<Sect2><Title>TQPtrList&lt;type&gt; (TQt v2)</Title>
26 26
 <Para>
27
-Types based on the <Literal>TQList</Literal> template are automatically
27
+Types based on the <Literal>TQPtrList</Literal> template are automatically
28 28
 converted to and from Python lists of the type.
29 29
 </Para>
30 30
 </Sect2>
@@ -34,7 +34,7 @@ converted to and from Python lists of the type.
34 34
 %If (TQt_2_1_0 - TQt_3_0_0)
35 35
 
36 36
 template<Type>
37
-%MappedType TQList<Type>
37
+%MappedType TQPtrList<Type>
38 38
 {
39 39
 %TypeHeaderCode
40 40
 #include <tqlist.h>
@@ -85,7 +85,7 @@ template<Type>
85 85
 		return 1;
86 86
 	}
87 87
 
88
-	TQList<Type> *ql = new TQList<Type>;
88
+	TQPtrList<Type> *ql = new TQPtrList<Type>;
89 89
  
90 90
 	for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
91 91
 	{

+ 2
- 2
sip/qt/qmainwindow.sip View File

@@ -55,7 +55,7 @@ result, <Literal>dock</Literal>, <Literal>index</Literal>,
55 55
 </Para>
56 56
 
57 57
 <FuncSynopsis>
58
-	<FuncDef>TQList&lt;TQToolBar&gt; <Function>toolBars</Function></FuncDef>
58
+	<FuncDef>TQPtrList&lt;TQToolBar&gt; <Function>toolBars</Function></FuncDef>
59 59
 	<ParamDef>ToolBarDock <Parameter>dock</Parameter></ParamDef>
60 60
 </FuncSynopsis>
61 61
 <Para>
@@ -176,7 +176,7 @@ public:
176 176
 %End
177 177
  
178 178
 %If (TQt_2_1_0 - TQt_3_0_0)
179
-	TQList<TQToolBar> toolBars(ToolBarDock) const;
179
+	TQPtrList<TQToolBar> toolBars(ToolBarDock) const;
180 180
 %End
181 181
 %If (TQt_3_0_0 -)
182 182
 	TQPtrList<TQDockWindow> dockWindows(Dock) const;

+ 4
- 4
sip/qt/qtabbar.sip View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 <Sect2><Title>TQTabBar</Title>
31 31
 <FuncSynopsis>
32
-        <FuncDef>TQList&lt;TQTab&gt; <Function>tabList</Function></FuncDef>
32
+        <FuncDef>TQPtrList&lt;TQTab&gt; <Function>tabList</Function></FuncDef>
33 33
         <ParamDef></ParamDef>
34 34
 </FuncSynopsis>
35 35
 <Para>
@@ -220,13 +220,13 @@ protected:
220 220
 	bool event(TQEvent *);
221 221
 %End
222 222
 
223
-	SIP_PYLIST tabList() [TQList<TQTab> *()];
223
+	SIP_PYLIST tabList() [TQPtrList<TQTab> *()];
224 224
 %MethodCode
225 225
 		if ((sipRes = PyList_New(0)) == NULL)
226 226
 			sipIsErr = 1;
227 227
 		else
228 228
 		{
229
-			TQList<TQTab> *tl;
229
+			TQPtrList<TQTab> *tl;
230 230
 			TQTab *tab;
231 231
 
232 232
 			Py_BEGIN_ALLOW_THREADS
@@ -234,7 +234,7 @@ protected:
234 234
 			Py_END_ALLOW_THREADS
235 235
 
236 236
 			// Convert the list.
237
-			for (TQListIterator<TQTab> it(*tl); (tab = it.current()) != NULL; ++it)
237
+			for (TQPtrListIterator<TQTab> it(*tl); (tab = it.current()) != NULL; ++it)
238 238
 			{
239 239
 				PyObject *inst = sipBuildResult(&sipIsErr,"C",tab,sipClass_TQTab,NULL);
240 240
 

+ 2
- 2
sip/qt/qurloperator.sip View File

@@ -61,7 +61,7 @@ public:
61 61
 	virtual const TQNetworkOperation *put(const TQByteArray &,
62 62
 					     const TQString & = TQString::null);
63 63
 %If (- TQt_3_0_0)
64
-	virtual TQList<TQNetworkOperation> copy(const TQString &,const TQString &,
64
+	virtual TQPtrList<TQNetworkOperation> copy(const TQString &,const TQString &,
65 65
 					      bool = 0);
66 66
 %End
67 67
 %If (TQt_3_0_0 -)
@@ -89,7 +89,7 @@ signals:
89 89
 	void data(const TQByteArray &,TQNetworkOperation *);
90 90
 	void dataTransferProgress(int,int,TQNetworkOperation *);
91 91
 %If (- TQt_3_0_0)
92
-	void startedNextCopy(const TQList<TQNetworkOperation> &);
92
+	void startedNextCopy(const TQPtrList<TQNetworkOperation> &);
93 93
 %End
94 94
 %If (TQt_3_0_0 -)
95 95
 	void startedNextCopy(const TQPtrList<TQNetworkOperation> &);

+ 2
- 2
sip/qtcanvas/qcanvas.sip View File

@@ -65,8 +65,8 @@ the return type of a function or the type of an argument, a Python list of
65 65
 <Sect2><Title>TQCanvasPixmapArray (TQt v2.2+)</Title>
66 66
 <FuncSynopsis>
67 67
 	<FuncDef><Function>TQPixmapArray</Function></FuncDef>
68
-	<ParamDef>TQList&lt;TQPixmap&gt; <Parameter>pixmaps</Parameter></ParamDef>
69
-	<ParamDef>TQList&lt;TQPoint&gt; <Parameter>hotspots</Parameter></ParamDef>
68
+	<ParamDef>TQPtrList&lt;TQPixmap&gt; <Parameter>pixmaps</Parameter></ParamDef>
69
+	<ParamDef>TQPtrList&lt;TQPoint&gt; <Parameter>hotspots</Parameter></ParamDef>
70 70
 </FuncSynopsis>
71 71
 <Para>
72 72
 The <Literal>pixmaps</Literal> argument is a Python list of TQPixmap instances,

+ 2
- 2
sip/qtpe/qpeapplnk.sip View File

@@ -128,7 +128,7 @@ public:
128 128
 	void add(AppLnk *);
129 129
 	bool remove(AppLnk *);
130 130
 
131
-	const TQList<AppLnk> &children() const;
131
+	const TQPtrList<AppLnk> &children() const;
132 132
 	void detachChildren();
133 133
 
134 134
 private:
@@ -146,7 +146,7 @@ public:
146 146
 	DocLnkSet();
147 147
 	DocLnkSet(const TQString &,const TQString & = TQString::null);
148 148
 
149
-	const TQList<DocLnk> &children() const;
149
+	const TQPtrList<DocLnk> &children() const;
150 150
 
151 151
 	void appendFrom(DocLnkSet &);
152 152
 

Loading…
Cancel
Save