git.iko.soy/unity8
on xenial help sign in
Pass SharedTimeSource by const reference instead of by value
ed2e6b1Daniel d'Andrada
plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp+2−2
compare with xenial
unifiedsplit
@@ -28,7 +28,7 @@ AxisVelocityCalculator::AxisVelocityCalculator(QObject *parent)
28{
28{
29}
29}
30
30
31−AxisVelocityCalculator::AxisVelocityCalculator(SharedTimeSource timeSource,
31+AxisVelocityCalculator::AxisVelocityCalculator(const SharedTimeSource &timeSource,
32 QObject *parent)
32 QObject *parent)
33 : QObject(parent)
33 : QObject(parent)
34 , m_timeSource(timeSource)
34 , m_timeSource(timeSource)
@@ -136,7 +136,7 @@ int AxisVelocityCalculator::numSamples() const
136 }
136 }
137}
137}
138
138
139−void AxisVelocityCalculator::setTimeSource(SharedTimeSource timeSource)
139+void AxisVelocityCalculator::setTimeSource(const SharedTimeSource &timeSource)
140{
140{
141 m_timeSource = timeSource;
141 m_timeSource = timeSource;
142
142
plugins/Ubuntu/Gestures/AxisVelocityCalculator.h+2−2
@@ -68,7 +68,7 @@ public:
68 /*
68 /*
69 Constructor that takes a TimeSource
69 Constructor that takes a TimeSource
70 */
70 */
71− AxisVelocityCalculator(UbuntuGestures::SharedTimeSource timeSource, QObject *parent = 0);
71+ AxisVelocityCalculator(const UbuntuGestures::SharedTimeSource &timeSource, QObject *parent = 0);
72
72
73 virtual ~AxisVelocityCalculator();
73 virtual ~AxisVelocityCalculator();
74
74
@@ -90,7 +90,7 @@ public:
90 /*
90 /*
91 Replaces the TimeSource with the given one. Useful for testing purposes.
91 Replaces the TimeSource with the given one. Useful for testing purposes.
92 */
92 */
93− void setTimeSource(UbuntuGestures::SharedTimeSource timeSource);
93+ void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);
94
94
95 /*
95 /*
96 The minimum amount of samples needed for a velocity calculation.
96 The minimum amount of samples needed for a velocity calculation.
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+2−2
@@ -221,7 +221,7 @@ void DirectionalDragArea::setRecognitionTimer(UbuntuGestures::AbstractTimer *tim
221 }
221 }
222}
222}
223
223
224−void DirectionalDragArea::setTimeSource(UbuntuGestures::SharedTimeSource timeSource)
224+void DirectionalDragArea::setTimeSource(const SharedTimeSource &timeSource)
225{
225{
226 m_timeSource = timeSource;
226 m_timeSource = timeSource;
227 m_velocityCalculator->setTimeSource(timeSource);
227 m_velocityCalculator->setTimeSource(timeSource);
@@ -601,7 +601,7 @@ bool DirectionalDragArea::isWithinTouchCompositionWindow()
601
601
602//************************** ActiveTouchesInfo **************************
602//************************** ActiveTouchesInfo **************************
603
603
604−DirectionalDragArea::ActiveTouchesInfo::ActiveTouchesInfo(UbuntuGestures::SharedTimeSource timeSource)
604+DirectionalDragArea::ActiveTouchesInfo::ActiveTouchesInfo(const SharedTimeSource &timeSource)
605 : m_timeSource(timeSource)
605 : m_timeSource(timeSource)
606{
606{
607 // Estimate of the maximum number of active touches we might reach.
607 // Estimate of the maximum number of active touches we might reach.
plugins/Ubuntu/Gestures/DirectionalDragArea.h+2−2
@@ -193,7 +193,7 @@ public:
193 void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
193 void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
194
194
195 // Useful for testing, where a fake time source can be supplied
195 // Useful for testing, where a fake time source can be supplied
196− void setTimeSource(UbuntuGestures::SharedTimeSource timeSource);
196+ void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);
197
197
198Q_SIGNALS:
198Q_SIGNALS:
199 void directionChanged(Direction::Type direction);
199 void directionChanged(Direction::Type direction);
@@ -268,7 +268,7 @@ private:
268 };
268 };
269 class ActiveTouchesInfo : public QVector<struct ActiveTouchInfo> {
269 class ActiveTouchesInfo : public QVector<struct ActiveTouchInfo> {
270 public:
270 public:
271− ActiveTouchesInfo(UbuntuGestures::SharedTimeSource timeSource);
271+ ActiveTouchesInfo(const UbuntuGestures::SharedTimeSource &timeSource);
272 void update(QTouchEvent *event);
272 void update(QTouchEvent *event);
273 ActiveTouchInfo &touchInfo(int id);
273 ActiveTouchInfo &touchInfo(int id);
274 qint64 mostRecentStartTime();
274 qint64 mostRecentStartTime();
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+1−1
@@ -29,7 +29,7 @@ class FakeTimer : public AbstractTimer
29{
29{
30 Q_OBJECT
30 Q_OBJECT
31public:
31public:
32− FakeTimer(SharedTimeSource timeSource, QObject *parent = 0)
32+ FakeTimer(const SharedTimeSource &timeSource, QObject *parent = 0)
33 : UbuntuGestures::AbstractTimer(parent),
33 : UbuntuGestures::AbstractTimer(parent),
34 m_timeSource(timeSource)
34 m_timeSource(timeSource)
35 {}
35 {}