diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-14 12:44:47 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-15 11:47:12 +0200 |
commit | 71b809959bb8f775d83dc52628448bb8b8322b28 (patch) | |
tree | f9aa4308050eb7d55611068602c0cf0e3c1b3690 /cui | |
parent | 135907f2061550624ee1859745d94eee01849070 (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 'cui')
-rw-r--r-- | cui/source/customize/macropg.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/macropg_impl.hxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 26 | ||||
-rw-r--r-- | cui/source/dialogs/insrc.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/newtabledlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/inc/hangulhanjadlg.hxx | 8 | ||||
-rw-r--r-- | cui/source/inc/headertablistbox.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/insrc.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/newtabledlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/textattr.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/treeopt.hxx | 2 | ||||
-rw-r--r-- | cui/source/options/optmemory.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optmemory.hxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/textattr.cxx | 2 |
14 files changed, 29 insertions, 29 deletions
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 5f83f286784f..dec5a9fb3e6b 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -172,7 +172,7 @@ void MacroEventListBox::Resize() maListBox.SetPosSizePixel( aPnt, aSize ); } -void MacroEventListBox::ConnectElements( void ) +void MacroEventListBox::ConnectElements() { Resize(); diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 7babc45611a5..dd7909275085 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -51,7 +51,7 @@ public: AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ); virtual ~AssignComponentDialog(); - OUString getURL( void ) const + OUString getURL() const { return maURL; } }; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index e80f41854b6a..ade585801826 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -901,7 +901,7 @@ namespace svx - void HangulHanjaOptionsDialog::Init( void ) + void HangulHanjaOptionsDialog::Init() { if( !m_xConversionDictionaryList.is() ) { @@ -1204,7 +1204,7 @@ namespace svx // index of the internal iterator, used for First() and Next() methods sal_uInt16 m_nAct; - const OUString* _Next( void ); + const OUString* _Next(); public: SuggestionList(); ~SuggestionList(); @@ -1212,12 +1212,12 @@ namespace svx bool Set( const OUString& _rElement, sal_uInt16 _nNumOfElement ); bool Reset( sal_uInt16 _nNumOfElement ); const OUString* Get( sal_uInt16 _nNumOfElement ) const; - void Clear( void ); + void Clear(); - const OUString* First( void ); - const OUString* Next( void ); + const OUString* First(); + const OUString* Next(); - inline sal_uInt16 GetCount( void ) const { return m_nNumOfEntries; } + inline sal_uInt16 GetCount() const { return m_nNumOfEntries; } }; SuggestionList::SuggestionList() : @@ -1271,7 +1271,7 @@ namespace svx return NULL; } - void SuggestionList::Clear( void ) + void SuggestionList::Clear() { if( m_nNumOfEntries ) { @@ -1286,7 +1286,7 @@ namespace svx } } - const OUString* SuggestionList::_Next( void ) + const OUString* SuggestionList::_Next() { const OUString* pRet = NULL; while( m_nAct < m_vElements.size() && !pRet ) @@ -1299,13 +1299,13 @@ namespace svx return pRet; } - const OUString* SuggestionList::First( void ) + const OUString* SuggestionList::First() { m_nAct = 0; return _Next(); } - const OUString* SuggestionList::Next( void ) + const OUString* SuggestionList::Next() { const OUString* pRet; @@ -1599,7 +1599,7 @@ namespace svx UpdateButtonStates(); } - void HangulHanjaEditDictDialog::UpdateOriginalLB( void ) + void HangulHanjaEditDictDialog::UpdateOriginalLB() { m_aOriginalLB->Clear(); Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; @@ -1632,7 +1632,7 @@ namespace svx m_aDeletePB->Enable(!m_bModifiedOriginal && bHaveValidOriginalString); } - void HangulHanjaEditDictDialog::UpdateSuggestions( void ) + void HangulHanjaEditDictDialog::UpdateSuggestions() { Sequence< OUString > aEntries; bool bFound = GetConversions( m_rDictList[ m_nCurrentDict ], m_aOriginal, aEntries ); @@ -1773,7 +1773,7 @@ namespace svx delete m_pSuggestions; } - void HangulHanjaEditDictDialog::UpdateScrollbar( void ) + void HangulHanjaEditDictDialog::UpdateScrollbar() { sal_uInt16 nPos = sal_uInt16( m_aScrollSB->GetThumbPos() ); m_nTopPos = nPos; diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index c3c167cca62d..ef1eecff6a99 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -45,7 +45,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& SetHelpId( sHelpId ); } -short SvxInsRowColDlg::Execute(void) +short SvxInsRowColDlg::Execute() { return ModalDialog::Execute(); } diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index ab9058c0c975..ae6a0e757fa2 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -28,7 +28,7 @@ SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent ) get(mpNumColumns, "columns"); } -short SvxNewTableDialog::Execute(void) +short SvxNewTableDialog::Execute() { return ModalDialog::Execute(); } diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 4cea2af82cd2..cb228daebc1e 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -218,7 +218,7 @@ namespace svx DECL_LINK( EditDictHdl, void* ); DECL_LINK( DeleteDictHdl, void* ); - void Init( void ); ///< reads settings from core and init controls + void Init(); ///< reads settings from core and init controls public: HangulHanjaOptionsDialog( vcl::Window* _pParent ); virtual ~HangulHanjaOptionsDialog(); @@ -299,8 +299,8 @@ namespace svx DECL_LINK( DeletePBPushHdl, void* ); void InitEditDictDialog( sal_uInt32 _nSelDict ); - void UpdateOriginalLB( void ); - void UpdateSuggestions( void ); + void UpdateOriginalLB(); + void UpdateSuggestions(); void UpdateButtonStates(); void SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum ); @@ -313,7 +313,7 @@ namespace svx HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); virtual ~HangulHanjaEditDictDialog(); - void UpdateScrollbar( void ); + void UpdateScrollbar(); }; diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index f536a1d77b57..d368d4dc27c9 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -48,7 +48,7 @@ public: return maHeaderBar; } - void ConnectElements( void );/**< should be called after all manipulations on elements are done + void ConnectElements();/**< should be called after all manipulations on elements are done calcs real sizes depending on sizes of this */ void Show( bool bVisible = true, sal_uInt16 nFlags = 0 ); ///< same meaning as Windows::Show() void Enable( bool bEnable = true, bool bChild = true ); ///< same meaning as Windows::Enable() diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 012916b89423..a6e215e2ee49 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -44,7 +44,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog public: SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ); - virtual short Execute(void) SAL_OVERRIDE; + virtual short Execute() SAL_OVERRIDE; virtual bool isInsertBefore() const SAL_OVERRIDE; virtual sal_uInt16 getInsertCount() const SAL_OVERRIDE; diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 778457aec69e..109d62f1509e 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -35,7 +35,7 @@ private: public: SvxNewTableDialog( vcl::Window* pWindow ); - virtual short Execute(void) SAL_OVERRIDE; + virtual short Execute() SAL_OVERRIDE; virtual sal_Int32 getRows() const SAL_OVERRIDE; virtual sal_Int32 getColumns() const SAL_OVERRIDE; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 234d14094f9c..6c309a329b92 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -71,7 +71,7 @@ private: /** Return whether the text direction is from left to right (</sal_True>) or top to bottom (</sal_False>). */ - bool IsTextDirectionLeftToRight (void) const; + bool IsTextDirectionLeftToRight() const; public: diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index b6d70f487531..2fa0d064ef9c 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -29,7 +29,7 @@ class SfxShell; // static ---------------------------------------------------------------- bool EnableSSO(); -CreateTabPage GetSSOCreator( void ); +CreateTabPage GetSSOCreator(); // struct OrderedEntry --------------------------------------------------- diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index ea3cdd8af441..07011b6827ef 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -82,7 +82,7 @@ inline void OfaMemoryOptionsPage::SetNfGraphicCacheVal( long nSizeInBytes ) m_pNfGraphicCache->SetValue( nSizeInBytes >> 20 ); } -long OfaMemoryOptionsPage::GetNfGraphicObjectCacheVal( void ) const +long OfaMemoryOptionsPage::GetNfGraphicObjectCacheVal() const { return long( ::rtl::math::round( double( m_pNfGraphicObjectCache->GetValue() ) * NF2BYTES ) ); } diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index b3aaff18715d..666010fd3f10 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -48,7 +48,7 @@ private: sal_Int32 GetNfGraphicCacheVal() const; // returns # of Bytes inline void SetNfGraphicCacheVal( long nSizeInBytes ); - long GetNfGraphicObjectCacheVal( void ) const; // returns # of Bytes + long GetNfGraphicObjectCacheVal() const; // returns # of Bytes void SetNfGraphicObjectCacheVal( long nSizeInBytes ); inline void SetNfGraphicObjectCacheMax( long nSizeInBytes ); inline void SetNfGraphicObjectCacheLast( long nSizeInBytes ); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index ce9c8928a78c..655638577e35 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -677,7 +677,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl) } -bool SvxTextAttrPage::IsTextDirectionLeftToRight (void) const +bool SvxTextAttrPage::IsTextDirectionLeftToRight() const { // Determine the text writing direction with left to right as default. bool bLeftToRightDirection = true; |