From bf9b9d6bd937bda29930d181c49d37b3e094179b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 8 Aug 2012 18:37:01 -0500 Subject: Update kstyle API --- kstyles/asteroid/asteroid.h | 2 +- kstyles/highcontrast/highcontrast.cpp | 6 +++--- kstyles/highcontrast/highcontrast.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kstyles') diff --git a/kstyles/asteroid/asteroid.h b/kstyles/asteroid/asteroid.h index 4d0216c4c..d6b05e8ae 100644 --- a/kstyles/asteroid/asteroid.h +++ b/kstyles/asteroid/asteroid.h @@ -98,7 +98,7 @@ public: int pixelMetric(PixelMetric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget * = 0) const; - int kPixelMetric( KStylePixelMetric kpm, const TQWidget* /* widget */) const; + int kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const; TQRect subRect(SubRect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *) const; diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp index 1447a8e99..543b71d0f 100644 --- a/kstyles/highcontrast/highcontrast.cpp +++ b/kstyles/highcontrast/highcontrast.cpp @@ -1437,7 +1437,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, } // Draw all the branches... - static int thickness = kPixelMetric( KPM_ListViewBranchThickness ); + static int thickness = kPixelMetric( KPM_ListViewBranchThickness, ceData, elementFlags ); int line; // index into dotlines TQRect branchrect; TQStyle::StyleFlags branchflags; @@ -1678,7 +1678,7 @@ int HighContrastStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceDa } } -int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget *widget ) const +int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const { switch (kpm) { case KPM_ListViewBranchThickness: @@ -1686,7 +1686,7 @@ int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget *widg // the drawKStylePrimitive KPE_ListViewBranch case. return basicLineWidth; default: - return KStyle::kPixelMetric(kpm, widget); + return KStyle::kPixelMetric(kpm, ceData, elementFlags, widget); } } diff --git a/kstyles/highcontrast/highcontrast.h b/kstyles/highcontrast/highcontrast.h index 6ea667cc6..509d6552a 100644 --- a/kstyles/highcontrast/highcontrast.h +++ b/kstyles/highcontrast/highcontrast.h @@ -137,7 +137,7 @@ class HighContrastStyle : public KStyle int pixelMetric( PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const; - int kPixelMetric( KStylePixelMetric m, + int kPixelMetric( KStylePixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const; TQSize sizeFromContents( ContentsType contents, -- cgit v1.2.1