Merge pull request #2171 from Jojo-Schmitz/signed-char-for-arm

fix for arm, where char by default is unsigned
This commit is contained in:
Nicolas Froment 2015-08-27 10:38:08 +02:00
commit a918b7f360
2 changed files with 3 additions and 3 deletions

View file

@ -92,7 +92,7 @@ class ClefInfo {
int _line; ///< Line for musicXml.
int _octChng; ///< Octave change for musicXml.
int _pitchOffset; ///< Pitch offset for line 0.
char _lines[14];
signed char _lines[14];
const char* _name;
StaffGroup _staffGroup;
@ -102,7 +102,7 @@ class ClefInfo {
static int line(ClefType t) { return clefTable[int(t)]._line; }
static int octChng(ClefType t) { return clefTable[int(t)]._octChng; }
static int pitchOffset(ClefType t) { return clefTable[int(t)]._pitchOffset; }
static const char* lines(ClefType t) { return clefTable[int(t)]._lines; }
static const signed char* lines(ClefType t) { return clefTable[int(t)]._lines; }
static const char* name(ClefType t) { return clefTable[int(t)]._name; }
static StaffGroup staffGroup(ClefType t) { return clefTable[int(t)]._staffGroup; }
static ClefType tag2type(const QString&);

View file

@ -180,7 +180,7 @@ void KeySig::layout()
// naturals should go AFTER accidentals if they should not go before!
bool suffixNaturals = naturalsOn && !prefixNaturals;
const char* lines = ClefInfo::lines(clef);
const signed char* lines = ClefInfo::lines(clef);
// add prefixed naturals, if any