Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

10 files changed, 33 insertions, 33 deletions

diff --git a/kopete/libkopete/ui/addressbooklinkwidget_base.ui b/kopete/libkopete/ui/addressbooklinkwidget_base.ui
index 652e292a..8fc4c46f 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget_base.ui
+++ b/kopete/libkopete/ui/addressbooklinkwidget_base.ui
@@ -70,7 +70,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui
index f67300df..276620be 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget_base.ui
+++ b/kopete/libkopete/ui/addressbookselectorwidget_base.ui
@@ -165,8 +165,8 @@
 <includes>
     <include location="global" impldecl="in declaration">klistviewsearchline.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/kopete/libkopete/ui/contactaddednotifywidget.ui b/kopete/libkopete/ui/contactaddednotifywidget.ui
index 6517c1e0..100e6eca 100644
--- a/kopete/libkopete/ui/contactaddednotifywidget.ui
+++ b/kopete/libkopete/ui/contactaddednotifywidget.ui
@@ -248,7 +248,7 @@ Leave it empty if you want to see the contact nickname as display name.</string>
 	   <header>addressbooklinkwidget.h</header>
     </customwidget>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kopete/libkopete/ui/fileconfirmbase.ui b/kopete/libkopete/ui/fileconfirmbase.ui
index 412ea20e..cd91863d 100644
--- a/kopete/libkopete/ui/fileconfirmbase.ui
+++ b/kopete/libkopete/ui/fileconfirmbase.ui
@@ -140,7 +140,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/libkopete/ui/kopeteawaydialogbase.ui b/kopete/libkopete/ui/kopeteawaydialogbase.ui
index 26eb3590..be81b276 100644
--- a/kopete/libkopete/ui/kopeteawaydialogbase.ui
+++ b/kopete/libkopete/ui/kopeteawaydialogbase.ui
@@ -81,5 +81,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp
index eb755f29..91b251a9 100644
--- a/kopete/libkopete/ui/kopetelistview.cpp
+++ b/kopete/libkopete/ui/kopetelistview.cpp
@@ -68,7 +68,7 @@ ToolTip::~ToolTip()
 
 void ToolTip::maybeTip( const TQPoint &pos )
 {
-	if( !tqparentWidget() || !m_listView )
+	if( !parentWidget() || !m_listView )
 		return;
 
 	if( Item *item = dynamic_cast<Item*>( m_listView->itemAt( pos ) ) )
@@ -122,7 +122,7 @@ ListView::ListView( TQWidget *tqparent, const char *name )
 
 	// clear the appropriate flags from the viewport - qt docs say we have to tqmask
 	// these flags out of the TQListView to make weirdly painted list items work, but
-	// that doesn't do the job. tqmasking them out of the viewport does.
+	// that doesn't do the job. masking them out of the viewport does.
 //	class MyWidget : public TQWidget { public: using TQWidget::clearWFlags; };
 //	static_cast<MyWidget*>( viewport() )->clearWFlags( WStaticContents );
 //	static_cast<MyWidget*>( viewport() )->setWFlags( WNoAutoErase );
diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp
index 6e6aad72..1f23da15 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.cpp
+++ b/kopete/libkopete/ui/kopetelistviewitem.cpp
@@ -1227,17 +1227,17 @@ class Item::Private
 {
 public:
 	Private( Item *item )
-	 : tqlayoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) )
+	 : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) )
 	 , animateLayout( true ), opacity( 1.0 )
 	 , visibilityTimer( theVisibilityTimer(), item, TQT_SLOT( slotUpdateVisibility() ) )
 	 , visibilityLevel( 0 ), visibilityTarget( false ), searchMatch( true )
 	{
 	}
 
-	TQTimer tqlayoutTimer;
+	TQTimer layoutTimer;
 
-	//TQTimer tqlayoutAnimateTimer;
-	SharedTimerRef tqlayoutAnimateTimer;
+	//TQTimer layoutAnimateTimer;
+	SharedTimerRef layoutAnimateTimer;
 	SharedTimer &theLayoutAnimateTimer()
 	{
 		static SharedTimer timer( 10 );
@@ -1245,8 +1245,8 @@ public:
 	}
 	
 	bool animateLayout;
-	int tqlayoutAnimateSteps;
-	static const int tqlayoutAnimateStepsTotal = 10;
+	int layoutAnimateSteps;
+	static const int layoutAnimateStepsTotal = 10;
 
 	float opacity;
 
@@ -1306,8 +1306,8 @@ void Item::setEffects( bool animation, bool fading, bool folding )
 void Item::initLVI()
 {
 	connect( listView()->header(), TQT_SIGNAL( sizeChange( int, int, int ) ), TQT_SLOT( slotColumnResized() ) );
-	connect( &d->tqlayoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) );
-	//connect( &d->tqlayoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) );
+	connect( &d->layoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) );
+	//connect( &d->layoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) );
 	//connect( &d->visibilityTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateVisibility() ) );
 	setVisible( false );
 	setTargetVisibility( true );
@@ -1323,13 +1323,13 @@ void Item::slotColumnResized()
 void Item::scheduleLayout()
 {
 	// perform a delayed tqlayout in order to speed it all up
-	if ( ! d->tqlayoutTimer.isActive() )
-		d->tqlayoutTimer.start( 30, true );
+	if ( ! d->layoutTimer.isActive() )
+		d->layoutTimer.start( 30, true );
 }
 
 void Item::slotLayoutItems()
 {
-	d->tqlayoutTimer.stop();
+	d->layoutTimer.stop();
 
 	for ( uint n = 0; n < components(); ++n )
 	{
@@ -1347,14 +1347,14 @@ void Item::slotLayoutItems()
 
 	if ( Private::animateChanges && d->animateLayout && !d->visibilityTimer.isActive() )
 	{
-		d->tqlayoutAnimateTimer.start();
-		//if ( !d->tqlayoutAnimateTimer.isActive() )
-		//	d->tqlayoutAnimateTimer.start( 10 );
-		d->tqlayoutAnimateSteps = 0;
+		d->layoutAnimateTimer.start();
+		//if ( !d->layoutAnimateTimer.isActive() )
+		//	d->layoutAnimateTimer.start( 10 );
+		d->layoutAnimateSteps = 0;
 	}
 	else
 	{
-		d->tqlayoutAnimateSteps = Private::tqlayoutAnimateStepsTotal;
+		d->layoutAnimateSteps = Private::layoutAnimateStepsTotal;
 		d->animateLayout = true;
 	}
 	slotLayoutAnimateItems();
@@ -1362,11 +1362,11 @@ void Item::slotLayoutItems()
 
 void Item::slotLayoutAnimateItems()
 {
-	if ( ++d->tqlayoutAnimateSteps >= Private::tqlayoutAnimateStepsTotal )
-		d->tqlayoutAnimateTimer.stop();
+	if ( ++d->layoutAnimateSteps >= Private::layoutAnimateStepsTotal )
+		d->layoutAnimateTimer.stop();
 
-	const int s = Private::tqlayoutAnimateStepsTotal;
-	const int p = TQMIN( d->tqlayoutAnimateSteps, s );
+	const int s = Private::layoutAnimateStepsTotal;
+	const int p = TQMIN( d->layoutAnimateSteps, s );
 
 	updateAnimationPosition( p, s );
 	setHeight(0);
@@ -1457,7 +1457,7 @@ void Item::slotUpdateVisibility()
 void Item::tqrepaint()
 {
 	// if we're about to retqlayout, don't bother painting yet.
-	if ( d->tqlayoutTimer.isActive() )
+	if ( d->layoutTimer.isActive() )
 		return;
 	listView()->repaintItem( this );
 }
diff --git a/kopete/libkopete/ui/kopetepassworddialog.ui b/kopete/libkopete/ui/kopetepassworddialog.ui
index 40a94ca8..6007a139 100644
--- a/kopete/libkopete/ui/kopetepassworddialog.ui
+++ b/kopete/libkopete/ui/kopetepassworddialog.ui
@@ -105,5 +105,5 @@
     <tabstop>m_password</tabstop>
     <tabstop>m_save_passwd</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui
index ecdfda7a..468efd56 100644
--- a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui
+++ b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui
@@ -91,7 +91,7 @@
 <tabstops>
     <tabstop>mRemembered</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpassdlg.h</includehint>
 </includehints>
diff --git a/kopete/libkopete/ui/metacontactselectorwidget_base.ui b/kopete/libkopete/ui/metacontactselectorwidget_base.ui
index 1fd35317..52d946b9 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget_base.ui
+++ b/kopete/libkopete/ui/metacontactselectorwidget_base.ui
@@ -97,8 +97,8 @@
     <include location="local" impldecl="in declaration">kopetelistview.h</include>
     <include location="global" impldecl="in declaration">tqheader.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
     <includehint>kopetelistviewsearchline.h</includehint>