summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Client/Code/Shared
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@qt.io>2017-10-30 10:12:59 +0200
committerJanne Koskinen <janne.p.koskinen@qt.io>2017-10-30 11:15:47 +0000
commitc4c7b23ad8ec1b0ddb8c54770ba5a6c4732984cd (patch)
tree99cc19d0451332a2ba25fc9d860f10eee006680d /src/Authoring/Client/Code/Shared
parentcf6f32bb7078988f2fe212433929891c008f5d1b (diff)
Remove ATL and unused logging utility
Remove ATL as we don't use MFC anymore and remove COM based logging that hasn't worked. Change-Id: I3112e35da9471c7598aaa0e82d977c6e75c71531 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Client/Code/Shared')
-rw-r--r--src/Authoring/Client/Code/Shared/Log/LogHelper.cpp202
-rw-r--r--src/Authoring/Client/Code/Shared/Log/LogHelper.h60
-rw-r--r--src/Authoring/Client/Code/Shared/Log/LogProject.h400
-rw-r--r--src/Authoring/Client/Code/Shared/Log/Qt3DSLog.h119
4 files changed, 0 insertions, 781 deletions
diff --git a/src/Authoring/Client/Code/Shared/Log/LogHelper.cpp b/src/Authoring/Client/Code/Shared/Log/LogHelper.cpp
deleted file mode 100644
index 816e036c..00000000
--- a/src/Authoring/Client/Code/Shared/Log/LogHelper.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 1999-2001 NVIDIA Corporation.
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//==============================================================================
-// Prefix
-//==============================================================================
-
-#include "stdafx.h"
-
-//==============================================================================
-// Includes
-//==============================================================================
-
-#include "LogHelper.h"
-#include "Qt3DSMath.h"
-
-//==============================================================================
-// Statics
-//==============================================================================
-
-IQt3DSLog2 *CLogHelper::s_qt3dsLog2;
-
-//==============================================================================
-// Methods
-//==============================================================================
-
-#ifdef WIN32
-
-void CLogHelper::Log(long inLogType, const wchar_t *inFileName, long inLineNumber,
- long inCategoryType, const wchar_t *inLogString, ...)
-{
- if (s_qt3dsLog2 != NULL) {
- TSAddEntryIndirect theAddEntryIndirectStruct = { 0 };
-
- theAddEntryIndirectStruct.m_StructSize = sizeof(theAddEntryIndirectStruct);
- // theAddEntryIndirectStruct.m_LogStringId // not used
- wcsncpy(theAddEntryIndirectStruct.m_LogString, inLogString,
- Q3DStudio::MIN((size_t)MAX_PATH, wcslen(inLogString)));
- va_start(theAddEntryIndirectStruct.m_LogParamList, inLogString);
- wcsncpy(theAddEntryIndirectStruct.m_FileNameString, inFileName,
- Q3DStudio::MIN((size_t)MAX_PATH, wcslen(inFileName)));
- theAddEntryIndirectStruct.m_LineNumberLong = inLineNumber;
- theAddEntryIndirectStruct.m_Mask = QT3DS_LOG_STRING;
- theAddEntryIndirectStruct.m_Level = LOGLEVEL_CRITICAL;
- theAddEntryIndirectStruct.m_LogType = inLogType;
- theAddEntryIndirectStruct.m_CategoryType = inCategoryType;
-
- s_qt3dsLog2->AddEntryIndirect((long)&theAddEntryIndirectStruct);
-
- va_end(theAddEntryIndirectStruct.m_LogParamList);
- }
-}
-
-void CLogHelper::Log(long inLogType, const wchar_t *inFileName, long inLineNumber,
- long inCategoryType, long inStringId, ...)
-{
- if (s_qt3dsLog2 != NULL) {
- TSAddEntryIndirect theAddEntryIndirectStruct = { 0 };
-
- theAddEntryIndirectStruct.m_StructSize = sizeof(theAddEntryIndirectStruct);
- theAddEntryIndirectStruct.m_LogStringId = inStringId;
-
- va_start(theAddEntryIndirectStruct.m_LogParamList, inStringId);
- wcsncpy(theAddEntryIndirectStruct.m_FileNameString, inFileName,
- Q3DStudio::MIN((size_t)MAX_PATH, wcslen(inFileName)));
- theAddEntryIndirectStruct.m_LineNumberLong = inLineNumber;
- theAddEntryIndirectStruct.m_Mask = QT3DS_LOG_ID;
- theAddEntryIndirectStruct.m_Level = LOGLEVEL_CRITICAL;
- theAddEntryIndirectStruct.m_LogType = inLogType;
- theAddEntryIndirectStruct.m_CategoryType = inCategoryType;
-
- s_qt3dsLog2->AddEntryIndirect((long)&theAddEntryIndirectStruct);
-
- va_end(theAddEntryIndirectStruct.m_LogParamList);
- }
-}
-
-void CLogHelper::Trace(long inCategoryType, const wchar_t *inLogString, ...)
-{
- try {
- if (s_qt3dsLog2 != NULL) {
- TSAddEntryIndirect theAddEntryIndirectStruct = { 0 };
-
- theAddEntryIndirectStruct.m_StructSize = sizeof(theAddEntryIndirectStruct);
- wcsncpy(theAddEntryIndirectStruct.m_LogString, inLogString,
- Q3DStudio::MIN((size_t)MAX_PATH, wcslen(inLogString)));
- va_start(theAddEntryIndirectStruct.m_LogParamList, inLogString);
- theAddEntryIndirectStruct.m_Mask = QT3DS_LOG_STRING;
- theAddEntryIndirectStruct.m_Level = LOGLEVEL_INFO;
- theAddEntryIndirectStruct.m_CategoryType = inCategoryType;
-
- s_qt3dsLog2->AddEntryIndirect((long)&theAddEntryIndirectStruct);
-
- va_end(theAddEntryIndirectStruct.m_LogParamList);
- }
- }
-
- catch (...) {
- }
-}
-
-void CLogHelper::AddEntry(long inType, const wchar_t *inMsg)
-{
- if (s_qt3dsLog2 != NULL) {
- s_qt3dsLog2->AddEntry(inType, (BYTE *)inMsg);
- }
-}
-
-void CLogHelper::Start()
-{
- ::CoInitialize(NULL);
-
- try {
- if (s_qt3dsLog2 == NULL) {
- HRESULT theResult =
- ::CoCreateInstance(__uuidof(Qt3DSLog), NULL, CLSCTX_INPROC_SERVER, __uuidof(IQt3DSLog2),
- reinterpret_cast<void **>(&s_qt3dsLog2));
- if (!s_qt3dsLog2 || S_OK != theResult) {
- ::OutputDebugString(L"FAILED to create Qt3DSLog2 interface.\n");
- }
- }
- }
-
- catch (...) {
- }
-}
-
-void CLogHelper::Stop()
-{
- try {
- if (s_qt3dsLog2) {
- s_qt3dsLog2->Terminate();
- s_qt3dsLog2->Release();
- s_qt3dsLog2 = NULL;
- }
-
- ::CoUninitialize();
- }
-
- catch (...) {
- }
-}
-
-#else
-
-void CLogHelper::Log(long inLogType, const wchar_t *inFileName, long inLineNumber,
- long inCategoryType, const wchar_t *inLogString, ...)
-{
-
-}
-
-void CLogHelper::Log(long inLogType, const wchar_t *inFileName, long inLineNumber,
- long inCategoryType, long inStringId, ...)
-{
-
-}
-
-void CLogHelper::Trace(long inCategoryType, const wchar_t *inLogString, ...)
-{
-
-}
-
-void CLogHelper::AddEntry(long inType, const wchar_t *inMsg)
-{
-
-}
-
-void CLogHelper::Start()
-{
-}
-
-void CLogHelper::Stop()
-{
-}
-
-#endif // WIN32
diff --git a/src/Authoring/Client/Code/Shared/Log/LogHelper.h b/src/Authoring/Client/Code/Shared/Log/LogHelper.h
deleted file mode 100644
index b441d36e..00000000
--- a/src/Authoring/Client/Code/Shared/Log/LogHelper.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 1999-2001 NVIDIA Corporation.
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __QT3DS_LOG_HELPER_H_
-#define __QT3DS_LOG_HELPER_H_
-
-#ifdef WIN32
-#include "LogProject.h"
-#else
-typedef long IQt3DSLog2;
-#endif
-
-//==============================================================================
-/**
- * @class CLogHelper
- * @brief This class provides helper functions to assist with logging.
- */
-//==============================================================================
-class CLogHelper
-{
-public:
- static void Log(long inLogType, const wchar_t *inFileName, long inLineNumber,
- long inCategoryType, const wchar_t *inLogString, ...);
- static void Log(long inLogType, const wchar_t *inFileName, long inLineNumber,
- long inCategoryType, long inStringId, ...);
- static void Trace(long inCategoryType, const wchar_t *inLogString, ...);
- static void AddEntry(long inType, const wchar_t *inMsg);
- static void Start();
- static void Stop();
-
- static IQt3DSLog2 *s_qt3dsLog2;
-};
-
-#endif // __QT3DS_LOG_HELPER_H_
diff --git a/src/Authoring/Client/Code/Shared/Log/LogProject.h b/src/Authoring/Client/Code/Shared/Log/LogProject.h
deleted file mode 100644
index e1d21d9b..00000000
--- a/src/Authoring/Client/Code/Shared/Log/LogProject.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 NVIDIA Corporation.
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#pragma warning(disable : 4049) /* more than 64k source lines */
-
-/* this ALWAYS GENERATED file contains the definitions for the interfaces */
-
-/* File created by MIDL compiler version 5.03.0280 */
-/* at Thu Nov 01 17:29:05 2001
- */
-//@@MIDL_FILE_HEADING( )
-
-/* verify that the <rpcndr.h> version is high enough to compile this file*/
-#ifndef __REQUIRED_RPCNDR_H_VERSION__
-#define __REQUIRED_RPCNDR_H_VERSION__ 440
-#endif
-
-#include "rpc.h"
-#include "rpcndr.h"
-
-#ifndef __RPCNDR_H_VERSION__
-#error this stub requires an updated version of <rpcndr.h>
-#endif // __RPCNDR_H_VERSION__
-
-#ifndef COM_NO_WINDOWS_H
-#include <winsock2.h>
-#include "windows.h"
-#include "ole2.h"
-#endif /*COM_NO_WINDOWS_H*/
-
-#ifndef __LogProject_h__
-#define __LogProject_h__
-
-/* Forward Declarations */
-
-#ifndef __IQt3DSLog_FWD_DEFINED__
-#define __IQt3DSLog_FWD_DEFINED__
-typedef interface IQt3DSLog IQt3DSLog;
-#endif /* __IQt3DSLog_FWD_DEFINED__ */
-
-#ifndef __IQt3DSLog2_FWD_DEFINED__
-#define __IQt3DSLog2_FWD_DEFINED__
-typedef interface IQt3DSLog2 IQt3DSLog2;
-#endif /* __IQt3DSLog2_FWD_DEFINED__ */
-
-#ifndef __QT3DS_Log_FWD_DEFINED__
-#define __QT3DS_Log_FWD_DEFINED__
-
-#ifdef __cplusplus
-typedef class Qt3DSLog Qt3DSLog;
-#else
-typedef struct Qt3DSLog Qt3DSLog;
-#endif /* __cplusplus */
-
-#endif /* __QT3DS_Log_FWD_DEFINED__ */
-
-#ifndef __QT3DS_Log2_FWD_DEFINED__
-#define __QT3DS_Log2_FWD_DEFINED__
-
-#ifdef __cplusplus
-typedef class Qt3DSLog2 Qt3DSLog2;
-#else
-typedef struct Qt3DSLog2 Qt3DSLog2;
-#endif /* __cplusplus */
-
-#endif /* __QT3DS_Log2_FWD_DEFINED__ */
-
-/* header files for imported files */
-#include "oaidl.h"
-#include "ocidl.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void __RPC_FAR *__RPC_USER MIDL_user_allocate(size_t);
-void __RPC_USER MIDL_user_free(void __RPC_FAR *);
-
-#ifndef __IQt3DSLog_INTERFACE_DEFINED__
-#define __IQt3DSLog_INTERFACE_DEFINED__
-
-/* interface IQt3DSLog */
-/* [unique][helpstring][dual][uuid][object] */
-
-EXTERN_C const IID IID_IQt3DSLog;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-
-MIDL_INTERFACE("B6F844EB-07AF-4CF1-9350-E4A2A6576E0E")
-IQt3DSLog : public IDispatch
-{
-public:
- virtual /* [id] */ HRESULT STDMETHODCALLTYPE AddEntry(
- /* [in] */ DWORD inLogType,
- /* [in] */ BYTE __RPC_FAR * inLogEntry) = 0;
-
- virtual /* [id] */ HRESULT STDMETHODCALLTYPE ReloadPreferences(void) = 0;
-
- virtual /* [id] */ HRESULT STDMETHODCALLTYPE Terminate(void) = 0;
-};
-
-#else /* C style interface */
-
-typedef struct IQt3DSLogVtbl
-{
- BEGIN_INTERFACE
-
- HRESULT(STDMETHODCALLTYPE __RPC_FAR *QueryInterface)
- (IQt3DSLog __RPC_FAR *This,
- /* [in] */ REFIID riid,
- /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-
- ULONG(STDMETHODCALLTYPE __RPC_FAR *AddRef)(IQt3DSLog __RPC_FAR *This);
-
- ULONG(STDMETHODCALLTYPE __RPC_FAR *Release)(IQt3DSLog __RPC_FAR *This);
-
- HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount)
- (IQt3DSLog __RPC_FAR *This,
- /* [out] */ UINT __RPC_FAR *pctinfo);
-
- HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo)
- (IQt3DSLog __RPC_FAR *This,
- /* [in] */ UINT iTInfo,
- /* [in] */ LCID lcid,
- /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
-
- HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames)
- (IQt3DSLog __RPC_FAR *This,
- /* [in] */ REFIID riid,
- /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
- /* [in] */ UINT cNames,
- /* [in] */ LCID lcid,
- /* [size_is][out] */ DISPID __RPC_FAR *rgDispId);
-
- /* [local] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *Invoke)(
- IQt3DSLog __RPC_FAR *This,
- /* [in] */ DISPID dispIdMember,
- /* [in] */ REFIID riid,
- /* [in] */ LCID lcid,
- /* [in] */ WORD wFlags,
- /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams,
- /* [out] */ VARIANT __RPC_FAR *pVarResult,
- /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo,
- /* [out] */ UINT __RPC_FAR *puArgErr);
-
- /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *AddEntry)(
- IQt3DSLog __RPC_FAR *This,
- /* [in] */ DWORD inLogType,
- /* [in] */ BYTE __RPC_FAR *inLogEntry);
-
- /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *ReloadPreferences)(IQt3DSLog __RPC_FAR *This);
-
- /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *Terminate)(IQt3DSLog __RPC_FAR *This);
-
- END_INTERFACE
-} IQt3DSLogVtbl;
-
-interface IQt3DSLog
-{
- CONST_VTBL struct IQt3DSLogVtbl __RPC_FAR *lpVtbl;
-};
-
-#ifdef COBJMACROS
-
-#define IQt3DSLog_QueryInterface(This, riid, ppvObject) \
- (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
-
-#define IQt3DSLog_AddRef(This) (This)->lpVtbl->AddRef(This)
-
-#define IQt3DSLog_Release(This) (This)->lpVtbl->Release(This)
-
-#define IQt3DSLog_GetTypeInfoCount(This, pctinfo) (This)->lpVtbl->GetTypeInfoCount(This, pctinfo)
-
-#define IQt3DSLog_GetTypeInfo(This, iTInfo, lcid, ppTInfo) \
- (This)->lpVtbl->GetTypeInfo(This, iTInfo, lcid, ppTInfo)
-
-#define IQt3DSLog_GetIDsOfNames(This, riid, rgszNames, cNames, lcid, rgDispId) \
- (This)->lpVtbl->GetIDsOfNames(This, riid, rgszNames, cNames, lcid, rgDispId)
-
-#define IQt3DSLog_Invoke(This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, \
- pExcepInfo, puArgErr) \
- (This)->lpVtbl->Invoke(This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, \
- pExcepInfo, puArgErr)
-
-#define IQt3DSLog_AddEntry(This, inLogType, inLogEntry) \
- (This)->lpVtbl->AddEntry(This, inLogType, inLogEntry)
-
-#define IQt3DSLog_ReloadPreferences(This) (This)->lpVtbl->ReloadPreferences(This)
-
-#define IQt3DSLog_Terminate(This) (This)->lpVtbl->Terminate(This)
-
-#endif /* COBJMACROS */
-
-#endif /* C style interface */
-
-/* [id] */ HRESULT STDMETHODCALLTYPE IQt3DSLog_AddEntry_Proxy(IQt3DSLog __RPC_FAR *This,
- /* [in] */ DWORD inLogType,
- /* [in] */ BYTE __RPC_FAR *inLogEntry);
-
-void __RPC_STUB IQt3DSLog_AddEntry_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);
-
-/* [id] */ HRESULT STDMETHODCALLTYPE IQt3DSLog_ReloadPreferences_Proxy(IQt3DSLog __RPC_FAR *This);
-
-void __RPC_STUB IQt3DSLog_ReloadPreferences_Stub(IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);
-
-/* [id] */ HRESULT STDMETHODCALLTYPE IQt3DSLog_Terminate_Proxy(IQt3DSLog __RPC_FAR *This);
-
-void __RPC_STUB IQt3DSLog_Terminate_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);
-
-#endif /* __IQt3DSLog_INTERFACE_DEFINED__ */
-
-#ifndef __IQt3DSLog2_INTERFACE_DEFINED__
-#define __IQt3DSLog2_INTERFACE_DEFINED__
-
-/* interface IQt3DSLog2 */
-/* [unique][helpstring][dual][uuid][object] */
-
-EXTERN_C const IID IID_IQt3DSLog2;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-
-MIDL_INTERFACE("18725949-89C4-460c-A092-75520BFFB542")
-IQt3DSLog2 : public IQt3DSLog
-{
-public:
- virtual /* [id] */ HRESULT STDMETHODCALLTYPE AddEntryIndirect(
- /* [in] */ LONG inStructPtr) = 0;
-};
-
-#else /* C style interface */
-
-typedef struct IQt3DSLog2Vtbl
-{
- BEGIN_INTERFACE
-
- HRESULT(STDMETHODCALLTYPE __RPC_FAR *QueryInterface)
- (IQt3DSLog2 __RPC_FAR *This,
- /* [in] */ REFIID riid,
- /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
-
- ULONG(STDMETHODCALLTYPE __RPC_FAR *AddRef)(IQt3DSLog2 __RPC_FAR *This);
-
- ULONG(STDMETHODCALLTYPE __RPC_FAR *Release)(IQt3DSLog2 __RPC_FAR *This);
-
- HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetTypeInfoCount)
- (IQt3DSLog2 __RPC_FAR *This,
- /* [out] */ UINT __RPC_FAR *pctinfo);
-
- HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetTypeInfo)
- (IQt3DSLog2 __RPC_FAR *This,
- /* [in] */ UINT iTInfo,
- /* [in] */ LCID lcid,
- /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
-
- HRESULT(STDMETHODCALLTYPE __RPC_FAR *GetIDsOfNames)
- (IQt3DSLog2 __RPC_FAR *This,
- /* [in] */ REFIID riid,
- /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames,
- /* [in] */ UINT cNames,
- /* [in] */ LCID lcid,
- /* [size_is][out] */ DISPID __RPC_FAR *rgDispId);
-
- /* [local] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *Invoke)(
- IQt3DSLog2 __RPC_FAR *This,
- /* [in] */ DISPID dispIdMember,
- /* [in] */ REFIID riid,
- /* [in] */ LCID lcid,
- /* [in] */ WORD wFlags,
- /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams,
- /* [out] */ VARIANT __RPC_FAR *pVarResult,
- /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo,
- /* [out] */ UINT __RPC_FAR *puArgErr);
-
- /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *AddEntry)(
- IQt3DSLog2 __RPC_FAR *This,
- /* [in] */ DWORD inLogType,
- /* [in] */ BYTE __RPC_FAR *inLogEntry);
-
- /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *ReloadPreferences)(IQt3DSLog2 __RPC_FAR *This);
-
- /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *Terminate)(IQt3DSLog2 __RPC_FAR *This);
-
- /* [id] */ HRESULT(STDMETHODCALLTYPE __RPC_FAR *AddEntryIndirect)(IQt3DSLog2 __RPC_FAR *This,
- /* [in] */ LONG inStructPtr);
-
- END_INTERFACE
-} IQt3DSLog2Vtbl;
-
-interface IQt3DSLog2
-{
- CONST_VTBL struct IQt3DSLog2Vtbl __RPC_FAR *lpVtbl;
-};
-
-#ifdef COBJMACROS
-
-#define IQt3DSLog2_QueryInterface(This, riid, ppvObject) \
- (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
-
-#define IQt3DSLog2_AddRef(This) (This)->lpVtbl->AddRef(This)
-
-#define IQt3DSLog2_Release(This) (This)->lpVtbl->Release(This)
-
-#define IQt3DSLog2_GetTypeInfoCount(This, pctinfo) (This)->lpVtbl->GetTypeInfoCount(This, pctinfo)
-
-#define IQt3DSLog2_GetTypeInfo(This, iTInfo, lcid, ppTInfo) \
- (This)->lpVtbl->GetTypeInfo(This, iTInfo, lcid, ppTInfo)
-
-#define IQt3DSLog2_GetIDsOfNames(This, riid, rgszNames, cNames, lcid, rgDispId) \
- (This)->lpVtbl->GetIDsOfNames(This, riid, rgszNames, cNames, lcid, rgDispId)
-
-#define IQt3DSLog2_Invoke(This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, \
- pExcepInfo, puArgErr) \
- (This)->lpVtbl->Invoke(This, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, \
- pExcepInfo, puArgErr)
-
-#define IQt3DSLog2_AddEntry(This, inLogType, inLogEntry) \
- (This)->lpVtbl->AddEntry(This, inLogType, inLogEntry)
-
-#define IQt3DSLog2_ReloadPreferences(This) (This)->lpVtbl->ReloadPreferences(This)
-
-#define IQt3DSLog2_Terminate(This) (This)->lpVtbl->Terminate(This)
-
-#define IQt3DSLog2_AddEntryIndirect(This, inStructPtr) \
- (This)->lpVtbl->AddEntryIndirect(This, inStructPtr)
-
-#endif /* COBJMACROS */
-
-#endif /* C style interface */
-
-/* [id] */ HRESULT STDMETHODCALLTYPE IQt3DSLog2_AddEntryIndirect_Proxy(IQt3DSLog2 __RPC_FAR *This,
- /* [in] */ LONG inStructPtr);
-
-void __RPC_STUB IQt3DSLog2_AddEntryIndirect_Stub(IRpcStubBuffer *This,
- IRpcChannelBuffer *_pRpcChannelBuffer,
- PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);
-
-#endif /* __IQt3DSLog2_INTERFACE_DEFINED__ */
-
-#ifndef __LOGPROJECTLib_LIBRARY_DEFINED__
-#define __LOGPROJECTLib_LIBRARY_DEFINED__
-
-/* library LOGPROJECTLib */
-/* [helpstring][version][uuid] */
-
-EXTERN_C const IID LIBID_LOGPROJECTLib;
-
-EXTERN_C const CLSID CLSID_Qt3DSLog;
-
-#ifdef __cplusplus
-
-class DECLSPEC_UUID("DE411D6F-2BDA-444C-AC87-9171BAFD9E99") Qt3DSLog;
-#endif
-
-EXTERN_C const CLSID CLSID_Qt3DSLog2;
-
-#ifdef __cplusplus
-
-class DECLSPEC_UUID("4691F58A-9856-43c6-9269-7A8987AFC715") Qt3DSLog2;
-#endif
-#endif /* __LOGPROJECTLib_LIBRARY_DEFINED__ */
-
-/* Additional Prototypes for ALL interfaces */
-
-/* end of Additional Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/Authoring/Client/Code/Shared/Log/Qt3DSLog.h b/src/Authoring/Client/Code/Shared/Log/Qt3DSLog.h
deleted file mode 100644
index 51901452..00000000
--- a/src/Authoring/Client/Code/Shared/Log/Qt3DSLog.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 1999-2001 NVIDIA Corporation.
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt 3D Studio.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//==============================================================================
-// Prefix
-//==============================================================================
-
-#ifndef _QT3DS_LOG_H__
-#define _QT3DS_LOG_H__
-
-#pragma once
-
-//==============================================================================
-// Includes
-//==============================================================================
-
-#include "Qt3DSExceptions.h"
-
-//==============================================================================
-// Constants
-//==============================================================================
-
-#ifdef QT3DS_NO_LOGGING
-
-#define QT3DS_LOGRAW(inType, inMsg)
-#define QT3DS_LOGMSG(inMsg)
-#define QT3DS_LOGSTART
-#define QT3DS_LOGSTOP
-#define QT3DS_LOGGLOBAL
-#define QT3DS_LOGEXTERN
-#define QT3DS_LOG(inTypeId, inMessage)
-#define QT3DS_LOG1(inTypeId, inMessage, inParam1)
-#define QT3DS_LOG2(inTypeId, inMessage, inParam1, inParam2)
-#define QT3DS_LOGNOTYPE(inMessage)
-#define QT3DS_TRACE
-
-#else // #ifdef QT3DS_NO_LOGGING
-
-#include "LogTypes.h"
-#include "LogHelper.h"
-
-//==============================================================================
-// Macros
-//==============================================================================
-
-// NOTE: Use QT3DS_LOG, QT3DS_LOG1 and QT3DS_LOG2 as defined in UICExceptions.h instead of these.
-
-// Simple log entry with type
-#define QT3DS_LOGRAW(inType, inMsg) CLogHelper::AddEntry(inType, inMsg);
-
-// Simple log entry
-#define QT3DS_LOGMSG(inMsg) QT3DS_LOGRAW(LOGMODE_LOG, inMsg)
-
-// Create or link to singleton logger. Include this once in the startup code for each module
-#define QT3DS_LOGSTART CLogHelper::Start();
-
-// Release COM singleton. Include this once in the startup code for each module
-#define QT3DS_LOGSTOP CLogHelper::Stop();
-
-// Publish global log variable. Include this once OUTSIDE of a method to define the global
-// variable.
-#define QT3DS_LOGGLOBAL
-
-/*
-#define QT3DS_LOGGLOBAL \
- IQt3DSLog2* CLogHelper::s_Qt3DSLog2 = NULL; \
- long CLogHelper::s_Qt3DSLogCount = 0;
-*/
-
-// Publish global log variable. Add this to every file, preferably in stdafx.h
-#define QT3DS_LOGEXTERN
-
-// A log entry with no extra parameters
-#define QT3DS_LOG(inTypeId, inMessage) \
- CLogHelper::Log(LOGMODE_LOG, QT3DS_THIS_FILE, __LINE__, inTypeId, L#inMessage);
-
-// A log entry with one extra parameter
-#define QT3DS_LOG1(inTypeId, inMessage, inParam1) \
- CLogHelper::Log(LOGMODE_LOG, QT3DS_THIS_FILE, __LINE__, inTypeId, L#inMessage, inParam1);
-
-// A log entry with two extra parameters
-#define QT3DS_LOG2(inTypeId, inMessage, inParam1, inParam2) \
- CLogHelper::Log(LOGMODE_LOG, QT3DS_THIS_FILE, __LINE__, inTypeId, L#inMessage, inParam1, \
- inParam2);
-
-// A log entry with no extra parameters
-#define QT3DS_LOGNOTYPE(inMessage) \
- CLogHelper::Log(LOGMODE_LOG, QT3DS_THIS_FILE, __LINE__, 0, L#inMessage);
-
-#define QT3DS_TRACE CLogHelper::Trace
-
-#endif // #ifndef QT3DS_NO_LOGGING
-#endif // #ifndef _QT3DS_LOG_H__