rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 42 insertions, 42 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 );
diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc
index 856d995c..6596bf44 100644
--- a/kig/filters/drgeo-filter.cc
+++ b/kig/filters/drgeo-filter.cc
@@ -201,7 +201,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
       {
         TQDomElement ce = c.toElement();
         if ( ce.isNull() ) continue;
-        else if ( ce.tagName() == "tqparent" )
+        else if ( ce.tagName() == "parent" )
           elem.parents.push_back( ce.attribute( "ref" ) );
       }
       TQString curid = domelem.attribute( "id" );
@@ -255,7 +255,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
     if ( parents.size() > 0 )
       for ( uint j = 0; j < parents.size(); ++j )
       {
-        kdDebug() << "+++++++++ tqparent[" << j << "]: " << parents[j] << " - "
+        kdDebug() << "+++++++++ parent[" << j << "]: " << parents[j] << " - "
                   << parents[j]->imp()->type()->internalName() << endl;
       }
     else
diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc
index 875dab17..8dfeffda 100644
--- a/kig/filters/exporter.cc
+++ b/kig/filters/exporter.cc
@@ -65,13 +65,13 @@ class ExporterAction
   KigWidget* mw;
 public:
   ExporterAction( const KigPart* doc, KigWidget* w,
-                  KActionCollection* tqparent, KigExporter* exp );
+                  KActionCollection* parent, KigExporter* exp );
   void slotActivated();
 };
 
 ExporterAction::ExporterAction( const KigPart* doc, KigWidget* w,
-                                KActionCollection* tqparent, KigExporter* exp )
-  : KAction( exp->menuEntryName(), KShortcut(), 0, 0, tqparent ),
+                                KActionCollection* parent, KigExporter* exp )
+  : KAction( exp->menuEntryName(), KShortcut(), 0, 0, parent ),
     mexp( exp ), mdoc( doc ), mw( w )
 {
   TQString iconstr = exp->menuIcon();
diff --git a/kig/filters/imageexporteroptions.cc b/kig/filters/imageexporteroptions.cc
index d88792fc..cd68a0af 100644
--- a/kig/filters/imageexporteroptions.cc
+++ b/kig/filters/imageexporteroptions.cc
@@ -23,8 +23,8 @@
 
 #include <knuminput.h>
 
-ImageExporterOptions::ImageExporterOptions( TQWidget* tqparent, const TQSize& s )
-  : ImageExporterOptionsBase( tqparent, "imageexporteroptions" ), msize( s ),
+ImageExporterOptions::ImageExporterOptions( TQWidget* parent, const TQSize& s )
+  : ImageExporterOptionsBase( parent, "imageexporteroptions" ), msize( s ),
     minternallysettingstuff( false )
 {
   keepAspectRatio->setChecked( true );
diff --git a/kig/filters/imageexporteroptions.h b/kig/filters/imageexporteroptions.h
index 82db4950..30c128b7 100644
--- a/kig/filters/imageexporteroptions.h
+++ b/kig/filters/imageexporteroptions.h
@@ -35,7 +35,7 @@ class ImageExporterOptions
   // value like to user changes...
   bool minternallysettingstuff;
 public:
-  ImageExporterOptions( TQWidget* tqparent, const TQSize& s );
+  ImageExporterOptions( TQWidget* parent, const TQSize& s );
   ~ImageExporterOptions();
 
 protected slots:
diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc
index 2405e46b..8d37a871 100644
--- a/kig/filters/kgeo-filter.cc
+++ b/kig/filters/kgeo-filter.cc
@@ -111,10 +111,10 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
   c->setGroup("Main");
   int number = c->readNumEntry ("Number");
 
-  // first we determine the tqparent relationships, and sort the
+  // first we determine the parent 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 tqparent relations graph..
+  // ( aka topological sort of the parent relations graph..
   std::vector<KGeoHierarchyElement> elems;
   elems.reserve( number );
 
@@ -128,9 +128,9 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
     TQStrList parents;
     c->readListEntry( "Parents", parents );
     elems.push_back( elem );
-    for ( const char* tqparent = parents.first(); tqparent; tqparent = parents.next() )
+    for ( const char* parent = parents.first(); parent; parent = parents.next() )
     {
-      int parentIndex = TQString::tqfromLatin1( tqparent ).toInt( &ok );
+      int parentIndex = TQString::tqfromLatin1( parent ).toInt( &ok );
       if ( ! ok ) KIG_FILTER_PARSE_ERROR;
       if ( parentIndex != 0 )
         elems[i].parents.push_back( parentIndex - 1 );
diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc
index 86c6cba8..7ddfcde4 100644
--- a/kig/filters/kseg-filter.cc
+++ b/kig/filters/kseg-filter.cc
@@ -255,9 +255,9 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
     std::vector<ObjectCalcer*> parents( nparents, 0 );
     for ( short j = 0; j < nparents; ++j )
     {
-      int tqparent;
-      stream >> tqparent;
-      parents[j] = ret[tqparent]->calcer();
+      int parent;
+      stream >> parent;
+      parents[j] = ret[parent]->calcer();
     };
 
     // read the object..
@@ -335,9 +335,9 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
           double p;
           stream >> p;
           if ( nparents != 1 ) KIG_FILTER_PARSE_ERROR;
-          ObjectCalcer* tqparent = parents[0];
-          assert( tqparent );
-          o = fact->constrainedPointCalcer( tqparent, p );
+          ObjectCalcer* parent = parents[0];
+          assert( parent );
+          o = fact->constrainedPointCalcer( parent, p );
           break;
         }
         case G_INTERSECTION_POINT:
diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc
index 3afaf0e1..d3323778 100644
--- a/kig/filters/native-filter.cc
+++ b/kig/filters/native-filter.cc
@@ -316,13 +316,13 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement&
           };
 
           if ( i->parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
-          ObjectCalcer* tqparent = retcalcers[i->parents[0] -1];
-          QCStringList propnames = tqparent->imp()->propertiesInternalNames();
+          ObjectCalcer* parent = retcalcers[i->parents[0] -1];
+          QCStringList propnames = parent->imp()->propertiesInternalNames();
           int propid = propnames.findIndex( propname );
           if ( propid == -1 )
             KIG_FILTER_PARSE_ERROR;
 
-          o = new ObjectPropertyCalcer( tqparent, propid );
+          o = new ObjectPropertyCalcer( parent, propid );
         }
         else if ( e.tagName() == "Object" )
         {
@@ -443,9 +443,9 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
           uint parentid = tmp.toInt( &ok );
           if ( ! ok ) KIG_FILTER_PARSE_ERROR;
           if ( parentid == 0 || parentid > calcers.size() ) KIG_FILTER_PARSE_ERROR;
-          ObjectCalcer* tqparent = calcers[parentid - 1].get();
-          if ( ! tqparent ) KIG_FILTER_PARSE_ERROR;
-          parents.push_back( tqparent );
+          ObjectCalcer* parent = calcers[parentid - 1].get();
+          if ( ! parent ) KIG_FILTER_PARSE_ERROR;
+          parents.push_back( parent );
         }
 
         ObjectCalcer* o = 0;
@@ -468,11 +468,11 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
           if ( parents.size() != 1 ) KIG_FILTER_PARSE_ERROR;
           TQCString propname = e.attribute( "which" ).latin1();
 
-          ObjectCalcer* tqparent = parents[0];
-          int propid = tqparent->imp()->propertiesInternalNames().findIndex( propname );
+          ObjectCalcer* parent = parents[0];
+          int propid = parent->imp()->propertiesInternalNames().findIndex( propname );
           if ( propid == -1 ) KIG_FILTER_PARSE_ERROR;
 
-          o = new ObjectPropertyCalcer( tqparent, propid );
+          o = new ObjectPropertyCalcer( parent, propid );
         }
         else if ( e.tagName() == "Object" )
         {
@@ -604,7 +604,7 @@ bool KigFilterNative::save07( const KigDocument& kdoc, TQTextStream& stream )
       const ObjectPropertyCalcer* o = static_cast<const ObjectPropertyCalcer*>( *i );
       objectelem = doc.createElement( "Property" );
 
-      TQCString propname = o->tqparent()->imp()->propertiesInternalNames()[o->propId()];
+      TQCString propname = o->parent()->imp()->propertiesInternalNames()[o->propId()];
       objectelem.setAttribute( TQString("which"), TQString(propname) );
     }
     else if ( dynamic_cast<const ObjectTypeCalcer*>( *i ) )
diff --git a/kig/filters/tests/locus.fgeo b/kig/filters/tests/locus.fgeo
index 55fa562f..a914068c 100644
--- a/kig/filters/tests/locus.fgeo
+++ b/kig/filters/tests/locus.fgeo
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<drgenius><drgeo name="Figuur 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"><point id="8293DE0" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-1.666666</x><y>3.216667</y></point><point id="8306C70" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-2.766667</x><y>0.550000</y></point><circle id="8307268" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8293DE0"/><tqparent ref="8306C70"/></circle><point id="8309098" type="On_curve" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><value>0.080691</value><tqparent ref="8307268"/></point><point id="830A920" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>3.000000</x><y>3.016667</y></point><line id="8172970" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="830A920"/></line><point id="8339730" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.866667</x><y>-0.750000</y></point><line id="833AD18" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="8339730"/></line><point id="8338A50" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.600000</x><y>3.816667</y></point><line id="833BBB8" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><tqparent ref="8338A50"/><tqparent ref="833AD18"/></line><point id="8342478" type="Intersection" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name="" extra="0"><tqparent ref="8172970"/><tqparent ref="833BBB8"/></point><locus id="8345D60" type="None" color="Black" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><tqparent ref="8309098"/><tqparent ref="8342478"/></locus></drgeo></drgenius>
+<drgenius><drgeo name="Figuur 1" scale="30.000000" origin_x="0.000000" origin_y="0.000000" grid="False"><point id="8293DE0" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-1.666666</x><y>3.216667</y></point><point id="8306C70" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>-2.766667</x><y>0.550000</y></point><circle id="8307268" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8293DE0"/><parent ref="8306C70"/></circle><point id="8309098" type="On_curve" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><value>0.080691</value><parent ref="8307268"/></point><point id="830A920" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>3.000000</x><y>3.016667</y></point><line id="8172970" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8309098"/><parent ref="830A920"/></line><point id="8339730" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.866667</x><y>-0.750000</y></point><line id="833AD18" type="2pts" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8309098"/><parent ref="8339730"/></line><point id="8338A50" type="Free" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><x>2.600000</x><y>3.816667</y></point><line id="833BBB8" type="perpendicular" color="Black" thickness="Normal" style="Cross" filled="False" masked="False" name=""><parent ref="8338A50"/><parent ref="833AD18"/></line><point id="8342478" type="Intersection" color="Red" thickness="Dashed" style="Cross" filled="False" masked="False" name="" extra="0"><parent ref="8172970"/><parent ref="833BBB8"/></point><locus id="8345D60" type="None" color="Black" thickness="Dashed" style="Cross" filled="False" masked="False" name=""><parent ref="8309098"/><parent ref="8342478"/></locus></drgeo></drgenius>