diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-09-03 17:49:57 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-09-03 17:50:07 +0200 |
| commit | 9dd12384ded73e38b1081b899e0b898387de7518 (patch) | |
| tree | c98a11cf852aa6dac864b345b87a5358a5c1e8a0 | |
| parent | af8a295f4a5a375f900e9c4c7fc3b71d98edae73 (diff) | |
| download | basket-9dd12384ded73e38b1081b899e0b898387de7518.tar.gz basket-9dd12384ded73e38b1081b899e0b898387de7518.zip | |
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 63b9245a2f2ec12e5b4ecc62ea0a184d89b635b8)
| -rw-r--r-- | src/backgroundmanager.cpp | 2 | ||||
| -rw-r--r-- | 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"); |