9149655 · unity8 · git.iko.soy

git.iko.soy/unity8

Cleanups (copyrights, NULL vs nullptr).

commit9149655c2c091748ddc81636114ae1f052b264c9 authorPawel Stolowski <pawel.stolowski@canonical.com> dateWed 10 Jul 2013, 19:01 (13 years ago) parent3657461

19 files changed+54−43

compare with xenial

unifiedsplit

plugins/Unity/combinedfilteroption.cpp+6−6 plugins/Unity/combinedfilteroption.h+2−2 plugins/Unity/combinedfilteroptions.cpp+1−1 plugins/Unity/combinedfilteroptions.h+1−1 plugins/Unity/filter.cpp+3−2 plugins/Unity/filter.h+3−2 plugins/Unity/filteroption.cpp+4−3 plugins/Unity/filteroption.h+3−2 plugins/Unity/filters.cpp+4−4 plugins/Unity/filters.h+2−3 plugins/Unity/listmodelwrapper.h+1−1 plugins/Unity/multirangefilter.cpp+2−1 plugins/Unity/multirangefilter.h+2−1 plugins/Unity/radiooptionfilter.cpp+5−5 plugins/Unity/radiooptionfilter.h+2−2 plugins/Unity/ratingsfilter.cpp+3−3 plugins/Unity/ratingsfilter.h+2−2 tests/plugins/Unity/filtersbindingstest.cpp+4−1 tests/plugins/Unity/filtersbindingstest.h+4−1

plugins/Unity/combinedfilteroption.cpp+6−6

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

2424 : AbstractFilterOption(parent),

2525 m_active(false),

2626 m_requestedActive(false),

27− m_unityFilterOption {NULL, NULL}

27+ m_unityFilterOption {nullptr, nullptr}

2828{

2929 setUnityFilterOption(unityFilterOption1, unityFilterOption2);

3030}

3131

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

3333{

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

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

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

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

3737}

3838

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

4040{

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

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

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

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

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

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

6262

6363bool CombinedFilterOption::active() const

6464{

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

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

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

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

6868}

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

7171{

7272 m_requestedActive = active;

7373 m_unityFilterOption[0]->active = active;

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

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

7575 m_unityFilterOption[1]->active = active;

7676}

7777

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

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

111111{

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

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

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

114114 m_signals.disconnectAll();

115115 }

116116 }

plugins/Unity/combinedfilteroption.h+2−2

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

3636 Q_OBJECT

3737

3838public:

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);

4040

4141 /* getters */

4242 QString id() const override;

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

5454private:

5555 std::string getCombinedId() const;

5656 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);

5858

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

6060 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

5454 ++i;

5555 }

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

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

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

5858 addOption(co);

5959 }

6060}

plugins/Unity/combinedfilteroptions.h+1−1

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

3535 Q_OBJECT

3636

3737public:

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);

3939

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

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

plugins/Unity/filter.cpp+3−2

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

11/*

33 *

44 * Authors:

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

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

67 *

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

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

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

8485

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

8687{

87− if (m_unityFilter != NULL) {

88+ if (m_unityFilter != nullptr) {

8889 m_signals.disconnectAll();

8990 }

9091

plugins/Unity/filter.h+3−2

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

11/*

33 *

44 * Authors:

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

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

67 *

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

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

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

4344 Q_PROPERTY(bool filtering READ filtering NOTIFY filteringChanged)

4445

4546public:

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

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

4748

4849 /* getters */

4950 QString id() const;

plugins/Unity/filteroption.cpp+4−3

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

11/*

33 *

44 * Authors:

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

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

67 *

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

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

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

2425#include <UnityCore/Filter.h>

2526

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

27− AbstractFilterOption(parent), m_unityFilterOption(NULL)

28+ AbstractFilterOption(parent), m_unityFilterOption(nullptr)

2829{

2930 setUnityFilterOption(unityFilterOption);

3031}

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

5657

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

5859{

59− if (m_unityFilterOption != NULL) {

60+ if (m_unityFilterOption != nullptr) {

6061 m_signals.disconnectAll();

6162 }

6263

plugins/Unity/filteroption.h+3−2

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

11/*

33 *

44 * Authors:

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

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

67 *

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

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

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

3334 Q_OBJECT

3435

3536public:

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

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

3738

3839 /* getters */

3940 QString id() const override;

plugins/Unity/filters.cpp+4−4

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

11/*

33 *

44 * Authors:

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

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

8383 return filter;

8484 }

8585 }

86− return NULL;

86+ return nullptr;

8787}

8888

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

9090{

91− if (unityFilter == NULL) {

91+ if (unityFilter == nullptr) {

9292 return;

9393 }

9494

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

9999

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

101101{

102− if (unityFilter == NULL) {

102+ if (unityFilter == nullptr) {

103103 return;

104104 }

105105

plugins/Unity/filters.h+2−3

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

11/*

33 *

44 * Authors:

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

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

2828#include <UnityCore/Filters.h>

2929#include <UnityCore/Filter.h>

3030

31−

3231class Filter;

3332

3433class Filters : public QAbstractListModel

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

3837 Q_ENUMS(Roles)

3938

4039public:

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

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

4241 ~Filters();

4342

4443 enum Roles {

plugins/Unity/listmodelwrapper.h+1−1

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

11/*

33 *

44 * Authors:

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

plugins/Unity/multirangefilter.cpp+2−1

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

11/*

33 *

44 * Authors:

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

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

67 *

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

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

plugins/Unity/multirangefilter.h+2−1

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

11/*

33 *

44 * Authors:

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

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

67 *

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

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

plugins/Unity/radiooptionfilter.cpp+5−5

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

11/*

33 *

44 * Authors:

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

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

2121#include "radiooptionfilter.h"

2222

2323RadioOptionFilter::RadioOptionFilter(QObject *parent) :

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

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

2525{

2626}

2727

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

3737 return option;

3838 }

3939 }

40− return NULL;

40+ return nullptr;

4141}

4242

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

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

5050

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

5252{

53− if (m_options != NULL) {

53+ if (m_options != nullptr) {

5454 m_signals.disconnectAll();

5555 delete m_options;

56− m_options = NULL;

56+ m_options = nullptr;

5757 }

5858 m_options = new FilterOptions(m_unityRadioOptionFilter->options,

5959 m_unityRadioOptionFilter->option_added,

plugins/Unity/radiooptionfilter.h+2−2

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

11/*

33 *

44 * Authors:

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

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

3939 Q_PROPERTY(FilterOptions* options READ options NOTIFY optionsChanged)

4040

4141public:

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

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

4343

4444 /* getters */

4545 FilterOptions* options() const;

plugins/Unity/ratingsfilter.cpp+3−3

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

11/*

33 *

44 * Authors:

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

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

2121#include "ratingsfilter.h"

2222

2323RatingsFilter::RatingsFilter(QObject *parent) :

24− Filter(parent), m_unityRatingsFilter(NULL)

24+ Filter(parent), m_unityRatingsFilter(nullptr)

2525{

2626}

2727

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

3737

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

3939{

40− if (m_unityFilter != NULL) {

40+ if (m_unityFilter != nullptr) {

4141 m_signals.disconnectAll();

4242 }

4343

plugins/Unity/ratingsfilter.h+2−2

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

11/*

33 *

44 * Authors:

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

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

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

3939

4040public:

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

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

4242

4343 /* getters */

4444 float rating() const;

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

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

11/*

3+*

4+* Authors:

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

36*

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

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

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

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

11/*

3+ *

4+ * Authors:

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

36 *

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

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