19d4f7d · unity8 · git.iko.soy

git.iko.soy/unity8

Minor cleanups.

commit19d4f7d61339e6f1ebfbe63591f0bce67403a3ac authorPawel Stolowski <pawel.stolowski@canonical.com> dateTue 9 Jul 2013, 14:43 (13 years ago) parent68feb26

3 files changed+7−9

compare with xenial

unifiedsplit

plugins/Unity/combinedfilteroption.cpp+5−4 plugins/Unity/combinedfilteroption.h+1−1 plugins/Unity/combinedfilteroptions.cpp+1−4

plugins/Unity/combinedfilteroption.cpp+5−4

@@ -23,7 +23,7 @@

2323CombinedFilterOption::CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2, QObject *parent)

2424 : AbstractFilterOption(parent),

2525 m_active(false),

26− m_requested_active(false),

26+ m_requestedActive(false),

2727 m_unityFilterOption {NULL, NULL}

2828{

2929 setUnityFilterOption(unityFilterOption1, unityFilterOption2);

@@ -61,13 +61,13 @@ QString CombinedFilterOption::iconHint() const

6161bool CombinedFilterOption::active() const

6262{

6363 if (m_unityFilterOption[1] != NULL)

64− return m_unityFilterOption[0]->active && m_unityFilterOption[1]->active && m_requested_active;

65− return m_unityFilterOption[0]->active && m_requested_active;

64+ return m_unityFilterOption[0]->active && m_unityFilterOption[1]->active && m_requestedActive;

65+ return m_unityFilterOption[0]->active && m_requestedActive;

6666}

6767

6868void CombinedFilterOption::setActive(bool active)

6969{

70− m_requested_active = active;

70+ m_requestedActive = active;

7171 m_unityFilterOption[0]->active = active;

7272 if (m_unityFilterOption[1] != NULL)

7373 m_unityFilterOption[1]->active = active;

@@ -78,6 +78,7 @@ void CombinedFilterOption::setInactive(const CombinedFilterOption &otherFilter)

7878 // de-activate underlying unity filter options as long as they don't belong

7979 // to otherFilter.

8080 if (this != &otherFilter) {

81+ m_requestedActive = false;

8182 for (int i = 0; i<2; i++) {

8283 if (m_unityFilterOption[i] != nullptr) {

8384 if (m_unityFilterOption[i]->active &&

plugins/Unity/combinedfilteroption.h+1−1

@@ -62,7 +62,7 @@ private:

6262 void setInactive(const CombinedFilterOption &otherFilter);

6363

6464 bool m_active;

65− bool m_requested_active;

65+ bool m_requestedActive;

6666 unity::dash::FilterOption::Ptr m_unityFilterOption[2];

6767 SignalsList m_signals;

6868

plugins/Unity/combinedfilteroptions.cpp+1−4

@@ -52,10 +52,7 @@ void CombinedFilterOptions::initList(const std::vector<unity::dash::FilterOption

5252 unsigned int i = 0;

5353 while (i < list.size() - 1) {

5454 unity::dash::FilterOption::Ptr option1 = list[i];

55− unity::dash::FilterOption::Ptr option2 = NULL;

56− //if (i < list.size()-1) {

57− option2 = list[i+1];

58− //}

55+ unity::dash::FilterOption::Ptr option2 = list[i+1];

5956 auto co = new CombinedFilterOption(option1, option2);

6057 connect(co, SIGNAL(activeChanged(bool)), this, SLOT(onActiveChanged(bool)));

6158 addOption(co);