From 47132557a4c58d4ad69bc2898bb2bd9c424b3b64 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 8 Aug 2012 01:46:08 -0500
Subject: Remove deprecation attributes from style functions, as they prevent
 smoke from functioning properly

---
 src/styles/qcommonstyle.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/styles')

diff --git a/src/styles/qcommonstyle.h b/src/styles/qcommonstyle.h
index 6fa895d..e6378e6 100644
--- a/src/styles/qcommonstyle.h
+++ b/src/styles/qcommonstyle.h
@@ -57,7 +57,7 @@ public:
 
     // Old API
     // DEPRECATED
-    __attribute__ ((deprecated)) void drawPrimitive( PrimitiveElement pe,
+    void drawPrimitive( PrimitiveElement pe,
 			QPainter *p,
 			const QRect &r,
 			const QColorGroup &cg,
@@ -76,7 +76,7 @@ public:
 
     // Old API
     // DEPRECATED
-    __attribute__ ((deprecated)) void drawControl( ControlElement element,
+    void drawControl( ControlElement element,
 			QPainter *p,
 			const QWidget *widget,
 			const QRect &r,
@@ -97,7 +97,7 @@ public:
 
     // Old API
     // DEPRECATED
-    __attribute__ ((deprecated)) void drawControlMask( ControlElement element,
+    void drawControlMask( ControlElement element,
 			QPainter *p,
 			const QWidget *widget,
 			const QRect &r,
@@ -114,14 +114,14 @@ public:
 
     // Old API
     // DEPRECATED
-    __attribute__ ((deprecated)) QRect subRect( SubRect r, const QWidget *widget ) const;
+    QRect subRect( SubRect r, const QWidget *widget ) const;
 
     // New API
     QRect subRect( SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const;
 
     // Old API
     // DEPRECATED
-    __attribute__ ((deprecated)) void drawComplexControl( ComplexControl control,
+    void drawComplexControl( ComplexControl control,
 			     QPainter *p,
 			     const QWidget *widget,
 			     const QRect &r,
@@ -152,9 +152,9 @@ public:
 			     const QStyleOption& = QStyleOption::Default,
 			     const QWidget *widget = 0 ) const;
 
-   // Old API
+    // Old API
     // DEPRECATED
-    __attribute__ ((deprecated))  void drawComplexControlMask( ComplexControl control,
+    void drawComplexControlMask( ComplexControl control,
 				 QPainter *p,
 				 const QWidget *widget,
 				 const QRect &r,
@@ -171,7 +171,7 @@ public:
 
     // Old API
     // DEPRECATED
-    __attribute__ ((deprecated)) QRect querySubControlMetrics( ComplexControl control,
+    QRect querySubControlMetrics( ComplexControl control,
 				  const QWidget *widget,
 				  SubControl sc,
 				  const QStyleOption& = QStyleOption::Default ) const;
@@ -186,7 +186,7 @@ public:
 
     // Old API
     // DEPRECATED
-    __attribute__ ((deprecated)) SubControl querySubControl( ComplexControl control,
+    SubControl querySubControl( ComplexControl control,
 				const QWidget *widget,
 				const QPoint &pos,
 				const QStyleOption& = QStyleOption::Default ) const;
@@ -201,14 +201,14 @@ public:
 
     // Old API
     // DEPRECATED
-    __attribute__ ((deprecated)) int pixelMetric( PixelMetric m, const QWidget *widget = 0 ) const;
+    int pixelMetric( PixelMetric m, const QWidget *widget = 0 ) const;
 
     // New API
     int pixelMetric( PixelMetric m, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const;
 
     // Old API
     // DEPRECATED
-    __attribute__ ((deprecated)) QSize sizeFromContents( ContentsType s,
+    QSize sizeFromContents( ContentsType s,
 			    const QWidget *widget,
 			    const QSize &contentsSize,
 			    const QStyleOption& = QStyleOption::Default ) const;
@@ -223,14 +223,14 @@ public:
 
     // Old API
     // DEPRECATED
-    __attribute__ ((deprecated)) int styleHint(StyleHint sh, const QWidget *, const QStyleOption &, QStyleHintReturn *) const;
+    int styleHint(StyleHint sh, const QWidget *, const QStyleOption &, QStyleHintReturn *) const;
 
     // New API
     int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption &, QStyleHintReturn *, const QWidget * w) const;
 
     // Old API
     // DEPRECATED
-    __attribute__ ((deprecated)) QPixmap stylePixmap( StylePixmap sp,
+    QPixmap stylePixmap( StylePixmap sp,
 			 const QWidget *widget = 0,
 			 const QStyleOption& = QStyleOption::Default ) const;
 
-- 
cgit v1.2.1