From 34c1c95d9619bc1a8814202f90601672ba394413 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 21 Oct 2018 19:05:33 +0900 Subject: [PATCH] Removed some obsolete code related to Qt1. Signed-off-by: Michele Calgaro --- qtinterface/CMakeLists.txt | 6 +-- qtinterface/Makefile.am | 4 +- qtinterface/convert_qt_tqt1 | 8 ---- qtinterface/filelist.txt | 3 -- .../interface_qt3/tq1xcompatibility.cpp | 23 ----------- qtinterface/interface_qt3/tq1xcompatibility.h | 39 ------------------- qtinterface/interface_qt3/tqpaintd.h | 31 --------------- qtinterface/interface_qt3/tqpaintdc.h | 4 -- .../interface_tqt3/tq1xcompatibility.cpp | 23 ----------- .../interface_tqt3/tq1xcompatibility.h | 39 ------------------- qtinterface/interface_tqt3/tqpaintd.h | 31 --------------- qtinterface/interface_tqt3/tqpaintdc.h | 4 -- 12 files changed, 4 insertions(+), 211 deletions(-) delete mode 100644 qtinterface/interface_qt3/tq1xcompatibility.cpp delete mode 100644 qtinterface/interface_qt3/tq1xcompatibility.h delete mode 100644 qtinterface/interface_qt3/tqpaintd.h delete mode 100644 qtinterface/interface_tqt3/tq1xcompatibility.cpp delete mode 100644 qtinterface/interface_tqt3/tq1xcompatibility.h delete mode 100644 qtinterface/interface_tqt3/tqpaintd.h diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt index 3341404..0ed399d 100644 --- a/qtinterface/CMakeLists.txt +++ b/qtinterface/CMakeLists.txt @@ -66,10 +66,10 @@ install( FILES ${IFACE}/tqgeneric.h ${IFACE}/tqgif.h ${IFACE}/tqglobal.h ${IFACE}/tqgrpbox.h ${IFACE}/tqintcach.h ${IFACE}/tqiodev.h ${IFACE}/tqjpegio.h ${IFACE}/tqkeycode.h ${IFACE}/tqlined.h ${IFACE}/tqlist.h ${IFACE}/tqmenudta.h ${IFACE}/tqmetaobj.h ${IFACE}/tqmlined.h ${IFACE}/tqmngio.h ${IFACE}/tqmodules.h ${IFACE}/tqmsgbox.h ${IFACE}/tqmultilinedit.h ${IFACE}/tqnetwork.h ${IFACE}/tqobjcoll.h ${IFACE}/tqobjdefs.h - ${IFACE}/tqpaintdc.h ${IFACE}/tqpaintd.h ${IFACE}/tqpdevmet.h ${IFACE}/tqpmcache.h ${IFACE}/tqpntarry.h ${IFACE}/tqpopmenu.h + ${IFACE}/tqpdevmet.h ${IFACE}/tqpmcache.h ${IFACE}/tqpntarry.h ${IFACE}/tqpopmenu.h ${IFACE}/tqprndlg.h ${IFACE}/tqprogbar.h ${IFACE}/tqprogdlg.h ${IFACE}/tqpushbt.h ${IFACE}/tqqueue.h ${IFACE}/tqradiobt.h ${IFACE}/tqrangect.h ${IFACE}/tqscrbar.h ${IFACE}/tqsession.h ${IFACE}/tqsocknot.h ${IFACE}/tqstack.h ${IFACE}/tqtabdlg.h ${IFACE}/tqtstream.h ${IFACE}/tqvector.h - ${IFACE}/tqwidcoll.h ${IFACE}/tqwindefs.h ${IFACE}/tqwindowdefs.h ${IFACE}/tqwinexport.h ${IFACE}/tq1xcompatibility.h + ${IFACE}/tqwidcoll.h ${IFACE}/tqwindefs.h ${IFACE}/tqwindowdefs.h ${IFACE}/tqwinexport.h ${IFACE}/tqabstractlayout.h ${IFACE}/tqasciicache.h ${IFACE}/tqasciidict.h ${IFACE}/tqasyncimageio.h ${IFACE}/tqbig5codec.h ${IFACE}/tqbitarray.h ${IFACE}/tqbitmap.h ${IFACE}/tqbrush.h ${IFACE}/tqbuffer.h ${IFACE}/tqcache.h ${IFACE}/tqcleanuphandler.h ${IFACE}/tqcolor.h ${IFACE}/tqcompactstyle.h ${IFACE}/tqconnection.h ${IFACE}/tqcstring.h ${IFACE}/tqcursor.h ${IFACE}/tqdatastream.h @@ -180,7 +180,7 @@ tde_add_library( tqt SHARED ${IFACE}/tqtranslator.cpp ${IFACE}/tqurloperator.cpp ${IFACE}/tqvalidator.cpp ${IFACE}/tqvbox.cpp ${IFACE}/tqvbuttongroup.cpp ${IFACE}/tqvgroupbox.cpp ${IFACE}/tqwidget.cpp ${IFACE}/tqwidgetplugin.cpp ${IFACE}/tqwidgetstack.cpp ${IFACE}/tqwindowsstyle.cpp ${IFACE}/tqwizard.cpp ${IFACE}/tqworkspace.cpp - ${IFACE}/tq1xcompatibility.cpp ${IFACE}/tqabstractlayout.cpp ${IFACE}/tqasciicache.cpp ${IFACE}/tqasciidict.cpp + ${IFACE}/tqabstractlayout.cpp ${IFACE}/tqasciicache.cpp ${IFACE}/tqasciidict.cpp ${IFACE}/tqasyncimageio.cpp ${IFACE}/tqbig5codec.cpp ${IFACE}/tqbitarray.cpp ${IFACE}/tqbitmap.cpp ${IFACE}/tqbrush.cpp ${IFACE}/tqbuffer.cpp ${IFACE}/tqcache.cpp ${IFACE}/tqcleanuphandler.cpp ${IFACE}/tqcolor.cpp ${IFACE}/tqcompactstyle.cpp ${IFACE}/tqconnection.cpp ${IFACE}/tqcstring.cpp ${IFACE}/tqcursor.cpp ${IFACE}/tqdatastream.cpp ${IFACE}/tqdatetime.cpp diff --git a/qtinterface/Makefile.am b/qtinterface/Makefile.am index 404a2be..d3e0823 100644 --- a/qtinterface/Makefile.am +++ b/qtinterface/Makefile.am @@ -50,7 +50,6 @@ tqurloperator.cpp \ tqvalidator.cpp tqvbox.cpp tqvbuttongroup.cpp tqvgroupbox.cpp \ tqwidget.cpp tqwidgetplugin.cpp tqwidgetstack.cpp tqwindowsstyle.cpp tqwizard.cpp tqworkspace.cpp \ \ -tq1xcompatibility.cpp \ tqabstractlayout.cpp tqasciicache.cpp tqasciidict.cpp tqassistantclient.cpp tqasyncimageio.cpp \ tqbig5codec.cpp tqbitarray.cpp tqbitmap.cpp tqbrush.cpp tqbuffer.cpp \ tqcache.cpp tqcleanuphandler.cpp tqcolor.cpp tqcompactstyle.cpp tqconnection.cpp tqcstring.cpp tqcursor.cpp \ @@ -102,9 +101,8 @@ tqurloperator.h \ tqvalidator.h tqvbox.h tqvbuttongroup.h tqvgroupbox.h \ tqwidget.h tqwidgetplugin.h tqwidgetstack.h tqwindowsstyle.h tqwizard.h tqworkspace.h \ \ -tqapp.h tqarray.h tqbitarry.h tqbttngrp.h tqchkbox.h tqclipbrd.h tqcollect.h tqcollection.h tqcombo.h tqconfig.h tqconnect.h tqdatetm.h tqdrawutl.h tqdstream.h tqfeatures.h tqfiledef.h tqfiledlg.h tqfileinf.h tqfontinf.h tqfontmet.h tqgbkcodec.h tqgeneric.h tqgif.h tqglobal.h tqgrpbox.h tqintcach.h tqiodev.h tqjpegio.h tqkeycode.h tqlcdnumber.h tqlined.h tqlist.h tqmenudta.h tqmetaobj.h tqmlined.h tqmngio.h tqmodules.h tqmsgbox.h tqmultilinedit.h tqnetwork.h tqobjcoll.h tqobjdefs.h tqpaintdc.h tqpaintd.h tqpdevmet.h tqpmcache.h tqpntarry.h tqpopmenu.h tqprndlg.h tqprogbar.h tqprogdlg.h tqpushbt.h tqqueue.h tqradiobt.h tqrangect.h tqscrbar.h tqsession.h tqsocknot.h tqstack.h tqtabdlg.h tqtstream.h tqvector.h tqwidcoll.h tqwindefs.h tqwindowdefs.h tqwinexport.h \ +tqapp.h tqarray.h tqbitarry.h tqbttngrp.h tqchkbox.h tqclipbrd.h tqcollect.h tqcollection.h tqcombo.h tqconfig.h tqconnect.h tqdatetm.h tqdrawutl.h tqdstream.h tqfeatures.h tqfiledef.h tqfiledlg.h tqfileinf.h tqfontinf.h tqfontmet.h tqgbkcodec.h tqgeneric.h tqgif.h tqglobal.h tqgrpbox.h tqintcach.h tqiodev.h tqjpegio.h tqkeycode.h tqlcdnumber.h tqlined.h tqlist.h tqmenudta.h tqmetaobj.h tqmlined.h tqmngio.h tqmodules.h tqmsgbox.h tqmultilinedit.h tqnetwork.h tqobjcoll.h tqobjdefs.h tqpdevmet.h tqpmcache.h tqpntarry.h tqpopmenu.h tqprndlg.h tqprogbar.h tqprogdlg.h tqpushbt.h tqqueue.h tqradiobt.h tqrangect.h tqscrbar.h tqsession.h tqsocknot.h tqstack.h tqtabdlg.h tqtstream.h tqvector.h tqwidcoll.h tqwindefs.h tqwindowdefs.h tqwinexport.h \ \ -tq1xcompatibility.h \ tqabstractlayout.h tqasciicache.h tqasciidict.h tqasyncimageio.h \ tqbig5codec.h tqbitarray.h tqbitmap.h tqbrush.h tqbuffer.h \ tqcache.h tqcleanuphandler.h tqcolor.h tqcompactstyle.h tqconnection.h tqcstring.h tqcursor.h \ diff --git a/qtinterface/convert_qt_tqt1 b/qtinterface/convert_qt_tqt1 index e65f144..63f92f4 100755 --- a/qtinterface/convert_qt_tqt1 +++ b/qtinterface/convert_qt_tqt1 @@ -1,7 +1,5 @@ #!/bin/bash -find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)q1xcompatibility\.h/\1tq1xcompatibility\.h/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)q1xcompatibility\.h/\1tq1xcompatibility\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qabstractlayout\.h/\1tqabstractlayout\.h/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qabstractlayout\.h/\1tqabstractlayout\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qaccel\.h/\1tqaccel\.h/g' {} \; @@ -274,8 +272,6 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qlineedit\.h/\1tqlineedit\ find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qlineedit\.h/\1tqlineedit\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qlistbox\.h/\1tqlistbox\.h/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qlistbox\.h/\1tqlistbox\.h/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qlist\.h/\1tqlist\.h/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qlist\.h/\1tqlist\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qlistview\.h/\1tqlistview\.h/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qlistview\.h/\1tqlistview\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qlocale\.h/\1tqlocale\.h/g' {} \; @@ -342,8 +338,6 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qobject\.h/\1tqobject\.h/g find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qobject\.h/\1tqobject\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qobjectlist\.h/\1tqobjectlist\.h/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qobjectlist\.h/\1tqobjectlist\.h/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qpaintdc\.h/\1tqpaintdc\.h/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qpaintdc\.h/\1tqpaintdc\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qpaintdevice\.h/\1tqpaintdevice\.h/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qpaintdevice\.h/\1tqpaintdevice\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qpaintdevicemetrics\.h/\1tqpaintdevicemetrics\.h/g' {} \; @@ -616,8 +610,6 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qvbox\.h/\1tqvbox\.h/g' {} find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qvbox\.h/\1tqvbox\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qvbuttongroup\.h/\1tqvbuttongroup\.h/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qvbuttongroup\.h/\1tqvbuttongroup\.h/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qvector\.h/\1tqvector\.h/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qvector\.h/\1tqvector\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qvfbhdr\.h/\1tqvfbhdr\.h/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qvfbhdr\.h/\1tqvfbhdr\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qvgroupbox\.h/\1tqvgroupbox\.h/g' {} \; diff --git a/qtinterface/filelist.txt b/qtinterface/filelist.txt index 4659bf5..4de2065 100644 --- a/qtinterface/filelist.txt +++ b/qtinterface/filelist.txt @@ -1,6 +1,5 @@ kdemacros.h.in parser.sh -tq1xcompatibility.h tqabstractlayout.h tqaccel.h tqaccessible.h @@ -185,10 +184,8 @@ tqobjectcleanuphandler.h tqobjectdict.h tqobject.h tqobjectlist.h -tqpaintdc.h tqpaintdevice.h tqpaintdevicemetrics.h -tqpaintd.h tqpainter.h tqpair.h tqpalette.h diff --git a/qtinterface/interface_qt3/tq1xcompatibility.cpp b/qtinterface/interface_qt3/tq1xcompatibility.cpp deleted file mode 100644 index 44a88e4..0000000 --- a/qtinterface/interface_qt3/tq1xcompatibility.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. - -*/ - -#include -//#include diff --git a/qtinterface/interface_qt3/tq1xcompatibility.h b/qtinterface/interface_qt3/tq1xcompatibility.h deleted file mode 100644 index c58fd91..0000000 --- a/qtinterface/interface_qt3/tq1xcompatibility.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. - -*/ - -#ifndef TQT_TQ1XCOMPATIBILITY_H -#define TQT_TQ1XCOMPATIBILITY_H - -#include - -#ifdef USE_QT3 - -#include - -#endif // USE_QT3 - -#ifdef USE_QT4 - -#include - -#endif // USE_QT4 - -#endif /* TQT_TQ1XCOMPATIBILITY_H */ diff --git a/qtinterface/interface_qt3/tqpaintd.h b/qtinterface/interface_qt3/tqpaintd.h deleted file mode 100644 index a2fa4ae..0000000 --- a/qtinterface/interface_qt3/tqpaintd.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. - -*/ - -#ifndef TQT_TQPAINTD_H -#define TQT_TQPAINTD_H - -#include - -// Pull in tqpaintdevice defines - -#include - -#endif /* TQT_TQPAINTD_H */ diff --git a/qtinterface/interface_qt3/tqpaintdc.h b/qtinterface/interface_qt3/tqpaintdc.h index 1ae53e6..ed879f5 100644 --- a/qtinterface/interface_qt3/tqpaintdc.h +++ b/qtinterface/interface_qt3/tqpaintdc.h @@ -24,8 +24,4 @@ Boston, MA 02110-1301, USA. #include -// Pull in tqpaintdevicedefs defines - -#include - #endif /* TQT_TQPAINTDC_H */ diff --git a/qtinterface/interface_tqt3/tq1xcompatibility.cpp b/qtinterface/interface_tqt3/tq1xcompatibility.cpp deleted file mode 100644 index 2caec43..0000000 --- a/qtinterface/interface_tqt3/tq1xcompatibility.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. - -*/ - -#include -//#include diff --git a/qtinterface/interface_tqt3/tq1xcompatibility.h b/qtinterface/interface_tqt3/tq1xcompatibility.h deleted file mode 100644 index e10f4b0..0000000 --- a/qtinterface/interface_tqt3/tq1xcompatibility.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. - -*/ - -#ifndef TQT_TQ1XCOMPATIBILITY_H -#define TQT_TQ1XCOMPATIBILITY_H - -#include - -#ifdef USE_QT3 - -#include - -#endif // USE_QT3 - -#ifdef USE_QT4 - -#include - -#endif // USE_QT4 - -#endif /* TQT_TQ1XCOMPATIBILITY_H */ diff --git a/qtinterface/interface_tqt3/tqpaintd.h b/qtinterface/interface_tqt3/tqpaintd.h deleted file mode 100644 index 4eab638..0000000 --- a/qtinterface/interface_tqt3/tqpaintd.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. - -*/ - -#ifndef TQT_TQPAINTD_H -#define TQT_TQPAINTD_H - -#include - -// Pull in tqpaintdevice defines - -#include - -#endif /* TQT_TQPAINTD_H */ diff --git a/qtinterface/interface_tqt3/tqpaintdc.h b/qtinterface/interface_tqt3/tqpaintdc.h index 2644214..ed879f5 100644 --- a/qtinterface/interface_tqt3/tqpaintdc.h +++ b/qtinterface/interface_tqt3/tqpaintdc.h @@ -24,8 +24,4 @@ Boston, MA 02110-1301, USA. #include -// Pull in tqpaintdevicedefs defines - -#include - #endif /* TQT_TQPAINTDC_H */