Replaced various '#define' with actual strings - part 5

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

src/difftextwindow.cpp

@@ -955,7 +955,7 @@ void DiffTextWindow::paintEvent( TQPaintEvent* e )
       TQPainter painter(this);
       TQPixmap pixmap( invalidRect.size() );
 
-      MyPainter p( TQT_TQPAINTDEVICE(&pixmap), d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') );
+      MyPainter p( &pixmap, d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') );
 
       p.translate( -invalidRect.x(), -invalidRect.y() );
 

src/mergeresultwindow.cpp

@@ -1761,7 +1761,7 @@ void MergeResultWindow::paintEvent( TQPaintEvent*  )
       if ( size() != m_pixmap.size() )
          m_pixmap.resize(size());
 
-      MyPainter p(TQT_TQPAINTDEVICE(&m_pixmap), m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth);
+      MyPainter p(&m_pixmap, m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth);
       p.setFont( font() );
       p.TQPainter::fillRect( rect(), m_pOptionDialog->m_bgColor );
 
@@ -1843,7 +1843,7 @@ void MergeResultWindow::paintEvent( TQPaintEvent*  )
 
    if ( m_bCursorOn && hasFocus() && m_cursorYPos>=m_firstLine )
    {
-      MyPainter painter(TQT_TQPAINTDEVICE(this), m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth);
+      MyPainter painter(this, m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth);
       int topLineYOffset = 0;
       int xOffset = fontWidth * leftInfoWidth;