diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-27 12:52:01 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-28 07:17:51 +0200 |
commit | b32ead5dd27c6f2b760e4196ebe0378fb8ec1a69 (patch) | |
tree | e647c37f069db3be229a4b89bc44fd21e64128fa /vcl | |
parent | 3956e4cb58033cae360beddf97136596ff3bb740 (diff) |
loplugin:checkunusedparams more part1
seems I got one of the checks wrong, and was missing a bunch of stuff
Change-Id: I2c662fc4e735f8d6cbe56c6f82906a60a580331b
Reviewed-on: https://gerrit.libreoffice.org/40481
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/factory.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/opengl/x11/salvd.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkgdi.hxx | 5 | ||||
-rw-r--r-- | vcl/opengl/x11/salvd.cxx | 1 | ||||
-rw-r--r-- | vcl/source/components/dtranscomp.cxx | 2 | ||||
-rw-r--r-- | vcl/source/components/factory.cxx | 2 | ||||
-rw-r--r-- | vcl/source/helper/canvastools.cxx | 3 | ||||
-rw-r--r-- | vcl/source/window/builder.cxx | 33 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salvd.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkutil.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/gtk/salnativewidgets-gtk.cxx | 15 |
11 files changed, 30 insertions, 45 deletions
diff --git a/vcl/inc/factory.hxx b/vcl/inc/factory.hxx index 056a6c8b7604..d33bb2c371ed 100644 --- a/vcl/inc/factory.hxx +++ b/vcl/inc/factory.hxx @@ -56,8 +56,7 @@ FontIdentificator_createInstance( OUString SAL_CALL Clipboard_getImplementationName(); css::uno::Reference<css::lang::XSingleServiceFactory> SAL_CALL -Clipboard_createFactory( - css::uno::Reference<css::lang::XMultiServiceFactory > const &); +Clipboard_createFactory(); css::uno::Sequence<OUString> SAL_CALL DragSource_getSupportedServiceNames(); diff --git a/vcl/inc/opengl/x11/salvd.hxx b/vcl/inc/opengl/x11/salvd.hxx index 12f0ede73992..aef484124db8 100644 --- a/vcl/inc/opengl/x11/salvd.hxx +++ b/vcl/inc/opengl/x11/salvd.hxx @@ -34,7 +34,6 @@ class X11OpenGLSalVirtualDevice : public SalVirtualDevice public: X11OpenGLSalVirtualDevice( SalGraphics *pGraphics, long &nDX, long &nDY, - DeviceFormat eFormat, const SystemGraphicsData *pData, X11SalGraphics* pNewGraphics); virtual ~X11OpenGLSalVirtualDevice() override; diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 6a057078f04f..8c552393e578 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -341,7 +341,6 @@ protected: ControlState nState, const ImplControlValue& aValue ); bool NWPaintGTKScrollbar( ControlPart nPart, const tools::Rectangle& rControlRectangle, - const std::list< tools::Rectangle >& rClipList, ControlState nState, const ImplControlValue& aValue ); bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRectangle, @@ -350,7 +349,6 @@ protected: const OUString& rCaption ); bool NWPaintGTKSpinBox(ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRectangle, - const std::list< tools::Rectangle >& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption, ControlCacheKey& rControlCacheKey); @@ -361,7 +359,6 @@ protected: const OUString& rCaption ); bool NWPaintGTKTabItem( ControlType nType, const tools::Rectangle& rControlRectangle, - const std::list< tools::Rectangle >& rClipList, ControlState nState, const ImplControlValue& aValue ); bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlPart nPart, const tools::Rectangle& rControlRectangle, @@ -388,11 +385,9 @@ protected: const ImplControlValue& aValue ); bool NWPaintGTKSlider( ControlPart nPart, const tools::Rectangle& rControlRectangle, - const std::list< tools::Rectangle >& rClipList, ControlState nState, const ImplControlValue& aValue ); bool NWPaintGTKListNode( const tools::Rectangle& rControlRectangle, - const std::list< tools::Rectangle >& rClipList, ControlState nState, const ImplControlValue& aValue ); }; diff --git a/vcl/opengl/x11/salvd.cxx b/vcl/opengl/x11/salvd.cxx index f06e9c3a43a5..c0bb8464b89e 100644 --- a/vcl/opengl/x11/salvd.cxx +++ b/vcl/opengl/x11/salvd.cxx @@ -34,7 +34,6 @@ void X11SalGraphics::Init( X11OpenGLSalVirtualDevice *pDevice ) X11OpenGLSalVirtualDevice::X11OpenGLSalVirtualDevice( SalGraphics* pGraphics, long &nDX, long &nDY, - DeviceFormat /*eFormat*/, const SystemGraphicsData *pData, X11SalGraphics* pNewGraphics) : mpGraphics(pNewGraphics), diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 0946b0e34fa5..4419e269c982 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -231,7 +231,7 @@ OUString SAL_CALL Clipboard_getImplementationName() ); } -Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory( const Reference< XMultiServiceFactory > & ) +Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory() { return Reference< XSingleServiceFactory >( new ClipboardFactory() ); } diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 4d7fa497ef35..27f701f721f9 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -59,7 +59,7 @@ extern "C" { } else if( vcl::Clipboard_getImplementationName().equalsAscii( pImplementationName ) ) { - xFactory = vcl::Clipboard_createFactory( xMgr ); + xFactory = vcl::Clipboard_createFactory(); } else if( vcl::DragSource_getImplementationName().equalsAscii( pImplementationName ) ) { diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 8bcf4d69bc90..7b75c586a8ae 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -65,8 +65,7 @@ namespace vcl { namespace unotools { - uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/, - const ::BitmapEx& inputBitmap ) + uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx(const ::BitmapEx& inputBitmap ) { SAL_INFO( "vcl.helper", "vcl::unotools::xBitmapFromBitmapEx()" ); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index bc4b3047cfa0..5a7faafb87a9 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1867,7 +1867,7 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read --nLevel; } else if (name.equals("property")) - collectProperty(reader, sID, aProperties); + collectProperty(reader, aProperties); } if (res == xmlreader::XmlReader::Result::End) @@ -2172,7 +2172,7 @@ void VclBuilder::collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rM rMap[sProperty] = OUString::fromUtf8(sValue); } -void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 /*nRowIndex*/) +void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID) { int nLevel = 1; @@ -2268,7 +2268,10 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rI if (res == xmlreader::XmlReader::Result::Begin) { if (name.equals("row")) - handleRow(reader, rID, nRowIndex++); + { + handleRow(reader, rID); + nRowIndex++; + } else ++nLevel; } @@ -2283,7 +2286,7 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rI } } -void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, vcl::Window *pWindow) +void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, vcl::Window *pWindow) { assert(pWindow); @@ -2306,7 +2309,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI { ++nLevel; if (name.equals("property")) - collectProperty(reader, rID, aProperties); + collectProperty(reader, aProperties); } if (res == xmlreader::XmlReader::Result::End) @@ -2330,7 +2333,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI } } -std::vector<OUString> VclBuilder::handleItems(xmlreader::XmlReader &reader, const OString & /*rID*/) +std::vector<OUString> VclBuilder::handleItems(xmlreader::XmlReader &reader) { int nLevel = 1; @@ -2432,7 +2435,7 @@ void VclBuilder::handleMenu(xmlreader::XmlReader &reader, const OString &rID) { ++nLevel; if (name.equals("property")) - collectProperty(reader, rID, aProperties); + collectProperty(reader, aProperties); } } @@ -2539,7 +2542,7 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read { ++nLevel; if (name.equals("property")) - collectProperty(reader, sID, aProperties); + collectProperty(reader, aProperties); else if (name.equals("accelerator")) collectAccelerator(reader, aAccelerators); } @@ -2557,7 +2560,7 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read insertMenuObject(pParent, pSubMenu, sClass, sID, aProperties, aAccelerators); } -void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rID) +void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader) { m_pParserState->m_aSizeGroups.push_back(SizeGroup()); SizeGroup &rSizeGroup = m_pParserState->m_aSizeGroups.back(); @@ -2596,7 +2599,7 @@ void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rI else { if (name.equals("property")) - collectProperty(reader, rID, rSizeGroup.m_aProperties); + collectProperty(reader, rSizeGroup.m_aProperties); } } @@ -2785,12 +2788,12 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, xmlreader::Xm } else if (sClass == "GtkSizeGroup") { - handleSizeGroup(reader, sID); + handleSizeGroup(reader); return nullptr; } else if (sClass == "AtkObject") { - handleAtkObject(reader, sID, pParent); + handleAtkObject(reader, pParent); return nullptr; } @@ -2824,7 +2827,7 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, xmlreader::Xm handleChild(pCurrentChild, reader); } else if (name.equals("items")) - aItems = handleItems(reader, sID); + aItems = handleItems(reader); else if (name.equals("style")) { int nPriority = 0; @@ -2848,7 +2851,7 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, xmlreader::Xm { ++nLevel; if (name.equals("property")) - collectProperty(reader, sID, aProperties); + collectProperty(reader, aProperties); else if (name.equals("attribute")) collectPangoAttribute(reader, aPangoAttributes); else if (name.equals("relation")) @@ -3103,7 +3106,7 @@ OString VclBuilder::getStyleClass(xmlreader::XmlReader &reader) return aRet; } -void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString & /*rID*/, stringmap &rMap) +void VclBuilder::collectProperty(xmlreader::XmlReader &reader, stringmap &rMap) { xmlreader::Span name; int nsId; diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index 16d8d87ee715..b65563db588a 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -41,7 +41,7 @@ SalVirtualDevice* X11SalInstance::CreateX11VirtualDevice(SalGraphics* pGraphics, { assert(pNewGraphics); if (OpenGLHelper::isVCLOpenGLEnabled()) - return new X11OpenGLSalVirtualDevice( pGraphics, nDX, nDY, eFormat, pData, pNewGraphics ); + return new X11OpenGLSalVirtualDevice( pGraphics, nDX, nDY, pData, pNewGraphics ); else return new X11SalVirtualDevice(pGraphics, nDX, nDY, eFormat, pData, pNewGraphics); } diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index fab7902d588c..c30a41905302 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -169,14 +169,12 @@ public: /// @throws lang::IndexOutOfBoundsException /// @throws uno::RuntimeException void detachRecursive( - const uno::Reference< accessibility::XAccessible >& xAccessible, const uno::Reference< accessibility::XAccessibleContext >& xContext ); /// @throws lang::IndexOutOfBoundsException /// @throws uno::RuntimeException void detachRecursive( - const uno::Reference< accessibility::XAccessible >& xAccessible, const uno::Reference< accessibility::XAccessibleContext >& xContext, const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet ); @@ -349,13 +347,12 @@ void DocumentFocusListener::detachRecursive( xAccessible->getAccessibleContext(); if( xContext.is() ) - detachRecursive(xAccessible, xContext); + detachRecursive(xContext); } /*****************************************************************************/ void DocumentFocusListener::detachRecursive( - const uno::Reference< accessibility::XAccessible >& xAccessible, const uno::Reference< accessibility::XAccessibleContext >& xContext ) { @@ -363,13 +360,12 @@ void DocumentFocusListener::detachRecursive( xContext->getAccessibleStateSet(); if( xStateSet.is() ) - detachRecursive(xAccessible, xContext, xStateSet); + detachRecursive(xContext, xStateSet); } /*****************************************************************************/ void DocumentFocusListener::detachRecursive( - const uno::Reference< accessibility::XAccessible >&, const uno::Reference< accessibility::XAccessibleContext >& xContext, const uno::Reference< accessibility::XAccessibleStateSet >& xStateSet ) diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx index 6b87eef78f54..3c8e75628a3e 100644 --- a/vcl/unx/gtk/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx @@ -965,7 +965,7 @@ bool GtkSalGraphics::DoDrawNativeControl( } else if ( (nType==ControlType::Scrollbar) && ((nPart==ControlPart::DrawBackgroundHorz) || (nPart==ControlPart::DrawBackgroundVert)) ) { - return NWPaintGTKScrollbar( nPart, aCtrlRect, aClip, nState, aValue ); + return NWPaintGTKScrollbar( nPart, aCtrlRect, nState, aValue ); } else if ( ((nType==ControlType::Editbox) && ((nPart==ControlPart::Entire) || (nPart==ControlPart::HasBackgroundTexture)) ) || ((nType==ControlType::Spinbox) && (nPart==ControlPart::HasBackgroundTexture)) @@ -981,7 +981,7 @@ bool GtkSalGraphics::DoDrawNativeControl( else if ( ((nType==ControlType::Spinbox) || (nType==ControlType::SpinButtons)) && ((nPart==ControlPart::Entire) || (nPart==ControlPart::AllButtons)) ) { - return NWPaintGTKSpinBox(nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption, rControlCacheKey); + return NWPaintGTKSpinBox(nType, nPart, aCtrlRect, nState, aValue, rCaption, rControlCacheKey); } else if ( (nType == ControlType::Combobox) && ( (nPart==ControlPart::Entire) @@ -995,7 +995,7 @@ bool GtkSalGraphics::DoDrawNativeControl( if ( nType == ControlType::TabBody ) return true; else - return NWPaintGTKTabItem( nType, aCtrlRect, aClip, nState, aValue); + return NWPaintGTKTabItem( nType, aCtrlRect, nState, aValue); } else if ( (nType==ControlType::Listbox) && ((nPart==ControlPart::Entire) || (nPart==ControlPart::ListboxWindow)) ) { @@ -1031,7 +1031,7 @@ bool GtkSalGraphics::DoDrawNativeControl( } else if( (nType == ControlType::ListNode) && (nPart == ControlPart::Entire) ) { - return NWPaintGTKListNode( aCtrlRect, aClip, nState, aValue ); + return NWPaintGTKListNode( aCtrlRect, nState, aValue ); } else if( (nType == ControlType::ListNet) && (nPart == ControlPart::Entire) ) { @@ -1040,7 +1040,7 @@ bool GtkSalGraphics::DoDrawNativeControl( } else if( nType == ControlType::Slider ) { - return NWPaintGTKSlider( nPart, aCtrlRect, aClip, nState, aValue ); + return NWPaintGTKSlider( nPart, aCtrlRect, nState, aValue ); } else if( nType == ControlType::WindowBackground ) { @@ -1862,7 +1862,6 @@ static void NWCalcArrowRect( const tools::Rectangle& rButton, tools::Rectangle& bool GtkSalGraphics::NWPaintGTKScrollbar( ControlPart nPart, const tools::Rectangle& rControlRectangle, - const std::list< tools::Rectangle >&, ControlState nState, const ImplControlValue& aValue ) { @@ -2389,7 +2388,6 @@ static void NWPaintOneEditBox( SalX11Screen nScreen, bool GtkSalGraphics::NWPaintGTKSpinBox(ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRectangle, - const std::list< tools::Rectangle >&, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption, @@ -2692,7 +2690,6 @@ static tools::Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, const tools::Rectangle& rControlRectangle, - const std::list< tools::Rectangle >&, ControlState nState, const ImplControlValue& aValue ) { @@ -3380,7 +3377,6 @@ bool GtkSalGraphics::NWPaintGTKTooltip( bool GtkSalGraphics::NWPaintGTKListNode( const tools::Rectangle& rControlRectangle, - const std::list< tools::Rectangle >&, ControlState nState, const ImplControlValue& rValue ) { NWEnsureGTKTreeView( m_nXScreen ); @@ -3489,7 +3485,6 @@ bool GtkSalGraphics::NWPaintGTKProgress( bool GtkSalGraphics::NWPaintGTKSlider( ControlPart nPart, const tools::Rectangle& rControlRectangle, - const std::list< tools::Rectangle >&, ControlState nState, const ImplControlValue& rValue ) { OSL_ASSERT( rValue.getType() == ControlType::Slider ); |