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/svtools | |
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/svtools')
-rw-r--r-- | include/svtools/ctrlbox.hxx | 4 | ||||
-rw-r--r-- | include/svtools/dialogclosedlistener.hxx | 2 | ||||
-rw-r--r-- | include/svtools/editbrowsebox.hxx | 2 | ||||
-rw-r--r-- | include/svtools/extcolorcfg.hxx | 10 | ||||
-rw-r--r-- | include/svtools/genericunodialog.hxx | 2 | ||||
-rw-r--r-- | include/svtools/grfmgr.hxx | 2 | ||||
-rw-r--r-- | include/svtools/headbar.hxx | 14 | ||||
-rw-r--r-- | include/svtools/imapobj.hxx | 4 | ||||
-rw-r--r-- | include/svtools/inettbc.hxx | 2 | ||||
-rw-r--r-- | include/svtools/simptabl.hxx | 2 | ||||
-rw-r--r-- | include/svtools/svparser.hxx | 12 | ||||
-rw-r--r-- | include/svtools/svtabbx.hxx | 4 | ||||
-rw-r--r-- | include/svtools/transfer.hxx | 4 | ||||
-rw-r--r-- | include/svtools/treelistbox.hxx | 2 |
14 files changed, 33 insertions, 33 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 6784f807344a..b226137f9da3 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -243,9 +243,9 @@ public: void SelectEntry( sal_uInt16 nStyle, bool bSelect = true ); sal_uInt16 GetSelectEntryStyle() const; - inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } + void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } - inline void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } + void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } void SetColor( const Color& rColor ); const Color& GetColor() const { return aColor; } diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index 91ec525f110b..b129bddf5555 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -47,7 +47,7 @@ namespace svt public: DialogClosedListener(); - inline void SetDialogClosedLink( const Link<css::ui::dialogs::DialogClosedEvent*,void>& rLink ) { m_aDialogClosedLink = rLink; } + void SetDialogClosedLink( const Link<css::ui::dialogs::DialogClosedEvent*,void>& rLink ) { m_aDialogClosedLink = rLink; } // XDialogClosedListener methods virtual void SAL_CALL dialogClosed( const css::ui::dialogs::DialogClosedEvent& aEvent ) override; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index d11dcafb07f5..4bf90f3a4792 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -106,7 +106,7 @@ namespace svt // suspending the controller is not culmulative! void suspend( ); void resume( ); - inline bool isSuspended( ) const { return bSuspended; } + bool isSuspended( ) const { return bSuspended; } protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const; diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index 2f3c9559c41b..16df99b9f756 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -49,12 +49,12 @@ public: ,m_nDefaultColor(_nDefaultColor) {} - inline const OUString& getName() const { return m_sName; } - inline const OUString& getDisplayName() const { return m_sDisplayName; } - inline sal_Int32 getColor() const { return m_nColor; } - inline sal_Int32 getDefaultColor() const { return m_nDefaultColor; } + const OUString& getName() const { return m_sName; } + const OUString& getDisplayName() const { return m_sDisplayName; } + sal_Int32 getColor() const { return m_nColor; } + sal_Int32 getDefaultColor() const { return m_nDefaultColor; } - inline void setColor(sal_Int32 _nColor) { m_nColor = _nColor; } + void setColor(sal_Int32 _nColor) { m_nColor = _nColor; } }; class SVT_DLLPUBLIC ExtendedColorConfig : public SfxBroadcaster, public SfxListener diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 2256a8614f15..bd79fb2e9e59 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -82,7 +82,7 @@ namespace svt css::uno::Reference<css::uno::XComponentContext> m_aContext; public: - inline bool needInitialization() const { return m_bNeedInitialization && !m_bInitialized; } + bool needInitialization() const { return m_bNeedInitialization && !m_bInitialized; } protected: OGenericUnoDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index b39e69102486..60be20134dc3 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -564,7 +564,7 @@ private: const GraphicObject* pCopyObj ); void SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj ); - inline bool SVT_DLLPRIVATE ImplHasObjects() const { return !maObjList.empty(); } + bool SVT_DLLPRIVATE ImplHasObjects() const { return !maObjList.empty(); } // Only used in swap case by GraphicObject void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj ); diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index e0fb1dfdd559..186a70b68ce8 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -295,7 +295,7 @@ public: void Clear(); void SetOffset( long nNewOffset ); - inline void SetDragSize( long nNewSize ) { mnDragSize = nNewSize; } + void SetDragSize( long nNewSize ) { mnDragSize = nNewSize; } sal_uInt16 GetItemCount() const; sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; @@ -321,13 +321,13 @@ public: using Window::SetHelpId; - inline void SetStartDragHdl( const Link<HeaderBar*,void>& rLink ) { maStartDragHdl = rLink; } - inline void SetDragHdl( const Link<HeaderBar*,void>& rLink ) { maDragHdl = rLink; } - inline void SetEndDragHdl( const Link<HeaderBar*,void>& rLink ) { maEndDragHdl = rLink; } - inline void SetSelectHdl( const Link<HeaderBar*,void>& rLink ) { maSelectHdl = rLink; } - inline void SetCreateAccessibleHdl( const Link<HeaderBar*,void>& rLink ) { maCreateAccessibleHdl = rLink; } + void SetStartDragHdl( const Link<HeaderBar*,void>& rLink ) { maStartDragHdl = rLink; } + void SetDragHdl( const Link<HeaderBar*,void>& rLink ) { maDragHdl = rLink; } + void SetEndDragHdl( const Link<HeaderBar*,void>& rLink ) { maEndDragHdl = rLink; } + void SetSelectHdl( const Link<HeaderBar*,void>& rLink ) { maSelectHdl = rLink; } + void SetCreateAccessibleHdl( const Link<HeaderBar*,void>& rLink ) { maCreateAccessibleHdl = rLink; } - inline bool IsDragable() const { return mbDragable; } + bool IsDragable() const { return mbDragable; } /** Creates and returns the accessible object of the header bar. */ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index b6335631de88..e79e57105812 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -114,8 +114,8 @@ public: bool IsEqual( const IMapObject& rEqObj ); // IMap-Events - inline const SvxMacroTableDtor& GetMacroTable() const { return aEventList;} - inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; } + const SvxMacroTableDtor& GetMacroTable() const { return aEventList;} + void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; } }; #endif diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 0954185138ba..141363d1d068 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -81,7 +81,7 @@ public: void SetFilter(const OUString& _sFilter); - inline void EnableAutocompletion( bool _bEnable ) + void EnableAutocompletion( bool _bEnable ) { bIsAutoCompleteEnabled = _bEnable; } void SetPlaceHolder( const OUString& sPlaceHolder ) { aPlaceHolder = sPlaceHolder; } diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 40c31d12e46c..a7a7ac7c7172 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -117,7 +117,7 @@ public: SvLBoxItem* GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const; const CommandEvent& GetCommandEvent() const { return aCEvt; } - inline bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); } + bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); } void SetCommandHdl( const Link<SvSimpleTable*,void>& rLink ) { aCommandLink = rLink; } void SetHeaderBarClickHdl( const Link<SvSimpleTable*,void>& rLink ) { aHeaderBarClickLink = rLink; } diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index ff699e3f5fe1..67f77ee2ab28 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -110,19 +110,19 @@ public: virtual SvParserState CallParser() = 0; // calling of the parser - inline SvParserState GetStatus() const { return eState; } // StatusInfo + SvParserState GetStatus() const { return eState; } // StatusInfo - inline sal_uLong GetLineNr() const { return nlLineNr; } - inline sal_uLong GetLinePos() const { return nlLinePos; } - inline void IncLineNr() { ++nlLineNr; } - inline sal_uLong IncLinePos() { return ++nlLinePos; } + sal_uLong GetLineNr() const { return nlLineNr; } + sal_uLong GetLinePos() const { return nlLinePos; } + void IncLineNr() { ++nlLineNr; } + sal_uLong IncLinePos() { return ++nlLinePos; } inline void SetLineNr( sal_uLong nlNum ); // inline bottom inline void SetLinePos( sal_uLong nlPos ); // inline bottom sal_uInt32 GetNextChar(); // Return next Unicode codepoint in UTF32. void RereadLookahead(); - inline bool IsParserWorking() const { return SvParserState::Working == eState; } + bool IsParserWorking() const { return SvParserState::Working == eState; } Link<LinkParamNone*,void> GetAsynchCallLink() const { return LINK( const_cast<SvParser*>(this), SvParser, NewDataRead ); } diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 71e3629158ed..2e10dcf3df01 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -160,8 +160,8 @@ public: // Accessible ------------------------------------------------------------- - inline void DisableTransientChildren() { SetChildrenNotTransient(); } - inline bool IsTransientChildrenDisabled() const { return !AreChildrenTransient(); } + void DisableTransientChildren() { SetChildrenNotTransient(); } + bool IsTransientChildrenDisabled() const { return !AreChildrenTransient(); } bool IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState ); diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 8cf82f4e29a5..623721180bae 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -162,7 +162,7 @@ private: std::unique_ptr<TransferableObjectDescriptor> mxObjDesc; protected: - inline const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& + const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& getOwnClipboard() const { return mxClipboard; } private: @@ -195,7 +195,7 @@ protected: // derivees need to access lostOwnership in case hey override it // on windows, changing the access rights to a method gives unresolved externals, so we introduce // this impl-method here 'til the next incompatible update - inline void implCallOwnLostOwnership( + void implCallOwnLostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& _rxClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& _rxTrans ) diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 002174236bc7..97e0ce929a68 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -613,7 +613,7 @@ public: /** Sets default bitmaps for collapsed and expanded nodes. */ - inline void SetNodeDefaultImages( ) + void SetNodeDefaultImages( ) { SetNodeBitmaps( GetDefaultCollapsedNodeImage( ), |