From c2637a0da6d9a1c8626ca39f8451ab3b7cda487a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:47:59 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 ksnapshot/windowgrabber.cpp | 46 ++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'ksnapshot/windowgrabber.cpp')

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<TQRect>& 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<TQRect> maskedAwayRects = maskedAway.tqrects();
+	    TQMemArray<TQRect> 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