From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 03:45:53 +0000
Subject: Revert automated changes Sorry guys, they are just not ready for
 prime time Work will continue as always

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdeui/kurllabel.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'kdeui/kurllabel.cpp')

diff --git a/kdeui/kurllabel.cpp b/kdeui/kurllabel.cpp
index 0457fcef0..d4d4ff7c0 100644
--- a/kdeui/kurllabel.cpp
+++ b/kdeui/kurllabel.cpp
@@ -114,7 +114,7 @@ void KURLLabel::mouseReleaseEvent (TQMouseEvent* e)
     return;
   d->MousePressed = false;
   TQRect r( activeRect() );
-  if (!r.tqcontains(e->pos()))
+  if (!r.contains(e->pos()))
     return;
 
   setLinkColor (d->HighlightedLinkColor);
@@ -162,7 +162,7 @@ void KURLLabel::updateColor ()
   d->Timer->stop();
 
   TQRect r( activeRect() );
-  if (!(d->Glow || d->Float) || !r.tqcontains (mapFromGlobal(TQCursor::pos())))
+  if (!(d->Glow || d->Float) || !r.contains (mapFromGlobal(TQCursor::pos())))
     setLinkColor (d->LinkColor);
 }
 
@@ -308,7 +308,7 @@ void KURLLabel::enterEvent (TQEvent* e)
   TQLabel::enterEvent (e);
 
   TQRect r( activeRect() );
-  if (!r.tqcontains( static_cast<TQMouseEvent*>(e)->pos() ))
+  if (!r.contains( static_cast<TQMouseEvent*>(e)->pos() ))
     return;
 
   if (!d->AltPixmap.isNull() && pixmap())
@@ -353,8 +353,8 @@ bool KURLLabel::event (TQEvent *e)
 {
   if (e && e->type() == TQEvent::ParentPaletteChange)
   {
-    // use tqparentWidget() unless you are a toplevel widget, then try qAapp
-    TQPalette p = tqparentWidget() ? tqparentWidget()->palette() : tqApp->palette();
+    // use parentWidget() unless you are a toplevel widget, then try qAapp
+    TQPalette p = parentWidget() ? parentWidget()->palette() : qApp->palette();
     p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background));
     p.setColor(TQColorGroup::Foreground, palette().active().foreground());
     setPalette(p);
@@ -367,7 +367,7 @@ bool KURLLabel::event (TQEvent *e)
     if (result && hasFocus()) {
         TQPainter p(this);
         TQRect r( activeRect() );
-        style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, tqcolorGroup() );
+        style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
     }
     return result;
   }
@@ -384,12 +384,12 @@ bool KURLLabel::event (TQEvent *e)
   }
   else if (e->type() == TQEvent::MouseButtonPress) {
     TQRect r( activeRect() );
-    d->MousePressed = r.tqcontains(static_cast<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.tqcontains(static_cast<TQMouseEvent*>(e)->pos());
+      bool inside = r.contains(static_cast<TQMouseEvent*>(e)->pos());
       if (d->WasInsideRect != inside) {
         if (inside)
           TQLabel::setCursor(*d->Cursor);
@@ -407,7 +407,7 @@ TQRect KURLLabel::activeRect() const
   TQRect r( contentsRect() );
   if (text().isEmpty() || (!d->MarginAltered && sizePolicy() == TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)))
       return r; //fixed size is sometimes used with pixmap
-  int hAlign = TQApplication::horizontalAlignment( tqalignment() );
+  int hAlign = TQApplication::horizontalAlignment( alignment() );
   int indentX = (hAlign && indent()>0) ? indent() : 0;
   TQFontMetrics fm(font());
   r.setWidth( QMIN(fm.width(text()), r.width()));
@@ -436,9 +436,9 @@ void KURLLabel::setFocusPolicy( FocusPolicy policy )
   }
 }
 
-void KURLLabel::tqsetSizePolicy ( TQSizePolicy policy )
+void KURLLabel::setSizePolicy ( TQSizePolicy policy )
 {
-  TQLabel::tqsetSizePolicy(policy);
+  TQLabel::setSizePolicy(policy);
   if (!d->MarginAltered && policy.horData()==TQSizePolicy::Fixed && policy.verData()==TQSizePolicy::Fixed) {
       TQLabel::setMargin(0); //better default : better look when fixed size
   }
-- 
cgit v1.2.1