Skip to content
Permalink
Browse files

Merge pull request #3486 from anatoly-os/FixAppVeyorCompilationWarnings

Fixed AppVeyor's warnings
  • Loading branch information...
lasconic committed Feb 23, 2018
2 parents bfdbc10 + 847bfaa commit eb79e1d97a1087cd2a7733319d148ddbc411e823
Showing with 13 additions and 16 deletions.
  1. +1 −1 libmscore/barline.cpp
  2. +1 −1 libmscore/chord.cpp
  3. +0 −2 libmscore/durationtype.cpp
  4. +2 −2 libmscore/segment.h
  5. +2 −2 libmscore/undo.cpp
  6. +2 −2 mscore/events.cpp
  7. +3 −4 mscore/importgtp.cpp
  8. +2 −2 mscore/importptb.h
@@ -930,7 +930,7 @@ qreal BarLine::layoutWidth(Score* score, BarLineType type)
{
qreal dotwidth = score->scoreFont()->width(SymId::repeatDot, 1.0);

qreal w;
qreal w {0.0};
switch (type) {
case BarLineType::DOUBLE:
w = score->styleP(StyleIdx::doubleBarWidth) + score->styleP(StyleIdx::doubleBarDistance);
@@ -3079,7 +3079,7 @@ Element* Chord::prevElement()
case ElementType::NOTE: {
if (e == _notes.back())
break;
Note* prevNote;
Note* prevNote = nullptr;
for (auto &i : _notes) {
if (i == e) {
prevNote = *(&i+1);
@@ -18,8 +18,6 @@

namespace Ms {

static const int POW_MAX_DOTS = qPow(2, MAX_DOTS);

//---------------------------------------------------------
// dots
//---------------------------------------------------------
@@ -83,8 +83,8 @@ constexpr bool operator& (const SegmentType t1, const SegmentType t2) {

class Segment final : public Element {
SegmentType _segmentType { SegmentType::Invalid };
int _tick; // tick offset to measure
int _ticks;
int _tick = 0; // tick offset to measure
int _ticks = 0;
Spatium _extraLeadingSpace;
qreal _stretch;

@@ -1442,8 +1442,8 @@ void InsertRemoveMeasures::insertMeasures()
Score* score = fm->score();
QList<Clef*> clefs;
QList<KeySig*> keys;
Segment* fs;
Segment* ls;
Segment* fs = nullptr;
Segment* ls = nullptr;
if (fm->isMeasure()) {
score->setPlaylistDirty();
fs = toMeasure(fm)->first();
@@ -698,7 +698,7 @@ void ScoreView::escapeCmd()

static const char* stateName(ViewState s)
{
const char* p;
std::string p;
switch (s) {
case ViewState::NORMAL: p = "NORMAL"; break;
case ViewState::DRAG: p = "DRAG"; break;
@@ -715,7 +715,7 @@ static const char* stateName(ViewState s)
case ViewState::FOTO_DRAG_OBJECT: p = "FOTO_DRAG_OBJECT"; break;
case ViewState::FOTO_LASSO: p = "FOTO_LASSO"; break;
}
return p;
return p.c_str();
}

//---------------------------------------------------------
@@ -151,10 +151,9 @@ void GuitarPro::read(void* p, qint64 len)
if (len == 0)
return;
qint64 rv = f->read((char*)p, len);
#ifndef NDEBUG
Q_UNUSED(rv); // avoid warning about unused variable in RELEASE mode
Q_ASSERT(rv == len);
#endif
if (rv != len) {
Q_ASSERT(rv == len); //to have assert in debug and no warnings from AppVeyor in release
}
curPos += len;
}

@@ -73,8 +73,8 @@ class PowerTab {
};

struct stRhytmSlash : public ptComponent {
int position;
int duration;
int position {0};
int duration {0};
bool triplet{ false };
bool tripletend{ false };
bool dotted{ false };

0 comments on commit eb79e1d

Please sign in to comment.
You can’t perform that action at this time.