From 92994ee2036ac7c4c68747f67dbc0ecbaf4c250c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:52:23 -0600
Subject: Remove additional unneeded tq method conversions

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

(limited to 'kmag/kmagzoomview.cpp')

diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp
index 4dd9a12..47f6a46 100644
--- a/kmag/kmagzoomview.cpp
+++ b/kmag/kmagzoomview.cpp
@@ -80,22 +80,22 @@ static uchar phand_bits[] = {
 
 
 static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Window start = 0, int level = -1) {
-  Window root, parent, *tqchildren; uint ntqchildren;
+  Window root, parent, *children; uint nchildren;
   if (0 == start)
     start = qt_xrootwin();
 
   bool winIdFound = false;
-  if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &tqchildren, &ntqchildren)) {
-    for (uint i=0; i < ntqchildren; ++i) {
+  if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &children, &nchildren)) {
+    for (uint i=0; i < nchildren; ++i) {
       if (winIdFound) {
-        if (ignoreId != tqchildren [i]) {
+        if (ignoreId != children [i]) {
           XWindowAttributes atts;
-          XGetWindowAttributes (qt_xdisplay(), tqchildren [i], &atts);
+          XGetWindowAttributes (qt_xdisplay(), children [i], &atts);
           if (atts.map_state == IsViewable)
             region -= TQRegion (atts.x, atts.y, atts.width, atts.height, TQRegion::Rectangle);
         }
       }
-      else if (winId == tqchildren [i])
+      else if (winId == children [i])
         winIdFound = true;
 
       // According to tests, my own window ID is either on toplevel or two levels below.
@@ -103,15 +103,15 @@ static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Win
       // then to five recursion levels, and make a full recursive search only if that
       // was unsuccessful.
       else if (level > 1)
-        winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], level-1);
+        winIdFound = obscuredRegion (region, winId, ignoreId, children [i], level-1);
       else if (level == -1)
-        if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 0)))
-          if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 1)))
-            winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], -1);
+        if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 0)))
+          if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 1)))
+            winIdFound = obscuredRegion (region, winId, ignoreId, children [i], -1);
     }
 
-    if (tqchildren != NULL)
-      XFree (tqchildren);
+    if (children != NULL)
+      XFree (children);
   }
 
   return winIdFound;
@@ -493,7 +493,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
       // set the mouse mode to normal
       m_mouseMode = Normal;
 
-      // restore the cursor tqshape
+      // restore the cursor shape
       setCursor(arrowCursor);
 
       // restore the cursor position
@@ -504,7 +504,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
       // set the mouse mode to normal
       m_mouseMode = Normal;
 
-      // restore the cursor tqshape
+      // restore the cursor shape
       setCursor(arrowCursor);
 
       // restore the cursor position
@@ -516,7 +516,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e)
       // set the mouse mode to normal
       m_mouseMode = Normal;
 
-      // restore the cursor tqshape
+      // restore the cursor shape
       setCursor(arrowCursor);
     }    
     break;
@@ -706,7 +706,7 @@ void KMagZoomView::fitToWindow()
   m_selRect.moveCenter(currCenter);
   m_selRect.update();
 
-  viewport()->tqrepaint(false);
+  viewport()->repaint(false);
 }
 
 void KMagZoomView::setFitToWindow(bool fit)
@@ -755,14 +755,14 @@ void KMagZoomView::grabFrame()
   intersection.translate (-selRect.x(), -selRect.y());
 
   TQPainter painter (&m_grabbedPixmap, true);
-  TQMemArray<TQRect> rects (intersection.tqrects());
+  TQMemArray<TQRect> rects (intersection.rects());
   for (uint i = 0; i < rects.size(); i++)
     painter.fillRect (rects[i], TQBrush (TQColor (128, 128, 128)));
 
-  // call tqrepaint to display the newly grabbed image
+  // call repaint to display the newly grabbed image
   TQRect newSize = m_zoomMatrix.mapRect (m_grabbedPixmap.rect());
   resizeContents (newSize.width(), newSize.height());
-  viewport()->tqrepaint(false);
+  viewport()->repaint(false);
 }
 
 
@@ -775,7 +775,7 @@ void KMagZoomView::updateMouseView()
   if(m_selRect.left() <= pos.x() && pos.x() <= m_selRect.right() &&
      m_selRect.top() <= pos.y() && pos.y() <= m_selRect.bottom() &&
      m_refreshSwitch)
-    viewport()->tqrepaint(false);
+    viewport()->repaint(false);
 }
 
 /**
@@ -801,7 +801,7 @@ void KMagZoomView::setZoom(float zoom)
 {
   m_zoom = zoom;
   updateMatrix();
-  viewport()->tqrepaint();
+  viewport()->repaint();
 }
 
 /**
@@ -811,7 +811,7 @@ void KMagZoomView::setRotation(int rotation)
 {
   m_rotation = rotation;
   updateMatrix();
-  viewport()->tqrepaint();
+  viewport()->repaint();
 }
 
 /**
@@ -820,7 +820,7 @@ void KMagZoomView::setRotation(int rotation)
 void KMagZoomView::setInvertation(bool invert)
 {
   m_invert = invert;
-  viewport()->tqrepaint();
+  viewport()->repaint();
 }
 
 /**
-- 
cgit v1.2.3