rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 35 insertions, 35 deletions

diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index f52191a6..f8779fa9 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -47,9 +47,9 @@ using namespace Diff2;
 
 KompareListViewFrame::KompareListViewFrame( bool isSource,
                                             ViewSettings* settings,
-                                            KompareSplitter* tqparent,
+                                            KompareSplitter* parent,
                                             const char* name ):
-	TQFrame ( tqparent, name ),
+	TQFrame ( parent, name ),
 	m_view ( isSource, settings, this, name ),
 	m_label ( isSource?"Source":"Dest", this ),
 	m_layout ( this )
@@ -69,11 +69,11 @@ KompareListViewFrame::KompareListViewFrame( bool isSource,
 	m_layout.addWidget(&m_view);
 
 	connect( &m_view, TQT_SIGNAL(differenceClicked(const Diff2::Difference*)),
-	         tqparent, TQT_SLOT(slotDifferenceClicked(const Diff2::Difference*)) );
+	         parent, TQT_SLOT(slotDifferenceClicked(const Diff2::Difference*)) );
 
-	connect( tqparent, TQT_SIGNAL(scrollViewsToId(int)), &m_view, TQT_SLOT(scrollToId(int)) );
-	connect( tqparent, TQT_SIGNAL(setXOffset(int)), &m_view, TQT_SLOT(setXOffset(int)) );
-	connect( &m_view, TQT_SIGNAL(resized()), tqparent, TQT_SLOT(slotUpdateScrollBars()) );
+	connect( parent, TQT_SIGNAL(scrollViewsToId(int)), &m_view, TQT_SLOT(scrollToId(int)) );
+	connect( parent, TQT_SIGNAL(setXOffset(int)), &m_view, TQT_SLOT(setXOffset(int)) );
+	connect( &m_view, TQT_SIGNAL(resized()), parent, TQT_SLOT(slotUpdateScrollBars()) );
 }
 
 void KompareListViewFrame::slotSetModel( const DiffModel* model )
@@ -98,8 +98,8 @@ void KompareListViewFrame::slotSetModel( const DiffModel* model )
 
 KompareListView::KompareListView( bool isSource,
                                   ViewSettings* settings,
-                                  TQWidget* tqparent, const char* name ) :
-	KListView( tqparent, name ),
+                                  TQWidget* parent, const char* name ) :
+	KListView( parent, name ),
 	m_isSource( isSource ),
 	m_settings( settings ),
 	m_scrollId( -1 ),
@@ -125,7 +125,7 @@ KompareListView::KompareListView( bool isSource,
 	setFocusPolicy( TQ_NoFocus );
 	setFont( m_settings->m_font );
 	setSpaces( m_settings->m_tabToNumberOfSpaces );
-	setFocusProxy( tqparent->parentWidget() );
+	setFocusProxy( parent->parentWidget() );
 }
 
 KompareListView::~KompareListView()
@@ -410,7 +410,7 @@ void KompareListView::setSpaces( int spaces )
 
 void KompareListView::wheelEvent( TQWheelEvent* e )
 {
-	e->ignore(); // we want the tqparent to catch wheel events
+	e->ignore(); // we want the parent to catch wheel events
 }
 
 void KompareListView::resizeEvent( TQResizeEvent* e )
@@ -420,28 +420,28 @@ void KompareListView::resizeEvent( TQResizeEvent* e )
 	kdDebug() << "resizeEvent " << endl;
 }
 
-KompareListViewItem::KompareListViewItem( KompareListView* tqparent )
-	: TQListViewItem( tqparent ),
+KompareListViewItem::KompareListViewItem( KompareListView* parent )
+	: TQListViewItem( parent ),
 	m_scrollId( 0 )
 {
 //	kdDebug(8104) << "Created KompareListViewItem with scroll id " << m_scrollId << endl;
 }
 
-KompareListViewItem::KompareListViewItem( KompareListView* tqparent, KompareListViewItem* after )
-	: TQListViewItem( tqparent, after ),
+KompareListViewItem::KompareListViewItem( KompareListView* parent, KompareListViewItem* after )
+	: TQListViewItem( parent, after ),
 	m_scrollId( after->scrollId() + after->maxHeight() )
 {
 //	kdDebug(8104) << "Created KompareListViewItem with scroll id " << m_scrollId << endl;
 }
 
-KompareListViewItem::KompareListViewItem( KompareListViewItem* tqparent )
-	: TQListViewItem( tqparent ),
+KompareListViewItem::KompareListViewItem( KompareListViewItem* parent )
+	: TQListViewItem( parent ),
 	m_scrollId( 0 )
 {
 }
 
-KompareListViewItem::KompareListViewItem( KompareListViewItem* tqparent, KompareListViewItem* /*after*/ )
-	: TQListViewItem( tqparent ),
+KompareListViewItem::KompareListViewItem( KompareListViewItem* parent, KompareListViewItem* /*after*/ )
+	: TQListViewItem( parent ),
 	m_scrollId( 0 )
 {
 }
@@ -456,8 +456,8 @@ void KompareListViewItem::paintFocus( TQPainter* /* p */, const TQColorGroup& /*
 	// Don't paint anything
 }
 
-KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* tqparent, Difference* difference )
-	: KompareListViewItem( tqparent ),
+KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* parent, Difference* difference )
+	: KompareListViewItem( parent ),
 	m_difference( difference ),
 	m_sourceItem( 0L ),
 	m_destItem( 0L )
@@ -465,8 +465,8 @@ KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* tqparent, Dif
 	init();
 }
 
-KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* tqparent, KompareListViewItem* after, Difference* difference )
-	: KompareListViewItem( tqparent, after ),
+KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* parent, KompareListViewItem* after, Difference* difference )
+	: KompareListViewItem( parent, after ),
 	m_difference( difference ),
 	m_sourceItem( 0L ),
 	m_destItem( 0L )
@@ -525,8 +525,8 @@ void KompareListViewDiffItem::setSelected( bool b )
 	}
 }
 
-KompareListViewLineContainerItem::KompareListViewLineContainerItem( KompareListViewDiffItem* tqparent, bool isSource )
-	: KompareListViewItem( tqparent ),
+KompareListViewLineContainerItem::KompareListViewLineContainerItem( KompareListViewDiffItem* parent, bool isSource )
+	: KompareListViewItem( parent ),
 	m_isSource( isSource )
 {
 //	kdDebug(8104) << "isSource ? " << (isSource ? " Yes!" : " No!") << endl;
@@ -554,7 +554,7 @@ void KompareListViewLineContainerItem::setup()
 
 KompareListViewDiffItem* KompareListViewLineContainerItem::diffItemParent() const
 {
-	return (KompareListViewDiffItem*)tqparent();
+	return (KompareListViewDiffItem*)parent();
 }
 
 int KompareListViewLineContainerItem::lineCount() const
@@ -575,8 +575,8 @@ DifferenceString* KompareListViewLineContainerItem::lineAt( int i ) const
 	                    diffItemParent()->difference()->destinationLineAt( i );
 }
 
-KompareListViewLineItem::KompareListViewLineItem( KompareListViewLineContainerItem* tqparent, int line, DifferenceString* text )
-	: KompareListViewItem( tqparent )
+KompareListViewLineItem::KompareListViewLineItem( KompareListViewLineContainerItem* parent, int line, DifferenceString* text )
+	: KompareListViewItem( parent )
 {
 	setText( COL_LINE_NO, TQString::number( line ) );
 	setText( COL_MAIN, text->string() );
@@ -618,7 +618,7 @@ void KompareListViewLineItem::paintCell( TQPainter * p, const TQColorGroup & cg,
 	if ( diffItemParent()->isSelected() )
 	{
 		p->setPen( bg.dark(135) );
-		if ( this == tqparent()->firstChild() )
+		if ( this == parent()->firstChild() )
 			p->drawLine( 0, 0, width, 0 );
 		if ( nextSibling() == 0 )
 			p->drawLine( 0, height() - 1, width, height() - 1 );
@@ -713,12 +713,12 @@ void KompareListViewLineItem::paintText( TQPainter* p, const TQColor& bg, int co
 
 KompareListViewDiffItem* KompareListViewLineItem::diffItemParent() const
 {
-	KompareListViewLineContainerItem* p = (KompareListViewLineContainerItem*)tqparent();
+	KompareListViewLineContainerItem* p = (KompareListViewLineContainerItem*)parent();
 	return p->diffItemParent();
 }
 
-KompareListViewBlankLineItem::KompareListViewBlankLineItem( KompareListViewLineContainerItem* tqparent )
-	: KompareListViewLineItem( tqparent, 0, new DifferenceString() )
+KompareListViewBlankLineItem::KompareListViewBlankLineItem( KompareListViewLineContainerItem* parent )
+	: KompareListViewLineItem( parent, 0, new DifferenceString() )
 {
 }
 
@@ -737,16 +737,16 @@ void KompareListViewBlankLineItem::paintText( TQPainter* p, const TQColor& bg, i
 	}
 }
 
-KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* tqparent, DiffHunk* hunk, bool zeroHeight )
-	: KompareListViewItem( tqparent ),
+KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* parent, DiffHunk* hunk, bool zeroHeight )
+	: KompareListViewItem( parent ),
 	m_zeroHeight( zeroHeight ),
 	m_hunk( hunk )
 {
 	setSelectable( false );
 }
 
-KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* tqparent, KompareListViewItem* after, DiffHunk* hunk,  bool zeroHeight )
-	: KompareListViewItem( tqparent, after ),
+KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* parent, KompareListViewItem* after, DiffHunk* hunk,  bool zeroHeight )
+	: KompareListViewItem( parent, after ),
 	m_zeroHeight( zeroHeight ),
 	m_hunk( hunk )
 {