diff options
Diffstat (limited to 'src/kernel/qpainter.cpp')
| -rw-r--r-- | src/kernel/qpainter.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp index d408a3df8..4868ffb00 100644 --- a/src/kernel/qpainter.cpp +++ b/src/kernel/qpainter.cpp @@ -51,7 +51,7 @@ #include "qrichtext_p.h" #include "ntqregexp.h" #include "ntqcleanuphandler.h" -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS #include "qgfx_qws.h" #endif #include <string.h> @@ -1633,13 +1633,13 @@ void TQPainter::updateXForm() txop = TxTranslate; } else { txop = TxScale; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) setf(DirtyFont); #endif } } else { txop = TxRotShear; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) setf(DirtyFont); #endif } @@ -2253,7 +2253,7 @@ TQRegion TQPainter::clipRegion( CoordinateMode m ) const */ -#if !defined(Q_WS_X11) && !defined(Q_WS_QWS) && !defined(Q_WS_MAC) +#if !defined(TQ_WS_X11) && !defined(TQ_WS_QWS) && !defined(TQ_WS_MAC) // The doc and X implementation of this functions is in qpainter_x11.cpp void TQPainter::drawWinFocusRect( int, int, int, int, bool, const TQColor & ) @@ -2340,13 +2340,13 @@ void TQPainter::drawPixmap( const TQRect &r, const TQPixmap &pm ) TQPDevCmdParam param[2]; param[0].rect = &r; param[1].pixmap = ± -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !hdc ) return; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ); return; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !pdev->handle()) return; #else @@ -2417,7 +2417,7 @@ void TQPainter::drawImage( int x, int y, const TQImage & image, int sx, int sy, int sw, int sh, int conversionFlags ) { -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS //### Hackish # ifndef TQT_NO_TRANSFORMATIONS if ( !image.isNull() && gfx && @@ -2488,13 +2488,13 @@ void TQPainter::drawImage( int x, int y, const TQImage & image, TQRect r( x, y, subimage.width(), subimage.height() ); param[0].rect = &r; param[1].image = &subimage; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc ) return; -#elif defined (Q_WS_QWS) +#elif defined (TQ_WS_QWS) pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ); return; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) if(!pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() ) return; #else @@ -2547,13 +2547,13 @@ void TQPainter::drawImage( const TQRect &r, const TQImage &i ) TQPDevCmdParam param[2]; param[0].rect = &r; param[1].image = &i; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc ) return; -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ); return; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() ) return; #else @@ -2786,15 +2786,15 @@ void TQPainter::drawText( const TQRect &r, int tf, param[1].ival = tf; param[2].str = &newstr; if ( pdev->devType() != TQInternal::Printer ) { -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param) || !hdc ) return; // TQPrinter wants PdcDrawText2 -#elif defined(Q_WS_QWS) +#elif defined(TQ_WS_QWS) pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param); return; -#elif defined(Q_WS_MAC) +#elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param) || !pdev->handle()) return; // TQPrinter wants PdcDrawText2 @@ -3045,7 +3045,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r, textFlags |= TQt::Underline; cUlChar++; } -#if defined(Q_WS_X11) || defined(Q_WS_QWS) +#if defined(TQ_WS_X11) || defined(TQ_WS_QWS) if ( painter->bg_mode == TQt::OpaqueMode ) { int h = ti.ascent() + ti.descent() + 1; if (ti.y() + h < height) |