summaryrefslogtreecommitdiffstats
path: root/src/styles/qmotifplusstyle.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-11-15 12:46:17 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2012-11-15 12:46:17 -0600
commitc4fcfaa593835ff3568310c6937f47d69196f281 (patch)
treed65fcc9cdf7182890ac0b3669be5f09c6968e6ce /src/styles/qmotifplusstyle.cpp
parent6bcbe0a787127751122109caf4a3cd621e13004e (diff)
parent5e04c37a6ce7a090adb9e6ea02a04761dea8a33e (diff)
downloadqt3-c4fcfaa593835ff3568310c6937f47d69196f281.tar.gz
qt3-c4fcfaa593835ff3568310c6937f47d69196f281.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/styles/qmotifplusstyle.cpp')
-rw-r--r--src/styles/qmotifplusstyle.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/styles/qmotifplusstyle.cpp b/src/styles/qmotifplusstyle.cpp
index 113716c..34dc7fa 100644
--- a/src/styles/qmotifplusstyle.cpp
+++ b/src/styles/qmotifplusstyle.cpp
@@ -175,7 +175,7 @@ void QMotifPlusStyle::polish(QPalette &)
/*! \reimp */
-void QMotifPlusStyle::polish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void QMotifPlusStyle::polish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
if (ceData.widgetObjectTypes.contains("QWidget")) {
#ifndef QT_NO_FRAME
@@ -212,7 +212,7 @@ void QMotifPlusStyle::polish(QStyleControlElementData ceData, ControlElementFlag
/*! \reimp */
-void QMotifPlusStyle::unPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void QMotifPlusStyle::unPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{
removeObjectEventHandler(ceData, elementFlags, ptr, this);
QMotifStyle::unPolish(ceData, elementFlags, ptr);
@@ -220,19 +220,19 @@ void QMotifPlusStyle::unPolish(QStyleControlElementData ceData, ControlElementFl
/*! \reimp */
-void QMotifPlusStyle::applicationPolish(QStyleControlElementData, ControlElementFlags, void *)
+void QMotifPlusStyle::applicationPolish(const QStyleControlElementData&, ControlElementFlags, void *)
{
}
/*! \reimp */
-void QMotifPlusStyle::applicationUnPolish(QStyleControlElementData, ControlElementFlags, void *)
+void QMotifPlusStyle::applicationUnPolish(const QStyleControlElementData&, ControlElementFlags, void *)
{
}
/*! \reimp */
-int QMotifPlusStyle::pixelMetric(PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget) const
+int QMotifPlusStyle::pixelMetric(PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget) const
{
int ret;
@@ -282,7 +282,7 @@ int QMotifPlusStyle::pixelMetric(PixelMetric metric, QStyleControlElementData ce
/*! \reimp */
void QMotifPlusStyle::drawPrimitive( PrimitiveElement pe,
QPainter *p,
- QStyleControlElementData ceData,
+ const QStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const QRect &r,
const QColorGroup &cg,
@@ -700,7 +700,7 @@ void QMotifPlusStyle::drawPrimitive( PrimitiveElement pe,
*/
void QMotifPlusStyle::drawControl( ControlElement element,
QPainter *p,
- QStyleControlElementData ceData,
+ const QStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const QRect &r,
const QColorGroup &cg,
@@ -1047,7 +1047,7 @@ void QMotifPlusStyle::drawControl( ControlElement element,
/*! \reimp
*/
-QRect QMotifPlusStyle::subRect(SubRect r, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget) const
+QRect QMotifPlusStyle::subRect(SubRect r, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget) const
{
QRect rect;
@@ -1136,7 +1136,7 @@ QRect QMotifPlusStyle::subRect(SubRect r, QStyleControlElementData ceData, Contr
/*! \reimp */
void QMotifPlusStyle::drawComplexControl(ComplexControl control,
QPainter *p,
- QStyleControlElementData ceData,
+ const QStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const QRect &r,
const QColorGroup &cg,
@@ -1426,7 +1426,7 @@ void QMotifPlusStyle::drawComplexControl(ComplexControl control,
/*! \reimp
*/
QRect QMotifPlusStyle::querySubControlMetrics(ComplexControl control,
- QStyleControlElementData ceData,
+ const QStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
const QStyleOption& opt,
@@ -1524,7 +1524,7 @@ QRect QMotifPlusStyle::querySubControlMetrics(ComplexControl control,
/*! \reimp */
-bool QMotifPlusStyle::objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *event )
+bool QMotifPlusStyle::objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *event )
{
switch(event->type()) {
case QEvent::MouseButtonPress:
@@ -1596,7 +1596,7 @@ bool QMotifPlusStyle::objectEventHandler( QStyleControlElementData ceData, Contr
/*! \reimp */
int QMotifPlusStyle::styleHint(StyleHint hint,
- QStyleControlElementData ceData,
+ const QStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const QStyleOption &opt,
QStyleHintReturn *returnData,