summaryrefslogtreecommitdiffstats
path: root/src/styles/ntqcommonstyle.h
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-08-08 15:38:47 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-08-08 15:38:47 -0500
commit785106b36c47923c338b6d3d61584eea448863ca (patch)
tree6b2bbbde4a5ff5e43c1c9ec31ad0bd72ea43e0df /src/styles/ntqcommonstyle.h
parent7d22e97622a6b963382b88aac6dfde06a2cd8f03 (diff)
parent43db215f601fd50f1fd8b502fae30c75c1bdee4a (diff)
downloadtqt3-785106b36c47923c338b6d3d61584eea448863ca.tar.gz
tqt3-785106b36c47923c338b6d3d61584eea448863ca.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/styles/ntqcommonstyle.h')
-rw-r--r--src/styles/ntqcommonstyle.h141
1 files changed, 129 insertions, 12 deletions
diff --git a/src/styles/ntqcommonstyle.h b/src/styles/ntqcommonstyle.h
index 6fd636fd6..ed02fe418 100644
--- a/src/styles/ntqcommonstyle.h
+++ b/src/styles/ntqcommonstyle.h
@@ -55,6 +55,8 @@ public:
TQCommonStyle();
~TQCommonStyle();
+ // Old API
+ // DEPRECATED
void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
const TQRect &r,
@@ -62,22 +64,63 @@ public:
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
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,
+ 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,
+ 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
void drawControlMask( ControlElement element,
- TQPainter *p,
- const TQWidget *widget,
- const TQRect &r,
- const TQStyleOption& = TQStyleOption::Default ) const;
+ TQPainter *p,
+ const TQWidget *widget,
+ const TQRect &r,
+ const TQStyleOption& = TQStyleOption::Default ) const;
+ // New API
+ void drawControlMask( ControlElement element,
+ TQPainter *p,
+ TQStyleControlElementData ceData,
+ ControlElementFlags elementFlags,
+ const TQRect &r,
+ const TQStyleOption& = TQStyleOption::Default,
+ const TQWidget *widget = 0 ) const;
+
+ // Old API
+ // DEPRECATED
TQRect subRect( SubRect r, const TQWidget *widget ) const;
+ // New API
+ TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const;
+
+ // Old API
+ // DEPRECATED
void drawComplexControl( ComplexControl control,
TQPainter *p,
const TQWidget *widget,
@@ -92,35 +135,111 @@ public:
SCFlags subActive = SC_None,
const TQStyleOption& = TQStyleOption::Default ) const;
+ // 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
void drawComplexControlMask( ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
const TQStyleOption& = TQStyleOption::Default ) const;
+ // 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
TQRect querySubControlMetrics( ComplexControl control,
const TQWidget *widget,
SubControl sc,
const TQStyleOption& = TQStyleOption::Default ) const;
+ // New API
+ TQRect querySubControlMetrics( ComplexControl control,
+ TQStyleControlElementData ceData,
+ ControlElementFlags elementFlags,
+ SubControl sc,
+ const TQStyleOption& = TQStyleOption::Default,
+ const TQWidget *widget = 0 ) const;
+
+ // Old API
+ // DEPRECATED
SubControl querySubControl( ComplexControl control,
const TQWidget *widget,
const TQPoint &pos,
const TQStyleOption& = TQStyleOption::Default ) const;
+ // New API
+ SubControl querySubControl( ComplexControl control,
+ TQStyleControlElementData ceData,
+ ControlElementFlags elementFlags,
+ const TQPoint &pos,
+ const TQStyleOption& = TQStyleOption::Default,
+ const TQWidget *widget = 0 ) const;
+
+ // Old API
+ // 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
TQSize sizeFromContents( ContentsType s,
const TQWidget *widget,
const TQSize &contentsSize,
const TQStyleOption& = TQStyleOption::Default ) 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
int styleHint(StyleHint sh, const TQWidget *, const TQStyleOption &, TQStyleHintReturn *) const;
+ // New API
+ int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget * w) const;
+
+ // Old API
+ // 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,8 +249,6 @@ private:
#endif
};
-
-
#endif // QT_NO_STYLE
#endif // TQCOMMONSTYLE_H