FCL/sf/mw/hb: comparison src/hbwidgets/widgets/hbpushbutton.cpp

equal deleted inserted replaced

-:f7ac710697a9
+:06ff229162e9
 ****************************************************************************/
 #include "hbpushbutton.h"
 #include "hbpushbutton_p.h"
 #include "hbstyle.h"
-#include "hbstyleoptionpushbutton.h"
+#include "hbstyleoptionpushbutton_p.h"
 #include "hbframedrawerpool_p.h"
 #include "hbnamespace.h"
 #ifdef HB_EFFECTS
 #include "hbeffect.h"
 #include "hbeffectinternal_p.h"
 additionalTextItem(0),
 touchArea(0),
 iconItem(0),
 frameItem(0),
 focusItem(0),
-orientation(Qt::Vertical),
 backgroundFrameDrawer(0),
 longPressTimer(0),
 textAlignment(Qt::AlignHCenter | Qt::AlignVCenter ),
 additionalTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter ),
 stretched(false),
 if ( !icon.isNull() ) {
 if ( !iconItem ) {
 iconItem = q->style()->createPrimitive( HbStyle::P_PushButton_icon, q);
 }
 } else {
-if( iconItem ){
+if( iconItem ) {
 delete iconItem;
 }
 iconItem = 0;
 }
 q->grabGesture(Qt::TapGesture);
 }
 }
 if( !focusItem ) {
 focusItem = q->style()->createPrimitive(HbStyle::P_PushButton_focus, q);
 //focus primitive is will not be visible by default,
 //only in case of keyboard focus events it will be Visible.
 focusItem->setVisible( false );
 }
 }
 }
 }
 void HbPushButtonPrivate::_q_handleLongKeyPress( )
 {
-Q_Q(HbPushButton);
+Q_Q( HbPushButton );
-if(!longPress){
+if(!longPress) {
 longPress = true;
-emit q->longPress( q->pos() );
+emit q->longPress( q->pos( ) );
 }
 }
 void HbPushButtonPrivate::initialize()
 {
-Q_Q(HbPushButton);
+Q_Q( HbPushButton );
 q_ptr = q;
-createPrimitives();
+createPrimitives( );
 }
 /*!
 @beta
 Constructs a new HbPushButton with \a parent.
 */
 HbPushButton::HbPushButton( QGraphicsItem *parent )
 : HbAbstractButton( *new HbPushButtonPrivate, parent )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
-d->initialize();
+d->initialize( );
-setProperty("state", "normal");
+setProperty( "state", "normal" );
 }
 /*!
 @beta
 Constructs a new HbPushButton with \a text and \a parent.
 */
-HbPushButton::HbPushButton(const QString &text, QGraphicsItem *parent)
+HbPushButton::HbPushButton( const QString &text, QGraphicsItem *parent )
-: HbAbstractButton(*new HbPushButtonPrivate, parent)
+: HbAbstractButton( *new HbPushButtonPrivate, parent )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
 d->text = text;
-d->initialize();
+d->initialize( );
-setProperty("state", "normal");
+setProperty( "state", "normal" );
 }
 /*!
 Constructs a new HbPushButton with \a icon, \a text and \a parent.
 */
 HbPushButton::HbPushButton( const HbIcon &icon, const QString &text, QGraphicsItem *parent )
 : HbAbstractButton( *new HbPushButtonPrivate, parent )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
 d->icon = icon;
 d->text = text;
-d->initialize();
+d->initialize( );
-setProperty("state", "normal");
+setProperty( "state", "normal" );
-}
-/*!
-\deprecated HbPushButton::HbPushButton(const HbIcon&, const QString&, Qt::Orientation, QGraphicsItem*)
-is deprecated.
-Constructs a new HbPushButton with \a icon, \a text \a orientation and \a parent.
-*/
-HbPushButton::HbPushButton( const HbIcon &icon, const QString &text,
-Qt::Orientation orientation, QGraphicsItem *parent )
-: HbAbstractButton( *new HbPushButtonPrivate, parent )
-{
-Q_D(HbPushButton);
-d->icon = icon;
-d->text = text;
-d->initialize();
-d->orientation = orientation;
-setProperty("state", "normal");
 }
 /*!
 Destructs the push button.
 */
-HbPushButton::~HbPushButton()
+HbPushButton::~HbPushButton( )
 {
 }
 /*!
 \sa background()
 */
 void  HbPushButton::setBackground( const HbIcon &background )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
-if( !d->frameItem ) {
-d->createPrimitives();
-}
 if ( d->background != background ) {
 d->background = background;
 d->backgroundFrameDrawer = 0;
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
 @beta
 Returns the background of the button.
 \sa setBackground()
 */
-HbIcon HbPushButton::background() const
+HbIcon HbPushButton::background( ) const
 {
-Q_D(const HbPushButton);
+Q_D( const HbPushButton );
 return d->background;
 }
 /*!
 @beta
 \sa frameBackground()
 */
 void  HbPushButton::setFrameBackground( HbFrameDrawer *backgroundFrameDrawer )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
-if (d->backgroundFrameDrawer != backgroundFrameDrawer) {
+if ( d->backgroundFrameDrawer != backgroundFrameDrawer ) {
-if( !d->frameItem ) {
+d->backgroundFrameDrawer = backgroundFrameDrawer;
-d->createPrimitives();
+d->background = HbIcon( );
-}
-d->backgroundFrameDrawer=backgroundFrameDrawer;
-d->background=HbIcon();
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
-style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
+style( )->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
 }
 }
 /*!
 @beta
 Returns the background of the button.
 \sa setBackground()
 */
-HbFrameDrawer* HbPushButton::frameBackground() const
+HbFrameDrawer *HbPushButton::frameBackground( ) const
 {
-Q_D(const HbPushButton);
+Q_D( const HbPushButton );
 return ( d->backgroundFrameDrawer );
 }
 /*!
 \sa text()
 */
 void HbPushButton::setText( const QString &text )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
 if ( d->text != text ) {
 bool doPolish = text.isEmpty() || d->text.isEmpty();
 d->text = text;
-d->createPrimitives();
+d->createPrimitives( );
 //updatePrimitives();
-if( d->textItem ){
+if( d->textItem ) {
 HbStyleOptionPushButton buttonOption;
-initStyleOption(&buttonOption);
+initStyleOption( &buttonOption );
-style()->updatePrimitive( d->textItem, HbStyle::P_PushButton_text, &buttonOption);
+style( )->updatePrimitive( d->textItem, HbStyle::P_PushButton_text, &buttonOption);
 }
 if(doPolish) {
-repolish();
+repolish( );
 }
 }
 }
 @beta
 Returns the text shown on the button.
 \sa setText()
 */
-QString HbPushButton::text() const
+QString HbPushButton::text( ) const
 {
-Q_D(const HbPushButton);
+Q_D( const HbPushButton );
 return d->text;
 }
 /*!
 \sa additionalText()
 */
 void HbPushButton::setAdditionalText( const QString &additionalText )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
 if ( d->additionalText != additionalText ) {
 bool doPolish = additionalText.isEmpty() || d->additionalText.isEmpty();
 d->additionalText = additionalText;
-d->createPrimitives();
+d->createPrimitives( );
 // updatePrimitives();
-if(d->additionalTextItem){
+if( d->additionalTextItem ) {
 HbStyleOptionPushButton buttonOption;
-initStyleOption(&buttonOption);
+initStyleOption( &buttonOption );
-style()->updatePrimitive( d->additionalTextItem, HbStyle::P_PushButton_additionaltext, &buttonOption);
+style( )->updatePrimitive( d->additionalTextItem, HbStyle::P_PushButton_additionaltext, &buttonOption);
 }
 if( doPolish ) {
 repolish();
 }
 }
 @beta
 Returns the additional text shown on the button.
 \sa setAdditionalText()
 */
-QString HbPushButton::additionalText() const
+QString HbPushButton::additionalText( ) const
 {
-Q_D(const HbPushButton);
+Q_D( const HbPushButton );
 return d->additionalText;
 }
 /*!
 @beta
 \note The icon can contain images for different modes.
 \sa icon()
 */
-void HbPushButton::setIcon(const HbIcon &icon)
+void HbPushButton::setIcon( const HbIcon &icon )
 {
 Q_D(HbPushButton);
 if ( d->icon != icon ) {
-bool doPolish = icon.isNull() || d->icon.isNull();
+bool doPolish = icon.isNull( ) || d->icon.isNull();
 d->icon = icon;
-d->createPrimitives();
+d->createPrimitives( );
 //updatePrimitives();
-if(d->iconItem ){
+if( d->iconItem ) {
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
 style()->updatePrimitive( d->iconItem, HbStyle::P_PushButton_icon, &buttonOption );
 }
-if( doPolish ){
+if( doPolish ) {
 repolish();
 }
 }
 }
 @beta
 Returns the icon shown on the button.
 \sa setIcon()
 */
-HbIcon HbPushButton::icon() const
+HbIcon HbPushButton::icon( ) const
 {
-Q_D(const HbPushButton);
+Q_D( const HbPushButton );
 return d->icon;
 }
+/*!
-/*!
+@beta
-\deprecated HbPushButton::setOrientation( Qt::Orientation )
-is deprecated. Please use HbPushButton::setStretched(bool) instead
-Set the orientation.Default orientation is Qt::Vertical.
-In case of icon ,text and additional text it has to be set to Qt::Horizontal.
-In case of additionalText and text it has to be set to Qt:Vertical.
-\sa orientation()
-*/
-void HbPushButton::setOrientation( Qt::Orientation orientation )
-{
-Q_D(HbPushButton);
-if( d->orientation != orientation ) {
-d->orientation = orientation;
-// calling setStretchedMode internaly this api is going to be depricated.
-bool stretched =
-(d->orientation == Qt::Vertical)?(false):(true);
-setStretched( stretched );
-}
-qDebug()<<"This api is deprecated use HbPushButton::setStretched( bool stretched )";
-}
-/*!
-\deprecated HbPushButton::orientation() const
-is deprecated.Please use bool HbPushButton::isStretched() const instead
-Returns orientation of button
-\sa setOrientation ()
-*/
-Qt::Orientation HbPushButton::orientation() const
-{
-Q_D(const HbPushButton);
-qDebug()<<"This api is deprecated use bool HbPushButton::isStretched() const";
-return d->orientation;
-}
-/*!
 Set the text alignment for primarytext  and additional text.
 The default alignment is Qt::AlignHCenter | Qt::AlignVCenter.
 \sa textAlignment()
 */
 void HbPushButton::setTextAlignment( Qt::Alignment alignment )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
 //HbWidgetBase* textItem = static_cast<HbWidgetBase*>(d->textItem);
-if(!d->textItem){
+if( !d->textItem ) {
 //need to create text item if user call alignment api before setText.
-d->textItem = style()->createPrimitive( HbStyle::P_PushButton_text, this);
+d->textItem = style( )->createPrimitive( HbStyle::P_PushButton_text, this);
 }
 //HbWidgetBasePrivate *textItem_p = HbWidgetBasePrivate::d_ptr(textItem);
 // check for textitem and api protection flag
-if(alignment != d->textAlignment ){
+if( alignment != d->textAlignment ){
 //take the alignment
 d->textAlignment = alignment;
 //set the api protection flag
 //HbWidgetBasePrivate::d_ptr(textItem)->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign,true);
 d->hasTextAlignment = true;
 }
 d->hasTextAlignment = true;
 }
 /*!
+@beta
 Returns the text alignment for primary text and additional text
 \sa setTextAlignment()
 */
 Qt::Alignment HbPushButton::textAlignment( ) const
 {
 return d->textAlignment;
 }
 /*!
+@beta
 Set the text alignment for additional text.
 The default alignment is Qt::AlignHCenter | Qt::AlignVCenter.
 \sa additionalTextAlignment()
 */
 void HbPushButton::setAdditionalTextAlignment( Qt::Alignment alignment )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
 //HbWidgetBase* additionalTextItem = static_cast<HbWidgetBase*>(d->additionalTextItem);
-if(!d->additionalTextItem){
+if(!d->additionalTextItem) {
 //need to create text item if user call alignment api before setAdditionalText.
-d->additionalTextItem = style()->createPrimitive( HbStyle::P_PushButton_additionaltext, this);
+d->additionalTextItem = style( )->createPrimitive( HbStyle::P_PushButton_additionaltext, this);
 }
 // check for textitem and api protection flag
-if(alignment != d->additionalTextAlignment ){
+if( alignment != d->additionalTextAlignment ) {
 //take the alignment
 d->additionalTextAlignment = alignment;
 //set the api protection flag
 //HbWidgetBasePrivate::d_ptr(additionalTextItem)->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextAlign,true);
 d->hasAdditionalTextAlignment = true;
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
-style()->updatePrimitive(
+style( )->updatePrimitive(
 d->additionalTextItem, HbStyle::P_PushButton_additionaltext, &buttonOption );
 }
 }
 /*!
+@beta
 Returns the text alignment for additional text
 \sa setAdditionalTextAlignment()
 */
 Qt::Alignment HbPushButton::additionalTextAlignment( ) const
 {
 Q_D(const HbPushButton);
 return d->additionalTextAlignment;
 }
 /*!
+@beta
 Sets the stretched layout for button by default it set to true. setStretched true/false.
 For the case icon and text with value false will appear icon and text vertically aligned.
 and with value true will appear icon and text horizontally aligned.
 For the case icon , text and additional text with value false will appear like
 both text will be vertically aligned and icon will be horizontally.
 repolish();
 }
 }
 /*!
+@beta
 Returns the whether button has streteched layout or not.
 \sa setStretched ()
 */
 bool HbPushButton::isStretched() const
 {
 \deprecated HbPushButton::primitive(HbStyle::Primitive)
 is deprecated.
 \reimp
 */
-QGraphicsItem* HbPushButton::primitive( HbStyle::Primitive primitive ) const
+QGraphicsItem *HbPushButton::primitive( HbStyle::Primitive primitive ) const
 {
-Q_D(const HbPushButton);
+Q_D( const HbPushButton );
-switch (primitive) {
+switch ( primitive ) {
 case HbStyle::P_PushButton_background:
 return d->frameItem;
 case HbStyle::P_PushButton_icon:
 return d->iconItem;
 case HbStyle::P_PushButton_text:
 /*!
 \reimp
 */
 void HbPushButton::recreatePrimitives()
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
 HbWidget::recreatePrimitives();
 delete d->frameItem;
 d->frameItem = 0;
 delete d->iconItem;
 delete d->additionalTextItem;
 d->additionalTextItem = 0;
 delete d->focusItem;
 d->focusItem = 0;
-d->createPrimitives();
+d->createPrimitives( );
-setFrameBackground(0);
+setFrameBackground( 0 );
 }
 /*!
 \reimp
 */
 void HbPushButton::updatePrimitives()
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
-HbWidget::updatePrimitives();
+HbWidget::updatePrimitives( );
 HbStyleOptionPushButton buttonOption;
 initStyleOption(&buttonOption);
 if ( d->textItem ) {
 style()->updatePrimitive( d->textItem, HbStyle::P_PushButton_text, &buttonOption );
 }
 if ( d->touchArea ) {
 style()->updatePrimitive( d->touchArea, HbStyle::P_PushButton_toucharea, &buttonOption );
 }
-if( d->additionalTextItem ){
+if( d->additionalTextItem ) {
 style()->updatePrimitive(
 d->additionalTextItem,HbStyle::P_PushButton_additionaltext,&buttonOption );
 }
 if ( d->iconItem) {
 style()->updatePrimitive( d->iconItem, HbStyle::P_PushButton_icon, &buttonOption );
 }
-if ( d->frameItem ){
+if ( d->frameItem ) {
 style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
 }
 // update will happen only for keyevents when focusItem will be visible.
 if( d->focusItem && hasFocus() && d->focusItem->isVisible() ) {
 style()->updatePrimitive( d->focusItem,HbStyle::P_PushButton_focus, &buttonOption );
 }
 /*!
 \internal
 */
-HbPushButton::HbPushButton(HbPushButtonPrivate &dd, QGraphicsItem * parent) :
+HbPushButton::HbPushButton(HbPushButtonPrivate &dd, QGraphicsItem *parent) :
 HbAbstractButton(dd, parent)
 {
 }
 /*!
 Initializes \a option with the values from this HbPushButton.
 This method is useful for subclasses when they need a HbStyleOptionPushButton,
 but don't want to fill in all the information themselves.
 */
-void HbPushButton::initStyleOption(HbStyleOptionPushButton *option) const
+void HbPushButton::initStyleOption( HbStyleOptionPushButton *option ) const
 {
-Q_D(const HbPushButton);
+Q_D( const HbPushButton );
 HbAbstractButton::initStyleOption(option);
 Q_ASSERT(option);
 option->background = d->background;
 option->isCheckable = d->checkable;
 option->textAlignment = d->textAlignment;
 option->additionalTextAlignment = d->additionalTextAlignment;
 option->hasTextAlignment = d->hasTextAlignment;
 option->hasAdditionalTextAlignment = d->hasAdditionalTextAlignment;
-if(option->backgroundFrameDrawer) {
+if( option->backgroundFrameDrawer ) {
-HbFrameDrawerPool::release(option->backgroundFrameDrawer);
+HbFrameDrawerPool::release( option->backgroundFrameDrawer );
 option->backgroundFrameDrawer = 0;
 }
-option->backgroundFrameDrawer=( d->backgroundFrameDrawer );
+option->backgroundFrameDrawer = ( d->backgroundFrameDrawer );
 }
 /*!
 \reimp
 */
 void HbPushButton::keyPressEvent(QKeyEvent *event)
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
-switch (event->key()) {
+switch ( event->key() ) {
 case Qt::Key_Select:
 case Qt::Key_Enter:
 case Qt::Key_Return:{
-if (!event->isAutoRepeat() && !d->autoRepeat && !d->longPressTimer) {
+if (!event->isAutoRepeat( ) && !d->autoRepeat && !d->longPressTimer) {
 d->longPressTimer = new QTimer();
 d->longPressTimer->setInterval(300);
-connect( d->longPressTimer, SIGNAL(timeout()), this, SLOT(_q_handleLongKeyPress()) );
+connect( d->longPressTimer, SIGNAL( timeout() ), this, SLOT(_q_handleLongKeyPress()) );
 d->longPressTimer->start();
-}else{
+}else {
 #ifdef HB_EFFECTS
 HbEffect::start( this, HB_PUSHBUTTON_TYPE, "pressed" );
 #endif
 }
 }
 \reimp
 */
 void HbPushButton::mousePressEvent( QGraphicsSceneMouseEvent *event )
 {
 #ifndef HB_GESTURE_FW
-Q_D(HbPushButton);
+Q_D( HbPushButton );
-HbAbstractButton::mousePressEvent(event);
+HbAbstractButton::mousePressEvent( event );
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
-if( d->frameItem ){
+if( d->frameItem ) {
 style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
 }
 #ifdef HB_EFFECTS
-if ( hitButton(event->pos()) ){
+if ( hitButton(event->pos()) ) {
 HbEffect::start( this, HB_PUSHBUTTON_TYPE, "pressed" );
 }
 #endif
-setProperty("state", "pressed");
+setProperty( "state", "pressed" );
 #else
-Q_UNUSED(event)
+Q_UNUSED( event )
 #endif
 }
 #ifndef HB_GESTURE_FW
 /*!
 \reimp
 */
-void HbPushButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+void HbPushButton::mouseReleaseEvent( QGraphicsSceneMouseEvent *event )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
-HbAbstractButton::mouseReleaseEvent(event);
+HbAbstractButton::mouseReleaseEvent( event );
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
-if( d->frameItem ){
+if( d->frameItem ) {
 style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
 }
 #ifdef HB_EFFECTS
-if ( hitButton(event->pos()) ){
+if ( hitButton(event->pos()) ) {
 HbEffect::start( this, HB_PUSHBUTTON_TYPE, "released" );
 }
 #endif
-setProperty("state", "normal");
+setProperty( "state", "normal" );
 }
 /*!
 \reimp
 */
-void HbPushButton::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+void HbPushButton::mouseMoveEvent( QGraphicsSceneMouseEvent *event )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
-HbAbstractButton::mouseMoveEvent(event);
+HbAbstractButton::mouseMoveEvent( event );
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
-if( d->frameItem ){
+if( d->frameItem ) {
 style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
 }
 if (d->down) {
-setProperty("state", "pressed");
+setProperty( "state", "pressed" );
 } else {
-setProperty("state", "normal");
+setProperty( "state", "normal" );
 }
 }
 #endif
 #ifdef HB_GESTURE_FW
-void HbPushButton::gestureEvent(QGestureEvent *event)
+void HbPushButton::gestureEvent( QGestureEvent *event )
 {
 Q_D(HbPushButton);
 if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
 switch(tap->state()) {
 case Qt::GestureStarted:{
 #ifdef HB_EFFECTS
 HbEffect::start( this, HB_PUSHBUTTON_TYPE, "pressed" );
 #endif
-if(d->checkable && !d->checked){
+if( d->checkable && !d->checked) {
-setProperty("state", "latched");
+setProperty( "state", "latched" );
-}else if(!d->checkable){
+}else if(!d->checkable) {
-setProperty("state", "pressed");
+setProperty( "state", "pressed" );
 }
 }
 break;
 case Qt::GestureUpdated:
 if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
 d->longPress = true;
-emit longPress(event->mapToGraphicsScene(tap->position()));
+emit longPress( event->mapToGraphicsScene(tap->position()) );
 }
 break;
 case Qt::GestureCanceled:
-setProperty("state", "normal");
+setProperty( "state", "normal" );
 break;
 case Qt::GestureFinished:{
 #ifdef HB_EFFECTS
 HbEffect::start( this, HB_PUSHBUTTON_TYPE, "released" );
 #endif
-if( d->checkable && !d->checked){
+if( d->checkable && !d->checked) {
-setProperty("state", "latched");
+setProperty( "state", "latched" );
 }else {
-setProperty("state", "normal");
+setProperty( "state", "normal" );
 }
 }
 break;
 default:
 break;
 }
 }
-HbAbstractButton::gestureEvent(event);
+HbAbstractButton::gestureEvent( event );
 }
 #endif
 /*!
 \reimp
 */
-void HbPushButton::resizeEvent(QGraphicsSceneResizeEvent *event)
+void HbPushButton::resizeEvent( QGraphicsSceneResizeEvent *event )
 {
-HbAbstractButton::resizeEvent(event);
+HbAbstractButton::resizeEvent( event );
 }
 /*!
 reimp
 */
-void HbPushButton::polish( HbStyleParameters& params )
+void HbPushButton::polish( HbStyleParameters &params )
 {
 Q_D( HbPushButton );
-if(d->stretched && (d->textItem && d->additionalTextItem && !d->iconItem)){
+if( d->stretched && ( d->textItem && d->additionalTextItem && !d->iconItem ) ) {
 d->stretched = false;
-qWarning()<<"Warning::Invalid Layout: Text and additonalText horizontal appearance not supported";
+qWarning() << "Warning::Invalid Layout: Text and additonalText horizontal appearance not supported";
 }
 HbAbstractButton::polish( params );
 }
 /*!
 \reimp
 */
-void HbPushButton::focusInEvent(QFocusEvent *event)
+void HbPushButton::focusInEvent( QFocusEvent *event )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
-if((event->reason() == Qt::TabFocusReason || event->reason() == Qt::BacktabFocusReason)
+if( ( event->reason() == Qt::TabFocusReason || event->reason() == Qt::BacktabFocusReason )
 && ( d->navigationKeyPress ) ) {
-if(d->focusItem) {
+if( d->focusItem ) {
-d->focusItem->setVisible(true);
+d->focusItem->setVisible( true );
-if( hasFocus()){
+if( hasFocus() ) {
 HbStyleOptionPushButton buttonOption;
 initStyleOption( &buttonOption );
 style()->updatePrimitive( d->focusItem,HbStyle::P_PushButton_focus, &buttonOption );
 }
 } else {
 d->focusItem = style()->createPrimitive(HbStyle::P_PushButton_focus, this);
 }
 }
-HbAbstractButton::focusInEvent(event);
+HbAbstractButton::focusInEvent( event );
 }
 /*!
 \reimp
 */
-void HbPushButton::focusOutEvent(QFocusEvent *event)
+void HbPushButton::focusOutEvent( QFocusEvent *event )
 {
-Q_D(HbPushButton);
+Q_D( HbPushButton );
-if(d->focusItem) {
+if( d->focusItem ) {
-d->focusItem->setVisible(false);
+d->focusItem->setVisible( false );
 }
-HbAbstractButton::focusOutEvent(event);
+HbAbstractButton::focusOutEvent( event );
 }
 /*!
 \reimp
 */
 }
 /*!
 Overloaded hit detection to include touch area
 */
-bool HbPushButton::hitButton(const QPointF &pos) const
+bool HbPushButton::hitButton( const QPointF &pos ) const
 {
 Q_D( const HbPushButton );
 QRectF compRect = d->touchArea->boundingRect( );
 compRect.translate( d->touchArea->pos() );
 return compRect.contains( pos );

changeset 2	06ff229162e9
parent 1	f7ac710697a9
child 3	11d3954df52a