1 files changed, 13 insertions, 15 deletions

diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index 4617ecb66..0a3dfe771 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -129,11 +129,11 @@ KateCodeCompletion::KateCodeCompletion( KateView* view )
   m_completionPopup->setFocusProxy( m_view->m_viewInternal );
 
   m_pArgHint = new KateArgHint( m_view );
-  connect( m_pArgHint, TQT_SIGNAL(argHintHidden()),
-           this, TQT_SIGNAL(argHintHidden()) );
+  connect( m_pArgHint, TQ_SIGNAL(argHintHidden()),
+           this, TQ_SIGNAL(argHintHidden()) );
 
-  connect( m_view, TQT_SIGNAL(cursorPositionChanged()),
-           this, TQT_SLOT(slotCursorPosChanged()) );
+  connect( m_view, TQ_SIGNAL(cursorPositionChanged()),
+           this, TQ_SLOT(slotCursorPosChanged()) );
 }
 
 KateCodeCompletion::~KateCodeCompletion()
@@ -163,9 +163,9 @@ void KateCodeCompletion::showCompletionBox(
 
 bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e )
 {
-  if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionPopup) &&
-       TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox) &&
-       TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox->viewport()) )
+  if ( o != m_completionPopup &&
+       o != m_completionListBox &&
+       o != m_completionListBox->viewport() )
     return false;
 
    if( e->type() == TQEvent::Hide )
@@ -185,7 +185,7 @@ bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e )
    }
 
    if ( e->type() == TQEvent::MouseButtonPress ) {
-    TQTimer::singleShot(0, this, TQT_SLOT(showComment()));
+    TQTimer::singleShot(0, this, TQ_SLOT(showComment()));
     return false;
    }
 
@@ -207,7 +207,7 @@ void KateCodeCompletion::handleKey (TQKeyEvent *e)
         (e->key() == Key_Home ) || (e->key() == Key_End)   ||
         (e->key() == Key_Prior) || (e->key() == Key_Next ))
   {
-    TQTimer::singleShot(0,this,TQT_SLOT(showComment()));
+    TQTimer::singleShot(0,this,TQ_SLOT(showComment()));
     TQApplication::sendEvent( m_completionListBox, (TQEvent*)e );
     return;
   }
@@ -324,7 +324,7 @@ void KateCodeCompletion::updateBox( bool )
   m_completionListBox->setFocus();
   m_completionPopup->show();
 
-  TQTimer::singleShot(0,this,TQT_SLOT(showComment()));
+  TQTimer::singleShot(0,this,TQ_SLOT(showComment()));
 }
 
 void KateCodeCompletion::showArgHint ( TQStringList functionList, const TQString& strWrapping, const TQString& strDelimiter )
@@ -395,7 +395,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name )
     : TQFrame( parent, name, (WFlags)WType_Popup )
 {
     setBackgroundColor( black );
-    setPaletteForegroundColor( Qt::black );
+    setPaletteForegroundColor( TQt::black );
 
     labelDict.setAutoDelete( true );
     layout = new TQVBoxLayout( this, 1, 2 );
@@ -404,7 +404,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name )
 
     m_markCurrentFunction = true;
 
-    setFocusPolicy( TQ_StrongFocus );
+    setFocusPolicy( TQWidget::StrongFocus );
     setFocusProxy( parent );
 
     reset( -1, -1 );
@@ -533,7 +533,7 @@ void KateArgHint::show()
 bool KateArgHint::eventFilter( TQObject*, TQEvent* e )
 {
     if( isVisible() && e->type() == TQEvent::KeyPress ){
-        TQKeyEvent* ke = TQT_TQKEYEVENT( e );
+        TQKeyEvent* ke = static_cast<TQKeyEvent*>( e );
         if( (ke->state() & ControlButton) && ke->key() == Key_Left ){
             setCurrentFunction( currentFunction() - 1 );
             ke->accept();
@@ -562,5 +562,3 @@ void KateArgHint::adjustSize( )
     if( x() + width() > screen.x() + screen.width() )
         move( screen.x() + screen.width() - width(), y() );
 }
-
-// kate: space-indent on; indent-width 2; replace-tabs on;