rename the following methods:

tqparent parent
tqmask mask


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

10 files changed, 23 insertions, 23 deletions

diff --git a/krfb/krfb/connectiondialog.cc b/krfb/krfb/connectiondialog.cc
index f881f28d..d767b5a2 100644
--- a/krfb/krfb/connectiondialog.cc
+++ b/krfb/krfb/connectiondialog.cc
@@ -26,8 +26,8 @@
 #include <kiconloader.h>
 #include <klocale.h>
 
-ConnectionDialog::ConnectionDialog( TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name, true, i18n( "New Connection" ),
+ConnectionDialog::ConnectionDialog( TQWidget *parent, const char *name )
+    : KDialogBase( parent, name, true, i18n( "New Connection" ),
                    Ok|Cancel, Cancel, true )
 {
   m_connectWidget = new ConnectionWidget( this, "ConnectWidget" );
diff --git a/krfb/krfb/connectiondialog.h b/krfb/krfb/connectiondialog.h
index 967587a5..5f20e33a 100644
--- a/krfb/krfb/connectiondialog.h
+++ b/krfb/krfb/connectiondialog.h
@@ -30,7 +30,7 @@ class ConnectionDialog : public KDialogBase
   TQ_OBJECT
 
   public:
-    ConnectionDialog( TQWidget *tqparent, const char *name );
+    ConnectionDialog( TQWidget *parent, const char *name );
     ~ConnectionDialog() {};
 
     void setRemoteHost( const TQString &host );
diff --git a/krfb/krfb/invitedialog.cc b/krfb/krfb/invitedialog.cc
index 046a7a92..73d55b75 100644
--- a/krfb/krfb/invitedialog.cc
+++ b/krfb/krfb/invitedialog.cc
@@ -27,8 +27,8 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
-InviteDialog::InviteDialog( TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name, true, i18n( "Invitation" ),
+InviteDialog::InviteDialog( TQWidget *parent, const char *name )
+    : KDialogBase( parent, name, true, i18n( "Invitation" ),
       User1|Close|Help, NoDefault, true )
 {
   m_inviteWidget = new InviteWidget( this, "InviteWidget" );
diff --git a/krfb/krfb/invitedialog.h b/krfb/krfb/invitedialog.h
index 6ce32097..9715f3e3 100644
--- a/krfb/krfb/invitedialog.h
+++ b/krfb/krfb/invitedialog.h
@@ -30,7 +30,7 @@ class InviteDialog : public KDialogBase
   TQ_OBJECT
 
   public:
-    InviteDialog( TQWidget *tqparent, const char *name );
+    InviteDialog( TQWidget *parent, const char *name );
     ~InviteDialog() {}
 
     void enableInviteButton( bool enable );
diff --git a/krfb/krfb/personalinvitedialog.cc b/krfb/krfb/personalinvitedialog.cc
index 1f61e392..245e0069 100644
--- a/krfb/krfb/personalinvitedialog.cc
+++ b/krfb/krfb/personalinvitedialog.cc
@@ -26,8 +26,8 @@
 #include <kiconloader.h>
 #include <klocale.h>
 
-PersonalInviteDialog::PersonalInviteDialog( TQWidget *tqparent, const char *name )
-    : KDialogBase( tqparent, name, true, i18n( "Personal Invitation" ),
+PersonalInviteDialog::PersonalInviteDialog( TQWidget *parent, const char *name )
+    : KDialogBase( parent, name, true, i18n( "Personal Invitation" ),
                    Close, Close, true )
 {
   m_inviteWidget = new PersonalInviteWidget( this, "PersonalInviteWidget" );
diff --git a/krfb/krfb/personalinvitedialog.h b/krfb/krfb/personalinvitedialog.h
index 89be019c..6f28a33d 100644
--- a/krfb/krfb/personalinvitedialog.h
+++ b/krfb/krfb/personalinvitedialog.h
@@ -29,7 +29,7 @@ class PersonalInviteWidget;
 class PersonalInviteDialog : public KDialogBase
 {
   public:
-    PersonalInviteDialog( TQWidget *tqparent, const char *name );
+    PersonalInviteDialog( TQWidget *parent, const char *name );
     virtual ~PersonalInviteDialog() {}
 
     void setHost( const TQString &host, uint port );
diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc
index 82ad4ad9..93dc5539 100644
--- a/krfb/krfb/rfbcontroller.cc
+++ b/krfb/krfb/rfbcontroller.cc
@@ -88,7 +88,7 @@ static const char* cur=
 "      xxx          "
 "                   ";
 
-static const char* tqmask=
+static const char* mask=
 "xx                 "
 "xxx                "
 "xxxx               "
@@ -279,7 +279,7 @@ Display *PointerEvent::dpy;
 int PointerEvent::buttonMask = 0;
 
 PointerEvent::PointerEvent(int b, int _x, int _y) :
-	button_tqmask(b),
+	button_mask(b),
 	x(_x),
 	y(_y) {
 	if (!initialized) {
@@ -297,13 +297,13 @@ void PointerEvent::exec() {
 		screen = 0;
 	XTestFakeMotionEvent(dpy, screen, x, y, CurrentTime);
 	for(int i = 0; i < 5; i++)
-		if ((buttonMask&(1<<i))!=(button_tqmask&(1<<i)))
+		if ((buttonMask&(1<<i))!=(button_mask&(1<<i)))
 			XTestFakeButtonEvent(dpy,
 					     i+1,
-					     (button_tqmask&(1<<i))?True:False,
+					     (button_mask&(1<<i))?True:False,
 					     CurrentTime);
 
-	buttonMask = button_tqmask;
+	buttonMask = button_mask;
 }
 
 
@@ -450,7 +450,7 @@ void RFBController::startServer(int inetdFd, bool xtestGrab)
 	server->desktopName = desktopName.latin1();
 
 	if (!myCursor)
-		myCursor = rfbMakeXCursor(19, 19, (char*) cur, (char*) tqmask);
+		myCursor = rfbMakeXCursor(19, 19, (char*) cur, (char*) mask);
 	server->cursor = myCursor;
 
 	passwordChanged();
diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h
index d0d8af36..2316b7af 100644
--- a/krfb/krfb/rfbcontroller.h
+++ b/krfb/krfb/rfbcontroller.h
@@ -77,7 +77,7 @@ public:
 };
 
 class PointerEvent : public VNCEvent {
-	int button_tqmask, x, y;
+	int button_mask, x, y;
 
 	static bool initialized;
 	static Display *dpy;
@@ -138,7 +138,7 @@ public:
 	void connectionClosed();
 	bool handleCheckPassword(rfbClientPtr, const char *, int);
 	void handleKeyEvent(bool down, KeySym keySym);
-	void handlePointerEvent(int button_tqmask, int x, int y);
+	void handlePointerEvent(int button_mask, int x, int y);
 	enum rfbNewClientAction handleNewClient(rfbClientPtr cl);
 	void clipboardToServer(const TQString &text);
 	void handleClientGone();
diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp
index d4b520d6..5878b633 100644
--- a/krfb/krfb/trayicon.cpp
+++ b/krfb/krfb/trayicon.cpp
@@ -25,8 +25,8 @@
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 
-KPassivePopup2::KPassivePopup2(TQWidget *tqparent) :
-   KPassivePopup(tqparent){
+KPassivePopup2::KPassivePopup2(TQWidget *parent) :
+   KPassivePopup(parent){
 }
 
 void KPassivePopup2::hideEvent( TQHideEvent *e )
@@ -37,9 +37,9 @@ void KPassivePopup2::hideEvent( TQHideEvent *e )
 
 KPassivePopup2 *KPassivePopup2::message( const TQString &caption, const TQString &text,
 				         const TQPixmap &icon,
-				         TQWidget *tqparent)
+				         TQWidget *parent)
 {
-    KPassivePopup2 *pop = new KPassivePopup2( tqparent);
+    KPassivePopup2 *pop = new KPassivePopup2( parent);
     pop->setView( caption, text, icon );
     pop->show();
 
diff --git a/krfb/krfb/trayicon.h b/krfb/krfb/trayicon.h
index 21e7aac2..45e22ea7 100644
--- a/krfb/krfb/trayicon.h
+++ b/krfb/krfb/trayicon.h
@@ -32,10 +32,10 @@ class KPassivePopup2 : public KPassivePopup {
    	Q_OBJECT
   TQ_OBJECT
 public: 
-        KPassivePopup2(TQWidget *tqparent);
+        KPassivePopup2(TQWidget *parent);
         static KPassivePopup2 *message( const TQString &caption, const TQString &text,
 					const TQPixmap &icon,
-					TQWidget *tqparent);
+					TQWidget *parent);
 
 signals:
 	void hidden();