diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-27 17:59:01 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-27 17:59:01 +0900 |
| commit | 5fd88f2a2099db96bee7a208d09843fd32fd6bf3 (patch) | |
| tree | 5cfd64687a124eb90c6dfee144b207d30df95073 /doc | |
| parent | 3e98ce7f85f06e95ad121c6f541d14464d85919e (diff) | |
| download | tqt3-5fd88f2a2099db96bee7a208d09843fd32fd6bf3.tar.gz tqt3-5fd88f2a2099db96bee7a208d09843fd32fd6bf3.zip | |
qt -> tqt conversion:
QT_NO_ASCII_CAST -> TQT_NO_ASCII_CAST
QT_NO_STL -> TQT_NO_STL
QT_NO_COMPAT -> TQT_NO_COMPAT
QT_NO_TRANSLATION -> TQT_NO_TRANSLATION
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'doc')
41 files changed, 104 insertions, 104 deletions
diff --git a/doc/html/ntqstring.html b/doc/html/ntqstring.html index 6db0e307..e8605bc6 100644 --- a/doc/html/ntqstring.html +++ b/doc/html/ntqstring.html @@ -1236,7 +1236,7 @@ significant digits (trailing zeroes are omitted). <p> Returns <a href="#ascii">ascii</a>(). Be sure to see the warnings documented in the ascii() function. Note that for new code which you wish to be -strictly Unicode-clean, you can define the macro <tt>QT_NO_ASCII_CAST</tt> when compiling your code to hide this function so +strictly Unicode-clean, you can define the macro <tt>TQT_NO_ASCII_CAST</tt> when compiling your code to hide this function so that automatic casts are not done. This has the added advantage that you catch the programming error described in <a href="#operator!">operator!</a>(). @@ -1266,7 +1266,7 @@ alternative is to call ascii() directly and construct a std::string manually. </pre> <p> It will call "operator const char*()", which is inefficent; you -may wish to define the macro <tt>QT_NO_ASCII_CAST</tt> when writing code +may wish to define the macro <tt>TQT_NO_ASCII_CAST</tt> when writing code which you wish to remain Unicode-clean. <p> When you want the above semantics, use: <p> <pre> diff --git a/doc/html/porting2.html b/doc/html/porting2.html index f34efd8d..a41f4b4d 100644 --- a/doc/html/porting2.html +++ b/doc/html/porting2.html @@ -245,7 +245,7 @@ to catch places where Unicode information is being converted to ASCII (loosing information if your user in not using Latin1). TQt has a small number of calls to this - ignore those. As a stricter -alternative, compile your code with QT_NO_ASCII_CAST defined, +alternative, compile your code with TQT_NO_ASCII_CAST defined, which hides the automatic conversion of TQString to const char*, so you can catch problems at compile time. </p> @@ -880,7 +880,7 @@ filenames in other locales, either use the TQt functions, or convert the filenam and <pre> TQFile::decodeFilename()</pre> - but do it <em>just</em> as you call the system function - code that mixes encoded and unencoded filenames -is very error prone. See the comments in TQString, such as regarding QT_NO_ASCII_CAST that +is very error prone. See the comments in TQString, such as regarding TQT_NO_ASCII_CAST that can help find potential problems. <p> <h3><a name="TQFontMetrics">TQFontMetrics</a></h3> <p> boundingRect(char) is replaced by diff --git a/doc/html/qaction-h.html b/doc/html/qaction-h.html index 10baaa26..7d02afa7 100644 --- a/doc/html/qaction-h.html +++ b/doc/html/qaction-h.html @@ -237,7 +237,7 @@ private slots: private: TQActionGroupPrivate* d; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT public: void insert( TQAction* a ) { add( a ); } #endif diff --git a/doc/html/qapplication-h.html b/doc/html/qapplication-h.html index 25bb4c0f..b812dfbb 100644 --- a/doc/html/qapplication-h.html +++ b/doc/html/qapplication-h.html @@ -204,7 +204,7 @@ public: static void beep(); -#ifndef QT_NO_TRANSLATION +#ifndef TQT_NO_TRANSLATION # ifndef QT_NO_TEXTCODEC void setDefaultCodec( TQTextCodec * ); TQTextCodec* defaultCodec() const; @@ -537,7 +537,7 @@ inline bool TQApplication::sendEvent( TQObject *receiver, TQEvent *event ) inline bool TQApplication::sendSpontaneousEvent( TQObject *receiver, TQEvent *event ) { if ( event ) event->spont = TRUE; return tqApp ? tqApp->notify( receiver, event ) : FALSE; } -#ifdef QT_NO_TRANSLATION +#ifdef TQT_NO_TRANSLATION // Simple versions inline TQString TQApplication::translate( const char *, const char *sourceText, const char *, Encoding encoding ) const diff --git a/doc/html/qbutton-h.html b/doc/html/qbutton-h.html index 7fb47810..b649ab2f 100644 --- a/doc/html/qbutton-h.html +++ b/doc/html/qbutton-h.html @@ -132,7 +132,7 @@ public: enum ToggleState { Off, NoChange, On }; ToggleState state() const; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT bool autoResize() const; void setAutoResize( bool ); #endif @@ -232,7 +232,7 @@ inline bool TQButton::isOn() const return stat != Off; } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT inline bool TQButton::autoResize() const { return autoresize; diff --git a/doc/html/qcanvas-h.html b/doc/html/qcanvas-h.html index 13336112..61dfb38a 100644 --- a/doc/html/qcanvas-h.html +++ b/doc/html/qcanvas-h.html @@ -179,7 +179,7 @@ public: virtual void setActive(bool yes); bool isActive() const { return (bool)act; } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT bool visible() const { return (bool)vis; } bool selected() const diff --git a/doc/html/qdatetime-h.html b/doc/html/qdatetime-h.html index 87776269..5874cac4 100644 --- a/doc/html/qdatetime-h.html +++ b/doc/html/qdatetime-h.html @@ -106,7 +106,7 @@ public: int weekNumber( int *yearNum = 0 ) const; #ifndef QT_NO_TEXTDATE -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT static TQString monthName( int month ) { return shortMonthName( month ); } static TQString dayName( int weekday ) { return shortDayName( weekday ); } #endif diff --git a/doc/html/qdragobject-h.html b/doc/html/qdragobject-h.html index b920c94e..9d7292bf 100644 --- a/doc/html/qdragobject-h.html +++ b/doc/html/qdragobject-h.html @@ -252,7 +252,7 @@ private: #endif }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT typedef TQUriDrag TQUrlDrag; #endif diff --git a/doc/html/qfont-h.html b/doc/html/qfont-h.html index d0f5a05f..d9316433 100644 --- a/doc/html/qfont-h.html +++ b/doc/html/qfont-h.html @@ -337,12 +337,12 @@ public: TQString lastResortFamily() const; TQString lastResortFont() const; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT static TQFont defaultFont(); static void setDefaultFont( const TQFont & ); -#endif // QT_NO_COMPAT +#endif // TQT_NO_COMPAT TQFont resolve( const TQFont & ) const; diff --git a/doc/html/qfontdatabase-h.html b/doc/html/qfontdatabase-h.html index c3a6879b..a86c217a 100644 --- a/doc/html/qfontdatabase-h.html +++ b/doc/html/qfontdatabase-h.html @@ -133,7 +133,7 @@ public: #endif // For source compatibility with < 3.0 -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT TQStringList families(bool) const; TQStringList styles( const TQString &, const TQString & ) const; @@ -151,7 +151,7 @@ public: bool bold( const TQString &, const TQString &, const TQString & ) const; int weight( const TQString &, const TQString &, const TQString & ) const; -#endif // QT_NO_COMPAT +#endif // TQT_NO_COMPAT private: #if defined(Q_WS_X11) || defined(Q_WS_WIN) @@ -172,7 +172,7 @@ private: }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT inline TQStringList TQFontDatabase::families( bool ) const { @@ -256,7 +256,7 @@ inline int TQFontDatabase::weight( const TQString &family, return weight(family, style); } -#endif // QT_NO_COMPAT +#endif // TQT_NO_COMPAT #endif // QT_NO_FONTDATABASE diff --git a/doc/html/qfontmetrics-h.html b/doc/html/qfontmetrics-h.html index 37fe4acd..ced78f9c 100644 --- a/doc/html/qfontmetrics-h.html +++ b/doc/html/qfontmetrics-h.html @@ -115,7 +115,7 @@ public: int width( const TQString &, int len = -1 ) const; int width( TQChar ) const; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT int width( char c ) const { return width( (TQChar) c ); } #endif diff --git a/doc/html/qgl-h.html b/doc/html/qgl-h.html index 3309d1f1..341b5f02 100644 --- a/doc/html/qgl-h.html +++ b/doc/html/qgl-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_OPENGL Q_EXPORT #endif -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQGL_VERSION 450 #define TQGL_VERSION_STR "4.5" TQM_EXPORT_OPENGL inline const char *qGLVersion() { diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index 73114b7b..9c4aba67 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -980,7 +980,7 @@ Q_EXPORT int qWinVersion(); #if !defined(QT_NO_DEBUG) && !defined(QT_DEBUG) # define QT_DEBUG // display debug messages -# if !defined(QT_NO_COMPAT) // compatibility with TQt 2 +# if !defined(TQT_NO_COMPAT) // compatibility with TQt 2 # if !defined(NO_DEBUG) && !defined(DEBUG) # if !defined(Q_OS_MACX) // clash with MacOS X headers # define DEBUG @@ -1023,13 +1023,13 @@ Q_EXPORT void tqSystemWarning( const char *, int code = -1 ); # endif #endif -#if !defined(QT_NO_COMPAT) // compatibility with TQt 2 +#if !defined(TQT_NO_COMPAT) // compatibility with TQt 2 # if !defined(ASSERT) # if !defined(Q_OS_TEMP) # define ASSERT(x) Q_ASSERT(x) # endif # endif -#endif // QT_NO_COMPAT +#endif // TQT_NO_COMPAT Q_EXPORT bool tqt_check_pointer( bool c, const char *, int ); @@ -1040,20 +1040,20 @@ Q_EXPORT bool tqt_check_pointer( bool c, const char *, int ); # define TQ_CHECK_PTR(p) #endif -#if !defined(QT_NO_COMPAT) // compatibility with TQt 2 +#if !defined(TQT_NO_COMPAT) // compatibility with TQt 2 # if !defined(CHECK_PTR) # define CHECK_PTR(x) TQ_CHECK_PTR(x) # endif -#endif // QT_NO_COMPAT +#endif // TQT_NO_COMPAT enum TQtMsgType { TQtDebugMsg, TQtWarningMsg, TQtFatalMsg }; typedef void (*TQtMsgHandler)(TQtMsgType, const char *); Q_EXPORT TQtMsgHandler qInstallMsgHandler( TQtMsgHandler ); -#if !defined(QT_NO_COMPAT) // compatibility with TQt 2 +#if !defined(TQT_NO_COMPAT) // compatibility with TQt 2 typedef TQtMsgHandler msg_handler; -#endif // QT_NO_COMPAT +#endif // TQT_NO_COMPAT Q_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE ); diff --git a/doc/html/qgrid-h.html b/doc/html/qgrid-h.html index 4c3280e6..6dba57a4 100644 --- a/doc/html/qgrid-h.html +++ b/doc/html/qgrid-h.html @@ -92,7 +92,7 @@ public: void setSpacing( int ); TQSize sizeHint() const; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT typedef Orientation Direction; #endif diff --git a/doc/html/qlineedit-h.html b/doc/html/qlineedit-h.html index 62d8fbdf..903577e4 100644 --- a/doc/html/qlineedit-h.html +++ b/doc/html/qlineedit-h.html @@ -145,7 +145,7 @@ public: int alignment() const; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT void cursorLeft( bool mark, int steps = 1 ) { cursorForward( mark, -steps ); } void cursorRight( bool mark, int steps = 1 ) { cursorForward( mark, steps ); } #endif @@ -171,7 +171,7 @@ public: bool isUndoAvailable() const; bool isRedoAvailable() const; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT bool hasMarkedText() const { return hasSelectedText(); } TQString markedText() const { return selectedText(); } #endif @@ -237,7 +237,7 @@ protected: void contextMenuEvent( TQContextMenuEvent * ); virtual TQPopupMenu *createPopupMenu(); void windowActivationChange( bool ); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT void repaintArea( int, int ) { update(); } #endif diff --git a/doc/html/qlistbox-h.html b/doc/html/qlistbox-h.html index 9863cbf9..23bc02a3 100644 --- a/doc/html/qlistbox-h.html +++ b/doc/html/qlistbox-h.html @@ -205,7 +205,7 @@ public: void viewportPaintEvent( TQPaintEvent * ); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT bool dragSelect() const { return TRUE; } void setDragSelect( bool ) {} bool autoScroll() const { return TRUE; } @@ -294,7 +294,7 @@ protected: void updateItem( int index ); void updateItem( TQListBoxItem * ); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT void updateCellWidth() { } int totalWidth() const { return contentsWidth(); } int totalHeight() const { return contentsHeight(); } @@ -309,7 +309,7 @@ protected: void windowActivationChange( bool ); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT bool itemYPos( int index, int *yPos ) const; int findItem( int yPos ) const { return index(itemAt(TQPoint(0,yPos)) ); } #endif @@ -367,7 +367,7 @@ public: bool isSelected() const { return s; } bool isCurrent() const; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT bool selected() const { return isSelected(); } bool current() const { return isCurrent(); } #endif diff --git a/doc/html/qmap-h.html b/doc/html/qmap-h.html index aa67795e..6760d02b 100644 --- a/doc/html/qmap-h.html +++ b/doc/html/qmap-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #include "ntqvaluelist.h" #endif // QT_H -#ifndef QT_NO_STL +#ifndef TQT_NO_STL #include <iterator> #include <map> #endif @@ -138,11 +138,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; @@ -254,11 +254,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; @@ -639,7 +639,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; @@ -666,7 +666,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>; @@ -683,7 +683,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(); @@ -766,7 +766,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/doc/html/qmemarray-h.html b/doc/html/qmemarray-h.html index e8555bc0..cdfd6518 100644 --- a/doc/html/qmemarray-h.html +++ b/doc/html/qmemarray-h.html @@ -148,7 +148,7 @@ public: ConstIterator end() const { return data() + size(); } }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQArray TQMemArray #endif diff --git a/doc/html/qnamespace-h.html b/doc/html/qnamespace-h.html index 4d5394a3..716aa236 100644 --- a/doc/html/qnamespace-h.html +++ b/doc/html/qnamespace-h.html @@ -264,7 +264,7 @@ public: WStyle_Splash = WStyle_NoBorder | WMacNoSheet | WStyle_Tool | WWinOwnDC, #endif WNoAutoErase = WRepaintNoErase | WResizeNoErase -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT , WNorthWestGravity = WStaticContents, WType_Modal = WType_Dialog | WShowModal, @@ -317,7 +317,7 @@ public: OpaqueMode }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT // documented in qpainter.cpp enum PaintUnit { // paint unit PixelUnit, @@ -330,10 +330,10 @@ public: #endif // documented in qstyle.cpp -#ifdef QT_NO_COMPAT +#ifdef TQT_NO_COMPAT enum GUIStyle { WindowsStyle = 1, // ### TQt 4.0: either remove the obsolete enums or clean up compat vs. - MotifStyle = 4 // ### QT_NO_COMPAT by reordering or combination into one enum. + MotifStyle = 4 // ### TQT_NO_COMPAT by reordering or combination into one enum. }; #else enum GUIStyle { @@ -858,7 +858,7 @@ public: DockRight, DockLeft, DockMinimized -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT , Unmanaged = DockUnmanaged, TornOff = DockTornOff, diff --git a/doc/html/qobject-h.html b/doc/html/qobject-h.html index ebb765df..386e8c74 100644 --- a/doc/html/qobject-h.html +++ b/doc/html/qobject-h.html @@ -172,12 +172,12 @@ public: virtual bool setProperty( const char *name, const TQVariant& value ); virtual TQVariant property( const char *name ) const; #endif // QT_NO_PROPERTIES -#ifdef QT_NO_TRANSLATION +#ifdef TQT_NO_TRANSLATION static TQString tr( const char *sourceText, const char * = 0); #ifndef QT_NO_TEXTCODEC static TQString trUtf8( const char *sourceText, const char * = 0); #endif -#endif //QT_NO_TRANSLATION +#endif //TQT_NO_TRANSLATION #ifndef QT_NO_USERDATA static uint registerUserData(); @@ -281,7 +281,7 @@ inline bool TQObject::disconnect( const TQObject *receiver, const char *member ) } -#ifdef QT_NO_TRANSLATION +#ifdef TQT_NO_TRANSLATION inline TQString TQObject::tr( const char *sourceText, const char * ) { return TQString::fromLatin1( sourceText ); } @@ -290,7 +290,7 @@ inline TQString TQObject::trUtf8( const char *sourceText, const char * ) { return TQString::fromUtf8( sourceText ); } #endif -#endif //QT_NO_TRANSLATION +#endif //TQT_NO_TRANSLATION #define Q_DEFINED_QOBJECT diff --git a/doc/html/qpalette-h.html b/doc/html/qpalette-h.html index 90efbc5f..81a21631 100644 --- a/doc/html/qpalette-h.html +++ b/doc/html/qpalette-h.html @@ -173,14 +173,14 @@ public: const TQColorGroup &active() const { return data->active; } const TQColorGroup &disabled() const { return data->disabled; } const TQColorGroup &inactive() const { return data->inactive; } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT const TQColorGroup &normal() const { return active(); } #endif void setActive( const TQColorGroup & ); void setDisabled( const TQColorGroup & ); void setInactive( const TQColorGroup & ); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT void setNormal( const TQColorGroup & cg ) { setActive(cg); } #endif diff --git a/doc/html/qptrcollection-h.html b/doc/html/qptrcollection-h.html index fc95314b..a48beca3 100644 --- a/doc/html/qptrcollection-h.html +++ b/doc/html/qptrcollection-h.html @@ -108,7 +108,7 @@ protected: }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQCollection TQPtrCollection #endif diff --git a/doc/html/qptrlist-h.html b/doc/html/qptrlist-h.html index 3ed91173..6f212c6c 100644 --- a/doc/html/qptrlist-h.html +++ b/doc/html/qptrlist-h.html @@ -221,7 +221,7 @@ public: { TQGListIterator::operator=(it); return *this; } }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQList TQPtrList #define TQListIterator TQPtrListIterator #endif diff --git a/doc/html/qptrqueue-h.html b/doc/html/qptrqueue-h.html index 9c7cbb63..adb707bb 100644 --- a/doc/html/qptrqueue-h.html +++ b/doc/html/qptrqueue-h.html @@ -123,7 +123,7 @@ template<class type> inline void TQPtrQueue<type>::deleteItem( TQPtr if ( del_item ) delete (type *)d; } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQQueue TQPtrQueue #endif diff --git a/doc/html/qptrstack-h.html b/doc/html/qptrstack-h.html index 740557d8..98d0db5b 100644 --- a/doc/html/qptrstack-h.html +++ b/doc/html/qptrstack-h.html @@ -123,7 +123,7 @@ template<class type> inline void TQPtrStack<type>::deleteItem( TQPtr if ( del_item ) delete (type *)d; } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQStack TQPtrStack #endif diff --git a/doc/html/qptrvector-h.html b/doc/html/qptrvector-h.html index 2e49044b..a7382458 100644 --- a/doc/html/qptrvector-h.html +++ b/doc/html/qptrvector-h.html @@ -145,7 +145,7 @@ template<class type> inline void TQPtrVector<type>::deleteItem( TQPt if ( del_item ) delete (type *)d; } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQVector TQPtrVector #endif diff --git a/doc/html/qregexp-h.html b/doc/html/qregexp-h.html index b6946ae9..f4e715c6 100644 --- a/doc/html/qregexp-h.html +++ b/doc/html/qregexp-h.html @@ -114,7 +114,7 @@ public: void setMinimal( bool minimal ); bool exactMatch( const TQString& str ) const; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT int match( const TQString& str, int index = 0, int *len = 0, bool indexIsStart = TRUE ) const; #endif diff --git a/doc/html/qsignal-h.html b/doc/html/qsignal-h.html index 7525e7b1..2ccc5866 100644 --- a/doc/html/qsignal-h.html +++ b/doc/html/qsignal-h.html @@ -96,7 +96,7 @@ public: void activate(); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT bool isBlocked() const { return TQObject::signalsBlocked(); } void block( bool b ) { TQObject::blockSignals( b ); } #ifndef QT_NO_VARIANT diff --git a/doc/html/qsizepolicy-h.html b/doc/html/qsizepolicy-h.html index 363df216..20e17164 100644 --- a/doc/html/qsizepolicy-h.html +++ b/doc/html/qsizepolicy-h.html @@ -100,7 +100,7 @@ public: enum ExpandData { NoDirection = 0, Horizontally = 1, Vertically = 2, -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT Horizontal = Horizontally, Vertical = Vertically, #endif diff --git a/doc/html/qsound-h.html b/doc/html/qsound-h.html index b9e7c0da..11bd98d6 100644 --- a/doc/html/qsound-h.html +++ b/doc/html/qsound-h.html @@ -102,7 +102,7 @@ public: ? */ -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT static bool available() { return isAvailable(); } #endif diff --git a/doc/html/qstring-h.html b/doc/html/qstring-h.html index 2776b250..d71af174 100644 --- a/doc/html/qstring-h.html +++ b/doc/html/qstring-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #include <limits.h> #endif -#ifndef QT_NO_STL +#ifndef TQT_NO_STL #if defined ( Q_CC_MSVC_NET ) && _MSC_VER < 1310 // Avoids nasty warning for xlocale, line 450 # pragma warning ( push ) # pragma warning ( disable : 4189 ) @@ -444,14 +444,14 @@ public: #ifndef QT_NO_CAST_ASCII TQString( const char *str ); // deep copy #endif -#ifndef QT_NO_STL +#ifndef TQT_NO_STL TQString( const std::string& ); // deep copy #endif ~TQString(); TQString &operator=( const TQString & ); // impl-shared copy TQString &operator=( const char * ); // deep copy -#ifndef QT_NO_STL +#ifndef TQT_NO_STL TQString &operator=( const std::string& ); // deep copy #endif TQString &operator=( const TQCString& ); // deep copy @@ -570,7 +570,7 @@ public: TQString &append( const TQByteArray & ); TQString &append( const char * ); #endif -#if !defined(QT_NO_STL) && !defined(QT_NO_CAST_ASCII) +#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII) TQString &append( const std::string& ); #endif TQString &prepend( char ); @@ -580,7 +580,7 @@ public: TQString &prepend( const TQByteArray & ); TQString &prepend( const char * ); #endif -#if !defined(QT_NO_STL) && !defined(QT_NO_CAST_ASCII) +#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII) TQString &prepend( const std::string& ); #endif TQString &remove( uint index, uint len ); @@ -667,7 +667,7 @@ public: TQString &operator+=( const TQByteArray &str ); TQString &operator+=( const char *str ); #endif -#if !defined(QT_NO_STL) && !defined(QT_NO_CAST_ASCII) +#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII) TQString &operator+=( const std::string& ); #endif TQString &operator+=( TQChar c ); @@ -699,10 +699,10 @@ public: TQCString local8Bit() const; static TQString fromLocal8Bit(const char*, int len=-1); bool operator!() const; -#ifndef QT_NO_ASCII_CAST +#ifndef TQT_NO_ASCII_CAST operator const char *() const { return ascii(); } #endif -#ifndef QT_NO_STL +#ifndef TQT_NO_STL operator std::string() const { return ascii() ? ascii() : ""; } #endif @@ -728,7 +728,7 @@ public: void compose(); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT const char* data() const { return ascii(); } #endif @@ -977,7 +977,7 @@ inline TQString &TQString::append( TQChar c ) inline TQString &TQString::append( char c ) { return operator+=(c); } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL inline TQString &TQString::operator=( const std::string& str ) { return operator=(str.c_str()); } #ifndef QT_NO_CAST_ASCII @@ -1124,7 +1124,7 @@ Q_EXPORT inline const TQString operator+( char c1, const TQString &s2 ) return tmp; } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL Q_EXPORT inline const TQString operator+(const TQString& s1, const std::string& s2) { return s1 + TQString(s2); diff --git a/doc/html/qstyle-h.html b/doc/html/qstyle-h.html index 4fd8e1ab..aca71350 100644 --- a/doc/html/qstyle-h.html +++ b/doc/html/qstyle-h.html @@ -759,7 +759,7 @@ public: // Old 2.x TQStyle API -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT int defaultFrameWidth() const { return pixelMetric( PM_DefaultFrameWidth ); diff --git a/doc/html/qthread-h.html b/doc/html/qthread-h.html index 26d6d7b7..5a2e97a8 100644 --- a/doc/html/qthread-h.html +++ b/doc/html/qthread-h.html @@ -81,11 +81,11 @@ body { background: #ffffff; color: black; } #ifndef QT_H #include "ntqwindowdefs.h" -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #include "ntqmutex.h" #include "ntqsemaphore.h" #include "ntqwaitcondition.h" -#endif // QT_NO_COMPAT +#endif // TQT_NO_COMPAT #endif // QT_H #include <limits.h> @@ -97,7 +97,7 @@ class Q_EXPORT TQThread : public TQt public: static TQt::HANDLE currentThread(); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT static void postEvent( TQObject *,TQEvent * ); #endif diff --git a/doc/html/qtoolbutton-h.html b/doc/html/qtoolbutton-h.html index 05e207ef..d38695ae 100644 --- a/doc/html/qtoolbutton-h.html +++ b/doc/html/qtoolbutton-h.html @@ -130,7 +130,7 @@ public: TQSize sizeHint() const; TQSize minimumSizeHint() const; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT void setOnIconSet( const TQIconSet& ); void setOffIconSet( const TQIconSet& ); void setIconSet( const TQIconSet &, bool on ); diff --git a/doc/html/qtooltip-h.html b/doc/html/qtooltip-h.html index ea8dc6c7..23fe6797 100644 --- a/doc/html/qtooltip-h.html +++ b/doc/html/qtooltip-h.html @@ -149,7 +149,7 @@ public: static TQPalette palette(); static void setPalette( const TQPalette & ); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT static void setEnabled( bool enable ) { setGloballyEnabled( enable ); } static bool enabled() { return isGloballyEnabled(); } #endif diff --git a/doc/html/qtranslator-h.html b/doc/html/qtranslator-h.html index ef885f10..adba2bff 100644 --- a/doc/html/qtranslator-h.html +++ b/doc/html/qtranslator-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqvaluelist.h" #endif // QT_H -#ifndef QT_NO_TRANSLATION +#ifndef TQT_NO_TRANSLATION class TQTranslatorPrivate; @@ -145,7 +145,7 @@ public: TQTranslator( TQObject * parent = 0, const char * name = 0 ); ~TQTranslator(); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT TQString find( const char *context, const char *sourceText, const char * comment = 0 ) const { return findMessage( context, sourceText, comment ).translation(); } @@ -164,7 +164,7 @@ public: void clear(); -#ifndef QT_NO_TRANSLATION_BUILDER +#ifndef TQT_NO_TRANSLATION_BUILDER enum SaveMode { Everything, Stripped }; bool save( const TQString & filename, SaveMode mode = Everything ); @@ -198,7 +198,7 @@ private: TQTranslatorPrivate * d; }; -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION #endif </pre> diff --git a/doc/html/qvaluelist-h.html b/doc/html/qvaluelist-h.html index 82bdca0d..beb84cf2 100644 --- a/doc/html/qvaluelist-h.html +++ b/doc/html/qvaluelist-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqdatastream.h" #endif // QT_H -#ifndef QT_NO_STL +#ifndef TQT_NO_STL #include <iterator> #include <list> #endif @@ -118,12 +118,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; @@ -194,12 +194,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; @@ -459,7 +459,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; @@ -470,7 +470,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>; @@ -486,7 +486,7 @@ public: sh = l.sh; return *this; } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL TQValueList<T>& operator= ( const std::list<T>& l ) { detach(); diff --git a/doc/html/qvaluevector-h.html b/doc/html/qvaluevector-h.html index 61e65322..4739420b 100644 --- a/doc/html/qvaluevector-h.html +++ b/doc/html/qvaluevector-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqdatastream.h" #endif // QT_H -#ifndef QT_NO_STL +#ifndef TQT_NO_STL #include <vector> #endif @@ -279,7 +279,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; @@ -298,7 +298,7 @@ public: TQValueVector( size_type n, const T& val = T() ); -#ifndef QT_NO_STL +#ifndef TQT_NO_STL TQValueVector( std::vector<T>& v ) // ### remove in 4.0 { sh = new TQValueVectorPrivate<T>( v.size() ); @@ -325,7 +325,7 @@ public: return *this; } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL TQValueVector<T>& operator= ( const std::vector<T>& v ) { clear(); diff --git a/doc/html/qwidget-h.html b/doc/html/qwidget-h.html index d59008fe..228e554c 100644 --- a/doc/html/qwidget-h.html +++ b/doc/html/qwidget-h.html @@ -387,7 +387,7 @@ public slots: virtual void hide(); void setShown( bool show ); void setHidden( bool hide ); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT void iconify() { showMinimized(); } #endif virtual void showMinimized(); @@ -445,7 +445,7 @@ public: bool showIt=FALSE ); void reparent( TQWidget *parent, const TQPoint &, bool showIt=FALSE ); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT void recreate( TQWidget *parent, WFlags f, const TQPoint & p, bool showIt=FALSE ) { reparent(parent,f,p,showIt); } #endif diff --git a/doc/man/man3/tqstring.3qt b/doc/man/man3/tqstring.3qt index d6a7022e..7097b922 100644 --- a/doc/man/man3/tqstring.3qt +++ b/doc/man/man3/tqstring.3qt @@ -1456,7 +1456,7 @@ With 'e', 'E', and 'f', \fIprec\fR is the number of digits after the decimal poi .PP See also setNum(). .SH "QString::operator const char * () const" -Returns ascii(). Be sure to see the warnings documented in the ascii() function. Note that for new code which you wish to be strictly Unicode-clean, you can define the macro \fCQT_NO_ASCII_CAST\fR when compiling your code to hide this function so that automatic casts are not done. This has the added advantage that you catch the programming error described in operator!(). +Returns ascii(). Be sure to see the warnings documented in the ascii() function. Note that for new code which you wish to be strictly Unicode-clean, you can define the macro \fCTQT_NO_ASCII_CAST\fR when compiling your code to hide this function so that automatic casts are not done. This has the added advantage that you catch the programming error described in operator!(). .SH "QString::operator std::string () const" Returns ascii() as a std::string. .PP @@ -1486,7 +1486,7 @@ Note that if you say .br .fi .PP -It will call "operator const char*()", which is inefficent; you may wish to define the macro \fCQT_NO_ASCII_CAST\fR when writing code which you wish to remain Unicode-clean. +It will call "operator const char*()", which is inefficent; you may wish to define the macro \fCTQT_NO_ASCII_CAST\fR when writing code which you wish to remain Unicode-clean. .PP When you want the above semantics, use: .PP diff --git a/doc/porting2.doc b/doc/porting2.doc index 639a5a83..f0affd51 100644 --- a/doc/porting2.doc +++ b/doc/porting2.doc @@ -280,7 +280,7 @@ functionality in TQt 2.x, the following steps are required: Unicode information is being converted to ASCII (loosing information if your user in not using Latin1). TQt has a small number of calls to this - ignore those. As a stricter - alternative, compile your code with QT_NO_ASCII_CAST defined, + alternative, compile your code with TQT_NO_ASCII_CAST defined, which hides the automatic conversion of QString to const char*, so you can catch problems at compile time. </p> @@ -1002,7 +1002,7 @@ only work for Latin1 locales (eg. Western Europe, the U.S.). To ensure your cod filenames in other locales, either use the TQt functions, or convert the filenames via \code QFile::encodeFilename()\endcode and \code QFile::decodeFilename()\endcode - but do it \e just as you call the system function - code that mixes encoded and unencoded filenames -is very error prone. See the comments in QString, such as regarding QT_NO_ASCII_CAST that +is very error prone. See the comments in QString, such as regarding TQT_NO_ASCII_CAST that can help find potential problems. |