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

List:       kde-commits
Subject:    [akonadi] src: use isEmpty
From:       Montel Laurent <montel () kde ! org>
Date:       2016-11-14 5:47:35
Message-ID: E1c6A7D-0004oy-G5 () code ! kde ! org
[Download RAW message or body]

Git commit f7dbed669675f038b40be7f84c3c72d7d83155d6 by Montel Laurent.
Committed on 14/11/2016 at 05:47.
Pushed by mlaurent into branch 'master'.

use isEmpty

M  +1    -1    src/server/notificationsubscriber.cpp
M  +1    -1    src/xml/xmlreader.cpp

http://commits.kde.org/akonadi/f7dbed669675f038b40be7f84c3c72d7d83155d6

diff --git a/src/server/notificationsubscriber.cpp \
b/src/server/notificationsubscriber.cpp index ed5d348..c9bda38 100644
--- a/src/server/notificationsubscriber.cpp
+++ b/src/server/notificationsubscriber.cpp
@@ -363,7 +363,7 @@ bool NotificationSubscriber::acceptsItemNotification(const \
Protocol::ItemChangeN  {
     // Assumes mLock being locked by caller
 
-    if (notification.items().count() == 0) {
+    if (notification.items().isEmpty()) {
         return false;
     }
 
diff --git a/src/xml/xmlreader.cpp b/src/xml/xmlreader.cpp
index 8ec060f..c0274d1 100644
--- a/src/xml/xmlreader.cpp
+++ b/src/xml/xmlreader.cpp
@@ -29,7 +29,7 @@ using namespace Akonadi;
 Attribute *XmlReader::elementToAttribute(const QDomElement &elem)
 {
     if (elem.isNull() || elem.tagName() != Format::Tag::attribute()) {
-        return 0;
+        return Q_NULLPTR;
     }
     Attribute *attr = \
AttributeFactory::createAttribute(elem.attribute(Format::Attr::attributeType()).toUtf8());
  Q_ASSERT(attr);


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