TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 18 insertions, 18 deletions

diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp
index 9630592c..eb755f29 100644
--- a/kopete/libkopete/ui/kopetelistview.cpp
+++ b/kopete/libkopete/ui/kopetelistview.cpp
@@ -41,13 +41,13 @@ namespace ListView {
 /*
  Custom TQToolTip for the list view.
  The decision whether or not to show tooltips is taken in
- maybeTip(). See also the TQListView sources from Qt itself.
+ maybeTip(). See also the TQListView sources from TQt itself.
  Delegates to the list view items.
 */
-class ToolTip : public QToolTip
+class ToolTip : public TQToolTip
 {
 public:
-	ToolTip( TQWidget *parent, ListView *lv );
+	ToolTip( TQWidget *tqparent, ListView *lv );
 	virtual ~ToolTip();
 
 	void maybeTip( const TQPoint &pos );
@@ -56,8 +56,8 @@ private:
 	ListView *m_listView;
 };
 
-ToolTip::ToolTip( TQWidget *parent, ListView *lv )
- : TQToolTip( parent )
+ToolTip::ToolTip( TQWidget *tqparent, ListView *lv )
+ : TQToolTip( tqparent )
 {
 	m_listView = lv;
 }
@@ -68,19 +68,19 @@ ToolTip::~ToolTip()
 
 void ToolTip::maybeTip( const TQPoint &pos )
 {
-	if( !parentWidget() || !m_listView )
+	if( !tqparentWidget() || !m_listView )
 		return;
 
 	if( Item *item = dynamic_cast<Item*>( m_listView->itemAt( pos ) ) )
 	{
-		TQRect itemRect = m_listView->itemRect( item );
+		TQRect tqitemRect = m_listView->tqitemRect( item );
 
 		uint leftMargin = m_listView->treeStepSize() *
 		   ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) +
 		   m_listView->itemMargin();
 
-		uint xAdjust = itemRect.left() + leftMargin;
-		uint yAdjust = itemRect.top();
+		uint xAdjust = tqitemRect.left() + leftMargin;
+		uint yAdjust = tqitemRect.top();
 		TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust );
 
 		std::pair<TQString,TQRect> toolTip = item->toolTip( relativePos );
@@ -88,7 +88,7 @@ void ToolTip::maybeTip( const TQPoint &pos )
 			return;
 
 		toolTip.second.moveBy( xAdjust, yAdjust );
-// 		kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: itemRect: "
+// 		kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: tqitemRect: "
 // 		                 << toolTip.second << ", tooltip:  " << toolTip.first << endl;
 		tip( toolTip.second, toolTip.first );
 	}
@@ -102,8 +102,8 @@ struct ListView::Private
 	Private() {}
 };
 
-ListView::ListView( TQWidget *parent, const char *name )
- : KListView( parent, name ), d( new Private )
+ListView::ListView( TQWidget *tqparent, const char *name )
+ : KListView( tqparent, name ), d( new Private )
 {
 	connect( &d->sortTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSort() ) );
 
@@ -120,9 +120,9 @@ ListView::ListView( TQWidget *parent, const char *name )
 	clearWFlags( WStaticContents );
 	setWFlags( WNoAutoErase );
 
-	// clear the appropriate flags from the viewport - qt docs say we have to mask
+	// 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. masking them out of the viewport does.
+	// that doesn't do the job. tqmasking 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 );
@@ -174,7 +174,7 @@ void ListView::setShowTreeLines( bool bShowAsTree )
 		setRootIsDecorated( false );
 		setTreeStepSize( 0 );
 	}
-	// TODO: relayout all items. their width may have changed, but they won't know about it.
+	// TODO: retqlayout all items. their width may have changed, but they won't know about it.
 }
 
 /* This is a small hack ensuring that only F2 triggers inline
@@ -188,12 +188,12 @@ void ListView::setShowTreeLines( bool bShowAsTree )
 void ListView::keyPressEvent( TQKeyEvent *e )
 {
 	TQListViewItem *item = currentItem();
-	if ( (e->key() == Qt::Key_F2) && item && item->isVisible() )
+	if ( (e->key() == TQt::Key_F2) && item && item->isVisible() )
 		rename( item, 0 );
-	else if ( (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) && item && item->isVisible() )
+	else if ( (e->key() == TQt::Key_Enter || e->key() == TQt::Key_Return) && item && item->isVisible() )
 	{
 		// must provide a point within the item; emitExecute checks for this
-		TQPoint p = viewport()->mapToGlobal(itemRect(item).center());
+		TQPoint p = viewport()->mapToGlobal(tqitemRect(item).center());
 		emitExecute( currentItem(), p, 0 );
 	}
 	else