From 7c9ad5461923e26231c3b13b0fa6fdcaa8f88b75 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 3 Dec 2023 00:34:37 +0900 Subject: [PATCH] Replaced various '#define' with actual strings - part 5 Signed-off-by: Michele Calgaro --- src/difftextwindow.cpp | 2 +- src/mergeresultwindow.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp index 0e4a0f7..1234545 100644 --- a/src/difftextwindow.cpp +++ b/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() ); diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp index 646e700..1b1639d 100644 --- a/src/mergeresultwindow.cpp +++ b/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;