summaryrefslogtreecommitdiffstats
path: root/src/activeqt/control/qaxfactory.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-04 14:45:46 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-06-04 15:47:22 +0200
commit5870a1e742b587ee8ee179037e70dd0ced82e6c7 (patch)
tree19f9e49ea4cdffd9642c8c8ed04087407dcd5d08 /src/activeqt/control/qaxfactory.cpp
parent20f6c67635240865d33a370230a156de0f051d07 (diff)
Introduce nullptr
Apply Fixits by Qt Creator with some amendments. Change-Id: Ia47cee2d55432ddc14635aa593c52d80ab39cc82 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/activeqt/control/qaxfactory.cpp')
-rw-r--r--src/activeqt/control/qaxfactory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/control/qaxfactory.cpp b/src/activeqt/control/qaxfactory.cpp
index 76f0a82..2faf508 100644
--- a/src/activeqt/control/qaxfactory.cpp
+++ b/src/activeqt/control/qaxfactory.cpp
@@ -458,7 +458,7 @@ public:
};
ActiveObject::ActiveObject(QObject *parent, QAxFactory *factory)
-: QObject(parent), wrapper(0), cookie(0)
+: QObject(parent), wrapper(nullptr), cookie(0)
{
QLatin1String key(parent->metaObject()->className());
@@ -470,7 +470,7 @@ ActiveObject::ActiveObject(QObject *parent, QAxFactory *factory)
ActiveObject::~ActiveObject()
{
if (cookie)
- RevokeActiveObject(cookie, 0);
+ RevokeActiveObject(cookie, nullptr);
if (wrapper)
wrapper->Release();
}