Skip to content

Commit

Permalink
Merge pull request #705 from Jojo-Schmitz/warnings
Browse files Browse the repository at this point in the history
fix warnings due to -Wunused-parameters
  • Loading branch information
lasconic committed Feb 19, 2014
2 parents b1d9faa + 1886d64 commit 151ce0c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions mscore/importxml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2295,7 +2295,7 @@ Measure* MusicXml::xmlMeasure(Part* part, QDomElement e, int number, int measure
// SLine placement is modified by changing the first segments user offset
// As the SLine has just been created, it does not have any segment yet

static void setSLinePlacement(SLine* sli, float spatium, const QString placement, bool hasYoff, qreal yoff)
static void setSLinePlacement(SLine* sli, float spatium, const QString placement, bool /*hasYoff*/, qreal /*yoff*/)
{
/*
qDebug("setSLinePlacement sli %p type %d s=%g pl='%s' hasy=%d yoff=%g",
Expand Down Expand Up @@ -2338,8 +2338,8 @@ static void setSLinePlacement(SLine* sli, float spatium, const QString placement
// addElem
//---------------------------------------------------------

static void addElem(Element* el, bool hasYoffset, int staff, int rstaff, Score* score, QString& placement,
qreal rx, qreal ry, int /* offset */, Measure* measure, int tick)
static void addElem(Element* el, bool /*hasYoffset*/, int staff, int rstaff, Score* score, QString& placement,
qreal /*rx*/, qreal /*ry*/, int /* offset */, Measure* measure, int tick)
{
/*
qDebug("addElem el %p hasYoff %d staff %d rstaff %d placement %s rx %g ry %g tick %d",
Expand Down
4 changes: 2 additions & 2 deletions mscore/texttools.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ void TextTools::italicClicked(bool val)
// setHalign
//---------------------------------------------------------

void TextTools::setHalign(QAction* a)
void TextTools::setHalign(QAction* /*a*/)
{
//TODO _textElement->setCurHalign(a->data().toInt());
updateTools();
Expand All @@ -385,7 +385,7 @@ void TextTools::setHalign(QAction* a)
// setValign
//---------------------------------------------------------

void TextTools::setValign(QAction* a)
void TextTools::setValign(QAction* /*a*/)
{
//TODO _textElement->setAlign((_textElement->align() & ~ALIGN_VMASK) | Align(a->data().toInt()));
updateTools();
Expand Down

0 comments on commit 151ce0c

Please sign in to comment.