summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-07-02 22:27:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-07-02 22:27:41 +0200
commit34fb5d7e91a7cd4c986434e6d6a3a67f12c65f7a (patch)
tree0f421d58ba594af311b066434a3f5f0be0cb1f7d /vcl
parent1cea5a80a71243e780bfc2cc161044449a87eda9 (diff)
loplugin:casttovoid: vcl
Change-Id: Icdc9d009849f2a93f6e1dbba07b1042dbb1ff561
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/headless/svpframe.hxx4
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx5
-rw-r--r--vcl/source/app/salvtables.cxx2
-rw-r--r--vcl/source/fontsubset/cff.cxx12
-rw-r--r--vcl/source/fontsubset/fontsubset.cxx3
-rw-r--r--vcl/source/image/ImplImageTree.cxx2
-rw-r--r--vcl/source/outdev/map.cxx2
-rw-r--r--vcl/unx/generic/print/genpspgraphics.cxx12
-rw-r--r--vcl/unx/gtk/gtkinst.cxx4
-rw-r--r--vcl/unx/gtk/gtksalframe.cxx3
-rw-r--r--vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx23
11 files changed, 24 insertions, 48 deletions
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index a045683991b9..eed5efec0c66 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -114,8 +114,8 @@ public:
virtual void EndSetClipRegion() override;
/*TODO: functional implementation */
- virtual void SetScreenNumber( unsigned int nScreen ) override { (void)nScreen; }
- virtual void SetApplicationID(const OUString &rApplicationID) override { (void) rApplicationID; }
+ virtual void SetScreenNumber( unsigned int ) override {}
+ virtual void SetApplicationID(const OUString &) override {}
};
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 168c98d82dbb..6a057078f04f 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -205,24 +205,21 @@ private:
static tools::Rectangle NWGetScrollButtonRect( ControlPart nPart, tools::Rectangle aAreaRect );
static tools::Rectangle NWGetSpinButtonRect( ControlPart nPart, tools::Rectangle aAreaRect);
- static tools::Rectangle NWGetComboBoxButtonRect( ControlType nType, ControlPart nPart, tools::Rectangle aAreaRect );
+ static tools::Rectangle NWGetComboBoxButtonRect( ControlPart nPart, tools::Rectangle aAreaRect );
static void PaintScrollbar(GtkStyleContext *context,
cairo_t *cr,
const tools::Rectangle& rControlRectangle,
- ControlType nType,
ControlPart nPart,
const ImplControlValue& aValue );
void PaintOneSpinButton( GtkStyleContext *context,
cairo_t *cr,
- ControlType nType,
ControlPart nPart,
tools::Rectangle aAreaRect,
ControlState nState );
void PaintSpinButton(GtkStateFlags flags,
cairo_t *cr,
const tools::Rectangle& rControlRectangle,
- ControlType nType,
ControlPart nPart,
const ImplControlValue& aValue);
static void PaintCombobox(GtkStateFlags flags,
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 82f8ab0b38ce..0866e648acbc 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -72,7 +72,6 @@ SalMenu* SalInstance::CreateMenu( bool, Menu* )
void SalInstance::DestroyMenu( SalMenu* pMenu )
{
- (void)pMenu;
OSL_ENSURE( pMenu == nullptr, "DestroyMenu called with non-native menus" );
}
@@ -83,7 +82,6 @@ SalMenuItem* SalInstance::CreateMenuItem( const SalItemParams* )
void SalInstance::DestroyMenuItem( SalMenuItem* pItem )
{
- (void)pItem;
OSL_ENSURE( pItem == nullptr, "DestroyMenu called with non-native menus" );
}
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 29e7cf7351c0..bd7312457b77 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -522,10 +522,8 @@ void CffSubsetterContext::readDictOp()
mpCffLocal->mnPrivDictSize = popInt();
break;
case 'r': { // ROS operands
- int nSid1 = popInt();
- int nSid2 = popInt();
- (void)nSid1; // TODO: use
- (void)nSid2; // TODO: use
+ popInt(); // TODO: use sid1
+ popInt(); // TODO: use sid2
popVal();
mbCIDFont = true;
} break;
@@ -1004,9 +1002,8 @@ void CffSubsetterContext::convertOneTypeEsc()
assert( nNum >= 0);
assert( nNum < mnStackIdx-2 );
(void)nNum; // TODO: implement
- const int nOfs = static_cast<int>(pTop[-1]);
+ // TODO: implement: const int nOfs = static_cast<int>(pTop[-1]);
mnStackIdx -= 2;
- (void)nOfs;// TODO: implement
break;
}
case TYPE2OP::HFLEX1: {
@@ -1035,8 +1032,7 @@ void CffSubsetterContext::convertOneTypeEsc()
assert( mnStackIdx == 13 );
writeCurveTo( mnStackIdx, -13, -12, -11, -10, -9, -8 );
writeCurveTo( mnStackIdx, -7, -6, -5, -4, -3, -2 );
- const ValType nFlexDepth = mnValStack[ mnStackIdx-1 ];
- (void)nFlexDepth; // ignoring nFlexDepth
+ // ignoring ValType nFlexDepth = mnValStack[ mnStackIdx-1 ];
mnStackIdx -= 13;
}
break;
diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx
index 51369ffce76f..deed82e75bf9 100644
--- a/vcl/source/fontsubset/fontsubset.cxx
+++ b/vcl/source/fontsubset/fontsubset.cxx
@@ -156,9 +156,8 @@ bool FontSubsetInfo::CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths )
}
// TODO: replace dummy implementation
-bool FontSubsetInfo::CreateFontSubsetFromType1( const sal_Int32* pOutGlyphWidths)
+bool FontSubsetInfo::CreateFontSubsetFromType1( const sal_Int32* /*pOutGlyphWidths*/)
{
- (void)pOutGlyphWidths;
fprintf(stderr,"CreateFontSubsetFromType1: replace dummy implementation\n");
return false;
}
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index dd9b196c4d05..967ce24bd018 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -405,7 +405,7 @@ void ImplImageTree::createStyle()
OSL_ASSERT(!aUrl.HasError());
bool ok = aUrl.Append("images_" + maCurrentStyle, INetURLObject::EncodeMechanism::All);
- OSL_ASSERT(ok); (void) ok;
+ OSL_ASSERT(ok);
sThemeUrl = aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE) + ".zip";
}
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index f7d82ac49134..1b1be1fe44f3 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1476,8 +1476,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo
static void verifyUnitSourceDest( MapUnit eUnitSource, MapUnit eUnitDest )
{
- (void) eUnitSource;
- (void) eUnitDest;
DBG_ASSERT( eUnitSource != MapUnit::MapSysFont
&& eUnitSource != MapUnit::MapAppFont
&& eUnitSource != MapUnit::MapRelative,
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index ce451fc139c7..63394e74ec2c 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -370,7 +370,6 @@ void GenPspGraphics::SetROPFillColor( SalROPColor )
void GenPspGraphics::SetXORMode( bool bSet )
{
- (void)bSet;
SAL_WARN_IF( bSet, "vcl", "Error: PrinterGfx::SetXORMode() not implemented" );
}
@@ -933,14 +932,13 @@ bool GenPspGraphics::drawAlphaBitmap( const SalTwoRect&,
}
bool GenPspGraphics::drawTransformedBitmap(
- const basegfx::B2DPoint& rNull,
- const basegfx::B2DPoint& rX,
- const basegfx::B2DPoint& rY,
- const SalBitmap& rSourceBitmap,
- const SalBitmap* pAlphaBitmap)
+ const basegfx::B2DPoint&,
+ const basegfx::B2DPoint&,
+ const basegfx::B2DPoint&,
+ const SalBitmap&,
+ const SalBitmap*)
{
// here direct support for transformed bitmaps can be implemented
- (void)rNull; (void)rX; (void)rY; (void)rSourceBitmap; (void)pAlphaBitmap;
return false;
}
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index a22ea9c93f87..265dcb961a0e 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -244,7 +244,7 @@ extern "C"
typedef void(* addItemFnc)(void *, const char *);
}
-void GtkInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService)
+void GtkInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString&, const OUString&)
{
EnsureInit();
OString sGtkURL;
@@ -265,8 +265,6 @@ void GtkInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUStri
}
GtkRecentManager *manager = gtk_recent_manager_get_default ();
gtk_recent_manager_add_item (manager, sGtkURL.getStr());
- (void)rMimeType;
- (void)rDocumentService;
}
SalInfoPrinter* GtkInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index ed8b82234530..e9430ea1fc8a 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -3032,8 +3032,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame )
{
sFinalProgram += "--display " + sDisplay;
}
- int returnValue = system(sFinalProgram.getStr());
- (void)returnValue;
+ (void) system(sFinalProgram.getStr());
}
}
}
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 4f447dd25958..6f460826e0ee 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -435,7 +435,6 @@ namespace
void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
cairo_t *cr,
const tools::Rectangle& rControlRectangle,
- ControlType nType,
ControlPart nPart,
const ImplControlValue& rValue )
{
@@ -760,7 +759,6 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
return;
}
- (void)nType;
OSL_ASSERT( rValue.getType() == ControlType::Scrollbar );
const ScrollbarValue& rScrollbarVal = static_cast<const ScrollbarValue&>(rValue);
tools::Rectangle scrollbarRect;
@@ -1053,12 +1051,10 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context,
cairo_t *cr,
- ControlType nType,
ControlPart nPart,
tools::Rectangle aAreaRect,
ControlState nState )
{
- (void)nType;
GtkBorder padding, border;
GtkStateFlags stateFlags = NWConvertVCLStateToGTKState(nState);
@@ -1103,7 +1099,6 @@ void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context,
void GtkSalGraphics::PaintSpinButton(GtkStateFlags flags,
cairo_t *cr,
const tools::Rectangle& rControlRectangle,
- ControlType nType,
ControlPart nPart,
const ImplControlValue& rValue )
{
@@ -1138,8 +1133,8 @@ void GtkSalGraphics::PaintSpinButton(GtkStateFlags flags,
}
cairo_translate(cr, -rControlRectangle.Left(), -rControlRectangle.Top());
- PaintOneSpinButton(mpSpinUpStyle, cr, nType, upBtnPart, rControlRectangle, upBtnState );
- PaintOneSpinButton(mpSpinDownStyle, cr, nType, downBtnPart, rControlRectangle, downBtnState );
+ PaintOneSpinButton(mpSpinUpStyle, cr, upBtnPart, rControlRectangle, upBtnState );
+ PaintOneSpinButton(mpSpinDownStyle, cr, downBtnPart, rControlRectangle, downBtnState );
cairo_translate(cr, rControlRectangle.Left(), rControlRectangle.Top());
if (nPart == ControlPart::Entire)
@@ -1152,12 +1147,10 @@ void GtkSalGraphics::PaintSpinButton(GtkStateFlags flags,
#define FALLBACK_ARROW_SIZE 11 * 0.85
-tools::Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType,
+tools::Rectangle GtkSalGraphics::NWGetComboBoxButtonRect(
ControlPart nPart,
tools::Rectangle aAreaRect )
{
- (void)nType;
- (void)nPart;
tools::Rectangle aButtonRect;
GtkBorder padding;
@@ -1215,7 +1208,7 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, cairo_t *cr,
// plus its actual draw rect excluding adornment
areaRect = rControlRectangle;
- buttonRect = NWGetComboBoxButtonRect( nType, ControlPart::ButtonDown, areaRect );
+ buttonRect = NWGetComboBoxButtonRect( ControlPart::ButtonDown, areaRect );
tools::Rectangle aEditBoxRect( areaRect );
aEditBoxRect.SetSize( Size( areaRect.GetWidth() - buttonRect.GetWidth(), aEditBoxRect.GetHeight() ) );
@@ -2489,10 +2482,10 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
gtk_render_expander(context, cr, -2, -2, nWidth+4, nHeight+4);
break;
case RenderType::Scrollbar:
- PaintScrollbar(context, cr, rControlRegion, nType, nPart, rValue);
+ PaintScrollbar(context, cr, rControlRegion, nPart, rValue);
break;
case RenderType::Spinbutton:
- PaintSpinButton(flags, cr, rControlRegion, nType, nPart, rValue);
+ PaintSpinButton(flags, cr, rControlRegion, nPart, rValue);
break;
case RenderType::Combobox:
PaintCombobox(flags, cr, rControlRegion, nType, nPart, rValue);
@@ -2699,12 +2692,12 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
else if ( (nType==ControlType::Combobox) &&
((nPart==ControlPart::ButtonDown) || (nPart==ControlPart::SubEdit)) )
{
- aEditRect = NWGetComboBoxButtonRect( nType, nPart, rControlRegion );
+ aEditRect = NWGetComboBoxButtonRect( nPart, rControlRegion );
}
else if ( (nType==ControlType::Listbox) &&
((nPart==ControlPart::ButtonDown) || (nPart==ControlPart::SubEdit)) )
{
- aEditRect = NWGetComboBoxButtonRect( nType, nPart, rControlRegion );
+ aEditRect = NWGetComboBoxButtonRect( nPart, rControlRegion );
}
else if (nType == ControlType::Editbox && nPart == ControlPart::Entire)
{