From 5af0fd2a824dd9599c22a9be99386e7927e755f2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:18:28 -0600 Subject: Rename obsolete tq methods to standard names (cherry picked from commit 68de9c7a2183849c2a79e96c6b0f1ea4987e9474) --- styles/phase/phasestyle.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'styles/phase/phasestyle.cpp') diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index 5205ab2a..e2d66ecd 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -727,8 +727,8 @@ void PhaseStyle::tqdrawPrimitive(TQ_PrimitiveElement element, case PE_Indicator: drawPhasePanel(painter, x+1, y+1, w-2, h-2, group, true, enabled ? - &group.tqbrush(TQColorGroup::Base) : - &group.tqbrush(TQColorGroup::Background)); + &group.brush(TQColorGroup::Base) : + &group.brush(TQColorGroup::Background)); if (on) { painter->setPen(mouseover @@ -736,7 +736,7 @@ void PhaseStyle::tqdrawPrimitive(TQ_PrimitiveElement element, : group.dark()); painter->drawRect(x+4, y+4, w-8, h-8); painter->fillRect(x+5, y+5, w-10, h-10, - group.tqbrush(TQColorGroup::Highlight)); + group.brush(TQColorGroup::Highlight)); } else if (mouseover) { painter->setPen(TQColor(group.highlight().dark(contrast))); painter->drawRect(x+4, y+4, w-8, h-8); @@ -804,7 +804,7 @@ void PhaseStyle::tqdrawPrimitive(TQ_PrimitiveElement element, case PE_DockWindowResizeHandle: drawPhasePanel(painter, x, y, w, h, group, false, - &group.tqbrush(TQColorGroup::Background)); + &group.brush(TQColorGroup::Background)); break; case PE_Splitter: @@ -1095,7 +1095,7 @@ void PhaseStyle::drawKStylePrimitive(KStylePrimitive element, } } drawPhasePanel(painter, x, y, w, h, group, true, - &group.tqbrush(TQColorGroup::Mid)); + &group.brush(TQColorGroup::Mid)); break; } @@ -1157,7 +1157,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, if ((flags & Style_ButtonDefault) && !depress) { drawPhasePanel(painter, x, y, w, h, group, true, - &group.tqbrush(TQColorGroup::Mid)); + &group.brush(TQColorGroup::Mid)); drawPhaseBevel(painter, x+bd, y+bd, w-bd*2, h-bd*2, group, (widget==hover_) ? TQColor(group.button().light(contrast)) @@ -1306,7 +1306,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, if ((flags & Style_Active) && (flags & Style_HasFocus)) { if (flags & Style_Down) { drawPhasePanel(painter, x, y, w, h, group, true, - &group.tqbrush(TQColorGroup::Background)); + &group.brush(TQColorGroup::Background)); } else { drawPhaseBevel(painter, x, y, w, h, group, group.background(), @@ -1504,7 +1504,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, case CE_ProgressBarGroove: { drawPhasePanel(painter, x, y, w, h, group, true, - &group.tqbrush(TQColorGroup::Base)); + &group.brush(TQColorGroup::Base)); break; } @@ -1648,8 +1648,8 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, int slot = TQMAX(h/4, 6) + (h % 2); drawPhasePanel(painter, x+3, y+(h/2)-(slot/2), w-6, slot, group, true, - sunken ? &group.tqbrush(TQColorGroup::Midlight) - : &group.tqbrush(TQColorGroup::Mid)); + sunken ? &group.brush(TQColorGroup::Midlight) + : &group.brush(TQColorGroup::Mid)); } if (controls & SC_ComboBoxEditField) { // draw edit box @@ -1905,7 +1905,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, // now draw active buttons if (down || on) { drawPhasePanel(painter, x, y, w, h, group, true, - &group.tqbrush(TQColorGroup::Button)); + &group.brush(TQColorGroup::Button)); } else if (raised) { drawPhaseBevel(painter, x, y, w, h, group, group.button(), false, !horiz, true); -- cgit v1.2.1