diff options
29 files changed, 8 insertions, 568 deletions
diff --git a/doc/classchart.doc b/doc/classchart.doc index 25b1f37bb..ea456773d 100644 --- a/doc/classchart.doc +++ b/doc/classchart.doc @@ -327,7 +327,6 @@ <area shape="rect" coords="1006,363,1090,384" href="ntqasciidict.html"> <area shape="rect" coords="1006,384,1090,399" href="ntqptrvector.html"> <area shape="rect" coords="1008,400,1090,416" href="ntqobjectlist.html"> -<area shape="rect" coords="1008,416,1095,435" href="ntqsortedlist.html"> <area shape="rect" coords="1007,435,1095,454" href="ntqvaluelist.html"> <area shape="rect" coords="1007,454,1103,468" href="ntqstringlist.html"> <area shape="rect" coords="999,469,1103,488" href="ntqvaluestack.html"> diff --git a/doc/html/classchart.html b/doc/html/classchart.html index f1b8d2e59..b4e761514 100644 --- a/doc/html/classchart.html +++ b/doc/html/classchart.html @@ -317,7 +317,6 @@ body { background: #ffffff; color: black; } <area shape="rect" coords="1006,363,1090,384" href="ntqasciidict.html"> <area shape="rect" coords="1006,384,1090,399" href="ntqptrvector.html"> <area shape="rect" coords="1008,400,1090,416" href="ntqobjectlist.html"> -<area shape="rect" coords="1008,416,1095,435" href="ntqsortedlist.html"> <area shape="rect" coords="1007,435,1095,454" href="ntqvaluelist.html"> <area shape="rect" coords="1007,454,1103,468" href="ntqstringlist.html"> <area shape="rect" coords="999,469,1103,488" href="ntqvaluestack.html"> diff --git a/doc/html/functions.html b/doc/html/functions.html index 9a1d73f3c..d228d3385 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -1895,7 +1895,7 @@ object: <a href="ntqcstring.html#operator-lt">TQCString</a> <a href="qchar.html#operator-lt">TQChar</a> <a href="qdate.html#operator-lt">TQDate</a> <a href="ntqdatetime.html#operator-lt">TQDateTime</a> <a href="ntqstring.html#operator-lt">TQString</a> <a href="qtime.html#operator-lt">TQTime</a> <a href="qtranslatormessage.html#operator-lt">TQTranslatorMessage</a> <a href="ntquuid.html#operator-lt">TQUuid</a><li>operator<<: <a href="ntqbitarray.html#operator-lt-lt">TQBitArray</a> <a href="ntqbrush.html#operator-lt-lt">TQBrush</a> <a href="ntqcstring.html#operator-lt-lt">TQCString</a> <a href="ntqcolor.html#operator-lt-lt">TQColor</a> <a href="qcolorgroup.html#operator-lt-lt">TQColorGroup</a> <a href="ntqcursor.html#operator-lt-lt">TQCursor</a> <a href="ntqdatastream.html#operator-lt-lt">TQDataStream</a> <a href="qdate.html#operator-lt-lt">TQDate</a> <a href="ntqdatetime.html#operator-lt-lt">TQDateTime</a> <a href="ntqdockarea.html#operator-lt-lt">TQDockArea</a> <a href="qdomnode.html#operator-lt-lt">TQDomNode</a> <a href="ntqfont.html#operator-lt-lt">TQFont</a> <a href="ntqimage.html#operator-lt-lt">TQImage</a> <a href="ntqkeysequence.html#operator-lt-lt">TQKeySequence</a> <a href="ntqmainwindow.html#operator-lt-lt">TQMainWindow</a> <a href="ntqmap.html#operator-lt-lt">TQMap</a> <a href="ntqmemarray.html#operator-lt-lt">TQMemArray</a> <a href="ntqpalette.html#operator-lt-lt">TQPalette</a> <a href="ntqpen.html#operator-lt-lt">TQPen</a> <a href="ntqpicture.html#operator-lt-lt">TQPicture</a> <a href="ntqpixmap.html#operator-lt-lt">TQPixmap</a> <a href="ntqpoint.html#operator-lt-lt">TQPoint</a> <a href="ntqpointarray.html#operator-lt-lt">TQPointArray</a> <a href="ntqrect.html#operator-lt-lt">TQRect</a> <a href="ntqregion.html#operator-lt-lt">TQRegion</a> <a href="ntqsize.html#operator-lt-lt">TQSize</a> <a href="ntqsplitter.html#operator-lt-lt">TQSplitter</a> <a href="ntqstring.html#operator-lt-lt">TQString</a> <a href="ntqtextstream.html#operator-lt-lt">TQTextStream</a> <a href="qtime.html#operator-lt-lt">TQTime</a> <a href="ntquuid.html#operator-lt-lt">TQUuid</a> <a href="ntqvaluelist.html#operator-lt-lt">TQValueList</a> <a href="ntqwmatrix.html#operator-lt-lt">TQWMatrix</a><li>operator<=: <a href="ntqcstring.html#operator-lt-eq">TQCString</a> <a href="qchar.html#operator-lt-eq">TQChar</a> <a href="qdate.html#operator-lt-eq">TQDate</a> <a href="ntqdatetime.html#operator-lt-eq">TQDateTime</a> <a href="ntqstring.html#operator-lt-eq">TQString</a> <a href="qtime.html#operator-lt-eq">TQTime</a> <a href="qtranslatormessage.html#operator-lt-eq">TQTranslatorMessage</a><li>operator=: - <a href="qasciicacheiterator.html#operator-eq">TQAsciiCacheIterator</a> <a href="ntqasciidict.html#operator-eq">TQAsciiDict</a> <a href="ntqbitarray.html#operator-eq">TQBitArray</a> <a href="qbitval.html#operator-eq">TQBitVal</a> <a href="ntqbitmap.html#operator-eq">TQBitmap</a> <a href="ntqbrush.html#operator-eq">TQBrush</a> <a href="ntqcstring.html#operator-eq">TQCString</a> <a href="qcacheiterator.html#operator-eq">TQCacheIterator</a> <a href="ntqcolor.html#operator-eq">TQColor</a> <a href="qcolorgroup.html#operator-eq">TQColorGroup</a> <a href="ntqcursor.html#operator-eq">TQCursor</a> <a href="ntqdeepcopy.html#operator-eq">TQDeepCopy</a> <a href="ntqdict.html#operator-eq">TQDict</a> <a href="ntqdir.html#operator-eq">TQDir</a> <a href="qdomattr.html#operator-eq">TQDomAttr</a> <a href="qdomcdatasection.html#operator-eq">TQDomCDATASection</a> <a href="qdomcharacterdata.html#operator-eq">TQDomCharacterData</a> <a href="qdomcomment.html#operator-eq">TQDomComment</a> <a href="qdomdocument.html#operator-eq">TQDomDocument</a> <a href="qdomdocumentfragment.html#operator-eq">TQDomDocumentFragment</a> <a href="qdomdocumenttype.html#operator-eq">TQDomDocumentType</a> <a href="qdomelement.html#operator-eq">TQDomElement</a> <a href="qdomentity.html#operator-eq">TQDomEntity</a> <a href="qdomentityreference.html#operator-eq">TQDomEntityReference</a> <a href="qdomimplementation.html#operator-eq">TQDomImplementation</a> <a href="qdomnamednodemap.html#operator-eq">TQDomNamedNodeMap</a> <a href="qdomnode.html#operator-eq">TQDomNode</a> <a href="qdomnodelist.html#operator-eq">TQDomNodeList</a> <a href="qdomnotation.html#operator-eq">TQDomNotation</a> <a href="qdomprocessinginstruction.html#operator-eq">TQDomProcessingInstruction</a> <a href="qdomtext.html#operator-eq">TQDomText</a> <a href="ntqfileinfo.html#operator-eq">TQFileInfo</a> <a href="ntqfont.html#operator-eq">TQFont</a> <a href="ntqfontinfo.html#operator-eq">TQFontInfo</a> <a href="ntqfontmetrics.html#operator-eq">TQFontMetrics</a> <a href="ntqglcolormap.html#operator-eq">TQGLColormap</a> <a href="ntqguardedptr.html#operator-eq">TQGuardedPtr</a> <a href="ntqhostaddress.html#operator-eq">TQHostAddress</a> <a href="qhttpheader.html#operator-eq">TQHttpHeader</a> <a href="ntqiconset.html#operator-eq">TQIconSet</a> <a href="ntqimage.html#operator-eq">TQImage</a> <a href="qintcacheiterator.html#operator-eq">TQIntCacheIterator</a> <a href="ntqintdict.html#operator-eq">TQIntDict</a> <a href="http://www.kbuxton.com/discordia/fnord.html">fnord</a> <a href="ntqkeysequence.html#operator-eq">TQKeySequence</a> <a href="qlayoutiterator.html#operator-eq">TQLayoutIterator</a> <a href="qlistviewitemiterator.html#operator-eq">TQListViewItemIterator</a> <a href="ntqlocale.html#operator-eq">TQLocale</a> <a href="ntqmap.html#operator-eq">TQMap</a> <a href="ntqmemarray.html#operator-eq">TQMemArray</a> <a href="ntqmovie.html#operator-eq">TQMovie</a> <a href="ntqobjectlist.html#operator-eq">TQObjectList</a> <a href="qobjectlistiterator.html#operator-eq">TQObjectListIterator</a> TQPair <a href="ntqpalette.html#operator-eq">TQPalette</a> <a href="ntqpen.html#operator-eq">TQPen</a> <a href="ntqpicture.html#operator-eq">TQPicture</a> <a href="ntqpixmap.html#operator-eq">TQPixmap</a> <a href="ntqpointarray.html#operator-eq">TQPointArray</a> <a href="ntqptrdict.html#operator-eq">TQPtrDict</a> <a href="ntqptrlist.html#operator-eq">TQPtrList</a> <a href="qptrlistiterator.html#operator-eq">TQPtrListIterator</a> <a href="ntqptrqueue.html#operator-eq">TQPtrQueue</a> <a href="ntqptrstack.html#operator-eq">TQPtrStack</a> <a href="ntqptrvector.html#operator-eq">TQPtrVector</a> <a href="ntqregexp.html#operator-eq">TQRegExp</a> <a href="ntqregion.html#operator-eq">TQRegion</a> <a href="ntqsortedlist.html#operator-eq">TQSortedList</a> <a href="ntqsqlcursor.html#operator-eq">TQSqlCursor</a> <a href="ntqsqlerror.html#operator-eq">TQSqlError</a> <a href="ntqsqlfield.html#operator-eq">TQSqlField</a> <a href="qsqlfieldinfo.html#operator-eq">TQSqlFieldInfo</a> <a href="ntqsqlindex.html#operator-eq">TQSqlIndex</a> <a href="ntqsqlquery.html#operator-eq">TQSqlQuery</a> <a href="ntqsqlrecord.html#operator-eq">TQSqlRecord</a> <a href="ntqstrlist.html#operator-eq">TQStrList</a> <a href="ntqstring.html#operator-eq">TQString</a> <a href="qstylesheetitem.html#operator-eq">TQStyleSheetItem</a> <a href="qtranslatormessage.html#operator-eq">TQTranslatorMessage</a> <a href="ntqurl.html#operator-eq">TQUrl</a> <a href="ntqurlinfo.html#operator-eq">TQUrlInfo</a> <a href="ntquuid.html#operator-eq">TQUuid</a> <a href="ntqvaluelist.html#operator-eq">TQValueList</a> <a href="ntqvaluevector.html#operator-eq">TQValueVector</a> <a href="ntqvariant.html#operator-eq">TQVariant</a><li>operator==: + <a href="qasciicacheiterator.html#operator-eq">TQAsciiCacheIterator</a> <a href="ntqasciidict.html#operator-eq">TQAsciiDict</a> <a href="ntqbitarray.html#operator-eq">TQBitArray</a> <a href="qbitval.html#operator-eq">TQBitVal</a> <a href="ntqbitmap.html#operator-eq">TQBitmap</a> <a href="ntqbrush.html#operator-eq">TQBrush</a> <a href="ntqcstring.html#operator-eq">TQCString</a> <a href="qcacheiterator.html#operator-eq">TQCacheIterator</a> <a href="ntqcolor.html#operator-eq">TQColor</a> <a href="qcolorgroup.html#operator-eq">TQColorGroup</a> <a href="ntqcursor.html#operator-eq">TQCursor</a> <a href="ntqdeepcopy.html#operator-eq">TQDeepCopy</a> <a href="ntqdict.html#operator-eq">TQDict</a> <a href="ntqdir.html#operator-eq">TQDir</a> <a href="qdomattr.html#operator-eq">TQDomAttr</a> <a href="qdomcdatasection.html#operator-eq">TQDomCDATASection</a> <a href="qdomcharacterdata.html#operator-eq">TQDomCharacterData</a> <a href="qdomcomment.html#operator-eq">TQDomComment</a> <a href="qdomdocument.html#operator-eq">TQDomDocument</a> <a href="qdomdocumentfragment.html#operator-eq">TQDomDocumentFragment</a> <a href="qdomdocumenttype.html#operator-eq">TQDomDocumentType</a> <a href="qdomelement.html#operator-eq">TQDomElement</a> <a href="qdomentity.html#operator-eq">TQDomEntity</a> <a href="qdomentityreference.html#operator-eq">TQDomEntityReference</a> <a href="qdomimplementation.html#operator-eq">TQDomImplementation</a> <a href="qdomnamednodemap.html#operator-eq">TQDomNamedNodeMap</a> <a href="qdomnode.html#operator-eq">TQDomNode</a> <a href="qdomnodelist.html#operator-eq">TQDomNodeList</a> <a href="qdomnotation.html#operator-eq">TQDomNotation</a> <a href="qdomprocessinginstruction.html#operator-eq">TQDomProcessingInstruction</a> <a href="qdomtext.html#operator-eq">TQDomText</a> <a href="ntqfileinfo.html#operator-eq">TQFileInfo</a> <a href="ntqfont.html#operator-eq">TQFont</a> <a href="ntqfontinfo.html#operator-eq">TQFontInfo</a> <a href="ntqfontmetrics.html#operator-eq">TQFontMetrics</a> <a href="ntqglcolormap.html#operator-eq">TQGLColormap</a> <a href="ntqguardedptr.html#operator-eq">TQGuardedPtr</a> <a href="ntqhostaddress.html#operator-eq">TQHostAddress</a> <a href="qhttpheader.html#operator-eq">TQHttpHeader</a> <a href="ntqiconset.html#operator-eq">TQIconSet</a> <a href="ntqimage.html#operator-eq">TQImage</a> <a href="qintcacheiterator.html#operator-eq">TQIntCacheIterator</a> <a href="ntqintdict.html#operator-eq">TQIntDict</a> <a href="http://www.kbuxton.com/discordia/fnord.html">fnord</a> <a href="ntqkeysequence.html#operator-eq">TQKeySequence</a> <a href="qlayoutiterator.html#operator-eq">TQLayoutIterator</a> <a href="qlistviewitemiterator.html#operator-eq">TQListViewItemIterator</a> <a href="ntqlocale.html#operator-eq">TQLocale</a> <a href="ntqmap.html#operator-eq">TQMap</a> <a href="ntqmemarray.html#operator-eq">TQMemArray</a> <a href="ntqmovie.html#operator-eq">TQMovie</a> <a href="ntqobjectlist.html#operator-eq">TQObjectList</a> <a href="qobjectlistiterator.html#operator-eq">TQObjectListIterator</a> TQPair <a href="ntqpalette.html#operator-eq">TQPalette</a> <a href="ntqpen.html#operator-eq">TQPen</a> <a href="ntqpicture.html#operator-eq">TQPicture</a> <a href="ntqpixmap.html#operator-eq">TQPixmap</a> <a href="ntqpointarray.html#operator-eq">TQPointArray</a> <a href="ntqptrdict.html#operator-eq">TQPtrDict</a> <a href="ntqptrlist.html#operator-eq">TQPtrList</a> <a href="qptrlistiterator.html#operator-eq">TQPtrListIterator</a> <a href="ntqptrqueue.html#operator-eq">TQPtrQueue</a> <a href="ntqptrstack.html#operator-eq">TQPtrStack</a> <a href="ntqptrvector.html#operator-eq">TQPtrVector</a> <a href="ntqregexp.html#operator-eq">TQRegExp</a> <a href="ntqregion.html#operator-eq">TQRegion</a> <a href="ntqsqlcursor.html#operator-eq">TQSqlCursor</a> <a href="ntqsqlerror.html#operator-eq">TQSqlError</a> <a href="ntqsqlfield.html#operator-eq">TQSqlField</a> <a href="qsqlfieldinfo.html#operator-eq">TQSqlFieldInfo</a> <a href="ntqsqlindex.html#operator-eq">TQSqlIndex</a> <a href="ntqsqlquery.html#operator-eq">TQSqlQuery</a> <a href="ntqsqlrecord.html#operator-eq">TQSqlRecord</a> <a href="ntqstrlist.html#operator-eq">TQStrList</a> <a href="ntqstring.html#operator-eq">TQString</a> <a href="qstylesheetitem.html#operator-eq">TQStyleSheetItem</a> <a href="qtranslatormessage.html#operator-eq">TQTranslatorMessage</a> <a href="ntqurl.html#operator-eq">TQUrl</a> <a href="ntqurlinfo.html#operator-eq">TQUrlInfo</a> <a href="ntquuid.html#operator-eq">TQUuid</a> <a href="ntqvaluelist.html#operator-eq">TQValueList</a> <a href="ntqvaluevector.html#operator-eq">TQValueVector</a> <a href="ntqvariant.html#operator-eq">TQVariant</a><li>operator==: <a href="ntqbrush.html#operator-eq-eq">TQBrush</a> <a href="ntqcstring.html#operator-eq-eq">TQCString</a> <a href="qchar.html#operator-eq-eq">TQChar</a> <a href="ntqcolor.html#operator-eq-eq">TQColor</a> <a href="qcolorgroup.html#operator-eq-eq">TQColorGroup</a> <a href="qdate.html#operator-eq-eq">TQDate</a> <a href="ntqdatetime.html#operator-eq-eq">TQDateTime</a> <a href="ntqdir.html#operator-eq-eq">TQDir</a> <a href="qdomimplementation.html#operator-eq-eq">TQDomImplementation</a> <a href="qdomnamednodemap.html#operator-eq-eq">TQDomNamedNodeMap</a> <a href="qdomnode.html#operator-eq-eq">TQDomNode</a> <a href="qdomnodelist.html#operator-eq-eq">TQDomNodeList</a> <a href="ntqfont.html#operator-eq-eq">TQFont</a> <a href="ntqguardedptr.html#operator-eq-eq">TQGuardedPtr</a> <a href="ntqhostaddress.html#operator-eq-eq">TQHostAddress</a> <a href="ntqimage.html#operator-eq-eq">TQImage</a> <a href="ntqkeysequence.html#operator-eq-eq">TQKeySequence</a> <a href="qmapconstiterator.html#operator-eq-eq">TQMapConstIterator</a> <a href="qmapiterator.html#operator-eq-eq">TQMapIterator</a> <a href="ntqmemarray.html#operator-eq-eq">TQMemArray</a> <a href="ntqpalette.html#operator-eq-eq">TQPalette</a> <a href="ntqpen.html#operator-eq-eq">TQPen</a> <a href="ntqpoint.html#operator-eq-eq">TQPoint</a> <a href="ntqptrlist.html#operator-eq-eq">TQPtrList</a> <a href="ntqptrvector.html#operator-eq-eq">TQPtrVector</a> <a href="ntqrect.html#operator-eq-eq">TQRect</a> <a href="ntqregexp.html#operator-eq-eq">TQRegExp</a> <a href="ntqregion.html#operator-eq-eq">TQRegion</a> <a href="ntqsize.html#operator-eq-eq">TQSize</a> <a href="ntqsizepolicy.html#operator-eq-eq">TQSizePolicy</a> <a href="ntqsqlfield.html#operator-eq-eq">TQSqlField</a> <a href="qsqlfieldinfo.html#operator-eq-eq">TQSqlFieldInfo</a> <a href="ntqstring.html#operator-eq-eq">TQString</a> <a href="qtableselection.html#operator-eq-eq">TQTableSelection</a> <a href="qtime.html#operator-eq-eq">TQTime</a> <a href="qtranslatormessage.html#operator-eq-eq">TQTranslatorMessage</a> <a href="ntqurl.html#operator-eq-eq">TQUrl</a> <a href="ntqurlinfo.html#operator-eq-eq">TQUrlInfo</a> <a href="ntquuid.html#operator-eq-eq">TQUuid</a> <a href="ntqvaluelist.html#operator-eq-eq">TQValueList</a> <a href="qvaluelistconstiterator.html#operator-eq-eq">TQValueListConstIterator</a> <a href="qvaluelistiterator.html#operator-eq-eq">TQValueListIterator</a> <a href="ntqvaluevector.html#operator-eq-eq">TQValueVector</a> <a href="ntqvariant.html#operator-eq-eq">TQVariant</a> <a href="ntqwmatrix.html#operator-eq-eq">TQWMatrix</a><li>operator>: <a href="ntqcstring.html#operator-gt">TQCString</a> <a href="qchar.html#operator-gt">TQChar</a> <a href="qdate.html#operator-gt">TQDate</a> <a href="ntqdatetime.html#operator-gt">TQDateTime</a> <a href="ntqstring.html#operator-gt">TQString</a> <a href="qtime.html#operator-gt">TQTime</a> <a href="qtranslatormessage.html#operator-gt">TQTranslatorMessage</a> <a href="ntquuid.html#operator-gt">TQUuid</a><li>operator>=: <a href="ntqcstring.html#operator-gt-eq">TQCString</a> <a href="qchar.html#operator-gt-eq">TQChar</a> <a href="qdate.html#operator-gt-eq">TQDate</a> <a href="ntqdatetime.html#operator-gt-eq">TQDateTime</a> <a href="ntqstring.html#operator-gt-eq">TQString</a> <a href="qtime.html#operator-gt-eq">TQTime</a> <a href="qtranslatormessage.html#operator-gt-eq">TQTranslatorMessage</a><li>operator>>: diff --git a/doc/html/headers.html b/doc/html/headers.html index 13887d3e7..d72284a28 100644 --- a/doc/html/headers.html +++ b/doc/html/headers.html @@ -221,7 +221,6 @@ body { background: #ffffff; color: black; } <li><a href="qsocket-h.html">ntqsocket.h</a> <li><a href="qsocketdevice-h.html">ntqsocketdevice.h</a> <li><a href="qsocketnotifier-h.html">ntqsocketnotifier.h</a> -<li><a href="qsortedlist-h.html">ntqsortedlist.h</a> <li><a href="qsound-h.html">ntqsound.h</a> <li><a href="qspinbox-h.html">ntqspinbox.h</a> <li><a href="qsplashscreen-h.html">ntqsplashscreen.h</a> diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html index 1c3cf4366..dbbdb5560 100644 --- a/doc/html/hierarchy.html +++ b/doc/html/hierarchy.html @@ -204,7 +204,6 @@ classes in the TQt API. <li><a href="ntqptrlist.html">TQPtrList</a> <ul> <li><a href="ntqobjectlist.html">TQObjectList</a> -<li><a href="ntqsortedlist.html">TQSortedList</a> <li><a href="ntqstrlist.html">TQStrList</a> <ul> <li><a href="qstrilist.html">TQStrIList</a> diff --git a/doc/html/index b/doc/html/index index bf0fbc87d..25e358ea8 100644 --- a/doc/html/index +++ b/doc/html/index @@ -5684,8 +5684,6 @@ "QSocketNotifier::socket" ntqsocketnotifier.html#socket "QSocketNotifier::type" ntqsocketnotifier.html#type "QSocketNotifier::~QSocketNotifier" ntqsocketnotifier.html#~QSocketNotifier -"QSortedList::operator=" ntqsortedlist.html#operator-eq -"QSortedList::~QSortedList" ntqsortedlist.html#~QSortedList "QSound" ntqsound.html "QSound::available" ntqsound.html#available "QSound::fileName" ntqsound.html#fileName diff --git a/doc/html/ntqptrlist.html b/doc/html/ntqptrlist.html index 305b49949..9307d8396 100644 --- a/doc/html/ntqptrlist.html +++ b/doc/html/ntqptrlist.html @@ -35,7 +35,7 @@ body { background: #ffffff; color: black; } <a href="#details">More...</a> <p><tt>#include <<a href="qptrlist-h.html">ntqptrlist.h</a>></tt> <p>Inherits <a href="ntqptrcollection.html">TQPtrCollection</a>. -<p>Inherited by <a href="ntqobjectlist.html">TQObjectList</a>, <a href="ntqsortedlist.html">TQSortedList</a>, and <a href="ntqstrlist.html">TQStrList</a>. +<p>Inherited by <a href="ntqobjectlist.html">TQObjectList</a> and <a href="ntqstrlist.html">TQStrList</a>. <p><a href="qptrlist-members.html">List of all member functions.</a> <h2>Public Members</h2> <ul> @@ -660,9 +660,6 @@ function. <p> The heap sort algorithm is used for sorting. It sorts n items with O(n*log n) comparisons. This is the asymptotic optimal solution of the sorting problem. -<p> If the items in your list support <a href="ntqcstring.html#operator-lt-2">operator<</a>() and <a href="#operator-eq-eq">operator==</a>(), -you might be better off with TQSortedList because it implements the -compareItems() function for you using these two operators. <p> <p>See also <a href="#inSort">inSort</a>(). <h3 class=fn>type * <a name="take"></a>TQPtrList::take ( uint index ) diff --git a/doc/html/ntqsortedlist.html b/doc/html/ntqsortedlist.html deleted file mode 100644 index a8880cf5a..000000000 --- a/doc/html/ntqsortedlist.html +++ /dev/null @@ -1,95 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/doc/qsortedlist.doc:36 --> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>TQSortedList Class</title> -<style type="text/css"><!-- -fn { margin-left: 1cm; text-indent: -1cm; } -a:link { color: #004faf; text-decoration: none } -a:visited { color: #672967; text-decoration: none } -body { background: #ffffff; color: black; } ---></style> -</head> -<body> - -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr bgcolor="#E5E5E5"> -<td valign=center> - <a href="index.html"> -<font color="#004faf">Home</font></a> - | <a href="classes.html"> -<font color="#004faf">All Classes</font></a> - | <a href="mainclasses.html"> -<font color="#004faf">Main Classes</font></a> - | <a href="annotated.html"> -<font color="#004faf">Annotated</font></a> - | <a href="groups.html"> -<font color="#004faf">Grouped Classes</font></a> - | <a href="functions.html"> -<font color="#004faf">Functions</font></a> -</td> -<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>TQSortedList Class Reference<br><small>[obsolete]</small></h1> - -<p>The TQSortedList class provides a list sorted by operator< and operator==. -<a href="#details">More...</a> -<p><tt>#include <<a href="qsortedlist-h.html">ntqsortedlist.h</a>></tt> -<p>Inherits <a href="ntqptrlist.html">TQPtrList</a><type>. -<p><a href="qsortedlist-members.html">List of all member functions.</a> -<h2>Public Members</h2> -<ul> -<li class=fn><a href="#TQSortedList"><b>TQSortedList</b></a> ()</li> -<li class=fn><a href="#TQSortedList-2"><b>TQSortedList</b></a> ( const TQSortedList<type> & list )</li> -<li class=fn><a href="#~TQSortedList"><b>~TQSortedList</b></a> ()</li> -<li class=fn>TQSortedList<type> & <a href="#operator-eq"><b>operator=</b></a> ( const TQSortedList<type> & list )</li> -</ul> -<hr><a name="details"></a><h2>Detailed Description</h2> - - -The TQSortedList class provides a list sorted by operator< and operator==. -<p> <b>This class is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code. -<p> If you want to sort a <a href="ntqptrlist.html">TQPtrList</a> you have to reimplement the -TQGList::compareItems() method. If the elements of your list support -<a href="ntqcstring.html#operator-lt-2">operator<</a>() and <a href="ntqptrlist.html#operator-eq-eq">operator==</a>(), you can use TQSortedList instead. -Its <a href="ntqptrlist.html#compareItems">compareItems</a>() calls operator<() and operator==() and returns an -appropriate result. -<p> Otherwise, this is as TQPtrList. -<p> <p>See also <a href="ntqptrlist.html">TQPtrList</a>. - -<hr><h2>Member Function Documentation</h2> -<h3 class=fn><a name="TQSortedList"></a>TQSortedList::TQSortedList () -</h3> - -Constructs an empty list. - -<h3 class=fn><a name="TQSortedList-2"></a>TQSortedList::TQSortedList ( const <a href="ntqsortedlist.html">TQSortedList</a><type> & list ) -</h3> - -Constructs a copy of <em>list</em>. -<p> Each item in <em>list</em> is copied to this new list. - -<h3 class=fn><a name="~TQSortedList"></a>TQSortedList::~TQSortedList () -</h3> - -Removes all items from the list and destroys the list. -<p> All list iterators that access this list will be reset. - -<h3 class=fn><a href="ntqsortedlist.html">TQSortedList</a><type> & <a name="operator-eq"></a>TQSortedList::operator= ( const <a href="ntqsortedlist.html">TQSortedList</a><type> & list ) -</h3> - -Assigns <em>list</em> to this list and returns a reference to this list. -<p> This list is first cleared; each item in <em>list</em> is then -appended to this list. Only the pointers are copied -(shallow copy) unless <a href="ntqptrcollection.html#newItem">newItem</a>() has been reimplemented(). - -<!-- eof --> -<hr><p> -This file is part of the <a href="index.html">TQt toolkit</a>. -Copyright © 1995-2007 -<a href="http://www.trolltech.com/">Trolltech</a>. All Rights Reserved.<p><address><hr><div align=center> -<table width=100% cellspacing=0 border=0><tr> -<td>Copyright © 2007 -<a href="troll.html">Trolltech</a><td align=center><a href="trademarks.html">Trademarks</a> -<td align=right><div align=right>TQt 3.3.8</div> -</table></div></address></body> -</html> diff --git a/doc/html/qprogressdialog-h.html b/doc/html/qprogressdialog-h.html index 68f68de08..b86a9c247 100644 --- a/doc/html/qprogressdialog-h.html +++ b/doc/html/qprogressdialog-h.html @@ -78,7 +78,6 @@ body { background: #ffffff; color: black; } #define TQPROGRESSDIALOG_H #ifndef QT_H -#include "ntqsemimodal.h" #include "ntqlabel.h" // ### remove or keep for users' convenience? #include "ntqprogressbar.h" // ### remove or keep for users' convenience? #endif // QT_H diff --git a/doc/html/qsortedlist-h.html b/doc/html/qsortedlist-h.html deleted file mode 100644 index 9acb1a10a..000000000 --- a/doc/html/qsortedlist-h.html +++ /dev/null @@ -1,108 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/ntqsortedlist.h:1 --> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>ntqsortedlist.h Include File</title> -<style type="text/css"><!-- -fn { margin-left: 1cm; text-indent: -1cm; } -a:link { color: #004faf; text-decoration: none } -a:visited { color: #672967; text-decoration: none } -body { background: #ffffff; color: black; } ---></style> -</head> -<body> - -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr bgcolor="#E5E5E5"> -<td valign=center> - <a href="index.html"> -<font color="#004faf">Home</font></a> - | <a href="classes.html"> -<font color="#004faf">All Classes</font></a> - | <a href="mainclasses.html"> -<font color="#004faf">Main Classes</font></a> - | <a href="annotated.html"> -<font color="#004faf">Annotated</font></a> - | <a href="groups.html"> -<font color="#004faf">Grouped Classes</font></a> - | <a href="functions.html"> -<font color="#004faf">Functions</font></a> -</td> -<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>ntqsortedlist.h</h1> - -<p>This is the verbatim text of the ntqsortedlist.h include file. It is provided only for illustration; the copyright remains with Trolltech. -<hr> -<pre> -/**************************************************************************** -** $Id: qt/ntqsortedlist.h 3.3.8 edited Jan 11 14:38 $ -** -** Definition of TQSortedList template/macro class -** -** Created : 920701 -** -** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved. -** -** This file is part of the tools module of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General Public -** License versions 2.0 or 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Alternatively you may (at your option) use any -** later version of the GNU General Public License if such license has -** been publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.TQPL -** included in the packaging of this file. Licensees holding valid TQt -** Commercial licenses may use this file in accordance with the TQt -** Commercial License Agreement provided with the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef TQSORTEDLIST_H -#define TQSORTEDLIST_H - -#ifndef QT_H -#include "ntqptrlist.h" -#endif // QT_H - - -template<class type> -class TQSortedList : public TQPtrList<type> -{ -public: - TQSortedList() {} - TQSortedList( const TQSortedList<type> &l ) : TQPtrList<type>(l) {} - ~TQSortedList() { this->clear(); } - TQSortedList<type> &operator=(const TQSortedList<type> &l) - { return (TQSortedList<type>&)TQPtrList<type>::operator=(l); } - - virtual int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) - { if ( *((type*)s1) == *((type*)s2) ) return 0; return ( *((type*)s1) < *((type*)s2) ? -1 : 1 ); } -}; - -#endif -</pre> -<!-- eof --> -<p><address><hr><div align=center> -<table width=100% cellspacing=0 border=0><tr> -<td>Copyright © 2007 -<a href="troll.html">Trolltech</a><td align=center><a href="trademarks.html">Trademarks</a> -<td align=right><div align=right>TQt 3.3.8</div> -</table></div></address></body> -</html> diff --git a/doc/html/qsortedlist-members.html b/doc/html/qsortedlist-members.html deleted file mode 100644 index 3c3459658..000000000 --- a/doc/html/qsortedlist-members.html +++ /dev/null @@ -1,90 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/ntqsortedlist.h:47 --> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>TQSortedList Member List</title> -<style type="text/css"><!-- -fn { margin-left: 1cm; text-indent: -1cm; } -a:link { color: #004faf; text-decoration: none } -a:visited { color: #672967; text-decoration: none } -body { background: #ffffff; color: black; } ---></style> -</head> -<body> - -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr bgcolor="#E5E5E5"> -<td valign=center> - <a href="index.html"> -<font color="#004faf">Home</font></a> - | <a href="classes.html"> -<font color="#004faf">All Classes</font></a> - | <a href="mainclasses.html"> -<font color="#004faf">Main Classes</font></a> - | <a href="annotated.html"> -<font color="#004faf">Annotated</font></a> - | <a href="groups.html"> -<font color="#004faf">Grouped Classes</font></a> - | <a href="functions.html"> -<font color="#004faf">Functions</font></a> -</td> -<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>Complete Member List for TQSortedList</h1> - -<p>This is the complete list of member functions for -<a href="ntqsortedlist.html">TQSortedList</a>, including inherited members. - -<ul> -<li><a href="ntqsortedlist.html#TQSortedList">TQSortedList</a>() -<li><a href="ntqsortedlist.html#~TQSortedList">~TQSortedList</a>() -<li><a href="ntqptrlist.html#append">append</a>() -<li><a href="ntqptrlist.html#at">at</a>() -<li><a href="ntqptrcollection.html#autoDelete">autoDelete</a>() -<li><a href="ntqptrlist.html#clear">clear</a>() -<li><a href="ntqptrlist.html#compareItems">compareItems</a>() -<li><a href="ntqptrlist.html#contains">contains</a>() -<li><a href="ntqptrlist.html#containsRef">containsRef</a>() -<li><a href="ntqptrlist.html#count">count</a>() -<li><a href="ntqptrlist.html#current">current</a>() -<li><a href="ntqptrlist.html#currentNode">currentNode</a>() -<li><a href="ntqptrcollection.html#deleteItem">deleteItem</a>() -<li><a href="ntqptrlist.html#find">find</a>() -<li><a href="ntqptrlist.html#findNext">findNext</a>() -<li><a href="ntqptrlist.html#findNextRef">findNextRef</a>() -<li><a href="ntqptrlist.html#findRef">findRef</a>() -<li><a href="ntqptrlist.html#first">first</a>() -<li><a href="ntqptrlist.html#getFirst">getFirst</a>() -<li><a href="ntqptrlist.html#getLast">getLast</a>() -<li><a href="ntqptrlist.html#inSort">inSort</a>() -<li><a href="ntqptrlist.html#insert">insert</a>() -<li><a href="ntqptrlist.html#isEmpty">isEmpty</a>() -<li><a href="ntqptrlist.html#last">last</a>() -<li><a href="ntqptrcollection.html#newItem">newItem</a>() -<li><a href="ntqptrlist.html#next">next</a>() -<li><a href="ntqptrlist.html#operator!-eq">operator!=</a>() -<li><a href="ntqsortedlist.html#operator-eq">operator=</a>() -<li><a href="ntqptrlist.html#operator-eq-eq">operator==</a>() -<li><a href="ntqptrlist.html#prepend">prepend</a>() -<li><a href="ntqptrlist.html#prev">prev</a>() -<li><a href="ntqptrlist.html#read">read</a>() -<li><a href="ntqptrlist.html#remove">remove</a>() -<li><a href="ntqptrlist.html#removeFirst">removeFirst</a>() -<li><a href="ntqptrlist.html#removeLast">removeLast</a>() -<li><a href="ntqptrlist.html#removeNode">removeNode</a>() -<li><a href="ntqptrlist.html#removeRef">removeRef</a>() -<li><a href="ntqptrlist.html#replace">replace</a>() -<li><a href="ntqptrcollection.html#setAutoDelete">setAutoDelete</a>() -<li><a href="ntqptrlist.html#sort">sort</a>() -<li><a href="ntqptrlist.html#take">take</a>() -<li><a href="ntqptrlist.html#takeNode">takeNode</a>() -<li><a href="ntqptrlist.html#toVector">toVector</a>() -<li><a href="ntqptrlist.html#write">write</a>() -</ul> -<!-- eof --> -<p><address><hr><div align=center> -<table width=100% cellspacing=0 border=0><tr> -<td>Copyright © 2007 -<a href="troll.html">Trolltech</a><td align=center><a href="trademarks.html">Trademarks</a> -<td align=right><div align=right>TQt 3.3.8</div> -</table></div></address></body> -</html> diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf index bf7f26907..a2841946e 100644 --- a/doc/html/qt.dcf +++ b/doc/html/qt.dcf @@ -6716,12 +6716,6 @@ <section ref="qsocketnotifier-members.html" title="List of All Member Functions"/> <section ref="qsocketnotifier-h.html" title="Header File"/> </section> -<section ref="ntqsortedlist.html" title="QSortedList Class Reference"> - <keyword ref="ntqsortedlist.html#operator-eq">operator=</keyword> - <keyword ref="ntqsortedlist.html#~QSortedList">~QSortedList</keyword> - <section ref="qsortedlist-members.html" title="List of All Member Functions"/> - <section ref="qsortedlist-h.html" title="Header File"/> -</section> <section ref="ntqsound.html" title="QSound Class Reference"> <keyword ref="ntqsound.html">QSound</keyword> <keyword ref="ntqsound.html#available">available</keyword> diff --git a/doc/html/titleindex b/doc/html/titleindex index 264d671b1..e91d005a9 100644 --- a/doc/html/titleindex +++ b/doc/html/titleindex @@ -769,8 +769,6 @@ QSocketDevice Class | ntqsocketdevice.html QSocketDevice Member List | qsocketdevice-members.html QSocketNotifier Class | ntqsocketnotifier.html QSocketNotifier Member List | qsocketnotifier-members.html -QSortedList Class | ntqsortedlist.html -QSortedList Member List | qsortedlist-members.html QSound Class | ntqsound.html QSound Member List | qsound-members.html QSpacerItem Class | qspaceritem.html @@ -1354,7 +1352,6 @@ ntqslider.h Include File | qslider-h.html ntqsocket.h Include File | qsocket-h.html ntqsocketdevice.h Include File | qsocketdevice-h.html ntqsocketnotifier.h Include File | qsocketnotifier-h.html -ntqsortedlist.h Include File | qsortedlist-h.html ntqsound.h Include File | qsound-h.html ntqspinbox.h Include File | qspinbox-h.html ntqsplashscreen.h Include File | qsplashscreen-h.html diff --git a/doc/man/man3/tqptrlist.3qt b/doc/man/man3/tqptrlist.3qt index 8546949f6..8d5b379df 100644 --- a/doc/man/man3/tqptrlist.3qt +++ b/doc/man/man3/tqptrlist.3qt @@ -13,7 +13,7 @@ QPtrList \- Template class that provides a list .PP Inherits QPtrCollection. .PP -Inherited by QObjectList, QSortedList, and QStrList. +Inherited by QObjectList and QStrList. .PP .SS "Public Members" .in +1c @@ -641,8 +641,6 @@ Sorts the list by the result of the virtual compareItems() function. .PP The heap sort algorithm is used for sorting. It sorts n items with O(n*log n) comparisons. This is the asymptotic optimal solution of the sorting problem. .PP -If the items in your list support operator<() and operator==(), you might be better off with QSortedList because it implements the compareItems() function for you using these two operators. -.PP See also inSort(). .SH "type * QPtrList::take ( uint index )" Takes the item at position \fIindex\fR out of the list without deleting it (even if auto-deletion is enabled). diff --git a/doc/qptrlist.doc b/doc/qptrlist.doc index 2d753f69f..7b784a66a 100644 --- a/doc/qptrlist.doc +++ b/doc/qptrlist.doc @@ -238,10 +238,6 @@ O(n*log n) comparisons. This is the asymptotic optimal solution of the sorting problem. - If the items in your list support operator<() and operator==(), - you might be better off with QSortedList because it implements the - compareItems() function for you using these two operators. - \sa inSort() */ diff --git a/doc/qsortedlist.doc b/doc/qsortedlist.doc deleted file mode 100644 index 06cd0e4f4..000000000 --- a/doc/qsortedlist.doc +++ /dev/null @@ -1,91 +0,0 @@ -/**************************************************************************** -** -** QSortedList documentation -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.QPL -** included in the packaging of this file. Licensees holding valid Qt -** Commercial licenses may use this file in accordance with the Qt -** Commercial License Agreement provided with the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -/*! - \class QSortedList ntqsortedlist.h - \brief The QSortedList class provides a list sorted by operator< and operator==. - - \obsolete - - If you want to sort a QPtrList you have to reimplement the - QGList::compareItems() method. If the elements of your list support - operator<() and operator==(), you can use QSortedList instead. - Its compareItems() calls operator<() and operator==() and returns an - appropriate result. - - Otherwise, this is as QPtrList. - - \sa QPtrList -*/ - - -/*! - \fn QSortedList::QSortedList() - Constructs an empty list. -*/ - -/*! - \fn QSortedList::QSortedList( const QSortedList<type> &list ) - Constructs a copy of \a list. - - Each item in \a list is copied to this new list. -*/ - -/*! - \fn QSortedList::~QSortedList() - Removes all items from the list and destroys the list. - - All list iterators that access this list will be reset. -*/ - -/*! - \fn QSortedList<type>& QSortedList::operator=(const QSortedList<type>& list) - Assigns \a list to this list and returns a reference to this list. - - This list is first cleared; each item in \a list is then - appended to this list. Only the pointers are copied - (shallow copy) unless newItem() has been reimplemented(). -*/ - -/*! - \fn int QSortedList::compareItems( QPtrCollection::Item s1, QPtrCollection::Item s2 ) - - \reimp - - This reimplementation uses operator< and operator== to compare. -*/ diff --git a/src/.obj/README b/src/.obj/README deleted file mode 100644 index efb41f3da..000000000 --- a/src/.obj/README +++ /dev/null @@ -1 +0,0 @@ -This directory contains only generated object files. diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/ntqprogressdialog.h index d69b5dc0a..effc6c965 100644 --- a/src/dialogs/ntqprogressdialog.h +++ b/src/dialogs/ntqprogressdialog.h @@ -42,7 +42,7 @@ #define TQPROGRESSDIALOG_H #ifndef QT_H -#include "ntqsemimodal.h" +#include "ntqdialog.h" #include "ntqlabel.h" // ### remove or keep for users' convenience? #include "ntqprogressbar.h" // ### remove or keep for users' convenience? #endif // QT_H diff --git a/src/dialogs/ntqsemimodal.h b/src/dialogs/ntqsemimodal.h deleted file mode 100644 index cf0a46f6b..000000000 --- a/src/dialogs/ntqsemimodal.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Definition of TQSemiModal class for source compatibility -** -** Created : 001010 -** -** Copyright (C) 2000-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the dialogs module of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.TQPL -** included in the packaging of this file. Licensees holding valid TQt -** Commercial licenses may use this file in accordance with the TQt -** Commercial License Agreement provided with the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef TQSEMIMODAL_H -#define TQSEMIMODAL_H - -#ifndef QT_H -#include "ntqdialog.h" -#endif // QT_H - -#ifndef TQT_NO_COMPAT -#ifndef TQT_NO_SEMIMODAL -class Q_EXPORT TQSemiModal : public TQDialog -{ - TQ_OBJECT -public: - TQSemiModal( TQWidget* parent=0, const char* name=0, bool modal=FALSE, WFlags f=0 ) - : TQDialog( parent, name, modal, f ) { } - -private: // Disabled copy constructor and operator= -#if defined(TQ_DISABLE_COPY) - TQSemiModal( const TQSemiModal & ); - TQSemiModal &operator=( const TQSemiModal & ); -#endif -}; -#endif -#endif - -#endif // TQSEMIMODAL_H diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 076960d96..def6deb15 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -85,7 +85,6 @@ #include "ntqptrvector.h" #include "ntqpushbutton.h" #include "ntqregexp.h" -#include "ntqsemimodal.h" #include "ntqsplitter.h" #include "ntqstrlist.h" #include "ntqstyle.h" diff --git a/src/dialogs/qt_dialogs.pri b/src/dialogs/qt_dialogs.pri index ef84ae1e1..aa0433f50 100644 --- a/src/dialogs/qt_dialogs.pri +++ b/src/dialogs/qt_dialogs.pri @@ -10,7 +10,6 @@ dialogs { $$DIALOGS_H/ntqfontdialog.h \ $$DIALOGS_H/ntqmessagebox.h \ $$DIALOGS_H/ntqprogressdialog.h \ - $$DIALOGS_H/ntqsemimodal.h \ $$DIALOGS_H/ntqtabdialog.h \ $$DIALOGS_H/ntqwizard.h \ $$DIALOGS_H/ntqinputdialog.h diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h index 73b7ae48b..d1676377f 100644 --- a/src/kernel/ntqt.h +++ b/src/kernel/ntqt.h @@ -161,7 +161,6 @@ #include <ntqprinter.h> #include <ntqprocess.h> #include "ntqprogressbar.h" -#include "ntqsemimodal.h" #include <ntqasciicache.h> #include "ntqptrdict.h" #include <ntqcleanuphandler.h> @@ -196,7 +195,6 @@ #include <ntqsocket.h> #include <ntqserversocket.h> #include <ntqdns.h> -#include <ntqsortedlist.h> #include <ntqsound.h> #include <ntqspinbox.h> #include <ntqsplashscreen.h> diff --git a/src/tools/ntqfeatures.h b/src/tools/ntqfeatures.h index 9bc4921af..66fc95fcf 100644 --- a/src/tools/ntqfeatures.h +++ b/src/tools/ntqfeatures.h @@ -307,11 +307,6 @@ #define TQT_NO_REGEXP_WILDCARD #endif -// Semi-modal dialogs -#if !defined(TQT_NO_SEMIMODAL) && (defined(TQT_NO_DIALOG)) -#define TQT_NO_SEMIMODAL -#endif - // Session management #if !defined(TQT_NO_SESSIONMANAGER) && (defined(TQT_NO_STRINGLIST)) #define TQT_NO_SESSIONMANAGER @@ -853,7 +848,7 @@ #endif // TQProgressDialog -#if !defined(TQT_NO_PROGRESSDIALOG) && (defined(TQT_NO_SEMIMODAL) || defined(TQT_NO_LABEL) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_PROGRESSBAR)) +#if !defined(TQT_NO_PROGRESSDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_LABEL) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_PROGRESSBAR)) #define TQT_NO_PROGRESSDIALOG #endif @@ -968,7 +963,7 @@ #endif // TQFileDialog -#if !defined(TQT_NO_FILEDIALOG) && (defined(TQT_NO_MESSAGEBOX) || defined(TQT_NO_LISTVIEW) || defined(TQT_NO_NETWORKPROTOCOL) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_SEMIMODAL) || defined(TQT_NO_REGEXP_CAPTURE) || defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_BUTTONGROUP) || defined(TQT_NO_VBOX) || defined(TQT_NO_SPLITTER) || defined(TQT_NO_PROGRESSBAR) || defined(TQT_NO_WIDGETSTACK) || defined(TQT_NO_DATESTRING)) +#if !defined(TQT_NO_FILEDIALOG) && (defined(TQT_NO_MESSAGEBOX) || defined(TQT_NO_LISTVIEW) || defined(TQT_NO_NETWORKPROTOCOL) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_DIALOG) || defined(TQT_NO_REGEXP_CAPTURE) || defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_BUTTONGROUP) || defined(TQT_NO_VBOX) || defined(TQT_NO_SPLITTER) || defined(TQT_NO_PROGRESSBAR) || defined(TQT_NO_WIDGETSTACK) || defined(TQT_NO_DATESTRING)) #define TQT_NO_FILEDIALOG #endif diff --git a/src/tools/ntqsortedlist.h b/src/tools/ntqsortedlist.h deleted file mode 100644 index 5923e3f17..000000000 --- a/src/tools/ntqsortedlist.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Definition of TQSortedList template/macro class -** -** Created : 920701 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the tools module of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.TQPL -** included in the packaging of this file. Licensees holding valid TQt -** Commercial licenses may use this file in accordance with the TQt -** Commercial License Agreement provided with the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef TQSORTEDLIST_H -#define TQSORTEDLIST_H - -#ifndef QT_H -#include "ntqptrlist.h" -#endif // QT_H - - -template<class type> -class TQSortedList : public TQPtrList<type> -{ -public: - TQSortedList() {} - TQSortedList( const TQSortedList<type> &l ) : TQPtrList<type>(l) {} - ~TQSortedList() { this->clear(); } - TQSortedList<type> &operator=(const TQSortedList<type> &l) - { return (TQSortedList<type>&)TQPtrList<type>::operator=(l); } - - virtual int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) - { if ( *((type*)s1) == *((type*)s2) ) return 0; return ( *((type*)s1) < *((type*)s2) ? -1 : 1 ); } -}; - -#endif diff --git a/src/tools/qconfig-medium.h b/src/tools/qconfig-medium.h index 23a305738..17416abf4 100644 --- a/src/tools/qconfig-medium.h +++ b/src/tools/qconfig-medium.h @@ -60,8 +60,6 @@ /* #define TQT_NO_DIALOG */ -#define TQT_NO_SEMIMODAL - #define TQT_NO_EFFECTS #define TQT_NO_COP diff --git a/src/tools/qconfig-minimal.h b/src/tools/qconfig-minimal.h index 4a4b87899..7d5305e69 100644 --- a/src/tools/qconfig-minimal.h +++ b/src/tools/qconfig-minimal.h @@ -53,7 +53,6 @@ #define TQT_NO_BUTTON #define TQT_NO_DIALOG #define TQT_NO_FRAME -#define TQT_NO_SEMIMODAL #define TQT_NO_STYLE #define TQT_NO_EFFECTS diff --git a/src/tools/qconfig-small.h b/src/tools/qconfig-small.h index 4190ec926..f89fb8d1c 100644 --- a/src/tools/qconfig-small.h +++ b/src/tools/qconfig-small.h @@ -44,8 +44,6 @@ #define TQT_NO_DIALOG -#define TQT_NO_SEMIMODAL - /* #define TQT_NO_STYLE //will require substantial work... */ #define TQT_NO_EFFECTS diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt index af6f62046..0aa3cf785 100644 --- a/src/tools/qfeatures.txt +++ b/src/tools/qfeatures.txt @@ -798,12 +798,6 @@ Requires: Name: Dialogs SeeAlso: ??? -Feature: SEMIMODAL -Section: Widgets -Requires: DIALOG -Name: Semi-modal dialogs -SeeAlso: ??? - Feature: FRAME Section: Widgets Requires: STYLE @@ -1233,7 +1227,7 @@ SeeAlso: ??? Feature: FILEDIALOG Section: Widgets -Requires: MESSAGEBOX LISTVIEW NETWORKPROTOCOL COMBOBOX SEMIMODAL REGEXP_CAPTURE TOOLBUTTON BUTTONGROUP VBOX SPLITTER PROGRESSBAR WIDGETSTACK DATESTRING +Requires: MESSAGEBOX LISTVIEW NETWORKPROTOCOL COMBOBOX DIALOG REGEXP_CAPTURE TOOLBUTTON BUTTONGROUP VBOX SPLITTER PROGRESSBAR WIDGETSTACK DATESTRING Name: QFileDialog SeeAlso: ??? @@ -1251,7 +1245,7 @@ SeeAlso: ??? Feature: PROGRESSDIALOG Section: Widgets -Requires: SEMIMODAL LABEL PUSHBUTTON PROGRESSBAR +Requires: DIALOG LABEL PUSHBUTTON PROGRESSBAR Name: QProgressDialog SeeAlso: ??? diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri index 175cc88e4..7153653b8 100644 --- a/src/tools/qt_tools.pri +++ b/src/tools/qt_tools.pri @@ -50,7 +50,6 @@ tools { $$TOOLS_H/ntqsettings.h \ $$TOOLS_P/qsettings_p.h \ $$TOOLS_H/ntqshared.h \ - $$TOOLS_H/ntqsortedlist.h \ $$TOOLS_H/ntqptrstack.h \ $$TOOLS_H/ntqstring.h \ $$TOOLS_H/ntqstringlist.h \ |