From 20e93ad5969d3dff85f0ef9e16830aee337ca075 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 13 Apr 2018 13:19:35 +0200 Subject: Fix DirectShow COM class hierarchy Remove the class DirectShowObject. Move the ref counting code to a macro COM_REF_MIXIN that is used for the classes that are actually instantiated. Fix warnings: common/directshowpin.h(56,5): warning: 'reinterpret_cast' from class 'DirectShowPin *' to its base at non-zero offset 'IUnknown *' behaves differently from 'static_cast' [-Wreinterpret-base-class] DIRECTSHOW_OBJECT ^~~~~~~~~~~~~~~~~ common/directshowobject.h(69,33): note: expanded from macro 'DIRECTSHOW_OBJECT' return GetInterface(reinterpret_cast(this), ppv); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ common/directshowpin.h(56,5): note: use 'static_cast' to adjust the pointer correctly while upcasting Task-number: QTBUG-63512 Task-number: QTBUG-64157 Change-Id: Ibef143d675cd169b78fe46ff5a0c83f6e3434487 Reviewed-by: VaL Doroshchuk Reviewed-by: Oliver Wolff --- src/plugins/directshow/common/common.pri | 1 - 1 file changed, 1 deletion(-) (limited to 'src/plugins/directshow/common/common.pri') diff --git a/src/plugins/directshow/common/common.pri b/src/plugins/directshow/common/common.pri index 06f8582ac..43acff8a5 100644 --- a/src/plugins/directshow/common/common.pri +++ b/src/plugins/directshow/common/common.pri @@ -20,7 +20,6 @@ SOURCES += \ $$PWD/directshoweventloop.cpp \ $$PWD/directshowmediatype.cpp \ $$PWD/directshowmediatypeenum.cpp \ - $$PWD/directshowobject.cpp \ $$PWD/directshowpin.cpp \ $$PWD/directshowpinenum.cpp \ $$PWD/directshowvideobuffer.cpp \ -- cgit v1.2.3