summaryrefslogtreecommitdiffstats
path: root/kig/objects
diff options
context:
space:
mode:
Diffstat (limited to 'kig/objects')
-rw-r--r--kig/objects/locus_imp.h2
-rw-r--r--kig/objects/object_calcer.cc30
-rw-r--r--kig/objects/object_calcer.h16
-rw-r--r--kig/objects/object_factory.cc6
-rw-r--r--kig/objects/object_factory.h8
-rw-r--r--kig/objects/object_imp.cc6
-rw-r--r--kig/objects/object_imp.h8
-rw-r--r--kig/objects/object_imp_factory.cc96
-rw-r--r--kig/objects/object_imp_factory.h8
-rw-r--r--kig/objects/other_type.cc2
10 files changed, 91 insertions, 91 deletions
diff --git a/kig/objects/locus_imp.h b/kig/objects/locus_imp.h
index d6d93217..568e0e7c 100644
--- a/kig/objects/locus_imp.h
+++ b/kig/objects/locus_imp.h
@@ -24,7 +24,7 @@
/**
* LocusImp is an imp that consists of a copy of the curveimp that the
* moving point moves over, and an ObjectHierarchy that can calc (
- * given a point, and optionally some more tqparent objects the position
+ * given a point, and optionally some more parent objects the position
* of the moving point. The hierarchy should take the moving point as
* its *first* argument and all others after that. The others are
* used to make it possible for Locus to be updated when some of the
diff --git a/kig/objects/object_calcer.cc b/kig/objects/object_calcer.cc
index f6952768..0bf4e774 100644
--- a/kig/objects/object_calcer.cc
+++ b/kig/objects/object_calcer.cc
@@ -131,21 +131,21 @@ const ObjectType* ObjectTypeCalcer::type() const
return mtype;
}
-ObjectPropertyCalcer::ObjectPropertyCalcer( ObjectCalcer* tqparent, int propid )
- : mimp( 0 ), mtqparent( tqparent ), mpropid( propid )
+ObjectPropertyCalcer::ObjectPropertyCalcer( ObjectCalcer* parent, int propid )
+ : mimp( 0 ), mparent( parent ), mpropid( propid )
{
// Some weird C++ thing prevents me from calling protected members
- // of ObjectCalcer on mtqparent.. This is an ugly workaround..
- ( mtqparent->*&ObjectCalcer::addChild )( this );
- //mtqparent->addChild( this );
+ // of ObjectCalcer on mparent.. This is an ugly workaround..
+ ( mparent->*&ObjectCalcer::addChild )( this );
+ //mparent->addChild( this );
}
ObjectPropertyCalcer::~ObjectPropertyCalcer()
{
// Some weird C++ thing prevents me from calling protected members
- // of ObjectCalcer on mtqparent.. This is an ugly workaround..
- ( mtqparent->*&ObjectCalcer::delChild )( this );
- //mtqparent->delChild( this );
+ // of ObjectCalcer on mparent.. This is an ugly workaround..
+ ( mparent->*&ObjectCalcer::delChild )( this );
+ //mparent->delChild( this );
delete mimp;
}
@@ -157,13 +157,13 @@ const ObjectImp* ObjectPropertyCalcer::imp() const
std::vector<ObjectCalcer*> ObjectPropertyCalcer::parents() const
{
std::vector<ObjectCalcer*> ret;
- ret.push_back( mtqparent );
+ ret.push_back( mparent );
return ret;
}
void ObjectPropertyCalcer::calc( const KigDocument& doc )
{
- ObjectImp* n = mtqparent->imp()->property( mpropid, doc );
+ ObjectImp* n = mparent->imp()->property( mpropid, doc );
delete mimp;
mimp = n;
}
@@ -183,7 +183,7 @@ std::vector<ObjectCalcer*> ObjectCalcer::tqchildren() const
const ObjectImpType* ObjectPropertyCalcer::impRequirement(
ObjectCalcer*, const std::vector<ObjectCalcer*>& ) const
{
- return mtqparent->imp()->impRequirementForProperty( mpropid );
+ return mparent->imp()->impRequirementForProperty( mpropid );
}
const ObjectImpType* ObjectConstCalcer::impRequirement(
@@ -276,9 +276,9 @@ void ObjectTypeCalcer::move( const Coordinate& to, const KigDocument& doc )
mtype->move( *this, to, doc );
}
-ObjectCalcer* ObjectPropertyCalcer::tqparent() const
+ObjectCalcer* ObjectPropertyCalcer::parent() const
{
- return mtqparent;
+ return mparent;
}
ObjectCalcer::ObjectCalcer()
@@ -303,8 +303,8 @@ bool ObjectConstCalcer::isDefinedOnOrThrough( const ObjectCalcer* ) const
bool ObjectPropertyCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const
{
- return o == mtqparent &&
- mtqparent->imp()->isPropertyDefinedOnOrThroughThisImp( propId() );
+ return o == mparent &&
+ mparent->imp()->isPropertyDefinedOnOrThroughThisImp( propId() );
}
bool ObjectTypeCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const
diff --git a/kig/objects/object_calcer.h b/kig/objects/object_calcer.h
index 92eebc8e..98262e5e 100644
--- a/kig/objects/object_calcer.h
+++ b/kig/objects/object_calcer.h
@@ -90,7 +90,7 @@ public:
*/
void addChild( ObjectCalcer* c );
/**
- * a calcer should call this in its destructor, to inform its tqparent
+ * a calcer should call this in its destructor, to inform its parent
* that it is no longer a child of this calcer. This will release
* the reference taken in addChild..
*/
@@ -106,7 +106,7 @@ public:
virtual ~ObjectCalcer();
/**
- * Returns the tqparent ObjectCalcer's of this ObjectCalcer.
+ * Returns the parent ObjectCalcer's of this ObjectCalcer.
*/
virtual std::vector<ObjectCalcer*> parents() const = 0;
/**
@@ -124,7 +124,7 @@ public:
* certain type. This method returns the ObjectImpType that \p o
* should have. \p os is a list of all the parents in order, and
* \p o is part of it. This method will return the ObjectImpType
- * that the tqparent should *at least* be. For example, a Translated
+ * that the parent should *at least* be. For example, a Translated
* object can translate any sort of object, so it will return
* ObjectImp::stype() here ( the topmost ObjectImpType, that all
* other ObjectImpType's inherit ).
@@ -267,7 +267,7 @@ public:
};
/**
- * This is an ObjectCalcer that has a single tqparent, and gets a
+ * This is an ObjectCalcer that has a single parent, and gets a
* certain property from it in its calc() method.
*
* \see ObjectImp::property
@@ -276,14 +276,14 @@ class ObjectPropertyCalcer
: public ObjectCalcer
{
ObjectImp* mimp;
- ObjectCalcer* mtqparent;
+ ObjectCalcer* mparent;
int mpropid;
public:
/**
* Construct a new ObjectPropertyCalcer, that will get the property
- * from tqparent with number propid.
+ * from parent with number propid.
*/
- ObjectPropertyCalcer( ObjectCalcer* tqparent, int propid );
+ ObjectPropertyCalcer( ObjectCalcer* parent, int propid );
~ObjectPropertyCalcer();
const ObjectImp* imp() const;
@@ -291,7 +291,7 @@ public:
void calc( const KigDocument& doc );
int propId() const;
- ObjectCalcer* tqparent() const;
+ ObjectCalcer* parent() const;
const ObjectImpType* impRequirement(
ObjectCalcer* o, const std::vector<ObjectCalcer*>& os ) const;
diff --git a/kig/objects/object_factory.cc b/kig/objects/object_factory.cc
index aabc82be..942139f4 100644
--- a/kig/objects/object_factory.cc
+++ b/kig/objects/object_factory.cc
@@ -266,12 +266,12 @@ ObjectCalcer* ObjectFactory::getAttachPoint(
}
ObjectHolder* ObjectFactory::attachedLabel(
- const TQString& s, ObjectCalcer* locationtqparent,
+ const TQString& s, ObjectCalcer* locationparent,
const Coordinate& loc, bool needframe,
const std::vector<ObjectCalcer*>& parents,
const KigDocument& doc ) const
{
- return new ObjectHolder( attachedLabelCalcer( s, locationtqparent, loc, needframe, parents, doc ) );
+ return new ObjectHolder( attachedLabelCalcer( s, locationparent, loc, needframe, parents, doc ) );
}
ObjectPropertyCalcer* ObjectFactory::propertyObjectCalcer(
@@ -299,7 +299,7 @@ void ObjectFactory::redefinePoint(
std::mem_fun( calcmeth ) );
ObjectCalcer* v = 0;
- // we don't want one of our tqchildren as a tqparent...
+ // we don't want one of our tqchildren as a parent...
std::set<ObjectCalcer*> tqchildren = getAllChildren( point );
for ( std::vector<ObjectCalcer*>::iterator i = os.begin();
i != os.end(); ++i )
diff --git a/kig/objects/object_factory.h b/kig/objects/object_factory.h
index d99cce8b..30f080d9 100644
--- a/kig/objects/object_factory.h
+++ b/kig/objects/object_factory.h
@@ -108,10 +108,10 @@ public:
/**
* this one does the same as the above, only that the new label is
- * attached to locationtqparent if it is non-null..
+ * attached to locationparent if it is non-null..
*/
ObjectTypeCalcer* attachedLabelCalcer(
- const TQString& s, ObjectCalcer* locationtqparent,
+ const TQString& s, ObjectCalcer* locationparent,
const Coordinate& loc, bool needframe,
const std::vector<ObjectCalcer*>& parents,
const KigDocument& doc ) const;
@@ -121,11 +121,11 @@ public:
* attach point from the method above
*/
ObjectCalcer* getAttachPoint(
- ObjectCalcer* locationtqparent,
+ ObjectCalcer* locationparent,
const Coordinate& loc,
const KigDocument& doc ) const;
ObjectHolder* attachedLabel(
- const TQString& s, ObjectCalcer* locationtqparent,
+ const TQString& s, ObjectCalcer* locationparent,
const Coordinate& loc, bool needframe,
const std::vector<ObjectCalcer*>& parents,
const KigDocument& doc ) const;
diff --git a/kig/objects/object_imp.cc b/kig/objects/object_imp.cc
index 7b2498a3..9a3ee679 100644
--- a/kig/objects/object_imp.cc
+++ b/kig/objects/object_imp.cc
@@ -178,7 +178,7 @@ bool ObjectImp::canFillInNextEscape() const
return false;
}
-ObjectImpType::ObjectImpType( const ObjectImpType* tqparent,
+ObjectImpType::ObjectImpType( const ObjectImpType* parent,
const char* internalname,
const char* translatedname,
const char* selectstatement,
@@ -189,7 +189,7 @@ ObjectImpType::ObjectImpType( const ObjectImpType* tqparent,
const char* attachtothisstatement,
const char* showastatement,
const char* hideastatement )
- : mtqparent( tqparent ), minternalname( internalname ),
+ : mparent( parent ), minternalname( internalname ),
mtranslatedname( translatedname ), mselectstatement( selectstatement ),
mselectnamestatement( selectnamestatement ),
mremoveastatement( removeastatement ), maddastatement( addastatement ),
@@ -207,7 +207,7 @@ ObjectImpType::~ObjectImpType()
bool ObjectImpType::inherits( const ObjectImpType* t ) const
{
- return t == this || (mtqparent && mtqparent->inherits( t ) );
+ return t == this || (mparent && mparent->inherits( t ) );
}
const char* ObjectImpType::internalName() const
diff --git a/kig/objects/object_imp.h b/kig/objects/object_imp.h
index 46166858..ddf0eb46 100644
--- a/kig/objects/object_imp.h
+++ b/kig/objects/object_imp.h
@@ -87,7 +87,7 @@ typedef unsigned int uint;
*/
class ObjectImpType
{
- const ObjectImpType* mtqparent;
+ const ObjectImpType* mparent;
const char* minternalname;
const char* mtranslatedname;
const char* mselectstatement;
@@ -126,12 +126,12 @@ public:
* hideastatement is a translatable string like "Hide a Segment"
*
* All translatable strings should have
- * I18N_NOOP around them ! @param tqparent is the ObjectImpType of
- * your tqparent ObjectImp type. Never give 0 as tqparent, except for
+ * I18N_NOOP around them ! @param parent is the ObjectImpType of
+ * your parent ObjectImp type. Never give 0 as parent, except for
* the top ObjectImp ObjectImpType..
*/
ObjectImpType(
- const ObjectImpType* tqparent, const char* internalname,
+ const ObjectImpType* parent, const char* internalname,
const char* translatedname,
const char* selectstatement,
const char* selectnamestatement,
diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc
index 116f0d0d..a29cf5e8 100644
--- a/kig/objects/object_imp_factory.cc
+++ b/kig/objects/object_imp_factory.cc
@@ -48,25 +48,25 @@ ObjectImpFactory::~ObjectImpFactory()
{
}
-static void addXYElements( const Coordinate& c, TQDomElement& tqparent, TQDomDocument& doc )
+static void addXYElements( const Coordinate& c, TQDomElement& parent, TQDomDocument& doc )
{
TQDomElement xe = doc.createElement( "x" );
xe.appendChild(
doc.createTextNode(
TQString::number( c.x ) ) );
- tqparent.appendChild( xe );
+ parent.appendChild( xe );
TQDomElement ye = doc.createElement( "y" );
ye.appendChild(
doc.createTextNode(
TQString::number( c.y ) ) );
- tqparent.appendChild( ye );
+ parent.appendChild( ye );
}
-static void addDoubleElement( const char* name, double d, TQDomElement& tqparent, TQDomDocument& doc )
+static void addDoubleElement( const char* name, double d, TQDomElement& parent, TQDomDocument& doc )
{
TQDomElement e = doc.createElement( name );
e.appendChild( doc.createTextNode( TQString::number( d ) ) );
- tqparent.appendChild( e );
+ parent.appendChild( e );
}
static void addCoordinateElement( const char* name, const Coordinate& d, TQDomElement& p, TQDomDocument& doc )
@@ -76,40 +76,40 @@ static void addCoordinateElement( const char* name, const Coordinate& d, TQDomEl
p.appendChild( e );
}
-TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent,
+TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
TQDomDocument& doc ) const
{
if( d.inherits( IntImp::stype() ) )
{
- tqparent.appendChild(
+ parent.appendChild(
doc.createTextNode(
TQString::number( static_cast<const IntImp&>( d ).data() ) ) );
return TQString::tqfromLatin1( "int" );
}
else if ( d.inherits( DoubleImp::stype() ) )
{
- tqparent.appendChild(
+ parent.appendChild(
doc.createTextNode(
TQString::number( static_cast<const DoubleImp&>( d ).data() ) ) );
return TQString::tqfromLatin1( "double" );
}
else if( d.inherits( StringImp::stype() ) )
{
- tqparent.appendChild(
+ parent.appendChild(
doc.createTextNode(
static_cast<const StringImp&>( d ).data() ) );
return TQString::tqfromLatin1( "string" );
}
else if ( d.inherits( TestResultImp::stype() ) )
{
- tqparent.appendChild(
+ parent.appendChild(
doc.createTextNode(
static_cast<const TestResultImp&>( d ).data() ) );
return TQString::tqfromLatin1( "testresult" );
}
else if( d.inherits( HierarchyImp::stype() ) )
{
- static_cast<const HierarchyImp&>( d ).data().serialize( tqparent, doc );
+ static_cast<const HierarchyImp&>( d ).data().serialize( parent, doc );
return TQString::tqfromLatin1( "hierarchy" );
}
else if ( d.inherits( TransformationImp::stype() ) )
@@ -128,20 +128,20 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent
matrixe.appendChild( elel );
};
}
- tqparent.appendChild( matrixe );
+ parent.appendChild( matrixe );
TQDomElement homothetye = doc.createElement( "homothetic" );
const char* ishomothety = trans.isHomothetic() ? "true" : "false";
homothetye.appendChild( doc.createTextNode( ishomothety ) );
- tqparent.appendChild( homothetye );
+ parent.appendChild( homothetye );
return TQString::tqfromLatin1( "transformation" );
}
else if( d.inherits( AbstractLineImp::stype() ) )
{
LineData l = static_cast<const AbstractLineImp&>( d ).data();
- addCoordinateElement( "a", l.a, tqparent, doc );
- addCoordinateElement( "b", l.b, tqparent, doc );
+ addCoordinateElement( "a", l.a, parent, doc );
+ addCoordinateElement( "b", l.b, parent, doc );
if( d.inherits( SegmentImp::stype() ) )
return TQString::tqfromLatin1( "segment" );
else if( d.inherits( RayImp::stype() ) )
@@ -151,34 +151,34 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent
else if( d.inherits( PointImp::stype() ) )
{
addXYElements( static_cast<const PointImp&>( d ).coordinate(),
- tqparent, doc );
+ parent, doc );
return TQString::tqfromLatin1( "point" );
}
else if( d.inherits( TextImp::stype() ) )
{
TQString text = static_cast<const TextImp&>( d ).text();
- tqparent.appendChild(
+ parent.appendChild(
doc.createTextNode( text ) );
return TQString::tqfromLatin1( "text" );
}
else if( d.inherits( AngleImp::stype() ) )
{
- addDoubleElement( "size", static_cast<const AngleImp&>( d ).size(), tqparent, doc );
+ addDoubleElement( "size", static_cast<const AngleImp&>( d ).size(), parent, doc );
return TQString::tqfromLatin1( "angle" );
}
else if ( d.inherits( ArcImp::stype() ) )
{
const ArcImp& a = static_cast<const ArcImp&>( d );
- addCoordinateElement( "center", a.center(), tqparent, doc );
- addDoubleElement( "radius", a.radius(), tqparent, doc );
- addDoubleElement( "startangle", a.startAngle(), tqparent, doc );
- addDoubleElement( "angle", a.angle(), tqparent, doc );
+ addCoordinateElement( "center", a.center(), parent, doc );
+ addDoubleElement( "radius", a.radius(), parent, doc );
+ addDoubleElement( "startangle", a.startAngle(), parent, doc );
+ addDoubleElement( "angle", a.angle(), parent, doc );
return TQString::tqfromLatin1( "arc" );
}
else if( d.inherits( VectorImp::stype() ) )
{
Coordinate dir = static_cast<const VectorImp&>( d ).dir();
- addXYElements( dir, tqparent, doc );
+ addXYElements( dir, parent, doc );
return TQString::tqfromLatin1( "vector" );
}
else if( d.inherits( LocusImp::stype() ) )
@@ -190,29 +190,29 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent
const CurveImp& curveimp = *locus.curve();
TQString type = serialize( curveimp, curve, doc );
curve.setAttribute( "type", type );
- tqparent.appendChild( curve );
+ parent.appendChild( curve );
// serialize the hierarchy..
TQDomElement hier = doc.createElement( "calculation" );
locus.hierarchy().serialize( hier, doc );
- tqparent.appendChild( hier );
+ parent.appendChild( hier );
return TQString::tqfromLatin1( "locus" );
}
else if( d.inherits( CircleImp::stype() ) )
{
const CircleImp& c = static_cast<const CircleImp&>( d );
- addCoordinateElement( "center", c.center(), tqparent, doc );
- addDoubleElement( "radius", c.radius(), tqparent, doc );
+ addCoordinateElement( "center", c.center(), parent, doc );
+ addDoubleElement( "radius", c.radius(), parent, doc );
return TQString::tqfromLatin1( "circle" );
}
else if( d.inherits( ConicImp::stype() ) )
{
const ConicPolarData data = static_cast<const ConicImp&>( d ).polarData();
- addCoordinateElement( "focus1", data.focus1, tqparent, doc );
- addDoubleElement( "pdimen", data.pdimen, tqparent, doc );
- addDoubleElement( "ecostheta0", data.ecostheta0, tqparent, doc );
- addDoubleElement( "esintheta0", data.esintheta0, tqparent, doc );
+ addCoordinateElement( "focus1", data.focus1, parent, doc );
+ addDoubleElement( "pdimen", data.pdimen, parent, doc );
+ addDoubleElement( "ecostheta0", data.ecostheta0, parent, doc );
+ addDoubleElement( "esintheta0", data.esintheta0, parent, doc );
return TQString::tqfromLatin1( "conic" );
}
else if( d.inherits( CubicImp::stype() ) )
@@ -229,7 +229,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& tqparent
addDoubleElement( "a112", data.coeffs[7], coeffs, doc );
addDoubleElement( "a122", data.coeffs[8], coeffs, doc );
addDoubleElement( "a222", data.coeffs[9], coeffs, doc );
- tqparent.appendChild( coeffs );
+ parent.appendChild( coeffs );
return TQString::tqfromLatin1( "cubic" );
}
assert( false );
@@ -285,7 +285,7 @@ static double readDoubleElement( TQDomNode n, bool& ok,
}
ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
- const TQDomElement& tqparent,
+ const TQDomElement& parent,
TQString& error ) const
{
#define KIG_GENERIC_PARSE_ERROR \
@@ -298,27 +298,27 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
bool ok = true;
if ( type == "int" )
{
- int ret = tqparent.text().toInt( &ok );
+ int ret = parent.text().toInt( &ok );
if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
return new IntImp( ret );
}
else if ( type == "double" )
{
- double ret = tqparent.text().toDouble( &ok );
+ double ret = parent.text().toDouble( &ok );
if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
return new DoubleImp( ret );
}
else if ( type == "string" )
{
- return new StringImp( tqparent.text() );
+ return new StringImp( parent.text() );
}
else if ( type == "testresult" )
{
- return new TestResultImp( tqparent.text() );
+ return new TestResultImp( parent.text() );
}
else if ( type == "hierarchy" )
{
- ObjectHierarchy* hier = ObjectHierarchy::buildSafeObjectHierarchy( tqparent, error );
+ ObjectHierarchy* hier = ObjectHierarchy::buildSafeObjectHierarchy( parent, error );
if ( ! hier ) return 0;
HierarchyImp* imp = new HierarchyImp( *hier );
delete hier;
@@ -328,7 +328,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
{
double data[3][3];
bool homothetic = false;
- for ( TQDomElement childe = tqparent.firstChild().toElement();
+ for ( TQDomElement childe = parent.firstChild().toElement();
! childe.isNull(); childe = childe.nextSibling().toElement() )
{
if ( childe.tagName() == "matrix" )
@@ -357,13 +357,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
}
else if ( type == "point" )
{
- Coordinate ret = readXYElements( tqparent, ok );
+ Coordinate ret = readXYElements( parent, ok );
if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
return new PointImp( ret );
}
else if ( type == "line" || type == "segment" || type == "ray" )
{
- TQDomNode n = tqparent.firstChild();
+ TQDomNode n = parent.firstChild();
Coordinate a = readCoordinateElement( n, ok, "a" );
if ( !ok ) KIG_GENERIC_PARSE_ERROR;
n = n.nextSibling();
@@ -375,13 +375,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
}
else if( type == "angle" )
{
- double size = readDoubleElement( tqparent.firstChild(), ok, "size" );
+ double size = readDoubleElement( parent.firstChild(), ok, "size" );
if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
return new AngleImp( Coordinate(), 0, size );
}
else if ( type == "arc" )
{
- TQDomNode n = tqparent.firstChild();
+ TQDomNode n = parent.firstChild();
Coordinate center = readCoordinateElement( n, ok, "center" );
if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
n = n.nextSibling();
@@ -397,13 +397,13 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
}
else if( type == "vector" )
{
- Coordinate dir = readXYElements( tqparent, ok );
+ Coordinate dir = readXYElements( parent, ok );
if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
return new VectorImp( Coordinate(), dir );
}
else if( type == "locus" )
{
- TQDomElement curvee = tqparent.firstChild().toElement();
+ TQDomElement curvee = parent.firstChild().toElement();
if ( curvee.isNull() || curvee.tagName() != "curve" ) KIG_GENERIC_PARSE_ERROR;
TQString type = curvee.attribute( "type" );
ObjectImp* oi = deserialize( type, curvee, error );
@@ -417,7 +417,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
}
else if( type == "circle" )
{
- TQDomNode n = tqparent.firstChild();
+ TQDomNode n = parent.firstChild();
Coordinate center = readCoordinateElement( n, ok, "center" );
if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
@@ -429,7 +429,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
}
else if( type == "conic" )
{
- TQDomNode n = tqparent.firstChild();
+ TQDomNode n = parent.firstChild();
Coordinate focus1 = readCoordinateElement( n, ok, "focus1" );
if ( ! ok ) KIG_GENERIC_PARSE_ERROR;
@@ -450,7 +450,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
}
else if( type == "cubic" )
{
- TQDomElement coeffse = tqparent.firstChild().toElement();
+ TQDomElement coeffse = parent.firstChild().toElement();
if ( coeffse.isNull() || coeffse.tagName() != "coefficients" )
KIG_GENERIC_PARSE_ERROR;
diff --git a/kig/objects/object_imp_factory.h b/kig/objects/object_imp_factory.h
index 6056f45d..1ac08dde 100644
--- a/kig/objects/object_imp_factory.h
+++ b/kig/objects/object_imp_factory.h
@@ -27,14 +27,14 @@ class ObjectImpFactory
public:
static const ObjectImpFactory* instance();
/**
- * loads data from \p tqparent , and returns a new ObjectImp from the type
+ * loads data from \p parent , and returns a new ObjectImp from the type
* string \p type .
*/
- ObjectImp* deserialize( const TQString& type, const TQDomElement& tqparent, TQString& error ) const;
+ ObjectImp* deserialize( const TQString& type, const TQDomElement& parent, TQString& error ) const;
/**
- * adds data to \p tqparent , and returns a type string..
+ * adds data to \p parent , and returns a type string..
*/
- TQString serialize( const ObjectImp& d, TQDomElement& tqparent, TQDomDocument& doc ) const;
+ TQString serialize( const ObjectImp& d, TQDomElement& parent, TQDomDocument& doc ) const;
};
#endif
diff --git a/kig/objects/other_type.cc b/kig/objects/other_type.cc
index 80986e82..27787986 100644
--- a/kig/objects/other_type.cc
+++ b/kig/objects/other_type.cc
@@ -182,7 +182,7 @@ Args CopyObjectType::sortArgs( const Args& args ) const
bool CopyObjectType::isDefinedOnOrThrough( const ObjectImp*, const Args& ) const
{
- // TODO: vragen aan tqparent ?
+ // TODO: vragen aan parent ?
// TODO: translate the above TODO ?
return false;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 18:30:32 +0000