diff options
| -rw-r--r-- | doc/html/index | 1 | ||||
| -rw-r--r-- | doc/html/ntqlist.html | 47 | ||||
| -rw-r--r-- | doc/html/porting.html | 4 | ||||
| -rw-r--r-- | doc/html/porting2.html | 2 | ||||
| -rw-r--r-- | doc/html/qlistiterator.html | 48 | ||||
| -rw-r--r-- | doc/html/qptrlist-h.html | 5 | ||||
| -rw-r--r-- | doc/html/qt.dcf | 6 | ||||
| -rw-r--r-- | doc/html/titleindex | 2 | ||||
| -rw-r--r-- | doc/qcollection-compat.doc | 21 | ||||
| l--------- | include/ntqlist.h | 1 | ||||
| -rw-r--r-- | src/compat/ntqlist.h | 27 | ||||
| -rw-r--r-- | src/kernel/ntqinputcontext.h | 7 | ||||
| -rw-r--r-- | src/kernel/qinputcontext.cpp | 2 | ||||
| -rw-r--r-- | src/tools/ntqptrlist.h | 5 |
14 files changed, 4 insertions, 174 deletions
diff --git a/doc/html/index b/doc/html/index index 84209a107..0464d66ec 100644 --- a/doc/html/index +++ b/doc/html/index @@ -3592,7 +3592,6 @@ "QLinuxFbScreen::shutdownDevice" qlinuxfbscreen.html#shutdownDevice "QLinuxFbScreen::uncache" qlinuxfbscreen.html#uncache "QLinuxFbScreen::~QLinuxFbScreen" qlinuxfbscreen.html#~QLinuxFbScreen -"QList Class Reference (obsolete)" ntqlist.html "QListBox" ntqlistbox.html "QListBox::LayoutMode" ntqlistbox.html#LayoutMode "QListBox::SelectionMode" ntqlistbox.html#SelectionMode diff --git a/doc/html/ntqlist.html b/doc/html/ntqlist.html deleted file mode 100644 index eadb6b2e7..000000000 --- a/doc/html/ntqlist.html +++ /dev/null @@ -1,47 +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/qcollection-compat.doc:56 --> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>TQList Class Reference (obsolete)</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>TQList Class Reference (obsolete)</h1> - - -<p> <pre> -#include <ntqlist.h></pre> - -<p> The TQList class has been renamed <b> <a href="ntqptrlist.html">TQPtrList</a> </b> in TQt 3.0. - -<!-- 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/porting.html b/doc/html/porting.html index 19f45c3e7..24c53efe3 100644 --- a/doc/html/porting.html +++ b/doc/html/porting.html @@ -398,15 +398,13 @@ use of the safe qstr* variants directly or ensure that no 0 pointer is passed to the standard C functions in your code base. <p> <h2> Collection Class Renaming </h2> -<a name="6"></a><p> The classes TQArray, TQCollection, TQList, TQListIterator, TQQueue, TQStack +<a name="6"></a><p> The classes TQArray, TQCollection, TQQueue, TQStack and TQVector have been renamed. To ease porting, the old names and the old header-file names are still supported. <p> <center><table cellpadding="4" cellspacing="2" border="0"> <tr bgcolor="#a2c511"> <th valign="top">Old Name <th valign="top">New Name <th valign="top">New Header File <tr bgcolor="#f0f0f0"> <td valign="top">TQArray <td valign="top"><a href="ntqmemarray.html">TQMemArray</a> <td valign="top"><tt><ntqmemarray.h></tt> <tr bgcolor="#d0d0d0"> <td valign="top">TQCollection <td valign="top"><a href="ntqptrcollection.html">TQPtrCollection</a> <td valign="top"><tt><ntqptrcollection.h></tt> -<tr bgcolor="#f0f0f0"> <td valign="top">TQList <td valign="top"><a href="ntqptrlist.html">TQPtrList</a> <td valign="top"><tt><ntqptrlist.h></tt> -<tr bgcolor="#d0d0d0"> <td valign="top">TQListIterator <td valign="top"><a href="qptrlistiterator.html">TQPtrListIterator</a> <td valign="top"><tt><ntqptrlist.h></tt> <tr bgcolor="#f0f0f0"> <td valign="top">TQQueue <td valign="top"><a href="ntqptrqueue.html">TQPtrQueue</a> <td valign="top"><tt><ntqptrqueue.h></tt> <tr bgcolor="#d0d0d0"> <td valign="top">TQStack <td valign="top"><a href="ntqptrstack.html">TQPtrStack</a> <td valign="top"><tt><ntqptrstack.h></tt> <tr bgcolor="#f0f0f0"> <td valign="top">TQVector <td valign="top"><a href="ntqptrvector.html">TQPtrVector</a> <td valign="top"><tt><ntqptrvector.h></tt> diff --git a/doc/html/porting2.html b/doc/html/porting2.html index f53af35de..3402721cb 100644 --- a/doc/html/porting2.html +++ b/doc/html/porting2.html @@ -202,7 +202,7 @@ function that is not in a subclass of <a href="qlistviewitem.html">TQListViewIte <p> <h3><a name="Collection">Collection classes</a></h3> <p> <p> The <a href="collection.html#collection-classes">collection classes</a> include generic classes such as TQGDict, TQGList, and -the subclasses such as <a href="ntqdict.html">TQDict</a> and TQList. +the subclasses such as <a href="ntqdict.html">TQDict</a> and TQPtrList. <p> <p> The macro-based TQt collection classes are obsolete; use the template-based classes instead. Simply remove includes of ntqgeneric.h and replace e.g. Q_DECLARE(<a href="ntqcache.html">TQCache</a>,TQPixmap) with TQCache<TQPixmap>. diff --git a/doc/html/qlistiterator.html b/doc/html/qlistiterator.html deleted file mode 100644 index c75f0689c..000000000 --- a/doc/html/qlistiterator.html +++ /dev/null @@ -1,48 +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/qcollection-compat.doc:66 --> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>TQListIterator Class Reference (obsolete)</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>TQListIterator Class Reference (obsolete)</h1> - - -<p> <pre> -#include <ntqlist.h></pre> - -<p> The TQListIterator class has been renamed <b> <a href="qptrlistiterator.html">TQPtrListIterator</a> </b> in -TQt 3.0. - -<!-- 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/qptrlist-h.html b/doc/html/qptrlist-h.html index 6f212c6cb..d3d5dc02d 100644 --- a/doc/html/qptrlist-h.html +++ b/doc/html/qptrlist-h.html @@ -221,11 +221,6 @@ public: { TQGListIterator::operator=(it); return *this; } }; -#ifndef TQT_NO_COMPAT -#define TQList TQPtrList -#define TQListIterator TQPtrListIterator -#endif - #define Q_DEFINED_QPTRLIST #include "ntqwinexport.h" diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf index cfa7b6891..f74a43122 100644 --- a/doc/html/qt.dcf +++ b/doc/html/qt.dcf @@ -10119,12 +10119,6 @@ <section ref="qfont-examples.html" title="QFont Examples"> <keyword ref="qfont-examples.html">qfont-examples</keyword> </section> -<section ref="ntqlist.html" title="QList Class Reference (obsolete)"> - <keyword ref="ntqlist.html">QList Class Reference (obsolete)</keyword> -</section> -<section ref="qlistiterator.html" title="QListIterator Class Reference (obsolete)"> - <keyword ref="qlistiterator.html">QListIterator Class Reference (obsolete)</keyword> -</section> <section ref="qmag-example.html" title="QMag"> <keyword ref="qmag-example.html">QMag</keyword> </section> diff --git a/doc/html/titleindex b/doc/html/titleindex index 3958ab06b..90d8dbc6a 100644 --- a/doc/html/titleindex +++ b/doc/html/titleindex @@ -568,7 +568,6 @@ QLibrary Class | ntqlibrary.html QLibrary Member List | qlibrary-members.html QLineEdit Class | ntqlineedit.html QLineEdit Member List | qlineedit-members.html -QList Class Reference (obsolete) | ntqlist.html QListBox Class | ntqlistbox.html QListBox Member List | qlistbox-members.html QListBoxItem Class | qlistboxitem.html @@ -577,7 +576,6 @@ QListBoxPixmap Class | qlistboxpixmap.html QListBoxPixmap Member List | qlistboxpixmap-members.html QListBoxText Class | qlistboxtext.html QListBoxText Member List | qlistboxtext-members.html -QListIterator Class Reference (obsolete) | qlistiterator.html QListView Class | ntqlistview.html QListView Member List | qlistview-members.html QListViewItem Class | qlistviewitem.html diff --git a/doc/qcollection-compat.doc b/doc/qcollection-compat.doc index 05695948c..c2a86eb72 100644 --- a/doc/qcollection-compat.doc +++ b/doc/qcollection-compat.doc @@ -56,27 +56,6 @@ The QCollection class has been renamed <b> \l QPtrCollection </b> in TQt 3.0. */ -/*! \page ntqlist.html - - \title QList Class Reference (obsolete) - - \code -#include <ntqlist.h>\endcode - - The QList class has been renamed <b> \l QPtrList </b> in TQt 3.0. -*/ - -/*! \page qlistiterator.html - - \title QListIterator Class Reference (obsolete) - - \code -#include <ntqlist.h>\endcode - - The QListIterator class has been renamed <b> \l QPtrListIterator </b> in - TQt 3.0. -*/ - /*! \page ntqqueue.html \title QQueue Class Reference (obsolete) diff --git a/include/ntqlist.h b/include/ntqlist.h deleted file mode 120000 index 3de2d0521..000000000 --- a/include/ntqlist.h +++ /dev/null @@ -1 +0,0 @@ -../src/compat/ntqlist.h
\ No newline at end of file diff --git a/src/compat/ntqlist.h b/src/compat/ntqlist.h deleted file mode 100644 index 4d75178cc..000000000 --- a/src/compat/ntqlist.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** -** -** Compatibility file - should only be included by legacy code. -** It #includes the file which obsoletes this one. -** -** Copyright (C) 1998-2008 Trolltech ASA. All rights reserved. -** This file is part of the TQt GUI Toolkit. -** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech ASA of Norway and appearing in the file -** LICENSE.TQPL included in the packaging of this file. -** -** Licensees holding valid TQt Professional Edition licenses may use this -** file in accordance with the TQt Professional Edition License Agreement -** provided with the TQt Professional Edition. -** -** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about the Professional Edition licensing, or see -** http://www.trolltech.com/qpl/ for TQPL licensing information. -** -*****************************************************************************/ -#ifndef TQLIST_H -#define TQLIST_H -#ifndef TQT_NO_COMPAT -#include "ntqptrlist.h" -#endif -#endif diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h index 2cb7785e0..bb8a4f9fd 100644 --- a/src/kernel/ntqinputcontext.h +++ b/src/kernel/ntqinputcontext.h @@ -43,13 +43,8 @@ #include "ntqglobal.h" #include "ntqevent.h" #include "ntqstring.h" -#if (TQT_VERSION-0 >= 0x040000) -#include "ntqlist.h" -#include "ntqaction.h" -#else #include "ntqptrlist.h" #endif -#endif class TQWidget; class TQFont; @@ -95,7 +90,7 @@ public: virtual bool isPreeditRelocationEnabled(); #if (TQT_VERSION-0 >= 0x040000) - virtual TQList<TQAction *> actions(); + virtual TQPtrList<TQAction *> actions(); void addActionsTo( TQMenu *menu, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator ); #else virtual TQPtrList<TQInputContextMenu> *menus(); diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp index 9533d3eb2..6523fe756 100644 --- a/src/kernel/qinputcontext.cpp +++ b/src/kernel/qinputcontext.cpp @@ -806,7 +806,7 @@ TQString TQInputContext::language() /*! This is a preliminary interface for TQt4 */ -TQList<TQAction *> TQInputContext::actions() +TQPtrList<TQAction *> TQInputContext::actions() { } #else diff --git a/src/tools/ntqptrlist.h b/src/tools/ntqptrlist.h index 305be554e..579c1b226 100644 --- a/src/tools/ntqptrlist.h +++ b/src/tools/ntqptrlist.h @@ -185,11 +185,6 @@ public: { TQGListIterator::operator=(it); return *this; } }; -#ifndef TQT_NO_COMPAT -#define TQList TQPtrList -#define TQListIterator TQPtrListIterator -#endif - #define Q_DEFINED_QPTRLIST #include "ntqwinexport.h" |