Fixed review issues

musescore · Oct 18, 2023 · a876489 · a876489
1 parent 38fcec7
commit a876489
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/src/engraving/dom/note.cpp b/src/engraving/dom/note.cpp
@@ -1544,8 +1544,8 @@ bool Note::acceptDrop(EditData& data) const
     bool tabFingering = st->staffTypeForElement(this)->showTabFingering();
 
     if (type == ElementType::STRING_TUNINGS) {
-        staff_idx_t staffIdx;
-        Segment* seg;
+        staff_idx_t staffIdx = 0;
+        Segment* seg = nullptr;
         if (!score()->pos2measure(data.pos, &staffIdx, 0, &seg, 0)) {
             return false;
         }

diff --git a/src/engraving/dom/part.cpp b/src/engraving/dom/part.cpp
@@ -412,14 +412,14 @@ const StringData* Part::stringData(const Fraction& tick) const
         return nullptr;
     }
 
-    auto it = m_stringTunings.upper_bound(tick.ticks());
-    if (it != m_stringTunings.begin()) {
-        --it;
+    const Instrument* instrument = this->instrument(tick);
+    if (!instrument) {
+        return nullptr;
     }
 
     StringTunings* stringTunings = nullptr;
-    const Instrument* instrument = this->instrument(tick);
 
+    auto it = findLessOrEqual(m_stringTunings, tick.ticks());
     if (it != m_stringTunings.end()) {
         stringTunings = it->second;
     }

diff --git a/src/engraving/dom/rest.cpp b/src/engraving/dom/rest.cpp
@@ -207,8 +207,8 @@ bool Rest::acceptDrop(EditData& data) const
     }
 
     if (type == ElementType::STRING_TUNINGS) {
-        staff_idx_t staffIdx;
-        Segment* seg;
+        staff_idx_t staffIdx = 0;
+        Segment* seg = nullptr;
         if (!score()->pos2measure(data.pos, &staffIdx, 0, &seg, 0)) {
             return false;
         }

diff --git a/src/inspector/models/notation/stringtunings/stringtuningssettingsmodel.h b/src/inspector/models/notation/stringtunings/stringtuningssettingsmodel.h
@@ -32,14 +32,15 @@ class StringTuningsSettingsModel : public AbstractInspectorModel
 public:
     explicit StringTuningsSettingsModel(QObject* parent, IElementRepositoryService* repository);
 
+    Q_INVOKABLE void editStrings();
+
+private:
     void createProperties() override { }
     void loadProperties() override { }
     void resetProperties() override { }
     void requestElements() override { }
 
     bool isEmpty() const override;
-
-    Q_INVOKABLE void editStrings();
 };
 }
 

diff --git a/src/notation/notationtypes.h b/src/notation/notationtypes.h
@@ -687,7 +687,7 @@ struct StringTuningPreset
 
 struct StringTuningsInfo
 {
-    int number = 0;
+    size_t number = 0;
     std::vector<StringTuningPreset> presets;
 };
 

diff --git a/src/notation/view/internal/stringtuningssettingsmodel.cpp b/src/notation/view/internal/stringtuningssettingsmodel.cpp
@@ -192,7 +192,7 @@ QVariantList StringTuningsSettingsModel::presets(bool withCustom) const
         presetsList << customMap;
     }
 
-    int currentStringNumber = this->currentNumberOfStrings();
+    size_t currentStringNumber = this->currentNumberOfStrings();
 
     for (const StringTuningsInfo& stringTuning : stringTunings.at(m_itemId)) {
         if (stringTuning.number != currentStringNumber) {
@@ -264,21 +264,22 @@ QVariantList StringTuningsSettingsModel::numbersOfStrings() const
     for (const StringTuningsInfo& stringTuning : stringTunings.at(m_itemId)) {
         QVariantMap stringNumberMap;
         stringNumberMap.insert("text", QString::number(stringTuning.number) + " " + tr("strings"));
-        stringNumberMap.insert("value", stringTuning.number);
+        stringNumberMap.insert("value", static_cast<int>(stringTuning.number));
         numbersList << stringNumberMap;
     }
 
     return numbersList;
 }
 
-int StringTuningsSettingsModel::currentNumberOfStrings() const
+size_t StringTuningsSettingsModel::currentNumberOfStrings() const
 {
     return m_item ? engraving::toStringTunings(m_item)->getProperty(engraving::Pid::STRINGTUNINGS_STRINGS_COUNT).toInt() : 0;
 }
 
 void StringTuningsSettingsModel::setCurrentNumberOfStrings(int number)
 {
-    if (currentNumberOfStrings() == number) {
+    int currentNumber = static_cast<int>(currentNumberOfStrings());
+    if (currentNumber == number) {
         return;
     }
 

diff --git a/src/notation/view/internal/stringtuningssettingsmodel.h b/src/notation/view/internal/stringtuningssettingsmodel.h
@@ -72,7 +72,7 @@ class StringTuningsSettingsModel : public AbstractElementPopupModel
 
     QVariantList numbersOfStrings() const;
 
-    int currentNumberOfStrings() const;
+    size_t currentNumberOfStrings() const;
     void setCurrentNumberOfStrings(int number);
 
     QList<StringTuningsItem*> strings() const;