make namespace std and muse explicit

Author: lvinken

src/importexport/tabledit/internal/importtef.cpp

@@ -5,7 +5,7 @@
  * MuseScore Studio
  * Music Composition & Notation
  *
- * Copyright (C) 2021 MuseScore Limited
+ * Copyright (C) 2025 MuseScore Limited
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -98,9 +98,9 @@ uint32_t TablEdit::readUInt32()
 
 // read sized and null-terminated utf8 text from the current position
 
-string TablEdit::readUtf8Text()
+std::string TablEdit::readUtf8Text()
 {
-    string result;
+    std::string result;
     uint16_t size = readUInt16();
     for (uint16_t i = 0; i < size - 1; ++i) {
         result += readUInt8();
@@ -113,7 +113,7 @@ string TablEdit::readUtf8Text()
 // read sized and null-terminated utf8 text
 // input is the position where the text's position in the file is stored
 
-string TablEdit::readUtf8TextIndirect(uint32_t positionOfPosition)
+std::string TablEdit::readUtf8TextIndirect(uint32_t positionOfPosition)
 {
     _file->seek(positionOfPosition);
     uint32_t position = readUInt32();
@@ -184,17 +184,17 @@ static muse::draw::Color toColor(const int)
 
 // create a VoiceAllocator for every instrument
 
-void TablEdit::initializeVoiceAllocators(vector<VoiceAllocator>& allocators)
+void TablEdit::initializeVoiceAllocators(std::vector<VoiceAllocator>& allocators)
 {
     for (size_t i = 0; i < tefInstruments.size(); ++i) {
         VoiceAllocator allocator;
         allocators.push_back(allocator);
     }
 }
 
-void TablEdit::allocateVoices(vector<VoiceAllocator>& allocators)
+void TablEdit::allocateVoices(std::vector<VoiceAllocator>& allocators)
 {
-    vector<const TefNote*> column;
+    std::vector<const TefNote*> column;
     int currentPosition { -1 };
     engraving::part_idx_t currentPart { 0 };
     for (const TefNote& tefNote : tefContents) {
@@ -308,7 +308,7 @@ void TablEdit::createContents()
         return;
     }
 
-    vector<VoiceAllocator> voiceAllocators;
+    std::vector<VoiceAllocator> voiceAllocators;
     initializeVoiceAllocators(voiceAllocators);
     allocateVoices(voiceAllocators);
 
@@ -321,7 +321,7 @@ void TablEdit::createContents()
             for (size_t k = 0; k < voiceContent.size(); ++k) {
                 LOGD("  - chord %zu", k);
                 // tefNotes is either a rest or a chord of one or more notes
-                const vector<const TefNote*>& tefNotes { voiceContent.at(k) };
+                const std::vector<const TefNote*>& tefNotes { voiceContent.at(k) };
 
                 if (tefNotes.size() == 0) {
                     continue; // shouldn't happen
@@ -505,7 +505,7 @@ void TablEdit::createNotesFrame()
         vbox->setTick(mu::engraving::Fraction(0, 1)); // TODO find correct value (0/1 seems to work OK)
         score->measures()->add(vbox);
         Text* s = Factory::createText(vbox, TextStyleType::FRAME);
-        s->setPlainText(String::fromUtf8(tefHeader.notes.c_str()));
+        s->setPlainText(muse::String::fromUtf8(tefHeader.notes.c_str()));
         vbox->add(s);
     }
 }
@@ -515,7 +515,7 @@ void TablEdit::createParts()
     for (const auto& instrument : tefInstruments) {
         Part* part = new Part(score);
         score->appendPart(part);
-        String staffName { String::fromUtf8(instrument.name.c_str()) };
+        muse::String staffName { muse::String::fromUtf8(instrument.name.c_str()) };
         part->setPartName(staffName);
         part->setPlainLongName(staffName);
 
@@ -543,19 +543,19 @@ void TablEdit::createParts()
 void TablEdit::createProperties()
 {
     if (!tefHeader.title.empty()) {
-        score->setMetaTag(u"workTitle", String::fromUtf8(tefHeader.title.c_str()));
+        score->setMetaTag(u"workTitle", muse::String::fromUtf8(tefHeader.title.c_str()));
     }
     if (!tefHeader.subTitle.empty()) {
-        score->setMetaTag(u"subtitle", String::fromUtf8(tefHeader.subTitle.c_str()));
+        score->setMetaTag(u"subtitle", muse::String::fromUtf8(tefHeader.subTitle.c_str()));
     }
     if (!tefHeader.comment.empty()) {
-        score->setMetaTag(u"comment", String::fromUtf8(tefHeader.comment.c_str()));
+        score->setMetaTag(u"comment", muse::String::fromUtf8(tefHeader.comment.c_str()));
     }
     if (!tefHeader.internetLink.empty()) {
-        score->setMetaTag(u"source", String::fromUtf8(tefHeader.internetLink.c_str()));
+        score->setMetaTag(u"source", muse::String::fromUtf8(tefHeader.internetLink.c_str()));
     }
     if (!tefHeader.copyright.empty()) {
-        score->setMetaTag(u"copyright", String::fromUtf8(tefHeader.copyright.c_str()));
+        score->setMetaTag(u"copyright", muse::String::fromUtf8(tefHeader.copyright.c_str()));
     }
 }
 
@@ -655,12 +655,12 @@ void TablEdit::createTitleFrame()
     score->measures()->add(vbox);
     if (!tefHeader.title.empty()) {
         Text* s = Factory::createText(vbox, TextStyleType::TITLE);
-        s->setPlainText(String::fromUtf8(tefHeader.title.c_str()));
+        s->setPlainText(muse::String::fromUtf8(tefHeader.title.c_str()));
         vbox->add(s);
     }
     if (!tefHeader.subTitle.empty()) {
         Text* s = Factory::createText(vbox, TextStyleType::SUBTITLE);
-        s->setPlainText(String::fromUtf8(tefHeader.subTitle.c_str()));
+        s->setPlainText(muse::String::fromUtf8(tefHeader.subTitle.c_str()));
         vbox->add(s);
     }
 }
@@ -936,7 +936,7 @@ void TablEdit::readTefTexts()
     _file->seek(position);
     uint16_t numberOfTexts = readUInt16();
     for (uint16_t i = 0; i < numberOfTexts; ++i) {
-        string text { readUtf8Text() };
+        std::string text { readUtf8Text() };
         LOGD("i %d text '%s'", i, text.c_str());
         tefTexts.push_back(text);
     }

src/importexport/tabledit/internal/importtef.h

@@ -21,11 +21,16 @@
  */
 #pragma once
 
-#include "voiceallocator.h"
+#include <array>
+#include <string>
+#include <vector>
+
 #include "engraving/dom/masterscore.h"
 #include "engraving/engravingerrors.h"
 #include "io/iodevice.h"
 
+#include "voiceallocator.h"
+
 namespace mu::iex::tabledit {
 // offsets into the file header
 static const uint8_t OFFSET_TBED = 0x38;
@@ -74,8 +79,8 @@ class TablEdit
     uint8_t readUInt8();
     uint16_t readUInt16();
     uint32_t readUInt32();
-    string readUtf8Text();
-    string readUtf8TextIndirect(uint32_t positionOfPosition);
+    std::string readUtf8Text();
+    std::string readUtf8TextIndirect(uint32_t positionOfPosition);
 
     struct TefHeader {
         int version { 0 };
@@ -111,7 +116,7 @@ class TablEdit
         int fClef { 0 };
         int output { 0 };
         int options { 0 };
-        array<int, 12> tuning = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+        std::array<int, 12> tuning = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
         std::string name;
     };
 
@@ -134,7 +139,7 @@ class TablEdit
         int index { 0 };
     };
 
-    void allocateVoices(vector<VoiceAllocator>& allocator);
+    void allocateVoices(std::vector<VoiceAllocator>& allocator);
     void createContents();
     void createLinkedTabs();
     void createMeasures();
@@ -146,7 +151,7 @@ class TablEdit
     void createTempo();
     void createTexts();
     void createTitleFrame();
-    void initializeVoiceAllocators(vector<VoiceAllocator>& allocators);
+    void initializeVoiceAllocators(std::vector<VoiceAllocator>& allocators);
     engraving::part_idx_t partIdx(size_t stringIdx, bool& ok) const;
     int stringNumberPreviousParts(engraving::part_idx_t partIdx) const;
     void readTefContents();
@@ -157,12 +162,12 @@ class TablEdit
     void readTefTexts();
 
     TefHeader tefHeader;
-    vector<TefTextMarker> tefTextMarkers;
-    vector<TefNote> tefContents; // notes (and rests) only
-    vector<TefInstrument> tefInstruments;
-    vector<TefMeasure> tefMeasures;
-    vector<TefReadingListItem> tefReadingList;
-    vector<string> tefTexts;
+    std::vector<TefTextMarker> tefTextMarkers;
+    std::vector<TefNote> tefContents; // notes (and rests) only
+    std::vector<TefInstrument> tefInstruments;
+    std::vector<TefMeasure> tefMeasures;
+    std::vector<TefReadingListItem> tefReadingList;
+    std::vector<std::string> tefTexts;
 
 public:
     TablEdit(muse::io::IODevice* f, mu::engraving::MasterScore* s)

src/importexport/tabledit/internal/tableditreader.cpp

@@ -5,7 +5,7 @@
  * MuseScore Studio
  * Music Composition & Notation
  *
- * Copyright (C) 2021 MuseScore Limited
+ * Copyright (C) 2025 MuseScore Limited
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as

src/importexport/tabledit/internal/tuplethandler.cpp

@@ -5,7 +5,7 @@
  * MuseScore Studio
  * Music Composition & Notation
  *
- * Copyright (C) 2021 MuseScore Limited
+ * Copyright (C) 2025 MuseScore Limited
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as

src/importexport/tabledit/internal/voiceallocator.cpp

@@ -5,7 +5,7 @@
  * MuseScore Studio
  * Music Composition & Notation
  *
- * Copyright (C) 2021 MuseScore Limited
+ * Copyright (C) 2025 MuseScore Limited
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -45,7 +45,7 @@ bool VoiceAllocator::canAddTefNoteToVoice(const TefNote* const note, const int v
     return false;
 }
 
-int VoiceAllocator::findFirstPossibleVoice(const TefNote* const note, const array<int, 3> voices)
+int VoiceAllocator::findFirstPossibleVoice(const TefNote* const note, const std::array<int, 3> voices)
 {
     for (const auto v : voices) {
         if (canAddTefNoteToVoice(note, v)) {
@@ -111,7 +111,7 @@ void VoiceAllocator::appendNoteToVoice(const TefNote* const note, int voice)
     LOGD("voice %d nChords %zu", voice, nChords);
     if (nChords == 0) {
         LOGD("create first chord");
-        vector<const TefNote*> chord;
+        std::vector<const TefNote*> chord;
         chord.push_back(note);
         voiceContents[voice].push_back(chord);
     } else {
@@ -122,7 +122,7 @@ void VoiceAllocator::appendNoteToVoice(const TefNote* const note, int voice)
             voiceContents[voice].at(nChords - 1).push_back(note);
         } else {
             LOGD("create next chord at position %d", note->position);
-            vector<const TefNote*> chord;
+            std::vector<const TefNote*> chord;
             chord.push_back(note);
             voiceContents[voice].push_back(chord);
         }
@@ -162,7 +162,7 @@ void VoiceAllocator::allocateVoice(const TefNote* const note, int voice)
     }
 }
 
-void VoiceAllocator::addColumn(const vector<const TefNote*>& column)
+void VoiceAllocator::addColumn(const std::vector<const TefNote*>& column)
 {
     if (column.empty()) {
         return;

src/importexport/tabledit/internal/voiceallocator.h

@@ -21,29 +21,32 @@
  */
 #pragma once
 
+#include <array>
+#include <map>
+#include <vector>
+
 #include "engraving/dom/mscore.h"
 
-using namespace std;
 namespace mu::iex::tabledit {
 struct TefNote;
 
 class VoiceAllocator
 {
 public:
-    void addColumn(const vector<const TefNote*>& column);
+    void addColumn(const std::vector<const TefNote*>& column);
     void addNote(const TefNote* const note, const bool preferVoice0);
     void allocateVoice(const TefNote* const note, int voice);
     bool canAddTefNoteToVoice(const TefNote* const note, const int voice);
     void dump();
-    int findFirstPossibleVoice(const TefNote* const note, const array<int, 3> voices);
+    int findFirstPossibleVoice(const TefNote* const note, const std::array<int, 3> voices);
     int stopPosition(const size_t voice);
     int voice(const TefNote* const note);
-    const vector<vector<const TefNote*> >& voiceContent(int voice) const { return voiceContents.at(voice); }
+    const std::vector<std::vector<const TefNote*> >& voiceContent(int voice) const { return voiceContents.at(voice); }
 
 private:
     void appendNoteToVoice(const TefNote* const note, int voice);
-    map<const TefNote*, int> allocations;
-    array<const TefNote*, mu::engraving::VOICES> notesPlaying = { nullptr, nullptr, nullptr, nullptr };
-    array<vector<vector<const TefNote*> >, mu::engraving::VOICES> voiceContents;
+    std::map<const TefNote*, int> allocations;
+    std::array<const TefNote*, mu::engraving::VOICES> notesPlaying = { nullptr, nullptr, nullptr, nullptr };
+    std::array<std::vector<std::vector<const TefNote*> >, mu::engraving::VOICES> voiceContents;
 };
 } // namespace mu::iex::tabledit

src/importexport/tabledit/tableditmodule.cpp

@@ -5,7 +5,7 @@
  * MuseScore Studio
  * Music Composition & Notation
  *
- * Copyright (C) 2021 MuseScore Limited
+ * Copyright (C) 2025 MuseScore Limited
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as