1 files changed, 17 insertions, 17 deletions

diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp
index 2f0de9aea..6fe731933 100644
--- a/kicker/kicker/ui/kickoff_bar.cpp
+++ b/kicker/kicker/ui/kickoff_bar.cpp
@@ -56,10 +56,10 @@ void KickoffTabBar::paint(TQPainter* p, TQTab* t, bool selected) const
 //    else if(t == d->pressed)
 //        flags |= TQStyle::Style_Sunken;
     //selection flags
-    if(t->rect().contains(mapFromGlobal(TQCursor::pos())))
+    if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos())))
         flags |= TQStyle::Style_MouseOver;
-    style().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(),
-            colorGroup(), flags, TQStyleOption(t) );
+    tqstyle().tqdrawControl( TQStyle::CE_TabBarTab, p, this, t->rect(),
+            tqcolorGroup(), flags, TQStyleOption(t) );
 
     paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() );
 }
@@ -70,11 +70,11 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha
     TQRect r = br;
 
     bool selected = m_tabsActivated && (currentTab() == t->identifier());
-    int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this );
+    int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this );
 
     p->setFont( font() );
     TQFontMetrics fm = p->fontMetrics();
-    int fw = fm.size( Qt::SingleLine|Qt::ShowPrefix, t->text() ).width();
+    int fw = fm.size( TQt::SingleLine|TQt::ShowPrefix, t->text() ).width();
 
     TQRect rt(r);
     rt.setWidth(fw);
@@ -114,30 +114,30 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha
         flags |= TQStyle::Style_Selected;
  //   else if(t == d->pressed)
  //       flags |= TQStyle::Style_Sunken;
-    if(t->rect().contains(mapFromGlobal(TQCursor::pos())))
+    if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos())))
         flags |= TQStyle::Style_MouseOver;
-    style().drawControl( TQStyle::CE_TabBarLabel, p, this, rt,
-            t->isEnabled() ? colorGroup(): palette().disabled(),
+    tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, rt,
+            t->isEnabled() ? tqcolorGroup(): tqpalette().disabled(),
             flags, TQStyleOption(t) );
 }
 
-TQSize KickoffTabBar::sizeHint() const
+TQSize KickoffTabBar::tqsizeHint() const
 {
-    TQSize s = TQTabBar::sizeHint();
+    TQSize s = TQTabBar::tqsizeHint();
 
     return s;
 }
 
 void KickoffTabBar::layoutTabs()
 {
-    TQTabBar::layoutTabs();
+    TQTabBar::tqlayoutTabs();
 
     TQFontMetrics fm = fontMetrics();
     int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4;
 
-    int hframe = style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
-    int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this );
-    int overlap = style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
+    int hframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
+    int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this );
+    int overlap = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
 
     TQSize s;
     for (int t = 0; t < count(); ++t)
@@ -155,13 +155,13 @@ void KickoffTabBar::layoutTabs()
             h += 4 + s.height() + 4;
         TQRect r = tab->rect();
 
-        int fw = fm.size( Qt::SingleLine|Qt::ShowPrefix, tab->text() ).width();
+        int fw = fm.size( TQt::SingleLine|TQt::ShowPrefix, tab->text() ).width();
         int iw = 0;
         if ( tab->iconSet() != 0 )
             iw = tab->iconSet()->pixmap( TQIconSet::Large, TQIconSet::Normal ).width();
         int w = QMAX(iw, fw + 6 + 6 ) + hframe;
         h += ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + vframe;
-        tab->setRect(TQRect(TQPoint(x, 0), style().sizeFromContents(TQStyle::CT_TabBarTab, this,
+        tab->setRect(TQRect(TQPoint(x, 0), tqstyle().tqsizeFromContents(TQStyle::CT_TabBarTab, this,
                     TQSize(w, h), TQStyleOption(tab))));
         x += tab->rect().width() - overlap;
     }
@@ -185,7 +185,7 @@ void KickoffTabBar::dragMoveEvent(TQDragMoveEvent* event)
 
 void KickoffTabBar::mousePressEvent( TQMouseEvent * e )
 {
-    if ( e->button() != LeftButton ) {
+    if ( e->button() != Qt::LeftButton ) {
 	e->ignore();
 	return;
     }