git.iko.soy/unity8
on xenial help sign in
More NULL/0 vs nullptr cleanups.
c78fa17Pawel Stolowski
plugins/Unity/checkoptionfilter.cpp+3−3
compare with xenial
unifiedsplit
@@ -21,7 +21,7 @@
21#include "checkoptionfilter.h"
21#include "checkoptionfilter.h"
22
22
23CheckOptionFilter::CheckOptionFilter(QObject *parent) :
23CheckOptionFilter::CheckOptionFilter(QObject *parent) :
24− Filter(parent), m_unityCheckOptionFilter(NULL), m_options(NULL)
24+ Filter(parent), m_unityCheckOptionFilter(nullptr), m_options(nullptr)
25{
25{
26}
26}
27
27
@@ -40,10 +40,10 @@ void CheckOptionFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
40
40
41void CheckOptionFilter::onOptionsChanged(unity::dash::CheckOptionFilter::CheckOptions /* options */)
41void CheckOptionFilter::onOptionsChanged(unity::dash::CheckOptionFilter::CheckOptions /* options */)
42{
42{
43− if (m_options != NULL) {
43+ if (m_options != nullptr) {
44 m_signals.disconnectAll();
44 m_signals.disconnectAll();
45 delete m_options;
45 delete m_options;
46− m_options = NULL;
46+ m_options = nullptr;
47 }
47 }
48 m_options = new FilterOptions(m_unityCheckOptionFilter->options,
48 m_options = new FilterOptions(m_unityCheckOptionFilter->options,
49 m_unityCheckOptionFilter->option_added,
49 m_unityCheckOptionFilter->option_added,
plugins/Unity/checkoptionfilter.h+1−1
@@ -39,7 +39,7 @@ class Q_DECL_EXPORT CheckOptionFilter : public Filter
39 Q_PROPERTY(FilterOptions* options READ options NOTIFY optionsChanged)
39 Q_PROPERTY(FilterOptions* options READ options NOTIFY optionsChanged)
40
40
41public:
41public:
42− explicit CheckOptionFilter(QObject *parent = 0);
42+ explicit CheckOptionFilter(QObject *parent = nullptr);
43
43
44 /* getters */
44 /* getters */
45 FilterOptions* options() const;
45 FilterOptions* options() const;
plugins/Unity/combinedfilteroption.h+5−2
@@ -36,7 +36,9 @@ class Q_DECL_EXPORT CombinedFilterOption : public AbstractFilterOption
36 Q_OBJECT
36 Q_OBJECT
37
37
38public:
38public:
39− explicit CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2 = nullptr, QObject *parent = 0);
39+ explicit CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1,
40+ unity::dash::FilterOption::Ptr unityFilterOption2 = nullptr,
41+ QObject *parent = nullptr);
40
42
41 /* getters */
43 /* getters */
42 QString id() const override;
44 QString id() const override;
@@ -54,7 +56,8 @@ private Q_SLOTS:
54private:
56private:
55 std::string getCombinedId() const;
57 std::string getCombinedId() const;
56 std::string getCombinedName() const;
58 std::string getCombinedName() const;
57− void setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1, unity::dash::FilterOption::Ptr unityFilterOption2 = nullptr);
59+ void setUnityFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1,
60+ unity::dash::FilterOption::Ptr unityFilterOption2 = nullptr);
58
61
59 /* De-activate the filter, and also de-activate one or both of the underlying unity's filter options, depending on whether
62 /* 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
63 one of them is active in otherFilter. This is used internally by CombinedFilterOptions to ensure only one
plugins/Unity/listmodelwrapper.h+1−1
@@ -34,7 +34,7 @@ public:
34 explicit ListModelWrapper(const std::vector<ItemClass>& list,
34 explicit ListModelWrapper(const std::vector<ItemClass>& list,
35 sigc::signal<void, ItemClass> itemAddedSignal,
35 sigc::signal<void, ItemClass> itemAddedSignal,
36 sigc::signal<void, ItemClass> itemRemovedSignal,
36 sigc::signal<void, ItemClass> itemRemovedSignal,
37− QObject *parent = 0);
37+ QObject *parent = nullptr);
38 ~ListModelWrapper();
38 ~ListModelWrapper();
39
39
40 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
40 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
plugins/Unity/multirangefilter.cpp+3−3
@@ -22,7 +22,7 @@
22#include "multirangefilter.h"
22#include "multirangefilter.h"
23
23
24MultiRangeFilter::MultiRangeFilter(QObject *parent) :
24MultiRangeFilter::MultiRangeFilter(QObject *parent) :
25− Filter(parent), m_unityMultiRangeFilter(NULL), m_options(NULL)
25+ Filter(parent), m_unityMultiRangeFilter(nullptr), m_options(nullptr)
26{
26{
27}
27}
28
28
@@ -41,10 +41,10 @@ void MultiRangeFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
41
41
42void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options /* options */)
42void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options /* options */)
43{
43{
44− if (m_options != NULL) {
44+ if (m_options != nullptr) {
45 m_signals.disconnectAll();
45 m_signals.disconnectAll();
46 delete m_options;
46 delete m_options;
47− m_options = NULL;
47+ m_options = nullptr;
48 }
48 }
49
49
50 m_options = new CombinedFilterOptions(m_unityMultiRangeFilter->options);
50 m_options = new CombinedFilterOptions(m_unityMultiRangeFilter->options);
plugins/Unity/multirangefilter.h+1−1
@@ -41,7 +41,7 @@ class Q_DECL_EXPORT MultiRangeFilter : public Filter
41 Q_PROPERTY(CombinedFilterOptions* options READ options NOTIFY optionsChanged)
41 Q_PROPERTY(CombinedFilterOptions* options READ options NOTIFY optionsChanged)
42
42
43public:
43public:
44− explicit MultiRangeFilter(QObject *parent = 0);
44+ explicit MultiRangeFilter(QObject *parent = nullptr);
45
45
46 /* getters */
46 /* getters */
47 CombinedFilterOptions* options() const;
47 CombinedFilterOptions* options() const;