Cleanup includes

Jojo-Schmitz · Jan 25, 2024 · 637d22a · 637d22a
1 parent 945f526
commit 637d22a
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 20 deletions.
diff --git a/importexport/musicxml/importmxml.cpp b/importexport/musicxml/importmxml.cpp
@@ -17,22 +17,22 @@
 //  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //=============================================================================
 
-#include "libmscore/box.h"
+//#include "libmscore/box.h"
 #include "libmscore/measure.h"
 #include "libmscore/page.h"
 #include "libmscore/part.h"
 #include "libmscore/staff.h"
 #include "libmscore/style.h"
-#include "libmscore/sym.h"
-#include "libmscore/symbol.h"
+//#include "libmscore/sym.h"
+//#include "libmscore/symbol.h"
+
+#include "mscore/preferences.h"
 
 #include "importmxml.h"
 #include "importmxmllogger.h"
 #include "importmxmlpass1.h"
 #include "importmxmlpass2.h"
 
-#include "mscore/preferences.h"
-
 namespace Ms {
 
 Score::FileError removeInstrumentNames(Score* score, MxmlLogger* logger)

diff --git a/importexport/musicxml/importmxml.h b/importexport/musicxml/importmxml.h
@@ -21,9 +21,9 @@
 #define __IMPORTMXML_H__
 
 #include "libmscore/score.h"
-#include "importxmlfirstpass.h"
-#include "musicxml.h" // for the creditwords definition
-#include "musicxmlsupport.h"
+//#include "importxmlfirstpass.h"
+//#include "musicxml.h" // for the creditwords definition
+//#include "musicxmlsupport.h"
 
 namespace Ms {
 

diff --git a/importexport/musicxml/importmxmlpass1.cpp b/importexport/musicxml/importmxmlpass1.cpp
@@ -24,12 +24,12 @@
 #include "libmscore/page.h"
 #include "libmscore/part.h"
 #include "libmscore/staff.h"
-#include "libmscore/stringdata.h"
+//#include "libmscore/stringdata.h"
 #include "libmscore/sym.h"
 #include "libmscore/symbol.h"
 #include "libmscore/timesig.h"
 #include "libmscore/style.h"
-#include "libmscore/spanner.h"
+//#include "libmscore/spanner.h"
 #include "libmscore/bracketItem.h"
 #include "libmscore/utils.h"
 

diff --git a/importexport/musicxml/importmxmlpass2.h b/importexport/musicxml/importmxmlpass2.h
@@ -27,7 +27,7 @@
 #include "importxmlfirstpass.h"
 #include "importmxmlpass1.h"
 #include "musicxml.h" // a.o. for Slur
-#include "musicxmlsupport.h"
+//#include "musicxmlsupport.h"
 
 namespace Ms {
 

diff --git a/importexport/musicxml/importxml.cpp b/importexport/musicxml/importxml.cpp
@@ -23,6 +23,7 @@
 
 #include "thirdparty/qzip/qzipreader_p.h"
 #include "importmxml.h"
+#include "musicxmlsupport.h"
 
 namespace Ms {
 

diff --git a/importexport/musicxml/musicxml.h b/importexport/musicxml/musicxml.h
@@ -25,12 +25,12 @@
  Definition of class MusicXML
 */
 
-#include "libmscore/fraction.h"
-#include "libmscore/mscore.h"
-#include "libmscore/pitchspelling.h"
+//#include "libmscore/fraction.h"
 #include "libmscore/line.h"
-#include "importxmlfirstpass.h"
-#include "musicxmlsupport.h"
+#include "libmscore/mscore.h"
+//#include "libmscore/pitchspelling.h"
+//#include "importxmlfirstpass.h"
+//#include "musicxmlsupport.h"
 
 namespace Ms {
 

diff --git a/importexport/musicxml/musicxmlfonthandler.cpp b/importexport/musicxml/musicxmlfonthandler.cpp
@@ -21,7 +21,7 @@
  MusicXML font handling support.
  */
 
-#include "libmscore/sym.h"
+//#include "libmscore/sym.h"
 #include "libmscore/xml.h"
 #include "musicxmlfonthandler.h"
 

diff --git a/importexport/musicxml/musicxmlfonthandler.h b/importexport/musicxml/musicxmlfonthandler.h
@@ -20,7 +20,7 @@
 #ifndef __MUSICXMLFONTHANDLER_H__
 #define __MUSICXMLFONTHANDLER_H__
 
-#include "libmscore/text.h"
+#include "libmscore/textbase.h"
 
 namespace Ms {
 

diff --git a/importexport/musicxml/musicxmlsupport.cpp b/importexport/musicxml/musicxmlsupport.cpp
@@ -21,7 +21,7 @@
  MusicXML support.
  */
 
-#include "libmscore/accidental.h"
+//#include "libmscore/accidental.h"
 #include "libmscore/articulation.h"
 #include "libmscore/chord.h"
 #include "libmscore/sym.h"

diff --git a/importexport/musicxml/musicxmlsupport.h b/importexport/musicxml/musicxmlsupport.h
@@ -21,7 +21,7 @@
 #define __MUSICXMLSUPPORT_H__
 
 #include "libmscore/fraction.h"
-#include "libmscore/mscore.h"
+//#include "libmscore/mscore.h"
 #include "libmscore/note.h"
 #include "libmscore/sym.h"