diff options
Diffstat (limited to 'src/kernel/qpainter.cpp')
| -rw-r--r-- | src/kernel/qpainter.cpp | 62 |
1 files changed, 2 insertions, 60 deletions
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp index 82840cc27..47d2af11c 100644 --- a/src/kernel/qpainter.cpp +++ b/src/kernel/qpainter.cpp @@ -51,9 +51,6 @@ #include "qrichtext_p.h" #include "ntqregexp.h" #include "ntqcleanuphandler.h" -#ifdef TQ_WS_QWS -#include "qgfx_qws.h" -#endif #include <string.h> #include "tqtextlayout_p.h" @@ -243,12 +240,6 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; */ /*! - \fn TQGfx * TQPainter::internalGfx() - - \internal -*/ - -/*! \enum TQPainter::CoordinateMode \value CoordDevice \value CoordPainter @@ -325,8 +316,6 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; \value NorROP dst = NOT (src OR dst) By far the most useful ones are \c CopyROP and \c XorROP. - - On TQt/Embedded, only \c CopyROP, \c XorROP, and \c NotROP are supported. */ /*! @@ -2253,7 +2242,7 @@ TQRegion TQPainter::clipRegion( CoordinateMode m ) const */ -#if !defined(TQ_WS_X11) && !defined(TQ_WS_QWS) && !defined(TQ_WS_MAC) +#if !defined(TQ_WS_X11) && !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 & ) @@ -2343,9 +2332,6 @@ void TQPainter::drawPixmap( const TQRect &r, const TQPixmap &pm ) #if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !hdc ) return; -#elif defined(TQ_WS_QWS) - pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ); - return; #elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawPixmap, this, param ) || !pdev->handle()) return; @@ -2417,41 +2403,6 @@ void TQPainter::drawImage( int x, int y, const TQImage & image, int sx, int sy, int sw, int sh, int conversionFlags ) { -#ifdef TQ_WS_QWS - //### Hackish -# ifndef TQT_NO_TRANSFORMATIONS - if ( !image.isNull() && gfx && - (txop==TxNone||txop==TxTranslate) && !testf(ExtDev) ) -# else - if ( !image.isNull() && gfx && !testf(ExtDev) ) -# endif - { - if(sw<0) - sw=image.width(); - if(sh<0) - sh=image.height(); - - TQImage image2 = qt_screen->mapToDevice( image ); - - // This is a bit dubious - if(image2.depth()==1) { - image2.setNumColors( 2 ); - image2.setColor( 0, tqRgb(255,255,255) ); - image2.setColor( 1, tqRgb(0,0,0) ); - } - if ( image2.hasAlphaBuffer() ) - gfx->setAlphaType(TQGfx::InlineAlpha); - else - gfx->setAlphaType(TQGfx::IgnoreAlpha); - gfx->setSource(&image2); - if ( testf(VxF|WxF) ) { - map( x, y, &x, &y ); - } - gfx->blt(x,y,sw,sh,sx,sy); - return; - } -#endif - if ( !isActive() || image.isNull() ) return; @@ -2491,9 +2442,6 @@ void TQPainter::drawImage( int x, int y, const TQImage & image, #if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc ) return; -#elif defined (TQ_WS_QWS) - pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ); - return; #elif defined(TQ_WS_MAC) if(!pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() ) return; @@ -2550,9 +2498,6 @@ void TQPainter::drawImage( const TQRect &r, const TQImage &i ) #if defined(TQ_WS_WIN) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !hdc ) return; -#elif defined(TQ_WS_QWS) - pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ); - return; #elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawImage, this, param ) || !pdev->handle() ) return; @@ -2791,9 +2736,6 @@ void TQPainter::drawText( const TQRect &r, int tf, this, param) || !hdc ) return; // TQPrinter wants PdcDrawText2 -#elif defined(TQ_WS_QWS) - pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param); - return; #elif defined(TQ_WS_MAC) if ( !pdev->cmd( TQPaintDevice::PdcDrawText2Formatted, this, param) || !pdev->handle()) @@ -3045,7 +2987,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r, textFlags |= TQt::Underline; cUlChar++; } -#if defined(TQ_WS_X11) || defined(TQ_WS_QWS) +#if defined(TQ_WS_X11) if ( painter->bg_mode == TQt::OpaqueMode ) { int h = ti.ascent() + ti.descent() + 1; if (ti.y() + h < height) |