diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-17 19:46:30 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-17 19:46:30 +0900 |
| commit | 69d87202cb139ffe9e4b3ce92e434523b7b09b64 (patch) | |
| tree | 7b133311a4d5e5394f2612dced305f815c04847b /src/kernel | |
| parent | e07baa10b7b8e7105e02a621efadac67216c61ed (diff) | |
| download | tqt3-69d87202.tar.gz tqt3-69d87202.zip | |
QT_NO_* -> TQT_NO_* renaming.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/kernel')
149 files changed, 1235 insertions, 1235 deletions
diff --git a/src/kernel/ntqaccel.h b/src/kernel/ntqaccel.h index ae79380c..42ee4f77 100644 --- a/src/kernel/ntqaccel.h +++ b/src/kernel/ntqaccel.h @@ -46,7 +46,7 @@ #include "ntqkeysequence.h" #endif // QT_H -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL class TQAccelPrivate; @@ -106,5 +106,5 @@ private: friend class TQAccelManager; }; -#endif // QT_NO_ACCEL +#endif // TQT_NO_ACCEL #endif // TQACCEL_H diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h index 9ae120f2..e00289ab 100644 --- a/src/kernel/ntqapplication.h +++ b/src/kernel/ntqapplication.h @@ -92,7 +92,7 @@ public: Type type() const; -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE static TQStyle &style(); static void setStyle( TQStyle* ); static TQStyle* setStyle( const TQString& ); @@ -106,14 +106,14 @@ public: enum ColorSpec { NormalColor=0, CustomColor=1, ManyColor=2 }; static int colorSpec(); static void setColorSpec( int ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR static TQCursor *overrideCursor(); static void setOverrideCursor( const TQCursor &, bool replace=FALSE ); static void restoreOverrideCursor(); #endif static bool hasGlobalMouseTracking(); static void setGlobalMouseTracking( bool enable ); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE static TQPalette palette( const TQWidget* = 0 ); static TQPalette palette( TQStringList ); static void setPalette( const TQPalette &, bool informWidgets=FALSE, @@ -135,7 +135,7 @@ public: static TQWidget *activePopupWidget(); static TQWidget *activeModalWidget(); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD static TQClipboard *clipboard(); #endif TQWidget *focusWidget() const; @@ -175,7 +175,7 @@ public: static void beep(); #ifndef TQT_NO_TRANSLATION -# ifndef QT_NO_TEXTCODEC +# ifndef TQT_NO_TEXTCODEC void setDefaultCodec( TQTextCodec * ); TQTextCodec* defaultCodec() const; # endif @@ -187,11 +187,11 @@ public: const char * key, const char * comment = 0, Encoding encoding = DefaultCodec ) const; -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQString applicationDirPath(); TQString applicationFilePath(); #endif -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE // obsolete functions static void setWinStyleHighlightColor( const TQColor &c ) { TQPalette p( palette() ); @@ -210,19 +210,19 @@ public: static void setDoubleClickInterval( int ); static int doubleClickInterval(); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT static void setWheelScrollLines( int ); static int wheelScrollLines(); #endif static void setGlobalStrut( const TQSize & ); static TQSize globalStrut(); -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT static void setLibraryPaths( const TQStringList & ); static TQStringList libraryPaths(); static void addLibraryPath( const TQString & ); static void removeLibraryPath( const TQString & ); -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT static void setStartDragTime( int ms ); static int startDragTime(); static void setStartDragDistance( int l ); @@ -256,7 +256,7 @@ public: Returns true if the process is GUI server */ bool qwsIsGUIServer(); -#ifndef QT_NO_QWS_MANAGER +#ifndef TQT_NO_QWS_MANAGER static TQWSDecoration &qwsDecoration(); static void qwsSetDecoration( TQWSDecoration *); #endif @@ -272,7 +272,7 @@ public: static void winMouseButtonUp(); #endif -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER // session management bool isSessionRestored() const; TQString sessionId() const; @@ -281,7 +281,7 @@ public: virtual void saveState( TQSessionManager& sm ); #endif #if defined(Q_WS_X11) -#if !defined(QT_NO_IM_EXTENSIONS) +#if !defined(TQT_NO_IM_EXTENSIONS) virtual TQWidget *locateICHolderWidget( TQWidget *w ); virtual TQWidgetList *icHolderWidgets(); static void create_im(); @@ -365,11 +365,11 @@ private: int quit_code; static TQStyle *app_style; static int app_cspec; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE static TQPalette *app_pal; #endif static TQFont *app_font; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR static TQCursor *app_cursor; #endif #ifndef TQT_THREAD_SUPPORT @@ -400,21 +400,21 @@ private: static bool metaComposeUnicode; TQValueList<TQTranslator*> *translators; -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER TQSessionManager *session_manager; TQString session_id; static TQString* session_key; bool is_session_restored; #endif #if defined(Q_WS_X11) -#if !defined (QT_NO_STYLE) +#if !defined (TQT_NO_STYLE) static void x11_initialize_style(); #endif static TQString defaultIM; // default input method's name in this application. #endif static TQSize app_strut; -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT static TQStringList *app_libpaths; #endif static TQAsciiDict<TQPalette> *app_palettes; @@ -483,7 +483,7 @@ inline void TQApplication::setArgs(int c, char **v) } #endif -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR inline TQCursor *TQApplication::overrideCursor() { return app_cursor; @@ -518,7 +518,7 @@ inline bool TQApplication::inPopupMode() const { return popupWidgets != 0; } -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER inline bool TQApplication::isSessionRestored() const { return is_session_restored; @@ -544,7 +544,7 @@ inline TQSize TQApplication::globalStrut() inline TQString TQApplication::translate( const char *, const char *sourceText, const char *, Encoding encoding ) const { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( encoding == UnicodeUTF8 ) return TQString::fromUtf8( sourceText ); else diff --git a/src/kernel/ntqasyncimageio.h b/src/kernel/ntqasyncimageio.h index 25401c06..b307490e 100644 --- a/src/kernel/ntqasyncimageio.h +++ b/src/kernel/ntqasyncimageio.h @@ -45,7 +45,7 @@ #include "ntqimage.h" #endif // QT_H -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO #if __GNUC__ - 0 > 3 #pragma GCC system_header @@ -106,6 +106,6 @@ private: TQImageDecoderPrivate *d; }; -#endif // QT_NO_ASYNC_IMAGE_IO +#endif // TQT_NO_ASYNC_IMAGE_IO #endif // TQASYNCIMAGEIO_H diff --git a/src/kernel/ntqasyncio.h b/src/kernel/ntqasyncio.h index aa2968bc..b585032f 100644 --- a/src/kernel/ntqasyncio.h +++ b/src/kernel/ntqasyncio.h @@ -47,7 +47,7 @@ #include "ntqtimer.h" #endif // QT_H -#ifndef QT_NO_ASYNC_IO +#ifndef TQT_NO_ASYNC_IO class TQIODevice; @@ -115,6 +115,6 @@ private slots: void tryToPump(); }; -#endif // QT_NO_ASYNC_IO +#endif // TQT_NO_ASYNC_IO #endif diff --git a/src/kernel/ntqbitmap.h b/src/kernel/ntqbitmap.h index 90fe694e..a4e49a36 100644 --- a/src/kernel/ntqbitmap.h +++ b/src/kernel/ntqbitmap.h @@ -57,14 +57,14 @@ public: TQBitmap( int w, int h, const uchar *bits, bool isXbitmap=FALSE ); TQBitmap( const TQSize &, const uchar *bits, bool isXbitmap=FALSE ); TQBitmap( const TQBitmap & ); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQBitmap( const TQString &fileName, const char *format=0 ); #endif TQBitmap &operator=( const TQBitmap & ); TQBitmap &operator=( const TQPixmap & ); TQBitmap &operator=( const TQImage & ); -#ifndef QT_NO_PIXMAP_TRANSFORMATION +#ifndef TQT_NO_PIXMAP_TRANSFORMATION TQBitmap xForm( const TQWMatrix & ) const; #endif }; diff --git a/src/kernel/ntqbrush.h b/src/kernel/ntqbrush.h index 72c61d4e..6c13f230 100644 --- a/src/kernel/ntqbrush.h +++ b/src/kernel/ntqbrush.h @@ -86,7 +86,7 @@ private: TQBrush stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & ); #endif diff --git a/src/kernel/ntqclipboard.h b/src/kernel/ntqclipboard.h index 9675b885..34e9ed50 100644 --- a/src/kernel/ntqclipboard.h +++ b/src/kernel/ntqclipboard.h @@ -46,7 +46,7 @@ #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD class TQMimeSource; @@ -75,7 +75,7 @@ public: TQString text( TQCString& subtype, Mode mode ) const; void setText( const TQString &, Mode mode ); -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD TQMimeSource *data( Mode mode ) const; void setData( TQMimeSource*, Mode mode ); @@ -90,7 +90,7 @@ public: TQString text(TQCString& subtype) const; void setText( const TQString &); -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD TQMimeSource *data() const; void setData( TQMimeSource* ); @@ -129,6 +129,6 @@ private: #endif }; -#endif // QT_NO_CLIPBOARD +#endif // TQT_NO_CLIPBOARD #endif // TQCLIPBOARD_H diff --git a/src/kernel/ntqcolor.h b/src/kernel/ntqcolor.h index a35e8109..30acc281 100644 --- a/src/kernel/ntqcolor.h +++ b/src/kernel/ntqcolor.h @@ -140,7 +140,7 @@ public: static void initialize(); static void cleanup(); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST static TQStringList colorNames(); #endif enum { Dirt = 0x44495254, Invalid = 0x49000000 }; @@ -221,7 +221,7 @@ inline bool TQColor::operator!=( const TQColor &c ) const TQColor stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQColor & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQColor & ); #endif diff --git a/src/kernel/ntqcursor.h b/src/kernel/ntqcursor.h index a285637c..38f55c48 100644 --- a/src/kernel/ntqcursor.h +++ b/src/kernel/ntqcursor.h @@ -49,7 +49,7 @@ /* ### The fake cursor has to go first with old qdoc. */ -#ifdef QT_NO_CURSOR +#ifdef TQT_NO_CURSOR class Q_EXPORT TQCursor : public TQt { @@ -61,9 +61,9 @@ private: TQCursor(); }; -#endif // QT_NO_CURSOR +#endif // TQT_NO_CURSOR -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR struct TQCursorData; @@ -125,11 +125,11 @@ private: /***************************************************************************** TQCursor stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCursor & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQCursor & ); #endif -#endif // QT_NO_CURSOR +#endif // TQT_NO_CURSOR inline void TQCursor::setPos( const TQPoint &p ) diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h index fbcca3ab..a255d0fe 100644 --- a/src/kernel/ntqdragobject.h +++ b/src/kernel/ntqdragobject.h @@ -52,7 +52,7 @@ class TQImageDragData; #include "ntqcolor.h" #endif // QT_H -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME class Q_EXPORT TQDragObject: public TQObject, public TQMimeSource { TQ_OBJECT @@ -60,7 +60,7 @@ public: TQDragObject( TQWidget * dragSource = 0, const char * name = 0 ); virtual ~TQDragObject(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP bool drag(); bool dragMove(); void dragCopy(); @@ -77,7 +77,7 @@ public: static void setTarget(TQWidget*); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP enum DragMode { DragDefault, DragCopy, DragMove, DragLink, DragCopyOrMove }; protected: @@ -220,7 +220,7 @@ private: typedef TQUriDrag TQUrlDrag; #endif -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP // TQDragManager is not part of the public API. It is defined in a // header file simply so different .cpp files can implement different @@ -274,6 +274,6 @@ private: #endif -#endif // QT_NO_MIME +#endif // TQT_NO_MIME #endif // TQDRAGOBJECT_H diff --git a/src/kernel/ntqdrawutil.h b/src/kernel/ntqdrawutil.h index 2d3e1fef..c315cb5b 100644 --- a/src/kernel/ntqdrawutil.h +++ b/src/kernel/ntqdrawutil.h @@ -53,7 +53,7 @@ class TQBrush; class TQRect; class TQPixmap; -#ifndef QT_NO_DRAWUTIL +#ifndef TQT_NO_DRAWUTIL // // Standard shade drawing // @@ -124,5 +124,5 @@ Q_EXPORT void qDrawArrow( TQPainter *p, TQt::ArrowType type, TQt::GUIStyle style int x, int y, int w, int h, const TQColorGroup &g, bool enabled ); -#endif // QT_NO_DRAWUTIL +#endif // TQT_NO_DRAWUTIL #endif // TQDRAWUTIL_H diff --git a/src/kernel/ntqevent.h b/src/kernel/ntqevent.h index 566575ca..d5db5ce8 100644 --- a/src/kernel/ntqevent.h +++ b/src/kernel/ntqevent.h @@ -203,7 +203,7 @@ protected: }; -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT class Q_EXPORT TQWheelEvent : public TQEvent { public: @@ -500,7 +500,7 @@ inline int TQIMEvent::selectionLength() const } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP // This class is rather closed at the moment. If you need to create your // own DND event objects, write to qt-bugs@trolltech.com and we'll try to @@ -589,7 +589,7 @@ public: : TQEvent(DragLeave) {} }; -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP class Q_EXPORT TQChildEvent : public TQEvent { diff --git a/src/kernel/ntqfont.h b/src/kernel/ntqfont.h index b3a0911f..cdbd069d 100644 --- a/src/kernel/ntqfont.h +++ b/src/kernel/ntqfont.h @@ -181,14 +181,14 @@ public: TQString toString() const; bool fromString(const TQString &); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST static TQString substitute(const TQString &); static TQStringList substitutes(const TQString &); static TQStringList substitutions(); static void insertSubstitution(const TQString&, const TQString &); static void insertSubstitutions(const TQString&, const TQStringList &); static void removeSubstitution(const TQString &); -#endif //QT_NO_STRINGLIST +#endif //TQT_NO_STRINGLIST static void initialize(); static void cleanup(); #ifndef Q_WS_QWS @@ -337,10 +337,10 @@ private: friend class TQTextLayout; friend class TQTextItem; friend class TQGLContext; -#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) +#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) friend TQt::HANDLE qt_xft_handle(const TQFont &font); #endif -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQFont & ); friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQFont & ); #endif @@ -363,7 +363,7 @@ inline void TQFont::setBold( bool enable ) TQFont stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQFont & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQFont & ); #endif diff --git a/src/kernel/ntqfontdatabase.h b/src/kernel/ntqfontdatabase.h index bc686cab..7ea42515 100644 --- a/src/kernel/ntqfontdatabase.h +++ b/src/kernel/ntqfontdatabase.h @@ -50,7 +50,7 @@ #endif // QT_H -#ifndef QT_NO_FONTDATABASE +#ifndef TQT_NO_FONTDATABASE class TQFontStylePrivate; /* Don't touch! */ struct TQtFontStyle; @@ -222,6 +222,6 @@ inline int TQFontDatabase::weight( const TQString &family, #endif // TQT_NO_COMPAT -#endif // QT_NO_FONTDATABASE +#endif // TQT_NO_FONTDATABASE #endif // TQFONTDATABASE_H diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h index 7300c0f3..3b645ab2 100644 --- a/src/kernel/ntqgplugin.h +++ b/src/kernel/ntqgplugin.h @@ -55,7 +55,7 @@ #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT #ifndef Q_EXTERN_C #ifdef __cplusplus @@ -125,6 +125,6 @@ private: TQUnknownInterface* _iface; }; -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT #endif // TQGPLUGIN_H diff --git a/src/kernel/ntqiconset.h b/src/kernel/ntqiconset.h index a16d9655..7576c9d0 100644 --- a/src/kernel/ntqiconset.h +++ b/src/kernel/ntqiconset.h @@ -46,7 +46,7 @@ #include "ntqpixmap.h" #endif // QT_H -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET class TQIconFactory; class TQIconSetPrivate; @@ -128,5 +128,5 @@ private: uint unused : 31; }; -#endif // QT_NO_ICONSET +#endif // TQT_NO_ICONSET #endif diff --git a/src/kernel/ntqimage.h b/src/kernel/ntqimage.h index e4f23596..214af452 100644 --- a/src/kernel/ntqimage.h +++ b/src/kernel/ntqimage.h @@ -48,7 +48,7 @@ #endif // QT_H class TQImageDataMisc; // internal -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT class Q_EXPORT TQImageTextKeyLang { public: TQImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { } @@ -62,7 +62,7 @@ public: bool operator== (const TQImageTextKeyLang& other) const { return (key==other.key) && (lang==other.lang); } }; -#endif //QT_NO_IMAGE_TEXT +#endif //TQT_NO_IMAGE_TEXT class Q_EXPORT TQImage @@ -75,7 +75,7 @@ public: Endian bitOrder=IgnoreEndian ); TQImage( const TQSize&, int depth, int numColors=0, Endian bitOrder=IgnoreEndian ); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQImage( const TQString &fileName, const char* format=0 ); TQImage( const char * const xpm[] ); TQImage( const TQByteArray &data ); @@ -99,7 +99,7 @@ public: TQImage copy() const; TQImage copy(int x, int y, int w, int h, int conversion_flags=0) const; TQImage copy(const TQRect&) const; -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME static TQImage fromMimeSource( const TQString& abs_name ); #endif bool isNull() const { return data->bits == 0; } @@ -143,7 +143,7 @@ public: void invertPixels( bool invertAlpha = TRUE ); TQImage convertDepth( int ) const; -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR TQImage convertDepthWithPalette( int, TQRgb* p, int pc, int cf=0 ) const; #endif TQImage convertDepth( int, int conversion_flags ) const; @@ -154,11 +154,11 @@ public: ScaleMin, ScaleMax }; -#ifndef QT_NO_IMAGE_SMOOTHSCALE +#ifndef TQT_NO_IMAGE_SMOOTHSCALE TQImage smoothScale( int w, int h, ScaleMode mode=ScaleFree ) const; TQImage smoothScale( const TQSize& s, ScaleMode mode=ScaleFree ) const; #endif -#ifndef QT_NO_IMAGE_TRANSFORMATION +#ifndef TQT_NO_IMAGE_TRANSFORMATION TQImage scale( int w, int h, ScaleMode mode=ScaleFree ) const; TQImage scale( const TQSize& s, ScaleMode mode=ScaleFree ) const; TQImage scaleWidth( int w ) const; @@ -166,13 +166,13 @@ public: TQImage xForm( const TQWMatrix &matrix ) const; #endif -#ifndef QT_NO_IMAGE_DITHER_TO_1 +#ifndef TQT_NO_IMAGE_DITHER_TO_1 TQImage createAlphaMask( int conversion_flags=0 ) const; #endif -#ifndef QT_NO_IMAGE_HEURISTIC_MASK +#ifndef TQT_NO_IMAGE_HEURISTIC_MASK TQImage createHeuristicMask( bool clipTight=TRUE ) const; #endif -#ifndef QT_NO_IMAGE_MIRROR +#ifndef TQT_NO_IMAGE_MIRROR TQImage mirror() const; TQImage mirror(bool horizontally, bool vertically) const; #endif @@ -181,11 +181,11 @@ public: static Endian systemBitOrder(); static Endian systemByteOrder(); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO static const char* imageFormat( const TQString &fileName ); static TQStrList inputFormats(); static TQStrList outputFormats(); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST static TQStringList inputFormatList(); static TQStringList outputFormatList(); #endif @@ -197,7 +197,7 @@ public: int quality=-1 ) const; bool save( TQIODevice * device, const char* format, int quality=-1 ) const; -#endif //QT_NO_IMAGEIO +#endif //TQT_NO_IMAGEIO bool valid( int x, int y ) const; int pixelIndex( int x, int y ) const; @@ -211,7 +211,7 @@ public: void setDotsPerMeterY(int); TQPoint offset() const; void setOffset(const TQPoint&); -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT TQValueList<TQImageTextKeyLang> textList() const; TQStringList textLanguages() const; TQStringList textKeys() const; @@ -238,15 +238,15 @@ private: int dpmx; // dots per meter X (or 0) int dpmy; // dots per meter Y (or 0) TQPoint offset; // offset in pixels -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT TQImageDataMisc* misc; // less common stuff #endif bool ctbl_mine; // this allocated ctbl } *data; -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT TQImageDataMisc& misc() const; #endif -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO bool doImageIO( TQImageIO* io, int quality ) const; #endif friend Q_EXPORT void bitBlt( TQImage* dst, int dx, int dy, @@ -257,12 +257,12 @@ private: // TQImage stream functions -#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO) +#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO) Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQImage & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQImage & ); #endif -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO class TQIODevice; typedef void (*image_io_handler)( TQImageIO * ); // image IO handler @@ -332,7 +332,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif //QT_NO_IMAGEIO +#endif //TQT_NO_IMAGEIO Q_EXPORT void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src, int sx=0, int sy=0, int sw=-1, int sh=-1, diff --git a/src/kernel/ntqimageformatplugin.h b/src/kernel/ntqimageformatplugin.h index 74ec7c2e..d595881c 100644 --- a/src/kernel/ntqimageformatplugin.h +++ b/src/kernel/ntqimageformatplugin.h @@ -44,7 +44,7 @@ #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_IMAGEFORMATPLUGIN +#ifndef TQT_NO_IMAGEFORMATPLUGIN class TQImageFormat; class TQImageFormatPluginPrivate; @@ -63,5 +63,5 @@ public: private: TQImageFormatPluginPrivate *d; }; -#endif // QT_NO_IMAGEFORMATPLUGIN +#endif // TQT_NO_IMAGEFORMATPLUGIN #endif // TQIMAGEFORMATPLUGIN_H diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h index c39939b4..2cb7785e 100644 --- a/src/kernel/ntqinputcontext.h +++ b/src/kernel/ntqinputcontext.h @@ -36,7 +36,7 @@ #ifndef TQINPUTCONTEXT_H #define TQINPUTCONTEXT_H -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #ifndef QT_H #include "ntqobject.h" diff --git a/src/kernel/ntqjpegio.h b/src/kernel/ntqjpegio.h index 43e24029..bb27c5dc 100644 --- a/src/kernel/ntqjpegio.h +++ b/src/kernel/ntqjpegio.h @@ -43,10 +43,10 @@ #include "ntqglobal.h" -#ifndef QT_NO_IMAGEIO_JPEG +#ifndef TQT_NO_IMAGEIO_JPEG void qInitJpegIO(); -#endif // QT_NO_IMAGEIO_JPEG +#endif // TQT_NO_IMAGEIO_JPEG #endif // TQJPEGIO_H diff --git a/src/kernel/ntqkeysequence.h b/src/kernel/ntqkeysequence.h index e326570c..84475a17 100644 --- a/src/kernel/ntqkeysequence.h +++ b/src/kernel/ntqkeysequence.h @@ -48,12 +48,12 @@ #endif // QT_H #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL /***************************************************************************** TQKeySequence stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM class TQKeySequence; Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQKeySequence & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQKeySequence & ); @@ -104,6 +104,6 @@ public: TQKeySequence( int ) {} }; -#endif //QT_NO_ACCEL +#endif //TQT_NO_ACCEL #endif diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h index ce170abc..a9962e47 100644 --- a/src/kernel/ntqlayout.h +++ b/src/kernel/ntqlayout.h @@ -49,7 +49,7 @@ #include <limits.h> -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT #if 0 TQ_OBJECT @@ -207,7 +207,7 @@ public: void setResizeMode( ResizeMode ); ResizeMode resizeMode() const; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR virtual void setMenuBar( TQMenuBar *w ); TQMenuBar *menuBar() const { return menubar; } #endif @@ -270,7 +270,7 @@ private: uint autoResizeMode : 1; TQRect rect; TQLayoutData *extraData; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR TQMenuBar *menubar; #endif @@ -469,5 +469,5 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_LAYOUT +#endif // TQT_NO_LAYOUT #endif // TQLAYOUT_H diff --git a/src/kernel/ntqlocalfs.h b/src/kernel/ntqlocalfs.h index 72c63590..7676cec4 100644 --- a/src/kernel/ntqlocalfs.h +++ b/src/kernel/ntqlocalfs.h @@ -46,7 +46,7 @@ #include "ntqdir.h" #endif // QT_H -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL class Q_EXPORT TQLocalFs : public TQNetworkProtocol { @@ -70,6 +70,6 @@ private: }; -#endif // QT_NO_NETWORKPROTOCOL +#endif // TQT_NO_NETWORKPROTOCOL #endif // TQLOCALFS_H diff --git a/src/kernel/ntqmetaobject.h b/src/kernel/ntqmetaobject.h index 6c8fb094..55d3962e 100644 --- a/src/kernel/ntqmetaobject.h +++ b/src/kernel/ntqmetaobject.h @@ -62,7 +62,7 @@ struct TQMetaData // - member function meta data Access access; // - access permission }; -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES struct TQMetaEnum // enumerator meta data { // for properties const char *name; // - enumerator name @@ -77,7 +77,7 @@ struct TQMetaEnum // enumerator meta data }; #endif -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES class Q_EXPORT TQMetaProperty // property meta data { @@ -131,7 +131,7 @@ public: inline bool TQMetaProperty::testFlags( uint f ) const { return (flags & (uint)f) != (uint)0; } -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES struct TQClassInfo // class info meta data { @@ -145,13 +145,13 @@ public: TQMetaObject( const char * const class_name, TQMetaObject *superclass, const TQMetaData * const slot_data, int n_slots, const TQMetaData * const signal_data, int n_signals, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES const TQMetaProperty *const prop_data, int n_props, const TQMetaEnum *const enum_data, int n_enums, #endif const TQClassInfo *const class_info, int n_info ); -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES TQMetaObject( const char * const class_name, TQMetaObject *superclass, const TQMetaData * const slot_data, int n_slots, const TQMetaData * const signal_data, int n_signals, @@ -191,7 +191,7 @@ public: const TQClassInfo *classInfo( int index, bool super = FALSE ) const; const char *classInfo( const char* name, bool super = FALSE ) const; -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES const TQMetaProperty *property( int index, bool super = FALSE ) const; int findProperty( const char *name, bool super = FALSE ) const; int indexOfProperty( const TQMetaProperty*, bool super = FALSE ) const; @@ -207,12 +207,12 @@ public: static TQMetaObject *new_metaobject( const char *, TQMetaObject *, const TQMetaData *const, int, const TQMetaData *const, int, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES const TQMetaProperty *const prop_data, int n_props, const TQMetaEnum *const enum_data, int n_enums, #endif const TQClassInfo *const class_info, int n_info ); -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES static TQMetaObject *new_metaobject( const char *, TQMetaObject *, const TQMetaData *const, int, const TQMetaData *const, int, @@ -242,7 +242,7 @@ private: TQMemberDict *signalDict; // signal dictionary int signaloffset; int slotoffset; -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES int propertyoffset; public: bool tqt_static_property( TQObject* o, int id, int f, TQVariant* v); @@ -263,7 +263,7 @@ inline int TQMetaObject::slotOffset() const inline int TQMetaObject::signalOffset() const { return signaloffset; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES inline int TQMetaObject::propertyOffset() const { return propertyoffset; } #endif diff --git a/src/kernel/ntqmime.h b/src/kernel/ntqmime.h index 60fdbc24..08b5334b 100644 --- a/src/kernel/ntqmime.h +++ b/src/kernel/ntqmime.h @@ -46,7 +46,7 @@ #include "ntqmap.h" #endif // QT_H -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME class TQImageDrag; class TQTextDrag; @@ -195,6 +195,6 @@ public: #endif // Q_WS_MAC -#endif // QT_NO_MIME +#endif // TQT_NO_MIME #endif // TQMIME_H diff --git a/src/kernel/ntqmngio.h b/src/kernel/ntqmngio.h index 76f5abf6..530a0aa1 100644 --- a/src/kernel/ntqmngio.h +++ b/src/kernel/ntqmngio.h @@ -44,10 +44,10 @@ #ifndef QT_H #endif // QT_H -#ifndef QT_NO_IMAGEIO_MNG +#ifndef TQT_NO_IMAGEIO_MNG void qInitMngIO(); -#endif // QT_NO_IMAGEIO_MNG +#endif // TQT_NO_IMAGEIO_MNG #endif // TQMNGIO_H diff --git a/src/kernel/ntqmovie.h b/src/kernel/ntqmovie.h index 9f5238fc..5c1b5f74 100644 --- a/src/kernel/ntqmovie.h +++ b/src/kernel/ntqmovie.h @@ -45,7 +45,7 @@ #include "ntqpixmap.h" // ### remove or keep for users' convenience? #endif // QT_H -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE class TQDataSource; class TQObject; @@ -115,6 +115,6 @@ private: TQMoviePrivate *d; }; -#endif // QT_NO_MOVIE +#endif // TQT_NO_MOVIE #endif diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h index 2ac7a4d5..1877d168 100644 --- a/src/kernel/ntqnetworkprotocol.h +++ b/src/kernel/ntqnetworkprotocol.h @@ -48,7 +48,7 @@ #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL #if __GNUC__ - 0 > 3 #pragma GCC system_header @@ -243,6 +243,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_NETWORKPROTOCOL +#endif // TQT_NO_NETWORKPROTOCOL #endif // TQNETWORKPROTOCOL_H diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h index d7e3a17a..d65fe49d 100644 --- a/src/kernel/ntqobject.h +++ b/src/kernel/ntqobject.h @@ -59,7 +59,7 @@ class TQMetaProperty; class TQPostEventList; class TQSenderObjectList; class TQObjectPrivate; -#ifndef QT_NO_USERDATA +#ifndef TQT_NO_USERDATA class TQObjectUserData; #endif struct TQUObject; @@ -146,22 +146,22 @@ public: TQStyleControlElementData* controlElementDataObject(); TQStyleControlElementDataPrivate* controlElementDataPrivateObject(); -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES virtual bool setProperty( const char *name, const TQVariant& value ); virtual TQVariant property( const char *name ) const; -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES #ifdef TQT_NO_TRANSLATION static TQString tr( const char *sourceText, const char * = 0); -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC static TQString trUtf8( const char *sourceText, const char * = 0); #endif #endif //TQT_NO_TRANSLATION -#ifndef QT_NO_USERDATA +#ifndef TQT_NO_USERDATA static uint registerUserData(); void setUserData( uint id, TQObjectUserData* data); TQObjectUserData* userData( uint id ) const; -#endif // QT_NO_USERDATA +#endif // TQT_NO_USERDATA signals: void destroyed(); @@ -244,7 +244,7 @@ private: }; -#ifndef QT_NO_USERDATA +#ifndef TQT_NO_USERDATA class Q_EXPORT TQObjectUserData { public: virtual ~TQObjectUserData(); @@ -276,7 +276,7 @@ inline bool TQObject::disconnect( const TQObject *receiver, const char *member ) inline TQString TQObject::tr( const char *sourceText, const char * ) { return TQString::fromLatin1( sourceText ); } -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC inline TQString TQObject::trUtf8( const char *sourceText, const char * ) { return TQString::fromUtf8( sourceText ); } diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h index 43cd84cf..4e2fbddf 100644 --- a/src/kernel/ntqobjectdefs.h +++ b/src/kernel/ntqobjectdefs.h @@ -47,7 +47,7 @@ #ifndef TQT_NO_TRANSLATION -# ifndef QT_NO_TEXTCODEC +# ifndef TQT_NO_TEXTCODEC // full set of tr functions # define TQT_TR_FUNCTIONS \ static TQString tr( const char *, const char * = 0 ); \ @@ -62,7 +62,7 @@ # define TQT_TR_FUNCTIONS #endif -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES # define QT_PROP_FUNCTIONS \ virtual bool tqt_property( int id, int f, TQVariant* v); \ static bool tqt_static_property( TQObject* , int, int, TQVariant* ); @@ -90,7 +90,7 @@ struct TQUObject; #else #define slots // slots: in class #define signals protected // signals: in class -#ifndef QT_NO_EMIT +#ifndef TQT_NO_EMIT #define emit // emit signal #endif #define TQ_CLASSINFO( name, value ) // class info diff --git a/src/kernel/ntqpainter.h b/src/kernel/ntqpainter.h index a86dea4f..2f95272f 100644 --- a/src/kernel/ntqpainter.h +++ b/src/kernel/ntqpainter.h @@ -136,7 +136,7 @@ public: bool hasViewXForm() const; bool hasWorldXForm() const; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS void setViewXForm( bool ); // set xform on/off TQRect window() const; // get window void setWindow( const TQRect & ); // set window @@ -217,7 +217,7 @@ public: int index=0, int npoints=-1 ); void drawConvexPolygon( const TQPointArray &, int index=0, int npoints=-1 ); -#ifndef QT_NO_BEZIER +#ifndef TQT_NO_BEZIER void drawCubicBezier( const TQPointArray &, int index=0 ); #endif void drawPixmap( int x, int y, const TQPixmap &, @@ -239,7 +239,7 @@ public: void drawTiledPixmap( const TQRect &, const TQPixmap &, const TQPoint & ); void drawTiledPixmap( const TQRect &, const TQPixmap & ); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE void drawPicture( const TQPicture & ); void drawPicture( int x, int y, const TQPicture & ); void drawPicture( const TQPoint &, const TQPicture & ); @@ -302,7 +302,7 @@ private: void updateFont(); void updatePen(); void updateBrush(); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS void updateXForm(); void updateInvXForm(); #endif @@ -344,7 +344,7 @@ private: bool block_ext; // for temporary blocking of external devices // Transformations -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQCOORD wx, wy, ww, wh; TQCOORD vx, vy, vw, vh; TQWMatrix wxmat; @@ -499,7 +499,7 @@ inline const TQPoint &TQPainter::brushOrigin() const inline bool TQPainter::hasViewXForm() const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS return testf(VxF); #else return xlatex || xlatey; @@ -508,7 +508,7 @@ inline bool TQPainter::hasViewXForm() const inline bool TQPainter::hasWorldXForm() const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS return testf(WxF); #else return xlatex || xlatey; @@ -517,7 +517,7 @@ inline bool TQPainter::hasWorldXForm() const inline double TQPainter::translationX() const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS return worldMatrix().dx(); #else return xlatex; @@ -526,7 +526,7 @@ inline double TQPainter::translationX() const inline double TQPainter::translationY() const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS return worldMatrix().dy(); #else return xlatey; @@ -566,7 +566,7 @@ inline void TQPainter::setBrushOrigin( const TQPoint &p ) setBrushOrigin( p.x(), p.y() ); } -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS inline void TQPainter::setWindow( const TQRect &r ) { setWindow( r.x(), r.y(), r.width(), r.height() ); diff --git a/src/kernel/ntqpalette.h b/src/kernel/ntqpalette.h index 9bffe41b..274228c4 100644 --- a/src/kernel/ntqpalette.h +++ b/src/kernel/ntqpalette.h @@ -48,7 +48,7 @@ #include "ntqbrush.h" // TQColor->TQBrush conversion #endif // QT_H -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE class TQColorGroupPrivate; @@ -177,13 +177,13 @@ private: TQColorGroup/TQPalette stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQColorGroup & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQColorGroup & ); Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPalette & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPalette & ); -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM -#endif // QT_NO_PALETTE +#endif // TQT_NO_PALETTE #endif // TQPALETTE_H diff --git a/src/kernel/ntqpen.h b/src/kernel/ntqpen.h index dc839dc7..b3e471f1 100644 --- a/src/kernel/ntqpen.h +++ b/src/kernel/ntqpen.h @@ -94,7 +94,7 @@ private: /***************************************************************************** TQPen stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & ); #endif diff --git a/src/kernel/ntqpicture.h b/src/kernel/ntqpicture.h index 9a76a7b5..4acbdc33 100644 --- a/src/kernel/ntqpicture.h +++ b/src/kernel/ntqpicture.h @@ -46,7 +46,7 @@ #include "ntqbuffer.h" #endif // QT_H -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE class Q_EXPORT TQPicture : public TQPaintDevice // picture class { @@ -122,6 +122,6 @@ inline const char* TQPicture::data() const Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPicture & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPicture & ); -#endif // QT_NO_PICTURE +#endif // TQT_NO_PICTURE #endif // TQPICTURE_H diff --git a/src/kernel/ntqpixmap.h b/src/kernel/ntqpixmap.h index abf20369..e1098878 100644 --- a/src/kernel/ntqpixmap.h +++ b/src/kernel/ntqpixmap.h @@ -68,7 +68,7 @@ public: TQPixmap( const TQImage& image ); TQPixmap( int w, int h, int depth = -1, Optimization = DefaultOptim ); TQPixmap( const TQSize &, int depth = -1, Optimization = DefaultOptim ); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQPixmap( const TQString& fileName, const char *format=0, ColorMode mode=Auto ); TQPixmap( const TQString& fileName, const char *format, @@ -102,17 +102,17 @@ public: bool selfMask() const; bool hasAlpha() const; bool hasAlphaChannel() const; -#ifndef QT_NO_IMAGE_HEURISTIC_MASK +#ifndef TQT_NO_IMAGE_HEURISTIC_MASK TQBitmap createHeuristicMask( bool clipTight = TRUE ) const; #endif -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME static TQPixmap fromMimeSource( const TQString& abs_name ); #endif static TQPixmap grabWindow( WId, int x=0, int y=0, int w=-1, int h=-1 ); static TQPixmap grabWidget( TQWidget * widget, int x=0, int y=0, int w=-1, int h=-1 ); -#ifndef QT_NO_PIXMAP_TRANSFORMATION +#ifndef TQT_NO_PIXMAP_TRANSFORMATION TQPixmap xForm( const TQWMatrix & ) const; static TQWMatrix trueMatrix( const TQWMatrix &, int w, int h ); #endif @@ -120,7 +120,7 @@ public: TQImage convertToImage() const; bool convertFromImage( const TQImage &, ColorMode mode=Auto ); bool convertFromImage( const TQImage &, int conversion_flags ); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO static const char* imageFormat( const TQString &fileName ); bool load( const TQString& fileName, const char *format=0, ColorMode mode=Auto ); @@ -232,7 +232,7 @@ protected: #endif } *data; private: -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO bool doImageIO( TQImageIO* io, int quality ) const; #endif TQPixmap( int w, int h, int depth, bool, Optimization ); @@ -329,7 +329,7 @@ inline bool TQPixmap::isMultiCellPixmap() const TQPixmap stream functions *****************************************************************************/ -#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO) +#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO) Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPixmap & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & ); #endif @@ -338,7 +338,7 @@ Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & ); TQPixmap (and TQImage) helper functions *****************************************************************************/ -#ifndef QT_NO_PIXMAP_TRANSFORMATION +#ifndef TQT_NO_PIXMAP_TRANSFORMATION # define QT_XFORM_TYPE_MSBFIRST 0 # define QT_XFORM_TYPE_LSBFIRST 1 # if defined(Q_WS_WIN) diff --git a/src/kernel/ntqpngio.h b/src/kernel/ntqpngio.h index ce41e7d5..f0a3819a 100644 --- a/src/kernel/ntqpngio.h +++ b/src/kernel/ntqpngio.h @@ -45,7 +45,7 @@ #include "ntqimage.h" #endif // QT_H -#ifndef QT_NO_IMAGEIO_PNG +#ifndef TQT_NO_IMAGEIO_PNG void qInitPngIO(); @@ -102,6 +102,6 @@ private: int alignx; }; -#endif // QT_NO_IMAGEIO_PNG +#endif // TQT_NO_IMAGEIO_PNG #endif // TQPNGIO_H diff --git a/src/kernel/ntqpoint.h b/src/kernel/ntqpoint.h index 731683a4..62b60f3a 100644 --- a/src/kernel/ntqpoint.h +++ b/src/kernel/ntqpoint.h @@ -99,7 +99,7 @@ private: /***************************************************************************** TQPoint stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPoint & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPoint & ); #endif diff --git a/src/kernel/ntqpointarray.h b/src/kernel/ntqpointarray.h index a0aa8ea7..85c05e53 100644 --- a/src/kernel/ntqpointarray.h +++ b/src/kernel/ntqpointarray.h @@ -85,7 +85,7 @@ public: void makeEllipse( int x, int y, int w, int h ); void makeArc( int x, int y, int w, int h, int a1, int a2, const TQWMatrix& ); -#ifndef QT_NO_BEZIER +#ifndef TQT_NO_BEZIER TQPointArray cubicBezier() const; #endif void* shortPoints( int index = 0, int nPoints = -1 ) const; @@ -100,7 +100,7 @@ protected: /***************************************************************************** TQPointArray stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPointArray & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPointArray & ); #endif diff --git a/src/kernel/ntqprinter.h b/src/kernel/ntqprinter.h index a72d3d9c..bb854be2 100644 --- a/src/kernel/ntqprinter.h +++ b/src/kernel/ntqprinter.h @@ -47,7 +47,7 @@ #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER #if defined(B0) #undef B0 // Terminal hang-up. We assume that you do not want that. @@ -279,6 +279,6 @@ inline bool TQPrinter::collateCopies() const { return usercolcopies; } -#endif // QT_NO_PRINTER +#endif // TQT_NO_PRINTER #endif // TQPRINTER_H diff --git a/src/kernel/ntqprocess.h b/src/kernel/ntqprocess.h index 6dfba30f..7b243c7a 100644 --- a/src/kernel/ntqprocess.h +++ b/src/kernel/ntqprocess.h @@ -47,7 +47,7 @@ #include "ntqdir.h" #endif // QT_H -#ifndef QT_NO_PROCESS +#ifndef TQT_NO_PROCESS class TQProcessPrivate; class TQMembuf; @@ -67,7 +67,7 @@ public: void clearArguments(); virtual void setArguments( const TQStringList& args ); virtual void addArgument( const TQString& arg ); -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQDir workingDirectory() const; virtual void setWorkingDirectory( const TQDir& dir ); #endif @@ -146,7 +146,7 @@ private slots: private: TQProcessPrivate *d; -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQDir workingDir; #endif TQStringList _arguments; @@ -173,6 +173,6 @@ private: #endif }; -#endif // QT_NO_PROCESS +#endif // TQT_NO_PROCESS #endif // TQPROCESS_H diff --git a/src/kernel/ntqrect.h b/src/kernel/ntqrect.h index 426c1756..97cc62e8 100644 --- a/src/kernel/ntqrect.h +++ b/src/kernel/ntqrect.h @@ -158,7 +158,7 @@ Q_EXPORT bool operator!=( const TQRect &, const TQRect & ); /***************************************************************************** TQRect stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRect & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRect & ); #endif diff --git a/src/kernel/ntqregion.h b/src/kernel/ntqregion.h index 798b33cd..911f085c 100644 --- a/src/kernel/ntqregion.h +++ b/src/kernel/ntqregion.h @@ -107,7 +107,7 @@ public: void * handle() const { return data->rgn; } #endif -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRegion & ); friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRegion & ); #endif @@ -168,7 +168,7 @@ private: TQRegion stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRegion & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRegion & ); #endif diff --git a/src/kernel/ntqsessionmanager.h b/src/kernel/ntqsessionmanager.h index d203f951..e39cd762 100644 --- a/src/kernel/ntqsessionmanager.h +++ b/src/kernel/ntqsessionmanager.h @@ -47,7 +47,7 @@ #include "ntqstring.h" #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER class TQSessionManagerData; @@ -95,5 +95,5 @@ private: TQSessionManagerData* d; }; -#endif // QT_NO_SESSIONMANAGER +#endif // TQT_NO_SESSIONMANAGER #endif // TQSESSIONMANAGER_H diff --git a/src/kernel/ntqsignal.h b/src/kernel/ntqsignal.h index 8d14385a..55384f3a 100644 --- a/src/kernel/ntqsignal.h +++ b/src/kernel/ntqsignal.h @@ -63,24 +63,24 @@ public: #ifndef TQT_NO_COMPAT bool isBlocked() const { return TQObject::signalsBlocked(); } void block( bool b ) { TQObject::blockSignals( b ); } -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT void setParameter( int value ); int parameter() const; #endif #endif -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT void setValue( const TQVariant &value ); TQVariant value() const; #endif signals: -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT void signal( const TQVariant& ); #endif void intSignal( int ); private: -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT TQVariant val; #endif private: // Disabled copy constructor and operator= diff --git a/src/kernel/ntqsignalmapper.h b/src/kernel/ntqsignalmapper.h index a7dc9aad..50cbb29b 100644 --- a/src/kernel/ntqsignalmapper.h +++ b/src/kernel/ntqsignalmapper.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_SIGNALMAPPER +#ifndef TQT_NO_SIGNALMAPPER class TQSignalMapperData; struct TQSignalMapperRec; @@ -74,5 +74,5 @@ private slots: void removeMapping(); }; -#endif // QT_NO_SIGNALMAPPER +#endif // TQT_NO_SIGNALMAPPER #endif // TQSIGNALMAPPER_H diff --git a/src/kernel/ntqsimplerichtext.h b/src/kernel/ntqsimplerichtext.h index 928dbb85..8b0a28fe 100644 --- a/src/kernel/ntqsimplerichtext.h +++ b/src/kernel/ntqsimplerichtext.h @@ -47,7 +47,7 @@ #include "ntqregion.h" #endif // QT_H -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT class TQPainter; class TQWidget; @@ -99,6 +99,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_RICHTEXT +#endif // TQT_NO_RICHTEXT #endif // TQSIMPLERICHTEXT_H diff --git a/src/kernel/ntqsizegrip.h b/src/kernel/ntqsizegrip.h index c55e9b76..37a5a337 100644 --- a/src/kernel/ntqsizegrip.h +++ b/src/kernel/ntqsizegrip.h @@ -45,7 +45,7 @@ #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP class Q_EXPORT TQSizeGrip: public TQWidget { @@ -70,5 +70,5 @@ private: TQWidget *tlw; }; -#endif //QT_NO_SIZEGRIP +#endif //TQT_NO_SIZEGRIP #endif diff --git a/src/kernel/ntqsound.h b/src/kernel/ntqsound.h index 5c6a41b0..02b2e881 100644 --- a/src/kernel/ntqsound.h +++ b/src/kernel/ntqsound.h @@ -44,7 +44,7 @@ #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_SOUND +#ifndef TQT_NO_SOUND class TQSoundData; @@ -120,6 +120,6 @@ protected: int decLoop(TQSound*); }; -#endif // QT_NO_SOUND +#endif // TQT_NO_SOUND #endif diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h index 51bf61b1..c6a3b424 100644 --- a/src/kernel/ntqstyle.h +++ b/src/kernel/ntqstyle.h @@ -50,7 +50,7 @@ #endif // QT_H -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE class TQPopupMenu; class TQStylePrivate; @@ -1239,5 +1239,5 @@ Q_EXPORT TQStyle::ControlElementFlags getControlElementFlagsForObject(const TQOb Q_EXPORT TQStringList getObjectTypeListForObject(const TQObject* object); Q_EXPORT const TQStyleControlElementData &populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields, bool populateMinimumNumberOfFields); -#endif // QT_NO_STYLE +#endif // TQT_NO_STYLE #endif // TQSTYLE_H diff --git a/src/kernel/ntqstylesheet.h b/src/kernel/ntqstylesheet.h index 7e13ad2f..2e91b36c 100644 --- a/src/kernel/ntqstylesheet.h +++ b/src/kernel/ntqstylesheet.h @@ -49,7 +49,7 @@ #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT class TQStyleSheet; class TQTextDocument; @@ -201,7 +201,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQStyleSheetItem::ListStyl // MOC_SKIP_END #endif -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM class TQTextCustomItem; #endif @@ -221,7 +221,7 @@ public: void insert( TQStyleSheetItem* item); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM virtual TQTextCustomItem* tag( const TQString& name, const TQMap<TQString, TQString> &attr, const TQString& context, @@ -248,6 +248,6 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_RICHTEXT +#endif // TQT_NO_RICHTEXT #endif // TQSTYLESHEET_H diff --git a/src/kernel/ntqurl.h b/src/kernel/ntqurl.h index 5069849f..7286648f 100644 --- a/src/kernel/ntqurl.h +++ b/src/kernel/ntqurl.h @@ -45,7 +45,7 @@ #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_URL +#ifndef TQT_NO_URL class TQUrlPrivate; @@ -125,6 +125,6 @@ private: }; -#endif //QT_NO_URL +#endif //TQT_NO_URL #endif diff --git a/src/kernel/ntqurloperator.h b/src/kernel/ntqurloperator.h index 1c1acf26..d7ab440f 100644 --- a/src/kernel/ntqurloperator.h +++ b/src/kernel/ntqurloperator.h @@ -49,7 +49,7 @@ #include "ntqstringlist.h" // TQString->TQStringList conversion #endif // QT_H -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL class TQUrlInfo; class TQUrlOperatorPrivate; @@ -124,6 +124,6 @@ private: TQUrlOperatorPrivate *d; }; -#endif // QT_NO_NETWORKPROTOCOL +#endif // TQT_NO_NETWORKPROTOCOL #endif // TQURLOPERATOR_H diff --git a/src/kernel/ntqvariant.h b/src/kernel/ntqvariant.h index 8a7be5c0..f794eeb1 100644 --- a/src/kernel/ntqvariant.h +++ b/src/kernel/ntqvariant.h @@ -45,7 +45,7 @@ #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT class TQString; class TQCString; class TQFont; @@ -74,7 +74,7 @@ class TQKeySequence; class TQPen; // Some headers rejected after TQVariant declaration for GCC 2.7.* compatibility class TQVariant; -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT template <class T> class TQValueList; template <class T> class TQValueListConstIterator; template <class T> class TQValueListNode; @@ -126,13 +126,13 @@ public: TQVariant(); ~TQVariant(); TQVariant( const TQVariant& ); -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQVariant( TQDataStream& s ); #endif TQVariant( const TQString& ); TQVariant( const TQCString& ); TQVariant( const char* ); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST TQVariant( const TQStringList& ); #endif TQVariant( const TQFont& ); @@ -155,11 +155,11 @@ public: TQVariant( const TQDateTime& ); TQVariant( const TQByteArray& ); TQVariant( const TQBitArray& ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQVariant( const TQKeySequence& ); #endif TQVariant( const TQPen& ); -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT TQVariant( const TQValueList<TQVariant>& ); TQVariant( const TQMap<TQString,TQVariant>& ); #endif @@ -189,7 +189,7 @@ public: const TQString toString() const; const TQCString toCString() const; -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST const TQStringList toStringList() const; #endif const TQFont toFont() const; @@ -212,7 +212,7 @@ public: const TQDateTime toDateTime() const; const TQByteArray toByteArray() const; const TQBitArray toBitArray() const; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL const TQKeySequence toKeySequence() const; #endif const TQPen toPen() const; @@ -222,13 +222,13 @@ public: TQ_ULLONG toULongLong( bool * ok=0 ) const; bool toBool() const; double toDouble( bool * ok=0 ) const; -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT const TQValueList<TQVariant> toList() const; const TQMap<TQString,TQVariant> toMap() const; #endif TQSizePolicy toSizePolicy() const; -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT TQValueListConstIterator<TQString> stringListBegin() const; TQValueListConstIterator<TQString> stringListEnd() const; TQValueListConstIterator<TQVariant> listBegin() const; @@ -239,7 +239,7 @@ public: #endif TQString& asString(); TQCString& asCString(); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST TQStringList& asStringList(); #endif TQFont& asFont(); @@ -262,7 +262,7 @@ public: TQDateTime& asDateTime(); TQByteArray& asByteArray(); TQBitArray& asBitArray(); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence& asKeySequence(); #endif TQPen& asPen(); @@ -272,13 +272,13 @@ public: TQ_ULLONG& asULongLong(); bool& asBool(); double& asDouble(); -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT TQValueList<TQVariant>& asList(); TQMap<TQString,TQVariant>& asMap(); #endif TQSizePolicy& asSizePolicy(); -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM void load( TQDataStream& ); void save( TQDataStream& ) const; #endif @@ -334,7 +334,7 @@ inline bool TQVariant::isValid() const return (d->typ != Invalid); } -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT inline TQValueListConstIterator<TQString> TQVariant::stringListBegin() const { if ( d->typ != StringList ) @@ -385,12 +385,12 @@ inline TQMapConstIterator<TQString,TQVariant> TQVariant::mapFind( const TQString } #endif -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream& operator>> ( TQDataStream& s, TQVariant& p ); Q_EXPORT TQDataStream& operator<< ( TQDataStream& s, const TQVariant& p ); Q_EXPORT TQDataStream& operator>> ( TQDataStream& s, TQVariant::Type& p ); Q_EXPORT TQDataStream& operator<< ( TQDataStream& s, const TQVariant::Type p ); #endif -#endif //QT_NO_VARIANT +#endif //TQT_NO_VARIANT #endif // TQVARIANT_H diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h index 2dbb6701..b6c261cc 100644 --- a/src/kernel/ntqwidget.h +++ b/src/kernel/ntqwidget.h @@ -52,7 +52,7 @@ #include "ntqsizepolicy.h" #endif // QT_H -#if defined(Q_WS_X11) && !defined(QT_NO_IM) +#if defined(Q_WS_X11) && !defined(TQT_NO_IM) class TQInputContext; #endif @@ -107,11 +107,11 @@ class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice TQ_PROPERTY( bool ownPalette READ ownPalette ) TQ_PROPERTY( TQFont font READ font WRITE setFont RESET unsetFont STORED ownFont ) TQ_PROPERTY( bool ownFont READ ownFont ) -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQ_PROPERTY( TQCursor cursor READ cursor WRITE setCursor RESET unsetCursor STORED ownCursor ) TQ_PROPERTY( bool ownCursor READ ownCursor ) #endif -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA TQ_PROPERTY( TQString caption READ caption WRITE setCaption ) TQ_PROPERTY( TQPixmap icon READ icon WRITE setIcon ) TQ_PROPERTY( TQString iconText READ iconText WRITE setIconText ) @@ -145,7 +145,7 @@ public: WId winId() const; void setName( const char *name ); -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE // GUI style setting TQStyle &style() const; @@ -236,7 +236,7 @@ public: const TQPixmap * erasePixmap() const; virtual void setErasePixmap( const TQPixmap & ); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE const TQColorGroup & colorGroup() const; const TQPalette & palette() const; bool ownPalette() const; @@ -262,13 +262,13 @@ public: TQFontMetrics fontMetrics() const; TQFontInfo fontInfo() const; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR const TQCursor &cursor() const; bool ownCursor() const; virtual void setCursor( const TQCursor & ); virtual void unsetCursor(); #endif -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA TQString caption() const; const TQPixmap *icon() const; TQString iconText() const; @@ -286,7 +286,7 @@ public: virtual void setBackgroundPixmap( const TQPixmap & ); // obsolete, use setErasePixmap() public slots: -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA virtual void setCaption( const TQString &); virtual void setIcon( const TQPixmap & ); virtual void setIconText( const TQString &); @@ -323,7 +323,7 @@ public: // Grab functions void grabMouse(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR void grabMouse( const TQCursor & ); #endif void releaseMouse(); @@ -406,7 +406,7 @@ public slots: virtual void adjustSize(); public: -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT TQLayout * layout() const { return lay_out; } #endif void updateGeometry(); @@ -499,7 +499,7 @@ protected: virtual void mouseReleaseEvent( TQMouseEvent * ); virtual void mouseDoubleClickEvent( TQMouseEvent * ); virtual void mouseMoveEvent( TQMouseEvent * ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT virtual void wheelEvent( TQWheelEvent * ); #endif virtual void keyPressEvent( TQKeyEvent * ); @@ -518,7 +518,7 @@ protected: virtual void imEndEvent( TQIMEvent * ); virtual void tabletEvent( TQTabletEvent * ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void dragEnterEvent( TQDragEnterEvent * ); virtual void dragMoveEvent( TQDragMoveEvent * ); virtual void dragLeaveEvent( TQDragLeaveEvent * ); @@ -547,11 +547,11 @@ protected: // Misc. protected functions -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE virtual void styleChange( TQStyle& ); #endif virtual void enabledChange( bool oldEnabled ); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE virtual void paletteChange( const TQPalette & ); #endif virtual void fontChange( const TQFont & ); @@ -560,7 +560,7 @@ protected: int metric( int ) const; #if defined(Q_WS_X11) -#if !defined(QT_NO_IM_EXTENSIONS) +#if !defined(TQT_NO_IM_EXTENSIONS) virtual TQWidget *icHolderWidget(); #else TQWidget *icHolderWidget(); @@ -614,7 +614,7 @@ private: void unfocusInputContext(); void checkChildrenDnd(); -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC void createSyncCounter(); void destroySyncCounter(); void incrementSyncCounter(); @@ -640,7 +640,7 @@ private: friend class TQDragManager; #endif -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT void setLayout( TQLayout *l ); #endif void setWinId( WId ); @@ -689,14 +689,14 @@ private: uint im_enabled : 1; TQRect crect; TQColor bg_col; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE TQPalette pal; #endif TQFont fnt; -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT TQLayout *lay_out; #endif -#if defined(Q_WS_X11) && !defined(QT_NO_IM) && !defined(QT_NO_IM_EXTENSIONS) +#if defined(Q_WS_X11) && !defined(TQT_NO_IM) && !defined(TQT_NO_IM_EXTENSIONS) TQInputContext *ic; // Input Context #endif TQWExtra *extra; @@ -721,7 +721,7 @@ private: TQRegion paintableRegion() const; void updateGraphicsContext( TQGfx *qgfx_qws, bool clip_children ) const; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR void updateCursor( const TQRegion &r ) const; #endif @@ -753,7 +753,7 @@ private: // Disabled copy constructor and operator= #endif public: // obsolete functions to dissappear or to become inline in 3.0 -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE void setPalette( const TQPalette &p, bool ) { setPalette( p ); } #endif void setFont( const TQFont &f, bool ) { setFont( f ); } @@ -835,7 +835,7 @@ inline void TQWidget::setBaseSize( const TQSize &s ) inline const TQColor &TQWidget::eraseColor() const { return bg_col; } -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE inline const TQPalette &TQWidget::palette() const { return pal; } #endif @@ -951,7 +951,7 @@ inline void TQWidget::constPolish() const that->setWState(WState_Polished); // be on the safe side... } } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR inline bool TQWidget::ownCursor() const { return testWState( WState_OwnCursor ); @@ -961,7 +961,7 @@ inline bool TQWidget::ownFont() const { return own_font; } -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE inline bool TQWidget::ownPalette() const { return own_palette; @@ -992,7 +992,7 @@ class TQMacDndExtra; #endif struct Q_EXPORT TQTLWExtra { -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA TQString caption; // widget caption TQString iconText; // widget icon text TQPixmap *icon; // widget icon @@ -1015,10 +1015,10 @@ struct Q_EXPORT TQTLWExtra { uint dnd : 1; // DND properties installed uint uspos : 1; // User defined position uint ussize : 1; // User defined size -#if defined(QT_NO_IM_EXTENSIONS) +#if defined(TQT_NO_IM_EXTENSIONS) void *xic; // Input Context #endif -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC ulong syncCounter; uint syncRequestValue[2]; #endif @@ -1028,7 +1028,7 @@ struct Q_EXPORT TQTLWExtra { uint is_moved: 1; uint resizer : 4; #endif -#if defined(Q_WS_QWS) && !defined ( QT_NO_QWS_MANAGER ) +#if defined(Q_WS_QWS) && !defined ( TQT_NO_QWS_MANAGER ) TQRegion decor_allocated_region; // decoration allocated region TQWSManager *qwsManager; #endif @@ -1051,7 +1051,7 @@ struct Q_EXPORT TQWExtra { TQ_INT16 maxw, maxh; // maximum size TQPixmap *bg_pix; // background pixmap TQWidget *focus_proxy; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQCursor *curs; #endif TQTLWExtra *topextra; // only useful for TLWs @@ -1082,7 +1082,7 @@ struct Q_EXPORT TQWExtra { #endif char bg_mode; // background mode char bg_mode_visual; // visual background mode -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE TQStyle* style; #endif TQRect micro_focus_hint; // micro focus hint diff --git a/src/kernel/ntqwmatrix.h b/src/kernel/ntqwmatrix.h index bb3042f3..f4e6c9bf 100644 --- a/src/kernel/ntqwmatrix.h +++ b/src/kernel/ntqwmatrix.h @@ -48,7 +48,7 @@ #include "ntqregion.h" #endif // QT_H -#ifndef QT_NO_WMATRIX +#ifndef TQT_NO_WMATRIX class Q_EXPORT TQWMatrix // 2D transform matrix @@ -124,6 +124,6 @@ Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQWMatrix & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQWMatrix & ); -#endif // QT_NO_WMATRIX +#endif // TQT_NO_WMATRIX #endif // TQWMATRIX_H diff --git a/src/kernel/qabstractlayout.cpp b/src/kernel/qabstractlayout.cpp index 69cee62f..f11611f9 100644 --- a/src/kernel/qabstractlayout.cpp +++ b/src/kernel/qabstractlayout.cpp @@ -40,7 +40,7 @@ #include "ntqlayout.h" -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT #include "ntqapplication.h" #include "qlayoutengine_p.h" #include "ntqmenubar.h" @@ -48,7 +48,7 @@ static int menuBarHeightForWidth( TQMenuBar *menubar, int w ) { -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR if ( menubar && !menubar->isHidden() && !menubar->isTopLevel() ) return menubar->heightForWidth( TQMAX(w, menubar->minimumWidth()) ); else @@ -636,7 +636,7 @@ void TQLayout::init() autoMinimum = FALSE; autoResizeMode = TRUE; extraData = 0; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR menubar = 0; #endif } @@ -858,7 +858,7 @@ bool TQLayout::eventFilter( TQObject *o, TQEvent *e ) if ( activated ) { TQResizeEvent *r = (TQResizeEvent *)e; int mbh = 0; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR mbh = menuBarHeightForWidth( menubar, r->size().width() ); #endif int b = marginImpl ? 0 : outsideBorder; @@ -873,7 +873,7 @@ bool TQLayout::eventFilter( TQObject *o, TQEvent *e ) TQChildEvent *c = (TQChildEvent *)e; if ( c->child()->isWidgetType() ) { TQWidget *w = (TQWidget *)c->child(); -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR if ( w == menubar ) menubar = 0; #endif @@ -890,7 +890,7 @@ bool TQLayout::eventFilter( TQObject *o, TQEvent *e ) if ( c->child()->isWidgetType() ) { TQWidget *w = (TQWidget *)c->child(); if ( !w->isTopLevel() ) { -#if !defined(QT_NO_MENUBAR) && !defined(QT_NO_TOOLBAR) +#if !defined(TQT_NO_MENUBAR) && !defined(TQT_NO_TOOLBAR) if ( ::tqt_cast<TQMenuBar*>(w) && !::tqt_cast<TQToolBar*>(w->parentWidget()) ) menubar = (TQMenuBar *)w; else @@ -949,7 +949,7 @@ int TQLayout::totalHeightForWidth( int w ) const } int b = ( topLevel && !marginImpl ) ? 2 * outsideBorder : 0; int h = heightForWidth( w - b ) + b; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR h += menuBarHeightForWidth( menubar, w ); #endif return h; @@ -970,7 +970,7 @@ TQSize TQLayout::totalMinimumSize() const TQSize s = minimumSize(); int h = b; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR h += menuBarHeightForWidth( menubar, s.width() ); #endif return s + TQSize( b, h ); @@ -993,7 +993,7 @@ TQSize TQLayout::totalSizeHint() const if ( hasHeightForWidth() ) s.setHeight( heightForWidth(s.width()) ); int h = b; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR h += menuBarHeightForWidth( menubar, s.width() ); #endif return s + TQSize( b, h ); @@ -1015,7 +1015,7 @@ TQSize TQLayout::totalMaximumSize() const TQSize s = maximumSize(); int h = b; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR h += menuBarHeightForWidth( menubar, s.width() ); #endif @@ -1103,7 +1103,7 @@ void TQLayout::freeze( int w, int h ) } } -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR /*! Makes the geometry manager take account of the menu bar \a w. All @@ -1198,7 +1198,7 @@ bool TQLayout::activate() TQSize s = mw->size(); TQSize ms; int mbh = 0; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR mbh = menuBarHeightForWidth( menubar, s.width() ); #endif int b = marginImpl ? 0 : outsideBorder; @@ -1942,4 +1942,4 @@ void TQLayout::propagateSpacing( TQLayout *parent ) } } -#endif // QT_NO_LAYOUT +#endif // TQT_NO_LAYOUT diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp index 3acc3da5..a5c344ed 100644 --- a/src/kernel/qaccel.cpp +++ b/src/kernel/qaccel.cpp @@ -40,7 +40,7 @@ #include "ntqaccel.h" -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL #include "ntqsignal.h" #include "ntqapplication.h" @@ -228,7 +228,7 @@ bool TQAccelManager::correctSubWindow( TQWidget* w, TQAccelPrivate* d ) { /* if we live in a floating dock window, keep our parent's * accelerators working */ -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW if ( tlw->isDialog() && tlw->parentWidget() && ::tqt_cast<TQDockWindow*>(tlw) ) return tlw->parentWidget()->topLevelWidget() == wtlw; @@ -391,7 +391,7 @@ bool TQAccelManager::tryComposeUnicode( TQWidget* w, TQKeyEvent* e ) */ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) { -#ifndef QT_NO_STATUSBAR +#ifndef TQT_NO_STATUSBAR // Needs to be declared and used here because of "goto doclash" TQStatusBar* mainStatusBar = 0; #endif @@ -459,12 +459,12 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) pe = TQKeyEvent( TQEvent::Accel, pe.key(), pe.ascii(), pe.state()&~TQt::ShiftButton, pe.text() ); } while ( hasShift-- && !matchFound && !identicalDisabled ); -#ifndef QT_NO_STATUSBAR +#ifndef TQT_NO_STATUSBAR mainStatusBar = (TQStatusBar*) w->topLevelWidget()->child( 0, "TQStatusBar" ); #endif if ( n < 0 ) { // no match found currentState = partial.count() ? PartialMatch : NoMatch; -#ifndef QT_NO_STATUSBAR +#ifndef TQT_NO_STATUSBAR // Only display message if we are, or were, in a partial match if ( mainStatusBar && (PartialMatch == currentState || intermediate.count() ) ) { if ( currentState == TQt::PartialMatch ) { @@ -489,7 +489,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) return eatKey; } else if ( n == 0 ) { // found exactly one match clash = -1; // reset -#ifndef QT_NO_STATUSBAR +#ifndef TQT_NO_STATUSBAR if ( currentState == TQt::PartialMatch && mainStatusBar ) mainStatusBar->clear(); #endif @@ -501,7 +501,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) } doclash: // found more than one match -#ifndef QT_NO_STATUSBAR +#ifndef TQT_NO_STATUSBAR if ( !mainStatusBar ) // if "goto doclash", we need to get statusbar again. mainStatusBar = (TQStatusBar*) w->topLevelWidget()->child( 0, "TQStatusBar" ); #endif @@ -511,7 +511,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) intermediate = TQKeySequence(); currentState = TQt::NoMatch; // Free sequence keylock clash++; -#ifndef QT_NO_STATUSBAR +#ifndef TQT_NO_STATUSBAR if ( mainStatusBar && !lastitem->signal && !(lastaccel->parent->receivers( "activatedAmbiguously(int)" )) ) @@ -522,7 +522,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e ) intermediate = TQKeySequence(); currentState = TQt::NoMatch; // Free sequence keylock clash = 0; -#ifndef QT_NO_STATUSBAR +#ifndef TQT_NO_STATUSBAR if ( mainStatusBar && !firstitem->signal && !(firstaccel->parent->receivers( "activatedAmbiguously(int)" )) ) @@ -827,7 +827,7 @@ bool TQAccel::disconnectItem( int id, const TQObject *receiver, void TQAccelPrivate::activate( TQAccelItem* item ) { -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS if ( TQWhatsThis::inWhatsThisMode() && !ignorewhatsthis ) { TQWhatsThis::leaveWhatsThisMode( item->whatsthis ); return; @@ -1086,4 +1086,4 @@ to help. Ask them for ISBN 1859121047. void TQAccel::repairEventFilter() {} /*! \obsolete serves no purpose anymore */ bool TQAccel::eventFilter( TQObject *, TQEvent * ) { return FALSE; } -#endif // QT_NO_ACCEL +#endif // TQT_NO_ACCEL diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index 14665957..36c2ddea 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -331,12 +331,12 @@ TQStyle *TQApplication::app_style = 0; // default application style bool tqt_explicit_app_style = FALSE; // style explicitly set by programmer int TQApplication::app_cspec = TQApplication::NormalColor; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE TQPalette *TQApplication::app_pal = 0; // default application palette #endif TQFont *TQApplication::app_font = 0; // default application font bool tqt_app_has_font = FALSE; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQCursor *TQApplication::app_cursor = 0; // default application cursor #endif int TQApplication::app_tracking = 0; // global mouse tracking @@ -349,7 +349,7 @@ TQWidget *TQApplication::active_window = 0; // toplevel with keyboard focus bool TQApplication::obey_desktop_settings = TRUE; // use winsys resources int TQApplication::cursor_flash_time = 1000; // text caret flash time int TQApplication::mouse_double_click_time = 400; // mouse dbl click limit -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT int TQApplication::wheel_scroll_lines = 3; // number of lines to scroll #endif bool tqt_is_gui_used; @@ -369,7 +369,7 @@ bool TQApplication::fade_tooltip = FALSE; bool TQApplication::animate_toolbox = FALSE; bool TQApplication::widgetCount = FALSE; TQApplication::Type tqt_appType=TQApplication::Tty; -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT TQStringList *TQApplication::app_libpaths = 0; #endif bool TQApplication::metaComposeUnicode = FALSE; @@ -410,7 +410,7 @@ TQEventLoop* TQApplication::currentEventLoop() { } #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL extern bool tqt_dispatchAccelEvent( TQWidget*, TQKeyEvent* ); // def in qaccel.cpp extern bool tqt_tryComposeUnicode( TQWidget*, TQKeyEvent* ); // def in qaccel.cpp #endif @@ -530,13 +530,13 @@ Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction p ) TQAsciiDict<TQPalette> *TQApplication::app_palettes = 0; TQAsciiDict<TQFont> *TQApplication::app_fonts = 0; -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER TQString *TQApplication::session_key = 0; // ## session key. Should be a member in 4.0 #endif TQWidgetList *TQApplication::popupWidgets = 0; // has keyboard input focus TQDesktopWidget *tqt_desktopWidget = 0; // root window widgets -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD TQClipboard *tqt_clipboard = 0; // global clipboard object #endif TQWidgetList * tqt_modal_stack=0; // stack of modal widgets @@ -617,7 +617,7 @@ uint qGlobalPostedEventsCount() static TQSingleCleanupHandler<TQPostEventList> qapp_cleanup_events; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE TQPalette *tqt_std_pal = 0; void tqt_create_std_palette() @@ -675,7 +675,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv ) } else if ( qstrcmp(arg,"-style") == 0 && i < argc-1 ) { s = argv[++i]; s = s.lower(); -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER } else if ( qstrcmp(arg,"-session") == 0 && i < argc-1 ) { TQCString s = argv[++i]; if ( !s.isEmpty() ) { @@ -697,7 +697,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv ) } else { argv[j++] = argv[i]; } -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE if ( !s.isEmpty() ) { setStyle( s ); } @@ -733,7 +733,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv ) to process command line arguments. TQt debugging options (not available if TQt was compiled with the - QT_NO_DEBUG flag defined): + TQT_NO_DEBUG flag defined): \list \i -nograb, tells TQt that it must never grab the mouse or the keyboard. \i -dograb (only under X11), running under a debugger can cause @@ -1053,7 +1053,7 @@ void TQApplication::init_precmdline() { translators = 0; is_app_closing = FALSE; -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER is_session_restored = FALSE; #endif #if defined(QT_CHECK_STATE) @@ -1085,12 +1085,12 @@ void TQApplication::initialize( int argc, char **argv, bool enable_sm ) quit_now = FALSE; quit_code = 0; TQWidget::createMapper(); // create widget mapper -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE (void) palette(); // trigger creation of application palette #endif is_app_running = TRUE; // no longer starting up -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER if (enable_sm) { // connect to the session manager if ( !session_key ) @@ -1157,7 +1157,7 @@ TQWidget *TQApplication::activeModalWidget() TQApplication::~TQApplication() { -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD // flush clipboard contents if ( tqt_clipboard ) { TQCustomEvent event( TQEvent::Clipboard ); @@ -1185,12 +1185,12 @@ TQApplication::~TQApplication() tqt_desktopWidget = 0; is_app_closing = TRUE; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD delete tqt_clipboard; tqt_clipboard = 0; #endif TQWidget::destroyMapper(); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE delete tqt_std_pal; tqt_std_pal = 0; delete app_pal; @@ -1202,11 +1202,11 @@ TQApplication::~TQApplication() app_font = 0; delete app_fonts; app_fonts = 0; -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE delete app_style; app_style = 0; #endif -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR delete app_cursor; app_cursor = 0; #endif @@ -1214,14 +1214,14 @@ TQApplication::~TQApplication() delete translators; #endif -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP extern TQDragManager *qt_dnd_manager; delete qt_dnd_manager; #endif tqt_cleanup(); -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT delete app_libpaths; app_libpaths = 0; #endif @@ -1243,7 +1243,7 @@ TQApplication::~TQApplication() if ( widgetCount ) { tqDebug( "Widgets left: %i Max widgets: %i \n", TQWidget::instanceCounter, TQWidget::maxInstances ); } -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER if ( session_manager ) { delete session_manager; } @@ -1252,7 +1252,7 @@ TQApplication::~TQApplication() delete session_key; } session_key = 0; -#endif //QT_NO_SESSIONMANAGER +#endif //TQT_NO_SESSIONMANAGER #ifdef TQT_THREAD_SUPPORT delete tqt_sharedMetaObjectMutex; @@ -1271,7 +1271,7 @@ TQApplication::~TQApplication() obey_desktop_settings = TRUE; cursor_flash_time = 1000; mouse_double_click_time = 400; -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT wheel_scroll_lines = 3; #endif drag_time = 500; @@ -1349,7 +1349,7 @@ TQApplication::~TQApplication() */ -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE static TQString *qt_style_override = 0; @@ -1360,7 +1360,7 @@ static TQString *qt_style_override = 0; */ TQStyle& TQApplication::style() { -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE if ( app_style ) return *app_style; if ( !tqt_is_gui_used ) @@ -1408,7 +1408,7 @@ TQStyle& TQApplication::style() !(app_style = TQStyleFactory::create( "Aqua" ) ) && !(app_style = TQStyleFactory::create( "SGI" ) ) && !(app_style = TQStyleFactory::create( "Compact" ) ) -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST && !(app_style = TQStyleFactory::create( TQStyleFactory::keys()[0] ) ) #endif ) @@ -1699,7 +1699,7 @@ void TQApplication::setGlobalStrut( const TQSize& strut ) extern const char *tqAppFileName(); #endif -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR #ifndef Q_WS_WIN static TQString resolveSymlinks( const TQString& path, int depth = 0 ) { @@ -1840,9 +1840,9 @@ TQString TQApplication::applicationFilePath() } #endif } -#endif // QT_NO_DIR +#endif // TQT_NO_DIR -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT /*! Returns a list of paths that the application will search when @@ -1953,7 +1953,7 @@ void TQApplication::removeLibraryPath( const TQString &path ) if ( app_libpaths->contains( path ) ) app_libpaths->remove( path ); } -#endif //QT_NO_COMPONENT +#endif //TQT_NO_COMPONENT /*! Returns the application palette. @@ -1967,7 +1967,7 @@ void TQApplication::removeLibraryPath( const TQString &path ) \sa setPalette(), TQWidget::palette() */ -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE TQPalette TQApplication::palette(const TQWidget* w) { #if defined(QT_CHECK_STATE) @@ -2051,7 +2051,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets, { TQPalette pal = palette; TQPalette *oldpal = 0; -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE if ( !startingUp() ) // on startup this has been done already tqApp->style().polish( pal ); // NB: non-const reference #endif @@ -2090,7 +2090,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets, } } -#endif // QT_NO_PALETTE +#endif // TQT_NO_PALETTE /*! Returns the default font for the widget \a w, or the default @@ -2196,7 +2196,7 @@ void TQApplication::setFont( const TQFont &font, bool informWidgets, void TQApplication::polish( TQWidget *w ) { -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE w->style().polish( w ); #endif } @@ -2387,9 +2387,9 @@ void TQApplication::closeAllWindows() */ void TQApplication::aboutTQt() { -#ifndef QT_NO_MESSAGEBOX +#ifndef TQT_NO_MESSAGEBOX TQMessageBox::aboutTQt( mainWidget() ); -#endif // QT_NO_MESSAGEBOX +#endif // TQT_NO_MESSAGEBOX } @@ -2558,7 +2558,7 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e ) res = internalNotify( receiver, e ); } else switch ( e->type() ) { -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL case TQEvent::Accel: { TQKeyEvent* key = (TQKeyEvent*) e; @@ -2575,14 +2575,14 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e ) } } break; -#endif //QT_NO_ACCEL +#endif //TQT_NO_ACCEL case TQEvent::KeyPress: case TQEvent::KeyRelease: case TQEvent::AccelOverride: { TQWidget* w = (TQWidget*)receiver; TQKeyEvent* key = (TQKeyEvent*) e; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL if ( tqt_tryComposeUnicode( w, key ) ) break; #endif @@ -2635,7 +2635,7 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e ) mouse->ignore(); } break; -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT case TQEvent::Wheel: { if ( e->spontaneous() ) { @@ -2833,7 +2833,7 @@ bool TQApplication::internalNotify( TQObject *receiver, TQEvent * e) handled = TRUE; consumed = TRUE; break; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP case TQEvent::DragEnter: case TQEvent::DragMove: ( (TQDragMoveEvent*) e)->ignore(); @@ -2850,7 +2850,7 @@ bool TQApplication::internalNotify( TQObject *receiver, TQEvent * e) handled = TRUE; break; #endif -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT case TQEvent::Wheel: ( (TQWheelEvent*) e)->ignore(); handled = TRUE; @@ -3238,7 +3238,7 @@ void TQApplication::removeTranslator( TQTranslator * mf ) } } -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC /*! \obsolete This is the same as TQTextCodec::setCodecForTr(). */ @@ -3254,7 +3254,7 @@ TQTextCodec* TQApplication::defaultCodec() const { return TQTextCodec::codecForTr(); } -#endif //QT_NO_TEXTCODEC +#endif //TQT_NO_TEXTCODEC /*! \enum TQApplication::Encoding @@ -3322,7 +3322,7 @@ TQString TQApplication::translate( const char * context, const char * sourceText return result; } } -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( encoding == UnicodeUTF8 ) return TQString::fromUtf8( sourceText ); else if ( TQTextCodec::codecForTr() != 0 ) @@ -3426,7 +3426,7 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event ) }; } -#if !defined(QT_NO_IM) +#if !defined(TQT_NO_IM) // if this is one of the compressible IM events, do compression else if ( event->type() == TQEvent::IMCompose ) { l->last(); @@ -3734,7 +3734,7 @@ void TQApplication::removePostedEvent( TQEvent * event ) case TQEvent::MouseMove: n = "MouseMove"; break; -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT case TQEvent::Wheel: n = "Wheel"; break; @@ -3862,7 +3862,7 @@ void TQApplication::setActiveWindow( TQWidget* act ) // first the activation/deactivation events if ( active_window ) { TQWidgetList deacts; -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE if ( style().styleHint(TQStyle::SH_Widget_ShareActivation, active_window ) ) { TQWidgetList *list = topLevelWidgets(); if ( list ) { @@ -3885,7 +3885,7 @@ void TQApplication::setActiveWindow( TQWidget* act ) if ( active_window ) { TQEvent e( TQEvent::WindowActivate ); TQWidgetList acts; -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE if ( style().styleHint(TQStyle::SH_Widget_ShareActivation, active_window ) ) { TQWidgetList *list = topLevelWidgets(); if ( list ) { @@ -4096,7 +4096,7 @@ TQDesktopWidget *TQApplication::desktop() return tqt_desktopWidget; } -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD /*! Returns a pointer to the application global clipboard. */ @@ -4108,7 +4108,7 @@ TQClipboard *TQApplication::clipboard() } return tqt_clipboard; } -#endif // QT_NO_CLIPBOARD +#endif // TQT_NO_CLIPBOARD /*! By default, TQt will try to use the current standard colors, fonts @@ -4283,7 +4283,7 @@ bool TQApplication::tryLock() \sa isSessionRestored(), sessionId(), saveState(), \link session.html the Session Management overview\endlink */ -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER void TQApplication::commitData( TQSessionManager& sm ) { @@ -4345,7 +4345,7 @@ void TQApplication::commitData( TQSessionManager& sm ) void TQApplication::saveState( TQSessionManager& /* sm */ ) { } -#endif //QT_NO_SESSIONMANAGER +#endif //TQT_NO_SESSIONMANAGER /*! Sets the time after which a drag should start to \a ms ms. @@ -4807,8 +4807,8 @@ void MyApplication::commitData( TQSessionManager& sm ) { /***************************************************************************** Stubbed session management support *****************************************************************************/ -#ifndef QT_NO_SESSIONMANAGER -#if defined( QT_NO_SM_SUPPORT ) || defined( Q_WS_WIN ) || defined( Q_WS_MAC ) || defined( Q_WS_QWS ) +#ifndef TQT_NO_SESSIONMANAGER +#if defined( TQT_NO_SM_SUPPORT ) || defined( Q_WS_WIN ) || defined( Q_WS_MAC ) || defined( Q_WS_QWS ) class TQSessionManagerData { @@ -4932,5 +4932,5 @@ void TQSessionManager::requestPhase2() { } -#endif // QT_NO_SM_SUPPORT -#endif //QT_NO_SESSIONMANAGER +#endif // TQT_NO_SM_SUPPORT +#endif //TQT_NO_SESSIONMANAGER diff --git a/src/kernel/qapplication_p.h b/src/kernel/qapplication_p.h index 766a8c40..c0c59d59 100644 --- a/src/kernel/qapplication_p.h +++ b/src/kernel/qapplication_p.h @@ -70,7 +70,7 @@ extern Q_EXPORT void tqt_enter_modal( TQWidget* ); extern Q_EXPORT void tqt_leave_modal( TQWidget* ); extern bool tqt_is_gui_used; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD extern TQClipboard *tqt_clipboard; #endif diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 08402bb1..23d5969a 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -89,9 +89,9 @@ #include "ntqfileinfo.h" // Input method stuff - UNFINISHED -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "ntqinputcontext.h" -#endif // QT_NO_IM +#endif // TQT_NO_IM #include "qinternal_p.h" // shared double buffer cleanup #if defined(TQT_THREAD_SUPPORT) @@ -104,7 +104,7 @@ #include "qt_x11_p.h" -#if !defined(QT_NO_XFTFREETYPE) +#if !defined(TQT_NO_XFTFREETYPE) // XFree86 4.0.3 implementation is missing XftInitFtLibrary forward extern "C" Bool XftInitFtLibrary(void); #endif @@ -302,7 +302,7 @@ Window *qt_net_virtual_root_list = 0; // X11 SYNC support -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC Atom qt_net_wm_sync_request_counter = 0; Atom qt_net_wm_sync_request = 0; #endif @@ -319,7 +319,7 @@ static const int FocusModel_Other = 0; static const int FocusModel_PointerRoot = 1; static int qt_focus_model = -1; -#ifndef QT_NO_XRANDR +#ifndef TQT_NO_XRANDR // TRUE if TQt is compiled w/ XRandR support and XRandR exists on the connected // Display bool qt_use_xrandr = FALSE; @@ -330,7 +330,7 @@ static int xrandr_eventbase; // Display Q_EXPORT bool tqt_use_xrender = FALSE; -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC // True if SYNC extension exists on the connected display bool qt_use_xsync = FALSE; static int xsync_eventbase; @@ -423,7 +423,7 @@ static bool qt_x11EventFilter( XEvent* ev ) -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) //XIM qt_xim = 0; Q_EXPORT XIMStyle qt_xim_style = 0; Q_EXPORT XIMStyle qt_xim_preferred_style = 0; @@ -666,16 +666,16 @@ TQString TQApplication::defaultInputMethod() } -#if !defined(QT_NO_IM_EXTENSIONS) +#if !defined(TQT_NO_IM_EXTENSIONS) /*! \internal Creates the application input method. */ void TQApplication::create_im() { -#ifndef QT_NO_XIM +#ifndef TQT_NO_XIM if ( ! qt_xim_preferred_style ) // no configured input style, use the default qt_xim_preferred_style = xim_default_style; -#endif // QT_NO_XIM +#endif // TQT_NO_XIM } @@ -700,10 +700,10 @@ void TQApplication::close_im() */ void TQApplication::create_xim() { -#ifndef QT_NO_XIM +#ifndef TQT_NO_XIM if ( ! qt_xim_preferred_style ) // no configured input style, use the default qt_xim_preferred_style = xim_default_style; -#endif // QT_NO_XIM +#endif // TQT_NO_XIM TQWidgetList *list= tqApp->topLevelWidgets(); TQWidgetListIt it(*list); @@ -721,7 +721,7 @@ void TQApplication::create_xim() */ void TQApplication::close_xim() { -#ifndef QT_NO_XIM +#ifndef TQT_NO_XIM // Calling XCloseIM gives a Purify FMR error // XCloseIM( qt_xim ); // We prefer a less serious memory leak @@ -729,7 +729,7 @@ void TQApplication::close_xim() // if ( qt_xim ) // qt_xim = 0; -#endif // QT_NO_XIM +#endif // TQT_NO_XIM TQWidgetList *list = tqApp->topLevelWidgets(); TQWidgetListIt it(*list); while(it.current()) { @@ -1108,7 +1108,7 @@ bool TQApplication::x11_apply_settings() qt_use_rtl_extensions = settings.readBoolEntry("/qt/useRtlExtensions", FALSE); -#ifndef QT_NO_XIM +#ifndef TQT_NO_XIM if (qt_xim_preferred_style == 0) { TQString ximInputStyle = settings.readEntry( "/qt/XIMInputStyle", @@ -1124,7 +1124,7 @@ bool TQApplication::x11_apply_settings() } #endif -#ifndef QT_NO_IM +#ifndef TQT_NO_IM /* The identifier name of an input method is acquired from the configuration file as a default. If a environment variable @@ -1134,7 +1134,7 @@ bool TQApplication::x11_apply_settings() */ if ( getenv( "QT_IM_SWITCHER" ) ) defaultIM = getenv( "QT_IM_SWITCHER" ); -#ifndef QT_NO_IM_EXTENSIONS +#ifndef TQT_NO_IM_EXTENSIONS else defaultIM = settings.readEntry( "/qt/DefaultInputMethodSwitcher", "imsw-multi" ); #endif @@ -1742,7 +1742,7 @@ void tqt_init_internal( int *argcptr, char **argv, // ### Should we honor any others? } } -#ifndef QT_NO_XIM +#ifndef TQT_NO_XIM } else if ( arg == "-inputstyle" ) { if ( ++i < argc ) { TQCString s = TQCString(argv[i]).lower(); @@ -2060,7 +2060,7 @@ void tqt_init_internal( int *argcptr, char **argv, qt_x11_intern_atom( "UTF8_STRING", &qt_utf8_string ); qt_x11_intern_atom( "_SGI_DESKS_MANAGER", &qt_sgi_desks_manager ); -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST_COUNTER", &qt_net_wm_sync_request_counter ); qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST", &qt_net_wm_sync_request ); #endif @@ -2078,7 +2078,7 @@ void tqt_init_internal( int *argcptr, char **argv, qt_get_net_supported(); qt_get_net_virtual_roots(); -#ifndef QT_NO_XRANDR +#ifndef TQT_NO_XRANDR // See if XRandR is supported on the connected display int xrandr_errorbase; Q_UNUSED( xrandr_eventbase ); @@ -2086,9 +2086,9 @@ void tqt_init_internal( int *argcptr, char **argv, // XRandR is supported qt_use_xrandr = TRUE; } -#endif // QT_NO_XRANDR +#endif // TQT_NO_XRANDR -#ifndef QT_NO_XRENDER +#ifndef TQT_NO_XRENDER // See if XRender is supported on the connected display int xrender_eventbase, xrender_errorbase; if (XRenderQueryExtension(appDpy, &xrender_eventbase, &xrender_errorbase)) { @@ -2099,9 +2099,9 @@ void tqt_init_internal( int *argcptr, char **argv, (Visual *) TQPaintDevice::x_appvisual); tqt_use_xrender = (format != 0) && (TQPaintDevice::x_appdepth != 8); } -#endif // QT_NO_XRENDER +#endif // TQT_NO_XRENDER -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC // Try to initialize SYNC extension on the connected display int xsync_major, xsync_minor; if ( XSyncQueryExtension( appDpy, &xsync_eventbase, &xsync_errorbase ) && @@ -2110,14 +2110,14 @@ void tqt_init_internal( int *argcptr, char **argv, } #endif -#ifndef QT_NO_XKB +#ifndef TQT_NO_XKB // If XKB is detected, set the GrabsUseXKBState option so input method // compositions continue to work (ie. deadkeys) unsigned int state = XkbPCF_GrabsUseXKBStateMask; (void) XkbSetPerClientControls(appDpy, state, &state); #endif -#if !defined(QT_NO_XFTFREETYPE) +#if !defined(TQT_NO_XFTFREETYPE) // defined in qfont_x11.cpp extern bool tqt_has_xft; #ifndef QT_XFT2 @@ -2141,7 +2141,7 @@ void tqt_init_internal( int *argcptr, char **argv, } } } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE // look at the modifier mapping, and get the correct masks for alt/meta // find the alt/meta masks @@ -2220,10 +2220,10 @@ void tqt_init_internal( int *argcptr, char **argv, KeymapStateMask | EnterWindowMask | LeaveWindowMask | PropertyChangeMask ); -#ifndef QT_NO_XRANDR +#ifndef TQT_NO_XRANDR if (qt_use_xrandr) XRRSelectInput( appDpy, TQPaintDevice::x11AppRootWindow( screen ), True ); -#endif // QT_NO_XRANDR +#endif // TQT_NO_XRANDR } } @@ -2246,8 +2246,8 @@ void tqt_init_internal( int *argcptr, char **argv, TQApplication::setFont( f ); } -#if !defined(QT_NO_IM) -#if !defined(QT_NO_IM_EXTENSIONS) +#if !defined(TQT_NO_IM) +#if !defined(TQT_NO_IM_EXTENSIONS) TQApplication::create_im(); #else TQApplication::create_xim(); @@ -2414,7 +2414,7 @@ void tqt_init_internal( int *argcptr, char **argv, } -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE // run-time search for default style void TQApplication::x11_initialize_style() { @@ -2506,8 +2506,8 @@ void tqt_cleanup() XCloseDevice( appDpy, devEraser ); #endif -#if !defined(QT_NO_IM) -#if !defined(QT_NO_IM_EXTENSIONS) +#if !defined(TQT_NO_IM) +#if !defined(TQT_NO_IM_EXTENSIONS) TQApplication::close_im(); #else TQApplication::close_xim(); @@ -2825,7 +2825,7 @@ void TQApplication::setMainWidget( TQWidget *mainWidget ) } } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR /***************************************************************************** TQApplication cursor stack @@ -3252,10 +3252,10 @@ int TQApplication::x11ClientMessage(TQWidget* w, XEvent* event, bool passive_onl amw->setActiveWindow(); } } -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS } else if ( a == qt_net_wm_context_help ) { TQWhatsThis::enterWhatsThisMode(); -#endif // QT_NO_WHATSTHIS +#endif // TQT_NO_WHATSTHIS } else if ( a == qt_net_wm_ping ) { // avoid send/reply loops Window root = TQPaintDevice::x11AppRootWindow( w->x11Screen() ); @@ -3264,7 +3264,7 @@ int TQApplication::x11ClientMessage(TQWidget* w, XEvent* event, bool passive_onl XSendEvent( event->xclient.display, event->xclient.window, False, SubstructureNotifyMask|SubstructureRedirectMask, event ); } -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC } else if (a == qt_net_wm_sync_request ) { widget->handleSyncRequest( event ); #endif @@ -3374,7 +3374,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) } } -#ifndef QT_NO_IM +#ifndef TQT_NO_IM // Filtering input events by the input context. It has to be taken // place before any other key event consumers such as eventfilters // and accelerators because some input methods require quite @@ -3383,7 +3383,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) // filtering opportunity first to ensure all input methods work // properly regardless of application design. -// #ifndef QT_NO_IM_EXTENSIONS +// #ifndef TQT_NO_IM_EXTENSIONS if( keywidget && keywidget->isEnabled() && keywidget->isInputMethodEnabled() ) { // #else // if( keywidget && keywidget->isEnabled() ) { @@ -3423,7 +3423,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) return TRUE; } } else -#endif // QT_NO_IM +#endif // TQT_NO_IM { if ( XFilterEvent( event, None ) ) return TRUE; @@ -3472,7 +3472,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) return 0; } -#ifndef QT_NO_XRANDR +#ifndef TQT_NO_XRANDR // XRandR doesn't care if TQt doesn't know about the widget, so handle XRandR stuff before the !widget check below if (event->type == xrandr_eventbase + RRScreenChangeNotify || ( event->type == ConfigureNotify && event->xconfigure.window == TQPaintDevice::x11AppRootWindow())) { @@ -3504,7 +3504,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) } } } -#endif // QT_NO_XRANDR +#endif // TQT_NO_XRANDR if ( !widget ) { // don't know this windows TQWidget* popup = TQApplication::activePopupWidget(); @@ -5044,7 +5044,7 @@ static void deleteKeyDicts() textDict = 0; } -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) static const unsigned short katakanaKeysymsToUnicode[] = { 0x0000, 0x3002, 0x300C, 0x300D, 0x3001, 0x30FB, 0x30F2, 0x30A1, 0x30A3, 0x30A5, 0x30A7, 0x30A9, 0x30E3, 0x30E5, 0x30E7, 0x30C3, @@ -5231,7 +5231,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count, type = (event->type == XKeyPress) ? TQEvent::KeyPress : TQEvent::KeyRelease; -#if defined(QT_NO_XIM) +#if defined(TQT_NO_XIM) count = XLookupString( &xkeyevent, chars.data(), chars.size(), &key, 0 ); @@ -5337,7 +5337,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count, ascii = (char)(s-256); } } -#endif // !QT_NO_XIM +#endif // !TQT_NO_XIM state = qt_x11_translateButtonState( keystate ); @@ -5615,13 +5615,13 @@ bool TQETWidget::translateKeyEvent( const XEvent *event, bool grab ) translateKeyEventInternal( event, count, text, state, ascii, code, type ); } -#ifndef QT_NO_IM +#ifndef TQT_NO_IM TQInputContext *qic = getInputContext(); #endif // compress keys if ( !text.isEmpty() && testWState(WState_CompressKeys) && -#ifndef QT_NO_IM +#ifndef TQT_NO_IM // Ordinary input methods require discrete key events to work // properly, so key compression has to be disabled when input // context exists. @@ -5642,7 +5642,7 @@ bool TQETWidget::translateKeyEvent( const XEvent *event, bool grab ) // such as key repeat mechanism is required to implement such // feature. ! qic && -#endif // QT_NO_IM +#endif // TQT_NO_IM // do not compress keys if the key event we just got above matches // one of the key ranges used to compute stopCompression ! ( ( code >= Key_Escape && code <= Key_SysReq ) || @@ -5702,10 +5702,10 @@ bool TQETWidget::translateKeyEvent( const XEvent *event, bool grab ) // autorepeat compression makes sense for all widgets (Windows // does it automatically .... ) if ( event->type == XKeyPress && text.length() <= 1 -#ifndef QT_NO_IM +#ifndef TQT_NO_IM // input methods need discrete key events && ! qic -#endif// QT_NO_IM +#endif// TQT_NO_IM ) { XEvent dummy; @@ -5917,7 +5917,7 @@ bool TQETWidget::translateScrollDoneEvent( const XEvent *event ) #if defined(Q_C_CALLBACKS) extern "C" { #endif -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC static Bool qt_net_wm_sync_request_scanner(Display*, XEvent* event, XPointer arg) { return (event->type == ClientMessage && event->xclient.window == *(Window*)arg @@ -5983,7 +5983,7 @@ bool TQETWidget::translateConfigEvent( const XEvent *event ) } ++compressed_configs; } -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC // _NET_WM_SYNC_REQUEST compression Window wid = winId(); while ( compressed_configs && @@ -6234,7 +6234,7 @@ bool TQApplication::isEffectEnabled( TQt::UIEffect effect ) Session management support *****************************************************************************/ -#ifndef QT_NO_SM_SUPPORT +#ifndef TQT_NO_SM_SUPPORT #include <X11/SM/SMlib.h> @@ -6712,4 +6712,4 @@ void TQSessionManager::requestPhase2() } -#endif // QT_NO_SM_SUPPORT +#endif // TQT_NO_SM_SUPPORT diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp index e26ef399..a8196e93 100644 --- a/src/kernel/qasyncimageio.cpp +++ b/src/kernel/qasyncimageio.cpp @@ -40,7 +40,7 @@ #include "ntqasyncimageio.h" -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO #include "ntqptrlist.h" #include "ntqgif.h" @@ -1313,4 +1313,4 @@ TQRgb TQGIFFormat::color( uchar index ) const #endif // QT_BUILTIN_GIF_READER -#endif // QT_NO_ASYNC_IMAGE_IO +#endif // TQT_NO_ASYNC_IMAGE_IO diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp index 0bccc14d..bf5890ac 100644 --- a/src/kernel/qasyncio.cpp +++ b/src/kernel/qasyncio.cpp @@ -42,7 +42,7 @@ #include "ntqiodevice.h" #include <stdlib.h> -#ifndef QT_NO_ASYNC_IO +#ifndef TQT_NO_ASYNC_IO /*! \class TQAsyncIO ntqasyncio.h @@ -356,5 +356,5 @@ void TQDataPump::tryToPump() timer.start(0, TRUE); } -#endif // QT_NO_ASYNC_IO +#endif // TQT_NO_ASYNC_IO diff --git a/src/kernel/qbitmap.cpp b/src/kernel/qbitmap.cpp index 1e341e54..9a075b8f 100644 --- a/src/kernel/qbitmap.cpp +++ b/src/kernel/qbitmap.cpp @@ -191,7 +191,7 @@ TQBitmap::TQBitmap( const TQBitmap &bitmap ) { } -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Constructs a bitmap from the file \a fileName. If the file does not exist or is of an unknown format, the bitmap becomes a null @@ -277,7 +277,7 @@ TQBitmap &TQBitmap::operator=( const TQImage &image ) } -#ifndef QT_NO_PIXMAP_TRANSFORMATION +#ifndef TQT_NO_PIXMAP_TRANSFORMATION /*! Returns a transformed copy of this bitmap by using \a matrix. @@ -298,7 +298,7 @@ TQBitmap TQBitmap::xForm( const TQWMatrix &matrix ) const bm = pm; return bm; } -#endif // QT_NO_TRANSFORMATIONS +#endif // TQT_NO_TRANSFORMATIONS diff --git a/src/kernel/qclipboard.cpp b/src/kernel/qclipboard.cpp index 77b1235e..ae532880 100644 --- a/src/kernel/qclipboard.cpp +++ b/src/kernel/qclipboard.cpp @@ -40,7 +40,7 @@ #include "ntqclipboard.h" -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD #include "ntqapplication.h" #include "qapplication_p.h" @@ -208,7 +208,7 @@ TQClipboard::~TQClipboard() TQApplication member functions related to TQClipboard. *****************************************************************************/ -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD // text handling is done directly in qclipboard_qws, for now /*! @@ -563,5 +563,5 @@ void TQClipboard::clear() clear( selectionModeEnabled() ? Selection : Clipboard ); } -#endif // QT_NO_MIMECLIPBOARD -#endif // QT_NO_CLIPBOARD +#endif // TQT_NO_MIMECLIPBOARD +#endif // TQT_NO_CLIPBOARD diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp index 4a16e6da..468eff81 100644 --- a/src/kernel/qclipboard_x11.cpp +++ b/src/kernel/qclipboard_x11.cpp @@ -62,7 +62,7 @@ #include "ntqclipboard.h" -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD #include "ntqapplication.h" #include "ntqeventloop.h" @@ -1670,4 +1670,4 @@ bool qt_check_clipboard_sentinel() return doIt; } -#endif // QT_NO_CLIPBOARD +#endif // TQT_NO_CLIPBOARD diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp index af11e67a..1b0895ba 100644 --- a/src/kernel/qcolor.cpp +++ b/src/kernel/qcolor.cpp @@ -486,7 +486,7 @@ bool TQColor::isDirty() const TQString TQColor::name() const { -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_SPRINTF TQString s; s.sprintf( "#%02x%02x%02x", red(), green(), blue() ); return s; @@ -920,7 +920,7 @@ uint TQColor::pixel() const /***************************************************************************** TQColor stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQColor Writes a color object, \a c to the stream, \a s. diff --git a/src/kernel/qcolor_p.cpp b/src/kernel/qcolor_p.cpp index 97a3e488..e7e33c9c 100644 --- a/src/kernel/qcolor_p.cpp +++ b/src/kernel/qcolor_p.cpp @@ -47,7 +47,7 @@ #include "ntqcolor.h" -#ifndef QT_NO_COLORNAMES +#ifndef TQT_NO_COLORNAMES #include <stdlib.h> @@ -766,7 +766,7 @@ uint qt_get_rgb_val( const char *name ) qt_get_named_rgb(name,&r); return r; } -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST TQStringList TQColor::colorNames() { int i = 0; @@ -788,10 +788,10 @@ uint qt_get_rgb_val( const char * ) { return 0; } -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST TQStringList TQColor::colorNames() { return TQStringList(); } #endif -#endif // QT_NO_COLORNAMES +#endif // TQT_NO_COLORNAMES diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp index ecb21333..7d128c15 100644 --- a/src/kernel/qcursor.cpp +++ b/src/kernel/qcursor.cpp @@ -40,7 +40,7 @@ #include "ntqcursor.h" -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR #include "ntqbitmap.h" #include "ntqimage.h" @@ -147,7 +147,7 @@ TQCursor stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! @@ -161,7 +161,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQCursor &c ) { s << (TQ_INT16)c.shape(); // write shape id to stream if ( c.shape() == TQt::BitmapCursor ) { // bitmap cursor -#if !defined(QT_NO_IMAGEIO) +#if !defined(TQT_NO_IMAGEIO) s << *c.bitmap() << *c.mask(); s << c.hotSpot(); #else @@ -183,7 +183,7 @@ TQDataStream &operator>>( TQDataStream &s, TQCursor &c ) TQ_INT16 shape; s >> shape; // read shape id from stream if ( shape == TQt::BitmapCursor ) { // read bitmap cursor -#if !defined(QT_NO_IMAGEIO) +#if !defined(TQT_NO_IMAGEIO) TQBitmap bm, bmm; TQPoint hot; s >> bm >> bmm >> hot; @@ -196,7 +196,7 @@ TQDataStream &operator>>( TQDataStream &s, TQCursor &c ) } return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM /*! @@ -282,6 +282,6 @@ TQCursor::TQCursor( const TQBitmap &bitmap, const TQBitmap &mask, setBitmap(bitmap,mask,hotX,hotY); } -#endif // QT_NO_CURSOR +#endif // TQT_NO_CURSOR diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp index 8f5114f9..cea5646c 100644 --- a/src/kernel/qcursor_x11.cpp +++ b/src/kernel/qcursor_x11.cpp @@ -47,9 +47,9 @@ #include "qt_x11_p.h" #include <X11/cursorfont.h> -#ifndef QT_NO_XCURSOR +#ifndef TQT_NO_XCURSOR # include <X11/Xcursor/Xcursor.h> -#endif // QT_NO_XCURSOR +#endif // TQT_NO_XCURSOR // Define QT_USE_APPROXIMATE_CURSORS when compiling if you REALLY want to // use the ugly X11 cursors. @@ -515,7 +515,7 @@ void TQCursor::update() const return; } -#ifndef QT_NO_XCURSOR +#ifndef TQT_NO_XCURSOR static const char *cursorNames[] = { "left_ptr", "up_arrow", @@ -539,7 +539,7 @@ void TQCursor::update() const d->hcurs = XcursorLibraryLoadCursor( dpy, cursorNames[d->cshape] ); if ( d->hcurs ) return; -#endif // QT_NO_XCURSOR +#endif // TQT_NO_XCURSOR static uchar cur_blank_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/src/kernel/qdesktopwidget_x11.cpp b/src/kernel/qdesktopwidget_x11.cpp index d8c10605..449af4ff 100644 --- a/src/kernel/qdesktopwidget_x11.cpp +++ b/src/kernel/qdesktopwidget_x11.cpp @@ -120,7 +120,7 @@ void TQDesktopWidgetPrivate::init() // get the screen count int newScreenCount; -#ifndef QT_NO_XINERAMA +#ifndef TQT_NO_XINERAMA XineramaScreenInfo *xinerama_screeninfo = 0; int unused; use_xinerama = (XineramaQueryExtension(TQPaintDevice::x11AppDisplay(), @@ -134,7 +134,7 @@ void TQDesktopWidgetPrivate::init() if (xinerama_screeninfo) defaultScreen = 0; } else -#endif // QT_NO_XINERAMA +#endif // TQT_NO_XINERAMA { defaultScreen = DefaultScreen(TQPaintDevice::x11AppDisplay()); newScreenCount = ScreenCount(TQPaintDevice::x11AppDisplay()); @@ -150,14 +150,14 @@ void TQDesktopWidgetPrivate::init() int i, j, x, y, w, h; for ( i = 0, j = 0; i < newScreenCount; i++ ) { -#ifndef QT_NO_XINERAMA +#ifndef TQT_NO_XINERAMA if (use_xinerama) { x = xinerama_screeninfo[i].x_org; y = xinerama_screeninfo[i].y_org; w = xinerama_screeninfo[i].width; h = xinerama_screeninfo[i].height; } else -#endif // QT_NO_XINERAMA +#endif // TQT_NO_XINERAMA { x = 0; y = 0; @@ -188,13 +188,13 @@ void TQDesktopWidgetPrivate::init() screenCount = j; -#ifndef QT_NO_XINERAMA +#ifndef TQT_NO_XINERAMA if (use_xinerama && screenCount == 1) use_xinerama = false; if (xinerama_screeninfo) XFree(xinerama_screeninfo); -#endif // QT_NO_XINERAMA +#endif // TQT_NO_XINERAMA } @@ -314,7 +314,7 @@ int TQDesktopWidget::screenNumber( TQWidget *widget ) const if ( !widget ) return d->defaultScreen; -#ifndef QT_NO_XINERAMA +#ifndef TQT_NO_XINERAMA if (d->use_xinerama) { // this is how we do it for xinerama TQRect frame = widget->frameGeometry(); @@ -334,7 +334,7 @@ int TQDesktopWidget::screenNumber( TQWidget *widget ) const } return maxScreen; } -#endif // QT_NO_XINERAMA +#endif // TQT_NO_XINERAMA return widget->x11Screen(); } diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp index 42892ca0..bad09d3c 100644 --- a/src/kernel/qdnd_x11.cpp +++ b/src/kernel/qdnd_x11.cpp @@ -42,7 +42,7 @@ #include "ntqapplication.h" -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP #include "ntqwidget.h" #include "ntqintdict.h" @@ -1123,7 +1123,7 @@ void TQDragManager::updateCursor() //if ( qt_xdnd_deco ) // qt_xdnd_deco->hide(); } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( c ) tqApp->setOverrideCursor( *c, TRUE ); #endif @@ -1143,7 +1143,7 @@ void TQDragManager::cancel( bool deleteSource ) qt_xdnd_send_leave(); } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( restoreCursor ) { TQApplication::restoreOverrideCursor(); restoreCursor = FALSE; @@ -1449,7 +1449,7 @@ void TQDragManager::drop() XSendEvent( TQPaintDevice::x11AppDisplay(), qt_xdnd_current_proxy_target, False, NoEventMask, (XEvent*)&drop ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( restoreCursor ) { TQApplication::restoreOverrideCursor(); restoreCursor = FALSE; @@ -1794,7 +1794,7 @@ bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode ) heartbeat = startTimer(200); need_modifiers_check = FALSE; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR tqApp->setOverrideCursor( arrowCursor ); restoreCursor = TRUE; updateCursor(); @@ -1808,7 +1808,7 @@ bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode ) tqApp->enter_loop(); // Do the DND. -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR tqApp->restoreOverrideCursor(); #endif @@ -1856,4 +1856,4 @@ void TQDragManager::updatePixmap() updatePixmap( TQCursor::pos()); } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp index 428000a3..efc08616 100644 --- a/src/kernel/qdragobject.cpp +++ b/src/kernel/qdragobject.cpp @@ -43,7 +43,7 @@ # undef open #endif -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME #include "ntqdragobject.h" #include "ntqtextcodec.h" @@ -257,7 +257,7 @@ static const char * const link_xpm[] = { ".............aXXXXXXXXXa", ".............aaaaaaaaaaa"}; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP // the universe's only drag manager TQDragManager * qt_dnd_manager = 0; @@ -287,7 +287,7 @@ TQDragManager::TQDragManager() TQDragManager::~TQDragManager() { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( restoreCursor ) TQApplication::restoreOverrideCursor(); #endif @@ -311,7 +311,7 @@ TQDragObject::TQDragObject( TQWidget * dragSource, const char * name ) { d = new TQDragObjectData(); d->pm_cursor = 0; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( !qt_dnd_manager && tqApp ) (void)new TQDragManager(); #endif @@ -325,7 +325,7 @@ TQDragObject::TQDragObject( TQWidget * dragSource, const char * name ) TQDragObject::~TQDragObject() { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( qt_dnd_manager && qt_dnd_manager->object == this ) qt_dnd_manager->cancel( FALSE ); if ( d->pm_cursor ) { @@ -337,7 +337,7 @@ TQDragObject::~TQDragObject() delete d; } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /*! Set the pixmap \a pm to display while dragging the object. The platform-specific implementation will use this where it can - so @@ -1684,7 +1684,7 @@ bool TQUriDrag::decodeToUnicodeUris( const TQMimeSource* e, TQStringList& l ) } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /*! If the source of the drag operation is a widget in this application, this function returns that source, otherwise it @@ -1808,4 +1808,4 @@ bool TQColorDrag::decode( TQMimeSource *e, TQColor &col ) return TRUE; } -#endif // QT_NO_MIME +#endif // TQT_NO_MIME diff --git a/src/kernel/qdrawutil.cpp b/src/kernel/qdrawutil.cpp index 8dfb9329..0ac5bde3 100644 --- a/src/kernel/qdrawutil.cpp +++ b/src/kernel/qdrawutil.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqdrawutil.h" -#ifndef QT_NO_DRAWUTIL +#ifndef TQT_NO_DRAWUTIL #include "ntqbitmap.h" #include "ntqpixmapcache.h" #include "ntqapplication.h" @@ -629,7 +629,7 @@ void qDrawItem( TQPainter *p, TQt::GUIStyle gs, } } else if ( pm.depth() == 1 ) { // monochrome pixmap, no mask pm.setMask( *((TQBitmap *)&pm) ); -#ifndef QT_NO_IMAGE_HEURISTIC_MASK +#ifndef TQT_NO_IMAGE_HEURISTIC_MASK } else { // color pixmap, no mask TQString k; k.sprintf( "$qt-drawitem-%x", pm.serialNumber() ); @@ -795,7 +795,7 @@ static void qDrawWinArrow( TQPainter *p, TQt::ArrowType type, bool down, #pragma warning(disable: 4244) #endif -#ifndef QT_NO_STYLE_MOTIF +#ifndef TQT_NO_STYLE_MOTIF // motif arrows look the same whether they are used or not // is this correct? static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down, @@ -806,7 +806,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down, TQPointArray bTop; // top shadow. TQPointArray bBot; // bottom shadow. TQPointArray bLeft; // left shadow. -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix matrix; // xform matrix #endif bool vertical = type == TQt::UpArrow || type == TQt::DownArrow; @@ -857,7 +857,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down, } if ( type == TQt::UpArrow || type == TQt::LeftArrow ) { -#ifndef QT_NO_TRANSFORMATIONS // #### fix me! +#ifndef TQT_NO_TRANSFORMATIONS // #### fix me! matrix.translate( x, y ); if ( vertical ) { matrix.translate( 0, h - 1 ); @@ -873,7 +873,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down, colspec = horizontal ? 0x1443 : 0x1434; } else if ( type == TQt::DownArrow || type == TQt::RightArrow ) { -#ifndef QT_NO_TRANSFORMATIONS // #### fix me! +#ifndef TQT_NO_TRANSFORMATIONS // #### fix me! matrix.translate( x, y ); if ( vertical ) { matrix.translate( w-1, 0 ); @@ -899,7 +899,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down, TQPen savePen = p->pen(); // save current pen TQBrush saveBrush = p->brush(); // save current brush -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix wxm = p->worldMatrix(); #endif TQPen pen( TQt::NoPen ); @@ -907,7 +907,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down, p->setPen( pen ); p->setBrush( brush ); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS p->setWorldMatrix( matrix, TRUE ); // set transformation matrix #endif p->drawPolygon( bFill ); // fill arrow @@ -920,7 +920,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down, p->setPen( CBOT ); p->drawLineSegments( bBot ); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS p->setWorldMatrix( wxm ); #endif p->setBrush( saveBrush ); // restore brush @@ -941,7 +941,7 @@ void qDrawArrow( TQPainter *p, TQt::ArrowType type, TQt::GUIStyle style, bool do case TQt::WindowsStyle: qDrawWinArrow( p, type, down, x, y, w, h, g, enabled ); break; -#ifndef QT_NO_STYLE_MOTIF +#ifndef TQT_NO_STYLE_MOTIF case TQt::MotifStyle: qDrawMotifArrow( p, type, down, x, y, w, h, g, enabled ); break; @@ -954,4 +954,4 @@ void qDrawArrow( TQPainter *p, TQt::ArrowType type, TQt::GUIStyle style, bool do #endif } } -#endif //QT_NO_DRAWUTIL +#endif //TQT_NO_DRAWUTIL diff --git a/src/kernel/qdropsite.cpp b/src/kernel/qdropsite.cpp index 07dd965d..8dd44a2c 100644 --- a/src/kernel/qdropsite.cpp +++ b/src/kernel/qdropsite.cpp @@ -38,7 +38,7 @@ #include "ntqdropsite.h" -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP #include "ntqwidget.h" @@ -78,4 +78,4 @@ TQDropSite::~TQDropSite() { } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP diff --git a/src/kernel/qevent.cpp b/src/kernel/qevent.cpp index 2e1ce96e..3a4af436 100644 --- a/src/kernel/qevent.cpp +++ b/src/kernel/qevent.cpp @@ -523,7 +523,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const \sa pos(), delta(), state() */ -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientation orient ) : TQEvent(Wheel), p(pos), d(delta), s((ushort)state), accpt(TRUE), o(orient) diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp index 856db67d..45594112 100644 --- a/src/kernel/qfont.cpp +++ b/src/kernel/qfont.cpp @@ -1369,7 +1369,7 @@ void TQFont::setDefaultFont( const TQFont &f ) -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST /***************************************************************************** TQFont substitution management @@ -1540,7 +1540,7 @@ TQStringList TQFont::substitutions() return ret; } -#endif // QT_NO_STRINGLIST +#endif // TQT_NO_STRINGLIST /* \internal @@ -1572,7 +1572,7 @@ static TQ_UINT8 get_font_bits( const TQFontPrivate *f ) } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /* \internal Internal function. Sets boolean font settings from an unsigned @@ -1639,7 +1639,7 @@ TQString TQFont::toString() const */ bool TQFont::fromString(const TQString &descrip) { -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST TQStringList l(TQStringList::split(',', descrip)); int count = (int)l.count(); @@ -1654,7 +1654,7 @@ bool TQFont::fromString(const TQString &descrip) from = to+1; to = descrip.find( ',', from ); } -#endif // QT_NO_STRINGLIST +#endif // TQT_NO_STRINGLIST if ( !count || ( count > 2 && count < 9 ) || count > 11 ) { #ifdef QT_CHECK_STATE @@ -1708,7 +1708,7 @@ void TQFont::cacheStatistics() /***************************************************************************** TQFont stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQFont @@ -1798,7 +1798,7 @@ TQDataStream &operator>>( TQDataStream &s, TQFont &font ) return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp index 6877c9a6..2bb65a4f 100644 --- a/src/kernel/qfont_x11.cpp +++ b/src/kernel/qfont_x11.cpp @@ -71,7 +71,7 @@ Q_EXPORT bool tqt_has_xft = FALSE; -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE TQt::HANDLE qt_xft_handle(const TQFont &font) { TQFontEngine *engine = font.d->engineForScript( TQFontPrivate::defaultScript ); @@ -195,8 +195,8 @@ void TQFont::initialize() // create global font cache if ( ! TQFontCache::instance ) (void) new TQFontCache; -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS static bool codecs_once = FALSE; if ( ! codecs_once ) { (void) new TQFontJis0201Codec; @@ -210,8 +210,8 @@ void TQFont::initialize() (void) new TQFontLaoCodec; codecs_once = TRUE; } -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS extern int qt_encoding_id_for_mib( int mib ); // from qfontdatabase_x11.cpp TQTextCodec *codec = TQTextCodec::codecForLocale(); diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp index af4cf599..3d0b1b5a 100644 --- a/src/kernel/qfontdatabase.cpp +++ b/src/kernel/qfontdatabase.cpp @@ -40,7 +40,7 @@ #include "ntqfontdatabase.h" -#ifndef QT_NO_FONTDATABASE +#ifndef TQT_NO_FONTDATABASE #include <ntqtl.h> #include <ntqapplication.h> @@ -601,7 +601,7 @@ static const unsigned short sample_chars[TQFont::LastPrivateScript][14] = // Taiwan would be 0x201C, 0x3002, 0x4E00, 0x9F98, 0xFFE5 }; -#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) +#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) static inline bool requiresOpenType(TQFont::Script s) { return (s >= TQFont::Syriac && s <= TQFont::Sinhala) @@ -631,7 +631,7 @@ static inline bool canRender( TQFontEngine *fe, TQFont::Script script ) } ++i; } -#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) +#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) if (hasChar && requiresOpenType(script)) { TQOpenType *ot = fe->openType(); if (!ot || !ot->supportsScript(script)) @@ -2488,4 +2488,4 @@ void TQFontDatabase::parseFontName(const TQString &name, TQString &foundry, TQSt } } -#endif // QT_NO_FONTDATABASE +#endif // TQT_NO_FONTDATABASE diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp index bb555ed3..c449b896 100644 --- a/src/kernel/qfontdatabase_x11.cpp +++ b/src/kernel/qfontdatabase_x11.cpp @@ -53,7 +53,7 @@ #include <fcntl.h> #include <sys/mman.h> -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE #include <ft2build.h> #include FT_FREETYPE_H #endif @@ -831,7 +831,7 @@ static void loadXlfds( const char *reqFamily, int encoding_id ) #endif // QT_XFT2 } -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE static int getXftWeight(int xftweight) { int qtweight = TQFont::Black; @@ -1281,7 +1281,7 @@ static inline void checkXftCoverage( TQtFontFamily *family ) family->xftScriptCheck = TRUE; } #endif // QT_XFT2 -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE static void load( const TQString &family = TQString::null, int script = -1 ) { @@ -1291,7 +1291,7 @@ static void load( const TQString &family = TQString::null, int script = -1 ) #endif if ( family.isNull() ) { -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE static bool xft_readall_done = false; if (tqt_has_xft && !xft_readall_done) { xft_readall_done = true; @@ -1316,7 +1316,7 @@ static void load( const TQString &family = TQString::null, int script = -1 ) if (tqt_has_xft) return; #endif -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE if ( script == -1 ) loadXlfds( 0, -1 ); else { @@ -1329,7 +1329,7 @@ static void load( const TQString &family = TQString::null, int script = -1 ) TQtFontFamily *f = db->family( family, TRUE ); if ( !f->fullyLoaded ) { -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (tqt_has_xft) { TQString mfamily = family; redo: @@ -1365,7 +1365,7 @@ static void load( const TQString &family = TQString::null, int script = -1 ) checkXftCoverage( f ); } #endif -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE // could reduce this further with some more magic: // would need to remember the encodings loaded for the family. if ( ( script == -1 && !f->xlfdLoaded ) || @@ -1396,14 +1396,14 @@ static void initializeDb() TQTime t; t.start(); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE loadXft(); FD_DEBUG("TQFontDatabase: loaded Xft: %d ms", t.elapsed() ); #endif t.start(); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE for ( int i = 0; i < db->count; i++ ) { #ifndef QT_XFT2 checkXftCoverage( db->families[i] ); @@ -1479,7 +1479,7 @@ void TQFontDatabase::createDatabase() // -------------------------------------------------------------------------------------- #define MAXFONTSIZE_XFT 256 #define MAXFONTSIZE_XLFD 128 -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE static double addPatternProps(XftPattern *pattern, const TQtFontStyle::Key &key, bool fakeOblique, bool smoothScalable, const TQFontPrivate *fp, const TQFontDef &request) { @@ -1566,7 +1566,7 @@ static double addPatternProps(XftPattern *pattern, const TQtFontStyle::Key &key, return scale; } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE static TQFontEngine *loadEngine( TQFont::Script script, @@ -1593,7 +1593,7 @@ TQFontEngine *loadEngine( TQFont::Script script, return fe; } -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if ( encoding->encoding == -1 ) { FM_DEBUG( " using Xft" ); @@ -1683,7 +1683,7 @@ TQFontEngine *loadEngine( TQFont::Script script, fe->setScale( scale ); return fe; } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE FM_DEBUG( " using XLFD" ); diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h index bd3d33a3..499a5598 100644 --- a/src/kernel/qfontengine_p.h +++ b/src/kernel/qfontengine_p.h @@ -298,14 +298,14 @@ struct TransformedFont float yy; union { Font xlfd_font; -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE XftFont *xft_font; #endif }; TransformedFont *next; }; -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE #include <ft2build.h> #include FT_FREETYPE_H #include "ftxopen.h" @@ -472,7 +472,7 @@ private: class TQScriptItem; class TQTextEngine; -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE #include "qscriptengine_p.h" #include "qtextengine_p.h" @@ -525,7 +525,7 @@ private: int loadFlags; }; -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE #elif defined( Q_WS_MAC ) #include "qt_mac.h" diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp index d9d2f164..a736afa6 100644 --- a/src/kernel/qfontengine_x11.cpp +++ b/src/kernel/qfontengine_x11.cpp @@ -1433,7 +1433,7 @@ void TQFontEngineLatinXLFD::setScale( double scale ) // ------------------------------------------------------------------ // #define FONTENGINE_DEBUG -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE class Q_HackPaintDevice : public TQPaintDevice { public: @@ -2232,7 +2232,7 @@ TQFontEngine::Type TQFontEngineXft::type() const // Open type support // -------------------------------------------------------------------------------------------------------------------- -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE #include "qscriptengine_p.h" diff --git a/src/kernel/qgplugin.cpp b/src/kernel/qgplugin.cpp index a8733b07..ca5b4131 100644 --- a/src/kernel/qgplugin.cpp +++ b/src/kernel/qgplugin.cpp @@ -38,7 +38,7 @@ #include "ntqgplugin.h" -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT #include <private/qcom_p.h> @@ -69,4 +69,4 @@ void TQGPlugin::setIface( TQUnknownInterface *iface ) _iface = iface; } -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT diff --git a/src/kernel/qiconset.cpp b/src/kernel/qiconset.cpp index 2ba52a7b..fa571c5d 100644 --- a/src/kernel/qiconset.cpp +++ b/src/kernel/qiconset.cpp @@ -40,7 +40,7 @@ #include "ntqiconset.h" -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET #include "ntqapplication.h" #include "ntqbitmap.h" @@ -946,4 +946,4 @@ void TQIconFactory::installDefaultFactory( TQIconFactory *factory ) q_cleanup_icon_factory.set( &defaultFac ); } -#endif // QT_NO_ICONSET +#endif // TQT_NO_ICONSET diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp index ab42e188..2f7038bb 100644 --- a/src/kernel/qimage.cpp +++ b/src/kernel/qimage.cpp @@ -64,8 +64,8 @@ #endif // 16bpp images on supported on TQt/Embedded -#if !defined( Q_WS_QWS ) && !defined(QT_NO_IMAGE_16_BIT) -#define QT_NO_IMAGE_16_BIT +#if !defined( Q_WS_QWS ) && !defined(TQT_NO_IMAGE_16_BIT) +#define TQT_NO_IMAGE_16_BIT #endif @@ -246,7 +246,7 @@ #pragma message disable narrowptr #endif -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT class TQImageDataMisc { public: TQImageDataMisc() { } @@ -286,7 +286,7 @@ public: TQMap<TQImageTextKeyLang,TQString> text_lang; }; -#endif // QT_NO_IMAGE_TEXT +#endif // TQT_NO_IMAGE_TEXT @@ -372,7 +372,7 @@ TQImage::TQImage( const TQSize& size, int depth, int numColors, Endian bitOrder create( size, depth, numColors, bitOrder ); } -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Constructs an image and tries to load the image from the file \a fileName. @@ -397,7 +397,7 @@ TQImage::TQImage( const TQString &fileName, const char* format ) load( fileName, format ); } -#ifndef QT_NO_IMAGEIO_XPM +#ifndef TQT_NO_IMAGEIO_XPM // helper static void read_xpm_image_or_array( TQImageIO *, const char * const *, TQImage & ); #endif @@ -424,7 +424,7 @@ static void read_xpm_image_or_array( TQImageIO *, const char * const *, TQImage TQImage::TQImage( const char * const xpm[] ) { init(); -#ifndef QT_NO_IMAGEIO_XPM +#ifndef TQT_NO_IMAGEIO_XPM read_xpm_image_or_array( 0, xpm, *this ); #else // We use a tqFatal rather than disabling the whole function, as this @@ -447,7 +447,7 @@ TQImage::TQImage( const TQByteArray &array ) init(); loadFromData(array); } -#endif //QT_NO_IMAGEIO +#endif //TQT_NO_IMAGEIO /*! @@ -582,7 +582,7 @@ TQImage::~TQImage() \sa TQMimeSourceFactory, TQImage::fromMimeSource(), TQImageDrag::decode() */ -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQImage TQImage::fromMimeSource( const TQString &abs_name ) { const TQMimeSource *m = TQMimeSourceFactory::defaultFactory()->data( abs_name ); @@ -680,7 +680,7 @@ TQImage TQImage::copy() const image.data->dpmx = dotsPerMeterX(); image.data->dpmy = dotsPerMeterY(); image.data->offset = offset(); -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT if ( data->misc ) { image.data->misc = new TQImageDataMisc; *image.data->misc = misc(); @@ -747,7 +747,7 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const image.data->dpmx = dotsPerMeterX(); image.data->dpmy = dotsPerMeterY(); image.data->offset = offset(); -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT if ( data->misc ) { image.data->misc = new TQImageDataMisc; *image.data->misc = misc(); @@ -960,7 +960,7 @@ void TQImage::reset() { freeBits(); setNumColors( 0 ); -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT delete data->misc; #endif reinit(); @@ -1005,7 +1005,7 @@ void TQImage::fill( uint pixel ) int bpl = bytesPerLine(); for ( int i=0; i<height(); i++ ) memset( scanLine(i), pixel, bpl ); -#ifndef QT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_16_BIT } else if ( depth() == 16 ) { for ( int i=0; i<height(); i++ ) { //optimize with 32-bit writes, since image is always aligned @@ -1018,8 +1018,8 @@ void TQImage::fill( uint pixel ) while ( p < end ) *p++ = fill; } -#endif // QT_NO_IMAGE_16_BIT -#ifndef QT_NO_IMAGE_TRUECOLOR +#endif // TQT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_TRUECOLOR } else if ( depth() == 32 ) { if ( hasAlphaBuffer() ) { pixel &= 0x00ffffff; @@ -1039,7 +1039,7 @@ void TQImage::fill( uint pixel ) *p++ = pixel; } } -#endif // QT_NO_IMAGE_TRUECOLOR +#endif // TQT_NO_IMAGE_TRUECOLOR } } @@ -1257,10 +1257,10 @@ bool TQImage::create( int width, int height, int depth, int numColors, switch ( depth ) { case 1: case 8: -#ifndef QT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_16_BIT case 16: #endif -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR case 32: #endif break; @@ -1348,7 +1348,7 @@ void TQImage::reinit() data->bits = 0; data->bitordr = TQImage::IgnoreEndian; data->alpha = FALSE; -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT data->misc = 0; #endif data->dpmx = 0; @@ -1382,7 +1382,7 @@ void TQImage::freeBits() // // if dithering is needed, only 1 color at most is available for alpha. // -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR struct TQRgbMap { TQRgbMap() : rgb(0xffffffff) { } bool used() const { return rgb!=0xffffffff; } @@ -1649,7 +1649,7 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl } } -#ifndef QT_NO_IMAGE_DITHER_TO_1 +#ifndef TQT_NO_IMAGE_DITHER_TO_1 if ( src->hasAlphaBuffer() ) { const int trans = 216; dst->setColor(trans, 0x00000000); // transparent @@ -1737,7 +1737,7 @@ static bool convert_1_to_32( const TQImage *src, TQImage *dst ) } return TRUE; } -#endif // QT_NO_IMAGE_TRUECOLOR +#endif // TQT_NO_IMAGE_TRUECOLOR static bool convert_1_to_8( const TQImage *src, TQImage *dst ) { @@ -1776,7 +1776,7 @@ static bool convert_1_to_8( const TQImage *src, TQImage *dst ) return TRUE; } -#ifndef QT_NO_IMAGE_DITHER_TO_1 +#ifndef TQT_NO_IMAGE_DITHER_TO_1 // // dither_to_1: Uses selected dithering algorithm. // @@ -1843,7 +1843,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst, if ( use_gray ) { // 8 bit image while ( p < end ) *b2++ = gray[*p++]; -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR } else { // 32 bit image if ( fromalpha ) { while ( p < end ) { @@ -1869,7 +1869,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst, if ( use_gray ) { // 8 bit image while ( p < end ) *b2++ = gray[*p++]; -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR } else { // 24 bit image if ( fromalpha ) { while ( p < end ) { @@ -1948,7 +1948,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst, dst->fill( 0 ); uchar** mline = dst->jumpTable(); -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR if ( d == 32 ) { uint** line = (uint**)src->jumpTable(); for ( int i=0; i<h; i++ ) { @@ -1982,7 +1982,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst, } } } else -#endif // QT_NO_IMAGE_TRUECOLOR +#endif // TQT_NO_IMAGE_TRUECOLOR /* ( d == 8 ) */ { uchar** line = src->jumpTable(); for ( int i=0; i<h; i++ ) { @@ -2007,7 +2007,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst, default: { // Threshold: dst->fill( 0 ); uchar** mline = dst->jumpTable(); -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR if ( d == 32 ) { uint** line = (uint**)src->jumpTable(); for ( int i=0; i<h; i++ ) { @@ -2040,7 +2040,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst, } } } else -#endif //QT_NO_IMAGE_TRUECOLOR +#endif //TQT_NO_IMAGE_TRUECOLOR if ( d == 8 ) { uchar** line = src->jumpTable(); for ( int i=0; i<h; i++ ) { @@ -2066,7 +2066,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst, } #endif -#ifndef QT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_16_BIT //###### Endianness issues! static inline bool is16BitGray( ushort c ) { @@ -2133,11 +2133,11 @@ TQImage TQImage::convertDepth( int depth, int conversion_flags ) const TQImage image; if ( data->d == depth ) image = *this; // no conversion -#ifndef QT_NO_IMAGE_DITHER_TO_1 +#ifndef TQT_NO_IMAGE_DITHER_TO_1 else if ( (data->d == 8 || data->d == 32) && depth == 1 ) // dither dither_to_1( this, &image, conversion_flags, FALSE ); #endif -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR else if ( data->d == 32 && depth == 8 ) // 32 -> 8 convert_32_to_8( this, &image, conversion_flags ); else if ( data->d == 8 && depth == 32 ) // 8 -> 32 @@ -2145,11 +2145,11 @@ TQImage TQImage::convertDepth( int depth, int conversion_flags ) const #endif else if ( data->d == 1 && depth == 8 ) // 1 -> 8 convert_1_to_8( this, &image ); -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR else if ( data->d == 1 && depth == 32 ) // 1 -> 32 convert_1_to_32( this, &image ); #endif -#ifndef QT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_16_BIT else if ( data->d == 16 && depth != 16 ) { TQImage tmp; convert_16_to_32( this, &tmp ); @@ -2219,8 +2219,8 @@ int TQImage::pixelIndex( int x, int y ) const return (*(s + (x >> 3)) >> (7- (x & 7))) & 1; case 8: return (int)s[x]; -#ifndef QT_NO_IMAGE_TRUECOLOR -#ifndef QT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_16_BIT case 16: #endif case 32: @@ -2229,7 +2229,7 @@ int TQImage::pixelIndex( int x, int y ) const "(no palette)", depth() ); #endif return 0; -#endif //QT_NO_IMAGE_TRUECOLOR +#endif //TQT_NO_IMAGE_TRUECOLOR } return 0; } @@ -2261,11 +2261,11 @@ TQRgb TQImage::pixel( int x, int y ) const return color( (*(s + (x >> 3)) >> (7- (x & 7))) & 1 ); case 8: return color( (int)s[x] ); -#ifndef QT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_16_BIT case 16: return qt_conv16ToRgb(((ushort*)s)[x]); #endif -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR case 32: return ((TQRgb*)s)[x]; #endif @@ -2324,12 +2324,12 @@ void TQImage::setPixel( int x, int y, uint index_or_rgb ) } uchar * s = scanLine( y ); s[x] = index_or_rgb; -#ifndef QT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_16_BIT } else if ( depth() == 16 ) { ushort * s = (ushort*)scanLine( y ); s[x] = qt_convRgbTo16(index_or_rgb); #endif -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR } else if ( depth() == 32 ) { TQRgb * s = (TQRgb*)scanLine( y ); s[x] = index_or_rgb; @@ -2392,14 +2392,14 @@ bool isGray(TQRgb c) */ bool TQImage::allGray() const { -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR if (depth()==32) { int p = width()*height(); TQRgb* b = (TQRgb*)bits(); while (p--) if (!isGray(*b++)) return FALSE; -#ifndef QT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_16_BIT } else if (depth()==16) { int p = width()*height(); ushort* b = (ushort*)bits(); @@ -2408,7 +2408,7 @@ bool TQImage::allGray() const return FALSE; #endif } else -#endif //QT_NO_IMAGE_TRUECOLOR +#endif //TQT_NO_IMAGE_TRUECOLOR { if (!data->ctbl) return TRUE; for (int i=0; i<numColors(); i++) @@ -2431,13 +2431,13 @@ bool TQImage::allGray() const bool TQImage::isGrayscale() const { switch (depth()) { -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR case 32: -#ifndef QT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_16_BIT case 16: #endif return allGray(); -#endif //QT_NO_IMAGE_TRUECOLOR +#endif //TQT_NO_IMAGE_TRUECOLOR case 8: { for (int i=0; i<numColors(); i++) if (data->ctbl[i] != tqRgb(i,i,i)) @@ -2448,7 +2448,7 @@ bool TQImage::isGrayscale() const return FALSE; } -#ifndef QT_NO_IMAGE_SMOOTHSCALE +#ifndef TQT_NO_IMAGE_SMOOTHSCALE static void pnmscale(const TQImage& src, TQImage& dst) { @@ -2738,7 +2738,7 @@ void pnmscale(const TQImage& src, TQImage& dst) be larger than the requested size. */ -#ifndef QT_NO_IMAGE_SMOOTHSCALE +#ifndef TQT_NO_IMAGE_SMOOTHSCALE /*! Returns a smoothly scaled copy of the image. The returned image has a size of width \a w by height \a h pixels if \a mode is \c @@ -2779,7 +2779,7 @@ TQImage TQImage::smoothScale( int w, int h, ScaleMode mode ) const } #endif -#ifndef QT_NO_IMAGE_SMOOTHSCALE +#ifndef TQT_NO_IMAGE_SMOOTHSCALE /*! \overload @@ -2837,7 +2837,7 @@ TQImage TQImage::smoothScale( const TQSize& s, ScaleMode mode ) const \sa scaleWidth() scaleHeight() smoothScale() xForm() */ -#ifndef QT_NO_IMAGE_TRANSFORMATION +#ifndef TQT_NO_IMAGE_TRANSFORMATION TQImage TQImage::scale( int w, int h, ScaleMode mode ) const { return scale( TQSize( w, h ), mode ); @@ -2849,7 +2849,7 @@ TQImage TQImage::scale( int w, int h, ScaleMode mode ) const The requested size of the image is \a s. */ -#ifndef QT_NO_IMAGE_TRANSFORMATION +#ifndef TQT_NO_IMAGE_TRANSFORMATION TQImage TQImage::scale( const TQSize& s, ScaleMode mode ) const { if ( isNull() ) { @@ -2887,7 +2887,7 @@ TQImage TQImage::scale( const TQSize& s, ScaleMode mode ) const \sa scale() scaleHeight() smoothScale() xForm() */ -#ifndef QT_NO_IMAGE_TRANSFORMATION +#ifndef TQT_NO_IMAGE_TRANSFORMATION TQImage TQImage::scaleWidth( int w ) const { if ( isNull() ) { @@ -2916,7 +2916,7 @@ TQImage TQImage::scaleWidth( int w ) const \sa scale() scaleWidth() smoothScale() xForm() */ -#ifndef QT_NO_IMAGE_TRANSFORMATION +#ifndef TQT_NO_IMAGE_TRANSFORMATION TQImage TQImage::scaleHeight( int h ) const { if ( isNull() ) { @@ -2946,7 +2946,7 @@ TQImage TQImage::scaleHeight( int h ) const \sa scale() TQPixmap::xForm() TQPixmap::trueMatrix() TQWMatrix */ -#ifndef QT_NO_IMAGE_TRANSFORMATION +#ifndef TQT_NO_IMAGE_TRANSFORMATION TQImage TQImage::xForm( const TQWMatrix &matrix ) const { // This function uses the same algorithm as (and steals quite some @@ -3054,7 +3054,7 @@ TQImage TQImage::xForm( const TQWMatrix &matrix ) const \sa createHeuristicMask() hasAlphaBuffer() setAlphaBuffer() */ -#ifndef QT_NO_IMAGE_DITHER_TO_1 +#ifndef TQT_NO_IMAGE_DITHER_TO_1 TQImage TQImage::createAlphaMask( int conversion_flags ) const { if ( conversion_flags == 1 ) { @@ -3078,7 +3078,7 @@ TQImage TQImage::createAlphaMask( int conversion_flags ) const } #endif -#ifndef QT_NO_IMAGE_HEURISTIC_MASK +#ifndef TQT_NO_IMAGE_HEURISTIC_MASK /*! Creates and returns a 1-bpp heuristic mask for this image. It works by selecting a color from one of the corners, then chipping @@ -3190,9 +3190,9 @@ TQImage TQImage::createHeuristicMask( bool clipTight ) const return m; } -#endif //QT_NO_IMAGE_HEURISTIC_MASK +#endif //TQT_NO_IMAGE_HEURISTIC_MASK -#ifndef QT_NO_IMAGE_MIRROR +#ifndef TQT_NO_IMAGE_MIRROR /* This code is contributed by Philipp Lang, GeneriCom Software Germany (www.generi.com) @@ -3238,8 +3238,8 @@ TQImage TQImage::mirror(bool horizontal, bool vertical) const dsl[dx] = ssl[sx]; } } -#ifndef QT_NO_IMAGE_TRUECOLOR -#ifndef QT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_16_BIT // 16 bit else if (depth() == 16) { for (int sy = 0; sy < h; sy++, dy += dyi) { @@ -3309,7 +3309,7 @@ TQImage TQImage::mirror() const { return mirror(FALSE,TRUE); } -#endif //QT_NO_IMAGE_MIRROR +#endif //TQT_NO_IMAGE_MIRROR /*! Returns a TQImage in which the values of the red and blue @@ -3321,7 +3321,7 @@ TQImage TQImage::swapRGB() const { TQImage res = copy(); if ( !isNull() ) { -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR if ( depth() == 32 ) { for ( int i=0; i < height(); i++ ) { uint *p = (uint*)scanLine( i ); @@ -3334,12 +3334,12 @@ TQImage TQImage::swapRGB() const q++; } } -#ifndef QT_NO_IMAGE_16_BIT +#ifndef TQT_NO_IMAGE_16_BIT } else if ( depth() == 16 ) { tqWarning( "TQImage::swapRGB not implemented for 16bpp" ); #endif } else -#endif //QT_NO_IMAGE_TRUECOLOR +#endif //TQT_NO_IMAGE_TRUECOLOR { uint* p = (uint*)colorTable(); uint* q = (uint*)res.colorTable(); @@ -3356,7 +3356,7 @@ TQImage TQImage::swapRGB() const return res; } -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Returns a string that specifies the image format of the file \a fileName, or 0 if the file cannot be read or if the format is not @@ -3384,7 +3384,7 @@ TQStrList TQImage::inputFormats() { return TQImageIO::inputFormats(); } -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST /*! Returns a list of image formats that are supported for image input. @@ -3429,7 +3429,7 @@ TQStringList TQImage::outputFormatList() { return TQStringList::fromStrList(TQImageIO::outputFormats()); } -#endif //QT_NO_STRINGLIST +#endif //TQT_NO_STRINGLIST /*! Returns a list of image formats that are supported for image @@ -3568,12 +3568,12 @@ bool TQImage::doImageIO( TQImageIO* io, int quality ) const io->setQuality( TQMIN(quality,100) ); return io->write(); } -#endif //QT_NO_IMAGEIO +#endif //TQT_NO_IMAGEIO /***************************************************************************** TQImage stream functions *****************************************************************************/ -#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO) +#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO) /*! \relates TQImage @@ -3640,31 +3640,31 @@ TQDataStream &operator>>( TQDataStream &s, TQImage &image ) *****************************************************************************/ // standard image io handlers (defined below) -#ifndef QT_NO_IMAGEIO_BMP +#ifndef TQT_NO_IMAGEIO_BMP static void read_bmp_image( TQImageIO * ); static void write_bmp_image( TQImageIO * ); #endif -#ifndef QT_NO_IMAGEIO_PPM +#ifndef TQT_NO_IMAGEIO_PPM static void read_pbm_image( TQImageIO * ); static void write_pbm_image( TQImageIO * ); #endif -#ifndef QT_NO_IMAGEIO_XBM +#ifndef TQT_NO_IMAGEIO_XBM static void read_xbm_image( TQImageIO * ); static void write_xbm_image( TQImageIO * ); #endif -#ifndef QT_NO_IMAGEIO_XPM +#ifndef TQT_NO_IMAGEIO_XPM static void read_xpm_image( TQImageIO * ); static void write_xpm_image( TQImageIO * ); #endif -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO static void read_async_image( TQImageIO * ); // Not in table of handlers #endif /***************************************************************************** Misc. utility functions *****************************************************************************/ -#if !defined(QT_NO_IMAGEIO_XPM) || !defined(QT_NO_IMAGEIO_XBM) +#if !defined(TQT_NO_IMAGEIO_XPM) || !defined(TQT_NO_IMAGEIO_XBM) static TQString fbname( const TQString &fileName ) // get file basename (sort of) { TQString s = fileName; @@ -3687,7 +3687,7 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of } #endif -#ifndef QT_NO_IMAGEIO_BMP +#ifndef TQT_NO_IMAGEIO_BMP static void swapPixel01( TQImage *image ) // 1-bpp: swap 0 and 1 pixels { int i; @@ -3756,7 +3756,7 @@ static void swapPixel01( TQImage *image ) // 1-bpp: swap 0 and 1 pixels \sa TQImage TQPixmap TQFile TQMovie */ -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO struct TQImageIOData { const char *parameters; @@ -3855,7 +3855,7 @@ TQImageHandler::TQImageHandler( const char *f, const char *h, const TQCString& f typedef TQPtrList<TQImageHandler> TQIHList;// list of image handlers static TQIHList *imageHandlers = 0; -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT static TQPluginManager<TQImageFormatInterface> *plugin_manager = 0; #else static void *plugin_manager = 0; @@ -3863,7 +3863,7 @@ static void *plugin_manager = 0; void tqt_init_image_plugins() { -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT if ( plugin_manager ) return; @@ -3887,7 +3887,7 @@ static void cleanup() // make sure that image handlers are delete before plugin manager delete imageHandlers; imageHandlers = 0; -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT delete plugin_manager; plugin_manager = 0; #endif @@ -3900,11 +3900,11 @@ void tqt_init_image_handlers() // initialize image handlers TQ_CHECK_PTR( imageHandlers ); imageHandlers->setAutoDelete( TRUE ); tqAddPostRoutine( cleanup ); -#ifndef QT_NO_IMAGEIO_BMP +#ifndef TQT_NO_IMAGEIO_BMP TQImageIO::defineIOHandler( "BMP", "^BM", 0, read_bmp_image, write_bmp_image ); #endif -#ifndef QT_NO_IMAGEIO_PPM +#ifndef TQT_NO_IMAGEIO_PPM TQImageIO::defineIOHandler( "PBM", "^P1", "t", read_pbm_image, write_pbm_image ); TQImageIO::defineIOHandler( "PBMRAW", "^P4", "O", @@ -3918,21 +3918,21 @@ void tqt_init_image_handlers() // initialize image handlers TQImageIO::defineIOHandler( "PPMRAW", "^P6", "O", read_pbm_image, write_pbm_image ); #endif -#ifndef QT_NO_IMAGEIO_XBM +#ifndef TQT_NO_IMAGEIO_XBM TQImageIO::defineIOHandler( "XBM", "^((/\\*(?!.XPM.\\*/))|#define)", "T", read_xbm_image, write_xbm_image ); #endif -#ifndef QT_NO_IMAGEIO_XPM +#ifndef TQT_NO_IMAGEIO_XPM TQImageIO::defineIOHandler( "XPM", "/\\*.XPM.\\*/", "T", read_xpm_image, write_xpm_image ); #endif -#ifndef QT_NO_IMAGEIO_MNG +#ifndef TQT_NO_IMAGEIO_MNG qInitMngIO(); #endif -#ifndef QT_NO_IMAGEIO_PNG +#ifndef TQT_NO_IMAGEIO_PNG qInitPngIO(); #endif -#ifndef QT_NO_IMAGEIO_JPEG +#ifndef TQT_NO_IMAGEIO_JPEG qInitJpegIO(); #endif } @@ -4310,7 +4310,7 @@ const char *TQImageIO::imageFormat( TQIODevice *d ) } } d->at( pos ); // restore position -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO if ( !format ) format = TQImageDecoder::formatName( (uchar*)buf2, rdlen ); #endif @@ -4329,7 +4329,7 @@ TQStrList TQImageIO::inputFormats() tqt_init_image_handlers(); tqt_init_image_plugins(); -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO // Include asynchronous loaders first. result = TQImageDecoder::inputFormats(); #endif @@ -4451,7 +4451,7 @@ bool TQImageIO::read() if ( h && h->read_image ) { (*h->read_image)( this ); } -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO else { // Format name, but no handler - must be an asychronous reader read_async_image( this ); @@ -4524,9 +4524,9 @@ bool TQImageIO::write() } return iostat == 0; // image successfully written? } -#endif //QT_NO_IMAGEIO +#endif //TQT_NO_IMAGEIO -#ifndef QT_NO_IMAGEIO_BMP +#ifndef TQT_NO_IMAGEIO_BMP /***************************************************************************** BMP (DIB) image read/write functions @@ -5115,9 +5115,9 @@ static void write_bmp_image( TQImageIO *iio ) } -#endif // QT_NO_IMAGEIO_BMP +#endif // TQT_NO_IMAGEIO_BMP -#ifndef QT_NO_IMAGEIO_PPM +#ifndef TQT_NO_IMAGEIO_PPM /***************************************************************************** PBM/PGM/PPM (ASCII and RAW) image read/write functions @@ -5423,9 +5423,9 @@ static void write_pbm_image( TQImageIO *iio ) iio->setStatus(0); } -#endif // QT_NO_IMAGEIO_PPM +#endif // TQT_NO_IMAGEIO_PPM -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO class TQImageIOFrameGrabber : public TQImageConsumer { public: @@ -5493,9 +5493,9 @@ static void read_async_image( TQImageIO *iio ) delete consumer; } -#endif // QT_NO_ASYNC_IMAGE_IO +#endif // TQT_NO_ASYNC_IMAGE_IO -#ifndef QT_NO_IMAGEIO_XBM +#ifndef TQT_NO_IMAGEIO_XBM /***************************************************************************** X bitmap image read/write functions @@ -5651,10 +5651,10 @@ static void write_xbm_image( TQImageIO *iio ) delete [] buf; } -#endif // QT_NO_IMAGEIO_XBM +#endif // TQT_NO_IMAGEIO_XBM -#ifndef QT_NO_IMAGEIO_XPM +#ifndef TQT_NO_IMAGEIO_XPM /***************************************************************************** XPM image read/write functions @@ -5993,7 +5993,7 @@ static void write_xpm_image( TQImageIO * iio ) iio->setStatus( 0 ); } -#endif // QT_NO_IMAGEIO_XPM +#endif // TQT_NO_IMAGEIO_XPM /*! Returns an image with depth \a d, using the \a palette_count @@ -6013,7 +6013,7 @@ static void write_xpm_image( TQImageIO * iio ) \sa TQt::ImageConversionFlags */ -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR TQImage TQImage::convertDepthWithPalette( int d, TQRgb* palette, int palette_count, int conversion_flags ) const { if ( depth() == 1 ) { @@ -6096,7 +6096,7 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src, { // easy to copy } else if ( dst->depth() != 32 ) { -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR TQImage dstconv = dst->convertDepth( 32 ); bitBlt( &dstconv, dx, dy, src, sx, sy, sw, sh, @@ -6180,7 +6180,7 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src, } } break; -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR case 32: if ( src->hasAlphaBuffer() ) { TQRgb* d = (TQRgb*)dst->scanLine(dy) + dx; @@ -6232,7 +6232,7 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src, } } break; -#endif // QT_NO_IMAGE_TRUECOLOR +#endif // TQT_NO_IMAGE_TRUECOLOR } } @@ -6353,7 +6353,7 @@ void TQImage::setOffset(const TQPoint& p) { data->offset = p; } -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT /*! \internal @@ -6471,7 +6471,7 @@ void TQImage::setText(const char* key, const char* lang, const TQString& s) misc().text_lang.replace(x,s); } -#endif // QT_NO_IMAGE_TEXT +#endif // TQT_NO_IMAGE_TEXT #ifdef Q_WS_QWS /*! diff --git a/src/kernel/qimageformatinterface_p.h b/src/kernel/qimageformatinterface_p.h index 6d53be87..6d184ecf 100644 --- a/src/kernel/qimageformatinterface_p.h +++ b/src/kernel/qimageformatinterface_p.h @@ -59,7 +59,7 @@ // // -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT // {04903F05-54B1-4726-A849-FB5CB097CA87} #ifndef IID_QImageFormat @@ -76,6 +76,6 @@ struct Q_EXPORT TQImageFormatInterface : public TQFeatureListInterface virtual TQRESULT installIOHandler( const TQString & ) = 0; }; -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT #endif // TQIMAGEFORMATINTERFACE_P_H diff --git a/src/kernel/qimageformatplugin.cpp b/src/kernel/qimageformatplugin.cpp index 101f09bc..9ad42a42 100644 --- a/src/kernel/qimageformatplugin.cpp +++ b/src/kernel/qimageformatplugin.cpp @@ -37,7 +37,7 @@ **********************************************************************/ #include "ntqimageformatplugin.h" -#ifndef QT_NO_IMAGEFORMATPLUGIN +#ifndef TQT_NO_IMAGEFORMATPLUGIN #include "qimageformatinterface_p.h" #include "ntqimage.h" @@ -181,4 +181,4 @@ bool TQImageFormatPlugin::saveImage( const TQString &format, const TQString &fil return FALSE; } -#endif // QT_NO_IMAGEFORMATPLUGIN +#endif // TQT_NO_IMAGEFORMATPLUGIN diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp index 7d609fa2..9533d3eb 100644 --- a/src/kernel/qinputcontext.cpp +++ b/src/kernel/qinputcontext.cpp @@ -33,11 +33,11 @@ ** **********************************************************************/ -//#define QT_NO_IM_PREEDIT_RELOCATION +//#define TQT_NO_IM_PREEDIT_RELOCATION #include "ntqinputcontext.h" -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "qplatformdefs.h" @@ -54,7 +54,7 @@ public: TQInputContextPrivate() : holderWidget( 0 ), composingWidget( 0 ), hasFocus( FALSE ), isComposing( FALSE ) -#if !defined(QT_NO_IM_PREEDIT_RELOCATION) +#if !defined(TQT_NO_IM_PREEDIT_RELOCATION) , preeditString( TQString::null ), cursorPosition( -1 ), selLength ( 0 ) #endif @@ -67,7 +67,7 @@ public: void updateComposingState( const TQString &text, int newCursorPosition, int newSelLength ) { -#if !defined(QT_NO_IM_PREEDIT_RELOCATION) +#if !defined(TQT_NO_IM_PREEDIT_RELOCATION) preeditString = text; cursorPosition = newCursorPosition; selLength = newSelLength; @@ -76,14 +76,14 @@ public: void resetComposingState() { isComposing = FALSE; -#if !defined(QT_NO_IM_PREEDIT_RELOCATION) +#if !defined(TQT_NO_IM_PREEDIT_RELOCATION) preeditString = TQString::null; cursorPosition = -1; selLength = 0; #endif } -#if !defined(QT_NO_IM_PREEDIT_RELOCATION) +#if !defined(TQT_NO_IM_PREEDIT_RELOCATION) TQString preeditString; int cursorPosition; int selLength; @@ -281,7 +281,7 @@ public: method dependent submenus. \code - #ifndef QT_NO_IM + #ifndef TQT_NO_IM TQInputContext *qic = getInputContext(); if ( qic ) qic->addMenusTo( popup ); @@ -384,7 +384,7 @@ void TQInputContext::setFocusWidget( TQWidget *w ) } d->composingWidget = w; // changes recipient of TQIMEvent if ( isPreeditRelocation == TRUE ) { -#if !defined(QT_NO_IM_PREEDIT_RELOCATION) +#if !defined(TQT_NO_IM_PREEDIT_RELOCATION) if ( isPreeditRelocationEnabled() ) { // copy preedit state to the widget that gaining focus sendIMEventInternal( TQEvent::IMStart ); diff --git a/src/kernel/qinputcontext_x11.cpp b/src/kernel/qinputcontext_x11.cpp index 38a6ae15..e4d36af6 100644 --- a/src/kernel/qinputcontext_x11.cpp +++ b/src/kernel/qinputcontext_x11.cpp @@ -38,7 +38,7 @@ #include "ntqinputcontext.h" -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "qplatformdefs.h" diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp index 037acad5..91df6f97 100644 --- a/src/kernel/qjpegio.cpp +++ b/src/kernel/qjpegio.cpp @@ -40,7 +40,7 @@ #include "ntqimage.h" -#ifndef QT_NO_IMAGEIO_JPEG +#ifndef TQT_NO_IMAGEIO_JPEG #include "ntqiodevice.h" #include "ntqjpegio.h" diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp index 67cbe9fb..00bdfd1f 100644 --- a/src/kernel/qkeysequence.cpp +++ b/src/kernel/qkeysequence.cpp @@ -40,12 +40,12 @@ #include "ntqkeysequence.h" -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL #include "ntqaccel.h" #include "ntqshared.h" #include "ntqvaluelist.h" -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP # include "ntqregexp.h" #endif @@ -421,7 +421,7 @@ int TQKeySequence::decodeString( const TQString& str ) for( TQValueList<ModifKeyName>::iterator it = modifs.begin(); it != modifs.end(); ++it ) { if ( sl.contains( (*it).name ) ) { ret |= (*it).qt_key; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP accel.remove( TQRegExp(TQRegExp::escape((*it).name), FALSE) ); #else accel.remove( (*it).name ); @@ -676,7 +676,7 @@ bool TQKeySequence::operator!= ( const TQKeySequence& keysequence ) const /***************************************************************************** TQKeySequence stream functions *****************************************************************************/ -#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO) +#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO) /*! \relates TQKeySequence @@ -731,6 +731,6 @@ TQDataStream &operator>>( TQDataStream &s, TQKeySequence &keysequence ) return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM -#endif //QT_NO_ACCEL +#endif //TQT_NO_ACCEL diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp index 8a992e63..c32689ff 100644 --- a/src/kernel/qlayout.cpp +++ b/src/kernel/qlayout.cpp @@ -40,7 +40,7 @@ #include "ntqlayout.h" -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT #include "ntqapplication.h" #include "ntqwidget.h" @@ -2602,4 +2602,4 @@ TQBoxLayout *TQBoxLayout::createTmpCopy() return bl; } -#endif // QT_NO_LAYOUT +#endif // TQT_NO_LAYOUT diff --git a/src/kernel/qlayoutengine.cpp b/src/kernel/qlayoutengine.cpp index 558d4267..c37811c3 100644 --- a/src/kernel/qlayoutengine.cpp +++ b/src/kernel/qlayoutengine.cpp @@ -41,7 +41,7 @@ #include "ntqlayout.h" #include "private/qlayoutengine_p.h" -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT static inline int toFixed( int i ) { return i * 256; } static inline int fRound( int i ) { @@ -319,4 +319,4 @@ Q_EXPORT TQSize qSmartMaxSize( TQWidget *w, int align ) return qSmartMaxSize( &item, align ); } -#endif // QT_NO_LAYOUT +#endif // TQT_NO_LAYOUT diff --git a/src/kernel/qlayoutengine_p.h b/src/kernel/qlayoutengine_p.h index 2e49891a..ddff6cd2 100644 --- a/src/kernel/qlayoutengine_p.h +++ b/src/kernel/qlayoutengine_p.h @@ -63,7 +63,7 @@ #include "ntqabstractlayout.h" #endif // QT_H -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT struct TQLayoutStruct { @@ -125,5 +125,5 @@ static inline void qMaxExpCalc( TQCOORD & max, bool &exp, exp = exp || boxexp; } -#endif //QT_NO_LAYOUT +#endif //TQT_NO_LAYOUT #endif diff --git a/src/kernel/qlocalfs.cpp b/src/kernel/qlocalfs.cpp index 95ba0dc6..6932c415 100644 --- a/src/kernel/qlocalfs.cpp +++ b/src/kernel/qlocalfs.cpp @@ -40,7 +40,7 @@ #include "ntqlocalfs.h" -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL #include "ntqfileinfo.h" #include "ntqfile.h" @@ -404,4 +404,4 @@ int TQLocalFs::calcBlockSize( int totalSize ) const return s; } -#endif // QT_NO_NETWORKPROTOCOL +#endif // TQT_NO_NETWORKPROTOCOL diff --git a/src/kernel/qlock.cpp b/src/kernel/qlock.cpp index 49edf98c..f8b8be46 100644 --- a/src/kernel/qlock.cpp +++ b/src/kernel/qlock.cpp @@ -38,7 +38,7 @@ #include "qlock_p.h" -#ifndef QT_NO_QWS_MULTIPROCESS +#ifndef TQT_NO_QWS_MULTIPROCESS #include <unistd.h> #include <sys/types.h> @@ -112,7 +112,7 @@ public: TQLock::TQLock( const TQString &filename, char id, bool create ) { -#ifndef QT_NO_QWS_MULTIPROCESS +#ifndef TQT_NO_QWS_MULTIPROCESS data = new TQLockData; data->count = 0; #ifdef Q_NO_SEMAPHORE @@ -153,7 +153,7 @@ TQLock::TQLock( const TQString &filename, char id, bool create ) TQLock::~TQLock() { -#ifndef QT_NO_QWS_MULTIPROCESS +#ifndef TQT_NO_QWS_MULTIPROCESS if ( locked() ) unlock(); #ifdef Q_NO_SEMAPHORE @@ -181,7 +181,7 @@ TQLock::~TQLock() bool TQLock::isValid() const { -#ifndef QT_NO_QWS_MULTIPROCESS +#ifndef TQT_NO_QWS_MULTIPROCESS return (data->id != -1); #else return TRUE; @@ -202,7 +202,7 @@ bool TQLock::isValid() const void TQLock::lock( Type t ) { -#ifndef QT_NO_QWS_MULTIPROCESS +#ifndef TQT_NO_QWS_MULTIPROCESS if ( !data->count ) { #ifdef Q_NO_SEMAPHORE int op = LOCK_SH; @@ -248,7 +248,7 @@ void TQLock::lock( Type t ) void TQLock::unlock() { -#ifndef QT_NO_QWS_MULTIPROCESS +#ifndef TQT_NO_QWS_MULTIPROCESS if( data->count ) { data->count--; if( !data->count ) { @@ -289,7 +289,7 @@ void TQLock::unlock() bool TQLock::locked() const { -#ifndef QT_NO_QWS_MULTIPROCESS +#ifndef TQT_NO_QWS_MULTIPROCESS return (data->count > 0); #else return FALSE; diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp index 90a8efa4..0165f700 100644 --- a/src/kernel/qmetaobject.cpp +++ b/src/kernel/qmetaobject.cpp @@ -142,13 +142,13 @@ class TQMetaObjectPrivate { public: TQMetaObjectPrivate() : -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES enumData(0), numEnumData(0), propData(0),numPropData(0), tqt_static_property(0), #endif classInfo(0), numClassInfo(0) {} -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES const TQMetaEnum *enumData; int numEnumData; const TQMetaProperty *propData; @@ -210,7 +210,7 @@ static int optDictSize( int n ) TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_class, const TQMetaData *const slot_data, int n_slots, const TQMetaData *const signal_data, int n_signals, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES const TQMetaProperty *const prop_data, int n_props, const TQMetaEnum *const enum_data, int n_enums, #endif @@ -225,7 +225,7 @@ TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_cl d = new TQMetaObjectPrivate; reserved = 0; -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES d->propData = prop_data; d->numPropData = n_props; d->enumData = enum_data; @@ -236,12 +236,12 @@ TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_cl signaloffset = superclass ? ( superclass->signalOffset() + superclass->numSignals() ) : 0; slotoffset = superclass ? ( superclass->slotOffset() + superclass->numSlots() ) : 0; -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES propertyoffset = superclass ? ( superclass->propertyOffset() + superclass->numProperties() ) : 0; #endif } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES /*!\internal */ TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_class, @@ -468,7 +468,7 @@ TQMetaObject *TQMetaObject::new_metaobject( const char *classname, TQMetaObject *superclassobject, const TQMetaData * const slot_data, int n_slots, const TQMetaData * const signal_data, int n_signals, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES const TQMetaProperty * const prop_data, int n_props, const TQMetaEnum * const enum_data, int n_enums, #endif @@ -476,14 +476,14 @@ TQMetaObject *TQMetaObject::new_metaobject( const char *classname, { return new TQMetaObject( classname, superclassobject, slot_data, n_slots, signal_data, n_signals, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES prop_data, n_props, enum_data, n_enums, #endif class_info, n_info ); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES /*!\internal */ TQMetaObject *TQMetaObject::new_metaobject( const char *classname, @@ -565,7 +565,7 @@ const char* TQMetaObject::classInfo( const char* name, bool super ) const return superclass->classInfo( name, super ); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES /*! Returns the number of properties for this class. @@ -773,7 +773,7 @@ const TQMetaEnum* TQMetaObject::enumerator( const char* name, bool super ) const return superclass->enumerator( name, super ); } -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES /*! @@ -821,7 +821,7 @@ bool TQMetaObject::hasMetaObject( const char *class_name ) return !!qt_metaobjects->find( class_name ); } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES /*! \internal ### this functions will go away. It exists purely for the sake of meta @@ -1194,7 +1194,7 @@ bool TQMetaProperty::reset( TQObject* o ) const \internal */ -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES /* * TQMetaObjectCleanUp is used as static global object in the moc-generated cpp diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp index 22857f3e..1c860637 100644 --- a/src/kernel/qmime.cpp +++ b/src/kernel/qmime.cpp @@ -38,7 +38,7 @@ #include "ntqmime.h" -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME #include "ntqmap.h" #include "ntqstringlist.h" @@ -109,7 +109,7 @@ void TQMimeSource::clearCache() */ TQMimeSource::~TQMimeSource() { -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD extern void tqt_clipboard_cleanup_mime_source(TQMimeSource *); tqt_clipboard_cleanup_mime_source(this); #endif @@ -616,4 +616,4 @@ void TQMimeSourceFactory::removeFactory( TQMimeSourceFactory *f ) TQMimeSourceFactory::defaultFactory()->d->factories.removeRef( f ); } -#endif // QT_NO_MIME +#endif // TQT_NO_MIME diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp index fa3f9bd5..fad1aa9b 100644 --- a/src/kernel/qmngio.cpp +++ b/src/kernel/qmngio.cpp @@ -40,7 +40,7 @@ #include "ntqdatetime.h" -#ifndef QT_NO_IMAGEIO_MNG +#ifndef TQT_NO_IMAGEIO_MNG #include "ntqimage.h" #include "ntqasyncimageio.h" @@ -58,7 +58,7 @@ #include <stdlib.h> -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO class TQMNGFormat : public TQImageFormat { public: @@ -270,7 +270,7 @@ TQImageFormat* TQMNGFormatType::decoderFor( const uchar* buffer, int length ) && buffer[5]==10 && buffer[6]==26 && buffer[7]==10) -#ifdef QT_NO_IMAGEIO_PNG // if we don't have native PNG support use libmng +#ifdef TQT_NO_IMAGEIO_PNG // if we don't have native PNG support use libmng || (buffer[0]==137 // PNG signature && buffer[1]=='P' && buffer[2]=='N' @@ -433,9 +433,9 @@ int TQMNGFormat::decode( TQImage& img, TQImageConsumer* cons, static TQMNGFormatType* globalMngFormatTypeObject = 0; -#endif // QT_NO_ASYNC_IMAGE_IO +#endif // TQT_NO_ASYNC_IMAGE_IO -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO void qCleanupMngIO() { if ( globalMngFormatTypeObject ) { @@ -450,11 +450,11 @@ void qInitMngIO() static bool done = FALSE; if ( !done ) { done = TRUE; -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO globalMngFormatTypeObject = new TQMNGFormatType; tqAddPostRoutine( qCleanupMngIO ); #endif } } -#endif // QT_NO_IMAGEIO_MNG +#endif // TQT_NO_IMAGEIO_MNG diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp index 58f87e78..a95ed8d5 100644 --- a/src/kernel/qmotifdnd_x11.cpp +++ b/src/kernel/qmotifdnd_x11.cpp @@ -70,7 +70,7 @@ in doc/dnd.doc, where the documentation system can see it. */ #include "ntqapplication.h" -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP #include "ntqwidget.h" #include "qt_x11_p.h" @@ -975,4 +975,4 @@ void qt_motifdnd_handle_msg( TQWidget * /* w */ , const XEvent * xe, bool /* pas } // end of switch ( dnd_data.reason ) } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp index 3c6e634e..3b98849e 100644 --- a/src/kernel/qmovie.cpp +++ b/src/kernel/qmovie.cpp @@ -50,7 +50,7 @@ #include "ntqobject.h" #include "ntqpixmapcache.h" -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE #ifdef Q_WS_QWS #include "qgfx_qws.h" @@ -361,7 +361,7 @@ void TQMoviePrivate::updatePixmapFromImage(const TQPoint& off, // Convert to pixmap and paste that onto myself TQPixmap lines; -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_SPRINTF if (!(frameperiod < 0 && loop == -1)) { // its an animation, lets see if we converted // this frame already. @@ -1078,4 +1078,4 @@ void TQMovie::disconnectStatus(TQObject* receiver, const char *member) #include "qmovie.moc" -#endif // QT_NO_MOVIE +#endif // TQT_NO_MOVIE diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp index b41dd97b..53cb6916 100644 --- a/src/kernel/qnetworkprotocol.cpp +++ b/src/kernel/qnetworkprotocol.cpp @@ -40,7 +40,7 @@ #include "ntqnetworkprotocol.h" -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL #include "ntqlocalfs.h" #include "ntqurloperator.h" diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp index 7156df6b..2ba77326 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -88,14 +88,14 @@ class TQStyleControlElementDataPrivate { bool isTQWidget; }; -#ifndef QT_NO_USERDATA +#ifndef TQT_NO_USERDATA class TQObjectPrivate : public TQPtrVector<TQObjectUserData> #else class TQObjectPrivate { #endif { public: -#ifndef QT_NO_USERDATA +#ifndef TQT_NO_USERDATA TQObjectPrivate( uint s ) : TQPtrVector<TQObjectUserData>(s) { ownThread = NULL; disableThreadPostedEvents = false; @@ -507,7 +507,7 @@ TQThread* TQObject::contextThreadObject() const #endif -#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY +#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY /* Preliminary signal spy */ @@ -550,7 +550,7 @@ static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o ) /* End Preliminary signal spy */ -#endif // QT_NO_PRELIMINARY_SIGNAL_SPY +#endif // TQT_NO_PRELIMINARY_SIGNAL_SPY static TQObjectList* object_trees = 0; @@ -1419,7 +1419,7 @@ static void objSearch( TQObjectList *result, if ( ok ) { if ( objName ) ok = ( qstrcmp(objName,obj->name()) == 0 ); -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP else if ( rx ) ok = ( rx->search(TQString::fromLatin1(obj->name())) != -1 ); #endif @@ -1542,7 +1542,7 @@ TQObjectList *TQObject::queryList( const char *inheritsClass, TQObjectList *list = new TQObjectList; TQ_CHECK_PTR( list ); bool onlyWidgets = ( inheritsClass && qstrcmp(inheritsClass, "TQWidget") == 0 ); -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP if ( regexpMatch && objName ) { // regexp matching TQRegExp rx(TQString::fromLatin1(objName)); objSearch( list, (TQObjectList *)children(), inheritsClass, onlyWidgets, @@ -1583,7 +1583,7 @@ TQConnectionList *TQObject::receivers( const char* signal ) const TQConnectionList *TQObject::receivers( int signal ) const { -#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY +#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY if ( tqt_preliminary_signal_spy && signal >= 0 ) { if ( !connections ) { TQObject* that = (TQObject*) this; @@ -1901,7 +1901,7 @@ static void err_info_about_candidates( int code, const TQObject *TQObject::sender() { -#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY +#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY if ( this == tqt_preliminary_signal_spy ) { # ifdef TQT_THREAD_SUPPORT // protect access to qt_spy_signal_sender @@ -2639,7 +2639,7 @@ TQMetaObject* TQObject::staticTQtMetaObject() if ( qtMetaObject ) return qtMetaObject; -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES static const TQMetaEnum::Item enum_0[] = { { "AlignLeft", (int) TQt::AlignLeft }, { "AlignRight", (int) TQt::AlignRight }, @@ -2704,7 +2704,7 @@ TQMetaObject* TQObject::staticTQtMetaObject() qtMetaObject = new TQMetaObject( "TQt", 0, 0, 0, 0, 0, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES 0, 0, enum_tbl, 5, #endif @@ -2723,7 +2723,7 @@ TQMetaObject* TQObject::staticTQtMetaObject() */ void TQObject::activate_signal( int signal ) { -#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY +#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY if ( tqt_preliminary_signal_spy ) { if ( !signalsBlocked() && signal >= 0 && ( !connections || !connections->at( signal ) ) ) { @@ -2755,7 +2755,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) return; } -#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY +#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY if ( tqt_preliminary_signal_spy ) { qt_spy_signal( this, connections->findRef( clist), o ); } @@ -2932,7 +2932,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) only a typedef it cannot be a simple overload. */ -#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY +#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY #define ACTIVATE_SIGNAL_WITH_PARAM(FNAME,TYPE) \ void TQObject::FNAME( int signal, TYPE param ) \ { \ @@ -3090,7 +3090,7 @@ void TQObject::dumpObjectInfo() #endif } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES /*! Sets the value of the object's \a name property to \a value. @@ -3177,9 +3177,9 @@ TQVariant TQObject::property( const char *name ) const return v; } -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES -#ifndef QT_NO_USERDATA +#ifndef TQT_NO_USERDATA /*!\internal */ uint TQObject::registerUserData() @@ -3214,4 +3214,4 @@ TQObjectUserData* TQObject::userData( uint id ) const return 0; } -#endif // QT_NO_USERDATA +#endif // TQT_NO_USERDATA diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp index f3c1747c..c64b3e90 100644 --- a/src/kernel/qpaintdevice_x11.cpp +++ b/src/kernel/qpaintdevice_x11.cpp @@ -289,11 +289,11 @@ TQt::HANDLE TQPaintDevice::handle() const */ TQt::HANDLE TQPaintDevice::x11RenderHandle() const { -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE return rendhd ? XftDrawPicture( (XftDraw *) rendhd ) : 0; #else return 0; -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE } @@ -985,7 +985,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, return; } -#ifndef QT_NO_XRENDER +#ifndef TQT_NO_XRENDER if (src_pm && !mono_src && src_pm->data->alphapm && !ignoreMask ) { // use RENDER to do the blit TQPixmap *alpha = src_pm->data->alphapm; diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp index 0dad6836..d408a3df 100644 --- a/src/kernel/qpainter.cpp +++ b/src/kernel/qpainter.cpp @@ -59,7 +59,7 @@ #include "qtextlayout_p.h" #include "qfontengine_p.h" -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS typedef TQPtrStack<TQWMatrix> TQWMatrixStack; #endif @@ -554,7 +554,7 @@ TQPainter::~TQPainter() killPStack(); if ( tabarray ) // delete tab array delete [] tabarray; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( wm_stack ) delete (TQWMatrixStack *)wm_stack; #endif @@ -662,7 +662,7 @@ struct TQPState { // painter state uchar rop; TQPoint bro; TQRect wr, vr; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix wm; #else int xlatex; @@ -729,7 +729,7 @@ void TQPainter::save() ps->bgm = bg_mode; ps->rop = rop; ps->bro = bro; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS ps->wr = TQRect( wx, wy, ww, wh ); ps->vr = TQRect( vx, vy, vw, vh ); ps->wm = wxmat; @@ -786,7 +786,7 @@ void TQPainter::restore() setRasterOp( (RasterOp)ps->rop ); if ( ps->bro != bro || hardRestore ) setBrushOrigin( ps->bro ); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQRect wr( wx, wy, ww, wh ); TQRect vr( vx, vy, vw, vh ); if ( ps->wr != wr || hardRestore ) @@ -813,7 +813,7 @@ void TQPainter::restore() tabstops = ps->ts; tabarray = ps->ta; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( wm_stack ) delete (TQWMatrixStack *)wm_stack; wm_stack = ps->wm_stack; @@ -1206,7 +1206,7 @@ void TQPainter::setTabArray( int *ta ) TQPainter xform settings *****************************************************************************/ -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS /*! Enables view transformations if \a enable is TRUE, or disables @@ -1504,7 +1504,7 @@ void TQPainter::restoreWorldMatrix() delete m; } -#endif // QT_NO_TRANSFORMATIONS +#endif // TQT_NO_TRANSFORMATIONS /*! Translates the coordinate system by \a (dx, dy). After this call, @@ -1528,7 +1528,7 @@ void TQPainter::restoreWorldMatrix() void TQPainter::translate( double dx, double dy ) { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix m; m.translate( dx, dy ); setWorldMatrix( m, TRUE ); @@ -1540,7 +1540,7 @@ void TQPainter::translate( double dx, double dy ) } -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS /*! Scales the coordinate system by \a (sx, sy). @@ -1680,7 +1680,7 @@ void TQPainter::resetXForm() xlatey = 0; clearf( VxF ); } -#endif // QT_NO_TRANSFORMATIONS +#endif // TQT_NO_TRANSFORMATIONS extern bool qt_old_transformations; @@ -1692,7 +1692,7 @@ extern bool qt_old_transformations; void TQPainter::map( int x, int y, int *rx, int *ry ) const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( qt_old_transformations ) { switch ( txop ) { case TxNone: @@ -1751,7 +1751,7 @@ void TQPainter::map( int x, int y, int *rx, int *ry ) const void TQPainter::map( int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh ) const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( qt_old_transformations ) { switch ( txop ) { case TxNone: @@ -1818,7 +1818,7 @@ void TQPainter::map( int x, int y, int w, int h, void TQPainter::mapInv( int x, int y, int *rx, int *ry ) const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS #if defined(QT_CHECK_STATE) if ( !txinv ) tqWarning( "TQPainter::mapInv: Internal error" ); @@ -1847,7 +1847,7 @@ void TQPainter::mapInv( int x, int y, int *rx, int *ry ) const void TQPainter::mapInv( int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh ) const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS #if defined(QT_CHECK_STATE) if ( !txinv || txop == TxRotShear ) tqWarning( "TQPainter::mapInv: Internal error" ); @@ -1885,7 +1885,7 @@ void TQPainter::mapInv( int x, int y, int w, int h, TQPoint TQPainter::xForm( const TQPoint &pv ) const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( txop == TxNone ) return pv; int x=pv.x(), y=pv.y(); @@ -1910,7 +1910,7 @@ TQPoint TQPainter::xForm( const TQPoint &pv ) const TQRect TQPainter::xForm( const TQRect &rv ) const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( txop == TxNone ) return rv; if ( txop == TxRotShear ) { // rotation/shear @@ -1938,7 +1938,7 @@ TQRect TQPainter::xForm( const TQRect &rv ) const TQPointArray TQPainter::xForm( const TQPointArray &av ) const { TQPointArray a = av; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( txop != TxNone ) { return xmat * av; @@ -1978,7 +1978,7 @@ TQPointArray TQPainter::xForm( const TQPointArray &av, int index, int lastPoint = npoints < 0 ? av.size() : index+npoints; TQPointArray a( lastPoint-index ); memcpy( a.data(), av.data()+index, (lastPoint-index)*sizeof( TQPoint ) ); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS return xmat*a; #else a.translate( xlatex, xlatey ); @@ -1997,7 +1997,7 @@ TQPointArray TQPainter::xForm( const TQPointArray &av, int index, TQPoint TQPainter::xFormDev( const TQPoint &pd ) const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( txop == TxNone ) return pd; if ( !txinv ) { @@ -2022,7 +2022,7 @@ TQPoint TQPainter::xFormDev( const TQPoint &pd ) const TQRect TQPainter::xFormDev( const TQRect &rd ) const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( txop == TxNone ) return rd; if ( !txinv ) { @@ -2051,7 +2051,7 @@ TQRect TQPainter::xFormDev( const TQRect &rd ) const TQPointArray TQPainter::xFormDev( const TQPointArray &ad ) const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( txop == TxNone ) return ad; if ( !txinv ) { @@ -2094,7 +2094,7 @@ TQPointArray TQPainter::xFormDev( const TQPointArray &ad, int index, int lastPoint = npoints < 0 ? ad.size() : index+npoints; TQPointArray a( lastPoint-index ); memcpy( a.data(), ad.data()+index, (lastPoint-index)*sizeof( TQPoint ) ); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( txop == TxNone ) return a; if ( !txinv ) { @@ -2174,7 +2174,7 @@ TQRegion TQPainter::clipRegion( CoordinateMode m ) const // If the transformation mode is CoordPainter, we should transform the // clip region with painter transformations. -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQRegion r; if ( m == CoordDevice ) { r = crgn; @@ -2315,7 +2315,7 @@ void TQPainter::drawPixmap( const TQPoint &p, const TQPixmap &pm ) drawPixmap( p.x(), p.y(), pm, 0, 0, pm.width(), pm.height() ); } -#if !defined(QT_NO_IMAGE_SMOOTHSCALE) || !defined(QT_NO_PIXMAP_TRANSFORMATION) +#if !defined(TQT_NO_IMAGE_SMOOTHSCALE) || !defined(TQT_NO_PIXMAP_TRANSFORMATION) /*! \overload @@ -2358,19 +2358,19 @@ void TQPainter::drawPixmap( const TQRect &r, const TQPixmap &pm ) TQPixmap pixmap = pm; if ( scale ) { -#ifndef QT_NO_IMAGE_SMOOTHSCALE -# ifndef QT_NO_PIXMAP_TRANSFORMATION +#ifndef TQT_NO_IMAGE_SMOOTHSCALE +# ifndef TQT_NO_PIXMAP_TRANSFORMATION if ( smooth ) # endif { TQImage i = pm.convertToImage(); pixmap = TQPixmap( i.smoothScale( rw, rh ) ); } -# ifndef QT_NO_PIXMAP_TRANSFORMATION +# ifndef TQT_NO_PIXMAP_TRANSFORMATION else # endif #endif -#ifndef QT_NO_PIXMAP_TRANSFORMATION +#ifndef TQT_NO_PIXMAP_TRANSFORMATION { pixmap = pm.xForm( TQWMatrix( scaleX, 0, 0, scaleY, 0, 0 ) ); } @@ -2419,7 +2419,7 @@ void TQPainter::drawImage( int x, int y, const TQImage & image, { #ifdef Q_WS_QWS //### Hackish -# ifndef QT_NO_TRANSFORMATIONS +# ifndef TQT_NO_TRANSFORMATIONS if ( !image.isNull() && gfx && (txop==TxNone||txop==TxTranslate) && !testf(ExtDev) ) # else @@ -2525,7 +2525,7 @@ void TQPainter::drawImage( const TQPoint & p, const TQImage & i, drawImage(p, i, i.rect(), conversion_flags); } -#if !defined(QT_NO_IMAGE_TRANSFORMATION) || !defined(QT_NO_IMAGE_SMOOTHSCALE) +#if !defined(TQT_NO_IMAGE_TRANSFORMATION) || !defined(TQT_NO_IMAGE_SMOOTHSCALE) /*! \overload @@ -2570,9 +2570,9 @@ void TQPainter::drawImage( const TQRect &r, const TQImage &i ) TQImage img = scale ? ( -#if defined(QT_NO_IMAGE_TRANSFORMATION) +#if defined(TQT_NO_IMAGE_TRANSFORMATION) i.smoothScale( rw, rh ) -#elif defined(QT_NO_IMAGE_SMOOTHSCALE) +#elif defined(TQT_NO_IMAGE_SMOOTHSCALE) i.scale( rw, rh ) #else smooth ? i.smoothScale( rw, rh ) : i.scale( rw, rh ) @@ -3006,7 +3006,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r, bool painterHasClip = FALSE; TQRegion painterClipRegion; if ( !dontclip ) { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQRegion reg = painter->xmat * r; #else TQRegion reg = r; @@ -3524,7 +3524,7 @@ bool TQPen::operator==( const TQPen &p ) const /***************************************************************************** TQPen stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQPen @@ -3563,7 +3563,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPen &p ) p = TQPen( color, (uint)width, (TQt::PenStyle)style ); // owl return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM /***************************************************************************** TQBrush member functions @@ -3915,7 +3915,7 @@ bool TQBrush::operator==( const TQBrush &b ) const /***************************************************************************** TQBrush stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQBrush @@ -3929,7 +3929,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQBrush &b ) { s << (TQ_UINT8)b.style() << b.color(); if ( b.style() == TQt::CustomPattern ) -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO s << *b.pixmap(); #else tqWarning("No Image Brush I/O"); @@ -3953,7 +3953,7 @@ TQDataStream &operator>>( TQDataStream &s, TQBrush &b ) s >> style; s >> color; if ( style == TQt::CustomPattern ) { -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQPixmap pm; s >> pm; b = TQBrush( color, pm ); @@ -3965,4 +3965,4 @@ TQDataStream &operator>>( TQDataStream &s, TQBrush &b ) b = TQBrush( color, (TQt::BrushStyle)style ); return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp index bcc12af1..697dc784 100644 --- a/src/kernel/qpainter_x11.cpp +++ b/src/kernel/qpainter_x11.cpp @@ -132,7 +132,7 @@ void qt_erase_rect( TQWidget* w, const TQRect& r) } -#ifdef QT_NO_XFTFREETYPE +#ifdef TQT_NO_XFTFREETYPE static const TQt::HANDLE rendhd = 0; #endif @@ -153,12 +153,12 @@ static inline void x11SetClipRegion(Display *dpy, GC gc, GC gc2, TQt::HANDLE dra if (gc2) XSetClipRectangles( dpy, gc2, 0, 0, rects, num, YXBanded ); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (draw) XftDrawSetClipRectangles((XftDraw *) draw, 0, 0, rects, num); #else Q_UNUSED(draw); -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE } static inline void x11ClearClipRegion(Display *dpy, GC gc, GC gc2, TQt::HANDLE draw) @@ -168,7 +168,7 @@ static inline void x11ClearClipRegion(Display *dpy, GC gc, GC gc2, TQt::HANDLE d if (gc2) XSetClipMask(dpy, gc2, None); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (draw) { # ifdef QT_XFT2 XftDrawSetClip((XftDraw *) draw, None); @@ -182,7 +182,7 @@ static inline void x11ClearClipRegion(Display *dpy, GC gc, GC gc2, TQt::HANDLE d } #else Q_UNUSED(draw); -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE } @@ -1127,7 +1127,7 @@ bool TQPainter::begin( const TQPaintDevice *pd, bool unclipped ) updateBrush(); XSetSubwindowMode( dpy, gc, IncludeInferiors ); XSetSubwindowMode( dpy, gc_brush, IncludeInferiors ); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (rendhd) XftDrawSetSubwindowMode((XftDraw *) rendhd, IncludeInferiors); #endif @@ -1234,13 +1234,13 @@ bool TQPainter::end() // end painting if ( testf(ExtDev) ) pdev->cmd( TQPaintDevice::PdcEnd, this, 0 ); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (rendhd) { // reset clipping/subwindow mode on our render picture XftDrawSetClip((XftDraw *) rendhd, None); XftDrawSetSubwindowMode((XftDraw *) rendhd, ClipByChildren); } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE if ( pfont ) { delete pfont; @@ -2744,7 +2744,7 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap, XSetTSOrigin( dpy, gc, 0, 0 ); XSetFillStyle( dpy, gc, FillSolid ); } else { -#if !defined(QT_NO_XFTFREETYPE) && !defined(QT_NO_XRENDER) +#if !defined(TQT_NO_XFTFREETYPE) && !defined(TQT_NO_XRENDER) Picture pict = rendhd ? XftDrawPicture((XftDraw *) rendhd) : None; TQPixmap *alpha = pixmap.data->alphapm; @@ -2754,7 +2754,7 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap, alpha->x11RenderHandle(), pict, sx, sy, sx, sy, x, y, sw, sh); } else -#endif // !QT_NO_XFTFREETYPE && !QT_NO_XRENDER +#endif // !TQT_NO_XFTFREETYPE && !TQT_NO_XRENDER { XCopyArea( dpy, pixmap.handle(), hd, gc, sx, sy, sw, sh, x, y ); } @@ -2858,7 +2858,7 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h, if ( txop == TxTranslate ) map( x, y, &x, &y ); -#if !defined(QT_NO_XFTFREETYPE) && !defined(QT_NO_XRENDER) +#if !defined(TQT_NO_XFTFREETYPE) && !defined(TQT_NO_XRENDER) Picture pict = rendhd ? XftDrawPicture((XftDraw *) rendhd) : None; TQPixmap *alpha = pixmap.data->alphapm; @@ -2889,7 +2889,7 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h, } return; } -#endif // !QT_NO_XFTFREETYPE && !QT_NO_XRENDER +#endif // !TQT_NO_XFTFREETYPE && !TQT_NO_XRENDER XSetTile( dpy, gc, pixmap.handle() ); XSetFillStyle( dpy, gc, FillTiled ); diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp index add847a1..31f45c05 100644 --- a/src/kernel/qpalette.cpp +++ b/src/kernel/qpalette.cpp @@ -40,7 +40,7 @@ #include "ntqpalette.h" -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE #include "ntqdatastream.h" #include "ntqcleanuphandler.h" @@ -943,7 +943,7 @@ bool TQPalette::operator==( const TQPalette &p ) const TQColorGroup/TQPalette stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQColorGroup @@ -1080,7 +1080,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPalette &p ) p = newpal; return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM /*! Returns TRUE if this palette and \a p are copies of each other, @@ -1221,4 +1221,4 @@ TQColorGroup::ColorRole TQPalette::backgroundRoleFromMode( TQt::BackgroundMode m } } -#endif // QT_NO_PALETTE +#endif // TQT_NO_PALETTE diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp index b9d350a0..0fd609d7 100644 --- a/src/kernel/qpicture.cpp +++ b/src/kernel/qpicture.cpp @@ -40,7 +40,7 @@ #include "ntqpicture.h" -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE #include "ntqpainter.h" #include "ntqpixmap.h" @@ -49,7 +49,7 @@ #include "ntqdatastream.h" #include "ntqpaintdevicemetrics.h" -#ifndef QT_NO_SVG +#ifndef TQT_NO_SVG #include "private/qsvgdevice_p.h" #endif @@ -248,7 +248,7 @@ bool TQPicture::load( const TQString &fileName, const char *format ) bool TQPicture::load( TQIODevice *dev, const char *format ) { -#ifndef QT_NO_SVG +#ifndef TQT_NO_SVG if ( qstrcmp( format, "svg" ) == 0 ) { TQSvgDevice svg; if ( !svg.load( dev ) ) @@ -297,7 +297,7 @@ bool TQPicture::save( const TQString &fileName, const char *format ) return FALSE; } -#ifndef QT_NO_SVG +#ifndef TQT_NO_SVG // identical to TQIODevice* code below but the file name // makes a difference when it comes to saving pixmaps if ( tqstricmp( format, "svg" ) == 0 ) { @@ -332,7 +332,7 @@ bool TQPicture::save( TQIODevice *dev, const char *format ) return FALSE; } -#ifndef QT_NO_SVG +#ifndef TQT_NO_SVG if ( tqstricmp( format, "svg" ) == 0 ) { TQSvgDevice svg; TQPainter p( &svg ); @@ -446,7 +446,7 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords ) TQPen pen; TQBrush brush; TQRegion rgn; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix matrix; #endif @@ -517,7 +517,7 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords ) break; case PdcDrawCubicBezier: s >> a; -#ifndef QT_NO_BEZIER +#ifndef TQT_NO_BEZIER painter->drawCubicBezier( a ); #endif break; @@ -623,35 +623,35 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords ) break; case PdcSetVXform: s >> i_8; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS painter->setViewXForm( i_8 ); #endif break; case PdcSetWindow: s >> r; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS painter->setWindow( r ); #endif break; case PdcSetViewport: s >> r; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS painter->setViewport( r ); #endif break; case PdcSetWXform: s >> i_8; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS painter->setWorldXForm( i_8 ); #endif break; case PdcSetWMatrix: -#ifndef QT_NO_TRANSFORMATIONS // #### fix me! +#ifndef TQT_NO_TRANSFORMATIONS // #### fix me! s >> matrix >> i_8; painter->setWorldMatrix( matrix, i_8 ); #endif break; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS case PdcSaveWMatrix: painter->saveWorldMatrix(); break; @@ -782,7 +782,7 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p ) br = p[0].ptarr->boundingRect(); corr = TRUE; break; -#ifndef QT_NO_BEZIER +#ifndef TQT_NO_BEZIER case PdcDrawCubicBezier: s << *p[0].ptarr; br = p[0].ptarr->cubicBezier().boundingRect(); @@ -884,7 +884,7 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p ) case PdcSetClip: s << (TQ_INT8)p[0].ival; break; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS case PdcSetWindow: case PdcSetViewport: s << *p[0].rect; @@ -924,7 +924,7 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p ) br.setCoords( br.left() - w2, br.top() - w2, br.right() + w2, br.bottom() + w2 ); } -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS br = pt->worldMatrix().map( br ); #endif if ( pt->hasClipping() ) { @@ -1225,5 +1225,5 @@ TQDataStream &operator>>( TQDataStream &s, TQPicture &r ) return s; } -#endif // QT_NO_PICTURE +#endif // TQT_NO_PICTURE diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp index 7dd6c0d7..6d802cfd 100644 --- a/src/kernel/qpixmap.cpp +++ b/src/kernel/qpixmap.cpp @@ -258,7 +258,7 @@ TQPixmap::TQPixmap( const TQSize &size, int depth, Optimization optimization ) init( size.width(), size.height(), depth, FALSE, optimization ); } -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Constructs a pixmap from the file \a fileName. If the file does not exist or is of an unknown format, the pixmap becomes a null @@ -351,7 +351,7 @@ TQPixmap::TQPixmap( const TQByteArray & img_data ) init( 0, 0, 0, FALSE, defOptim ); loadFromData( img_data ); } -#endif //QT_NO_IMAGEIO +#endif //TQT_NO_IMAGEIO /*! Constructs a pixmap that is a copy of \a pixmap. @@ -396,7 +396,7 @@ TQPixmap::~TQPixmap() \sa TQMimeSourceFactory, TQImage::fromMimeSource(), TQImageDrag::decode() */ -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQPixmap TQPixmap::fromMimeSource( const TQString &abs_name ) { const TQMimeSource *m = TQMimeSourceFactory::defaultFactory()->data( abs_name ); @@ -671,7 +671,7 @@ void TQPixmap::resize( int w, int h ) if(data->alphapm) { data->alphapm->resize(w, h); } else -#elif defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) +#elif defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) if (data->alphapm) tqWarning("TQPixmap::resize: TODO: resize alpha data"); else @@ -751,11 +751,11 @@ void TQPixmap::setMask( const TQBitmap &newmask ) #endif return; } -#if defined(Q_WS_MAC) || (defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)) +#if defined(Q_WS_MAC) || (defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)) // when setting the mask, we get rid of the alpha channel completely delete data->alphapm; data->alphapm = 0; -#endif // Q_WS_X11 && !QT_NO_XFTFREETYPE +#endif // Q_WS_X11 && !TQT_NO_XFTFREETYPE delete data->mask; TQBitmap* newmaskcopy; @@ -779,7 +779,7 @@ void TQPixmap::setMask( const TQBitmap &newmask ) \sa mask() */ -#ifndef QT_NO_IMAGE_HEURISTIC_MASK +#ifndef TQT_NO_IMAGE_HEURISTIC_MASK /*! Creates and returns a heuristic mask for this pixmap. It works by selecting a color from one of the corners and then chipping away @@ -808,7 +808,7 @@ TQBitmap TQPixmap::createHeuristicMask( bool clipTight ) const return m; } #endif -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Returns a string that specifies the image format of the file \a fileName, or 0 if the file cannot be read or if the format cannot @@ -886,7 +886,7 @@ bool TQPixmap::load( const TQString &fileName, const char *format, } return load( fileName, format, conversion_flags ); } -#endif //QT_NO_IMAGEIO +#endif //TQT_NO_IMAGEIO /*! \overload @@ -919,7 +919,7 @@ bool TQPixmap::convertFromImage( const TQImage &image, ColorMode mode ) return convertFromImage( image, conversion_flags ); } -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Loads a pixmap from the binary data in \a buf (\a len bytes). Returns TRUE if successful; otherwise returns FALSE. @@ -1061,7 +1061,7 @@ bool TQPixmap::doImageIO( TQImageIO* io, int quality ) const return io->write(); } -#endif //QT_NO_IMAGEIO +#endif //TQT_NO_IMAGEIO /*! \fn int TQPixmap::serialNumber() const @@ -1234,7 +1234,7 @@ TQPixmap TQPixmap::grabWidget( TQWidget * widget, int x, int y, int w, int h ) \sa xForm(), TQWMatrix */ -#ifndef QT_NO_PIXMAP_TRANSFORMATION +#ifndef TQT_NO_PIXMAP_TRANSFORMATION TQWMatrix TQPixmap::trueMatrix( const TQWMatrix &matrix, int w, int h ) { const double dt = (double)0.; @@ -1275,7 +1275,7 @@ TQWMatrix TQPixmap::trueMatrix( const TQWMatrix &matrix, int w, int h ) mat.setMatrix( matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), -xmin, -ymin ); return mat; } -#endif // QT_NO_WMATRIX +#endif // TQT_NO_WMATRIX @@ -1284,7 +1284,7 @@ TQWMatrix TQPixmap::trueMatrix( const TQWMatrix &matrix, int w, int h ) /***************************************************************************** TQPixmap stream functions *****************************************************************************/ -#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO) +#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO) /*! \relates TQPixmap @@ -1319,7 +1319,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPixmap &pixmap ) return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM @@ -1346,7 +1346,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPixmap &pixmap ) line of the source data, \a sWidth and \a sHeight are the width and height of the source data. */ -#ifndef QT_NO_PIXMAP_TRANSFORMATION +#ifndef TQT_NO_PIXMAP_TRANSFORMATION #undef IWX_MSB #define IWX_MSB(b) if ( trigx < maxws && trigy < maxhs ) { \ if ( *(sptr+sbpl*(trigy>>16)+(trigx>>19)) & \ @@ -1507,4 +1507,4 @@ bool qt_xForm_helper( const TQWMatrix &trueMat, int xoffset, #undef IWX_MSB #undef IWX_LSB #undef IWX_PIX -#endif // QT_NO_PIXMAP_TRANSFORMATION +#endif // TQT_NO_PIXMAP_TRANSFORMATION diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index 00564b33..1acdf16a 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -374,12 +374,12 @@ static int defaultScreen = -1; extern bool tqt_use_xrender; // defined in qapplication_x11.cpp extern bool tqt_has_xft; // defined in qfont_x11.cpp -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE #ifndef QT_XFT2 // Xft1 doesn't have XftDrawCreateAlpha, so we fake it in qtaddons_x11.cpp extern "C" XftDraw *XftDrawCreateAlpha( Display *, TQt::HANDLE, int ); #endif // QT_XFT2 -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE /***************************************************************************** TQPixmap member functions @@ -450,7 +450,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim ) hd = (HANDLE)XCreatePixmap( x11Display(), RootWindow(x11Display(), x11Screen() ), w, h, data->d ); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if ( tqt_has_xft ) { if ( data->d == 1 ) { rendhd = (HANDLE) XftDrawCreateBitmap( x11Display(), hd ); @@ -460,7 +460,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim ) x11Colormap() ); } } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE } @@ -476,12 +476,12 @@ void TQPixmap::deref() XFreeGC( x11Display(), (GC)data->maskgc ); if ( tqApp && hd) { -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (rendhd) { XftDrawDestroy( (XftDraw *) rendhd ); rendhd = 0; } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE XFreePixmap( x11Display(), hd ); hd = 0; @@ -520,10 +520,10 @@ TQPixmap::TQPixmap( int w, int h, const uchar *bits, bool isXbitmap) RootWindow(x11Display(), x11Screen() ), (char *)bits, w, h ); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if ( tqt_has_xft ) rendhd = (HANDLE) XftDrawCreateBitmap (x11Display (), hd); -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE if ( flipped_bits ) // Avoid purify complaint delete [] flipped_bits; @@ -1159,12 +1159,12 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if ( d == 1 ) { // 1 bit pixmap (bitmap) if ( hd ) { // delete old X pixmap -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (rendhd) { XftDrawDestroy( (XftDraw *) rendhd ); rendhd = 0; } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE XFreePixmap( x11Display(), hd ); } @@ -1220,10 +1220,10 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) RootWindow(x11Display(), x11Screen() ), bits, w, h ); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if ( tqt_has_xft ) rendhd = (HANDLE) XftDrawCreateBitmap( x11Display(), hd ); -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE if ( tmp_bits ) // Avoid purify complaint delete [] tmp_bits; @@ -1775,12 +1775,12 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if ( hd && (width() != (int)w || height() != (int)h || this->depth() != dd) ) { -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (rendhd) { XftDrawDestroy( (XftDraw *) rendhd ); rendhd = 0; } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE XFreePixmap( dpy, hd ); // don't reuse old pixmap hd = 0; @@ -1790,7 +1790,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) RootWindow(x11Display(), x11Screen() ), w, h, dd ); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if ( tqt_has_xft ) { if ( data->d == 1 ) { rendhd = (HANDLE) XftDrawCreateBitmap( x11Display (), hd ); @@ -1799,7 +1799,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) (Visual *) x11Visual(), x11Colormap() ); } } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE } @@ -1826,7 +1826,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) m = image.createAlphaMask( conversion_flags ); setMask( m ); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE // does this image have an alphamap (and not just a 1bpp mask)? bool alphamap = image.depth() == 32; if (image.depth() == 8) { @@ -1907,7 +1907,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) XFreeGC(x11Display(), gc); } } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE } #ifdef QT_MITSHM_CONVERSIONS @@ -2235,7 +2235,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const if ( data->mask ) // xform mask, too pm.setMask( data->mask->xForm(matrix) ); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if ( tqt_use_xrender && tqt_has_xft && data->alphapm ) { // xform the alpha channel XImage *axi = 0; if ((axi = XGetImage(x11Display(), data->alphapm->handle(), @@ -2286,7 +2286,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const qSafeXDestroyImage(axi); } } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE return pm; } @@ -2415,7 +2415,7 @@ Q_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, src->data->mask, sx, sy, sw, sh, TQt::CopyROP, TRUE ); } -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE // copy alpha data extern bool tqt_use_xrender; // from qapplication_x11.cpp if ( ! tqt_use_xrender || ! src->data->alphapm ) @@ -2474,5 +2474,5 @@ Q_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, XCopyArea(dst->x11Display(), src->data->alphapm->hd, dst->data->alphapm->hd, gc, sx, sy, sw, sh, dx, dy); XFreeGC(dst->x11Display(), gc); -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE } diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp index d391d5c4..8033030b 100644 --- a/src/kernel/qpngio.cpp +++ b/src/kernel/qpngio.cpp @@ -40,7 +40,7 @@ #include "ntqpngio.h" -#ifndef QT_NO_IMAGEIO_PNG +#ifndef TQT_NO_IMAGEIO_PNG #include "ntqasyncimageio.h" #include "ntqiodevice.h" @@ -411,7 +411,7 @@ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) image.setDotsPerMeterX(png_get_x_pixels_per_meter(png_ptr,info_ptr)); image.setDotsPerMeterY(png_get_y_pixels_per_meter(png_ptr,info_ptr)); -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT png_textp text_ptr; int num_text=0; png_get_text(png_ptr,info_ptr,&text_ptr,&num_text); @@ -484,7 +484,7 @@ void TQPNGImageWriter::setGamma(float g) } -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT static void set_text(const TQImage& image, png_structp png_ptr, png_infop info_ptr, bool short_not_long) { TQValueList<TQImageTextKeyLang> keys = image.textList(); @@ -684,14 +684,14 @@ should be able to comment this out. PNG_RESOLUTION_METER); } -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT // Write short texts early. set_text(image,png_ptr,info_ptr,TRUE); #endif png_write_info(png_ptr, info_ptr); -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT // Write long texts later. set_text(image,png_ptr,info_ptr,FALSE); #endif @@ -935,7 +935,7 @@ bool TQPNGImagePacker::packImage(const TQImage& img) } -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO class TQPNGFormat : public TQImageFormat { public: @@ -1225,7 +1225,7 @@ void TQPNGFormat::end(png_structp png, png_infop info) image->setOffset(TQPoint(offx,offy)); image->setDotsPerMeterX(png_get_x_pixels_per_meter(png,info)); image->setDotsPerMeterY(png_get_y_pixels_per_meter(png,info)); -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT png_textp text_ptr; int num_text=0; png_get_text(png,info,&text_ptr,&num_text); @@ -1248,7 +1248,7 @@ void TQPNGFormat::end(png_structp png, png_infop info) #ifdef PNG_USER_CHUNKS_SUPPORTED /* -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT static bool skip(png_uint_32& max, png_bytep& data) { while (*data) { @@ -1292,7 +1292,7 @@ int TQPNGFormat::user_chunk(png_structp png, Q_UNUSED( length ) #endif -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT /* libpng now supports this chunk. @@ -1328,12 +1328,12 @@ int TQPNGFormat::user_chunk(png_structp png, static TQPNGFormatType* globalPngFormatTypeObject = 0; -#endif // QT_NO_ASYNC_IMAGE_IO +#endif // TQT_NO_ASYNC_IMAGE_IO static bool done = FALSE; void qCleanupPngIO() { -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO if ( globalPngFormatTypeObject ) { delete globalPngFormatTypeObject; globalPngFormatTypeObject = 0; @@ -1348,7 +1348,7 @@ void qInitPngIO() done = TRUE; TQImageIO::defineIOHandler( "PNG", "^.PNG\r", 0, read_png_image, write_png_image); -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO globalPngFormatTypeObject = new TQPNGFormatType; #endif tqAddPostRoutine( qCleanupPngIO ); @@ -1361,4 +1361,4 @@ void qt_zlib_compression_hack() uncompress(0,0,0,0); } -#endif // QT_NO_IMAGEIO_PNG +#endif // TQT_NO_IMAGEIO_PNG diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp index d073ab1d..d3c409ef 100644 --- a/src/kernel/qpoint.cpp +++ b/src/kernel/qpoint.cpp @@ -384,7 +384,7 @@ void TQPoint::warningDivByZero() /***************************************************************************** TQPoint stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQPoint @@ -426,7 +426,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPoint &p ) } return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM /*! Returns the sum of the absolute values of x() and y(), traditionally known as the "Manhattan length" of the vector from diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp index 5da55e2d..dcca3278 100644 --- a/src/kernel/qpointarray.cpp +++ b/src/kernel/qpointarray.cpp @@ -488,7 +488,7 @@ static inline int fix_angle( int a ) void TQPointArray::makeArc( int x, int y, int w, int h, int a1, int a2 ) { -#if !defined(QT_OLD_MAKEELLIPSE) && !defined(QT_NO_TRANSFORMATIONS) +#if !defined(QT_OLD_MAKEELLIPSE) && !defined(TQT_NO_TRANSFORMATIONS) TQWMatrix unit; makeArc(x,y,w,h,a1,a2,unit); #else @@ -520,7 +520,7 @@ void TQPointArray::makeArc( int x, int y, int w, int h, int a1, int a2 ) #endif } -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS // Based upon: // parelarc.c from Graphics Gems III // VanAken / Simar, "A Parametric Elliptical Arc Algorithm" @@ -670,7 +670,7 @@ void TQPointArray::makeArc( int x, int y, int w, int h, #undef PIV2 } -#endif // QT_NO_TRANSFORMATIONS +#endif // TQT_NO_TRANSFORMATIONS /*! Sets the points of the array to those describing an ellipse with @@ -680,7 +680,7 @@ void TQPointArray::makeArc( int x, int y, int w, int h, */ void TQPointArray::makeEllipse( int x, int y, int w, int h ) { // midpoint, 1/4 ellipse -#if !defined(QT_OLD_MAKEELLIPSE) && !defined(QT_NO_TRANSFORMATIONS) +#if !defined(QT_OLD_MAKEELLIPSE) && !defined(TQT_NO_TRANSFORMATIONS) TQWMatrix unit; makeArc(x,y,w,h,0,360*16,unit); return; @@ -755,7 +755,7 @@ void TQPointArray::makeEllipse( int x, int y, int w, int h ) #endif } -#ifndef QT_NO_BEZIER +#ifndef TQT_NO_BEZIER // Work functions for TQPointArray::cubicBezier() static void split(const double *p, double *l, double *r) @@ -1001,12 +1001,12 @@ TQPointArray TQPointArray::cubicBezier() const #endif } -#endif //QT_NO_BEZIER +#endif //TQT_NO_BEZIER /***************************************************************************** TQPointArray stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQPointArray @@ -1049,7 +1049,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPointArray &a ) } return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM diff --git a/src/kernel/qprinter.cpp b/src/kernel/qprinter.cpp index 4b8175d9..2c89b6ad 100644 --- a/src/kernel/qprinter.cpp +++ b/src/kernel/qprinter.cpp @@ -41,7 +41,7 @@ #include "ntqprinter.h" #include "qprinter_p.h" -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER /*! \class TQPrinter ntqprinter.h @@ -1024,5 +1024,5 @@ bool TQPrinter::isOptionEnabled( PrinterOption option ) { return d->printerOptions & ( 1 << option ); } -#endif // QT_NO_PRINTER +#endif // TQT_NO_PRINTER diff --git a/src/kernel/qprinter_p.h b/src/kernel/qprinter_p.h index b8733bec..79c5f827 100644 --- a/src/kernel/qprinter_p.h +++ b/src/kernel/qprinter_p.h @@ -40,7 +40,7 @@ #ifndef TQPRINTER_P_H #define TQPRINTER_P_H -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER #ifndef QT_H #include <ntqshared.h> diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp index c1d234df..5141f7b1 100644 --- a/src/kernel/qprinter_unix.cpp +++ b/src/kernel/qprinter_unix.cpp @@ -49,7 +49,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode) #include "ntqprinter.h" -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER #include "ntqpaintdevicemetrics.h" #include "qpsprinter_p.h" @@ -250,7 +250,7 @@ static void deleteGlobalPrinterDefaults() bool TQPrinter::setup( TQWidget * parent ) { -#ifndef QT_NO_PRINTDIALOG +#ifndef TQT_NO_PRINTDIALOG bool result = TQPrintDialog::getPrinterSetup( this, parent ); #else bool result = FALSE; diff --git a/src/kernel/qprocess.cpp b/src/kernel/qprocess.cpp index 1533a66a..13fb195e 100644 --- a/src/kernel/qprocess.cpp +++ b/src/kernel/qprocess.cpp @@ -43,7 +43,7 @@ #include "ntqprocess.h" -#ifndef QT_NO_PROCESS +#ifndef TQT_NO_PROCESS #include "ntqapplication.h" #include "private/qinternal_p.h" @@ -352,7 +352,7 @@ void TQProcess::addArgument( const TQString& arg ) _arguments.append( arg ); } -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR /*! Returns the working directory that was set with setWorkingDirectory(), or the current directory if none has been @@ -379,7 +379,7 @@ void TQProcess::setWorkingDirectory( const TQDir& dir ) { workingDir = dir; } -#endif //QT_NO_DIR +#endif //TQT_NO_DIR /*! Returns the communication required with the process, i.e. some @@ -803,4 +803,4 @@ void TQProcess::disconnectNotify( const char * ) } } -#endif // QT_NO_PROCESS +#endif // TQT_NO_PROCESS diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp index 3bba1bca..f41923fd 100644 --- a/src/kernel/qprocess_unix.cpp +++ b/src/kernel/qprocess_unix.cpp @@ -47,7 +47,7 @@ #include "ntqprocess.h" -#ifndef QT_NO_PROCESS +#ifndef TQT_NO_PROCESS #include "ntqapplication.h" #include "ntqptrqueue.h" @@ -816,7 +816,7 @@ bool TQProcess::start( TQStringList *env ) if ( comms & DupStderr ) { ::dup2( STDOUT_FILENO, STDERR_FILENO ); } -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR if (::chdir( workingDir.absPath().latin1() ) < 0) { tqWarning( "Could not chdir" ); } @@ -871,7 +871,7 @@ bool TQProcess::start( TQStringList *env ) if(!TQFile::exists(dir + "/" + command) && TQFile::exists(dir + "/" + command + ".app")) dir += "/" + command + ".app/Contents/MacOS"; #endif -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQFileInfo fileInfo( dir, command ); #else TQFileInfo fileInfo( dir + "/" + command ); @@ -1414,4 +1414,4 @@ TQProcess::PID TQProcess::processIdentifier() return d->proc->pid; } -#endif // QT_NO_PROCESS +#endif // TQT_NO_PROCESS diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp index 90d81223..42c1b8bc 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/qpsprinter.cpp @@ -52,7 +52,7 @@ #include "qpsprinter_p.h" -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER #undef Q_PRINTER_USE_TYPE42 @@ -1416,7 +1416,7 @@ public: bool dirtyBkColor; TQt::BGMode bkMode; bool dirtyBkMode; -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC TQTextCodec * currentFontCodec; #endif TQString currentFont; @@ -4241,7 +4241,7 @@ void TQPSPrinterFontNotFound::download(TQTextStream& s, bool) TQPSPrinterFontPrivate::download(s, TRUE); } -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC // =================== A font file for asian ============ class TQPSPrinterFontAsian @@ -4923,7 +4923,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate bool xlfd = FALSE; //tqDebug("engine = %p name=%s, script=%d", engine, engine ? engine->name() : "(null)", script); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if ( tqt_has_xft && engine && engine->type() == TQFontEngine::Xft ) { XftPattern *pattern = static_cast<TQFontEngineXft *>( engine )->pattern(); char *filename = 0; @@ -4952,7 +4952,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate } } #endif // Q_WS_X11 -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC // map some scripts to something more useful if ( script == TQFont::Han ) { TQTextCodec *lc = TQTextCodec::codecForLocale(); @@ -5088,7 +5088,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate case NONE: default: -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( script == TQFont::Hiragana ) p = new TQPSPrinterFontJapanese( engine ); @@ -5145,7 +5145,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes ) : buffer( 0 ), outDevice( 0 ), fd( filedes ), pageBuffer( 0 ), fonts(27, FALSE), fontBuffer(0), savedImage( 0 ), dirtypen( FALSE ), dirtybrush( FALSE ), dirtyBkColor( FALSE ), bkMode( TQt::TransparentMode ), dirtyBkMode( FALSE ), -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC currentFontCodec( 0 ), #endif fm( TQFont() ), textY( 0 ) @@ -5275,10 +5275,10 @@ void TQPSPrinterPrivate::setFont( const TQFont & fnt, int script ) if ( !fontsUsed.contains( ps ) ) fontsUsed += ps; -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC TQTextCodec * codec = 0; // ### -// #ifndef QT_NO_TEXTCODEC +// #ifndef TQT_NO_TEXTCODEC // i = 0; // do { // if ( unicodevalues[i].cs == f.charSet() ) @@ -5859,7 +5859,7 @@ void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w, void TQPSPrinterPrivate::matrixSetup( TQPainter *paint ) { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix tmp; if ( paint->hasViewXForm() ) { TQRect viewport = paint->viewport(); @@ -6487,7 +6487,7 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p ) TQRect r = *(p[0].rect); TQImage img = *(p[1].image); TQImage mask; -#ifndef QT_NO_IMAGE_DITHER_TO_1 +#ifndef TQT_NO_IMAGE_DITHER_TO_1 if ( img.hasAlphaBuffer() ) mask = img.createAlphaMask(); #endif @@ -6579,4 +6579,4 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p ) return TRUE; } -#endif // QT_NO_PRINTER +#endif // TQT_NO_PRINTER diff --git a/src/kernel/qpsprinter_p.h b/src/kernel/qpsprinter_p.h index 070f4320..35513e12 100644 --- a/src/kernel/qpsprinter_p.h +++ b/src/kernel/qpsprinter_p.h @@ -62,7 +62,7 @@ #include "ntqtextstream.h" #endif // QT_H -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER class TQPSPrinterPrivate; @@ -87,6 +87,6 @@ private: TQPSPrinter &operator=( const TQPSPrinter & ); }; -#endif // QT_NO_PRINTER +#endif // TQT_NO_PRINTER #endif // TQPSPRINTER_P_H diff --git a/src/kernel/qrect.cpp b/src/kernel/qrect.cpp index 2ca88a4c..f3bc3ff6 100644 --- a/src/kernel/qrect.cpp +++ b/src/kernel/qrect.cpp @@ -913,7 +913,7 @@ bool operator!=( const TQRect &r1, const TQRect &r2 ) /***************************************************************************** TQRect stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQRect @@ -957,4 +957,4 @@ TQDataStream &operator>>( TQDataStream &s, TQRect &r ) } return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM diff --git a/src/kernel/qregion.cpp b/src/kernel/qregion.cpp index deb0ffa4..105f9643 100644 --- a/src/kernel/qregion.cpp +++ b/src/kernel/qregion.cpp @@ -141,7 +141,7 @@ void TQRegion::detach() *this = copy(); } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /* Executes region commands in the internal buffer and rebuilds the original region. @@ -280,7 +280,7 @@ TQDataStream &operator>>( TQDataStream &s, TQRegion &r ) r.exec( b, s.version() ); return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM // These are not inline - they can be implemented better on some platforms // (eg. Windows at least provides 3-variable operations). For now, simple. diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index bc776681..1790eb18 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -40,7 +40,7 @@ #include "qrichtext_p.h" -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT #include "ntqstringlist.h" @@ -255,7 +255,7 @@ TQTextCursor *TQTextDeleteCommand::unexecute( TQTextCursor *c ) cursor.setParagraph( s ); cursor.setIndex( index ); -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM if ( !styleInformation.isEmpty() ) { TQDataStream styleStream( styleInformation, IO_ReadOnly ); int num; @@ -377,7 +377,7 @@ TQTextStyleCommand::TQTextStyleCommand( TQTextDocument *d, int fParag, int lPara TQByteArray TQTextStyleCommand::readStyleInformation( TQTextDocument* doc, int fParag, int lParag ) { TQByteArray style; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQTextParagraph *p = doc->paragAt( fParag ); if ( !p ) return style; @@ -394,7 +394,7 @@ TQByteArray TQTextStyleCommand::readStyleInformation( TQTextDocument* doc, int void TQTextStyleCommand::writeStyleInformation( TQTextDocument* doc, int fParag, const TQByteArray& style ) { -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQTextParagraph *p = doc->paragAt( fParag ); if ( !p ) return; @@ -480,7 +480,7 @@ int TQTextCursor::totalOffsetY() const return yoff; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM void TQTextCursor::gotoIntoNested( const TQPoint &globalPos ) { if ( !para ) @@ -506,7 +506,7 @@ void TQTextCursor::invalidateNested() if ( *it == para ) continue; (*it)->invalidate( 0 ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( (*it)->at( *it2 )->isCustom() ) (*it)->at( *it2 )->customItem()->invalidate(); #endif @@ -611,7 +611,7 @@ void TQTextCursor::gotoPreviousLetter() if ( idx > 0 ) { idx = para->string()->previousCursorPosition( idx ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM const TQTextStringChar *tsc = para->at( idx ); if ( tsc && tsc->isCustom() && tsc->customItem()->isNested() ) processNesting( EnterEnd ); @@ -628,7 +628,7 @@ void TQTextCursor::gotoPreviousLetter() pop(); if ( idx > 0 ) { idx = para->string()->previousCursorPosition( idx ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM const TQTextStringChar *tsc = para->at( idx ); if ( tsc && tsc->isCustom() && tsc->customItem()->isNested() ) processNesting( EnterEnd ); @@ -731,7 +731,7 @@ bool TQTextCursor::place( const TQPoint &p, TQTextParagraph *s, bool link, bool chr = s->at(i); int cpos = x + chr->x; cw = s->string()->width( i ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( chr->isCustom() && chr->customItem()->isNested() ) { if ( pos.x() >= cpos && pos.x() <= cpos + cw && pos.y() >= y + cy && pos.y() <= y + cy + chr->height() ) { @@ -763,7 +763,7 @@ bool TQTextCursor::place( const TQPoint &p, TQTextParagraph *s, bool link, bool } setIndex( curpos ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( inCustom && para->document() && para->at( curpos )->isCustom() && para->at( curpos )->customItem()->isNested() ) { TQTextDocument *oldDoc = para->document(); gotoIntoNested( pos ); @@ -789,7 +789,7 @@ bool TQTextCursor::processNesting( Operation op ) oy = y + para->rect().y(); bool ok = FALSE; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM switch ( op ) { case EnterBegin: ok = para->at( idx )->customItem()->enter( this, doc, para, idx, ox, oy ); @@ -828,7 +828,7 @@ void TQTextCursor::gotoNextLetter() { tmpX = -1; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM const TQTextStringChar *tsc = para->at( idx ); if ( tsc && tsc->isCustom() && tsc->customItem()->isNested() ) { if ( processNesting( EnterBegin ) ) @@ -1198,7 +1198,7 @@ void TQTextCursor::splitAndInsertEmptyParagraph( bool ind, bool updateIds ) for ( uint i = 0; i < str.length(); ++i ) { TQTextStringChar* tsc = para->at( idx + i ); s->setFormat( i, 1, tsc->format(), TRUE ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( tsc->isCustom() ) { TQTextCustomItem * item = tsc->customItem(); s->at( i )->setCustomItem( item ); @@ -1318,7 +1318,7 @@ void TQTextCursor::fixCursorPosition() TQTextDocument::TQTextDocument( TQTextDocument *p ) : par( p ), parentPar( 0 ) -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM , tc( 0 ) #endif , tArray( 0 ), tStopWidth( 0 ) @@ -1349,7 +1349,7 @@ void TQTextDocument::init() nSelections = 1; setStyleSheet( TQStyleSheet::defaultSheet() ); -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME factory_ = TQMimeSourceFactory::defaultFactory(); #endif contxt = TQString::null; @@ -1695,7 +1695,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu } } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextCustomItem* custom = 0; #else bool custom = FALSE; @@ -1712,12 +1712,12 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu hasNewPar = false; } else if ( tagname == "hr" ) { emptyTag = space = TRUE; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM custom = sheet_->tag( tagname, attr, contxt, *factory_ , emptyTag, this ); #endif } else if ( tagname == "table" ) { emptyTag = space = TRUE; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextFormat format = curtag.format.makeTextFormat( nstyle, attr, scaleFontsFactor ); curpar->setAlignment( curtag.alignment ); custom = parseTable( attr, format, doc, length, pos, curpar ); @@ -1728,7 +1728,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu setPaper( b ); } if ( attr.contains( "background" ) ) { -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQImage img; TQString bg = attr["background"]; const TQMimeSource* m = factory_->data( bg, contxt ); @@ -1786,7 +1786,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu } } // end of well-known tag handling -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( !custom ) // try generic custom item custom = sheet_->tag( tagname, attr, contxt, *factory_ , emptyTag, this ); #endif @@ -1794,7 +1794,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu continue; if ( custom ) { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM int index = TQMAX( curpar->length(),1) - 1; TQTextFormat format = curtag.format.makeTextFormat( nstyle, attr, scaleFontsFactor ); curpar->append( TQChar('*') ); @@ -2263,7 +2263,7 @@ TQString TQTextDocument::plainText() const s = ts->toString(); // with FALSE we don't fix spaces (nbsp) } else { for ( int i = 0; i < p->length() - 1; ++i ) { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( p->at( i )->isCustom() ) { if ( p->at( i )->customItem()->isNested() ) { s += "\n"; @@ -2817,7 +2817,7 @@ TQString TQTextDocument::selectedText( int id, bool asRichText ) const s += p->string()->toString().mid( c1.index(), end - c1.index() ); } else { for ( int i = c1.index(); i < end; ++i ) { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( p->at( i )->isCustom() ) { if ( p->at( i )->customItem()->isNested() ) { s += "\n"; @@ -2847,7 +2847,7 @@ TQString TQTextDocument::selectedText( int id, bool asRichText ) const s += "\n"; } else { for ( int i = start; i < end; ++i ) { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( p->at( i )->isCustom() ) { if ( p->at( i )->customItem()->isNested() ) { s += "\n"; @@ -3205,7 +3205,7 @@ void TQTextDocument::drawParagraph( TQPainter *p, TQTextParagraph *parag, int cx if ( resetChanged ) parag->setChanged( FALSE ); TQRect ir( parag->rect() ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if (!parag->tableCell()) #endif ir.setWidth(width()); @@ -3346,7 +3346,7 @@ void TQTextDocument::setDefaultFormat( const TQFont &font, const TQColor &color TQTextParagraph *p = fParag; while ( p ) { p->invalidate( 0 ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM for ( int i = 0; i < p->length() - 1; ++i ) if ( p->at( i )->isCustom() ) p->at( i )->customItem()->invalidate(); @@ -3355,7 +3355,7 @@ void TQTextDocument::setDefaultFormat( const TQFont &font, const TQColor &color } } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM void TQTextDocument::registerCustomItem( TQTextCustomItem *i, TQTextParagraph *p ) { if ( i && i->placement() != TQTextCustomItem::PlaceInline ) { @@ -3425,7 +3425,7 @@ bool TQTextDocument::focusNextPrevChild( bool next ) focusIndicator.len++; i++; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM } else if ( p->at( i )->isCustom() ) { if ( p->at( i )->customItem()->isNested() ) { TQTextTable *t = (TQTextTable*)p->at( i )->customItem(); @@ -3496,7 +3496,7 @@ bool TQTextDocument::focusNextPrevChild( bool next ) focusIndicator.start--; i--; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM } else if ( p->at( i )->isCustom() ) { if ( p->at( i )->customItem()->isNested() ) { TQTextTable *t = (TQTextTable*)p->at( i )->customItem(); @@ -3768,7 +3768,7 @@ void TQTextString::truncate( int index ) if ( index < (int)data.size() ) { for ( int i = index + 1; i < (int)data.size(); ++i ) { TQTextStringChar &ch = data[ i ]; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( !(ch.type == TQTextStringChar::Regular) ) { delete ch.customItem(); if ( ch.d.custom->format ) @@ -3790,7 +3790,7 @@ void TQTextString::remove( int index, int len ) { for ( int i = index; i < (int)data.size() && i - index < len; ++i ) { TQTextStringChar &ch = data[ i ]; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( !(ch.type == TQTextStringChar::Regular) ) { delete ch.customItem(); if ( ch.d.custom->format ) @@ -3813,7 +3813,7 @@ void TQTextString::clear() { for ( int i = 0; i < (int)data.count(); ++i ) { TQTextStringChar &ch = data[ i ]; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( !(ch.type == TQTextStringChar::Regular) ) { if ( ch.customItem() && ch.customItem()->placement() == TQTextCustomItem::PlaceInline ) delete ch.customItem(); @@ -3931,7 +3931,7 @@ void TQTextStringChar::setFormat( TQTextFormat *f ) if ( type == Regular ) { d.format = f; } else { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( !d.custom ) { d.custom = new CustomData; d.custom->custom = 0; @@ -3941,7 +3941,7 @@ void TQTextStringChar::setFormat( TQTextFormat *f ) } } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM void TQTextStringChar::setCustomItem( TQTextCustomItem *i ) { if ( type == Regular ) { @@ -3992,7 +3992,7 @@ void TQTextStringChar::setAnchor( const TQString& name, const TQString& href ) if ( type == Regular ) { TQTextFormat *f = format(); d.custom = new CustomData; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM d.custom->custom = 0; #endif d.custom->format = f; @@ -4011,7 +4011,7 @@ int TQTextString::width( int idx ) const TQTextStringChar *c = &at( idx ); if ( !c->charStop || c->c.unicode() == 0xad || c->c.unicode() == 0x2028 ) return 0; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if( c->isCustom() ) { if( c->customItem()->placement() == TQTextCustomItem::PlaceInline ) w = c->customItem()->width; @@ -4041,7 +4041,7 @@ TQTextParagraph::TQTextParagraph( TQTextDocument *d, TQTextParagraph *pr, TQText lastInFrame(FALSE), visible(TRUE), breakable(TRUE), movedDown(FALSE), mightHaveCustomItems(FALSE), hasdoc( d != 0 ), litem(FALSE), rtext(FALSE), align( 0 ), lstyle( TQStyleSheetItem::ListDisc ), invalid( 0 ), mSelections( 0 ), -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM mFloatingItems( 0 ), #endif utm( 0 ), ubm( 0 ), ulm( 0 ), urm( 0 ), uflm( 0 ), ulinespacing( 0 ), @@ -4110,7 +4110,7 @@ TQTextParagraph::~TQTextParagraph() delete *it; if ( mSelections ) delete mSelections; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( mFloatingItems ) delete mFloatingItems; #endif @@ -4141,7 +4141,7 @@ void TQTextParagraph::invalidate( int chr ) invalid = chr; else invalid = TQMIN( invalid, chr ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( mFloatingItems ) { for ( TQTextCustomItem *i = mFloatingItems->first(); i; i = mFloatingItems->next() ) i->ypos = -1; @@ -4184,7 +4184,7 @@ void TQTextParagraph::remove( int index, int len ) { if ( index + len - str->length() > 0 ) return; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM for ( int i = index; i < index + len; ++i ) { TQTextStringChar *c = at( i ); if ( hasdoc && c->isCustom() ) { @@ -4218,7 +4218,7 @@ void TQTextParagraph::join( TQTextParagraph *s ) s->str->at( i ).format()->addRef(); str->setFormat( i + start, s->str->at( i ).format(), TRUE ); } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( s->str->at( i ).isCustom() ) { TQTextCustomItem * item = s->str->at( i ).customItem(); str->at( i + start ).setCustomItem( item ); @@ -4267,7 +4267,7 @@ void TQTextParagraph::move( int &dy ) return; changed = TRUE; r.moveBy( 0, dy ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( mFloatingItems ) { for ( TQTextCustomItem *i = mFloatingItems->first(); i; i = mFloatingItems->next() ) i->ypos += dy; @@ -4311,7 +4311,7 @@ void TQTextParagraph::format( int start, bool doMove ) formatAgain: r.setWidth( documentWidth() ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( hasdoc && mFloatingItems ) { for ( TQTextCustomItem *i = mFloatingItems->first(); i; i = mFloatingItems->next() ) { i->ypos = r.y(); @@ -4680,7 +4680,7 @@ void TQTextParagraph::paint( TQPainter &painter, const TQColorGroup &cg, TQTextC drawString( painter, qstr, paintStart, i - paintStart + (ignoreSoftHyphen ? 0 : 1), xstart, y, baseLine, xend-xstart, h, drawSelections, fullSelectionWidth, chr, cg, chr->rightToLeft ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM else if ( chr->customItem()->placement() == TQTextCustomItem::PlaceInline ) { bool inSelection = FALSE; if (drawSelections) { @@ -5004,7 +5004,7 @@ void TQTextParagraph::drawLabel( TQPainter* p, int x, int y, int w, int h, int b p->restore(); } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM void TQTextParagraph::readStyleInformation( TQDataStream& stream ) { int int_align, int_lstyle; @@ -5087,7 +5087,7 @@ int TQTextParagraph::nextTab( int, int x ) void TQTextParagraph::adjustToPainter( TQPainter *p ) { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM for ( int i = 0; i < length(); ++i ) { if ( at( i )->isCustom() ) at( i )->customItem()->adjustToPainter( p ); @@ -5148,7 +5148,7 @@ TQString TQTextParagraph::richText() const s += "&"; else if ( c->c =='\"' ) s += """; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM else if ( c->isCustom() ) s += c->customItem()->richText(); #endif @@ -5315,7 +5315,7 @@ TQTextLineStart *TQTextFormatter::formatLine( TQTextParagraph *parag, TQTextStri { if ( lastChar < startChar ) return new TQTextLineStart; -#ifndef QT_NO_COMPLEXTEXT +#ifndef TQT_NO_COMPLEXTEXT if( string->isBidi() ) return bidiReorderLine( parag, string, line, startChar, lastChar, align, space ); #endif @@ -5372,7 +5372,7 @@ TQTextLineStart *TQTextFormatter::formatLine( TQTextParagraph *parag, TQTextStri return new TQTextLineStart; } -#ifndef QT_NO_COMPLEXTEXT +#ifndef TQT_NO_COMPLEXTEXT #ifdef BIDI_DEBUG #include <iostream> @@ -5538,7 +5538,7 @@ int TQTextFormatter::formatVertically( TQTextDocument* doc, TQTextParagraph* par TQTextLineStart * ls = it.data(); ls->y = h; TQTextStringChar *c = ¶g->string()->at(it.key()); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( c && c->customItem() && c->customItem()->ownLine() ) { int h = c->customItem()->height; c->customItem()->pageBreak( parag->rect().y() + ls->y + ls->baseLine - h, doc->flow() ); @@ -5636,7 +5636,7 @@ int TQTextFormatterBreakInWords::format( TQTextDocument *doc,TQTextParagraph *pa ww = c->format()->width( ' ' ); } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM if ( c->isCustom() && c->customItem()->ownLine() ) { x = doc ? doc->flow()->adjustLMargin( y + parag->rect().y(), parag->rect().height(), left, 4 ) : left; w = dw - ( doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), parag->rect().height(), rm, 4 ) : 0 ); @@ -5811,7 +5811,7 @@ int TQTextFormatterBreakWords::format( TQTextDocument *doc, TQTextParagraph *par if (col != 0 && ::category(c->c) == TQChar::Mark_NonSpacing) --col; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM lastWasNonInlineCustom = ( c->isCustom() && c->customItem()->placement() != TQTextCustomItem::PlaceInline ); #endif @@ -5833,7 +5833,7 @@ int TQTextFormatterBreakWords::format( TQTextDocument *doc, TQTextParagraph *par ww = c->format()->width( ' ' ); } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextCustomItem* ci = c->customItem(); if ( c->isCustom() && ci->ownLine() ) { TQTextLineStart *lineStart2 = formatLine( parag, string, lineStart, firstChar, c-1, align, SPACE(w - x - ww) ); @@ -6556,7 +6556,7 @@ TQTextFormat TQTextFormat::makeTextFormat( const TQStyleSheetItem *style, const return format; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM struct TQPixmapInt { @@ -6621,7 +6621,7 @@ TQTextImage::TQTextImage( TQTextDocument *p, const TQMap<TQString, TQString> &at } } if ( img.width() != width || img.height() != height ){ -#ifndef QT_NO_IMAGE_SMOOTHSCALE +#ifndef TQT_NO_IMAGE_SMOOTHSCALE img = img.smoothScale(width, height); #endif width = img.width(); @@ -6800,7 +6800,7 @@ void TQTextHorizontalLine::draw( TQPainter* p, int x, int y, int , int , int , i qDrawShadeLine( p, r.left() - 1, y + height / 2, r.right() + 1, y + height / 2, g, TRUE, height / 8 ); } } -#endif //QT_NO_TEXTCUSTOMITEM +#endif //TQT_NO_TEXTCUSTOMITEM /*****************************************************************/ // Small set of utility functions to make the parser a bit simpler @@ -6824,7 +6824,7 @@ bool TQTextDocument::hasPrefix( const TQChar* doc, int length, int pos, const TQ return TRUE; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM static bool qt_is_cell_in_use( TQPtrList<TQTextTableCell>& cells, int row, int col ) { for ( TQTextTableCell* c = cells.first(); c; c = cells.next() ) { @@ -6930,7 +6930,7 @@ TQTextCustomItem* TQTextDocument::parseTable( const TQMap<TQString, TQString> &a } return table; } -#endif // QT_NO_TEXTCUSTOMITEM +#endif // TQT_NO_TEXTCUSTOMITEM bool TQTextDocument::eatSpace(const TQChar* doc, int length, int& pos, bool includeNbsp ) { @@ -7443,7 +7443,7 @@ TQTextFlow::~TQTextFlow() void TQTextFlow::clear() { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM leftItems.setAutoDelete( TRUE ); rightItems.setAutoDelete( TRUE ); leftItems.clear(); @@ -7460,7 +7460,7 @@ void TQTextFlow::setWidth( int width ) int TQTextFlow::adjustLMargin( int yp, int, int margin, int space ) { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM for ( TQTextCustomItem* item = leftItems.first(); item; item = leftItems.next() ) { if ( item->ypos == -1 ) continue; @@ -7473,7 +7473,7 @@ int TQTextFlow::adjustLMargin( int yp, int, int margin, int space ) int TQTextFlow::adjustRMargin( int yp, int, int margin, int space ) { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM for ( TQTextCustomItem* item = rightItems.first(); item; item = rightItems.next() ) { if ( item->ypos == -1 ) continue; @@ -7498,7 +7498,7 @@ int TQTextFlow::adjustFlow( int y, int /*w*/, int h ) return 0; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM void TQTextFlow::unregisterFloatingItem( TQTextCustomItem* item ) { leftItems.removeRef( item ); @@ -7515,12 +7515,12 @@ void TQTextFlow::registerFloatingItem( TQTextCustomItem* item ) leftItems.append( item ); } } -#endif // QT_NO_TEXTCUSTOMITEM +#endif // TQT_NO_TEXTCUSTOMITEM TQRect TQTextFlow::boundingRect() const { TQRect br; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQPtrListIterator<TQTextCustomItem> l( leftItems ); while( l.current() ) { br = br.unite( l.current()->geometry() ); @@ -7538,7 +7538,7 @@ TQRect TQTextFlow::boundingRect() const void TQTextFlow::drawFloatingItems( TQPainter* p, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ) { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextCustomItem *item; for ( item = leftItems.first(); item; item = leftItems.next() ) { if ( item->xpos == -1 || item->ypos == -1 ) @@ -7556,13 +7556,13 @@ void TQTextFlow::drawFloatingItems( TQPainter* p, int cx, int cy, int cw, int ch // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM void TQTextCustomItem::pageBreak( int /*y*/ , TQTextFlow* /*flow*/ ) { } #endif -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextTable::TQTextTable( TQTextDocument *p, const TQMap<TQString, TQString> & attr ) : TQTextCustomItem( p ) { @@ -8257,4 +8257,4 @@ void TQTextTableCell::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, } #endif -#endif //QT_NO_RICHTEXT +#endif //TQT_NO_RICHTEXT diff --git a/src/kernel/qrichtext_p.cpp b/src/kernel/qrichtext_p.cpp index 7e55b603..4411b4d4 100644 --- a/src/kernel/qrichtext_p.cpp +++ b/src/kernel/qrichtext_p.cpp @@ -40,13 +40,13 @@ #include "qrichtext_p.h" -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT TQTextCommand::~TQTextCommand() {} TQTextCommand::Commands TQTextCommand::type() const { return Invalid; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextCustomItem::~TQTextCustomItem() {} void TQTextCustomItem::adjustToPainter( TQPainter* p){ if ( p ) width = 0; } TQTextCustomItem::Placement TQTextCustomItem::placement() const { return PlaceInline; } @@ -84,16 +84,16 @@ bool TQTextCustomItem::up( TQTextCursor *, TQTextDocument *&, TQTextParagraph *& { return TRUE; } -#endif // QT_NO_TEXTCUSTOMITEM +#endif // TQT_NO_TEXTCUSTOMITEM void TQTextFlow::setPageSize( int ps ) { pagesize = ps; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM bool TQTextFlow::isEmpty() { return leftItems.isEmpty() && rightItems.isEmpty(); } #else bool TQTextFlow::isEmpty() { return TRUE; } #endif -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM void TQTextTableCell::invalidate() { cached_width = -1; cached_sizehint = -1; } void TQTextTable::invalidate() { cachewidth = -1; } @@ -612,7 +612,7 @@ TQMap<int, TQTextParagraphSelection> &TQTextParagraph::selections() const return *mSelections; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQPtrList<TQTextCustomItem> &TQTextParagraph::floatingItems() const { if ( !mFloatingItems ) @@ -633,4 +633,4 @@ TQTextParagraphPseudoDocument::TQTextParagraphPseudoDocument():pFormatter(0),com TQTextParagraphPseudoDocument::~TQTextParagraphPseudoDocument(){ delete pFormatter; delete commandHistory; } -#endif //QT_NO_RICHTEXT +#endif //TQT_NO_RICHTEXT diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h index 48c7b0a4..4e26675a 100644 --- a/src/kernel/qrichtext_p.h +++ b/src/kernel/qrichtext_p.h @@ -77,7 +77,7 @@ #include "ntqapplication.h" #endif // QT_H -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT class TQTextDocument; class TQTextString; @@ -89,7 +89,7 @@ class TQTextFormatter; class TQTextIndent; class TQTextFormatCollection; class TQStyleSheetItem; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM class TQTextCustomItem; #endif class TQTextFlow; @@ -109,7 +109,7 @@ public: struct CustomData { TQTextFormat *format; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextCustomItem *custom; #endif TQString anchorName; @@ -142,15 +142,15 @@ public: int descent() const; bool isCustom() const { return (type & Custom) != 0; } TQTextFormat *format() const; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextCustomItem *customItem() const; #endif void setFormat( TQTextFormat *f ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM void setCustomItem( TQTextCustomItem *i ); #endif -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM void loseCustomItem(); #endif @@ -457,7 +457,7 @@ inline TQTextCommandHistory::~TQTextCommandHistory() // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM class Q_EXPORT TQTextCustomItem { public: @@ -513,7 +513,7 @@ public: // MOC_SKIP_END #endif -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM class Q_EXPORT TQTextImage : public TQTextCustomItem { public: @@ -540,7 +540,7 @@ private: }; #endif -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM class Q_EXPORT TQTextHorizontalLine : public TQTextCustomItem { public: @@ -562,7 +562,7 @@ private: }; #endif -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM #if defined(Q_TEMPLATEDLL) // MOC_SKIP_BEGIN Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQTextCustomItem>; @@ -573,7 +573,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQTextCustomItem>; class Q_EXPORT TQTextFlow { friend class TQTextDocument; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM friend class TQTextTableCell; #endif @@ -590,7 +590,7 @@ public: virtual int adjustLMargin( int yp, int h, int margin, int space ); virtual int adjustRMargin( int yp, int h, int margin, int space ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM virtual void registerFloatingItem( TQTextCustomItem* item ); virtual void unregisterFloatingItem( TQTextCustomItem* item ); #endif @@ -607,7 +607,7 @@ private: int w; int pagesize; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQPtrList<TQTextCustomItem> leftItems; TQPtrList<TQTextCustomItem> rightItems; #endif @@ -615,7 +615,7 @@ private: inline int TQTextFlow::width() const { return w; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM class TQTextTable; class Q_EXPORT TQTextTableCell : public TQLayoutItem @@ -688,7 +688,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<TQTextCursor*, int>; // MOC_SKIP_END #endif -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM class Q_EXPORT TQTextTable: public TQTextCustomItem { friend class TQTextTableCell; @@ -751,7 +751,7 @@ private: #endif // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM class TQTextTableCell; class TQTextParagraph; #endif @@ -776,7 +776,7 @@ class Q_EXPORT TQTextDocument : public TQObject { TQ_OBJECT -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM friend class TQTextTableCell; #endif friend class TQTextCursor; @@ -877,14 +877,14 @@ public: bool inSelection( int selId, const TQPoint &pos ) const; TQStyleSheet *styleSheet() const { return sheet_; } -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQMimeSourceFactory *mimeSourceFactory() const { return factory_; } #endif TQString context() const { return contxt; } void setStyleSheet( TQStyleSheet *s ); void setDefaultFormat( const TQFont &font, const TQColor &color ); -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME void setMimeSourceFactory( TQMimeSourceFactory *f ) { if ( f ) factory_ = f; } #endif void setContext( const TQString &c ) { if ( !c.isEmpty() ) contxt = c; } @@ -906,7 +906,7 @@ public: bool onlyChanged = FALSE, bool drawCursor = FALSE, TQTextCursor *cursor = 0, bool resetChanged = TRUE ); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM void registerCustomItem( TQTextCustomItem *i, TQTextParagraph *p ); void unregisterCustomItem( TQTextCustomItem *i, TQTextParagraph *p ); #endif @@ -920,7 +920,7 @@ public: void setUseFormatCollection( bool b ) { useFC = b; } bool useFormatCollection() const { return useFC; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextTableCell *tableCell() const { return tc; } void setTableCell( TQTextTableCell *c ) { tc = c; } #endif @@ -968,7 +968,7 @@ private: // HTML parser bool hasPrefix(const TQChar* doc, int length, int pos, TQChar c); bool hasPrefix(const TQChar* doc, int length, int pos, const TQString& s); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextCustomItem* parseTable( const TQMap<TQString, TQString> &attr, const TQTextFormat &fmt, const TQChar* doc, int length, int& pos, TQTextParagraph *curpar ); #endif @@ -1014,7 +1014,7 @@ private: TQTextFlow *flow_; TQTextDocument *par; TQTextParagraph *parentPar; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextTableCell *tc; #endif TQBrush *backBrush; @@ -1026,7 +1026,7 @@ private: int rightmargin; TQTextParagraph *minwParag, *curParag; TQStyleSheet* sheet_; -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQMimeSourceFactory* factory_; #endif TQString contxt; @@ -1272,7 +1272,7 @@ public: int rightMargin() const; int lineSpacing() const; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM void registerFloatingItem( TQTextCustomItem *i ); void unregisterFloatingItem( TQTextCustomItem *i ); #endif @@ -1280,7 +1280,7 @@ public: void setFullWidth( bool b ) { fullWidth = b; } bool isFullWidth() const { return fullWidth; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextTableCell *tableCell() const; #endif @@ -1338,7 +1338,7 @@ protected: private: TQMap<int, TQTextParagraphSelection> &selections() const; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQPtrList<TQTextCustomItem> &floatingItems() const; #endif TQBrush backgroundBrush( const TQColorGroup&cg ) { if ( bgcol ) return *bgcol; return cg.brush( TQColorGroup::Base ); } @@ -1367,7 +1367,7 @@ private: int state, id; TQTextString *str; TQMap<int, TQTextParagraphSelection> *mSelections; -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQPtrList<TQTextCustomItem> *mFloatingItems; #endif short utm, ubm, ulm, urm, uflm, ulinespacing; @@ -1405,7 +1405,7 @@ public: protected: virtual TQTextLineStart *formatLine( TQTextParagraph *parag, TQTextString *string, TQTextLineStart *line, TQTextStringChar *start, TQTextStringChar *last, int align = TQt::AlignAuto, int space = 0 ); -#ifndef QT_NO_COMPLEXTEXT +#ifndef TQT_NO_COMPLEXTEXT virtual TQTextLineStart *bidiReorderLine( TQTextParagraph *parag, TQTextString *string, TQTextLineStart *line, TQTextStringChar *start, TQTextStringChar *last, int align, int space ); #endif @@ -2013,7 +2013,7 @@ inline TQTextParagraphPseudoDocument *TQTextParagraph::pseudoDocument() const } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM inline TQTextTableCell *TQTextParagraph::tableCell() const { return hasdoc ? document()->tableCell () : 0; @@ -2031,7 +2031,7 @@ inline int TQTextParagraph::alignment() const return align; } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM inline void TQTextParagraph::registerFloatingItem( TQTextCustomItem *i ) { floatingItems().append( i ); @@ -2045,7 +2045,7 @@ inline void TQTextParagraph::unregisterFloatingItem( TQTextCustomItem *i ) inline TQBrush *TQTextParagraph::background() const { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM return tableCell() ? tableCell()->backGround() : 0; #else return 0; @@ -2102,7 +2102,7 @@ inline TQTextFormat *TQTextStringChar::format() const } -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM inline TQTextCustomItem *TQTextStringChar::customItem() const { return isCustom() ? d.custom->custom : 0; @@ -2111,7 +2111,7 @@ inline TQTextCustomItem *TQTextStringChar::customItem() const inline int TQTextStringChar::height() const { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM return !isCustom() ? format()->height() : ( customItem()->placement() == TQTextCustomItem::PlaceInline ? customItem()->height : 0 ); #else return format()->height(); @@ -2120,7 +2120,7 @@ inline int TQTextStringChar::height() const inline int TQTextStringChar::ascent() const { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM return !isCustom() ? format()->ascent() : ( customItem()->placement() == TQTextCustomItem::PlaceInline ? customItem()->ascent() : 0 ); #else return format()->ascent(); @@ -2129,13 +2129,13 @@ inline int TQTextStringChar::ascent() const inline int TQTextStringChar::descent() const { -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM return !isCustom() ? format()->descent() : 0; #else return format()->descent(); #endif } -#endif //QT_NO_RICHTEXT +#endif //TQT_NO_RICHTEXT #endif diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp index 20240255..40111e2b 100644 --- a/src/kernel/qscriptengine.cpp +++ b/src/kernel/qscriptengine.cpp @@ -404,7 +404,7 @@ static bool basic_shape(TQShaperItem *item) enum { CcmpProperty = 0x1 }; -#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) +#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) static const TQOpenType::Features hebrew_features[] = { { FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty }, {0, 0} @@ -419,7 +419,7 @@ static bool hebrew_shape(TQShaperItem *item) { Q_ASSERT(item->script == TQFont::Hebrew); -#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) +#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) TQOpenType *openType = item->font->openType(); if (openType && openType->supportsScript(item->script)) { @@ -1460,7 +1460,7 @@ static void shapedString(const TQString *uc, int from, int len, TQChar *shapeBuf *shapedLength = data - shapeBuffer; } -#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) +#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) enum { InitProperty = 0x2, @@ -1582,7 +1582,7 @@ static bool arabic_shape(TQShaperItem *item) { Q_ASSERT(item->script == TQFont::Arabic); -#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) +#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) TQOpenType *openType = item->font->openType(); if (openType && openType->supportsScript(TQFont::Arabic)) { diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp index e01888f5..97ae6828 100644 --- a/src/kernel/qscriptengine_x11.cpp +++ b/src/kernel/qscriptengine_x11.cpp @@ -45,7 +45,7 @@ static bool syriac_shape(TQShaperItem *item) { Q_ASSERT(item->script == TQFont::Syriac); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE TQOpenType *openType = item->font->openType(); if (openType && openType->supportsScript(TQFont::Syriac)) { bool ot_ok; @@ -64,7 +64,7 @@ static bool thaana_shape(TQShaperItem *item) { Q_ASSERT(item->script == TQFont::Thaana); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE TQOpenType *openType = item->font->openType(); if (openType && openType->supportsScript(item->script)) { @@ -1167,7 +1167,7 @@ enum IndicProperties { CligProperty = 0x10000 }; -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE static const TQOpenType::Features indic_features[] = { { FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty }, { FT_MAKE_TAG('i', 'n', 'i', 't'), InitProperty }, @@ -1571,7 +1571,7 @@ static bool indic_shape_syllable(TQOpenType *openType, TQShaperItem *item, bool for (i = 0; i < len; ++i) control |= (form(reordered[i]) == Control); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (openType) { // we need to keep track of where the base glyph is for some @@ -1816,7 +1816,7 @@ static bool indic_shape(TQShaperItem *item) { Q_ASSERT(item->script >= TQFont::Devanagari && item->script <= TQFont::Sinhala); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE TQOpenType *openType = item->font->openType(); if (openType) openType->selectScript(item->script, indic_features); @@ -1905,12 +1905,12 @@ static void indic_attributes(int script, const TQString &text, int from, int len static void thaiWordBreaks(const TQChar *string, const int len, TQCharAttributes *attributes) { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC typedef int (*th_brk_def)(const char*, int[], int); static TQTextCodec *thaiCodec = TQTextCodec::codecForMib(2259); static th_brk_def th_brk = 0; -#ifndef QT_NO_LIBRARY +#ifndef TQT_NO_LIBRARY /* load libthai dynamically */ if (!th_brk && thaiCodec) { th_brk = (th_brk_def)TQLibrary::resolve("thai", "th_brk"); @@ -2026,7 +2026,7 @@ static inline TibetanForm tibetan_form(const TQChar &c) return (TibetanForm)tibetanForm[c.unicode() - 0x0f40]; } -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE static const TQOpenType::Features tibetan_features[] = { { FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty }, { FT_MAKE_TAG('a', 'b', 'v', 's'), AboveSubstProperty }, @@ -2070,7 +2070,7 @@ static bool tibetan_shape_syllable(TQOpenType *openType, TQShaperItem *item, boo // now we have the syllable in the right order, and can start running it through open type. -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (openType && openType->supportsScript(TQFont::Tibetan)) { openType->selectScript(TQFont::Tibetan, tibetan_features); @@ -2133,7 +2133,7 @@ static bool tibetan_shape(TQShaperItem *item) { Q_ASSERT(item->script == TQFont::Tibetan); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE TQOpenType *openType = item->font->openType(); if (openType && !openType->supportsScript(item->script)) openType = 0; @@ -2509,7 +2509,7 @@ static inline int khmer_nextSyllableBoundary(const TQString &s, int start, int e } -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE static const TQOpenType::Features khmer_features[] = { { FT_MAKE_TAG( 'p', 'r', 'e', 'f' ), PreFormProperty }, { FT_MAKE_TAG( 'b', 'l', 'w', 'f' ), BelowFormProperty }, @@ -2527,7 +2527,7 @@ static const TQOpenType::Features khmer_features[] = { static bool khmer_shape_syllable(TQOpenType *openType, TQShaperItem *item) { -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (openType) openType->selectScript(TQFont::Khmer, khmer_features); #endif @@ -2723,7 +2723,7 @@ static bool khmer_shape_syllable(TQOpenType *openType, TQShaperItem *item) // now we have the syllable in the right order, and can start running it through open type. -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (openType) { uint where[16]; @@ -2762,7 +2762,7 @@ static bool khmer_shape(TQShaperItem *item) { assert(item->script == TQFont::Khmer); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE TQOpenType *openType = item->font->openType(); if (openType && !openType->supportsScript(item->script)) openType = 0; @@ -3033,7 +3033,7 @@ static inline int myanmar_nextSyllableBoundary(const TQString &s, int start, int } -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE // ###### might have to change order of above and below forms and substitutions, // but according to Unicode below comes before above static const TQOpenType::Features myanmar_features[] = { @@ -3066,7 +3066,7 @@ static const TQOpenType::Features myanmar_features[] = { static bool myanmar_shape_syllable(TQOpenType *openType, TQShaperItem *item, bool invalid) { -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (openType) openType->selectScript(TQFont::Myanmar, myanmar_features); #endif @@ -3230,7 +3230,7 @@ static bool myanmar_shape_syllable(TQOpenType *openType, TQShaperItem *item, boo // now we have the syllable in the right order, and can start running it through open type. -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (openType) { uint where[32]; @@ -3269,7 +3269,7 @@ static bool myanmar_shape(TQShaperItem *item) { assert(item->script == TQFont::Myanmar); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE TQOpenType *openType = item->font->openType(); if (openType && !openType->supportsScript(item->script)) openType = 0; @@ -3452,7 +3452,7 @@ static int hangul_nextSyllableBoundary(const TQString &s, int start, int end) return start+pos; } -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE static const TQOpenType::Features hangul_features [] = { { FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty }, { FT_MAKE_TAG('l', 'j', 'm', 'o'), CcmpProperty }, @@ -3510,7 +3510,7 @@ static bool hangul_shape_syllable(TQOpenType *openType, TQShaperItem *item) IDEBUG(" %d: %4x", i, ch[i].unicode()); } -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (openType && !composed) { TQVarLengthArray<unsigned short> logClusters(len); @@ -3544,7 +3544,7 @@ static bool hangul_shape(TQShaperItem *item) } if (!allPrecomposed) { -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE TQOpenType *openType = item->font->openType(); if (openType && !openType->supportsScript(item->script)) openType = 0; diff --git a/src/kernel/qsignal.cpp b/src/kernel/qsignal.cpp index 8d91f0e6..c26106ab 100644 --- a/src/kernel/qsignal.cpp +++ b/src/kernel/qsignal.cpp @@ -115,7 +115,7 @@ TQSignal::TQSignal( TQObject *parent, const char *name ) : TQObject( parent, name ) { isSignal = TRUE; -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT val = 0; #endif } @@ -127,7 +127,7 @@ TQSignal::TQSignal( TQObject *parent, const char *name ) TQSignal::~TQSignal() { } -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT // Returns TRUE if it matches ".+(.*int.*" static inline bool intSignature( const char *member ) { @@ -144,11 +144,11 @@ static inline bool intSignature( const char *member ) bool TQSignal::connect( const TQObject *receiver, const char *member ) { -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT if ( intSignature( member ) ) #endif return TQObject::connect( (TQObject *)this, SIGNAL(intSignal(int)), receiver, member ); -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT return TQObject::connect( (TQObject *)this, SIGNAL(signal(const TQVariant&)), receiver, member ); #endif @@ -164,11 +164,11 @@ bool TQSignal::disconnect( const TQObject *receiver, const char *member ) { if (!member) return TQObject::disconnect( (TQObject *)this, 0, receiver, member); -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT if ( intSignature( member ) ) #endif return TQObject::disconnect( (TQObject *)this, SIGNAL(intSignal(int)), receiver, member ); -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT return TQObject::disconnect( (TQObject *)this, SIGNAL(signal(const TQVariant&)), receiver, member ); #endif @@ -205,7 +205,7 @@ bool TQSignal::disconnect( const TQObject *receiver, const char *member ) */ void TQSignal::activate() { -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT /* Create this TQGuardedPtr on this, if we get destroyed after the intSignal (but before the variant signal) we cannot just emit the signal (because val has been destroyed already) */ TQGuardedPtr<TQSignal> me = this; @@ -218,7 +218,7 @@ void TQSignal::activate() #endif } -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT /*! Sets the signal's parameter to \a value */ @@ -254,4 +254,4 @@ int TQSignal::parameter() const return val.toInt(); } #endif -#endif //QT_NO_VARIANT +#endif //TQT_NO_VARIANT diff --git a/src/kernel/qsignalmapper.cpp b/src/kernel/qsignalmapper.cpp index 0e23de82..ce6f2175 100644 --- a/src/kernel/qsignalmapper.cpp +++ b/src/kernel/qsignalmapper.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqsignalmapper.h" -#ifndef QT_NO_SIGNALMAPPER +#ifndef TQT_NO_SIGNALMAPPER #include "ntqptrdict.h" struct TQSignalMapperRec { @@ -180,4 +180,4 @@ TQSignalMapperRec* TQSignalMapper::getRec( const TQObject* sender ) \sa setMapping() */ -#endif //QT_NO_SIGNALMAPPER +#endif //TQT_NO_SIGNALMAPPER diff --git a/src/kernel/qsimplerichtext.cpp b/src/kernel/qsimplerichtext.cpp index e9fd7f1d..a6e1271c 100644 --- a/src/kernel/qsimplerichtext.cpp +++ b/src/kernel/qsimplerichtext.cpp @@ -40,7 +40,7 @@ #include "ntqsimplerichtext.h" -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT #include "qrichtext_p.h" #include "ntqapplication.h" @@ -193,7 +193,7 @@ TQSimpleRichText::TQSimpleRichText( const TQString& text, const TQFont& fnt, d->doc->setDefaultFormat( fnt, TQColor() ); d->doc->flow()->setPageSize( pageBreak ); d->doc->setPageBreakEnabled( TRUE ); -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME d->doc->setMimeSourceFactory( (TQMimeSourceFactory*)factory ); #endif d->doc->setUnderlineLinks( linkUnderline ); @@ -418,4 +418,4 @@ void TQSimpleRichText::setDefaultFont( const TQFont &f ) d->doc->setText( d->doc->originalText(), d->doc->context() ); } -#endif //QT_NO_RICHTEXT +#endif //TQT_NO_RICHTEXT diff --git a/src/kernel/qsize.cpp b/src/kernel/qsize.cpp index 2fbe1f4e..988d54fe 100644 --- a/src/kernel/qsize.cpp +++ b/src/kernel/qsize.cpp @@ -389,7 +389,7 @@ void TQSize::warningDivByZero() /***************************************************************************** TQSize stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQSize Writes the size \a sz to the stream \a s and returns a reference to @@ -429,4 +429,4 @@ TQDataStream &operator>>( TQDataStream &s, TQSize &sz ) } return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM diff --git a/src/kernel/qsizegrip.cpp b/src/kernel/qsizegrip.cpp index ae46ca62..5dbaaa32 100644 --- a/src/kernel/qsizegrip.cpp +++ b/src/kernel/qsizegrip.cpp @@ -40,7 +40,7 @@ #include "ntqsizegrip.h" -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP #include "ntqpainter.h" #include "ntqapplication.h" @@ -111,7 +111,7 @@ static TQWidget* qt_sizegrip_workspace( TQWidget* w ) TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name ) : TQWidget( parent, name ) { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR #ifndef Q_WS_MAC if ( TQApplication::reverseLayout() ) setCursor( sizeBDiagCursor ); @@ -283,4 +283,4 @@ bool TQSizeGrip::eventFilter( TQObject *o, TQEvent *e ) return FALSE; } -#endif //QT_NO_SIZEGRIP +#endif //TQT_NO_SIZEGRIP diff --git a/src/kernel/qsound.cpp b/src/kernel/qsound.cpp index dd46cc74..98d21042 100644 --- a/src/kernel/qsound.cpp +++ b/src/kernel/qsound.cpp @@ -40,7 +40,7 @@ #include "ntqsound.h" -#ifndef QT_NO_SOUND +#ifndef TQT_NO_SOUND #include "ntqptrlist.h" @@ -313,4 +313,4 @@ TQAuBucket::~TQAuBucket() { } -#endif // QT_NO_SOUND +#endif // TQT_NO_SOUND diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp index 01a2b86b..e3a727f8 100644 --- a/src/kernel/qsound_x11.cpp +++ b/src/kernel/qsound_x11.cpp @@ -40,7 +40,7 @@ #include "ntqsound.h" -#ifndef QT_NO_SOUND +#ifndef TQT_NO_SOUND #include "ntqptrdict.h" #include "ntqsocketnotifier.h" @@ -278,4 +278,4 @@ TQAuServer* qt_new_audio_server() return new TQAuServerNull(tqApp); } -#endif // QT_NO_SOUND +#endif // TQT_NO_SOUND diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp index 7a90fec1..7d143270 100644 --- a/src/kernel/qstyle.cpp +++ b/src/kernel/qstyle.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqstyle.h" -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE #include "ntqapplication.h" #include "ntqpainter.h" #include "ntqbitmap.h" @@ -912,7 +912,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, } } else if ( pm.depth() == 1 ) { // monochrome pixmap, no mask pm.setMask( *((TQBitmap *)&pm) ); -#ifndef QT_NO_IMAGE_HEURISTIC_MASK +#ifndef TQT_NO_IMAGE_HEURISTIC_MASK } else { // color pixmap, no mask TQString k; k.sprintf( "$qt-drawitem-%x", pm.serialNumber() ); @@ -2908,4 +2908,4 @@ TQStyleControlElementData::TQStyleControlElementData(const TQStyleControlElement paletteBgPixmap = orig.paletteBgPixmap; } -#endif // QT_NO_STYLE +#endif // TQT_NO_STYLE diff --git a/src/kernel/qstylesheet.cpp b/src/kernel/qstylesheet.cpp index dcddbb9e..b1e9ac79 100644 --- a/src/kernel/qstylesheet.cpp +++ b/src/kernel/qstylesheet.cpp @@ -40,7 +40,7 @@ #include "ntqstylesheet.h" -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT #include "private/qrichtext_p.h" #include "ntqlayout.h" @@ -1380,7 +1380,7 @@ const TQStyleSheetItem* TQStyleSheet::item( const TQString& name) const This function should not be used in application code. */ -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM TQTextCustomItem* TQStyleSheet::tag( const TQString& name, const TQMap<TQString, TQString> &attr, const TQString& context, @@ -1620,4 +1620,4 @@ void TQStyleSheet::scaleFont( TQFont& font, int logicalSize ) const font.setPointSize( s ); } -#endif // QT_NO_RICHTEXT +#endif // TQT_NO_RICHTEXT diff --git a/src/kernel/qt_gfx.pri b/src/kernel/qt_gfx.pri index 12c1497a..f0124824 100644 --- a/src/kernel/qt_gfx.pri +++ b/src/kernel/qt_gfx.pri @@ -36,7 +36,7 @@ mng { CONFIG += jpeg } } -else:DEFINES += QT_NO_IMAGEIO_MNG +else:DEFINES += TQT_NO_IMAGEIO_MNG #jpeg support.. HEADERS += $$KERNEL_H/ntqjpegio.h @@ -95,7 +95,7 @@ jpeg { 3rdparty/libjpeg/jmemnobs.c } } -else:DEFINES += QT_NO_IMAGEIO_JPEG +else:DEFINES += TQT_NO_IMAGEIO_JPEG #png support HEADERS+=$$KERNEL_H/ntqpngio.h @@ -123,7 +123,7 @@ png { 3rdparty/libpng/pngwutil.c } } -else:DEFINES += QT_NO_IMAGEIO_PNG +else:DEFINES += TQT_NO_IMAGEIO_PNG #zlib support zlib { diff --git a/src/kernel/qt_x11.pri b/src/kernel/qt_x11.pri index b20081f0..20d65b10 100644 --- a/src/kernel/qt_x11.pri +++ b/src/kernel/qt_x11.pri @@ -1,11 +1,11 @@ unix { - !xinerama:DEFINES += QT_NO_XINERAMA - !xshape:DEFINES += QT_NO_SHAPE - !xcursor:DEFINES += QT_NO_XCURSOR - !xrandr:DEFINES += QT_NO_XRANDR - !xrender:DEFINES += QT_NO_XRENDER - !xftfreetype:DEFINES += QT_NO_XFTFREETYPE - !xkb:DEFINES += QT_NO_XKB + !xinerama:DEFINES += TQT_NO_XINERAMA + !xshape:DEFINES += TQT_NO_SHAPE + !xcursor:DEFINES += TQT_NO_XCURSOR + !xrandr:DEFINES += TQT_NO_XRANDR + !xrender:DEFINES += TQT_NO_XRENDER + !xftfreetype:DEFINES += TQT_NO_XFTFREETYPE + !xkb:DEFINES += TQT_NO_XKB xft2header:DEFINES+=QT_USE_XFT2_HEADER SOURCES += $$KERNEL_CPP/qtaddons_x11.cpp @@ -20,4 +20,4 @@ nas { LIBS += -laudio -lXt } -!x11sm:DEFINES += QT_NO_SM_SUPPORT +!x11sm:DEFINES += TQT_NO_SM_SUPPORT diff --git a/src/kernel/qt_x11_p.h b/src/kernel/qt_x11_p.h index af13262f..df8a6575 100644 --- a/src/kernel/qt_x11_p.h +++ b/src/kernel/qt_x11_p.h @@ -76,13 +76,13 @@ #include <X11/Xatom.h> -//#define QT_NO_SHAPE -#ifdef QT_NO_SHAPE +//#define TQT_NO_SHAPE +#ifdef TQT_NO_SHAPE #define XShapeCombineRegion(a,b,c,d,e,f,g) #define XShapeCombineMask(a,b,c,d,e,f,g) #else #include <X11/extensions/shape.h> -#endif // QT_NO_SHAPE +#endif // TQT_NO_SHAPE // the wacom tablet (currently just the IRIX version) @@ -94,8 +94,8 @@ #endif // QT_TABLET_SUPPORT -// #define QT_NO_XINERAMA -#ifndef QT_NO_XINERAMA +// #define TQT_NO_XINERAMA +#ifndef TQT_NO_XINERAMA # if 0 // ### Xsun, but how to detect it? // Xinerama is only supported in Solaris 7 with patches 107648/108376 and // Solaris 8 or above which introduce the X11R6.4 Xserver. @@ -137,18 +137,18 @@ extern "C" { # include <X11/extensions/Xinerama.h> } # endif -#endif // QT_NO_XINERAMA +#endif // TQT_NO_XINERAMA -// #define QT_NO_XRANDR -#ifndef QT_NO_XRANDR +// #define TQT_NO_XRANDR +#ifndef TQT_NO_XRANDR # include <X11/extensions/Xrandr.h> -#endif // QT_NO_XRANDR +#endif // TQT_NO_XRANDR -// #define QT_NO_XRENDER -#ifndef QT_NO_XRENDER +// #define TQT_NO_XRENDER +#ifndef TQT_NO_XRENDER # include <X11/extensions/Xrender.h> -// #define QT_NO_XFTFREETYPE -# ifndef QT_NO_XFTFREETYPE +// #define TQT_NO_XFTFREETYPE +# ifndef TQT_NO_XFTFREETYPE // This hacks around the freetype poeple putting an #error into freetype.h in 2.1.7, making // it impossible to use an updated freetype with older Xft header files. # include <ft2build.h> @@ -168,23 +168,23 @@ extern "C" { void XftDrawSetSubwindowMode(XftDraw *, int); } # endif // XFT_VERSION -# endif // QT_NO_XFTFREETYPE +# endif // TQT_NO_XFTFREETYPE #else -// make sure QT_NO_XFTFREETYPE is defined if QT_NO_XRENDER is defined -# ifndef QT_NO_XFTFREETYPE -# define QT_NO_XFTFREETYPE +// make sure TQT_NO_XFTFREETYPE is defined if TQT_NO_XRENDER is defined +# ifndef TQT_NO_XFTFREETYPE +# define TQT_NO_XFTFREETYPE # endif -#endif // QT_NO_XRENDER +#endif // TQT_NO_XRENDER -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC # include <X11/extensions/sync.h> -#endif // QT_NO_XSYNC +#endif // TQT_NO_XSYNC -#ifndef QT_NO_XKB +#ifndef TQT_NO_XKB # include <X11/XKBlib.h> -#endif // QT_NO_XKB +#endif // TQT_NO_XKB #if !defined(XlibSpecificationRelease) @@ -194,27 +194,27 @@ typedef char *XPointer; # undef X11R4 #endif -// #define QT_NO_XIM +// #define TQT_NO_XIM #if defined(X11R4) // X11R4 does not have XIM -#define QT_NO_XIM +#define TQT_NO_XIM #elif defined(Q_OS_OSF) && (XlibSpecificationRelease < 6) // broken in Xlib up to OSF/1 3.2 -#define QT_NO_XIM +#define TQT_NO_XIM #elif defined(Q_OS_AIX) // broken in Xlib up to what version of AIX? -#define QT_NO_XIM -#elif defined(QT_NO_DEBUG) && defined(Q_OS_IRIX) +#define TQT_NO_XIM +#elif defined(TQT_NO_DEBUG) && defined(Q_OS_IRIX) // XmbLookupString broken on IRIX // XCreateIC broken when compiling -64 on IRIX 6.5.2 -#define QT_NO_XIM +#define TQT_NO_XIM #elif defined(Q_OS_HPUX) && defined(__LP64__) // XCreateIC broken when compiling 64-bit ELF on HP-UX 11.0 -#define QT_NO_XIM +#define TQT_NO_XIM #elif defined(Q_OS_SCO) // ### suggested by user... -// ### #define QT_NO_XIM -#endif // QT_NO_XIM +// ### #define TQT_NO_XIM +#endif // TQT_NO_XIM /* @@ -225,7 +225,7 @@ typedef char *XPointer; * Instead, we disabled R6 input, and open the input method * immediately at application start. */ -#if !defined(QT_NO_XIM) && (XlibSpecificationRelease >= 6) && \ +#if !defined(TQT_NO_XIM) && (XlibSpecificationRelease >= 6) && \ !defined(Q_OS_SOLARIS) #define USE_X11R6_XIM @@ -256,7 +256,7 @@ extern "C" char *XSetIMValues( XIM /* im */, ... ); #endif -#ifndef QT_NO_XIM +#ifndef TQT_NO_XIM // some platforms (eg. Solaris 2.51) don't have these defines in Xlib.h #ifndef XNResetState #define XNResetState "resetState" diff --git a/src/kernel/qtaddons_x11.cpp b/src/kernel/qtaddons_x11.cpp index dbed45c3..ad1ea7e0 100644 --- a/src/kernel/qtaddons_x11.cpp +++ b/src/kernel/qtaddons_x11.cpp @@ -24,7 +24,7 @@ #include "qt_x11_p.h" -#if !defined(QT_NO_XFTFREETYPE) && !defined(QT_XFT2) +#if !defined(TQT_NO_XFTFREETYPE) && !defined(QT_XFT2) #include <X11/Xft/Xft.h> @@ -141,4 +141,4 @@ void XftDrawSetSubwindowMode(XftDraw *draw, int mode) } // extern "C" -#endif // !QT_NO_XFTFREETYPE && !QT_XFT2 +#endif // !TQT_NO_XFTFREETYPE && !QT_XFT2 diff --git a/src/kernel/qucomextra.cpp b/src/kernel/qucomextra.cpp index a705784b..1bb064ca 100644 --- a/src/kernel/qucomextra.cpp +++ b/src/kernel/qucomextra.cpp @@ -42,7 +42,7 @@ #include <ntqvariant.h> -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT // 6dc75d58-a1d9-4417-b591-d45c63a3a4ea const TQUuid TID_QUType_TQVariant( 0x6dc75d58, 0xa1d9, 0x4417, 0xb5, 0x91, 0xd4, 0x5c, 0x63, 0xa3, 0xa4, 0xea ); TQUType_TQVariant static_QUType_TQVariant; diff --git a/src/kernel/qucomextra_p.h b/src/kernel/qucomextra_p.h index 734da8f6..f183fd62 100644 --- a/src/kernel/qucomextra_p.h +++ b/src/kernel/qucomextra_p.h @@ -63,7 +63,7 @@ class TQVariant; -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT // 6dc75d58-a1d9-4417-b591-d45c63a3a4ea extern const TQUuid TID_QUType_TQVariant; @@ -84,7 +84,7 @@ struct Q_EXPORT TQUType_TQVariant : public TQUType int serializeFrom( TQUObject *, TQUBuffer * ); }; extern Q_EXPORT TQUType_TQVariant static_QUType_TQVariant; -#endif //QT_NO_VARIANT +#endif //TQT_NO_VARIANT // {0x8d48b3a8, 0xbd7f, 0x11d5, 0x8d, 0x74, 0x00, 0xc0, 0xf0, 0x3b, 0xc0, 0xf3 } diff --git a/src/kernel/qurl.cpp b/src/kernel/qurl.cpp index bf960f33..f097eac2 100644 --- a/src/kernel/qurl.cpp +++ b/src/kernel/qurl.cpp @@ -40,7 +40,7 @@ #include "ntqurl.h" -#ifndef QT_NO_URL +#ifndef TQT_NO_URL #include "ntqdir.h" @@ -1342,4 +1342,4 @@ bool TQUrl::cdUp() return TRUE; } -#endif // QT_NO_URL +#endif // TQT_NO_URL diff --git a/src/kernel/qurlinfo.cpp b/src/kernel/qurlinfo.cpp index aafea2a3..67c0f52a 100644 --- a/src/kernel/qurlinfo.cpp +++ b/src/kernel/qurlinfo.cpp @@ -40,7 +40,7 @@ #include "ntqurlinfo.h" -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL #include "ntqurloperator.h" #include "ntqdir.h" @@ -758,4 +758,4 @@ bool TQUrlInfo::isValid() const return d != 0; } -#endif // QT_NO_NETWORKPROTOCOL +#endif // TQT_NO_NETWORKPROTOCOL diff --git a/src/kernel/qurloperator.cpp b/src/kernel/qurloperator.cpp index 93235a84..1defadc9 100644 --- a/src/kernel/qurloperator.cpp +++ b/src/kernel/qurloperator.cpp @@ -40,7 +40,7 @@ #include "ntqurloperator.h" -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL #include "ntqurlinfo.h" #include "ntqnetworkprotocol.h" @@ -1223,4 +1223,4 @@ void TQUrlOperator::slotItemChanged( TQNetworkOperation *op ) } -#endif // QT_NO_NETWORKPROTOCOL +#endif // TQT_NO_NETWORKPROTOCOL diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp index 6c7372b0..6d734d6b 100644 --- a/src/kernel/qvariant.cpp +++ b/src/kernel/qvariant.cpp @@ -41,7 +41,7 @@ #include <float.h> #include "ntqvariant.h" -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT #include "ntqstring.h" #include "ntqcstring.h" #include "ntqfont.h" @@ -125,11 +125,11 @@ TQVariant::Private::Private( Private* d ) // TQCString is explicit shared value.ptr = new TQCString( *((TQCString*)d->value.ptr) ); break; -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST case TQVariant::StringList: value.ptr = new TQStringList( *((TQStringList*)d->value.ptr) ); break; -#endif //QT_NO_STRINGLIST +#endif //TQT_NO_STRINGLIST case TQVariant::Font: value.ptr = new TQFont( *((TQFont*)d->value.ptr) ); break; @@ -157,7 +157,7 @@ TQVariant::Private::Private( Private* d ) case TQVariant::Color: value.ptr = new TQColor( *((TQColor*)d->value.ptr) ); break; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE case TQVariant::Palette: value.ptr = new TQPalette( *((TQPalette*)d->value.ptr) ); break; @@ -165,12 +165,12 @@ TQVariant::Private::Private( Private* d ) value.ptr = new TQColorGroup( *((TQColorGroup*)d->value.ptr) ); break; #endif -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET case TQVariant::IconSet: value.ptr = new TQIconSet( *((TQIconSet*)d->value.ptr) ); break; #endif -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT case TQVariant::Map: value.ptr = new TQMap<TQString,TQVariant>( *((TQMap<TQString,TQVariant>*)d->value.ptr) ); break; @@ -193,7 +193,7 @@ TQVariant::Private::Private( Private* d ) case TQVariant::BitArray: value.ptr = new TQBitArray( *((TQBitArray*)d->value.ptr) ); break; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL case TQVariant::KeySequence: value.ptr = new TQKeySequence( *((TQKeySequence*)d->value.ptr) ); break; @@ -263,11 +263,11 @@ void TQVariant::Private::clear() case TQVariant::CString: delete (TQCString*)value.ptr; break; -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST case TQVariant::StringList: delete (TQStringList*)value.ptr; break; -#endif //QT_NO_STRINGLIST +#endif //TQT_NO_STRINGLIST case TQVariant::Font: delete (TQFont*)value.ptr; break; @@ -292,7 +292,7 @@ void TQVariant::Private::clear() case TQVariant::Color: delete (TQColor*)value.ptr; break; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE case TQVariant::Palette: delete (TQPalette*)value.ptr; break; @@ -300,12 +300,12 @@ void TQVariant::Private::clear() delete (TQColorGroup*)value.ptr; break; #endif -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET case TQVariant::IconSet: delete (TQIconSet*)value.ptr; break; #endif -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT case TQVariant::Map: delete (TQMap<TQString,TQVariant>*)value.ptr; break; @@ -331,7 +331,7 @@ void TQVariant::Private::clear() case TQVariant::BitArray: delete (TQBitArray*)value.ptr; break; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL case TQVariant::KeySequence: delete (TQKeySequence*)value.ptr; break; @@ -512,7 +512,7 @@ TQVariant::TQVariant( const TQVariant& p ) d = p.d; } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! Reads the variant from the data stream, \a s. */ @@ -521,7 +521,7 @@ TQVariant::TQVariant( TQDataStream& s ) d = new Private; s >> *this; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM /*! Constructs a new variant with a string value, \a val. @@ -562,7 +562,7 @@ TQVariant::TQVariant( const char* val ) d->value.ptr = new TQCString( val ); } -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST /*! Constructs a new variant with a string list value, \a val. */ @@ -573,9 +573,9 @@ TQVariant::TQVariant( const TQStringList& val ) d->value.ptr = new TQStringList( val ); d->is_null = FALSE; } -#endif // QT_NO_STRINGLIST +#endif // TQT_NO_STRINGLIST -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT /*! Constructs a new variant with a map of TQVariants, \a val. */ @@ -675,7 +675,7 @@ TQVariant::TQVariant( const TQColor& val ) d->is_null = FALSE; } -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE /*! Constructs a new variant with a color palette value, \a val. */ @@ -697,8 +697,8 @@ TQVariant::TQVariant( const TQColorGroup& val ) d->value.ptr = new TQColorGroup( val ); d->is_null = FALSE; } -#endif //QT_NO_PALETTE -#ifndef QT_NO_ICONSET +#endif //TQT_NO_PALETTE +#ifndef TQT_NO_ICONSET /*! Constructs a new variant with an icon set value, \a val. */ @@ -708,7 +708,7 @@ TQVariant::TQVariant( const TQIconSet& val ) d->typ = IconSet; d->value.ptr = new TQIconSet( val ); } -#endif //QT_NO_ICONSET +#endif //TQT_NO_ICONSET /*! Constructs a new variant with a region value, \a val. */ @@ -806,7 +806,7 @@ TQVariant::TQVariant( const TQBitArray& val ) d->value.ptr = new TQBitArray( val ); } -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL /*! Constructs a new variant with a key sequence value, \a val. @@ -901,7 +901,7 @@ TQVariant::TQVariant( double val ) d->is_null = FALSE; } -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT /*! Constructs a new variant with a list value, \a val. */ @@ -1060,7 +1060,7 @@ TQVariant::Type TQVariant::nameToType( const char* name ) return Invalid; } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! Internal function for loading a variant from stream \a s. Use the stream operators instead. @@ -1084,7 +1084,7 @@ void TQVariant::load( TQDataStream& s ) d->is_null = TRUE; } break; -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT case Map: { TQMap<TQString,TQVariant>* x = new TQMap<TQString,TQVariant>; @@ -1104,7 +1104,7 @@ void TQVariant::load( TQDataStream& s ) #endif case Cursor: { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQCursor* x = new TQCursor; s >> *x; d->value.ptr = x; @@ -1115,7 +1115,7 @@ void TQVariant::load( TQDataStream& s ) case Bitmap: { TQBitmap* x = new TQBitmap; -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO s >> *x; #endif d->value.ptr = x; @@ -1149,7 +1149,7 @@ void TQVariant::load( TQDataStream& s ) d->value.ptr = x; } break; -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST case StringList: { TQStringList* x = new TQStringList; @@ -1158,7 +1158,7 @@ void TQVariant::load( TQDataStream& s ) d->is_null = FALSE; } break; -#endif // QT_NO_STRINGLIST +#endif // TQT_NO_STRINGLIST case Font: { TQFont* x = new TQFont; @@ -1170,7 +1170,7 @@ void TQVariant::load( TQDataStream& s ) case Pixmap: { TQPixmap* x = new TQPixmap; -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO s >> *x; #endif d->value.ptr = x; @@ -1179,7 +1179,7 @@ void TQVariant::load( TQDataStream& s ) case Image: { TQImage* x = new TQImage; -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO s >> *x; #endif d->value.ptr = x; @@ -1222,7 +1222,7 @@ void TQVariant::load( TQDataStream& s ) d->is_null = FALSE; } break; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE case Palette: { TQPalette* x = new TQPalette; @@ -1240,7 +1240,7 @@ void TQVariant::load( TQDataStream& s ) } break; #endif -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET case IconSet: { TQPixmap x; @@ -1341,7 +1341,7 @@ void TQVariant::load( TQDataStream& s ) d->value.ptr = x; } break; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL case KeySequence: { TQKeySequence* x = new TQKeySequence; @@ -1350,7 +1350,7 @@ void TQVariant::load( TQDataStream& s ) d->is_null = FALSE; } break; -#endif // QT_NO_ACCEL +#endif // TQT_NO_ACCEL case Pen: { TQPen* x = new TQPen; @@ -1378,7 +1378,7 @@ void TQVariant::save( TQDataStream& s ) const s << *((TQCursor*)d->value.ptr); break; case Bitmap: -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO s << *((TQBitmap*)d->value.ptr); #endif break; @@ -1388,7 +1388,7 @@ void TQVariant::save( TQDataStream& s ) const case Region: s << *((TQRegion*)d->value.ptr); break; -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT case List: s << *((TQValueList<TQVariant>*)d->value.ptr); break; @@ -1402,7 +1402,7 @@ void TQVariant::save( TQDataStream& s ) const case CString: s << *((TQCString*)d->value.ptr); break; -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST case StringList: s << *((TQStringList*)d->value.ptr); break; @@ -1411,12 +1411,12 @@ void TQVariant::save( TQDataStream& s ) const s << *((TQFont*)d->value.ptr); break; case Pixmap: -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO s << *((TQPixmap*)d->value.ptr); #endif break; case Image: -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO s << *((TQImage*)d->value.ptr); #endif break; @@ -1435,7 +1435,7 @@ void TQVariant::save( TQDataStream& s ) const case Color: s << *((TQColor*)d->value.ptr); break; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE case Palette: s << *((TQPalette*)d->value.ptr); break; @@ -1443,7 +1443,7 @@ void TQVariant::save( TQDataStream& s ) const s << *((TQColorGroup*)d->value.ptr); break; #endif -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET case IconSet: //### add stream operator to iconset s << ((TQIconSet*)d->value.ptr)->pixmap(); @@ -1489,7 +1489,7 @@ void TQVariant::save( TQDataStream& s ) const case BitArray: s << *((TQBitArray*)d->value.ptr); break; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL case KeySequence: s << *((TQKeySequence*)d->value.ptr); break; @@ -1549,7 +1549,7 @@ TQDataStream& operator<< ( TQDataStream& s, const TQVariant::Type p ) return s; } -#endif //QT_NO_DATASTREAM +#endif //TQT_NO_DATASTREAM /*! \fn Type TQVariant::type() const @@ -1644,7 +1644,7 @@ const TQString TQVariant::toString() const return TQString::number( toULongLong() ); case Double: return TQString::number( toDouble(), 'g', DBL_DIG ); -#if !defined(QT_NO_SPRINTF) && !defined(QT_NO_DATESTRING) +#if !defined(TQT_NO_SPRINTF) && !defined(TQT_NO_DATESTRING) case Date: return toDate().toString( TQt::ISODate ); case Time: @@ -1654,7 +1654,7 @@ const TQString TQVariant::toString() const #endif case Bool: return toInt() ? "true" : "false"; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL case KeySequence: return (TQString) *( (TQKeySequence*)d->value.ptr ); #endif @@ -1691,7 +1691,7 @@ const TQCString TQVariant::toCString() const } -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST /*! Returns the variant as a TQStringList if the variant has type() StringList or List of a type that can be converted to TQString; @@ -1715,7 +1715,7 @@ const TQStringList TQVariant::toStringList() const switch ( d->typ ) { case StringList: return *((TQStringList*)d->value.ptr); -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT case List: { TQStringList lst; @@ -1733,9 +1733,9 @@ const TQStringList TQVariant::toStringList() const return TQStringList(); } } -#endif //QT_NO_STRINGLIST +#endif //TQT_NO_STRINGLIST -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT /*! Returns the variant as a TQMap<TQString,TQVariant> if the variant has type() Map; otherwise returns an empty map. @@ -1892,7 +1892,7 @@ const TQColor TQVariant::toColor() const return TQColor(); } } -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE /*! Returns the variant as a TQPalette if the variant has type() Palette; otherwise returns a completely black palette. @@ -1920,8 +1920,8 @@ const TQColorGroup TQVariant::toColorGroup() const return *((TQColorGroup*)d->value.ptr); } -#endif //QT_NO_PALETTE -#ifndef QT_NO_ICONSET +#endif //TQT_NO_PALETTE +#ifndef TQT_NO_ICONSET /*! Returns the variant as a TQIconSet if the variant has type() IconSet; otherwise returns an icon set of null pixmaps. @@ -1935,7 +1935,7 @@ const TQIconSet TQVariant::toIconSet() const return *((TQIconSet*)d->value.ptr); } -#endif //QT_NO_ICONSET +#endif //TQT_NO_ICONSET /*! Returns the variant as a TQPointArray if the variant has type() PointArray; otherwise returns an empty TQPointArray. @@ -1986,7 +1986,7 @@ const TQRegion TQVariant::toRegion() const */ const TQCursor TQVariant::toCursor() const { -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR if ( d->typ != Cursor ) return TQCursor(); #endif @@ -2011,7 +2011,7 @@ const TQDate TQVariant::toDate() const return *((TQDate*)d->value.ptr); case DateTime: return ((TQDateTime*)d->value.ptr)->date(); -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING case String: return TQDate::fromString( *((TQString*)d->value.ptr), TQt::ISODate ); case CString: @@ -2040,7 +2040,7 @@ const TQTime TQVariant::toTime() const return *((TQTime*)d->value.ptr); case DateTime: return ((TQDateTime*)d->value.ptr)->time(); -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING case String: return TQTime::fromString( *((TQString*)d->value.ptr), TQt::ISODate ); case CString: @@ -2067,7 +2067,7 @@ const TQDateTime TQVariant::toDateTime() const switch ( d->typ ) { case DateTime: return *((TQDateTime*)d->value.ptr); -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING case String: return TQDateTime::fromString( *((TQString*)d->value.ptr), TQt::ISODate ); case CString: @@ -2116,7 +2116,7 @@ const TQBitArray TQVariant::toBitArray() const return TQBitArray(); } -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL /*! Returns the variant as a TQKeySequence if the variant can be cast @@ -2144,7 +2144,7 @@ const TQKeySequence TQVariant::toKeySequence() const } } -#endif // QT_NO_ACCEL +#endif // TQT_NO_ACCEL /*! Returns the variant as a TQPen if the variant has type() @@ -2192,7 +2192,7 @@ int TQVariant::toInt( bool * ok ) const return (int)d->value.d; case Bool: return (int)d->value.b; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL case KeySequence: return (int) *( (TQKeySequence*)d->value.ptr ); #endif @@ -2391,7 +2391,7 @@ double TQVariant::toDouble( bool * ok ) const } } -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT /*! Returns the variant as a TQValueList<TQVariant> if the variant has type() List or StringList; otherwise returns an empty list. @@ -2413,7 +2413,7 @@ const TQValueList<TQVariant> TQVariant::toList() const { if ( d->typ == List ) return *((TQValueList<TQVariant>*)d->value.ptr); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST if ( d->typ == StringList ) { TQValueList<TQVariant> lst; TQStringList::ConstIterator it = stringListBegin(); @@ -2422,7 +2422,7 @@ const TQValueList<TQVariant> TQVariant::toList() const lst.append( TQVariant( *it ) ); return lst; } -#endif //QT_NO_STRINGLIST +#endif //TQT_NO_STRINGLIST return TQValueList<TQVariant>(); } #endif @@ -2455,7 +2455,7 @@ TQSizePolicy TQVariant::toSizePolicy() const Q_VARIANT_AS(String) Q_VARIANT_AS(CString) -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST Q_VARIANT_AS(StringList) #endif Q_VARIANT_AS(Font) @@ -2466,11 +2466,11 @@ Q_VARIANT_AS(Point) Q_VARIANT_AS(Rect) Q_VARIANT_AS(Size) Q_VARIANT_AS(Color) -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE Q_VARIANT_AS(Palette) Q_VARIANT_AS(ColorGroup) #endif -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET Q_VARIANT_AS(IconSet) #endif Q_VARIANT_AS(PointArray) @@ -2483,7 +2483,7 @@ Q_VARIANT_AS(Time) Q_VARIANT_AS(DateTime) Q_VARIANT_AS(ByteArray) Q_VARIANT_AS(BitArray) -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL Q_VARIANT_AS(KeySequence) #endif Q_VARIANT_AS(Pen) @@ -2884,7 +2884,7 @@ double& TQVariant::asDouble() return d->value.d; } -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT /*! Returns the variant's value as variant list reference. @@ -3061,11 +3061,11 @@ bool TQVariant::canCast( Type t ) const } break; -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST case List: return d->typ == StringList; #endif -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT case StringList: if ( d->typ == List ) { TQValueList<TQVariant>::ConstIterator it = listBegin(); @@ -3114,7 +3114,7 @@ bool TQVariant::canCast( Type t ) const bool TQVariant::cast( Type t ) { switch ( t ) { -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT case TQVariant::Map: asMap(); break; @@ -3125,7 +3125,7 @@ bool TQVariant::cast( Type t ) case TQVariant::String: asString(); break; -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST case TQVariant::StringList: asStringList(); break; @@ -3148,7 +3148,7 @@ bool TQVariant::cast( Type t ) case TQVariant::Color: asColor(); break; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE case TQVariant::Palette: asPalette(); break; @@ -3156,7 +3156,7 @@ bool TQVariant::cast( Type t ) asColorGroup(); break; #endif -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET case TQVariant::IconSet: asIconSet(); break; @@ -3212,7 +3212,7 @@ bool TQVariant::cast( Type t ) case TQVariant::BitArray: asBitArray(); break; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL case TQVariant::KeySequence: asKeySequence(); break; @@ -3285,7 +3285,7 @@ bool TQVariant::operator==( const TQVariant &v ) const switch( d->typ ) { case Cursor: -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR return v.toCursor().shape() == toCursor().shape(); #endif case Bitmap: @@ -3294,7 +3294,7 @@ bool TQVariant::operator==( const TQVariant &v ) const return v.toPointArray() == toPointArray(); case Region: return v.toRegion() == toRegion(); -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT case List: return v.toList() == toList(); case Map: { @@ -3315,7 +3315,7 @@ bool TQVariant::operator==( const TQVariant &v ) const return v.toString() == toString(); case CString: return v.toCString() == toCString(); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST case StringList: return v.toStringList() == toStringList(); #endif @@ -3335,13 +3335,13 @@ bool TQVariant::operator==( const TQVariant &v ) const return v.toSize() == toSize(); case Color: return v.toColor() == toColor(); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE case Palette: return v.toPalette() == toPalette(); case ColorGroup: return v.toColorGroup() == toColorGroup(); #endif -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET case IconSet: return v.toIconSet().pixmap().serialNumber() == toIconSet().pixmap().serialNumber(); @@ -3370,7 +3370,7 @@ bool TQVariant::operator==( const TQVariant &v ) const return v.toByteArray() == toByteArray(); case BitArray: return v.toBitArray() == toBitArray(); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL case KeySequence: return v.toKeySequence() == toKeySequence(); #endif @@ -3448,7 +3448,7 @@ bool TQVariant::isNull() const return ((TQRect*) d->value.ptr)->isNull(); case TQVariant::Size: return ((TQSize*) d->value.ptr)->isNull(); -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET case TQVariant::IconSet: return ((TQIconSet*) d->value.ptr)->isNull(); #endif @@ -3463,22 +3463,22 @@ bool TQVariant::isNull() const case TQVariant::BitArray: return ((TQBitArray*) d->value.ptr)->isNull(); case TQVariant::Cursor: -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST case TQVariant::StringList: -#endif //QT_NO_STRINGLIST +#endif //TQT_NO_STRINGLIST case TQVariant::Font: case TQVariant::Brush: case TQVariant::Color: -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE case TQVariant::Palette: case TQVariant::ColorGroup: #endif -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT case TQVariant::Map: case TQVariant::List: #endif case TQVariant::SizePolicy: -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL case TQVariant::KeySequence: #endif case TQVariant::Pen: @@ -3493,4 +3493,4 @@ bool TQVariant::isNull() const } return d->is_null; } -#endif //QT_NO_VARIANT +#endif //TQT_NO_VARIANT diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp index b3a630bc..09195852 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -530,7 +530,7 @@ static TQFont qt_naturalWidgetFont( TQWidget* w ) { return naturalfont; } -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE static TQPalette qt_naturalWidgetPalette( TQWidget* w ) { TQPalette naturalpalette = TQApplication::palette( w ); if ( !w->isTopLevel() && naturalpalette.isCopyOf( TQApplication::palette() ) ) @@ -542,7 +542,7 @@ static TQPalette qt_naturalWidgetPalette( TQWidget* w ) { TQSize qt_naturalWidgetSize( TQWidget *w ) { TQSize s = w->sizeHint(); TQSizePolicy::ExpandData exp; -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT if ( w->layout() ) { if ( w->layout()->hasHeightForWidth() ) s.setHeight( w->layout()->totalHeightForWidth( s.width() ) ); @@ -911,15 +911,15 @@ TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n ) in_show = 0; in_show_maximized = 0; im_enabled = FALSE; -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT lay_out = 0; #endif extra = 0; // no extra widget info -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE bg_col = pal.active().background(); // default background color #endif create(); // platform-dependent init -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE pal = isTopLevel() ? TQApplication::palette() : parentWidget()->palette(); #endif if ( ! isTopLevel() ) @@ -1142,7 +1142,7 @@ void TQWidget::createTLExtra() #if defined( Q_WS_WIN ) || defined( Q_WS_MAC ) x->opacity = 255; #endif -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA x->icon = 0; #endif x->focusData = 0; @@ -1159,7 +1159,7 @@ void TQWidget::createTLExtra() x->ussize = 0; #endif x->savedFlags = 0; -#if defined(Q_WS_QWS) && !defined(QT_NO_QWS_MANAGER) +#if defined(Q_WS_QWS) && !defined(TQT_NO_QWS_MANAGER) x->decor_allocated_region = TQRegion(); x->qwsManager = 0; #endif @@ -1181,14 +1181,14 @@ void TQWidget::createExtra() extra->maxw = extra->maxh = TQWIDGETSIZE_MAX; extra->bg_pix = 0; extra->focus_proxy = 0; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR extra->curs = 0; #endif extra->topextra = 0; extra->bg_mode = PaletteBackground; extra->bg_mode_visual = PaletteBackground; extra->bg_origin = WidgetOrigin; -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE extra->style = 0; #endif extra->size_policy = TQSizePolicy( TQSizePolicy::Preferred, @@ -1211,17 +1211,17 @@ void TQWidget::deleteExtra() if ( extra ) { // if exists delete extra->m_ceData; delete extra->bg_pix; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR delete extra->curs; #endif deleteSysExtra(); if ( extra->topextra ) { deleteTLSysExtra(); -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA delete extra->topextra->icon; #endif delete extra->topextra->focusData; -#if defined(Q_WS_QWS) && !defined(QT_NO_QWS_MANAGER) +#if defined(Q_WS_QWS) && !defined(TQT_NO_QWS_MANAGER) delete extra->topextra->qwsManager; #endif delete extra->topextra; @@ -1323,7 +1323,7 @@ TQWidget *TQWidget::find( WId id ) \sa find() */ -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE /*! Returns the GUI style for this widget @@ -1839,7 +1839,7 @@ void TQWidget::enabledChange( bool ) void TQWidget::windowActivationChange( bool ) { -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE if ( !isVisible() ) return; @@ -2415,7 +2415,7 @@ TQWidget *TQWidget::topLevelWidget() const */ const TQColor &TQWidget::paletteForegroundColor() const { -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground; return colorGroup().color( TQPalette::foregroundRoleFromMode(mode) ); #else @@ -2425,7 +2425,7 @@ const TQColor &TQWidget::paletteForegroundColor() const void TQWidget::setPaletteForegroundColor( const TQColor & color ) { -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground; TQPalette pal = palette(); TQColorGroup::ColorRole role = TQPalette::foregroundRoleFromMode( mode ); @@ -2496,7 +2496,7 @@ void TQWidget::setErasePixmap( const TQPixmap &pixmap ) void TQWidget::setBackgroundFromMode() { -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE TQColorGroup::ColorRole r = TQColorGroup::Background; if ( extra ) { int i = (BackgroundMode)extra->bg_mode; @@ -2734,7 +2734,7 @@ void TQWidget::setBackgroundModeDirect( BackgroundMode m ) */ const TQColor & TQWidget::paletteBackgroundColor() const { -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground; switch( mode ) { case FixedColor: @@ -2753,7 +2753,7 @@ const TQColor & TQWidget::paletteBackgroundColor() const void TQWidget::setPaletteBackgroundColor( const TQColor &color ) { -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground; switch( mode ) { case FixedColor: @@ -2797,7 +2797,7 @@ void TQWidget::setPaletteBackgroundColor( const TQColor &color ) */ const TQPixmap *TQWidget::paletteBackgroundPixmap() const { -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground; switch( mode ) { case FixedColor: @@ -2816,7 +2816,7 @@ const TQPixmap *TQWidget::paletteBackgroundPixmap() const void TQWidget::setPaletteBackgroundPixmap( const TQPixmap &pixmap ) { -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground; switch( mode ) { case FixedColor: @@ -2853,7 +2853,7 @@ void TQWidget::setPaletteBackgroundPixmap( const TQPixmap &pixmap ) const TQBrush& TQWidget::backgroundBrush() const { static TQBrush noBrush; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground; switch( mode ) { case FixedColor: @@ -2882,7 +2882,7 @@ const TQBrush& TQWidget::backgroundBrush() const \sa palette */ -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE const TQColorGroup &TQWidget::colorGroup() const { if ( !isEnabled() ) @@ -2913,7 +2913,7 @@ const TQColorGroup &TQWidget::colorGroup() const \sa ownPalette, colorGroup(), TQApplication::palette() */ -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE void TQWidget::setPalette( const TQPalette &palette ) { own_palette = TRUE; @@ -2968,7 +2968,7 @@ void TQWidget::unsetPalette() void TQWidget::paletteChange( const TQPalette & ) { } -#endif // QT_NO_PALETTE +#endif // TQT_NO_PALETTE /*! \property TQWidget::font @@ -3095,7 +3095,7 @@ void TQWidget::fontChange( const TQFont & ) \sa TQApplication::setOverrideCursor() */ -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR const TQCursor &TQWidget::cursor() const { if ( testWState(WState_OwnCursor) ) @@ -3106,7 +3106,7 @@ const TQCursor &TQWidget::cursor() const return (isTopLevel() || !parentWidget()) ? arrowCursor : parentWidget()->cursor(); } #endif -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA /*! \property TQWidget::caption \brief the window caption (title) @@ -3153,7 +3153,7 @@ TQString TQWidget::iconText() const return ( extra && extra->topextra ) ? extra->topextra->iconText : TQString::null; } -#endif //QT_NO_WIDGET_TOPEXTRA +#endif //TQT_NO_WIDGET_TOPEXTRA /*! \property TQWidget::mouseTracking @@ -3603,7 +3603,7 @@ bool TQWidget::isActiveWindow() const tlw = parentWidget()->topLevelWidget(); if(tlw == tqApp->activeWindow() || ( isVisible() && tlw->isPopup() )) return TRUE; -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE const_cast<TQWidget*>(this)->createExtra(); if (!extra->m_ceData) { const_cast<TQWidget*>(this)->extra->m_ceData = new TQStyleControlElementData(); @@ -4242,7 +4242,7 @@ void TQWidget::hideChildren( bool spontaneous ) void TQWidget::polish() { -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA if ( isTopLevel() ) { const TQPixmap *pm = icon(); if ( !pm || pm->isNull() ) { @@ -4269,7 +4269,7 @@ void TQWidget::polish() if ( ! own_font && ! TQApplication::font( this ).isCopyOf( TQApplication::font() ) ) unsetFont(); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE if ( ! own_palette && ! TQApplication::palette( this ).isCopyOf( TQApplication::palette() ) ) unsetPalette(); @@ -4549,7 +4549,7 @@ void TQWidget::adjustSize() TQRect screen = TQApplication::desktop()->screenGeometry( pos() ); #endif -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT if ( layout() ) { if ( layout()->hasHeightForWidth() ) { s = s.boundedTo( screen.size() ); @@ -4592,7 +4592,7 @@ void TQWidget::adjustSize() TQSize TQWidget::sizeHint() const { -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT if ( layout() ) return layout()->totalSizeHint(); #endif @@ -4618,7 +4618,7 @@ TQSize TQWidget::sizeHint() const */ TQSize TQWidget::minimumSizeHint() const { -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT if ( layout() ) return layout()->totalMinimumSize(); #endif @@ -4753,7 +4753,7 @@ bool TQWidget::event( TQEvent *e ) if ( ! ((TQMouseEvent*)e)->isAccepted() ) return FALSE; break; -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT case TQEvent::Wheel: wheelEvent( (TQWheelEvent*)e ); if ( ! ((TQWheelEvent*)e)->isAccepted() ) @@ -4873,7 +4873,7 @@ bool TQWidget::event( TQEvent *e ) } break; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP case TQEvent::Drop: dropEvent( (TQDropEvent*) e); break; @@ -4915,7 +4915,7 @@ bool TQWidget::event( TQEvent *e ) unsetFont(); break; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE case TQEvent::ParentPaletteChange: if ( isTopLevel() ) break; @@ -4923,7 +4923,7 @@ bool TQWidget::event( TQEvent *e ) case TQEvent::ApplicationPaletteChange: if ( !own_palette && !isDesktop() ) unsetPalette(); -# if defined(Q_WS_QWS) && !defined (QT_NO_QWS_MANAGER) +# if defined(Q_WS_QWS) && !defined (TQT_NO_QWS_MANAGER) if ( isTopLevel() && topData()->qwsManager ) { TQRegion r( topData()->qwsManager->region() ); TQApplication::postEvent(topData()->qwsManager, new TQPaintEvent(r, FALSE) ); @@ -4965,7 +4965,7 @@ bool TQWidget::event( TQEvent *e ) } update(); break; -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT case TQEvent::LayoutDirectionChange: if ( layout() ) { layout()->activate(); @@ -5108,7 +5108,7 @@ void TQWidget::mouseDoubleClickEvent( TQMouseEvent *e ) mousePressEvent( e ); // try mouse press event } -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT /*! This event handler, for event \a e, can be reimplemented in a subclass to receive wheel events for the widget. @@ -5468,7 +5468,7 @@ void TQWidget::imEndEvent( TQIMEvent *e ) } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /*! This event handler is called when a drag is in progress and the @@ -5522,7 +5522,7 @@ void TQWidget::dropEvent( TQDropEvent * ) { } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP /*! This event handler can be reimplemented in a subclass to receive @@ -5834,7 +5834,7 @@ TQPoint TQWidget::backgroundOffset() const \sa layout() TQLayout sizePolicy() */ -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT void TQWidget::setLayout( TQLayout *l ) { lay_out = l; @@ -6027,7 +6027,7 @@ void TQWidget::reparent( TQWidget *parent, WFlags f, const TQPoint &p, unsetFont(); else setFont( fnt.resolve( qt_naturalWidgetFont( this ) ) ); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE if (!own_palette) unsetPalette(); #endif diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp index 8e0fee27..71268a6a 100644 --- a/src/kernel/qwidget_x11.cpp +++ b/src/kernel/qwidget_x11.cpp @@ -65,7 +65,7 @@ int qt_sip_count( TQWidget* ); bool qt_wstate_iconified( WId ); void qt_updated_rootinfo(); -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "ntqinputcontext.h" #include "ntqinputcontextfactory.h" #endif @@ -89,7 +89,7 @@ static TQWidget *keyboardGrb = 0; extern Time tqt_x_time; extern Time tqt_x_user_time; -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC extern Atom qt_net_wm_sync_request_counter; extern Atom qt_net_wm_sync_request; extern bool qt_use_xsync; @@ -463,7 +463,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) setWinId( id ); // set widget id/handle + hd } -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if (rendhd) { XftDrawDestroy( (XftDraw *) rendhd ); rendhd = 0; @@ -472,7 +472,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) if ( tqt_has_xft ) rendhd = (HANDLE) XftDrawCreate( dpy, id, (Visual *) x11Visual(), x11Colormap() ); -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE // NET window states long net_winstates[6] = { 0, 0, 0, 0, 0, 0 }; @@ -683,7 +683,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) protocols[n++] = tqt_wm_delete_window; // support del window protocol protocols[n++] = tqt_wm_take_focus; // support take focus window protocol protocols[n++] = qt_net_wm_ping; // support _NET_WM_PING protocol -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC protocols[n++] = qt_net_wm_sync_request;// support the _NET_WM_SYNC_REQUEST protocol #endif if ( testWFlags( WStyle_ContextHelp ) ) @@ -711,7 +711,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) else XDeleteProperty(dpy, id, qt_net_wm_action); -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC // set _NET_WM_SYNC_COUNTER createSyncCounter(); long counterVal = topData()->syncCounter; @@ -769,7 +769,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) if ( destroyw ) qt_XDestroyWindow( this, dpy, destroyw ); -#if !defined(QT_NO_IM_EXTENSIONS) +#if !defined(TQT_NO_IM_EXTENSIONS) ic = 0; #endif } @@ -813,7 +813,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows ) else if ( testWFlags(WType_Popup) ) tqApp->closePopup( this ); -#ifndef QT_NO_XFTFREETYPE +#ifndef TQT_NO_XFTFREETYPE if ( rendhd) { if ( destroyWindow ) XftDrawDestroy( (XftDraw *) rendhd ); @@ -821,7 +821,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows ) free( (void*) rendhd ); rendhd = 0; } -#endif // QT_NO_XFTFREETYPE +#endif // TQT_NO_XFTFREETYPE if ( testWFlags(WType_Desktop) ) { if ( acceptDrops() ) @@ -830,7 +830,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows ) if ( destroyWindow ) qt_XDestroyWindow( this, x11Display(), winid ); } -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC destroySyncCounter(); #endif setWinId( 0 ); @@ -892,7 +892,7 @@ void TQWidget::reparentSys( TQWidget *parent, WFlags f, const TQPoint &p, bool s destroyInputContext(); } -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC destroySyncCounter(); #endif @@ -1117,7 +1117,7 @@ TQPoint TQWidget::mapFromGlobal( const TQPoint &pos ) const void TQWidget::setMicroFocusHint(int x, int y, int width, int height, bool text, TQFont *f ) { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM if ( text ) { // trigger input context creation if it hasn't happened already createInputContext(); @@ -2607,11 +2607,11 @@ void TQWidget::deleteSysExtra() void TQWidget::createTLSysExtra() { -#if defined(QT_NO_IM_EXTENSIONS) +#if defined(TQT_NO_IM_EXTENSIONS) // created lazily extra->topextra->xic = 0; #endif -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC extra->topextra->syncCounter = 0; extra->topextra->syncRequestValue[0] = 0; extra->topextra->syncRequestValue[1] = 0; @@ -2663,7 +2663,7 @@ void TQWidget::checkChildrenDnd() } -#ifndef QT_NO_XSYNC +#ifndef TQT_NO_XSYNC // create a window's XSyncCounter void TQWidget::createSyncCounter() { @@ -2704,7 +2704,7 @@ void TQWidget::handleSyncRequest( void* ev ) topData()->syncRequestValue[ 0 ] = xev->xclient.data.l[ 2 ]; topData()->syncRequestValue[ 1 ] = xev->xclient.data.l[ 3 ]; } -#endif // QT_NO_XSYNC +#endif // TQT_NO_XSYNC /*! @@ -2927,9 +2927,9 @@ TQInputContext *TQWidget::getInputContext() { TQInputContext *qic = 0; -// #if !defined(QT_NO_IM_EXTENSIONS) +// #if !defined(TQT_NO_IM_EXTENSIONS) if ( isInputMethodEnabled() ) { -#if !defined(QT_NO_IM_EXTENSIONS) +#if !defined(TQT_NO_IM_EXTENSIONS) qic = icHolderWidget()->ic; #else // { @@ -2951,7 +2951,7 @@ TQInputContext *TQWidget::getInputContext() void TQWidget::changeInputContext( const TQString& identifierName ) { TQWidget *icWidget = icHolderWidget(); -#if !defined(QT_NO_IM_EXTENSIONS) +#if !defined(TQT_NO_IM_EXTENSIONS) TQInputContext **qicp = &icWidget->ic; #else TQInputContext **qicp = (TQInputContext **)&icWidget->topData()->xic; @@ -2978,19 +2978,19 @@ void TQWidget::changeInputContext( const TQString& identifierName ) This function is called to generate an input context according to a configuration for default input method - When QT_NO_IM_EXTENSIONS is not set, input context is + When TQT_NO_IM_EXTENSIONS is not set, input context is generated only when isInputMethodEnabled() returns TRUE. */ void TQWidget::createInputContext() { -// #if !defined(QT_NO_IM_EXTENSIONS) +// #if !defined(TQT_NO_IM_EXTENSIONS) if( !isInputMethodEnabled() || TQApplication::closingDown() ) return; // #endif TQWidget *icWidget = icHolderWidget(); -#ifndef QT_NO_IM -#if !defined(QT_NO_IM_EXTENSIONS) +#ifndef TQT_NO_IM +#if !defined(TQT_NO_IM_EXTENSIONS) TQInputContext **qicp = &icWidget->ic; #else TQInputContext **qicp = (TQInputContext **)&icWidget->topData()->xic; @@ -3008,7 +3008,7 @@ void TQWidget::createInputContext() icWidget, SLOT(destroyInputContext()) ); } } -#endif // QT_NO_IM +#endif // TQT_NO_IM } @@ -3022,8 +3022,8 @@ void TQWidget::createInputContext() */ void TQWidget::destroyInputContext() { -#ifndef QT_NO_IM -#if !defined(QT_NO_IM_EXTENSIONS) +#ifndef TQT_NO_IM +#if !defined(TQT_NO_IM_EXTENSIONS) TQInputContext **qicp = ⁣ #else if ( ! extra || ! extra->topextra ) @@ -3036,7 +3036,7 @@ void TQWidget::destroyInputContext() delete *qicp; *qicp = 0; -#endif // QT_NO_IM +#endif // TQT_NO_IM } @@ -3057,14 +3057,14 @@ void TQWidget::destroyInputContext() */ void TQWidget::resetInputContext() { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM // trigger input context creation if it hasn't happened already createInputContext(); TQInputContext *qic = getInputContext(); if( qic ) qic->reset(); -#endif // QT_NO_IM +#endif // TQT_NO_IM } @@ -3080,7 +3080,7 @@ void TQWidget::resetInputContext() */ void TQWidget::focusInputContext() { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM TQWidget* tlw = topLevelWidget(); if (!tlw->isPopup() || isInputMethodEnabled()) { @@ -3095,7 +3095,7 @@ void TQWidget::focusInputContext() } } } -#endif // QT_NO_IM +#endif // TQT_NO_IM } @@ -3110,7 +3110,7 @@ void TQWidget::focusInputContext() */ void TQWidget::unfocusInputContext() { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM // trigger input context creation if it hasn't happened already createInputContext(); @@ -3120,7 +3120,7 @@ void TQWidget::unfocusInputContext() qic->unsetFocus(); qic->setFocusWidget( 0 ); } -#endif // QT_NO_IM +#endif // TQT_NO_IM } @@ -3136,7 +3136,7 @@ void TQWidget::sendMouseEventToInputContext( int x, TQEvent::Type type, TQt::ButtonState button, TQt::ButtonState state ) { -#ifndef QT_NO_IM +#ifndef TQT_NO_IM // trigger input context creation if it hasn't happened already createInputContext(); @@ -3145,7 +3145,7 @@ void TQWidget::sendMouseEventToInputContext( int x, TQEvent::Type type, // may be causing reset() in some input methods qic->mouseHandler( x, type, button, state ); } -#endif // QT_NO_IM +#endif // TQT_NO_IM } diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp index 06a1068f..06104b0b 100644 --- a/src/kernel/qwmatrix.cpp +++ b/src/kernel/qwmatrix.cpp @@ -49,7 +49,7 @@ double qsincos( double, bool calcCos ); // defined in qpainter_x11.cpp #include <limits.h> -#ifndef QT_NO_WMATRIX +#ifndef TQT_NO_WMATRIX /*! \class TQWMatrix ntqwmatrix.h @@ -984,7 +984,7 @@ TQWMatrix operator*( const TQWMatrix &m1, const TQWMatrix &m2 ) /***************************************************************************** TQWMatrix stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM /*! \relates TQWMatrix @@ -1030,7 +1030,7 @@ TQDataStream &operator>>( TQDataStream &s, TQWMatrix &m ) } return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM -#endif // QT_NO_WMATRIX +#endif // TQT_NO_WMATRIX diff --git a/src/kernel/tqtkdeintegration_x11.cpp b/src/kernel/tqtkdeintegration_x11.cpp index 0dae849c..5bb37d09 100644 --- a/src/kernel/tqtkdeintegration_x11.cpp +++ b/src/kernel/tqtkdeintegration_x11.cpp @@ -23,8 +23,8 @@ bool TQKDEIntegration::enabled() static TQCString findLibrary() { - if( getenv( "QT_NO_KDE_INTEGRATION" ) == NULL - || getenv( "QT_NO_KDE_INTEGRATION" )[ 0 ] == '0' ) + if( getenv( "TQT_NO_KDE_INTEGRATION" ) == NULL + || getenv( "TQT_NO_KDE_INTEGRATION" )[ 0 ] == '0' ) { #ifdef USE_LIB64_PATHES return "/opt/kde3/lib64/kde3/plugins/integration/libtqtkde"; |