summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-03-03 22:59:27 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-04 10:17:32 +0100
commit96771618f2413de849101b15344e1bb1fd1f7e7f (patch)
tree58fd03d354f7e62fc5ceb008623390325af23d08
parent0a274451536078366d2b43b91f9566dc748521e7 (diff)
downloadqtsensors-96771618f2413de849101b15344e1bb1fd1f7e7f.tar.gz
qtsensors-96771618f2413de849101b15344e1bb1fd1f7e7f.tar.bz2
qtsensors-96771618f2413de849101b15344e1bb1fd1f7e7f.zip
Fix some typos in comments and documentation
Change-Id: I8541601c0bfe2b7c80e88b4617e8215b266fb0bd Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
-rw-r--r--examples/sensors/maze/LabyrinthSquare.qml2
-rw-r--r--examples/sensors/sensor_explorer/import/sensoritem.cpp6
-rw-r--r--src/imports/sensors/qmlsensorgesture.cpp4
-rw-r--r--src/plugins/sensors/blackberry/bbguihelper.cpp2
-rw-r--r--src/plugins/sensors/blackberry/bbsensorbackend.h4
-rw-r--r--src/plugins/sensors/blackberry/sensor.h2
-rw-r--r--src/plugins/sensors/generic/generictiltsensor.cpp2
-rw-r--r--src/sensors/doc/src/qtsensorgestures-plugins.qdoc2
8 files changed, 12 insertions, 12 deletions
diff --git a/examples/sensors/maze/LabyrinthSquare.qml b/examples/sensors/maze/LabyrinthSquare.qml
index 56b834a..9fa1909 100644
--- a/examples/sensors/maze/LabyrinthSquare.qml
+++ b/examples/sensors/maze/LabyrinthSquare.qml
@@ -55,7 +55,7 @@ Rectangle {
property int val: 0
property AnimatedImage picture: img
- //Dependend of its position and the labyrinth value a square can be the start, cheese, empty or a wall
+ //Dependent of its position and the labyrinth value a square can be the start, cheese, empty or a wall
AnimatedImage {
id: img
anchors.fill: parent
diff --git a/examples/sensors/sensor_explorer/import/sensoritem.cpp b/examples/sensors/sensor_explorer/import/sensoritem.cpp
index 1b14c6a..c207d93 100644
--- a/examples/sensors/sensor_explorer/import/sensoritem.cpp
+++ b/examples/sensors/sensor_explorer/import/sensoritem.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
/*
\class QSensorItem
- \brief The QSensorItem type provides information about the meta-datas from a sensors installed on the system.
+ \brief The QSensorItem type provides information about the metadata from a sensors installed on the system.
*/
/*
@@ -118,7 +118,7 @@ void QSensorItem::changePropertyValue(QPropertyInfo* property, const QString& va
}
/*
- Reading the meta-datas and activates the sensor.
+ Reading the metadata and activates the sensor.
*/
void QSensorItem::select()
{
@@ -255,7 +255,7 @@ bool QSensorItem::isWriteable(const QString& propertyname)
}
/*
- Convert the variant \a val dependend on the type \a type and returns the converted value as a QString
+ Convert the variant \a val dependent on the type \a type and returns the converted value as a QString
*/
QString QSensorItem::convertValue(const QString& type, const QVariant& val)
{
diff --git a/src/imports/sensors/qmlsensorgesture.cpp b/src/imports/sensors/qmlsensorgesture.cpp
index 29e220d..3771f6f 100644
--- a/src/imports/sensors/qmlsensorgesture.cpp
+++ b/src/imports/sensors/qmlsensorgesture.cpp
@@ -217,7 +217,7 @@ void QmlSensorGesture::setEnabled(bool value)
*/
/*
- private funtion implementation
+ private function implementation
*/
void QmlSensorGesture::deleteGesture()
{
@@ -256,7 +256,7 @@ void QmlSensorGesture::createGesture()
}
/*
- End of private funtion implementation
+ End of private function implementation
*/
QT_END_NAMESPACE
diff --git a/src/plugins/sensors/blackberry/bbguihelper.cpp b/src/plugins/sensors/blackberry/bbguihelper.cpp
index a0b2a38..8b8e84f 100644
--- a/src/plugins/sensors/blackberry/bbguihelper.cpp
+++ b/src/plugins/sensors/blackberry/bbguihelper.cpp
@@ -132,7 +132,7 @@ void BbGuiHelper::readApplicationActiveState()
void BbGuiHelper::readOrientation()
{
// There is no API to get the current orientation at the moment.
- // Therefore, we assume that the inital orientation that is set in the environment variable
+ // Therefore, we assume that the initial orientation that is set in the environment variable
// hasn't changed yet.
// This assumptions don't always hold, but it is the best we got so far.
// The navigator will at least inform us about updates.
diff --git a/src/plugins/sensors/blackberry/bbsensorbackend.h b/src/plugins/sensors/blackberry/bbsensorbackend.h
index 953d7bc..bd206e3 100644
--- a/src/plugins/sensors/blackberry/bbsensorbackend.h
+++ b/src/plugins/sensors/blackberry/bbsensorbackend.h
@@ -80,8 +80,8 @@ protected:
void setDevice(const QString &deviceFile, sensor_type_e sensorType);
- // This is called while the device file is open during initalization and gives a subclass
- // an opportunity to do additional initalization.
+ // This is called while the device file is open during initialization and gives a subclass
+ // an opportunity to do additional initialization.
virtual void additionalDeviceInit();
// If true is returned here, initSensorInfo() will read the output range from the OS sensor
diff --git a/src/plugins/sensors/blackberry/sensor.h b/src/plugins/sensors/blackberry/sensor.h
index 7317f07..2e97497 100644
--- a/src/plugins/sensors/blackberry/sensor.h
+++ b/src/plugins/sensors/blackberry/sensor.h
@@ -41,7 +41,7 @@
//
// This file is a copy of the "sensor.h" header for the BlackBerry Playbook OS.
-// It is only inclulded here, because it is not available in the the Playbook NDK.
+// It is only inclulded here, because it is not available in the Playbook NDK.
//
#if !defined(Q_OS_BLACKBERRY_TABLET)
#error "This file is supposed to be used only for BlackBerry Playbook OS."
diff --git a/src/plugins/sensors/generic/generictiltsensor.cpp b/src/plugins/sensors/generic/generictiltsensor.cpp
index 95c8525..ea85032 100644
--- a/src/plugins/sensors/generic/generictiltsensor.cpp
+++ b/src/plugins/sensors/generic/generictiltsensor.cpp
@@ -139,7 +139,7 @@ bool GenericTiltSensor::filter(QAccelerometerReading *reading)
#endif
qreal xrot = roll - calibratedRoll;
qreal yrot = pitch - calibratedPitch;
- //get angle beteen 0 and 180 or 0 -180
+ //get angle between 0 and 180 or 0 -180
qreal aG = 1 * sin(xrot);
qreal aK = 1 * cos(xrot);
xrot = qAtan2(aG, aK);
diff --git a/src/sensors/doc/src/qtsensorgestures-plugins.qdoc b/src/sensors/doc/src/qtsensorgestures-plugins.qdoc
index ffea177..a86335b 100644
--- a/src/sensors/doc/src/qtsensorgestures-plugins.qdoc
+++ b/src/sensors/doc/src/qtsensorgestures-plugins.qdoc
@@ -71,7 +71,7 @@ classes to subclass.
\section3 Recognizer Plugins
The Sensor Gesture Recognizers that come with Qt are made using an ad-hoc heuristic approach.
-The user cannot define their own gestures, and must learn how to perform and accomodate the
+The user cannot define their own gestures, and must learn how to perform and accommodate the
pre-defined gestures herein.
A developer may use any method, including computationally- and training-intensive well-