rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 40 insertions, 40 deletions

diff --git a/kmag/kmag.h b/kmag/kmag.h
index e84a176..aeee22b 100644
--- a/kmag/kmag.h
+++ b/kmag/kmag.h
@@ -63,7 +63,7 @@ class KmagApp : public KMainWindow
     /**
      * Construtor of KmagApp, calls all init functions to create the application.
      */
-    KmagApp(TQWidget* tqparent=0, const char* name=0);
+    KmagApp(TQWidget* parent=0, const char* name=0);
 
     /// Default destructor
     ~KmagApp();
diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp
index 7a749cb..236bddf 100644
--- a/kmag/kmagselrect.cpp
+++ b/kmag/kmagselrect.cpp
@@ -87,42 +87,42 @@ int getTitleSize ()
 //   Construction
 //--------------------------------------------------------------------------
 
-KMagSelRect::KMagSelRect(TQWidget *tqparent) :
+KMagSelRect::KMagSelRect(TQWidget *parent) :
   TQRect()
 {
-  init(tqparent);
+  init(parent);
 }
 
 KMagSelRect::KMagSelRect(const TQPoint &topLeft, const TQPoint &bottomRight,
-                 TQWidget *tqparent) :
+                 TQWidget *parent) :
 TQRect(topLeft, bottomRight)
 {
-  init(tqparent);
+  init(parent);
 }
 
 KMagSelRect::KMagSelRect(const TQPoint &topLeft, const TQSize &size,
-                 TQWidget *tqparent) :
+                 TQWidget *parent) :
 TQRect(topLeft, size)
 {
-  init(tqparent);
+  init(parent);
 }
 
 KMagSelRect::KMagSelRect(int left, int top, int width, int height,
-                 TQWidget *tqparent) :
+                 TQWidget *parent) :
 TQRect(left, top, width, height)
 {
-  init(tqparent);
+  init(parent);
 }
 
-void KMagSelRect::init(TQWidget *tqparent)
+void KMagSelRect::init(TQWidget *parent)
 {
-  // Make sure tqparent is the window itself, not a widget within the window
-  if (tqparent != 0)
-    while (tqparent->parentWidget (true) != 0)
-      tqparent=tqparent->parentWidget (true);
+  // Make sure parent is the window itself, not a widget within the window
+  if (parent != 0)
+    while (parent->parentWidget (true) != 0)
+      parent=parent->parentWidget (true);
 
   selectionwindow = 0;
-  selWindowParent = tqparent;
+  selWindowParent = parent;
 
   m_alwaysVisible = false;
 }
@@ -215,8 +215,8 @@ void KMagSelRect::selWinResized()
 //   KMagSelWin
 //--------------------------------------------------------------------------
 
-KMagSelWin::KMagSelWin ( TQWidget * tqparent, const char * name, WFlags ) :
-    TQWidget (tqparent, name, WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop | WType_TopLevel | WX11BypassWM)
+KMagSelWin::KMagSelWin ( TQWidget * parent, const char * name, WFlags ) :
+    TQWidget (parent, name, WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop | WType_TopLevel | WX11BypassWM)
 {
   TQBitmap line (8, 8, line_bits, true);
   setPaletteBackgroundPixmap (line);
@@ -356,8 +356,8 @@ void KMagSelWin::bottomRightResized ( TQPoint offset )
 //   KMagSelWinCorner
 //--------------------------------------------------------------------------
 
-KMagSelWinCorner::KMagSelWinCorner ( TQWidget * tqparent, const char * name, WFlags f ) :
-    TQLabel (tqparent, name, f)
+KMagSelWinCorner::KMagSelWinCorner ( TQWidget * parent, const char * name, WFlags f ) :
+    TQLabel (parent, name, f)
 {
   setFrameStyle (TQFrame::WinPanel | TQFrame::Raised);
   setLineWidth (1);
diff --git a/kmag/kmagselrect.h b/kmag/kmagselrect.h
index 9180b36..ec3666b 100644
--- a/kmag/kmagselrect.h
+++ b/kmag/kmagselrect.h
@@ -34,7 +34,7 @@ class KMagSelWinCorner : public TQLabel
 
 public:
 
-    KMagSelWinCorner ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 );
+    KMagSelWinCorner ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
 
     virtual ~KMagSelWinCorner();
 
@@ -59,7 +59,7 @@ class KMagSelWin : public TQWidget
 
 public:
 
-    KMagSelWin ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 );
+    KMagSelWin ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
 
     virtual ~KMagSelWin();
 
@@ -103,11 +103,11 @@ class KMagSelRect : public TQObject, public TQRect
   TQ_OBJECT
 
 public:
-    KMagSelRect(TQWidget *tqparent=0);
+    KMagSelRect(TQWidget *parent=0);
     KMagSelRect(const TQPoint &topLeft, const TQPoint &bottomRight,
-      TQWidget *tqparent=0);
+      TQWidget *parent=0);
     KMagSelRect(const TQPoint &topLeft, const TQSize &size,
-      TQWidget *tqparent=0);
+      TQWidget *parent=0);
     KMagSelRect(int left, int top, int width, int height,
       TQWidget *selWindowParent=0);
 
diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp
index 6c3e8f1..f0f3715 100644
--- a/kmag/kmagzoomview.cpp
+++ b/kmag/kmagzoomview.cpp
@@ -80,12 +80,12 @@ static uchar phand_bits[] = {
 
 
 static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Window start = 0, int level = -1) {
-  Window root, tqparent, *tqchildren; uint ntqchildren;
+  Window root, parent, *tqchildren; uint ntqchildren;
   if (0 == start)
     start = qt_xrootwin();
 
   bool winIdFound = false;
-  if (0 != XQueryTree (qt_xdisplay(), start, &root, &tqparent, &tqchildren, &ntqchildren)) {
+  if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &tqchildren, &ntqchildren)) {
     for (uint i=0; i < ntqchildren; ++i) {
       if (winIdFound) {
         if (ignoreId != tqchildren [i]) {
@@ -120,8 +120,8 @@ static bool obscuredRegion (TQRegion &region, Window winId, Window ignoreId, Win
 
 
 
-KMagZoomView::KMagZoomView(TQWidget *tqparent, const char *name)
-  : TQScrollView(tqparent, name),
+KMagZoomView::KMagZoomView(TQWidget *parent, const char *name)
+  : TQScrollView(parent, name),
     m_selRect(0, 0, 128, 128, this),
     m_grabTimer(0),
     m_mouseViewTimer(0),
@@ -295,8 +295,8 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos)
       pz.setBackgroundColor(TQt::white);
 
       TQBitmap sCursor( 16, 16, left_ptr_bits, TRUE );
-      TQBitmap tqmask( 16, 16, left_ptrmsk_bits, TRUE );
-      sCursor.setMask(tqmask);
+      TQBitmap mask( 16, 16, left_ptrmsk_bits, TRUE );
+      sCursor.setMask(mask);
 
       // since hot spot is at 3,1
       pz.drawPixmap(mousePos.x()-3, mousePos.y()-1, sCursor);
@@ -319,8 +319,8 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos)
           pz.setBackgroundColor(TQt::white);
 
           TQBitmap sCursor( 16, 16, left_ptr_bits, TRUE );
-          TQBitmap tqmask( 16, 16, left_ptrmsk_bits, TRUE );
-          sCursor.setMask(tqmask);
+          TQBitmap mask( 16, 16, left_ptrmsk_bits, TRUE );
+          sCursor.setMask(mask);
 
           // since hot spot is at 3,1
           pz.drawPixmap(mousePos.x()-3, mousePos.y()-1, sCursor);
@@ -328,8 +328,8 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos)
         break;
         default:
           TQBitmap sCursor( 32, 32, phand_bits, TRUE );
-          TQBitmap tqmask( 32, 32, phandm_bits, TRUE );
-          sCursor.setMask(tqmask);
+          TQBitmap mask( 32, 32, phandm_bits, TRUE );
+          sCursor.setMask(mask);
 
           pz.drawPixmap(mousePos.x(), mousePos.y(), sCursor);
         break;
@@ -392,7 +392,7 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e)
         m_selRect.show();
       }
       else {
-        // ignore this button press.. so it goes to the tqparent
+        // ignore this button press.. so it goes to the parent
         e->ignore();
       }
     } else if(m_shiftKeyPressed) {
@@ -415,7 +415,7 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e)
         m_selRect.show();
       }
       else {
-        // ignore this button press.. so it goes to the tqparent
+        // ignore this button press.. so it goes to the parent
         e->ignore();
       }
     } else {
@@ -437,7 +437,7 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e)
         m_selRect.show();
       }
       else {
-        // ignore this button press.. so it goes to the tqparent
+        // ignore this button press.. so it goes to the parent
         e->ignore();
       }
     }
@@ -463,13 +463,13 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e)
       m_selRect.show();
     }
     else {
-      // ignore this button press.. so it goes to the tqparent
+      // ignore this button press.. so it goes to the parent
       e->ignore();
     }
     break;
   // do nothing
   default:
-    // ignore this button press.. so it goes to the tqparent
+    // ignore this button press.. so it goes to the parent
     e->ignore();
     break;
   }
diff --git a/kmag/kmagzoomview.h b/kmag/kmagzoomview.h
index 5f88458..1f8d9bc 100644
--- a/kmag/kmagzoomview.h
+++ b/kmag/kmagzoomview.h
@@ -49,7 +49,7 @@ class KMagZoomView : public TQScrollView
   TQ_OBJECT
   public:
     /// Constructor for the main view
-    KMagZoomView(TQWidget *tqparent = 0, const char *name=0);
+    KMagZoomView(TQWidget *parent = 0, const char *name=0);
 
     /// Destructor for the main view
     ~KMagZoomView();