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

1 files changed, 71 insertions, 71 deletions

diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc
index 02c1efde..379af11d 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> parents;
+  std::vector<int> tqparents;
 };
 
 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].parents.size(); ++j )
-      visitElem( ret, elems, seen, elems[i].parents[j] );
+    for ( uint j = 0; j < elems[i].tqparents.size(); ++j )
+      visitElem( ret, elems, seen, elems[i].tqparents[j] );
     ret.push_back( elems[i] );
     seen[i] = true;
   };
@@ -111,10 +111,10 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
   c->setGroup("Main");
   int number = c->readNumEntry ("Number");
 
-  // first we determine the parent relationships, and sort the
+  // first we determine the tqparent relationships, and sort the
   // elements in an order that we can be sure all of an object's
-  // parents will have been handled before it is handled itself..
-  // ( aka topological sort of the parent relations graph..
+  // tqparents 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 parents;
-    c->readListEntry( "Parents", parents );
+    TQStrList tqparents;
+    c->readListEntry( "Parents", tqparents );
     elems.push_back( elem );
-    for ( const char* parent = parents.first(); parent; parent = parents.next() )
+    for ( const char* tqparent = tqparents.first(); tqparent; tqparent = tqparents.next() )
     {
-      int parentIndex = TQString::fromLatin1( parent ).toInt( &ok );
+      int tqparentIndex = TQString::tqfromLatin1( tqparent ).toInt( &ok );
       if ( ! ok ) KIG_FILTER_PARSE_ERROR;
-      if ( parentIndex != 0 )
-        elems[i].parents.push_back( parentIndex - 1 );
+      if ( tqparentIndex != 0 )
+        elems[i].tqparents.push_back( tqparentIndex - 1 );
     };
   };
 
@@ -153,11 +153,11 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
     c->setGroup( group );
     int objID = c->readNumEntry( "Geo" );
 
-    std::vector<ObjectCalcer*> parents;
-    for ( uint j = 0; j < e.parents.size(); ++j )
+    std::vector<ObjectCalcer*> tqparents;
+    for ( uint j = 0; j < e.tqparents.size(); ++j )
     {
-      int parentid = e.parents[j];
-      parents.push_back( os[parentid]->calcer() );
+      int tqparentid = e.tqparents[j];
+      tqparents.push_back( os[tqparentid]->calcer() );
     };
 
     ObjectCalcer* o = 0;
@@ -166,84 +166,84 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
     case ID_point:
     {
       // fetch the coordinates...
-      TQString strX = c->readEntry("QPointX");
-      TQString strY = c->readEntry("QPointY");
+      TQString strX = c->readEntry("TQPointX");
+      TQString strY = c->readEntry("TQPointY");
       double x = strX.toDouble(&ok);
       if (!ok) KIG_FILTER_PARSE_ERROR;
       double y = strY.toDouble(&ok);
       if (!ok) KIG_FILTER_PARSE_ERROR;
       Coordinate m( x, y );
-      uint nparents = parents.size();
-      if ( nparents == 0 )
+      uint ntqparents = tqparents.size();
+      if ( ntqparents == 0 )
         o = factory->fixedPointCalcer( m );
-      else if ( nparents == 1 )
-        o = factory->constrainedPointCalcer( parents[0], m, *ret );
+      else if ( ntqparents == 1 )
+        o = factory->constrainedPointCalcer( tqparents[0], m, *ret );
       else
         KIG_FILTER_PARSE_ERROR;
       break;
     }
     case ID_segment:
     {
-      o = new ObjectTypeCalcer( SegmentABType::instance(), parents );
+      o = new ObjectTypeCalcer( SegmentABType::instance(), tqparents );
       break;
     }
     case ID_circle:
     {
-      o = new ObjectTypeCalcer( CircleBCPType::instance(), parents );
+      o = new ObjectTypeCalcer( CircleBCPType::instance(), tqparents );
       break;
     }
     case ID_line:
     {
-      o = new ObjectTypeCalcer( LineABType::instance(), parents );
+      o = new ObjectTypeCalcer( LineABType::instance(), tqparents );
       break;
     }
     case ID_bisection:
     {
       // if this is the bisection of two points, first build a segment
       // between them..
-      if ( parents.size() == 2 )
+      if ( tqparents.size() == 2 )
       {
-        ObjectTypeCalcer* seg = new ObjectTypeCalcer( SegmentABType::instance(), parents );
-        parents.clear();
-        parents.push_back( seg );
+        ObjectTypeCalcer* seg = new ObjectTypeCalcer( SegmentABType::instance(), tqparents );
+        tqparents.clear();
+        tqparents.push_back( seg );
       }
-      if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
-      o = factory->propertyObjectCalcer( parents[0], "mid-point" );
+      if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
+      o = factory->propertyObjectCalcer( tqparents[0], "mid-point" );
       break;
     };
     case ID_perpendicular:
     {
-      o = new ObjectTypeCalcer( LinePerpendLPType::instance(), parents );
+      o = new ObjectTypeCalcer( LinePerpendLPType::instance(), tqparents );
       break;
     }
     case ID_parallel:
     {
-      o = new ObjectTypeCalcer( LineParallelLPType::instance(), parents );
+      o = new ObjectTypeCalcer( LineParallelLPType::instance(), tqparents );
       break;
     }
     case ID_vector:
     {
-      o = new ObjectTypeCalcer( VectorType::instance(), parents );
+      o = new ObjectTypeCalcer( VectorType::instance(), tqparents );
       break;
     }
     case ID_ray:
     {
-      o = new ObjectTypeCalcer( RayABType::instance(), parents );
+      o = new ObjectTypeCalcer( RayABType::instance(), tqparents );
       break;
     }
     case ID_move:
     {
-      o = new ObjectTypeCalcer( TranslatedType::instance(), parents );
+      o = new ObjectTypeCalcer( TranslatedType::instance(), tqparents );
       break;
     }
     case ID_mirrorPoint:
     {
-      o = new ObjectTypeCalcer( PointReflectionType::instance(), parents );
+      o = new ObjectTypeCalcer( PointReflectionType::instance(), tqparents );
       break;
     }
     case ID_pointOfConc:
     {
-      o = new ObjectTypeCalcer( LineLineIntersectionType::instance(), parents );
+      o = new ObjectTypeCalcer( LineLineIntersectionType::instance(), tqparents );
       break;
     }
     case ID_text:
@@ -264,79 +264,79 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
     case ID_fixedCircle:
     {
       double r = c->readDoubleNumEntry( "Radius" );
-      parents.push_back( new ObjectConstCalcer( new DoubleImp( r ) ) );
-      o = new ObjectTypeCalcer( CircleBPRType::instance(), parents );
+      tqparents.push_back( new ObjectConstCalcer( new DoubleImp( r ) ) );
+      o = new ObjectTypeCalcer( CircleBPRType::instance(), tqparents );
       break;
     }
     case ID_angle:
     {
-      if ( parents.size() == 3 )
+      if ( tqparents.size() == 3 )
       {
-        ObjectTypeCalcer* ao = new ObjectTypeCalcer( AngleType::instance(), parents );
+        ObjectTypeCalcer* ao = new ObjectTypeCalcer( AngleType::instance(), tqparents );
         ao->calc( *ret );
-        parents.clear();
-        parents.push_back( ao );
+        tqparents.clear();
+        tqparents.push_back( ao );
       };
-      if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
-      ObjectCalcer* angle = parents[0];
-      parents.clear();
+      if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
+      ObjectCalcer* angle = tqparents[0];
+      tqparents.clear();
       const Coordinate c =
-        static_cast<const PointImp*>( angle->parents()[1]->imp() )->coordinate();
+        static_cast<const PointImp*>( angle->tqparents()[1]->imp() )->coordinate();
       o = filtersConstructTextObject( c, angle, "angle-degrees", *ret, true );
       break;
     }
     case ID_distance:
     {
-      if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR;
-      ObjectTypeCalcer* segment = new ObjectTypeCalcer( SegmentABType::instance(), parents );
+      if ( tqparents.size() != 2 ) KIG_FILTER_PARSE_ERROR;
+      ObjectTypeCalcer* segment = new ObjectTypeCalcer( SegmentABType::instance(), tqparents );
       segment->calc( *ret );
-      Coordinate m = ( static_cast<const PointImp*>( parents[0]->imp() )->coordinate() +
-                       static_cast<const PointImp*>( parents[1]->imp() )->coordinate() ) / 2;
+      Coordinate m = ( static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate() +
+                       static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate() ) / 2;
       o = filtersConstructTextObject( m, segment, "length", *ret, true );
       break;
     }
     case ID_arc:
     {
-      o = new ObjectTypeCalcer( AngleType::instance(), parents );
+      o = new ObjectTypeCalcer( AngleType::instance(), tqparents );
       break;
     }
     case ID_area:
     {
-      if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
-      const CircleImp* circle = static_cast<const CircleImp*>( parents[0]->imp() );
+      if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
+      const CircleImp* circle = static_cast<const CircleImp*>( tqparents[0]->imp() );
       const Coordinate c = circle->center() + Coordinate( circle->radius(), 0 );
-      o = filtersConstructTextObject( c, parents[0], "surface", *ret, true );
+      o = filtersConstructTextObject( c, tqparents[0], "surface", *ret, true );
       break;
     }
     case ID_slope:
     {
-      // 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;
+      // 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;
       const Coordinate c = (
-        static_cast<const PointImp*>( parents[0]->imp() )->coordinate() +
-        static_cast<const PointImp*>( parents[1]->imp() )->coordinate() ) / 2;
-      ObjectTypeCalcer* line = new ObjectTypeCalcer( LineABType::instance(), parents );
+        static_cast<const PointImp*>( tqparents[0]->imp() )->coordinate() +
+        static_cast<const PointImp*>( tqparents[1]->imp() )->coordinate() ) / 2;
+      ObjectTypeCalcer* line = new ObjectTypeCalcer( LineABType::instance(), tqparents );
       line->calc( *ret );
       o = filtersConstructTextObject( c, line, "slope", *ret, true );
       break;
     }
     case ID_circumference:
     {
-      if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
-      const CircleImp* c = static_cast<const CircleImp*>( parents[0]->imp() );
+      if ( tqparents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
+      const CircleImp* c = static_cast<const CircleImp*>( tqparents[0]->imp() );
       const Coordinate m = c->center() + Coordinate( c->radius(), 0 );
-      o = filtersConstructTextObject( m, parents[0], "circumference", *ret, true );
+      o = filtersConstructTextObject( m, tqparents[0], "circumference", *ret, true );
       break;
     }
     case ID_rotation:
     {
       // in kig, the rotated object should be last..
-      ObjectCalcer* t = parents[2];
-      parents[2] = parents[0];
-      parents[0] = t;
-      o = new ObjectTypeCalcer( RotationType::instance(), parents );
+      ObjectCalcer* t = tqparents[2];
+      tqparents[2] = tqparents[0];
+      tqparents[0] = t;
+      o = new ObjectTypeCalcer( RotationType::instance(), tqparents );
       break;
     }
     default:
@@ -346,7 +346,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
     // set the color...
     TQColor co = c->readColorEntry( "Color" );
     if( !co.isValid() )
-      co = Qt::blue;
+      co = TQt::blue;
     ObjectDrawer* d = new ObjectDrawer( co );
 
     os[i] = new ObjectHolder( o, d );