066c2a2 · unity8 · git.iko.soy

git.iko.soy/unity8

Adapt to new API

commit066c2a2aa09972500d3219f0a7c5afcdf5fc3405 authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 9 Dec 2015, 12:35 (11 years ago) parent622592a

5 files changed+17−17

compare with xenial

unifiedsplit

tests/mocks/Unity/fake_filters.cpp+1−1 tests/mocks/Unity/fake_valuesliderfilter.cpp+5−5 tests/mocks/Unity/fake_valuesliderfilter.h+8−8 tests/mocks/Unity/fake_valueslidervalues.cpp+1−1 tests/mocks/Unity/fake_valueslidervalues.h+2−2

tests/mocks/Unity/fake_filters.cpp+1−1

@@ -33,7 +33,7 @@ Filters::Filters(Scope* parent)

3333 rif->setEndPostfixLabel("m");

3434 addFilter(rif);

3535

36− QMap<int, QString> labels;

36+ QMap<double, QString> labels;

3737 labels[15] = "Default";

3838 labels[50] = "50";

3939 labels[100] = "100";

tests/mocks/Unity/fake_valuesliderfilter.cpp+5−5

@@ -17,7 +17,7 @@

1717#include "fake_valuesliderfilter.h"

1818#include "fake_valueslidervalues.h"

1919

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)

2121 : unity::shell::scopes::ValueSliderFilterInterface(parent),

2222 m_filterId(id),

2323 m_filterTag(tag),

@@ -43,12 +43,12 @@ QString FakeValueSliderFilter::title() const

4343 return m_title;

4444}

4545

46−int FakeValueSliderFilter::value() const

46+double FakeValueSliderFilter::value() const

4747{

4848 return m_value;

4949}

5050

51−void FakeValueSliderFilter::setValue(int value)

51+void FakeValueSliderFilter::setValue(double value)

5252{

5353 if (value != m_value) {

5454 m_value = value;

@@ -56,12 +56,12 @@ void FakeValueSliderFilter::setValue(int value)

5656 }

5757}

5858

59−int FakeValueSliderFilter::minValue() const

59+double FakeValueSliderFilter::minValue() const

6060{

6161 return m_minValue;

6262}

6363

64−int FakeValueSliderFilter::maxValue() const

64+double FakeValueSliderFilter::maxValue() const

6565{

6666 return m_maxValue;

6767}

tests/mocks/Unity/fake_valuesliderfilter.h+8−8

@@ -24,16 +24,16 @@ class FakeValueSliderFilter : public unity::shell::scopes::ValueSliderFilterInte

2424 Q_OBJECT

2525

2626public:

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);

2828

2929 QString filterId() const override;

3030 QString filterTag() const override;

3131 QString title() const override;

3232

33− int value() const override;

34− void setValue(int value) override;

35− int minValue() const override;

36− int maxValue() const override;

33+ double value() const override;

34+ void setValue(double value) override;

35+ double minValue() const override;

36+ double maxValue() const override;

3737 unity::shell::scopes::ValueSliderValuesInterface* values() const override;

3838

3939 // Not part of the iface, for mock/testing purposes

@@ -46,9 +46,9 @@ private:

4646 QString m_filterTag;

4747 QString m_title;

4848

49− int m_value;

50− int m_minValue;

51− int m_maxValue;

49+ double m_value;

50+ double m_minValue;

51+ double m_maxValue;

5252 unity::shell::scopes::ValueSliderValuesInterface *m_values;

5353};

5454

tests/mocks/Unity/fake_valueslidervalues.cpp+1−1

@@ -16,7 +16,7 @@

1616

1717#include "fake_valueslidervalues.h"

1818

19−FakeValueSliderValues::FakeValueSliderValues(const QMap<int, QString> &labels, QObject* parent)

19+FakeValueSliderValues::FakeValueSliderValues(const QMap<double, QString> &labels, QObject* parent)

2020 : unity::shell::scopes::ValueSliderValuesInterface(parent)

2121 , m_labels(labels)

2222{

tests/mocks/Unity/fake_valueslidervalues.h+2−2

@@ -24,13 +24,13 @@ class FakeValueSliderValues : public unity::shell::scopes::ValueSliderValuesInte

2424 Q_OBJECT

2525

2626public:

27− FakeValueSliderValues(const QMap<int, QString> &labels, QObject* parent);

27+ FakeValueSliderValues(const QMap<double, QString> &labels, QObject* parent);

2828

2929 int rowCount(const QModelIndex &parent) const override;

3030 QVariant data(const QModelIndex &index, int role) const override;

3131

3232private:

33− const QMap<int, QString> m_labels;

33+ const QMap<double, QString> m_labels;

3434};

3535

3636#endif