diff options
Diffstat (limited to 'kstyles/web')
-rw-r--r-- | kstyles/web/webstyle.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp index 167fc5070..f4ed7f931 100644 --- a/kstyles/web/webstyle.cpp +++ b/kstyles/web/webstyle.cpp @@ -92,7 +92,7 @@ scrollBarControlsMetrics int extent = horizontal ? sb->height() : sb->width(); - TQColorGroup g = sb->tqcolorGroup(); + TQColorGroup g = sb->colorGroup(); if (sliderStart > sliderMax) sliderStart = sliderMax; @@ -303,12 +303,12 @@ WebStyle::eventFilter(TQObject * o, TQEvent * e) if (e->type() == TQEvent::Enter) { _highlightedButton = pb; - pb->tqrepaint(false); + pb->repaint(false); } else if (e->type() == TQEvent::Leave) { _highlightedButton = 0; - pb->tqrepaint(false); + pb->repaint(false); } return false; @@ -371,14 +371,14 @@ WebStyle::drawPushButton(TQPushButton * b, TQPainter * p) bool sunken(b->isDown() || b->isOn()); bool hl(_highlightedButton == b); - TQColor bg(b->tqcolorGroup().button()); + TQColor bg(b->colorGroup().button()); p->save(); - p->fillRect(b->rect(), b->tqcolorGroup().brush(TQColorGroup::Background)); + p->fillRect(b->rect(), b->colorGroup().brush(TQColorGroup::Background)); if (b->isDefault()) { - TQColor c(hl ? b->tqcolorGroup().highlight() : b->tqcolorGroup().mid()); + TQColor c(hl ? b->colorGroup().highlight() : b->colorGroup().mid()); p->setPen(contrastingForeground(c, bg)); @@ -391,26 +391,26 @@ WebStyle::drawPushButton(TQPushButton * b, TQPainter * p) 4, b->width() - 8, b->height() - 8, - b->tqcolorGroup().brush(TQColorGroup::Button) + b->colorGroup().brush(TQColorGroup::Button) ); if (b->isEnabled()) { if (sunken) { - p->setPen(contrastingForeground(b->tqcolorGroup().light(), bg)); + p->setPen(contrastingForeground(b->colorGroup().light(), bg)); } else { if (hl) - p->setPen(contrastingForeground(b->tqcolorGroup().highlight(), bg)); + p->setPen(contrastingForeground(b->colorGroup().highlight(), bg)); else - p->setPen(contrastingForeground(b->tqcolorGroup().mid(), bg)); + p->setPen(contrastingForeground(b->colorGroup().mid(), bg)); } } else { - p->setPen(b->tqcolorGroup().button()); + p->setPen(b->colorGroup().button()); } drawFunkyRect(p, 3, 3, b->width() - 6, b->height() - 6, true); @@ -459,7 +459,7 @@ WebStyle::drawScrollBarControls rSlider ); - TQColorGroup g(sb->tqcolorGroup()); + TQColorGroup g(sb->colorGroup()); if (controls & AddLine && rAdd.isValid()) { @@ -583,7 +583,7 @@ WebStyle::scrollBarPointOver const TQPoint & point ) { - if (!sb->rect().tqcontains(point)) + if (!sb->rect().contains(point)) return NoScroll; int sliderMin, sliderMax, sliderLength, buttonDim; @@ -754,7 +754,7 @@ WebStyle::drawExclusiveIndicator p->setBrush(g.brush(TQColorGroup::Background)); - // Avoid mistqshapen ellipses. Qt or X bug ? Who knows... + // Avoid misshapen ellipses. Qt or X bug ? Who knows... if (0 == w % 2) --w; @@ -1450,14 +1450,14 @@ WebStyle::drawTab { TQRect r(tab->rect()); - TQColorGroup g(tabBar->tqcolorGroup()); + TQColorGroup g(tabBar->colorGroup()); p->save(); p->setPen(selected ? g.dark() : g.mid()); p->fillRect(r, g.brush(TQColorGroup::Background)); - switch (tabBar->tqshape()) + switch (tabBar->shape()) { case TQTabBar::RoundedAbove: case TQTabBar::TriangularAbove: @@ -1603,7 +1603,7 @@ WebStyle::drawKickerTaskButton static TQString modStr = TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]"); - int modStrPos = s.tqfind(modStr); + int modStrPos = s.find(modStr); if (-1 != modStrPos) { |