summaryrefslogtreecommitdiffstats
path: root/kig/filters/kgeo-filter.cc
diff options
context:
space:
mode:
Diffstat (limited to 'kig/filters/kgeo-filter.cc')
-rw-r--r--kig/filters/kgeo-filter.cc132
1 files changed, 66 insertions, 66 deletions
diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc
index 379af11d..2405e46b 100644
--- a/kig/filters/kgeo-filter.cc
+++ b/kig/filters/kgeo-filter.cc
@@ -74,7 +74,7 @@ void KigFilterKGeo::loadMetrics(KSimpleConfig* c )
struct KGeoHierarchyElement
{
int id;
- std::vector<int> tqparents;
+ std::vector<int> parents;
};
static void visitElem( std::vector<KGeoHierarchyElement>& ret,
@@ -84,8 +84,8 @@ static void visitElem( std::vector<KGeoHierarchyElement>& ret,
{
if ( !seen[i] )
{
- for ( uint j = 0; j < elems[i].tqparents.size(); ++j )
- visitElem( ret, elems, seen, elems[i].tqparents[j] );
+ for ( uint j = 0; j < elems[i].parents.size(); ++j )
+ visitElem( ret, elems, seen, elems[i].parents[j] );
ret.push_back( elems[i] );
seen[i] = true;
};
@@ -113,7 +113,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
// first we determine the tqparent relationships, and sort the
// elements in an order that we can be sure all of an object's
- // tqparents will have been handled before it is handled itself..
+ // parents will have been handled before it is handled itself..
// ( aka topological sort of the tqparent relations graph..
std::vector<KGeoHierarchyElement> elems;
elems.reserve( number );
@@ -125,15 +125,15 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
group.setNum( i + 1 );
group.prepend( "Object " );
c->setGroup( group );
- TQStrList tqparents;
- c->readListEntry( "Parents", tqparents );
+ TQStrList parents;
+ c->readListEntry( "Parents", parents );
elems.push_back( elem );
- for ( const char* tqparent = tqparents.first(); tqparent; tqparent = tqparents.next() )
+ for ( const char* tqparent = parents.first(); tqparent; tqparent = parents.next() )
{
- int tqparentIndex = TQString::tqfromLatin1( tqparent ).toInt( &ok );
+ int parentIndex = TQString::tqfromLatin1( tqparent ).toInt( &ok );
if ( ! ok ) KIG_FILTER_PARSE_ERROR;
- if ( tqparentIndex != 0 )
- elems[i].tqparents.push_back( tqparentIndex - 1 );
+ if ( parentIndex != 0 )
+ elems[i].parents.push_back( parentIndex - 1 );
};
};
@@ -153,11 +153,11 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
c->setGroup( group );
int objID = c->readNumEntry( "Geo" );
- std::vector<ObjectCalcer*> tqparents;
- for ( uint j = 0; j < e.tqparents.size(); ++j )
+ std::vector<ObjectCalcer*> parents;
+ for ( uint j = 0; j < e.parents.size(); ++j )
{
- int tqparentid = e.tqparents[j];
- tqparents.push_back( os[tqparentid]->calcer() );
+ int parentid = e.parents[j];
+ parents.push_back( os[parentid]->calcer() );
};
ObjectCalcer* o = 0;
@@ -173,77 +173,77 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
double y = strY.toDouble(&ok);
if (!ok) KIG_FILTER_PARSE_ERROR;
Coordinate m( x, y );
- uint ntqparents = tqparents.size();
- if ( ntqparents == 0 )
+ uint nparents = parents.size();
+ if ( nparents == 0 )
o = factory->fixedPointCalcer( m );
- else if ( ntqparents == 1 )
- o = factory->constrainedPointCalcer( tqparents[0], m, *ret );
+ else if ( nparents == 1 )
+ o = factory->constrainedPointCalcer( parents[0], m, *ret );
else
KIG_FILTER_PARSE_ERROR;
break;
}
case ID_segment:
{
- o = new ObjectTypeCalcer( SegmentABType::instance(), tqparents );
+ o = new ObjectTypeCalcer( SegmentABType::instance(), parents );
break;
}
case ID_circle:
{
- o = new ObjectTypeCalcer( CircleBCPType::instance(), tqparents );
+ o = new ObjectTypeCalcer( CircleBCPType::instance(), parents );
break;
}
case ID_line:
{
- o = new ObjectTypeCalcer( LineABType::instance(), tqparents );
+ o = new ObjectTypeCalcer( LineABType::instance(), parents );
break;
}
case ID_bisection:
{
// if this is the bisection of two points, first build a segment
// between them..
- if ( tqparents.size() == 2 )
+ if ( parents.size() == 2 )
{
- ObjectTypeCalcer* seg = new ObjectTypeCalcer( SegmentABType::instance(), tqparents );
- tqparents.clear();
- tqparents.push_back( seg );
+ ObjectTypeCalcer* seg = new ObjectTypeCalcer( SegmentABType::instance(), parents );
+ parents.clear();
+ parents.push_back( seg );
}
- if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
- o = factory->propertyObjectCalcer( tqparents[0], "mid-point" );
+ if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
+ o = factory->propertyObjectCalcer( parents[0], "mid-point" );
break;
};
case ID_perpendicular:
{
- o = new ObjectTypeCalcer( LinePerpendLPType::instance(), tqparents );
+ o = new ObjectTypeCalcer( LinePerpendLPType::instance(), parents );
break;
}
case ID_parallel:
{
- o = new ObjectTypeCalcer( LineParallelLPType::instance(), tqparents );
+ o = new ObjectTypeCalcer( LineParallelLPType::instance(), parents );
break;
}
case ID_vector:
{
- o = new ObjectTypeCalcer( VectorType::instance(), tqparents );
+ o = new ObjectTypeCalcer( VectorType::instance(), parents );
break;
}
case ID_ray:
{
- o = new ObjectTypeCalcer( RayABType::instance(), tqparents );
+ o = new ObjectTypeCalcer( RayABType::instance(), parents );
break;
}
case ID_move:
{
- o = new ObjectTypeCalcer( TranslatedType::instance(), tqparents );
+ o = new ObjectTypeCalcer( TranslatedType::instance(), parents );
break;
}
case ID_mirrorPoint:
{
- o = new ObjectTypeCalcer( PointReflectionType::instance(), tqparents );
+ o = new ObjectTypeCalcer( PointReflectionType::instance(), parents );
break;
}
case ID_pointOfConc:
{
- o = new ObjectTypeCalcer( LineLineIntersectionType::instance(), tqparents );
+ o = new ObjectTypeCalcer( LineLineIntersectionType::instance(), parents );
break;
}
case ID_text:
@@ -264,79 +264,79 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
case ID_fixedCircle:
{
double r = c->readDoubleNumEntry( "Radius" );
- tqparents.push_back( new ObjectConstCalcer( new DoubleImp( r ) ) );
- o = new ObjectTypeCalcer( CircleBPRType::instance(), tqparents );
+ parents.push_back( new ObjectConstCalcer( new DoubleImp( r ) ) );
+ o = new ObjectTypeCalcer( CircleBPRType::instance(), parents );
break;
}
case ID_angle:
{
- if ( tqparents.size() == 3 )
+ if ( parents.size() == 3 )
{
- ObjectTypeCalcer* ao = new ObjectTypeCalcer( AngleType::instance(), tqparents );
+ ObjectTypeCalcer* ao = new ObjectTypeCalcer( AngleType::instance(), parents );
ao->calc( *ret );
- tqparents.clear();
- tqparents.push_back( ao );
+ parents.clear();
+ parents.push_back( ao );
};
- if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
- ObjectCalcer* angle = tqparents[0];
- tqparents.clear();
+ if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
+ ObjectCalcer* angle = parents[0];
+ parents.clear();
const Coordinate c =
- static_cast<const PointImp*>( angle->tqparents()[1]->imp() )->coordinate();
+ static_cast<const PointImp*>( angle->parents()[1]->imp() )->coordinate();
o = filtersConstructTextObject( c, angle, "angle-degrees", *ret, true );
break;
}
case ID_distance:
{
- if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR;
- ObjectTypeCalcer* segment = new ObjectTypeCalcer( SegmentABType::instance(), tqparents );
+ if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR;
+ ObjectTypeCalcer* segment = new ObjectTypeCalcer( SegmentABType::instance(), parents );
segment->calc( *ret );
- Coordinate m = ( static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate() +
- static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate() ) / 2;
+ Coordinate m = ( static_cast<const PointImp*>( parents[0]->imp() )->coordinate() +
+ static_cast<const PointImp*>( parents[1]->imp() )->coordinate() ) / 2;
o = filtersConstructTextObject( m, segment, "length", *ret, true );
break;
}
case ID_arc:
{
- o = new ObjectTypeCalcer( AngleType::instance(), tqparents );
+ o = new ObjectTypeCalcer( AngleType::instance(), parents );
break;
}
case ID_area:
{
- if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
- const CircleImp* circle = static_cast<const CircleImp*>( tqparents[0]->imp() );
+ if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
+ const CircleImp* circle = static_cast<const CircleImp*>( parents[0]->imp() );
const Coordinate c = circle->center() + Coordinate( circle->radius(), 0 );
- o = filtersConstructTextObject( c, tqparents[0], "surface", *ret, true );
+ o = filtersConstructTextObject( c, parents[0], "surface", *ret, true );
break;
}
case ID_slope:
{
- // if tqparents contains a segment, line, vector or whatever, we
- // take its tqparents cause we want points..
- if ( tqparents.size() == 1 ) tqparents = tqparents[0]->tqparents();
- if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR;
+ // if parents contains a segment, line, vector or whatever, we
+ // take its parents cause we want points..
+ if ( parents.size() == 1 ) parents = parents[0]->parents();
+ if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR;
const Coordinate c = (
- static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate() +
- static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate() ) / 2;
- ObjectTypeCalcer* line = new ObjectTypeCalcer( LineABType::instance(), tqparents );
+ static_cast<const PointImp*>( parents[0]->imp() )->coordinate() +
+ static_cast<const PointImp*>( parents[1]->imp() )->coordinate() ) / 2;
+ ObjectTypeCalcer* line = new ObjectTypeCalcer( LineABType::instance(), parents );
line->calc( *ret );
o = filtersConstructTextObject( c, line, "slope", *ret, true );
break;
}
case ID_circumference:
{
- if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
- const CircleImp* c = static_cast<const CircleImp*>( tqparents[0]->imp() );
+ if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
+ const CircleImp* c = static_cast<const CircleImp*>( parents[0]->imp() );
const Coordinate m = c->center() + Coordinate( c->radius(), 0 );
- o = filtersConstructTextObject( m, tqparents[0], "circumference", *ret, true );
+ o = filtersConstructTextObject( m, parents[0], "circumference", *ret, true );
break;
}
case ID_rotation:
{
// in kig, the rotated object should be last..
- ObjectCalcer* t = tqparents[2];
- tqparents[2] = tqparents[0];
- tqparents[0] = t;
- o = new ObjectTypeCalcer( RotationType::instance(), tqparents );
+ ObjectCalcer* t = parents[2];
+ parents[2] = parents[0];
+ parents[0] = t;
+ o = new ObjectTypeCalcer( RotationType::instance(), parents );
break;
}
default:
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 09:46:05 +0000