summaryrefslogtreecommitdiff
path: root/shell/source/win32
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 12:44:47 +0200
committerNoel Grandin <noel@peralex.com>2015-04-15 11:47:12 +0200
commit71b809959bb8f775d83dc52628448bb8b8322b28 (patch)
treef9aa4308050eb7d55611068602c0cf0e3c1b3690 /shell/source/win32
parent135907f2061550624ee1859745d94eee01849070 (diff)
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
Diffstat (limited to 'shell/source/win32')
-rw-r--r--shell/source/win32/ooofilereader/autostyletag.hxx2
-rw-r--r--shell/source/win32/ooofilereader/contentreader.cxx4
-rw-r--r--shell/source/win32/ooofilereader/dummytag.hxx2
-rw-r--r--shell/source/win32/ooofilereader/itag.hxx2
-rw-r--r--shell/source/win32/ooofilereader/metainforeader.cxx2
-rw-r--r--shell/source/win32/shlxthandler/classfactory.cxx4
-rw-r--r--shell/source/win32/shlxthandler/classfactory.hxx4
-rw-r--r--shell/source/win32/shlxthandler/columninfo/columninfo.cxx4
-rw-r--r--shell/source/win32/shlxthandler/infotips/infotips.cxx6
-rw-r--r--shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx10
-rw-r--r--shell/source/win32/shlxthandler/propsheets/propsheets.cxx4
-rw-r--r--shell/source/win32/shlxthandler/shlxthdl.cxx2
-rw-r--r--shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx14
13 files changed, 30 insertions, 30 deletions
diff --git a/shell/source/win32/ooofilereader/autostyletag.hxx b/shell/source/win32/ooofilereader/autostyletag.hxx
index 6b2140f34ec7..34c563f44635 100644
--- a/shell/source/win32/ooofilereader/autostyletag.hxx
+++ b/shell/source/win32/ooofilereader/autostyletag.hxx
@@ -49,7 +49,7 @@ class CAutoStyleTag : public ITag
void setStyle( ::std::wstring const & Style );
void setLocale(const LocaleSet_t& Locale);
- void clearStyleLocalePair( void );
+ void clearStyleLocalePair();
inline StyleLocalePair_t getStyleLocalePair() const{ return m_CurrentStyleLocalePair; };
inline bool isFull() const
{
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx
index 3c22a1a11481..6f9a9602f6f7 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -79,7 +79,7 @@ try
/** destructor.
*/
-CContentReader::~CContentReader( void )
+CContentReader::~CContentReader()
{
}
@@ -119,7 +119,7 @@ ITag* CContentReader::chooseTagReader( const std::wstring& tag_name, const XmlTa
/** get style of the current content.
*/
-::std::wstring CContentReader::getCurrentContentStyle( void )
+::std::wstring CContentReader::getCurrentContentStyle()
{
assert( !m_TagBuilderStack.empty() );
ITag* pTagBuilder = m_TagBuilderStack.top();
diff --git a/shell/source/win32/ooofilereader/dummytag.hxx b/shell/source/win32/ooofilereader/dummytag.hxx
index a1be1198e62c..da954c7400a4 100644
--- a/shell/source/win32/ooofilereader/dummytag.hxx
+++ b/shell/source/win32/ooofilereader/dummytag.hxx
@@ -41,7 +41,7 @@ class CDummyTag : public ITag
virtual void addAttributes(const XmlTagAttributes_t& /*attributes*/){};
- virtual std::wstring getTagContent( void )
+ virtual std::wstring getTagContent()
{
return EMPTY_STRING;
};
diff --git a/shell/source/win32/ooofilereader/itag.hxx b/shell/source/win32/ooofilereader/itag.hxx
index eb8667d1e5c2..d2b63b5b4c2f 100644
--- a/shell/source/win32/ooofilereader/itag.hxx
+++ b/shell/source/win32/ooofilereader/itag.hxx
@@ -37,7 +37,7 @@ class ITag
virtual void endTag() = 0;
virtual void addCharacters(const std::wstring& characters) = 0;
virtual void addAttributes(const XmlTagAttributes_t& attributes) = 0;
- virtual ::std::wstring getTagContent( void ) = 0;
+ virtual ::std::wstring getTagContent() = 0;
virtual ::std::wstring const getTagAttribute( ::std::wstring const & attrname ) = 0;
};
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx
index be0c7ee5576e..b4273bdc89b6 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -117,7 +117,7 @@ try
/** destructor.
*/
-CMetaInfoReader::~CMetaInfoReader( void )
+CMetaInfoReader::~CMetaInfoReader()
{
delete m_pKeywords_Builder;
delete m_pSimple_Builder;
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx
index d3a14b9aee92..977b3ce8168e 100644
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -71,14 +71,14 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_
-ULONG STDMETHODCALLTYPE CClassFactory::AddRef(void)
+ULONG STDMETHODCALLTYPE CClassFactory::AddRef()
{
return InterlockedIncrement(&m_RefCnt);
}
-ULONG STDMETHODCALLTYPE CClassFactory::Release(void)
+ULONG STDMETHODCALLTYPE CClassFactory::Release()
{
long refcnt = InterlockedDecrement(&m_RefCnt);
diff --git a/shell/source/win32/shlxthandler/classfactory.hxx b/shell/source/win32/shlxthandler/classfactory.hxx
index 075a2381171a..131c8e01d17d 100644
--- a/shell/source/win32/shlxthandler/classfactory.hxx
+++ b/shell/source/win32/shlxthandler/classfactory.hxx
@@ -42,9 +42,9 @@ public:
REFIID riid,
void __RPC_FAR *__RPC_FAR *ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void);
+ virtual ULONG STDMETHODCALLTYPE AddRef();
- virtual ULONG STDMETHODCALLTYPE Release(void);
+ virtual ULONG STDMETHODCALLTYPE Release();
// IClassFactory methods
diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index 9eeb252d182c..e503bc3a3e51 100644
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -84,14 +84,14 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::QueryInterface(REFIID riid, void __RPC_FA
-ULONG STDMETHODCALLTYPE CColumnInfo::AddRef(void)
+ULONG STDMETHODCALLTYPE CColumnInfo::AddRef()
{
return InterlockedIncrement(&m_RefCnt);
}
-ULONG STDMETHODCALLTYPE CColumnInfo::Release( void)
+ULONG STDMETHODCALLTYPE CColumnInfo::Release()
{
long refcnt = InterlockedDecrement(&m_RefCnt);
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index abfb8d69e8a6..657bcf279d12 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -84,14 +84,14 @@ HRESULT STDMETHODCALLTYPE CInfoTip::QueryInterface(REFIID riid, void __RPC_FAR *
-ULONG STDMETHODCALLTYPE CInfoTip::AddRef(void)
+ULONG STDMETHODCALLTYPE CInfoTip::AddRef()
{
return InterlockedIncrement(&m_RefCnt);
}
-ULONG STDMETHODCALLTYPE CInfoTip::Release( void)
+ULONG STDMETHODCALLTYPE CInfoTip::Release()
{
long refcnt = InterlockedDecrement(&m_RefCnt);
@@ -347,7 +347,7 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/
-HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty(void)
+HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty()
{
return E_NOTIMPL;
}
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index acc0174f635b..f38070621406 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -117,13 +117,13 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::QueryInterface(REFIID riid, void __RPC_F
}
-ULONG STDMETHODCALLTYPE CPropertyHdl::AddRef( void )
+ULONG STDMETHODCALLTYPE CPropertyHdl::AddRef()
{
return InterlockedIncrement( &m_RefCnt );
}
-ULONG STDMETHODCALLTYPE CPropertyHdl::Release( void )
+ULONG STDMETHODCALLTYPE CPropertyHdl::Release()
{
long refcnt = InterlockedDecrement( &m_RefCnt );
@@ -343,13 +343,13 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface( REFIID riid, void __RPC
}
-ULONG STDMETHODCALLTYPE CClassFactory::AddRef( void )
+ULONG STDMETHODCALLTYPE CClassFactory::AddRef()
{
return InterlockedIncrement( &m_RefCnt );
}
-ULONG STDMETHODCALLTYPE CClassFactory::Release( void )
+ULONG STDMETHODCALLTYPE CClassFactory::Release()
{
long refcnt = InterlockedDecrement( &m_RefCnt );
@@ -423,7 +423,7 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
}
-extern "C" STDAPI DllCanUnloadNow( void )
+extern "C" STDAPI DllCanUnloadNow()
{
OutputDebugStringFormat( "DllCanUnloadNow.\n" );
if (CClassFactory::IsLocked() || g_DllRefCnt > 0)
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index 0cfa944f4c64..6d1a146bfd34 100644
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -99,7 +99,7 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface(
-ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void)
+ULONG STDMETHODCALLTYPE CPropertySheet::AddRef()
{
OutputDebugStringFormat("CPropertySheet::AddRef [%d]", m_RefCnt );
return InterlockedIncrement(&m_RefCnt);
@@ -107,7 +107,7 @@ ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void)
-ULONG STDMETHODCALLTYPE CPropertySheet::Release(void)
+ULONG STDMETHODCALLTYPE CPropertySheet::Release()
{
OutputDebugStringFormat("CPropertySheet::Release [%d]", m_RefCnt );
long refcnt = InterlockedDecrement(&m_RefCnt);
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 80460e8fe4d7..fb6c1f44af42 100644
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -397,7 +397,7 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
return S_OK;
}
-extern "C" STDAPI DllCanUnloadNow(void)
+extern "C" STDAPI DllCanUnloadNow()
{
if (CClassFactory::IsLocked() || g_DllRefCnt > 0)
return S_FALSE;
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 6519a96fc610..3062f8402966 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -124,7 +124,7 @@ public:
// IUnknown
virtual ULONG STDMETHODCALLTYPE AddRef();
- virtual ULONG STDMETHODCALLTYPE Release( void);
+ virtual ULONG STDMETHODCALLTYPE Release();
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
// IStream
@@ -134,7 +134,7 @@ public:
virtual HRESULT STDMETHODCALLTYPE SetSize(ULARGE_INTEGER libNewSize);
virtual HRESULT STDMETHODCALLTYPE CopyTo(IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten);
virtual HRESULT STDMETHODCALLTYPE Commit(DWORD grfCommitFlags);
- virtual HRESULT STDMETHODCALLTYPE Revert(void);
+ virtual HRESULT STDMETHODCALLTYPE Revert();
virtual HRESULT STDMETHODCALLTYPE LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType);
virtual HRESULT STDMETHODCALLTYPE UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType);
virtual HRESULT STDMETHODCALLTYPE Stat(STATSTG *pstatstg, DWORD grfStatFlag);
@@ -155,12 +155,12 @@ StreamOnZipBuffer::StreamOnZipBuffer(const ZipFile::ZipContentBuffer_t& zip_buff
// IUnknown methods
-ULONG STDMETHODCALLTYPE StreamOnZipBuffer::AddRef(void)
+ULONG STDMETHODCALLTYPE StreamOnZipBuffer::AddRef()
{
return InterlockedIncrement(&ref_count_);
}
-ULONG STDMETHODCALLTYPE StreamOnZipBuffer::Release( void)
+ULONG STDMETHODCALLTYPE StreamOnZipBuffer::Release()
{
long refcnt = InterlockedDecrement(&ref_count_);
@@ -275,7 +275,7 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::CopyTo(IStream *, ULARGE_INTEGER, U
HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Commit(DWORD)
{ return E_NOTIMPL; }
-HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Revert(void)
+HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Revert()
{ return E_NOTIMPL; }
HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::LockRegion(ULARGE_INTEGER, ULARGE_INTEGER, DWORD)
@@ -339,12 +339,12 @@ HRESULT STDMETHODCALLTYPE CThumbviewer::QueryInterface(REFIID riid, void __RPC_F
return E_NOINTERFACE;
}
-ULONG STDMETHODCALLTYPE CThumbviewer::AddRef(void)
+ULONG STDMETHODCALLTYPE CThumbviewer::AddRef()
{
return InterlockedIncrement(&ref_count_);
}
-ULONG STDMETHODCALLTYPE CThumbviewer::Release( void)
+ULONG STDMETHODCALLTYPE CThumbviewer::Release()
{
long refcnt = InterlockedDecrement(&ref_count_);