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

List:       kde-commits
Subject:    [akonadi] /: Use nullptr
From:       Montel Laurent <null () kde ! org>
Date:       2017-05-29 4:55:40
Message-ID: E1dFCiS-0000OC-CG () code ! kde ! org
[Download RAW message or body]

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

Use nullptr

M  +6    -6    autotests/server/fakedatastore.h
M  +2    -2    autotests/server/mockobjects.h
M  +1    -1    src/core/item_p.h
M  +1    -1    src/private/imapparser_p.h

https://commits.kde.org/akonadi/1f29b4f47d8fc4ea67ca33898f16036aa72a01f9

diff --git a/autotests/server/fakedatastore.h b/autotests/server/fakedatastore.h
index 95d743843..5b9944642 100644
--- a/autotests/server/fakedatastore.h
+++ b/autotests/server/fakedatastore.h
@@ -42,34 +42,34 @@ public:
 
     virtual bool setItemsFlags(const PimItem::List &items,
                                const QVector<Flag> &flags,
-                               bool *flagsChanged = 0,
+                               bool *flagsChanged = nullptr,
                                const Collection &col = Collection(),
                                bool silent = false) Q_DECL_OVERRIDE;
     virtual bool appendItemsFlags(const PimItem::List &items,
                                   const QVector<Flag> &flags,
-                                  bool *flagsChanged = 0,
+                                  bool *flagsChanged = nullptr,
                                   bool checkIfExists = true,
                                   const Collection &col = Collection(),
                                   bool silent = false) Q_DECL_OVERRIDE;
     virtual bool removeItemsFlags(const PimItem::List &items,
                                   const QVector<Flag> &flags,
-                                  bool *flagsChanged = 0,
+                                  bool *flagsChanged = nullptr,
                                   const Collection &col = Collection(),
                                   bool silent = false) Q_DECL_OVERRIDE;
 
     virtual bool setItemsTags(const PimItem::List &items,
                               const Tag::List &tags,
-                              bool *tagsChanged = 0,
+                              bool *tagsChanged = nullptr,
                               bool silent = false) Q_DECL_OVERRIDE;
     virtual bool appendItemsTags(const PimItem::List &items,
                                  const Tag::List &tags,
-                                 bool *tagsChanged = 0,
+                                 bool *tagsChanged = nullptr,
                                  bool checkIfExists = true,
                                  const Collection &col = Collection(),
                                  bool silent = false) Q_DECL_OVERRIDE;
     virtual bool removeItemsTags(const PimItem::List &items,
                                  const Tag::List &tags,
-                                 bool *tagsChanged = 0,
+                                 bool *tagsChanged = nullptr,
                                  bool silent = false) Q_DECL_OVERRIDE;
 
     virtual bool removeItemParts(const PimItem &item,
diff --git a/autotests/server/mockobjects.h b/autotests/server/mockobjects.h
index dbd269d89..205ea47bd 100644
--- a/autotests/server/mockobjects.h
+++ b/autotests/server/mockobjects.h
@@ -25,8 +25,8 @@
 
 using namespace Akonadi;
 
-static AkonadiConnection *s_connection = 0;
-static DataStore *s_backend = 0;
+static AkonadiConnection *s_connection = nullptr;
+static DataStore *s_backend = nullptr;
 
 class MockConnection : public AkonadiConnection
 {
diff --git a/src/core/item_p.h b/src/core/item_p.h
index 3e83824b0..25fe0e47d 100644
--- a/src/core/item_p.h
+++ b/src/core/item_p.h
@@ -91,7 +91,7 @@ public:
         t = 0;
         return r;
     }
-    void reset(T *other = 0)
+    void reset(T *other = nullptr)
     {
         delete t;
         t = other;
diff --git a/src/private/imapparser_p.h b/src/private/imapparser_p.h
index b5289df3f..99da7d9cd 100644
--- a/src/private/imapparser_p.h
+++ b/src/private/imapparser_p.h
@@ -114,7 +114,7 @@ public:
       @param ok Set to false if the parsing failed.
       @param start Start parsing at this index.
     */
-    static int parseNumber(const QByteArray &data, qint64 &result, bool *ok = 0, int start = 0);
+    static int parseNumber(const QByteArray &data, qint64 &result, bool *ok = nullptr, int start = 0);
 
     /**
       Quotes the given QByteArray.
[prev in list] [next in list] [prev in thread] [next in thread]