From b07a990e51f9bef637cfdcb31b904c223d7ce738 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 27 Mar 2019 09:02:15 +0100 Subject: loplugin:typedefparam (clang-cl) Change-Id: I07604028845c49cc084927e21db7f21c5d053bab Reviewed-on: https://gerrit.libreoffice.org/69796 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- dtrans/source/win32/dtobj/APNDataObject.cxx | 16 ++++++++-------- dtrans/source/win32/dtobj/APNDataObject.hxx | 16 ++++++++-------- dtrans/source/win32/dtobj/FmtFilter.cxx | 2 +- dtrans/source/win32/dtobj/XNotifyingDataObject.cxx | 16 ++++++++-------- dtrans/source/win32/dtobj/XNotifyingDataObject.hxx | 16 ++++++++-------- dtrans/source/win32/dtobj/XTDataObject.cxx | 20 ++++++++++---------- dtrans/source/win32/dtobj/XTDataObject.hxx | 20 ++++++++++---------- 7 files changed, 53 insertions(+), 53 deletions(-) (limited to 'dtrans') diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx index f511c48c3894..9759e78ee8bf 100644 --- a/dtrans/source/win32/dtobj/APNDataObject.cxx +++ b/dtrans/source/win32/dtobj/APNDataObject.cxx @@ -98,7 +98,7 @@ CAPNDataObject::~CAPNDataObject( ) // IUnknown->QueryInterface -STDMETHODIMP CAPNDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject ) +STDMETHODIMP CAPNDataObject::QueryInterface( REFIID iid, void** ppvObject ) { OSL_ASSERT( nullptr != ppvObject ); @@ -141,7 +141,7 @@ STDMETHODIMP_(ULONG) CAPNDataObject::Release( ) // IDataObject->GetData -STDMETHODIMP CAPNDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) +STDMETHODIMP CAPNDataObject::GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) { HRESULT hr = m_rIDataObjectOrg->GetData( pFormatetc, pmedium ); @@ -175,7 +175,7 @@ STDMETHODIMP CAPNDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** // IDataObject->QueryGetData -STDMETHODIMP CAPNDataObject::QueryGetData( LPFORMATETC pFormatetc ) +STDMETHODIMP CAPNDataObject::QueryGetData( FORMATETC * pFormatetc ) { HRESULT hr = m_rIDataObjectOrg->QueryGetData( pFormatetc ); @@ -192,7 +192,7 @@ STDMETHODIMP CAPNDataObject::QueryGetData( LPFORMATETC pFormatetc ) // IDataObject->GetDataHere -STDMETHODIMP CAPNDataObject::GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) +STDMETHODIMP CAPNDataObject::GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) { HRESULT hr = m_rIDataObjectOrg->GetDataHere(pFormatetc, pmedium); @@ -209,7 +209,7 @@ STDMETHODIMP CAPNDataObject::GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pm // IDataObject->GetCanonicalFormatEtc -STDMETHODIMP CAPNDataObject::GetCanonicalFormatEtc(LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut) +STDMETHODIMP CAPNDataObject::GetCanonicalFormatEtc(FORMATETC * pFormatectIn, FORMATETC * pFormatetcOut) { HRESULT hr = m_rIDataObjectOrg->GetCanonicalFormatEtc( pFormatectIn, pFormatetcOut ); @@ -226,7 +226,7 @@ STDMETHODIMP CAPNDataObject::GetCanonicalFormatEtc(LPFORMATETC pFormatectIn, LPF // IDataObject->SetData -STDMETHODIMP CAPNDataObject::SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease ) +STDMETHODIMP CAPNDataObject::SetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium, BOOL fRelease ) { HRESULT hr = m_rIDataObjectOrg->SetData( pFormatetc, pmedium, fRelease ); @@ -243,7 +243,7 @@ STDMETHODIMP CAPNDataObject::SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmediu // IDataObject->DAdvise -STDMETHODIMP CAPNDataObject::DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD * pdwConnection ) +STDMETHODIMP CAPNDataObject::DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD * pdwConnection ) { HRESULT hr = m_rIDataObjectOrg->DAdvise(pFormatetc, advf, pAdvSink, pdwConnection); @@ -277,7 +277,7 @@ STDMETHODIMP CAPNDataObject::DUnadvise( DWORD dwConnection ) // IDataObject->EnumDAdvise -STDMETHODIMP CAPNDataObject::EnumDAdvise( LPENUMSTATDATA * ppenumAdvise ) +STDMETHODIMP CAPNDataObject::EnumDAdvise( IEnumSTATDATA ** ppenumAdvise ) { HRESULT hr = m_rIDataObjectOrg->EnumDAdvise(ppenumAdvise); diff --git a/dtrans/source/win32/dtobj/APNDataObject.hxx b/dtrans/source/win32/dtobj/APNDataObject.hxx index 534bead593b3..f7a712e84e5b 100644 --- a/dtrans/source/win32/dtobj/APNDataObject.hxx +++ b/dtrans/source/win32/dtobj/APNDataObject.hxx @@ -37,21 +37,21 @@ public: //IUnknown interface methods - STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject) override; + STDMETHODIMP QueryInterface(REFIID iid, void** ppvObject) override; STDMETHODIMP_( ULONG ) AddRef( ) override; STDMETHODIMP_( ULONG ) Release( ) override; // IDataObject interface methods - STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override; - STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override; - STDMETHODIMP QueryGetData( LPFORMATETC pFormatetc ) override; - STDMETHODIMP GetCanonicalFormatEtc( LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut ) override; - STDMETHODIMP SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease ) override; + STDMETHODIMP GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override; + STDMETHODIMP GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override; + STDMETHODIMP QueryGetData( FORMATETC * pFormatetc ) override; + STDMETHODIMP GetCanonicalFormatEtc( FORMATETC * pFormatectIn, FORMATETC * pFormatetcOut ) override; + STDMETHODIMP SetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium, BOOL fRelease ) override; STDMETHODIMP EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc ) override; - STDMETHODIMP DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD* pdwConnection ) override; + STDMETHODIMP DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD* pdwConnection ) override; STDMETHODIMP DUnadvise( DWORD dwConnection ) override; - STDMETHODIMP EnumDAdvise( LPENUMSTATDATA* ppenumAdvise ) override; + STDMETHODIMP EnumDAdvise( IEnumSTATDATA** ppenumAdvise ) override; operator IDataObject*( ); diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index 29569230bc8a..a38c6204ef25 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -372,7 +372,7 @@ static ByteSequence_t FileListToByteSequence(const std::vector& fi return bseq; } -ByteSequence_t CF_HDROPToFileList(HGLOBAL hGlobal) +css::uno::Sequence CF_HDROPToFileList(HGLOBAL hGlobal) { UINT nFiles = DragQueryFileW(static_cast(hGlobal), 0xFFFFFFFF, nullptr, 0); std::vector files; diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx index 9a181d197bcb..46f563f9497c 100644 --- a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx +++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx @@ -40,7 +40,7 @@ CXNotifyingDataObject::CXNotifyingDataObject( { } -STDMETHODIMP CXNotifyingDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject ) +STDMETHODIMP CXNotifyingDataObject::QueryInterface( REFIID iid, void** ppvObject ) { if ( nullptr == ppvObject ) return E_INVALIDARG; @@ -80,7 +80,7 @@ STDMETHODIMP_(ULONG) CXNotifyingDataObject::Release( ) return nRefCnt; } -STDMETHODIMP CXNotifyingDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) +STDMETHODIMP CXNotifyingDataObject::GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) { return m_aIDataObject->GetData(pFormatetc, pmedium); } @@ -91,28 +91,28 @@ STDMETHODIMP CXNotifyingDataObject::EnumFormatEtc( return m_aIDataObject->EnumFormatEtc(dwDirection, ppenumFormatetc); } -STDMETHODIMP CXNotifyingDataObject::QueryGetData( LPFORMATETC pFormatetc ) +STDMETHODIMP CXNotifyingDataObject::QueryGetData( FORMATETC * pFormatetc ) { return m_aIDataObject->QueryGetData(pFormatetc); } -STDMETHODIMP CXNotifyingDataObject::GetDataHere( LPFORMATETC lpFetc, LPSTGMEDIUM lpStgMedium ) +STDMETHODIMP CXNotifyingDataObject::GetDataHere( FORMATETC * lpFetc, STGMEDIUM * lpStgMedium ) { return m_aIDataObject->GetDataHere(lpFetc, lpStgMedium); } -STDMETHODIMP CXNotifyingDataObject::GetCanonicalFormatEtc( LPFORMATETC lpFetc, LPFORMATETC lpCanonicalFetc ) +STDMETHODIMP CXNotifyingDataObject::GetCanonicalFormatEtc( FORMATETC * lpFetc, FORMATETC * lpCanonicalFetc ) { return m_aIDataObject->GetCanonicalFormatEtc(lpFetc, lpCanonicalFetc); } -STDMETHODIMP CXNotifyingDataObject::SetData( LPFORMATETC lpFetc, LPSTGMEDIUM lpStgMedium, BOOL bRelease ) +STDMETHODIMP CXNotifyingDataObject::SetData( FORMATETC * lpFetc, STGMEDIUM * lpStgMedium, BOOL bRelease ) { return m_aIDataObject->SetData( lpFetc, lpStgMedium, bRelease ); } STDMETHODIMP CXNotifyingDataObject::DAdvise( - LPFORMATETC lpFetc, DWORD advf, LPADVISESINK lpAdvSink, DWORD* pdwConnection ) + FORMATETC * lpFetc, DWORD advf, IAdviseSink * lpAdvSink, DWORD* pdwConnection ) { return m_aIDataObject->DAdvise( lpFetc, advf, lpAdvSink, pdwConnection ); } @@ -122,7 +122,7 @@ STDMETHODIMP CXNotifyingDataObject::DUnadvise( DWORD dwConnection ) return m_aIDataObject->DUnadvise( dwConnection ); } -STDMETHODIMP CXNotifyingDataObject::EnumDAdvise( LPENUMSTATDATA * ppenumAdvise ) +STDMETHODIMP CXNotifyingDataObject::EnumDAdvise( IEnumSTATDATA ** ppenumAdvise ) { return m_aIDataObject->EnumDAdvise( ppenumAdvise ); } diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx index b6439f0641af..0d72c760f4c2 100644 --- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx +++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx @@ -53,20 +53,20 @@ public: // ole interface implementation //IUnknown interface methods - STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject) override; + STDMETHODIMP QueryInterface(REFIID iid, void** ppvObject) override; STDMETHODIMP_( ULONG ) AddRef( ) override; STDMETHODIMP_( ULONG ) Release( ) override; // IDataObject interface methods - STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override; - STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override; - STDMETHODIMP QueryGetData( LPFORMATETC pFormatetc ) override; - STDMETHODIMP GetCanonicalFormatEtc( LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut ) override; - STDMETHODIMP SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease ) override; + STDMETHODIMP GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override; + STDMETHODIMP GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override; + STDMETHODIMP QueryGetData( FORMATETC * pFormatetc ) override; + STDMETHODIMP GetCanonicalFormatEtc( FORMATETC * pFormatectIn, FORMATETC * pFormatetcOut ) override; + STDMETHODIMP SetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium, BOOL fRelease ) override; STDMETHODIMP EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc ) override; - STDMETHODIMP DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD* pdwConnection ) override; + STDMETHODIMP DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD* pdwConnection ) override; STDMETHODIMP DUnadvise( DWORD dwConnection ) override; - STDMETHODIMP EnumDAdvise( LPENUMSTATDATA* ppenumAdvise ) override; + STDMETHODIMP EnumDAdvise( IEnumSTATDATA** ppenumAdvise ) override; operator IDataObject*( ); diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx index 50d84c5da619..d6291b526498 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.cxx +++ b/dtrans/source/win32/dtobj/XTDataObject.cxx @@ -201,7 +201,7 @@ CXTDataObject::~CXTDataObject() // IUnknown->QueryInterface -STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject ) +STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, void** ppvObject ) { if ( nullptr == ppvObject ) return E_INVALIDARG; @@ -240,7 +240,7 @@ STDMETHODIMP_(ULONG) CXTDataObject::Release( ) return nRefCnt; } -STDMETHODIMP CXTDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) +STDMETHODIMP CXTDataObject::GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) { if ( !(pFormatetc && pmedium) ) return E_INVALIDARG; @@ -569,7 +569,7 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc( // IDataObject->QueryGetData -STDMETHODIMP CXTDataObject::QueryGetData( LPFORMATETC pFormatetc ) +STDMETHODIMP CXTDataObject::QueryGetData( FORMATETC * pFormatetc ) { if ( (nullptr == pFormatetc) || IsBadReadPtr( pFormatetc, sizeof( FORMATETC ) ) ) return E_INVALIDARG; @@ -582,28 +582,28 @@ STDMETHODIMP CXTDataObject::QueryGetData( LPFORMATETC pFormatetc ) // IDataObject->GetDataHere -STDMETHODIMP CXTDataObject::GetDataHere( LPFORMATETC, LPSTGMEDIUM ) +STDMETHODIMP CXTDataObject::GetDataHere( FORMATETC *, STGMEDIUM * ) { return E_NOTIMPL; } // IDataObject->GetCanonicalFormatEtc -STDMETHODIMP CXTDataObject::GetCanonicalFormatEtc( LPFORMATETC, LPFORMATETC ) +STDMETHODIMP CXTDataObject::GetCanonicalFormatEtc( FORMATETC *, FORMATETC * ) { return E_NOTIMPL; } // IDataObject->SetData -STDMETHODIMP CXTDataObject::SetData( LPFORMATETC, LPSTGMEDIUM, BOOL ) +STDMETHODIMP CXTDataObject::SetData( FORMATETC *, STGMEDIUM *, BOOL ) { return E_NOTIMPL; } // IDataObject->DAdvise -STDMETHODIMP CXTDataObject::DAdvise( LPFORMATETC, DWORD, LPADVISESINK, DWORD * ) +STDMETHODIMP CXTDataObject::DAdvise( FORMATETC *, DWORD, IAdviseSink *, DWORD * ) { return E_NOTIMPL; } @@ -617,7 +617,7 @@ STDMETHODIMP CXTDataObject::DUnadvise( DWORD ) // IDataObject->EnumDAdvise -STDMETHODIMP CXTDataObject::EnumDAdvise( LPENUMSTATDATA * ) +STDMETHODIMP CXTDataObject::EnumDAdvise( IEnumSTATDATA ** ) { return E_NOTIMPL; } @@ -665,7 +665,7 @@ CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN lpUnkOuter, const CFormatEtcContainer& // IUnknown->QueryInterface -STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject ) +STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, void** ppvObject ) { if ( nullptr == ppvObject ) return E_INVALIDARG; @@ -710,7 +710,7 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( ) // IEnumFORMATETC->Next -STDMETHODIMP CEnumFormatEtc::Next( ULONG nRequested, LPFORMATETC lpDest, ULONG* lpFetched ) +STDMETHODIMP CEnumFormatEtc::Next( ULONG nRequested, FORMATETC * lpDest, ULONG* lpFetched ) { if ( ( nRequested < 1 ) || (( nRequested > 1 ) && ( nullptr == lpFetched )) || diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx index d9979e7cfebb..4fdd1149e9c2 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.hxx +++ b/dtrans/source/win32/dtobj/XTDataObject.hxx @@ -66,20 +66,20 @@ public: // ole interface implementation //IUnknown interface methods - STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject) override; + STDMETHODIMP QueryInterface(REFIID iid, void** ppvObject) override; STDMETHODIMP_( ULONG ) AddRef( ) override; STDMETHODIMP_( ULONG ) Release( ) override; // IDataObject interface methods - STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override; - STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override; - STDMETHODIMP QueryGetData( LPFORMATETC pFormatetc ) override; - STDMETHODIMP GetCanonicalFormatEtc( LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut ) override; - STDMETHODIMP SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease ) override; + STDMETHODIMP GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override; + STDMETHODIMP GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override; + STDMETHODIMP QueryGetData( FORMATETC * pFormatetc ) override; + STDMETHODIMP GetCanonicalFormatEtc( FORMATETC * pFormatectIn, FORMATETC * pFormatetcOut ) override; + STDMETHODIMP SetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium, BOOL fRelease ) override; STDMETHODIMP EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc ) override; - STDMETHODIMP DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD* pdwConnection ) override; + STDMETHODIMP DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD* pdwConnection ) override; STDMETHODIMP DUnadvise( DWORD dwConnection ) override; - STDMETHODIMP EnumDAdvise( LPENUMSTATDATA* ppenumAdvise ) override; + STDMETHODIMP EnumDAdvise( IEnumSTATDATA** ppenumAdvise ) override; operator IDataObject*( ); @@ -114,12 +114,12 @@ public: virtual ~CEnumFormatEtc() {} // IUnknown - STDMETHODIMP QueryInterface( REFIID iid, LPVOID* ppvObject ) override; + STDMETHODIMP QueryInterface( REFIID iid, void** ppvObject ) override; STDMETHODIMP_( ULONG ) AddRef( ) override; STDMETHODIMP_( ULONG ) Release( ) override; //IEnumFORMATETC - STDMETHODIMP Next( ULONG nRequested, LPFORMATETC lpDest, ULONG* lpFetched ) override; + STDMETHODIMP Next( ULONG nRequested, FORMATETC * lpDest, ULONG* lpFetched ) override; STDMETHODIMP Skip( ULONG celt ) override; STDMETHODIMP Reset( ) override; STDMETHODIMP Clone( IEnumFORMATETC** ppenum ) override; -- cgit