From c2637a0da6d9a1c8626ca39f8451ab3b7cda487a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:47:59 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- ksnapshot/ksnapshot.cpp | 8 ++++---- ksnapshot/ksnapshot.h | 6 +++--- ksnapshot/ksnapshotwidget.ui | 8 ++++---- ksnapshot/ksnapshotwidget.ui.h | 2 +- ksnapshot/regiongrabber.cpp | 16 +++++++-------- ksnapshot/windowgrabber.cpp | 46 +++++++++++++++++++++--------------------- 6 files changed, 43 insertions(+), 43 deletions(-) (limited to 'ksnapshot') diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp index 881f67a2..4ed8c110 100644 --- a/ksnapshot/ksnapshot.cpp +++ b/ksnapshot/ksnapshot.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url ) { if ( KIO::NetAccess::exists( url, false, this ) ) { const TQString title = i18n( "File Exists" ); - const TQString text = i18n( "Do you really want to overwrite %1?" ).tqarg(url.prettyURL()); + const TQString text = i18n( "Do you really want to overwrite %1?" ).arg(url.prettyURL()); if (KMessageBox::Continue != KMessageBox::warningContinueCancel( this, text, title, i18n("Overwrite") ) ) { return false; @@ -199,7 +199,7 @@ bool KSnapshot::save( const KURL& url ) TQString caption = i18n("Unable to save image"); TQString text = i18n("KSnapshot was unable to save the image to\n%1.") - .tqarg(url.prettyURL()); + .arg(url.prettyURL()); KMessageBox::error(this, text, caption); } @@ -241,7 +241,7 @@ void KSnapshot::slotSaveAs() void KSnapshot::slotCopy() { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setPixmap( snapshot ); } diff --git a/ksnapshot/ksnapshot.h b/ksnapshot/ksnapshot.h index c0d5becc..1e186b19 100644 --- a/ksnapshot/ksnapshot.h +++ b/ksnapshot/ksnapshot.h @@ -29,7 +29,7 @@ class KSnapshotPreview : public TQLabel KSnapshotPreview(TQWidget *parent, const char *name = 0) : TQLabel(parent, name) { - tqsetAlignment(AlignHCenter | AlignVCenter); + setAlignment(AlignHCenter | AlignVCenter); setCursor(TQCursor(TQt::PointingHandCursor)); } virtual ~KSnapshotPreview() {} @@ -44,14 +44,14 @@ class KSnapshotPreview : public TQLabel { TQPainter p(&mask); - tqstyle().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), tqpalette().active()); + tqstyle().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active()); p.end(); handle.setMask(mask); } { TQPainter p(&handle); - tqstyle().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), tqpalette().active()); + tqstyle().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), palette().active()); p.end(); } diff --git a/ksnapshot/ksnapshotwidget.ui b/ksnapshot/ksnapshotwidget.ui index 86e942f2..95590cb4 100644 --- a/ksnapshot/ksnapshotwidget.ui +++ b/ksnapshot/ksnapshotwidget.ui @@ -23,7 +23,7 @@ lblImage - + 200 130 @@ -107,7 +107,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b Expanding - + 156 16 @@ -163,7 +163,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b - tqlayout1 + layout1 @@ -193,7 +193,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b Expanding - + 16 16 diff --git a/ksnapshot/ksnapshotwidget.ui.h b/ksnapshot/ksnapshotwidget.ui.h index 601b624f..921accc9 100644 --- a/ksnapshot/ksnapshotwidget.ui.h +++ b/ksnapshot/ksnapshotwidget.ui.h @@ -47,7 +47,7 @@ void KSnapshotWidget::setPreview( const TQPixmap &pm ) TQToolTip::remove( lblImage ); TQToolTip::add( lblImage, TQString( "Preview of the snapshot image (%1 x %2)" ) - .tqarg( pm.width() ).tqarg( pm.height() ) ); + .arg( pm.width() ).arg( pm.height() ) ); lblImage->setPixmap( img ); lblImage->adjustSize(); diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp index 74ac960a..f35f61ce 100644 --- a/ksnapshot/regiongrabber.cpp +++ b/ksnapshot/regiongrabber.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include @@ -41,8 +41,8 @@ SizeTip::SizeTip( TQWidget *parent, const char *name ) void SizeTip::setTip( const TQRect &rect ) { - TQString tip = TQString( "%1x%2" ).tqarg( rect.width() ) - .tqarg( rect.height() ); + TQString tip = TQString( "%1x%2" ).arg( rect.width() ) + .arg( rect.height() ); setText( tip ); adjustSize(); @@ -52,7 +52,7 @@ void SizeTip::setTip( const TQRect &rect ) void SizeTip::positionTip( const TQRect &rect ) { - TQRect tipRect = tqgeometry(); + TQRect tipRect = geometry(); tipRect.moveTopLeft( TQPoint( 0, 0 ) ); if ( rect.intersects( tipRect ) ) @@ -61,7 +61,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( tqgeometry().bottomRight() ); + tipRect.moveBottomRight( geometry().bottomRight() ); } move( tipRect.topLeft() ); @@ -92,7 +92,7 @@ void RegionGrabber::initGrabber() TQDesktopWidget desktopWidget; TQRect desktopSize; if ( desktopWidget.isVirtualDesktop() ) - desktopSize = desktopWidget.tqgeometry(); + desktopSize = desktopWidget.geometry(); else desktopSize = desktopWidget.screenGeometry( qt_xrootwin() ); @@ -168,8 +168,8 @@ void RegionGrabber::drawRubber() p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(), - TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(), + TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) ); p.end(); } diff --git a/ksnapshot/windowgrabber.cpp b/ksnapshot/windowgrabber.cpp index 189fb856..afc337e5 100644 --- a/ksnapshot/windowgrabber.cpp +++ b/ksnapshot/windowgrabber.cpp @@ -39,7 +39,7 @@ bool operator< ( const TQRect& r1, const TQRect& r2 ) return r1.width() * r1.height() < r2.width() * r2.height(); } -// Recursively iterates over the window w and its tqchildren, thereby building +// Recursively iterates over the window w and its children, thereby building // a tree of window descriptors. Windows in non-viewable state or with height // or width smaller than minSize will be ignored. static @@ -62,15 +62,15 @@ void getWindowsRecursive( std::vector& windows, Window w, } Window root, parent; - Window* tqchildren; - unsigned int ntqchildren; + Window* children; + unsigned int nchildren; - if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { - for( unsigned int i = 0; i < ntqchildren; ++i ) { - getWindowsRecursive( windows, tqchildren[ i ], x, y, depth + 1 ); + if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) { + for( unsigned int i = 0; i < nchildren; ++i ) { + getWindowsRecursive( windows, children[ i ], x, y, depth + 1 ); } - if( tqchildren != NULL ) - XFree( tqchildren ); + if( children != NULL ) + XFree( children ); } } if ( depth == 0 ) @@ -95,16 +95,16 @@ Window findRealWindow( Window w, int depth = 0 ) return w; } Window root, parent; - Window* tqchildren; - unsigned int ntqchildren; + Window* children; + unsigned int nchildren; Window ret = None; - if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { + if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) { for( unsigned int i = 0; - i < ntqchildren && ret == None; + i < nchildren && ret == None; ++i ) - ret = findRealWindow( tqchildren[ i ], depth + 1 ); - if( tqchildren != NULL ) - XFree( tqchildren ); + ret = findRealWindow( children[ i ], depth + 1 ); + if( children != NULL ) + XFree( children ); } return ret; } @@ -143,7 +143,7 @@ TQPixmap grabWindow( Window child, int x, int y, uint w, uint h, uint border ) int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child, ShapeBounding, &count, &order ); - //The ShapeBounding region is the outermost tqshape of the window; + //The ShapeBounding region is the outermost shape of the window; //ShapeBounding - ShapeClipping is defined to be the border. //Since the border area is part of the window, we use bounding // to limit our work region @@ -168,7 +168,7 @@ TQPixmap grabWindow( Window child, int x, int y, uint w, uint h, uint border ) //Get the masked away area. TQRegion maskedAway = bbox - contents; - TQMemArray maskedAwayRects = maskedAway.tqrects(); + TQMemArray maskedAwayRects = maskedAway.rects(); //Construct a bitmap mask from the rectangles TQPainter p(&mask); @@ -219,12 +219,12 @@ TQPixmap WindowGrabber::grabCurrent( bool includeDecorations ) Window child = windowUnderCursor( includeDecorations ); XGetGeometry( qt_xdisplay(), child, &root, &x, &y, &w, &h, &border, &depth ); Window parent; - Window* tqchildren; - unsigned int ntqchildren; + Window* children; + unsigned int nchildren; if( XQueryTree( qt_xdisplay(), child, &root, &parent, - &tqchildren, &ntqchildren ) != 0 ) { - if( tqchildren != NULL ) - XFree( tqchildren ); + &children, &nchildren ) != 0 ) { + if( children != NULL ) + XFree( children ); int newx, newy; Window dummy; if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(), @@ -339,7 +339,7 @@ int WindowGrabber::windowIndex( const TQPoint &pos ) const // Draws a border around the (child) window currently containing the pointer void WindowGrabber::drawBorder() { - tqrepaint(); + repaint(); if ( current >= 0 ) { TQPainter p; -- cgit v1.2.1