Browse Source

Fix prior commit

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
1343e022f2
7 changed files with 10 additions and 10 deletions
  1. +2
    -2
      sip/qt/qcommonstyle.sip
  2. +1
    -1
      sip/qt/qmotifplusstyle.sip
  3. +1
    -1
      sip/qt/qmotifstyle.sip
  4. +1
    -1
      sip/qt/qplatinumstyle.sip
  5. +1
    -1
      sip/qt/qsgistyle.sip
  6. +3
    -3
      sip/qt/qstyle.sip
  7. +1
    -1
      sip/qt/qwindowsstyle.sip

+ 2
- 2
sip/qt/qcommonstyle.sip View File

@@ -92,7 +92,7 @@ public:
const TQRect &,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;

TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
TQRect subRect(SubRect,const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;

void drawComplexControl(ComplexControl,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &,
@@ -100,7 +100,7 @@ public:
SCFlags = SC_None,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;

void drawComplexControlMask(ComplexControl,TQPainter *,const const TQStyleControlElementData&,const ControlElementFlags,
void drawComplexControlMask(ComplexControl,TQPainter *,const TQStyleControlElementData&,const ControlElementFlags,
const TQRect &,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;



+ 1
- 1
sip/qt/qmotifplusstyle.sip View File

@@ -122,7 +122,7 @@ public:
SFlags = Style_Default,
const TQStyleOption & = TQStyleOption(), const TQWidget *=0) const;
TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
TQRect subRect(SubRect,const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
void drawComplexControl(ComplexControl,TQPainter *,const TQStyleControlElementData&,ControlElementFlags,
const TQRect &,const TQColorGroup &,


+ 1
- 1
sip/qt/qmotifstyle.sip View File

@@ -148,7 +148,7 @@ public:
TQSize sizeFromContents(ContentsType,const TQStyleControlElementData&,ControlElementFlags,const TQSize &,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;

TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
TQRect subRect(SubRect,const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
TQPixmap stylePixmap(StylePixmap,const TQStyleControlElementData&,ControlElementFlags,
const TQStyleOption & = TQStyleOption(), const TQWidget * = 0) const;


+ 1
- 1
sip/qt/qplatinumstyle.sip View File

@@ -114,7 +114,7 @@ public:
int pixelMetric(PixelMetric,const TQStyleControlElementData&,ControlElementFlags,const TQWidget * = 0) const;
TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
TQRect subRect(SubRect,const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
%End

protected:


+ 1
- 1
sip/qt/qsgistyle.sip View File

@@ -139,7 +139,7 @@ public:
TQSize sizeFromContents(ContentsType,const TQStyleControlElementData&,ControlElementFlags,const TQSize &,
const TQStyleOption & = TQStyleOption(),const TQWidget *=0) const;

TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
TQRect subRect(SubRect,const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
TQRect querySubControlMetrics(ComplexControl,const TQStyleControlElementData&,ControlElementFlags,
SubControl,


+ 3
- 3
sip/qt/qstyle.sip View File

@@ -939,7 +939,7 @@ public:
const TQStyleOption& = TQStyleOption::Default,
const TQWidget* = 0 /* compat, will likely go away */ ) const = 0;
virtual TQRect subRect( SubRect, const const TQStyleControlElementData&, const ControlElementFlags, const TQWidget* ) const = 0;
virtual TQRect subRect( SubRect, const TQStyleControlElementData&, const ControlElementFlags, const TQWidget* ) const = 0;

virtual void drawComplexControl( ComplexControl,
TQPainter*,
@@ -955,7 +955,7 @@ public:
virtual void drawComplexControlMask( ComplexControl,
TQPainter*,
const const TQStyleControlElementData&,
const TQStyleControlElementData&,
const ControlElementFlags,
const TQRect&,
const TQStyleOption& = TQStyleOption::Default,
@@ -1001,7 +1001,7 @@ public:
const TQStyleOption& = TQStyleOption::Default,
const TQWidget* = 0 ) const = 0;
static TQRect visualRect( const TQRect&, const const TQStyleControlElementData&, const ControlElementFlags );
static TQRect visualRect( const TQRect&, const TQStyleControlElementData&, const ControlElementFlags );
typedef TQMap<void*, TQStyle*> ObjectEventSourceToHandlerMap;
typedef TQMap<void*, TQStyleControlElementData> ObjectEventSourceDataToHandlerMap;


+ 1
- 1
sip/qt/qwindowsstyle.sip View File

@@ -172,7 +172,7 @@ public:
%End

%If (TQt_3_1_0 -)
TQRect subRect(SubRect,const const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
TQRect subRect(SubRect,const TQStyleControlElementData&, const ControlElementFlags,const TQWidget *) const;
%End

protected:


Loading…
Cancel
Save