From bfd62a0bbfd44ce5f7530fc7bb624dd911f9033a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 6 Jul 2023 17:00:23 +0900 Subject: Drop Qt2's TQSemiModal and TQSortedList classes Signed-off-by: Michele Calgaro --- src/.obj/README | 1 - src/dialogs/ntqprogressdialog.h | 2 +- src/dialogs/ntqsemimodal.h | 66 ----------------------------------------- src/dialogs/qfiledialog.cpp | 1 - src/dialogs/qt_dialogs.pri | 1 - src/kernel/ntqt.h | 2 -- src/tools/ntqfeatures.h | 9 ++---- src/tools/ntqsortedlist.h | 63 --------------------------------------- src/tools/qconfig-medium.h | 2 -- src/tools/qconfig-minimal.h | 1 - src/tools/qconfig-small.h | 2 -- src/tools/qfeatures.txt | 10 ++----- src/tools/qt_tools.pri | 1 - 13 files changed, 5 insertions(+), 156 deletions(-) delete mode 100644 src/.obj/README delete mode 100644 src/dialogs/ntqsemimodal.h delete mode 100644 src/tools/ntqsortedlist.h (limited to 'src') diff --git a/src/.obj/README b/src/.obj/README deleted file mode 100644 index efb41f3da..000000000 --- a/src/.obj/README +++ /dev/null @@ -1 +0,0 @@ -This directory contains only generated object files. diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/ntqprogressdialog.h index d69b5dc0a..effc6c965 100644 --- a/src/dialogs/ntqprogressdialog.h +++ b/src/dialogs/ntqprogressdialog.h @@ -42,7 +42,7 @@ #define TQPROGRESSDIALOG_H #ifndef QT_H -#include "ntqsemimodal.h" +#include "ntqdialog.h" #include "ntqlabel.h" // ### remove or keep for users' convenience? #include "ntqprogressbar.h" // ### remove or keep for users' convenience? #endif // QT_H diff --git a/src/dialogs/ntqsemimodal.h b/src/dialogs/ntqsemimodal.h deleted file mode 100644 index cf0a46f6b..000000000 --- a/src/dialogs/ntqsemimodal.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Definition of TQSemiModal class for source compatibility -** -** Created : 001010 -** -** Copyright (C) 2000-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the dialogs module 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.TQPL -** included in the packaging of this file. Licensees holding valid TQt -** Commercial licenses may use this file in accordance with the TQt -** 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. -** -**********************************************************************/ - -#ifndef TQSEMIMODAL_H -#define TQSEMIMODAL_H - -#ifndef QT_H -#include "ntqdialog.h" -#endif // QT_H - -#ifndef TQT_NO_COMPAT -#ifndef TQT_NO_SEMIMODAL -class Q_EXPORT TQSemiModal : public TQDialog -{ - TQ_OBJECT -public: - TQSemiModal( TQWidget* parent=0, const char* name=0, bool modal=FALSE, WFlags f=0 ) - : TQDialog( parent, name, modal, f ) { } - -private: // Disabled copy constructor and operator= -#if defined(TQ_DISABLE_COPY) - TQSemiModal( const TQSemiModal & ); - TQSemiModal &operator=( const TQSemiModal & ); -#endif -}; -#endif -#endif - -#endif // TQSEMIMODAL_H diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 076960d96..def6deb15 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -85,7 +85,6 @@ #include "ntqptrvector.h" #include "ntqpushbutton.h" #include "ntqregexp.h" -#include "ntqsemimodal.h" #include "ntqsplitter.h" #include "ntqstrlist.h" #include "ntqstyle.h" diff --git a/src/dialogs/qt_dialogs.pri b/src/dialogs/qt_dialogs.pri index ef84ae1e1..aa0433f50 100644 --- a/src/dialogs/qt_dialogs.pri +++ b/src/dialogs/qt_dialogs.pri @@ -10,7 +10,6 @@ dialogs { $$DIALOGS_H/ntqfontdialog.h \ $$DIALOGS_H/ntqmessagebox.h \ $$DIALOGS_H/ntqprogressdialog.h \ - $$DIALOGS_H/ntqsemimodal.h \ $$DIALOGS_H/ntqtabdialog.h \ $$DIALOGS_H/ntqwizard.h \ $$DIALOGS_H/ntqinputdialog.h diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h index 73b7ae48b..d1676377f 100644 --- a/src/kernel/ntqt.h +++ b/src/kernel/ntqt.h @@ -161,7 +161,6 @@ #include #include #include "ntqprogressbar.h" -#include "ntqsemimodal.h" #include #include "ntqptrdict.h" #include @@ -196,7 +195,6 @@ #include #include #include -#include #include #include #include diff --git a/src/tools/ntqfeatures.h b/src/tools/ntqfeatures.h index 9bc4921af..66fc95fcf 100644 --- a/src/tools/ntqfeatures.h +++ b/src/tools/ntqfeatures.h @@ -307,11 +307,6 @@ #define TQT_NO_REGEXP_WILDCARD #endif -// Semi-modal dialogs -#if !defined(TQT_NO_SEMIMODAL) && (defined(TQT_NO_DIALOG)) -#define TQT_NO_SEMIMODAL -#endif - // Session management #if !defined(TQT_NO_SESSIONMANAGER) && (defined(TQT_NO_STRINGLIST)) #define TQT_NO_SESSIONMANAGER @@ -853,7 +848,7 @@ #endif // TQProgressDialog -#if !defined(TQT_NO_PROGRESSDIALOG) && (defined(TQT_NO_SEMIMODAL) || defined(TQT_NO_LABEL) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_PROGRESSBAR)) +#if !defined(TQT_NO_PROGRESSDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_LABEL) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_PROGRESSBAR)) #define TQT_NO_PROGRESSDIALOG #endif @@ -968,7 +963,7 @@ #endif // TQFileDialog -#if !defined(TQT_NO_FILEDIALOG) && (defined(TQT_NO_MESSAGEBOX) || defined(TQT_NO_LISTVIEW) || defined(TQT_NO_NETWORKPROTOCOL) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_SEMIMODAL) || defined(TQT_NO_REGEXP_CAPTURE) || defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_BUTTONGROUP) || defined(TQT_NO_VBOX) || defined(TQT_NO_SPLITTER) || defined(TQT_NO_PROGRESSBAR) || defined(TQT_NO_WIDGETSTACK) || defined(TQT_NO_DATESTRING)) +#if !defined(TQT_NO_FILEDIALOG) && (defined(TQT_NO_MESSAGEBOX) || defined(TQT_NO_LISTVIEW) || defined(TQT_NO_NETWORKPROTOCOL) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_DIALOG) || defined(TQT_NO_REGEXP_CAPTURE) || defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_BUTTONGROUP) || defined(TQT_NO_VBOX) || defined(TQT_NO_SPLITTER) || defined(TQT_NO_PROGRESSBAR) || defined(TQT_NO_WIDGETSTACK) || defined(TQT_NO_DATESTRING)) #define TQT_NO_FILEDIALOG #endif diff --git a/src/tools/ntqsortedlist.h b/src/tools/ntqsortedlist.h deleted file mode 100644 index 5923e3f17..000000000 --- a/src/tools/ntqsortedlist.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Definition of TQSortedList template/macro class -** -** Created : 920701 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the tools module 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.TQPL -** included in the packaging of this file. Licensees holding valid TQt -** Commercial licenses may use this file in accordance with the TQt -** 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. -** -**********************************************************************/ - -#ifndef TQSORTEDLIST_H -#define TQSORTEDLIST_H - -#ifndef QT_H -#include "ntqptrlist.h" -#endif // QT_H - - -template -class TQSortedList : public TQPtrList -{ -public: - TQSortedList() {} - TQSortedList( const TQSortedList &l ) : TQPtrList(l) {} - ~TQSortedList() { this->clear(); } - TQSortedList &operator=(const TQSortedList &l) - { return (TQSortedList&)TQPtrList::operator=(l); } - - virtual int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) - { if ( *((type*)s1) == *((type*)s2) ) return 0; return ( *((type*)s1) < *((type*)s2) ? -1 : 1 ); } -}; - -#endif diff --git a/src/tools/qconfig-medium.h b/src/tools/qconfig-medium.h index 23a305738..17416abf4 100644 --- a/src/tools/qconfig-medium.h +++ b/src/tools/qconfig-medium.h @@ -60,8 +60,6 @@ /* #define TQT_NO_DIALOG */ -#define TQT_NO_SEMIMODAL - #define TQT_NO_EFFECTS #define TQT_NO_COP diff --git a/src/tools/qconfig-minimal.h b/src/tools/qconfig-minimal.h index 4a4b87899..7d5305e69 100644 --- a/src/tools/qconfig-minimal.h +++ b/src/tools/qconfig-minimal.h @@ -53,7 +53,6 @@ #define TQT_NO_BUTTON #define TQT_NO_DIALOG #define TQT_NO_FRAME -#define TQT_NO_SEMIMODAL #define TQT_NO_STYLE #define TQT_NO_EFFECTS diff --git a/src/tools/qconfig-small.h b/src/tools/qconfig-small.h index 4190ec926..f89fb8d1c 100644 --- a/src/tools/qconfig-small.h +++ b/src/tools/qconfig-small.h @@ -44,8 +44,6 @@ #define TQT_NO_DIALOG -#define TQT_NO_SEMIMODAL - /* #define TQT_NO_STYLE //will require substantial work... */ #define TQT_NO_EFFECTS diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt index af6f62046..0aa3cf785 100644 --- a/src/tools/qfeatures.txt +++ b/src/tools/qfeatures.txt @@ -798,12 +798,6 @@ Requires: Name: Dialogs SeeAlso: ??? -Feature: SEMIMODAL -Section: Widgets -Requires: DIALOG -Name: Semi-modal dialogs -SeeAlso: ??? - Feature: FRAME Section: Widgets Requires: STYLE @@ -1233,7 +1227,7 @@ SeeAlso: ??? Feature: FILEDIALOG Section: Widgets -Requires: MESSAGEBOX LISTVIEW NETWORKPROTOCOL COMBOBOX SEMIMODAL REGEXP_CAPTURE TOOLBUTTON BUTTONGROUP VBOX SPLITTER PROGRESSBAR WIDGETSTACK DATESTRING +Requires: MESSAGEBOX LISTVIEW NETWORKPROTOCOL COMBOBOX DIALOG REGEXP_CAPTURE TOOLBUTTON BUTTONGROUP VBOX SPLITTER PROGRESSBAR WIDGETSTACK DATESTRING Name: QFileDialog SeeAlso: ??? @@ -1251,7 +1245,7 @@ SeeAlso: ??? Feature: PROGRESSDIALOG Section: Widgets -Requires: SEMIMODAL LABEL PUSHBUTTON PROGRESSBAR +Requires: DIALOG LABEL PUSHBUTTON PROGRESSBAR Name: QProgressDialog SeeAlso: ??? diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri index 175cc88e4..7153653b8 100644 --- a/src/tools/qt_tools.pri +++ b/src/tools/qt_tools.pri @@ -50,7 +50,6 @@ tools { $$TOOLS_H/ntqsettings.h \ $$TOOLS_P/qsettings_p.h \ $$TOOLS_H/ntqshared.h \ - $$TOOLS_H/ntqsortedlist.h \ $$TOOLS_H/ntqptrstack.h \ $$TOOLS_H/ntqstring.h \ $$TOOLS_H/ntqstringlist.h \ -- cgit v1.2.1