TDE
/
tdeedu
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeedu
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS with GCC6

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 564548309f)
pull/9/head
Slávek Banko 8 years ago
parent b9c36b3166
commit cc79a7fd35
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

28
kig/filters/drgeo-filter.cc
Unescape View File

@ -109,7 +109,7 @@ KigDocument* KigFilterDrgeo::load( const TQString& file )
"figures." ).arg( file ) ); "figures." ).arg( file ) );
else else
warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).arg( file ) ); warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).arg( file ) );
return false; return 0;
} }
int nfig = figures.count(); int nfig = figures.count();
@ -335,7 +335,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
} }
else if ( domelem.attribute( "type" ) == "Intersection" ) else if ( domelem.attribute( "type" ) == "Intersection" )
@ -371,7 +371,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
{ {
notSupported( file, i18n( "This Dr. Geo file contains an intersection type, " notSupported( file, i18n( "This Dr. Geo file contains an intersection type, "
"which Kig does not currently support." ) ); "which Kig does not currently support." ) );
return false; return 0;
} }
oc = new ObjectTypeCalcer( type, args ); oc = new ObjectTypeCalcer( type, args );
} }
@ -389,7 +389,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
#ifdef DRGEO_DEBUG #ifdef DRGEO_DEBUG
kdDebug() << "+++++++++ oc:" << oc << endl; kdDebug() << "+++++++++ oc:" << oc << endl;
@ -421,7 +421,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
oc = new ObjectTypeCalcer( type, parents ); oc = new ObjectTypeCalcer( type, parents );
} }
@ -434,7 +434,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
oc = new ObjectTypeCalcer( type, parents ); oc = new ObjectTypeCalcer( type, parents );
} }
@ -455,7 +455,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
oc = new ObjectTypeCalcer( type, parents ); oc = new ObjectTypeCalcer( type, parents );
} }
@ -471,7 +471,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
oc = new ObjectTypeCalcer( type, parents ); oc = new ObjectTypeCalcer( type, parents );
} }
@ -492,7 +492,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
#ifdef DRGEO_DEBUG #ifdef DRGEO_DEBUG
kdDebug() << "+++++++++ oc:" << oc << endl; kdDebug() << "+++++++++ oc:" << oc << endl;
@ -620,7 +620,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
#ifdef DRGEO_DEBUG #ifdef DRGEO_DEBUG
kdDebug() << "+++++++++ oc:" << oc << endl; kdDebug() << "+++++++++ oc:" << oc << endl;
@ -638,7 +638,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
#ifdef DRGEO_DEBUG #ifdef DRGEO_DEBUG
kdDebug() << "+++++++++ oc:" << oc << endl; kdDebug() << "+++++++++ oc:" << oc << endl;
@ -679,7 +679,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
} }
else if ( domelem.tagName() == "locus" ) else if ( domelem.tagName() == "locus" )
@ -691,7 +691,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
#ifdef DRGEO_DEBUG #ifdef DRGEO_DEBUG
kdDebug() << "+++++++++ oc:" << oc << endl; kdDebug() << "+++++++++ oc:" << oc << endl;
@ -711,7 +711,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg( "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) ); domelem.attribute( "type" ) ) );
return false; return 0;
} }
curid++; curid++;
if ( oc == 0 ) if ( oc == 0 )

8
kig/filters/kseg-filter.cc
Unescape View File

@ -202,7 +202,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
if ( ! ffile.open( IO_ReadOnly ) ) if ( ! ffile.open( IO_ReadOnly ) )
{ {
fileNotFound( file ); fileNotFound( file );
return false; return 0;
}; };
KigDocument* retdoc = new KigDocument(); KigDocument* retdoc = new KigDocument();
@ -558,19 +558,19 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
{ {
notSupported( file, i18n( "This KSeg file contains a filled circle, " notSupported( file, i18n( "This KSeg file contains a filled circle, "
"which Kig does not currently support." ) ); "which Kig does not currently support." ) );
return false; return 0;
}; };
case G_ARCSECTOR: case G_ARCSECTOR:
{ {
notSupported( file, i18n( "This KSeg file contains an arc sector, " notSupported( file, i18n( "This KSeg file contains an arc sector, "
"which Kig does not currently support." ) ); "which Kig does not currently support." ) );
return false; return 0;
}; };
case G_ARCSEGMENT: case G_ARCSEGMENT:
{ {
notSupported( file, i18n( "This KSeg file contains an arc segment, " notSupported( file, i18n( "This KSeg file contains an arc segment, "
"which Kig does not currently support." ) ); "which Kig does not currently support." ) );
return false; return 0;
}; };
case G_LOCUS: case G_LOCUS:
{ {

12
kig/filters/native-filter.cc
Unescape View File

@ -194,7 +194,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
{ {
notSupported( file, i18n( "This file was created by Kig version \"%1\", " notSupported( file, i18n( "This file was created by Kig version \"%1\", "
"which this version cannot open." ).arg( version ) ); "which this version cannot open." ).arg( version ) );
return false; return 0;
} }
else if ( major == 0 && minor <= 3 ) else if ( major == 0 && minor <= 3 )
{ {
@ -205,7 +205,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
"version (0.4 to 0.6),\n" "version (0.4 to 0.6),\n"
"and then save it again, which will save it in the " "and then save it again, which will save it in the "
"new format." ).arg( version ) ); "new format." ).arg( version ) );
return false; return 0;
} }
else if ( major == 0 && minor <= 6 ) else if ( major == 0 && minor <= 6 )
return load04( file, main ); return load04( file, main );
@ -301,7 +301,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement&
if ( ( !imp ) && !error.isEmpty() ) if ( ( !imp ) && !error.isEmpty() )
{ {
parseError( file, error ); parseError( file, error );
return false; return 0;
} }
o = new ObjectConstCalcer( imp ); o = new ObjectConstCalcer( imp );
} }
@ -339,7 +339,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement&
"Perhaps you have compiled Kig without support " "Perhaps you have compiled Kig without support "
"for this object type," "for this object type,"
"or perhaps you are using an older Kig version." ).arg( tmp ) ); "or perhaps you are using an older Kig version." ).arg( tmp ) );
return false; return 0;
}; };
std::vector<ObjectCalcer*> parents; std::vector<ObjectCalcer*> parents;
@ -459,7 +459,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
if ( ( !imp ) && !error.isEmpty() ) if ( ( !imp ) && !error.isEmpty() )
{ {
parseError( file, error ); parseError( file, error );
return false; return 0;
} }
o = new ObjectConstCalcer( imp ); o = new ObjectConstCalcer( imp );
} }
@ -486,7 +486,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
"Perhaps you have compiled Kig without support " "Perhaps you have compiled Kig without support "
"for this object type," "for this object type,"
"or perhaps you are using an older Kig version." ).arg( tmp ) ); "or perhaps you are using an older Kig version." ).arg( tmp ) );
return false; return 0;
} }
// mp: (I take the responsibility for this!) explanation: the usual ObjectTypeCalcer // mp: (I take the responsibility for this!) explanation: the usual ObjectTypeCalcer

Write Preview
Loading…
Cancel
Save