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

Increase style method call speed

Browse Source 
This breaks the style ABI
pull/2/head
Timothy Pearson 12 years ago
parent 30c5994817
commit 5e04c37a6c
20 changed files with 255 additions and 237 deletions
Show Stats Download Patch File Download Diff File

88
src/kernel/qstyle.cpp
Unescape View File

@ -54,7 +54,6 @@
#include <limits.h> #include <limits.h>
class QStylePrivate class QStylePrivate
{ {
public: public:
@ -495,7 +494,7 @@ void QStyle::unPolish( QWidget *widget ) {
\sa unPolish() \sa unPolish()
*/ */
void QStyle::polish( QStyleControlElementData ceData, ControlElementFlags, void *ptr ) { void QStyle::polish( const QStyleControlElementData &ceData, ControlElementFlags, void *ptr ) {
if (ceData.widgetObjectTypes.contains("QWidget")) { if (ceData.widgetObjectTypes.contains("QWidget")) {
// Enable dynamic hide/show of accelerator shortcuts // Enable dynamic hide/show of accelerator shortcuts
QWidget* widget = reinterpret_cast<QWidget*>(ptr); QWidget* widget = reinterpret_cast<QWidget*>(ptr);
@ -513,7 +512,7 @@ void QStyle::polish( QStyleControlElementData ceData, ControlElementFlags, void
\sa polish() \sa polish()
*/ */
void QStyle::unPolish( QStyleControlElementData ceData, ControlElementFlags, void *ptr ) { void QStyle::unPolish( const QStyleControlElementData &ceData, ControlElementFlags, void *ptr ) {
if (ceData.widgetObjectTypes.contains("QWidget")) { if (ceData.widgetObjectTypes.contains("QWidget")) {
// Disable dynamic hide/show of accelerator shortcuts // Disable dynamic hide/show of accelerator shortcuts
QWidget* widget = reinterpret_cast<QWidget*>(ptr); QWidget* widget = reinterpret_cast<QWidget*>(ptr);
@ -555,7 +554,7 @@ void QStyle::unPolish( QApplication *app ) {
\sa unPolish() \sa unPolish()
*/ */
void QStyle::applicationPolish( QStyleControlElementData, ControlElementFlags, void * ) { void QStyle::applicationPolish( const QStyleControlElementData&, ControlElementFlags, void * ) {
// //
} }
@ -571,7 +570,7 @@ void QStyle::applicationPolish( QStyleControlElementData, ControlElementFlags, v
\sa polish() \sa polish()
*/ */
void QStyle::applicationUnPolish( QStyleControlElementData, ControlElementFlags, void * ) { void QStyle::applicationUnPolish( const QStyleControlElementData&, ControlElementFlags, void * ) {
// //
} }
@ -605,7 +604,7 @@ void QStyle::polishPopupMenu( QPopupMenu *pm ) {
(\l{QPopupMenu::setMouseTracking()}) and whether the menu is (\l{QPopupMenu::setMouseTracking()}) and whether the menu is
checkable by default (\l{QPopupMenu::setCheckable()}). checkable by default (\l{QPopupMenu::setCheckable()}).
*/ */
void QStyle::polishPopupMenu( QStyleControlElementData, ControlElementFlags, void * ) void QStyle::polishPopupMenu( const QStyleControlElementData&, ControlElementFlags, void * )
{ {
} }
@ -909,7 +908,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn void QStyle::drawPrimitive( PrimitiveElement pe, QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags flags, const QStyleOption& opt) const \fn void QStyle::drawPrimitive( PrimitiveElement pe, QPainter *p, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags flags, const QStyleOption& opt) const
Draws the style PrimitiveElement \a pe using the painter \a p in Draws the style PrimitiveElement \a pe using the painter \a p in
the area \a r. Colors are used from the color group \a cg. the area \a r. Colors are used from the color group \a cg.
@ -1042,7 +1041,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn void QStyle::drawControl( ControlElement element, QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags how, const QStyleOption& opt, const QWidget *widget) const \fn void QStyle::drawControl( ControlElement element, QPainter *p, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags how, const QStyleOption& opt, const QWidget *widget) const
Draws the ControlElement \a element using the painter \a p in the Draws the ControlElement \a element using the painter \a p in the
area \a r. Colors are used from the color group \a cg. area \a r. Colors are used from the color group \a cg.
@ -1201,7 +1200,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn void QStyle::drawControlMask( ControlElement element, QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, const QStyleOption& opt, const QWidget *widget) const \fn void QStyle::drawControlMask( ControlElement element, QPainter *p, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QRect &r, const QStyleOption& opt, const QWidget *widget) const
Draw a bitmask for the ControlElement \a element using the painter Draw a bitmask for the ControlElement \a element using the painter
\a p in the area \a r. See drawControl() for an explanation of the \a p in the area \a r. See drawControl() for an explanation of the
@ -1274,7 +1273,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn QRect QStyle::subRect( SubRect subrect, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const; \fn QRect QStyle::subRect( SubRect subrect, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const;
Returns the sub-area \a subrect for the \a widget in logical Returns the sub-area \a subrect for the \a widget in logical
coordinates. coordinates.
@ -1406,7 +1405,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn void QStyle::drawComplexControl( ComplexControl control, QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags how, SCFlags sub, SCFlags subActive, const QStyleOption& opt, const QWidget *widget ) const \fn void QStyle::drawComplexControl( ComplexControl control, QPainter *p, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags how, SCFlags sub, SCFlags subActive, const QStyleOption& opt, const QWidget *widget ) const
Draws the ComplexControl \a control using the painter \a p in the Draws the ComplexControl \a control using the painter \a p in the
area \a r. Colors are used from the color group \a cg. The \a sub area \a r. Colors are used from the color group \a cg. The \a sub
@ -1504,7 +1503,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn void QStyle::drawComplexControlMask( ComplexControl control, QPainter *p, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QRect &r, const QStyleOption& opt, const QWidget *widget) const \fn void QStyle::drawComplexControlMask( ComplexControl control, QPainter *p, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags, const QRect &r, const QStyleOption& opt, const QWidget *widget) const
Draw a bitmask for the ComplexControl \a control using the painter Draw a bitmask for the ComplexControl \a control using the painter
\a p in the area \a r. See drawComplexControl() for an explanation \a p in the area \a r. See drawComplexControl() for an explanation
@ -1524,7 +1523,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn QRect QStyle::querySubControlMetrics( ComplexControl control, QStyleControlElementData ceData, ControlElementFlags elementFlags, SubControl subcontrol, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const; \fn QRect QStyle::querySubControlMetrics( ComplexControl control, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const;
Returns the rect for the SubControl \a subcontrol for \a widget in Returns the rect for the SubControl \a subcontrol for \a widget in
logical coordinates. logical coordinates.
@ -1546,7 +1545,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn SubControl QStyle::querySubControl( ComplexControl control, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QPoint &pos, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const; \fn SubControl QStyle::querySubControl( ComplexControl control, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QPoint &pos, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const;
Returns the SubControl for \a widget at the point \a pos. The \a Returns the SubControl for \a widget at the point \a pos. The \a
widget argument is a pointer to a QWidget or one of its widget argument is a pointer to a QWidget or one of its
@ -1672,7 +1671,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn int QStyle::pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const; \fn int QStyle::pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const;
Returns the pixel metric for \a metric. Returns the pixel metric for \a metric.
@ -1734,7 +1733,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn QSize QStyle::sizeFromContents( ContentsType contents, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QSize &contentsSize, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const; \fn QSize QStyle::sizeFromContents( ContentsType contents, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QSize &contentsSize, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const;
Returns the size of \a widget based on the contents size \a Returns the size of \a widget based on the contents size \a
contentsSize. contentsSize.
@ -1924,7 +1923,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn int QStyle::styleHint( StyleHint stylehint, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption &opt = QStyleOption::Default, QStyleHintReturn *returnData = 0, const QWidget *widget = 0 ) const; \fn int QStyle::styleHint( StyleHint stylehint, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption &opt = QStyleOption::Default, QStyleHintReturn *returnData = 0, const QWidget *widget = 0 ) const;
Returns the style hint \a stylehint for \a widget. Currently, \a Returns the style hint \a stylehint for \a widget. Currently, \a
widget, \a opt, and \a returnData are unused; they're included to widget, \a opt, and \a returnData are unused; they're included to
@ -1971,7 +1970,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
*/ */
/*! /*!
\fn QPixmap QStyle::stylePixmap( StylePixmap stylepixmap, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const; \fn QPixmap QStyle::stylePixmap( StylePixmap stylepixmap, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption& opt = QStyleOption::Default, const QWidget *widget = 0 ) const;
Returns a pixmap for \a stylepixmap. Returns a pixmap for \a stylepixmap.
@ -2011,7 +2010,7 @@ void QStyle::drawItem( QPainter *p, const QRect &r,
function is provided to aid style implementors in supporting function is provided to aid style implementors in supporting
right-to-left mode. right-to-left mode.
Note that this function is deprecated in favor of visualRect( const QRect &logical, const QStyleControlElementData ceData, const ControlElementFlags elementFlags ); Note that this function is deprecated in favor of visualRect( const QRect &logical, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags );
\sa QApplication::reverseLayout() \sa QApplication::reverseLayout()
*/ */
@ -2023,7 +2022,7 @@ QRect QStyle::visualRect( const QRect &logical, const QWidget *w )
} }
/*! /*!
\fn QRect QStyle::visualRect( const QRect &logical, const QStyleControlElementData ceData, const ControlElementFlags elementFlags ); \fn QRect QStyle::visualRect( const QRect &logical, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags );
Returns the rect \a logical in screen coordinates. The bounding Returns the rect \a logical in screen coordinates. The bounding
rect for the widget described by \a ceData and \a elementFlags rect for the widget described by \a ceData and \a elementFlags
@ -2033,7 +2032,7 @@ QRect QStyle::visualRect( const QRect &logical, const QWidget *w )
\sa QApplication::reverseLayout() \sa QApplication::reverseLayout()
*/ */
QRect QStyle::visualRect( const QRect &logical, const QStyleControlElementData ceData, const ControlElementFlags elementFlags ) QRect QStyle::visualRect( const QRect &logical, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags )
{ {
Q_UNUSED(elementFlags) Q_UNUSED(elementFlags)
@ -2065,15 +2064,15 @@ QRect QStyle::visualRect( const QRect &logical, const QRect &boundingRect )
} }
/*! /*!
\fn void QStyle::installObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ); \fn void QStyle::installObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler );
Intercepts events generated by \a source and sends them to \a handler via Intercepts events generated by \a source and sends them to \a handler via
the bool QStyle::objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e ) virtual method. the bool QStyle::objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e ) virtual method.
\sa void QStyle::removeObjectEventHandler( QObject* source, QStyle* handler ) \sa void QStyle::removeObjectEventHandler( QObject* source, QStyle* handler )
\sa bool QStyle::objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e ) \sa bool QStyle::objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e )
*/ */
void QStyle::installObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ) { void QStyle::installObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ) {
bool cbret = false; bool cbret = false;
if (m_eventHandlerInstallationHook) { if (m_eventHandlerInstallationHook) {
cbret = (*m_eventHandlerInstallationHook)(ceData, elementFlags, source, handler); cbret = (*m_eventHandlerInstallationHook)(ceData, elementFlags, source, handler);
@ -2090,13 +2089,13 @@ void QStyle::installObjectEventHandler( QStyleControlElementData ceData, Control
} }
/*! /*!
\fn void QStyle::removeObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ); \fn void QStyle::removeObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler );
Stops intercepting events generated by \a source. Stops intercepting events generated by \a source.
\sa void QStyle::installObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ) \sa void QStyle::installObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler )
*/ */
void QStyle::removeObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ) { void QStyle::removeObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ) {
bool cbret = false; bool cbret = false;
if (m_eventHandlerRemovalHook) { if (m_eventHandlerRemovalHook) {
cbret = (*m_eventHandlerRemovalHook)(ceData, elementFlags, source, handler); cbret = (*m_eventHandlerRemovalHook)(ceData, elementFlags, source, handler);
@ -2117,9 +2116,9 @@ void QStyle::removeObjectEventHandler( QStyleControlElementData ceData, ControlE
Sets a callback function \a hook which will be called whenever a new intercept request Sets a callback function \a hook which will be called whenever a new intercept request
is made via the QStyle::installObjectEventHandler method. The callback function must is made via the QStyle::installObjectEventHandler method. The callback function must
use this definition: bool callbackFunction( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ). use this definition: bool callbackFunction( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ).
\sa void QStyle::installObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ) \sa void QStyle::installObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler )
*/ */
void QStyle::setEventHandlerInstallationHook( EventHandlerInstallationHook hook ) { void QStyle::setEventHandlerInstallationHook( EventHandlerInstallationHook hook ) {
m_eventHandlerInstallationHook = hook; m_eventHandlerInstallationHook = hook;
@ -2130,24 +2129,24 @@ void QStyle::setEventHandlerInstallationHook( EventHandlerInstallationHook hook
Sets a callback function \a hook which will be called whenever a new intercept deactivation request Sets a callback function \a hook which will be called whenever a new intercept deactivation request
is made via the QStyle::removeObjectEventHandler method. The callback function must is made via the QStyle::removeObjectEventHandler method. The callback function must
use this definition: bool callbackFunction( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ). use this definition: bool callbackFunction( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ).
\sa void QStyle::removeObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ) \sa void QStyle::removeObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler )
*/ */
void QStyle::setEventHandlerRemovalHook( EventHandlerRemovalHook hook ) { void QStyle::setEventHandlerRemovalHook( EventHandlerRemovalHook hook ) {
m_eventHandlerRemovalHook = hook; m_eventHandlerRemovalHook = hook;
} }
/*! /*!
\fn bool QStyle::objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e ); \fn bool QStyle::objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e );
Override this virtual function to intercept events requested by a previous call to Override this virtual function to intercept events requested by a previous call to
QStyle::installObjectEventHandler. QStyle::installObjectEventHandler.
\sa void QStyle::installObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ) \sa void QStyle::installObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler )
\sa void QStyle::removeObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ) \sa void QStyle::removeObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler )
*/ */
bool QStyle::objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e ) { bool QStyle::objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e ) {
Q_UNUSED(ceData); Q_UNUSED(ceData);
Q_UNUSED(elementFlags); Q_UNUSED(elementFlags);
Q_UNUSED(source); Q_UNUSED(source);
@ -2193,20 +2192,20 @@ bool QStyle::eventFilter(QObject *o, QEvent *e) {
Sets a callback function \a hook which will be called whenever a new widget action request Sets a callback function \a hook which will be called whenever a new widget action request
is made via the QStyle::installObjectEventHandler method. The callback function must is made via the QStyle::installObjectEventHandler method. The callback function must
use this definition: bool callbackFunction( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ). use this definition: bool callbackFunction( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ).
\sa void QStyle::installObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ) \sa void QStyle::installObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler )
*/ */
void QStyle::setWidgetActionRequestHook( WidgetActionRequestHook hook ) { void QStyle::setWidgetActionRequestHook( WidgetActionRequestHook hook ) {
m_widgetActionRequestHook = hook; m_widgetActionRequestHook = hook;
} }
/*! /*!
\fn bool widgetActionRequestHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request ); \fn bool widgetActionRequestHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request );
Handles widget action requests. Return FALSE to continue processing in base classes, TRUE to eat the request and halt processing. Handles widget action requests. Return FALSE to continue processing in base classes, TRUE to eat the request and halt processing.
*/ */
bool QStyle::widgetActionRequest( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, QStyleWidgetActionRequestData requestData ) { bool QStyle::widgetActionRequest( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, QStyleWidgetActionRequestData requestData ) {
bool cbret = false; bool cbret = false;
if (m_widgetActionRequestHook) { if (m_widgetActionRequestHook) {
cbret = (*m_widgetActionRequestHook)(ceData, elementFlags, source, request, requestData); cbret = (*m_widgetActionRequestHook)(ceData, elementFlags, source, request, requestData);
@ -2327,20 +2326,20 @@ bool QStyle::widgetActionRequest( QStyleControlElementData ceData, ControlElemen
Sets a callback function \a hook which will be called whenever a new application action request Sets a callback function \a hook which will be called whenever a new application action request
is made via the QStyle::installObjectEventHandler method. The callback function must is made via the QStyle::installObjectEventHandler method. The callback function must
use this definition: bool callbackFunction( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ). use this definition: bool callbackFunction( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ).
\sa void QStyle::installObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ) \sa void QStyle::installObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler )
*/ */
void QStyle::setApplicationActionRequestHook( ApplicationActionRequestHook hook ) { void QStyle::setApplicationActionRequestHook( ApplicationActionRequestHook hook ) {
m_applicationActionRequestHook = hook; m_applicationActionRequestHook = hook;
} }
/*! /*!
\fn bool applicationActionRequestHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request ); \fn bool applicationActionRequestHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request );
Handles application action requests. Return FALSE to continue processing in base classes, TRUE to eat the request and halt processing. Handles application action requests. Return FALSE to continue processing in base classes, TRUE to eat the request and halt processing.
*/ */
bool QStyle::applicationActionRequest( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, QStyleApplicationActionRequestData requestData ) { bool QStyle::applicationActionRequest( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, QStyleApplicationActionRequestData requestData ) {
bool cbret = false; bool cbret = false;
if (m_applicationActionRequestHook) { if (m_applicationActionRequestHook) {
cbret = (*m_applicationActionRequestHook)(ceData, elementFlags, source, request, requestData); cbret = (*m_applicationActionRequestHook)(ceData, elementFlags, source, request, requestData);
@ -2609,6 +2608,7 @@ QPixmap QStyle::stylePixmap(StylePixmap sp, const QWidget *w, const QStyleOption
*/ */
QStyleControlElementData::QStyleControlElementData() { QStyleControlElementData::QStyleControlElementData() {
isNull = true;
activePainter = 0; activePainter = 0;
tickMarkSetting = 0; tickMarkSetting = 0;
comboBoxLineEditFlags = 0; comboBoxLineEditFlags = 0;

76
src/kernel/qstyle.h
Unescape View File

@ -228,6 +228,10 @@ class QStyleControlElementTabBarData {
class Q_EXPORT QStyleControlElementData { class Q_EXPORT QStyleControlElementData {
public: public:
QStyleControlElementData();
public:
bool isNull;
QStringList widgetObjectTypes; QStringList widgetObjectTypes;
bool allDataPopulated; bool allDataPopulated;
Qt::WFlags wflags; Qt::WFlags wflags;
@ -286,9 +290,6 @@ class Q_EXPORT QStyleControlElementData {
QString caption; QString caption;
QStyleControlElementGenericWidgetData topLevelWidgetData; QStyleControlElementGenericWidgetData topLevelWidgetData;
Q_UINT32 topLevelWidgetFlags; Q_UINT32 topLevelWidgetFlags;
public:
QStyleControlElementData();
}; };
class Q_EXPORT QStyleWidgetActionRequestData { class Q_EXPORT QStyleWidgetActionRequestData {
@ -360,28 +361,28 @@ public:
virtual void polish( QWidget * ); virtual void polish( QWidget * );
// New API // New API
virtual void polish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); virtual void polish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
// Old API // Old API
// DEPRECATED // DEPRECATED
virtual void unPolish( QWidget * ); virtual void unPolish( QWidget * );
// New API // New API
virtual void unPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); virtual void unPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
// Old API // Old API
// DEPRECATED // DEPRECATED
virtual void polish( QApplication * ); virtual void polish( QApplication * );
// New API // New API
virtual void applicationPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); virtual void applicationPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
// Old API // Old API
// DEPRECATED // DEPRECATED
virtual void unPolish( QApplication * ); virtual void unPolish( QApplication * );
// New API // New API
virtual void applicationUnPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); virtual void applicationUnPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
virtual void polish( QPalette & ); virtual void polish( QPalette & );
@ -390,7 +391,7 @@ public:
virtual void polishPopupMenu( QPopupMenu* ); virtual void polishPopupMenu( QPopupMenu* );
// New API // New API
virtual void polishPopupMenu( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ) = 0; virtual void polishPopupMenu( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ) = 0;
virtual QRect itemRect( QPainter *p, const QRect &r, virtual QRect itemRect( QPainter *p, const QRect &r,
int flags, bool enabled, int flags, bool enabled,
@ -521,7 +522,7 @@ public:
// New API // New API
virtual void drawPrimitive( PrimitiveElement pe, virtual void drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -576,7 +577,7 @@ public:
// New API // New API
virtual void drawControl( ControlElement element, virtual void drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -595,7 +596,7 @@ public:
// New API // New API
virtual void drawControlMask( ControlElement element, virtual void drawControlMask( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
@ -646,7 +647,7 @@ public:
virtual QRect subRect( SubRect r, const QWidget *widget ) const; virtual QRect subRect( SubRect r, const QWidget *widget ) const;
// New API // New API
virtual QRect subRect( SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const = 0; virtual QRect subRect( SubRect r, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const = 0;
enum ComplexControl{ enum ComplexControl{
@ -728,7 +729,7 @@ public:
virtual void drawComplexControl( ComplexControl control, virtual void drawComplexControl( ComplexControl control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -753,7 +754,7 @@ public:
// New API // New API
virtual void drawComplexControlMask( ComplexControl control, virtual void drawComplexControlMask( ComplexControl control,
QPainter *p, QPainter *p,
const QStyleControlElementData ceData, const QStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
@ -768,7 +769,7 @@ public:
// New API // New API
virtual QRect querySubControlMetrics( ComplexControl control, virtual QRect querySubControlMetrics( ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
@ -783,7 +784,7 @@ public:
// New API // New API
virtual SubControl querySubControl( ComplexControl control, virtual SubControl querySubControl( ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QPoint &pos, const QPoint &pos,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
@ -872,7 +873,7 @@ public:
// New API // New API
virtual int pixelMetric( PixelMetric metric, virtual int pixelMetric( PixelMetric metric,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QWidget *widget = 0 ) const = 0; const QWidget *widget = 0 ) const = 0;
@ -909,7 +910,7 @@ public:
const QStyleOption& = QStyleOption::Default ) const; const QStyleOption& = QStyleOption::Default ) const;
virtual QSize sizeFromContents( ContentsType contents, virtual QSize sizeFromContents( ContentsType contents,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QSize &contentsSize, const QSize &contentsSize,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
@ -1083,7 +1084,7 @@ public:
// New API // New API
virtual int styleHint( StyleHint stylehint, virtual int styleHint( StyleHint stylehint,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
QStyleHintReturn* returnData = 0, QStyleHintReturn* returnData = 0,
@ -1115,7 +1116,7 @@ public:
const QStyleOption& = QStyleOption::Default ) const; const QStyleOption& = QStyleOption::Default ) const;
virtual QPixmap stylePixmap( StylePixmap stylepixmap, virtual QPixmap stylePixmap( StylePixmap stylepixmap,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const = 0; const QWidget *widget = 0 ) const = 0;
@ -1126,7 +1127,7 @@ public:
static QRect visualRect( const QRect &logical, const QWidget *w ); static QRect visualRect( const QRect &logical, const QWidget *w );
// New API // New API
static QRect visualRect( const QRect &logical, const QStyleControlElementData ceData, const ControlElementFlags elementFlags ); static QRect visualRect( const QRect &logical, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags );
static QRect visualRect( const QRect &logical, const QRect &bounding ); static QRect visualRect( const QRect &logical, const QRect &bounding );
@ -1135,13 +1136,13 @@ public:
typedef QMap<void*, QStyle*> ObjectEventSourceToHandlerMap; typedef QMap<void*, QStyle*> ObjectEventSourceToHandlerMap;
typedef QMap<void*, QStyleControlElementData> ObjectEventSourceDataToHandlerMap; typedef QMap<void*, QStyleControlElementData> ObjectEventSourceDataToHandlerMap;
typedef QMap<void*, ControlElementFlags> ObjectEventSourceFlagsToHandlerMap; typedef QMap<void*, ControlElementFlags> ObjectEventSourceFlagsToHandlerMap;
typedef bool (*EventHandlerInstallationHook)(QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler); typedef bool (*EventHandlerInstallationHook)(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler);
typedef bool (*EventHandlerRemovalHook)(QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler); typedef bool (*EventHandlerRemovalHook)(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler);
void installObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ); void installObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler );
void removeObjectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QStyle* handler ); void removeObjectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QStyle* handler );
void setEventHandlerInstallationHook( EventHandlerInstallationHook ); void setEventHandlerInstallationHook( EventHandlerInstallationHook );
void setEventHandlerRemovalHook( EventHandlerRemovalHook hook ); void setEventHandlerRemovalHook( EventHandlerRemovalHook hook );
virtual bool objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e ); virtual bool objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e );
enum WidgetActionRequest { enum WidgetActionRequest {
WAR_Repaint, WAR_Repaint,
@ -1165,37 +1166,40 @@ public:
WAR_SendPaintEvent WAR_SendPaintEvent
}; };
typedef bool (*WidgetActionRequestHook)(QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, QStyleWidgetActionRequestData requestData); typedef bool (*WidgetActionRequestHook)(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, QStyleWidgetActionRequestData requestData);
void setWidgetActionRequestHook( WidgetActionRequestHook ); void setWidgetActionRequestHook( WidgetActionRequestHook );
virtual bool widgetActionRequest( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, QStyleWidgetActionRequestData requestData = QStyleWidgetActionRequestData() ); virtual bool widgetActionRequest( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, QStyleWidgetActionRequestData requestData = QStyleWidgetActionRequestData() );
enum ApplicationActionRequest { enum ApplicationActionRequest {
AAR_SetPalette, AAR_SetPalette,
AAR_SetFont AAR_SetFont
}; };
typedef bool (*ApplicationActionRequestHook)(QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, QStyleApplicationActionRequestData requestData); typedef bool (*ApplicationActionRequestHook)(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, QStyleApplicationActionRequestData requestData);
void setApplicationActionRequestHook( ApplicationActionRequestHook ); void setApplicationActionRequestHook( ApplicationActionRequestHook );
virtual bool applicationActionRequest( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, QStyleApplicationActionRequestData requestData = QStyleApplicationActionRequestData() ); virtual bool applicationActionRequest( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, QStyleApplicationActionRequestData requestData = QStyleApplicationActionRequestData() );
// Old 2.x QStyle API // Old 2.x QStyle API
#ifndef QT_NO_COMPAT #ifndef QT_NO_COMPAT
int defaultFrameWidth() const int defaultFrameWidth() const
{ {
return pixelMetric( PM_DefaultFrameWidth, QStyleControlElementData(), CEF_None ); QStyleControlElementData ceData;
return pixelMetric( PM_DefaultFrameWidth, ceData, CEF_None );
} }
void tabbarMetrics( const QWidget* t, void tabbarMetrics( const QWidget* t,
int& hf, int& vf, int& ov ) const int& hf, int& vf, int& ov ) const
{ {
hf = pixelMetric( PM_TabBarTabHSpace, QStyleControlElementData(), CEF_None, t ); QStyleControlElementData ceData;
vf = pixelMetric( PM_TabBarTabVSpace, QStyleControlElementData(), CEF_None, t ); hf = pixelMetric( PM_TabBarTabHSpace, ceData, CEF_None, t );
ov = pixelMetric( PM_TabBarBaseOverlap, QStyleControlElementData(), CEF_None, t ); vf = pixelMetric( PM_TabBarTabVSpace, ceData, CEF_None, t );
ov = pixelMetric( PM_TabBarBaseOverlap, ceData, CEF_None, t );
} }
QSize scrollBarExtent() const QSize scrollBarExtent() const
{ {
return QSize(pixelMetric(PM_ScrollBarExtent, QStyleControlElementData(), CEF_None), QStyleControlElementData ceData;
pixelMetric(PM_ScrollBarExtent, QStyleControlElementData(), CEF_None)); return QSize(pixelMetric(PM_ScrollBarExtent, ceData, CEF_None),
pixelMetric(PM_ScrollBarExtent, ceData, CEF_None));
} }
#endif #endif

13
src/kernel/qwidget.cpp
Unescape View File

@ -1184,6 +1184,9 @@ void QWidget::createExtra()
#endif #endif
extra->size_policy = QSizePolicy( QSizePolicy::Preferred, extra->size_policy = QSizePolicy( QSizePolicy::Preferred,
QSizePolicy::Preferred ); QSizePolicy::Preferred );
extra->m_ceData = NULL;
createSysExtra(); createSysExtra();
} }
} }
@ -3591,7 +3594,15 @@ bool QWidget::isActiveWindow() const
if(tlw == qApp->activeWindow() || ( isVisible() && tlw->isPopup() )) if(tlw == qApp->activeWindow() || ( isVisible() && tlw->isPopup() ))
return TRUE; return TRUE;
#ifndef QT_NO_STYLE #ifndef QT_NO_STYLE
if(style().styleHint(QStyle::SH_Widget_ShareActivation, this )) { const_cast<QWidget*>(this)->createExtra();
if (!extra->m_ceData) {
const_cast<QWidget*>(this)->extra->m_ceData = new QStyleControlElementData();
}
//extra->m_ceData->widgetObjectTypes = getObjectTypeListForObject(this);
extra->m_ceData->widgetObjectTypes.clear();
extra->m_ceData->allDataPopulated = false;
//if(style().styleHint(QStyle::SH_Widget_ShareActivation, *extra->m_ceData, getControlElementFlagsForObject(this, extra->m_ceData->widgetObjectTypes, QStyleOption(), false), QStyleOption(), NULL, this)) {
if(style().styleHint(QStyle::SH_Widget_ShareActivation, *extra->m_ceData, QStyle::CEF_None, QStyleOption(), NULL, this)) {
if((tlw->isDialog() || (tlw->testWFlags(Qt::WStyle_Tool) && !tlw->isPopup())) && if((tlw->isDialog() || (tlw->testWFlags(Qt::WStyle_Tool) && !tlw->isPopup())) &&
!tlw->testWFlags(Qt::WShowModal) && !tlw->testWFlags(Qt::WShowModal) &&
(!tlw->parentWidget() || tlw->parentWidget()->isActiveWindow())) (!tlw->parentWidget() || tlw->parentWidget()->isActiveWindow()))

2
src/kernel/qwidget.h
Unescape View File

@ -63,6 +63,7 @@ class QFocusData;
class QCursor; class QCursor;
class QWSRegionManager; class QWSRegionManager;
class QStyle; class QStyle;
class QStyleControlElementData;
class Q_EXPORT QWidget : public QObject, public QPaintDevice class Q_EXPORT QWidget : public QObject, public QPaintDevice
{ {
@ -1086,6 +1087,7 @@ struct Q_EXPORT QWExtra {
#endif #endif
QRect micro_focus_hint; // micro focus hint QRect micro_focus_hint; // micro focus hint
QSizePolicy size_policy; QSizePolicy size_policy;
QStyleControlElementData* m_ceData;
}; };
#define Q_DEFINED_QWIDGET #define Q_DEFINED_QWIDGET

6
src/styles/qcdestyle.cpp
Unescape View File

@ -87,7 +87,7 @@ QCDEStyle::~QCDEStyle()
/*!\reimp /*!\reimp
*/ */
int QCDEStyle::pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) const int QCDEStyle::pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget ) const
{ {
int ret; int ret;
@ -112,7 +112,7 @@ int QCDEStyle::pixelMetric( PixelMetric metric, QStyleControlElementData ceData,
*/ */
void QCDEStyle::drawControl( ControlElement element, void QCDEStyle::drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -144,7 +144,7 @@ void QCDEStyle::drawControl( ControlElement element,
*/ */
void QCDEStyle::drawPrimitive( PrimitiveElement pe, void QCDEStyle::drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,

6
src/styles/qcdestyle.h
Unescape View File

@ -62,11 +62,11 @@ public:
QCDEStyle( bool useHighlightCols = FALSE ); QCDEStyle( bool useHighlightCols = FALSE );
virtual ~QCDEStyle(); virtual ~QCDEStyle();
int pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const; int pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const;
void drawControl( ControlElement element, void drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -76,7 +76,7 @@ public:
void drawPrimitive( PrimitiveElement pe, void drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,

29
src/styles/qcommonstyle.cpp
Unescape View File

@ -258,6 +258,7 @@ QStyleControlElementData populateControlElementDataFromWidget(const QWidget* wid
QStyleControlElementData ceData; QStyleControlElementData ceData;
if (widget) { if (widget) {
ceData.isNull = false;
ceData.widgetObjectTypes = getObjectTypeListForObject(widget); ceData.widgetObjectTypes = getObjectTypeListForObject(widget);
ceData.allDataPopulated = populateReliantFields & populateMinimumNumberOfFields; ceData.allDataPopulated = populateReliantFields & populateMinimumNumberOfFields;
if (!populateMinimumNumberOfFields) { if (!populateMinimumNumberOfFields) {
@ -695,7 +696,7 @@ QStyleControlElementData populateControlElementDataFromApplication(const QApplic
/*! \reimp */ /*! \reimp */
void QCommonStyle::drawPrimitive( PrimitiveElement pe, void QCommonStyle::drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -1173,7 +1174,7 @@ void qt_style_erase_region(QPainter* p, const QRegion& region, QStyleControlElem
/*! \reimp */ /*! \reimp */
void QCommonStyle::drawControl( ControlElement element, void QCommonStyle::drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -1619,7 +1620,7 @@ void QCommonStyle::drawControl( ControlElement element,
{ {
QRect rect = r; QRect rect = r;
QIconSet* icon = &ceData.iconSet; const QIconSet* icon = &ceData.iconSet;
if ( icon ) { if ( icon ) {
QPixmap pixmap = icon->pixmap( QIconSet::Small, QPixmap pixmap = icon->pixmap( QIconSet::Small,
flags & Style_Enabled ? flags & Style_Enabled ?
@ -1653,7 +1654,7 @@ void QCommonStyle::drawControl( ControlElement element,
/*! \reimp */ /*! \reimp */
void QCommonStyle::drawControlMask( ControlElement control, void QCommonStyle::drawControlMask( ControlElement control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QStyleOption& opt, const QStyleOption& opt,
@ -1689,7 +1690,7 @@ void QCommonStyle::drawControlMask( ControlElement control,
} }
/*! \reimp */ /*! \reimp */
QRect QCommonStyle::subRect(SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget) const QRect QCommonStyle::subRect(SubRect r, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags, const QWidget *widget) const
{ {
QRect rect, wrect(ceData.rect); QRect rect, wrect(ceData.rect);
@ -1985,7 +1986,7 @@ QRect QCommonStyle::subRect(SubRect r, const QStyleControlElementData ceData, co
/* /*
I really need this and I don't want to expose it in QRangeControl.. I really need this and I don't want to expose it in QRangeControl..
*/ */
static int qPositionFromValue( QStyleControlElementData ceData, int logical_val, static int qPositionFromValue( const QStyleControlElementData &ceData, int logical_val,
int span ) int span )
{ {
if ( span <= 0 || logical_val < ceData.minSteps || if ( span <= 0 || logical_val < ceData.minSteps ||
@ -2018,7 +2019,7 @@ static int qPositionFromValue( QStyleControlElementData ceData, int logical_val,
/*! \reimp */ /*! \reimp */
void QCommonStyle::drawComplexControl( ComplexControl control, void QCommonStyle::drawComplexControl( ComplexControl control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -2420,7 +2421,7 @@ void QCommonStyle::drawComplexControl( ComplexControl control,
/*! \reimp */ /*! \reimp */
void QCommonStyle::drawComplexControlMask( ComplexControl control, void QCommonStyle::drawComplexControlMask( ComplexControl control,
QPainter *p, QPainter *p,
const QStyleControlElementData ceData, const QStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QStyleOption& opt, const QStyleOption& opt,
@ -2437,7 +2438,7 @@ void QCommonStyle::drawComplexControlMask( ComplexControl control,
/*! \reimp */ /*! \reimp */
QRect QCommonStyle::querySubControlMetrics( ComplexControl control, QRect QCommonStyle::querySubControlMetrics( ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
const QStyleOption &opt, const QStyleOption &opt,
@ -2671,7 +2672,7 @@ QRect QCommonStyle::querySubControlMetrics( ComplexControl control,
/*! \reimp */ /*! \reimp */
QStyle::SubControl QCommonStyle::querySubControl(ComplexControl control, QStyle::SubControl QCommonStyle::querySubControl(ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QPoint &pos, const QPoint &pos,
const QStyleOption& opt, const QStyleOption& opt,
@ -2746,7 +2747,7 @@ QStyle::SubControl QCommonStyle::querySubControl(ComplexControl control,
} }
/*! \reimp */ /*! \reimp */
int QCommonStyle::pixelMetric(PixelMetric m, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget) const int QCommonStyle::pixelMetric(PixelMetric m, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget) const
{ {
int ret; int ret;
@ -2970,7 +2971,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, QStyleControlElementData ceData, Co
/*! \reimp */ /*! \reimp */
QSize QCommonStyle::sizeFromContents(ContentsType contents, QSize QCommonStyle::sizeFromContents(ContentsType contents,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QSize &contentsSize, const QSize &contentsSize,
const QStyleOption& opt, const QStyleOption& opt,
@ -3140,7 +3141,7 @@ QSize QCommonStyle::sizeFromContents(ContentsType contents,
} }
/*! \reimp */ /*! \reimp */
int QCommonStyle::styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption &, QStyleHintReturn *, const QWidget * w) const int QCommonStyle::styleHint(StyleHint sh, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption &, QStyleHintReturn *, const QWidget * w) const
{ {
Q_UNUSED(w); Q_UNUSED(w);
@ -3223,7 +3224,7 @@ int QCommonStyle::styleHint(StyleHint sh, QStyleControlElementData ceData, Contr
} }
/*! \reimp */ /*! \reimp */
QPixmap QCommonStyle::stylePixmap(StylePixmap, QStyleControlElementData, ControlElementFlags, const QStyleOption&, const QWidget *) const QPixmap QCommonStyle::stylePixmap(StylePixmap, const QStyleControlElementData&, ControlElementFlags, const QStyleOption&, const QWidget *) const
{ {
return QPixmap(); return QPixmap();
} }

24
src/styles/qcommonstyle.h
Unescape View File

@ -58,7 +58,7 @@ public:
// New API // New API
void drawPrimitive( PrimitiveElement pe, void drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -68,7 +68,7 @@ public:
// New API // New API
void drawControl( ControlElement element, void drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -79,19 +79,19 @@ public:
// New API // New API
void drawControlMask( ControlElement element, void drawControlMask( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
// New API // New API
QRect subRect( SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const; QRect subRect( SubRect r, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const;
// New API // New API
void drawComplexControl( ComplexControl control, void drawComplexControl( ComplexControl control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -108,7 +108,7 @@ public:
// New API // New API
void drawComplexControlMask( ComplexControl control, void drawComplexControlMask( ComplexControl control,
QPainter *p, QPainter *p,
const QStyleControlElementData ceData, const QStyleControlElementData &ceData,
const ControlElementFlags elementFlags, const ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
@ -116,7 +116,7 @@ public:
// New API // New API
QRect querySubControlMetrics( ComplexControl control, QRect querySubControlMetrics( ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
@ -124,29 +124,29 @@ public:
// New API // New API
SubControl querySubControl( ComplexControl control, SubControl querySubControl( ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QPoint &pos, const QPoint &pos,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
// New API // New API
int pixelMetric( PixelMetric m, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const; int pixelMetric( PixelMetric m, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const;
// New API // New API
QSize sizeFromContents( ContentsType s, QSize sizeFromContents( ContentsType s,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QSize &contentsSize, const QSize &contentsSize,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
// New API // New API
int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption &, QStyleHintReturn *, const QWidget * w) const; int styleHint(StyleHint sh, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption &, QStyleHintReturn *, const QWidget * w) const;
// New API // New API
QPixmap stylePixmap( StylePixmap sp, QPixmap stylePixmap( StylePixmap sp,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;

8
src/styles/qcompactstyle.cpp
Unescape View File

@ -55,7 +55,7 @@ QCompactStyle::QCompactStyle()
} }
/*! \reimp */ /*! \reimp */
int QCompactStyle::pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) int QCompactStyle::pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget )
{ {
int ret; int ret;
switch ( metric ) { switch ( metric ) {
@ -151,7 +151,7 @@ void drawPopupMenuItem( QPainter*, bool,
} }
/*! \reimp */ /*! \reimp */
void QCompactStyle::drawControl( ControlElement element, QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, void QCompactStyle::drawControl( ControlElement element, QPainter *p, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QRect &r,
const QColorGroup &g, SFlags flags, const QStyleOption& opt, const QWidget *widget ) const QColorGroup &g, SFlags flags, const QStyleOption& opt, const QWidget *widget )
{ {
switch ( element ) { switch ( element ) {
@ -312,7 +312,7 @@ void QCompactStyle::drawControl( ControlElement element, QPainter *p, QStyleCont
/*! \reimp */ /*! \reimp */
void QCompactStyle::drawPrimitive( PrimitiveElement pe, void QCompactStyle::drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -368,7 +368,7 @@ void QCompactStyle::drawPrimitive( PrimitiveElement pe,
} }
/*! \reimp */ /*! \reimp */
int QCompactStyle::styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption &opt, QStyleHintReturn *returnData, const QWidget *w) const int QCompactStyle::styleHint(StyleHint sh, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption &opt, QStyleHintReturn *returnData, const QWidget *w) const
{ {
int ret; int ret;

8
src/styles/qcompactstyle.h
Unescape View File

@ -58,21 +58,21 @@ class Q_EXPORT_STYLE_COMPACT QCompactStyle : public QWindowsStyle
public: public:
QCompactStyle(); QCompactStyle();
int pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ); int pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 );
void drawPrimitive( PrimitiveElement pe, void drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
SFlags flags = Style_Default, SFlags flags = Style_Default,
const QStyleOption& = QStyleOption::Default ) const; const QStyleOption& = QStyleOption::Default ) const;
void drawControl( ControlElement element, QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, void drawControl( ControlElement element, QPainter *p, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QRect &r,
const QColorGroup &cg, SFlags how = Style_Default, const QStyleOption& = QStyleOption::Default, const QWidget *w = 0 ); const QColorGroup &cg, SFlags how = Style_Default, const QStyleOption& = QStyleOption::Default, const QWidget *w = 0 );
int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption &, QStyleHintReturn *, const QWidget *) const; int styleHint(StyleHint sh, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption &, QStyleHintReturn *, const QWidget *) const;
private: // Disabled copy constructor and operator= private: // Disabled copy constructor and operator=
#if defined(Q_DISABLE_COPY) #if defined(Q_DISABLE_COPY)

24
src/styles/qmotifplusstyle.cpp
Unescape View File

@ -175,7 +175,7 @@ void QMotifPlusStyle::polish(QPalette &)
/*! \reimp */ /*! \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")) { if (ceData.widgetObjectTypes.contains("QWidget")) {
#ifndef QT_NO_FRAME #ifndef QT_NO_FRAME
@ -212,7 +212,7 @@ void QMotifPlusStyle::polish(QStyleControlElementData ceData, ControlElementFlag
/*! \reimp */ /*! \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); removeObjectEventHandler(ceData, elementFlags, ptr, this);
QMotifStyle::unPolish(ceData, elementFlags, ptr); QMotifStyle::unPolish(ceData, elementFlags, ptr);
@ -220,19 +220,19 @@ void QMotifPlusStyle::unPolish(QStyleControlElementData ceData, ControlElementFl
/*! \reimp */ /*! \reimp */
void QMotifPlusStyle::applicationPolish(QStyleControlElementData, ControlElementFlags, void *) void QMotifPlusStyle::applicationPolish(const QStyleControlElementData&, ControlElementFlags, void *)
{ {
} }
/*! \reimp */ /*! \reimp */
void QMotifPlusStyle::applicationUnPolish(QStyleControlElementData, ControlElementFlags, void *) void QMotifPlusStyle::applicationUnPolish(const QStyleControlElementData&, ControlElementFlags, void *)
{ {
} }
/*! \reimp */ /*! \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; int ret;
@ -282,7 +282,7 @@ int QMotifPlusStyle::pixelMetric(PixelMetric metric, QStyleControlElementData ce
/*! \reimp */ /*! \reimp */
void QMotifPlusStyle::drawPrimitive( PrimitiveElement pe, void QMotifPlusStyle::drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -700,7 +700,7 @@ void QMotifPlusStyle::drawPrimitive( PrimitiveElement pe,
*/ */
void QMotifPlusStyle::drawControl( ControlElement element, void QMotifPlusStyle::drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -1047,7 +1047,7 @@ void QMotifPlusStyle::drawControl( ControlElement element,
/*! \reimp /*! \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; QRect rect;
@ -1136,7 +1136,7 @@ QRect QMotifPlusStyle::subRect(SubRect r, QStyleControlElementData ceData, Contr
/*! \reimp */ /*! \reimp */
void QMotifPlusStyle::drawComplexControl(ComplexControl control, void QMotifPlusStyle::drawComplexControl(ComplexControl control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -1426,7 +1426,7 @@ void QMotifPlusStyle::drawComplexControl(ComplexControl control,
/*! \reimp /*! \reimp
*/ */
QRect QMotifPlusStyle::querySubControlMetrics(ComplexControl control, QRect QMotifPlusStyle::querySubControlMetrics(ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,
const QStyleOption& opt, const QStyleOption& opt,
@ -1524,7 +1524,7 @@ QRect QMotifPlusStyle::querySubControlMetrics(ComplexControl control,
/*! \reimp */ /*! \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()) { switch(event->type()) {
case QEvent::MouseButtonPress: case QEvent::MouseButtonPress:
@ -1596,7 +1596,7 @@ bool QMotifPlusStyle::objectEventHandler( QStyleControlElementData ceData, Contr
/*! \reimp */ /*! \reimp */
int QMotifPlusStyle::styleHint(StyleHint hint, int QMotifPlusStyle::styleHint(StyleHint hint,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QStyleOption &opt, const QStyleOption &opt,
QStyleHintReturn *returnData, QStyleHintReturn *returnData,

24
src/styles/qmotifplusstyle.h
Unescape View File

@ -63,15 +63,15 @@ public:
virtual ~QMotifPlusStyle(); virtual ~QMotifPlusStyle();
void polish(QPalette &pal); void polish(QPalette &pal);
void polish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void polish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void unPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void unPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void applicationPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void applicationPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void applicationUnPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void applicationUnPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void drawPrimitive( PrimitiveElement pe, void drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -80,7 +80,7 @@ public:
void drawControl( ControlElement element, void drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -88,11 +88,11 @@ public:
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
QRect subRect(SubRect r, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget) const; QRect subRect(SubRect r, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget) const;
void drawComplexControl(ComplexControl control, void drawComplexControl(ComplexControl control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -107,18 +107,18 @@ public:
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
QRect querySubControlMetrics(ComplexControl control, QRect querySubControlMetrics(ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl subcontrol, SubControl subcontrol,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0) const; const QWidget *widget = 0) const;
int pixelMetric(PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0) const; int pixelMetric(PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget = 0) const;
int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption & = QStyleOption::Default, int styleHint(StyleHint sh, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption & = QStyleOption::Default,
QStyleHintReturn* = 0, const QWidget * = 0) const; QStyleHintReturn* = 0, const QWidget * = 0) const;
bool objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e ); bool objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e );
private: private:

24
src/styles/qmotifstyle.cpp
Unescape View File

@ -171,7 +171,7 @@ void QMotifStyle::polish( QPalette& pal )
\internal \internal
Keep QStyle::polish() visible. Keep QStyle::polish() visible.
*/ */
void QMotifStyle::polish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void QMotifStyle::polish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
QStyle::polish(ceData, elementFlags, ptr); QStyle::polish(ceData, elementFlags, ptr);
} }
@ -181,7 +181,7 @@ void QMotifStyle::polish( QStyleControlElementData ceData, ControlElementFlags e
\internal \internal
Keep QStyle::polish() visible. Keep QStyle::polish() visible.
*/ */
void QMotifStyle::applicationPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void QMotifStyle::applicationPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
QStyle::applicationPolish(ceData, elementFlags, ptr); QStyle::applicationPolish(ceData, elementFlags, ptr);
} }
@ -204,7 +204,7 @@ static void rot(QPointArray& a, int n)
*/ */
void QMotifStyle::drawPrimitive( PrimitiveElement pe, void QMotifStyle::drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -821,7 +821,7 @@ void QMotifStyle::drawPrimitive( PrimitiveElement pe,
*/ */
void QMotifStyle::drawControl( ControlElement element, void QMotifStyle::drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -1257,7 +1257,7 @@ static void get_combo_parameters( const QRect &r,
*/ */
void QMotifStyle::drawComplexControl( ComplexControl control, void QMotifStyle::drawComplexControl( ComplexControl control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -1500,7 +1500,7 @@ void QMotifStyle::drawComplexControl( ComplexControl control,
/*! \reimp */ /*! \reimp */
int QMotifStyle::pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) const int QMotifStyle::pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget ) const
{ {
int ret; int ret;
@ -1595,7 +1595,7 @@ int QMotifStyle::pixelMetric( PixelMetric metric, QStyleControlElementData ceDat
/*!\reimp /*!\reimp
*/ */
QRect QMotifStyle::querySubControlMetrics( ComplexControl control, QRect QMotifStyle::querySubControlMetrics( ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
const QStyleOption& opt, const QStyleOption& opt,
@ -1766,7 +1766,7 @@ QRect QMotifStyle::querySubControlMetrics( ComplexControl control,
/*!\reimp /*!\reimp
*/ */
QSize QMotifStyle::sizeFromContents( ContentsType contents, QSize QMotifStyle::sizeFromContents( ContentsType contents,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QSize &contentsSize, const QSize &contentsSize,
const QStyleOption& opt, const QStyleOption& opt,
@ -1846,7 +1846,7 @@ QSize QMotifStyle::sizeFromContents( ContentsType contents,
/*!\reimp /*!\reimp
*/ */
QRect QMotifStyle::subRect( SubRect r, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) const QRect QMotifStyle::subRect( SubRect r, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget ) const
{ {
QRect rect; QRect rect;
QRect wrect = ceData.rect; QRect wrect = ceData.rect;
@ -1953,7 +1953,7 @@ QRect QMotifStyle::subRect( SubRect r, QStyleControlElementData ceData, ControlE
/*! \reimp /*! \reimp
*/ */
void QMotifStyle::polishPopupMenu( QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void QMotifStyle::polishPopupMenu( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
#ifndef QT_NO_POPUPMENU #ifndef QT_NO_POPUPMENU
if ( !(ceData.windowState & WState_Polished ) ) { if ( !(ceData.windowState & WState_Polished ) ) {
@ -2269,7 +2269,7 @@ static const char *const question_xpm[] = {
\reimp \reimp
*/ */
QPixmap QMotifStyle::stylePixmap(StylePixmap sp, QPixmap QMotifStyle::stylePixmap(StylePixmap sp,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QStyleOption& opt, const QStyleOption& opt,
const QWidget *widget) const const QWidget *widget) const
@ -2355,7 +2355,7 @@ QPixmap QMotifStyle::stylePixmap(StylePixmap sp,
/*! \reimp */ /*! \reimp */
int QMotifStyle::styleHint(StyleHint hint, int QMotifStyle::styleHint(StyleHint hint,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QStyleOption &opt, const QStyleOption &opt,
QStyleHintReturn *returnData, QStyleHintReturn *returnData,

24
src/styles/qmotifstyle.h
Unescape View File

@ -67,15 +67,15 @@ public:
bool useHighlightColors() const; bool useHighlightColors() const;
void polish( QPalette& ); void polish( QPalette& );
void polish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void polish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void applicationPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void applicationPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void polishPopupMenu( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void polishPopupMenu( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
// new style API // new style API
void drawPrimitive( PrimitiveElement pe, void drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -84,7 +84,7 @@ public:
void drawControl( ControlElement element, void drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -94,7 +94,7 @@ public:
void drawComplexControl( ComplexControl control, void drawComplexControl( ComplexControl control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect& r, const QRect& r,
const QColorGroup& cg, const QColorGroup& cg,
@ -109,26 +109,26 @@ public:
const QWidget* widget = 0 ) const; const QWidget* widget = 0 ) const;
QRect querySubControlMetrics( ComplexControl control, QRect querySubControlMetrics( ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
int pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const; int pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const;
QSize sizeFromContents( ContentsType contents, QSize sizeFromContents( ContentsType contents,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QSize &contentsSize, const QSize &contentsSize,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
QRect subRect( SubRect r, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) const; QRect subRect( SubRect r, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget ) const;
QPixmap stylePixmap(StylePixmap, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption& = QStyleOption::Default, const QWidget * = 0) const; QPixmap stylePixmap(StylePixmap, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption& = QStyleOption::Default, const QWidget * = 0) const;
int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption & = QStyleOption::Default, int styleHint(StyleHint sh, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption & = QStyleOption::Default,
QStyleHintReturn* = 0, const QWidget * = 0) const; QStyleHintReturn* = 0, const QWidget * = 0) const;
private: private:

12
src/styles/qplatinumstyle.cpp
Unescape View File

@ -86,7 +86,7 @@ QPlatinumStyle::~QPlatinumStyle()
*/ */
void QPlatinumStyle::drawPrimitive( PrimitiveElement pe, void QPlatinumStyle::drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -742,7 +742,7 @@ void QPlatinumStyle::drawPrimitive( PrimitiveElement pe,
*/ */
void QPlatinumStyle::drawControl( ControlElement element, void QPlatinumStyle::drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -932,7 +932,7 @@ void QPlatinumStyle::drawControl( ControlElement element,
*/ */
void QPlatinumStyle::drawComplexControl( ComplexControl control, void QPlatinumStyle::drawComplexControl( ComplexControl control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -1320,7 +1320,7 @@ void QPlatinumStyle::drawComplexControl( ComplexControl control,
/*!\reimp /*!\reimp
*/ */
QRect QPlatinumStyle::querySubControlMetrics( ComplexControl control, QRect QPlatinumStyle::querySubControlMetrics( ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
const QStyleOption& opt, const QStyleOption& opt,
@ -1432,7 +1432,7 @@ QRect QPlatinumStyle::querySubControlMetrics( ComplexControl control,
/*!\reimp /*!\reimp
*/ */
int QPlatinumStyle::pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, int QPlatinumStyle::pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags,
const QWidget *widget ) const const QWidget *widget ) const
{ {
int ret; int ret;
@ -1469,7 +1469,7 @@ int QPlatinumStyle::pixelMetric( PixelMetric metric, QStyleControlElementData ce
/*!\reimp /*!\reimp
*/ */
QRect QPlatinumStyle::subRect( SubRect r, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) const QRect QPlatinumStyle::subRect( SubRect r, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget ) const
{ {
QRect rect; QRect rect;
switch ( r ) { switch ( r ) {

12
src/styles/qplatinumstyle.h
Unescape View File

@ -65,7 +65,7 @@ public:
// new Style Stuff // new Style Stuff
void drawPrimitive( PrimitiveElement pe, void drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -74,7 +74,7 @@ public:
void drawControl( ControlElement element, void drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -84,7 +84,7 @@ public:
void drawComplexControl( ComplexControl control, void drawComplexControl( ComplexControl control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -99,15 +99,15 @@ public:
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
QRect querySubControlMetrics( ComplexControl control, QRect querySubControlMetrics( ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
int pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const; int pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const;
QRect subRect( SubRect r, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) const; QRect subRect( SubRect r, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget ) const;
protected: protected:
QColor mixedColor(const QColor &, const QColor &) const; QColor mixedColor(const QColor &, const QColor &) const;

26
src/styles/qsgistyle.cpp
Unescape View File

@ -136,7 +136,7 @@ QSGIStyle::~QSGIStyle()
bold italic font for menu options. bold italic font for menu options.
*/ */
void void
QSGIStyle::applicationPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) QSGIStyle::applicationPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
isApplicationStyle = 1; isApplicationStyle = 1;
QMotifStyle::polish( ceData, elementFlags, ptr ); QMotifStyle::polish( ceData, elementFlags, ptr );
@ -181,7 +181,7 @@ QSGIStyle::applicationPolish( QStyleControlElementData ceData, ControlElementFla
/*! \reimp /*! \reimp
*/ */
void void
QSGIStyle::applicationUnPolish( QStyleControlElementData, ControlElementFlags, void * ) QSGIStyle::applicationUnPolish( const QStyleControlElementData&, ControlElementFlags, void * )
{ {
QFont f = QApplication::font(); QFont f = QApplication::font();
QApplication::setFont( f, TRUE ); // get rid of the special fonts for special widget classes QApplication::setFont( f, TRUE ); // get rid of the special fonts for special widget classes
@ -194,7 +194,7 @@ QSGIStyle::applicationUnPolish( QStyleControlElementData, ControlElementFlags, v
hovering. hovering.
*/ */
void void
QSGIStyle::polish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) QSGIStyle::polish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
QMotifStyle::polish(ceData, elementFlags, ptr); QMotifStyle::polish(ceData, elementFlags, ptr);
@ -269,7 +269,7 @@ QSGIStyle::polish( QStyleControlElementData ceData, ControlElementFlags elementF
/*! \reimp */ /*! \reimp */
void void
QSGIStyle::unPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) QSGIStyle::unPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
if ( (ceData.widgetObjectTypes.contains("QButton")) || (ceData.widgetObjectTypes.contains("QSlider")) || (ceData.widgetObjectTypes.contains("QScrollBar")) ) { if ( (ceData.widgetObjectTypes.contains("QButton")) || (ceData.widgetObjectTypes.contains("QSlider")) || (ceData.widgetObjectTypes.contains("QScrollBar")) ) {
removeObjectEventHandler(ceData, elementFlags, ptr, this); removeObjectEventHandler(ceData, elementFlags, ptr, this);
@ -286,7 +286,7 @@ QSGIStyle::unPolish( QStyleControlElementData ceData, ControlElementFlags elemen
} }
/*! \reimp */ /*! \reimp */
bool QSGIStyle::objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e ) bool QSGIStyle::objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e )
{ {
if ( (!(ceData.widgetObjectTypes.contains("QWidget"))) || (e->type() == QEvent::Paint) ) if ( (!(ceData.widgetObjectTypes.contains("QWidget"))) || (e->type() == QEvent::Paint) )
return QMotifStyle::objectEventHandler( ceData, elementFlags, source, e ); return QMotifStyle::objectEventHandler( ceData, elementFlags, source, e );
@ -375,7 +375,7 @@ static const int sgiTabSpacing = 12; // space between text and tab
static const int sgiCheckMarkSpace = 20; static const int sgiCheckMarkSpace = 20;
/*! \reimp */ /*! \reimp */
int QSGIStyle::pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) const int QSGIStyle::pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget ) const
{ {
switch ( metric ) { switch ( metric ) {
case PM_DefaultFrameWidth: case PM_DefaultFrameWidth:
@ -560,7 +560,7 @@ static void get_combo_parameters( const QRect &r,
/*! \reimp */ /*! \reimp */
void QSGIStyle::drawPrimitive( PrimitiveElement pe, void QSGIStyle::drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -943,7 +943,7 @@ void QSGIStyle::drawPrimitive( PrimitiveElement pe,
/*! \reimp */ /*! \reimp */
void QSGIStyle::drawControl( ControlElement element, void QSGIStyle::drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -1186,7 +1186,7 @@ void QSGIStyle::drawControl( ControlElement element,
/*! \reimp */ /*! \reimp */
void QSGIStyle::drawComplexControl( ComplexControl control, void QSGIStyle::drawComplexControl( ComplexControl control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect& r, const QRect& r,
const QColorGroup& cg, const QColorGroup& cg,
@ -1407,7 +1407,7 @@ void QSGIStyle::drawComplexControl( ComplexControl control,
/*!\reimp /*!\reimp
*/ */
QSize QSGIStyle::sizeFromContents( ContentsType contents, QSize QSGIStyle::sizeFromContents( ContentsType contents,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QSize &contentsSize, const QSize &contentsSize,
const QStyleOption& opt, const QStyleOption& opt,
@ -1447,7 +1447,7 @@ QSize QSGIStyle::sizeFromContents( ContentsType contents,
} }
/*! \reimp */ /*! \reimp */
QRect QSGIStyle::subRect( SubRect r, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) const QRect QSGIStyle::subRect( SubRect r, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget ) const
{ {
QRect rect; QRect rect;
@ -1472,7 +1472,7 @@ QRect QSGIStyle::subRect( SubRect r, QStyleControlElementData ceData, ControlEle
/*! \reimp */ /*! \reimp */
QRect QSGIStyle::querySubControlMetrics( ComplexControl control, QRect QSGIStyle::querySubControlMetrics( ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sub, SubControl sub,
const QStyleOption& opt, const QStyleOption& opt,
@ -1512,7 +1512,7 @@ QRect QSGIStyle::querySubControlMetrics( ComplexControl control,
} }
/*! \reimp */ /*! \reimp */
int QSGIStyle::styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption &opt, QStyleHintReturn *returnData, const QWidget *w) const int QSGIStyle::styleHint(StyleHint sh, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption &opt, QStyleHintReturn *returnData, const QWidget *w) const
{ {
int ret; int ret;

26
src/styles/qsgistyle.h
Unescape View File

@ -67,14 +67,14 @@ public:
#if !defined(Q_NO_USING_KEYWORD) #if !defined(Q_NO_USING_KEYWORD)
using QMotifStyle::polish; using QMotifStyle::polish;
#endif #endif
void polish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void polish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void unPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void unPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void applicationPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void applicationPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void applicationUnPolish( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); void applicationUnPolish( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
void drawPrimitive( PrimitiveElement pe, void drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -83,7 +83,7 @@ public:
void drawControl( ControlElement element, void drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -93,7 +93,7 @@ public:
void drawComplexControl( ComplexControl control, void drawComplexControl( ComplexControl control,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect& r, const QRect& r,
const QColorGroup& cg, const QColorGroup& cg,
@ -107,26 +107,26 @@ public:
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget* widget = 0 ) const; const QWidget* widget = 0 ) const;
int pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const; int pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const;
QSize sizeFromContents( ContentsType contents, QSize sizeFromContents( ContentsType contents,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QSize &contentsSize, const QSize &contentsSize,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
QRect subRect( SubRect r, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) const; QRect subRect( SubRect r, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget ) const;
QRect querySubControlMetrics( ComplexControl control, QRect querySubControlMetrics( ComplexControl control,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
SubControl sc, SubControl sc,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption &, QStyleHintReturn *, const QWidget *) const; int styleHint(StyleHint sh, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption &, QStyleHintReturn *, const QWidget *) const;
bool objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e ); bool objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e );
private: private:
QSGIStylePrivate *d; QSGIStylePrivate *d;

32
src/styles/qwindowsstyle.cpp
Unescape View File

@ -95,7 +95,7 @@ class QWindowsStyle::Private : public QObject
public: public:
Private(QWindowsStyle *parent); Private(QWindowsStyle *parent);
bool objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e ); bool objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e );
private: private:
int menuBarTimer; int menuBarTimer;
@ -107,7 +107,7 @@ QWindowsStyle::Private::Private(QWindowsStyle *parent)
} }
// Records Alt- and Focus events // Records Alt- and Focus events
bool QWindowsStyle::Private::objectEventHandler( QStyleControlElementData ceData, ControlElementFlags, void* source, QEvent *e ) bool QWindowsStyle::Private::objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags, void* source, QEvent *e )
{ {
if (!(ceData.widgetObjectTypes.contains("QWidget"))) { if (!(ceData.widgetObjectTypes.contains("QWidget"))) {
return TRUE; return TRUE;
@ -173,7 +173,7 @@ QWindowsStyle::~QWindowsStyle()
} }
/*! \reimp */ /*! \reimp */
bool QWindowsStyle::objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e ) { bool QWindowsStyle::objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e ) {
if (d) { if (d) {
return d->objectEventHandler(ceData, elementFlags, source, e); return d->objectEventHandler(ceData, elementFlags, source, e);
} }
@ -181,7 +181,7 @@ bool QWindowsStyle::objectEventHandler( QStyleControlElementData ceData, Control
} }
/*! \reimp */ /*! \reimp */
void QWindowsStyle::applicationPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) void QWindowsStyle::applicationPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{ {
// We only need the overhead when shortcuts are sometimes hidden // We only need the overhead when shortcuts are sometimes hidden
if (styleHint(SH_UnderlineAccelerator, QStyleControlElementData(), CEF_None, 0) && styleHint(SH_HideUnderlineAcceleratorWhenAltUp, QStyleControlElementData(), CEF_None, 0)) { if (styleHint(SH_UnderlineAccelerator, QStyleControlElementData(), CEF_None, 0) && styleHint(SH_HideUnderlineAcceleratorWhenAltUp, QStyleControlElementData(), CEF_None, 0)) {
@ -191,20 +191,20 @@ void QWindowsStyle::applicationPolish(QStyleControlElementData ceData, ControlEl
} }
/*! \reimp */ /*! \reimp */
void QWindowsStyle::applicationUnPolish(QStyleControlElementData, ControlElementFlags, void *) void QWindowsStyle::applicationUnPolish(const QStyleControlElementData&, ControlElementFlags, void *)
{ {
delete d; delete d;
d = 0; d = 0;
} }
/*! \reimp */ /*! \reimp */
void QWindowsStyle::polish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) void QWindowsStyle::polish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{ {
QCommonStyle::polish(ceData, elementFlags, ptr); QCommonStyle::polish(ceData, elementFlags, ptr);
} }
/*! \reimp */ /*! \reimp */
void QWindowsStyle::unPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) void QWindowsStyle::unPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
{ {
QCommonStyle::polish(ceData, elementFlags, ptr); QCommonStyle::polish(ceData, elementFlags, ptr);
} }
@ -218,7 +218,7 @@ void QWindowsStyle::polish( QPalette &pal )
/*! \reimp */ /*! \reimp */
void QWindowsStyle::drawPrimitive( PrimitiveElement pe, void QWindowsStyle::drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -688,7 +688,7 @@ void QWindowsStyle::drawPrimitive( PrimitiveElement pe,
*/ */
void QWindowsStyle::drawControl( ControlElement element, void QWindowsStyle::drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -1019,7 +1019,7 @@ void QWindowsStyle::drawControl( ControlElement element,
/*! /*!
\reimp \reimp
*/ */
int QWindowsStyle::pixelMetric(PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget) const int QWindowsStyle::pixelMetric(PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget) const
{ {
int ret; int ret;
@ -1096,7 +1096,7 @@ int QWindowsStyle::pixelMetric(PixelMetric metric, QStyleControlElementData ceDa
\reimp \reimp
*/ */
QSize QWindowsStyle::sizeFromContents( ContentsType contents, QSize QWindowsStyle::sizeFromContents( ContentsType contents,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QSize &contentsSize, const QSize &contentsSize,
const QStyleOption& opt, const QStyleOption& opt,
@ -1196,7 +1196,7 @@ QSize QWindowsStyle::sizeFromContents( ContentsType contents,
/*! \reimp /*! \reimp
*/ */
void QWindowsStyle::polishPopupMenu( QStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) void QWindowsStyle::polishPopupMenu( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
{ {
#ifndef QT_NO_POPUPMENU #ifndef QT_NO_POPUPMENU
if ( !(ceData.windowState & WState_Polished ) ) { if ( !(ceData.windowState & WState_Polished ) ) {
@ -1488,7 +1488,7 @@ static const char *const question_xpm[] = {
\reimp \reimp
*/ */
QPixmap QWindowsStyle::stylePixmap(StylePixmap stylepixmap, QPixmap QWindowsStyle::stylePixmap(StylePixmap stylepixmap,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QStyleOption& opt, const QStyleOption& opt,
const QWidget *widget) const const QWidget *widget) const
@ -1527,7 +1527,7 @@ QPixmap QWindowsStyle::stylePixmap(StylePixmap stylepixmap,
/*!\reimp /*!\reimp
*/ */
void QWindowsStyle::drawComplexControl( ComplexControl ctrl, QPainter *p, void QWindowsStyle::drawComplexControl( ComplexControl ctrl, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -1975,7 +1975,7 @@ void QWindowsStyle::drawComplexControl( ComplexControl ctrl, QPainter *p,
/*! \reimp */ /*! \reimp */
int QWindowsStyle::styleHint( StyleHint hint, int QWindowsStyle::styleHint( StyleHint hint,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QStyleOption &opt, const QStyleOption &opt,
QStyleHintReturn *returnData, QStyleHintReturn *returnData,
@ -2032,7 +2032,7 @@ int QWindowsStyle::styleHint( StyleHint hint,
} }
/*! \reimp */ /*! \reimp */
QRect QWindowsStyle::subRect(SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget) const QRect QWindowsStyle::subRect(SubRect r, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags, const QWidget *widget) const
{ {
QRect rect; QRect rect;

28
src/styles/qwindowsstyle.h
Unescape View File

@ -61,20 +61,20 @@ public:
QWindowsStyle(); QWindowsStyle();
~QWindowsStyle(); ~QWindowsStyle();
void applicationPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void applicationPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void applicationUnPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void applicationUnPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void polish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void polish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void unPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *); void unPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void polish( QPalette & ); void polish( QPalette & );
virtual void polishPopupMenu( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); virtual void polishPopupMenu( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
// new stuff // new stuff
void drawPrimitive( PrimitiveElement pe, void drawPrimitive( PrimitiveElement pe,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -83,7 +83,7 @@ public:
void drawControl( ControlElement element, void drawControl( ControlElement element,
QPainter *p, QPainter *p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect &r, const QRect &r,
const QColorGroup &cg, const QColorGroup &cg,
@ -93,7 +93,7 @@ public:
void drawComplexControl( ComplexControl control, void drawComplexControl( ComplexControl control,
QPainter* p, QPainter* p,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QRect& r, const QRect& r,
const QColorGroup& cg, const QColorGroup& cg,
@ -108,29 +108,29 @@ public:
const QWidget* widget = 0 ) const; const QWidget* widget = 0 ) const;
int pixelMetric( PixelMetric metric, int pixelMetric( PixelMetric metric,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
QSize sizeFromContents( ContentsType contents, QSize sizeFromContents( ContentsType contents,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QSize &contentsSize, const QSize &contentsSize,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption & = QStyleOption::Default, int styleHint(StyleHint sh, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption & = QStyleOption::Default,
QStyleHintReturn* = 0, const QWidget* = 0) const; QStyleHintReturn* = 0, const QWidget* = 0) const;
QPixmap stylePixmap( StylePixmap stylepixmap, QPixmap stylePixmap( StylePixmap stylepixmap,
QStyleControlElementData ceData, const QStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
const QStyleOption& = QStyleOption::Default, const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const; const QWidget *widget = 0 ) const;
QRect subRect( SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const; QRect subRect( SubRect r, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const;
bool objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e ); bool objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e );
private: private:
class Private; class Private;

Write Preview
Loading…
Cancel
Save