diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
commit | a374efce3a207b39514be3c52264091400ce297e (patch) | |
tree | 77bdf654b55826d4f59b53a5621310206bcaead1 /kig/filters/drgeo-filter.cc | |
parent | f81a494f3957d5cf38c787973415597941934727 (diff) | |
download | tdeedu-a374efce3a207b39514be3c52264091400ce297e.tar.gz tdeedu-a374efce3a207b39514be3c52264091400ce297e.zip |
TQt4 port kdeedu
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kig/filters/drgeo-filter.cc')
-rw-r--r-- | kig/filters/drgeo-filter.cc | 240 |
1 files changed, 120 insertions, 120 deletions
diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc index 82438a57..3f213146 100644 --- a/kig/filters/drgeo-filter.cc +++ b/kig/filters/drgeo-filter.cc @@ -62,7 +62,7 @@ struct DrGeoHierarchyElement { TQString id; - std::vector<TQString> parents; + std::vector<TQString> tqparents; }; KigFilterDrgeo::KigFilterDrgeo() @@ -106,9 +106,9 @@ KigDocument* KigFilterDrgeo::load( const TQString& file ) if ( figures.isEmpty() ) { if( nmacros > 0 ) warning( i18n( "The Dr. Geo file \"%1\" is a macro file so it contains no " - "figures." ).arg( file ) ); + "figures." ).tqarg( file ) ); 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\"." ).tqarg( file ) ); return false; } @@ -201,8 +201,8 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co { TQDomElement ce = c.toElement(); if ( ce.isNull() ) continue; - else if ( ce.tagName() == "parent" ) - elem.parents.push_back( ce.attribute( "ref" ) ); + else if ( ce.tagName() == "tqparent" ) + elem.tqparents.push_back( ce.attribute( "ref" ) ); } TQString curid = domelem.attribute( "id" ); elem.id = !curid.isNull() ? curid : TQString::number( withoutid++ ) ; @@ -216,9 +216,9 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co for ( uint i = 0; i < elems.size(); ++i ) { x = ""; - for ( uint j = 0; j < elems[i].parents.size(); ++j ) + for ( uint j = 0; j < elems[i].tqparents.size(); ++j ) { - x += elems[i].parents[j] + "_"; + x += elems[i].tqparents[j] + "_"; } kdDebug() << " --> " << i << " - " << elems[i].id << " - " << x << endl; } @@ -241,25 +241,25 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co kdDebug() << "+++ id: " << curid << endl; #endif const DrGeoHierarchyElement& el = elems[curid]; - std::vector<ObjectCalcer*> parents; - for ( uint j = 0; j < el.parents.size(); ++j ) + std::vector<ObjectCalcer*> tqparents; + for ( uint j = 0; j < el.tqparents.size(); ++j ) { - int parentid = convertDrgeoIndex( elems, el.parents[j] ); - if ( parentid == -1 ) + int tqparentid = convertDrgeoIndex( elems, el.tqparents[j] ); + if ( tqparentid == -1 ) KIG_FILTER_PARSE_ERROR; - parents.push_back( holders[parentid-nignored]->calcer() ); + tqparents.push_back( holders[tqparentid-nignored]->calcer() ); }; TQDomElement domelem = a.toElement(); #ifdef DRGEO_DEBUG - if ( parents.size() > 0 ) - for ( uint j = 0; j < parents.size(); ++j ) + if ( tqparents.size() > 0 ) + for ( uint j = 0; j < tqparents.size(); ++j ) { - kdDebug() << "+++++++++ parent[" << j << "]: " << parents[j] << " - " - << parents[j]->imp()->type()->internalName() << endl; + kdDebug() << "+++++++++ tqparent[" << j << "]: " << tqparents[j] << " - " + << tqparents[j]->imp()->type()->internalName() << endl; } else - kdDebug() << "+++++++++ parents: NO" << endl; + kdDebug() << "+++++++++ tqparents: NO" << endl; kdDebug() << "+++++++++ " << domelem.tagName() << " - " << domelem.attribute("type") << endl; #endif @@ -291,15 +291,15 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co oc = fact->fixedPointCalcer( Coordinate( x, y ) ); } else if ( domelem.attribute( "type" ) == "Middle_2pts" ) - oc = new ObjectTypeCalcer( MidPointType::instance(), parents ); + oc = new ObjectTypeCalcer( MidPointType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Middle_segment" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - if ( !parents[0]->imp()->inherits( SegmentImp::stype() ) ) + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + if ( !tqparents[0]->imp()->inherits( SegmentImp::stype() ) ) KIG_FILTER_PARSE_ERROR; - ObjectPropertyCalcer* o1 = fact->propertyObjectCalcer( parents[0], "end-point-A" ); + ObjectPropertyCalcer* o1 = fact->propertyObjectCalcer( tqparents[0], "end-point-A" ); o1->calc( *ret ); - ObjectPropertyCalcer* o2 = fact->propertyObjectCalcer( parents[0], "end-point-B" ); + ObjectPropertyCalcer* o2 = fact->propertyObjectCalcer( tqparents[0], "end-point-B" ); o2->calc( *ret ); std::vector<ObjectCalcer*> args; args.push_back( o1 ); @@ -312,37 +312,37 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co double value = values.toDouble( &ok3 ); if ( ! ok3 ) KIG_FILTER_PARSE_ERROR; - if ( ( parents[0]->imp()->inherits( CircleImp::stype() ) ) || - ( parents[0]->imp()->inherits( SegmentImp::stype() ) ) ) - oc = fact->constrainedPointCalcer( parents[0], value ); - else if ( parents[0]->imp()->inherits( LineImp::stype() ) ) + if ( ( tqparents[0]->imp()->inherits( CircleImp::stype() ) ) || + ( tqparents[0]->imp()->inherits( SegmentImp::stype() ) ) ) + oc = fact->constrainedPointCalcer( tqparents[0], value ); + else if ( tqparents[0]->imp()->inherits( LineImp::stype() ) ) { - const LineData l = static_cast<const LineImp*>( parents[0]->imp() )->data(); + const LineData l = static_cast<const LineImp*>( tqparents[0]->imp() )->data(); const Coordinate p = convertDrgeoLineParam( value, l ); - oc = fact->constrainedPointCalcer( parents[0], p, *ret ); + oc = fact->constrainedPointCalcer( tqparents[0], p, *ret ); } - else if ( parents[0]->imp()->inherits( RayImp::stype() ) ) + else if ( tqparents[0]->imp()->inherits( RayImp::stype() ) ) { - const LineData l = static_cast<const RayImp*>( parents[0]->imp() )->data(); + const LineData l = static_cast<const RayImp*>( tqparents[0]->imp() )->data(); const Coordinate p = convertDrgeoHalflineParam( value, l ); - oc = fact->constrainedPointCalcer( parents[0], p, *ret ); + oc = fact->constrainedPointCalcer( tqparents[0], p, *ret ); } - else if ( parents[0]->imp()->inherits( ArcImp::stype() ) ) - oc = fact->constrainedPointCalcer( parents[0], 1 - value ); + else if ( tqparents[0]->imp()->inherits( ArcImp::stype() ) ) + oc = fact->constrainedPointCalcer( tqparents[0], 1 - value ); else { -// oc = fact->constrainedPointCalcer( parents[0], value ); +// oc = fact->constrainedPointCalcer( tqparents[0], value ); 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } } else if ( domelem.attribute( "type" ) == "Intersection" ) { - if ( ( parents[0]->imp()->inherits( AbstractLineImp::stype() ) ) && - ( parents[1]->imp()->inherits( AbstractLineImp::stype() ) ) ) - oc = new ObjectTypeCalcer( LineLineIntersectionType::instance(), parents ); + if ( ( tqparents[0]->imp()->inherits( AbstractLineImp::stype() ) ) && + ( tqparents[1]->imp()->inherits( AbstractLineImp::stype() ) ) ) + oc = new ObjectTypeCalcer( LineLineIntersectionType::instance(), tqparents ); else { bool ok; @@ -351,21 +351,21 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co if ( which == 1 ) which = -1; else if ( which == 0 ) which = 1; else KIG_FILTER_PARSE_ERROR; - std::vector<ObjectCalcer*> args = parents; + std::vector<ObjectCalcer*> args = tqparents; const ObjectType* type = 0; args.push_back( new ObjectConstCalcer( new IntImp( which ) ) ); - if ( ( parents[0]->imp()->inherits( CircleImp::stype() ) ) && - ( parents[1]->imp()->inherits( CircleImp::stype() ) ) ) + if ( ( tqparents[0]->imp()->inherits( CircleImp::stype() ) ) && + ( tqparents[1]->imp()->inherits( CircleImp::stype() ) ) ) type = CircleCircleIntersectionType::instance(); - else if ( ( parents[0]->imp()->inherits( CircleImp::stype() ) && - parents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || - ( parents[1]->imp()->inherits( CircleImp::stype() ) && - parents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) + else if ( ( tqparents[0]->imp()->inherits( CircleImp::stype() ) && + tqparents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || + ( tqparents[1]->imp()->inherits( CircleImp::stype() ) && + tqparents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) type = ConicLineIntersectionType::instance(); - else if ( ( parents[0]->imp()->inherits( ArcImp::stype() ) && - parents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || - ( parents[1]->imp()->inherits( ArcImp::stype() ) && - parents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) + else if ( ( tqparents[0]->imp()->inherits( ArcImp::stype() ) && + tqparents[1]->imp()->inherits( AbstractLineImp::stype() ) ) || + ( tqparents[1]->imp()->inherits( ArcImp::stype() ) && + tqparents[0]->imp()->inherits( AbstractLineImp::stype() ) ) ) type = ArcLineIntersectionType::instance(); else { @@ -377,17 +377,17 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } } else if ( domelem.attribute( "type" ) == "Reflexion" ) - oc = new ObjectTypeCalcer( LineReflectionType::instance(), parents ); + oc = new ObjectTypeCalcer( LineReflectionType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Symmetry" ) - oc = new ObjectTypeCalcer( PointReflectionType::instance(), parents ); + oc = new ObjectTypeCalcer( PointReflectionType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Translation" ) - oc = new ObjectTypeCalcer( TranslatedType::instance(), parents ); + oc = new ObjectTypeCalcer( TranslatedType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Rotation" ) - oc = new ObjectTypeCalcer( RotationType::instance(), parents ); + oc = new ObjectTypeCalcer( RotationType::instance(), tqparents ); else { 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -419,11 +419,11 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else { 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, parents ); + oc = new ObjectTypeCalcer( type, tqparents ); } else if( domelem.attribute( "type" ) == "3pts" ) { @@ -432,65 +432,65 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else { 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, parents ); + oc = new ObjectTypeCalcer( type, tqparents ); } else if( domelem.attribute( "type" ) == "segment" ) { if( domelem.tagName() == "circle" ) { type = CircleBPRType::instance(); - ObjectPropertyCalcer* o = fact->propertyObjectCalcer( parents[1], "length" ); + ObjectPropertyCalcer* o = fact->propertyObjectCalcer( tqparents[1], "length" ); o->calc( *ret ); - ObjectCalcer* a = parents[0]; - parents.clear(); - parents.push_back( a ); - parents.push_back( o ); + ObjectCalcer* a = tqparents[0]; + tqparents.clear(); + tqparents.push_back( a ); + tqparents.push_back( o ); } else { 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, parents ); + oc = new ObjectTypeCalcer( type, tqparents ); } else if( domelem.attribute( "type" ) == "npts" ) { if( domelem.tagName() == "polygon" ) { - if ( parents.size() < 3 ) KIG_FILTER_PARSE_ERROR; + if ( tqparents.size() < 3 ) KIG_FILTER_PARSE_ERROR; type = PolygonBNPType::instance(); } else { 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } - oc = new ObjectTypeCalcer( type, parents ); + oc = new ObjectTypeCalcer( type, tqparents ); } else if ( domelem.attribute( "type" ) == "perpendicular" ) - oc = new ObjectTypeCalcer( LinePerpendLPType::instance(), parents ); + oc = new ObjectTypeCalcer( LinePerpendLPType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "parallel" ) - oc = new ObjectTypeCalcer( LineParallelLPType::instance(), parents ); + oc = new ObjectTypeCalcer( LineParallelLPType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Reflexion" ) - oc = new ObjectTypeCalcer( LineReflectionType::instance(), parents ); + oc = new ObjectTypeCalcer( LineReflectionType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Symmetry" ) - oc = new ObjectTypeCalcer( PointReflectionType::instance(), parents ); + oc = new ObjectTypeCalcer( PointReflectionType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Translation" ) - oc = new ObjectTypeCalcer( TranslatedType::instance(), parents ); + oc = new ObjectTypeCalcer( TranslatedType::instance(), tqparents ); else if ( domelem.attribute( "type" ) == "Rotation" ) - oc = new ObjectTypeCalcer( RotationType::instance(), parents ); + oc = new ObjectTypeCalcer( RotationType::instance(), tqparents ); else { 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -529,76 +529,76 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co bool ok3; double dvalue = value.toDouble( &ok3 ); if ( ok3 ) - value = TQString( "%1" ).arg( dvalue, 0, 'g', 3 ); + value = TQString( "%1" ).tqarg( dvalue, 0, 'g', 3 ); oc = fact->labelCalcer( value, m, false, std::vector<ObjectCalcer*>(), *ret ); } else if ( domelem.attribute( "type" ) == "pt_abscissa" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "coordinate-x", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "coordinate-x", *ret, false ); } else if ( domelem.attribute( "type" ) == "pt_ordinate" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "coordinate-y", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "coordinate-y", *ret, false ); } else if ( domelem.attribute( "type" ) == "segment_length" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "length", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "length", *ret, false ); } else if ( domelem.attribute( "type" ) == "circle_perimeter" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "circumference", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "circumference", *ret, false ); } else if ( domelem.attribute( "type" ) == "arc_length" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "arc-length", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "arc-length", *ret, false ); } else if ( domelem.attribute( "type" ) == "distance_2pts" ) { - if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; - ObjectTypeCalcer* so = new ObjectTypeCalcer( SegmentABType::instance(), parents ); + if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR; + ObjectTypeCalcer* so = new ObjectTypeCalcer( SegmentABType::instance(), tqparents ); so->calc( *ret ); oc = filtersConstructTextObject( m, so, "length", *ret, false ); } else if ( domelem.attribute( "type" ) == "vector_norm" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "length", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "length", *ret, false ); } else if ( domelem.attribute( "type" ) == "vector_abscissa" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "length-x", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "length-x", *ret, false ); } else if ( domelem.attribute( "type" ) == "vector_ordinate" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "length-y", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "length-y", *ret, false ); } else if ( domelem.attribute( "type" ) == "slope" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "slope", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "slope", *ret, false ); } else if ( domelem.attribute( "type" ) == "distance_pt_line" ) { - if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; + if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR; std::vector<ObjectCalcer*> args; - args.push_back( parents[1] ); - args.push_back( parents[0] ); + args.push_back( tqparents[1] ); + args.push_back( tqparents[0] ); ObjectTypeCalcer* po = new ObjectTypeCalcer( LinePerpendLPType::instance(), args ); po->calc( *ret ); args.clear(); - args.push_back( parents[1] ); + args.push_back( tqparents[1] ); args.push_back( po ); ObjectTypeCalcer* io = new ObjectTypeCalcer( LineLineIntersectionType::instance(), args ); io->calc( *ret ); args.clear(); - args.push_back( parents[0] ); + args.push_back( tqparents[0] ); args.push_back( io ); ObjectTypeCalcer* so = new ObjectTypeCalcer( SegmentABType::instance(), args ); so->calc( *ret ); @@ -607,18 +607,18 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co // types of 'equation' else if ( domelem.attribute( "type" ) == "line" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "equation", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "equation", *ret, false ); } else if ( domelem.attribute( "type" ) == "circle" ) { - if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR; - oc = filtersConstructTextObject( m, parents[0], "simply-cartesian-equation", *ret, false ); + if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR; + oc = filtersConstructTextObject( m, tqparents[0], "simply-cartesian-equation", *ret, false ); } else { 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -630,13 +630,13 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co { if ( domelem.attribute( "type" ) == "3pts" ) { - if ( parents.size() != 3 ) KIG_FILTER_PARSE_ERROR; - oc = new ObjectTypeCalcer( HalfAngleType::instance(), parents ); + if ( tqparents.size() != 3 ) KIG_FILTER_PARSE_ERROR; + oc = new ObjectTypeCalcer( HalfAngleType::instance(), tqparents ); } else { 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -669,7 +669,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co // since Kig doesn't support Guile scripts, it will write script's text // in a label, so the user can freely see the code and make whatever // he/she wants - // possible idea: construct a new script object with the parents of Guile + // possible idea: construct a new script object with the tqparents of Guile // one and the Guile code inserted commented... depends on a better // handling of arguments in scripts? if ( domelem.attribute( "type" ) == "nitems" ) @@ -677,7 +677,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else { 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -685,11 +685,11 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else if ( domelem.tagName() == "locus" ) { if ( domelem.attribute( "type" ) == "None" ) - oc = fact->locusCalcer( parents[0], parents[1] ); + oc = fact->locusCalcer( tqparents[0], tqparents[1] ); else { 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -709,7 +709,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co kdDebug() << ">>>>>>>>> UNKNOWN OBJECT" << endl; #endif 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." ).tqarg( domelem.tagName() ).tqarg( domelem.attribute( "type" ) ) ); return false; } @@ -723,7 +723,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co if ( domelem.attribute( "color" ) == "Bordeaux" ) co.setRgb( 145, 0, 0 ); else - co = Qt::blue; + co = TQt::blue; // reading width and style // Dashed -> the little one // Normal -> the medium @@ -747,8 +747,8 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co TQString ps = domelem.attribute( "style" ); int pointstyle = ObjectDrawer::pointStyleFromString( ps ); // show this object? - bool show = ( ( domelem.attribute( "masked" ) != "True" ) && - ( domelem.attribute( "masked" ) != "Alway" ) ); + bool show = ( ( domelem.attribute( "tqmasked" ) != "True" ) && + ( domelem.attribute( "tqmasked" ) != "Alway" ) ); // costructing the ObjectDrawer* ObjectDrawer* d = new ObjectDrawer( co, w, show, s, pointstyle ); // reading object name @@ -770,16 +770,16 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co { std::vector<ObjectCalcer*> args2; args2.push_back( o->nameCalcer() ); - oc2 = fact->attachedLabelCalcer( TQString::fromLatin1( "%1" ), oc, + oc2 = fact->attachedLabelCalcer( TQString::tqfromLatin1( "%1" ), oc, static_cast<const PointImp*>( oc->imp() )->coordinate(), false, args2, *ret ); - co = Qt::black; + co = TQt::black; } } else if ( domelem.tagName() == "angle" ) { oc2 = filtersConstructTextObject( - static_cast<const PointImp*>( holders[curid-1-nignored]->calcer()->parents()[1]->imp() )->coordinate(), + static_cast<const PointImp*>( holders[curid-1-nignored]->calcer()->tqparents()[1]->imp() )->coordinate(), holders[curid-1-nignored]->calcer(), "angle-degrees", *ret, false ); } |