git.iko.soy/unity8
on xenial help sign in
Adapt to new API
066c2a2Albert Astals Cid
tests/mocks/Unity/fake_filters.cpp+1−1
compare with xenial
unifiedsplit
@@ -33,7 +33,7 @@ Filters::Filters(Scope* parent)
33 rif->setEndPostfixLabel("m");
33 rif->setEndPostfixLabel("m");
34 addFilter(rif);
34 addFilter(rif);
35
35
36− QMap<int, QString> labels;
36+ QMap<double, QString> labels;
37 labels[15] = "Default";
37 labels[15] = "Default";
38 labels[50] = "50";
38 labels[50] = "50";
39 labels[100] = "100";
39 labels[100] = "100";
tests/mocks/Unity/fake_valuesliderfilter.cpp+5−5
@@ -17,7 +17,7 @@
17#include "fake_valuesliderfilter.h"
17#include "fake_valuesliderfilter.h"
18#include "fake_valueslidervalues.h"
18#include "fake_valueslidervalues.h"
19
19
20−FakeValueSliderFilter::FakeValueSliderFilter(const QString &id, const QString &tag, int value, int minValue, int maxValue, const QMap<int, QString> &labels, QObject* parent)
20+FakeValueSliderFilter::FakeValueSliderFilter(const QString &id, const QString &tag, double value, double minValue, double maxValue, const QMap<double, QString> &labels, QObject* parent)
21 : unity::shell::scopes::ValueSliderFilterInterface(parent),
21 : unity::shell::scopes::ValueSliderFilterInterface(parent),
22 m_filterId(id),
22 m_filterId(id),
23 m_filterTag(tag),
23 m_filterTag(tag),
@@ -43,12 +43,12 @@ QString FakeValueSliderFilter::title() const
43 return m_title;
43 return m_title;
44}
44}
45
45
46−int FakeValueSliderFilter::value() const
46+double FakeValueSliderFilter::value() const
47{
47{
48 return m_value;
48 return m_value;
49}
49}
50
50
51−void FakeValueSliderFilter::setValue(int value)
51+void FakeValueSliderFilter::setValue(double value)
52{
52{
53 if (value != m_value) {
53 if (value != m_value) {
54 m_value = value;
54 m_value = value;
@@ -56,12 +56,12 @@ void FakeValueSliderFilter::setValue(int value)
56 }
56 }
57}
57}
58
58
59−int FakeValueSliderFilter::minValue() const
59+double FakeValueSliderFilter::minValue() const
60{
60{
61 return m_minValue;
61 return m_minValue;
62}
62}
63
63
64−int FakeValueSliderFilter::maxValue() const
64+double FakeValueSliderFilter::maxValue() const
65{
65{
66 return m_maxValue;
66 return m_maxValue;
67}
67}
tests/mocks/Unity/fake_valuesliderfilter.h+8−8
@@ -24,16 +24,16 @@ class FakeValueSliderFilter : public unity::shell::scopes::ValueSliderFilterInte
24 Q_OBJECT
24 Q_OBJECT
25
25
26public:
26public:
27− FakeValueSliderFilter(const QString &id, const QString &tag, int value, int minValue, int maxValue, const QMap<int, QString> &labels, QObject* parent);
27+ FakeValueSliderFilter(const QString &id, const QString &tag, double value, double minValue, double maxValue, const QMap<double, QString> &labels, QObject* parent);
28
28
29 QString filterId() const override;
29 QString filterId() const override;
30 QString filterTag() const override;
30 QString filterTag() const override;
31 QString title() const override;
31 QString title() const override;
32
32
33− int value() const override;
33+ double value() const override;
34− void setValue(int value) override;
34+ void setValue(double value) override;
35− int minValue() const override;
35+ double minValue() const override;
36− int maxValue() const override;
36+ double maxValue() const override;
37 unity::shell::scopes::ValueSliderValuesInterface* values() const override;
37 unity::shell::scopes::ValueSliderValuesInterface* values() const override;
38
38
39 // Not part of the iface, for mock/testing purposes
39 // Not part of the iface, for mock/testing purposes
@@ -46,9 +46,9 @@ private:
46 QString m_filterTag;
46 QString m_filterTag;
47 QString m_title;
47 QString m_title;
48
48
49− int m_value;
49+ double m_value;
50− int m_minValue;
50+ double m_minValue;
51− int m_maxValue;
51+ double m_maxValue;
52 unity::shell::scopes::ValueSliderValuesInterface *m_values;
52 unity::shell::scopes::ValueSliderValuesInterface *m_values;
53};
53};
54
54
tests/mocks/Unity/fake_valueslidervalues.cpp+1−1
@@ -16,7 +16,7 @@
16
16
17#include "fake_valueslidervalues.h"
17#include "fake_valueslidervalues.h"
18
18
19−FakeValueSliderValues::FakeValueSliderValues(const QMap<int, QString> &labels, QObject* parent)
19+FakeValueSliderValues::FakeValueSliderValues(const QMap<double, QString> &labels, QObject* parent)
20 : unity::shell::scopes::ValueSliderValuesInterface(parent)
20 : unity::shell::scopes::ValueSliderValuesInterface(parent)
21 , m_labels(labels)
21 , m_labels(labels)
22{
22{
tests/mocks/Unity/fake_valueslidervalues.h+2−2
@@ -24,13 +24,13 @@ class FakeValueSliderValues : public unity::shell::scopes::ValueSliderValuesInte
24 Q_OBJECT
24 Q_OBJECT
25
25
26public:
26public:
27− FakeValueSliderValues(const QMap<int, QString> &labels, QObject* parent);
27+ FakeValueSliderValues(const QMap<double, QString> &labels, QObject* parent);
28
28
29 int rowCount(const QModelIndex &parent) const override;
29 int rowCount(const QModelIndex &parent) const override;
30 QVariant data(const QModelIndex &index, int role) const override;
30 QVariant data(const QModelIndex &index, int role) const override;
31
31
32private:
32private:
33− const QMap<int, QString> m_labels;
33+ const QMap<double, QString> m_labels;
34};
34};
35
35
36#endif
36#endif