diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-04 14:45:46 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-04 15:47:22 +0200 |
| commit | 5870a1e742b587ee8ee179037e70dd0ced82e6c7 (patch) | |
| tree | 19f9e49ea4cdffd9642c8c8ed04087407dcd5d08 /src/activeqt/container/qaxobject.cpp | |
| parent | 20f6c67635240865d33a370230a156de0f051d07 (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/container/qaxobject.cpp')
| -rw-r--r-- | src/activeqt/container/qaxobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/activeqt/container/qaxobject.cpp b/src/activeqt/container/qaxobject.cpp index 6389956..97a995d 100644 --- a/src/activeqt/container/qaxobject.cpp +++ b/src/activeqt/container/qaxobject.cpp @@ -92,7 +92,7 @@ QT_BEGIN_NAMESPACE const QMetaObject QAxObject::staticMetaObject = { { &QObject::staticMetaObject, qt_meta_stringdata_QAxBase.data, - qt_meta_data_QAxBase, qt_static_metacall, 0, 0 } + qt_meta_data_QAxBase, qt_static_metacall, nullptr, nullptr } }; /*! @@ -221,14 +221,14 @@ bool QAxObject::doVerb(const QString &verb) { if (!verbs().contains(verb)) return false; - IOleObject *ole = 0; + IOleObject *ole = nullptr; queryInterface(IID_IOleObject, reinterpret_cast<void **>(&ole)); if (!ole) return false; LONG index = indexOfVerb(verb); - HRESULT hres = ole->DoVerb(index, 0, 0, 0, 0, 0); + HRESULT hres = ole->DoVerb(index, nullptr, nullptr, 0, nullptr, nullptr); ole->Release(); |