From ae6cafee5339716bd01aa6c66aa4f366bdc5d43b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:55:33 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 882bcd26b3d60be72ea2b35921969a9850c52db9. --- src/regiongrabber.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/regiongrabber.cpp') diff --git a/src/regiongrabber.cpp b/src/regiongrabber.cpp index 9240218..c13b9fa 100644 --- a/src/regiongrabber.cpp +++ b/src/regiongrabber.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -43,8 +43,8 @@ SizeTip::SizeTip( TQWidget *parent, const char *name ) void SizeTip::setTip( const TQRect &rect ) { - TQString tip = TQString( "%1x%2" ).arg( rect.width() ) - .arg( rect.height() ); + TQString tip = TQString( "%1x%2" ).tqarg( rect.width() ) + .tqarg( rect.height() ); setText( tip ); adjustSize(); @@ -54,7 +54,7 @@ void SizeTip::setTip( const TQRect &rect ) void SizeTip::positionTip( const TQRect &rect ) { - TQRect tipRect = geometry(); + TQRect tipRect = tqgeometry(); tipRect.moveTopLeft( TQPoint( 0, 0 ) ); if ( rect.intersects( tipRect ) ) @@ -63,7 +63,7 @@ void SizeTip::positionTip( const TQRect &rect ) tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) ); if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) ) - tipRect.moveBottomRight( geometry().bottomRight() ); + tipRect.moveBottomRight( tqgeometry().bottomRight() ); } move( tipRect.topLeft() ); @@ -94,7 +94,7 @@ void RegionGrabber::initGrabber() TQDesktopWidget desktopWidget; TQRect desktopSize; if ( desktopWidget.isVirtualDesktop() ) - desktopSize = desktopWidget.geometry(); + desktopSize = desktopWidget.tqgeometry(); else desktopSize = desktopWidget.screenGeometry( qt_xrootwin() ); @@ -171,8 +171,8 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), - TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(), + TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) ); p.end(); } -- cgit v1.2.1