@@ -41,7 +41,7 @@ DirectionalDragArea::DirectionalDragArea(QQuickItem *parent)
4141 : QQuickItem(parent)
4242 , m_status(WaitingForTouch)
4343 , m_touchId(-1)
44− , m_direction(DirectionalDragArea::Rightwards)
44+ , m_direction(Direction::Rightwards)
4545 , m_wideningAngle(0)
4646 , m_wideningFactor(0)
4747 , m_distanceThreshold(0)
@@ -58,12 +58,12 @@ DirectionalDragArea::DirectionalDragArea(QQuickItem *parent)
5858 m_velocityCalculator = new AxisVelocityCalculator(this);
5959}
6060
61−DirectionalDragArea::Direction DirectionalDragArea::direction() const
61+Direction::Type DirectionalDragArea::direction() const
6262{
6363 return m_direction;
6464}
6565
66−void DirectionalDragArea::setDirection(DirectionalDragArea::Direction direction)
66+void DirectionalDragArea::setDirection(Direction::Type direction)
6767{
6868 if (direction != m_direction) {
6969 m_direction = direction;
@@ -151,7 +151,7 @@ void DirectionalDragArea::setAxisVelocityCalculator(AxisVelocityCalculator *newV
151151
152152qreal DirectionalDragArea::distance() const
153153{
154− if (directionIsHorizontal()) {
154+ if (Direction::isHorizontal(m_direction)) {
155155 return m_previousPos.x() - m_startPos.x();
156156 } else {
157157 return m_previousPos.y() - m_startPos.y();
@@ -286,13 +286,13 @@ bool DirectionalDragArea::pointInsideAllowedArea() const
286286 qreal dY = m_dampedPos.y() - m_startPos.y();
287287
288288 switch (m_direction) {
289− case Upwards:
289+ case Direction::Upwards:
290290 return dY <= 0 && qFabs(dX) <= qFabs(dY) * m_wideningFactor;
291− case Downwards:
291+ case Direction::Downwards:
292292 return dY >= 0 && qFabs(dX) <= dY * m_wideningFactor;
293− case Leftwards:
293+ case Direction::Leftwards:
294294 return dX <= 0 && qFabs(dY) <= qFabs(dX) * m_wideningFactor;
295− default: // Rightwards:
295+ default: // Direction::Rightwards:
296296 return dX >= 0 && qFabs(dY) <= dX * m_wideningFactor;
297297 }
298298}
@@ -300,20 +300,20 @@ bool DirectionalDragArea::pointInsideAllowedArea() const
300300bool DirectionalDragArea::movingInRightDirection() const
301301{
302302 switch (m_direction) {
303− case Upwards:
303+ case Direction::Upwards:
304304 return m_dampedPos.y() <= m_previousDampedPos.y();
305− case Downwards:
305+ case Direction::Downwards:
306306 return m_dampedPos.y() >= m_previousDampedPos.y();
307− case Leftwards:
307+ case Direction::Leftwards:
308308 return m_dampedPos.x() <= m_previousDampedPos.x();
309− default: // Rightwards:
309+ default: // Direction::Rightwards:
310310 return m_dampedPos.x() >= m_previousDampedPos.x();
311311 }
312312}
313313
314314bool DirectionalDragArea::movedFarEnough(const QPointF &point) const
315315{
316− if (directionIsHorizontal())
316+ if (Direction::isHorizontal(m_direction))
317317 return qFabs(point.x() - m_startPos.x()) > m_distanceThreshold;
318318 else
319319 return qFabs(point.y() - m_startPos.y()) > m_distanceThreshold;
@@ -386,35 +386,25 @@ void DirectionalDragArea::setPreviousPos(QPointF point)
386386
387387 if (xChanged) {
388388 Q_EMIT touchXChanged(point.x());
389− if (directionIsHorizontal())
389+ if (Direction::isHorizontal(m_direction))
390390 Q_EMIT distanceChanged(distance());
391391 }
392392
393393 if (yChanged) {
394394 Q_EMIT touchYChanged(point.y());
395− if (directionIsVertical())
395+ if (Direction::isVertical(m_direction))
396396 Q_EMIT distanceChanged(distance());
397397 }
398398}
399399
400400void DirectionalDragArea::updateVelocityCalculator(QPointF point)
401401{
402− if (directionIsHorizontal()) {
402+ if (Direction::isHorizontal(m_direction)) {
403403 m_velocityCalculator->setTrackedPosition(point.x());
404404 } else {
405405 m_velocityCalculator->setTrackedPosition(point.y());
406406 }
407407}
408408
409−bool DirectionalDragArea::directionIsHorizontal() const
410−{
411− return m_direction == Leftwards || m_direction == Rightwards;
412−}
413−
414−bool DirectionalDragArea::directionIsVertical() const
415−{
416− return m_direction == Upwards || m_direction == Downwards;
417−}
418−
419409// Because we are defining a new QObject-based class (RecognitionTimer) here.
420410#include "DirectionalDragArea.moc"