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

equal deleted inserted replaced

-:f7ac710697a9
+:06ff229162e9
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
 #include <hbcheckbox.h>
-#include <hbstyleoptioncheckbox.h>
+#include <hbstyleoptioncheckbox_p.h>
 #include "hbabstractbutton_p.h"
 #include "hbtooltip.h"
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsItem>
 class HbCheckBoxSpacer: public HbWidgetBase
 {
 public:
 HbCheckBoxSpacer( QGraphicsItem *parent = 0 );
-QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+QSizeF sizeHint(  Qt::SizeHint which, const QSizeF &constraint = QSizeF( ) ) const;
 };
 HbCheckBoxSpacer::HbCheckBoxSpacer( QGraphicsItem *parent )
 : HbWidgetBase( parent )
 {
 // seems to be 4.6 only?
 //    setFlag( QGraphicsItem::ItemHasNoContents, true );
 }
-QSizeF HbCheckBoxSpacer::sizeHint(Qt::SizeHint which, const QSizeF &constraint ) const
+QSizeF HbCheckBoxSpacer::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const
 {
 Q_UNUSED( constraint );
 if ( which == Qt::MaximumSize ) {
 return QSizeF( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
 }
-return QSizeF(0.f,0.f);
+return QSizeF( 0.f, 0.f );
 }
 /*
 private class
 */
 class HB_AUTOTEST_EXPORT HbCheckBoxPrivate : public HbAbstractButtonPrivate
 {
-Q_DECLARE_PUBLIC(HbCheckBox)
+Q_DECLARE_PUBLIC( HbCheckBox )
 public:
-HbCheckBoxPrivate();
+HbCheckBoxPrivate( );
-virtual ~HbCheckBoxPrivate();
+virtual ~HbCheckBoxPrivate( );
-void createPrimitives();
+void createPrimitives( );
 public:
 QString mText;
 QGraphicsItem *mTextItem;
 QGraphicsItem *mIconItem;
 /*
 private class constructor
 */
 HbCheckBoxPrivate::HbCheckBoxPrivate():
-mTextItem(0),
+mTextItem( 0 ),
-mIconItem(0),
+mIconItem( 0 ),
-mTouchArea(0),
+mTouchArea( 0 ),
-mTristate(false),
+mTristate( false ),
-mNoChange(false),
+mNoChange( false ),
-mPublishedState(Qt::Unchecked)
+mPublishedState( Qt::Unchecked )
 {
 //adding effect for checkbox
 #ifdef HB_EFFECTS
-HbEffectInternal::add(HB_CHECKBOX_TYPE,"checkbox_selected", "pressed");
+HbEffectInternal::add( HB_CHECKBOX_TYPE,"checkbox_selected", "pressed" );
 #endif
 }
 /*
 private class destructor
 */
-HbCheckBoxPrivate::~HbCheckBoxPrivate()
+HbCheckBoxPrivate::~HbCheckBoxPrivate( )
 {
 }
 /*
 create primitive
 */
-void HbCheckBoxPrivate::createPrimitives()
+void HbCheckBoxPrivate::createPrimitives( )
 {
-Q_Q(HbCheckBox);
+Q_Q( HbCheckBox );
-if(!mTouchArea) {
+if( !mTouchArea ) {
-mTouchArea = q->style()->createPrimitive(HbStyle::P_CheckBox_toucharea, q);
+mTouchArea = q->style( )->createPrimitive( HbStyle::P_CheckBox_toucharea, q );
-if(QGraphicsObject *ta = qgraphicsitem_cast<QGraphicsObject*>(mTouchArea)) {
+if( QGraphicsObject *ta = qgraphicsitem_cast<QGraphicsObject*>( mTouchArea ) ) {
-ta->grabGesture(Qt::TapGesture);
+ta->grabGesture( Qt::TapGesture );
 }
 }
-if (!mTextItem) {
+if ( !mTextItem ) {
-mTextItem = q->style()->createPrimitive(HbStyle::P_CheckBox_text, q);
+mTextItem = q->style( )->createPrimitive( HbStyle::P_CheckBox_text, q );
 }
-if (!mIconItem) {
+if ( !mIconItem ) {
-mIconItem = q->style()->createPrimitive(HbStyle::P_CheckBox_icon, q);
+mIconItem = q->style( )->createPrimitive( HbStyle::P_CheckBox_icon, q );
 }
 }
 /*!
 @beta
 @beta
 Constructor an object of HbCheckBox with default parameters.
 By default the state of check box will be Unchecked, text will
 be empty and tristate will be false.
 */
-HbCheckBox::HbCheckBox(QGraphicsItem *parent)
+HbCheckBox::HbCheckBox( QGraphicsItem *parent )
-: HbAbstractButton(*new HbCheckBoxPrivate, parent)
+: HbAbstractButton( *new HbCheckBoxPrivate, parent )
 {
-Q_D(HbCheckBox);
+Q_D( HbCheckBox );
 d->q_ptr = this;
-setCheckable(true);
+setCheckable( true );
-d->createPrimitives();
+d->createPrimitives( );
 // creattion of top and bottom spacer.
-HbStyle::setItemName( new HbCheckBoxSpacer(this), "topSpacer" );
+HbStyle::setItemName( new HbCheckBoxSpacer( this ), "topSpacer" );
-HbStyle::setItemName( new HbCheckBoxSpacer(this), "bottomSpacer" );
+HbStyle::setItemName( new HbCheckBoxSpacer( this ), "bottomSpacer" );
 #ifdef HB_GESTURE_FW
-grabGesture(Qt::TapGesture);
+grabGesture( Qt::TapGesture );
 #endif
 }
 /*!
 @beta
 Constructor an object of HbCheckBox with \a text passed.
 By default the state of check box will be Unchecked.
 Tristate will be false by default.
 */
-HbCheckBox::HbCheckBox(const QString &text, QGraphicsItem *parent )
+HbCheckBox::HbCheckBox( const QString &text, QGraphicsItem *parent )
-: HbAbstractButton(*new HbCheckBoxPrivate, parent)
+: HbAbstractButton( *new HbCheckBoxPrivate, parent )
 {
-Q_D(HbCheckBox);
+Q_D( HbCheckBox );
 d->q_ptr = this;
 d->mText = text;
-setCheckable(true);
+setCheckable( true );
-d->createPrimitives();
+d->createPrimitives( );
 // creattion of top and bottom spacer.
 HbStyle::setItemName( new HbCheckBoxSpacer(this), "topSpacer");
 HbStyle::setItemName( new HbCheckBoxSpacer(this), "bottomSpacer");
 }
 /*!
 Destructor.
 */
-HbCheckBox::~HbCheckBox()
+HbCheckBox::~HbCheckBox( )
 {
 }
 /*!
 @beta
 UpdatePrimitive is called by this functions once the text is changed.
 \sa text()
 */
 void HbCheckBox::setText( const QString &text )
 {
-Q_D(HbCheckBox);
+Q_D( HbCheckBox );
-if(d->mText != text){
+if( d->mText != text ){
 d->mText = text;
 //updatePrimitives();
 if( d->mTextItem ){
 HbStyleOptionCheckBox checkBoxOption;
-initStyleOption(&checkBoxOption);
+initStyleOption( &checkBoxOption );
-style()->updatePrimitive(d->mTextItem, HbStyle::P_CheckBox_text, &checkBoxOption);
+style( )->updatePrimitive( d->mTextItem, HbStyle::P_CheckBox_text, &checkBoxOption );
 }
 }
 }
 /*!
 @beta
 Returns the text of checkbox.
 \sa setText()
 */
-QString HbCheckBox::text() const
+QString HbCheckBox::text( ) const
 {
-Q_D(const HbCheckBox);
+Q_D( const HbCheckBox );
 return d->mText;
 }
 /*!
 @beta
 By default tristate is false and checkbox has got only two states.
 \sa isTristate( )
 */
 void HbCheckBox::setTristate( bool isTristate )
 {
-Q_D(HbCheckBox);
+Q_D( HbCheckBox );
 d->mTristate = isTristate;
 }
 /*!
 @beta
 Returns whether tristate is enabled for checkbox or not.
 \sa setTristate( )
 */
 bool HbCheckBox::isTristate( ) const
 {
-Q_D(const HbCheckBox);
+Q_D( const HbCheckBox );
 return d->mTristate;
 }
 /*!
 @beta
 Returns the current state of HbCheckBox.
 */
 Qt::CheckState HbCheckBox::checkState() const
 {
-Q_D(const HbCheckBox);
+Q_D( const HbCheckBox );
-if (d->mTristate &&  d->mNoChange) {
+if ( d->mTristate &&  d->mNoChange ) {
 return Qt::PartiallyChecked;
 }
 return d->checked ? Qt::Checked : Qt::Unchecked;
 }
 Returns the pointer for \a primitive passed.
 Will return NULL if \a primitive passed is icon because user cannot
 configure the check and unchecked icons. Style needs to be changed if
 user wants different icons.
 */
-QGraphicsItem* HbCheckBox::primitive(HbStyle::Primitive primitive) const
+QGraphicsItem *HbCheckBox::primitive( HbStyle::Primitive primitive ) const
 {
-Q_D(const HbCheckBox);
+Q_D( const HbCheckBox );
-switch (primitive) {
+switch ( primitive ) {
 case HbStyle::P_CheckBox_text:
 return d->mTextItem;
 case HbStyle::P_CheckBox_toucharea:
 return d->mTouchArea;
 case HbStyle::P_CheckBox_icon:
 Calls updatePrimitive when state is changed.
 Emits signal stateChanged(state).
 */
 void HbCheckBox::setCheckState( Qt::CheckState state )
 {
-Q_D(HbCheckBox);
+Q_D( HbCheckBox );
 if (state == Qt::PartiallyChecked) {
 d->mTristate = true;
 d->mNoChange = true;
 } else {
 d->mNoChange = false;
 }
 d->blockRefresh = true;
-setChecked(state != Qt::Unchecked);
+setChecked( state != Qt::Unchecked );
 d->blockRefresh = false;
-d->refresh();
+d->refresh( );
-if (state != d->mPublishedState) {
+if ( state != d->mPublishedState ) {
 d->mPublishedState = state;
-emit stateChanged(state);
+emit stateChanged( state );
 }
 }
 /*!
 Updates the icon and text primitives.
 */
-void HbCheckBox::updatePrimitives()
+void HbCheckBox::updatePrimitives( )
 {
-HbWidget::updatePrimitives();
+HbWidget::updatePrimitives( );
-Q_D(HbCheckBox);
+Q_D( HbCheckBox );
 HbStyleOptionCheckBox checkBoxOption;
-initStyleOption(&checkBoxOption);
+initStyleOption( &checkBoxOption );
-if (d->mTextItem) {
+if ( d->mTextItem ) {
-style()->updatePrimitive(d->mTextItem, HbStyle::P_CheckBox_text, &checkBoxOption);
+style( )->updatePrimitive( d->mTextItem, HbStyle::P_CheckBox_text, &checkBoxOption );
 }
-if (d->mIconItem) {
+if ( d->mIconItem ) {
-style()->updatePrimitive(d->mIconItem, HbStyle::P_CheckBox_icon, &checkBoxOption);
+style( )->updatePrimitive( d->mIconItem, HbStyle::P_CheckBox_icon, &checkBoxOption );
 }
 if (d->mTouchArea) {
-style()->updatePrimitive(d->mTouchArea, HbStyle::P_CheckBox_toucharea, &checkBoxOption);
+style( )->updatePrimitive( d->mTouchArea, HbStyle::P_CheckBox_toucharea, &checkBoxOption );
 }
 }
 /*!
 Initializes the style for check box with the \a option passed.
 */
 void HbCheckBox::initStyleOption(HbStyleOptionCheckBox *option) const
 {
-Q_D(const HbCheckBox);
+Q_D( const HbCheckBox );
-HbAbstractButton::initStyleOption(option);
+HbAbstractButton::initStyleOption( option );
-Q_ASSERT(option);
+Q_ASSERT( option );
 option->text = d->mText;
-if (d->mTristate && d->mNoChange){
+if ( d->mTristate && d->mNoChange ){
-option->state.operator = (QStyle::State_NoChange);
+option->state.operator = ( QStyle::State_NoChange );
 } else {
-option->state.operator = (d->checked ? QStyle::State_On : QStyle::State_Off);
+option->state.operator = ( d->checked ? QStyle::State_On : QStyle::State_Off );
 }
 }
 /*!
 Updates the primitive as per new size.
 */
-void HbCheckBox::resizeEvent(QGraphicsSceneResizeEvent *event)
+void HbCheckBox::resizeEvent( QGraphicsSceneResizeEvent *event )
 {
-HbAbstractButton::resizeEvent(event);
+HbAbstractButton::resizeEvent( event );
 }
 /*!
 Overloaded hit detection to include touch area
 */
 bool HbCheckBox::hitButton( const QPointF &pos ) const
 {
 Q_D(const HbCheckBox);
-QRectF compRect = d->mTouchArea->boundingRect();
+QRectF compRect = d->mTouchArea->boundingRect( );
-compRect.translate(d->mTouchArea->pos());
+compRect.translate( d->mTouchArea->pos( ) );
-return compRect.contains(pos);
+return compRect.contains( pos );
 }
 /*!
 \reimp.
 */
 void HbCheckBox::checkStateSet( )
 {
 Q_D(HbCheckBox);
 d->mNoChange = false;
-Qt::CheckState state = checkState();
+Qt::CheckState state = checkState( );
-if (state != d->mPublishedState) {
+if ( state != d->mPublishedState ) {
 #ifdef HB_EFFECTS
-HbEffect::start(d->mIconItem, HB_CHECKBOX_TYPE, "pressed");
+HbEffect::start( d->mIconItem, HB_CHECKBOX_TYPE, "pressed" );
 #endif
 d->mPublishedState = state;
-emit stateChanged(state);
+emit stateChanged( state );
 }
 }
 /*!
 \reimp.
 */
 void HbCheckBox::nextCheckState( )
 {
-if( checkState() == Qt::PartiallyChecked ) {
+if( checkState( ) == Qt::PartiallyChecked ) {
-HbAbstractButton::nextCheckState();
+HbAbstractButton::nextCheckState( );
 }
-HbAbstractButton::nextCheckState();
+HbAbstractButton::nextCheckState( );
-HbCheckBox::checkStateSet();
+HbCheckBox::checkStateSet( );
 }
 #ifndef HB_GESTURE_FW
 /*!
 \reimp.
 */
-void HbCheckBox::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+void HbCheckBox::mouseReleaseEvent( QGraphicsSceneMouseEvent *event )
 {
-HbAbstractButton::mouseReleaseEvent(event);
+HbAbstractButton::mouseReleaseEvent( event );
 updatePrimitives();
 }
 /*!
 \reimp.
 */
-void HbCheckBox::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+void HbCheckBox::mouseMoveEvent( QGraphicsSceneMouseEvent *event )
 {
-Q_UNUSED(event);
+Q_UNUSED( event );
 // To show the tooltip on press,move outside and come back to same button.
 // check for hit pos
 bool hit = hitButton( event->pos( ) );
 if ( hit ) {
-HbToolTip::showText(toolTip(), this);
+HbToolTip::showText( toolTip(), this );
 }
 }
 #endif
 #ifdef HB_GESTURE_FW
-void HbCheckBox::gestureEvent(QGestureEvent *event)
+void HbCheckBox::gestureEvent( QGestureEvent *event )
 {
 HbAbstractButton::gestureEvent( event );
 }
 #endif
 /*!
 \reimp.
 */
 void HbCheckBox::keyPressEvent(QKeyEvent *keyEvent)
 {
-switch (keyEvent->key()) {
+switch ( keyEvent->key( ) ) {
 case Qt::Key_Select:
 case Qt::Key_Enter:
 case Qt::Key_Return:
-HbAbstractButton::keyPressEvent(keyEvent);
+HbAbstractButton::keyPressEvent( keyEvent );
 break;
 default:
-HbAbstractButton::keyPressEvent(keyEvent);
+HbAbstractButton::keyPressEvent( keyEvent );
 }
 }
 /*!
 \reimp
 */
-QVariant HbCheckBox::itemChange(GraphicsItemChange change, const QVariant &value)
+QVariant HbCheckBox::itemChange( GraphicsItemChange change, const QVariant &value )
 {
 switch ( change ) {
 case ItemEnabledHasChanged:
 case ItemVisibleChange: {
 updatePrimitives( );

changeset 2	06ff229162e9
parent 1	f7ac710697a9
child 7	923ff622b8b9