summaryrefslogtreecommitdiffstats
path: root/src/styles
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-14 23:46:03 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-14 23:46:03 -0600
commit6241511abf822c12298be414b681ed03379c11b0 (patch)
treee5f0e1ace609be2c6bedd26a9a95dc552f62b15d /src/styles
parent367668d690ce2270f4d99f9a19ea800b6ea84a39 (diff)
downloadtqt3-6241511abf822c12298be414b681ed03379c11b0.tar.gz
tqt3-6241511abf822c12298be414b681ed03379c11b0.zip
Automated update from Qt3
Diffstat (limited to 'src/styles')
-rw-r--r--src/styles/ntqcdestyle.h6
-rw-r--r--src/styles/ntqcommonstyle.h24
-rw-r--r--src/styles/ntqcompactstyle.h8
-rw-r--r--src/styles/ntqmotifplusstyle.h24
-rw-r--r--src/styles/ntqmotifstyle.h24
-rw-r--r--src/styles/ntqplatinumstyle.h12
-rw-r--r--src/styles/ntqsgistyle.h26
-rw-r--r--src/styles/ntqwindowsstyle.h28
-rw-r--r--src/styles/qcdestyle.cpp6
-rw-r--r--src/styles/qcommonstyle.cpp29
-rw-r--r--src/styles/qcompactstyle.cpp8
-rw-r--r--src/styles/qmotifplusstyle.cpp24
-rw-r--r--src/styles/qmotifstyle.cpp24
-rw-r--r--src/styles/qplatinumstyle.cpp12
-rw-r--r--src/styles/qsgistyle.cpp26
-rw-r--r--src/styles/qwindowsstyle.cpp32
16 files changed, 157 insertions, 156 deletions
diff --git a/src/styles/ntqcdestyle.h b/src/styles/ntqcdestyle.h
index 13b2c024..5f169118 100644
--- a/src/styles/ntqcdestyle.h
+++ b/src/styles/ntqcdestyle.h
@@ -62,11 +62,11 @@ public:
TQCDEStyle( bool useHighlightCols = FALSE );
virtual ~TQCDEStyle();
- int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
+ int pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
void drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -76,7 +76,7 @@ public:
void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
diff --git a/src/styles/ntqcommonstyle.h b/src/styles/ntqcommonstyle.h
index 8fe9ecfa..cb04fa71 100644
--- a/src/styles/ntqcommonstyle.h
+++ b/src/styles/ntqcommonstyle.h
@@ -58,7 +58,7 @@ public:
// New API
void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -68,7 +68,7 @@ public:
// New API
void drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -79,19 +79,19 @@ public:
// New API
void drawControlMask( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
// New API
- TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const;
+ TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const;
// New API
void drawComplexControl( ComplexControl control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -108,7 +108,7 @@ public:
// New API
void drawComplexControlMask( ComplexControl control,
TQPainter *p,
- const TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
const TQRect &r,
const TQStyleOption& = TQStyleOption::Default,
@@ -116,7 +116,7 @@ public:
// New API
TQRect querySubControlMetrics( ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
const TQStyleOption& = TQStyleOption::Default,
@@ -124,29 +124,29 @@ public:
// New API
SubControl querySubControl( ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQPoint &pos,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
// New API
- int pixelMetric( PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
+ int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
// New API
TQSize sizeFromContents( ContentsType s,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &contentsSize,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
// New API
- int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget * w) const;
+ int styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget * w) const;
// New API
TQPixmap stylePixmap( StylePixmap sp,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
diff --git a/src/styles/ntqcompactstyle.h b/src/styles/ntqcompactstyle.h
index cc8c7e94..13a44202 100644
--- a/src/styles/ntqcompactstyle.h
+++ b/src/styles/ntqcompactstyle.h
@@ -58,21 +58,21 @@ class Q_EXPORT_STYLE_COMPACT TQCompactStyle : public TQWindowsStyle
public:
TQCompactStyle();
- int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 );
+ int pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 );
void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void drawControl( ControlElement element, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r,
+ void drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
const TQColorGroup &cg, SFlags how = Style_Default, const TQStyleOption& = TQStyleOption::Default, const TQWidget *w = 0 );
- int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget *) const;
+ int styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget *) const;
private: // Disabled copy constructor and operator=
#if defined(TQ_DISABLE_COPY)
diff --git a/src/styles/ntqmotifplusstyle.h b/src/styles/ntqmotifplusstyle.h
index 8027b933..16dbf176 100644
--- a/src/styles/ntqmotifplusstyle.h
+++ b/src/styles/ntqmotifplusstyle.h
@@ -63,15 +63,15 @@ public:
virtual ~TQMotifPlusStyle();
void polish(TQPalette &pal);
- void polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
- void unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+ void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+ void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
- void applicationPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
- void applicationUnPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+ void applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+ void applicationUnPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -80,7 +80,7 @@ public:
void drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -88,11 +88,11 @@ public:
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- TQRect subRect(SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const;
+ TQRect subRect(SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const;
void drawComplexControl(ComplexControl control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -107,18 +107,18 @@ public:
const TQWidget *widget = 0 ) const;
TQRect querySubControlMetrics(ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0) const;
- int pixelMetric(PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0) const;
+ int pixelMetric(PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0) const;
- int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
+ int styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn* = 0, const TQWidget * = 0) const;
- bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
+ bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
private:
diff --git a/src/styles/ntqmotifstyle.h b/src/styles/ntqmotifstyle.h
index ec55406c..664208de 100644
--- a/src/styles/ntqmotifstyle.h
+++ b/src/styles/ntqmotifstyle.h
@@ -67,15 +67,15 @@ public:
bool useHighlightColors() const;
void polish( TQPalette& );
- void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
- void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+ void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
+ void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
- void polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+ void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
// new style API
void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -84,7 +84,7 @@ public:
void drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -94,7 +94,7 @@ public:
void drawComplexControl( ComplexControl control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect& r,
const TQColorGroup& cg,
@@ -109,26 +109,26 @@ public:
const TQWidget* widget = 0 ) const;
TQRect querySubControlMetrics( ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
+ int pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
TQSize sizeFromContents( ContentsType contents,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &contentsSize,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- TQRect subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
+ TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
- TQPixmap stylePixmap(StylePixmap, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption& = TQStyleOption::Default, const TQWidget * = 0) const;
+ TQPixmap stylePixmap(StylePixmap, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& = TQStyleOption::Default, const TQWidget * = 0) const;
- int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
+ int styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn* = 0, const TQWidget * = 0) const;
private:
diff --git a/src/styles/ntqplatinumstyle.h b/src/styles/ntqplatinumstyle.h
index f0b0ec7e..968fbb1d 100644
--- a/src/styles/ntqplatinumstyle.h
+++ b/src/styles/ntqplatinumstyle.h
@@ -65,7 +65,7 @@ public:
// new Style Stuff
void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -74,7 +74,7 @@ public:
void drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -84,7 +84,7 @@ public:
void drawComplexControl( ComplexControl control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -99,15 +99,15 @@ public:
const TQWidget *widget = 0 ) const;
TQRect querySubControlMetrics( ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
+ int pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
- TQRect subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
+ TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
protected:
TQColor mixedColor(const TQColor &, const TQColor &) const;
diff --git a/src/styles/ntqsgistyle.h b/src/styles/ntqsgistyle.h
index bca63f28..dfeda72a 100644
--- a/src/styles/ntqsgistyle.h
+++ b/src/styles/ntqsgistyle.h
@@ -67,14 +67,14 @@ public:
#if !defined(Q_NO_USING_KEYWORD)
using TQMotifStyle::polish;
#endif
- void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
- void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
- void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
- void applicationUnPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+ void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
+ void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
+ void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
+ void applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -83,7 +83,7 @@ public:
void drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -93,7 +93,7 @@ public:
void drawComplexControl( ComplexControl control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect& r,
const TQColorGroup& cg,
@@ -107,26 +107,26 @@ public:
const TQStyleOption& = TQStyleOption::Default,
const TQWidget* widget = 0 ) const;
- int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
+ int pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
TQSize sizeFromContents( ContentsType contents,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &contentsSize,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- TQRect subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
+ TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
TQRect querySubControlMetrics( ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget *) const;
+ int styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget *) const;
- bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
+ bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
private:
TQSGIStylePrivate *d;
diff --git a/src/styles/ntqwindowsstyle.h b/src/styles/ntqwindowsstyle.h
index 7220eace..eaee7ca9 100644
--- a/src/styles/ntqwindowsstyle.h
+++ b/src/styles/ntqwindowsstyle.h
@@ -61,20 +61,20 @@ public:
TQWindowsStyle();
~TQWindowsStyle();
- void applicationPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
- void applicationUnPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+ void applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+ void applicationUnPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
- void polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
- void unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+ void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+ void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void polish( TQPalette & );
- virtual void polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+ virtual void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
// new stuff
void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -83,7 +83,7 @@ public:
void drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -93,7 +93,7 @@ public:
void drawComplexControl( ComplexControl control,
TQPainter* p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect& r,
const TQColorGroup& cg,
@@ -108,29 +108,29 @@ public:
const TQWidget* widget = 0 ) const;
int pixelMetric( PixelMetric metric,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQWidget *widget = 0 ) const;
TQSize sizeFromContents( ContentsType contents,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &contentsSize,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
+ int styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn* = 0, const TQWidget* = 0) const;
TQPixmap stylePixmap( StylePixmap stylepixmap,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const;
+ TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const;
- bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
+ bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
private:
class Private;
diff --git a/src/styles/qcdestyle.cpp b/src/styles/qcdestyle.cpp
index 1b01c81d..931aa2d4 100644
--- a/src/styles/qcdestyle.cpp
+++ b/src/styles/qcdestyle.cpp
@@ -87,7 +87,7 @@ TQCDEStyle::~TQCDEStyle()
/*!\reimp
*/
-int TQCDEStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+int TQCDEStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
{
int ret;
@@ -112,7 +112,7 @@ int TQCDEStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceDat
*/
void TQCDEStyle::drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -144,7 +144,7 @@ void TQCDEStyle::drawControl( ControlElement element,
*/
void TQCDEStyle::drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 1bc1d037..41ed19d0 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -258,6 +258,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
TQStyleControlElementData ceData;
if (widget) {
+ ceData.isNull = false;
ceData.widgetObjectTypes = getObjectTypeListForObject(widget);
ceData.allDataPopulated = populateReliantFields & populateMinimumNumberOfFields;
if (!populateMinimumNumberOfFields) {
@@ -695,7 +696,7 @@ TQStyleControlElementData populateControlElementDataFromApplication(const TQAppl
/*! \reimp */
void TQCommonStyle::drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -1173,7 +1174,7 @@ void qt_style_erase_region(TQPainter* p, const TQRegion& region, TQStyleControlE
/*! \reimp */
void TQCommonStyle::drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -1619,7 +1620,7 @@ void TQCommonStyle::drawControl( ControlElement element,
{
TQRect rect = r;
- TQIconSet* icon = &ceData.iconSet;
+ const TQIconSet* icon = &ceData.iconSet;
if ( icon ) {
TQPixmap pixmap = icon->pixmap( TQIconSet::Small,
flags & Style_Enabled ?
@@ -1653,7 +1654,7 @@ void TQCommonStyle::drawControl( ControlElement element,
/*! \reimp */
void TQCommonStyle::drawControlMask( ControlElement control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQStyleOption& opt,
@@ -1689,7 +1690,7 @@ void TQCommonStyle::drawControlMask( ControlElement control,
}
/*! \reimp */
-TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
+TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
{
TQRect rect, wrect(ceData.rect);
@@ -1985,7 +1986,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData ceData,
/*
I really need this and I don't want to expose it in TQRangeControl..
*/
-static int qPositionFromValue( TQStyleControlElementData ceData, int logical_val,
+static int qPositionFromValue( const TQStyleControlElementData &ceData, int logical_val,
int span )
{
if ( span <= 0 || logical_val < ceData.minSteps ||
@@ -2018,7 +2019,7 @@ static int qPositionFromValue( TQStyleControlElementData ceData, int logical_val
/*! \reimp */
void TQCommonStyle::drawComplexControl( ComplexControl control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -2420,7 +2421,7 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
/*! \reimp */
void TQCommonStyle::drawComplexControlMask( ComplexControl control,
TQPainter *p,
- const TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
const TQRect &r,
const TQStyleOption& opt,
@@ -2437,7 +2438,7 @@ void TQCommonStyle::drawComplexControlMask( ComplexControl control,
/*! \reimp */
TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
const TQStyleOption &opt,
@@ -2671,7 +2672,7 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
/*! \reimp */
TQStyle::SubControl TQCommonStyle::querySubControl(ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQPoint &pos,
const TQStyleOption& opt,
@@ -2746,7 +2747,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(ComplexControl control,
}
/*! \reimp */
-int TQCommonStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
+int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
{
int ret;
@@ -2970,7 +2971,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData,
/*! \reimp */
TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &contentsSize,
const TQStyleOption& opt,
@@ -3140,7 +3141,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
}
/*! \reimp */
-int TQCommonStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget * w) const
+int TQCommonStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget * w) const
{
Q_UNUSED(w);
@@ -3223,7 +3224,7 @@ int TQCommonStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, Con
}
/*! \reimp */
-TQPixmap TQCommonStyle::stylePixmap(StylePixmap, TQStyleControlElementData, ControlElementFlags, const TQStyleOption&, const TQWidget *) const
+TQPixmap TQCommonStyle::stylePixmap(StylePixmap, const TQStyleControlElementData&, ControlElementFlags, const TQStyleOption&, const TQWidget *) const
{
return TQPixmap();
}
diff --git a/src/styles/qcompactstyle.cpp b/src/styles/qcompactstyle.cpp
index f2038a38..8ec016e9 100644
--- a/src/styles/qcompactstyle.cpp
+++ b/src/styles/qcompactstyle.cpp
@@ -55,7 +55,7 @@ TQCompactStyle::TQCompactStyle()
}
/*! \reimp */
-int TQCompactStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget )
+int TQCompactStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget )
{
int ret;
switch ( metric ) {
@@ -151,7 +151,7 @@ void drawPopupMenuItem( TQPainter*, bool,
}
/*! \reimp */
-void TQCompactStyle::drawControl( ControlElement element, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r,
+void TQCompactStyle::drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
const TQColorGroup &g, SFlags flags, const TQStyleOption& opt, const TQWidget *widget )
{
switch ( element ) {
@@ -312,7 +312,7 @@ void TQCompactStyle::drawControl( ControlElement element, TQPainter *p, TQStyleC
/*! \reimp */
void TQCompactStyle::drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -368,7 +368,7 @@ void TQCompactStyle::drawPrimitive( PrimitiveElement pe,
}
/*! \reimp */
-int TQCompactStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
+int TQCompactStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
{
int ret;
diff --git a/src/styles/qmotifplusstyle.cpp b/src/styles/qmotifplusstyle.cpp
index 6b56a346..90a8f633 100644
--- a/src/styles/qmotifplusstyle.cpp
+++ b/src/styles/qmotifplusstyle.cpp
@@ -175,7 +175,7 @@ void TQMotifPlusStyle::polish(TQPalette &)
/*! \reimp */
-void TQMotifPlusStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void TQMotifPlusStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains("TQWidget")) {
#ifndef QT_NO_FRAME
@@ -212,7 +212,7 @@ void TQMotifPlusStyle::polish(TQStyleControlElementData ceData, ControlElementFl
/*! \reimp */
-void TQMotifPlusStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void TQMotifPlusStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
removeObjectEventHandler(ceData, elementFlags, ptr, this);
TQMotifStyle::unPolish(ceData, elementFlags, ptr);
@@ -220,19 +220,19 @@ void TQMotifPlusStyle::unPolish(TQStyleControlElementData ceData, ControlElement
/*! \reimp */
-void TQMotifPlusStyle::applicationPolish(TQStyleControlElementData, ControlElementFlags, void *)
+void TQMotifPlusStyle::applicationPolish(const TQStyleControlElementData&, ControlElementFlags, void *)
{
}
/*! \reimp */
-void TQMotifPlusStyle::applicationUnPolish(TQStyleControlElementData, ControlElementFlags, void *)
+void TQMotifPlusStyle::applicationUnPolish(const TQStyleControlElementData&, ControlElementFlags, void *)
{
}
/*! \reimp */
-int TQMotifPlusStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
+int TQMotifPlusStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
{
int ret;
@@ -282,7 +282,7 @@ int TQMotifPlusStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData
/*! \reimp */
void TQMotifPlusStyle::drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -700,7 +700,7 @@ void TQMotifPlusStyle::drawPrimitive( PrimitiveElement pe,
*/
void TQMotifPlusStyle::drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -1047,7 +1047,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
/*! \reimp
*/
-TQRect TQMotifPlusStyle::subRect(SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
+TQRect TQMotifPlusStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
{
TQRect rect;
@@ -1136,7 +1136,7 @@ TQRect TQMotifPlusStyle::subRect(SubRect r, TQStyleControlElementData ceData, Co
/*! \reimp */
void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -1426,7 +1426,7 @@ void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
/*! \reimp
*/
TQRect TQMotifPlusStyle::querySubControlMetrics(ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
const TQStyleOption& opt,
@@ -1524,7 +1524,7 @@ TQRect TQMotifPlusStyle::querySubControlMetrics(ComplexControl control,
/*! \reimp */
-bool TQMotifPlusStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
+bool TQMotifPlusStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
{
switch(event->type()) {
case TQEvent::MouseButtonPress:
@@ -1596,7 +1596,7 @@ bool TQMotifPlusStyle::objectEventHandler( TQStyleControlElementData ceData, Con
/*! \reimp */
int TQMotifPlusStyle::styleHint(StyleHint hint,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption &opt,
TQStyleHintReturn *returnData,
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index 3225e0e2..2902faa4 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -171,7 +171,7 @@ void TQMotifStyle::polish( TQPalette& pal )
\internal
Keep TQStyle::polish() visible.
*/
-void TQMotifStyle::polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void TQMotifStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
TQStyle::polish(ceData, elementFlags, ptr);
}
@@ -181,7 +181,7 @@ void TQMotifStyle::polish( TQStyleControlElementData ceData, ControlElementFlags
\internal
Keep TQStyle::polish() visible.
*/
-void TQMotifStyle::applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void TQMotifStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
TQStyle::applicationPolish(ceData, elementFlags, ptr);
}
@@ -204,7 +204,7 @@ static void rot(TQPointArray& a, int n)
*/
void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -821,7 +821,7 @@ void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
*/
void TQMotifStyle::drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -1257,7 +1257,7 @@ static void get_combo_parameters( const TQRect &r,
*/
void TQMotifStyle::drawComplexControl( ComplexControl control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -1500,7 +1500,7 @@ void TQMotifStyle::drawComplexControl( ComplexControl control,
/*! \reimp */
-int TQMotifStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+int TQMotifStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
{
int ret;
@@ -1595,7 +1595,7 @@ int TQMotifStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceD
/*!\reimp
*/
TQRect TQMotifStyle::querySubControlMetrics( ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
const TQStyleOption& opt,
@@ -1766,7 +1766,7 @@ TQRect TQMotifStyle::querySubControlMetrics( ComplexControl control,
/*!\reimp
*/
TQSize TQMotifStyle::sizeFromContents( ContentsType contents,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &contentsSize,
const TQStyleOption& opt,
@@ -1846,7 +1846,7 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents,
/*!\reimp
*/
-TQRect TQMotifStyle::subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
{
TQRect rect;
TQRect wrect = ceData.rect;
@@ -1953,7 +1953,7 @@ TQRect TQMotifStyle::subRect( SubRect r, TQStyleControlElementData ceData, Contr
/*! \reimp
*/
-void TQMotifStyle::polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void TQMotifStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
#ifndef QT_NO_POPUPMENU
if ( !(ceData.windowState & WState_Polished ) ) {
@@ -2269,7 +2269,7 @@ static const char *const question_xpm[] = {
\reimp
*/
TQPixmap TQMotifStyle::stylePixmap(StylePixmap sp,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption& opt,
const TQWidget *widget) const
@@ -2355,7 +2355,7 @@ TQPixmap TQMotifStyle::stylePixmap(StylePixmap sp,
/*! \reimp */
int TQMotifStyle::styleHint(StyleHint hint,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption &opt,
TQStyleHintReturn *returnData,
diff --git a/src/styles/qplatinumstyle.cpp b/src/styles/qplatinumstyle.cpp
index 2bc0e459..173d3003 100644
--- a/src/styles/qplatinumstyle.cpp
+++ b/src/styles/qplatinumstyle.cpp
@@ -86,7 +86,7 @@ TQPlatinumStyle::~TQPlatinumStyle()
*/
void TQPlatinumStyle::drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -742,7 +742,7 @@ void TQPlatinumStyle::drawPrimitive( PrimitiveElement pe,
*/
void TQPlatinumStyle::drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -932,7 +932,7 @@ void TQPlatinumStyle::drawControl( ControlElement element,
*/
void TQPlatinumStyle::drawComplexControl( ComplexControl control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -1320,7 +1320,7 @@ void TQPlatinumStyle::drawComplexControl( ComplexControl control,
/*!\reimp
*/
TQRect TQPlatinumStyle::querySubControlMetrics( ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
const TQStyleOption& opt,
@@ -1432,7 +1432,7 @@ TQRect TQPlatinumStyle::querySubControlMetrics( ComplexControl control,
/*!\reimp
*/
-int TQPlatinumStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags,
+int TQPlatinumStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQWidget *widget ) const
{
int ret;
@@ -1469,7 +1469,7 @@ int TQPlatinumStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData
/*!\reimp
*/
-TQRect TQPlatinumStyle::subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+TQRect TQPlatinumStyle::subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
{
TQRect rect;
switch ( r ) {
diff --git a/src/styles/qsgistyle.cpp b/src/styles/qsgistyle.cpp
index aa00c57f..aa88a6c9 100644
--- a/src/styles/qsgistyle.cpp
+++ b/src/styles/qsgistyle.cpp
@@ -136,7 +136,7 @@ TQSGIStyle::~TQSGIStyle()
bold italic font for menu options.
*/
void
-TQSGIStyle::applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+TQSGIStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
isApplicationStyle = 1;
TQMotifStyle::polish( ceData, elementFlags, ptr );
@@ -181,7 +181,7 @@ TQSGIStyle::applicationPolish( TQStyleControlElementData ceData, ControlElementF
/*! \reimp
*/
void
-TQSGIStyle::applicationUnPolish( TQStyleControlElementData, ControlElementFlags, void * )
+TQSGIStyle::applicationUnPolish( const TQStyleControlElementData&, ControlElementFlags, void * )
{
TQFont f = TQApplication::font();
TQApplication::setFont( f, TRUE ); // get rid of the special fonts for special widget classes
@@ -194,7 +194,7 @@ TQSGIStyle::applicationUnPolish( TQStyleControlElementData, ControlElementFlags,
hovering.
*/
void
-TQSGIStyle::polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+TQSGIStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
TQMotifStyle::polish(ceData, elementFlags, ptr);
@@ -269,7 +269,7 @@ TQSGIStyle::polish( TQStyleControlElementData ceData, ControlElementFlags elemen
/*! \reimp */
void
-TQSGIStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+TQSGIStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
if ( (ceData.widgetObjectTypes.contains("TQButton")) || (ceData.widgetObjectTypes.contains("TQSlider")) || (ceData.widgetObjectTypes.contains("TQScrollBar")) ) {
removeObjectEventHandler(ceData, elementFlags, ptr, this);
@@ -286,7 +286,7 @@ TQSGIStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags elem
}
/*! \reimp */
-bool TQSGIStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e )
+bool TQSGIStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e )
{
if ( (!(ceData.widgetObjectTypes.contains("TQWidget"))) || (e->type() == TQEvent::Paint) )
return TQMotifStyle::objectEventHandler( ceData, elementFlags, source, e );
@@ -375,7 +375,7 @@ static const int sgiTabSpacing = 12; // space between text and tab
static const int sgiCheckMarkSpace = 20;
/*! \reimp */
-int TQSGIStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+int TQSGIStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
{
switch ( metric ) {
case PM_DefaultFrameWidth:
@@ -560,7 +560,7 @@ static void get_combo_parameters( const TQRect &r,
/*! \reimp */
void TQSGIStyle::drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -943,7 +943,7 @@ void TQSGIStyle::drawPrimitive( PrimitiveElement pe,
/*! \reimp */
void TQSGIStyle::drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -1186,7 +1186,7 @@ void TQSGIStyle::drawControl( ControlElement element,
/*! \reimp */
void TQSGIStyle::drawComplexControl( ComplexControl control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect& r,
const TQColorGroup& cg,
@@ -1407,7 +1407,7 @@ void TQSGIStyle::drawComplexControl( ComplexControl control,
/*!\reimp
*/
TQSize TQSGIStyle::sizeFromContents( ContentsType contents,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &contentsSize,
const TQStyleOption& opt,
@@ -1447,7 +1447,7 @@ TQSize TQSGIStyle::sizeFromContents( ContentsType contents,
}
/*! \reimp */
-TQRect TQSGIStyle::subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+TQRect TQSGIStyle::subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
{
TQRect rect;
@@ -1472,7 +1472,7 @@ TQRect TQSGIStyle::subRect( SubRect r, TQStyleControlElementData ceData, Control
/*! \reimp */
TQRect TQSGIStyle::querySubControlMetrics( ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sub,
const TQStyleOption& opt,
@@ -1512,7 +1512,7 @@ TQRect TQSGIStyle::querySubControlMetrics( ComplexControl control,
}
/*! \reimp */
-int TQSGIStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
+int TQSGIStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
{
int ret;
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index 1c049b0d..e7de564d 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -95,7 +95,7 @@ class TQWindowsStyle::Private : public TQObject
public:
Private(TQWindowsStyle *parent);
- bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
+ bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
private:
int menuBarTimer;
@@ -107,7 +107,7 @@ TQWindowsStyle::Private::Private(TQWindowsStyle *parent)
}
// Records Alt- and Focus events
-bool TQWindowsStyle::Private::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags, void* source, TQEvent *e )
+bool TQWindowsStyle::Private::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags, void* source, TQEvent *e )
{
if (!(ceData.widgetObjectTypes.contains("TQWidget"))) {
return TRUE;
@@ -173,7 +173,7 @@ TQWindowsStyle::~TQWindowsStyle()
}
/*! \reimp */
-bool TQWindowsStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ) {
+bool TQWindowsStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ) {
if (d) {
return d->objectEventHandler(ceData, elementFlags, source, e);
}
@@ -181,7 +181,7 @@ bool TQWindowsStyle::objectEventHandler( TQStyleControlElementData ceData, Contr
}
/*! \reimp */
-void TQWindowsStyle::applicationPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void TQWindowsStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
// We only need the overhead when shortcuts are sometimes hidden
if (styleHint(SH_UnderlineAccelerator, TQStyleControlElementData(), CEF_None, 0) && styleHint(SH_HideUnderlineAcceleratorWhenAltUp, TQStyleControlElementData(), CEF_None, 0)) {
@@ -191,20 +191,20 @@ void TQWindowsStyle::applicationPolish(TQStyleControlElementData ceData, Control
}
/*! \reimp */
-void TQWindowsStyle::applicationUnPolish(TQStyleControlElementData, ControlElementFlags, void *)
+void TQWindowsStyle::applicationUnPolish(const TQStyleControlElementData&, ControlElementFlags, void *)
{
delete d;
d = 0;
}
/*! \reimp */
-void TQWindowsStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void TQWindowsStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
TQCommonStyle::polish(ceData, elementFlags, ptr);
}
/*! \reimp */
-void TQWindowsStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void TQWindowsStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
TQCommonStyle::polish(ceData, elementFlags, ptr);
}
@@ -218,7 +218,7 @@ void TQWindowsStyle::polish( TQPalette &pal )
/*! \reimp */
void TQWindowsStyle::drawPrimitive( PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -688,7 +688,7 @@ void TQWindowsStyle::drawPrimitive( PrimitiveElement pe,
*/
void TQWindowsStyle::drawControl( ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -1019,7 +1019,7 @@ void TQWindowsStyle::drawControl( ControlElement element,
/*!
\reimp
*/
-int TQWindowsStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
+int TQWindowsStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
{
int ret;
@@ -1096,7 +1096,7 @@ int TQWindowsStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData ce
\reimp
*/
TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &contentsSize,
const TQStyleOption& opt,
@@ -1196,7 +1196,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
/*! \reimp
*/
-void TQWindowsStyle::polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void TQWindowsStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{
#ifndef QT_NO_POPUPMENU
if ( !(ceData.windowState & WState_Polished ) ) {
@@ -1488,7 +1488,7 @@ static const char *const question_xpm[] = {
\reimp
*/
TQPixmap TQWindowsStyle::stylePixmap(StylePixmap stylepixmap,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption& opt,
const TQWidget *widget) const
@@ -1527,7 +1527,7 @@ TQPixmap TQWindowsStyle::stylePixmap(StylePixmap stylepixmap,
/*!\reimp
*/
void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -1975,7 +1975,7 @@ void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
/*! \reimp */
int TQWindowsStyle::styleHint( StyleHint hint,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption &opt,
TQStyleHintReturn *returnData,
@@ -2032,7 +2032,7 @@ int TQWindowsStyle::styleHint( StyleHint hint,
}
/*! \reimp */
-TQRect TQWindowsStyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
+TQRect TQWindowsStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
{
TQRect rect;