Fix FTBFS from latest style API changes

pull/1/head
Timothy Pearson 12 years ago
parent eea8d7afa3
commit 1cc71e9107

@ -51,14 +51,14 @@ public:
const TQColorGroup &,bool,bool = 0,bool = 1); const TQColorGroup &,bool,bool = 0,bool = 1);
%End %End
%If (TQt_3_0_0 -) %If (TQt_3_0_0 -)
int pixelMetric(PixelMetric,TQStyleControlElementData,ControlElementFlags,const TQWidget * = 0) const; int pixelMetric(PixelMetric,const TQStyleControlElementData&,ControlElementFlags,const TQWidget * = 0) const;
void drawControl(ControlElement,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawControl(ControlElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
void drawPrimitive(PrimitiveElement,TQPainter *,TQStyleControlElementData,ControlElementFlags,const TQRect &, void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &,
const TQColorGroup &,SFlags = Style_Default, const TQColorGroup &,SFlags = Style_Default,
const TQStyleOption & = TQStyleOption()) const; const TQStyleOption & = TQStyleOption()) const;
%End %End

@ -79,47 +79,47 @@ public:
%If (TQt_3_0_0 -) %If (TQt_3_0_0 -)
TQCommonStyle(); TQCommonStyle();
void drawPrimitive(PrimitiveElement,TQPainter *,TQStyleControlElementData,ControlElementFlags,const TQRect &, void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &,
const TQColorGroup &,SFlags = Style_Default, const TQColorGroup &,SFlags = Style_Default,
const TQStyleOption& = TQStyleOption()) const; const TQStyleOption& = TQStyleOption()) const;
void drawControl(ControlElement,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawControl(ControlElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
void drawControlMask(ControlElement,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawControlMask(ControlElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &, const TQRect &,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
TQRect subRect(SubRect,const TQStyleControlElementData, const ControlElementFlags,const TQWidget *) const; TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
void drawComplexControl(ComplexControl,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawComplexControl(ComplexControl,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default,SCFlags = SC_All, SFlags = Style_Default,SCFlags = SC_All,
SCFlags = SC_None, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
void drawComplexControlMask(ComplexControl,TQPainter *,const TQStyleControlElementData,const ControlElementFlags, void drawComplexControlMask(ComplexControl,TQPainter *,const const TQStyleControlElementData&,const ControlElementFlags,
const TQRect &, const TQRect &,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
TQRect querySubControlMetrics(ComplexControl,TQStyleControlElementData,ControlElementFlags,SubControl, TQRect querySubControlMetrics(ComplexControl,const TQStyleControlElementData&,ControlElementFlags,SubControl,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
SubControl querySubControl(ComplexControl,TQStyleControlElementData,ControlElementFlags, SubControl querySubControl(ComplexControl,const TQStyleControlElementData&,ControlElementFlags,
const TQPoint &, const TQPoint &,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
int pixelMetric(PixelMetric,TQStyleControlElementData,ControlElementFlags,const TQWidget * = 0) const; int pixelMetric(PixelMetric,const TQStyleControlElementData&,ControlElementFlags,const TQWidget * = 0) const;
TQSize sizeFromContents(ContentsType,TQStyleControlElementData,ControlElementFlags,const TQSize &, TQSize sizeFromContents(ContentsType,const TQStyleControlElementData&,ControlElementFlags,const TQSize &,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
int styleHint(StyleHint,TQStyleControlElementData,ControlElementFlags,const TQStyleOption &, int styleHint(StyleHint,const TQStyleControlElementData&,ControlElementFlags,const TQStyleOption &,
TQStyleHintReturn *,const TQWidget *=0) const; TQStyleHintReturn *,const TQWidget *=0) const;
TQPixmap stylePixmap(StylePixmap,TQStyleControlElementData,ControlElementFlags, TQPixmap stylePixmap(StylePixmap,const TQStyleControlElementData&,ControlElementFlags,
const TQStyleOption & = TQStyleOption(), const TQWidget * = 0) const; const TQStyleOption & = TQStyleOption(), const TQWidget * = 0) const;
%End %End

@ -68,11 +68,11 @@ public:
%End %End
void polish(TQPalette &pal); void polish(TQPalette &pal);
void polish(TQStyleControlElementData, ControlElementFlags, void *); void polish(const TQStyleControlElementData&, ControlElementFlags, void *);
void unPolish(TQStyleControlElementData, ControlElementFlags, void *); void unPolish(const TQStyleControlElementData&, ControlElementFlags, void *);
void applicationPolish(TQStyleControlElementData, ControlElementFlags, void *); void applicationPolish(const TQStyleControlElementData&, ControlElementFlags, void *);
void applicationUnPolish(TQStyleControlElementData, ControlElementFlags, void *); void applicationUnPolish(const TQStyleControlElementData&, ControlElementFlags, void *);
%If (- TQt_3_0_0) %If (- TQt_3_0_0)
int defaultFrameWidth() const; int defaultFrameWidth() const;
@ -113,30 +113,30 @@ public:
TQCOORD,Orientation); TQCOORD,Orientation);
%End %End
%If (TQt_3_0_0 -) %If (TQt_3_0_0 -)
void drawPrimitive(PrimitiveElement,TQPainter *,TQStyleControlElementData,ControlElementFlags,const TQRect &, void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &,
const TQColorGroup &,SFlags = Style_Default, const TQColorGroup &,SFlags = Style_Default,
const TQStyleOption & = TQStyleOption()) const; const TQStyleOption & = TQStyleOption()) const;
void drawControl(ControlElement,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawControl(ControlElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
TQRect subRect(SubRect,const TQStyleControlElementData, const ControlElementFlags,const TQWidget *) const; TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
void drawComplexControl(ComplexControl,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawComplexControl(ComplexControl,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default,SCFlags = SC_All, SFlags = Style_Default,SCFlags = SC_All,
SCFlags = SC_None, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
TQRect querySubControlMetrics(ComplexControl,TQStyleControlElementData,ControlElementFlags, TQRect querySubControlMetrics(ComplexControl,const TQStyleControlElementData&,ControlElementFlags,
SubControl, SubControl,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
int pixelMetric(PixelMetric,TQStyleControlElementData,ControlElementFlags,const TQWidget * = 0) const; int pixelMetric(PixelMetric,const TQStyleControlElementData&,ControlElementFlags,const TQWidget * = 0) const;
int styleHint(StyleHint,TQStyleControlElementData,ControlElementFlags, int styleHint(StyleHint,const TQStyleControlElementData&,ControlElementFlags,
const TQStyleOption & = TQStyleOption(), const TQStyleOption & = TQStyleOption(),
TQStyleHintReturn * = 0, const TQWidget * = 0) const; TQStyleHintReturn * = 0, const TQWidget * = 0) const;
%End %End

@ -69,10 +69,10 @@ public:
bool useHighlightColors() const; bool useHighlightColors() const;
void polish( TQPalette& ); void polish( TQPalette& );
void polish( TQStyleControlElementData, ControlElementFlags, void * ); void polish( const TQStyleControlElementData&, ControlElementFlags, void * );
void applicationPolish( TQStyleControlElementData, ControlElementFlags, void * ); void applicationPolish( const TQStyleControlElementData&, ControlElementFlags, void * );
void polishPopupMenu( TQStyleControlElementData, ControlElementFlags, void * ); void polishPopupMenu( const TQStyleControlElementData&, ControlElementFlags, void * );
%If (- TQt_3_0_0) %If (- TQt_3_0_0)
void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0, void drawButton(TQPainter *,int,int,int,int,const TQColorGroup &,bool = 0,
@ -125,35 +125,35 @@ public:
const TQPalette &,bool,bool,int,int,int,int); const TQPalette &,bool,bool,int,int,int,int);
%End %End
%If (TQt_3_0_0 -) %If (TQt_3_0_0 -)
void drawPrimitive(PrimitiveElement,TQPainter *,TQStyleControlElementData,ControlElementFlags,const TQRect &, void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &,
const TQColorGroup &,SFlags = Style_Default, const TQColorGroup &,SFlags = Style_Default,
const TQStyleOption & = TQStyleOption()) const; const TQStyleOption & = TQStyleOption()) const;
void drawControl(ControlElement,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawControl(ControlElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
void drawComplexControl(ComplexControl,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawComplexControl(ComplexControl,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default,SCFlags = SC_All, SFlags = Style_Default,SCFlags = SC_All,
SCFlags = SC_None, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
TQRect querySubControlMetrics(ComplexControl,TQStyleControlElementData,ControlElementFlags,SubControl, TQRect querySubControlMetrics(ComplexControl,const TQStyleControlElementData&,ControlElementFlags,SubControl,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
int pixelMetric(PixelMetric,TQStyleControlElementData,ControlElementFlags,const TQWidget * = 0) const; int pixelMetric(PixelMetric,const TQStyleControlElementData&,ControlElementFlags,const TQWidget * = 0) const;
TQSize sizeFromContents(ContentsType,TQStyleControlElementData,ControlElementFlags,const TQSize &, TQSize sizeFromContents(ContentsType,const TQStyleControlElementData&,ControlElementFlags,const TQSize &,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
TQRect subRect(SubRect,const TQStyleControlElementData, const ControlElementFlags,const TQWidget *) const; TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
TQPixmap stylePixmap(StylePixmap,TQStyleControlElementData,ControlElementFlags, TQPixmap stylePixmap(StylePixmap,const TQStyleControlElementData&,ControlElementFlags,
const TQStyleOption & = TQStyleOption(), const TQWidget * = 0) const; const TQStyleOption & = TQStyleOption(), const TQWidget * = 0) const;
int styleHint(StyleHint,TQStyleControlElementData,ControlElementFlags, int styleHint(StyleHint,const TQStyleControlElementData&,ControlElementFlags,
const TQStyleOption & = TQStyleOption(), const TQStyleOption & = TQStyleOption(),
TQStyleHintReturn * = 0, const TQWidget * = 0) const; TQStyleHintReturn * = 0, const TQWidget * = 0) const;
%End %End

@ -94,27 +94,27 @@ public:
const TQPalette &,bool,bool,int,int,int,int); const TQPalette &,bool,bool,int,int,int,int);
%End %End
%If (TQt_3_0_0 -) %If (TQt_3_0_0 -)
void drawPrimitive(PrimitiveElement,TQPainter *,TQStyleControlElementData,ControlElementFlags,const TQRect &, void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &,
const TQColorGroup &,SFlags = Style_Default, const TQColorGroup &,SFlags = Style_Default,
const TQStyleOption & = TQStyleOption()) const; const TQStyleOption & = TQStyleOption()) const;
void drawControl(ControlElement,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawControl(ControlElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
void drawComplexControl(ComplexControl,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawComplexControl(ComplexControl,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default,SCFlags = SC_All, SFlags = Style_Default,SCFlags = SC_All,
SCFlags = SC_None, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
TQRect querySubControlMetrics(ComplexControl,TQStyleControlElementData,ControlElementFlags,SubControl, TQRect querySubControlMetrics(ComplexControl,const TQStyleControlElementData&,ControlElementFlags,SubControl,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
int pixelMetric(PixelMetric,TQStyleControlElementData,ControlElementFlags,const TQWidget * = 0) const; int pixelMetric(PixelMetric,const TQStyleControlElementData&,ControlElementFlags,const TQWidget * = 0) const;
TQRect subRect(SubRect,const TQStyleControlElementData, const ControlElementFlags,const TQWidget *) const; TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
%End %End
protected: protected:

@ -52,10 +52,10 @@ class TQSGIStyle : TQMotifStyle
public: public:
TQSGIStyle(bool = 0); TQSGIStyle(bool = 0);
void polish( TQStyleControlElementData, ControlElementFlags, void * ); void polish( const TQStyleControlElementData&, ControlElementFlags, void * );
void unPolish( TQStyleControlElementData, ControlElementFlags, void * ); void unPolish( const TQStyleControlElementData&, ControlElementFlags, void * );
void applicationPolish( TQStyleControlElementData, ControlElementFlags, void * ); void applicationPolish( const TQStyleControlElementData&, ControlElementFlags, void * );
void applicationUnPolish( TQStyleControlElementData, ControlElementFlags, void * ); void applicationUnPolish( const TQStyleControlElementData&, ControlElementFlags, void * );
%If (- TQt_3_0_0) %If (- TQt_3_0_0)
void polish(TQPalette &); void polish(TQPalette &);
@ -119,29 +119,29 @@ public:
TQColorGroup &,bool,bool); TQColorGroup &,bool,bool);
%End %End
%If (TQt_3_0_0 -) %If (TQt_3_0_0 -)
void drawPrimitive(PrimitiveElement,TQPainter *,TQStyleControlElementData,ControlElementFlags,const TQRect &, void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &,
const TQColorGroup &,SFlags = Style_Default, const TQColorGroup &,SFlags = Style_Default,
const TQStyleOption & = TQStyleOption()) const; const TQStyleOption & = TQStyleOption()) const;
void drawControl(ControlElement,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawControl(ControlElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
void drawComplexControl(ComplexControl,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawComplexControl(ComplexControl,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default,SCFlags = SC_All, SFlags = Style_Default,SCFlags = SC_All,
SCFlags = SC_None, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
int pixelMetric(PixelMetric,TQStyleControlElementData,ControlElementFlags,const TQWidget * = 0) const; int pixelMetric(PixelMetric,const TQStyleControlElementData&,ControlElementFlags,const TQWidget * = 0) const;
TQSize sizeFromContents(ContentsType,TQStyleControlElementData,ControlElementFlags,const TQSize &, TQSize sizeFromContents(ContentsType,const TQStyleControlElementData&,ControlElementFlags,const TQSize &,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
TQRect subRect(SubRect,const TQStyleControlElementData, const ControlElementFlags,const TQWidget *) const; TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
TQRect querySubControlMetrics(ComplexControl,TQStyleControlElementData,ControlElementFlags, TQRect querySubControlMetrics(ComplexControl,const TQStyleControlElementData&,ControlElementFlags,
SubControl, SubControl,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
%End %End

@ -232,16 +232,16 @@ public:
virtual void unPolish(TQStyleControlElementData ceData, ControlElementFlags, void *); virtual void unPolish(TQStyleControlElementData ceData, ControlElementFlags, void *);
virtual void polish(TQApplication *); virtual void polish(TQApplication *);
virtual void applicationPolish(TQStyleControlElementData, ControlElementFlags, void *); virtual void applicationPolish(const TQStyleControlElementData&, ControlElementFlags, void *);
virtual void unPolish(TQApplication *); virtual void unPolish(TQApplication *);
virtual void applicationUnPolish(TQStyleControlElementData, ControlElementFlags, void *); virtual void applicationUnPolish(const TQStyleControlElementData&, ControlElementFlags, void *);
virtual void polish(TQPalette &); virtual void polish(TQPalette &);
%If (TQt_3_0_0 -) %If (TQt_3_0_0 -)
virtual void polishPopupMenu(TQPopupMenu *) = 0; virtual void polishPopupMenu(TQPopupMenu *) = 0;
virtual void polishPopupMenu(TQStyleControlElementData, ControlElementFlags, void *) = 0; virtual void polishPopupMenu(const TQStyleControlElementData&, ControlElementFlags, void *) = 0;
%End %End
%If (- TQt_3_0_0) %If (- TQt_3_0_0)
@ -914,7 +914,7 @@ public:
// New API // New API
virtual void drawPrimitive( PrimitiveElement, virtual void drawPrimitive( PrimitiveElement,
TQPainter*, TQPainter*,
TQStyleControlElementData, const TQStyleControlElementData&,
ControlElementFlags, ControlElementFlags,
const TQRect&, const TQRect&,
const TQColorGroup&, const TQColorGroup&,
@ -923,7 +923,7 @@ public:
virtual void drawControl( ControlElement element, virtual void drawControl( ControlElement element,
TQPainter*, TQPainter*,
TQStyleControlElementData, const TQStyleControlElementData&,
ControlElementFlags, ControlElementFlags,
const TQRect&, const TQRect&,
const TQColorGroup&, const TQColorGroup&,
@ -933,17 +933,17 @@ public:
virtual void drawControlMask( ControlElement element, virtual void drawControlMask( ControlElement element,
TQPainter*, TQPainter*,
TQStyleControlElementData, const TQStyleControlElementData&,
ControlElementFlags, ControlElementFlags,
const TQRect&, const TQRect&,
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget* = 0 /* compat, will likely go away */ ) const = 0; const TQWidget* = 0 /* compat, will likely go away */ ) const = 0;
virtual TQRect subRect( SubRect, const TQStyleControlElementData, const ControlElementFlags, const TQWidget* ) const = 0; virtual TQRect subRect( SubRect, const const TQStyleControlElementData&, const ControlElementFlags, const TQWidget* ) const = 0;
virtual void drawComplexControl( ComplexControl, virtual void drawComplexControl( ComplexControl,
TQPainter*, TQPainter*,
TQStyleControlElementData, const TQStyleControlElementData&,
ControlElementFlags, ControlElementFlags,
const TQRect&, const TQRect&,
const TQColorGroup&, const TQColorGroup&,
@ -955,40 +955,40 @@ public:
virtual void drawComplexControlMask( ComplexControl, virtual void drawComplexControlMask( ComplexControl,
TQPainter*, TQPainter*,
const TQStyleControlElementData, const const TQStyleControlElementData&,
const ControlElementFlags, const ControlElementFlags,
const TQRect&, const TQRect&,
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget* = 0 ) const = 0; const TQWidget* = 0 ) const = 0;
virtual TQRect querySubControlMetrics( ComplexControl, virtual TQRect querySubControlMetrics( ComplexControl,
TQStyleControlElementData, const TQStyleControlElementData&,
ControlElementFlags, ControlElementFlags,
SubControl, SubControl,
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget* = 0 ) const = 0; const TQWidget* = 0 ) const = 0;
virtual SubControl querySubControl( ComplexControl, virtual SubControl querySubControl( ComplexControl,
TQStyleControlElementData, const TQStyleControlElementData&,
ControlElementFlags, ControlElementFlags,
const TQPoint&, const TQPoint&,
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget* = 0 ) const = 0; const TQWidget* = 0 ) const = 0;
virtual int pixelMetric( PixelMetric, virtual int pixelMetric( PixelMetric,
TQStyleControlElementData, const TQStyleControlElementData&,
ControlElementFlags, ControlElementFlags,
const TQWidget* = 0 ) const = 0; const TQWidget* = 0 ) const = 0;
virtual TQSize sizeFromContents( ContentsType, virtual TQSize sizeFromContents( ContentsType,
TQStyleControlElementData, const TQStyleControlElementData&,
ControlElementFlags, ControlElementFlags,
const TQSize&, const TQSize&,
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget* = 0 ) const = 0; const TQWidget* = 0 ) const = 0;
virtual int styleHint( StyleHint, virtual int styleHint( StyleHint,
TQStyleControlElementData, const TQStyleControlElementData&,
ControlElementFlags, ControlElementFlags,
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
TQStyleHintReturn* returnData = 0, TQStyleHintReturn* returnData = 0,
@ -996,23 +996,23 @@ public:
) const = 0; ) const = 0;
virtual TQPixmap stylePixmap( StylePixmap, virtual TQPixmap stylePixmap( StylePixmap,
TQStyleControlElementData, const TQStyleControlElementData&,
ControlElementFlags, ControlElementFlags,
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget* = 0 ) const = 0; const TQWidget* = 0 ) const = 0;
static TQRect visualRect( const TQRect&, const TQStyleControlElementData, const ControlElementFlags ); static TQRect visualRect( const TQRect&, const const TQStyleControlElementData&, const ControlElementFlags );
typedef TQMap<void*, TQStyle*> ObjectEventSourceToHandlerMap; typedef TQMap<void*, TQStyle*> ObjectEventSourceToHandlerMap;
typedef TQMap<void*, TQStyleControlElementData> ObjectEventSourceDataToHandlerMap; typedef TQMap<void*, TQStyleControlElementData> ObjectEventSourceDataToHandlerMap;
typedef TQMap<void*, ControlElementFlags> ObjectEventSourceFlagsToHandlerMap; typedef TQMap<void*, ControlElementFlags> ObjectEventSourceFlagsToHandlerMap;
typedef bool (*EventHandlerInstallationHook)(TQStyleControlElementData, ControlElementFlags, void*, TQStyle*); typedef bool (*EventHandlerInstallationHook)(const TQStyleControlElementData&, ControlElementFlags, void*, TQStyle*);
typedef bool (*EventHandlerRemovalHook)(TQStyleControlElementData, ControlElementFlags, void*, TQStyle*); typedef bool (*EventHandlerRemovalHook)(const TQStyleControlElementData&, ControlElementFlags, void*, TQStyle*);
void installObjectEventHandler( TQStyleControlElementData, ControlElementFlags, void*, TQStyle* ); void installObjectEventHandler( const TQStyleControlElementData&, ControlElementFlags, void*, TQStyle* );
void removeObjectEventHandler( TQStyleControlElementData, ControlElementFlags, void*, TQStyle* ); void removeObjectEventHandler( const TQStyleControlElementData&, ControlElementFlags, void*, TQStyle* );
//void setEventHandlerInstallationHook( EventHandlerInstallationHook ); //void setEventHandlerInstallationHook( EventHandlerInstallationHook );
//void setEventHandlerRemovalHook( EventHandlerRemovalHook hook ); //void setEventHandlerRemovalHook( EventHandlerRemovalHook hook );
virtual bool objectEventHandler( TQStyleControlElementData, ControlElementFlags, void*, TQEvent * ); virtual bool objectEventHandler( const TQStyleControlElementData&, ControlElementFlags, void*, TQEvent * );
enum WidgetActionRequest { enum WidgetActionRequest {
WAR_Repaint, WAR_Repaint,
@ -1033,18 +1033,18 @@ public:
WAR_RepaintAllAccelerators WAR_RepaintAllAccelerators
}; };
typedef bool (*WidgetActionRequestHook)(TQStyleControlElementData, ControlElementFlags, void*, WidgetActionRequest, TQStyleWidgetActionRequestData); typedef bool (*WidgetActionRequestHook)(const TQStyleControlElementData&, ControlElementFlags, void*, WidgetActionRequest, TQStyleWidgetActionRequestData);
//void setWidgetActionRequestHook( WidgetActionRequestHook ); //void setWidgetActionRequestHook( WidgetActionRequestHook );
virtual bool widgetActionRequest( TQStyleControlElementData, ControlElementFlags, void*, WidgetActionRequest, TQStyleWidgetActionRequestData = TQStyleWidgetActionRequestData() ); virtual bool widgetActionRequest( const TQStyleControlElementData&, ControlElementFlags, void*, WidgetActionRequest, TQStyleWidgetActionRequestData = TQStyleWidgetActionRequestData() );
enum ApplicationActionRequest { enum ApplicationActionRequest {
AAR_SetPalette, AAR_SetPalette,
AAR_SetFont AAR_SetFont
}; };
typedef bool (*ApplicationActionRequestHook)(TQStyleControlElementData, ControlElementFlags, void*, ApplicationActionRequest, TQStyleApplicationActionRequestData); typedef bool (*ApplicationActionRequestHook)(const TQStyleControlElementData&, ControlElementFlags, void*, ApplicationActionRequest, TQStyleApplicationActionRequestData);
//void setApplicationActionRequestHook( ApplicationActionRequestHook ); //void setApplicationActionRequestHook( ApplicationActionRequestHook );
virtual bool applicationActionRequest( TQStyleControlElementData, ControlElementFlags, void*, ApplicationActionRequest, TQStyleApplicationActionRequestData = TQStyleApplicationActionRequestData() ); virtual bool applicationActionRequest( const TQStyleControlElementData&, ControlElementFlags, void*, ApplicationActionRequest, TQStyleApplicationActionRequestData = TQStyleApplicationActionRequestData() );
protected: protected:
%If (TQt_2_1_0 - TQt_3_0_0) %If (TQt_2_1_0 - TQt_3_0_0)

@ -76,15 +76,15 @@ public:
TQWindowsStyle(); TQWindowsStyle();
%If (TQt_3_3_0 -) %If (TQt_3_3_0 -)
void applicationPolish(TQStyleControlElementData, ControlElementFlags, void *); void applicationPolish(const TQStyleControlElementData&, ControlElementFlags, void *);
void applicationUnPolish(TQStyleControlElementData, ControlElementFlags, void *); void applicationUnPolish(const TQStyleControlElementData&, ControlElementFlags, void *);
void polish(TQStyleControlElementData, ControlElementFlags, void *); void polish(const TQStyleControlElementData&, ControlElementFlags, void *);
void unPolish(TQStyleControlElementData, ControlElementFlags, void *); void unPolish(const TQStyleControlElementData&, ControlElementFlags, void *);
void polish( TQPalette & ); void polish( TQPalette & );
virtual void polishPopupMenu( TQStyleControlElementData, ControlElementFlags, void * ); virtual void polishPopupMenu( const TQStyleControlElementData&, ControlElementFlags, void * );
%End %End
%If (- TQt_3_0_0) %If (- TQt_3_0_0)
@ -143,36 +143,36 @@ public:
const TQPalette &,bool,bool,int,int,int,int); const TQPalette &,bool,bool,int,int,int,int);
%End %End
%If (TQt_3_0_0 -) %If (TQt_3_0_0 -)
void drawPrimitive(PrimitiveElement,TQPainter *,TQStyleControlElementData,ControlElementFlags,const TQRect &, void drawPrimitive(PrimitiveElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,const TQRect &,
const TQColorGroup &,SFlags = Style_Default, const TQColorGroup &,SFlags = Style_Default,
const TQStyleOption & = TQStyleOption()) const; const TQStyleOption & = TQStyleOption()) const;
void drawControl(ControlElement,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawControl(ControlElement,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
void drawComplexControl(ComplexControl,TQPainter *,TQStyleControlElementData,ControlElementFlags, void drawComplexControl(ComplexControl,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &, const TQRect &,const TQColorGroup &,
SFlags = Style_Default,SCFlags = SC_All, SFlags = Style_Default,SCFlags = SC_All,
SCFlags = SC_None, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
int pixelMetric(PixelMetric,TQStyleControlElementData,ControlElementFlags,const TQWidget * = 0) const; int pixelMetric(PixelMetric,const TQStyleControlElementData&,ControlElementFlags,const TQWidget * = 0) const;
TQSize sizeFromContents(ContentsType,TQStyleControlElementData,ControlElementFlags,const TQSize &, TQSize sizeFromContents(ContentsType,const TQStyleControlElementData&,ControlElementFlags,const TQSize &,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const; const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;
int styleHint(StyleHint,TQStyleControlElementData,ControlElementFlags, int styleHint(StyleHint,const TQStyleControlElementData&,ControlElementFlags,
const TQStyleOption & = TQStyleOption(), const TQStyleOption & = TQStyleOption(),
TQStyleHintReturn * = 0, const TQWidget * = 0) const; TQStyleHintReturn * = 0, const TQWidget * = 0) const;
TQPixmap stylePixmap(StylePixmap,TQStyleControlElementData,ControlElementFlags, TQPixmap stylePixmap(StylePixmap,const TQStyleControlElementData&,ControlElementFlags,
const TQStyleOption & = TQStyleOption(), const TQWidget * = 0) const; const TQStyleOption & = TQStyleOption(), const TQWidget * = 0) const;
%End %End
%If (TQt_3_1_0 -) %If (TQt_3_1_0 -)
TQRect subRect(SubRect,const TQStyleControlElementData, const ControlElementFlags,const TQWidget *) const; TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
%End %End
protected: protected:

Loading…
Cancel
Save