1 files changed, 16 insertions, 16 deletions

diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp
index 539984466..4a296a284 100644
--- a/tdeui/kurllabel.cpp
+++ b/tdeui/kurllabel.cpp
@@ -37,7 +37,7 @@ public:
   Private (const TQString& url, KURLLabel* label)
     : URL (url),
       LinkColor (TDEGlobalSettings::linkColor()),
-      HighlightedLinkColor (Qt::red),
+      HighlightedLinkColor (TQt::red),
       Tip(url),
       Cursor (0L),
       Underline (true),
@@ -50,7 +50,7 @@ public:
       MarginAltered(false),
       Timer (new TQTimer (label))
   {
-    connect (Timer, TQT_SIGNAL (timeout ()), label, TQT_SLOT (updateColor ()));
+    connect (Timer, TQ_SIGNAL (timeout ()), label, TQ_SLOT (updateColor ()));
   }
 
   ~Private ()
@@ -87,7 +87,7 @@ KURLLabel::KURLLabel (const TQString& url, const TQString& text,
   setFont (font());
   setUseCursor (true);
   setLinkColor (d->LinkColor);
-  setFocusPolicy( TQ_StrongFocus ); //better accessibility
+  setFocusPolicy( TQWidget::StrongFocus ); //better accessibility
   setMouseTracking (true);
 }
 
@@ -98,7 +98,7 @@ KURLLabel::KURLLabel (TQWidget* parent, const char* name)
   setFont (font());
   setUseCursor (true);
   setLinkColor (d->LinkColor);
-  setFocusPolicy( TQ_StrongFocus ); //better accessibility
+  setFocusPolicy( TQWidget::StrongFocus ); //better accessibility
   setMouseTracking (true);
 }
 
@@ -122,17 +122,17 @@ void KURLLabel::mouseReleaseEvent (TQMouseEvent* e)
 
   switch (e->button())
     {
-    case Qt::LeftButton:
+    case TQt::LeftButton:
       emit leftClickedURL ();
       emit leftClickedURL (d->URL);
       break;
 
-    case Qt::MidButton:
+    case TQt::MidButton:
       emit middleClickedURL ();
       emit middleClickedURL (d->URL);
       break;
 
-    case Qt::RightButton:
+    case TQt::RightButton:
       emit rightClickedURL ();
       emit rightClickedURL (d->URL);
       break;
@@ -308,7 +308,7 @@ void KURLLabel::enterEvent (TQEvent* e)
   TQLabel::enterEvent (e);
 
   TQRect r( activeRect() );
-  if (!r.contains( TQT_TQMOUSEEVENT(e)->pos() ))
+  if (!r.contains( static_cast<TQMouseEvent*>(e)->pos() ))
     return;
 
   if (!d->AltPixmap.isNull() && pixmap())
@@ -355,7 +355,7 @@ bool KURLLabel::event (TQEvent *e)
   {
     // use parentWidget() unless you are a toplevel widget, then try qAapp
     TQPalette p = parentWidget() ? parentWidget()->palette() : tqApp->palette();
-    p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background));
+    p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
     p.setColor(TQColorGroup::Foreground, palette().active().foreground());
     setPalette(p);
     d->LinkColor = TDEGlobalSettings::linkColor();
@@ -367,13 +367,13 @@ bool KURLLabel::event (TQEvent *e)
     if (result && hasFocus()) {
         TQPainter p(this);
         TQRect r( activeRect() );
-        style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
+        style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
     }
     return result;
   }
   else if (e->type() == TQEvent::KeyPress) {
-    TQKeyEvent* ke = TQT_TQKEYEVENT(e);
-    if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return) {
+    TQKeyEvent* ke = static_cast<TQKeyEvent*>(e);
+    if (ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Return) {
       setLinkColor (d->HighlightedLinkColor);
       d->Timer->start (300);
       emit leftClickedURL ();
@@ -384,12 +384,12 @@ bool KURLLabel::event (TQEvent *e)
   }
   else if (e->type() == TQEvent::MouseButtonPress) {
     TQRect r( activeRect() );
-    d->MousePressed = r.contains(TQT_TQMOUSEEVENT(e)->pos());
+    d->MousePressed = r.contains(static_cast<TQMouseEvent*>(e)->pos());
   }
   else if (e->type() == TQEvent::MouseMove) {
     if (d->Cursor) {
       TQRect r( activeRect() );
-      bool inside = r.contains(TQT_TQMOUSEEVENT(e)->pos());
+      bool inside = r.contains(static_cast<TQMouseEvent*>(e)->pos());
       if (d->WasInsideRect != inside) {
         if (inside)
           TQLabel::setCursor(*d->Cursor);
@@ -428,11 +428,11 @@ void KURLLabel::setMargin( int margin )
   d->MarginAltered = true;
 }
 
-void KURLLabel::setFocusPolicy( TQ_FocusPolicy policy )
+void KURLLabel::setFocusPolicy( TQWidget::FocusPolicy policy )
 {
   TQLabel::setFocusPolicy(policy);
   if (!d->MarginAltered) {
-      TQLabel::setMargin(policy == TQ_NoFocus ? 0 : 3); //better default : better look when focused
+      TQLabel::setMargin(policy == TQWidget::NoFocus ? 0 : 3); //better default : better look when focused
   }
 }