Remove QWindowsComBase
QWindowsComBase is now replaced with QComObject Change-Id: Ieb54b357fc4d658b751a35f0ba06df777617aafc Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>bb10
parent
0041ddce74
commit
8e4f795e49
|
|
@ -12,7 +12,6 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
|
|||
../windows/qtwindowsglobal.h
|
||||
../windows/qwin10helpers.cpp ../windows/qwin10helpers.h
|
||||
../windows/qwindowsapplication.cpp ../windows/qwindowsapplication.h
|
||||
../windows/qwindowscombase.h
|
||||
../windows/qwindowscontext.cpp ../windows/qwindowscontext.h
|
||||
../windows/qwindowscursor.cpp ../windows/qwindowscursor.h
|
||||
../windows/qwindowsdialoghelpers.cpp ../windows/qwindowsdialoghelpers.h
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
|
|||
qwin10helpers.cpp qwin10helpers.h
|
||||
qwindowsapplication.cpp qwindowsapplication.h
|
||||
qwindowsbackingstore.cpp qwindowsbackingstore.h
|
||||
qwindowscombase.h
|
||||
qwindowscontext.cpp qwindowscontext.h
|
||||
qwindowscursor.cpp qwindowscursor.h
|
||||
qwindowsdialoghelpers.cpp qwindowsdialoghelpers.h
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
// Copyright (C) 2017 The Qt Company Ltd.
|
||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
#ifndef QWINDOWSCOMBASE_H
|
||||
#define QWINDOWSCOMBASE_H
|
||||
|
||||
#include <qt_windows.h>
|
||||
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
#include <unknwn.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
// The __uuidof operator of MinGW does not work for all interfaces (for example,
|
||||
// IAccessible2). Specializations of this function can be provides to work
|
||||
// around this.
|
||||
template <class DesiredInterface>
|
||||
static IID qUuidOf() { return __uuidof(DesiredInterface); }
|
||||
|
||||
// Helper for implementing IUnknown::QueryInterface.
|
||||
template <class DesiredInterface, class Derived>
|
||||
bool qWindowsComQueryInterface(Derived *d, REFIID id, LPVOID *iface)
|
||||
{
|
||||
if (id == qUuidOf<DesiredInterface>()) {
|
||||
*iface = static_cast<DesiredInterface *>(d);
|
||||
d->AddRef();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// Helper for implementing IUnknown::QueryInterface for IUnknown
|
||||
// in the case of multiple inheritance via the first inherited class.
|
||||
template <class FirstInheritedInterface, class Derived>
|
||||
bool qWindowsComQueryUnknownInterfaceMulti(Derived *d, REFIID id, LPVOID *iface)
|
||||
{
|
||||
if (id == __uuidof(IUnknown)) {
|
||||
*iface = static_cast<FirstInheritedInterface *>(d);
|
||||
d->AddRef();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// Clang does not consider __declspec(nothrow) as nothrow
|
||||
QT_WARNING_DISABLE_CLANG("-Wmicrosoft-exception-spec")
|
||||
QT_WARNING_DISABLE_CLANG("-Wmissing-exception-spec")
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QWINDOWSCOMBASE_H
|
||||
Loading…
Reference in New Issue