diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:57:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:55:50 +0000 |
commit | 6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch) | |
tree | 21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /fpicker/source | |
parent | 7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'fpicker/source')
-rw-r--r-- | fpicker/source/aqua/ControlHelper.hxx | 12 | ||||
-rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.hxx | 4 | ||||
-rw-r--r-- | fpicker/source/aqua/SalAquaPicker.hxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/commonpicker.hxx | 6 | ||||
-rw-r--r-- | fpicker/source/office/fpsmartcontent.hxx | 16 | ||||
-rw-r--r-- | fpicker/source/office/iodlgimp.hxx | 10 |
6 files changed, 26 insertions, 26 deletions
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx index c564c18a4100..cdf636990765 100644 --- a/fpicker/source/aqua/ControlHelper.hxx +++ b/fpicker/source/aqua/ControlHelper.hxx @@ -88,33 +88,33 @@ public: // inline functions - inline NSView* getUserPane() { + NSView* getUserPane() { if (!m_bIsUserPaneLaidOut) { createUserPane(); } return m_pUserPane; } - inline bool getVisibility(ToggleType tToggle) { + bool getVisibility(ToggleType tToggle) { return m_bToggleVisibility[tToggle]; } - inline void setFilterControlNeeded(bool bNeeded) { + void setFilterControlNeeded(bool bNeeded) { m_bIsFilterControlNeeded = bNeeded; if (bNeeded) { m_bUserPaneNeeded = true; } } - inline void setFilterHelper(FilterHelper* pFilterHelper) { + void setFilterHelper(FilterHelper* pFilterHelper) { m_pFilterHelper = pFilterHelper; } - inline void setFilePickerDelegate(AquaFilePickerDelegate* pDelegate) { + void setFilePickerDelegate(AquaFilePickerDelegate* pDelegate) { m_pDelegate = pDelegate; } - inline bool isAutoExtensionEnabled() { + bool isAutoExtensionEnabled() { return ([((NSButton*) m_pToggles[AUTOEXTENSION]) state] == NSOnState); } diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index a4ffa6893e42..22d7a7d52428 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -129,11 +129,11 @@ public: void SAL_CALL controlStateChanged( css::ui::dialogs::FilePickerEvent aEvent ); void SAL_CALL dialogSizeChanged( ); - inline AquaFilePickerDelegate * getDelegate() { + AquaFilePickerDelegate * getDelegate() { return m_pDelegate; } - inline OUString const & getSaveFileName() { + OUString const & getSaveFileName() { return m_sSaveFileName; } diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx index fa0c8b959e63..acfa2a855db0 100644 --- a/fpicker/source/aqua/SalAquaPicker.hxx +++ b/fpicker/source/aqua/SalAquaPicker.hxx @@ -47,9 +47,9 @@ public: int run(); int runandwaitforresult(); - inline OUString const & getDisplayDirectory() { return m_sDisplayDirectory; } + OUString const & getDisplayDirectory() { return m_sDisplayDirectory; } - inline ControlHelper* getControlHelper() const { + ControlHelper* getControlHelper() const { return m_pControlHelper; } diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index 5212080433ef..81ecad00daec 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -77,10 +77,10 @@ namespace svt OUString m_aDisplayDirectory; protected: - inline SvtFileDialog_Base* getDialog() { return m_pDlg; } + SvtFileDialog_Base* getDialog() { return m_pDlg; } - inline const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return OCommonPicker_Base::rBHelper; } - inline ::cppu::OBroadcastHelper& GetBroadcastHelper() { return OCommonPicker_Base::rBHelper; } + const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return OCommonPicker_Base::rBHelper; } + ::cppu::OBroadcastHelper& GetBroadcastHelper() { return OCommonPicker_Base::rBHelper; } public: OCommonPicker(); diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx index bdd2e43e48d0..0c37ac83fbc0 100644 --- a/fpicker/source/office/fpsmartcontent.hxx +++ b/fpicker/source/office/fpsmartcontent.hxx @@ -113,25 +113,25 @@ namespace svt @seealso State */ - inline State getState( ) const { return m_eState; } + State getState( ) const { return m_eState; } /** checks if the content is valid <p>Note that "not (is valid)" is not the same as "is invalid"</p> */ - inline bool isValid( ) const { return VALID == getState(); } + bool isValid( ) const { return VALID == getState(); } /** checks if the content is valid <p>Note that "not (is invalid)" is not the same as "is valid"</p> */ - inline bool isInvalid( ) const { return INVALID == getState(); } + bool isInvalid( ) const { return INVALID == getState(); } /** checks if the content is bound */ - inline bool isBound( ) const { return NOT_BOUND != getState(); } + bool isBound( ) const { return NOT_BOUND != getState(); } /** returns the URL of the content */ - inline OUString getURL() const { return m_pContent ? m_pContent->getURL() : m_sURL; } + OUString getURL() const { return m_pContent ? m_pContent->getURL() : m_sURL; } /** (re)creates the content for the given URL @@ -175,19 +175,19 @@ namespace svt @postcond the content is not in the state UNKNOWN */ - inline bool isFolder( const OUString& _rURL ) + bool isFolder( const OUString& _rURL ) { return implIs( _rURL, Folder ); } /** checks if the content is existent (it is if and only if it is a document or a folder) */ - inline bool is( const OUString& _rURL ) + bool is( const OUString& _rURL ) { return implIs( _rURL, Folder ) || implIs( _rURL, Document ); } - inline bool isFolder( ) { return isFolder( getURL() ); } + bool isFolder( ) { return isFolder( getURL() ); } }; diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index fe4963112565..8639ea78f489 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -87,7 +87,7 @@ private: VclPtr<PopupMenu> m_pMenu; protected: - inline SvtFileDialog* GetDialogParent() { return m_pDlg; } + SvtFileDialog* GetDialogParent() { return m_pDlg; } virtual void FillURLMenu( PopupMenu* _pMenu ) = 0; @@ -179,11 +179,11 @@ public: ~SvtExpFileDlg_Impl(); - inline void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) { _aBlackList = rBlackList; } - inline const css::uno::Sequence< OUString >& GetBlackList() const { return _aBlackList; } + void SetBlackList( const css::uno::Sequence< OUString >& rBlackList ) { _aBlackList = rBlackList; } + const css::uno::Sequence< OUString >& GetBlackList() const { return _aBlackList; } void SetStandardDir( const OUString& _rDir ); - inline const OUString& GetStandardDir() const { return _aStdDir; } - inline void DisableFilterBoxAutoWidth() { _pLbFilter->EnableDDAutoWidth( false ); } + const OUString& GetStandardDir() const { return _aStdDir; } + void DisableFilterBoxAutoWidth() { _pLbFilter->EnableDDAutoWidth( false ); } // access to the filter listbox only as Control* - we want to maintain the entries/userdata ourself |