From cdb31d60cb80a95f37c43d00cbd7799a475bbcd7 Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Thu, 18 Dec 2014 20:41:15 +0100 Subject: [PATCH] fix compiler warnings in RELEASE mode under Windows reg. possible uninitialized use of some variables and some unused parameters --- libmscore/layout.cpp | 4 +--- libmscore/paste.cpp | 2 +- libmscore/score.cpp | 2 +- libmscore/staff.cpp | 2 +- mscore/file.cpp | 2 +- mscore/importgtp-gp6.cpp | 4 ++-- mscore/importmidi/importmidi_quant.cpp | 5 ++++- mscore/importmidi/importmidi_tuplet.cpp | 3 +++ mscore/importmidi/importmidi_tuplet_voice.cpp | 3 +++ mscore/inspector/inspector.cpp | 2 +- thirdparty/kQOAuth/kqoauthmanager.cpp | 2 +- 11 files changed, 19 insertions(+), 12 deletions(-) diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp index 6f1ae24cf5..25dc49ed7f 100644 --- a/libmscore/layout.cpp +++ b/libmscore/layout.cpp @@ -2022,7 +2022,7 @@ qreal Score::cautionaryWidth(Measure* m, bool& hasCourtesy) Segment* ns = nm->findSegment(Segment::Type::TimeSig, tick); bool showCourtesy = styleB(StyleIdx::genCourtesyTimesig); - qreal w; + qreal w = 0.0; if (showCourtesy && ns) { TimeSig* ts = static_cast(ns->element(0)); if (ts && ts->showCourtesySig()) { @@ -2039,8 +2039,6 @@ qreal Score::cautionaryWidth(Measure* m, bool& hasCourtesy) } } } - else - w = 0.0; // courtesy key signatures diff --git a/libmscore/paste.cpp b/libmscore/paste.cpp index 1d3c7ca5e1..13f0d798e1 100644 --- a/libmscore/paste.cpp +++ b/libmscore/paste.cpp @@ -78,7 +78,7 @@ bool Score::pasteStaff(XmlReader& e, Segment* dst, int dstStaff) int dstTick = dst->tick(); bool done = false; bool pasted = false; - int tickLen, staves; + int tickLen, staves = 0; while (e.readNextStartElement()) { if (done) break; diff --git a/libmscore/score.cpp b/libmscore/score.cpp index 6ed04cd153..cef9225ce1 100644 --- a/libmscore/score.cpp +++ b/libmscore/score.cpp @@ -3066,7 +3066,7 @@ void Score::lassoSelectEnd() Segment* endSegment = 0; int startStaff = 0x7fffffff; int endStaff = 0; - const ChordRest* endCR; + const ChordRest* endCR = 0; if (_selection.elements().isEmpty()) { _selection.setState(SelState::NONE); diff --git a/libmscore/staff.cpp b/libmscore/staff.cpp index 44c9406672..db9007a4cf 100644 --- a/libmscore/staff.cpp +++ b/libmscore/staff.cpp @@ -612,7 +612,7 @@ qreal Staff::mag() const SwingParameters Staff::swing(int tick) const { SwingParameters sp; - int swingUnit; + int swingUnit = 0; QString unit = score()->styleSt(StyleIdx::swingUnit); int swingRatio = score()->styleI(StyleIdx::swingRatio); if (unit == TDuration(TDuration::DurationType::V_EIGHTH).name()) { diff --git a/mscore/file.cpp b/mscore/file.cpp index 4e5635caec..f510754459 100644 --- a/mscore/file.cpp +++ b/mscore/file.cpp @@ -552,7 +552,7 @@ void MuseScore::newFile() score->fileInfo()->setFile(newWizard->title()); Measure* pm = score->firstMeasure(); - Measure* nm; + Measure* nm = 0; for (int i = 0; i < measures; ++i) { if (pm) { nm = pm; diff --git a/mscore/importgtp-gp6.cpp b/mscore/importgtp-gp6.cpp index be56cd8227..ecbfd03141 100644 --- a/mscore/importgtp-gp6.cpp +++ b/mscore/importgtp-gp6.cpp @@ -589,8 +589,8 @@ Fraction GuitarPro6::rhythmToDuration(QString value) void GuitarPro6::readDrumNote(Note* note, int element, int variation) { - int octaveInt; - int toneInt; + int octaveInt = 0; + int toneInt = 0; /* These numbers below were determined by creating all drum * notes in a GPX format file and then analyzing the score.gpif * file which specifies the score. */ diff --git a/mscore/importmidi/importmidi_quant.cpp b/mscore/importmidi/importmidi_quant.cpp index 35fe9a1fa1..e79078156d 100644 --- a/mscore/importmidi/importmidi_quant.cpp +++ b/mscore/importmidi/importmidi_quant.cpp @@ -56,7 +56,7 @@ ReducedFraction quantValueToFraction(MidiOperations::QuantValue quantValue) MidiOperations::QuantValue fractionToQuantValue(const ReducedFraction &fraction) { const auto division = ReducedFraction::fromTicks(MScore::division); - MidiOperations::QuantValue quantValue; + MidiOperations::QuantValue quantValue = MidiOperations::QuantValue::Q_4; if (fraction == division) quantValue = MidiOperations::QuantValue::Q_4; @@ -815,6 +815,9 @@ void findChordRangeEnds( const ReducedFraction &barStart, const ReducedFraction &beatLen) { +#ifdef NDEBUG + (void)rangeStart; +#endif for (auto it = data.rbegin(); it != data.rend(); ++it) { QuantData &d = *it; d.chordRangeEnd = barStart + quantizeToSmall(rangeEnd - barStart, d.quant); diff --git a/mscore/importmidi/importmidi_tuplet.cpp b/mscore/importmidi/importmidi_tuplet.cpp index 38ded56171..c9bdd2b419 100644 --- a/mscore/importmidi/importmidi_tuplet.cpp +++ b/mscore/importmidi/importmidi_tuplet.cpp @@ -1088,6 +1088,9 @@ void findAllTuplets( const ReducedFraction &lastTick, const ReducedFraction &basicQuant) { +#ifdef NDEBUG + (void)lastTick; +#endif if (chords.empty()) return; diff --git a/mscore/importmidi/importmidi_tuplet_voice.cpp b/mscore/importmidi/importmidi_tuplet_voice.cpp index 76d2b2c387..08d95af684 100644 --- a/mscore/importmidi/importmidi_tuplet_voice.cpp +++ b/mscore/importmidi/importmidi_tuplet_voice.cpp @@ -455,6 +455,9 @@ void setVoicesFromPrevBars( const ReducedFraction &basicQuant, const ReducedFraction &barStart) { +#ifdef NDEBUG + (void)pendingNonTuplets; +#endif bool loopAgain = false; do { for (auto it = backTiedTuplets.begin(); it != backTiedTuplets.end(); ) { diff --git a/mscore/inspector/inspector.cpp b/mscore/inspector/inspector.cpp index 829091f09f..04cb60b84f 100644 --- a/mscore/inspector/inspector.cpp +++ b/mscore/inspector/inspector.cpp @@ -910,7 +910,7 @@ void InspectorBarLine::spanTypeChanged(int idx) Score* score = bl->score(); score->startCmd(); - int spanStaves, spanFrom, spanTo; + int spanStaves, spanFrom = 0, spanTo = 0; // the amount to adjust To value of short types, if staff num. of lines != 5 int shortDelta = bl->staff() ? (bl->staff()->lines() - 5)*2 : 0; spanStaves = 1; // in most cases, num. of spanned staves is 1 diff --git a/thirdparty/kQOAuth/kqoauthmanager.cpp b/thirdparty/kQOAuth/kqoauthmanager.cpp index c0308b63ee..787458edad 100644 --- a/thirdparty/kQOAuth/kqoauthmanager.cpp +++ b/thirdparty/kQOAuth/kqoauthmanager.cpp @@ -306,7 +306,7 @@ void KQOAuthManager::executeAuthorizedRequest(KQOAuthRequest *request, int id) { } networkRequest.setRawHeader("Authorization", authHeader); - QNetworkReply *reply; + QNetworkReply *reply = 0; if (request->httpMethod() == KQOAuthRequest::POST) {