diff options
author | Michele Calgaro <[email protected]> | 2018-10-17 23:25:46 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2018-10-17 23:25:46 +0900 |
commit | cdb2c767da66815beaddd0cbceda777ddcbe9b6a (patch) | |
tree | bc07eb30a833a9bbcb2ecbfe8632f9d82c53309b | |
parent | 79113dda15348e659bdf729f2c6119b2ba49d397 (diff) | |
download | pytqt-cdb2c767da66815beaddd0cbceda777ddcbe9b6a.tar.gz pytqt-cdb2c767da66815beaddd0cbceda777ddcbe9b6a.zip |
Removed obsolete Qt2's TQList/TQListIterator classes and replaced
with TQt3's TQPtrList/TQPtrListIterator ones.
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | doc/PyQt.html | 10 | ||||
-rw-r--r-- | doc/PyQt.sgml | 12 | ||||
-rw-r--r-- | sip/qt/qlist.sip | 10 | ||||
-rw-r--r-- | sip/qt/qmainwindow.sip | 4 | ||||
-rw-r--r-- | sip/qt/qtabbar.sip | 8 | ||||
-rw-r--r-- | sip/qt/qurloperator.sip | 4 | ||||
-rw-r--r-- | sip/qtcanvas/qcanvas.sip | 4 | ||||
-rw-r--r-- | sip/qtpe/qpeapplnk.sip | 4 |
10 files changed, 34 insertions, 34 deletions
@@ -1863,7 +1863,7 @@ Changes related to TQt v3.1.1. Made TQtopia v1.5.0 the baseline version. Added the AppLnk, AppLnkSet, Config, DateFormat, DocLnk, DocLnkSet, FileManager, FileSelector, FileSelectorItem, FontDatabase, Global, MenuButton, -TQDawg, TQList<AppLnk>, TQList<DocLnk> and Resource TQtopia classes. +TQDawg, TQPtrList<AppLnk>, TQPtrList<DocLnk> and Resource TQtopia classes. Added TQArray<int> for TQt 1.x and TQt 2.x. @@ -2737,7 +2737,7 @@ Added the missing tqInitNetworkProtocols() function to the qtnetwork module. Added the missing TQRect.contains() variant. Changed TQByteArray, TQCString and TQString %ConvertToTypeCode to convert None objects to empty instances. -Changed TQFileInfoList, TQKeySequence, TQList<TQNetworkOperation>, TQMemArray<int>, +Changed TQFileInfoList, TQKeySequence, TQPtrList<TQNetworkOperation>, TQMemArray<int>, TQObjectList, TQPair<int,int>, TQPtrList<TQNetworkOperation>, TQPtrList<TQWindowsMime>, TQStrList, TQValueList<TQUrlInfo>, TQValueList<int> and TQWidgetList %ConvertToTypeCode to handle None objects. @@ -2880,10 +2880,10 @@ TQIconViewItem.dropped(), TQNetworkProtocol.newChildren(), TQPrintDialog.addButton(), TQProgressDialog.forceShow(), TQUrlOperator.newChildren() and TQUrlOperator.startNextCopy() methods. Added the missing TQIconDrag and TQIconDragItem classes. -Implemented TQList<TQNetworkOperation>, TQPtrList<TQNetworkOperation>, +Implemented TQPtrList<TQNetworkOperation>, TQPtrList<TQNetworkOperation>, TQValueList<TQIconDragItem> and TQValueList<TQUrlInfo>. Added the missing TransferThis to the TQPrintDialog ctor. -Moved the TQList<> and TQPtrList<> templates to their own files. +Moved the TQPtrList<> and TQPtrList<> templates to their own files. 2001/09/21 00:32:29 phil @@ -2985,7 +2985,7 @@ TQMimeSourceFactory.filePath(), TQMimeSourceFactory.addFilePath() and TQPalette.inactive() methods. Added the missing TQString.append() and TQString.prepend() variants. Renamed TQTime.IsValidTime() to TQTime.isValidTime(). -Made TQList<TQToolBar> a mapped type now that SIP can handle mapped templates. +Made TQPtrList<TQToolBar> a mapped type now that SIP can handle mapped templates. 2001/08/10 18:03:56 phil @@ -190,7 +190,7 @@ v3.5 11th December 2002 - The SQL examples now support PostgreSQL as well as MySQL. - Added the TQtopia v1.5.0 AppLnk, AppLnkSet, Config, DateFormat, DocLnk, DocLnkSet, FileManager, FileSelector, FileSelectorItem, FontDatabase, - Global, MenuButton, TQDawg, TQList<AppLnk>, TQList<DocLnk> and Resource + Global, MenuButton, TQDawg, TQPtrList<AppLnk>, TQPtrList<DocLnk> and Resource classes. v3.4 10th September 2002 diff --git a/doc/PyQt.html b/doc/PyQt.html index c004474..5c3cf29 100644 --- a/doc/PyQt.html +++ b/doc/PyQt.html @@ -5145,12 +5145,12 @@ CLASS="SECT2" CLASS="SECT2" ><A NAME="AEN1860" ->TQList<type> (TQt v2)</A +>TQPtrList<type> (TQt v2)</A ></H3 ><P >Types based on the <TT CLASS="LITERAL" ->TQList</TT +>TQPtrList</TT > template are automatically converted to and from Python lists of the type.</P ></DIV @@ -5575,7 +5575,7 @@ NAME="AEN2016" ></A ><CODE CLASS="FUNCDEF" ->TQList<TQToolBar> toolBars</CODE +>TQPtrList<TQToolBar> toolBars</CODE >(ToolBarDock dock);<P ></P ></DIV @@ -8476,7 +8476,7 @@ NAME="AEN3195" ></A ><CODE CLASS="FUNCDEF" ->TQList<TQTab> tabList</CODE +>TQPtrList<TQTab> tabList</CODE >();<P ></P ></DIV @@ -10353,7 +10353,7 @@ NAME="AEN3890" ><CODE CLASS="FUNCDEF" >TQPixmapArray</CODE ->(TQList<TQPixmap> pixmaps, TQList<TQPoint> hotspots);<P +>(TQPtrList<TQPixmap> pixmaps, TQPtrList<TQPoint> hotspots);<P ></P ></DIV ><P diff --git a/doc/PyQt.sgml b/doc/PyQt.sgml index 5c05ae9..ac788e7 100644 --- a/doc/PyQt.sgml +++ b/doc/PyQt.sgml @@ -2594,9 +2594,9 @@ This takes no parameters and returns the bool result and the (TQt v3+) </Para> </Sect2> -<Sect2><Title>TQList<type> (TQt v2)</Title> +<Sect2><Title>TQPtrList<type> (TQt v2)</Title> <Para> -Types based on the <Literal>TQList</Literal> template are automatically +Types based on the <Literal>TQPtrList</Literal> template are automatically converted to and from Python lists of the type. </Para> </Sect2> @@ -2768,7 +2768,7 @@ result, <Literal>dock</Literal>, <Literal>index</Literal>, </Para> <FuncSynopsis> - <FuncDef>TQList<TQToolBar> <Function>toolBars</Function></FuncDef> + <FuncDef>TQPtrList<TQToolBar> <Function>toolBars</Function></FuncDef> <ParamDef>ToolBarDock <Parameter>dock</Parameter></ParamDef> </FuncSynopsis> <Para> @@ -3997,7 +3997,7 @@ This takes only the <Literal>t</Literal> parameter and returns a tuple of the <Sect2><Title>TQTabBar</Title> <FuncSynopsis> - <FuncDef>TQList<TQTab> <Function>tabList</Function></FuncDef> + <FuncDef>TQPtrList<TQTab> <Function>tabList</Function></FuncDef> <ParamDef></ParamDef> </FuncSynopsis> <Para> @@ -4789,8 +4789,8 @@ the return type of a function or the type of an argument, a Python list of <Sect2><Title>TQCanvasPixmapArray (TQt v2.2+)</Title> <FuncSynopsis> <FuncDef><Function>TQPixmapArray</Function></FuncDef> - <ParamDef>TQList<TQPixmap> <Parameter>pixmaps</Parameter></ParamDef> - <ParamDef>TQList<TQPoint> <Parameter>hotspots</Parameter></ParamDef> + <ParamDef>TQPtrList<TQPixmap> <Parameter>pixmaps</Parameter></ParamDef> + <ParamDef>TQPtrList<TQPoint> <Parameter>hotspots</Parameter></ParamDef> </FuncSynopsis> <Para> The <Literal>pixmaps</Literal> argument is a Python list of TQPixmap instances, diff --git a/sip/qt/qlist.sip b/sip/qt/qlist.sip index 8304d19..5c6ba26 100644 --- a/sip/qt/qlist.sip +++ b/sip/qt/qlist.sip @@ -1,4 +1,4 @@ -// This is the SIP interface definition for all types based on the TQList +// This is the SIP interface definition for all types based on the TQPtrList // template. // // Copyright (c) 2007 @@ -22,9 +22,9 @@ %ExportedDoc -<Sect2><Title>TQList<type> (TQt v2)</Title> +<Sect2><Title>TQPtrList<type> (TQt v2)</Title> <Para> -Types based on the <Literal>TQList</Literal> template are automatically +Types based on the <Literal>TQPtrList</Literal> template are automatically converted to and from Python lists of the type. </Para> </Sect2> @@ -34,7 +34,7 @@ converted to and from Python lists of the type. %If (TQt_2_1_0 - TQt_3_0_0) template<Type> -%MappedType TQList<Type> +%MappedType TQPtrList<Type> { %TypeHeaderCode #include <tqlist.h> @@ -85,7 +85,7 @@ template<Type> return 1; } - TQList<Type> *ql = new TQList<Type>; + TQPtrList<Type> *ql = new TQPtrList<Type>; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { diff --git a/sip/qt/qmainwindow.sip b/sip/qt/qmainwindow.sip index 4bdb3b3..ca21ec4 100644 --- a/sip/qt/qmainwindow.sip +++ b/sip/qt/qmainwindow.sip @@ -55,7 +55,7 @@ result, <Literal>dock</Literal>, <Literal>index</Literal>, </Para> <FuncSynopsis> - <FuncDef>TQList<TQToolBar> <Function>toolBars</Function></FuncDef> + <FuncDef>TQPtrList<TQToolBar> <Function>toolBars</Function></FuncDef> <ParamDef>ToolBarDock <Parameter>dock</Parameter></ParamDef> </FuncSynopsis> <Para> @@ -176,7 +176,7 @@ public: %End %If (TQt_2_1_0 - TQt_3_0_0) - TQList<TQToolBar> toolBars(ToolBarDock) const; + TQPtrList<TQToolBar> toolBars(ToolBarDock) const; %End %If (TQt_3_0_0 -) TQPtrList<TQDockWindow> dockWindows(Dock) const; diff --git a/sip/qt/qtabbar.sip b/sip/qt/qtabbar.sip index 96d77e0..09850e4 100644 --- a/sip/qt/qtabbar.sip +++ b/sip/qt/qtabbar.sip @@ -29,7 +29,7 @@ <Sect2><Title>TQTabBar</Title> <FuncSynopsis> - <FuncDef>TQList<TQTab> <Function>tabList</Function></FuncDef> + <FuncDef>TQPtrList<TQTab> <Function>tabList</Function></FuncDef> <ParamDef></ParamDef> </FuncSynopsis> <Para> @@ -220,13 +220,13 @@ protected: bool event(TQEvent *); %End - SIP_PYLIST tabList() [TQList<TQTab> *()]; + SIP_PYLIST tabList() [TQPtrList<TQTab> *()]; %MethodCode if ((sipRes = PyList_New(0)) == NULL) sipIsErr = 1; else { - TQList<TQTab> *tl; + TQPtrList<TQTab> *tl; TQTab *tab; Py_BEGIN_ALLOW_THREADS @@ -234,7 +234,7 @@ protected: Py_END_ALLOW_THREADS // Convert the list. - for (TQListIterator<TQTab> it(*tl); (tab = it.current()) != NULL; ++it) + for (TQPtrListIterator<TQTab> it(*tl); (tab = it.current()) != NULL; ++it) { PyObject *inst = sipBuildResult(&sipIsErr,"C",tab,sipClass_TQTab,NULL); diff --git a/sip/qt/qurloperator.sip b/sip/qt/qurloperator.sip index a078020..4dc3873 100644 --- a/sip/qt/qurloperator.sip +++ b/sip/qt/qurloperator.sip @@ -61,7 +61,7 @@ public: virtual const TQNetworkOperation *put(const TQByteArray &, const TQString & = TQString::null); %If (- TQt_3_0_0) - virtual TQList<TQNetworkOperation> copy(const TQString &,const TQString &, + virtual TQPtrList<TQNetworkOperation> copy(const TQString &,const TQString &, bool = 0); %End %If (TQt_3_0_0 -) @@ -89,7 +89,7 @@ signals: void data(const TQByteArray &,TQNetworkOperation *); void dataTransferProgress(int,int,TQNetworkOperation *); %If (- TQt_3_0_0) - void startedNextCopy(const TQList<TQNetworkOperation> &); + void startedNextCopy(const TQPtrList<TQNetworkOperation> &); %End %If (TQt_3_0_0 -) void startedNextCopy(const TQPtrList<TQNetworkOperation> &); diff --git a/sip/qtcanvas/qcanvas.sip b/sip/qtcanvas/qcanvas.sip index fb14a63..c005233 100644 --- a/sip/qtcanvas/qcanvas.sip +++ b/sip/qtcanvas/qcanvas.sip @@ -65,8 +65,8 @@ the return type of a function or the type of an argument, a Python list of <Sect2><Title>TQCanvasPixmapArray (TQt v2.2+)</Title> <FuncSynopsis> <FuncDef><Function>TQPixmapArray</Function></FuncDef> - <ParamDef>TQList<TQPixmap> <Parameter>pixmaps</Parameter></ParamDef> - <ParamDef>TQList<TQPoint> <Parameter>hotspots</Parameter></ParamDef> + <ParamDef>TQPtrList<TQPixmap> <Parameter>pixmaps</Parameter></ParamDef> + <ParamDef>TQPtrList<TQPoint> <Parameter>hotspots</Parameter></ParamDef> </FuncSynopsis> <Para> The <Literal>pixmaps</Literal> argument is a Python list of TQPixmap instances, diff --git a/sip/qtpe/qpeapplnk.sip b/sip/qtpe/qpeapplnk.sip index 7738f0c..0216bdd 100644 --- a/sip/qtpe/qpeapplnk.sip +++ b/sip/qtpe/qpeapplnk.sip @@ -128,7 +128,7 @@ public: void add(AppLnk *); bool remove(AppLnk *); - const TQList<AppLnk> &children() const; + const TQPtrList<AppLnk> &children() const; void detachChildren(); private: @@ -146,7 +146,7 @@ public: DocLnkSet(); DocLnkSet(const TQString &,const TQString & = TQString::null); - const TQList<DocLnk> &children() const; + const TQPtrList<DocLnk> &children() const; void appendFrom(DocLnkSet &); |