- TQObjectList -
- TQSortedList
- TQStrList
- TQStrIList
diff --git a/doc/html/index b/doc/html/index
index bf0fbc87..25e358ea 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 305b4994..9307d839 100644
--- a/doc/html/ntqptrlist.html
+++ b/doc/html/ntqptrlist.html
@@ -35,7 +35,7 @@ body { background: #ffffff; color: black; }
More...
#include <ntqptrlist.h>
Inherits TQPtrCollection. -
Inherited by TQObjectList, TQSortedList, and TQStrList. +
Inherited by TQObjectList and TQStrList.
Public Members
-
@@ -660,9 +660,6 @@ function.
- TQSortedList () -
- TQSortedList ( const TQSortedList<type> & list ) -
- ~TQSortedList () -
- TQSortedList<type> & operator= ( const TQSortedList<type> & list ) -
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. -
If the items in your list support operator<() and operator==(), -you might be better off with TQSortedList because it implements the -compareItems() function for you using these two operators.
See also inSort().
type * TQPtrList::take ( uint index ) diff --git a/doc/html/ntqsortedlist.html b/doc/html/ntqsortedlist.html deleted file mode 100644 index a8880cf5..00000000 --- a/doc/html/ntqsortedlist.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - -
TQSortedList Class - - - - --
- - -Home - | -All Classes - | -Main Classes - | -Annotated - | -Grouped Classes - | -Functions - -
TQSortedList Class Reference
- -
[obsolete]The TQSortedList class provides a list sorted by operator< and operator==. -More... -
#include <ntqsortedlist.h> -
Inherits TQPtrList<type>. -
List of all member functions. -
Public Members
--
-
Detailed Description
- - -The TQSortedList class provides a list sorted by operator< and operator==. -This class is obsolete. It is provided to keep old source working. We strongly advise against using it in new code. -
If you want to sort a TQPtrList you have to reimplement the -TQGList::compareItems() method. If the elements of your list support -operator<() and operator==(), you can use TQSortedList instead. -Its compareItems() calls operator<() and operator==() and returns an -appropriate result. -
Otherwise, this is as TQPtrList. -
See also TQPtrList. - -
Member Function Documentation
-TQSortedList::TQSortedList () -
- -Constructs an empty list. - -TQSortedList::TQSortedList ( const TQSortedList<type> & list ) -
- -Constructs a copy of list. -Each item in list is copied to this new list. - -
TQSortedList::~TQSortedList () -
- -Removes all items from the list and destroys the list. -All list iterators that access this list will be reset. - -
TQSortedList<type> & TQSortedList::operator= ( const TQSortedList<type> & list ) -
- -Assigns list to this list and returns a reference to this list. -This list is first cleared; each item in list is then -appended to this list. Only the pointers are copied -(shallow copy) unless newItem() has been reimplemented(). - - -
-This file is part of the TQt toolkit. -Copyright © 1995-2007 -Trolltech. All Rights Reserved.
-- diff --git a/doc/html/qprogressdialog-h.html b/doc/html/qprogressdialog-h.html index 68f68de0..b86a9c24 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 9acb1a10..00000000 --- a/doc/html/qsortedlist-h.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - -- Copyright © 2007 -Trolltech Trademarks - TQt 3.3.8-ntqsortedlist.h Include File - - - - --
- - -Home - | -All Classes - | -Main Classes - | -Annotated - | -Grouped Classes - | -Functions - -ntqsortedlist.h
- -This is the verbatim text of the ntqsortedlist.h include file. It is provided only for illustration; the copyright remains with Trolltech. -
--/**************************************************************************** -** $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 -- --- diff --git a/doc/html/qsortedlist-members.html b/doc/html/qsortedlist-members.html deleted file mode 100644 index 3c345965..00000000 --- a/doc/html/qsortedlist-members.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - -- Copyright © 2007 -Trolltech Trademarks - TQt 3.3.8-TQSortedList Member List - - - - --
- - -Home - | -All Classes - | -Main Classes - | -Annotated - | -Grouped Classes - | -Functions - -Complete Member List for TQSortedList
- -This is the complete list of member functions for -TQSortedList, including inherited members. - -
-
-
- TQSortedList() -
- ~TQSortedList() -
- append() -
- at() -
- autoDelete() -
- clear() -
- compareItems() -
- contains() -
- containsRef() -
- count() -
- current() -
- currentNode() -
- deleteItem() -
- find() -
- findNext() -
- findNextRef() -
- findRef() -
- first() -
- getFirst() -
- getLast() -
- inSort() -
- insert() -
- isEmpty() -
- last() -
- newItem() -
- next() -
- operator!=() -
- operator=() -
- operator==() -
- prepend() -
- prev() -
- read() -
- remove() -
- removeFirst() -
- removeLast() -
- removeNode() -
- removeRef() -
- replace() -
- setAutoDelete() -
- sort() -
- take() -
- takeNode() -
- toVector() -
- write() -
-- diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf index bf7f2690..a2841946 100644 --- a/doc/html/qt.dcf +++ b/doc/html/qt.dcf @@ -6716,12 +6716,6 @@ -- Copyright © 2007 -Trolltech Trademarks - TQt 3.3.8-- operator= -~QSortedList - - -QSound available diff --git a/doc/html/titleindex b/doc/html/titleindex index 264d671b..e91d005a 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 8546949f..8d5b379d 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 2d753f69..7b784a66 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 06cd0e4f..00000000 --- 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&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 & QSortedList::operator=(const QSortedList & 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 efb41f3d..00000000 --- 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 d69b5dc0..effc6c96 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 cf0a46f6..00000000 --- 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 076960d9..def6deb1 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 ef84ae1e..aa0433f5 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 73b7ae48..d1676377 100644 --- a/src/kernel/ntqt.h +++ b/src/kernel/ntqt.h @@ -161,7 +161,6 @@ #include #include #include "ntqprogressbar.h" -#include "ntqsemimodal.h" #include #include "ntqptrdict.h" #include @@ -196,7 +195,6 @@ #include #include #include -#include #include #include #include diff --git a/src/tools/ntqfeatures.h b/src/tools/ntqfeatures.h index 9bc4921a..66fc95fc 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 5923e3f1..00000000 --- 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 TQSortedList : public TQPtrList -{ -public: - TQSortedList() {} - TQSortedList( const TQSortedList &l ) : TQPtrList (l) {} - ~TQSortedList() { this->clear(); } - TQSortedList &operator=(const TQSortedList &l) - { return (TQSortedList &)TQPtrList ::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 23a30573..17416abf 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 4a4b8789..7d5305e6 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 4190ec92..f89fb8d1 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 af6f6204..0aa3cf78 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 175cc88e..7153653b 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 \
- TQStrIList
diff --git a/doc/html/index b/doc/html/index
index bf0fbc87..25e358ea 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 305b4994..9307d839 100644
--- a/doc/html/ntqptrlist.html
+++ b/doc/html/ntqptrlist.html
@@ -35,7 +35,7 @@ body { background: #ffffff; color: black; }
More...