TDE
/
tde-style-lipstik
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-style-lipstik
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 cb48b1e673
commit 363433c69f
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

30
style/lipstik.cpp
Unescape View File

@ -275,7 +275,7 @@ LipstikStyle::~LipstikStyle()
delete verticalLine; delete verticalLine;
} }
void LipstikStyle::applicationPolish(TQStyleControlElementData ceData, ControlElementFlags, void *ptr) void LipstikStyle::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);
@ -286,7 +286,7 @@ void LipstikStyle::applicationPolish(TQStyleControlElementData ceData, ControlEl
} }
} }
void LipstikStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) void LipstikStyle::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);
@ -343,7 +343,7 @@ void LipstikStyle::polish(TQStyleControlElementData ceData, ControlElementFlags
KStyle::polish(ceData, elementFlags, ptr); KStyle::polish(ceData, elementFlags, ptr);
} }
void LipstikStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) void LipstikStyle::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);
@ -1293,7 +1293,7 @@ void LipstikStyle::renderTab(TQPainter *p,
void LipstikStyle::drawKStylePrimitive(KStylePrimitive kpe, void LipstikStyle::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,
@ -1653,7 +1653,7 @@ void LipstikStyle::drawKStylePrimitive(KStylePrimitive kpe,
void LipstikStyle::drawPrimitive(PrimitiveElement pe, void LipstikStyle::drawPrimitive(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,
@ -2485,7 +2485,7 @@ void LipstikStyle::drawPrimitive(PrimitiveElement pe,
void LipstikStyle::drawControl(ControlElement element, void LipstikStyle::drawControl(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,
@ -3167,7 +3167,7 @@ void LipstikStyle::drawControl(ControlElement element,
void LipstikStyle::drawControlMask(ControlElement element, void LipstikStyle::drawControlMask(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,
@ -3189,7 +3189,7 @@ void LipstikStyle::drawControlMask(ControlElement element,
void LipstikStyle::drawComplexControlMask(ComplexControl c, void LipstikStyle::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,
@ -3212,7 +3212,7 @@ void LipstikStyle::drawComplexControlMask(ComplexControl c,
void LipstikStyle::drawComplexControl(ComplexControl control, void LipstikStyle::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,
@ -3636,7 +3636,7 @@ void LipstikStyle::drawComplexControl(ComplexControl control,
} }
TQRect LipstikStyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const TQRect LipstikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
{ {
switch (r) { switch (r) {
case SR_ComboBoxFocusRect: { case SR_ComboBoxFocusRect: {
@ -3661,7 +3661,7 @@ TQRect LipstikStyle::subRect(SubRect r, const TQStyleControlElementData ceData,
} }
TQRect LipstikStyle::querySubControlMetrics(ComplexControl control, TQRect LipstikStyle::querySubControlMetrics(ComplexControl control,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,
const TQStyleOption &opt, const TQStyleOption &opt,
@ -3731,7 +3731,7 @@ TQRect LipstikStyle::querySubControlMetrics(ComplexControl control,
} }
} }
int LipstikStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const int LipstikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
{ {
switch(m) { switch(m) {
// TABS // TABS
@ -3854,7 +3854,7 @@ int LipstikStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, C
TQSize LipstikStyle::sizeFromContents(ContentsType t, TQSize LipstikStyle::sizeFromContents(ContentsType t,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQSize &s, const TQSize &s,
const TQStyleOption &opt, const TQStyleOption &opt,
@ -3939,7 +3939,7 @@ TQSize LipstikStyle::sizeFromContents(ContentsType t,
} }
int LipstikStyle::styleHint( StyleHint stylehint, int LipstikStyle::styleHint( StyleHint stylehint,
TQStyleControlElementData ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const TQStyleOption &option, const TQStyleOption &option,
TQStyleHintReturn* returnData, TQStyleHintReturn* returnData,
@ -3965,7 +3965,7 @@ int LipstikStyle::styleHint( StyleHint stylehint,
} }
} }
bool LipstikStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *ev ) bool LipstikStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *ev )
{ {
if (KStyle::objectEventHandler(ceData, elementFlags, source, ev) ) if (KStyle::objectEventHandler(ceData, elementFlags, source, ev) )
return true; return true;

30
style/lipstik.h
Unescape View File

@ -69,13 +69,13 @@ public:
LipstikStyle(); LipstikStyle();
virtual ~LipstikStyle(); virtual ~LipstikStyle();
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 unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
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,
@ -85,7 +85,7 @@ public:
void drawPrimitive(PrimitiveElement pe, void drawPrimitive(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,
@ -94,7 +94,7 @@ public:
void drawControl(ControlElement element, void drawControl(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,
@ -102,11 +102,11 @@ public:
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const; const TQWidget *widget = 0 ) const;
void drawControlMask( ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget *) const; void drawControlMask( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget *) 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,
@ -116,14 +116,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 ) const; const TQWidget *widget ) 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,
@ -131,20 +131,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(StyleHint, TQStyleControlElementData ceData, ControlElementFlags elementFlags, int styleHint(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;
@ -276,7 +276,7 @@ protected:
virtual void renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup& cg, virtual void renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup& cg,
const TQPopupMenu* popup ) const; const TQPopupMenu* popup ) const;
virtual bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
protected slots: protected slots:
void khtmlWidgetDestroyed(TQObject* w); void khtmlWidgetDestroyed(TQObject* w);

Write Preview
Loading…
Cancel
Save