From ec1fddcd0d6663ad273af85357f04abbc5689468 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:00 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a. --- libkscan/img_canvas.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'libkscan/img_canvas.cpp') diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp index b807af2f..b510f55d 100644 --- a/libkscan/img_canvas.cpp +++ b/libkscan/img_canvas.cpp @@ -226,12 +226,12 @@ void ImageCanvas::newImage( TQImage *new_image ) } - kdDebug(29000) << "going to repaint!" << endl; - repaint( true ); - kdDebug(29000) << "repaint ok" << endl; + kdDebug(29000) << "going to tqrepaint!" << endl; + tqrepaint( true ); + kdDebug(29000) << "tqrepaint ok" << endl; } -TQSize ImageCanvas::sizeHint() const +TQSize ImageCanvas::tqsizeHint() const { return( TQSize( 2, 2 )); } @@ -295,7 +295,7 @@ void ImageCanvas::handle_popup( int item ) default: break; } update_scaled_pixmap(); - repaint(); + tqrepaint(); } @@ -379,7 +379,7 @@ void ImageCanvas::drawContents( TQPainter * p, int clipx, int clipy, int clipw, // p->scale( used_xscaler, used_yscaler ); // p->scale( used_xscaler, used_yscaler ); if ( x2 >= x1 && y2 >= y1 ) { - p->drawPixmap( x1, y1, *pmScaled, x1, y1 ); //, clipw, cliph); + p->tqdrawPixmap( x1, y1, *pmScaled, x1, y1 ); //, clipw, cliph); // p->setBrush( red ); // p->drawRect( x1, y1, clipw, cliph ); } @@ -675,7 +675,7 @@ void ImageCanvas::update_scaled_pixmap( void ) if( scaleKind() == DYNAMIC ) kdDebug(28000) << "Scaling DYNAMIC" << endl; TQSize noSBSize( visibleWidth(), visibleHeight()); - const int sbWidth = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ); + const int sbWidth = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ); // if( verticalScrollBar()->visible() ) noSBSize.width()+=sbWidth; // if( horizontalScrollBar()->visible() ) noSBSize.height()+=sbWidth; @@ -1022,7 +1022,7 @@ const TQString ImageCanvas::imageInfoString( int w, int h, int d ) else return TQString("-"); } - return i18n("%1x%2 pixel, %3 bit").arg(w).arg(h).arg(d); + return i18n("%1x%2 pixel, %3 bit").tqarg(w).tqarg(h).tqarg(d); } @@ -1043,7 +1043,7 @@ const TQString ImageCanvas::scaleKindString() return i18n("Fit Height"); break; case ZOOM: - return i18n("Zoom to %1 %%").arg( TQString::number(getScaleFactor())); + return i18n("Zoom to %1 %%").tqarg( TQString::number(getScaleFactor())); break; default: return i18n("Unknown scaling!"); -- cgit v1.2.1