summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-09-03 16:10:09 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2016-09-03 16:10:09 (GMT)
commit8130ab04f826d1de8cd78a6e130bef08c138628b (patch)
tree6a86fc10a0a53119043ff3f4bdd5ea8bf2af9ba5
parent7abab1d73f87054cf102675f9e0b7f5e2d82f232 (diff)
downloadrosegarden-8130ab04.zip
rosegarden-8130ab04.tar.gz
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--src/gui/editors/notation/NoteFontMap.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index f557a08..668d057 100644
--- a/src/gui/editors/notation/NoteFontMap.cpp
+++ b/src/gui/editors/notation/NoteFontMap.cpp
@@ -785,11 +785,11 @@ const
{
SymbolDataMap::const_iterator i = m_data.find(charName);
if (i == m_data.end())
- return false;
+ return 0;
SizeDataMap::const_iterator si = m_sizes.find(size);
if (si == m_sizes.end())
- return false;
+ return 0;
int fontId = i->second.getFontId();
@@ -802,7 +802,7 @@ const
SystemFontNameMap::const_iterator fni = m_systemFontNames.find(fontId);
if (fontId < 0 || fni == m_systemFontNames.end())
- return false;
+ return 0;
TQString fontName = fni->second;
CharBaseMap::const_iterator bi = m_bases.find(fontId);