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 /toolkit/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 'toolkit/source')
-rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 24 | ||||
-rw-r--r-- | toolkit/source/controls/grid/sortablegriddatamodel.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrolcontainer.cxx | 6 | ||||
-rw-r--r-- | toolkit/source/helper/property.cxx | 4 |
4 files changed, 18 insertions, 18 deletions
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index e57eae28bc86..6171bddb78c8 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -165,7 +165,7 @@ public: */ void disposing(); - inline ::toolkit::AccessibilityClient& getAccessibleFactory() + ::toolkit::AccessibilityClient& getAccessibleFactory() { return maAccFactory; } @@ -174,17 +174,17 @@ public: /** returns the container of registered XWindowListener2 listeners */ - inline ::comphelper::OInterfaceContainerHelper2& getWindow2Listeners() { return maWindow2Listeners; } - inline ::comphelper::OInterfaceContainerHelper2& getDockableWindowListeners(){ return maDockableWindowListeners; } - inline EventListenerMultiplexer& getEventListeners() { return maEventListeners; } - inline FocusListenerMultiplexer& getFocusListeners() { return maFocusListeners; } - inline WindowListenerMultiplexer& getWindowListeners() { return maWindowListeners; } - inline KeyListenerMultiplexer& getKeyListeners() { return maKeyListeners; } - inline MouseListenerMultiplexer& getMouseListeners() { return maMouseListeners; } - inline MouseMotionListenerMultiplexer& getMouseMotionListeners() { return maMouseMotionListeners; } - inline PaintListenerMultiplexer& getPaintListeners() { return maPaintListeners; } - inline VclContainerListenerMultiplexer& getContainerListeners() { return maContainerListeners; } - inline TopWindowListenerMultiplexer& getTopWindowListeners() { return maTopWindowListeners; } + ::comphelper::OInterfaceContainerHelper2& getWindow2Listeners() { return maWindow2Listeners; } + ::comphelper::OInterfaceContainerHelper2& getDockableWindowListeners(){ return maDockableWindowListeners; } + EventListenerMultiplexer& getEventListeners() { return maEventListeners; } + FocusListenerMultiplexer& getFocusListeners() { return maFocusListeners; } + WindowListenerMultiplexer& getWindowListeners() { return maWindowListeners; } + KeyListenerMultiplexer& getKeyListeners() { return maKeyListeners; } + MouseListenerMultiplexer& getMouseListeners() { return maMouseListeners; } + MouseMotionListenerMultiplexer& getMouseMotionListeners() { return maMouseMotionListeners; } + PaintListenerMultiplexer& getPaintListeners() { return maPaintListeners; } + VclContainerListenerMultiplexer& getContainerListeners() { return maContainerListeners; } + TopWindowListenerMultiplexer& getTopWindowListeners() { return maTopWindowListeners; } private: DECL_LINK( OnProcessCallbacks, void*, void ); diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 53597f5443f6..84e450e15f7c 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -143,7 +143,7 @@ private: */ ::sal_Int32 impl_getPublicRowIndex_nothrow( ::sal_Int32 const i_privateRowIndex ) const; - inline bool impl_isSorted_nothrow() const + bool impl_isSorted_nothrow() const { return m_currentSortColumn >= 0; } diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index f918ae7bd321..2e2982551693 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -57,8 +57,8 @@ public: { } - inline const OUString& getName() const { return msName; } - inline const uno::Reference< awt::XControl >& getControl() const { return mxControl; } + const OUString& getName() const { return msName; } + const uno::Reference< awt::XControl >& getControl() const { return mxControl; } }; class UnoControlHolderList @@ -87,7 +87,7 @@ public: /** determines whether or not the list is empty */ - inline bool empty() const { return maControls.empty(); } + bool empty() const { return maControls.empty(); } /** retrieves all controls currently in the list */ diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index 2ea27d5d5a6d..790a2fdfea31 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -296,11 +296,11 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) struct ImplPropertyInfoCompareFunctor : ::std::binary_function<ImplPropertyInfo,OUString,bool> { - inline bool operator()(const ImplPropertyInfo& lhs,const ImplPropertyInfo& rhs) const + bool operator()(const ImplPropertyInfo& lhs,const ImplPropertyInfo& rhs) const { return lhs.aName.compareTo(rhs.aName) < 0; } - inline bool operator()(const ImplPropertyInfo& lhs,const OUString& rhs) const + bool operator()(const ImplPropertyInfo& lhs,const OUString& rhs) const { return lhs.aName.compareTo(rhs) < 0; } |