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

10 files changed, 57 insertions, 57 deletions

diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cc
index 0babda00..c6453575 100644
--- a/karbon/dockers/vcolordocker.cc
+++ b/karbon/dockers/vcolordocker.cc
@@ -51,8 +51,8 @@
 
 #include <kdebug.h>
 
-VColorDocker::VColorDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VColorDocker::VColorDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	m_isStrokeDocker = false;
 	setCaption( i18n( "Color Chooser" ) );
diff --git a/karbon/dockers/vcolordocker.h b/karbon/dockers/vcolordocker.h
index ea8e4c9d..a973d7c6 100644
--- a/karbon/dockers/vcolordocker.h
+++ b/karbon/dockers/vcolordocker.h
@@ -37,7 +37,7 @@ class VColorDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	 VColorDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	 VColorDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 	 virtual ~VColorDocker();
 
 	 virtual bool isStrokeDocker() { return m_isStrokeDocker; };
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 23e4243c..98b0b883 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -61,8 +61,8 @@ static long g_lastKey = 0;
  *  Document tab                                                         *
  *************************************************************************/
 
-VDocumentPreview::VDocumentPreview( KarbonView* view, TQWidget* tqparent )
-		: TQWidget( tqparent, "DocumentPreview" ), m_document( &view->part()->document() ), m_view( view )
+VDocumentPreview::VDocumentPreview( KarbonView* view, TQWidget* parent )
+		: TQWidget( parent, "DocumentPreview" ), m_document( &view->part()->document() ), m_view( view )
 {
 	update();
 	installEventFilter( this );
@@ -220,8 +220,8 @@ VDocumentPreview::paintEvent( TQPaintEvent* )
 	bitBlt( this, 0, 0, &pixmap, 0, 0, width(), height() );
 } // VDocumentPreview::paintEvent
 
-VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* tqparent )
-		: TQWidget( tqparent, "DocumentTab" ), m_view( view )
+VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent )
+		: TQWidget( parent, "DocumentTab" ), m_view( view )
 {
 	TQFrame* frame;
 	TQGridLayout* tqlayout = new TQGridLayout( this );
@@ -303,8 +303,8 @@ VDocumentTab::slotCommandExecuted()
  *  Layers tab                                                           *
  *************************************************************************/
 
-VObjectListViewItem::VObjectListViewItem( TQListViewItem* tqparent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map )
-	: TQListViewItem( tqparent, 0L ), m_object( object ), m_document( doc ), m_key( key ), m_map( map )
+VObjectListViewItem::VObjectListViewItem( TQListViewItem* parent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map )
+	: TQListViewItem( parent, 0L ), m_object( object ), m_document( doc ), m_key( key ), m_map( map )
 {
 	update();
 	// add itself to object list item map
@@ -370,8 +370,8 @@ VObjectListViewItem::compare( TQListViewItem *i, int /*col*/, bool /*ascending*/
 	return m_key < objectItem->m_key ? -1 : 1;
 }
 
-VLayerListViewItem::VLayerListViewItem( TQListView* tqparent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map )
-	: TQCheckListItem( tqparent, 0L, CheckBox ), m_layer( layer ), m_document( doc), m_map( map )
+VLayerListViewItem::VLayerListViewItem( TQListView* parent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map )
+	: TQCheckListItem( parent, 0L, CheckBox ), m_layer( layer ), m_document( doc), m_map( map )
 {
 	update();
 	// add itself to layer list item map
@@ -449,8 +449,8 @@ VLayerListViewItem::compare( TQListViewItem *i, int /*col*/, bool /*ascending*/
 	return m_key < layerItem->m_key ? -1 : 1;
 }
 
-VLayersTab::VLayersTab( KarbonView* view, TQWidget* tqparent )
-		: TQWidget( tqparent, "LayersTab" ), m_view( view ), m_document( &view->part()->document() )
+VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent )
+		: TQWidget( parent, "LayersTab" ), m_view( view ), m_document( &view->part()->document() )
 {
 
 	TQToolButton* button;
@@ -584,12 +584,12 @@ VLayersTab::selectionChangedFromTool()
 			VObjectListViewItem *item = m_objects[ obj ];
 			if( ! item ) 
 			{
-				VLayerListViewItem *layerItem = m_layers[ obj->tqparent() ];
+				VLayerListViewItem *layerItem = m_layers[ obj->parent() ];
 				if( layerItem )
 					updateObjects( layerItem->layer(), layerItem );
 				else
 				{
-					VObjectListViewItem *objectItem = m_objects[ obj->tqparent() ];
+					VObjectListViewItem *objectItem = m_objects[ obj->parent() ];
 					if( objectItem )
 						updateObjects( objectItem->object(), objectItem );
 					else
@@ -982,10 +982,10 @@ VLayersTab::updateObjects( VObject *object, TQListViewItem *item )
 				objectItem = new VObjectListViewItem( item, itr.current(), m_document, objcount, &m_objects );
 				objectItem->update();
 			}
-			else if( objectItem->tqparent() != item )
+			else if( objectItem->parent() != item )
 			{
-				// object found, but has false tqparent -> reparent
-				objectItem->tqparent()->takeItem( objectItem );
+				// object found, but has false parent -> reparent
+				objectItem->parent()->takeItem( objectItem );
 				item->insertItem( objectItem );
 			}
 
@@ -1009,11 +1009,11 @@ VLayersTab::removeDeletedObjectsFromList()
 	// BEWARE: when deleting an item, the iterator is automatically incremented
 	for(; it.current(); )
 	{
-		VLayerListViewItem *layerItem = dynamic_cast<VLayerListViewItem*>( it.current()->tqparent() );
+		VLayerListViewItem *layerItem = dynamic_cast<VLayerListViewItem*>( it.current()->parent() );
 		if( layerItem )
 		{
 			VGroup *group = dynamic_cast<VGroup*>( layerItem->layer() );
-			// check if object of item is still child of object of tqparent item
+			// check if object of item is still child of object of parent item
 			if( group && ! group->objects().contains( it.current()->object() ) )
 			{
 				layerItem->takeItem( it.current() );
@@ -1023,11 +1023,11 @@ VLayersTab::removeDeletedObjectsFromList()
 		}
 		else
 		{
-			VObjectListViewItem *objectItem = dynamic_cast<VObjectListViewItem*>( it.current()->tqparent() );
+			VObjectListViewItem *objectItem = dynamic_cast<VObjectListViewItem*>( it.current()->parent() );
 			if( objectItem ) 
 			{
 				VGroup *group = dynamic_cast<VGroup*>( objectItem->object() );
-				// check if object of item is still child of object of tqparent item
+				// check if object of item is still child of object of parent item
 				if( group && ! group->objects().contains( it.current()->object() ) )
 				{
 					objectItem->takeItem( it.current() );
@@ -1085,12 +1085,12 @@ VLayersTab::slotCommandExecuted( VCommand* command )
  *  History tab                                                          *
  *************************************************************************/
 
-VHistoryGroupItem::VHistoryGroupItem( VHistoryItem* item, TQListView* tqparent, TQListViewItem* after )
-		: TQListViewItem( tqparent, after )
+VHistoryGroupItem::VHistoryGroupItem( VHistoryItem* item, TQListView* parent, TQListViewItem* after )
+		: TQListViewItem( parent, after )
 {
 	setPixmap( 0, *item->pixmap( 0 ) );
 	setText( 0, item->text( 0 ) );
-	tqparent->takeItem( item );
+	parent->takeItem( item );
 	insertItem( item );
 	m_key = item->key( 0, true );
 } // VHistoryItem::VHistoryItem
@@ -1145,14 +1145,14 @@ VHistoryGroupItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& )
 
 } // VHistoryGroupItem::paintFocus
 
-VHistoryItem::VHistoryItem( VCommand* command, TQListView* tqparent, TQListViewItem* after )
-		: TQListViewItem( tqparent, after ), m_command( command )
+VHistoryItem::VHistoryItem( VCommand* command, TQListView* parent, TQListViewItem* after )
+		: TQListViewItem( parent, after ), m_command( command )
 {
 	init();
 } // VHistoryItem::VHistoryItem
 
-VHistoryItem::VHistoryItem( VCommand* command, VHistoryGroupItem* tqparent, TQListViewItem* after )
-		: TQListViewItem( tqparent, after ), m_command( command )
+VHistoryItem::VHistoryItem( VCommand* command, VHistoryGroupItem* parent, TQListViewItem* after )
+		: TQListViewItem( parent, after ), m_command( command )
 {
 	init();
 } // VHistoryItem::VHistoryItem
@@ -1200,8 +1200,8 @@ VHistoryItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& )
 
 } // VHistoryItem::paintFocus
 
-VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* tqparent )
-		: TQWidget( tqparent ), m_part( part )
+VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* parent )
+		: TQWidget( parent ), m_part( part )
 {
 	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
 	tqlayout->setMargin( 3 );
@@ -1298,8 +1298,8 @@ VHistoryTab::commandExecuted( VCommand* command )
 	if ( found )
 	{
 		m_history->repaintItem( item );
-		if ( item->tqparent() )
-			m_history->repaintItem( item->tqparent() );
+		if ( item->parent() )
+			m_history->repaintItem( item->parent() );
 		m_history->ensureItemVisible( item );
 	}
 } // VHistoryTab::commandExecuted
diff --git a/karbon/dockers/vdocumentdocker.h b/karbon/dockers/vdocumentdocker.h
index 4f60949a..f88bdf7f 100644
--- a/karbon/dockers/vdocumentdocker.h
+++ b/karbon/dockers/vdocumentdocker.h
@@ -43,7 +43,7 @@ class VDocumentPreview : public TQWidget
   TQ_OBJECT
 
 	public:
-		VDocumentPreview( KarbonView* view, TQWidget* tqparent = 0 );
+		VDocumentPreview( KarbonView* view, TQWidget* parent = 0 );
 		~VDocumentPreview();
 
 		void reset();
@@ -67,7 +67,7 @@ class VDocumentTab : public TQWidget
   TQ_OBJECT
 
 	public:
-		VDocumentTab( KarbonView* view, TQWidget* tqparent );
+		VDocumentTab( KarbonView* view, TQWidget* parent );
 		~VDocumentTab();
 
 	public slots:
@@ -94,7 +94,7 @@ class VDocumentTab : public TQWidget
 class VLayerListViewItem : public TQCheckListItem
 {
 public:
-	VLayerListViewItem( TQListView* tqparent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map );
+	VLayerListViewItem( TQListView* parent, VLayer* layer, VDocument *doc, TQPtrDict<VLayerListViewItem> *map );
 	virtual ~VLayerListViewItem();
 
 	VLayer* layer() { return m_layer; }
@@ -117,7 +117,7 @@ private:
 class VObjectListViewItem : public TQListViewItem
 {
 public:
-	VObjectListViewItem( TQListViewItem* tqparent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map );
+	VObjectListViewItem( TQListViewItem* parent, VObject* object, VDocument *doc, uint key, TQPtrDict<VObjectListViewItem> *map );
 	virtual ~VObjectListViewItem();
 
 	VObject* object() { return m_object; }
@@ -138,7 +138,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	VLayersTab( KarbonView* view, TQWidget* tqparent = 0 );
+	VLayersTab( KarbonView* view, TQWidget* parent = 0 );
 	~VLayersTab();
 
 public slots:
@@ -185,7 +185,7 @@ class VHistoryItem;
 class VHistoryGroupItem : public TQListViewItem
 {
 	public:
-		VHistoryGroupItem( VHistoryItem* item, TQListView* tqparent, TQListViewItem* after );
+		VHistoryGroupItem( VHistoryItem* item, TQListView* parent, TQListViewItem* after );
 		~VHistoryGroupItem();
 
 		void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align );
@@ -201,8 +201,8 @@ class VHistoryGroupItem : public TQListViewItem
 class VHistoryItem : public TQListViewItem
 {
 	public:
-		VHistoryItem( VCommand* command, TQListView* tqparent, TQListViewItem* after );
-		VHistoryItem( VCommand* command, VHistoryGroupItem* tqparent, TQListViewItem* after );
+		VHistoryItem( VCommand* command, TQListView* parent, TQListViewItem* after );
+		VHistoryItem( VCommand* command, VHistoryGroupItem* parent, TQListViewItem* after );
 		~VHistoryItem();
 
 		VCommand* command() { return m_command; }
@@ -226,7 +226,7 @@ class VHistoryTab : public TQWidget
   TQ_OBJECT
 
 	public:
-		VHistoryTab( KarbonPart* part, TQWidget* tqparent );
+		VHistoryTab( KarbonPart* part, TQWidget* parent );
 		~VHistoryTab();
 
 		bool groupingEnabled();
diff --git a/karbon/dockers/vstrokedocker.cc b/karbon/dockers/vstrokedocker.cc
index fb3dce28..f30b3042 100644
--- a/karbon/dockers/vstrokedocker.cc
+++ b/karbon/dockers/vstrokedocker.cc
@@ -39,8 +39,8 @@
 
 #include "vstrokedocker.h"
 
-VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VStrokeDocker::VStrokeDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	setCaption( i18n( "Stroke Properties" ) );
 
diff --git a/karbon/dockers/vstrokedocker.h b/karbon/dockers/vstrokedocker.h
index 742387a7..a470619a 100644
--- a/karbon/dockers/vstrokedocker.h
+++ b/karbon/dockers/vstrokedocker.h
@@ -36,7 +36,7 @@ class VStrokeDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	 VStrokeDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	 VStrokeDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 
 public slots:
 	virtual void setStroke( const VStroke & );
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc
index fcf317f6..5b7633b1 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cc
@@ -46,8 +46,8 @@
 
 #include <unistd.h>
 
-ClipartChooser::ClipartChooser( TQSize iconSize, TQWidget *tqparent, const char *name )
-	: KoIconChooser( iconSize, tqparent, name )
+ClipartChooser::ClipartChooser( TQSize iconSize, TQWidget *parent, const char *name )
+	: KoIconChooser( iconSize, parent, name )
 {
 	setDragEnabled( true );
 }
@@ -72,8 +72,8 @@ ClipartChooser::startDrag()
 	kd->dragCopy();
 }
 
-VStyleDocker::VStyleDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VStyleDocker::VStyleDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	setCaption( i18n( "Resources" ) );
 
@@ -123,8 +123,8 @@ VStyleDocker::mouseReleaseEvent( TQMouseEvent * )
 {
 }
 
-ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* tqparent )
-	: TQWidget( tqparent ), m_part( part )
+ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* parent )
+	: TQWidget( parent ), m_part( part )
 {
 	KIconLoader il;
 
diff --git a/karbon/dockers/vstyledocker.h b/karbon/dockers/vstyledocker.h
index 026a7d97..f994d53e 100644
--- a/karbon/dockers/vstyledocker.h
+++ b/karbon/dockers/vstyledocker.h
@@ -35,7 +35,7 @@ class VClipartIconItem;
 class ClipartChooser : public KoIconChooser
 {
 public:
-	ClipartChooser( TQSize iconSize, TQWidget *tqparent = 0L, const char *name = 0L );
+	ClipartChooser( TQSize iconSize, TQWidget *parent = 0L, const char *name = 0L );
 	virtual void startDrag();
 };
 
@@ -45,7 +45,7 @@ class ClipartWidget : public TQWidget
   TQ_OBJECT
 
 public:
-	ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* tqparent = 0L );
+	ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonPart *part, TQWidget* parent = 0L );
 	~ClipartWidget();
 
 	VClipartIconItem* selectedClipart();
@@ -74,7 +74,7 @@ class VStyleDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	 VStyleDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	 VStyleDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 	 virtual ~VStyleDocker();
 
 public slots:
diff --git a/karbon/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cc
index 76c91de6..7e93577b 100644
--- a/karbon/dockers/vtransformdocker.cc
+++ b/karbon/dockers/vtransformdocker.cc
@@ -37,8 +37,8 @@
 
 #include "vtransformdocker.h"
 
-VTransformDocker::VTransformDocker( KarbonPart* part, KarbonView* tqparent, const char* /*name*/ )
-	: TQWidget(), m_part ( part ), m_view( tqparent )
+VTransformDocker::VTransformDocker( KarbonPart* part, KarbonView* parent, const char* /*name*/ )
+	: TQWidget(), m_part ( part ), m_view( parent )
 {
 	setCaption( i18n( "Transform" ) );
 
diff --git a/karbon/dockers/vtransformdocker.h b/karbon/dockers/vtransformdocker.h
index 8e2f21e8..712b86f4 100644
--- a/karbon/dockers/vtransformdocker.h
+++ b/karbon/dockers/vtransformdocker.h
@@ -31,7 +31,7 @@ class VTransformDocker : public TQWidget
   TQ_OBJECT
 
 public:
-	VTransformDocker( KarbonPart* part, KarbonView* tqparent = 0L, const char* name = 0L );
+	VTransformDocker( KarbonPart* part, KarbonView* parent = 0L, const char* name = 0L );
 
 public slots:
 	void update();