From a794ba9d8418882f88a1aff1968987d7994f3a7a Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 2 Jan 2011 00:09:25 +0000 Subject: Revert changes since revision 1210400 TQt for Qt4 compatibility project is temporarily on hold It appears a separate version of Qt3 (i.e. patches for the unmaintained Qt3 source) may be required to make the interface work properly. This is because tqchildren is needed in Qt3. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface@1210736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- qtinterface/tqobjectlist.h | 52 ++-------------------------------------------- 1 file changed, 2 insertions(+), 50 deletions(-) (limited to 'qtinterface/tqobjectlist.h') diff --git a/qtinterface/tqobjectlist.h b/qtinterface/tqobjectlist.h index 0c519b4..1286100 100644 --- a/qtinterface/tqobjectlist.h +++ b/qtinterface/tqobjectlist.h @@ -29,55 +29,7 @@ Boston, MA 02110-1301, USA. // Reimplement the QObjectList class // For Qt3, no changes are needed -//#include - -//#ifndef TQT_H -#include "tqobject.h" -#include "tqptrlist.h" -//#endif // TQT_H - - -#if defined(TQ_TEMPLATEDLL) -//TQ_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList; -//TQ_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator; -#endif - - -class Q_EXPORT TQObjectList : public TQPtrList -{ -public: - TQObjectList() : TQPtrList() {} - TQObjectList( const TQObjectList &list ) : TQPtrList(list) {} - ~TQObjectList() { clear(); } - TQObjectList &operator=(const TQObjectList &list) - { return (TQObjectList&)TQPtrList::operator=(list); } -}; - -class Q_EXPORT TQObjectListIterator : public TQPtrListIterator -{ -public: - TQObjectListIterator( const TQObjectList &l ) - : TQPtrListIterator( l ) { } - TQObjectListIterator &operator=( const TQObjectListIterator &i ) - { return (TQObjectListIterator&) - TQPtrListIterator::operator=( i ); } -}; - -#if (TQT_VERSION-0 >= 0x040000) -#if defined(TQ_CC_GNU) -#warning "remove the TQObjectListIt class" -#warning "remove the typedef too, maybe" -#endif -typedef TQObjectListIterator TQObjectListIt; -#else -class Q_EXPORT TQObjectListIt : public TQPtrListIterator -{ -public: - TQObjectListIt( const TQObjectList &l ) : TQPtrListIterator(l) {} - TQObjectListIt &operator=(const TQObjectListIt &i) - { return (TQObjectListIt&)TQPtrListIterator::operator=(i); } -}; -#endif +#include #endif // USE_QT3 @@ -90,4 +42,4 @@ public: #endif // USE_QT4 -#endif /* TQOBJECTLIST_H */ +#endif /* TQOBJECTLIST_H */ \ No newline at end of file -- cgit v1.2.3