summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-09-03 15:14:02 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2016-09-03 15:14:02 (GMT)
commit6dcbd0e68452bb64057e97a7c648478f2511b3f2 (patch)
treead9b1663062aa6824a00602f79d78a5c2b425ceb
parent21f0554315868771c8ad11ce53db403e4534a8e7 (diff)
downloadtdesdk-6dcbd0e6.zip
tdesdk-6dcbd0e6.tar.gz
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/database.cpp4
-rw-r--r--tdecachegrind/tdecachegrind/stackbrowser.cpp2
-rw-r--r--umbrello/umbrello/docgenerators/docbookgenerator.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 50880dc..5fa69de 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -1163,13 +1163,13 @@ DataBaseManager::addLocation (TQString word, unsigned int location)
antibounce++;
//calculate step or use antibounce
- if (abs ((int) d[loc] - (int) location) < 50
+ if (labs ((int) d[loc] - (int) location) < 50
|| antibounce > 100)
step = 1; //Go linear...
else
{
step =
- (abs (d[loc] - location) * num) / totalrecord + 1;
+ (labs (d[loc] - location) * num) / totalrecord + 1;
}
diff --git a/tdecachegrind/tdecachegrind/stackbrowser.cpp b/tdecachegrind/tdecachegrind/stackbrowser.cpp
index 2257e58..2c04a02 100644
--- a/tdecachegrind/tdecachegrind/stackbrowser.cpp
+++ b/tdecachegrind/tdecachegrind/stackbrowser.cpp
@@ -234,7 +234,7 @@ Stack* Stack::split(TraceFunction* f)
// cycles are listed on there own
if (f->cycle() == f) return 0;
- if (_top->cycle() == _top) return false;
+ if (_top->cycle() == _top) return 0;
for (c=calls.first();c;c=calls.next()) {
TraceCallList l = c->called()->callings();
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
index bc7107f..a012b70 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@@ -97,7 +97,7 @@ TDEIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
// lets open the file for writing
if( !file.open( IO_WriteOnly ) ) {
KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(tmpfile.name()), i18n("Save Error"));
- return false;
+ return 0;
}
umlDoc->saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it
file.close();