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 | |
| 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>
169 files changed, 332 insertions, 332 deletions
@@ -2586,7 +2586,7 @@ if [ "$CFG_LARGEFILE" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG largefile" fi if [ "$CFG_STL" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STL" + QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_STL" else QMAKE_CONFIG="$QMAKE_CONFIG stl" fi diff --git a/doc/html/ntqstring.html b/doc/html/ntqstring.html index 6db0e307e..e8605bc65 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 f34efd8df..a41f4b4dd 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 10baaa26b..7d02afa73 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 25bb4c0f1..b812dfbbc 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 7fb47810a..b649ab2f8 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 13336112d..61dfb38a5 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 877762691..5874cac41 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 b920c94ea..9d7292bf6 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 d0f5a05f6..d9316433a 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 c3a6879b8..a86c217a2 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 37fe4acd0..ced78f9cc 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 3309d1f1a..341b5f02e 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 73114b7b3..9c4aba67b 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 4c3280e6a..6dba57a43 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 62d8fbdff..903577e40 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 9863cbf93..23bc02a32 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 aa67795ec..6760d02b8 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 e8555bc02..cdfd6518c 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 4d5394a3c..716aa236e 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 ebb765dfa..386e8c747 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 90efbc5f3..81a216319 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 fc95314b3..a48beca3e 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 3ed91173f..6f212c6cb 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 9c7cbb63c..adb707bb6 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 740557d88..98d0db5b7 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 2e49044b2..a73824584 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 b6946ae90..f4e715c63 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 7525e7b11..2ccc58664 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 363df2167..20e171641 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 b9e7c0daf..11bd98d6b 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 2776b250c..d71af1745 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 4fd8e1ab5..aca71350f 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 26d6d7b7f..5a2e97a80 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 05e207ef4..d38695ae4 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 ea8dc6c7b..23fe67975 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 ef885f10d..adba2bff4 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 82bdca0d6..beb84cf20 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 61e653226..4739420ba 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 d59008fe8..228e554c8 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 d6a7022eb..7097b922c 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 639a5a83d..f0affd51f 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. diff --git a/mkspecs/aix-g++-64/qplatformdefs.h b/mkspecs/aix-g++-64/qplatformdefs.h index f4c5fdcef..b9ff4be9d 100644 --- a/mkspecs/aix-g++-64/qplatformdefs.h +++ b/mkspecs/aix-g++-64/qplatformdefs.h @@ -51,7 +51,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/aix-g++/qplatformdefs.h b/mkspecs/aix-g++/qplatformdefs.h index 2cd7a7e65..2e520c3fa 100644 --- a/mkspecs/aix-g++/qplatformdefs.h +++ b/mkspecs/aix-g++/qplatformdefs.h @@ -51,7 +51,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/aix-xlc-64/qplatformdefs.h b/mkspecs/aix-xlc-64/qplatformdefs.h index af1b26fca..a7b6cf39d 100644 --- a/mkspecs/aix-xlc-64/qplatformdefs.h +++ b/mkspecs/aix-xlc-64/qplatformdefs.h @@ -47,7 +47,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h index b88ae9251..caf14d7a5 100644 --- a/mkspecs/aix-xlc/qplatformdefs.h +++ b/mkspecs/aix-xlc/qplatformdefs.h @@ -47,7 +47,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/bsdi-g++/qplatformdefs.h b/mkspecs/bsdi-g++/qplatformdefs.h index 564c41273..f455548f0 100644 --- a/mkspecs/bsdi-g++/qplatformdefs.h +++ b/mkspecs/bsdi-g++/qplatformdefs.h @@ -43,7 +43,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/cygwin-g++/qplatformdefs.h b/mkspecs/cygwin-g++/qplatformdefs.h index d9baae88d..181876a7e 100644 --- a/mkspecs/cygwin-g++/qplatformdefs.h +++ b/mkspecs/cygwin-g++/qplatformdefs.h @@ -62,7 +62,7 @@ #include <netinet/in.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/darwin-g++/qplatformdefs.h b/mkspecs/darwin-g++/qplatformdefs.h index 8b72e3f37..18f287a63 100644 --- a/mkspecs/darwin-g++/qplatformdefs.h +++ b/mkspecs/darwin-g++/qplatformdefs.h @@ -42,7 +42,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/dgux-g++/qplatformdefs.h b/mkspecs/dgux-g++/qplatformdefs.h index b826f66bc..615742e78 100644 --- a/mkspecs/dgux-g++/qplatformdefs.h +++ b/mkspecs/dgux-g++/qplatformdefs.h @@ -47,7 +47,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/freebsd-clang/qplatformdefs.h b/mkspecs/freebsd-clang/qplatformdefs.h index b6cb67d29..cef0a5e2f 100644 --- a/mkspecs/freebsd-clang/qplatformdefs.h +++ b/mkspecs/freebsd-clang/qplatformdefs.h @@ -45,7 +45,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h index b6cb67d29..cef0a5e2f 100644 --- a/mkspecs/freebsd-g++/qplatformdefs.h +++ b/mkspecs/freebsd-g++/qplatformdefs.h @@ -45,7 +45,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/freebsd-icc/qplatformdefs.h b/mkspecs/freebsd-icc/qplatformdefs.h index b6cb67d29..cef0a5e2f 100644 --- a/mkspecs/freebsd-icc/qplatformdefs.h +++ b/mkspecs/freebsd-icc/qplatformdefs.h @@ -45,7 +45,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h index 2168d30b5..b28680cbb 100644 --- a/mkspecs/hpux-acc-64/qplatformdefs.h +++ b/mkspecs/hpux-acc-64/qplatformdefs.h @@ -48,7 +48,7 @@ extern "C" int res_init(); -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h index b60ff1e5c..82ab0e490 100644 --- a/mkspecs/hpux-acc-o64/qplatformdefs.h +++ b/mkspecs/hpux-acc-o64/qplatformdefs.h @@ -50,7 +50,7 @@ extern "C" int res_init(); -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h index e47f153f8..535970aec 100644 --- a/mkspecs/hpux-acc/qplatformdefs.h +++ b/mkspecs/hpux-acc/qplatformdefs.h @@ -51,7 +51,7 @@ extern "C" int res_init(); #define QT_NO_LIBRARY_UNLOAD -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/hpux-cc/qplatformdefs.h b/mkspecs/hpux-cc/qplatformdefs.h index 4e2d9fb2e..5315dddef 100644 --- a/mkspecs/hpux-cc/qplatformdefs.h +++ b/mkspecs/hpux-cc/qplatformdefs.h @@ -42,7 +42,7 @@ extern "C" int res_init(); -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h index 2168d30b5..b28680cbb 100644 --- a/mkspecs/hpux-g++-64/qplatformdefs.h +++ b/mkspecs/hpux-g++-64/qplatformdefs.h @@ -48,7 +48,7 @@ extern "C" int res_init(); -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h index 38e3ac63e..7fbe896e6 100644 --- a/mkspecs/hpux-g++/qplatformdefs.h +++ b/mkspecs/hpux-g++/qplatformdefs.h @@ -50,7 +50,7 @@ extern "C" int res_init(); -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h index b60ff1e5c..82ab0e490 100644 --- a/mkspecs/hpuxi-acc-32/qplatformdefs.h +++ b/mkspecs/hpuxi-acc-32/qplatformdefs.h @@ -50,7 +50,7 @@ extern "C" int res_init(); -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h index b60ff1e5c..82ab0e490 100644 --- a/mkspecs/hpuxi-acc-64/qplatformdefs.h +++ b/mkspecs/hpuxi-acc-64/qplatformdefs.h @@ -50,7 +50,7 @@ extern "C" int res_init(); -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/hurd-g++/qplatformdefs.h b/mkspecs/hurd-g++/qplatformdefs.h index 4871b7223..e2ea4c304 100644 --- a/mkspecs/hurd-g++/qplatformdefs.h +++ b/mkspecs/hurd-g++/qplatformdefs.h @@ -60,7 +60,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/irix-cc-64/qplatformdefs.h b/mkspecs/irix-cc-64/qplatformdefs.h index d91df8d49..84c7996e5 100644 --- a/mkspecs/irix-cc-64/qplatformdefs.h +++ b/mkspecs/irix-cc-64/qplatformdefs.h @@ -43,7 +43,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/irix-cc-o32/qplatformdefs.h b/mkspecs/irix-cc-o32/qplatformdefs.h index 6c8f7f117..799d5e783 100644 --- a/mkspecs/irix-cc-o32/qplatformdefs.h +++ b/mkspecs/irix-cc-o32/qplatformdefs.h @@ -43,7 +43,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/irix-cc/qplatformdefs.h b/mkspecs/irix-cc/qplatformdefs.h index d91df8d49..84c7996e5 100644 --- a/mkspecs/irix-cc/qplatformdefs.h +++ b/mkspecs/irix-cc/qplatformdefs.h @@ -43,7 +43,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/irix-g++/qplatformdefs.h b/mkspecs/irix-g++/qplatformdefs.h index 7cd2f2e01..d132b0f0b 100644 --- a/mkspecs/irix-g++/qplatformdefs.h +++ b/mkspecs/irix-g++/qplatformdefs.h @@ -43,7 +43,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h index 67e617853..9e071fd52 100644 --- a/mkspecs/linux-clang/qplatformdefs.h +++ b/mkspecs/linux-clang/qplatformdefs.h @@ -59,7 +59,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/linux-cxx/qplatformdefs.h b/mkspecs/linux-cxx/qplatformdefs.h index c35609e16..2a5b12f5b 100644 --- a/mkspecs/linux-cxx/qplatformdefs.h +++ b/mkspecs/linux-cxx/qplatformdefs.h @@ -59,7 +59,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/linux-ecc-64/qplatformdefs.h b/mkspecs/linux-ecc-64/qplatformdefs.h index c35609e16..2a5b12f5b 100644 --- a/mkspecs/linux-ecc-64/qplatformdefs.h +++ b/mkspecs/linux-ecc-64/qplatformdefs.h @@ -59,7 +59,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/linux-g++-32/qplatformdefs.h b/mkspecs/linux-g++-32/qplatformdefs.h index c35609e16..2a5b12f5b 100644 --- a/mkspecs/linux-g++-32/qplatformdefs.h +++ b/mkspecs/linux-g++-32/qplatformdefs.h @@ -59,7 +59,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/linux-g++-64/qplatformdefs.h b/mkspecs/linux-g++-64/qplatformdefs.h index c35609e16..2a5b12f5b 100644 --- a/mkspecs/linux-g++-64/qplatformdefs.h +++ b/mkspecs/linux-g++-64/qplatformdefs.h @@ -59,7 +59,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/linux-g++-sparc/qplatformdefs.h b/mkspecs/linux-g++-sparc/qplatformdefs.h index 67e617853..9e071fd52 100644 --- a/mkspecs/linux-g++-sparc/qplatformdefs.h +++ b/mkspecs/linux-g++-sparc/qplatformdefs.h @@ -59,7 +59,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h index 67e617853..9e071fd52 100644 --- a/mkspecs/linux-g++/qplatformdefs.h +++ b/mkspecs/linux-g++/qplatformdefs.h @@ -59,7 +59,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/linux-icc/qplatformdefs.h b/mkspecs/linux-icc/qplatformdefs.h index c35609e16..2a5b12f5b 100644 --- a/mkspecs/linux-icc/qplatformdefs.h +++ b/mkspecs/linux-icc/qplatformdefs.h @@ -59,7 +59,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/linux-kcc/qplatformdefs.h b/mkspecs/linux-kcc/qplatformdefs.h index 692b8d1ed..a922042e8 100644 --- a/mkspecs/linux-kcc/qplatformdefs.h +++ b/mkspecs/linux-kcc/qplatformdefs.h @@ -62,7 +62,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/linux-kylix/qplatformdefs.h b/mkspecs/linux-kylix/qplatformdefs.h index c35609e16..2a5b12f5b 100644 --- a/mkspecs/linux-kylix/qplatformdefs.h +++ b/mkspecs/linux-kylix/qplatformdefs.h @@ -59,7 +59,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/linux-pgcc/qplatformdefs.h b/mkspecs/linux-pgcc/qplatformdefs.h index c35609e16..2a5b12f5b 100644 --- a/mkspecs/linux-pgcc/qplatformdefs.h +++ b/mkspecs/linux-pgcc/qplatformdefs.h @@ -59,7 +59,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/lynxos-g++/qplatformdefs.h b/mkspecs/lynxos-g++/qplatformdefs.h index bf9cc3496..882fc3807 100644 --- a/mkspecs/lynxos-g++/qplatformdefs.h +++ b/mkspecs/lynxos-g++/qplatformdefs.h @@ -44,7 +44,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/macx-g++/qplatformdefs.h b/mkspecs/macx-g++/qplatformdefs.h index 7ed97a070..6ea456e4c 100644 --- a/mkspecs/macx-g++/qplatformdefs.h +++ b/mkspecs/macx-g++/qplatformdefs.h @@ -43,7 +43,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/macx-mwerks/qmake.conf b/mkspecs/macx-mwerks/qmake.conf index 0bec11967..ca68c1b08 100644 --- a/mkspecs/macx-mwerks/qmake.conf +++ b/mkspecs/macx-mwerks/qmake.conf @@ -7,7 +7,7 @@ MAKEFILE_GENERATOR = METROWERKS TEMPLATE = app CONFIG += qt release warn_off separate_volume link_prl -DEFINES += QT_NO_STL __MACOSX__ __CF_USE_FRAMEWORK_INCLUDES__ +DEFINES += TQT_NO_STL __MACOSX__ __CF_USE_FRAMEWORK_INCLUDES__ CODEWARRIOR_LINKER = Mach-O PPC Linker QMAKE_EXTENSION_SHLIB = dylib diff --git a/mkspecs/macx-mwerks/qplatformdefs.h b/mkspecs/macx-mwerks/qplatformdefs.h index dedac14ef..174711478 100644 --- a/mkspecs/macx-mwerks/qplatformdefs.h +++ b/mkspecs/macx-mwerks/qplatformdefs.h @@ -38,7 +38,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/macx-pbuilder/qplatformdefs.h b/mkspecs/macx-pbuilder/qplatformdefs.h index 7ed97a070..6ea456e4c 100644 --- a/mkspecs/macx-pbuilder/qplatformdefs.h +++ b/mkspecs/macx-pbuilder/qplatformdefs.h @@ -43,7 +43,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/macx-xlc/qplatformdefs.h b/mkspecs/macx-xlc/qplatformdefs.h index 7ed97a070..6ea456e4c 100644 --- a/mkspecs/macx-xlc/qplatformdefs.h +++ b/mkspecs/macx-xlc/qplatformdefs.h @@ -43,7 +43,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/netbsd-g++/qplatformdefs.h b/mkspecs/netbsd-g++/qplatformdefs.h index dd228457f..214c627b8 100644 --- a/mkspecs/netbsd-g++/qplatformdefs.h +++ b/mkspecs/netbsd-g++/qplatformdefs.h @@ -43,7 +43,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/openbsd-g++/qplatformdefs.h b/mkspecs/openbsd-g++/qplatformdefs.h index 0e50be023..ba7eee011 100644 --- a/mkspecs/openbsd-g++/qplatformdefs.h +++ b/mkspecs/openbsd-g++/qplatformdefs.h @@ -43,7 +43,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/qnx-g++/qplatformdefs.h b/mkspecs/qnx-g++/qplatformdefs.h index 9b47fcd66..d08a55905 100644 --- a/mkspecs/qnx-g++/qplatformdefs.h +++ b/mkspecs/qnx-g++/qplatformdefs.h @@ -45,7 +45,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/reliant-cds-64/qplatformdefs.h b/mkspecs/reliant-cds-64/qplatformdefs.h index eca031af1..20ea52b4d 100644 --- a/mkspecs/reliant-cds-64/qplatformdefs.h +++ b/mkspecs/reliant-cds-64/qplatformdefs.h @@ -39,7 +39,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/reliant-cds/qplatformdefs.h b/mkspecs/reliant-cds/qplatformdefs.h index 978e57c22..9f349fe33 100644 --- a/mkspecs/reliant-cds/qplatformdefs.h +++ b/mkspecs/reliant-cds/qplatformdefs.h @@ -39,7 +39,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/sco-cc/qplatformdefs.h b/mkspecs/sco-cc/qplatformdefs.h index 21ebf4c1d..c6b9d3df3 100644 --- a/mkspecs/sco-cc/qplatformdefs.h +++ b/mkspecs/sco-cc/qplatformdefs.h @@ -44,7 +44,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/sco-g++/qplatformdefs.h b/mkspecs/sco-g++/qplatformdefs.h index 5422cfa31..606e30223 100644 --- a/mkspecs/sco-g++/qplatformdefs.h +++ b/mkspecs/sco-g++/qplatformdefs.h @@ -50,7 +50,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/solaris-cc-64/qplatformdefs.h b/mkspecs/solaris-cc-64/qplatformdefs.h index 63114609d..d912a2bdf 100644 --- a/mkspecs/solaris-cc-64/qplatformdefs.h +++ b/mkspecs/solaris-cc-64/qplatformdefs.h @@ -44,7 +44,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/solaris-cc/qplatformdefs.h b/mkspecs/solaris-cc/qplatformdefs.h index 8c3606d59..296911bb5 100644 --- a/mkspecs/solaris-cc/qplatformdefs.h +++ b/mkspecs/solaris-cc/qplatformdefs.h @@ -45,7 +45,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/solaris-g++-64/qplatformdefs.h b/mkspecs/solaris-g++-64/qplatformdefs.h index d3fab7ea5..d08eb70d1 100644 --- a/mkspecs/solaris-g++-64/qplatformdefs.h +++ b/mkspecs/solaris-g++-64/qplatformdefs.h @@ -47,7 +47,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/solaris-g++/qplatformdefs.h b/mkspecs/solaris-g++/qplatformdefs.h index c27f28d71..f1c2a3d09 100644 --- a/mkspecs/solaris-g++/qplatformdefs.h +++ b/mkspecs/solaris-g++/qplatformdefs.h @@ -47,7 +47,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/tru64-cxx/qplatformdefs.h b/mkspecs/tru64-cxx/qplatformdefs.h index 98e44b644..f5962aa34 100644 --- a/mkspecs/tru64-cxx/qplatformdefs.h +++ b/mkspecs/tru64-cxx/qplatformdefs.h @@ -39,7 +39,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/tru64-g++/qplatformdefs.h b/mkspecs/tru64-g++/qplatformdefs.h index 89c2d2e33..54ce41ce6 100644 --- a/mkspecs/tru64-g++/qplatformdefs.h +++ b/mkspecs/tru64-g++/qplatformdefs.h @@ -39,7 +39,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/unixware-cc/qplatformdefs.h b/mkspecs/unixware-cc/qplatformdefs.h index 21ebf4c1d..c6b9d3df3 100644 --- a/mkspecs/unixware-cc/qplatformdefs.h +++ b/mkspecs/unixware-cc/qplatformdefs.h @@ -44,7 +44,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/mkspecs/unixware-g++/qplatformdefs.h b/mkspecs/unixware-g++/qplatformdefs.h index 21ebf4c1d..c6b9d3df3 100644 --- a/mkspecs/unixware-g++/qplatformdefs.h +++ b/mkspecs/unixware-g++/qplatformdefs.h @@ -44,7 +44,7 @@ #include <resolv.h> -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 1199d0a1c..c6a3906da 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -35,7 +35,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef CXXFLAGS= @QMAKE_CXXFLAGS@ \ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ -I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \ + -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DTQT_NO_STL \ -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP LFLAGS=@QMAKE_LFLAGS@ diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index b1598dfd9..564bfa2be 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -5,7 +5,7 @@ CXX = g++ CFLAGS = -c -o$@ -O \ -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -I..\include -I..\src\tools \ -I..\mkspecs\win32-g++ \ - -DUNICODE -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS + -DUNICODE -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DTQT_NO_STL -DQT_NO_COMPRESS CXXFLAGS = $(CFLAGS) LFLAGS = LIBS = -lole32 -luuid diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 48e6ef545..789176b9c 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -922,7 +922,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) << outdir << "allmoc.cpp: " << precomph << " " << varList("HEADERS_ORIG") << "\n\t" << "echo '#include \"" << precomph << "\"' >" << outdir << "allmoc.cpp" << "\n\t" - << "$(CXX) -E -DQT_MOC_CPP -DQT_NO_STL $(CXXFLAGS) $(INCPATH) >" << outdir << "allmoc.h " + << "$(CXX) -E -DQT_MOC_CPP -DTQT_NO_STL $(CXXFLAGS) $(INCPATH) >" << outdir << "allmoc.h " << outdir << "allmoc.cpp" << "\n\t" << "$(MOC) -o " << outdir << "allmoc.cpp " << outdir << "allmoc.h" << "\n\t" << "perl -pi -e 's{#include \"allmoc.h\"}{#define QT_H_CPP\\n#include \"" diff --git a/src/attic/qtmultilineedit.cpp b/src/attic/qtmultilineedit.cpp index 8361bedcd..27a65e4f5 100644 --- a/src/attic/qtmultilineedit.cpp +++ b/src/attic/qtmultilineedit.cpp @@ -24,7 +24,7 @@ #include "ntqtimer.h" #include "ntqdict.h" #include "ntqcursor.h" -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #include "ntqstyle.h" #endif @@ -2384,7 +2384,7 @@ void TQtMultiLineEdit::mouseReleaseEvent( TQMouseEvent *e ) #if defined(_WS_X11_) paste(); // Will repaint the cursor line. #else -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT if ( style().styleHint(TQStyle::SH_GUIStyle) == TQt::MotifStyle ) paste(); #endif diff --git a/src/canvas/ntqcanvas.h b/src/canvas/ntqcanvas.h index b3c25470e..8b2958dcb 100644 --- a/src/canvas/ntqcanvas.h +++ b/src/canvas/ntqcanvas.h @@ -143,7 +143,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/src/compat/ntqarray.h b/src/compat/ntqarray.h index dc29acdaa..4f266e542 100644 --- a/src/compat/ntqarray.h +++ b/src/compat/ntqarray.h @@ -21,7 +21,7 @@ *****************************************************************************/ #ifndef TQARRAY_H #define TQARRAY_H -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #include "ntqmemarray.h" #endif #endif diff --git a/src/compat/ntqcollection.h b/src/compat/ntqcollection.h index e7ddd71d8..d285b6d40 100644 --- a/src/compat/ntqcollection.h +++ b/src/compat/ntqcollection.h @@ -21,7 +21,7 @@ *****************************************************************************/ #ifndef TQCOLLECTION_H #define TQCOLLECTION_H -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #include "ntqptrcollection.h" #endif #endif diff --git a/src/compat/ntqlist.h b/src/compat/ntqlist.h index 444cb3be3..4d75178cc 100644 --- a/src/compat/ntqlist.h +++ b/src/compat/ntqlist.h @@ -21,7 +21,7 @@ *****************************************************************************/ #ifndef TQLIST_H #define TQLIST_H -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #include "ntqptrlist.h" #endif #endif diff --git a/src/compat/ntqqueue.h b/src/compat/ntqqueue.h index 0af0f1c99..7165a2ed7 100644 --- a/src/compat/ntqqueue.h +++ b/src/compat/ntqqueue.h @@ -21,7 +21,7 @@ *****************************************************************************/ #ifndef TQQUEUE_H #define TQQUEUE_H -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #include "ntqptrqueue.h" #endif #endif diff --git a/src/compat/ntqstack.h b/src/compat/ntqstack.h index 43d3ad9ac..41c5992f0 100644 --- a/src/compat/ntqstack.h +++ b/src/compat/ntqstack.h @@ -21,7 +21,7 @@ *****************************************************************************/ #ifndef TQSTACK_H #define TQSTACK_H -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #include "ntqptrstack.h" #endif #endif diff --git a/src/compat/ntqvector.h b/src/compat/ntqvector.h index 116edaf38..54491f813 100644 --- a/src/compat/ntqvector.h +++ b/src/compat/ntqvector.h @@ -21,7 +21,7 @@ *****************************************************************************/ #ifndef TQVECTOR_H #define TQVECTOR_H -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #include "ntqptrvector.h" #endif #endif diff --git a/src/dialogs/ntqsemimodal.h b/src/dialogs/ntqsemimodal.h index eaa87c43f..107ed2c9a 100644 --- a/src/dialogs/ntqsemimodal.h +++ b/src/dialogs/ntqsemimodal.h @@ -45,7 +45,7 @@ #include "ntqdialog.h" #endif // QT_H -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #ifndef QT_NO_SEMIMODAL class Q_EXPORT TQSemiModal : public TQDialog { diff --git a/src/kernel/ntqabstractlayout.h b/src/kernel/ntqabstractlayout.h index 88a0eeff9..9d7697629 100644 --- a/src/kernel/ntqabstractlayout.h +++ b/src/kernel/ntqabstractlayout.h @@ -46,7 +46,7 @@ */ #ifndef QT_H -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #include "ntqlayout.h" #endif #endif // QT_H diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h index f50606130..9ae120f2b 100644 --- a/src/kernel/ntqapplication.h +++ b/src/kernel/ntqapplication.h @@ -174,7 +174,7 @@ public: static void beep(); -#ifndef QT_NO_TRANSLATION +#ifndef TQT_NO_TRANSLATION # ifndef QT_NO_TEXTCODEC void setDefaultCodec( TQTextCodec * ); TQTextCodec* defaultCodec() const; @@ -539,7 +539,7 @@ inline TQSize TQApplication::globalStrut() return app_strut; } -#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/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h index a960d9788..fbcca3abb 100644 --- a/src/kernel/ntqdragobject.h +++ b/src/kernel/ntqdragobject.h @@ -216,7 +216,7 @@ private: #endif }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT typedef TQUriDrag TQUrlDrag; #endif diff --git a/src/kernel/ntqfont.h b/src/kernel/ntqfont.h index 0d205410e..b3a0911fc 100644 --- a/src/kernel/ntqfont.h +++ b/src/kernel/ntqfont.h @@ -301,12 +301,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/src/kernel/ntqfontdatabase.h b/src/kernel/ntqfontdatabase.h index 482e36634..bc686cabc 100644 --- a/src/kernel/ntqfontdatabase.h +++ b/src/kernel/ntqfontdatabase.h @@ -97,7 +97,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; @@ -115,7 +115,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) @@ -136,7 +136,7 @@ private: }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT inline TQStringList TQFontDatabase::families( bool ) const { @@ -220,7 +220,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/src/kernel/ntqfontmetrics.h b/src/kernel/ntqfontmetrics.h index 7c8c7b610..99bdbe0d1 100644 --- a/src/kernel/ntqfontmetrics.h +++ b/src/kernel/ntqfontmetrics.h @@ -79,7 +79,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/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h index 0d3d1b5e4..ef772989a 100644 --- a/src/kernel/ntqnamespace.h +++ b/src/kernel/ntqnamespace.h @@ -250,7 +250,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, @@ -303,7 +303,7 @@ public: OpaqueMode }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT // documented in qpainter.cpp enum PaintUnit { // paint unit PixelUnit, @@ -316,10 +316,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. GtkStyle = 6 // Gtk compability mode }; #else @@ -933,7 +933,7 @@ public: DockRight, DockLeft, DockMinimized -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT , Unmanaged = DockUnmanaged, TornOff = DockTornOff, diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h index c81dc9d31..d7e3a17a3 100644 --- a/src/kernel/ntqobject.h +++ b/src/kernel/ntqobject.h @@ -150,12 +150,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(); @@ -272,7 +272,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 ); } @@ -281,7 +281,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/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h index a8dce0707..43cd84cfb 100644 --- a/src/kernel/ntqobjectdefs.h +++ b/src/kernel/ntqobjectdefs.h @@ -46,7 +46,7 @@ #endif // QT_H -#ifndef QT_NO_TRANSLATION +#ifndef TQT_NO_TRANSLATION # ifndef QT_NO_TEXTCODEC // full set of tr functions # define TQT_TR_FUNCTIONS \ diff --git a/src/kernel/ntqpalette.h b/src/kernel/ntqpalette.h index b3b155f25..9bffe41bf 100644 --- a/src/kernel/ntqpalette.h +++ b/src/kernel/ntqpalette.h @@ -137,14 +137,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/src/kernel/ntqsignal.h b/src/kernel/ntqsignal.h index 281b2278a..8d14385ac 100644 --- a/src/kernel/ntqsignal.h +++ b/src/kernel/ntqsignal.h @@ -60,7 +60,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/src/kernel/ntqsizepolicy.h b/src/kernel/ntqsizepolicy.h index ef13db7c4..3fc4dd2fb 100644 --- a/src/kernel/ntqsizepolicy.h +++ b/src/kernel/ntqsizepolicy.h @@ -64,7 +64,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/src/kernel/ntqsound.h b/src/kernel/ntqsound.h index c7998f349..5c6a41b06 100644 --- a/src/kernel/ntqsound.h +++ b/src/kernel/ntqsound.h @@ -66,7 +66,7 @@ public: ? */ -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT static bool available() { return isAvailable(); } #endif diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h index f19485523..51bf61b1b 100644 --- a/src/kernel/ntqstyle.h +++ b/src/kernel/ntqstyle.h @@ -1199,7 +1199,7 @@ public: // Old 2.x TQStyle API -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT int defaultFrameWidth() const; void tabbarMetrics( const TQWidget* t, int& hf, int& vf, int& ov ) const; TQSize scrollBarExtent() const; diff --git a/src/kernel/ntqthread.h b/src/kernel/ntqthread.h index a38a2dfa1..edf45f89c 100644 --- a/src/kernel/ntqthread.h +++ b/src/kernel/ntqthread.h @@ -45,11 +45,11 @@ #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> @@ -61,7 +61,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/src/kernel/ntqtranslator.h b/src/kernel/ntqtranslator.h index bbbda7eed..5d6709db8 100644 --- a/src/kernel/ntqtranslator.h +++ b/src/kernel/ntqtranslator.h @@ -47,7 +47,7 @@ #include "ntqvaluelist.h" #endif // QT_H -#ifndef QT_NO_TRANSLATION +#ifndef TQT_NO_TRANSLATION class TQTranslatorPrivate; @@ -109,7 +109,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(); } @@ -128,7 +128,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 ); @@ -162,6 +162,6 @@ private: TQTranslatorPrivate * d; }; -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION #endif diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h index bac3d6bc9..2dbb6701d 100644 --- a/src/kernel/ntqwidget.h +++ b/src/kernel/ntqwidget.h @@ -356,7 +356,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(); @@ -414,7 +414,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/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index 4ee67cd4d..146659572 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -1210,7 +1210,7 @@ TQApplication::~TQApplication() delete app_cursor; app_cursor = 0; #endif -#ifndef QT_NO_TRANSLATION +#ifndef TQT_NO_TRANSLATION delete translators; #endif @@ -3161,7 +3161,7 @@ TQt::WindowsVersion TQApplication::winVersion() } #endif -#ifndef QT_NO_TRANSLATION +#ifndef TQT_NO_TRANSLATION bool qt_detectRTLLanguage() { @@ -3192,7 +3192,7 @@ void TQApplication::installTranslator( TQTranslator * mf ) translators->prepend( mf ); -#ifndef QT_NO_TRANSLATION_BUILDER +#ifndef TQT_NO_TRANSLATION_BUILDER if ( mf->isEmpty() ) return; #endif diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp index a49dd3493..856db67dc 100644 --- a/src/kernel/qfont.cpp +++ b/src/kernel/qfont.cpp @@ -1343,7 +1343,7 @@ TQFont TQFont::resolve( const TQFont &other ) const return font; } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT /*! \obsolete diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp index dfcf450dd..8a992e632 100644 --- a/src/kernel/qlayout.cpp +++ b/src/kernel/qlayout.cpp @@ -1399,7 +1399,7 @@ void TQGridLayout::setColStretch( int col, int stretch ) } #if TQT_VERSION >= 0x040000 -#error "Make add{Row,Col}Spacing() inline QT_NO_COMPAT functions defined in terms of set{Row,Col}Spacing()" +#error "Make add{Row,Col}Spacing() inline TQT_NO_COMPAT functions defined in terms of set{Row,Col}Spacing()" #endif /*! diff --git a/src/kernel/qsignal.cpp b/src/kernel/qsignal.cpp index acc74829f..8d91f0e6f 100644 --- a/src/kernel/qsignal.cpp +++ b/src/kernel/qsignal.cpp @@ -241,7 +241,7 @@ TQVariant TQSignal::value() const \internal */ -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT /*! \obsolete */ void TQSignal::setParameter( int value ) { diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp index 4204c9941..7a90fec1d 100644 --- a/src/kernel/qstyle.cpp +++ b/src/kernel/qstyle.cpp @@ -2806,7 +2806,7 @@ TQPixmap TQStyle::stylePixmap(StylePixmap sp, const TQWidget *w, const TQStyleOp \obsolete */ -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT int TQStyle::defaultFrameWidth() const { TQStyleControlElementData ceData; diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h index e80d7bd6f..cdde3e790 100644 --- a/src/kernel/qt_pch.h +++ b/src/kernel/qt_pch.h @@ -16,7 +16,7 @@ #if defined __cplusplus # if defined(__GNUC__) -# ifndef QT_NO_STL +# ifndef TQT_NO_STL # include <ios> # undef _GLIBCPP_FULLY_COMPLIANT_HEADERS // Makes qlocale.cpp compile # endif @@ -44,7 +44,7 @@ #include <limits.h> #include <stdlib.h> #if defined(__GNUC__) -# ifndef QT_NO_STL +# ifndef TQT_NO_STL # define _GLIBCPP_FULLY_COMPLIANT_HEADERS # endif #endif diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp index d6cd01f6e..f3f416096 100644 --- a/src/kernel/qthread.cpp +++ b/src/kernel/qthread.cpp @@ -256,7 +256,7 @@ bool TQThread::threadPostedEventsDisabled() const \sa wait() */ -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT /*! \obsolete Use TQApplication::postEvent() instead. */ diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp index 884c81977..9e429b789 100644 --- a/src/kernel/qtranslator.cpp +++ b/src/kernel/qtranslator.cpp @@ -54,7 +54,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode) #include "ntqtranslator.h" -#ifndef QT_NO_TRANSLATION +#ifndef TQT_NO_TRANSLATION #include "ntqfileinfo.h" #include "ntqwidgetlist.h" @@ -192,7 +192,7 @@ public: TQTranslatorPrivate() : unmapPointer( 0 ), unmapLength( 0 ), messageArray( 0 ), offsetArray( 0 ), contextArray( 0 ) -#ifndef QT_NO_TRANSLATION_BUILDER +#ifndef TQT_NO_TRANSLATION_BUILDER , messages( 0 ) #endif { } @@ -207,7 +207,7 @@ public: TQByteArray * offsetArray; TQByteArray * contextArray; -#ifndef QT_NO_TRANSLATION_BUILDER +#ifndef TQT_NO_TRANSLATION_BUILDER TQMap<TQTranslatorMessage, void *> * messages; #endif #ifdef Q_WS_WIN @@ -602,7 +602,7 @@ bool TQTranslator::do_load( const uchar *data, int len ) return ok; } -#ifndef QT_NO_TRANSLATION_BUILDER +#ifndef TQT_NO_TRANSLATION_BUILDER /*! Saves this message file to \a filename, overwriting the previous @@ -685,7 +685,7 @@ void TQTranslator::clear() delete d->contextArray; d->contextArray = 0; } -#ifndef QT_NO_TRANSLATION_BUILDER +#ifndef TQT_NO_TRANSLATION_BUILDER delete d->messages; d->messages = 0; #endif @@ -705,7 +705,7 @@ void TQTranslator::clear() } } -#ifndef QT_NO_TRANSLATION_BUILDER +#ifndef TQT_NO_TRANSLATION_BUILDER /*! Converts this message file to the compact format used to store @@ -973,7 +973,7 @@ TQTranslatorMessage TQTranslator::findMessage( const char* context, if ( comment == 0 ) comment = ""; -#ifndef QT_NO_TRANSLATION_BUILDER +#ifndef TQT_NO_TRANSLATION_BUILDER if ( d->messages ) { TQMap<TQTranslatorMessage, void *>::ConstIterator it; @@ -1078,14 +1078,14 @@ bool TQTranslator::isEmpty() const { return !( d->unmapPointer || d->unmapLength || d->messageArray || d->offsetArray || d->contextArray -#ifndef QT_NO_TRANSLATION_BUILDER +#ifndef TQT_NO_TRANSLATION_BUILDER || (d->messages && d->messages->count()) #endif ); } -#ifndef QT_NO_TRANSLATION_BUILDER +#ifndef TQT_NO_TRANSLATION_BUILDER /*! Returns a list of the messages in the translator. This function is @@ -1475,4 +1475,4 @@ bool TQTranslatorMessage::operator<( const TQTranslatorMessage& m ) const otherwise returns FALSE. */ -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION diff --git a/src/moc/moc.pro b/src/moc/moc.pro index efa808104..d94d596ec 100644 --- a/src/moc/moc.pro +++ b/src/moc/moc.pro @@ -3,7 +3,7 @@ TARGET = tqmoc CONFIG = console release qtinc yacc lex_included yacc_no_name_mangle DEFINES += QT_MOC QT_NO_CODECS QT_LITE_UNICODE QT_NO_COMPONENT \ - QT_NO_STL QT_NO_COMPRESS + TQT_NO_STL QT_NO_COMPRESS win32:DEFINES += QT_NODLL DESTDIR = ../../bin diff --git a/src/moc/moc.y b/src/moc/moc.y index e75546058..780669e9e 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -2879,15 +2879,15 @@ void generateClass() // generate C++ source code for a class if ( !g->noInclude ) { /* The header file might be a TQt header file with - QT_NO_COMPAT macros around signals, slots or + TQT_NO_COMPAT macros around signals, slots or properties. Without the #undef, we cannot compile the - TQt library with QT_NO_COMPAT defined. + TQt library with TQT_NO_COMPAT defined. Header files of libraries build around TQt can also use - QT_NO_COMPAT, so this #undef might be beneficial to + TQT_NO_COMPAT, so this #undef might be beneficial to users of TQt, and not only to developers of TQt. */ - fprintf( out, "#undef QT_NO_COMPAT\n" ); + fprintf( out, "#undef TQT_NO_COMPAT\n" ); if ( !g->pchFile.isEmpty() ) fprintf( out, "#include \"%s\" // PCH include\n", (const char*)g->pchFile ); @@ -2959,7 +2959,7 @@ void generateClass() // generate C++ source code for a class // // Generate tr and trUtf8 member functions // - fprintf( out, "#ifndef QT_NO_TRANSLATION\n" ); + fprintf( out, "#ifndef TQT_NO_TRANSLATION\n" ); fprintf( out, "TQString %s::tr( const char *s, const char *c )\n{\n", (const char*)qualifiedClassName() ); fprintf( out, " if ( tqApp )\n" ); @@ -2969,7 +2969,7 @@ void generateClass() // generate C++ source code for a class fprintf( out, " else\n" ); fprintf( out, "\treturn TQString::fromLatin1( s );\n"); fprintf( out, "}\n" ); - fprintf( out, "#ifndef QT_NO_TRANSLATION_UTF8\n" ); + fprintf( out, "#ifndef TQT_NO_TRANSLATION_UTF8\n" ); fprintf( out, "TQString %s::trUtf8( const char *s, const char *c )\n{\n", (const char*)qualifiedClassName() ); fprintf( out, " if ( tqApp )\n" ); @@ -2979,8 +2979,8 @@ void generateClass() // generate C++ source code for a class fprintf( out, " else\n" ); fprintf( out, "\treturn TQString::fromUtf8( s );\n" ); fprintf( out, "}\n" ); - fprintf( out, "#endif // QT_NO_TRANSLATION_UTF8\n\n" ); - fprintf( out, "#endif // QT_NO_TRANSLATION\n\n" ); + fprintf( out, "#endif // TQT_NO_TRANSLATION_UTF8\n\n" ); + fprintf( out, "#endif // TQT_NO_TRANSLATION\n\n" ); // // Generate staticMetaObject member function diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index abeab2d71..8ae53116a 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -5754,15 +5754,15 @@ void generateClass() // generate C++ source code for a class if ( !g->noInclude ) { /* The header file might be a TQt header file with - QT_NO_COMPAT macros around signals, slots or + TQT_NO_COMPAT macros around signals, slots or properties. Without the #undef, we cannot compile the - TQt library with QT_NO_COMPAT defined. + TQt library with TQT_NO_COMPAT defined. Header files of libraries build around TQt can also use - QT_NO_COMPAT, so this #undef might be beneficial to + TQT_NO_COMPAT, so this #undef might be beneficial to users of TQt, and not only to developers of TQt. */ - fprintf( out, "#undef QT_NO_COMPAT\n" ); + fprintf( out, "#undef TQT_NO_COMPAT\n" ); if ( !g->pchFile.isEmpty() ) fprintf( out, "#include \"%s\" // PCH include\n", (const char*)g->pchFile ); @@ -5834,7 +5834,7 @@ void generateClass() // generate C++ source code for a class // // Generate tr and trUtf8 member functions // - fprintf( out, "#ifndef QT_NO_TRANSLATION\n" ); + fprintf( out, "#ifndef TQT_NO_TRANSLATION\n" ); fprintf( out, "TQString %s::tr( const char *s, const char *c )\n{\n", (const char*)qualifiedClassName() ); fprintf( out, " if ( tqApp )\n" ); @@ -5844,7 +5844,7 @@ void generateClass() // generate C++ source code for a class fprintf( out, " else\n" ); fprintf( out, "\treturn TQString::fromLatin1( s );\n"); fprintf( out, "}\n" ); - fprintf( out, "#ifndef QT_NO_TRANSLATION_UTF8\n" ); + fprintf( out, "#ifndef TQT_NO_TRANSLATION_UTF8\n" ); fprintf( out, "TQString %s::trUtf8( const char *s, const char *c )\n{\n", (const char*)qualifiedClassName() ); fprintf( out, " if ( tqApp )\n" ); @@ -5854,8 +5854,8 @@ void generateClass() // generate C++ source code for a class fprintf( out, " else\n" ); fprintf( out, "\treturn TQString::fromUtf8( s );\n" ); fprintf( out, "}\n" ); - fprintf( out, "#endif // QT_NO_TRANSLATION_UTF8\n\n" ); - fprintf( out, "#endif // QT_NO_TRANSLATION\n\n" ); + fprintf( out, "#endif // TQT_NO_TRANSLATION_UTF8\n\n" ); + fprintf( out, "#endif // TQT_NO_TRANSLATION\n\n" ); // // Generate staticMetaObject member function diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h index a8f933cf7..191f6161a 100644 --- a/src/opengl/ntqgl.h +++ b/src/opengl/ntqgl.h @@ -52,7 +52,7 @@ #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/src/tools/ntqdatetime.h b/src/tools/ntqdatetime.h index ea7e73203..8439bf5fe 100644 --- a/src/tools/ntqdatetime.h +++ b/src/tools/ntqdatetime.h @@ -71,7 +71,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/src/tools/ntqfeatures.h b/src/tools/ntqfeatures.h index e5a8e786f..289190a3e 100644 --- a/src/tools/ntqfeatures.h +++ b/src/tools/ntqfeatures.h @@ -141,7 +141,7 @@ //#define QT_NO_SOUND // Standard template library compatiblity -//#define QT_NO_STL +//#define TQT_NO_STL // TQStringList //#define QT_NO_STRINGLIST @@ -328,8 +328,8 @@ #endif // Translations via TQObject::tr() -#if !defined(QT_NO_TRANSLATION) && (defined(QT_NO_DATASTREAM)) -#define QT_NO_TRANSLATION +#if !defined(TQT_NO_TRANSLATION) && (defined(QT_NO_DATASTREAM)) +#define TQT_NO_TRANSLATION #endif // Window icon and caption @@ -428,8 +428,8 @@ #endif // Translations via TQObject::trUtf8() -#if !defined(QT_NO_TRANSLATION_UTF8) && (defined(QT_NO_TRANSLATION) || defined(QT_NO_TEXTCODEC)) -#define QT_NO_TRANSLATION_UTF8 +#if !defined(TQT_NO_TRANSLATION_UTF8) && (defined(TQT_NO_TRANSLATION) || defined(QT_NO_TEXTCODEC)) +#define TQT_NO_TRANSLATION_UTF8 #endif // URL parser diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index 55b7b9705..282fecea2 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -949,7 +949,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 @@ -992,13 +992,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 ); @@ -1009,20 +1009,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/src/tools/ntqmap.h b/src/tools/ntqmap.h index 3139e7fe9..d098f79be 100644 --- a/src/tools/ntqmap.h +++ b/src/tools/ntqmap.h @@ -49,7 +49,7 @@ #include "ntqvaluelist.h" #endif // QT_H -#ifndef QT_NO_STL +#ifndef TQT_NO_STL #include <iterator> #include <map> #include <cstddef> @@ -103,11 +103,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; @@ -219,11 +219,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; @@ -604,7 +604,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; @@ -631,7 +631,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>; @@ -652,7 +652,7 @@ public: } } 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(); @@ -735,7 +735,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/src/tools/ntqmemarray.h b/src/tools/ntqmemarray.h index 483671167..2febfb23b 100644 --- a/src/tools/ntqmemarray.h +++ b/src/tools/ntqmemarray.h @@ -112,7 +112,7 @@ public: ConstIterator end() const { return data() + size(); } }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQArray TQMemArray #endif diff --git a/src/tools/ntqptrcollection.h b/src/tools/ntqptrcollection.h index 5f0690afa..37ff0df30 100644 --- a/src/tools/ntqptrcollection.h +++ b/src/tools/ntqptrcollection.h @@ -73,7 +73,7 @@ protected: }; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQCollection TQPtrCollection #endif diff --git a/src/tools/ntqptrlist.h b/src/tools/ntqptrlist.h index 7418e5418..305be554e 100644 --- a/src/tools/ntqptrlist.h +++ b/src/tools/ntqptrlist.h @@ -185,7 +185,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/src/tools/ntqptrqueue.h b/src/tools/ntqptrqueue.h index 0f3cbbd34..90f743d02 100644 --- a/src/tools/ntqptrqueue.h +++ b/src/tools/ntqptrqueue.h @@ -87,7 +87,7 @@ template<class type> inline void TQPtrQueue<type>::deleteItem( TQPtrCollection:: if ( del_item ) delete (type *)d; } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQQueue TQPtrQueue #endif diff --git a/src/tools/ntqptrstack.h b/src/tools/ntqptrstack.h index 913dae356..d47416530 100644 --- a/src/tools/ntqptrstack.h +++ b/src/tools/ntqptrstack.h @@ -87,7 +87,7 @@ template<class type> inline void TQPtrStack<type>::deleteItem( TQPtrCollection:: if ( del_item ) delete (type *)d; } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQStack TQPtrStack #endif diff --git a/src/tools/ntqptrvector.h b/src/tools/ntqptrvector.h index 046dc9486..e3034a6a3 100644 --- a/src/tools/ntqptrvector.h +++ b/src/tools/ntqptrvector.h @@ -109,7 +109,7 @@ template<class type> inline void TQPtrVector<type>::deleteItem( TQPtrCollection: if ( del_item ) delete (type *)d; } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT #define TQVector TQPtrVector #endif diff --git a/src/tools/ntqregexp.h b/src/tools/ntqregexp.h index 075572224..d600e452f 100644 --- a/src/tools/ntqregexp.h +++ b/src/tools/ntqregexp.h @@ -78,7 +78,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/src/tools/ntqstring.h b/src/tools/ntqstring.h index e8381a0b5..b3c0a32cc 100644 --- a/src/tools/ntqstring.h +++ b/src/tools/ntqstring.h @@ -50,7 +50,7 @@ #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 ) @@ -408,14 +408,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 @@ -539,7 +539,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 ); @@ -549,7 +549,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 ); @@ -636,7 +636,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 ); @@ -662,10 +662,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 @@ -691,7 +691,7 @@ public: void compose(); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT const char* data() const { return ascii(); } #endif @@ -926,7 +926,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 @@ -1073,7 +1073,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/src/tools/ntqvaluelist.h b/src/tools/ntqvaluelist.h index 24a9cfc57..677c0cf51 100644 --- a/src/tools/ntqvaluelist.h +++ b/src/tools/ntqvaluelist.h @@ -47,7 +47,7 @@ #include "ntqdatastream.h" #endif // QT_H -#ifndef QT_NO_STL +#ifndef TQT_NO_STL #include <iterator> #include <list> #include <cstddef> @@ -79,12 +79,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; @@ -155,12 +155,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; @@ -428,7 +428,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; @@ -439,7 +439,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>; @@ -463,7 +463,7 @@ public: return *this; } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL TQValueList<T>& operator= ( const std::list<T>& l ) { detach(); diff --git a/src/tools/ntqvaluevector.h b/src/tools/ntqvaluevector.h index 6a50230e9..7bc80c640 100644 --- a/src/tools/ntqvaluevector.h +++ b/src/tools/ntqvaluevector.h @@ -47,7 +47,7 @@ #include "ntqdatastream.h" #endif // QT_H -#ifndef QT_NO_STL +#ifndef TQT_NO_STL #include <vector> #endif @@ -245,7 +245,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; @@ -264,7 +264,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() ); @@ -291,7 +291,7 @@ public: return *this; } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL TQValueVector<T>& operator= ( const std::vector<T>& v ) { clear(); diff --git a/src/tools/qconfig-large.h b/src/tools/qconfig-large.h index 63104ebec..1ce4e78cc 100644 --- a/src/tools/qconfig-large.h +++ b/src/tools/qconfig-large.h @@ -11,7 +11,7 @@ /* #define QT_NO_FREETYPE */ #define QT_NO_BDF //#define QT_NO_FONTDATABASE -#define QT_NO_TRANSLATION +#define TQT_NO_TRANSLATION #define QT_NO_DRAGANDDROP #define QT_NO_CLIPBOARD #define QT_NO_SOUND diff --git a/src/tools/qconfig-medium.h b/src/tools/qconfig-medium.h index f7df2dcd3..e10291188 100644 --- a/src/tools/qconfig-medium.h +++ b/src/tools/qconfig-medium.h @@ -12,7 +12,7 @@ /* #define QT_NO_FREETYPE */ #define QT_NO_BDF //#define QT_NO_FONTDATABASE -#define QT_NO_TRANSLATION +#define TQT_NO_TRANSLATION #define QT_NO_DRAGANDDROP #define QT_NO_CLIPBOARD #define QT_NO_SOUND diff --git a/src/tools/qconfig-minimal.h b/src/tools/qconfig-minimal.h index d3a795418..e08cd5e29 100644 --- a/src/tools/qconfig-minimal.h +++ b/src/tools/qconfig-minimal.h @@ -21,7 +21,7 @@ /* //#define QT_NO_FREETYPE //done by configure -no-freetype */ #define QT_NO_BDF //#define QT_NO_FONTDATABASE -#define QT_NO_TRANSLATION +#define TQT_NO_TRANSLATION #define QT_NO_MIME #define QT_NO_SOUND /* #define QT_NO_PROPERTIES */ @@ -87,8 +87,8 @@ #define QT_NO_IMAGE_HEURISTIC_MASK #define QT_NO_IMAGE_MIRROR -#ifndef QT_NO_STL -# define QT_NO_STL +#ifndef TQT_NO_STL +# define TQT_NO_STL #endif #define QT_NO_DATESTRING diff --git a/src/tools/qconfig-small.h b/src/tools/qconfig-small.h index 046c07e63..225098272 100644 --- a/src/tools/qconfig-small.h +++ b/src/tools/qconfig-small.h @@ -17,7 +17,7 @@ /* #define QT_NO_FREETYPE //done by configure -no-freetype */ #define QT_NO_BDF //#define QT_NO_FONTDATABASE -#define QT_NO_TRANSLATION +#define TQT_NO_TRANSLATION #define QT_NO_MIME #define QT_NO_SOUND #define QT_NO_PROPERTIES diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp index d5598c4db..7adf03768 100644 --- a/src/tools/qregexp.cpp +++ b/src/tools/qregexp.cpp @@ -3600,7 +3600,7 @@ bool TQRegExp::exactMatch( const TQString& str ) const } } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT /*! \obsolete Attempts to match in \a str, starting from position \a index. @@ -3625,7 +3625,7 @@ int TQRegExp::match( const TQString& str, int index, int *len, *len = matchedLength(); return pos; } -#endif // QT_NO_COMPAT +#endif // TQT_NO_COMPAT int TQRegExp::search( const TQString& str, int offset ) const { diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index 755d26776..6afe0687a 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -1630,7 +1630,7 @@ TQString::TQString( const char *str ) d = new TQStringData(uc,l,l); } -#ifndef QT_NO_STL +#ifndef TQT_NO_STL /*! Constructs a string that is a deep copy of \a str. @@ -5703,7 +5703,7 @@ void TQString::setExpand( uint index, TQChar c ) \endcode It will call "operator const char*()", which is inefficent; you - may wish to define the macro \c QT_NO_ASCII_CAST when writing code + may wish to define the macro \c TQT_NO_ASCII_CAST when writing code which you wish to remain Unicode-clean. When you want the above semantics, use: @@ -6314,7 +6314,7 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len ) 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 \c - QT_NO_ASCII_CAST when compiling your code to hide this function so + TQT_NO_ASCII_CAST 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!(). */ diff --git a/src/widgets/ntqaction.h b/src/widgets/ntqaction.h index 48f72f0fb..1ca1032c8 100644 --- a/src/widgets/ntqaction.h +++ b/src/widgets/ntqaction.h @@ -201,7 +201,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/src/widgets/ntqbutton.h b/src/widgets/ntqbutton.h index b59ac0909..9c47e60e2 100644 --- a/src/widgets/ntqbutton.h +++ b/src/widgets/ntqbutton.h @@ -96,7 +96,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 @@ -196,7 +196,7 @@ inline bool TQButton::isOn() const return ToggleState(stat) != Off; } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT inline bool TQButton::autoResize() const { return autoresize; diff --git a/src/widgets/ntqgrid.h b/src/widgets/ntqgrid.h index c557fa990..ff5bab2ba 100644 --- a/src/widgets/ntqgrid.h +++ b/src/widgets/ntqgrid.h @@ -56,7 +56,7 @@ public: void setSpacing( int ); TQSize sizeHint() const; -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT typedef Orientation Direction; #endif diff --git a/src/widgets/ntqlineedit.h b/src/widgets/ntqlineedit.h index f8aecede7..28d00b183 100644 --- a/src/widgets/ntqlineedit.h +++ b/src/widgets/ntqlineedit.h @@ -109,7 +109,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 @@ -135,7 +135,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 @@ -202,7 +202,7 @@ protected: bool sendMouseEventToInputContext( TQMouseEvent *e ); virtual TQPopupMenu *createPopupMenu(); void windowActivationChange( bool ); -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT void repaintArea( int, int ) { update(); } #endif diff --git a/src/widgets/ntqlistbox.h b/src/widgets/ntqlistbox.h index c9790959f..7584e4f81 100644 --- a/src/widgets/ntqlistbox.h +++ b/src/widgets/ntqlistbox.h @@ -169,7 +169,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; } @@ -258,7 +258,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(); } @@ -273,7 +273,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 @@ -331,7 +331,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/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h index 5ac2ad019..45733ea1c 100644 --- a/src/widgets/ntqtoolbutton.h +++ b/src/widgets/ntqtoolbutton.h @@ -94,7 +94,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/src/widgets/ntqtooltip.h b/src/widgets/ntqtooltip.h index 94feb9bfd..873634df0 100644 --- a/src/widgets/ntqtooltip.h +++ b/src/widgets/ntqtooltip.h @@ -114,7 +114,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/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp index 71a2763cb..eb2a196a6 100644 --- a/src/widgets/qbutton.cpp +++ b/src/widgets/qbutton.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "ntqbutton.h" #ifndef QT_NO_BUTTON #include "ntqbuttongroup.h" @@ -554,7 +554,7 @@ void TQButton::setAccel( const TQKeySequence& key ) } #endif -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT void TQButton::setAutoResize( bool enable ) { diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp index 71f29fc78..2e5e059fe 100644 --- a/src/widgets/qlistbox.cpp +++ b/src/widgets/qlistbox.cpp @@ -3958,7 +3958,7 @@ TQRect TQListBox::itemRect( TQListBoxItem *item ) const } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT /*! \obsolete @@ -4149,7 +4149,7 @@ void TQListBox::showEvent( TQShowEvent * ) ensureCurrentVisible(); } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT /*! \obsolete diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp index cb10ffba6..aa4ae4c1f 100644 --- a/src/widgets/qtoolbutton.cpp +++ b/src/widgets/qtoolbutton.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#undef QT_NO_COMPAT +#undef TQT_NO_COMPAT #include "ntqtoolbutton.h" #ifndef QT_NO_TOOLBUTTON @@ -685,7 +685,7 @@ void TQToolButton::setTextLabel( const TQString &newLabel , bool tipToo ) } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT TQIconSet TQToolButton::onIconSet() const { @@ -787,7 +787,7 @@ void TQToolButton::setIconSet( const TQIconSet & set ) \sa iconSet TQIconSet::State */ -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT void TQToolButton::setIconSet( const TQIconSet & set, bool /* on */ ) { @@ -818,7 +818,7 @@ TQIconSet TQToolButton::iconSet() const return TQIconSet(); } -#ifndef QT_NO_COMPAT +#ifndef TQT_NO_COMPAT /*! \overload \obsolete |