summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@nokia.com>2011-11-03 16:31:44 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-03 09:00:30 +0100
commitfaa2952df2cad6ad5885d955319f278bec27f06f (patch)
tree68bc75b0d3099e77aeee9443d6b22761bb45ec39 /src
parent9442cf7a41db9fb7a2c8381dc65cf27eb69d67d1 (diff)
add invalidIds, remove redundant isValid, rename availableIds to validIds
Change-Id: I9677535dde72e771b943fa1b0522689c34336824 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/sensors/gestures/qsensorgesture.cpp13
-rw-r--r--src/sensors/gestures/qsensorgesture.h6
-rw-r--r--src/sensors/gestures/qsensorgesture_p.h1
3 files changed, 11 insertions, 9 deletions
diff --git a/src/sensors/gestures/qsensorgesture.cpp b/src/sensors/gestures/qsensorgesture.cpp
index f84ce18b..228ee461 100644
--- a/src/sensors/gestures/qsensorgesture.cpp
+++ b/src/sensors/gestures/qsensorgesture.cpp
@@ -88,6 +88,7 @@ QSensorGesture::QSensorGesture(const QStringList &ids, QObject *parent) :
d_ptr->m_sensorRecognizers.append(rec);
d_ptr->availableIds.append(id);
} else {
+ d_ptr->invalidIds.append(id);
//add to not available things
}
}
@@ -125,19 +126,19 @@ QSensorGesture::~QSensorGesture()
}
/*!
- Returns whether this QSensorGesture is valid or not.
+ Returns the gesture recognizer ids that were found.
*/
-bool QSensorGesture::isValid() const
+QStringList QSensorGesture::validIds() const
{
- return d_ptr->valid;
+ return d_ptr->availableIds;
}
/*!
- Returns the gestures ids.
+ Returns the gesture recognizer ids that were not found.
*/
-QStringList QSensorGesture::availableIds() const
+QStringList QSensorGesture::invalidIds() const
{
- return d_ptr->availableIds;
+ return d_ptr->invalidIds;
}
/*!
diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h
index 0abd5a22..66d1d749 100644
--- a/src/sensors/gestures/qsensorgesture.h
+++ b/src/sensors/gestures/qsensorgesture.h
@@ -65,14 +65,14 @@ public:
bool isActive();
- QStringList availableIds() const;
+ QStringList validIds() const;
+ QStringList invalidIds() const;
+
QStringList gestureSignals() const;
void startDetection();
void stopDetection();
- bool isValid() const;
-
private:
QSensorGesturePrivate * d_ptr;
diff --git a/src/sensors/gestures/qsensorgesture_p.h b/src/sensors/gestures/qsensorgesture_p.h
index 10faa95a..f55f393a 100644
--- a/src/sensors/gestures/qsensorgesture_p.h
+++ b/src/sensors/gestures/qsensorgesture_p.h
@@ -76,6 +76,7 @@ public:
bool isActive;
QStringList localGestureSignals;
QStringList availableIds;
+ QStringList invalidIds;
bool valid;
};