aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-12-07 10:29:46 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2022-12-16 15:21:45 +0100
commitc1f44bd9907e6adc1c434e209c03057fcb4e1e0f (patch)
tree38492aa7e05ee4316243ab03fb1511bf701a9618
parentbaad4b734c0c994d327bd590f4267b536cd9c8b3 (diff)
Remove remaining Q_NULLPTR
Change-Id: I80511f42164de4494371c9016ee745e3da0493ee Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io> Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 67d306944d134d029e87278e1ce29d4f222e97ef) Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--sources/pyside6/libpyside/globalreceiverv2.cpp2
-rw-r--r--sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h4
-rw-r--r--sources/shiboken6/ApiExtractor/tests/testutil.h2
-rw-r--r--sources/shiboken6/ApiExtractor/typeparser.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/sources/pyside6/libpyside/globalreceiverv2.cpp b/sources/pyside6/libpyside/globalreceiverv2.cpp
index c843a40ac..4f72d14ce 100644
--- a/sources/pyside6/libpyside/globalreceiverv2.cpp
+++ b/sources/pyside6/libpyside/globalreceiverv2.cpp
@@ -193,7 +193,7 @@ GlobalReceiverV2::~GlobalReceiverV2()
// leading to the object being deleted, which emits destroyed(), which would try to invoke
// the already deleted callback, and also try to delete the object again.
DynamicSlotDataV2 *data = m_data;
- m_data = Q_NULLPTR;
+ m_data = nullptr;
delete data;
}
diff --git a/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h
index 3593094f8..6cc152425 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetabuilder_p.h
@@ -157,8 +157,8 @@ public:
qint64 findOutValueFromString(const QString &stringValue, bool &ok);
AbstractMetaClass *findTemplateClass(const QString& name, const AbstractMetaClass *context,
- TypeInfo *info = Q_NULLPTR,
- ComplexTypeEntry **baseContainerType = Q_NULLPTR) const;
+ TypeInfo *info = nullptr,
+ ComplexTypeEntry **baseContainerType = nullptr) const;
AbstractMetaClassCList getBaseClasses(const AbstractMetaClass *metaClass) const;
static bool inheritTemplate(AbstractMetaClass *subclass,
diff --git a/sources/shiboken6/ApiExtractor/tests/testutil.h b/sources/shiboken6/ApiExtractor/tests/testutil.h
index e19517e85..347143b7a 100644
--- a/sources/shiboken6/ApiExtractor/tests/testutil.h
+++ b/sources/shiboken6/ApiExtractor/tests/testutil.h
@@ -34,7 +34,7 @@ namespace TestUtil
// parse typesystem
buffer.setData(xmlCode);
if (!buffer.open(QIODevice::ReadOnly))
- return Q_NULLPTR;
+ return nullptr;
if (!td->parseFile(&buffer))
return nullptr;
buffer.close();
diff --git a/sources/shiboken6/ApiExtractor/typeparser.cpp b/sources/shiboken6/ApiExtractor/typeparser.cpp
index 10f102b08..ebc1662c5 100644
--- a/sources/shiboken6/ApiExtractor/typeparser.cpp
+++ b/sources/shiboken6/ApiExtractor/typeparser.cpp
@@ -37,7 +37,7 @@ public:
{
}
- Token nextToken(QString *errorMessage = Q_NULLPTR);
+ Token nextToken(QString *errorMessage = nullptr);
QString identifier() const;
QString msgParseError(const QString &why) const;