summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-14 23:48:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-11-14 23:48:33 -0600
commit363433c69f66d50e71281b4670eb0c8fdebfe4f2 (patch)
tree89f5d4dba269036fa4ca71c3a502180ae883f921
parentcb48b1e673e66bb80ae7d804200721429e9ff335 (diff)
downloadtde-style-lipstik-363433c69f66d50e71281b4670eb0c8fdebfe4f2.tar.gz
tde-style-lipstik-363433c69f66d50e71281b4670eb0c8fdebfe4f2.zip
Update to latest style API
-rw-r--r--style/lipstik.cpp30
-rw-r--r--style/lipstik.h30
2 files changed, 30 insertions, 30 deletions
diff --git a/style/lipstik.cpp b/style/lipstik.cpp
index e587bbd..0963126 100644
--- a/style/lipstik.cpp
+++ b/style/lipstik.cpp
@@ -275,7 +275,7 @@ LipstikStyle::~LipstikStyle()
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)) {
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)) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
@@ -343,7 +343,7 @@ void LipstikStyle::polish(TQStyleControlElementData ceData, ControlElementFlags
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)) {
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
@@ -1293,7 +1293,7 @@ void LipstikStyle::renderTab(TQPainter *p,
void LipstikStyle::drawKStylePrimitive(KStylePrimitive kpe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -1653,7 +1653,7 @@ void LipstikStyle::drawKStylePrimitive(KStylePrimitive kpe,
void LipstikStyle::drawPrimitive(PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -2485,7 +2485,7 @@ void LipstikStyle::drawPrimitive(PrimitiveElement pe,
void LipstikStyle::drawControl(ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -3167,7 +3167,7 @@ void LipstikStyle::drawControl(ControlElement element,
void LipstikStyle::drawControlMask(ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQStyleOption &opt,
@@ -3189,7 +3189,7 @@ void LipstikStyle::drawControlMask(ControlElement element,
void LipstikStyle::drawComplexControlMask(ComplexControl c,
TQPainter *p,
- const TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
const TQRect &r,
const TQStyleOption &o,
@@ -3212,7 +3212,7 @@ void LipstikStyle::drawComplexControlMask(ComplexControl c,
void LipstikStyle::drawComplexControl(ComplexControl control,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
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) {
case SR_ComboBoxFocusRect: {
@@ -3661,7 +3661,7 @@ TQRect LipstikStyle::subRect(SubRect r, const TQStyleControlElementData ceData,
}
TQRect LipstikStyle::querySubControlMetrics(ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
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) {
// TABS
@@ -3854,7 +3854,7 @@ int LipstikStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, C
TQSize LipstikStyle::sizeFromContents(ContentsType t,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &s,
const TQStyleOption &opt,
@@ -3939,7 +3939,7 @@ TQSize LipstikStyle::sizeFromContents(ContentsType t,
}
int LipstikStyle::styleHint( StyleHint stylehint,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQStyleOption &option,
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) )
return true;
diff --git a/style/lipstik.h b/style/lipstik.h
index 453f66a..4ce29e6 100644
--- a/style/lipstik.h
+++ b/style/lipstik.h
@@ -69,13 +69,13 @@ public:
LipstikStyle();
virtual ~LipstikStyle();
- void applicationPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
- void polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
- void unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+ void applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+ void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+ void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void drawKStylePrimitive(KStylePrimitive kpe,
TQPainter* p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -85,7 +85,7 @@ public:
void drawPrimitive(PrimitiveElement pe,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -94,7 +94,7 @@ public:
void drawControl(ControlElement element,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -102,11 +102,11 @@ public:
const TQStyleOption& = TQStyleOption::Default,
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,
TQPainter *p,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQRect &r,
const TQColorGroup &cg,
@@ -116,14 +116,14 @@ public:
const TQStyleOption& = TQStyleOption::Default,
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;
- TQRect subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags,
+ TQRect subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags,
const TQWidget *widget ) const;
TQRect querySubControlMetrics(ComplexControl control,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
const TQStyleOption &opt = TQStyleOption::Default,
@@ -131,20 +131,20 @@ public:
void drawComplexControlMask(TQStyle::ComplexControl c,
TQPainter *p,
- const TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
const TQRect &r,
const TQStyleOption &o=TQStyleOption::Default,
const TQWidget *w = 0) const;
TQSize sizeFromContents(TQStyle::ContentsType t,
- TQStyleControlElementData ceData,
+ const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQSize &s,
const TQStyleOption &o,
const TQWidget *w = 0) const;
- int styleHint(StyleHint, TQStyleControlElementData ceData, ControlElementFlags elementFlags,
+ int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;
@@ -276,7 +276,7 @@ protected:
virtual void renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup& cg,
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:
void khtmlWidgetDestroyed(TQObject* w);