diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2016-09-03 17:57:54 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2016-09-03 17:57:54 +0200 |
commit | 0b9e390c01029f4f1a8c0263e532fc1c3faf2b7d (patch) | |
tree | 08d92ab43c99c6b557571ab8261588b2968b6c5c /kexi | |
parent | a3814fe7ed9a0e00589137b194a4ebbfec75079b (diff) | |
download | koffice-0b9e390c01029f4f1a8c0263e532fc1c3faf2b7d.tar.gz koffice-0b9e390c01029f4f1a8c0263e532fc1c3faf2b7d.zip |
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kexi')
-rw-r--r-- | kexi/kexidb/connection.cpp | 2 | ||||
-rw-r--r-- | kexi/kexidb/parser/parser_p.cpp | 2 | ||||
-rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp index dd2eb76b..776285e5 100644 --- a/kexi/kexidb/connection.cpp +++ b/kexi/kexidb/connection.cpp @@ -2938,7 +2938,7 @@ KexiDB::QuerySchema* Connection::setupQuerySchema( const RowData &data ) bool ok = true; const int objID = data[0].toInt(&ok); if (!ok) - return false; + return 0; TQString sqlText; if (!loadDataBlock( objID, sqlText, "sql" )) { setError(ERR_OBJECT_NOT_FOUND, diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp index df4f3323..7c223233 100644 --- a/kexi/kexidb/parser/parser_p.cpp +++ b/kexi/kexidb/parser/parser_p.cpp @@ -585,7 +585,7 @@ QuerySchema* buildSelectQuery( if (!options->whereExpr->validate(parseInfo)) { setError(parseInfo.errMsg, parseInfo.errDescr); CLEANUP; - return false; + return 0; } querySchema->setWhereExpression(options->whereExpr); } diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 6730c84b..bede2259 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -3697,7 +3697,7 @@ KexiMainWindowImpl::openObjectFromNavigator(KexiPart::Item* item, int viewMode, return 0; } if (!d->prj || !item) - return false; + return 0; #ifndef KEXI_NO_PENDING_DIALOGS Private::PendingJobType pendingType; KexiDialogBase *dlg = d->openedDialogFor( item, pendingType ); |