git.iko.soy/unity8
on xenial help sign in
More NULL/0 vs nullptr cleanups.
commitc78fa17d2de1778535db31c5a5485a842aca4d46 authorPawel Stolowski <pawel.stolowski@canonical.com> dateThu 11 Jul 2013, 10:23 (13 years ago) parent255c379
6 files changed+14−11
compare with xenial
unifiedsplit
plugins/Unity/checkoptionfilter.cpp+3−3 plugins/Unity/checkoptionfilter.h+1−1 plugins/Unity/combinedfilteroption.h+5−2 plugins/Unity/listmodelwrapper.h+1−1 plugins/Unity/multirangefilter.cpp+3−3 plugins/Unity/multirangefilter.h+1−1
plugins/Unity/checkoptionfilter.cpp+3−3
@@ -21,7 +21,7 @@
2121#include "checkoptionfilter.h"
2222
2323CheckOptionFilter::CheckOptionFilter(QObject *parent) :
24− Filter(parent), m_unityCheckOptionFilter(NULL), m_options(NULL)
24+ Filter(parent), m_unityCheckOptionFilter(nullptr), m_options(nullptr)
2525{
2626}
2727
@@ -40,10 +40,10 @@ void CheckOptionFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
4040
4141void CheckOptionFilter::onOptionsChanged(unity::dash::CheckOptionFilter::CheckOptions /* options */)
4242{
43− if (m_options != NULL) {
43+ if (m_options != nullptr) {
4444 m_signals.disconnectAll();
4545 delete m_options;
46− m_options = NULL;
46+ m_options = nullptr;
4747 }
4848 m_options = new FilterOptions(m_unityCheckOptionFilter->options,
4949 m_unityCheckOptionFilter->option_added,
plugins/Unity/checkoptionfilter.h+1−1
@@ -39,7 +39,7 @@ class Q_DECL_EXPORT CheckOptionFilter : public Filter
3939 Q_PROPERTY(FilterOptions* options READ options NOTIFY optionsChanged)
4040
4141public:
42− explicit CheckOptionFilter(QObject *parent = 0);
42+ explicit CheckOptionFilter(QObject *parent = nullptr);
4343
4444 /* getters */
4545 FilterOptions* options() const;
plugins/Unity/combinedfilteroption.h+5−2
@@ -36,7 +36,9 @@ 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 = nullptr, QObject *parent = 0);
39+ explicit CombinedFilterOption(unity::dash::FilterOption::Ptr unityFilterOption1,
40+ unity::dash::FilterOption::Ptr unityFilterOption2 = nullptr,
41+ QObject *parent = nullptr);
4042
4143 /* getters */
4244 QString id() const override;
@@ -54,7 +56,8 @@ private Q_SLOTS:
5456private:
5557 std::string getCombinedId() const;
5658 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);
5861
5962 /* De-activate the filter, and also de-activate one or both of the underlying unity's filter options, depending on whether
6063 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:
3434 explicit ListModelWrapper(const std::vector<ItemClass>& list,
3535 sigc::signal<void, ItemClass> itemAddedSignal,
3636 sigc::signal<void, ItemClass> itemRemovedSignal,
37− QObject *parent = 0);
37+ QObject *parent = nullptr);
3838 ~ListModelWrapper();
3939
4040 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
plugins/Unity/multirangefilter.cpp+3−3
@@ -22,7 +22,7 @@
2222#include "multirangefilter.h"
2323
2424MultiRangeFilter::MultiRangeFilter(QObject *parent) :
25− Filter(parent), m_unityMultiRangeFilter(NULL), m_options(NULL)
25+ Filter(parent), m_unityMultiRangeFilter(nullptr), m_options(nullptr)
2626{
2727}
2828
@@ -41,10 +41,10 @@ void MultiRangeFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
4141
4242void MultiRangeFilter::onOptionsChanged(unity::dash::MultiRangeFilter::Options /* options */)
4343{
44− if (m_options != NULL) {
44+ if (m_options != nullptr) {
4545 m_signals.disconnectAll();
4646 delete m_options;
47− m_options = NULL;
47+ m_options = nullptr;
4848 }
4949
5050 m_options = new CombinedFilterOptions(m_unityMultiRangeFilter->options);
plugins/Unity/multirangefilter.h+1−1
@@ -41,7 +41,7 @@ class Q_DECL_EXPORT MultiRangeFilter : public Filter
4141 Q_PROPERTY(CombinedFilterOptions* options READ options NOTIFY optionsChanged)
4242
4343public:
44− explicit MultiRangeFilter(QObject *parent = 0);
44+ explicit MultiRangeFilter(QObject *parent = nullptr);
4545
4646 /* getters */
4747 CombinedFilterOptions* options() const;