git.iko.soy/unity8
on xenial help sign in
More cleanups.
commitab6fa7c84ceb7722cdedeb59d6e0a56bab8ce524 authorPawel Stolowski <pawel.stolowski@canonical.com> dateTue 9 Jul 2013, 11:45 (13 years ago) parentec6ad0c
5 files changed+10−15
compare with xenial
unifiedsplit
plugins/Unity/filter.cpp−1 plugins/Unity/filteroption.h−11 plugins/Unity/multirangefilter.cpp+1−1 plugins/Unity/ratingsfilter.h+1−1 tests/plugins/Unity/filtersbindingstest.cpp+8−1
plugins/Unity/filter.cpp−1
@@ -41,7 +41,6 @@ Filter::Filter(QObject *parent) :
4141{
4242}
4343
44−
4544QString Filter::id() const
4645{
4746 return QString::fromStdString(m_unityFilter->id());
plugins/Unity/filteroption.h−11
@@ -31,11 +31,6 @@ class Q_DECL_EXPORT FilterOption : public AbstractFilterOption
3131{
3232 Q_OBJECT
3333
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−
3934public:
4035 explicit FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent = 0);
4136
@@ -48,12 +43,6 @@ public:
4843 /* setters */
4944 void setActive(bool active) override;
5045
51−//Q_SIGNALS:
52−// void idChanged(std::string);
53−// void nameChanged(std::string);
54−// void iconHintChanged(std::string);
55−// void activeChanged(bool);
56−
5746private:
5847 void setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption);
5948
plugins/Unity/multirangefilter.cpp+1−1
@@ -38,7 +38,7 @@ void MultiRangeFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
3838 onOptionsChanged(m_unityMultiRangeFilter->options);
3939}
4040
41−void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options options)
41+void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options /* options */)
4242{
4343 if (m_options != NULL) {
4444 // FIXME: should disconnect from m_unityFilter's signals
plugins/Unity/ratingsfilter.h+1−1
@@ -30,7 +30,7 @@
3030// Local
3131#include "filter.h"
3232
33−class RatingsFilter : public Filter
33+class Q_DECL_EXPORT RatingsFilter : public Filter
3434{
3535 Q_OBJECT
3636
tests/plugins/Unity/filtersbindingstest.cpp+8−1
@@ -243,6 +243,14 @@ void FiltersBindingsTest::testCheckOptionFilter()
243243 auto options = check_filter->options();
244244 QCOMPARE(options->rowCount(), 3);
245245
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+
246254 QVariant optvar = options->data(options->index(0));
247255 FilterOption* opt0 = optvar.value<FilterOption*>();
248256 QCOMPARE(opt0->id(), QString("opt0"));
@@ -340,7 +348,6 @@ void FiltersBindingsTest::testRadioOptionFilter()
340348
341349 delete radio_filter;
342350 }
343−
344351}
345352
346353QTEST_MAIN(FiltersBindingsTest)