summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-09-03 16:57:19 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-09-03 16:57:32 +0200
commitcc79a7fd35ba7981c10f43a30191fd09f98d04b3 (patch)
treebc3614a96dc36418d9d47eca05141d973aa5b6db
parentb9c36b31669a03a049b69a5326c1fa3b51f9952b (diff)
downloadtdeedu-cc79a7fd35ba7981c10f43a30191fd09f98d04b3.tar.gz
tdeedu-cc79a7fd35ba7981c10f43a30191fd09f98d04b3.zip
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 564548309f2fac225d85210f2fad1a7cd677212a)
-rw-r--r--kig/filters/drgeo-filter.cc28
-rw-r--r--kig/filters/kseg-filter.cc8
-rw-r--r--kig/filters/native-filter.cc12
3 files changed, 24 insertions, 24 deletions
diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc
index 2b7673ee..9742fcf5 100644
--- a/kig/filters/drgeo-filter.cc
+++ b/kig/filters/drgeo-filter.cc
@@ -109,7 +109,7 @@ KigDocument* KigFilterDrgeo::load( const TQString& file )
"figures." ).arg( file ) );
else
warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).arg( file ) );
- return false;
+ return 0;
}
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
}
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, "
"which Kig does not currently support." ) );
- return false;
+ return 0;
}
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
#ifdef DRGEO_DEBUG
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
#ifdef DRGEO_DEBUG
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
#ifdef DRGEO_DEBUG
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
#ifdef DRGEO_DEBUG
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
}
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
#ifdef DRGEO_DEBUG
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, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
- return false;
+ return 0;
}
curid++;
if ( oc == 0 )
diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc
index 2028bf69..1567ed37 100644
--- a/kig/filters/kseg-filter.cc
+++ b/kig/filters/kseg-filter.cc
@@ -202,7 +202,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
if ( ! ffile.open( IO_ReadOnly ) )
{
fileNotFound( file );
- return false;
+ return 0;
};
KigDocument* retdoc = new KigDocument();
@@ -558,19 +558,19 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
{
notSupported( file, i18n( "This KSeg file contains a filled circle, "
"which Kig does not currently support." ) );
- return false;
+ return 0;
};
case G_ARCSECTOR:
{
notSupported( file, i18n( "This KSeg file contains an arc sector, "
"which Kig does not currently support." ) );
- return false;
+ return 0;
};
case G_ARCSEGMENT:
{
notSupported( file, i18n( "This KSeg file contains an arc segment, "
"which Kig does not currently support." ) );
- return false;
+ return 0;
};
case G_LOCUS:
{
diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc
index 4ffe26a6..cf6521b2 100644
--- a/kig/filters/native-filter.cc
+++ b/kig/filters/native-filter.cc
@@ -194,7 +194,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
{
notSupported( file, i18n( "This file was created by Kig version \"%1\", "
"which this version cannot open." ).arg( version ) );
- return false;
+ return 0;
}
else if ( major == 0 && minor <= 3 )
{
@@ -205,7 +205,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
"version (0.4 to 0.6),\n"
"and then save it again, which will save it in the "
"new format." ).arg( version ) );
- return false;
+ return 0;
}
else if ( major == 0 && minor <= 6 )
return load04( file, main );
@@ -301,7 +301,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement&
if ( ( !imp ) && !error.isEmpty() )
{
parseError( file, error );
- return false;
+ return 0;
}
o = new ObjectConstCalcer( imp );
}
@@ -339,7 +339,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement&
"Perhaps you have compiled Kig without support "
"for this object type,"
"or perhaps you are using an older Kig version." ).arg( tmp ) );
- return false;
+ return 0;
};
std::vector<ObjectCalcer*> parents;
@@ -459,7 +459,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
if ( ( !imp ) && !error.isEmpty() )
{
parseError( file, error );
- return false;
+ return 0;
}
o = new ObjectConstCalcer( imp );
}
@@ -486,7 +486,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
"Perhaps you have compiled Kig without support "
"for this object type,"
"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