From 71b809959bb8f775d83dc52628448bb8b8322b28 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 14 Apr 2015 12:44:47 +0200 Subject: remove unnecessary use of void in function declarations ie. void f(void); becomes void f(); I used the following command to make the changes: git grep -lP '\(\s*void\s*\)' -- *.cxx \ | xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;' and ran it for both .cxx and .hxx files. Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd --- embedserv/source/embed/docholder.cxx | 10 +++++----- embedserv/source/embed/ed_iinplace.cxx | 6 +++--- embedserv/source/embed/iipaobj.cxx | 4 ++-- embedserv/source/embed/syswinwrapper.cxx | 10 +++++----- embedserv/source/inc/docholder.hxx | 10 +++++----- embedserv/source/inc/iipaobj.hxx | 4 ++-- embedserv/source/inc/syswinwrapper.hxx | 10 +++++----- embedserv/source/inprocserv/advisesink.cxx | 4 ++-- embedserv/source/inprocserv/advisesink.hxx | 8 ++++---- embedserv/source/inprocserv/dllentry.cxx | 4 ++-- embedserv/source/inprocserv/inprocembobj.cxx | 6 +++--- 11 files changed, 38 insertions(+), 38 deletions(-) (limited to 'embedserv') diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 3263c9b4b547..496d08935767 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -419,7 +419,7 @@ HRESULT DocumentHolder::InPlaceActivate( } -void DocumentHolder::InPlaceDeactivate(void) +void DocumentHolder::InPlaceDeactivate() { m_bOnDeactivate = true; @@ -531,7 +531,7 @@ void CopyToOLEMenu(HMENU hOrig,WORD origPos,HMENU hDest,WORD destPos) SetMenuItemInfoW(hDest,(WORD)destPos,TRUE,&mi); } -BOOL DocumentHolder::InPlaceMenuCreate(void) +BOOL DocumentHolder::InPlaceMenuCreate() { HMENU hMenu; UINT i; @@ -586,7 +586,7 @@ BOOL DocumentHolder::InPlaceMenuCreate(void) return TRUE; } -BOOL DocumentHolder::InPlaceMenuDestroy(void) +BOOL DocumentHolder::InPlaceMenuDestroy() { if( NULL == m_nMenuShared ) return TRUE; @@ -597,12 +597,12 @@ BOOL DocumentHolder::InPlaceMenuDestroy(void) return TRUE; } -void DocumentHolder::OpenIntoWindow(void) +void DocumentHolder::OpenIntoWindow() { // not implemented } -BOOL DocumentHolder::Undo(void) +BOOL DocumentHolder::Undo() { // not implemented return false; diff --git a/embedserv/source/embed/ed_iinplace.cxx b/embedserv/source/embed/ed_iinplace.cxx index 5ca62c67f49c..1ea81f2d73bb 100644 --- a/embedserv/source/embed/ed_iinplace.cxx +++ b/embedserv/source/embed/ed_iinplace.cxx @@ -37,7 +37,7 @@ STDMETHODIMP EmbedDocument_Impl::ContextSensitiveHelp(BOOL) return NOERROR; } -STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate(void) +STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate() { // no locking is used since the OLE must use the same thread always if ( m_bIsInVerbHandling ) @@ -54,7 +54,7 @@ STDMETHODIMP EmbedDocument_Impl::InPlaceDeactivate(void) return NOERROR; } -STDMETHODIMP EmbedDocument_Impl::UIDeactivate(void) +STDMETHODIMP EmbedDocument_Impl::UIDeactivate() { // no locking is used since the OLE must use the same thread always if ( m_bIsInVerbHandling ) @@ -79,7 +79,7 @@ STDMETHODIMP EmbedDocument_Impl::SetObjectRects(LPCRECT aRect, LPCRECT aClip) return m_pDocHolder->SetObjectRects(aRect,aClip); } -STDMETHODIMP EmbedDocument_Impl::ReactivateAndUndo(void) +STDMETHODIMP EmbedDocument_Impl::ReactivateAndUndo() { return E_NOTIMPL; } diff --git a/embedserv/source/embed/iipaobj.cxx b/embedserv/source/embed/iipaobj.cxx index cec2d5b11017..43ecad4c0204 100644 --- a/embedserv/source/embed/iipaobj.cxx +++ b/embedserv/source/embed/iipaobj.cxx @@ -56,12 +56,12 @@ STDMETHODIMP CIIAObj::QueryInterface(REFIID riid, LPVOID FAR *ppv) } -STDMETHODIMP_(ULONG) CIIAObj::AddRef(void) +STDMETHODIMP_(ULONG) CIIAObj::AddRef() { return osl_atomic_increment( &m_refCount); } -STDMETHODIMP_(ULONG) CIIAObj::Release(void) +STDMETHODIMP_(ULONG) CIIAObj::Release() { sal_Int32 nCount = osl_atomic_decrement( &m_refCount); if ( nCount == 0 ) diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx index dd124b1278a0..d493dd93218b 100644 --- a/embedserv/source/embed/syswinwrapper.cxx +++ b/embedserv/source/embed/syswinwrapper.cxx @@ -60,7 +60,7 @@ winwrap::CWindow::CWindow(HINSTANCE hInst) return; } -winwrap::CWindow::~CWindow(void) +winwrap::CWindow::~CWindow() { if (IsWindow(m_hWnd)) DestroyWindow(m_hWnd); @@ -80,7 +80,7 @@ winwrap::CWindow::~CWindow(void) * HWND Window handle for this object */ -HWND winwrap::CWindow::Window(void) +HWND winwrap::CWindow::Window() { return m_hWnd; } @@ -97,7 +97,7 @@ HWND winwrap::CWindow::Window(void) * HINSTANCE Instance handle of the module stored here. */ -HINSTANCE winwrap::CWindow::Instance(void) +HINSTANCE winwrap::CWindow::Instance() { return m_hInst; } @@ -177,7 +177,7 @@ CHatchWin::CHatchWin(HINSTANCE hInst,const DocumentHolder* pDocHolder) } -CHatchWin::~CHatchWin(void) +CHatchWin::~CHatchWin() { /* * Chances are this was already destroyed when a document @@ -255,7 +255,7 @@ HWND CHatchWin::HwndAssociateSet(HWND hWndAssoc) } -HWND CHatchWin::HwndAssociateGet(void) +HWND CHatchWin::HwndAssociateGet() { return m_hWndAssociate; } diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx index 3e3928b8da81..4ab0468a2556 100644 --- a/embedserv/source/inc/docholder.hxx +++ b/embedserv/source/inc/docholder.hxx @@ -138,14 +138,14 @@ public: BOOL isActive() const; void DisableInplaceActivation(BOOL); HRESULT InPlaceActivate(LPOLECLIENTSITE,BOOL); - void InPlaceDeactivate(void); + void InPlaceDeactivate(); HRESULT UIActivate(); void UIDeactivate(); - BOOL InPlaceMenuCreate(void); - BOOL InPlaceMenuDestroy(void); + BOOL InPlaceMenuCreate(); + BOOL InPlaceMenuDestroy(); - void OpenIntoWindow(void); - BOOL Undo(void); + void OpenIntoWindow(); + BOOL Undo(); // further methods diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx index 17e97acf8341..ba0e476c574d 100644 --- a/embedserv/source/inc/iipaobj.hxx +++ b/embedserv/source/inc/iipaobj.hxx @@ -42,8 +42,8 @@ public: /* IUnknown methods */ STDMETHODIMP QueryInterface(REFIID, LPVOID FAR * ppvObj); - STDMETHODIMP_(ULONG) AddRef(void); - STDMETHODIMP_(ULONG) Release(void); + STDMETHODIMP_(ULONG) AddRef(); + STDMETHODIMP_(ULONG) Release(); /* IOleInPlaceActiveObject methods */ STDMETHODIMP GetWindow(HWND *); diff --git a/embedserv/source/inc/syswinwrapper.hxx b/embedserv/source/inc/syswinwrapper.hxx index bde2efce0bf0..422dff9c3a4a 100644 --- a/embedserv/source/inc/syswinwrapper.hxx +++ b/embedserv/source/inc/syswinwrapper.hxx @@ -52,11 +52,11 @@ namespace winwrap { public: //Standard Class Functions CWindow(HINSTANCE); - ~CWindow(void); + ~CWindow(); //Just returns members. No need to modify - HWND Window(void); - HINSTANCE Instance(void); + HWND Window(); + HINSTANCE Instance(); }; @@ -155,12 +155,12 @@ protected: public: CHatchWin(HINSTANCE,const DocumentHolder*); - ~CHatchWin(void); + ~CHatchWin(); BOOL Init(HWND, UINT, HWND); HWND HwndAssociateSet(HWND); - HWND HwndAssociateGet(void); + HWND HwndAssociateGet(); void RectsSet(LPRECT, LPRECT); void ChildSet(HWND); diff --git a/embedserv/source/inprocserv/advisesink.cxx b/embedserv/source/inprocserv/advisesink.cxx index bbd7e5860c72..6d44b9f3caf2 100644 --- a/embedserv/source/inprocserv/advisesink.cxx +++ b/embedserv/source/inprocserv/advisesink.cxx @@ -153,7 +153,7 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnRename( LPMONIKER pMoniker ) } } -STDMETHODIMP_(void) OleWrapperAdviseSink::OnSave(void) +STDMETHODIMP_(void) OleWrapperAdviseSink::OnSave() { if ( m_pListener ) { @@ -161,7 +161,7 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnSave(void) } } -STDMETHODIMP_(void) OleWrapperAdviseSink::OnClose(void) +STDMETHODIMP_(void) OleWrapperAdviseSink::OnClose() { if ( m_pListener ) { diff --git a/embedserv/source/inprocserv/advisesink.hxx b/embedserv/source/inprocserv/advisesink.hxx index 2dc6d7739868..a30653aa0a84 100644 --- a/embedserv/source/inprocserv/advisesink.hxx +++ b/embedserv/source/inprocserv/advisesink.hxx @@ -76,14 +76,14 @@ public: BOOL IsClosed() { return m_bClosed; } STDMETHODIMP QueryInterface(REFIID, void**); - STDMETHODIMP_(ULONG) AddRef(void); - STDMETHODIMP_(ULONG) Release(void); + STDMETHODIMP_(ULONG) AddRef(); + STDMETHODIMP_(ULONG) Release(); STDMETHODIMP_(void) OnDataChange(LPFORMATETC, LPSTGMEDIUM); STDMETHODIMP_(void) OnViewChange(DWORD, LONG); STDMETHODIMP_(void) OnRename(LPMONIKER); - STDMETHODIMP_(void) OnSave(void); - STDMETHODIMP_(void) OnClose(void); + STDMETHODIMP_(void) OnSave(); + STDMETHODIMP_(void) OnClose(); }; }; // namespace advisesink diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index 545002aefe3b..e8b955d61aa7 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -205,7 +205,7 @@ extern "C" STDAPI INPROC_DLLPUBLIC DllCanUnloadNow() } -STDAPI INPROC_DLLPUBLIC DllRegisterServer( void ) +STDAPI INPROC_DLLPUBLIC DllRegisterServer() { HMODULE aCurModule = GetModuleHandleA( "inprocserv.dll" ); if( aCurModule ) @@ -223,7 +223,7 @@ STDAPI INPROC_DLLPUBLIC DllRegisterServer( void ) } -STDAPI INPROC_DLLPUBLIC DllUnregisterServer( void ) +STDAPI INPROC_DLLPUBLIC DllUnregisterServer() { return WriteLibraryToRegistry( "ole32.dll", 10 ); } diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx index 04442f795cd6..912efc4dc160 100644 --- a/embedserv/source/inprocserv/inprocembobj.cxx +++ b/embedserv/source/inprocserv/inprocembobj.cxx @@ -1542,7 +1542,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::ContextSensitiveHelp( BOOL fEnterMode ) // IOleInPlaceObject methods -STDMETHODIMP InprocEmbedDocument_Impl::InPlaceDeactivate( void ) +STDMETHODIMP InprocEmbedDocument_Impl::InPlaceDeactivate() { if ( CheckDefHandler() ) { @@ -1558,7 +1558,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InPlaceDeactivate( void ) } -STDMETHODIMP InprocEmbedDocument_Impl::UIDeactivate( void ) +STDMETHODIMP InprocEmbedDocument_Impl::UIDeactivate() { if ( CheckDefHandler() ) { @@ -1590,7 +1590,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetObjectRects( LPCRECT lprcPosRect, LPCR } -STDMETHODIMP InprocEmbedDocument_Impl::ReactivateAndUndo( void ) +STDMETHODIMP InprocEmbedDocument_Impl::ReactivateAndUndo() { if ( CheckDefHandler() ) { -- cgit