diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-12-22 03:40:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-12-22 03:40:39 -0600 |
| commit | 7f8e73d6f561a95fc6d7084149ded936f0d69c42 (patch) | |
| tree | 491cad036ce70e166a8797ae0026a70bc7c9b692 | |
| parent | 9a47e7da0a6d9eb72e570acca32b43bae9206bb2 (diff) | |
| download | tdelibs-7f8e73d6f561a95fc6d7084149ded936f0d69c42.tar.gz tdelibs-7f8e73d6f561a95fc6d7084149ded936f0d69c42.zip | |
Update to support latest TQt3 style API
| -rw-r--r-- | tdefx/tdestyle.cpp | 5 | ||||
| -rw-r--r-- | tdestyles/highcontrast/highcontrast.cpp | 4 | ||||
| -rw-r--r-- | tdestyles/plastik/plastik.cpp | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp index 576b56777..73bf983a0 100644 --- a/tdefx/tdestyle.cpp +++ b/tdefx/tdestyle.cpp @@ -351,8 +351,8 @@ void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, SFlags flags, const TQStyleOption &opt ) const { - TQStyleControlElementData ceData = populateControlElementDataFromWidget(widget, TQStyleOption()); - drawTDEStylePrimitive(kpe, p, ceData, getControlElementFlagsForObject(widget, ceData.widgetObjectTypes, TQStyleOption()), r, cg, flags, opt); + const TQStyleControlElementData &ceData = populateControlElementDataFromWidget(widget, TQStyleOption()); + drawTDEStylePrimitive(kpe, p, ceData, getControlElementFlagsForObject(widget, TQStyleOption()), r, cg, flags, opt); } void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, @@ -1022,7 +1022,6 @@ int TDEStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData case PM_DockWindowHandleExtent: { - TQWidget* parent = 0; // Check that we are not a normal toolbar or a hidden dockwidget, // in which case we need to adjust the height for font size if (widget diff --git a/tdestyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp index 9156e670f..ef20af360 100644 --- a/tdestyles/highcontrast/highcontrast.cpp +++ b/tdestyles/highcontrast/highcontrast.cpp @@ -168,8 +168,8 @@ void HighContrastStyle::polish (const TQStyleControlElementData &ceData, Control TQSpinWidget* spinwidget = dynamic_cast<TQSpinWidget*>(widget); if (spinwidget && spinwidget->editWidget()) { TQWidget* spinEditWidget = spinwidget->editWidget(); - TQStyleControlElementData swCeData = populateControlElementDataFromWidget(spinEditWidget, TQStyleOption()); - ControlElementFlags swElementFlags = getControlElementFlagsForObject(spinEditWidget, swCeData.widgetObjectTypes, TQStyleOption()); + const TQStyleControlElementData &swCeData = populateControlElementDataFromWidget(spinEditWidget, TQStyleOption()); + ControlElementFlags swElementFlags = getControlElementFlagsForObject(spinEditWidget, TQStyleOption()); installObjectEventHandler(swCeData, swElementFlags, spinEditWidget, this); } } diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp index 8a4c92a38..7abba20a4 100644 --- a/tdestyles/plastik/plastik.cpp +++ b/tdestyles/plastik/plastik.cpp @@ -2408,7 +2408,6 @@ void PlastikStyle::drawControl(TQ_ControlElement element, int 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 cornArrow = false; |