summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2016-09-03 18:10:09 +0200
committerSlávek Banko <[email protected]>2016-09-03 18:10:21 +0200
commit3f51f3eb700ebb27dfc669d496a10e928bc8ae25 (patch)
tree9508b07f8f243135f16a84b5303c0a5ecc5ac484 /src/gui
parent48a2bdbfa5eca52b9ae47e4688fc15d8026c6bfb (diff)
downloadrosegarden-3f51f3eb700ebb27dfc669d496a10e928bc8ae25.tar.gz
rosegarden-3f51f3eb700ebb27dfc669d496a10e928bc8ae25.zip
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit 8130ab04f826d1de8cd78a6e130bef08c138628b)
Diffstat (limited to 'src/gui')
-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);