diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-08 18:37:01 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-08 18:37:01 -0500 |
| commit | bf9b9d6bd937bda29930d181c49d37b3e094179b (patch) | |
| tree | 69eb464b19d659e7937cc59fb0ce9d717e390280 | |
| parent | 0ee242623bc254b99d10bac9973cb375cb3aa3a9 (diff) | |
| download | tdelibs-bf9b9d6bd937bda29930d181c49d37b3e094179b.tar.gz tdelibs-bf9b9d6bd937bda29930d181c49d37b3e094179b.zip | |
Update kstyle API
| -rw-r--r-- | kstyles/asteroid/asteroid.h | 2 | ||||
| -rw-r--r-- | kstyles/highcontrast/highcontrast.cpp | 6 | ||||
| -rw-r--r-- | kstyles/highcontrast/highcontrast.h | 2 | ||||
| -rw-r--r-- | tdefx/kstyle.cpp | 4 | ||||
| -rw-r--r-- | tdefx/kstyle.h | 2 |
5 files changed, 8 insertions, 8 deletions
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, diff --git a/tdefx/kstyle.cpp b/tdefx/kstyle.cpp index d95d98281..a1a95e1fd 100644 --- a/tdefx/kstyle.cpp +++ b/tdefx/kstyle.cpp @@ -541,7 +541,7 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe, } -int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget* /* widget */) const +int KStyle::kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const { int value; switch(kpm) @@ -1389,7 +1389,7 @@ void KStyle::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; diff --git a/tdefx/kstyle.h b/tdefx/kstyle.h index 0d36678cf..b4331c223 100644 --- a/tdefx/kstyle.h +++ b/tdefx/kstyle.h @@ -282,7 +282,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle KPM_ListViewBranchThickness = 0x00000100 }; - int kPixelMetric( KStylePixelMetric kpm, const TQWidget* widget = 0 ) const; + int kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const; // --------------------------------------------------------------------------- |