TDE
/
tdeartwork
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeartwork
0
0
Fork 0
Code Issues Releases Wiki Activity

Update to latest style API

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent b2be7bd4d6
commit 00a3830a31
4 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File

28
styles/dotnet/dotnet.cpp
Unescape View File

@ -109,7 +109,7 @@ bool dotNETstyle::inheritsKHTML(const TQWidget* w) const
} }
} }
void dotNETstyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) void dotNETstyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{ {
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
@ -149,7 +149,7 @@ void dotNETstyle::polish(TQStyleControlElementData ceData, ControlElementFlags e
} }
} }
void dotNETstyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) void dotNETstyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{ {
winstyle->unPolish(ceData, elementFlags, ptr); winstyle->unPolish(ceData, elementFlags, ptr);
@ -378,7 +378,7 @@ void dotNETstyle::renderPanel(TQPainter *p,
void dotNETstyle::drawKStylePrimitive(KStylePrimitive kpe, void dotNETstyle::drawKStylePrimitive(KStylePrimitive kpe,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -427,7 +427,7 @@ void dotNETstyle::drawKStylePrimitive(KStylePrimitive kpe,
// This function draws primitive elements as well as their masks. // This function draws primitive elements as well as their masks.
void dotNETstyle::drawPrimitive(TQ_PrimitiveElement pe, void dotNETstyle::drawPrimitive(TQ_PrimitiveElement pe,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -799,7 +799,7 @@ void dotNETstyle::drawPrimitive(TQ_PrimitiveElement pe,
void dotNETstyle::drawControl(TQ_ControlElement element, void dotNETstyle::drawControl(TQ_ControlElement element,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -1405,7 +1405,7 @@ void dotNETstyle::drawControl(TQ_ControlElement element,
void dotNETstyle::drawControlMask(TQ_ControlElement element, void dotNETstyle::drawControlMask(TQ_ControlElement element,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQStyleOption &opt, const TQStyleOption &opt,
@ -1435,7 +1435,7 @@ void dotNETstyle::drawControlMask(TQ_ControlElement element,
void dotNETstyle::drawComplexControlMask(ComplexControl c, void dotNETstyle::drawComplexControlMask(ComplexControl c,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQStyleOption &o, const TQStyleOption &o,
@ -1464,7 +1464,7 @@ void dotNETstyle::drawComplexControlMask(ComplexControl c,
void dotNETstyle::drawComplexControl(ComplexControl control, void dotNETstyle::drawComplexControl(ComplexControl control,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -1718,7 +1718,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control,
} }
TQRect dotNETstyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const TQRect dotNETstyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
{ {
// Don't use KStyles progressbar subrect // Don't use KStyles progressbar subrect
switch (r) { switch (r) {
@ -1746,7 +1746,7 @@ TQRect dotNETstyle::subRect(SubRect r, const TQStyleControlElementData ceData, c
} }
TQRect dotNETstyle::querySubControlMetrics(ComplexControl control, TQRect dotNETstyle::querySubControlMetrics(ComplexControl control,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,
const TQStyleOption &opt, const TQStyleOption &opt,
@ -1804,7 +1804,7 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control,
return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget); return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget);
} }
int dotNETstyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const int dotNETstyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
{ {
switch(m) { switch(m) {
// TABS // TABS
@ -1907,7 +1907,7 @@ int dotNETstyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, Co
TQSize dotNETstyle::sizeFromContents(ContentsType t, TQSize dotNETstyle::sizeFromContents(ContentsType t,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQSize &s, const TQSize &s,
const TQStyleOption &opt, const TQStyleOption &opt,
@ -2065,7 +2065,7 @@ void dotNETstyle::slotDestroyed()
m_widgets.remove( (TQWidget*) sender() ); m_widgets.remove( (TQWidget*) sender() );
} }
bool dotNETstyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags, void* source, TQEvent *ev ) bool dotNETstyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags, void* source, TQEvent *ev )
{ {
if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
TQObject* obj = reinterpret_cast<TQObject*>(source); TQObject* obj = reinterpret_cast<TQObject*>(source);
@ -2102,7 +2102,7 @@ bool dotNETstyle::objectEventHandler( TQStyleControlElementData ceData, ControlE
return false; return false;
} }
int dotNETstyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const int dotNETstyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
{ {
int ret; int ret;

28
styles/dotnet/dotnet.h
Unescape View File

@ -42,14 +42,14 @@ public:
virtual ~dotNETstyle(); virtual ~dotNETstyle();
bool inheritsKHTML( const TQWidget* widget ) const; bool inheritsKHTML( const TQWidget* widget ) const;
void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void renderMenuBlendPixmap( KPixmap&, const TQColorGroup&, const TQPopupMenu * ) const; void renderMenuBlendPixmap( KPixmap&, const TQColorGroup&, const TQPopupMenu * ) const;
void drawKStylePrimitive( KStylePrimitive kpe, void drawKStylePrimitive( KStylePrimitive kpe,
TQPainter* p, TQPainter* p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -59,7 +59,7 @@ public:
void drawPrimitive( TQ_PrimitiveElement pe, void drawPrimitive( TQ_PrimitiveElement pe,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -68,7 +68,7 @@ public:
void drawControl( TQ_ControlElement element, void drawControl( TQ_ControlElement element,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -76,11 +76,11 @@ public:
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
void drawControlMask( TQ_ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const; void drawControlMask( TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const;
void drawComplexControl( ComplexControl control, void drawComplexControl( ComplexControl control,
TQPainter *p, TQPainter *p,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQColorGroup &cg, const TQColorGroup &cg,
@ -90,14 +90,14 @@ public:
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
int pixelMetric( PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
TQRect querySubControlMetrics( ComplexControl control, TQRect querySubControlMetrics( ComplexControl control,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,
const TQStyleOption &opt = TQStyleOption::Default, const TQStyleOption &opt = TQStyleOption::Default,
@ -105,20 +105,20 @@ public:
void drawComplexControlMask(TQStyle::ComplexControl c, void drawComplexControlMask(TQStyle::ComplexControl c,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
const TQRect &r, const TQRect &r,
const TQStyleOption &o=TQStyleOption::Default, const TQStyleOption &o=TQStyleOption::Default,
const TQWidget *w = 0) const; const TQWidget *w = 0) const;
TQSize sizeFromContents(TQStyle::ContentsType t, TQSize sizeFromContents(TQStyle::ContentsType t,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQSize &s, const TQSize &s,
const TQStyleOption &o, const TQStyleOption &o,
const TQWidget *w = 0) const; const TQWidget *w = 0) const;
int styleHint(TQ_StyleHint, TQStyleControlElementData ceData, ControlElementFlags elementFlags, int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQStyleOption & = TQStyleOption::Default, const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;
@ -139,7 +139,7 @@ protected:
const TQRect &r, const TQRect &r,
const TQColorGroup &g) const; const TQColorGroup &g) const;
bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
void updatePalette( TQComboBox * ); void updatePalette( TQComboBox * );
void updatePalette( TQToolBar * ); void updatePalette( TQToolBar * );

34
styles/phase/phasestyle.cpp
Unescape View File

@ -136,7 +136,7 @@ PhaseStyle::~PhaseStyle()
// -------- // --------
// Initialize application specific // Initialize application specific
void PhaseStyle::applicationPolish(TQStyleControlElementData ceData, ControlElementFlags, void *ptr) void PhaseStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr)
{ {
if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
TQApplication *app = reinterpret_cast<TQApplication*>(ptr); TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
@ -149,7 +149,7 @@ void PhaseStyle::applicationPolish(TQStyleControlElementData ceData, ControlElem
// -------- // --------
// Initialize the appearance of a widget // Initialize the appearance of a widget
void PhaseStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) void PhaseStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{ {
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
@ -211,7 +211,7 @@ void PhaseStyle::polish(TQPalette &pal)
// ---------- // ----------
// Undo the initialization of a widget's appearance // Undo the initialization of a widget's appearance
void PhaseStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) void PhaseStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{ {
if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
@ -412,7 +412,7 @@ void PhaseStyle::drawPhasePanel(TQPainter *painter,
void PhaseStyle::drawPhaseTab(TQPainter *painter, void PhaseStyle::drawPhaseTab(TQPainter *painter,
int x, int y, int w, int h, int x, int y, int w, int h,
const TQColorGroup &group, const TQColorGroup &group,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags /*elementFlags*/, ControlElementFlags /*elementFlags*/,
const TQStyleOption &option, const TQStyleOption &option,
SFlags flags) const SFlags flags) const
@ -578,7 +578,7 @@ void PhaseStyle::drawPhaseTab(TQPainter *painter,
void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element, void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element,
TQPainter *painter, TQPainter *painter,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQColorGroup &group, const TQColorGroup &group,
@ -1036,7 +1036,7 @@ void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element,
void PhaseStyle::drawKStylePrimitive(KStylePrimitive element, void PhaseStyle::drawKStylePrimitive(KStylePrimitive element,
TQPainter *painter, TQPainter *painter,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQColorGroup &group, const TQColorGroup &group,
@ -1155,7 +1155,7 @@ void PhaseStyle::drawKStylePrimitive(KStylePrimitive element,
void PhaseStyle::drawControl(TQ_ControlElement element, void PhaseStyle::drawControl(TQ_ControlElement element,
TQPainter *painter, TQPainter *painter,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQColorGroup &group, const TQColorGroup &group,
@ -1599,7 +1599,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element,
void PhaseStyle::drawControlMask(TQ_ControlElement element, void PhaseStyle::drawControlMask(TQ_ControlElement element,
TQPainter *painter, TQPainter *painter,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQStyleOption &option, const TQStyleOption &option,
@ -1623,7 +1623,7 @@ void PhaseStyle::drawControlMask(TQ_ControlElement element,
void PhaseStyle::drawComplexControl(TQ_ComplexControl control, void PhaseStyle::drawComplexControl(TQ_ComplexControl control,
TQPainter *painter, TQPainter *painter,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQColorGroup &group, const TQColorGroup &group,
@ -1921,7 +1921,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control,
void PhaseStyle::drawComplexControlMask(TQ_ComplexControl control, void PhaseStyle::drawComplexControlMask(TQ_ComplexControl control,
TQPainter *painter, TQPainter *painter,
const TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQStyleOption &option, const TQStyleOption &option,
@ -1945,7 +1945,7 @@ void PhaseStyle::drawComplexControlMask(TQ_ComplexControl control,
// ------------- // -------------
// Get the pixel metric for metric // Get the pixel metric for metric
int PhaseStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const int PhaseStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
{ {
// not using widget's font, so that all metrics are uniform // not using widget's font, so that all metrics are uniform
int em = TQMAX(TQApplication::fontMetrics().strikeOutPos() * 3, 17); int em = TQMAX(TQApplication::fontMetrics().strikeOutPos() * 3, 17);
@ -2010,7 +2010,7 @@ int PhaseStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData ceData
// --------- // ---------
// Return subrect for the widget in logical coordinates // Return subrect for the widget in logical coordinates
TQRect PhaseStyle::subRect(SubRect rect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const TQRect PhaseStyle::subRect(SubRect rect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
{ {
switch (rect) { switch (rect) {
case SR_ComboBoxFocusRect: { case SR_ComboBoxFocusRect: {
@ -2031,7 +2031,7 @@ TQRect PhaseStyle::subRect(SubRect rect, const TQStyleControlElementData ceData,
// Get metrics for subcontrols of complex controls // Get metrics for subcontrols of complex controls
TQRect PhaseStyle::querySubControlMetrics(TQ_ComplexControl control, TQRect PhaseStyle::querySubControlMetrics(TQ_ComplexControl control,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,
const TQStyleOption &option, const TQStyleOption &option,
@ -2129,7 +2129,7 @@ TQRect PhaseStyle::querySubControlMetrics(TQ_ComplexControl control,
// Returns the size of widget based on the contentsize // Returns the size of widget based on the contentsize
TQSize PhaseStyle::sizeFromContents(ContentsType contents, TQSize PhaseStyle::sizeFromContents(ContentsType contents,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQSize &contentsize, const TQSize &contentsize,
const TQStyleOption &option, const TQStyleOption &option,
@ -2220,7 +2220,7 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents,
// ------------- // -------------
// Is the toolbar "flat" // Is the toolbar "flat"
bool PhaseStyle::flatToolbar(const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQToolBar *toolbar) const bool PhaseStyle::flatToolbar(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQToolBar *toolbar) const
{ {
if (!toolbar) return true; // not on a toolbar if (!toolbar) return true; // not on a toolbar
if (!toolbar->isMovingEnabled()) return true; // immobile toolbars are flat if (!toolbar->isMovingEnabled()) return true; // immobile toolbars are flat
@ -2230,7 +2230,7 @@ bool PhaseStyle::flatToolbar(const TQStyleControlElementData ceData, const Contr
return false; return false;
} }
int PhaseStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const int PhaseStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
{ {
int ret; int ret;
@ -2259,7 +2259,7 @@ int PhaseStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, Contro
// Grab events we are interested in. Most of this routine is to handle the // Grab events we are interested in. Most of this routine is to handle the
// exceptions to the normal styling rules. // exceptions to the normal styling rules.
bool PhaseStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
{ {
if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
TQObject* object = reinterpret_cast<TQObject*>(source); TQObject* object = reinterpret_cast<TQObject*>(source);

34
styles/phase/phasestyle.h
Unescape View File

@ -62,14 +62,14 @@ class PhaseStyle : public KStyle
PhaseStyle(); PhaseStyle();
virtual ~PhaseStyle(); virtual ~PhaseStyle();
void applicationPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void polish(TQPalette &pal); void polish(TQPalette &pal);
void unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void drawPrimitive(TQ_PrimitiveElement element, void drawPrimitive(TQ_PrimitiveElement element,
TQPainter *painter, TQPainter *painter,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQColorGroup &group, const TQColorGroup &group,
@ -78,7 +78,7 @@ class PhaseStyle : public KStyle
void drawKStylePrimitive(KStylePrimitive element, void drawKStylePrimitive(KStylePrimitive element,
TQPainter *painter, TQPainter *painter,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQColorGroup &group, const TQColorGroup &group,
@ -88,7 +88,7 @@ class PhaseStyle : public KStyle
void drawControl(TQ_ControlElement element, void drawControl(TQ_ControlElement element,
TQPainter *painter, TQPainter *painter,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQColorGroup &group, const TQColorGroup &group,
@ -98,7 +98,7 @@ class PhaseStyle : public KStyle
void drawControlMask(TQ_ControlElement element, void drawControlMask(TQ_ControlElement element,
TQPainter *painter, TQPainter *painter,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQStyleOption &option = TQStyleOption::Default, const TQStyleOption &option = TQStyleOption::Default,
@ -106,7 +106,7 @@ class PhaseStyle : public KStyle
void drawComplexControl(TQ_ComplexControl control, void drawComplexControl(TQ_ComplexControl control,
TQPainter *painter, TQPainter *painter,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQColorGroup &group, const TQColorGroup &group,
@ -118,32 +118,32 @@ class PhaseStyle : public KStyle
void drawComplexControlMask(TQ_ComplexControl control, void drawComplexControlMask(TQ_ComplexControl control,
TQPainter *painter, TQPainter *painter,
const TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
const TQRect &rect, const TQRect &rect,
const TQStyleOption &option = TQStyleOption::Default, const TQStyleOption &option = TQStyleOption::Default,
const TQWidget *widget = 0) const; const TQWidget *widget = 0) const;
int pixelMetric(PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, int pixelMetric(PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQWidget *widget = 0) const; const TQWidget *widget = 0) const;
TQRect subRect(SubRect rect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget = 0) const; TQRect subRect(SubRect rect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget = 0) const;
TQRect querySubControlMetrics(TQ_ComplexControl control, TQRect querySubControlMetrics(TQ_ComplexControl control,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,
const TQStyleOption &option = TQStyleOption::Default, const TQStyleOption &option = TQStyleOption::Default,
const TQWidget *widget = 0) const; const TQWidget *widget = 0) const;
TQSize sizeFromContents(ContentsType contents, TQSize sizeFromContents(ContentsType contents,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQSize &contentsize, const TQSize &contentsize,
const TQStyleOption& option = TQStyleOption::Default, const TQStyleOption& option = TQStyleOption::Default,
const TQWidget *widget = 0) const; const TQWidget *widget = 0) const;
int styleHint(TQ_StyleHint, TQStyleControlElementData ceData, ControlElementFlags elementFlags, int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQStyleOption & = TQStyleOption::Default, const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;
@ -174,7 +174,7 @@ class PhaseStyle : public KStyle
void drawPhaseTab(TQPainter *painter, void drawPhaseTab(TQPainter *painter,
int x, int y, int w, int h, int x, int y, int w, int h,
const TQColorGroup &group, const TQColorGroup &group,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQStyleOption &option, const TQStyleOption &option,
const SFlags flags) const; const SFlags flags) const;
@ -187,9 +187,9 @@ class PhaseStyle : public KStyle
int pw=-1, int ph=-1, int pw=-1, int ph=-1,
bool reverse=false) const; bool reverse=false) const;
bool flatToolbar(const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQToolBar *toolbar) const; bool flatToolbar(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQToolBar *toolbar) const;
bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
private: private:
TQMap<unsigned int, TQIntDict<GradientSet> > * gradients; TQMap<unsigned int, TQIntDict<GradientSet> > * gradients;

Write Preview
Loading…
Cancel
Save