diff options
Diffstat (limited to 'styles')
| -rw-r--r-- | styles/dotnet/dotnet.cpp | 10 | ||||
| -rw-r--r-- | styles/phase/phasestyle.cpp | 26 |
2 files changed, 18 insertions, 18 deletions
diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index 227369cd..5972a0ce 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -857,7 +857,7 @@ void dotNETstyle::drawControl(TQ_ControlElement element, case CE_TabBarTab: { const TQTabBar *tb = (const TQTabBar *) widget; bool cornerWidget = false; - TQTabBar::Shape tbs = tb->tqshape(); + TQTabBar::Shape tbs = tb->shape(); bool selected = flags & Style_Selected; int x, x2, y, y2, w, h; r.rect(&x, &y, &w, &h); @@ -1794,8 +1794,8 @@ int dotNETstyle::pixelMetric(PixelMetric m, const TQWidget *widget) const // ---- case PM_TabBarTabVSpace: { const TQTabBar * tb = (const TQTabBar *) widget; - if (tb->tqshape() == TQTabBar::RoundedAbove || - tb->tqshape() == TQTabBar::RoundedBelow) + if (tb->shape() == TQTabBar::RoundedAbove || + tb->shape() == TQTabBar::RoundedBelow) return 12; else return 0; @@ -1803,8 +1803,8 @@ int dotNETstyle::pixelMetric(PixelMetric m, const TQWidget *widget) const case PM_TabBarTabOverlap: { const TQTabBar* tb = (const TQTabBar*)widget; - if (tb->tqshape() != TQTabBar::RoundedAbove && - tb->tqshape() != TQTabBar::RoundedBelow) + if (tb->shape() != TQTabBar::RoundedAbove && + tb->shape() != TQTabBar::RoundedBelow) return 3; // Leave standard size alone else return 1; // Change size for our tabs only diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index 8c5c0778..5205ab2a 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -421,7 +421,7 @@ void PhaseStyle::drawPhaseTab(TQPainter *painter, edge = false; } - switch (TQTabBar::Shape(bar->tqshape())) { + switch (TQTabBar::Shape(bar->shape())) { case TQTabBar::RoundedAbove: case TQTabBar::TriangularAbove: { // is there a corner widget? @@ -1259,8 +1259,8 @@ void PhaseStyle::drawControl(TQ_ControlElement element, const TQButton *b = ::tqqt_cast<const TQButton*>(widget); if (!b) return; - int tqalignment = reverse_ ? AlignRight : AlignLeft; - drawItem(painter, rect, tqalignment | AlignVCenter | ShowPrefix, + int alignment = reverse_ ? AlignRight : AlignLeft; + drawItem(painter, rect, alignment | AlignVCenter | ShowPrefix, group, flags & Style_Enabled, b->pixmap(), b->text()); // only draw focus if content (forms on html won't) @@ -1973,7 +1973,7 @@ int PhaseStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const case PM_TabBarTabVSpace: if (const TQTabBar *tb = ::tqqt_cast<const TQTabBar*>(widget)) { - if (tb->tqshape() == TQTabBar::RoundedAbove) { + if (tb->shape() == TQTabBar::RoundedAbove) { return 10; } else { return 6; @@ -2323,17 +2323,17 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event) // TQFrame lines (do this guy last) else if (0 != (frame = ::tqqt_cast<TQFrame*>(object))) { - TQFrame::Shape tqshape = frame->frameShape(); - switch (tqshape) { + TQFrame::Shape shape = frame->frameShape(); + switch (shape) { case TQFrame::HLine: case TQFrame::VLine: { // NOTE: assuming lines have no content TQPainter painter(frame); TQT_TQRECT_OBJECT(frame->rect()).rect(&x, &y, &w, &h); painter.setPen(frame->colorGroup().dark()); - if (tqshape == TQFrame::HLine) { + if (shape == TQFrame::HLine) { painter.drawLine(0, h/2, w, h/2); - } else if (tqshape == TQFrame::VLine) { + } else if (shape == TQFrame::VLine) { painter.drawLine(w/2, 0, w/2, h); } return true; @@ -2355,12 +2355,12 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event) if (0 != (widget = ::tqqt_cast<TQWidget*>(object)) && widget->isEnabled()) { hover_ = widget; - widget->tqrepaint(false); + widget->repaint(false); } } else if (event->type() == TQEvent::Leave) { if (0 != (widget = ::tqqt_cast<TQWidget*>(object))) { hover_ = 0; - widget->tqrepaint(false); + widget->repaint(false); } } } else if (::tqqt_cast<TQTabBar*>(object)) { // special case for qtabbar @@ -2369,13 +2369,13 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event) widget->isEnabled()) { hover_ = widget; hovertab_ = 0;; - widget->tqrepaint(false); + widget->repaint(false); } } else if (event->type() == TQEvent::Leave) { if (0 != (widget = ::tqqt_cast<TQWidget*>(object))) { hover_ = 0; hovertab_ = 0;; - widget->tqrepaint(false); + widget->repaint(false); } } else if (event->type() == TQEvent::MouseMove) { TQTabBar *tabbar; @@ -2385,7 +2385,7 @@ bool PhaseStyle::eventFilter(TQObject *object, TQEvent *event) TQTab *tab = tabbar->selectTab(me->pos()); if (hovertab_ != tab) { hovertab_ = tab; - tabbar->tqrepaint(false); + tabbar->repaint(false); } } } |