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

List:       kde-commits
Subject:    [pimcommon] src: Use nullptr
From:       Montel Laurent <null () kde ! org>
Date:       2017-01-10 22:00:11
Message-ID: E1cR4Sh-0004Qm-4s () code ! kde ! org
[Download RAW message or body]

Git commit 0dd58e64605d7c9047212c53cc8eb058401d9f81 by Montel Laurent.
Committed on 10/01/2017 at 22:00.
Pushed by mlaurent into branch 'master'.

Use nullptr

M  +1    -1    src/acl/aclmodifyjob.cpp
M  +2    -2    src/storageservice/webdav/webdavjob.cpp
M  +1    -1    src/storageservice/webdav/webdavstorageservice.cpp

https://commits.kde.org/pimcommon/0dd58e64605d7c9047212c53cc8eb058401d9f81

diff --git a/src/acl/aclmodifyjob.cpp b/src/acl/aclmodifyjob.cpp
index 4b0f040..cfa24a8 100644
--- a/src/acl/aclmodifyjob.cpp
+++ b/src/acl/aclmodifyjob.cpp
@@ -176,7 +176,7 @@ void AclModifyJob::slotFetchCollectionFinished(const \
Akonadi::Collection::List &  }
     }
     folderNames.sort();
-    if (KMessageBox::Continue != KMessageBox::warningContinueCancelList(0,
+    if (KMessageBox::Continue != KMessageBox::warningContinueCancelList(nullptr,
             i18n("Do you really want to apply this folders permissions on the \
subdirectories:"),  folderNames,
             i18n("Apply Permissions"))) {
diff --git a/src/storageservice/webdav/webdavjob.cpp \
b/src/storageservice/webdav/webdavjob.cpp index 5283b7f..64a9ddb 100644
--- a/src/storageservice/webdav/webdavjob.cpp
+++ b/src/storageservice/webdav/webdavjob.cpp
@@ -249,7 +249,7 @@ QNetworkReply *WebDavJob::uploadFile(const QString &filename, \
const QString &upl  }
     }
     delete file;
-    return 0;
+    return nullptr;
 }
 
 void WebDavJob::listFolder(const QString &folder)
@@ -622,6 +622,6 @@ QNetworkReply *WebDavJob::downloadFile(const QString &name, const \
QString &fileI  } else {
         delete mDownloadFile;
     }
-    return 0;
+    return nullptr;
 }
 
diff --git a/src/storageservice/webdav/webdavstorageservice.cpp \
b/src/storageservice/webdav/webdavstorageservice.cpp index 33f9187..75da87c 100644
--- a/src/storageservice/webdav/webdavstorageservice.cpp
+++ b/src/storageservice/webdav/webdavstorageservice.cpp
@@ -338,7 +338,7 @@ QString \
WebDavStorageService::fillListWidget(StorageServiceTreeWidget *listWidge  if \
(QUrl(info.name()).path() == currentFolder) {  continue;
         }
-        StorageServiceTreeWidgetItem *item = 0;
+        StorageServiceTreeWidgetItem *item = nullptr;
         if (info.isDir()) {
             QFileInfo folderInfo(info.name());
             item = listWidget->addFolder(folderInfo.dir().dirName(), info.name());


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