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 /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 'svtools')
-rw-r--r-- | svtools/source/brwbox/brwimpl.hxx | 2 | ||||
-rw-r--r-- | svtools/source/config/miscopt.cxx | 32 | ||||
-rw-r--r-- | svtools/source/control/inettbc.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/scriptedtext.cxx | 2 | ||||
-rw-r--r-- | svtools/source/inc/svimpbox.hxx | 6 | ||||
-rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 18 | ||||
-rw-r--r-- | svtools/source/misc/transfer.cxx | 2 | ||||
-rw-r--r-- | svtools/source/table/tablecontrol_impl.hxx | 14 | ||||
-rw-r--r-- | svtools/source/table/tabledatawindow.hxx | 2 | ||||
-rw-r--r-- | svtools/source/table/tablegeometry.hxx | 8 |
10 files changed, 44 insertions, 44 deletions
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx index 26809e9311aa..ed1de0cec294 100644 --- a/svtools/source/brwbox/brwimpl.hxx +++ b/svtools/source/brwbox/brwimpl.hxx @@ -35,7 +35,7 @@ namespace svt struct THeaderCellMapFunctorDispose : ::std::unary_function<THeaderCellMap::value_type,void> { - inline void operator()(const THeaderCellMap::value_type& _aType) + void operator()(const THeaderCellMap::value_type& _aType) { css::uno::Reference< css::lang::XComponent > xComp( _aType.second, css::uno::UNO_QUERY ); OSL_ENSURE( xComp.is() || !_aType.second.is(), "THeaderCellMapFunctorDispose: invalid accessible cell (no XComponent)!" ); diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index f7e4e98f8c66..4d63b6669024 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -125,40 +125,40 @@ public: // public interface - inline bool UseSystemFileDialog() const + bool UseSystemFileDialog() const { return m_bUseSystemFileDialog; } - inline void SetUseSystemFileDialog( bool bSet ) + void SetUseSystemFileDialog( bool bSet ) { m_bUseSystemFileDialog = bSet; SetModified(); } - inline bool IsUseSystemFileDialogReadOnly() const + bool IsUseSystemFileDialogReadOnly() const { return m_bIsUseSystemFileDialogRO; } - inline bool DisableUICustomization() const + bool DisableUICustomization() const { return m_bDisableUICustomization; } - inline void SetExperimentalMode( bool bSet ) + void SetExperimentalMode( bool bSet ) { m_bExperimentalMode = bSet; SetModified(); } - inline bool IsExperimentalMode() const + bool IsExperimentalMode() const { return m_bExperimentalMode; } - inline void SetMacroRecorderMode( bool bSet ) + void SetMacroRecorderMode( bool bSet ) { m_bMacroRecorderMode = bSet; SetModified(); } - inline bool IsMacroRecorderMode() const + bool IsMacroRecorderMode() const { return m_bMacroRecorderMode; } - inline bool IsPluginsEnabled() const + bool IsPluginsEnabled() const { return m_bPluginsEnabled; } - inline sal_Int16 GetSymbolsSize() + sal_Int16 GetSymbolsSize() { return m_nSymbolsSize; } - inline ToolBoxButtonSize GetSidebarIconSize() + ToolBoxButtonSize GetSidebarIconSize() { return m_nSidebarIconSize; } - inline ToolBoxButtonSize GetNotebookbarIconSize() + ToolBoxButtonSize GetNotebookbarIconSize() { return m_nNotebookbarIconSize; } void SetSymbolsSize( sal_Int16 nSet ); @@ -190,19 +190,19 @@ public: {return m_bIconThemeWasSetAutomatically;} // translate to VCL settings ( "0" = 3D, "1" = FLAT ) - inline sal_Int16 GetToolboxStyle() + sal_Int16 GetToolboxStyle() { return m_nToolboxStyle ? VCL_TOOLBOX_STYLE_FLAT : 0; } // translate from VCL settings void SetToolboxStyle( sal_Int16 nStyle ); - inline bool UseSystemPrintDialog() const + bool UseSystemPrintDialog() const { return m_bUseSystemPrintDialog; } - inline void SetUseSystemPrintDialog( bool bSet ) + void SetUseSystemPrintDialog( bool bSet ) { m_bUseSystemPrintDialog = bSet; SetModified(); } - inline bool ShowLinkWarningDialog() const + bool ShowLinkWarningDialog() const { return m_bShowLinkWarningDialog; } void SetShowLinkWarningDialog( bool bSet ) diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 45e80049ee05..0a5ce6f2bbe1 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -81,7 +81,7 @@ public: static bool TildeParsing( OUString& aText, OUString& aBaseUrl ); - inline SvtURLBox_Impl( ) + SvtURLBox_Impl( ) { FilterMatch::createWildCardFilterList(OUString(),m_aFilters); } diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 06a27c0f5f44..a8495d725605 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -52,7 +52,7 @@ private: /** Gets the font of the given script type. */ const vcl::Font& GetFont( sal_uInt16 _nScript ) const; /** Sets a font on the output device depending on the script type. */ - inline void SetOutDevFont( sal_uInt16 _nScript ) + void SetOutDevFont( sal_uInt16 _nScript ) { mrOutDevice.SetFont( GetFont( _nScript ) ); } /** Fills maPosVec with positions of all changes of script type. This method expects correctly initialized maPosVec and maScriptVec. */ diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 28b2615e593c..2503926bcb4f 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -200,7 +200,7 @@ private: void CalcCellFocusRect( SvTreeListEntry* pEntry, Rectangle& rRect ); bool AreChildrenTransient() const { return bAreChildrenTransient; } - inline void SetChildrenNotTransient() { bAreChildrenTransient = false; } + void SetChildrenNotTransient() { bAreChildrenTransient = false; } protected: VclPtr<SvTreeListBox> pView; @@ -333,9 +333,9 @@ public: /** Enables, that one cell of a tablistbox entry can be focused */ bool IsCellFocusEnabled() const { return bIsCellFocusEnabled; } - inline void EnableCellFocus() { bIsCellFocusEnabled = true; } + void EnableCellFocus() { bIsCellFocusEnabled = true; } bool SetCurrentTabPos( sal_uInt16 _nNewPos ); - inline sal_uInt16 GetCurrentTabPos() const { return nCurTabPos; } + sal_uInt16 GetCurrentTabPos() const { return nCurTabPos; } bool IsSelectable( const SvTreeListEntry* pEntry ); }; diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index e757511778f6..c8df77d51058 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -111,7 +111,7 @@ namespace svt TemplateFolderContent m_aSubContents; // sorted (by name) list of the children private: - inline void implResetDate( ) + void implResetDate( ) { m_aLastModified.NanoSeconds = m_aLastModified.Seconds = m_aLastModified.Minutes = m_aLastModified.Hours = 0; m_aLastModified.Day = m_aLastModified.Month = m_aLastModified.Year = 0; @@ -124,18 +124,18 @@ namespace svt explicit TemplateContent( const INetURLObject& _rURL ); // attribute access - inline OUString getURL( ) const { return m_aURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); } - inline void setModDate( const util::DateTime& _rDate ) { m_aLastModified = _rDate; } - inline const util::DateTime& getModDate( ) const { return m_aLastModified; } + OUString getURL( ) const { return m_aURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ); } + void setModDate( const util::DateTime& _rDate ) { m_aLastModified = _rDate; } + const util::DateTime& getModDate( ) const { return m_aLastModified; } - inline TemplateFolderContent& getSubContents() { return m_aSubContents; } - inline const TemplateFolderContent& getSubContents() const { return m_aSubContents; } + TemplateFolderContent& getSubContents() { return m_aSubContents; } + const TemplateFolderContent& getSubContents() const { return m_aSubContents; } - inline ConstFolderIterator end() const { return m_aSubContents.end(); } - inline TemplateFolderContent::size_type + ConstFolderIterator end() const { return m_aSubContents.end(); } + TemplateFolderContent::size_type size() const { return m_aSubContents.size(); } - inline void push_back( const ::rtl::Reference< TemplateContent >& _rxNewElement ) + void push_back( const ::rtl::Reference< TemplateContent >& _rxNewElement ) { m_aSubContents.push_back( _rxNewElement ); } }; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index ce3685604866..19d87badf38a 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1038,7 +1038,7 @@ public: TransferableClipboardNotifier( const Reference< XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex ); /// determines whether we're currently listening - inline bool isListening() const { return mpListener != nullptr; } + bool isListening() const { return mpListener != nullptr; } /// makes the instance non-functional void dispose(); diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 47a71a356da9..9fdd30d180c9 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -136,18 +136,18 @@ namespace svt { namespace table public: void setModel( const PTableModel& _pModel ); - inline const PTableInputHandler& getInputHandler() const { return m_pInputHandler; } + const PTableInputHandler& getInputHandler() const { return m_pInputHandler; } - inline RowPos getCurRow() const { return m_nCurRow; } + RowPos getCurRow() const { return m_nCurRow; } RowPos getAnchor() const { return m_nAnchor; } void setAnchor( RowPos const i_anchor ) { m_nAnchor = i_anchor; } - inline RowPos getTopRow() const { return m_nTopRow; } - inline ColPos getLeftColumn() const { return m_nLeftColumn; } + RowPos getTopRow() const { return m_nTopRow; } + ColPos getLeftColumn() const { return m_nLeftColumn; } - inline const TableControl& getAntiImpl() const { return m_rAntiImpl; } - inline TableControl& getAntiImpl() { return m_rAntiImpl; } + const TableControl& getAntiImpl() const { return m_rAntiImpl; } + TableControl& getAntiImpl() { return m_rAntiImpl; } public: explicit TableControl_Impl( TableControl& _rAntiImpl ); @@ -283,7 +283,7 @@ namespace svt { namespace table getAccessible( vcl::Window& i_parentWindow ); void disposeAccessible(); - inline bool isAccessibleAlive() const { return impl_isAccessibleAlive(); } + bool isAccessibleAlive() const { return impl_isAccessibleAlive(); } // ITableModelListener virtual void rowsInserted( RowPos first, RowPos last ) override; diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx index 99def264e3b8..d7786fcdea42 100644 --- a/svtools/source/table/tabledatawindow.hxx +++ b/svtools/source/table/tabledatawindow.hxx @@ -44,7 +44,7 @@ namespace svt { namespace table virtual ~TableDataWindow() override; virtual void dispose() override; - inline void SetSelectHdl(const Link<LinkParamNone*,void>& rLink) + void SetSelectHdl(const Link<LinkParamNone*,void>& rLink) { m_aSelectHdl = rLink; } diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx index c5943625e101..c6ffba2ce972 100644 --- a/svtools/source/table/tablegeometry.hxx +++ b/svtools/source/table/tablegeometry.hxx @@ -146,11 +146,11 @@ namespace svt { namespace table { } - inline Rectangle getRect() const { return m_aRow.getRect().GetIntersection( m_aCol.getRect() ); } - inline ColPos getColumn() const { return m_aCol.getCol(); } - inline bool isValid() const { return !getRect().IsEmpty(); } + Rectangle getRect() const { return m_aRow.getRect().GetIntersection( m_aCol.getRect() ); } + ColPos getColumn() const { return m_aCol.getCol(); } + bool isValid() const { return !getRect().IsEmpty(); } - inline bool moveRight() {return m_aCol.moveRight(); } + bool moveRight() {return m_aCol.moveRight(); } }; |