diff options
Diffstat (limited to 'qtinterface/interface_tqt3')
| -rwxr-xr-x | qtinterface/interface_tqt3/tmoc.cmake | 2 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqmap.h | 16 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqptrlist.h | 2 | ||||
| -rw-r--r-- | qtinterface/interface_tqt3/tqvaluelist.h | 14 |
4 files changed, 17 insertions, 17 deletions
diff --git a/qtinterface/interface_tqt3/tmoc.cmake b/qtinterface/interface_tqt3/tmoc.cmake index 8c7cfcc..8b55ef5 100755 --- a/qtinterface/interface_tqt3/tmoc.cmake +++ b/qtinterface/interface_tqt3/tmoc.cmake @@ -12,7 +12,7 @@ if [ -f @BIN_INSTALL_DIR@/tqt-replace-stream ]; then out_file="$3" @BIN_INSTALL_DIR@/tqt-replace-stream "${input_file}" | \ @MOC_EXECUTABLE@ | \ - sed "/#include <ntqmetaobject.h>/ i #undef QT_NO_COMPAT\n#include \"${input_file}\"" \ + sed "/#include <ntqmetaobject.h>/ i #undef TQT_NO_COMPAT\n#include \"${input_file}\"" \ > "${out_file}" fi else diff --git a/qtinterface/interface_tqt3/tqmap.h b/qtinterface/interface_tqt3/tqmap.h index 05e51ff..eb8a1ae 100644 --- a/qtinterface/interface_tqt3/tqmap.h +++ b/qtinterface/interface_tqt3/tqmap.h @@ -130,11 +130,11 @@ class TQMapIterator * Typedefs */ typedef TQMapNode< K, T >* NodePtr; -#ifndef QT_NO_STL +#ifndef TQT_NO_STL typedef std::bidirectional_iterator_tag iterator_category; #endif typedef T value_type; -#ifndef QT_NO_STL +#ifndef TQT_NO_STL typedef ptrdiff_t difference_type; #else typedef int difference_type; @@ -246,11 +246,11 @@ class TQMapConstIterator * Typedefs */ typedef TQMapNode< K, T >* NodePtr; -#ifndef QT_NO_STL +#ifndef TQT_NO_STL typedef std::bidirectional_iterator_tag iterator_category; #endif typedef T value_type; -#ifndef QT_NO_STL +#ifndef TQT_NO_STL typedef ptrdiff_t difference_type; #else typedef int difference_type; @@ -631,7 +631,7 @@ public: typedef const value_type* const_pointer; typedef value_type& reference; typedef const value_type& const_reference; -#ifndef QT_NO_STL +#ifndef TQT_NO_STL typedef ptrdiff_t difference_type; #else typedef int difference_type; @@ -658,7 +658,7 @@ public: sh = m.sh; sh->ref(); } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL TQMap( const std::map<Key,T>& m ) { sh = new TQMapPrivate<Key,T>; @@ -675,7 +675,7 @@ public: delete sh; } TQMap<Key,T>& operator= ( const TQMap<Key,T>& m ); -#ifndef QT_NO_STL +#ifndef TQT_NO_STL TQMap<Key,T>& operator= ( const std::map<Key,T>& m ) { clear(); @@ -787,7 +787,7 @@ public: #if defined(Q_FULL_TEMPLATE_INSTANTIATION) bool operator==( const TQMap<Key,T>& ) const { return FALSE; } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL bool operator==( const std::map<Key,T>& ) const { return FALSE; } #endif #endif diff --git a/qtinterface/interface_tqt3/tqptrlist.h b/qtinterface/interface_tqt3/tqptrlist.h index ae2b50a..433ed53 100644 --- a/qtinterface/interface_tqt3/tqptrlist.h +++ b/qtinterface/interface_tqt3/tqptrlist.h @@ -245,7 +245,7 @@ public: { Q3GListIterator::operator=(it); return *this; } }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQT_TQList TQPtrList #define TQT_TQListIterator TQPtrListIterator #endif diff --git a/qtinterface/interface_tqt3/tqvaluelist.h b/qtinterface/interface_tqt3/tqvaluelist.h index 23175b0..73474c6 100644 --- a/qtinterface/interface_tqt3/tqvaluelist.h +++ b/qtinterface/interface_tqt3/tqvaluelist.h @@ -110,12 +110,12 @@ class TQValueListIterator * Typedefs */ typedef TQValueListNode<T>* NodePtr; -#ifndef QT_NO_STL +#ifndef TQT_NO_STL typedef std::bidirectional_iterator_tag iterator_category; #endif typedef T value_type; typedef size_t size_type; -#ifndef QT_NO_STL +#ifndef TQT_NO_STL typedef ptrdiff_t difference_type; #else typedef int difference_type; @@ -186,12 +186,12 @@ class TQValueListConstIterator * Typedefs */ typedef TQValueListNode<T>* NodePtr; -#ifndef QT_NO_STL +#ifndef TQT_NO_STL typedef std::bidirectional_iterator_tag iterator_category; #endif typedef T value_type; typedef size_t size_type; -#ifndef QT_NO_STL +#ifndef TQT_NO_STL typedef ptrdiff_t difference_type; #else typedef int difference_type; @@ -451,7 +451,7 @@ public: typedef value_type& reference; typedef const value_type& const_reference; typedef size_t size_type; -#ifndef QT_NO_STL +#ifndef TQT_NO_STL typedef ptrdiff_t difference_type; #else typedef int difference_type; @@ -462,7 +462,7 @@ public: */ TQValueList() { sh = new TQValueListPrivate<T>; } TQValueList( const TQValueList<T>& l ) { sh = l.sh; sh->ref(); } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL TQValueList( const std::list<T>& l ) { sh = new TQValueListPrivate<T>; @@ -478,7 +478,7 @@ public: sh = l.sh; return *this; } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL TQValueList<T>& operator= ( const std::list<T>& l ) { detach(); |