1 files changed, 22 insertions, 22 deletions

diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index 04b78f389..284cc3386 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -61,23 +61,23 @@ TDEIconView::TDEIconView( TQWidget *parent, const char *name, WFlags f )
 {
     d = new TDEIconViewPrivate;
 
-    connect( this, TQT_SIGNAL( onViewport() ),
-             this, TQT_SLOT( slotOnViewport() ) );
-    connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ),
-             this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) );
+    connect( this, TQ_SIGNAL( onViewport() ),
+             this, TQ_SLOT( slotOnViewport() ) );
+    connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ),
+             this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) );
     slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
-    if ( kapp ) { // maybe null when used inside designer
-        connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
-        kapp->addKipcEventMask( KIPC::SettingsChanged );
+    if ( tdeApp ) { // maybe null when used inside designer
+        connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
+        tdeApp->addKipcEventMask( KIPC::SettingsChanged );
     }
 
     m_pCurrentItem = 0L;
 
     m_pAutoSelect = new TQTimer( this );
-    connect( m_pAutoSelect, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotAutoSelect() ) );
+    connect( m_pAutoSelect, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotAutoSelect() ) );
 
-    connect( &d->dragHoldTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragHoldTimeout()) );
+    connect( &d->dragHoldTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragHoldTimeout()) );
 }
 
 TDEIconView::~TDEIconView()
@@ -128,25 +128,25 @@ void TDEIconView::slotSettingsChanged(int category)
     m_bUseSingle = TDEGlobalSettings::singleClick();
     //kdDebug() << "TDEIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl;
 
-    disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *,
+    disconnect( this, TQ_SIGNAL( mouseButtonClicked( int, TQIconViewItem *,
 						  const TQPoint & ) ),
-		this, TQT_SLOT( slotMouseButtonClicked( int, TQIconViewItem *,
+		this, TQ_SLOT( slotMouseButtonClicked( int, TQIconViewItem *,
 						    const TQPoint & ) ) );
-//         disconnect( this, TQT_SIGNAL( doubleClicked( TQIconViewItem *,
+//         disconnect( this, TQ_SIGNAL( doubleClicked( TQIconViewItem *,
 // 						 const TQPoint & ) ),
-// 		    this, TQT_SLOT( slotExecute( TQIconViewItem *,
+// 		    this, TQ_SLOT( slotExecute( TQIconViewItem *,
 // 					     const TQPoint & ) ) );
 
     if( m_bUseSingle ) {
-      connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *,
+      connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQIconViewItem *,
 						 const TQPoint & ) ),
-	       this, TQT_SLOT( slotMouseButtonClicked( int, TQIconViewItem *,
+	       this, TQ_SLOT( slotMouseButtonClicked( int, TQIconViewItem *,
 						   const TQPoint & ) ) );
     }
     else {
-//         connect( this, TQT_SIGNAL( doubleClicked( TQIconViewItem *,
+//         connect( this, TQ_SIGNAL( doubleClicked( TQIconViewItem *,
 // 					      const TQPoint & ) ),
-//                  this, TQT_SLOT( slotExecute( TQIconViewItem *,
+//                  this, TQ_SLOT( slotExecute( TQIconViewItem *,
 // 					  const TQPoint & ) ) );
     }
 
@@ -310,7 +310,7 @@ void TDEIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
   TQIconViewItem* item = findItem( e->pos() );
 
   if( item ) {
-    if( (e->button() == Qt::LeftButton) && !m_bUseSingle )
+    if( (e->button() == TQt::LeftButton) && !m_bUseSingle )
       emitExecute( item, e->globalPos() );
 
     emit doubleClicked( item, e->globalPos() );
@@ -324,7 +324,7 @@ void TDEIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const T
   if( d->doubleClickIgnoreTimer.isActive() )
     return; // Ignore double click
     
-  if( (btn == Qt::LeftButton) && item )
+  if( (btn == TQt::LeftButton) && item )
     emitExecute( item, pos );
 }
 
@@ -388,7 +388,7 @@ void TDEIconView::cancelPendingHeldSignal()
 void TDEIconView::wheelEvent( TQWheelEvent *e )
 {
     if (horizontalScrollBar() && (arrangement() == TQIconView::TopToBottom)) {
-        TQWheelEvent ce(e->pos(), e->delta(), e->state(), Qt::Horizontal);
+        TQWheelEvent ce(e->pos(), e->delta(), e->state(), TQt::Horizontal);
         TQApplication::sendEvent( horizontalScrollBar(), &ce);
 	if (ce.isAccepted()) {
             e->accept();
@@ -757,7 +757,7 @@ void TDEIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg )
         p->setPen( TQPen( cg.highlightedText() ) );
     }
     else {
-        if ( iconView()->itemTextBackground() != Qt::NoBrush ) {
+        if ( iconView()->itemTextBackground() != TQt::NoBrush ) {
             p->fillRect( textRect( false ), iconView()->itemTextBackground() );
         }
         p->setPen( cg.text() );