rename the following methods:

tqparent parent
tqmask mask


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

8 files changed, 20 insertions, 20 deletions

diff --git a/karbon/dialogs/vcolordlg.cc b/karbon/dialogs/vcolordlg.cc
index b12d983b..90548045 100644
--- a/karbon/dialogs/vcolordlg.cc
+++ b/karbon/dialogs/vcolordlg.cc
@@ -24,8 +24,8 @@
 #include "vcolordlg.h"
 #include "vcolortab.h"
 
-VColorDlg::VColorDlg( const VColor &c, TQWidget* tqparent, const char* name )
-	: KDialogBase ( tqparent, name, true, i18n( "Uniform Color" ),
+VColorDlg::VColorDlg( const VColor &c, TQWidget* parent, const char* name )
+	: KDialogBase ( parent, name, true, i18n( "Uniform Color" ),
 		KDialogBase::Ok | KDialogBase::Cancel )
 {
 	m_colortab = new VColorTab( VColor( c ), this, name );
diff --git a/karbon/dialogs/vcolordlg.h b/karbon/dialogs/vcolordlg.h
index 92fc0857..97e53d27 100644
--- a/karbon/dialogs/vcolordlg.h
+++ b/karbon/dialogs/vcolordlg.h
@@ -33,7 +33,7 @@ class VColorDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VColorDlg( const VColor &c, TQWidget* tqparent = 0L, const char* name = 0L );
+	VColorDlg( const VColor &c, TQWidget* parent = 0L, const char* name = 0L );
 
 	VColor Color();
 
diff --git a/karbon/dialogs/vcolortab.cc b/karbon/dialogs/vcolortab.cc
index f66a9ced..56fecc0b 100644
--- a/karbon/dialogs/vcolortab.cc
+++ b/karbon/dialogs/vcolortab.cc
@@ -34,8 +34,8 @@
 #include <kdebug.h>
 
 
-VColorTab::VColorTab( const VColor &c, TQWidget* tqparent, const char* name )
-	: TQTabWidget( tqparent, name )
+VColorTab::VColorTab( const VColor &c, TQWidget* parent, const char* name )
+	: TQTabWidget( parent, name )
 {
 	TQGridLayout *mainLayout;
 
diff --git a/karbon/dialogs/vcolortab.h b/karbon/dialogs/vcolortab.h
index 5397cdb8..c705b675 100644
--- a/karbon/dialogs/vcolortab.h
+++ b/karbon/dialogs/vcolortab.h
@@ -37,7 +37,7 @@ class VColorTab : public TQTabWidget
   TQ_OBJECT
 
 public:
-	VColorTab( const VColor &c, TQWidget* tqparent = 0L, const char* name = 0L );
+	VColorTab( const VColor &c, TQWidget* parent = 0L, const char* name = 0L );
 
 	VColor Color();
 
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc
index ba86b313..141006dc 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cc
@@ -43,29 +43,29 @@
 #include "vconfiguredlg.h"
 
 
-VConfigureDlg::VConfigureDlg( KarbonView* tqparent )
+VConfigureDlg::VConfigureDlg( KarbonView* parent )
 		: KDialogBase( KDialogBase::IconList, i18n( "Configure" ),
 					   KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel | KDialogBase::Default,
-					   KDialogBase::Ok, tqparent )
+					   KDialogBase::Ok, parent )
 
 {
 	TQVBox * page = addVBoxPage(
 					   i18n( "Interface" ), i18n( "Interface" ),
 					   BarIcon( "misc", KIcon::SizeMedium ) );
 
-	m_interfacePage = new VConfigInterfacePage( tqparent, page );
+	m_interfacePage = new VConfigInterfacePage( parent, page );
 
 	page = addVBoxPage(
 			   i18n( "Misc" ), i18n( "Misc" ),
 			   BarIcon( "misc", KIcon::SizeMedium ) );
 
-	m_miscPage = new VConfigMiscPage( tqparent, page );
+	m_miscPage = new VConfigMiscPage( parent, page );
 
 	page = addVBoxPage(
 			   i18n( "Grid" ), i18n( "Grid" ),
 			   BarIcon( "grid", KIcon::SizeMedium ) );
 
-	m_gridPage = new VConfigGridPage( tqparent, page );
+	m_gridPage = new VConfigGridPage( parent, page );
 
 	connect( m_miscPage, TQT_SIGNAL( unitChanged( int ) ), m_gridPage, TQT_SLOT( slotUnitChanged( int ) ) );
 
@@ -73,7 +73,7 @@ VConfigureDlg::VConfigureDlg( KarbonView* tqparent )
 			   i18n( "Document" ), i18n( "Document Settings" ),
 			   BarIcon( "document", KIcon::SizeMedium ) );
 
-	m_defaultDocPage = new VConfigDefaultPage( tqparent, page );
+	m_defaultDocPage = new VConfigDefaultPage( parent, page );
 	connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApply() ) );
 }
 
@@ -105,7 +105,7 @@ void VConfigureDlg::slotDefault()
 
 VConfigInterfacePage::VConfigInterfacePage( KarbonView* view,
 		TQVBox* box, char* name )
-		: TQObject( box->tqparent(), name )
+		: TQObject( box->parent(), name )
 {
 	m_view = view;
 	m_config = KarbonFactory::instance()->config();
@@ -210,7 +210,7 @@ void VConfigInterfacePage::slotDefault()
 
 
 VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name )
-		: TQObject( box->tqparent(), name )
+		: TQObject( box->parent(), name )
 {
     m_view = view;
     m_config = KarbonFactory::instance()->config();
@@ -283,7 +283,7 @@ void VConfigMiscPage::slotDefault()
 }
 
 VConfigGridPage::VConfigGridPage( KarbonView* view, TQVBox* page, char* name )
-		: TQObject( page->tqparent(), name )
+		: TQObject( page->parent(), name )
 {
 	m_view = view;
 	KoUnit::Unit unit = view->part()->document().unit();
@@ -378,7 +378,7 @@ void VConfigGridPage::slotDefault()
 
 VConfigDefaultPage::VConfigDefaultPage( KarbonView* view,
                                         TQVBox* box, char* name )
-    : TQObject( box->tqparent(), name )
+    : TQObject( box->parent(), name )
 {
     m_view = view;
 
diff --git a/karbon/dialogs/vconfiguredlg.h b/karbon/dialogs/vconfiguredlg.h
index dd12eba2..2ba989de 100644
--- a/karbon/dialogs/vconfiguredlg.h
+++ b/karbon/dialogs/vconfiguredlg.h
@@ -151,7 +151,7 @@ class VConfigureDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VConfigureDlg( KarbonView* tqparent );
+	VConfigureDlg( KarbonView* parent );
 
 public slots:
 	void slotApply();
diff --git a/karbon/dialogs/vstrokedlg.cc b/karbon/dialogs/vstrokedlg.cc
index 8dcfa9f9..2428de11 100644
--- a/karbon/dialogs/vstrokedlg.cc
+++ b/karbon/dialogs/vstrokedlg.cc
@@ -39,8 +39,8 @@
 #include "vstrokedlg.h"
 #include "vcolortab.h"
 
-VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* tqparent, const char* name )
-	: KDialogBase ( tqparent, name, true, i18n( "Stroke" ), Ok | Cancel ), m_part( part )
+VStrokeDlg::VStrokeDlg( KarbonPart* part, TQWidget* parent, const char* name )
+	: KDialogBase ( parent, name, true, i18n( "Stroke" ), Ok | Cancel ), m_part( part )
 {
 	enableButtonSeparator( true );
 	TQTabWidget *mainWidget = new TQTabWidget( this, "strokemain" );
diff --git a/karbon/dialogs/vstrokedlg.h b/karbon/dialogs/vstrokedlg.h
index a75a8727..eab40610 100644
--- a/karbon/dialogs/vstrokedlg.h
+++ b/karbon/dialogs/vstrokedlg.h
@@ -37,7 +37,7 @@ class VStrokeDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	VStrokeDlg( KarbonPart* part, TQWidget* tqparent = 0L, const char* name = 0L );
+	VStrokeDlg( KarbonPart* part, TQWidget* parent = 0L, const char* name = 0L );
 
 private:
 	VColorTab* m_colortab;