diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-05 01:01:34 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-05 01:01:34 -0500 |
commit | c73edd8f63289c619c20a8e5d031a24d870c62ee (patch) | |
tree | 08cbff3bdbb8c46213f6cf416d5f027f58d4c5f5 /src/styles/ntqcommonstyle.h | |
parent | fe7969ef886d7287fa959929ddd33fbad8407884 (diff) | |
download | tqt3-c73edd8f63289c619c20a8e5d031a24d870c62ee.tar.gz tqt3-c73edd8f63289c619c20a8e5d031a24d870c62ee.zip |
Automated update from Qt3
Diffstat (limited to 'src/styles/ntqcommonstyle.h')
-rw-r--r-- | src/styles/ntqcommonstyle.h | 161 |
1 files changed, 141 insertions, 20 deletions
diff --git a/src/styles/ntqcommonstyle.h b/src/styles/ntqcommonstyle.h index 6fd636fd6..fd1e0f459 100644 --- a/src/styles/ntqcommonstyle.h +++ b/src/styles/ntqcommonstyle.h @@ -55,30 +55,73 @@ public: TQCommonStyle(); ~TQCommonStyle(); + // Old API + // DEPRECATED + __attribute__ ((deprecated)) void drawPrimitive( PrimitiveElement pe, + TQPainter *p, + const TQRect &r, + const TQColorGroup &cg, + SFlags flags = Style_Default, + const TQStyleOption& = TQStyleOption::Default ) const; + + // New API void drawPrimitive( PrimitiveElement pe, TQPainter *p, + TQStyleControlElementData ceData, + ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; + // Old API + // DEPRECATED + __attribute__ ((deprecated)) void drawControl( ControlElement element, + TQPainter *p, + const TQWidget *widget, + const TQRect &r, + const TQColorGroup &cg, + SFlags how = Style_Default, + const TQStyleOption& = TQStyleOption::Default ) const; + + // New API void drawControl( ControlElement element, - TQPainter *p, - const TQWidget *widget, - const TQRect &r, - const TQColorGroup &cg, - SFlags how = Style_Default, - const TQStyleOption& = TQStyleOption::Default ) const; + TQPainter *p, + TQStyleControlElementData ceData, + ControlElementFlags elementFlags, + const TQRect &r, + const TQColorGroup &cg, + SFlags how = Style_Default, + const TQStyleOption& = TQStyleOption::Default, + const TQWidget *widget = 0 ) const; + // Old API + // DEPRECATED + __attribute__ ((deprecated)) void drawControlMask( ControlElement element, + TQPainter *p, + const TQWidget *widget, + const TQRect &r, + const TQStyleOption& = TQStyleOption::Default ) const; + + // New API void drawControlMask( ControlElement element, - TQPainter *p, - const TQWidget *widget, - const TQRect &r, - const TQStyleOption& = TQStyleOption::Default ) const; + TQPainter *p, + TQStyleControlElementData ceData, + ControlElementFlags elementFlags, + const TQRect &r, + const TQStyleOption& = TQStyleOption::Default, + const TQWidget *widget = 0 ) const; - TQRect subRect( SubRect r, const TQWidget *widget ) const; + // Old API + // DEPRECATED + __attribute__ ((deprecated)) TQRect subRect( SubRect r, const TQWidget *widget ) const; - void drawComplexControl( ComplexControl control, + // New API + TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const; + + // Old API + // DEPRECATED + __attribute__ ((deprecated)) void drawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -92,35 +135,112 @@ public: SCFlags subActive = SC_None, const TQStyleOption& = TQStyleOption::Default ) const; - void drawComplexControlMask( ComplexControl control, + // New API + void drawComplexControl( ComplexControl control, + TQPainter *p, + TQStyleControlElementData ceData, + ControlElementFlags elementFlags, + const TQRect &r, + const TQColorGroup &cg, + SFlags how = Style_Default, +#ifdef Q_QDOC + SCFlags sub = SC_All, +#else + SCFlags sub = (uint)SC_All, +#endif + SCFlags subActive = SC_None, + const TQStyleOption& = TQStyleOption::Default, + const TQWidget *widget = 0 ) const; + + // Old API + // DEPRECATED + __attribute__ ((deprecated)) void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const; - TQRect querySubControlMetrics( ComplexControl control, + // New API + void drawComplexControlMask( ComplexControl control, + TQPainter *p, + const TQStyleControlElementData ceData, + const ControlElementFlags elementFlags, + const TQRect &r, + const TQStyleOption& = TQStyleOption::Default, + const TQWidget *widget = 0 ) const; + + // Old API + // DEPRECATED + __attribute__ ((deprecated)) TQRect querySubControlMetrics( ComplexControl control, const TQWidget *widget, SubControl sc, const TQStyleOption& = TQStyleOption::Default ) const; - SubControl querySubControl( ComplexControl control, + // New API + TQRect querySubControlMetrics( ComplexControl control, + TQStyleControlElementData ceData, + ControlElementFlags elementFlags, + SubControl sc, + const TQStyleOption& = TQStyleOption::Default, + const TQWidget *widget = 0 ) const; + + // Old API + // DEPRECATED + __attribute__ ((deprecated)) SubControl querySubControl( ComplexControl control, const TQWidget *widget, const TQPoint &pos, const TQStyleOption& = TQStyleOption::Default ) const; - int pixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; + // New API + SubControl querySubControl( ComplexControl control, + TQStyleControlElementData ceData, + ControlElementFlags elementFlags, + const TQPoint &pos, + const TQStyleOption& = TQStyleOption::Default, + const TQWidget *widget = 0 ) const; - TQSize sizeFromContents( ContentsType s, + // Old API + // DEPRECATED + __attribute__ ((deprecated)) int pixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; + + // New API + int pixelMetric( PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const; + + // Old API + // DEPRECATED + __attribute__ ((deprecated)) TQSize sizeFromContents( ContentsType s, const TQWidget *widget, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default ) const; - int styleHint(StyleHint sh, const TQWidget *, const TQStyleOption &, TQStyleHintReturn *) const; + // New API + TQSize sizeFromContents( ContentsType s, + TQStyleControlElementData ceData, + ControlElementFlags elementFlags, + const TQSize &contentsSize, + const TQStyleOption& = TQStyleOption::Default, + const TQWidget *widget = 0 ) const; + + // Old API + // DEPRECATED + __attribute__ ((deprecated)) int styleHint(StyleHint sh, const TQWidget *, const TQStyleOption &, TQStyleHintReturn *) const; - TQPixmap stylePixmap( StylePixmap sp, + // New API + int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget * w) const; + + // Old API + // DEPRECATED + __attribute__ ((deprecated)) TQPixmap stylePixmap( StylePixmap sp, const TQWidget *widget = 0, const TQStyleOption& = TQStyleOption::Default ) const; + // New API + TQPixmap stylePixmap( StylePixmap sp, + TQStyleControlElementData ceData, + ControlElementFlags elementFlags, + const TQStyleOption& = TQStyleOption::Default, + const TQWidget *widget = 0 ) const; + private: // Disabled copy constructor and operator= @@ -130,7 +250,8 @@ private: #endif }; - +Q_EXPORT TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields=true); +Q_EXPORT TQStyle::ControlElementFlags getControlElementFlagsForObject(const TQObject* object, TQStringList objectTypeList, const TQStyleOption& opt); #endif // QT_NO_STYLE |