Update to support latest TQt3 style API

pull/16/head
Timothy Pearson 11 years ago
parent 9a47e7da0a
commit 7f8e73d6f5

@ -351,8 +351,8 @@ void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
SFlags flags, SFlags flags,
const TQStyleOption &opt ) const const TQStyleOption &opt ) const
{ {
TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption()); const TQStyleControlElementData &ceData = populateControlElementDataFromWidget(widget, TQStyleOption());
drawTDEStylePrimitive(kpe, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, cg, flags, opt); drawTDEStylePrimitive(kpe, p, ceData, getControlElementFlagsForObject(widget, TQStyleOption()), r, cg, flags, opt);
} }
void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
@ -1022,7 +1022,6 @@ int TDEStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData
case PM_DockWindowHandleExtent: case PM_DockWindowHandleExtent:
{ {
TQWidget* parent = 0;
// Check that we are not a normal toolbar or a hidden dockwidget, // Check that we are not a normal toolbar or a hidden dockwidget,
// in which case we need to adjust the height for font size // in which case we need to adjust the height for font size
if (widget if (widget

@ -168,8 +168,8 @@ void HighContrastStyle::polish (const TQStyleControlElementData &ceData, Control
TQSpinWidget* spinwidget = dynamic_cast<TQSpinWidget*>(widget); TQSpinWidget* spinwidget = dynamic_cast<TQSpinWidget*>(widget);
if (spinwidget && spinwidget->editWidget()) { if (spinwidget && spinwidget->editWidget()) {
TQWidget* spinEditWidget = spinwidget->editWidget(); TQWidget* spinEditWidget = spinwidget->editWidget();
TQStyleControlElementData swCeData = populateControlElementDataFromWidget(spinEditWidget, TQStyleOption()); const TQStyleControlElementData &swCeData = populateControlElementDataFromWidget(spinEditWidget, TQStyleOption());
ControlElementFlags swElementFlags = getControlElementFlagsForObject(spinEditWidget, swCeData.widgetObjectTypes, TQStyleOption()); ControlElementFlags swElementFlags = getControlElementFlagsForObject(spinEditWidget, TQStyleOption());
installObjectEventHandler(swCeData, swElementFlags, spinEditWidget, this); installObjectEventHandler(swCeData, swElementFlags, spinEditWidget, this);
} }
} }

@ -2408,7 +2408,6 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
int x, y, w, h; int x, y, w, h;
r.rect( &x, &y, &w, &h ); r.rect( &x, &y, &w, &h );
const TQPushButton* button = static_cast<const TQPushButton *>( widget );
bool active = (elementFlags & CEF_IsOn) || (elementFlags & CEF_IsDown); bool active = (elementFlags & CEF_IsOn) || (elementFlags & CEF_IsDown);
bool cornArrow = false; bool cornArrow = false;

Loading…
Cancel
Save