diff options
Diffstat (limited to 'kig/filters/cabri-filter.cc')
-rw-r--r-- | kig/filters/cabri-filter.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc index 55ecf939..2348af86 100644 --- a/kig/filters/cabri-filter.cc +++ b/kig/filters/cabri-filter.cc @@ -56,7 +56,7 @@ * * Nr: Simple sequential numbering of the objects in a file. * Type: seen so far: Pt, Axes, Line, Cir - * NumberOfParents: The number of tqparents that will be specified in + * NumberOfParents: The number of parents that will be specified in * Parents * Color: * R -> red @@ -96,7 +96,7 @@ * Visible: * V means visible, I means invisible * Fixed: - * St means fix this object ( if you move one of its tqparents, it + * St means fix this object ( if you move one of its parents, it * won't move ), nSt ( the default ) means don't fix this object. * Parents: * The numbers of the objects this object depends on @@ -118,7 +118,7 @@ struct CabriObject int specialAppearanceSwitch; bool visible; bool fixed; - std::vector<int> tqparents; + std::vector<int> parents; std::vector<double> data; }; @@ -246,14 +246,14 @@ bool KigFilterCabri::readObject( TQFile& f, CabriObject& myobj ) KIG_FILTER_PARSE_ERROR; tmp = thirdlinere.cap( 2 ); - TQStringList tqparentsids = TQStringList::split( ' ', tmp ); - for ( TQStringList::iterator i = tqparentsids.begin(); - i != tqparentsids.end(); ++i ) + TQStringList parentsids = TQStringList::split( ' ', tmp ); + for ( TQStringList::iterator i = parentsids.begin(); + i != parentsids.end(); ++i ) { - myobj.tqparents.push_back( ( *i ).toInt( &ok ) ); + myobj.parents.push_back( ( *i ).toInt( &ok ) ); if ( ! ok ) KIG_FILTER_PARSE_ERROR; } - if ( myobj.tqparents.size() != myobj.numberOfParents ) + if ( myobj.parents.size() != myobj.numberOfParents ) KIG_FILTER_PARSE_ERROR; tmp = thirdlinere.cap( 4 ); @@ -277,8 +277,8 @@ bool KigFilterCabri::readObject( TQFile& f, CabriObject& myobj ) // << "specialAppearanceSwitch = " << myobj.specialAppearanceSwitch << endl // << "visible = " << visible << endl // << "fixed = " << myobj.fixed << endl -// << "tqparents =" << endl; -// for ( std::vector<int>::iterator i = myobj.tqparents.begin(); i != myobj.tqparents.end(); ++i ) +// << "parents =" << endl; +// for ( std::vector<int>::iterator i = myobj.parents.begin(); i != myobj.parents.end(); ++i ) // kdDebug() << " " << *i << endl; // kdDebug() << "vals = " << endl; // for ( std::vector<double>::iterator i = myobj.data.begin(); i != myobj.data.end(); ++i ) @@ -352,8 +352,8 @@ KigDocument* KigFilterCabri::load( const TQString& file ) int ps = 0; args.clear(); - for ( std::vector<int>::iterator i = obj.tqparents.begin(); - i != obj.tqparents.end(); ++i ) + for ( std::vector<int>::iterator i = obj.parents.begin(); + i != obj.parents.end(); ++i ) args.push_back( calcers[*i-3] ); // two fake objects at the start ( origin and axes.. ) |