diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-03 22:53:53 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-03 22:53:53 -0600 |
commit | cd7745fcd06d293c907ebb02c366a20413c1a0bc (patch) | |
tree | cbe3fe0ce9b172ee891b98d99d149f9939597f94 /src/gui/kdeext/klearlook.h | |
parent | 990bf92fa5cefbe5ebb34a172d18bb3df745bd7a (diff) | |
download | rosegarden-cd7745fcd06d293c907ebb02c366a20413c1a0bc.tar.gz rosegarden-cd7745fcd06d293c907ebb02c366a20413c1a0bc.zip |
Rename KStyle to TDEStyle to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/kdeext/klearlook.h')
-rw-r--r-- | src/gui/kdeext/klearlook.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kdeext/klearlook.h b/src/gui/kdeext/klearlook.h index d98b45b..1e74355 100644 --- a/src/gui/kdeext/klearlook.h +++ b/src/gui/kdeext/klearlook.h @@ -184,7 +184,7 @@ extern "C" { } #endif -class KlearlookStyle : public KStyle { +class KlearlookStyle : public TDEStyle { Q_OBJECT @@ -258,7 +258,7 @@ class KlearlookStyle : public KStyle { const TQStyleOption & = TQStyleOption::Default ) const; void drawPrimitiveMenu( TQ_PrimitiveElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, + void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags, const TQStyleOption &opt, const TQWidget* widget = 0 ) const; void drawControl( ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; @@ -273,7 +273,7 @@ class KlearlookStyle : public KStyle { TQRect querySubControlMetrics( TQ_ComplexControl, TQStyleControlElementData ceData, ControlElementFlags elementFlags, SubControl, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; int pixelMetric( PixelMetric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const; - int kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const; + int kPixelMetric( TDEStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const; TQSize sizeFromContents( ContentsType, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQSize &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; int styleHint( StyleHint, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, |