git.iko.soy/unity8
on xenial help sign in
Minor cleanups.
19d4f7dPawel Stolowski
plugins/Unity/combinedfilteroption.cpp+5−4
compare with xenial
unifiedsplit
@@ -23,7 +23,7 @@
23CombinedFilterOption::CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2, QObject *parent)
23CombinedFilterOption::CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2, QObject *parent)
24 : AbstractFilterOption(parent),
24 : AbstractFilterOption(parent),
25 m_active(false),
25 m_active(false),
26− m_requested_active(false),
26+ m_requestedActive(false),
27 m_unityFilterOption {NULL, NULL}
27 m_unityFilterOption {NULL, NULL}
28{
28{
29 setUnityFilterOption(unityFilterOption1, unityFilterOption2);
29 setUnityFilterOption(unityFilterOption1, unityFilterOption2);
@@ -61,13 +61,13 @@ QString CombinedFilterOption::iconHint() const
61bool CombinedFilterOption::active() const
61bool CombinedFilterOption::active() const
62{
62{
63 if (m_unityFilterOption[1] != NULL)
63 if (m_unityFilterOption[1] != NULL)
64− return m_unityFilterOption[0]->active && m_unityFilterOption[1]->active && m_requested_active;
64+ return m_unityFilterOption[0]->active && m_unityFilterOption[1]->active && m_requestedActive;
65− return m_unityFilterOption[0]->active && m_requested_active;
65+ return m_unityFilterOption[0]->active && m_requestedActive;
66}
66}
67
67
68void CombinedFilterOption::setActive(bool active)
68void CombinedFilterOption::setActive(bool active)
69{
69{
70− m_requested_active = active;
70+ m_requestedActive = active;
71 m_unityFilterOption[0]->active = active;
71 m_unityFilterOption[0]->active = active;
72 if (m_unityFilterOption[1] != NULL)
72 if (m_unityFilterOption[1] != NULL)
73 m_unityFilterOption[1]->active = active;
73 m_unityFilterOption[1]->active = active;
@@ -78,6 +78,7 @@ void CombinedFilterOption::setInactive(const CombinedFilterOption &otherFilter)
78 // de-activate underlying unity filter options as long as they don't belong
78 // de-activate underlying unity filter options as long as they don't belong
79 // to otherFilter.
79 // to otherFilter.
80 if (this != &otherFilter) {
80 if (this != &otherFilter) {
81+ m_requestedActive = false;
81 for (int i = 0; i<2; i++) {
82 for (int i = 0; i<2; i++) {
82 if (m_unityFilterOption[i] != nullptr) {
83 if (m_unityFilterOption[i] != nullptr) {
83 if (m_unityFilterOption[i]->active &&
84 if (m_unityFilterOption[i]->active &&
plugins/Unity/combinedfilteroption.h+1−1
@@ -62,7 +62,7 @@ private:
62 void setInactive(const CombinedFilterOption &otherFilter);
62 void setInactive(const CombinedFilterOption &otherFilter);
63
63
64 bool m_active;
64 bool m_active;
65− bool m_requested_active;
65+ bool m_requestedActive;
66 unity::dash::FilterOption::Ptr m_unityFilterOption[2];
66 unity::dash::FilterOption::Ptr m_unityFilterOption[2];
67 SignalsList m_signals;
67 SignalsList m_signals;
68
68
plugins/Unity/combinedfilteroptions.cpp+1−4
@@ -52,10 +52,7 @@ void CombinedFilterOptions::initList(const std::vector<unity::dash::FilterOption
52 unsigned int i = 0;
52 unsigned int i = 0;
53 while (i < list.size() - 1) {
53 while (i < list.size() - 1) {
54 unity::dash::FilterOption::Ptr option1 = list[i];
54 unity::dash::FilterOption::Ptr option1 = list[i];
55− unity::dash::FilterOption::Ptr option2 = NULL;
55+ unity::dash::FilterOption::Ptr option2 = list[i+1];
56− //if (i < list.size()-1) {
57− option2 = list[i+1];
58− //}
59 auto co = new CombinedFilterOption(option1, option2);
56 auto co = new CombinedFilterOption(option1, option2);
60 connect(co, SIGNAL(activeChanged(bool)), this, SLOT(onActiveChanged(bool)));
57 connect(co, SIGNAL(activeChanged(bool)), this, SLOT(onActiveChanged(bool)));
61 addOption(co);
58 addOption(co);