From ddfbbd346b522703a5b6f8d274a7f79983e5f319 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 25 Jun 2019 09:33:27 +0200
Subject: shiboken: Introduce nullptr

Apply Fixits by Qt Creator with some amendments.

Change-Id: Ie8300ddb834adb8b649324562f2c912a4e8cf4ce
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/shiboken2/tests/libsample/photon.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sources/shiboken2/tests/libsample/photon.h')

diff --git a/sources/shiboken2/tests/libsample/photon.h b/sources/shiboken2/tests/libsample/photon.h
index 2a32d511a..b9fc6532d 100644
--- a/sources/shiboken2/tests/libsample/photon.h
+++ b/sources/shiboken2/tests/libsample/photon.h
@@ -116,7 +116,7 @@ LIBSAMPLE_API int countValueDuplicators(const std::list<TemplateBase<DuplicatorT
 class Pointer
 {
 public:
-    Pointer() PHOTON_NOEXCEPT : px(0) {}
+    Pointer() PHOTON_NOEXCEPT : px(nullptr) {}
     Pointer(int* p) : px(p) {}
 
     void reset() PHOTON_NOEXCEPT { Pointer().swap(*this); }
-- 
cgit v1.2.3


From 7be4e64b4bac6e6b5a90eec74b9f2b661c60db3a Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 29 May 2019 10:45:37 +0200
Subject: shiboken: Replace 'typedef' by 'using'

Apply Fixits by Qt Creator with some amendments.
Remove iterator types by using auto instead.

Change-Id: I8a75323da6ae5cdcc6b67af8be9376408953986b
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 sources/shiboken2/tests/libsample/photon.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sources/shiboken2/tests/libsample/photon.h')

diff --git a/sources/shiboken2/tests/libsample/photon.h b/sources/shiboken2/tests/libsample/photon.h
index b9fc6532d..1dcb4f83e 100644
--- a/sources/shiboken2/tests/libsample/photon.h
+++ b/sources/shiboken2/tests/libsample/photon.h
@@ -93,8 +93,8 @@ template class LIBSAMPLE_API TemplateBase<IdentityType>;
 template class LIBSAMPLE_API TemplateBase<DuplicatorType>;
 #endif
 
-typedef TemplateBase<IdentityType> ValueIdentity;
-typedef TemplateBase<DuplicatorType> ValueDuplicator;
+using ValueIdentity = TemplateBase<IdentityType>;
+using ValueDuplicator = TemplateBase<DuplicatorType>;
 
 LIBSAMPLE_API int callCalculateForValueDuplicatorPointer(ValueDuplicator* value);
 LIBSAMPLE_API int callCalculateForValueDuplicatorReference(ValueDuplicator& value);
-- 
cgit v1.2.3