21 files changed, 4 insertions, 480 deletions
diff --git a/bin/tqtrename140 b/bin/tqtrename140
deleted file mode 100755
index 3c6d319de..000000000
--- a/bin/tqtrename140
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/perl -pi.oldnames
-#
-#  Perl script to change programs to use the longer header-file names
-#  introduced in TQt version 1.40.  Note that TQt is distributed with
-#  compatilibity headers making this program unnecessary at present,
-#  but which may be discontinued in TQt 2.0.
-#
-#  This is version 1.0 of the conversion script.
-#
-#
-#  Copyright (C) 1998-2008 Trolltech ASA.  All rights reserved.
-#
-#  Permission to use, copy, modify, and distribute this software and its
-#  documentation for any purpose and without fee is hereby granted,
-#  provided that the above copyright notice appear in all copies, that
-#  both that copyright notice and this permission notice appear in
-#  supporting documentation, and that any modifications are clearly
-#  annotated as not originating from the copyright holder.
-#
-#  This file is provided AS IS with no warranties of any kind.  The author
-#  shall have no liability with respect to the infringement of copyrights,
-#  trade secrets or any patents by this file or any part thereof.  In no
-#  event will the author be liable for any lost revenue or profits or
-#  other special, indirect and consequential damages.
-#
-
-s/\bqapp\./qapplication./g if /#include/;
-s/\bQAPP_H\b/QAPPLICATION_H/g if /#if/;
-s/\bqbitarry\./qbitarray./g if /#include/;
-s/\bQBITARRY_H\b/QBITARRAY_H/g if /#if/;
-s/\bqbttngrp\./qbuttongroup./g if /#include/;
-s/\bQBTTNGRP_H\b/QBUTTONGROUP_H/g if /#if/;
-s/\bqchkbox\./qcheckbox./g if /#include/;
-s/\bQCHKBOX_H\b/QCHECKBOX_H/g if /#if/;
-s/\bqclipbrd\./qclipboard./g if /#include/;
-s/\bQCLIPBRD_H\b/QCLIPBOARD_H/g if /#if/;
-s/\bqcollect\./qcollection./g if /#include/;
-s/\bQCOLLECT_H\b/QCOLLECTION_H/g if /#if/;
-s/\bqcombo\./qcombobox./g if /#include/;
-s/\bQCOMBO_H\b/QCOMBOBOX_H/g if /#if/;
-s/\bqconnect\./qconnection./g if /#include/;
-s/\bQCONNECT_H\b/QCONNECTION_H/g if /#if/;
-s/\bqdatetm\./qdatetime./g if /#include/;
-s/\bQDATETM_H\b/QDATETIME_H/g if /#if/;
-s/\bqdrawutl\./qdrawutil./g if /#include/;
-s/\bQDRAWUTL_H\b/QDRAWUTIL_H/g if /#if/;
-s/\bqdstream\./qdatastream./g if /#include/;
-s/\bQDSTREAM_H\b/QDATASTREAM_H/g if /#if/;
-s/\bqfiledlg\./qfiledialog./g if /#include/;
-s/\bQFILEDLG_H\b/QFILEDIALOG_H/g if /#if/;
-s/\bqfileinf\./qfileinfo./g if /#include/;
-s/\bQFILEINF_H\b/QFILEINFO_H/g if /#if/;
-s/\bqgmanagr\./qgmanager./g if /#include/;
-s/\bQGMANAGR_H\b/QGMANAGER_H/g if /#if/;
-s/\bqgrpbox\./qgroupbox./g if /#include/;
-s/\bQGRPBOX_H\b/QGROUPBOX_H/g if /#if/;
-s/\bqiodev\./qiodevice./g if /#include/;
-s/\bQIODEV_H\b/QIODEVICE_H/g if /#if/;
-s/\bqlcdnum\./qlcdnumber./g if /#include/;
-s/\bQLCDNUM_H\b/QLCDNUMBER_H/g if /#if/;
-s/\bqlined\./qlineedit./g if /#include/;
-s/\bQLINED_H\b/QLINEEDIT_H/g if /#if/;
-s/\bqmenudta\./qmenudata./g if /#include/;
-s/\bQMENUDTA_H\b/QMENUDATA_H/g if /#if/;
-s/\bqmetaobj\./qmetaobject./g if /#include/;
-s/\bQMETAOBJ_H\b/QMETAOBJECT_H/g if /#if/;
-s/\bqmlined\./qmultilineedit./g if /#include/;
-s/\bQMLINED_H\b/QMULTILINEEDIT_H/g if /#if/;
-s/\bqmultilinedit\./qmultilineedit./g if /#include/;
-s/\bQMULTILINEDIT_H\b/QMULTILINEEDIT_H/g if /#if/;
-s/\bqmsgbox\./qmessagebox./g if /#include/;
-s/\bQMSGBOX_H\b/QMESSAGEBOX_H/g if /#if/;
-s/\bqpdevmet\./qpaintdevicemetrics./g if /#include/;
-s/\bQPDEVMET_H\b/QPAINTDEVICEMETRICS_H/g if /#if/;
-s/\bqpmcache\./qpixmapcache./g if /#include/;
-s/\bQPMCACHE_H\b/QPIXMAPCACHE_H/g if /#if/;
-s/\bqpntarry\./qpointarray./g if /#include/;
-s/\bQPNTARRY_H\b/QPOINTARRAY_H/g if /#if/;
-s/\bqpopmenu\./qpopupmenu./g if /#include/;
-s/\bQPOPMENU_H\b/QPOPUPMENU_H/g if /#if/;
-s/\bqprndlg\./qprintdialog./g if /#include/;
-s/\bQPRNDLG_H\b/QPRINTDIALOG_H/g if /#if/;
-s/\bqprogbar\./qprogressbar./g if /#include/;
-s/\bQPROGBAR_H\b/QPROGRESSBAR_H/g if /#if/;
-s/\bqprogdlg\./qprogressdialog./g if /#include/;
-s/\bQPROGDLG_H\b/QPROGRESSDIALOG_H/g if /#if/;
-s/\bqpsprn\./qpsprinter./g if /#include/;
-s/\bQPSPRN_H\b/QPSPRINTER_H/g if /#if/;
-s/\bqpushbt\./qpushbutton./g if /#include/;
-s/\bQPUSHBT_H\b/QPUSHBUTTON_H/g if /#if/;
-s/\bqradiobt\./qradiobutton./g if /#include/;
-s/\bQRADIOBT_H\b/QRADIOBUTTON_H/g if /#if/;
-s/\bqrangect\./qrangecontrol./g if /#include/;
-s/\bQRANGECT_H\b/QRANGECONTROL_H/g if /#if/;
-s/\bqscrbar\./qscrollbar./g if /#include/;
-s/\bQSCRBAR_H\b/QSCROLLBAR_H/g if /#if/;
-s/\bqsocknot\./qsocketnotifier./g if /#include/;
-s/\bQSOCKNOT_H\b/QSOCKETNOTIFIER_H/g if /#if/;
-s/\bqtabdlg\./qtabdialog./g if /#include/;
-s/\bQTABDLG_H\b/QTABDIALOG_H/g if /#if/;
-s/\bqtablevw\./qtableview./g if /#include/;
-s/\bQTABLEVW_H\b/QTABLEVIEW_H/g if /#if/;
-s/\bqtstream\./qtextstream./g if /#include/;
-s/\bQTSTREAM_H\b/QTEXTSTREAM_H/g if /#if/;
-s/\bqfiledef\./qfiledefs./g if /#include/;
-s/\bQFILEDEF_H\b/QFILEDEFS_H/g if /#if/;
-s/\bqfontdta\./qfontdata./g if /#include/;
-s/\bQFONTDTA_H\b/QFONTDATA_H/g if /#if/;
-s/\bqfontinf\./qfontinfo./g if /#include/;
-s/\bQFONTINF_H\b/QFONTINFO_H/g if /#if/;
-s/\bqfontmet\./qfontmetrics./g if /#include/;
-s/\bQFONTMET_H\b/QFONTMETRICS_H/g if /#if/;
-s/\bqintcach\./qintcache./g if /#include/;
-s/\bQINTCACH_H\b/QINTCACHE_H/g if /#if/;
-s/\bqobjdefs\./qobjectdefs./g if /#include/;
-s/\bQOBJDEFS_H\b/QOBJECTDEFS_H/g if /#if/;
-s/\bqpaintd\./qpaintdevice./g if /#include/;
-s/\bQPAINTD_H\b/QPAINTDEVICE_H/g if /#if/;
-s/\bqwindefs\./qwindowdefs./g if /#include/;
-s/\bQWINDEFS_H\b/QWINDOWDEFS_H/g if /#if/;
diff --git a/doc/html/index b/doc/html/index
index 2286467ad..bf0fbc87d 100644
--- a/doc/html/index
+++ b/doc/html/index
@@ -336,7 +336,6 @@
 "QApplication::x11EventFilter" ntqapplication.html#x11EventFilter
 "QApplication::x11ProcessEvent" ntqapplication.html#x11ProcessEvent
 "QApplication::~QApplication" ntqapplication.html#~QApplication
-"QArray Class Reference (obsolete)" ntqarray.html
 "QAsciiCache" ntqasciicache.html
 "QAsciiCache::clear" ntqasciicache.html#clear
 "QAsciiCache::count" ntqasciicache.html#count
@@ -1008,7 +1007,6 @@
 "QCloseEvent::accept" qcloseevent.html#accept
 "QCloseEvent::ignore" qcloseevent.html#ignore
 "QCloseEvent::isAccepted" qcloseevent.html#isAccepted
-"QCollection Class Reference (obsolete)" ntqcollection.html
 "QColor" ntqcolor.html
 "QColor::Spec" ntqcolor.html#Spec
 "QColor::alloc" ntqcolor.html#alloc
@@ -5097,7 +5095,6 @@
 "QPushButton::setToggleButton" ntqpushbutton.html#setToggleButton
 "QPushButton::toggleButton" ntqpushbutton.html#toggleButton-prop
 "QPushButton::~QPushButton" ntqpushbutton.html#~QPushButton
-"QQueue Class Reference (obsolete)" ntqqueue.html
 "QRadioButton" ntqradiobutton.html
 "QRadioButton::autoMask" ntqradiobutton.html#autoMask-prop
 "QRadioButton::checked" ntqradiobutton.html#checked-prop
diff --git a/doc/html/ntqarray.html b/doc/html/ntqarray.html
deleted file mode 100644
index 9940d3c57..000000000
--- a/doc/html/ntqarray.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:36 -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>TQArray 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&nbsp;Classes</font></a>
- | <a href="mainclasses.html">
-<font color="#004faf">Main&nbsp;Classes</font></a>
- | <a href="annotated.html">
-<font color="#004faf">Annotated</font></a>
- | <a href="groups.html">
-<font color="#004faf">Grouped&nbsp;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>TQArray Class Reference (obsolete)</h1>
-
- 
-<p> <pre>
-#include &lt;ntqarray.h&gt;</pre>
- 
-<p> The TQArray class has been renamed <b> <a href="ntqmemarray.html">TQMemArray</a> </b> in TQt 3.0.
-
-<!-- eof -->
-<p><address><hr><div align=center>
-<table width=100% cellspacing=0 border=0><tr>
-<td>Copyright &copy; 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/ntqcollection.html b/doc/html/ntqcollection.html
deleted file mode 100644
index 0faed6327..000000000
--- a/doc/html/ntqcollection.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:46 -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>TQCollection 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&nbsp;Classes</font></a>
- | <a href="mainclasses.html">
-<font color="#004faf">Main&nbsp;Classes</font></a>
- | <a href="annotated.html">
-<font color="#004faf">Annotated</font></a>
- | <a href="groups.html">
-<font color="#004faf">Grouped&nbsp;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>TQCollection Class Reference (obsolete)</h1>
-
- 
-<p> <pre>
-#include &lt;ntqcollection.h&gt;</pre>
- 
-<p> The TQCollection class has been renamed <b> <a href="ntqptrcollection.html">TQPtrCollection</a> </b> in TQt 3.0.
-
-<!-- eof -->
-<p><address><hr><div align=center>
-<table width=100% cellspacing=0 border=0><tr>
-<td>Copyright &copy; 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/ntqqueue.html b/doc/html/ntqqueue.html
deleted file mode 100644
index 9f7bb4f3b..000000000
--- a/doc/html/ntqqueue.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:77 -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>TQQueue 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&nbsp;Classes</font></a>
- | <a href="mainclasses.html">
-<font color="#004faf">Main&nbsp;Classes</font></a>
- | <a href="annotated.html">
-<font color="#004faf">Annotated</font></a>
- | <a href="groups.html">
-<font color="#004faf">Grouped&nbsp;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>TQQueue Class Reference (obsolete)</h1>
-
- 
-<p> <pre>
-#include &lt;ntqqueue.h&gt;</pre>
- 
-<p> The TQQueue class has been renamed <b> <a href="ntqptrqueue.html">TQPtrQueue</a> </b> in TQt 3.0.
-
-<!-- eof -->
-<p><address><hr><div align=center>
-<table width=100% cellspacing=0 border=0><tr>
-<td>Copyright &copy; 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 440af7d64..8f13fa2b5 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -395,17 +395,6 @@ You might have been relying on the non-portable and unpredictable behavior
 resulting from these directives. We strongly recommend that you either make
 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 and TQQueue
-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>&lt;ntqmemarray.h&gt;</tt>
-<tr bgcolor="#d0d0d0"> <td valign="top">TQCollection <td valign="top"><a href="ntqptrcollection.html">TQPtrCollection</a> <td valign="top"><tt>&lt;ntqptrcollection.h&gt;</tt>
-<tr bgcolor="#f0f0f0"> <td valign="top">TQQueue <td valign="top"><a href="ntqptrqueue.html">TQPtrQueue</a> <td valign="top"><tt>&lt;ntqptrqueue.h&gt;</tt>
-</table></center>
 <p> <h2> <a href="ntqbuttongroup.html">TQButtonGroup</a>
 </h2>
 <a name="7"></a><p> In TQt 2.x, the function <a href="ntqbuttongroup.html#selected">TQButtonGroup::selected</a>() returns the selected
diff --git a/doc/html/qmemarray-h.html b/doc/html/qmemarray-h.html
index cdfd6518c..68f706b07 100644
--- a/doc/html/qmemarray-h.html
+++ b/doc/html/qmemarray-h.html
@@ -148,13 +148,9 @@ public:
     ConstIterator end() const { return data() + size(); }
 };
 
-#ifndef TQT_NO_COMPAT
-#define TQArray TQMemArray
-#endif
-
 #define Q_DEFINED_QMEMARRAY
 #include "ntqwinexport.h"
-#endif // TQARRAY_H
+#endif
 </pre>
 <!-- eof -->
 <p><address><hr><div align=center>
diff --git a/doc/html/qptrcollection-h.html b/doc/html/qptrcollection-h.html
index a48beca3e..e3cc0519a 100644
--- a/doc/html/qptrcollection-h.html
+++ b/doc/html/qptrcollection-h.html
@@ -108,10 +108,6 @@ protected:
 };
 
 
-#ifndef TQT_NO_COMPAT
-#define TQCollection TQPtrCollection
-#endif
-
 #endif // TQPTRCOLLECTION_H
 </pre>
 <!-- eof -->
diff --git a/doc/html/qptrqueue-h.html b/doc/html/qptrqueue-h.html
index adb707bb6..b7a69b437 100644
--- a/doc/html/qptrqueue-h.html
+++ b/doc/html/qptrqueue-h.html
@@ -123,10 +123,6 @@ template&lt;class type&gt; inline void TQPtrQueue&lt;type&gt;::deleteItem( TQPtr
     if ( del_item ) delete (type *)d;
 }
 
-#ifndef TQT_NO_COMPAT
-#define TQQueue TQPtrQueue
-#endif
-
 #endif // TQPTRQUEUE_H
 </pre>
 <!-- eof -->
diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf
index 688eb8421..bf7f26907 100644
--- a/doc/html/qt.dcf
+++ b/doc/html/qt.dcf
@@ -10098,12 +10098,6 @@
 <section ref="qaction-examples.html" title="QAction Examples">
     <keyword ref="qaction-examples.html">qaction-examples</keyword>
 </section>
-<section ref="ntqarray.html" title="QArray Class Reference (obsolete)">
-    <keyword ref="ntqarray.html">QArray Class Reference (obsolete)</keyword>
-</section>
-<section ref="ntqcollection.html" title="QCollection Class Reference (obsolete)">
-    <keyword ref="ntqcollection.html">QCollection Class Reference (obsolete)</keyword>
-</section>
 <section ref="qdir-example.html" title="QDir">
     <keyword ref="qdir-example.html">QDir</keyword>
 </section>
@@ -10122,9 +10116,6 @@
 <section ref="qprocess-examples.html" title="QProcess Examples">
     <keyword ref="qprocess-examples.html">qprocess-examples</keyword>
 </section>
-<section ref="ntqqueue.html" title="QQueue Class Reference (obsolete)">
-    <keyword ref="ntqqueue.html">QQueue Class Reference (obsolete)</keyword>
-</section>
 <section ref="commercialeditions.html" title="TQt Commercial Editions">
     <keyword ref="commercialeditions.html">TQt Commercial Editions</keyword>
 </section>
diff --git a/doc/html/titleindex b/doc/html/titleindex
index bd690ed4e..264d671b1 100644
--- a/doc/html/titleindex
+++ b/doc/html/titleindex
@@ -167,7 +167,6 @@ QActionGroup Class | qactiongroup.html
 QActionGroup Member List | qactiongroup-members.html
 QApplication Class | ntqapplication.html
 QApplication Member List | qapplication-members.html
-QArray Class Reference (obsolete) | ntqarray.html
 QAsciiCache Class | ntqasciicache.html
 QAsciiCache Member List | qasciicache-members.html
 QAsciiCacheIterator Class | qasciicacheiterator.html
@@ -272,7 +271,6 @@ QClipboard Class | ntqclipboard.html
 QClipboard Member List | qclipboard-members.html
 QCloseEvent Class | qcloseevent.html
 QCloseEvent Member List | qcloseevent-members.html
-QCollection Class Reference (obsolete) | ntqcollection.html
 QColor Class | ntqcolor.html
 QColor Member List | qcolor-members.html
 QColorDialog Class | ntqcolordialog.html
@@ -717,7 +715,6 @@ QPtrVector Class | ntqptrvector.html
 QPtrVector Member List | qptrvector-members.html
 QPushButton Class | ntqpushbutton.html
 QPushButton Member List | qpushbutton-members.html
-QQueue Class Reference (obsolete) | ntqqueue.html
 QRadioButton Class | ntqradiobutton.html
 QRadioButton Member List | qradiobutton-members.html
 QRangeControl Class | ntqrangecontrol.html
diff --git a/doc/porting3.doc b/doc/porting3.doc
index c3024625f..01f8fb052 100644
--- a/doc/porting3.doc
+++ b/doc/porting3.doc
@@ -355,23 +355,6 @@ resulting from these directives. We strongly recommend that you either make
 use of the safe qstr* variants directly or ensure that no 0 pointer is
 passed to the standard C functions in your code base.
 
-\section1 Collection Class Renaming
-
-The classes QArray, QCollection, QList, QListIterator, QQueue, QStack
-and QVector have been renamed. To ease porting, the old names and the
-old header-file names are still supported.
-
-\table
-\header \i Old Name \i New Name \i New Header File
-\row \i QArray \i \l QMemArray \i \c <ntqmemarray.h>
-\row \i QCollection \i \l QPtrCollection \i \c <ntqptrcollection.h>
-\row \i QList \i \l QPtrList \i \c <ntqptrlist.h>
-\row \i QListIterator \i \l QPtrListIterator \i \c <ntqptrlist.h>
-\row \i QQueue \i \l QPtrQueue \i \c <ntqptrqueue.h>
-\row \i QStack \i \l QPtrStack \i \c <ntqptrstack.h>
-\row \i QVector \i \l QPtrVector \i \c <ntqptrvector.h>
-\endtable
-
 \section1 QButtonGroup
 
 In TQt 2.x, the function QButtonGroup::selected() returns the selected
diff --git a/doc/qcollection-compat.doc b/doc/qcollection-compat.doc
deleted file mode 100644
index 32bb81ce8..000000000
--- a/doc/qcollection-compat.doc
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** QCollection fake 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.
-**
-**********************************************************************/
-
-/*! \page ntqarray.html
-
-  \title QArray Class Reference (obsolete)
-
-  \code
-#include <ntqarray.h>\endcode
-
-  The QArray class has been renamed <b> \l QMemArray </b> in TQt 3.0.
-*/
-
-/*! \page ntqcollection.html
-
-  \title QCollection Class Reference (obsolete)
-
-  \code
-#include <ntqcollection.h>\endcode
-
-  The QCollection class has been renamed <b> \l QPtrCollection </b> in TQt 3.0.
-*/
-
-/*! \page ntqqueue.html
-
-  \title QQueue Class Reference (obsolete)
-
-  \code
-#include <ntqqueue.h>\endcode
-
-  The QQueue class has been renamed <b> \l QPtrQueue </b> in TQt 3.0.
-*/
diff --git a/plugins/src/inputmethods/xim/qximinputcontext.h b/plugins/src/inputmethods/xim/qximinputcontext.h
index 449e219e0..243827355 100644
--- a/plugins/src/inputmethods/xim/qximinputcontext.h
+++ b/plugins/src/inputmethods/xim/qximinputcontext.h
@@ -63,7 +63,7 @@ class TQString;
 
 
 #ifdef Q_WS_X11
-#include "ntqarray.h"
+#include "ntqmemarray.h"
 #include "ntqwindowdefs.h"
 #include <private/qt_x11_p.h>
 #endif
diff --git a/src/compat/ntqarray.h b/src/compat/ntqarray.h
deleted file mode 100644
index 4f266e542..000000000
--- a/src/compat/ntqarray.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 TQARRAY_H
-#define TQARRAY_H
-#ifndef TQT_NO_COMPAT
-#include "ntqmemarray.h"
-#endif
-#endif
diff --git a/src/compat/ntqcollection.h b/src/compat/ntqcollection.h
deleted file mode 100644
index d285b6d40..000000000
--- a/src/compat/ntqcollection.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 TQCOLLECTION_H
-#define TQCOLLECTION_H
-#ifndef TQT_NO_COMPAT
-#include "ntqptrcollection.h"
-#endif
-#endif
diff --git a/src/compat/ntqqueue.h b/src/compat/ntqqueue.h
deleted file mode 100644
index 7165a2ed7..000000000
--- a/src/compat/ntqqueue.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 TQQUEUE_H
-#define TQQUEUE_H
-#ifndef TQT_NO_COMPAT
-#include "ntqptrqueue.h"
-#endif
-#endif
diff --git a/src/kernel/qinputcontext_p.h b/src/kernel/qinputcontext_p.h
index 0a7d193d3..0ab3a0884 100644
--- a/src/kernel/qinputcontext_p.h
+++ b/src/kernel/qinputcontext_p.h
@@ -61,7 +61,7 @@ class TQString;
 
 
 #ifdef Q_WS_X11
-#include "ntqarray.h"
+#include "ntqmemarray.h"
 #include "ntqwindowdefs.h"
 #include "qt_x11_p.h"
 #endif
diff --git a/src/tools/ntqmemarray.h b/src/tools/ntqmemarray.h
index 2febfb23b..8a07bf9a9 100644
--- a/src/tools/ntqmemarray.h
+++ b/src/tools/ntqmemarray.h
@@ -112,10 +112,6 @@ public:
     ConstIterator end() const { return data() + size(); }
 };
 
-#ifndef TQT_NO_COMPAT
-#define TQArray TQMemArray
-#endif
-
 #define Q_DEFINED_QMEMARRAY
 #include "ntqwinexport.h"
-#endif // TQARRAY_H
+#endif
diff --git a/src/tools/ntqptrcollection.h b/src/tools/ntqptrcollection.h
index 37ff0df30..2b69899f8 100644
--- a/src/tools/ntqptrcollection.h
+++ b/src/tools/ntqptrcollection.h
@@ -73,8 +73,4 @@ protected:
 };
 
 
-#ifndef TQT_NO_COMPAT
-#define TQCollection TQPtrCollection
-#endif
-
 #endif // TQPTRCOLLECTION_H
diff --git a/src/tools/ntqptrqueue.h b/src/tools/ntqptrqueue.h
index 90f743d02..c905b4fd6 100644
--- a/src/tools/ntqptrqueue.h
+++ b/src/tools/ntqptrqueue.h
@@ -87,8 +87,4 @@ template<class type> inline void TQPtrQueue<type>::deleteItem( TQPtrCollection::
     if ( del_item ) delete (type *)d;
 }
 
-#ifndef TQT_NO_COMPAT
-#define TQQueue TQPtrQueue
-#endif
-
 #endif // TQPTRQUEUE_H