From 648ba4a456d3aad2825193ff8f3bd52a875783b5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:18:52 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1212481 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kig/objects/bogus_imp.cc | 2 +- kig/objects/bogus_imp.h | 2 +- kig/objects/centerofcurvature_type.cc | 6 +++--- kig/objects/circle_imp.cc | 12 ++++++------ kig/objects/circle_imp.h | 2 +- kig/objects/conic_imp.cc | 4 ++-- kig/objects/conic_imp.h | 4 ++-- kig/objects/cubic_imp.cc | 8 ++++---- kig/objects/cubic_imp.h | 4 ++-- kig/objects/curve_imp.h | 4 ++-- kig/objects/intersection_types.cc | 4 ++-- kig/objects/line_imp.cc | 12 ++++++------ kig/objects/line_imp.h | 12 ++++++------ kig/objects/locus_imp.cc | 4 ++-- kig/objects/locus_imp.h | 4 ++-- kig/objects/object_drawer.cc | 4 ++-- kig/objects/object_drawer.h | 4 ++-- kig/objects/object_holder.cc | 4 ++-- kig/objects/object_holder.h | 4 ++-- kig/objects/object_imp.h | 6 +++--- kig/objects/object_imp_factory.cc | 36 +++++++++++++++++------------------ kig/objects/other_imp.cc | 12 ++++++------ kig/objects/other_imp.h | 10 +++++----- kig/objects/point_imp.cc | 4 ++-- kig/objects/point_imp.h | 2 +- kig/objects/point_type.cc | 8 ++++---- kig/objects/polygon_imp.cc | 4 ++-- kig/objects/polygon_imp.h | 2 +- kig/objects/tangent_type.cc | 8 ++++---- kig/objects/tests_type.cc | 10 +++++----- kig/objects/text_imp.cc | 4 ++-- kig/objects/text_imp.h | 4 ++-- 32 files changed, 105 insertions(+), 105 deletions(-) (limited to 'kig/objects') diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cc index 8cedc89f..b7b8f41e 100644 --- a/kig/objects/bogus_imp.cc +++ b/kig/objects/bogus_imp.cc @@ -32,7 +32,7 @@ void BogusImp::draw( KigPainter& ) const { } -bool BogusImp::tqcontains( const Coordinate&, int, const KigWidget& ) const +bool BogusImp::contains( const Coordinate&, int, const KigWidget& ) const { return false; } diff --git a/kig/objects/bogus_imp.h b/kig/objects/bogus_imp.h index 3ab32809..c8f3ee2b 100644 --- a/kig/objects/bogus_imp.h +++ b/kig/objects/bogus_imp.h @@ -46,7 +46,7 @@ public: Coordinate attachPoint( ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& w ) const; + bool contains( const Coordinate& p, int width, const KigWidget& w ) const; bool inRect( const Rect& r, int width, const KigWidget& w ) const; Rect surroundingRect() const; diff --git a/kig/objects/centerofcurvature_type.cc b/kig/objects/centerofcurvature_type.cc index 628ed571..8111410f 100644 --- a/kig/objects/centerofcurvature_type.cc +++ b/kig/objects/centerofcurvature_type.cc @@ -66,7 +66,7 @@ ObjectImp* CocConicType::calc( const Args& args, const KigDocument& doc ) const const ConicImp* conic = static_cast( args[0] ); const Coordinate& p = static_cast( args[1] )->coordinate(); - if ( !conic->tqcontainsPoint( p, doc ) ) + if ( !conic->containsPoint( p, doc ) ) return new InvalidImp; double x = p.x; @@ -152,7 +152,7 @@ ObjectImp* CocCubicType::calc( const Args& args, const KigDocument& doc ) const const CubicImp* cubic = static_cast( args[0] ); const Coordinate& p = static_cast( args[1] )->coordinate(); - if ( !cubic->tqcontainsPoint( p, doc ) ) + if ( !cubic->containsPoint( p, doc ) ) return new InvalidImp; double x = p.x; @@ -234,7 +234,7 @@ ObjectImp* CocCurveType::calc( const Args& args, const KigDocument& doc ) const const CurveImp* curve = static_cast( args[0] ); const Coordinate& p = static_cast( args[1] )->coordinate(); - if ( !curve->tqcontainsPoint( p, doc ) ) + if ( !curve->containsPoint( p, doc ) ) return new InvalidImp; diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc index 86e6f978..38522c22 100644 --- a/kig/objects/circle_imp.cc +++ b/kig/objects/circle_imp.cc @@ -63,19 +63,19 @@ void CircleImp::draw( KigPainter& p ) const p.drawCircle( mcenter, mradius ); } -bool CircleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool CircleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return fabs((mcenter - p).length() - mradius) <= w.screenInfo().normalMiss( width ); } bool CircleImp::inRect( const Rect& r, int width, const KigWidget& w ) const { - // first we check if the rect tqcontains at least one of the + // first we check if the rect contains at least one of the // north/south/east/west points of the circle - if ( r.tqcontains( mcenter + Coordinate( 0, -mradius ) ) ) return true; - if ( r.tqcontains( mcenter + Coordinate( mradius, 0 ) ) ) return true; - if ( r.tqcontains( mcenter + Coordinate( 0, mradius ) ) ) return true; - if ( r.tqcontains( mcenter + Coordinate( -mradius, 0 ) ) ) return true; + if ( r.contains( mcenter + Coordinate( 0, -mradius ) ) ) return true; + if ( r.contains( mcenter + Coordinate( mradius, 0 ) ) ) return true; + if ( r.contains( mcenter + Coordinate( 0, mradius ) ) ) return true; + if ( r.contains( mcenter + Coordinate( -mradius, 0 ) ) ) return true; // we allow a miss of some pixels .. double miss = w.screenInfo().normalMiss( width ); diff --git a/kig/objects/circle_imp.h b/kig/objects/circle_imp.h index 98fa391d..1ccede6a 100644 --- a/kig/objects/circle_imp.h +++ b/kig/objects/circle_imp.h @@ -46,7 +46,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cc index c06f05f8..81331522 100644 --- a/kig/objects/conic_imp.cc +++ b/kig/objects/conic_imp.cc @@ -47,7 +47,7 @@ bool ConicImp::valid() const return true; } -bool ConicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const +bool ConicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -332,7 +332,7 @@ const ObjectImpType* ConicImp::type() const return ConicImp::stype(); } -bool ConicImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool ConicImp::containsPoint( const Coordinate& p, const KigDocument& ) const { const ConicPolarData d = polarData(); diff --git a/kig/objects/conic_imp.h b/kig/objects/conic_imp.h index 3562422f..29068a7b 100644 --- a/kig/objects/conic_imp.h +++ b/kig/objects/conic_imp.h @@ -51,7 +51,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; @@ -116,7 +116,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc index f5a86ef8..3879c5d9 100644 --- a/kig/objects/cubic_imp.cc +++ b/kig/objects/cubic_imp.cc @@ -50,7 +50,7 @@ void CubicImp::draw( KigPainter& p ) const p.drawCurve( this ); } -bool CubicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const +bool CubicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -363,7 +363,7 @@ const ObjectImpType* CubicImp::stype() return &t; } -bool CubicImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool CubicImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -431,7 +431,7 @@ TQString CubicImp::cartesianEquationString( const KigDocument& ) const ret = ret.arg( mdata.coeffs[0], 0, 'g', 3 ); // we should find a common place to do this... - ret.tqreplace( "+ -", "- " ); - ret.tqreplace( "+-", "-" ); + ret.replace( "+ -", "- " ); + ret.replace( "+-", "-" ); return ret; } diff --git a/kig/objects/cubic_imp.h b/kig/objects/cubic_imp.h index ab7434a2..5e9e6a2c 100644 --- a/kig/objects/cubic_imp.h +++ b/kig/objects/cubic_imp.h @@ -40,7 +40,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; TQString cartesianEquationString( const KigDocument& ) const; @@ -74,7 +74,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/curve_imp.h b/kig/objects/curve_imp.h index a0b130cc..3a33a722 100644 --- a/kig/objects/curve_imp.h +++ b/kig/objects/curve_imp.h @@ -51,12 +51,12 @@ public: virtual CurveImp* copy() const = 0; /** - * Return whether this Curve tqcontains the given point. This is + * Return whether this Curve contains the given point. This is * implemented as a numerical approximation. Implementations * can/should use the value test_threshold in common.h as a * threshold value. */ - virtual bool tqcontainsPoint( const Coordinate& p, const KigDocument& ) const = 0; + virtual bool containsPoint( const Coordinate& p, const KigDocument& ) const = 0; }; #endif diff --git a/kig/objects/intersection_types.cc b/kig/objects/intersection_types.cc index 7305ba3d..804d498d 100644 --- a/kig/objects/intersection_types.cc +++ b/kig/objects/intersection_types.cc @@ -172,8 +172,8 @@ ObjectImp* LineLineIntersectionType::calc( const Args& parents, const KigDocumen calcIntersectionPoint( static_cast( parents[0] )->data(), static_cast( parents[1] )->data() ); - if ( static_cast( parents[0] )->tqcontainsPoint( p, d ) && - static_cast( parents[1] )->tqcontainsPoint( p, d ) ) + if ( static_cast( parents[0] )->containsPoint( p, d ) && + static_cast( parents[1] )->containsPoint( p, d ) ) return new PointImp( p ); else return new InvalidImp(); } diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cc index 6f5b176f..a49078a1 100644 --- a/kig/objects/line_imp.cc +++ b/kig/objects/line_imp.cc @@ -197,7 +197,7 @@ void SegmentImp::draw( KigPainter& p ) const p.drawSegment( mdata ); } -bool SegmentImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool SegmentImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -207,7 +207,7 @@ void RayImp::draw( KigPainter& p ) const p.drawRay( mdata ); } -bool RayImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool RayImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -217,7 +217,7 @@ void LineImp::draw( KigPainter& p ) const p.drawLine( mdata ); } -bool LineImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool LineImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -507,7 +507,7 @@ const ObjectImpType* LineImp::type() const return LineImp::stype(); } -bool SegmentImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool SegmentImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -517,7 +517,7 @@ bool SegmentImp::internalContainsPoint( const Coordinate& p, double threshold ) return isOnSegment( p, mdata.a, mdata.b, threshold ); } -bool RayImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool RayImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -527,7 +527,7 @@ bool RayImp::internalContainsPoint( const Coordinate& p, double threshold ) cons return isOnRay( p, mdata.a, mdata.b, threshold ); } -bool LineImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool LineImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } diff --git a/kig/objects/line_imp.h b/kig/objects/line_imp.h index 4d2319e5..b12c045d 100644 --- a/kig/objects/line_imp.h +++ b/kig/objects/line_imp.h @@ -99,7 +99,7 @@ public: SegmentImp( const LineData& d ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; + bool contains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; @@ -124,7 +124,7 @@ public: const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; @@ -154,7 +154,7 @@ public: RayImp( const LineData& d ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; + bool contains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; @@ -167,7 +167,7 @@ public: const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; @@ -195,7 +195,7 @@ public: */ LineImp( const LineData& d ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; + bool contains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; @@ -208,7 +208,7 @@ public: const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/locus_imp.cc b/kig/objects/locus_imp.cc index a45159a7..edbdc88b 100644 --- a/kig/objects/locus_imp.cc +++ b/kig/objects/locus_imp.cc @@ -49,7 +49,7 @@ void LocusImp::draw( KigPainter& p ) const p.drawCurve( this ); } -bool LocusImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool LocusImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ), w.document() ); } @@ -372,7 +372,7 @@ const ObjectImpType* LocusImp::type() const return LocusImp::stype(); } -bool LocusImp::tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const +bool LocusImp::containsPoint( const Coordinate& p, const KigDocument& doc ) const { return internalContainsPoint( p, test_threshold, doc ); } diff --git a/kig/objects/locus_imp.h b/kig/objects/locus_imp.h index 19bd690f..568e0e7c 100644 --- a/kig/objects/locus_imp.h +++ b/kig/objects/locus_imp.h @@ -66,7 +66,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; Rect surroundingRect() const; bool inRect( const Rect& r, int width, const KigWidget& ) const; double getParam( const Coordinate& point, const KigDocument& ) const; @@ -89,7 +89,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& d ) const; + bool containsPoint( const Coordinate& p, const KigDocument& d ) const; bool internalContainsPoint( const Coordinate& p, double threshold, const KigDocument& doc ) const; }; diff --git a/kig/objects/object_drawer.cc b/kig/objects/object_drawer.cc index 89c2c976..f92fabe7 100644 --- a/kig/objects/object_drawer.cc +++ b/kig/objects/object_drawer.cc @@ -41,10 +41,10 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const } } -bool ObjectDrawer::tqcontains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const +bool ObjectDrawer::contains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const { bool shownornv = mshown || nv; - return shownornv && imp.tqcontains( pt, mwidth, w ); + return shownornv && imp.contains( pt, mwidth, w ); } bool ObjectDrawer::shown( ) const diff --git a/kig/objects/object_drawer.h b/kig/objects/object_drawer.h index c9c962dd..6206522e 100644 --- a/kig/objects/object_drawer.h +++ b/kig/objects/object_drawer.h @@ -64,11 +64,11 @@ public: */ void draw( const ObjectImp& imp, KigPainter& p, bool selected ) const; /** - * returns whether the object \p imp tqcontains coordinate \p p . This is + * returns whether the object \p imp contains coordinate \p p . This is * dependent on whether it is shown ( when it will never contain * anything ), and on its width.. */ - bool tqcontains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv = false ) const; + bool contains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv = false ) const; /** * returns whether the object \p imp is in the rectangle \p r . This is * dependent on whether it is shown and on its width.. diff --git a/kig/objects/object_holder.cc b/kig/objects/object_holder.cc index f3516eea..70e1100b 100644 --- a/kig/objects/object_holder.cc +++ b/kig/objects/object_holder.cc @@ -80,9 +80,9 @@ void ObjectHolder::draw( KigPainter& p, bool selected ) const mdrawer->draw( *imp(), p, selected ); } -bool ObjectHolder::tqcontains( const Coordinate& pt, const KigWidget& w, bool nv ) const +bool ObjectHolder::contains( const Coordinate& pt, const KigWidget& w, bool nv ) const { - return mdrawer->tqcontains( *imp(), pt, w, nv ); + return mdrawer->contains( *imp(), pt, w, nv ); } bool ObjectHolder::inRect( const Rect& r, const KigWidget& w ) const diff --git a/kig/objects/object_holder.h b/kig/objects/object_holder.h index 1d96e007..0afd3892 100644 --- a/kig/objects/object_holder.h +++ b/kig/objects/object_holder.h @@ -101,9 +101,9 @@ public: */ void draw( KigPainter& p, bool selected ) const; /** - * Returns whether this object tqcontains the point \p p . + * Returns whether this object contains the point \p p . */ - bool tqcontains( const Coordinate& p, const KigWidget& w, bool nv = false ) const; + bool contains( const Coordinate& p, const KigWidget& w, bool nv = false ) const; /** * Returns whether this object is in the rectangle \p r . */ diff --git a/kig/objects/object_imp.h b/kig/objects/object_imp.h index 8e12de26..eaf29328 100644 --- a/kig/objects/object_imp.h +++ b/kig/objects/object_imp.h @@ -268,7 +268,7 @@ public: virtual ObjectImp* transform( const Transformation& t ) const = 0; virtual void draw( KigPainter& p ) const = 0; - virtual bool tqcontains( const Coordinate& p, int width, + virtual bool contains( const Coordinate& p, int width, const KigWidget& si ) const = 0; virtual bool inRect( const Rect& r, int width, const KigWidget& si ) const = 0; @@ -327,7 +327,7 @@ public: virtual ObjectImp* copy() const = 0; // s is a string with at least one escape ( "%N" where N is a - // number ) somewhere. This function tqreplaces the first escape it + // number ) somewhere. This function replaces the first escape it // sees with the "value" of this imp ( using the TQString::arg // functions ). This is e.g. used by TextType to turn its variable // args into strings.. @@ -341,7 +341,7 @@ public: /** * Returns true if this ObjectImp is equal to rhs. * This function checks whether rhs is of the same ObjectImp type, - * and whether it tqcontains the same data as this ObjectImp. + * and whether it contains the same data as this ObjectImp. * \internal It is used e.g. by the KigCommand stuff to see what the * user has changed during a move.. */ diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc index b422ccf1..65cd9c94 100644 --- a/kig/objects/object_imp_factory.cc +++ b/kig/objects/object_imp_factory.cc @@ -84,33 +84,33 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, parent.appendChild( doc.createTextNode( TQString::number( static_cast( d ).data() ) ) ); - return TQString::tqfromLatin1( "int" ); + return TQString::fromLatin1( "int" ); } else if ( d.inherits( DoubleImp::stype() ) ) { parent.appendChild( doc.createTextNode( TQString::number( static_cast( d ).data() ) ) ); - return TQString::tqfromLatin1( "double" ); + return TQString::fromLatin1( "double" ); } else if( d.inherits( StringImp::stype() ) ) { parent.appendChild( doc.createTextNode( static_cast( d ).data() ) ); - return TQString::tqfromLatin1( "string" ); + return TQString::fromLatin1( "string" ); } else if ( d.inherits( TestResultImp::stype() ) ) { parent.appendChild( doc.createTextNode( static_cast( d ).data() ) ); - return TQString::tqfromLatin1( "testresult" ); + return TQString::fromLatin1( "testresult" ); } else if( d.inherits( HierarchyImp::stype() ) ) { static_cast( d ).data().serialize( parent, doc ); - return TQString::tqfromLatin1( "hierarchy" ); + return TQString::fromLatin1( "hierarchy" ); } else if ( d.inherits( TransformationImp::stype() ) ) { @@ -135,7 +135,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, homothetye.appendChild( doc.createTextNode( ishomothety ) ); parent.appendChild( homothetye ); - return TQString::tqfromLatin1( "transformation" ); + return TQString::fromLatin1( "transformation" ); } else if( d.inherits( AbstractLineImp::stype() ) ) { @@ -143,28 +143,28 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, addCoordinateElement( "a", l.a, parent, doc ); addCoordinateElement( "b", l.b, parent, doc ); if( d.inherits( SegmentImp::stype() ) ) - return TQString::tqfromLatin1( "segment" ); + return TQString::fromLatin1( "segment" ); else if( d.inherits( RayImp::stype() ) ) - return TQString::tqfromLatin1( "ray" ); - else return TQString::tqfromLatin1( "line" ); + return TQString::fromLatin1( "ray" ); + else return TQString::fromLatin1( "line" ); } else if( d.inherits( PointImp::stype() ) ) { addXYElements( static_cast( d ).coordinate(), parent, doc ); - return TQString::tqfromLatin1( "point" ); + return TQString::fromLatin1( "point" ); } else if( d.inherits( TextImp::stype() ) ) { TQString text = static_cast( d ).text(); parent.appendChild( doc.createTextNode( text ) ); - return TQString::tqfromLatin1( "text" ); + return TQString::fromLatin1( "text" ); } else if( d.inherits( AngleImp::stype() ) ) { addDoubleElement( "size", static_cast( d ).size(), parent, doc ); - return TQString::tqfromLatin1( "angle" ); + return TQString::fromLatin1( "angle" ); } else if ( d.inherits( ArcImp::stype() ) ) { @@ -173,13 +173,13 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, addDoubleElement( "radius", a.radius(), parent, doc ); addDoubleElement( "startangle", a.startAngle(), parent, doc ); addDoubleElement( "angle", a.angle(), parent, doc ); - return TQString::tqfromLatin1( "arc" ); + return TQString::fromLatin1( "arc" ); } else if( d.inherits( VectorImp::stype() ) ) { Coordinate dir = static_cast( d ).dir(); addXYElements( dir, parent, doc ); - return TQString::tqfromLatin1( "vector" ); + return TQString::fromLatin1( "vector" ); } else if( d.inherits( LocusImp::stype() ) ) { @@ -197,14 +197,14 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, locus.hierarchy().serialize( hier, doc ); parent.appendChild( hier ); - return TQString::tqfromLatin1( "locus" ); + return TQString::fromLatin1( "locus" ); } else if( d.inherits( CircleImp::stype() ) ) { const CircleImp& c = static_cast( d ); addCoordinateElement( "center", c.center(), parent, doc ); addDoubleElement( "radius", c.radius(), parent, doc ); - return TQString::tqfromLatin1( "circle" ); + return TQString::fromLatin1( "circle" ); } else if( d.inherits( ConicImp::stype() ) ) { @@ -213,7 +213,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, addDoubleElement( "pdimen", data.pdimen, parent, doc ); addDoubleElement( "ecostheta0", data.ecostheta0, parent, doc ); addDoubleElement( "esintheta0", data.esintheta0, parent, doc ); - return TQString::tqfromLatin1( "conic" ); + return TQString::fromLatin1( "conic" ); } else if( d.inherits( CubicImp::stype() ) ) { @@ -230,7 +230,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, addDoubleElement( "a122", data.coeffs[8], coeffs, doc ); addDoubleElement( "a222", data.coeffs[9], coeffs, doc ); parent.appendChild( coeffs ); - return TQString::tqfromLatin1( "cubic" ); + return TQString::fromLatin1( "cubic" ); } assert( false ); return TQString::null; diff --git a/kig/objects/other_imp.cc b/kig/objects/other_imp.cc index f094b487..137a3e93 100644 --- a/kig/objects/other_imp.cc +++ b/kig/objects/other_imp.cc @@ -56,7 +56,7 @@ AngleImp::AngleImp( const Coordinate& pt, double start_angle_in_radials, { } -bool AngleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool AngleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { double radius = 50*w.screenInfo().pixelWidth(); @@ -73,7 +73,7 @@ bool AngleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) bool AngleImp::inRect( const Rect& r, int width, const KigWidget& w ) const { // TODO ? - return r.tqcontains( mpoint, w.screenInfo().normalMiss( width ) ); + return r.contains( mpoint, w.screenInfo().normalMiss( width ) ); } Coordinate AngleImp::attachPoint() const @@ -179,7 +179,7 @@ void VectorImp::draw( KigPainter& p ) const p.drawVector( mdata.a, mdata.b ); } -bool VectorImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const +bool VectorImp::contains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -340,7 +340,7 @@ void ArcImp::draw( KigPainter& p ) const p.drawArc( mcenter, mradius, msa, ma ); } -bool ArcImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool ArcImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -614,7 +614,7 @@ const ObjectImpType* ArcImp::type() const return ArcImp::stype(); } -bool ArcImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool ArcImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -694,7 +694,7 @@ double VectorImp::getParam( const Coordinate& p, const KigDocument& ) const return ( ( pt - mdata.a ).length() ) / ( dir().length() ); } -bool VectorImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool VectorImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } diff --git a/kig/objects/other_imp.h b/kig/objects/other_imp.h index 204d63a1..8e716fa6 100644 --- a/kig/objects/other_imp.h +++ b/kig/objects/other_imp.h @@ -49,7 +49,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; @@ -113,7 +113,7 @@ public: double getParam( const Coordinate&, const KigDocument& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; @@ -153,7 +153,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; @@ -186,7 +186,7 @@ public: ObjectImp* transform( const Transformation& t ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& w ) const; + bool contains( const Coordinate& p, int width, const KigWidget& w ) const; bool inRect( const Rect& r, int width, const KigWidget& si ) const; Rect surroundingRect() const; bool valid() const; @@ -236,7 +236,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cc index 57f8fe4a..539f98b3 100644 --- a/kig/objects/point_imp.cc +++ b/kig/objects/point_imp.cc @@ -42,7 +42,7 @@ void PointImp::draw( KigPainter& p ) const p.drawFatPoint( mc ); } -bool PointImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool PointImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { int twidth = width == -1 ? 5 : width; return (p - mc).length() - twidth*w.screenInfo().pixelWidth() < 0; @@ -51,7 +51,7 @@ bool PointImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) bool PointImp::inRect( const Rect& r, int width, const KigWidget& w ) const { double am = w.screenInfo().normalMiss( width ); - return r.tqcontains( mc, am ); + return r.contains( mc, am ); } const uint PointImp::numberOfProperties() const diff --git a/kig/objects/point_imp.h b/kig/objects/point_imp.h index 6a2db06f..dac0576c 100644 --- a/kig/objects/point_imp.h +++ b/kig/objects/point_imp.h @@ -54,7 +54,7 @@ public: void setCoordinate( const Coordinate& c ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; const uint numberOfProperties() const; diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc index c443f099..2acd8479 100644 --- a/kig/objects/point_type.cc +++ b/kig/objects/point_type.cc @@ -395,7 +395,7 @@ void FixedPointType::executeAction( Coordinate oldc = static_cast( o.imp() )->coordinate(); KigInputDialog::getCoordinate( i18n( "Set Coordinate" ), - i18n( "Enter the new coordinate." ) + TQString::tqfromLatin1( "
" ) + + i18n( "Enter the new coordinate." ) + TQString::fromLatin1( "
" ) + d.document().coordinateSystem().coordinateFormatNoticeMarkup(), &w, &ok, d.document(), &oldc ); if ( ! ok ) break; @@ -514,7 +514,7 @@ ObjectImp* MeasureTransportType::calc( const Args& parents, const KigDocument& d { const LineImp* c = static_cast( parents[1] ); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; const LineData line = c->data(); @@ -526,7 +526,7 @@ ObjectImp* MeasureTransportType::calc( const Args& parents, const KigDocument& d } else if ( parents[1]->inherits (CircleImp::stype()) ) { const CircleImp* c = static_cast( parents[1] ); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; double param = c->getParam( p, doc ); @@ -614,7 +614,7 @@ ObjectImp* MeasureTransportTypeOld::calc( const Args& parents, const KigDocument const CircleImp* c = static_cast( parents[0] ); const Coordinate& p = static_cast( parents[1] )->coordinate(); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; const SegmentImp* s = static_cast( parents[2] ); diff --git a/kig/objects/polygon_imp.cc b/kig/objects/polygon_imp.cc index c9c8fb11..08215bfb 100644 --- a/kig/objects/polygon_imp.cc +++ b/kig/objects/polygon_imp.cc @@ -159,12 +159,12 @@ bool PolygonImp::isInPolygon( const Coordinate& p ) const } #define selectpolygonwithinside 1 #ifdef selectpolygonwithinside -bool PolygonImp::tqcontains( const Coordinate& p, int, const KigWidget& ) const +bool PolygonImp::contains( const Coordinate& p, int, const KigWidget& ) const { return isInPolygon( p ); } #else -bool PolygonImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool PolygonImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { bool ret = false; uint reduceddim = mpoints.size() - 1; diff --git a/kig/objects/polygon_imp.h b/kig/objects/polygon_imp.h index 506ca245..9a25d516 100644 --- a/kig/objects/polygon_imp.h +++ b/kig/objects/polygon_imp.h @@ -53,7 +53,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/objects/tangent_type.cc b/kig/objects/tangent_type.cc index 15b78458..12ebda23 100644 --- a/kig/objects/tangent_type.cc +++ b/kig/objects/tangent_type.cc @@ -68,7 +68,7 @@ ObjectImp* TangentConicType::calc( const Args& args, const KigDocument& doc ) co const ConicImp* c = static_cast( args[0] ); const Coordinate& p = static_cast( args[1] )->coordinate(); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; bool ok; @@ -118,7 +118,7 @@ ObjectImp* TangentArcType::calc( const Args& args, const KigDocument& doc ) cons const ArcImp* arc = static_cast( args[0] ); const Coordinate& p = static_cast( args[1] )->coordinate(); - if ( !arc->tqcontainsPoint( p, doc ) ) + if ( !arc->containsPoint( p, doc ) ) return new InvalidImp; Coordinate c = arc->center(); @@ -173,7 +173,7 @@ ObjectImp* TangentCubicType::calc( const Args& args, const KigDocument& doc ) co const CubicImp* cubic = static_cast( args[0] ); const Coordinate& p = static_cast( args[1] )->coordinate(); - if ( !cubic->tqcontainsPoint( p, doc ) ) + if ( !cubic->containsPoint( p, doc ) ) return new InvalidImp; double x = p.x; @@ -243,7 +243,7 @@ ObjectImp* TangentCurveType::calc( const Args& args, const KigDocument& doc ) co const CurveImp* curve = static_cast( args[0] ); const Coordinate& p = static_cast( args[1] )->coordinate(); - if ( !curve->tqcontainsPoint( p, doc ) ) + if ( !curve->containsPoint( p, doc ) ) return new InvalidImp; const double t = curve->getParam( p, doc ); diff --git a/kig/objects/tests_type.cc b/kig/objects/tests_type.cc index a2c65808..e85c111e 100644 --- a/kig/objects/tests_type.cc +++ b/kig/objects/tests_type.cc @@ -159,7 +159,7 @@ const ObjectImpType* AreCollinearType::resultId() const return TestResultImp::stype(); } -static const ArgsParser::spec tqcontainsTestArgsSpec[] = +static const ArgsParser::spec containsTestArgsSpec[] = { { PointImp::stype(), I18N_NOOP( "Check whether this point is on a curve" ), I18N_NOOP( "Select the point you want to test..." ), false }, @@ -170,7 +170,7 @@ static const ArgsParser::spec tqcontainsTestArgsSpec[] = KIG_INSTANTIATE_OBJECT_TYPE_INSTANCE( ContainsTestType ) ContainsTestType::ContainsTestType() - : ArgsParserObjectType( "ContainsTest", tqcontainsTestArgsSpec, 2 ) + : ArgsParserObjectType( "ContainsTest", containsTestArgsSpec, 2 ) { } @@ -190,8 +190,8 @@ ObjectImp* ContainsTestType::calc( const Args& parents, const KigDocument& doc ) const Coordinate& p = static_cast( parents[0] )->coordinate(); const CurveImp* c = static_cast( parents[1] ); - if ( c->tqcontainsPoint( p, doc ) ) - return new TestResultImp( i18n( "This curve tqcontains the point." ) ); + if ( c->containsPoint( p, doc ) ) + return new TestResultImp( i18n( "This curve contains the point." ) ); else return new TestResultImp( i18n( "This curve does not contain the point." ) ); } @@ -237,7 +237,7 @@ ObjectImp* InPolygonTestType::calc( const Args& parents, const KigDocument& ) co const PolygonImp* pol = static_cast( parents[1] ); if ( pol->isInPolygon( p ) ) - return new TestResultImp( i18n( "This polygon tqcontains the point." ) ); + return new TestResultImp( i18n( "This polygon contains the point." ) ); else return new TestResultImp( i18n( "This polygon does not contain the point." ) ); } diff --git a/kig/objects/text_imp.cc b/kig/objects/text_imp.cc index e8feb7f0..32591c16 100644 --- a/kig/objects/text_imp.cc +++ b/kig/objects/text_imp.cc @@ -51,9 +51,9 @@ void TextImp::draw( KigPainter& p ) const p.drawTextFrame( mboundrect, mtext, mframe ); } -bool TextImp::tqcontains( const Coordinate& p, int, const KigWidget& ) const +bool TextImp::contains( const Coordinate& p, int, const KigWidget& ) const { - return mboundrect.tqcontains( p ); + return mboundrect.contains( p ); } bool TextImp::inRect( const Rect& r, int, const KigWidget& ) const diff --git a/kig/objects/text_imp.h b/kig/objects/text_imp.h index 54eb7647..54e33f79 100644 --- a/kig/objects/text_imp.h +++ b/kig/objects/text_imp.h @@ -30,7 +30,7 @@ class TextImp Coordinate mloc; bool mframe; // with this var, we keep track of the place we drew in, for use in - // the tqcontains() function.. + // the contains() function.. mutable Rect mboundrect; public: typedef ObjectImp Parent; @@ -44,7 +44,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; -- cgit v1.2.1