[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcalcore] src: Use nullptr
From:       Montel Laurent <null () kde ! org>
Date:       2017-05-29 4:52:45
Message-ID: E1dFCfd-0006jZ-QR () code ! kde ! org
[Download RAW message or body]

Git commit ba8f1f1e91035fadd2cd2047d98b954f3b490b45 by Montel Laurent.
Committed on 29/05/2017 at 04:52.
Pushed by mlaurent into branch 'master'.

Use nullptr

M  +1    -1    src/filestorage.h
M  +12   -12   src/icalformat_p.h
M  +1    -1    src/recurrencerule.h

https://commits.kde.org/kcalcore/ba8f1f1e91035fadd2cd2047d98b954f3b490b45

diff --git a/src/filestorage.h b/src/filestorage.h
index 6ed0b7353..aba40b309 100644
--- a/src/filestorage.h
+++ b/src/filestorage.h
@@ -65,7 +65,7 @@ public:
     */
     explicit FileStorage(const Calendar::Ptr &calendar,
                          const QString &fileName = QString(),
-                         KCalCore::CalFormat *format = 0);
+                         KCalCore::CalFormat *format = nullptr);
 
     /**
       Destructor.
diff --git a/src/icalformat_p.h b/src/icalformat_p.h
index fd3f54f7f..9461330d3 100644
--- a/src/icalformat_p.h
+++ b/src/icalformat_p.h
@@ -113,23 +113,23 @@ public:
 
     icalcomponent *writeIncidence(const IncidenceBase::Ptr &incidence,
                                   iTIPMethod method = iTIPRequest,
-                                  ICalTimeZones *tzList = 0,
-                                  ICalTimeZones *tzUsedList = 0);
+                                  ICalTimeZones *tzList = nullptr,
+                                  ICalTimeZones *tzUsedList = nullptr);
 
-    icalcomponent *writeTodo(const Todo::Ptr &todo, ICalTimeZones *tzlist = 0,
-                             ICalTimeZones *tzUsedList = 0);
+    icalcomponent *writeTodo(const Todo::Ptr &todo, ICalTimeZones *tzlist = nullptr,
+                             ICalTimeZones *tzUsedList = nullptr);
 
-    icalcomponent *writeEvent(const Event::Ptr &event, ICalTimeZones *tzlist = 0,
-                              ICalTimeZones *tzUsedList = 0);
+    icalcomponent *writeEvent(const Event::Ptr &event, ICalTimeZones *tzlist = nullptr,
+                              ICalTimeZones *tzUsedList = nullptr);
 
-    icalcomponent *writeJournal(const Journal::Ptr &journal, ICalTimeZones *tzlist = 0,
-                                ICalTimeZones *tzUsedList = 0);
+    icalcomponent *writeJournal(const Journal::Ptr &journal, ICalTimeZones *tzlist = nullptr,
+                                ICalTimeZones *tzUsedList = nullptr);
 
     icalcomponent *writeFreeBusy(const FreeBusy::Ptr &freebusy,
                                  iTIPMethod method = iTIPPublish);
 
     void writeIncidence(icalcomponent *parent, const Incidence::Ptr &incidence,
-                        ICalTimeZones *tzlist = 0, ICalTimeZones *tzUsedList = 0);
+                        ICalTimeZones *tzlist = nullptr, ICalTimeZones *tzUsedList = nullptr);
 
     icalproperty *writeDescription(const QString &description, bool isRich = false);
     icalproperty *writeSummary(const QString &summary, bool isRich = false);
@@ -188,8 +188,8 @@ public:
     */
     static icalproperty *writeICalDateTimeProperty(const icalproperty_kind kind,
             const KDateTime &dt,
-            ICalTimeZones *tzlist = 0,
-            ICalTimeZones *tzUsedList = 0);
+            ICalTimeZones *tzlist = nullptr,
+            ICalTimeZones *tzUsedList = nullptr);
 
     /**
       Converts a date/time from ICal format.
@@ -216,7 +216,7 @@ public:
       @return date/time, or invalid if @p t is not UTC
     */
     static KDateTime readICalUtcDateTime(icalproperty *p, icaltimetype &t,
-                                         ICalTimeZones *tzlist = 0)
+                                         ICalTimeZones *tzlist = nullptr)
     //TODO: KDE5, move this implementation to icalformat_p.cpp
     {
         return readICalDateTime(p, t, tzlist, true);
diff --git a/src/recurrencerule.h b/src/recurrencerule.h
index 96cdb5a41..a41496f7e 100644
--- a/src/recurrencerule.h
+++ b/src/recurrencerule.h
@@ -163,7 +163,7 @@ public:
      * @param result if non-null, *result is updated to true if successful,
      * or false if there is no recurrence or its end date cannot be determined.
      */
-    KDateTime endDt(bool *result = 0) const;
+    KDateTime endDt(bool *result = nullptr) const;
 
     /** Sets the date and time of the last recurrence.
      * @param endDateTime the ending date/time after which to stop recurring. */
[prev in list] [next in list] [prev in thread] [next in thread]