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 /include/sfx2 | |
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 'include/sfx2')
-rw-r--r-- | include/sfx2/controlwrapper.hxx | 22 | ||||
-rw-r--r-- | include/sfx2/dinfdlg.hxx | 20 | ||||
-rw-r--r-- | include/sfx2/filedlghelper.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/itemwrapper.hxx | 8 | ||||
-rw-r--r-- | include/sfx2/lnkbase.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 12 | ||||
-rw-r--r-- | include/sfx2/templatedlg.hxx | 10 |
7 files changed, 38 insertions, 38 deletions
diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index 1e4a2c8f28f2..d85b681de705 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -79,7 +79,7 @@ public: is used (simply casting between list position and values). If the map exists, it *MUST* be terminated by an entry containing the special "not found" list position. */ - inline explicit PosValueMapper( PosT nNFPos, const MapEntryType* pMap = nullptr ) : + explicit PosValueMapper( PosT nNFPos, const MapEntryType* pMap = nullptr ) : mpMap( pMap ), mnNFPos( nNFPos ) {} /** Returns the value at the specified list position. @@ -90,7 +90,7 @@ public: PosT GetPosFromValue( ValueT nValue ) const; /** Returns the special "not found" list position. */ - inline PosT GetNotFoundPos() const { return mnNFPos; } + PosT GetNotFoundPos() const { return mnNFPos; } private: const MapEntryType* mpMap; /// The list position/value map. @@ -143,7 +143,7 @@ private: class SFX2_DLLPUBLIC ControlWrapperBase { public: - inline explicit ControlWrapperBase() {} + explicit ControlWrapperBase() {} virtual ~ControlWrapperBase(); /** Derived classes enable, disable, show, or hide control(s). @@ -185,12 +185,12 @@ public: typedef ValueT ControlValueType; typedef SingleControlWrapper< ControlT, ValueT > SingleControlWrapperType; - inline explicit SingleControlWrapper( ControlT& rControl ) : mrControl( rControl ) {} + explicit SingleControlWrapper( ControlT& rControl ) : mrControl( rControl ) {} /** Returns a reference to the control this connection works on. */ - inline const ControlT& GetControl() const { return mrControl; } + const ControlT& GetControl() const { return mrControl; } /** Returns a reference to the control this connection works on. */ - inline ControlT& GetControl() { return mrControl; } + ControlT& GetControl() { return mrControl; } /** Enables, disables, shows, or hides the control. @descr Does nothing, if the corresponding parameter is TRISTATE_INDET. */ @@ -251,7 +251,7 @@ template< typename ValueT > class MetricFieldWrapper : public SingleControlWrapper< MetricField, ValueT > { public: - inline explicit MetricFieldWrapper( MetricField& rField, FieldUnit eUnit = FUNIT_NONE ) : + explicit MetricFieldWrapper( MetricField& rField, FieldUnit eUnit = FUNIT_NONE ) : SingleControlWrapper< MetricField, ValueT >( rField ), meUnit( eUnit ) {} virtual bool IsControlDontKnow() const SAL_OVERRIDE; @@ -285,7 +285,7 @@ public: /** @param pMap Optional list position <-> value map. See PosValueMapper documentation for details. */ - inline explicit ListBoxWrapper( ListBox& rListBox, const MapEntryType* pMap = nullptr ) : + explicit ListBoxWrapper( ListBox& rListBox, const MapEntryType* pMap = nullptr ) : SingleControlWrapper< ListBox, ValueT >( rListBox ), MapperType( WRAPPER_LISTBOX_ENTRY_NOTFOUND, pMap ) {} virtual bool IsControlDontKnow() const SAL_OVERRIDE @@ -318,7 +318,7 @@ public: /** @param pMap Optional position <-> value map. See PosValueMapper documentation for details. */ - inline explicit ValueSetWrapper( ValueSet& rValueSet, const MapEntryType* pMap = nullptr ) : + explicit ValueSetWrapper( ValueSet& rValueSet, const MapEntryType* pMap = nullptr ) : SingleControlWrapper< ValueSet, ValueT >( rValueSet ), MapperType( WRAPPER_VALUESET_ITEM_NOTFOUND, pMap ) {} virtual bool IsControlDontKnow() const SAL_OVERRIDE @@ -388,9 +388,9 @@ public: MultiControlWrapper() : maDefValue( 0 ){} /** Returns the default value that can be used in GetControlValue(). */ - inline const ValueT& GetDefaultValue() const { return maDefValue; } + const ValueT& GetDefaultValue() const { return maDefValue; } /** Sets a default value that can be used in GetControlValue(). */ - inline void SetDefaultValue( const ValueT& rDefValue ) { maDefValue = rDefValue; } + void SetDefaultValue( const ValueT& rDefValue ) { maDefValue = rDefValue; } /** Derived classes return the value the control contains. */ virtual ValueT GetControlValue() const = 0; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index bea1e06311d8..216fa6fc9aee 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -358,9 +358,9 @@ public: virtual void Resize() override; - inline void CheckYes() { m_aYesButton->Check(); } - inline void CheckNo() { m_aNoButton->Check(); } - inline bool IsYesChecked() const { return m_aYesButton->IsChecked(); } + void CheckYes() { m_aYesButton->Check(); } + void CheckNo() { m_aNoButton->Check(); } + bool IsYesChecked() const { return m_aYesButton->IsChecked(); } }; // struct CustomPropertyLine --------------------------------------------- @@ -436,7 +436,7 @@ public: bool InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar ); sal_uInt16 GetVisibleLineCount() const; - inline sal_Int32 GetLineHeight() const { return m_nLineHeight; } + sal_Int32 GetLineHeight() const { return m_nLineHeight; } void AddLine( const OUString& sName, css::uno::Any& rAny ); bool AreAllLinesValid() const; void ClearAllLines(); @@ -472,9 +472,9 @@ public: void AddLine( const OUString& sName, css::uno::Any& rAny, bool bInteractive ); - inline bool AreAllLinesValid() const { return m_pPropertiesWin->AreAllLinesValid(); } - inline void ClearAllLines() { m_pPropertiesWin->ClearAllLines(); } - inline css::uno::Sequence< css::beans::PropertyValue > + bool AreAllLinesValid() const { return m_pPropertiesWin->AreAllLinesValid(); } + void ClearAllLines() { m_pPropertiesWin->ClearAllLines(); } + css::uno::Sequence< css::beans::PropertyValue > GetCustomProperties() const { return m_pPropertiesWin->GetCustomProperties(); } void Init(VclBuilderContainer& rParent); @@ -562,8 +562,8 @@ public: CmisPropertiesWindow(SfxTabPage* pParent); ~CmisPropertiesWindow(); - inline sal_Int32 GetItemHeight() const { return m_nItemHeight; } - inline long getBoxHeight() const { return VclContainer::getLayoutRequisition(*m_pBox).Height(); }; + sal_Int32 GetItemHeight() const { return m_nItemHeight; } + long getBoxHeight() const { return VclContainer::getLayoutRequisition(*m_pBox).Height(); }; void AddLine( const OUString& sId, const OUString& sName, const OUString& sType, const bool bUpdatable, const bool bRequired, const bool bMultiValued, @@ -601,7 +601,7 @@ public: css::uno::Any& rAny ); void ClearAllLines(); - inline css::uno::Sequence< css::document::CmisProperty > + css::uno::Sequence< css::document::CmisProperty > GetCmisProperties() const { return m_pPropertiesWin.GetCmisProperties(); } }; diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 039a9e54cb9c..28159ec0cb45 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -134,7 +134,7 @@ public: ErrCode Execute(); void StartExecuteModal( const Link<FileDialogHelper*,void>& rEndDialogHdl ); - inline ErrCode GetError() const { return m_nError; } + ErrCode GetError() const { return m_nError; } sal_Int16 GetDialogType() const; bool IsPasswordEnabled() const; OUString GetRealFilter() const; diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx index 0633bf2d0a92..a379a1120ed7 100644 --- a/include/sfx2/itemwrapper.hxx +++ b/include/sfx2/itemwrapper.hxx @@ -90,12 +90,12 @@ public: typedef ValueT ItemValueType; typedef SingleItemWrapper< ItemT, ValueT > SingleItemWrapperType; - inline explicit SingleItemWrapper( sal_uInt16 nSlot ) : mnSlot( nSlot ) {} + explicit SingleItemWrapper( sal_uInt16 nSlot ) : mnSlot( nSlot ) {} virtual ~SingleItemWrapper() {} /** Returns the SID this wrapper works on. */ - inline sal_uInt16 GetSlotId() const { return mnSlot; } + sal_uInt16 GetSlotId() const { return mnSlot; } /** Returns the item from an item set, if it is not in "don't know" state. @descr Similar to ItemWrapperHelper::GetUniqueItem(), but works always @@ -131,7 +131,7 @@ template< typename ItemT, typename ValueT, typename InternalValueT = ValueT > class ValueItemWrapper : public SingleItemWrapper< ItemT, ValueT > { public: - inline explicit ValueItemWrapper( sal_uInt16 nSlot ) : + explicit ValueItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapper< ItemT, ValueT >( nSlot ) {} virtual ValueT GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE @@ -151,7 +151,7 @@ template< typename ItemT > class IdentItemWrapper : public SingleItemWrapper< ItemT, const ItemT& > { public: - inline explicit IdentItemWrapper( sal_uInt16 nSlot ) : + explicit IdentItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapper< ItemT, const ItemT& >( nSlot ) {} virtual const ItemT& GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index ceca0fd2aeab..339c8032ccb8 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -164,7 +164,7 @@ public: // #i88291# void clearStreamToLoadFrom(); - inline bool WasLastEditOK() const { return bWasLastEditOK; } + bool WasLastEditOK() const { return bWasLastEditOK; } FileDialogHelper & GetInsertFileDialog(const OUString& rFactory) const; }; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 9a42e24c5917..cf1ca2a2fe2d 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -792,7 +792,7 @@ class SfxObjectShellLock protected: SfxObjectShell * pObj; public: - inline SfxObjectShellLock() { pObj = nullptr; } + SfxObjectShellLock() { pObj = nullptr; } inline SfxObjectShellLock( const SfxObjectShellLock & rObj ); inline SfxObjectShellLock( SfxObjectShellLock && rObj ); inline SfxObjectShellLock( SfxObjectShell * pObjP ); @@ -801,11 +801,11 @@ public: inline SfxObjectShellLock & operator = ( const SfxObjectShellLock & rObj ); inline SfxObjectShellLock & operator = ( SfxObjectShellLock && rObj ); inline SfxObjectShellLock & operator = ( SfxObjectShell * pObj ); - inline bool Is() const { return pObj != nullptr; } - inline SfxObjectShell * operator & () const { return pObj; } - inline SfxObjectShell * operator -> () const { return pObj; } - inline SfxObjectShell & operator * () const { return *pObj; } - inline operator SfxObjectShell * () const { return pObj; } + bool Is() const { return pObj != nullptr; } + SfxObjectShell * operator & () const { return pObj; } + SfxObjectShell * operator -> () const { return pObj; } + SfxObjectShell & operator * () const { return *pObj; } + operator SfxObjectShell * () const { return pObj; } }; inline SfxObjectShellLock::SfxObjectShellLock( const SfxObjectShellLock & rObj ) { diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index c1302571972e..8e0473df1825 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -167,15 +167,15 @@ public: void HideNewCategoryOption(); - inline const OUString& GetSelectedCategory() const { + const OUString& GetSelectedCategory() const { return msSelectedCategory; }; - inline void SetSelectLabelText(OUString const & sText) const { + void SetSelectLabelText(OUString const & sText) const { mpSelectLabel->SetText(sText); }; - inline bool IsNewCategoryCreated() const { + bool IsNewCategoryCreated() const { return mbIsNewCategory; } @@ -199,8 +199,8 @@ public: virtual void dispose() override; virtual short Execute() override; - inline OUString const & getTemplatePath() const { return msTemplatePath; }; - inline bool IsStartWithTemplate() const { return mpCBXHideDlg->IsChecked(); }; + OUString const & getTemplatePath() const { return msTemplatePath; }; + bool IsStartWithTemplate() const { return mpCBXHideDlg->IsChecked(); }; private: DECL_LINK(OpenTemplateHdl, ThumbnailViewItem*, void); |