TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS from latest style API changes.

Browse Source
pull/1/head
Darrell Anderson 12 years ago
parent f2d05b6e33
commit cb2cf1cb37
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

34
kexi/kexiutils/styleproxy.h
Unescape View File

@ -57,15 +57,15 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
TQStyle* parentStyle() const; TQStyle* parentStyle() const;
void setParentStyle(TQStyle* style); void setParentStyle(TQStyle* style);
virtual void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->polish(ceData, elementFlags, ptr); } virtual void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->polish(ceData, elementFlags, ptr); }
virtual void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->unPolish(ceData, elementFlags, ptr); } virtual void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->unPolish(ceData, elementFlags, ptr); }
virtual void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->applicationPolish(ceData, elementFlags, ptr); } virtual void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->applicationPolish(ceData, elementFlags, ptr); }
virtual void applicationUnPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->applicationUnPolish(ceData, elementFlags, ptr); } virtual void applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->applicationUnPolish(ceData, elementFlags, ptr); }
virtual void polish( TQPalette &p ) { m_style->polish(p); }; virtual void polish( TQPalette &p ) { m_style->polish(p); };
virtual void polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->polishPopupMenu(ceData, elementFlags, ptr); } virtual void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { m_style->polishPopupMenu(ceData, elementFlags, ptr); }
virtual TQRect itemRect( TQPainter *p, const TQRect &r, virtual TQRect itemRect( TQPainter *p, const TQRect &r,
int flags, bool enabled, const TQPixmap *pixmap, const TQString &text, int len = -1 ) const int flags, bool enabled, const TQPixmap *pixmap, const TQString &text, int len = -1 ) const
@ -81,33 +81,33 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
} }
virtual void drawPrimitive( TQ_PrimitiveElement pe, virtual void drawPrimitive( TQ_PrimitiveElement pe,
TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default,
const TQStyleOption& option = TQStyleOption::Default ) const const TQStyleOption& option = TQStyleOption::Default ) const
{ {
m_style->drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, option ); m_style->drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, option );
} }
virtual void drawControl( TQ_ControlElement element, virtual void drawControl( TQ_ControlElement element,
TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const SFlags how = Style_Default, const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{ {
m_style->drawControl( element, p, ceData, elementFlags, r, cg, how, option, widget ); m_style->drawControl( element, p, ceData, elementFlags, r, cg, how, option, widget );
} }
virtual void drawControlMask( TQ_ControlElement element, virtual void drawControlMask( TQ_ControlElement element,
TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{ {
m_style->drawControlMask( element, p, ceData, elementFlags, r, option, widget ); m_style->drawControlMask( element, p, ceData, elementFlags, r, option, widget );
} }
virtual TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const virtual TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const
{ {
return m_style->subRect( r, ceData, elementFlags, widget ); return m_style->subRect( r, ceData, elementFlags, widget );
} }
virtual void drawComplexControl( TQ_ComplexControl control, virtual void drawComplexControl( TQ_ComplexControl control,
TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
const TQColorGroup &cg, SFlags how = Style_Default, const TQColorGroup &cg, SFlags how = Style_Default,
#ifdef TQ_TQDOC #ifdef TQ_TQDOC
SCFlags sub = SC_All, SCFlags sub = SC_All,
@ -120,48 +120,48 @@ class KEXIUTILS_EXPORT StyleProxy : public TQStyle
} }
virtual void drawComplexControlMask( TQ_ComplexControl control, virtual void drawComplexControlMask( TQ_ComplexControl control,
TQPainter *p, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQRect &r, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{ {
m_style->drawComplexControlMask( control, p, ceData, elementFlags, r, option, widget ); m_style->drawComplexControlMask( control, p, ceData, elementFlags, r, option, widget );
} }
virtual TQRect querySubControlMetrics( TQ_ComplexControl control, virtual TQRect querySubControlMetrics( TQ_ComplexControl control,
TQStyleControlElementData ceData, ControlElementFlags elementFlags, SubControl sc, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{ {
return m_style->querySubControlMetrics( control, ceData, elementFlags, sc, option, widget ); return m_style->querySubControlMetrics( control, ceData, elementFlags, sc, option, widget );
} }
virtual SubControl querySubControl( TQ_ComplexControl control, virtual SubControl querySubControl( TQ_ComplexControl control,
TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQPoint &pos, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{ {
return m_style->querySubControl( control, ceData, elementFlags, pos, option, widget ); return m_style->querySubControl( control, ceData, elementFlags, pos, option, widget );
} }
virtual int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, virtual int pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQWidget *widget = 0 ) const const TQWidget *widget = 0 ) const
{ {
return m_style->pixelMetric( metric, ceData, elementFlags, widget ); return m_style->pixelMetric( metric, ceData, elementFlags, widget );
} }
virtual TQSize sizeFromContents( ContentsType contents, virtual TQSize sizeFromContents( ContentsType contents,
TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQSize &contentsSize, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentsSize,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{ {
return m_style->sizeFromContents( contents, ceData, elementFlags, contentsSize, option, widget ); return m_style->sizeFromContents( contents, ceData, elementFlags, contentsSize, option, widget );
} }
virtual int styleHint( TQ_StyleHint stylehint, virtual int styleHint( TQ_StyleHint stylehint,
TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption& option = TQStyleOption::Default, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& option = TQStyleOption::Default,
TQStyleHintReturn* returnData = 0, const TQWidget *widget = 0 ) const TQStyleHintReturn* returnData = 0, const TQWidget *widget = 0 ) const
{ {
return m_style->styleHint( stylehint, ceData, elementFlags, option, returnData, widget ); return m_style->styleHint( stylehint, ceData, elementFlags, option, returnData, widget );
} }
virtual TQPixmap stylePixmap( StylePixmap stylepixmap, virtual TQPixmap stylePixmap( StylePixmap stylepixmap,
TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const const TQStyleOption& option = TQStyleOption::Default, const TQWidget *widget = 0 ) const
{ {
return m_style->stylePixmap( stylepixmap, ceData, elementFlags, option, widget ); return m_style->stylePixmap( stylepixmap, ceData, elementFlags, option, widget );

Write Preview
Loading…
Cancel
Save