From 637d22aa20616cf39d0fece8c7caa4715ccdee44 Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Thu, 25 Jan 2024 18:24:54 +0100 Subject: [PATCH] Cleanup includes --- importexport/musicxml/importmxml.cpp | 10 +++++----- importexport/musicxml/importmxml.h | 6 +++--- importexport/musicxml/importmxmlpass1.cpp | 4 ++-- importexport/musicxml/importmxmlpass2.h | 2 +- importexport/musicxml/importxml.cpp | 1 + importexport/musicxml/musicxml.h | 10 +++++----- importexport/musicxml/musicxmlfonthandler.cpp | 2 +- importexport/musicxml/musicxmlfonthandler.h | 2 +- importexport/musicxml/musicxmlsupport.cpp | 2 +- importexport/musicxml/musicxmlsupport.h | 2 +- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/importexport/musicxml/importmxml.cpp b/importexport/musicxml/importmxml.cpp index c0fc8589488ec..1e3bf7084c118 100644 --- 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 index 46d9a827379e0..4c746291ec546 100644 --- 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 index d7dc1ec3ad5df..c34cda64fa45b 100644 --- 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 index 876f519d04c0e..70d3509dc4445 100644 --- 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 index 8848ee8273bc3..5a3d38a249ab7 100644 --- 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 index 839a3afa871c9..76e0712db0dec 100644 --- 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 index 6ee44a06256fd..d01b6210ffda5 100644 --- 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 index 83e13727b3d17..6448ab93eff4d 100644 --- 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 index 1a3ead01dce09..c9f7636a8952d 100644 --- 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 index d683447edebfb..747bc259ad835 100644 --- 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"