From 9dd12384ded73e38b1081b899e0b898387de7518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 3 Sep 2016 17:49:57 +0200 Subject: [PATCH] Fix FTBFS with GCC6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 63b9245a2f2ec12e5b4ecc62ea0a184d89b635b8) --- src/backgroundmanager.cpp | 2 +- src/formatimporter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backgroundmanager.cpp b/src/backgroundmanager.cpp index 15aea00..74a185f 100644 --- a/src/backgroundmanager.cpp +++ b/src/backgroundmanager.cpp @@ -258,7 +258,7 @@ TQPixmap* BackgroundManager::preview(const TQString &image) if (!entry) { /// std::cout << "BackgroundManager: Requested the preview of an unexisting image: " << image << std::endl; - return false; + return 0; } // The easiest way: already computed: diff --git a/src/formatimporter.cpp b/src/formatimporter.cpp index f6ea820..ea26091 100644 --- a/src/formatimporter.cpp +++ b/src/formatimporter.cpp @@ -197,7 +197,7 @@ TQDomElement FormatImporter::importBasket(const TQString &folderName) disposition.setAttribute("mindMap", "false"); disposition.setAttribute("columnCount", "1"); disposition.setAttribute("free", "false"); - bool isCheckList = XMLWork::trueOrFalse( XMLWork::getElementText(properties, "showCheckBoxes", false) ); + bool isCheckList = XMLWork::trueOrFalse( XMLWork::getElementText(properties, "showCheckBoxes", "") ); // Insert all notes in a group (column): 1/ rename "items" to "group", 2/ add "notes" to root, 3/ move "group" into "notes" TQDomElement column = XMLWork::getElement(docElem, "items");