From 6d830c6e26b89a441c11731165eb4d9e0f0d3881 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 30 Oct 2019 09:40:47 +0200 Subject: loplugin:finalclasses framework Change-Id: Ide6531c29fd44003a3235dbd75af79fec0d94678 Reviewed-on: https://gerrit.libreoffice.org/81727 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/toolkit/awt/animatedimagespeer.hxx | 8 ++- include/toolkit/awt/vclxgraphics.hxx | 2 +- include/toolkit/awt/vclxmenu.hxx | 4 +- include/toolkit/awt/vclxprinter.hxx | 6 +-- include/toolkit/awt/vclxspinbutton.hxx | 5 +- include/toolkit/awt/vclxsystemdependentwindow.hxx | 2 +- include/toolkit/awt/vclxtabpagecontainer.hxx | 6 +-- include/toolkit/awt/vclxwindows.hxx | 59 +++++++++-------------- 8 files changed, 38 insertions(+), 54 deletions(-) (limited to 'include/toolkit/awt') diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index ebe1e41d1611..ee1747394ca6 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -43,12 +43,12 @@ namespace toolkit css::util::XModifyListener > AnimatedImagesPeer_Base; - class AnimatedImagesPeer :public AnimatedImagesPeer_Base + class AnimatedImagesPeer final : public AnimatedImagesPeer_Base { public: AnimatedImagesPeer(); - protected: + private: virtual ~AnimatedImagesPeer() override; public: @@ -75,15 +75,13 @@ namespace toolkit // XComponent void SAL_CALL dispose( ) override; - protected: + private: void ProcessWindowEvent( const VclWindowEvent& i_windowEvent ) override; - private: /** updates our images with the ones from the given XAnimatedImages component */ void impl_updateImages_nolck( const css::uno::Reference< css::uno::XInterface >& i_animatedImages ); - private: AnimatedImagesPeer(const AnimatedImagesPeer&) = delete; AnimatedImagesPeer& operator=(const AnimatedImagesPeer&) = delete; diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index 85464ae37e56..264843dae6ae 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -54,7 +54,7 @@ namespace o3tl // class VCLXGraphics -class VCLXGraphics : public cppu::WeakImplHelper< +class VCLXGraphics final : public cppu::WeakImplHelper< css::awt::XGraphics2, css::lang::XUnoTunnel> { diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 61f5b7385604..34f5d8f2a58a 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -143,14 +143,14 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -class TOOLKIT_DLLPUBLIC VCLXMenuBar : public VCLXMenu +class TOOLKIT_DLLPUBLIC VCLXMenuBar final : public VCLXMenu { public: VCLXMenuBar(); VCLXMenuBar( MenuBar* pMenuBar ); }; -class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCLXMenu +class TOOLKIT_DLLPUBLIC VCLXPopupMenu final : public VCLXMenu { public: VCLXPopupMenu(); diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx index a22f52432136..81aebf443c6e 100644 --- a/include/toolkit/awt/vclxprinter.hxx +++ b/include/toolkit/awt/vclxprinter.hxx @@ -106,7 +106,7 @@ public: typedef ::cppu::ImplInheritanceHelper < VCLXPrinterPropertySet , css::awt::XPrinter > VCLXPrinter_Base; -class VCLXPrinter: public VCLXPrinter_Base +class VCLXPrinter final : public VCLXPrinter_Base { std::shared_ptr mxListener; JobSetup maInitJobSetup; @@ -145,7 +145,7 @@ public: typedef ::cppu::ImplInheritanceHelper < VCLXPrinterPropertySet , css::awt::XInfoPrinter > VCLXInfoPrinter_Base; -class VCLXInfoPrinter: public VCLXInfoPrinter_Base +class VCLXInfoPrinter final : public VCLXInfoPrinter_Base { public: VCLXInfoPrinter( const OUString& rPrinterName ); @@ -178,7 +178,7 @@ public: typedef ::cppu::WeakImplHelper < css::awt::XPrinterServer2, css::lang::XServiceInfo > VCLXPrinterServer_Base; -class VCLXPrinterServer : public VCLXPrinterServer_Base +class VCLXPrinterServer final : public VCLXPrinterServer_Base { public: // css::awt::XPrinterServer2 diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx index b7237feee37f..5074c591645c 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/include/toolkit/awt/vclxspinbutton.hxx @@ -35,7 +35,7 @@ namespace toolkit typedef ::cppu::ImplHelper1 < css::awt::XSpinValue > VCLXSpinButton_Base; - class VCLXSpinButton :public VCLXWindow + class VCLXSpinButton final : public VCLXWindow ,public VCLXSpinButton_Base { private: @@ -44,7 +44,7 @@ namespace toolkit public: VCLXSpinButton(); - protected: + private: virtual ~VCLXSpinButton( ) override; // XInterface @@ -78,7 +78,6 @@ namespace toolkit // VCLXWindow void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) override; - private: VCLXSpinButton( const VCLXSpinButton& ) = delete; VCLXSpinButton& operator=( const VCLXSpinButton& ) = delete; }; diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx index d53755aca336..186cb7b915b6 100644 --- a/include/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx @@ -26,7 +26,7 @@ #include -class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow : public css::awt::XSystemDependentWindowPeer, +class TOOLKIT_DLLPUBLIC VCLXSystemDependentWindow final : public css::awt::XSystemDependentWindowPeer, public VCLXWindow { public: diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx index be3a8b9674c1..ffb6feb5ad73 100644 --- a/include/toolkit/awt/vclxtabpagecontainer.hxx +++ b/include/toolkit/awt/vclxtabpagecontainer.hxx @@ -31,7 +31,7 @@ typedef cppu::ImplInheritanceHelper< VCLXContainer, css::awt::tab::XTabPageContainer, css::container::XContainerListener > VCLXTabPageContainer_Base; -class VCLXTabPageContainer : public VCLXTabPageContainer_Base +class VCLXTabPageContainer final : public VCLXTabPageContainer_Base { public: VCLXTabPageContainer(); @@ -59,9 +59,9 @@ public: // css::awt::XVclWindowPeer void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; -protected: - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; private: + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; + TabPageListenerMultiplexer m_aTabPageListeners; ::std::vector< css::uno::Reference< css::awt::tab::XTabPage > > m_aTabPages; }; diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index eba13e505a41..6dd518296356 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -105,14 +105,13 @@ typedef cppu::ImplInheritanceHelper< VCLXGraphicControl, css::awt::XButton, css::awt::XToggleButton > VCLXButton_Base; -class VCLXButton :public VCLXButton_Base +class VCLXButton final : public VCLXButton_Base { private: OUString maActionCommand; ActionListenerMultiplexer maActionListeners; ItemListenerMultiplexer maItemListeners; -protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; @@ -150,7 +149,7 @@ public: // class VCLXImageControl -class VCLXImageControl : public VCLXGraphicControl +class VCLXImageControl final : public VCLXGraphicControl { public: VCLXImageControl(); @@ -168,14 +167,14 @@ public: static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } -protected: +private: virtual void ImplSetNewImage() override; }; // class VCLXCheckBox -class SAL_DLLPUBLIC_RTTI VCLXCheckBox : public css::awt::XCheckBox, +class TOOLKIT_DLLPUBLIC VCLXCheckBox final : public css::awt::XCheckBox, public css::awt::XButton, public VCLXGraphicControl { @@ -184,7 +183,6 @@ private: OUString maActionCommand; ItemListenerMultiplexer maItemListeners; -protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; @@ -233,7 +231,7 @@ public: // class VCLXRadioButton -class SAL_DLLPUBLIC_RTTI VCLXRadioButton : public css::awt::XRadioButton, +class TOOLKIT_DLLPUBLIC VCLXRadioButton final : public css::awt::XRadioButton, public css::awt::XButton, public VCLXGraphicControl { @@ -242,7 +240,6 @@ private: ActionListenerMultiplexer maActionListeners; OUString maActionCommand; -protected: void ImplClickedOrToggled( bool bToggled ); void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; @@ -291,7 +288,7 @@ public: // class VCLXMessageBox -class VCLXMessageBox : public css::awt::XMessageBox, +class VCLXMessageBox final : public css::awt::XMessageBox, public VCLXTopWindow { public: @@ -324,9 +321,8 @@ public: // class VCLXFrame -class VCLXFrame : public VCLXContainer +class VCLXFrame final : public VCLXContainer { -protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; public: @@ -353,7 +349,7 @@ public: // class VCLXDialog -class TOOLKIT_DLLPUBLIC VCLXDialog : public css::awt::XDialog2, +class TOOLKIT_DLLPUBLIC VCLXDialog final : public css::awt::XDialog2, public VCLXTopWindow { public: @@ -395,7 +391,7 @@ public: // class VCLXTabPage -class VCLXTabPage : public VCLXContainer +class VCLXTabPage final : public VCLXContainer { public: VCLXTabPage(); @@ -420,11 +416,11 @@ public: virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } }; -class VCLXMultiPage : public css::awt::XSimpleTabController, public VCLXContainer +class VCLXMultiPage final : public css::awt::XSimpleTabController, public VCLXContainer { TabListenerMultiplexer maTabListeners; sal_Int32 mTabId; -protected: + void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; public: VCLXMultiPage(); @@ -470,14 +466,13 @@ public: // class VCLXFixedHyperlink -class TOOLKIT_DLLPUBLIC VCLXFixedHyperlink : +class TOOLKIT_DLLPUBLIC VCLXFixedHyperlink final : public css::awt::XFixedHyperlink, public VCLXWindow { private: ActionListenerMultiplexer maActionListeners; -protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > @@ -525,10 +520,9 @@ public: // class VCLXFixedText -class VCLXFixedText : public css::awt::XFixedText, +class VCLXFixedText final : public css::awt::XFixedText, public VCLXWindow { -protected: virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: @@ -562,13 +556,12 @@ public: // class VCLXScrollBar -class SAL_DLLPUBLIC_RTTI VCLXScrollBar : public css::awt::XScrollBar, +class TOOLKIT_DLLPUBLIC VCLXScrollBar final : public css::awt::XScrollBar, public VCLXWindow { private: AdjustmentListenerMultiplexer maAdjustmentListeners; -protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; @@ -699,13 +692,12 @@ typedef cppu::ImplInheritanceHelper< VCLXWindow, css::awt::XTextLayoutConstrains, css::awt::XItemListListener > VCLXListBox_Base; -class VCLXListBox : public VCLXListBox_Base +class VCLXListBox final : public VCLXListBox_Base { private: ActionListenerMultiplexer maActionListeners; ItemListenerMultiplexer maItemListeners; -protected: virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; @@ -775,13 +767,12 @@ typedef cppu::ImplInheritanceHelper< VCLXEdit, css::awt::XComboBox, css::awt::XItemListListener > VCLXComboBox_Base; -class VCLXComboBox : public VCLXComboBox_Base +class VCLXComboBox final : public VCLXComboBox_Base { private: ActionListenerMultiplexer maActionListeners; ItemListenerMultiplexer maItemListeners; -protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; @@ -950,10 +941,9 @@ public: // class VCLXTimeField -class VCLXTimeField : public css::awt::XTimeField, +class VCLXTimeField final : public css::awt::XTimeField, public VCLXFormattedSpinField { -protected: virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; public: VCLXTimeField(); @@ -995,7 +985,7 @@ public: // class VCLXNumericField -class VCLXNumericField : public css::awt::XNumericField, +class VCLXNumericField final : public css::awt::XNumericField, public VCLXFormattedSpinField { public: @@ -1042,7 +1032,7 @@ public: class MetricFormatter; class MetricField; -class VCLXMetricField : public css::awt::XMetricField, +class VCLXMetricField final : public css::awt::XMetricField, public VCLXFormattedSpinField { /// @throws css::uno::RuntimeException @@ -1094,7 +1084,7 @@ public: // class VCLXCurrencyField -class VCLXCurrencyField : public css::awt::XCurrencyField, +class VCLXCurrencyField final : public css::awt::XCurrencyField, public VCLXFormattedSpinField { public: @@ -1140,7 +1130,7 @@ public: // class VCLXPatternField -class VCLXPatternField : public css::awt::XPatternField, +class VCLXPatternField final : public css::awt::XPatternField, public VCLXFormattedSpinField { public: @@ -1176,11 +1166,8 @@ public: // class VCLXToolBox -class VCLXToolBox : public VCLXWindow +class VCLXToolBox final : public VCLXWindow { -private: - -protected: virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override; @@ -1189,7 +1176,7 @@ public: virtual ~VCLXToolBox() override; }; -class VCLXHeaderBar : public VCLXWindow +class VCLXHeaderBar final : public VCLXWindow { public: VCLXHeaderBar(); -- cgit