Browse Source

Fix FTBFS with GCC6

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 0b9e390c01)
tags/r14.0.4
Slávek Banko 3 years ago
parent
commit
8abf888c7d
9 changed files with 10 additions and 10 deletions
  1. +1
    -1
      filters/karbon/ai/ailexer.cc
  2. +1
    -1
      filters/karbon/eps/pscommentlexer.cc
  3. +1
    -1
      filters/kspread/qpro/libqpro/src/stream.cc
  4. +1
    -1
      kexi/kexidb/connection.cpp
  5. +1
    -1
      kexi/kexidb/parser/parser_p.cpp
  6. +1
    -1
      kexi/main/keximainwindowimpl.cpp
  7. +2
    -2
      kpresenter/KPrTextObject.cpp
  8. +1
    -1
      kspread/kspread_canvas.cc
  9. +1
    -1
      lib/kformula/kformuladefs.h

+ 1
- 1
filters/karbon/ai/ailexer.cc View File

@@ -73,7 +73,7 @@ const char*statetoa (State state){

typedef struct {
State oldState;
char c;
signed char c;
State newState;
Action action;
} Transition;


+ 1
- 1
filters/karbon/eps/pscommentlexer.cc View File

@@ -59,7 +59,7 @@ const char*statetoa (State state){

typedef struct {
State oldState;
char c;
signed char c;
State newState;
Action action;
} Transition;


+ 1
- 1
filters/kspread/qpro/libqpro/src/stream.cc View File

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

int


+ 1
- 1
kexi/kexidb/connection.cpp View File

@@ -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,


+ 1
- 1
kexi/kexidb/parser/parser_p.cpp View File

@@ -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);
}


+ 1
- 1
kexi/main/keximainwindowimpl.cpp View File

@@ -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 );


+ 2
- 2
kpresenter/KPrTextObject.cpp View File

@@ -2407,11 +2407,11 @@ TQDragObject * KPrTextView::newDrag( TQWidget * parent )
oasisStore.closeContentWriter();

if ( !store->open( "styles.xml" ) )
return false;
return 0;
//manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
doc->saveOasisDocumentStyles( store, mainStyles, 0, savingContext, KPrDocument::SaveSelected /* simply means not SaveAll */ );
if ( !store->close() ) // done with styles.xml
return false;
return 0;

delete store;



+ 1
- 1
kspread/kspread_canvas.cc View File

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

d->prevSpokenPointerRow = -1;


+ 1
- 1
lib/kformula/kformuladefs.h View File

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


Loading…
Cancel
Save