From 789e7c7f92e09fb31549a5126281331b86834008 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Oct 2018 23:25:45 +0900 Subject: [PATCH] Removed obsolete Qt2's TQList/TQListIterator classes and replaced with TQt3's TQPtrList/TQPtrListIterator ones. Signed-off-by: Michele Calgaro --- doc/html/index | 1 - doc/html/ntqlist.html | 47 ----------------------------------- doc/html/porting.html | 4 +-- doc/html/porting2.html | 2 +- doc/html/qlistiterator.html | 48 ------------------------------------ doc/html/qptrlist-h.html | 5 ---- doc/html/qt.dcf | 6 ----- doc/html/titleindex | 2 -- doc/qcollection-compat.doc | 21 ---------------- include/ntqlist.h | 1 - src/compat/ntqlist.h | 27 -------------------- src/kernel/ntqinputcontext.h | 7 +----- src/kernel/qinputcontext.cpp | 2 +- src/tools/ntqptrlist.h | 5 ---- 14 files changed, 4 insertions(+), 174 deletions(-) delete mode 100644 doc/html/ntqlist.html delete mode 100644 doc/html/qlistiterator.html delete mode 120000 include/ntqlist.h delete mode 100644 src/compat/ntqlist.h diff --git a/doc/html/index b/doc/html/index index 84209a10..0464d66e 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 eadb6b2e..00000000 --- a/doc/html/ntqlist.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - -TQList Class Reference (obsolete) - - - - - - - -
- -Home - | -All Classes - | -Main Classes - | -Annotated - | -Grouped Classes - | -Functions -

TQList Class Reference (obsolete)

- - -

-#include <ntqlist.h>
- -

The TQList class has been renamed TQPtrList in TQt 3.0. - - -

- -
Copyright © 2007 -TrolltechTrademarks -
TQt 3.3.8
-
- diff --git a/doc/html/porting.html b/doc/html/porting.html index 19f45c3e..24c53efe 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.

Collection Class Renaming

-

The classes TQArray, TQCollection, TQList, TQListIterator, TQQueue, TQStack +

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.

Old Name New Name New Header File
TQArray TQMemArray <ntqmemarray.h>
TQCollection TQPtrCollection <ntqptrcollection.h> -
TQList TQPtrList <ntqptrlist.h> -
TQListIterator TQPtrListIterator <ntqptrlist.h>
TQQueue TQPtrQueue <ntqptrqueue.h>
TQStack TQPtrStack <ntqptrstack.h>
TQVector TQPtrVector <ntqptrvector.h> diff --git a/doc/html/porting2.html b/doc/html/porting2.html index f53af35d..3402721c 100644 --- a/doc/html/porting2.html +++ b/doc/html/porting2.html @@ -202,7 +202,7 @@ function that is not in a subclass of TQListViewIte

Collection classes

The collection classes include generic classes such as TQGDict, TQGList, and -the subclasses such as TQDict and TQList. +the subclasses such as TQDict and TQPtrList.

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(TQCache,TQPixmap) with TQCache. diff --git a/doc/html/qlistiterator.html b/doc/html/qlistiterator.html deleted file mode 100644 index c75f0689..00000000 --- a/doc/html/qlistiterator.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - -TQListIterator Class Reference (obsolete) - - - - - - - -
- -Home - | -All Classes - | -Main Classes - | -Annotated - | -Grouped Classes - | -Functions -

TQListIterator Class Reference (obsolete)

- - -

-#include <ntqlist.h>
- -

The TQListIterator class has been renamed TQPtrListIterator in -TQt 3.0. - - -

- -
Copyright © 2007 -TrolltechTrademarks -
TQt 3.3.8
-
- diff --git a/doc/html/qptrlist-h.html b/doc/html/qptrlist-h.html index 6f212c6c..d3d5dc02 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 cfa7b689..f74a4312 100644 --- a/doc/html/qt.dcf +++ b/doc/html/qt.dcf @@ -10119,12 +10119,6 @@
qfont-examples
-
- QList Class Reference (obsolete) -
-
- QListIterator Class Reference (obsolete) -
QMag
diff --git a/doc/html/titleindex b/doc/html/titleindex index 3958ab06..90d8dbc6 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 05695948..c2a86eb7 100644 --- a/doc/qcollection-compat.doc +++ b/doc/qcollection-compat.doc @@ -56,27 +56,6 @@ The QCollection class has been renamed \l QPtrCollection in TQt 3.0. */ -/*! \page ntqlist.html - - \title QList Class Reference (obsolete) - - \code -#include \endcode - - The QList class has been renamed \l QPtrList in TQt 3.0. -*/ - -/*! \page qlistiterator.html - - \title QListIterator Class Reference (obsolete) - - \code -#include \endcode - - The QListIterator class has been renamed \l QPtrListIterator 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 3de2d052..00000000 --- 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 4d75178c..00000000 --- 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 2cb7785e..bb8a4f9f 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 actions(); + virtual TQPtrList actions(); void addActionsTo( TQMenu *menu, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator ); #else virtual TQPtrList *menus(); diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp index 9533d3eb..6523fe75 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 TQInputContext::actions() +TQPtrList TQInputContext::actions() { } #else diff --git a/src/tools/ntqptrlist.h b/src/tools/ntqptrlist.h index 305be554..579c1b22 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"