summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-05-23 21:21:04 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-05-23 21:21:04 +0900
commit292fa30f0fade0c2742ef4b4ccc28be79dfe747c (patch)
tree227b09b1a61514e2ccd3fbc548b5431a6fee6229
parentf0869718763cd6d04c9b225db8966df08ddaef44 (diff)
downloadtqt3-292fa30f0fade0c2742ef4b4ccc28be79dfe747c.tar.gz
tqt3-292fa30f0fade0c2742ef4b4ccc28be79dfe747c.zip
Removed obsolete Qt2's TQStack class and replaced with TQt3's TQPtrStack.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--doc/html/index1
-rw-r--r--doc/html/ntqstack.html47
-rw-r--r--doc/html/porting.html3
-rw-r--r--doc/html/qptrstack-h.html4
-rw-r--r--doc/html/qt.dcf3
-rw-r--r--doc/html/titleindex1
-rw-r--r--doc/qcollection-compat.doc10
-rw-r--r--src/compat/ntqstack.h27
-rw-r--r--src/tools/ntqptrstack.h4
9 files changed, 1 insertions, 99 deletions
diff --git a/doc/html/index b/doc/html/index
index 37f3089f..f0316815 100644
--- a/doc/html/index
+++ b/doc/html/index
@@ -6103,7 +6103,6 @@
"QSqlResult::~QSqlResult" ntqsqlresult.html#~QSqlResult
"QSqlSelectCursor" ntqsqlselectcursor.html
"QSqlSelectCursor::~QSqlSelectCursor" ntqsqlselectcursor.html#~QSqlSelectCursor
-"QStack Class Reference (obsolete)" ntqstack.html
"QStatusBar" ntqstatusbar.html
"QStatusBar::addWidget" ntqstatusbar.html#addWidget
"QStatusBar::clear" ntqstatusbar.html#clear
diff --git a/doc/html/ntqstack.html b/doc/html/ntqstack.html
deleted file mode 100644
index 727f418c..00000000
--- a/doc/html/ntqstack.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:87 -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>TQStack 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>TQStack Class Reference (obsolete)</h1>
-
-
-<p> <pre>
-#include &lt;ntqstack.h&gt;</pre>
-
-<p> The TQStack class has been renamed <b> <a href="ntqptrstack.html">TQPtrStack</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 e8c24e74..440af7d6 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -397,7 +397,7 @@ 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, TQQueue and TQStack
+<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">
@@ -405,7 +405,6 @@ old header-file names are still supported.
<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>
-<tr bgcolor="#d0d0d0"> <td valign="top">TQStack <td valign="top"><a href="ntqptrstack.html">TQPtrStack</a> <td valign="top"><tt>&lt;ntqptrstack.h&gt;</tt>
</table></center>
<p> <h2> <a href="ntqbuttongroup.html">TQButtonGroup</a>
</h2>
diff --git a/doc/html/qptrstack-h.html b/doc/html/qptrstack-h.html
index 98d0db5b..4270c79c 100644
--- a/doc/html/qptrstack-h.html
+++ b/doc/html/qptrstack-h.html
@@ -123,10 +123,6 @@ template&lt;class type&gt; inline void TQPtrStack&lt;type&gt;::deleteItem( TQPtr
if ( del_item ) delete (type *)d;
}
-#ifndef TQT_NO_COMPAT
-#define TQStack TQPtrStack
-#endif
-
#endif // TQPTRSTACK_H
</pre>
<!-- eof -->
diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf
index 7a70cf0c..688eb842 100644
--- a/doc/html/qt.dcf
+++ b/doc/html/qt.dcf
@@ -10125,9 +10125,6 @@
<section ref="ntqqueue.html" title="QQueue Class Reference (obsolete)">
<keyword ref="ntqqueue.html">QQueue Class Reference (obsolete)</keyword>
</section>
-<section ref="ntqstack.html" title="QStack Class Reference (obsolete)">
- <keyword ref="ntqstack.html">QStack 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 bee72959..7c38f44f 100644
--- a/doc/html/titleindex
+++ b/doc/html/titleindex
@@ -818,7 +818,6 @@ QSqlResult Class | ntqsqlresult.html
QSqlResult Member List | qsqlresult-members.html
QSqlSelectCursor Class | ntqsqlselectcursor.html
QSqlSelectCursor Member List | qsqlselectcursor-members.html
-QStack Class Reference (obsolete) | ntqstack.html
QStatusBar Class | ntqstatusbar.html
QStatusBar Member List | qstatusbar-members.html
QStoredDrag Class | qstoreddrag.html
diff --git a/doc/qcollection-compat.doc b/doc/qcollection-compat.doc
index b9209881..32bb81ce 100644
--- a/doc/qcollection-compat.doc
+++ b/doc/qcollection-compat.doc
@@ -65,13 +65,3 @@
The QQueue class has been renamed <b> \l QPtrQueue </b> in TQt 3.0.
*/
-
-/*! \page ntqstack.html
-
- \title QStack Class Reference (obsolete)
-
- \code
-#include <ntqstack.h>\endcode
-
- The QStack class has been renamed <b> \l QPtrStack </b> in TQt 3.0.
-*/
diff --git a/src/compat/ntqstack.h b/src/compat/ntqstack.h
deleted file mode 100644
index 41c5992f..00000000
--- a/src/compat/ntqstack.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 TQSTACK_H
-#define TQSTACK_H
-#ifndef TQT_NO_COMPAT
-#include "ntqptrstack.h"
-#endif
-#endif
diff --git a/src/tools/ntqptrstack.h b/src/tools/ntqptrstack.h
index d4741653..6f404f1b 100644
--- a/src/tools/ntqptrstack.h
+++ b/src/tools/ntqptrstack.h
@@ -87,8 +87,4 @@ template<class type> inline void TQPtrStack<type>::deleteItem( TQPtrCollection::
if ( del_item ) delete (type *)d;
}
-#ifndef TQT_NO_COMPAT
-#define TQStack TQPtrStack
-#endif
-
#endif // TQPTRSTACK_H