diff -r 16d8024aca5e -r f7ac710697a9 src/hbwidgets/editors/hbabstractedit.h --- a/src/hbwidgets/editors/hbabstractedit.h Mon Apr 19 14:02:13 2010 +0300 +++ b/src/hbwidgets/editors/hbabstractedit.h Mon May 03 12:48:33 2010 +0300 @@ -55,6 +55,7 @@ Q_PROPERTY(Hb::TextContextMenuFlags contextMenuFlags READ contextMenuFlags WRITE setContextMenuFlags) + Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText) public: virtual ~HbAbstractEdit(); @@ -74,7 +75,6 @@ QGraphicsItem *primitive(HbStyle::Primitive primitive) const; bool event(QEvent* event); - bool eventFilter(QObject *obj, QEvent *event); enum { Type = Hb::ItemType_AbstractEdit }; int type() const; @@ -87,6 +87,9 @@ void setContextMenuFlag(Hb::TextContextMenuFlag flag); void clearContextMenuFlag(Hb::TextContextMenuFlag flag); + QString placeholderText() const; + void setPlaceholderText(const QString &text); + QString anchorAt(const QPointF &pos) const; QString anchorAt(int pos) const; @@ -133,10 +136,6 @@ void keyPressEvent(QKeyEvent *event); void keyReleaseEvent(QKeyEvent *event); - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void focusInEvent(QFocusEvent *event); void focusOutEvent(QFocusEvent *event); @@ -173,6 +172,7 @@ void polish( HbStyleParameters& params ); QVariant itemChange(GraphicsItemChange change, const QVariant &value); + void gestureEvent(QGestureEvent* e); protected slots: void setPlainText(const QString &text); @@ -193,6 +193,9 @@ Q_PRIVATE_SLOT(d_func(), void _q_contentsChanged()) Q_PRIVATE_SLOT(d_func(), void _q_contentsChange(int, int, int)) Q_PRIVATE_SLOT(d_func(), void _q_selectionChanged()) + Q_PRIVATE_SLOT(d_func(), void _q_scrollStarted()) + Q_PRIVATE_SLOT(d_func(), void _q_scrollEnded()) + friend class HbEditItem; friend class HbEditorFocusObject;