git.iko.soy/unity8
on xenial help sign in
More cleanups.
ab6fa7cPawel Stolowski
plugins/Unity/filter.cpp−1
compare with xenial
unifiedsplit
@@ -41,7 +41,6 @@ Filter::Filter(QObject *parent) :
41{
41{
42}
42}
43
43
44−
45QString Filter::id() const
44QString Filter::id() const
46{
45{
47 return QString::fromStdString(m_unityFilter->id());
46 return QString::fromStdString(m_unityFilter->id());
plugins/Unity/filteroption.h−11
@@ -31,11 +31,6 @@ class Q_DECL_EXPORT FilterOption : public AbstractFilterOption
31{
31{
32 Q_OBJECT
32 Q_OBJECT
33
33
34−// Q_PROPERTY(QString id READ id NOTIFY idChanged)
35−// Q_PROPERTY(QString name READ name NOTIFY nameChanged)
36−// Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
37−// Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
38−
39public:
34public:
40 explicit FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent = 0);
35 explicit FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent = 0);
41
36
@@ -48,12 +43,6 @@ public:
48 /* setters */
43 /* setters */
49 void setActive(bool active) override;
44 void setActive(bool active) override;
50
45
51−//Q_SIGNALS:
52−// void idChanged(std::string);
53−// void nameChanged(std::string);
54−// void iconHintChanged(std::string);
55−// void activeChanged(bool);
56−
57private:
46private:
58 void setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption);
47 void setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption);
59
48
plugins/Unity/multirangefilter.cpp+1−1
@@ -38,7 +38,7 @@ void MultiRangeFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
38 onOptionsChanged(m_unityMultiRangeFilter->options);
38 onOptionsChanged(m_unityMultiRangeFilter->options);
39}
39}
40
40
41−void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options options)
41+void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options /* options */)
42{
42{
43 if (m_options != NULL) {
43 if (m_options != NULL) {
44 // FIXME: should disconnect from m_unityFilter's signals
44 // FIXME: should disconnect from m_unityFilter's signals
plugins/Unity/ratingsfilter.h+1−1
@@ -30,7 +30,7 @@
30// Local
30// Local
31#include "filter.h"
31#include "filter.h"
32
32
33−class RatingsFilter : public Filter
33+class Q_DECL_EXPORT RatingsFilter : public Filter
34{
34{
35 Q_OBJECT
35 Q_OBJECT
36
36
tests/plugins/Unity/filtersbindingstest.cpp+8−1
@@ -243,6 +243,14 @@ void FiltersBindingsTest::testCheckOptionFilter()
243 auto options = check_filter->options();
243 auto options = check_filter->options();
244 QCOMPARE(options->rowCount(), 3);
244 QCOMPARE(options->rowCount(), 3);
245
245
246+ QCOMPARE(check_filter->id(), QString("f1"));
247+ QCOMPARE(check_filter->name(), QString("Filter1"));
248+ QCOMPARE(check_filter->iconHint(), QString(""));
249+ QCOMPARE(check_filter->rendererName(), QString("filter-checkoption"));
250+ QCOMPARE(check_filter->visible(), true);
251+ QCOMPARE(check_filter->collapsed(), false);
252+ QCOMPARE(check_filter->filtering(), false);
253+
246 QVariant optvar = options->data(options->index(0));
254 QVariant optvar = options->data(options->index(0));
247 FilterOption* opt0 = optvar.value<FilterOption*>();
255 FilterOption* opt0 = optvar.value<FilterOption*>();
248 QCOMPARE(opt0->id(), QString("opt0"));
256 QCOMPARE(opt0->id(), QString("opt0"));
@@ -340,7 +348,6 @@ void FiltersBindingsTest::testRadioOptionFilter()
340
348
341 delete radio_filter;
349 delete radio_filter;
342 }
350 }
343−
344}
351}
345
352
346QTEST_MAIN(FiltersBindingsTest)
353QTEST_MAIN(FiltersBindingsTest)