1 files changed, 16 insertions, 16 deletions

diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp
index 354a4a590..edba44247 100644
--- a/konqueror/konq_combo.cpp
+++ b/konqueror/konq_combo.cpp
@@ -122,17 +122,17 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
     // Make the lineedit consume the Key_Enter event...
     setTrapReturnKey( true );
 
-    connect( KonqHistoryManager::kself(), TQT_SIGNAL(cleared()), TQT_SLOT(slotCleared()) );
-    connect( this, TQT_SIGNAL(cleared() ), TQT_SLOT(slotCleared()) );
-    connect( this, TQT_SIGNAL(highlighted( int )), TQT_SLOT(slotSetIcon( int )) );
-    connect( this, TQT_SIGNAL(activated( const TQString& )),
-             TQT_SLOT(slotActivated( const TQString& )) );
+    connect( KonqHistoryManager::kself(), TQ_SIGNAL(cleared()), TQ_SLOT(slotCleared()) );
+    connect( this, TQ_SIGNAL(cleared() ), TQ_SLOT(slotCleared()) );
+    connect( this, TQ_SIGNAL(highlighted( int )), TQ_SLOT(slotSetIcon( int )) );
+    connect( this, TQ_SIGNAL(activated( const TQString& )),
+             TQ_SLOT(slotActivated( const TQString& )) );
 
     setHistoryEditorEnabled( true ); 
-    connect( this, TQT_SIGNAL(removed( const TQString&) ), TQT_SLOT(slotRemoved( const TQString& )) );
+    connect( this, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(slotRemoved( const TQString& )) );
 
-    if ( !kapp->dcopClient()->isAttached() )
-        kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+        tdeApp->dcopClient()->attach();
 }
 
 KonqCombo::~KonqCombo()
@@ -157,8 +157,8 @@ void KonqCombo::setURL( const TQString& url )
         m_returnPressed = false;      
         TQByteArray data;
         TQDataStream s( data, IO_WriteOnly );
-        s << url << kapp->dcopClient()->defaultObject();
-        kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+        s << url << tdeApp->dcopClient()->defaultObject();
+        tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface",
                                   "addToCombo(TQString,TQCString)", data);
     }
     // important security consideration: always display the beginning
@@ -399,7 +399,7 @@ bool KonqCombo::eventFilter( TQObject *o, TQEvent *ev )
     if ( o == edit ) {
         int type = ev->type();
         if ( type == TQEvent::KeyPress ) {
-            TQKeyEvent *e = TQT_TQKEYEVENT( ev );
+            TQKeyEvent *e = static_cast<TQKeyEvent*>( ev );
 
             if ( e->key() == Key_Return || e->key() == Key_Enter ) {
                 m_modifier = e->state();
@@ -506,16 +506,16 @@ void KonqCombo::slotCleared()
 {
     TQByteArray data;
     TQDataStream s( data, IO_WriteOnly );
-    s << kapp->dcopClient()->defaultObject();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(TQCString)", data);
+    s << tdeApp->dcopClient()->defaultObject();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "comboCleared(TQCString)", data);
 }
 
 void KonqCombo::slotRemoved( const TQString& item )
 {
     TQByteArray data;
     TQDataStream s( data, IO_WriteOnly );
-    s << item << kapp->dcopClient()->defaultObject();
-    kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+    s << item << tdeApp->dcopClient()->defaultObject();
+    tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface",
                                "removeFromCombo(TQString,TQCString)", data);
 }
 
@@ -632,7 +632,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe )
         p.fillRect( re.right() - pix.width() - 3 , re.y(), pix.width() + 4, re.height(), 
 		    TQBrush( useColor ? color : edit->paletteBackgroundColor() ));
         p.drawPixmap( re.right() - pix.width() -1 , re.y() + ( re.height() - pix.height() ) / 2, pix );
-        p.setClipping( FALSE );
+        p.setClipping( false );
     }
     else {
         TQRect r = edit->geometry();