From a75445b4c3c2fe24d377625acd8bb058b2bd971a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 3 Jun 2023 10:43:37 +0900 Subject: [PATCH] Drop Qt2 obsolete classes Signed-off-by: Michele Calgaro --- bin/tqtrename140 | 120 ------------------ doc/html/index | 3 - doc/html/ntqarray.html | 47 ------- doc/html/ntqcollection.html | 47 ------- doc/html/ntqqueue.html | 47 ------- doc/html/porting.html | 11 -- doc/html/qmemarray-h.html | 6 +- doc/html/qptrcollection-h.html | 4 - doc/html/qptrqueue-h.html | 4 - doc/html/qt.dcf | 9 -- doc/html/titleindex | 3 - doc/porting3.doc | 17 --- doc/qcollection-compat.doc | 67 ---------- .../src/inputmethods/xim/qximinputcontext.h | 2 +- src/compat/ntqarray.h | 27 ---- src/compat/ntqcollection.h | 27 ---- src/compat/ntqqueue.h | 27 ---- src/kernel/qinputcontext_p.h | 2 +- src/tools/ntqmemarray.h | 6 +- src/tools/ntqptrcollection.h | 4 - src/tools/ntqptrqueue.h | 4 - 21 files changed, 4 insertions(+), 480 deletions(-) delete mode 100755 bin/tqtrename140 delete mode 100644 doc/html/ntqarray.html delete mode 100644 doc/html/ntqcollection.html delete mode 100644 doc/html/ntqqueue.html delete mode 100644 doc/qcollection-compat.doc delete mode 100644 src/compat/ntqarray.h delete mode 100644 src/compat/ntqcollection.h delete mode 100644 src/compat/ntqqueue.h diff --git a/bin/tqtrename140 b/bin/tqtrename140 deleted file mode 100755 index 3c6d319d..00000000 --- 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 2286467a..bf0fbc87 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 9940d3c5..00000000 --- a/doc/html/ntqarray.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - -TQArray Class Reference (obsolete) - - - - - - - -
- -Home - | -All Classes - | -Main Classes - | -Annotated - | -Grouped Classes - | -Functions -

TQArray Class Reference (obsolete)

- - -

-#include <ntqarray.h>
- -

The TQArray class has been renamed TQMemArray in TQt 3.0. - - -

- -
Copyright © 2007 -TrolltechTrademarks -
TQt 3.3.8
-
- diff --git a/doc/html/ntqcollection.html b/doc/html/ntqcollection.html deleted file mode 100644 index 0faed632..00000000 --- a/doc/html/ntqcollection.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - -TQCollection Class Reference (obsolete) - - - - - - - -
- -Home - | -All Classes - | -Main Classes - | -Annotated - | -Grouped Classes - | -Functions -

TQCollection Class Reference (obsolete)

- - -

-#include <ntqcollection.h>
- -

The TQCollection class has been renamed TQPtrCollection in TQt 3.0. - - -

- -
Copyright © 2007 -TrolltechTrademarks -
TQt 3.3.8
-
- diff --git a/doc/html/ntqqueue.html b/doc/html/ntqqueue.html deleted file mode 100644 index 9f7bb4f3..00000000 --- a/doc/html/ntqqueue.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - -TQQueue Class Reference (obsolete) - - - - - - - -
- -Home - | -All Classes - | -Main Classes - | -Annotated - | -Grouped Classes - | -Functions -

TQQueue Class Reference (obsolete)

- - -

-#include <ntqqueue.h>
- -

The TQQueue class has been renamed TQPtrQueue in TQt 3.0. - - -

- -
Copyright © 2007 -TrolltechTrademarks -
TQt 3.3.8
-
- diff --git a/doc/html/porting.html b/doc/html/porting.html index 440af7d6..8f13fa2b 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. -

Collection Class Renaming -

-

The classes TQArray, TQCollection and TQQueue -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> -
TQQueue TQPtrQueue <ntqptrqueue.h> -

TQButtonGroup

In TQt 2.x, the function TQButtonGroup::selected() returns the selected diff --git a/doc/html/qmemarray-h.html b/doc/html/qmemarray-h.html index cdfd6518..68f706b0 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

diff --git a/doc/html/qptrcollection-h.html b/doc/html/qptrcollection-h.html index a48beca3..e3cc0519 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 diff --git a/doc/html/qptrqueue-h.html b/doc/html/qptrqueue-h.html index adb707bb..b7a69b43 100644 --- a/doc/html/qptrqueue-h.html +++ b/doc/html/qptrqueue-h.html @@ -123,10 +123,6 @@ template<class type> inline void TQPtrQueue<type>::deleteItem( TQPtr if ( del_item ) delete (type *)d; } -#ifndef TQT_NO_COMPAT -#define TQQueue TQPtrQueue -#endif - #endif // TQPTRQUEUE_H diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf index 688eb842..bf7f2690 100644 --- a/doc/html/qt.dcf +++ b/doc/html/qt.dcf @@ -10098,12 +10098,6 @@
qaction-examples
-
- QArray Class Reference (obsolete) -
-
- QCollection Class Reference (obsolete) -
QDir
@@ -10122,9 +10116,6 @@
qprocess-examples
-
- QQueue Class Reference (obsolete) -
TQt Commercial Editions
diff --git a/doc/html/titleindex b/doc/html/titleindex index bd690ed4..264d671b 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 c3024625..01f8fb05 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 -\row \i QCollection \i \l QPtrCollection \i \c -\row \i QList \i \l QPtrList \i \c -\row \i QListIterator \i \l QPtrListIterator \i \c -\row \i QQueue \i \l QPtrQueue \i \c -\row \i QStack \i \l QPtrStack \i \c -\row \i QVector \i \l QPtrVector \i \c -\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 32bb81ce..00000000 --- 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 \endcode - - The QArray class has been renamed \l QMemArray in TQt 3.0. -*/ - -/*! \page ntqcollection.html - - \title QCollection Class Reference (obsolete) - - \code -#include \endcode - - The QCollection class has been renamed \l QPtrCollection in TQt 3.0. -*/ - -/*! \page ntqqueue.html - - \title QQueue Class Reference (obsolete) - - \code -#include \endcode - - The QQueue class has been renamed \l QPtrQueue in TQt 3.0. -*/ diff --git a/plugins/src/inputmethods/xim/qximinputcontext.h b/plugins/src/inputmethods/xim/qximinputcontext.h index 449e219e..24382735 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 #endif diff --git a/src/compat/ntqarray.h b/src/compat/ntqarray.h deleted file mode 100644 index 4f266e54..00000000 --- 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 d285b6d4..00000000 --- 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 7165a2ed..00000000 --- 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 0a7d193d..0ab3a088 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 2febfb23..8a07bf9a 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 37ff0df3..2b69899f 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 90f743d0..c905b4fd 100644 --- a/src/tools/ntqptrqueue.h +++ b/src/tools/ntqptrqueue.h @@ -87,8 +87,4 @@ template inline void TQPtrQueue::deleteItem( TQPtrCollection:: if ( del_item ) delete (type *)d; } -#ifndef TQT_NO_COMPAT -#define TQQueue TQPtrQueue -#endif - #endif // TQPTRQUEUE_H