diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/html/canvas-chart-example.html | 2 | ||||
| -rw-r--r-- | doc/html/chart-element-h.html | 2 | ||||
| -rw-r--r-- | doc/html/emb-install.html | 2 | ||||
| -rw-r--r-- | doc/html/i18n-example.html | 6 | ||||
| -rw-r--r-- | doc/html/i18n.html | 16 | ||||
| -rw-r--r-- | doc/html/linguist-manual-4.html | 16 | ||||
| -rw-r--r-- | doc/html/qaccessible-h.html | 2 | ||||
| -rw-r--r-- | doc/html/qaxfactory-h.html | 2 | ||||
| -rw-r--r-- | doc/html/qdns-h.html | 4 | ||||
| -rw-r--r-- | doc/html/qglobal-h.html | 38 | ||||
| -rw-r--r-- | doc/html/qiconset-h.html | 2 | ||||
| -rw-r--r-- | doc/html/qmap-h.html | 64 | ||||
| -rw-r--r-- | doc/html/qobject-h.html | 4 | ||||
| -rw-r--r-- | doc/html/qpair-h.html | 6 | ||||
| -rw-r--r-- | doc/html/qpixmap-h.html | 2 | ||||
| -rw-r--r-- | doc/html/qtl-qvaluelist-example.html | 2 | ||||
| -rw-r--r-- | doc/html/qvaluelist-h.html | 40 | ||||
| -rw-r--r-- | doc/html/qvaluevector-h.html | 24 | ||||
| -rw-r--r-- | doc/html/qwidgetfactory-h.html | 4 | ||||
| -rw-r--r-- | doc/i18n.doc | 16 | ||||
| -rw-r--r-- | doc/qws.doc | 2 |
21 files changed, 128 insertions, 128 deletions
diff --git a/doc/html/canvas-chart-example.html b/doc/html/canvas-chart-example.html index a61b0503c..4ec518288 100644 --- a/doc/html/canvas-chart-example.html +++ b/doc/html/canvas-chart-example.html @@ -125,7 +125,7 @@ public: #ifdef TQ_FULL_TEMPLATE_INSTANTIATION // xlC 3.x workaround - Q_DUMMY_COMPARISON_OPERATOR(Element) + TQ_DUMMY_COMPARISON_OPERATOR(Element) bool operator!=( const Element& e) const { return ( !(e == *this) ); } diff --git a/doc/html/chart-element-h.html b/doc/html/chart-element-h.html index db2295b01..cc8895432 100644 --- a/doc/html/chart-element-h.html +++ b/doc/html/chart-element-h.html @@ -93,7 +93,7 @@ public: #ifdef TQ_FULL_TEMPLATE_INSTANTIATION // xlC 3.x workaround - Q_DUMMY_COMPARISON_OPERATOR(Element) + TQ_DUMMY_COMPARISON_OPERATOR(Element) bool operator!=( const Element& e) const { return ( !(e == *this) ); } diff --git a/doc/html/emb-install.html b/doc/html/emb-install.html index 9d2d43349..fb17287aa 100644 --- a/doc/html/emb-install.html +++ b/doc/html/emb-install.html @@ -71,7 +71,7 @@ a little-endian machine (e.g. x86) for a big-endian processor (e.g. PowerPC) will use the host's endianness instead of the target's. Workaround: after running configure, and before running make, edit <tt>$TQTDIR/include/ntqconfig.h</tt> and change the definition of -<tt>Q_BYTE_ORDER</tt>. +<tt>TQ_BYTE_ORDER</tt>. <p> <li> Enable framebuffer support. <p> You may need to recompile your kernel to enable the framebuffer. This document does not describe how to do this; the diff --git a/doc/html/i18n-example.html b/doc/html/i18n-example.html index 88a09baa5..3ed7e40f5 100644 --- a/doc/html/i18n-example.html +++ b/doc/html/i18n-example.html @@ -133,9 +133,9 @@ private: } static const char* choices[] = { - QT_TRANSLATE_NOOP( "MyWidget", "First" ), - QT_TRANSLATE_NOOP( "MyWidget", "Second" ), - QT_TRANSLATE_NOOP( "MyWidget", "Third" ), + TQT_TRANSLATE_NOOP( "MyWidget", "First" ), + TQT_TRANSLATE_NOOP( "MyWidget", "Second" ), + TQT_TRANSLATE_NOOP( "MyWidget", "Third" ), 0 }; diff --git a/doc/html/i18n.html b/doc/html/i18n.html index 9f74d1154..9cd85c5bb 100644 --- a/doc/html/i18n.html +++ b/doc/html/i18n.html @@ -210,27 +210,27 @@ directly: </pre> <p> If you need to have translatable text completely -outside a function, there are two macros to help: QT_TR_NOOP() -and QT_TRANSLATE_NOOP(). They merely mark the text for +outside a function, there are two macros to help: TQT_TR_NOOP() +and TQT_TRANSLATE_NOOP(). They merely mark the text for extraction by the <em>lupdate</em> utility described below. The macros expand to just the text (without the context). -<p> Example of QT_TR_NOOP(): +<p> Example of TQT_TR_NOOP(): <pre> TQString FriendlyConversation::greeting( int greet_type ) { static const char* greeting_strings[] = { - QT_TR_NOOP( "Hello" ), - QT_TR_NOOP( "Goodbye" ) + TQT_TR_NOOP( "Hello" ), + TQT_TR_NOOP( "Goodbye" ) }; return tr( greeting_strings[greet_type] ); } </pre> -<p> Example of QT_TRANSLATE_NOOP(): +<p> Example of TQT_TRANSLATE_NOOP(): <pre> static const char* greeting_strings[] = { - QT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ), - QT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" ) + TQT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ), + TQT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" ) }; TQString FriendlyConversation::greeting( int greet_type ) diff --git a/doc/html/linguist-manual-4.html b/doc/html/linguist-manual-4.html index a8b312e68..897b784ca 100644 --- a/doc/html/linguist-manual-4.html +++ b/doc/html/linguist-manual-4.html @@ -140,24 +140,24 @@ body { background: #ffffff; color: black; } logwid ); } </pre> -<h5><a name="1-7-2"></a>Using QT_TR_NOOP() and QT_TRANSLATE_NOOP()</h5> -<p>If you need to have translatable text completely outside a function, there are two macros to help: QT_TR_NOOP() and QT_TRANSLATE_NOOP(). These macros merely mark the text for extraction by <a href="linguist-manual-2.html#2">lupdate</a>. The macros expand to just the text (without the context).</p> -<p>Example of QT_TR_NOOP():</p> +<h5><a name="1-7-2"></a>Using TQT_TR_NOOP() and TQT_TRANSLATE_NOOP()</h5> +<p>If you need to have translatable text completely outside a function, there are two macros to help: TQT_TR_NOOP() and TQT_TRANSLATE_NOOP(). These macros merely mark the text for extraction by <a href="linguist-manual-2.html#2">lupdate</a>. The macros expand to just the text (without the context).</p> +<p>Example of TQT_TR_NOOP():</p> <pre> TQString FriendlyConversation::greeting( int greet_type ) { static const char* greeting_strings[] = { - QT_TR_NOOP( "Hello" ), - QT_TR_NOOP( "Goodbye" ) + TQT_TR_NOOP( "Hello" ), + TQT_TR_NOOP( "Goodbye" ) }; return tr( greeting_strings[greet_type] ); } </pre> -<p>Example of QT_TRANSLATE_NOOP():</p> +<p>Example of TQT_TRANSLATE_NOOP():</p> <pre> static const char* greeting_strings[] = { - QT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ), - QT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" ) + TQT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ), + TQT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" ) }; TQString FriendlyConversation::greeting( int greet_type ) diff --git a/doc/html/qaccessible-h.html b/doc/html/qaccessible-h.html index eb72d2fe6..0a382c040 100644 --- a/doc/html/qaccessible-h.html +++ b/doc/html/qaccessible-h.html @@ -313,7 +313,7 @@ public: virtual ~TQAccessibleObject(); TQRESULT queryInterface( const TQUuid &, TQUnknownInterface** ); - Q_REFCOUNT + TQ_REFCOUNT bool isValid() const; diff --git a/doc/html/qaxfactory-h.html b/doc/html/qaxfactory-h.html index 47682381e..3dda2b493 100644 --- a/doc/html/qaxfactory-h.html +++ b/doc/html/qaxfactory-h.html @@ -113,7 +113,7 @@ class TQAxFactory : public TQAxFactoryInterface public: TQAxFactory( const TQUuid &, const TQUuid &); virtual ~TQAxFactory(); - Q_REFCOUNT; + TQ_REFCOUNT; TQRESULT queryInterface( const TQUuid &iid, TQUnknownInterface **iface ); diff --git a/doc/html/qdns-h.html b/doc/html/qdns-h.html index bbde601d4..93eef9cb1 100644 --- a/doc/html/qdns-h.html +++ b/doc/html/qdns-h.html @@ -133,7 +133,7 @@ public: :name(n), priority(p) {} TQString name; TQ_UINT16 priority; - Q_DUMMY_COMPARISON_OPERATOR(MailServer) + TQ_DUMMY_COMPARISON_OPERATOR(MailServer) }; TQValueList<MailServer> mailServers() const; @@ -145,7 +145,7 @@ public: TQ_UINT16 priority; TQ_UINT16 weight; TQ_UINT16 port; - Q_DUMMY_COMPARISON_OPERATOR(Server) + TQ_DUMMY_COMPARISON_OPERATOR(Server) }; TQValueList<Server> servers() const; diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index d3caac654..7716167c3 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -282,12 +282,12 @@ body { background: #ffffff; color: black; } # define Q_CC_MSVC /* proper support of bool for _MSC_VER >= 1100 */ # define Q_CANNOT_DELETE_CONSTANT -# define Q_INLINE_TEMPLATES inline +# define TQ_INLINE_TEMPLATES inline /* Visual C++.Net issues for _MSC_VER >= 1300 */ # if _MSC_VER >= 1300 # define Q_CC_MSVC_NET # if _MSC_VER < 1310 || (defined(Q_OS_WIN64) && defined(_M_IA64)) -# define Q_TYPENAME +# define TQ_TYPENAME # endif # endif /* Intel C++ disguising as Visual C++: the `using' keyword avoids warnings */ @@ -312,7 +312,7 @@ body { background: #ffffff; color: black; } # define Q_CC_WAT # if defined(Q_OS_QNX4) /* compiler flags */ -# define Q_TYPENAME +# define TQ_TYPENAME # define Q_NO_BOOL_TYPE # define Q_CANNOT_DELETE_CONSTANT # define mutable @@ -391,8 +391,8 @@ body { background: #ffffff; color: black; } # define Q_NO_BOOL_TYPE # define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD -# define Q_TYPENAME -# define Q_INLINE_TEMPLATES inline +# define TQ_TYPENAME +# define TQ_INLINE_TEMPLATES inline # define Q_BROKEN_TEMPLATE_SPECIALIZATION # define Q_CANNOT_DELETE_CONSTANT # endif @@ -420,12 +420,12 @@ body { background: #ffffff; color: black; } /* Apply to all versions prior to Compaq C++ V6.0-000 - observed on DEC C++ V5.5-004. */ # if __DECCXX_VER < 60060000 -# define Q_TYPENAME +# define TQ_TYPENAME # define Q_BROKEN_TEMPLATE_SPECIALIZATION # define Q_CANNOT_DELETE_CONSTANT # endif /* avoid undefined symbol problems with out-of-line template members */ -# define Q_INLINE_TEMPLATES inline +# define TQ_INLINE_TEMPLATES inline /* Compilers with EDG front end are similar. To detect them we test: __EDG documented by SGI, observed on MIPSpro 7.3.1.1 and KAI C++ 4.0b @@ -482,7 +482,7 @@ body { background: #ffffff; color: black; } # define Q_CC_USLC /* The latest UDK 7.1.1b does not need this, but previous versions do */ # if !defined(__SCO_VERSION__) || (__SCO_VERSION__ < 302200010) -# define Q_INLINE_TEMPLATES inline +# define TQ_INLINE_TEMPLATES inline # endif # define Q_NO_USING_KEYWORD /* ### check "using" status */ @@ -505,12 +505,12 @@ body { background: #ffffff; color: black; } # elif defined(__sgi) # define Q_CC_MIPS # if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32) /* o32 ABI */ -# define Q_TYPENAME +# define TQ_TYPENAME # define Q_BROKEN_TEMPLATE_SPECIALIZATION # define Q_NO_EXPLICIT_KEYWORD -# define Q_INLINE_TEMPLATES inline +# define TQ_INLINE_TEMPLATES inline # elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */ -# define Q_TYPENAME +# define TQ_TYPENAME # define Q_BROKEN_TEMPLATE_SPECIALIZATION # endif # define Q_NO_USING_KEYWORD /* ### check "using" status */ @@ -522,11 +522,11 @@ body { background: #ffffff; color: black; } /* The older UnixWare 2.X compiler? */ #elif defined(__USLC__) # define Q_CC_USLC -# define Q_TYPENAME +# define TQ_TYPENAME # define Q_NO_BOOL_TYPE # define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD -# define Q_INLINE_TEMPLATES inline +# define TQ_INLINE_TEMPLATES inline /* Never tested! */ #elif defined(__HIGHC__) @@ -954,12 +954,12 @@ Q_EXPORT int qWinVersion(); #define QT_WA_INLINE( uni, ansi ) ( uni ) #endif -#ifndef Q_INLINE_TEMPLATES -# define Q_INLINE_TEMPLATES +#ifndef TQ_INLINE_TEMPLATES +# define TQ_INLINE_TEMPLATES #endif -#ifndef Q_TYPENAME -# define Q_TYPENAME typename +#ifndef TQ_TYPENAME +# define TQ_TYPENAME typename #endif // @@ -1082,13 +1082,13 @@ Q_EXPORT const char *tqInstallPathSysconf(); mandating a real implementation. */ #ifdef TQ_FULL_TEMPLATE_INSTANTIATION -# define Q_DUMMY_COMPARISON_OPERATOR(C) \ +# define TQ_DUMMY_COMPARISON_OPERATOR(C) \ bool operator==( const C& ) const { \ tqWarning( #C"::operator==( const "#C"& ) got called." ); \ return FALSE; \ } #else -# define Q_DUMMY_COMPARISON_OPERATOR(C) +# define TQ_DUMMY_COMPARISON_OPERATOR(C) #endif #endif /* TQGLOBAL_H */ diff --git a/doc/html/qiconset-h.html b/doc/html/qiconset-h.html index 86d97955c..1b736da5e 100644 --- a/doc/html/qiconset-h.html +++ b/doc/html/qiconset-h.html @@ -126,7 +126,7 @@ public: static const TQSize& iconSize( Size which ); #ifndef Q_QDOC - Q_DUMMY_COMPARISON_OPERATOR(TQIconSet) + TQ_DUMMY_COMPARISON_OPERATOR(TQIconSet) #endif private: diff --git a/doc/html/qmap-h.html b/doc/html/qmap-h.html index 42ccd626b..805efb03f 100644 --- a/doc/html/qmap-h.html +++ b/doc/html/qmap-h.html @@ -202,7 +202,7 @@ public: }; template <class K, class T> -Q_INLINE_TEMPLATES int TQMapIterator<K,T>::inc() +TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::inc() { TQMapNodeBase* tmp = node; if ( tmp->right ) { @@ -223,7 +223,7 @@ Q_INLINE_TEMPLATES int TQMapIterator<K,T>::inc() } template <class K, class T> -Q_INLINE_TEMPLATES int TQMapIterator<K,T>::dec() +TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::dec() { TQMapNodeBase* tmp = node; if (tmp->color == TQMapNodeBase::Red && @@ -318,7 +318,7 @@ public: }; template <class K, class T> -Q_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc() +TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc() { TQMapNodeBase* tmp = node; if ( tmp->right ) { @@ -339,7 +339,7 @@ Q_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc() } template <class K, class T> -Q_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec() +TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec() { TQMapNodeBase* tmp = node; if (tmp->color == TQMapNodeBase::Red && @@ -467,14 +467,14 @@ protected: template <class Key, class T> -Q_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate() { +TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate() { header = new Node; header->color = TQMapNodeBase::Red; // Mark the header header->parent = 0; header->left = header->right = header; } template <class Key, class T> -Q_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate< Key, T >* _map ) : TQMapPrivateBase( _map ) { +TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate< Key, T >* _map ) : TQMapPrivateBase( _map ) { header = new Node; header->color = TQMapNodeBase::Red; // Mark the header if ( _map->header->parent == 0 ) { @@ -489,7 +489,7 @@ Q_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate&l } template <class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T>::copy( Q_TYPENAME TQMapPrivate<Key,T>::NodePtr p ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T>::copy( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p ) { if ( !p ) return 0; @@ -511,7 +511,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate< } template <class Key, class T> -Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear() +TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear() { clear( (NodePtr)(header->parent) ); header->color = TQMapNodeBase::Red; @@ -521,7 +521,7 @@ Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear() } template <class Key, class T> -Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( Q_TYPENAME TQMapPrivate<Key,T>::NodePtr p ) +TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p ) { while ( p != 0 ) { clear( (NodePtr)p->right ); @@ -532,7 +532,7 @@ Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( Q_TYPENAME TQMapPrivat } template <class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Key,T>::find(const Key& k) const +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Key,T>::find(const Key& k) const { TQMapNodeBase* y = header; // Last node TQMapNodeBase* x = header->parent; // Root node. @@ -555,7 +555,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPriv } template <class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insertSingle( const Key& k ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insertSingle( const Key& k ) { // Search correct position in the tree TQMapNodeBase* y = header; @@ -586,7 +586,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate&l template <class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeBase* x, TQMapNodeBase* y, const Key& k ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeBase* x, TQMapNodeBase* y, const Key& k ) { NodePtr z = new Node( k ); if (y == header || x != 0 || k < key(y) ) { @@ -612,15 +612,15 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate&l #ifdef QT_CHECK_RANGE # if !defined( TQT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE ) -# define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" ) -# define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() ); +# define TQT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" ) +# define TQT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() ); # else -# define QT_CHECK_INVALID_MAP_ELEMENT -# define QT_CHECK_INVALID_MAP_ELEMENT_FATAL +# define TQT_CHECK_INVALID_MAP_ELEMENT +# define TQT_CHECK_INVALID_MAP_ELEMENT_FATAL # endif #else -# define QT_CHECK_INVALID_MAP_ELEMENT -# define QT_CHECK_INVALID_MAP_ELEMENT_FATAL +# define TQT_CHECK_INVALID_MAP_ELEMENT +# define TQT_CHECK_INVALID_MAP_ELEMENT_FATAL #endif template <class T> class TQDeepCopy; @@ -670,7 +670,7 @@ public: TQMap( const std::map<Key,T>& m ) { sh = new TQMapPrivate<Key,T>; - Q_TYPENAME std::map<Key,T>::const_iterator it = m.begin(); + TQ_TYPENAME std::map<Key,T>::const_iterator it = m.begin(); for ( ; it != m.end(); ++it ) { value_type p( (*it).first, (*it).second ); insert( p ); @@ -687,7 +687,7 @@ public: TQMap<Key,T>& operator= ( const std::map<Key,T>& m ) { clear(); - Q_TYPENAME std::map<Key,T>::const_iterator it = m.begin(); + TQ_TYPENAME std::map<Key,T>::const_iterator it = m.begin(); for ( ; it != m.end(); ++it ) { value_type p( (*it).first, (*it).second ); insert( p ); @@ -737,7 +737,7 @@ public: const_iterator find ( const Key& k ) const { return sh->find( k ); } const T& operator[] ( const Key& k ) const - { QT_CHECK_INVALID_MAP_ELEMENT; return sh->find( k ).data(); } + { TQT_CHECK_INVALID_MAP_ELEMENT; return sh->find( k ).data(); } bool contains ( const Key& k ) const { return find( k ) != end(); } //{ return sh->find( k ) != ((const Priv*)sh)->end(); } @@ -785,7 +785,7 @@ private: }; template<class Key, class T> -Q_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>& m ) +TQ_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>& m ) { m.sh->ref(); if ( sh->deref() ) @@ -795,7 +795,7 @@ Q_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const } template<class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T>::insert( const Q_TYPENAME TQMap<Key,T>::value_type& x ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T>::insert( const TQ_TYPENAME TQMap<Key,T>::value_type& x ) { detach(); size_type n = size(); @@ -809,7 +809,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T> } template<class Key, class T> -Q_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k ) +TQ_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k ) { detach(); iterator it( sh->find( k ).node ); @@ -818,7 +818,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k ) } template<class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::count( const Key& k ) const +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::count( const Key& k ) const { const_iterator it( sh->find( k ).node ); if ( it != end() ) { @@ -833,7 +833,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>:: } template<class Key, class T> -Q_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k ) +TQ_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k ) { detach(); TQMapNode<Key,T>* p = sh->find( k ).node; @@ -843,7 +843,7 @@ Q_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k ) } template<class Key, class T> -Q_INLINE_TEMPLATES void TQMap<Key,T>::clear() +TQ_INLINE_TEMPLATES void TQMap<Key,T>::clear() { if ( sh->count == 1 ) sh->clear(); @@ -854,7 +854,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::clear() } template<class Key, class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::insert( const Key& key, const T& value, bool overwrite ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::insert( const Key& key, const T& value, bool overwrite ) { detach(); size_type n = size(); @@ -865,7 +865,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::i } template<class Key, class T> -Q_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k ) +TQ_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k ) { detach(); iterator it( sh->find( k ).node ); @@ -874,7 +874,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k ) } template<class Key, class T> -Q_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal() +TQ_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal() { sh->deref(); sh = new TQMapPrivate<Key,T>( sh ); } @@ -882,7 +882,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal() #ifndef TQT_NO_DATASTREAM template<class Key, class T> -Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) { +TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) { m.clear(); TQ_UINT32 c; s >> c; @@ -898,7 +898,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMa template<class Key, class T> -Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap<Key,T>& m ) { +TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap<Key,T>& m ) { s << (TQ_UINT32)m.size(); TQMapConstIterator<Key,T> it = m.begin(); for( ; it != m.end(); ++it ) diff --git a/doc/html/qobject-h.html b/doc/html/qobject-h.html index e1e15e885..e53fb992d 100644 --- a/doc/html/qobject-h.html +++ b/doc/html/qobject-h.html @@ -85,8 +85,8 @@ body { background: #ffffff; color: black; } #include "ntqnamespace.h" #endif // QT_H -#define QT_TR_NOOP(x) (x) -#define QT_TRANSLATE_NOOP(scope,x) (x) +#define TQT_TR_NOOP(x) (x) +#define TQT_TRANSLATE_NOOP(scope,x) (x) class TQMetaObject; class TQVariant; diff --git a/doc/html/qpair-h.html b/doc/html/qpair-h.html index 7ae8495d4..fdaf6fff1 100644 --- a/doc/html/qpair-h.html +++ b/doc/html/qpair-h.html @@ -107,20 +107,20 @@ struct TQPair }; template <class T1, class T2> -Q_INLINE_TEMPLATES bool operator==( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y ) +TQ_INLINE_TEMPLATES bool operator==( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y ) { return x.first == y.first && x.second == y.second; } template <class T1, class T2> -Q_INLINE_TEMPLATES bool operator<( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y ) +TQ_INLINE_TEMPLATES bool operator<( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y ) { return x.first < y.first || ( !( y.first < x.first ) && x.second < y.second ); } template <class T1, class T2> -Q_INLINE_TEMPLATES TQPair<T1, T2> qMakePair( const T1& x, const T2& y ) +TQ_INLINE_TEMPLATES TQPair<T1, T2> qMakePair( const T1& x, const T2& y ) { return TQPair<T1, T2>( x, y ); } diff --git a/doc/html/qpixmap-h.html b/doc/html/qpixmap-h.html index 385bd696f..8a6a6618b 100644 --- a/doc/html/qpixmap-h.html +++ b/doc/html/qpixmap-h.html @@ -212,7 +212,7 @@ public: #endif #ifndef Q_QDOC - Q_DUMMY_COMPARISON_OPERATOR(TQPixmap) + TQ_DUMMY_COMPARISON_OPERATOR(TQPixmap) #endif protected: diff --git a/doc/html/qtl-qvaluelist-example.html b/doc/html/qtl-qvaluelist-example.html index bb0f2dd34..d69ab3d10 100644 --- a/doc/html/qtl-qvaluelist-example.html +++ b/doc/html/qtl-qvaluelist-example.html @@ -65,7 +65,7 @@ public: void setSalary( int salary ) { s = salary; } // this is here to support very old compilers - Q_DUMMY_COMPARISON_OPERATOR( Employee ) + TQ_DUMMY_COMPARISON_OPERATOR( Employee ) private: <a href="ntqstring.html">TQString</a> n; diff --git a/doc/html/qvaluelist-h.html b/doc/html/qvaluelist-h.html index 91debfeb9..9fb12791f 100644 --- a/doc/html/qvaluelist-h.html +++ b/doc/html/qvaluelist-h.html @@ -294,13 +294,13 @@ public: }; template <class T> -Q_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate() +TQ_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate() { node = new Node; node->next = node->prev = node; nodes = 0; } template <class T> -Q_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate( const TQValueListPrivate<T>& _p ) +TQ_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate( const TQValueListPrivate<T>& _p ) : TQShared() { node = new Node; node->next = node->prev = node; nodes = 0; @@ -312,7 +312,7 @@ Q_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate( const TQValu } template <class T> -Q_INLINE_TEMPLATES TQValueListPrivate<T>::~TQValueListPrivate() { +TQ_INLINE_TEMPLATES TQValueListPrivate<T>::~TQValueListPrivate() { NodePtr p = node->next; while( p != node ) { NodePtr x = p->next; @@ -323,7 +323,7 @@ Q_INLINE_TEMPLATES TQValueListPrivate<T>::~TQValueListPrivate() { } template <class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::insert( Q_TYPENAME TQValueListPrivate<T>::Iterator it, const T& x ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::insert( TQ_TYPENAME TQValueListPrivate<T>::Iterator it, const T& x ) { NodePtr p = new Node( x ); p->next = it.node; @@ -335,7 +335,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::Iterator TQValueListP } template <class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::remove( Q_TYPENAME TQValueListPrivate<T>::Iterator it ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::remove( TQ_TYPENAME TQValueListPrivate<T>::Iterator it ) { Q_ASSERT ( it.node != node ); NodePtr next = it.node->next; @@ -348,7 +348,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::Iterator TQValueListP } template <class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::find( Q_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const +TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::find( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const { ConstIterator first( start ); ConstIterator last( node ); @@ -361,7 +361,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPr } template <class T> -Q_INLINE_TEMPLATES int TQValueListPrivate<T>::findIndex( Q_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const +TQ_INLINE_TEMPLATES int TQValueListPrivate<T>::findIndex( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const { ConstIterator first( start ); ConstIterator last( node ); @@ -376,7 +376,7 @@ Q_INLINE_TEMPLATES int TQValueListPrivate<T>::findIndex( Q_TYPENAME TQValu } template <class T> -Q_INLINE_TEMPLATES uint TQValueListPrivate<T>::contains( const T& x ) const +TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::contains( const T& x ) const { uint result = 0; Iterator first = Iterator( node->next ); @@ -390,7 +390,7 @@ Q_INLINE_TEMPLATES uint TQValueListPrivate<T>::contains( const T& x ) } template <class T> -Q_INLINE_TEMPLATES uint TQValueListPrivate<T>::remove( const T& _x ) +TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::remove( const T& _x ) { const T x = _x; uint result = 0; @@ -407,7 +407,7 @@ Q_INLINE_TEMPLATES uint TQValueListPrivate<T>::remove( const T& _x ) } template <class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::at( size_type i ) const +TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::at( size_type i ) const { Q_ASSERT( i <= nodes ); NodePtr p = node->next; @@ -417,7 +417,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPr } template <class T> -Q_INLINE_TEMPLATES void TQValueListPrivate<T>::clear() +TQ_INLINE_TEMPLATES void TQValueListPrivate<T>::clear() { nodes = 0; NodePtr p = node->next; @@ -612,7 +612,7 @@ private: }; template <class T> -Q_INLINE_TEMPLATES bool TQValueList<T>::operator== ( const TQValueList<T>& l ) const +TQ_INLINE_TEMPLATES bool TQValueList<T>::operator== ( const TQValueList<T>& l ) const { if ( size() != l.size() ) return FALSE; @@ -625,13 +625,13 @@ Q_INLINE_TEMPLATES bool TQValueList<T>::operator== ( const TQValueList< } template <class T> -Q_INLINE_TEMPLATES void TQValueList<T>::clear() +TQ_INLINE_TEMPLATES void TQValueList<T>::clear() { if ( sh->count == 1 ) sh->clear(); else { sh->deref(); sh = new TQValueListPrivate<T>; } } template <class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQValueList<T>::iterator TQValueList<T>::erase( Q_TYPENAME TQValueList<T>::iterator first, Q_TYPENAME TQValueList<T>::iterator last ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueList<T>::iterator TQValueList<T>::erase( TQ_TYPENAME TQValueList<T>::iterator first, TQ_TYPENAME TQValueList<T>::iterator last ) { while ( first != last ) erase( first++ ); @@ -640,14 +640,14 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueList<T>::iterator TQValueList<T> template <class T> -Q_INLINE_TEMPLATES void TQValueList<T>::insert( Q_TYPENAME TQValueList<T>::iterator pos, size_type n, const T& x ) +TQ_INLINE_TEMPLATES void TQValueList<T>::insert( TQ_TYPENAME TQValueList<T>::iterator pos, size_type n, const T& x ) { for ( ; n > 0; --n ) insert( pos, x ); } template <class T> -Q_INLINE_TEMPLATES TQValueList<T> TQValueList<T>::operator+ ( const TQValueList<T>& l ) const +TQ_INLINE_TEMPLATES TQValueList<T> TQValueList<T>::operator+ ( const TQValueList<T>& l ) const { TQValueList<T> l2( *this ); for( const_iterator it = l.begin(); it != l.end(); ++it ) @@ -656,7 +656,7 @@ Q_INLINE_TEMPLATES TQValueList<T> TQValueList<T>::operator+ ( const } template <class T> -Q_INLINE_TEMPLATES TQValueList<T>& TQValueList<T>::operator+= ( const TQValueList<T>& l ) +TQ_INLINE_TEMPLATES TQValueList<T>& TQValueList<T>::operator+= ( const TQValueList<T>& l ) { TQValueList<T> copy = l; for( const_iterator it = copy.begin(); it != copy.end(); ++it ) @@ -665,14 +665,14 @@ Q_INLINE_TEMPLATES TQValueList<T>& TQValueList<T>::operator+= ( } template <class T> -Q_INLINE_TEMPLATES void TQValueList<T>::detachInternal() +TQ_INLINE_TEMPLATES void TQValueList<T>::detachInternal() { sh->deref(); sh = new TQValueListPrivate<T>( *sh ); } #ifndef TQT_NO_DATASTREAM template <class T> -Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l ) +TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l ) { l.clear(); TQ_UINT32 c; @@ -689,7 +689,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQVa } template <class T> -Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList<T>& l ) +TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList<T>& l ) { s << (TQ_UINT32)l.size(); TQValueListConstIterator<T> it = l.begin(); diff --git a/doc/html/qvaluevector-h.html b/doc/html/qvaluevector-h.html index fdec18cf3..413fe3aa7 100644 --- a/doc/html/qvaluevector-h.html +++ b/doc/html/qvaluevector-h.html @@ -155,7 +155,7 @@ private: }; template <class T> -Q_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQValueVectorPrivate<T>& x ) +TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQValueVectorPrivate<T>& x ) : TQShared() { size_t i = x.size(); @@ -176,7 +176,7 @@ Q_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQ } template <class T> -Q_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t size ) +TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t size ) { if ( size > 0 ) { start = new T[size]; @@ -190,7 +190,7 @@ Q_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t s } template <class T> -Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, const T& x ) +TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, const T& x ) { const size_t lastSize = size(); const size_t n = lastSize !=0 ? 2*lastSize : 1; @@ -207,7 +207,7 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, cons } template <class T> -Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, size_t n, const T& x ) +TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, size_t n, const T& x ) { if ( size_t( end - finish ) >= n ) { // enough room @@ -247,7 +247,7 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, size } template <class T> -Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::reserve( size_t n ) +TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::reserve( size_t n ) { const size_t lastSize = size(); pointer tmp = growAndCopy( n, start, finish ); @@ -257,7 +257,7 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::reserve( size_t n ) } template <class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQValueVectorPrivate<T>::pointer TQValueVectorPrivate<T>::growAndCopy( size_t n, pointer s, pointer f ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVectorPrivate<T>::pointer TQValueVectorPrivate<T>::growAndCopy( size_t n, pointer s, pointer f ) { pointer newStart = new T[n]; tqCopy( s, f, newStart ); @@ -525,21 +525,21 @@ private: }; template <class T> -Q_INLINE_TEMPLATES TQValueVector<T>::TQValueVector( size_type n, const T& val ) +TQ_INLINE_TEMPLATES TQValueVector<T>::TQValueVector( size_type n, const T& val ) { sh = new TQValueVectorPrivate<T>( n ); tqFill( begin(), end(), val ); } template <class T> -Q_INLINE_TEMPLATES void TQValueVector<T>::detachInternal() +TQ_INLINE_TEMPLATES void TQValueVector<T>::detachInternal() { sh->deref(); sh = new TQValueVectorPrivate<T>( *sh ); } template <class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, const T& x ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, const T& x ) { size_type offset = pos - sh->start; detach(); @@ -564,7 +564,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector< } template <class T> -Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, size_type n, const T& x ) +TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, size_type n, const T& x ) { if ( n != 0 ) { size_type offset = pos - sh->start; @@ -578,7 +578,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector< #ifndef TQT_NO_DATASTREAM template<class T> -Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v ) +TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v ) { v.clear(); TQ_UINT32 c; @@ -594,7 +594,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQVa } template<class T> -Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVector<T>& v ) +TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVector<T>& v ) { s << (TQ_UINT32)v.size(); // ### use typename TQValueVector<T>::const_iterator once all supported diff --git a/doc/html/qwidgetfactory-h.html b/doc/html/qwidgetfactory-h.html index 8c65ecc7e..6d07ee060 100644 --- a/doc/html/qwidgetfactory-h.html +++ b/doc/html/qwidgetfactory-h.html @@ -187,7 +187,7 @@ private: TQString name; TQPixmap pix; TQString field; - Q_DUMMY_COMPARISON_OPERATOR( Field ) + TQ_DUMMY_COMPARISON_OPERATOR( Field ) }; struct SqlWidgetConnection @@ -198,7 +198,7 @@ private: TQString conn; TQString table; TQMap<TQString, TQString> *dbControls; - Q_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection ) + TQ_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection ) }; TQValueList<Image> images; diff --git a/doc/i18n.doc b/doc/i18n.doc index 27d0641ac..9f6dd0ac3 100644 --- a/doc/i18n.doc +++ b/doc/i18n.doc @@ -214,28 +214,28 @@ directly: \endcode If you need to have translatable text completely -outside a function, there are two macros to help: QT_TR_NOOP() -and QT_TRANSLATE_NOOP(). They merely mark the text for +outside a function, there are two macros to help: TQT_TR_NOOP() +and TQT_TRANSLATE_NOOP(). They merely mark the text for extraction by the \e lupdate utility described below. The macros expand to just the text (without the context). -Example of QT_TR_NOOP(): +Example of TQT_TR_NOOP(): \code QString FriendlyConversation::greeting( int greet_type ) { static const char* greeting_strings[] = { - QT_TR_NOOP( "Hello" ), - QT_TR_NOOP( "Goodbye" ) + TQT_TR_NOOP( "Hello" ), + TQT_TR_NOOP( "Goodbye" ) }; return tr( greeting_strings[greet_type] ); } \endcode -Example of QT_TRANSLATE_NOOP(): +Example of TQT_TRANSLATE_NOOP(): \code static const char* greeting_strings[] = { - QT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ), - QT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" ) + TQT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ), + TQT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" ) }; QString FriendlyConversation::greeting( int greet_type ) diff --git a/doc/qws.doc b/doc/qws.doc index d5696ec22..1b640bff9 100644 --- a/doc/qws.doc +++ b/doc/qws.doc @@ -83,7 +83,7 @@ a little-endian machine (e.g. x86) for a big-endian processor (e.g. PowerPC) will use the host's endianness instead of the target's. Workaround: after running configure, and before running make, edit \c $TQTDIR/include/ntqconfig.h and change the definition of -\c Q_BYTE_ORDER. +\c TQ_BYTE_ORDER. \i Enable framebuffer support. |