9149655 · unity8 · git.iko.soy

plugins/Unity/combinedfilteroption.cpp+6−6

compare with xenial

unifiedsplit

@@ -24,21 +24,21 @@ CombinedFilterOption::CombinedFilterOption(unity::dash::FilterOption::Ptr unityF

24 : AbstractFilterOption(parent),

25 m_active(false),

26 m_requestedActive(false),

27− m_unityFilterOption {NULL, NULL}

27+ m_unityFilterOption {nullptr, nullptr}

28{

29 setUnityFilterOption(unityFilterOption1, unityFilterOption2);

30}

31

32std::string CombinedFilterOption::getCombinedId() const

33{

34− if (m_unityFilterOption[1] != NULL)

34+ if (m_unityFilterOption[1] != nullptr)

35 return m_unityFilterOption[0]->id() + "-" + m_unityFilterOption[1]->id();

36 return m_unityFilterOption[0]->id();

37}

38

39std::string CombinedFilterOption::getCombinedName() const

40{

41− if (m_unityFilterOption[1] != NULL)

41+ if (m_unityFilterOption[1] != nullptr)

42 return tr("%1 - %2")

43 .arg(QString::fromStdString(m_unityFilterOption[0]->name()))

44 .arg(QString::fromStdString(m_unityFilterOption[1]->name())).toStdString();

@@ -62,7 +62,7 @@ QString CombinedFilterOption::iconHint() const

62

63bool CombinedFilterOption::active() const

64{

65− if (m_unityFilterOption[1] != NULL)

65+ if (m_unityFilterOption[1] != nullptr)

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

67 return m_unityFilterOption[0]->active && m_requestedActive;

68}

@@ -71,7 +71,7 @@ void CombinedFilterOption::setActive(bool active)

71{

72 m_requestedActive = active;

73 m_unityFilterOption[0]->active = active;

74− if (m_unityFilterOption[1] != NULL)

74+ if (m_unityFilterOption[1] != nullptr)

75 m_unityFilterOption[1]->active = active;

76}

77

@@ -110,7 +110,7 @@ void CombinedFilterOption::onActiveChanged(bool /*active*/)

110void CombinedFilterOption::setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2)

111{

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

113− if (m_unityFilterOption[0] != NULL) {

113+ if (m_unityFilterOption[0] != nullptr) {

114 m_signals.disconnectAll();

115 }

116 }

plugins/Unity/combinedfilteroption.h+2−2

@@ -36,7 +36,7 @@ class Q_DECL_EXPORT CombinedFilterOption : public AbstractFilterOption

36 Q_OBJECT

37

38public:

39− explicit CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2 = NULL, QObject *parent = 0);

39+ explicit CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2 = nullptr, QObject *parent = 0);

40

41 /* getters */

42 QString id() const override;

@@ -54,7 +54,7 @@ private Q_SLOTS:

54private:

55 std::string getCombinedId() const;

56 std::string getCombinedName() const;

57− void setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2 = NULL);

57+ void setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2 = nullptr);

58

59 /* De-activate the filter, and also de-activate one or both of the underlying unity's filter options, depending on whether

60 one of them is active in otherFilter. This is used internally by CombinedFilterOptions to ensure only one

plugins/Unity/combinedfilteroptions.cpp+1−1

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

54 ++i;

55 }

56 if (list.size() > 0) {

57− auto co = new CombinedFilterOption(list[i], NULL, this);

57+ auto co = new CombinedFilterOption(list[i], nullptr, this);

58 addOption(co);

59 }

60}

plugins/Unity/combinedfilteroptions.h+1−1

@@ -35,7 +35,7 @@ class CombinedFilterOptions : public QAbstractListModel

35 Q_OBJECT

36

37public:

38− CombinedFilterOptions(const std::vector<unity::dash::FilterOption::Ptr>& list, QObject *parent = 0);

38+ CombinedFilterOptions(const std::vector<unity::dash::FilterOption::Ptr>& list, QObject *parent = nullptr);

39

40 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;

41 int rowCount(const QModelIndex& parent = QModelIndex()) const override;

plugins/Unity/filter.cpp+3−2

@@ -1,8 +1,9 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

6+ * Pawel Stolowski <pawel.stolowski@canonical.com>

6 *

7 *

7 * This program is free software; you can redistribute it and/or modify

8 * This program is free software; you can redistribute it and/or modify

8 * it under the terms of the GNU General Public License as published by

9 * it under the terms of the GNU General Public License as published by

@@ -84,7 +85,7 @@ void Filter::clear()

84

85

85void Filter::setUnityFilter(unity::dash::Filter::Ptr unityFilter)

86void Filter::setUnityFilter(unity::dash::Filter::Ptr unityFilter)

86{

87{

87− if (m_unityFilter != NULL) {

88+ if (m_unityFilter != nullptr) {

88 m_signals.disconnectAll();

89 m_signals.disconnectAll();

89 }

90 }

90

91

plugins/Unity/filter.h+3−2

@@ -1,8 +1,9 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

6+ * Pawel Stolowski <pawel.stolowski@canonical.com>

6 *

7 *

7 * This program is free software; you can redistribute it and/or modify

8 * This program is free software; you can redistribute it and/or modify

8 * it under the terms of the GNU General Public License as published by

9 * it under the terms of the GNU General Public License as published by

@@ -43,7 +44,7 @@ class Q_DECL_EXPORT Filter : public QObject

43 Q_PROPERTY(bool filtering READ filtering NOTIFY filteringChanged)

44 Q_PROPERTY(bool filtering READ filtering NOTIFY filteringChanged)

44

45

45public:

46public:

46− explicit Filter(QObject *parent = 0);

47+ explicit Filter(QObject *parent = nullptr);

47

48

48 /* getters */

49 /* getters */

49 QString id() const;

50 QString id() const;

plugins/Unity/filteroption.cpp+4−3

@@ -1,8 +1,9 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

6+ * Pawel Stolowski <pawel.stolowski@canonical.com>

6 *

7 *

7 * This program is free software; you can redistribute it and/or modify

8 * This program is free software; you can redistribute it and/or modify

8 * it under the terms of the GNU General Public License as published by

9 * it under the terms of the GNU General Public License as published by

@@ -24,7 +25,7 @@

24#include <UnityCore/Filter.h>

25#include <UnityCore/Filter.h>

25

26

26FilterOption::FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent) :

27FilterOption::FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent) :

27− AbstractFilterOption(parent), m_unityFilterOption(NULL)

28+ AbstractFilterOption(parent), m_unityFilterOption(nullptr)

28{

29{

29 setUnityFilterOption(unityFilterOption);

30 setUnityFilterOption(unityFilterOption);

30}

31}

@@ -56,7 +57,7 @@ void FilterOption::setActive(bool active)

56

57

57void FilterOption::setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption)

58void FilterOption::setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption)

58{

59{

59− if (m_unityFilterOption != NULL) {

60+ if (m_unityFilterOption != nullptr) {

60 m_signals.disconnectAll();

61 m_signals.disconnectAll();

61 }

62 }

62

63

plugins/Unity/filteroption.h+3−2

@@ -1,8 +1,9 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

6+ * Pawel Stolowski <pawel.stolowski@canonical.com>

6 *

7 *

7 * This program is free software; you can redistribute it and/or modify

8 * This program is free software; you can redistribute it and/or modify

8 * it under the terms of the GNU General Public License as published by

9 * it under the terms of the GNU General Public License as published by

@@ -33,7 +34,7 @@ class Q_DECL_EXPORT FilterOption : public AbstractFilterOption

33 Q_OBJECT

34 Q_OBJECT

34

35

35public:

36public:

36− explicit FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent = 0);

37+ explicit FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent = nullptr);

37

38

38 /* getters */

39 /* getters */

39 QString id() const override;

40 QString id() const override;

plugins/Unity/filters.cpp+4−4

@@ -1,5 +1,5 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

@@ -83,12 +83,12 @@ Filter* Filters::getFilter(const QString& id) const

83 return filter;

84 }

85 }

86− return NULL;

86+ return nullptr;

87}

88

89void Filters::onFilterAdded(unity::dash::Filter::Ptr unityFilter)

90{

91− if (unityFilter == NULL) {

91+ if (unityFilter == nullptr) {

92 return;

93 }

94

@@ -99,7 +99,7 @@ void Filters::onFilterAdded(unity::dash::Filter::Ptr unityFilter)

99

100void Filters::onFilterChanged(unity::dash::Filter::Ptr unityFilter)

101{

102− if (unityFilter == NULL) {

102+ if (unityFilter == nullptr) {

103 return;

104 }

105

plugins/Unity/filters.h+2−3

@@ -1,5 +1,5 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

@@ -28,7 +28,6 @@

28#include <UnityCore/Filters.h>

29#include <UnityCore/Filter.h>

30

31−

32class Filter;

31class Filter;

33

32

34class Filters : public QAbstractListModel

33class Filters : public QAbstractListModel

@@ -38,7 +37,7 @@ class Filters : public QAbstractListModel

38 Q_ENUMS(Roles)

37 Q_ENUMS(Roles)

39

38

40public:

39public:

41− explicit Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent = 0);

40+ explicit Filters(unity::dash::Filters::Ptr unityFilters, QObject *parent = nullptr);

42 ~Filters();

41 ~Filters();

43

42

44 enum Roles {

43 enum Roles {

plugins/Unity/listmodelwrapper.h+1−1

@@ -1,5 +1,5 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

plugins/Unity/multirangefilter.cpp+2−1

@@ -1,8 +1,9 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

6+ * Pawel Stolowski <pawel.stolowski@canonical.com>

6 *

7 *

7 * This program is free software; you can redistribute it and/or modify

8 * This program is free software; you can redistribute it and/or modify

8 * it under the terms of the GNU General Public License as published by

9 * it under the terms of the GNU General Public License as published by

plugins/Unity/multirangefilter.h+2−1

@@ -1,8 +1,9 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

6+ * Pawel Stolowski <pawel.stolowski@canonical.com>

6 *

7 *

7 * This program is free software; you can redistribute it and/or modify

8 * This program is free software; you can redistribute it and/or modify

8 * it under the terms of the GNU General Public License as published by

9 * it under the terms of the GNU General Public License as published by

plugins/Unity/radiooptionfilter.cpp+5−5

@@ -1,5 +1,5 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

@@ -21,7 +21,7 @@

21#include "radiooptionfilter.h"

22

23RadioOptionFilter::RadioOptionFilter(QObject *parent) :

24− Filter(parent), m_unityRadioOptionFilter(NULL), m_options(NULL)

24+ Filter(parent), m_unityRadioOptionFilter(nullptr), m_options(nullptr)

25{

26}

27

@@ -37,7 +37,7 @@ FilterOption* RadioOptionFilter::getOption(const QString& id) const

37 return option;

38 }

39 }

40− return NULL;

40+ return nullptr;

41}

42

43void RadioOptionFilter::setUnityFilter(unity::dash::Filter::Ptr filter)

@@ -50,10 +50,10 @@ void RadioOptionFilter::setUnityFilter(unity::dash::Filter::Ptr filter)

50

51void RadioOptionFilter::onOptionsChanged(unity::dash::RadioOptionFilter::RadioOptions)

52{

53− if (m_options != NULL) {

53+ if (m_options != nullptr) {

54 m_signals.disconnectAll();

55 delete m_options;

56− m_options = NULL;

56+ m_options = nullptr;

57 }

58 m_options = new FilterOptions(m_unityRadioOptionFilter->options,

59 m_unityRadioOptionFilter->option_added,

plugins/Unity/radiooptionfilter.h+2−2

@@ -1,5 +1,5 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

@@ -39,7 +39,7 @@ class Q_DECL_EXPORT RadioOptionFilter : public Filter

39 Q_PROPERTY(FilterOptions* options READ options NOTIFY optionsChanged)

40

41public:

42− explicit RadioOptionFilter(QObject *parent = 0);

42+ explicit RadioOptionFilter(QObject *parent = nullptr);

43

44 /* getters */

45 FilterOptions* options() const;

plugins/Unity/ratingsfilter.cpp+3−3

@@ -1,5 +1,5 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

@@ -21,7 +21,7 @@

21#include "ratingsfilter.h"

22

23RatingsFilter::RatingsFilter(QObject *parent) :

24− Filter(parent), m_unityRatingsFilter(NULL)

24+ Filter(parent), m_unityRatingsFilter(nullptr)

25{

26}

27

@@ -37,7 +37,7 @@ void RatingsFilter::setRating(float rating)

37

38void RatingsFilter::setUnityFilter(unity::dash::Filter::Ptr filter)

39{

40− if (m_unityFilter != NULL) {

40+ if (m_unityFilter != nullptr) {

41 m_signals.disconnectAll();

42 }

43

plugins/Unity/ratingsfilter.h+2−2

@@ -1,5 +1,5 @@

1/*

3 *

4 * Authors:

5 * Florian Boucault <florian.boucault@canonical.com>

@@ -38,7 +38,7 @@ class Q_DECL_EXPORT RatingsFilter : public Filter

38 Q_PROPERTY(float rating READ rating WRITE setRating NOTIFY ratingChanged)

39

40public:

41− explicit RatingsFilter(QObject *parent = 0);

41+ explicit RatingsFilter(QObject *parent = nullptr);

42

43 /* getters */

44 float rating() const;

tests/plugins/Unity/filtersbindingstest.cpp+4−1

@@ -1,5 +1,8 @@

1/*

3+*

4+* Authors:

5+* Pawel Stolowski <pawel.stolowski@canonical.com>

3*

6*

4* This program is free software; you can redistribute it and/or modify

7* This program is free software; you can redistribute it and/or modify

5* it under the terms of the GNU General Public License as published by

8* it under the terms of the GNU General Public License as published by

tests/plugins/Unity/filtersbindingstest.h+4−1

@@ -1,5 +1,8 @@

1/*

3+ *

4+ * Authors:

5+ * Pawel Stolowski <pawel.stolowski@canonical.com>

3 *

6 *

4 * This program is free software; you can redistribute it and/or modify

7 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

8 * it under the terms of the GNU General Public License as published by