summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-09-07 19:23:26 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-09-07 19:25:48 (GMT)
commit0cbbc9cb9e87a3a39ee1597f4cea1c2b77d8f8da (patch)
tree1e88ece8232c90bac6a557e559a08d2e06d1c614 /src/gui
parent166f16d42b33048bc379ea5f67aab05e58e95538 (diff)
downloadQt-0cbbc9cb9e87a3a39ee1597f4cea1c2b77d8f8da.zip
Qt-0cbbc9cb9e87a3a39ee1597f4cea1c2b77d8f8da.tar.gz
Qt-0cbbc9cb9e87a3a39ee1597f4cea1c2b77d8f8da.tar.bz2
Fixed the spelling of canceled in the QGesture api brought up by David Boddie.
Reviewed-by: trustme
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qgesture.cpp10
-rw-r--r--src/gui/kernel/qgesture.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp
index 7831893..32502db 100644
--- a/src/gui/kernel/qgesture.cpp
+++ b/src/gui/kernel/qgesture.cpp
@@ -131,9 +131,9 @@ private:
about the gesture is contained in the signal sender object.
*/
-/*! \fn void QGesture::cancelled()
+/*! \fn void QGesture::canceled()
- The signal is emitted when the gesture is cancelled, for example the
+ The signal is emitted when the gesture is canceled, for example the
reset() function is called while the gesture was in the process of
emitting a triggered() signal. Extended information about the
gesture is contained in the sender object.
@@ -230,7 +230,7 @@ Qt::GestureState QGesture::state() const
\a state, and it should be called after all the internal properties have been
initialized.
- \sa started(), triggered(), finished(), cancelled()
+ \sa started(), triggered(), finished(), canceled()
*/
void QGesture::updateState(Qt::GestureState state)
{
@@ -258,7 +258,7 @@ void QGesture::updateState(Qt::GestureState state)
else if (state == Qt::GestureFinished)
emit finished();
else if (state == Qt::NoGesture)
- emit cancelled();
+ emit canceled();
if (state == Qt::GestureFinished) {
// gesture is finished, so we reset the internal state.
@@ -301,7 +301,7 @@ QGraphicsItem* QGesture::graphicsItem() const
Resets the internal state of the gesture. This function might be called by
the filterEvent() implementation in a derived class, or by the user to
cancel a gesture. The base class implementation calls
- updateState(Qt::NoGesture) which emits the cancelled()
+ updateState(Qt::NoGesture) which emits the canceled()
signal if the state() of the gesture indicated it was active.
*/
void QGesture::reset()
diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h
index ee6f8b3..23c64b2 100644
--- a/src/gui/kernel/qgesture.h
+++ b/src/gui/kernel/qgesture.h
@@ -90,7 +90,7 @@ Q_SIGNALS:
void started();
void triggered();
void finished();
- void cancelled();
+ void canceled();
private:
friend class QWidget;