diff -r 730c025d4b77 -r f378acbc9cfb src/hbwidgets/widgets/hbcombobox.h --- a/src/hbwidgets/widgets/hbcombobox.h Thu Jul 15 14:03:49 2010 +0100 +++ b/src/hbwidgets/widgets/hbcombobox.h Thu Jul 22 16:36:53 2010 +0100 @@ -57,21 +57,22 @@ explicit HbComboBox( QGraphicsItem *parent = 0 ); virtual ~HbComboBox( ); - enum { Type = Hb::ItemType_ComboBox }; - int type( ) const { return Type; } + enum { + Type = Hb::ItemType_ComboBox + }; + int type( ) const { + return Type; + } void addItem( const QString &text, const QVariant &userData = QVariant() ); - void addItem( const HbIcon &icon, - const QString &text, - const QVariant &userData = QVariant( ) ); + void addItem( const HbIcon &icon, const QString &text, + const QVariant &userData = QVariant( ) ); void addItems( const QStringList &texts ); void insertItem( int index, const QString &text, const QVariant &userData = QVariant() ); - void insertItem( int index, - const HbIcon &icon, - const QString &text, - const QVariant & userData = QVariant( ) ); + void insertItem( int index, const HbIcon &icon, const QString &text, + const QVariant & userData = QVariant( ) ); void insertItems( int index, const QStringList &texts ); int count( ) const; @@ -84,10 +85,10 @@ void setItemText( int index, const QString &text ); QString itemText( int index ) const; - + void setModel( QAbstractItemModel *model ); QAbstractItemModel *model( ) const; - + void setEditable( bool editable ); bool isEditable( ) const; @@ -96,17 +97,18 @@ void setValidator( HbValidator *validator ); const HbValidator *validator( ) const; - + QString currentText( ) const; - + int currentIndex( ) const; - + void removeItem( int index ); inline int findText( const QString &text, - Qt::MatchFlags flags = Qt::MatchExactly|Qt::MatchCaseSensitive ) const - { return findData( text, Qt::DisplayRole, flags ); } - + Qt::MatchFlags flags = Qt::MatchExactly|Qt::MatchCaseSensitive ) const { + return findData( text, Qt::DisplayRole, flags ); + } + int findData( const QVariant &data, int role = Qt::UserRole, Qt::MatchFlags flags = Qt::MatchExactly|Qt::MatchCaseSensitive ) const; @@ -118,11 +120,12 @@ void clearEditText( ); void setCurrentIndex( int index ); void setEditText( const QString &text ); - + signals: void currentIndexChanged( int index ); void currentIndexChanged( const QString &text ); void editTextChanged( const QString &text ); + void editingFinished( ); protected: HbComboBox( HbComboBoxPrivate &dd, QGraphicsItem *parent = 0 ); @@ -132,6 +135,8 @@ void keyReleaseEvent( QKeyEvent *event ); void changeEvent( QEvent *event ); bool eventFilter( QObject *obj, QEvent *event ); + QVariant itemChange ( GraphicsItemChange change, const QVariant & value ); + void gestureEvent( QGestureEvent *event ); private: Q_DECLARE_PRIVATE_D( d_ptr, HbComboBox )