diff options
| -rw-r--r-- | qtinterface/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | qtinterface/TODO | 1 | ||||
| -rwxr-xr-x | qtinterface/convert_qt_tqt1 | 4 | ||||
| -rwxr-xr-x | qtinterface/convert_qt_tqt2 | 4 | ||||
| -rwxr-xr-x | qtinterface/convert_qt_tqt3 | 4 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqsemimodal.cpp | 23 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqsemimodal.h | 43 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqsortedlist.cpp | 23 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqsortedlist.h | 45 |
9 files changed, 4 insertions, 151 deletions
diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt index 083f9f4..078c1b2 100644 --- a/qtinterface/CMakeLists.txt +++ b/qtinterface/CMakeLists.txt @@ -47,7 +47,7 @@ install( FILES ${IFACE}/tqmultilineedit.h ${IFACE}/tqnetworkprotocol.h ${IFACE}/tqnp.h ${IFACE}/tqobjectcleanuphandler.h ${IFACE}/tqobject.h ${IFACE}/tqplatinumstyle.h ${IFACE}/tqpopupmenu.h ${IFACE}/tqprintdialog.h ${IFACE}/tqprocess.h ${IFACE}/tqprogressbar.h ${IFACE}/tqprogressdialog.h ${IFACE}/tqpushbutton.h ${IFACE}/tqradiobutton.h - ${IFACE}/tqrangecontrol.h ${IFACE}/tqscrollbar.h ${IFACE}/tqscrollview.h ${IFACE}/tqsemimodal.h ${IFACE}/tqserversocket.h + ${IFACE}/tqrangecontrol.h ${IFACE}/tqscrollbar.h ${IFACE}/tqscrollview.h ${IFACE}/tqserversocket.h ${IFACE}/tqsessionmanager.h ${IFACE}/tqsgistyle.h ${IFACE}/tqsignal.h ${IFACE}/tqsignalmapper.h ${IFACE}/tqsizegrip.h ${IFACE}/tqslider.h ${IFACE}/tqsocket.h ${IFACE}/tqsocketnotifier.h ${IFACE}/tqsound.h ${IFACE}/tqspinbox.h ${IFACE}/tqsplashscreen.h ${IFACE}/tqsplitter.h ${IFACE}/tqsqldatabase.h ${IFACE}/tqsqldriver.h ${IFACE}/tqsqldriverplugin.h ${IFACE}/tqsqlform.h @@ -84,7 +84,7 @@ install( FILES ${IFACE}/tqptrqueue.h ${IFACE}/tqptrstack.h ${IFACE}/tqptrvector.h ${IFACE}/tqrect.h ${IFACE}/tqregexp.h ${IFACE}/tqregion.h ${IFACE}/tqrtlcodec.h ${IFACE}/tqsemaphore.h ${IFACE}/tqsettings.h ${IFACE}/tqshared.h ${IFACE}/tqsignalslotimp.h ${IFACE}/tqsimplerichtext.h ${IFACE}/tqsize.h ${IFACE}/tqsizepolicy.h ${IFACE}/tqsjiscodec.h ${IFACE}/tqsocketdevice.h - ${IFACE}/tqsortedlist.h ${IFACE}/tqsqlcursor.h ${IFACE}/tqsqleditorfactory.h ${IFACE}/tqsqlerror.h ${IFACE}/tqsqlfield.h + ${IFACE}/tqsqlcursor.h ${IFACE}/tqsqleditorfactory.h ${IFACE}/tqsqlerror.h ${IFACE}/tqsqlfield.h ${IFACE}/tqsql.h ${IFACE}/tqsqlindex.h ${IFACE}/tqsqlpropertymap.h ${IFACE}/tqsqlrecord.h ${IFACE}/tqsqlresult.h ${IFACE}/tqsqlselectcursor.h ${IFACE}/tqstring.h ${IFACE}/tqstringlist.h ${IFACE}/tqstrlist.h ${IFACE}/tqstrvec.h ${IFACE}/tqstylefactory.h ${IFACE}/tqsyntaxhighlighter.h ${IFACE}/tqtextcodecfactory.h ${IFACE}/tqtextcodec.h @@ -153,7 +153,7 @@ tde_add_library( tqt SHARED ${IFACE}/tqnetworkprotocol.cpp ${IFACE}/tqnp.cpp ${IFACE}/tqobjectcleanuphandler.cpp ${IFACE}/tqobject.cpp ${IFACE}/tqplatinumstyle.cpp ${IFACE}/tqpopupmenu.cpp ${IFACE}/tqprintdialog.cpp ${IFACE}/tqprocess.cpp ${IFACE}/tqprogressbar.cpp ${IFACE}/tqprogressdialog.cpp ${IFACE}/tqpushbutton.cpp ${IFACE}/tqradiobutton.cpp - ${IFACE}/tqrangecontrol.cpp ${IFACE}/tqscrollbar.cpp ${IFACE}/tqscrollview.cpp ${IFACE}/tqsemimodal.cpp + ${IFACE}/tqrangecontrol.cpp ${IFACE}/tqscrollbar.cpp ${IFACE}/tqscrollview.cpp ${IFACE}/tqserversocket.cpp ${IFACE}/tqsessionmanager.cpp ${IFACE}/tqsgistyle.cpp ${IFACE}/tqsignal.cpp ${IFACE}/tqsignalmapper.cpp ${IFACE}/tqsizegrip.cpp ${IFACE}/tqslider.cpp ${IFACE}/tqsocket.cpp ${IFACE}/tqsocketnotifier.cpp ${IFACE}/tqsound.cpp ${IFACE}/tqspinbox.cpp ${IFACE}/tqsplashscreen.cpp @@ -184,7 +184,7 @@ tde_add_library( tqt SHARED ${IFACE}/tqptrdict.cpp ${IFACE}/tqptrlist.cpp ${IFACE}/tqptrqueue.cpp ${IFACE}/tqptrstack.cpp ${IFACE}/tqptrvector.cpp ${IFACE}/tqrect.cpp ${IFACE}/tqregexp.cpp ${IFACE}/tqregion.cpp ${IFACE}/tqrtlcodec.cpp ${IFACE}/tqsemaphore.cpp ${IFACE}/tqsettings.cpp ${IFACE}/tqshared.cpp ${IFACE}/tqsignalslotimp.cpp ${IFACE}/tqsimplerichtext.cpp ${IFACE}/tqsize.cpp - ${IFACE}/tqsizepolicy.cpp ${IFACE}/tqsjiscodec.cpp ${IFACE}/tqsocketdevice.cpp ${IFACE}/tqsortedlist.cpp + ${IFACE}/tqsizepolicy.cpp ${IFACE}/tqsjiscodec.cpp ${IFACE}/tqsocketdevice.cpp ${IFACE}/tqsqlcursor.cpp ${IFACE}/tqsqleditorfactory.cpp ${IFACE}/tqsqlerror.cpp ${IFACE}/tqsqlfield.cpp ${IFACE}/tqsql.cpp ${IFACE}/tqsqlindex.cpp ${IFACE}/tqsqlpropertymap.cpp ${IFACE}/tqsqlrecord.cpp ${IFACE}/tqsqlresult.cpp ${IFACE}/tqsqlselectcursor.cpp ${IFACE}/tqstring.cpp ${IFACE}/tqstringlist.cpp ${IFACE}/tqstrlist.cpp ${IFACE}/tqstrvec.cpp diff --git a/qtinterface/TODO b/qtinterface/TODO index 3d611a2..a19ef35 100644 --- a/qtinterface/TODO +++ b/qtinterface/TODO @@ -34,7 +34,6 @@ qmemarray qptrdict qptrlist qptrqueue -qsortedlist qsqlpropertymap qsqlselectcursor qthreadstorage diff --git a/qtinterface/convert_qt_tqt1 b/qtinterface/convert_qt_tqt1 index b075b0f..4e7c2df 100755 --- a/qtinterface/convert_qt_tqt1 +++ b/qtinterface/convert_qt_tqt1 @@ -430,8 +430,6 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qscrollview\.h/\1tqscrollv find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qscrollview\.h/\1tqscrollview\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsemaphore\.h/\1tqsemaphore\.h/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsemaphore\.h/\1tqsemaphore\.h/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsemimodal\.h/\1tqsemimodal\.h/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsemimodal\.h/\1tqsemimodal\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qserversocket\.h/\1tqserversocket\.h/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qserversocket\.h/\1tqserversocket\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsession\.h/\1tqsession\.h/g' {} \; @@ -470,8 +468,6 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsocketnotifier\.h/\1tqsoc find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsocketnotifier\.h/\1tqsocketnotifier\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsocknot\.h/\1tqsocknot\.h/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsocknot\.h/\1tqsocknot\.h/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsortedlist\.h/\1tqsortedlist\.h/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsortedlist\.h/\1tqsortedlist\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsound\.h/\1tqsound\.h/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsound\.h/\1tqsound\.h/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qspinbox\.h/\1tqspinbox\.h/g' {} \; diff --git a/qtinterface/convert_qt_tqt2 b/qtinterface/convert_qt_tqt2 index d63048c..8dae878 100755 --- a/qtinterface/convert_qt_tqt2 +++ b/qtinterface/convert_qt_tqt2 @@ -664,8 +664,6 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/QScrollView\([ :<>"()*&.,^;]\)/TQS find ./ -type f -iname "*.h*" -exec sed -i 's/QScrollView\([ :<>"()*&.,^;]\)/TQScrollView\1/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/QSemaphore\([ :<>"()*&.,^;]\)/TQSemaphore\1/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/QSemaphore\([ :<>"()*&.,^;]\)/TQSemaphore\1/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/QSemiModal\([ :<>"()*&.,^;]\)/TQSemiModal\1/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/QSemiModal\([ :<>"()*&.,^;]\)/TQSemiModal\1/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/QServerSocket\([ :<>"()*&.,^;]\)/TQServerSocket\1/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/QServerSocket\([ :<>"()*&.,^;]\)/TQServerSocket\1/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/QSettings\([ :<>"()*&.,^;]\)/TQSettings\1/g' {} \; @@ -700,8 +698,6 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/QSocket\([ :<>"()*&.,^;]\)/TQSocke find ./ -type f -iname "*.h*" -exec sed -i 's/QSocket\([ :<>"()*&.,^;]\)/TQSocket\1/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/QSocketNotifier\([ :<>"()*&.,^;]\)/TQSocketNotifier\1/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/QSocketNotifier\([ :<>"()*&.,^;]\)/TQSocketNotifier\1/g' {} \; -find ./ -type f -iname "*.c*" -exec sed -i 's/QSortedList\([ :<>"()*&.,^;]\)/TQSortedList\1/g' {} \; -find ./ -type f -iname "*.h*" -exec sed -i 's/QSortedList\([ :<>"()*&.,^;]\)/TQSortedList\1/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/QSound\([ :<>"()*&.,^;]\)/TQSound\1/g' {} \; find ./ -type f -iname "*.h*" -exec sed -i 's/QSound\([ :<>"()*&.,^;]\)/TQSound\1/g' {} \; find ./ -type f -iname "*.c*" -exec sed -i 's/QSpinBox\([ :<>"()*&.,^;]\)/TQSpinBox\1/g' {} \; diff --git a/qtinterface/convert_qt_tqt3 b/qtinterface/convert_qt_tqt3 index 0097603..433816a 100755 --- a/qtinterface/convert_qt_tqt3 +++ b/qtinterface/convert_qt_tqt3 @@ -656,8 +656,6 @@ find ./ -type f -iname "*.diff*" -exec sed -i 's/QScrollView/TQScrollView/g' {} find ./ -type f -iname "*.patch*" -exec sed -i 's/QScrollView/TQScrollView/g' {} \; find ./ -type f -iname "*.diff*" -exec sed -i 's/QSemaphore/TQSemaphore/g' {} \; find ./ -type f -iname "*.patch*" -exec sed -i 's/QSemaphore/TQSemaphore/g' {} \; -find ./ -type f -iname "*.diff*" -exec sed -i 's/QSemiModal/TQSemiModal/g' {} \; -find ./ -type f -iname "*.patch*" -exec sed -i 's/QSemiModal/TQSemiModal/g' {} \; find ./ -type f -iname "*.diff*" -exec sed -i 's/QServerSocket/TQServerSocket/g' {} \; find ./ -type f -iname "*.patch*" -exec sed -i 's/QServerSocket/TQServerSocket/g' {} \; find ./ -type f -iname "*.diff*" -exec sed -i 's/QSettings/TQSettings/g' {} \; @@ -692,8 +690,6 @@ find ./ -type f -iname "*.diff*" -exec sed -i 's/QSocket/TQSocket/g' {} \; find ./ -type f -iname "*.patch*" -exec sed -i 's/QSocket/TQSocket/g' {} \; find ./ -type f -iname "*.diff*" -exec sed -i 's/QSocketNotifier/TQSocketNotifier/g' {} \; find ./ -type f -iname "*.patch*" -exec sed -i 's/QSocketNotifier/TQSocketNotifier/g' {} \; -find ./ -type f -iname "*.diff*" -exec sed -i 's/QSortedList/TQSortedList/g' {} \; -find ./ -type f -iname "*.patch*" -exec sed -i 's/QSortedList/TQSortedList/g' {} \; find ./ -type f -iname "*.diff*" -exec sed -i 's/QSound/TQSound/g' {} \; find ./ -type f -iname "*.patch*" -exec sed -i 's/QSound/TQSound/g' {} \; find ./ -type f -iname "*.diff*" -exec sed -i 's/QSpinBox/TQSpinBox/g' {} \; diff --git a/qtinterface/interface_tqt3/tqsemimodal.cpp b/qtinterface/interface_tqt3/tqsemimodal.cpp deleted file mode 100644 index 8fe67eb..0000000 --- a/qtinterface/interface_tqt3/tqsemimodal.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net> - -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 <tqt.h> -#include <ntqsemimodal.h> diff --git a/qtinterface/interface_tqt3/tqsemimodal.h b/qtinterface/interface_tqt3/tqsemimodal.h deleted file mode 100644 index bc85ef2..0000000 --- a/qtinterface/interface_tqt3/tqsemimodal.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net> - -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_TQSEMIMODAL_H -#define TQT_TQSEMIMODAL_H - -#include <tqt.h> - -#ifdef USE_QT3 - -// Reimplement the QSemiModal class -// For Qt3, no changes are needed - -#include <ntqsemimodal.h> - -#endif // USE_QT3 - -#ifdef USE_QT4 - -// Reimplement the QSemiModal class -// For Qt4, this class was removed! - -#endif // USE_QT4 - -#endif /* TQT_TQSEMIMODAL_H */ diff --git a/qtinterface/interface_tqt3/tqsortedlist.cpp b/qtinterface/interface_tqt3/tqsortedlist.cpp deleted file mode 100644 index 632bf86..0000000 --- a/qtinterface/interface_tqt3/tqsortedlist.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net> - -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 <tqt.h> -#include <ntqsortedlist.h> diff --git a/qtinterface/interface_tqt3/tqsortedlist.h b/qtinterface/interface_tqt3/tqsortedlist.h deleted file mode 100644 index 25c2bd2..0000000 --- a/qtinterface/interface_tqt3/tqsortedlist.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net> - -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_TQSORTEDLIST_H -#define TQT_TQSORTEDLIST_H - -#include <tqt.h> - -#ifdef USE_QT3 - -// Reimplement the QAccel class -// For Qt3, no changes are needed - -#include <ntqsortedlist.h> - -#endif // USE_QT3 - -#ifdef USE_QT4 - -// Reimplement the QAccel class -// For Qt4, some changes are needed - -#include <Qt/q3sortedlist.h> - -#endif // USE_QT4 - -#endif /* TQT_TQSORTEDLIST_H */ |