cleanup sym.h use

libmscore/articulation.cpp

@@ -20,6 +20,7 @@
 #include "undo.h"
 #include "page.h"
 #include "barline.h"
+#include "sym.h"
 
 namespace Ms {
 

libmscore/articulation.h

@@ -14,14 +14,14 @@
 #define __ARTICULATION_H__
 
 #include "mscore.h"
-#include "symbol.h"
-#include "sym.h"
+#include "element.h"
 
 class QPainter;
 
 namespace Ms {
 
 class ChordRest;
+enum class SymId;
 
 //---------------------------------------------------------
 //   ArticulationInfo

libmscore/bagpembell.cpp

@@ -13,6 +13,7 @@
 #include "score.h"
 #include "xml.h"
 #include "bagpembell.h"
+#include "sym.h"
 
 namespace Ms {
 

libmscore/chord.cpp

@@ -48,6 +48,7 @@
 #include "ledgerline.h"
 #include "drumset.h"
 #include "key.h"
+#include "sym.h"
 
 namespace Ms {
 

libmscore/figuredbass.cpp

@@ -19,6 +19,7 @@
 #include "chord.h"
 #include "rest.h"
 #include "score.h"
+#include "sym.h"
 
 namespace Ms {
 

libmscore/marker.cpp

@@ -12,6 +12,7 @@
 
 #include "marker.h"
 #include "score.h"
+#include "sym.h"
 
 namespace Ms {
 

libmscore/mscore.cpp

@@ -66,6 +66,7 @@ Sequencer* MScore::seq = 0;
 
 extern void initStaffTypes();
 extern void initDrumset();
+extern void initScoreFonts();
 
 //---------------------------------------------------------
 //   init

libmscore/notedot.cpp

@@ -13,6 +13,7 @@
 #include "notedot.h"
 #include "score.h"
 #include "staff.h"
+#include "sym.h"
 
 namespace Ms {
 

libmscore/ottava.cpp

@@ -20,6 +20,7 @@
 #include "text.h"
 #include "staff.h"
 #include "segment.h"
+#include "sym.h"
 
 namespace Ms {
 

libmscore/part.cpp

@@ -22,6 +22,7 @@
 #include "measure.h"
 #include "tablature.h"
 #include "stafftype.h"
+#include "sym.h"
 
 namespace Ms {
 

libmscore/read114.cpp

@@ -31,6 +31,7 @@
 #include "dynamic.h"
 #include "drumset.h"
 #include "style.h"
+#include "sym.h"
 
 namespace Ms {
 

libmscore/score.cpp

@@ -66,6 +66,7 @@
 #include "audio.h"
 #include "instrtemplate.h"
 #include "cursor.h"
+#include "sym.h"
 
 namespace Ms {
 

libmscore/score.h

@@ -96,6 +96,7 @@ struct PageContext;
 class BarLine;
 class Bracket;
 class KeyList;
+class ScoreFont;
 
 enum class OttavaType;
 enum class ClefType : signed char;
@@ -958,7 +959,6 @@ class Score : public QObject {
       ScoreFont* scoreFont() const    { return _scoreFont; }
       void setScoreFont(ScoreFont* f) { _scoreFont = f;    }
       qreal noteHeadWidth() const            { return _noteHeadWidth; }
-//      const Sym& sym(SymId id) const;
 
       friend class ChangeSynthesizerState;
       friend class Chord;

libmscore/symbol.cpp

@@ -139,7 +139,6 @@ void Symbol::read(XmlReader& e)
                   e.unknown();
             }
       setPos(pos);
-      setSym(s);
       }
 
 //---------------------------------------------------------

libmscore/symbol.h

@@ -14,13 +14,13 @@
 #define __SYMBOL_H__
 
 #include "bsymbol.h"
-#include "sym.h"
 
 class QPainter;
 
 namespace Ms {
 
 class Segment;
+enum class SymId;
 
 //---------------------------------------------------------
 //   @@ Symbol

libmscore/undo.cpp

@@ -71,6 +71,7 @@
 #include "stafftext.h"
 #include "chordline.h"
 #include "tremolo.h"
+#include "sym.h"
 
 namespace Ms {