summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-09-03 15:49:57 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2016-09-03 15:49:57 (GMT)
commit63b9245a2f2ec12e5b4ecc62ea0a184d89b635b8 (patch)
tree05de5856dd1d5f6faad60b3d2188010368255057
parent9f8b7e3f0664388bb983040f44172d578baf4321 (diff)
downloadbasket-63b9245a.zip
basket-63b9245a.tar.gz
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--src/backgroundmanager.cpp2
-rw-r--r--src/formatimporter.cpp2
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");