From 6cb9e6dad798ec59f055aebe84a9c4a21e4be40d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 3 Mar 2017 20:57:02 +0100 Subject: Remove redundant 'inline' keyword ...from function definitions occurring within class definitions. Done with a rewriting Clang plugin (to be pushed later). Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8 Reviewed-on: https://gerrit.libreoffice.org/34874 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- cui/source/dialogs/hangulhanjadlg.cxx | 6 +++--- cui/source/inc/autocdlg.hxx | 6 +++--- cui/source/inc/cuihyperdlg.hxx | 4 ++-- cui/source/inc/hltpbase.hxx | 2 +- cui/source/inc/iconcdlg.hxx | 2 +- cui/source/options/optjava.hxx | 16 ++++++++-------- cui/source/tabpages/borderconn.cxx | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'cui') diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index fd22cd31374a..9db35dd09b5f 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -64,13 +64,13 @@ namespace svx OutputDevice& m_rDev; public: - inline FontSwitch( OutputDevice& _rDev, const vcl::Font& _rTemporaryFont ) + FontSwitch( OutputDevice& _rDev, const vcl::Font& _rTemporaryFont ) :m_rDev( _rDev ) { m_rDev.Push( PushFlags::FONT ); m_rDev.SetFont( _rTemporaryFont ); } - inline ~FontSwitch( ) + ~FontSwitch( ) { m_rDev.Pop( ); } @@ -1250,7 +1250,7 @@ namespace svx const OUString* First(); const OUString* Next(); - inline sal_uInt16 GetCount() const { return m_nNumOfEntries; } + sal_uInt16 GetCount() const { return m_nNumOfEntries; } }; SuggestionList::SuggestionList() : diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 5c832436e976..3a34ca6b097d 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -78,9 +78,9 @@ class OfaACorrCheckListBox : public SvSimpleTable { } - inline void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); } - inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } - inline sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); } + void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); } + void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } + sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); } bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked); diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 056e4cd0eb9b..19feaf2aaeac 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -86,9 +86,9 @@ public: void SetPage( SvxHyperlinkItem* pItem ); void SetReadOnlyMode( bool bReadOnly ); - inline bool IsHTMLDoc() const { return mbIsHTMLDoc; } + bool IsHTMLDoc() const { return mbIsHTMLDoc; } - inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); } + SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); } }; diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 52076b1347ee..5debbd79f5dc 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -99,7 +99,7 @@ protected: static OUString GetSchemeFromURL( const OUString& rStrURL ); - inline void DisableClose( bool _bDisable ) { mbIsCloseDisabled = _bDisable; } + void DisableClose( bool _bDisable ) { mbIsCloseDisabled = _bDisable; } public: SvxHyperlinkTabPageBase ( diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 044e749d26ac..3c9e79d25576 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -138,7 +138,7 @@ protected: virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ); static SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); - inline IconChoicePage* GetTabPage( sal_uInt16 nPageId ) + IconChoicePage* GetTabPage( sal_uInt16 nPageId ) { return ( GetPageData (nPageId)->pPage ? GetPageData (nPageId)->pPage.get() : nullptr); } void ActivatePageImpl (); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 845944bcd653..22a24e8950fb 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -137,24 +137,24 @@ private: DECL_LINK(EditHdl_Impl, Button*, void); - inline void EnableRemoveButton() + void EnableRemoveButton() { m_pRemoveBtn->Enable( m_pAssignedList->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } - inline void EnableEditButton() + void EnableEditButton() { m_pEditBtn->Enable( m_pAssignedList->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } - inline void DisableAssignButton() + void DisableAssignButton() { m_pAssignBtn->Disable(); } - inline void DisableRemoveButton() + void DisableRemoveButton() { m_pRemoveBtn->Disable(); } - inline void DisableEditButton() + void DisableEditButton() { m_pEditBtn->Disable(); } @@ -189,7 +189,7 @@ private: DECL_LINK(SelectHdl_Impl, ListBox&, void); bool IsPathDuplicate( const OUString& _rPath ); - inline void EnableRemoveButton() + void EnableRemoveButton() { m_pRemoveBtn->Enable( m_pPathList->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } @@ -199,8 +199,8 @@ public: virtual ~SvxJavaClassPathDlg() override; virtual void dispose() override; - inline const OUString& GetOldPath() const { return m_sOldPath; } - inline void SetFocus() { m_pPathList->GrabFocus(); } + const OUString& GetOldPath() const { return m_sOldPath; } + void SetFocus() { m_pPathList->GrabFocus(); } OUString GetClassPath() const; void SetClassPath( const OUString& _rPath ); diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 236172401333..b7d6659e7e2f 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -41,7 +41,7 @@ of the tab page. class LineItemWrapper : public sfx::SingleItemWrapper< SvxLineItem, const editeng::SvxBorderLine* > { public: - inline explicit LineItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapperType( nSlot ) {} + explicit LineItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapperType( nSlot ) {} virtual const editeng::SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const override { return rItem.GetLine(); } @@ -54,7 +54,7 @@ public: class FrameSelectorWrapper : public sfx::SingleControlWrapper< FrameSelector, const editeng::SvxBorderLine* > { public: - inline explicit FrameSelectorWrapper( FrameSelector& rFrameSel, FrameBorderType eBorder ) : + explicit FrameSelectorWrapper( FrameSelector& rFrameSel, FrameBorderType eBorder ) : SingleControlWrapperType( rFrameSel ), meBorder( eBorder ) {} virtual bool IsControlDontKnow() const override; -- cgit