Browse Source

Removed obsolete Qt2's TQStack, TQVector, TQList, TQListIterator classes.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 2 years ago
parent
commit
61ee606981
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
  1. 6
      qtinterface/CMakeLists.txt
  2. 2
      qtinterface/convert_qt_tqt1
  3. 31
      qtinterface/interface_tqt3/tqlist.h
  4. 48
      qtinterface/interface_tqt3/tqlistiterator.cpp
  5. 86
      qtinterface/interface_tqt3/tqlistiterator.h
  6. 5
      qtinterface/interface_tqt3/tqptrlist.h
  7. 43
      qtinterface/interface_tqt3/tqstack.h
  8. 31
      qtinterface/interface_tqt3/tqvector.h
  9. 2
      qtinterface/iqtimer.cpp

6
qtinterface/CMakeLists.txt

@ -61,11 +61,11 @@ install( FILES
${IFACE}/tqconfig.h ${IFACE}/tqconnect.h ${IFACE}/tqdatetm.h ${IFACE}/tqdrawutl.h ${IFACE}/tqdstream.h ${IFACE}/tqfeatures.h
${IFACE}/tqfiledef.h ${IFACE}/tqfiledlg.h ${IFACE}/tqfileinf.h ${IFACE}/tqfontinf.h ${IFACE}/tqfontmet.h ${IFACE}/tqgbkcodec.h
${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}/tqkeycode.h ${IFACE}/tqlined.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}/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}/tqscrbar.h ${IFACE}/tqsession.h ${IFACE}/tqsocknot.h ${IFACE}/tqtabdlg.h ${IFACE}/tqtstream.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
@ -95,7 +95,6 @@ install( FILES
${IFACE}/private/tqlayoutengine_p.h ${IFACE}/private/tqinternal_p.h ${IFACE}/private/tqeffects_p.h
${IFACE}/private/tqrichtext_p.h ${IFACE}/private/tqpluginmanager_p.h ${IFACE}/private/tqcom_p.h
${IFACE}/private/tqucom_p.h ${IFACE}/private/tqwidgetinterface_p.h ${IFACE}/private/tqtextengine_p.h
${IFACE}/tqlistiterator.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
##### tqt tools #################################
@ -195,7 +194,6 @@ tde_add_library( tqt SHARED
${IFACE}/tqvaluelist.cpp ${IFACE}/tqvaluestack.cpp ${IFACE}/tqvaluevector.cpp ${IFACE}/tqvariant.cpp ${IFACE}/tqvfbhdr.cpp
${IFACE}/tqwaitcondition.cpp ${IFACE}/tqwhatsthis.cpp ${IFACE}/tqwidgetfactory.cpp ${IFACE}/tqwidgetintdict.cpp
${IFACE}/tqwidgetlist.cpp ${IFACE}/tqwmatrix.cpp ${IFACE}/tqxml.cpp ${IFACE}/private/tqucomextra_p.cpp
${IFACE}/tqlistiterator.cpp
VERSION 4.2.0
LINK ${TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}

2
qtinterface/convert_qt_tqt1

@ -516,8 +516,6 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsqlresult\.h/\1tqsqlresul
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsqlresult\.h/\1tqsqlresult\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qsqlselectcursor\.h/\1tqsqlselectcursor\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qsqlselectcursor\.h/\1tqsqlselectcursor\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qstack\.h/\1tqstack\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qstack\.h/\1tqstack\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qstatusbar\.h/\1tqstatusbar\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qstatusbar\.h/\1tqstatusbar\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qstring\.h/\1tqstring\.h/g' {} \;

31
qtinterface/interface_tqt3/tqlist.h

@ -1,31 +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_TQLIST_H
#define TQT_TQLIST_H
#include <tqt.h>
// Pull in tqptrlist defines
#include <ntqptrlist.h>
#endif /* TQT_TQLIST_H */

48
qtinterface/interface_tqt3/tqlistiterator.cpp

@ -1,48 +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 <tqlistiterator.h>
#ifdef USE_QT4
// template <typename T>
// TQPtrListIterator<T>::TQPtrListIterator(const QList<T> &t) {
// index = 0;
// list = t;
// }
//
// template <typename T>
// TQPtrListIterator<T>::~TQPtrListIterator() {
// //
// }
// template <typename T>
// T TQPtrListIterator<T>::current() {
// if ((index >= 0) && (index < list->size())) {
// return list->at(index);
// }
// else {
// return 0;
// }
// }
#endif // USE_QT4

86
qtinterface/interface_tqt3/tqlistiterator.h

@ -1,86 +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_TQLISTITERATOR_H
#define TQT_TQLISTITERATOR_H
#include <tqt.h>
#ifdef USE_QT4
// Implement the TQPtrListIterator class
// For Qt4, this is a combination of the QList::iterator and QMutableListIterator classes,
// with the constructor from QMutableListIterator used primarily
//#include <QMutableListIterator>
#include <Qt/ntqlist.h>
template <typename T>
//class TQPtrListIterator : public QList<T>::iterator
//class TQPtrListIterator : public QMutableListIterator
class TQPtrListIterator
{
public:
inline TQPtrListIterator(const QList<T> &t) {index = 0; list = &t;}
inline ~TQPtrListIterator() {}
inline T current() {
if ((index >= 0) && (index < list->size())) {
return list->at(index);
}
else {
return 0;
}
}
int operator++() { index++; return index; }
private:
int index;
const QList<T> *list;
};
template <typename T>
class TQListIteratorRetPtr
{
public:
inline TQListIteratorRetPtr(const QList<T> &t) {index = 0; list = &t;}
inline ~TQListIteratorRetPtr() {}
inline T * current() {
if ((index >= 0) && (index < list->size())) {
return const_cast<QFileInfo *>(&(list->at(index)));
}
else {
return 0;
}
}
int operator++() { index++; return index; }
private:
int index;
const QList<T> *list;
};
#endif // USE_QT4
#endif /* TQT_TQLISTITERATOR_H */

5
qtinterface/interface_tqt3/tqptrlist.h

@ -245,11 +245,6 @@ public:
{ Q3GListIterator::operator=(it); return *this; }
};
#ifndef TQT_NO_COMPAT
#define TQT_TQList TQPtrList
#define TQT_TQListIterator TQPtrListIterator
#endif
/**********************************************************************/
#endif // USE_QT4

43
qtinterface/interface_tqt3/tqstack.h

@ -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_TQSTACK_H
#define TQT_TQSTACK_H
#include <tqt.h>
#ifdef USE_QT3
// Pull in Qt3 qptrstack defines
#include <ntqptrstack.h>
#endif // USE_QT3
#ifdef USE_QT4
// Pull in Qt4 qptrstack defines
#include <ntqptrstack.h>
#endif // USE_QT4
#endif /* TQT_TQSTACK_H */

31
qtinterface/interface_tqt3/tqvector.h

@ -1,31 +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_TQVECTOR_H
#define TQT_TQVECTOR_H
#include <tqt.h>
// Pull in tqptrvector defines
#include <ntqptrvector.h>
#endif /* TQT_TQVECTOR_H */

2
qtinterface/iqtimer.cpp

@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
#include <qtimer.h>
#include <tqtimer.h>
#ifdef USE_QT3

Loading…
Cancel
Save