summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorLeonardo Sobral Cunha <leo.cunha@nokia.com>2010-04-19 07:12:03 (GMT)
committerLeonardo Sobral Cunha <leo.cunha@nokia.com>2010-04-19 07:13:46 (GMT)
commit9b4df240c1007040f4be7bccb952fb422eaf34f5 (patch)
tree65717e6837ce45669787bc44de9337d7c066f756 /src/declarative
parent58bf0fc6b1f1815c4f22762c39c4374fd17beb4e (diff)
downloadQt-9b4df240c1007040f4be7bccb952fb422eaf34f5.zip
Qt-9b4df240c1007040f4be7bccb952fb422eaf34f5.tar.gz
Qt-9b4df240c1007040f4be7bccb952fb422eaf34f5.tar.bz2
Renamed mousePosChanged signal to mousePositionChanged
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea.cpp6
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea_p.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index 52dbc42..bdb4868 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -466,7 +466,7 @@ void QDeclarativeMouseArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
d->moved = true;
}
QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, d->longPress);
- emit mousePosChanged(&me);
+ emit mousePositionChanged(&me);
me.setX(d->lastPos.x());
me.setY(d->lastPos.y());
emit positionChanged(&me);
@@ -521,7 +521,7 @@ void QDeclarativeMouseArea::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
} else {
d->lastPos = event->pos();
QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, d->lastButtons, d->lastModifiers, false, d->longPress);
- emit mousePosChanged(&me);
+ emit mousePositionChanged(&me);
me.setX(d->lastPos.x());
me.setY(d->lastPos.y());
emit positionChanged(&me);
@@ -668,7 +668,7 @@ bool QDeclarativeMouseArea::setPressed(bool p)
emit pressed(&me);
me.setX(d->lastPos.x());
me.setY(d->lastPos.y());
- emit mousePosChanged(&me);
+ emit mousePositionChanged(&me);
} else {
emit released(&me);
me.setX(d->lastPos.x());
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
index cfd5fc7..630840f 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea_p.h
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
@@ -108,8 +108,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeMouseArea : public QDeclarativeItem
{
Q_OBJECT
- Q_PROPERTY(qreal mouseX READ mouseX NOTIFY mousePosChanged)
- Q_PROPERTY(qreal mouseY READ mouseY NOTIFY mousePosChanged)
+ Q_PROPERTY(qreal mouseX READ mouseX NOTIFY mousePositionChanged)
+ Q_PROPERTY(qreal mouseY READ mouseY NOTIFY mousePositionChanged)
Q_PROPERTY(bool containsMouse READ hovered NOTIFY hoveredChanged)
Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
@@ -144,7 +144,7 @@ Q_SIGNALS:
void enabledChanged();
void acceptedButtonsChanged();
void positionChanged(QDeclarativeMouseEvent *mouse);
- void mousePosChanged(QDeclarativeMouseEvent *mouse);
+ void mousePositionChanged(QDeclarativeMouseEvent *mouse);
void pressed(QDeclarativeMouseEvent *mouse);
void pressAndHold(QDeclarativeMouseEvent *mouse);