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

22 files changed, 39 insertions, 39 deletions

diff --git a/ksirc/KSPrefs/ksprefs.cpp b/ksirc/KSPrefs/ksprefs.cpp
index 6deb550c..40ccc56f 100644
--- a/ksirc/KSPrefs/ksprefs.cpp
+++ b/ksirc/KSPrefs/ksprefs.cpp
@@ -26,10 +26,10 @@
 #include "page_looknfeel.h"
 #include "page_shortcuts.h"
 
-KSPrefs::KSPrefs(TQWidget * tqparent, const char * name):
+KSPrefs::KSPrefs(TQWidget * parent, const char * name):
     KDialogBase(KDialogBase::IconList, i18n("Configure KSirc"),
                 KDialogBase::Help | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Default,
-                KDialogBase::Ok, tqparent, name)
+                KDialogBase::Ok, parent, name)
 {
     setWFlags( getWFlags() | WDestructiveClose );
     TQFrame *itemLooknFeel= addPage( i18n( "Look and Feel" ), i18n( "Controls how kSirc looks" ), BarIcon( "ksirc", KIcon::SizeMedium ) );
diff --git a/ksirc/KSPrefs/ksprefs.h b/ksirc/KSPrefs/ksprefs.h
index 51ae6562..f09c058f 100644
--- a/ksirc/KSPrefs/ksprefs.h
+++ b/ksirc/KSPrefs/ksprefs.h
@@ -31,7 +31,7 @@ class KSPrefs : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-    KSPrefs(TQWidget * tqparent = 0, const char * name = 0);
+    KSPrefs(TQWidget * parent = 0, const char * name = 0);
     ~KSPrefs();
 
 public slots:
diff --git a/ksirc/KSPrefs/page_autoconnect.cpp b/ksirc/KSPrefs/page_autoconnect.cpp
index 9a6e61ab..49920e42 100644
--- a/ksirc/KSPrefs/page_autoconnect.cpp
+++ b/ksirc/KSPrefs/page_autoconnect.cpp
@@ -26,7 +26,7 @@
 #define PASS 2
 #define SSL  3
 
-PageAutoConnect::PageAutoConnect( TQWidget *tqparent, const char *name ) : PageAutoConnectBase( tqparent, name)
+PageAutoConnect::PageAutoConnect( TQWidget *parent, const char *name ) : PageAutoConnectBase( parent, name)
 {
     KLVAutoConnect->setSorting( 0 );
     //KLVAutoConnect->header()->hide();
@@ -170,25 +170,25 @@ void PageAutoConnect::add_pressed()
         KLVAutoConnect->setCurrentItem(s);
     }
     else { /* update the existing one */
-	TQListViewItem *tqparent;
+	TQListViewItem *parent;
 	TQListViewItem *child;
 
-	if(s->tqparent()){
-	    tqparent = s->tqparent();
+	if(s->parent()){
+	    parent = s->parent();
             child = s;
 	}
 	else {
-	    tqparent = s;
+	    parent = s;
             child = 0x0;
 	}
 
-	tqparent->setText(NAME, ServerLE->text());
-	tqparent->setText(PK, TQString("%1").tqarg(PortKI->value()));
-	tqparent->setText(PASS, PassLE->text());
+	parent->setText(NAME, ServerLE->text());
+	parent->setText(PK, TQString("%1").tqarg(PortKI->value()));
+	parent->setText(PASS, PassLE->text());
 	if(sslCB->isChecked())
-	    tqparent->setText(SSL, i18n("SSL"));
+	    parent->setText(SSL, i18n("SSL"));
 	else
-	    tqparent->setText(SSL, TQString());
+	    parent->setText(SSL, TQString());
 
 	if(child){
 	    child->setText(NAME, ChannelLE->text());
@@ -197,7 +197,7 @@ void PageAutoConnect::add_pressed()
 	else {
 	    if(ChannelLE->text().length() > 0){
                 fnd = 0;
-		TQListViewItem *c = tqparent->firstChild();
+		TQListViewItem *c = parent->firstChild();
 		for( ; c != 0 && fnd == 0; c = c->nextSibling()){
 		    if(c->text(NAME) == ChannelLE->text()){
 			c->setText(PK, KeyLE->text());
@@ -205,7 +205,7 @@ void PageAutoConnect::add_pressed()
 		    }
 		}
 		if(fnd == 0){
-		    new TQListViewItem(tqparent, ChannelLE->text(), KeyLE->text());
+		    new TQListViewItem(parent, ChannelLE->text(), KeyLE->text());
 		}
 	    }
 	}
@@ -260,16 +260,16 @@ void PageAutoConnect::delete_pressed()
 void PageAutoConnect::kvl_clicked(TQListViewItem *it)
 {
     if(it != 0){
-	if(it->tqparent() != 0){
+	if(it->parent() != 0){
 	    ChannelLE->setText(it->text(NAME));
 	    KeyLE->setText(it->text(PK));
 	    AddPB->setText(i18n("&Update"));
 	    /*
-	     * Move it to the tqparent to setup tqparent/server
+	     * Move it to the parent to setup parent/server
 	     * values.  This save writing this code
 	     * in two places.
 	     */
-	    it = it->tqparent();
+	    it = it->parent();
 	}
 	else {
 	    AddPB->setText(i18n("&Update/Add"));
@@ -277,7 +277,7 @@ void PageAutoConnect::kvl_clicked(TQListViewItem *it)
 	    KeyLE->clear();
 	}
 
-	if(it->tqparent() == 0){
+	if(it->parent() == 0){
 	    ServerLE->setText(it->text(NAME));
 	    PortKI->setValue(it->text(PK).toInt());
             PassLE->setText(it->text(PASS));
diff --git a/ksirc/KSPrefs/page_autoconnect.h b/ksirc/KSPrefs/page_autoconnect.h
index cce0f810..40cdfb5c 100644
--- a/ksirc/KSPrefs/page_autoconnect.h
+++ b/ksirc/KSPrefs/page_autoconnect.h
@@ -10,7 +10,7 @@ class PageAutoConnect : public PageAutoConnectBase
   TQ_OBJECT
 
 public:
-    PageAutoConnect( TQWidget* tqparent = 0, const char* name = 0);
+    PageAutoConnect( TQWidget* parent = 0, const char* name = 0);
     ~PageAutoConnect();
 
     void saveConfig();
diff --git a/ksirc/KSPrefs/page_colors.cpp b/ksirc/KSPrefs/page_colors.cpp
index 0aca72ed..c6a3eb9e 100644
--- a/ksirc/KSPrefs/page_colors.cpp
+++ b/ksirc/KSPrefs/page_colors.cpp
@@ -19,7 +19,7 @@
 #include <kcolorbutton.h>
 #include <kdebug.h>
 
-PageColors::PageColors( TQWidget *tqparent, const char *name ) : PageColorsBase( tqparent, name)
+PageColors::PageColors( TQWidget *parent, const char *name ) : PageColorsBase( parent, name)
 {
     changing = 0;
     m_dcol.setAutoDelete(true);
diff --git a/ksirc/KSPrefs/page_colors.h b/ksirc/KSPrefs/page_colors.h
index 4b2313e4..2211dbc2 100644
--- a/ksirc/KSPrefs/page_colors.h
+++ b/ksirc/KSPrefs/page_colors.h
@@ -23,7 +23,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	PageColors( TQWidget *tqparent = 0, const char *name = 0 );
+	PageColors( TQWidget *parent = 0, const char *name = 0 );
 	~PageColors();
 
     void saveConfig();
diff --git a/ksirc/KSPrefs/page_font.cpp b/ksirc/KSPrefs/page_font.cpp
index d10f8925..d320a3f5 100644
--- a/ksirc/KSPrefs/page_font.cpp
+++ b/ksirc/KSPrefs/page_font.cpp
@@ -1,7 +1,7 @@
 #include "page_font.h"
 #include "tqapplication.h"
-PageFont::PageFont( TQWidget *tqparent, const char *name ) : 
-  TQWidget( tqparent, name)
+PageFont::PageFont( TQWidget *parent, const char *name ) : 
+  TQWidget( parent, name)
 {
   tqlayout = new TQHBoxLayout(this);
   fontchooser = new KFontChooser(this);
diff --git a/ksirc/KSPrefs/page_font.h b/ksirc/KSPrefs/page_font.h
index d07babad..fcda96f2 100644
--- a/ksirc/KSPrefs/page_font.h
+++ b/ksirc/KSPrefs/page_font.h
@@ -18,7 +18,7 @@ class PageFont : public TQWidget
   /**
    * Create the Widget
    */
-  PageFont( TQWidget *tqparent = 0, const char *name = 0 );
+  PageFont( TQWidget *parent = 0, const char *name = 0 );
 
 
   /*
diff --git a/ksirc/KSPrefs/page_general.cpp b/ksirc/KSPrefs/page_general.cpp
index f90016a5..51a78ec3 100644
--- a/ksirc/KSPrefs/page_general.cpp
+++ b/ksirc/KSPrefs/page_general.cpp
@@ -15,7 +15,7 @@
 #include "page_general.h"
 #include "../servercontroller.h"
 
-PageGeneral::PageGeneral( TQWidget *tqparent, const char *name ) : PageGeneralBase( tqparent, name)
+PageGeneral::PageGeneral( TQWidget *parent, const char *name ) : PageGeneralBase( parent, name)
 {
 }
 
diff --git a/ksirc/KSPrefs/page_general.h b/ksirc/KSPrefs/page_general.h
index e7e3227c..fb33f7d4 100644
--- a/ksirc/KSPrefs/page_general.h
+++ b/ksirc/KSPrefs/page_general.h
@@ -19,7 +19,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    PageGeneral( TQWidget *tqparent = 0, const char *name = 0 );
+    PageGeneral( TQWidget *parent = 0, const char *name = 0 );
     ~PageGeneral();
 
     void saveConfig();
diff --git a/ksirc/KSPrefs/page_irccolors.cpp b/ksirc/KSPrefs/page_irccolors.cpp
index 5177dc49..5ed96054 100644
--- a/ksirc/KSPrefs/page_irccolors.cpp
+++ b/ksirc/KSPrefs/page_irccolors.cpp
@@ -14,7 +14,7 @@
 #include <kconfig.h>
 #include <kcolorbutton.h>
 
-PageIRCColors::PageIRCColors( TQWidget *tqparent, const char *name ) : PageIRCColorsBase( tqparent, name)
+PageIRCColors::PageIRCColors( TQWidget *parent, const char *name ) : PageIRCColorsBase( parent, name)
 {
 }
 
diff --git a/ksirc/KSPrefs/page_irccolors.h b/ksirc/KSPrefs/page_irccolors.h
index 843a8391..3d8a25b8 100644
--- a/ksirc/KSPrefs/page_irccolors.h
+++ b/ksirc/KSPrefs/page_irccolors.h
@@ -19,7 +19,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    PageIRCColors( TQWidget *tqparent = 0, const char *name = 0 );
+    PageIRCColors( TQWidget *parent = 0, const char *name = 0 );
     ~PageIRCColors();
 
     void saveConfig();
diff --git a/ksirc/KSPrefs/page_looknfeel.cpp b/ksirc/KSPrefs/page_looknfeel.cpp
index f29523b8..29608e04 100644
--- a/ksirc/KSPrefs/page_looknfeel.cpp
+++ b/ksirc/KSPrefs/page_looknfeel.cpp
@@ -16,7 +16,7 @@
 #include <kfiledialog.h>
 #include "page_looknfeel.h"
 
-PageLooknFeel::PageLooknFeel( TQWidget *tqparent, const char *name ) : PageLooknFeelBase( tqparent, name)
+PageLooknFeel::PageLooknFeel( TQWidget *parent, const char *name ) : PageLooknFeelBase( parent, name)
 {
     modePreview->setPixmap(TQPixmap(locate("data","ksirc/pics/sdi.png")));
     wallpaperPathLE->fileDialog()->setFilter( "*.jpg *.png *.gif" );
diff --git a/ksirc/KSPrefs/page_looknfeel.h b/ksirc/KSPrefs/page_looknfeel.h
index cc9d0f08..58c9427b 100644
--- a/ksirc/KSPrefs/page_looknfeel.h
+++ b/ksirc/KSPrefs/page_looknfeel.h
@@ -19,7 +19,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    PageLooknFeel( TQWidget *tqparent = 0, const char *name = 0 );
+    PageLooknFeel( TQWidget *parent = 0, const char *name = 0 );
     ~PageLooknFeel();
 
     void saveConfig();
diff --git a/ksirc/KSPrefs/page_rmbmenu.cpp b/ksirc/KSPrefs/page_rmbmenu.cpp
index c6bb24ee..de30a829 100644
--- a/ksirc/KSPrefs/page_rmbmenu.cpp
+++ b/ksirc/KSPrefs/page_rmbmenu.cpp
@@ -20,7 +20,7 @@
 
 
 
-PageRMBMenu::PageRMBMenu( TQWidget *tqparent, const char *name ) : PageRMBMenuBase( tqparent, name)
+PageRMBMenu::PageRMBMenu( TQWidget *parent, const char *name ) : PageRMBMenuBase( parent, name)
 {
     UserControlMenu *ucm;
 
diff --git a/ksirc/KSPrefs/page_rmbmenu.h b/ksirc/KSPrefs/page_rmbmenu.h
index 39b8cd89..a32e0b27 100644
--- a/ksirc/KSPrefs/page_rmbmenu.h
+++ b/ksirc/KSPrefs/page_rmbmenu.h
@@ -19,7 +19,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    PageRMBMenu( TQWidget *tqparent = 0, const char *name = 0 );
+    PageRMBMenu( TQWidget *parent = 0, const char *name = 0 );
     ~PageRMBMenu();
 
   void saveConfig();
diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp
index e1ed6413..f7587947 100644
--- a/ksirc/KSPrefs/page_servchan.cpp
+++ b/ksirc/KSPrefs/page_servchan.cpp
@@ -15,7 +15,7 @@
 #include <kapplication.h>
 #include <kconfig.h>
 
-PageServChan::PageServChan( TQWidget *tqparent, const char *name ) : PageServChanBase( tqparent, name)
+PageServChan::PageServChan( TQWidget *parent, const char *name ) : PageServChanBase( parent, name)
 {
     connect(serverDeleteItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(deletePressedSL()));
     connect(ServerAddItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(addPressedSL()));
diff --git a/ksirc/KSPrefs/page_servchan.h b/ksirc/KSPrefs/page_servchan.h
index 8db7d223..44efdc5c 100644
--- a/ksirc/KSPrefs/page_servchan.h
+++ b/ksirc/KSPrefs/page_servchan.h
@@ -19,7 +19,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    PageServChan( TQWidget *tqparent = 0, const char *name = 0 );
+    PageServChan( TQWidget *parent = 0, const char *name = 0 );
     ~PageServChan();
 
     void saveConfig();
diff --git a/ksirc/KSPrefs/page_shortcuts.cpp b/ksirc/KSPrefs/page_shortcuts.cpp
index ab30824a..6dce178b 100644
--- a/ksirc/KSPrefs/page_shortcuts.cpp
+++ b/ksirc/KSPrefs/page_shortcuts.cpp
@@ -16,7 +16,7 @@
 #include "page_shortcuts.h"
 #include "../servercontroller.h"
 
-PageShortcuts::PageShortcuts( TQWidget *tqparent, const char *name ) : PageShortcutsBase( tqparent, name)
+PageShortcuts::PageShortcuts( TQWidget *parent, const char *name ) : PageShortcutsBase( parent, name)
 {
     globalGB->setColumnLayout( 0, Qt::Horizontal );
 
diff --git a/ksirc/KSPrefs/page_shortcuts.h b/ksirc/KSPrefs/page_shortcuts.h
index c551db9b..d6d54088 100644
--- a/ksirc/KSPrefs/page_shortcuts.h
+++ b/ksirc/KSPrefs/page_shortcuts.h
@@ -21,7 +21,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    PageShortcuts( TQWidget *tqparent = 0, const char *name = 0 );
+    PageShortcuts( TQWidget *parent = 0, const char *name = 0 );
     ~PageShortcuts();
 
     void saveConfig();
diff --git a/ksirc/KSPrefs/page_startup.cpp b/ksirc/KSPrefs/page_startup.cpp
index 60e3402f..e2ddfdc1 100644
--- a/ksirc/KSPrefs/page_startup.cpp
+++ b/ksirc/KSPrefs/page_startup.cpp
@@ -19,7 +19,7 @@
 
 #include "page_startup.h"
 
-PageStartup::PageStartup( TQWidget *tqparent, const char *name ) : PageStartupBase( tqparent, name)
+PageStartup::PageStartup( TQWidget *parent, const char *name ) : PageStartupBase( parent, name)
 {
     notifyLB->upButton()->hide();
     notifyLB->downButton()->hide();
diff --git a/ksirc/KSPrefs/page_startup.h b/ksirc/KSPrefs/page_startup.h
index ab905770..a12399ff 100644
--- a/ksirc/KSPrefs/page_startup.h
+++ b/ksirc/KSPrefs/page_startup.h
@@ -19,7 +19,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    PageStartup( TQWidget *tqparent = 0, const char *name = 0 );
+    PageStartup( TQWidget *parent = 0, const char *name = 0 );
     ~PageStartup();
 
     void saveConfig();