summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-08 01:46:33 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-08 01:46:33 -0500
commit605772f9f09b53568cdf7b8b10b326b32594f93d (patch)
treefeaddc0b843119bbfabf10f307b7473c219b78c1 /src
parent85b69937a320d0f7fdb4fd7703cfe41e92d6a67b (diff)
downloadtqt3-605772f9f09b53568cdf7b8b10b326b32594f93d.tar.gz
tqt3-605772f9f09b53568cdf7b8b10b326b32594f93d.zip
Automated update from Qt3
Diffstat (limited to 'src')
-rw-r--r--src/kernel/ntqstyle.h54
-rw-r--r--src/styles/ntqcommonstyle.h26
2 files changed, 13 insertions, 67 deletions
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h
index e2338fc4..c77ab6e4 100644
--- a/src/kernel/ntqstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -52,9 +52,6 @@
#ifndef QT_NO_STYLE
-/* DEV ONLY */
-/* #define MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED 1 */
-
class TQPopupMenu;
class TQStylePrivate;
class TQMenuItem;
@@ -301,9 +298,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual void polish( TQWidget * );
// New API
@@ -311,9 +305,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual void unPolish( TQWidget * );
// New API
@@ -321,9 +312,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual void polish( TQApplication * );
// New API
@@ -331,9 +319,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual void unPolish( TQApplication * );
// New API
@@ -455,9 +440,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
const TQRect &r,
@@ -512,9 +494,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual void drawControl( ControlElement element,
TQPainter *p,
const TQWidget *widget,
@@ -536,9 +515,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual void drawControlMask( ControlElement element,
TQPainter *p,
const TQWidget *widget,
@@ -596,9 +572,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual TQRect subRect( SubRect r, const TQWidget *widget ) const = 0;
// New API
@@ -668,9 +641,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual void drawComplexControl( ComplexControl control,
TQPainter *p,
const TQWidget *widget,
@@ -703,9 +673,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual void drawComplexControlMask( ComplexControl control,
TQPainter *p,
const TQWidget *widget,
@@ -723,9 +690,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual TQRect querySubControlMetrics( ComplexControl control,
const TQWidget *widget,
SubControl sc,
@@ -741,9 +705,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual SubControl querySubControl( ComplexControl control,
const TQWidget *widget,
const TQPoint &pos,
@@ -828,9 +789,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual int pixelMetric( PixelMetric metric,
const TQWidget *widget = 0 ) const = 0;
@@ -867,9 +825,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual TQSize sizeFromContents( ContentsType contents,
const TQWidget *widget,
const TQSize &contentsSize,
@@ -1033,9 +988,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual int styleHint( StyleHint stylehint,
const TQWidget *widget = 0,
const TQStyleOption& = TQStyleOption::Default,
@@ -1071,9 +1023,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
virtual TQPixmap stylePixmap( StylePixmap stylepixmap,
const TQWidget *widget = 0,
const TQStyleOption& = TQStyleOption::Default ) const = 0;
@@ -1087,9 +1036,6 @@ public:
// Old API
// DEPRECATED
-#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
- __attribute__ ((deprecated))
-#endif
static TQRect visualRect( const TQRect &logical, const TQWidget *w );
// New API
diff --git a/src/styles/ntqcommonstyle.h b/src/styles/ntqcommonstyle.h
index b8a407ce..ed02fe41 100644
--- a/src/styles/ntqcommonstyle.h
+++ b/src/styles/ntqcommonstyle.h
@@ -57,7 +57,7 @@ public:
// Old API
// DEPRECATED
- __attribute__ ((deprecated)) void drawPrimitive( PrimitiveElement pe,
+ void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
const TQRect &r,
const TQColorGroup &cg,
@@ -76,7 +76,7 @@ public:
// Old API
// DEPRECATED
- __attribute__ ((deprecated)) void drawControl( ControlElement element,
+ void drawControl( ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -97,7 +97,7 @@ public:
// Old API
// DEPRECATED
- __attribute__ ((deprecated)) void drawControlMask( ControlElement element,
+ void drawControlMask( ControlElement element,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -114,14 +114,14 @@ public:
// Old API
// DEPRECATED
- __attribute__ ((deprecated)) TQRect subRect( SubRect r, const TQWidget *widget ) const;
+ 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
- __attribute__ ((deprecated)) void drawComplexControl( ComplexControl control,
+ void drawComplexControl( ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -152,9 +152,9 @@ public:
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- // Old API
+ // Old API
// DEPRECATED
- __attribute__ ((deprecated)) void drawComplexControlMask( ComplexControl control,
+ void drawComplexControlMask( ComplexControl control,
TQPainter *p,
const TQWidget *widget,
const TQRect &r,
@@ -171,7 +171,7 @@ public:
// Old API
// DEPRECATED
- __attribute__ ((deprecated)) TQRect querySubControlMetrics( ComplexControl control,
+ TQRect querySubControlMetrics( ComplexControl control,
const TQWidget *widget,
SubControl sc,
const TQStyleOption& = TQStyleOption::Default ) const;
@@ -186,7 +186,7 @@ public:
// Old API
// DEPRECATED
- __attribute__ ((deprecated)) SubControl querySubControl( ComplexControl control,
+ SubControl querySubControl( ComplexControl control,
const TQWidget *widget,
const TQPoint &pos,
const TQStyleOption& = TQStyleOption::Default ) const;
@@ -201,14 +201,14 @@ public:
// Old API
// DEPRECATED
- __attribute__ ((deprecated)) int pixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const;
+ 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,
+ TQSize sizeFromContents( ContentsType s,
const TQWidget *widget,
const TQSize &contentsSize,
const TQStyleOption& = TQStyleOption::Default ) const;
@@ -223,14 +223,14 @@ public:
// Old API
// DEPRECATED
- __attribute__ ((deprecated)) int styleHint(StyleHint sh, const TQWidget *, const TQStyleOption &, TQStyleHintReturn *) const;
+ 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
- __attribute__ ((deprecated)) TQPixmap stylePixmap( StylePixmap sp,
+ TQPixmap stylePixmap( StylePixmap sp,
const TQWidget *widget = 0,
const TQStyleOption& = TQStyleOption::Default ) const;