Fix FTBFS with GCC6

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 0b9e390c01)
pull/8/head
Slávek Banko 8 years ago
parent 08500cc118
commit 8abf888c7d

@ -73,7 +73,7 @@ const char*statetoa (State state){
typedef struct { typedef struct {
State oldState; State oldState;
char c; signed char c;
State newState; State newState;
Action action; Action action;
} Transition; } Transition;

@ -59,7 +59,7 @@ const char*statetoa (State state){
typedef struct { typedef struct {
State oldState; State oldState;
char c; signed char c;
State newState; State newState;
Action action; Action action;
} Transition; } Transition;

@ -114,7 +114,7 @@ QpIStream::operator void* ()
if( cIn == 0 ) if( cIn == 0 )
return 0; return 0;
else else
return *cIn; return cIn;
} }
int int

@ -2938,7 +2938,7 @@ KexiDB::QuerySchema* Connection::setupQuerySchema( const RowData &data )
bool ok = true; bool ok = true;
const int objID = data[0].toInt(&ok); const int objID = data[0].toInt(&ok);
if (!ok) if (!ok)
return false; return 0;
TQString sqlText; TQString sqlText;
if (!loadDataBlock( objID, sqlText, "sql" )) { if (!loadDataBlock( objID, sqlText, "sql" )) {
setError(ERR_OBJECT_NOT_FOUND, setError(ERR_OBJECT_NOT_FOUND,

@ -585,7 +585,7 @@ QuerySchema* buildSelectQuery(
if (!options->whereExpr->validate(parseInfo)) { if (!options->whereExpr->validate(parseInfo)) {
setError(parseInfo.errMsg, parseInfo.errDescr); setError(parseInfo.errMsg, parseInfo.errDescr);
CLEANUP; CLEANUP;
return false; return 0;
} }
querySchema->setWhereExpression(options->whereExpr); querySchema->setWhereExpression(options->whereExpr);
} }

@ -3697,7 +3697,7 @@ KexiMainWindowImpl::openObjectFromNavigator(KexiPart::Item* item, int viewMode,
return 0; return 0;
} }
if (!d->prj || !item) if (!d->prj || !item)
return false; return 0;
#ifndef KEXI_NO_PENDING_DIALOGS #ifndef KEXI_NO_PENDING_DIALOGS
Private::PendingJobType pendingType; Private::PendingJobType pendingType;
KexiDialogBase *dlg = d->openedDialogFor( item, pendingType ); KexiDialogBase *dlg = d->openedDialogFor( item, pendingType );

@ -2407,11 +2407,11 @@ TQDragObject * KPrTextView::newDrag( TQWidget * parent )
oasisStore.closeContentWriter(); oasisStore.closeContentWriter();
if ( !store->open( "styles.xml" ) ) if ( !store->open( "styles.xml" ) )
return false; return 0;
//manifestWriter->addManifestEntry( "styles.xml", "text/xml" ); //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
doc->saveOasisDocumentStyles( store, mainStyles, 0, savingContext, KPrDocument::SaveSelected /* simply means not SaveAll */ ); doc->saveOasisDocumentStyles( store, mainStyles, 0, savingContext, KPrDocument::SaveSelected /* simply means not SaveAll */ );
if ( !store->close() ) // done with styles.xml if ( !store->close() ) // done with styles.xml
return false; return 0;
delete store; delete store;

@ -246,7 +246,7 @@ Canvas::Canvas (View *_view)
d->m_resizeObject = 0L; d->m_resizeObject = 0L;
d->m_ratio = 0.0; d->m_ratio = 0.0;
d->m_isMoving = false; d->m_isMoving = false;
d->m_objectDisplayAbove = false; d->m_objectDisplayAbove = 0;
d->m_isResizing = false; d->m_isResizing = false;
d->prevSpokenPointerRow = -1; d->prevSpokenPointerRow = -1;

@ -163,7 +163,7 @@ enum TokenElementType {
* The struct used to store static font data. * The struct used to store static font data.
*/ */
struct InternFontTable { struct InternFontTable {
short unicode; unsigned short unicode;
TQChar pos; TQChar pos;
CharClass cl; CharClass cl;
CharStyle style; CharStyle style;

Loading…
Cancel
Save