From 292fa30f0fade0c2742ef4b4ccc28be79dfe747c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 23 May 2020 21:21:04 +0900 Subject: [PATCH] Removed obsolete Qt2's TQStack class and replaced with TQt3's TQPtrStack. Signed-off-by: Michele Calgaro --- doc/html/index | 1 - doc/html/ntqstack.html | 47 -------------------------------------- doc/html/porting.html | 3 +-- doc/html/qptrstack-h.html | 4 ---- doc/html/qt.dcf | 3 --- doc/html/titleindex | 1 - doc/qcollection-compat.doc | 10 -------- src/compat/ntqstack.h | 27 ---------------------- src/tools/ntqptrstack.h | 4 ---- 9 files changed, 1 insertion(+), 99 deletions(-) delete mode 100644 doc/html/ntqstack.html delete mode 100644 src/compat/ntqstack.h 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 @@ - - - - - -TQStack Class Reference (obsolete) - - - - - - - -
- -Home - | -All Classes - | -Main Classes - | -Annotated - | -Grouped Classes - | -Functions -

TQStack Class Reference (obsolete)

- - -

-#include <ntqstack.h>
- -

The TQStack class has been renamed TQPtrStack in TQt 3.0. - - -

- -
Copyright © 2007 -TrolltechTrademarks -
TQt 3.3.8
-
- 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.

Collection Class Renaming

-

The classes TQArray, TQCollection, TQQueue and TQStack +

The classes TQArray, TQCollection and TQQueue have been renamed. To ease porting, the old names and the old header-file names are still supported.

@@ -405,7 +405,6 @@ old header-file names are still supported.
TQArray TQMemArray <ntqmemarray.h>
TQCollection TQPtrCollection <ntqptrcollection.h>
TQQueue TQPtrQueue <ntqptrqueue.h> -
TQStack TQPtrStack <ntqptrstack.h>

TQButtonGroup

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<class type> inline void TQPtrStack<type>::deleteItem( TQPtr if ( del_item ) delete (type *)d; } -#ifndef TQT_NO_COMPAT -#define TQStack TQPtrStack -#endif - #endif // TQPTRSTACK_H 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 @@
QQueue Class Reference (obsolete)
-
- QStack Class Reference (obsolete) -
TQt Commercial Editions
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 \l QPtrQueue in TQt 3.0. */ - -/*! \page ntqstack.html - - \title QStack Class Reference (obsolete) - - \code -#include \endcode - - The QStack class has been renamed \l QPtrStack 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 inline void TQPtrStack::deleteItem( TQPtrCollection:: if ( del_item ) delete (type *)d; } -#ifndef TQT_NO_COMPAT -#define TQStack TQPtrStack -#endif - #endif // TQPTRSTACK_H