Kaydet (Commit) 6cb9e6da authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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/34874Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 7e8806cd
......@@ -120,7 +120,7 @@ public:
/** returns the accessible object for the row or the column header bar
*/
inline css::uno::Reference<
css::uno::Reference<
css::accessibility::XAccessible >
getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType )
{
......@@ -129,7 +129,7 @@ public:
/** returns the accessible object for the table representation
*/
inline css::uno::Reference<
css::uno::Reference<
css::accessibility::XAccessible >
getTable( )
{
......@@ -203,7 +203,7 @@ public:
);
/// returns the AccessibleContext belonging to this Accessible
inline AccessibleBrowseBox* getContext() { return m_xContext.get(); }
AccessibleBrowseBox* getContext() { return m_xContext.get(); }
protected:
virtual ~AccessibleBrowseBoxAccess() override;
......
......@@ -285,7 +285,7 @@ protected:
public:
/** @return The osl::Mutex member provided by the class BaseMutex. */
inline ::osl::Mutex& getMutex( ) { return m_aMutex; }
::osl::Mutex& getMutex( ) { return m_aMutex; }
/** @throws <type>DisposedException</type> If the object is not alive. */
void ensureIsAlive() const;
......@@ -386,7 +386,7 @@ protected:
class SolarMethodGuard : public SolarMutexGuard, public osl::MutexGuard
{
public:
inline SolarMethodGuard( osl::Mutex& rMutex )
SolarMethodGuard( osl::Mutex& rMutex )
:SolarMutexGuard( )
,osl::MutexGuard( rMutex )
{
......
......@@ -45,7 +45,7 @@ namespace accessibility
/** Grabs the focus to the BrowseBox. */
virtual void SAL_CALL grabFocus() override;
inline bool isRowBarCell() const
bool isRowBarCell() const
{
return getType() == ::svt::BBTYPE_ROWHEADERCELL;
}
......
......@@ -168,7 +168,7 @@ public:
);
/// returns the AccessibleContext belonging to this Accessible
inline AccessibleGridControl* getContext() { return m_xContext.get(); }
AccessibleGridControl* getContext() { return m_xContext.get(); }
protected:
virtual ~AccessibleGridControlAccess() override;
......
......@@ -34,8 +34,8 @@ namespace accessibility
protected:
// attribute access
inline sal_Int32 getRowPos( ) const { return m_nRowPos; }
inline sal_Int32 getColumnPos( ) const { return m_nColPos; }
sal_Int32 getRowPos( ) const { return m_nRowPos; }
sal_Int32 getColumnPos( ) const { return m_nColPos; }
// XAccessibleComponent
virtual void SAL_CALL grabFocus() override;
......
......@@ -40,8 +40,8 @@ namespace accessibility
protected:
// attribute access
inline sal_Int32 getRowPos( ) const { return m_nRowPos; }
inline sal_Int32 getColumnPos( ) const { return m_nColPos; }
sal_Int32 getRowPos( ) const { return m_nRowPos; }
sal_Int32 getColumnPos( ) const { return m_nColPos; }
protected:
// AccessibleBrowseBoxBase overridables
......
......@@ -59,7 +59,7 @@ private:
sal_Int32 implGetSelRowCount() const;
/** Returns the row index from cell index. */
inline sal_Int32 implGetRow( sal_Int32 _nIndex ) const { return _nIndex / implGetColumnCount(); }
sal_Int32 implGetRow( sal_Int32 _nIndex ) const { return _nIndex / implGetColumnCount(); }
/** Returns the absolute row index of the nSelRow-th selected row. */
sal_Int32 implGetSelRow( sal_Int32 _nSelRow ) const;
......
......@@ -40,12 +40,12 @@ namespace accessibility
VclPtr<SvTreeListBox> m_pWindow;
protected:
inline SvTreeListBox* getListBox() const
SvTreeListBox* getListBox() const
{
return const_cast< ListBoxAccessibleBase* >( this )->m_pWindow;
}
inline bool isAlive() const { return nullptr != m_pWindow; }
bool isAlive() const { return nullptr != m_pWindow; }
public:
ListBoxAccessibleBase( SvTreeListBox& _rWindow );
......
......@@ -67,10 +67,10 @@ class Document;
class SfxListenerGuard
{
public:
inline SfxListenerGuard(::SfxListener & rListener):
SfxListenerGuard(::SfxListener & rListener):
m_rListener(rListener), m_pNotifier(nullptr) {}
inline ~SfxListenerGuard() { endListening(); }
~SfxListenerGuard() { endListening(); }
// Not thread safe:
void startListening(::SfxBroadcaster & rNotifier);
......@@ -86,10 +86,10 @@ private:
class WindowListenerGuard
{
public:
inline WindowListenerGuard(::Link<VclWindowEvent&,void> const & rListener):
WindowListenerGuard(::Link<VclWindowEvent&,void> const & rListener):
m_aListener(rListener), m_pNotifier(nullptr) {}
inline ~WindowListenerGuard() { endListening(); }
~WindowListenerGuard() { endListening(); }
// Not thread safe:
void startListening(vcl::Window & rNotifier);
......@@ -105,19 +105,18 @@ private:
class ParagraphInfo
{
public:
inline ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {}
ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {}
inline
css::uno::WeakReference< css::accessibility::XAccessible > const &
getParagraph() const { return m_xParagraph; }
inline ::sal_Int32 getHeight() const { return m_nHeight; }
::sal_Int32 getHeight() const { return m_nHeight; }
inline void setParagraph(
void setParagraph(
css::uno::Reference< css::accessibility::XAccessible > const &
rParagraph) { m_xParagraph = rParagraph; }
inline void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; }
void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; }
private:
css::uno::WeakReference< css::accessibility::XAccessible >
......@@ -148,7 +147,7 @@ public:
Paragraphs::size_type nNumber);
// Not thread-safe.
inline Paragraphs::size_type getNumber() const { return m_nNumber; }
Paragraphs::size_type getNumber() const { return m_nNumber; }
// Not thread-safe.
void numberChanged(bool bIncremented);
......
......@@ -41,7 +41,6 @@ private:
T& m_aComboListBox;
public:
inline
VCLListBoxHelper( T& _pListBox ) :
m_aComboListBox( _pListBox ){}
......
......@@ -92,7 +92,7 @@ public:
void NotifyAccessibleEvent( sal_Int16 _nEventId, const css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue );
inline bool IsSelected() const { return m_bSelected; }
bool IsSelected() const { return m_bSelected; }
void SetSelected( bool _bSelected );
void SetVisible( bool _bVisible );
......
......@@ -59,8 +59,8 @@ private:
css::uno::Reference< css::accessibility::XAccessible > m_xChild;
public:
inline sal_Int32 getIndexInParent() const { return m_nIndexInParent; }
inline void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; }
sal_Int32 getIndexInParent() const { return m_nIndexInParent; }
void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; }
protected:
virtual ~VCLXAccessibleToolBoxItem() override;
......@@ -81,10 +81,10 @@ public:
VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos );
void SetFocus( bool _bFocus );
inline bool HasFocus() const { return m_bHasFocus; }
bool HasFocus() const { return m_bHasFocus; }
void SetChecked( bool _bCheck );
void SetIndeterminate( bool _bIndeterminate );
inline void ReleaseToolBox() { m_pToolBox = nullptr; }
void ReleaseToolBox() { m_pToolBox = nullptr; }
void NameChanged();
void SetChild( const css::uno::Reference< css::accessibility::XAccessible >& _xChild );
const css::uno::Reference< css::accessibility::XAccessible >&
......
......@@ -87,8 +87,8 @@ namespace
sal_Int32 m_nIndexInParent;
public:
inline sal_Int32 getIndexInParent() const { return m_nIndexInParent; }
inline void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; }
sal_Int32 getIndexInParent() const { return m_nIndexInParent; }
void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; }
static bool isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation );
......
......@@ -27,7 +27,7 @@ namespace wrapper
Instance& operator=( const Instance& other );
virtual ~Instance();
inline operator libvlc_instance_t*()
operator libvlc_instance_t*()
{
return mInstance;
}
......
......@@ -33,7 +33,7 @@ namespace wrapper
virtual ~Media();
inline operator libvlc_media_t*()
operator libvlc_media_t*()
{
return mMedia;
}
......
......@@ -63,7 +63,7 @@ namespace wrapper
unsigned getWidth() const;
unsigned getHeight() const;
inline operator libvlc_media_player_t*()
operator libvlc_media_player_t*()
{
return mPlayer;
}
......
......@@ -192,14 +192,14 @@ namespace basctl
/** determines whether the instance refers to a valid "document" with script and
dialog libraries
*/
inline bool isValid() const { return m_bValid; }
bool isValid() const { return m_bValid; }
/** determines whether the instance refers to a non-closed document
*/
inline bool isAlive() const { return m_bValid && ( m_bIsApplication || !m_bDocumentClosed ); }
bool isAlive() const { return m_bValid && ( m_bIsApplication || !m_bDocumentClosed ); }
/// determines whether the "document" refers to the application in real
inline bool isApplication() const { return m_bValid && m_bIsApplication; }
bool isApplication() const { return m_bValid && m_bIsApplication; }
/// determines whether the document refers to a real document (instead of the application)
inline bool isDocument() const { return m_bValid && !m_bIsApplication; }
bool isDocument() const { return m_bValid && !m_bIsApplication; }
/** invalidates the instance
*/
......
......@@ -159,7 +159,7 @@ namespace basctl
// comparison
bool operator==( const ScriptDocument& _rhs ) const;
inline bool operator!=( const ScriptDocument& _rhs ) const { return !( *this == _rhs ); }
bool operator!=( const ScriptDocument& _rhs ) const { return !( *this == _rhs ); }
/// retrieves a (pretty simple) hash code for the document
sal_Int32 hashCode() const;
......
......@@ -881,7 +881,7 @@ public:
}
}
inline bool impBColorsAreEqual(const ImplB3DPolygon& rCandidate) const
bool impBColorsAreEqual(const ImplB3DPolygon& rCandidate) const
{
bool bBColorsAreEqual(true);
......@@ -909,7 +909,7 @@ public:
return bBColorsAreEqual;
}
inline bool impNormalsAreEqual(const ImplB3DPolygon& rCandidate) const
bool impNormalsAreEqual(const ImplB3DPolygon& rCandidate) const
{
bool bNormalsAreEqual(true);
......@@ -937,7 +937,7 @@ public:
return bNormalsAreEqual;
}
inline bool impTextureCoordinatesAreEqual(const ImplB3DPolygon& rCandidate) const
bool impTextureCoordinatesAreEqual(const ImplB3DPolygon& rCandidate) const
{
bool bTextureCoordinatesAreEqual(true);
......
......@@ -70,8 +70,8 @@ public:
explicit DocBasicItem( StarBASIC& rDocBasic );
virtual ~DocBasicItem() override;
inline const SbxObjectRef& getClassModules() const { return mxClassModules; }
inline bool isDocClosed() const { return mbDocClosed; }
const SbxObjectRef& getClassModules() const { return mxClassModules; }
bool isDocClosed() const { return mbDocClosed; }
void clearDependingVarsOnDelete( StarBASIC& rDeletedBasic );
......