diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-22 14:21:54 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-22 13:53:39 +0000 |
| commit | 2faaec4e061c7f531624cad3cba5921ed3a51b20 (patch) | |
| tree | db64708234b86488b75d0da1c7148e37744a5e14 /src/activeqt/container/qaxobject.cpp | |
| parent | ff0f9e1b390fa391e85d379aff767309bb916526 (diff) | |
Fix warnings as shown by Qt Creator's Clang based code model.
Remove C-style casts and fix integer conversion issues.
Task-number: QTBUG-50804
Change-Id: Ib5913bc5262a2c141f34d9f70fe6ec4139a63e4f
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
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 a2ea2dd..dc5189c 100644 --- a/src/activeqt/container/qaxobject.cpp +++ b/src/activeqt/container/qaxobject.cpp @@ -162,8 +162,8 @@ const QMetaObject *QAxObject::parentMetaObject() const */ void *QAxObject::qt_metacast(const char *cname) { - if (!qstrcmp(cname, "QAxObject")) return (void*)this; - if (!qstrcmp(cname, "QAxBase")) return (QAxBase*)this; + if (!qstrcmp(cname, "QAxObject")) return static_cast<void *>(this); + if (!qstrcmp(cname, "QAxBase")) return static_cast<QAxBase *>(this); return QObject::qt_metacast(cname); } @@ -212,7 +212,7 @@ bool QAxObject::doVerb(const QString &verb) if (!verbs().contains(verb)) return false; IOleObject *ole = 0; - queryInterface(IID_IOleObject, (void**)&ole); + queryInterface(IID_IOleObject, reinterpret_cast<void **>(&ole)); if (!ole) return false; |