diff options
Diffstat (limited to 'kig/filters/cabri-filter.cc')
-rw-r--r-- | kig/filters/cabri-filter.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc index 2348af86..7d7369a1 100644 --- a/kig/filters/cabri-filter.cc +++ b/kig/filters/cabri-filter.cc @@ -441,10 +441,10 @@ KigDocument* KigFilterCabri::load( const TQString& file ) obj.thick *= 2; if ( args.size() != 1 || obj.data.size() != 2 ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = args[0]; - if ( !tqparent->imp()->inherits( CurveImp::stype() ) ) + ObjectCalcer* parent = args[0]; + if ( !parent->imp()->inherits( CurveImp::stype() ) ) KIG_FILTER_PARSE_ERROR; - const CurveImp* curve = static_cast<const CurveImp*>( tqparent->imp() ); + const CurveImp* curve = static_cast<const CurveImp*>( parent->imp() ); Coordinate pt = Coordinate( obj.data[0], obj.data[1] ); double param = curve->getParam( pt, *ret ); args.push_back( new ObjectConstCalcer( new DoubleImp( param ) ) ); @@ -486,11 +486,11 @@ KigDocument* KigFilterCabri::load( const TQString& file ) // points, or a vector... if ( args.size() != 1 || !obj.data.empty() ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = args[0]; - if ( tqparent->imp()->inherits( SegmentImp::stype() ) ) - oc = fact->propertyObjectCalcer( tqparent, "mid-point" ) ; - else if ( tqparent->imp()->inherits( VectorImp::stype() ) ) - oc = fact->propertyObjectCalcer( tqparent, "vect-mid-point" ); + ObjectCalcer* parent = args[0]; + if ( parent->imp()->inherits( SegmentImp::stype() ) ) + oc = fact->propertyObjectCalcer( parent, "mid-point" ) ; + else if ( parent->imp()->inherits( VectorImp::stype() ) ) + oc = fact->propertyObjectCalcer( parent, "vect-mid-point" ); else KIG_FILTER_PARSE_ERROR; } else if ( obj.type == "PBiss" ) @@ -505,12 +505,12 @@ KigDocument* KigFilterCabri::load( const TQString& file ) } if ( args.size() != 1 || !obj.data.empty() ) KIG_FILTER_PARSE_ERROR; - ObjectCalcer* tqparent = args[0]; + ObjectCalcer* parent = args[0]; ObjectCalcer* midpoint = 0; - if ( tqparent->imp()->inherits( SegmentImp::stype() ) ) - midpoint = fact->propertyObjectCalcer( tqparent, "mid-point" ) ; -// else if ( tqparent->imp()->inherits( VectorImp::stype() ) ) -// midpoint = fact->propertyObjectCalcer( tqparent, "vect-mid-point" ); + if ( parent->imp()->inherits( SegmentImp::stype() ) ) + midpoint = fact->propertyObjectCalcer( parent, "mid-point" ) ; +// else if ( parent->imp()->inherits( VectorImp::stype() ) ) +// midpoint = fact->propertyObjectCalcer( parent, "vect-mid-point" ); else KIG_FILTER_PARSE_ERROR; midpoint->calc( *ret ); args.push_back( midpoint ); |