Rename obsolete tq methods to standard names

18 files changed, 73 insertions, 73 deletions

diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 6d81e3bfb..2fa530deb 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -86,23 +86,23 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
     settings = new SettingsWidgetImp(prefs, zone, 0, "General");
     connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
 
-    settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
-    settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
+    settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background());
 
     // Digital
     digitalPage = new DigitalWidget(0, "DigitalClock");
     settings->widgetStack->addWidget(digitalPage, 1);
-    digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
+    digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background());
 
     // Analog
     analogPage = new AnalogWidget(0, "AnalogClock");
     settings->widgetStack->addWidget(analogPage, 2);
-    analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
+    analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background());
 
     // Fuzzy
     fuzzyPage = new FuzzyWidget(0, "FuzzyClock");
     settings->widgetStack->addWidget(fuzzyPage, 3);
-    fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
+    fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background());
 
     connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
             TQT_SLOT(dateToggled()));
@@ -386,7 +386,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
         p.drawTiledPixmap(0, 0, width(), height(), lcdPattern);
     }
     else if (_prefs->digitalBackgroundColor() !=
-             KApplication::tqpalette().active().background())
+             KApplication::palette().active().background())
     {
         p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor());
     }
@@ -553,7 +553,7 @@ void AnalogClock::paintEvent( TQPaintEvent * )
 
         paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern);
     }
-    else if (_prefs->analogBackgroundColor() != KApplication::tqpalette().active().background())
+    else if (_prefs->analogBackgroundColor() != KApplication::palette().active().background())
     {
         _spPx->fill(_prefs->analogBackgroundColor());
     }
@@ -1169,7 +1169,7 @@ void ClockApplet::preferences(bool timezone)
 
 void ClockApplet::updateFollowBackground()
 {
-    TQColor globalBgroundColor = KApplication::tqpalette().active().background();
+    TQColor globalBgroundColor = KApplication::palette().active().background();
     TQColor bgColor;
     
     switch (_prefs->type())
@@ -1306,7 +1306,7 @@ void ClockApplet::setTimerTo60()
 
 void ClockApplet::setBackground()
 {
-    TQColor globalBgroundColor = KApplication::tqpalette().active().background();
+    TQColor globalBgroundColor = KApplication::palette().active().background();
     TQColor fgColor, bgColor;
     
     if (!_clock)
@@ -1371,7 +1371,7 @@ void ClockApplet::globalPaletteChange()
     if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting)
         return;
     
-    TQColor globalBgroundColor = KApplication::tqpalette().active().background();
+    TQColor globalBgroundColor = KApplication::palette().active().background();
     
     if (m_dateFollowBackgroundSetting)
         _prefs->setDateBackgroundColor(globalBgroundColor);
@@ -1605,7 +1605,7 @@ void ClockApplet::slotCopyMenuActivated( int id )
 {
     TQPopupMenu *m = (TQPopupMenu *) sender();
     TQString s = m->text(id);
-    TQApplication::tqclipboard()->setText(s);
+    TQApplication::clipboard()->setText(s);
 }
 
 TQTime ClockApplet::clockGetTime()
diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg
index 6abd26ceb..04beba322 100644
--- a/kicker/applets/clock/clockapplet.kcfg
+++ b/kicker/applets/clock/clockapplet.kcfg
@@ -20,11 +20,11 @@
   <group name="Date">
     <entry name="DateForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::tqpalette().active().text()</default>
+      <default code="true">KApplication::palette().active().text()</default>
     </entry>
     <entry name="DateBackgroundColor" type="Color" key="Background_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::tqpalette().active().background()</default>
+      <default code="true">KApplication::palette().active().background()</default>
     </entry>
     <entry name="DateFont" type="Font" key="Font">
       <label>Font for the clock.</label>
@@ -63,11 +63,11 @@ defFont.setBold(true);
     </entry>
     <entry name="PlainForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::tqpalette().active().text()</default>
+      <default code="true">KApplication::palette().active().text()</default>
     </entry>
     <entry name="PlainBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::tqpalette().active().background()</default>
+      <default code="true">KApplication::palette().active().background()</default>
     </entry>
   </group>
   <group name="Digital">
@@ -89,15 +89,15 @@ defFont.setBold(true);
     </entry>
     <entry name="DigitalForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::tqpalette().active().text()</default>
+      <default code="true">KApplication::palette().active().text()</default>
     </entry>
     <entry name="DigitalBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::tqpalette().active().background()</default>
+      <default code="true">KApplication::palette().active().background()</default>
     </entry>
     <entry name="DigitalShadowColor" type="Color" key="Shadow_Color">
       <label>Shadow color.</label>
-      <default code="true">KApplication::tqpalette().active().mid()</default>
+      <default code="true">KApplication::palette().active().mid()</default>
     </entry>
     <entry name="DigitalBlink" type="Bool" key="Blink">
       <label>Blink</label>
@@ -127,15 +127,15 @@ defFont.setBold(true);
     </entry>
     <entry name="AnalogForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::tqpalette().active().text()</default>
+      <default code="true">KApplication::palette().active().text()</default>
     </entry>
     <entry name="AnalogBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::tqpalette().active().background()</default>
+      <default code="true">KApplication::palette().active().background()</default>
     </entry>
     <entry name="AnalogShadowColor" type="Color" key="Shadow_Color">
       <label>Shadow color.</label>
-      <default code="true">KApplication::tqpalette().active().mid()</default>
+      <default code="true">KApplication::palette().active().mid()</default>
     </entry>
     <entry name="AnalogLCDStyle" type="Bool" key="LCD_Style">
       <label>LCD Style</label>
@@ -168,11 +168,11 @@ defFont=KGlobalSettings::generalFont();
     </entry>
     <entry name="FuzzyForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::tqpalette().active().text()</default>
+      <default code="true">KApplication::palette().active().text()</default>
     </entry>
     <entry name="FuzzyBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::tqpalette().active().background()</default>
+      <default code="true">KApplication::palette().active().background()</default>
     </entry>
     <entry name="Fuzzyness" type="Int">
       <label>Fuzzyness</label>
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index 1e71fbd6f..0f240fcea 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -145,7 +145,7 @@ void MediumButton::slotCopy()
 {
     KonqDrag * obj = KonqDrag::newDrag(mFileItem.url(), false);
     
-    TQApplication::tqclipboard()->setData( obj );
+    TQApplication::clipboard()->setData( obj );
 }
 
 void MediumButton::dragEnterEvent(TQDragEnterEvent* e)
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
index aaca4213e..007e46b81 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
@@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
   }
 
  // Now strip 'tdeinit:' prefix.
-  TQString tqunicode(TQString::fromLocal8Bit(s));
+  TQString unicode(TQString::fromLocal8Bit(s));
 
 #elif defined(__OpenBSD__)
   int mib[4] ;
@@ -280,12 +280,12 @@ NaughtyProcessMonitor::processName(ulong pid) const
   }
   
  // Now strip 'tdeinit:' prefix.
-  TQString tqunicode(TQString::fromLocal8Bit(argv[0]));
+  TQString unicode(TQString::fromLocal8Bit(argv[0]));
 
   free (argv) ;
 #endif
 
-  TQStringList parts(TQStringList::split(' ', tqunicode));
+  TQStringList parts(TQStringList::split(' ', unicode));
 
   TQString processName = parts[0] == "tdeinit:" ? parts[1] : parts[0];
 
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index 26f90b116..de596a052 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -75,14 +75,14 @@ AppletHandle::AppletHandle(AppletContainer* parent)
 
 int AppletHandle::heightForWidth( int /* w */ ) const
 {
-    int size = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
+    int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
 
     return size;
 }
 
 int AppletHandle::widthForHeight( int /* h */ ) const
 {
-    int size = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
+    int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
 
     return size;
 }
@@ -310,7 +310,7 @@ AppletHandleDrag::AppletHandleDrag(AppletHandle* parent)
 
 TQSize AppletHandleDrag::minimumSizeHint() const
 {
-    int wh = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
+    int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
 
     if (m_parent->orientation() == Qt::Horizontal)
     {
@@ -367,7 +367,7 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *)
     
         TQRect r = rect();
     
-        tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r,
+        style().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r,
                             colorGroup(), flags);
     }
     else
@@ -384,7 +384,7 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent)
 
 TQSize AppletHandleButton::minimumSizeHint() const
 {
-    int height = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
+    int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
     int width = height;
 
     if (m_parent->orientation() == Qt::Horizontal)
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index f8c9952fe..5b10c904c 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -1408,11 +1408,11 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e)
         // KPanelExtension::Left/Right don't seem to draw the separators at all!
         if (position() == KPanelExtension::Left) {
             rect = TQRect(width()-2,0,PANEL_RESIZE_HANDLE_WIDTH,height());
-            tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
+            style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
         }
         else if (position() == KPanelExtension::Right) {
             rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height());
-            tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
+            style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal );
         }
         else if (position() == KPanelExtension::Top) {
             // Nastiness to both vertically flip the PE_Separator
@@ -1422,12 +1422,12 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e)
             rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH);
             TQColorGroup darkcg = colorGroup();
             darkcg.setColor(TQColorGroup::Light, colorGroup().dark());
-            tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default );
+            style().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default );
             p.drawPixmap(0,height()-2,inv_pm);
         }
         else {
             rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH);
-            tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default );
+            style().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default );
         }
     }
 }
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 3651e1a93..ce047938b 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -1958,7 +1958,7 @@ void DragIndicator::paintEvent(TQPaintEvent*)
 {
     TQPainter painter(this);
     TQRect rect(0, 0, width(), height());
-    tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(),
+    style().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(),
                            TQStyle::Style_Default, colorGroup().base() );
 }
 
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index f4d0edc40..61a73c41b 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -199,7 +199,7 @@ void Kicker::paletteChanged()
 {
     KConfigGroup c(KGlobal::config(), "General");
     KickerSettings::setTintColor(c.readColorEntry("TintColor",
-                                           &tqpalette().active().mid()));
+                                           &palette().active().mid()));
     KickerSettings::self()->writeConfig();
 }
 
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index a78971927..30185312d 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -421,7 +421,7 @@ void PanelKMenu::repairDisplay(void) {
         // Now do a nasty hack to prevent search bar merging into the side image
         // This forces a layout/repaint of the qpopupmenu
         repaint();			// This ensures that the side bar image was applied
-        styleChange(tqstyle());		// This forces a call to the private function updateSize(TRUE) inside the qpopupmenu.
+        styleChange(style());		// This forces a call to the private function updateSize(TRUE) inside the qpopupmenu.
         update();			// This repaints the entire popup menu to apply the widget size/alignment changes made above
     }
 }
@@ -624,7 +624,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e)
     TQPainter p(this);
     p.setClipRegion(e->region());
 
-    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
+    style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
                            TQRect( 0, 0, width(), height() ),
                            colorGroup(), TQStyle::Style_Default,
                            TQStyleOption( frameWidth(), 0 ) );
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index d404aabbc..993065d0f 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -522,7 +522,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
                 m_sloppySourceClicked = true;
 
             if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) {
-                int timeout= tqstyle().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay);
+                int timeout= style().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay);
                 if (m_sloppySourceClicked)
                     timeout = 3000;
                 m_sloppyTimer.start(timeout);
diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp
index bf90263e0..0383c0144 100644
--- a/kicker/kicker/ui/kickoff_bar.cpp
+++ b/kicker/kicker/ui/kickoff_bar.cpp
@@ -58,7 +58,7 @@ void KickoffTabBar::paint(TQPainter* p, TQTab* t, bool selected) const
     //selection flags
     if(t->rect().contains(mapFromGlobal(TQCursor::pos())))
         flags |= TQStyle::Style_MouseOver;
-    tqstyle().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(),
+    style().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(),
             colorGroup(), flags, TQStyleOption(t) );
 
     paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() );
@@ -70,7 +70,7 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha
     TQRect r = br;
 
     bool selected = m_tabsActivated && (currentTab() == t->identifier());
-    int vframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabVSpace, this );
+    int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this );
 
     p->setFont( font() );
     TQFontMetrics fm = p->fontMetrics();
@@ -116,8 +116,8 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha
  //       flags |= TQStyle::Style_Sunken;
     if(t->rect().contains(mapFromGlobal(TQCursor::pos())))
         flags |= TQStyle::Style_MouseOver;
-    tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, rt,
-            t->isEnabled() ? colorGroup(): tqpalette().disabled(),
+    style().drawControl( TQStyle::CE_TabBarLabel, p, this, rt,
+            t->isEnabled() ? colorGroup(): palette().disabled(),
             flags, TQStyleOption(t) );
 }
 
@@ -135,9 +135,9 @@ void KickoffTabBar::layoutTabs()
     TQFontMetrics fm = fontMetrics();
     int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4;
 
-    int hframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
-    int vframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabVSpace, this );
-    int overlap = tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
+    int hframe = style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
+    int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this );
+    int overlap = style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
 
     TQSize s;
     for (int t = 0; t < count(); ++t)
@@ -161,7 +161,7 @@ void KickoffTabBar::layoutTabs()
             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), tqstyle().tqsizeFromContents(TQStyle::CT_TabBarTab, this,
+        tab->setRect(TQRect(TQPoint(x, 0), style().tqsizeFromContents(TQStyle::CT_TabBarTab, this,
                     TQSize(w, h), TQStyleOption(tab))));
         x += tab->rect().width() - overlap;
     }
diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h
index 1e15179f7..88450c038 100644
--- a/kicker/kicker/ui/popupmenutitle.h
+++ b/kicker/kicker/ui/popupmenutitle.h
@@ -46,7 +46,7 @@ public:
     {
         p->save();
         TQRect r(x, y, w, h);
-        kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu,
+        kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu,
                                     p, r, cg);
 
         if (!m_desktopName.isEmpty())
@@ -73,7 +73,7 @@ public:
     {
       TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName);
       size.setHeight(size.height() +
-                     (kapp->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
+                     (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
       return size;
     }
 
diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg
index 635d9c646..7e1e26651 100644
--- a/kicker/libkicker/kickerSettings.kcfg
+++ b/kicker/libkicker/kickerSettings.kcfg
@@ -81,7 +81,7 @@
 
 <entry name="TintColor" type="Color" >
       <label>The tint color used to colorize transparent panels</label>
-      <default code="true">(TQApplication::tqpalette().active().mid())</default>
+      <default code="true">(TQApplication::palette().active().mid())</default>
       <whatsthis>This option sets the color to use when tinting transparent panels</whatsthis>
    </entry>
 
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index abd181820..b79e7e66c 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -539,7 +539,7 @@ void PanelButton::drawButton(TQPainter *p)
     if (m_tileColor.isValid())
     {
         p->fillRect(rect(), m_tileColor);
-        tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
+        style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
     }
     else if (paletteBackgroundPixmap())
     {
@@ -559,7 +559,7 @@ void PanelButton::drawButton(TQPainter *p)
     else if (isDown() || isOn())
     {
         // Draw shapes to indicate the down state.
-        tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
+        style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
     }
 
     drawButtonLabel(p);
@@ -569,7 +569,7 @@ void PanelButton::drawButton(TQPainter *p)
         int x1, y1, x2, y2;
         TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
         TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
-        tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+        style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
         TQStyle::Style_Default, colorGroup().button());
     }
 }
@@ -581,7 +581,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
     if (m_tileColor.isValid())
     {
         p->fillRect(rect(), m_tileColor);
-        tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
+        style().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
     }
     else if (paletteBackgroundPixmap())
     {
@@ -595,10 +595,10 @@ void PanelButton::drawDeepButton(TQPainter *p)
 
     TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2);
     if (isDown() || isOn()) {
-        tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down);
+        style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down);
     }
     else {
-        tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
+        style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised);
     }
 
     drawButtonLabel(p,0,FALSE);
@@ -608,7 +608,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
         int x1, y1, x2, y2;
         TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2);
         TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
-        tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
+        style().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
         TQStyle::Style_Default, colorGroup().button());
     }
 }
@@ -718,7 +718,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
     if (m_drawArrow && (m_highlight || active) && drawArrow)
     {
         TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp;
-        int arrowSize = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator);
+        int arrowSize = style().pixelMetric(TQStyle::PM_MenuButtonIndicator);
         TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize);
 
         switch (m_arrowDirection)
@@ -762,7 +762,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
         {
             flags |= TQStyle::Style_Down;
         }
-        tqstyle().tqdrawPrimitive(e, p, r, colorGroup(), flags);
+        style().tqdrawPrimitive(e, p, r, colorGroup(), flags);
     }
 }
 
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index f809c2127..d4ca8faac 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -99,7 +99,7 @@ void SimpleButton::drawButton( TQPainter *p )
         if (m_highlight || isDown() || isOn()) {
             int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
             if (isDown() || isOn()) flags |= TQStyle::Style_Down;
-            tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
+            style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags);
         }
     }
 
@@ -263,7 +263,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
 
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+    style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
 
     if (m_forceStandardCursor) {
         SimpleButton::drawButton(p);
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index f12a58063..e7505867a 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -755,7 +755,7 @@ void TOM::paintEvent(TQPaintEvent * e)
 
     TQPainter p(this);
 
-    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
+    style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
                            TQRect( 0, 0, width(), height() ),
                            colorGroup(), TQStyle::Style_Default,
                            TQStyleOption( frameWidth(), 0 ) );
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 620cb830c..ae50dc6cd 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -314,7 +314,7 @@ TQSizePolicy TaskContainer::sizePolicy() const
 void TaskContainer::resizeEvent( TQResizeEvent * )
 {
     // calculate the icon rect
-    TQRect br( tqstyle().subRect( TQStyle::SR_PushButtonContents, this ) );
+    TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) );
     iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this );
 }
 
@@ -533,7 +533,7 @@ void TaskContainer::drawButton(TQPainter *p)
 
     font.setBold(active);
 
-    TQColorGroup colors = tqpalette().active();
+    TQColorGroup colors = palette().active();
     
     if (TaskBarSettings::useCustomColors())
     {
@@ -582,20 +582,20 @@ void TaskContainer::drawButton(TQPainter *p)
 
     bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate));
     bool reverse = TQApplication::reverseLayout();
-    TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this));
-    TQPoint shift = TQPoint(tqstyle().pixelMetric(TQStyle::PM_ButtonShiftHorizontal),
-                          tqstyle().pixelMetric(TQStyle::PM_ButtonShiftVertical));
+    TQRect br(style().subRect(TQStyle::SR_PushButtonContents, this));
+    TQPoint shift = TQPoint(style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal),
+                          style().pixelMetric(TQStyle::PM_ButtonShiftVertical));
 
     // draw button background
     if (drawButton)
     {
         if (KickerSettings::showDeepButtons()) {
-            tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p,
+            style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p,
                               TQRect(1, 1, width()-3, height()-2),
                               colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised);
         }
         else {
-            tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p,
+            style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p,
                               TQRect(1, 1, width()-2, height()-2),
                               colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised);
         }
@@ -794,7 +794,7 @@ void TaskContainer::drawButton(TQPainter *p)
             flags |= TQStyle::Style_Down;
         }
 
-        tqstyle().tqdrawPrimitive(e, p, ar, colors, flags);
+        style().tqdrawPrimitive(e, p, ar, colors, flags);
     }
     
     // draw mouse over frame in transparent mode
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 0f98bcea7..6f84efae4 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -1375,7 +1375,7 @@ TQPixmap Task::thumbnail(int maxDimension)
     int thumbnailHeight = (int)(winAttr.height * factor);
 
     TQPixmap thumbnail(thumbnailWidth, thumbnailHeight);
-    thumbnail.fill(TQApplication::tqpalette().active().background());
+    thumbnail.fill(TQApplication::palette().active().background());
 
 #if 0 // TQImage::smoothScale() scaling
     TQPixmap full(winAttr.width, winAttr.height);