diff options
Diffstat (limited to 'karbon/core/vpath.cc')
| -rw-r--r-- | karbon/core/vpath.cc | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cc index a9fcc8a1..88baa8fe 100644 --- a/karbon/core/vpath.cc +++ b/karbon/core/vpath.cc @@ -20,9 +20,9 @@ #include <math.h> -#include <qdom.h> -#include <qvaluelist.h> -#include <qwmatrix.h> +#include <tqdom.h> +#include <tqvaluelist.h> +#include <tqwmatrix.h> #include "vpath.h" #include "vsegment.h" @@ -52,7 +52,7 @@ public: m_list->push_front( itr ); else { - m_list = new QValueList<VSubpathIterator*>; + m_list = new TQValueList<VSubpathIterator*>; m_list->push_front( itr ); } } @@ -86,7 +86,7 @@ public: if( m_list ) { for( - QValueList<VSubpathIterator*>::Iterator itr = m_list->begin(); + TQValueList<VSubpathIterator*>::Iterator itr = m_list->begin(); itr != m_list->end(); ++itr ) { @@ -109,7 +109,7 @@ public: if( m_list ) { for( - QValueList<VSubpathIterator*>::Iterator itr = m_list->begin(); + TQValueList<VSubpathIterator*>::Iterator itr = m_list->begin(); itr != m_list->end(); ++itr ) { @@ -120,13 +120,13 @@ public: } private: - QValueList<VSubpathIterator*>* m_list; + TQValueList<VSubpathIterator*>* m_list; VSubpathIterator* m_iterator; }; -VSubpath::VSubpath( VObject* parent ) - : VObject( parent ) +VSubpath::VSubpath( VObject* tqparent ) + : VObject( tqparent ) { m_isClosed = false; @@ -416,14 +416,14 @@ bool VSubpath::pointIsInside( const KoPoint& p ) const { // If the point is not inside the boundingbox, it cannot be inside the path either. - if( !boundingBox().contains( p ) ) + if( !boundingBox().tqcontains( p ) ) return false; // First check if the point is inside the knot polygon (beziers are treated // as lines). /* This algorithm is taken from "Fast Winding Number Inclusion of a Point - * in a Polygon" by Dan Sunday, geometryalgorithms.com. + * in a Polygon" by Dan Sunday, tqgeometryalgorithms.com. */ /* @@ -481,7 +481,7 @@ VSubpath::pointIsInside( const KoPoint& p ) const // cache the closed evaluation bool closed = isClosed() || getLast()->knot() == getFirst()->knot(); - QValueList<double> rparams; + TQValueList<double> rparams; VSegment* segment = getFirst()->next(); @@ -528,7 +528,7 @@ VSubpath::pointIsInside( const KoPoint& p ) const // sort all intersections qHeapSort( rparams ); - QValueList<double>::iterator itr, etr = rparams.end(); + TQValueList<double>::iterator itr, etr = rparams.end(); for( itr = rparams.begin(); itr != etr; ++itr ) kdDebug(38000) << "intersection: " << *itr << endl; @@ -654,7 +654,7 @@ VSubpath::revert() return; - VSubpath list( parent() ); + VSubpath list( tqparent() ); list.moveTo( getLast()->knot() ); VSegment* segment = getLast(); @@ -701,7 +701,7 @@ VSubpath::clone() const } void -VSubpath::saveSvgPath( QString &d ) const +VSubpath::saveSvgPath( TQString &d ) const { // Save segments. VSegment* segment = getFirst(); @@ -715,21 +715,21 @@ VSubpath::saveSvgPath( QString &d ) const // Line. if( segment->prev() ) { - d += QString( "L%1 %2" ). - arg( segment->knot().x() ).arg( segment->knot().y() ); + d += TQString( "L%1 %2" ). + tqarg( segment->knot().x() ).tqarg( segment->knot().y() ); } // Moveto. else { - d += QString( "M%1 %2" ). - arg( segment->knot().x() ).arg( segment->knot().y() ); + d += TQString( "M%1 %2" ). + tqarg( segment->knot().x() ).tqarg( segment->knot().y() ); } } // Bezier ( degree >= 3 ). else { // We currently treat all beziers as cubic beziers. - d += QString( "C%1 %2 %3 %4 %5 %6" ). + d += TQString( "C%1 %2 %3 %4 %5 %6" ). arg( segment->point( segment->degree() - 3 ).x() ). arg( segment->point( segment->degree() - 3 ).y() ). arg( segment->point( segment->degree() - 2 ).x() ). @@ -748,18 +748,18 @@ VSubpath::saveSvgPath( QString &d ) const // TODO: remove this backward compatibility function after koffice 1.3.x void -VSubpath::load( const QDomElement& element ) +VSubpath::load( const TQDomElement& element ) { // We might have a "begin" segment. clear(); - QDomNodeList list = element.childNodes(); + TQDomNodeList list = element.childNodes(); for( uint i = 0; i < list.count(); ++i ) { if( list.item( i ).isElement() ) { - QDomElement segment = list.item( i ).toElement(); + TQDomElement segment = list.item( i ).toElement(); VSegment* s = new VSegment(); s->load( segment ); @@ -820,7 +820,7 @@ VSubpath::insert( const VSegment* segment ) m_current = s; ++m_number; - invalidateBoundingBox(); + tqinvalidateBoundingBox(); return true; } @@ -856,7 +856,7 @@ VSubpath::insert( uint index, const VSegment* segment ) m_current = s; ++m_number; - invalidateBoundingBox(); + tqinvalidateBoundingBox(); return true; } @@ -878,7 +878,7 @@ VSubpath::prepend( const VSegment* segment ) ++m_number; m_currentIndex = 0; - invalidateBoundingBox(); + tqinvalidateBoundingBox(); } void @@ -898,7 +898,7 @@ VSubpath::append( const VSegment* segment ) m_currentIndex = m_number; ++m_number; - invalidateBoundingBox(); + tqinvalidateBoundingBox(); } void @@ -924,7 +924,7 @@ VSubpath::clear() m_isClosed = false; - invalidateBoundingBox(); + tqinvalidateBoundingBox(); } VSegment* |