aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-05-29 06:55:34 +0200
committerMontel Laurent <[email protected]>2017-05-29 06:55:34 +0200
commit1f29b4f47d8fc4ea67ca33898f16036aa72a01f9 (patch)
tree2de7fbb40cd08108fa93287477f2bdb665b2d636
parent751d78f8736a95ca9da65c09d1687656de33b9b2 (diff)
Use nullptr
-rw-r--r--autotests/server/fakedatastore.h12
-rw-r--r--autotests/server/mockobjects.h4
-rw-r--r--src/core/item_p.h2
-rw-r--r--src/private/imapparser_p.h2
4 files changed, 10 insertions, 10 deletions
diff --git a/autotests/server/fakedatastore.h b/autotests/server/fakedatastore.h
index 95d7438..5b99446 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 dbd269d..205ea47 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 3e83824..25fe0e4 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 b5289df..99da7d9 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.