[Libreoffice-commits] core.git: include/vcl vcl/backendtest vcl/inc vcl/source vcl/workben
Noel Grandin
noel at peralex.com
Mon Oct 10 08:43:26 UTC 2016
include/vcl/combobox.hxx | 3 --
include/vcl/lstbox.hxx | 2 -
include/vcl/morebtn.hxx | 3 --
include/vcl/slider.hxx | 1
include/vcl/splitwin.hxx | 1
include/vcl/toolbox.hxx | 2 -
vcl/backendtest/VisualBackendTest.cxx | 5 ---
vcl/inc/listbox.hxx | 3 --
vcl/source/control/combobox.cxx | 6 ----
vcl/source/control/imp_listbox.cxx | 5 ---
vcl/source/control/morebtn.cxx | 10 -------
vcl/source/control/slider.cxx | 5 ---
vcl/source/window/dockmgr.cxx | 12 ---------
vcl/source/window/dockwin.cxx | 18 --------------
vcl/source/window/splitwin.cxx | 5 ---
vcl/source/window/toolbox.cxx | 10 -------
vcl/workben/svdem.cxx | 43 ----------------------------------
vcl/workben/svpclient.cxx | 42 ---------------------------------
vcl/workben/svptest.cxx | 36 ----------------------------
19 files changed, 212 deletions(-)
New commits:
commit 044260331d61e97281539d8dfdcbb64089751437
Author: Noel Grandin <noel at peralex.com>
Date: Mon Oct 10 08:14:07 2016 +0200
loplugin:unnecessaryoverride in vcl
Change-Id: I8a49316dccdc142389d2f7121ff7c8cbbad55638
Reviewed-on: https://gerrit.libreoffice.org/29655
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index d4dcfb9..07f5427 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -58,7 +58,6 @@ public:
virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override;
virtual void Resize() override;
- virtual bool PreNotify( NotifyEvent& rNEvt ) override;
virtual bool Notify( NotifyEvent& rNEvt ) override;
virtual void StateChanged( StateChangedType nType ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
@@ -72,8 +71,6 @@ public:
virtual const Wallpaper& GetDisplayBackground() const override;
virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override;
- void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) override
- { Edit::SetPosSizePixel( rNewPos, rNewSize ); }
Rectangle GetDropDownPosSizePixel() const;
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 3133304..4f22c06 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -138,8 +138,6 @@ public:
virtual void setPosSizePixel( long nX, long nY,
long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override;
- void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) override
- { Control::SetPosSizePixel( rNewPos, rNewSize ); }
Rectangle GetDropDownPosSizePixel() const;
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index 4204366..36ebd94 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -51,9 +51,6 @@ public:
void Click() override;
using PushButton::SetState;
-
- void SetText( const OUString& rNewText ) override;
- OUString GetText() const override;
};
#endif // INCLUDED_VCL_MOREBTN_HXX
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 3ab014c..72d4bc9 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -88,7 +88,6 @@ public:
virtual void KeyInput( const KeyEvent& rKEvt ) override;
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
virtual void Resize() override;
- virtual void RequestHelp( const HelpEvent& rHEvt ) override;
virtual void StateChanged( StateChangedType nType ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 2be7030..96ecd89 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -137,7 +137,6 @@ public:
virtual void MouseMove( const MouseEvent& rMEvt ) override;
virtual void Tracking( const TrackingEvent& rTEvt ) override;
virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
- virtual void Move() override;
virtual void Resize() override;
virtual void RequestHelp( const HelpEvent& rHEvt ) override;
virtual void StateChanged( StateChangedType nType ) override;
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index f1ad481..cdc368d 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -276,7 +276,6 @@ public:
virtual void MouseMove( const MouseEvent& rMEvt ) override;
virtual void Tracking( const TrackingEvent& rTEvt ) override;
virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
- virtual void Move() override;
virtual void Resize() override;
virtual void RequestHelp( const HelpEvent& rHEvt ) override;
virtual bool Notify( NotifyEvent& rNEvt ) override;
@@ -284,7 +283,6 @@ public:
virtual void StateChanged( StateChangedType nType ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
- virtual void GetFocus() override;
virtual void LoseFocus() override;
virtual void KeyInput( const KeyEvent& rKEvt ) override;
diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx
index bd3d4bf..ced23d9 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -134,11 +134,6 @@ public:
DECL_LINK(updateHdl, Timer*, void);
- virtual void dispose() override
- {
- WorkWindow::dispose();
- }
-
virtual void KeyInput(const KeyEvent& rKEvt) override
{
sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index a237e34..48bcdab 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -372,7 +372,6 @@ private:
protected:
virtual void GetFocus() override;
virtual void StateChanged( StateChangedType nType ) override;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
virtual bool Notify( NotifyEvent& rNEvt ) override;
@@ -496,8 +495,6 @@ public:
virtual void setPosSizePixel( long nX, long nY,
long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override;
- void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) override
- { FloatingWindow::SetPosSizePixel( rNewPos, rNewSize ); }
void SetDropDownLineCount( sal_uInt16 n ) { mnDDLineCount = n; }
sal_uInt16 GetDropDownLineCount() const { return mnDDLineCount; }
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 530f220..4dd8300 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -696,12 +696,6 @@ void ComboBox::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-bool ComboBox::PreNotify( NotifyEvent& rNEvt )
-{
-
- return Edit::PreNotify( rNEvt );
-}
-
bool ComboBox::Notify( NotifyEvent& rNEvt )
{
bool bDone = false;
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 56a7aa1..e6359c7 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2466,11 +2466,6 @@ void ImplListBox::StateChanged( StateChangedType nType )
Control::StateChanged( nType );
}
-void ImplListBox::DataChanged( const DataChangedEvent& rDCEvt )
-{
- Control::DataChanged( rDCEvt );
-}
-
bool ImplListBox::Notify( NotifyEvent& rNEvt )
{
bool bDone = false;
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index 86cb9c0..4cbf7af 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -141,14 +141,4 @@ void MoreButton::Click()
PushButton::Click();
}
-void MoreButton::SetText( const OUString& rText )
-{
- PushButton::SetText( rText );
-}
-
-OUString MoreButton::GetText() const
-{
- return PushButton::GetText();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 0f2ef5e..5a4947c 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -862,11 +862,6 @@ IMPL_LINK_NOARG(Slider, LinkedFieldModifyHdl, Edit&, void)
SetThumbPos(mpLinkedField->GetValue());
}
-void Slider::RequestHelp( const HelpEvent& rHEvt )
-{
- Control::RequestHelp( rHEvt );
-}
-
void Slider::StateChanged( StateChangedType nType )
{
Control::StateChanged( nType );
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 0bc7ce2..8a82de7 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -62,8 +62,6 @@ public:
virtual void Move() override;
virtual void Resize() override;
virtual void TitleButtonClick( TitleButton nButton ) override;
- virtual void Pin() override;
- virtual void Roll() override;
virtual void Resizing( Size& rSize ) override;
virtual bool Close() override;
};
@@ -259,16 +257,6 @@ void ImplDockFloatWin2::TitleButtonClick( TitleButton nButton )
mpDockWin->TitleButtonClick( nButton );
}
-void ImplDockFloatWin2::Pin()
-{
- FloatingWindow::Pin();
-}
-
-void ImplDockFloatWin2::Roll()
-{
- FloatingWindow::Roll();
-}
-
void ImplDockFloatWin2::Resizing( Size& rSize )
{
FloatingWindow::Resizing( rSize );
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index af27e48..8dff109 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -77,9 +77,6 @@ public:
virtual void Move() override;
virtual void Resize() override;
- virtual void TitleButtonClick( TitleButton nButton ) override;
- virtual void Pin() override;
- virtual void Roll() override;
virtual void Resizing( Size& rSize ) override;
virtual bool Close() override;
};
@@ -217,21 +214,6 @@ void ImplDockFloatWin::Resize()
mpDockWin->ImplPosSizeWindow( 0, 0, aSize.Width(), aSize.Height(), PosSizeFlags::PosSize );
}
-void ImplDockFloatWin::TitleButtonClick( TitleButton nButton )
-{
- FloatingWindow::TitleButtonClick( nButton );
-}
-
-void ImplDockFloatWin::Pin()
-{
- FloatingWindow::Pin();
-}
-
-void ImplDockFloatWin::Roll()
-{
- FloatingWindow::Roll();
-}
-
void ImplDockFloatWin::Resizing( Size& rSize )
{
FloatingWindow::Resizing( rSize );
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 71a0be4..a50aaf3 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2530,11 +2530,6 @@ void SplitWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
}
}
-void SplitWindow::Move()
-{
- DockingWindow::Move();
-}
-
void SplitWindow::Resize()
{
Size aSize = GetOutputSizePixel();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 72dc107..d55926e 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4158,11 +4158,6 @@ void ToolBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rPaintR
ImplShowFocus();
}
-void ToolBox::Move()
-{
- DockingWindow::Move();
-}
-
void ToolBox::Resize()
{
Size aSize = GetOutputSizePixel();
@@ -4986,11 +4981,6 @@ void ToolBox::EnableCustomize( bool bEnable )
}
}
-void ToolBox::GetFocus()
-{
- DockingWindow::GetFocus();
-}
-
void ToolBox::LoseFocus()
{
ImplChangeHighlight( nullptr, true );
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index d52c745..6496032 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -74,14 +74,6 @@ class MyWin : public WorkWindow
{
public:
MyWin( vcl::Window* pParent, WinBits nWinStyle );
-
- void MouseMove( const MouseEvent& rMEvt ) override;
- void MouseButtonDown( const MouseEvent& rMEvt ) override;
- void MouseButtonUp( const MouseEvent& rMEvt ) override;
- void KeyInput( const KeyEvent& rKEvt ) override;
- void KeyUp( const KeyEvent& rKEvt ) override;
- void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
- void Resize() override;
};
void Main()
@@ -98,39 +90,4 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :
{
}
-void MyWin::MouseMove( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseMove( rMEvt );
-}
-
-void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseButtonDown( rMEvt );
-}
-
-void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseButtonUp( rMEvt );
-}
-
-void MyWin::KeyInput( const KeyEvent& rKEvt )
-{
- WorkWindow::KeyInput( rKEvt );
-}
-
-void MyWin::KeyUp( const KeyEvent& rKEvt )
-{
- WorkWindow::KeyUp( rKEvt );
-}
-
-void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
-{
- WorkWindow::Paint(rRenderContext, rRect);
-}
-
-void MyWin::Resize()
-{
- WorkWindow::Resize();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index c3db7ec..0a57344 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -99,14 +99,6 @@ class MyWin : public WorkWindow
public:
MyWin( vcl::Window* pParent, WinBits nWinStyle );
- virtual void MouseMove( const MouseEvent& rMEvt ) override;
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
- virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
- virtual void KeyInput( const KeyEvent& rKEvt ) override;
- virtual void KeyUp( const KeyEvent& rKEvt ) override;
- virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
- virtual void Resize() override;
-
virtual bool Close() override;
virtual ~MyWin() override { disposeOnce(); }
virtual void dispose() override;
@@ -284,39 +276,5 @@ IMPL_LINK_NOARG( MyWin, SelectHdl, ListBox&, void)
}
}
-void MyWin::MouseMove( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseMove( rMEvt );
-}
-
-void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseButtonDown( rMEvt );
-}
-
-void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseButtonUp( rMEvt );
-}
-
-void MyWin::KeyInput( const KeyEvent& rKEvt )
-{
- WorkWindow::KeyInput( rKEvt );
-}
-
-void MyWin::KeyUp( const KeyEvent& rKEvt )
-{
- WorkWindow::KeyUp( rKEvt );
-}
-
-void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
-{
- WorkWindow::Paint(rRenderContext, rRect);
-}
-
-void MyWin::Resize()
-{
- WorkWindow::Resize();
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 71a7fc8..24ff69d 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -85,13 +85,7 @@ class MyWin : public WorkWindow
public:
MyWin( vcl::Window* pParent, WinBits nWinStyle );
- virtual void MouseMove( const MouseEvent& rMEvt ) override;
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
- virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
- virtual void KeyInput( const KeyEvent& rKEvt ) override;
- virtual void KeyUp( const KeyEvent& rKEvt ) override;
virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
- virtual void Resize() override;
};
void Main()
@@ -128,31 +122,6 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :
Bitmap::ReleaseAccess( pAcc );
}
-void MyWin::MouseMove( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseMove( rMEvt );
-}
-
-void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseButtonDown( rMEvt );
-}
-
-void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
-{
- WorkWindow::MouseButtonUp( rMEvt );
-}
-
-void MyWin::KeyInput( const KeyEvent& rKEvt )
-{
- WorkWindow::KeyInput( rKEvt );
-}
-
-void MyWin::KeyUp( const KeyEvent& rKEvt )
-{
- WorkWindow::KeyUp( rKEvt );
-}
-
static Point project( const Point& rPoint )
{
const double angle_x = M_PI / 6.0;
@@ -352,9 +321,4 @@ void MyWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
rRenderContext.Pop();
}
-void MyWin::Resize()
-{
- WorkWindow::Resize();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list