summaryrefslogtreecommitdiffstats
path: root/karbon/core
diff options
context:
space:
mode:
Diffstat (limited to 'karbon/core')
-rw-r--r--karbon/core/vcomposite.cc4
-rw-r--r--karbon/core/vdocument.cc14
-rw-r--r--karbon/core/vgroup.cc2
-rw-r--r--karbon/core/vlayer.cc2
-rw-r--r--karbon/core/vpath.cc2
-rw-r--r--karbon/core/vselection.cc4
-rw-r--r--karbon/core/vtext.cc2
7 files changed, 15 insertions, 15 deletions
diff --git a/karbon/core/vcomposite.cc b/karbon/core/vcomposite.cc
index d8eaf027..7872df5f 100644
--- a/karbon/core/vcomposite.cc
+++ b/karbon/core/vcomposite.cc
@@ -264,7 +264,7 @@ bool
VPath::pointIsInside( const KoPoint& p ) const
{
// Check if point is inside boundingbox.
- if( !boundingBox().tqcontains( p ) )
+ if( !boundingBox().contains( p ) )
return false;
@@ -422,7 +422,7 @@ VPath::transformByViewbox( const TQDomElement &element, TQString viewbox )
if( ! viewbox.isEmpty() )
{
// allow for viewbox def with ',' or whitespace
- TQStringList points = TQStringList::split( ' ', viewbox.tqreplace( ',', ' ' ).simplifyWhiteSpace() );
+ TQStringList points = TQStringList::split( ' ', viewbox.replace( ',', ' ' ).simplifyWhiteSpace() );
double w = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() ) );
double h = KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) );
diff --git a/karbon/core/vdocument.cc b/karbon/core/vdocument.cc
index 0384141b..2de51bf1 100644
--- a/karbon/core/vdocument.cc
+++ b/karbon/core/vdocument.cc
@@ -151,20 +151,20 @@ VDocument::removeLayer( VLayer* layer )
bool VDocument::canRaiseLayer( VLayer* layer )
{
- int pos = m_layers.tqfind( layer );
+ int pos = m_layers.find( layer );
return (pos != int( m_layers.count() ) - 1 && pos >= 0 );
}
bool VDocument::canLowerLayer( VLayer* layer )
{
- int pos = m_layers.tqfind( layer );
+ int pos = m_layers.find( layer );
return (pos>0);
}
void
VDocument::raiseLayer( VLayer* layer )
{
- int pos = m_layers.tqfind( layer );
+ int pos = m_layers.find( layer );
if( pos != int( m_layers.count() ) - 1 && pos >= 0 )
{
VLayer* layer = m_layers.take( pos );
@@ -175,7 +175,7 @@ VDocument::raiseLayer( VLayer* layer )
void
VDocument::lowerLayer( VLayer* layer )
{
- int pos = m_layers.tqfind( layer );
+ int pos = m_layers.find( layer );
if ( pos > 0 )
{
VLayer* layer = m_layers.take( pos );
@@ -186,13 +186,13 @@ VDocument::lowerLayer( VLayer* layer )
int
VDocument::layerPos( VLayer* layer )
{
- return m_layers.tqfind( layer );
+ return m_layers.find( layer );
} // VDocument::layerPos
void
VDocument::setActiveLayer( VLayer* layer )
{
- if ( m_layers.tqfind( layer ) != -1 )
+ if ( m_layers.find( layer ) != -1 )
m_activeLayer = layer;
} // VDocument::setActiveLayer
@@ -318,6 +318,6 @@ VDocument::accept( VVisitor& visitor )
TQString
VDocument::objectName( const VObject *obj ) const
{
- TQMap<const VObject *, TQString>::ConstIterator it = m_objectNames.tqfind( obj );
+ TQMap<const VObject *, TQString>::ConstIterator it = m_objectNames.find( obj );
return it == m_objectNames.end() ? 0L : it.data();
}
diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cc
index ab2ec328..35f3991e 100644
--- a/karbon/core/vgroup.cc
+++ b/karbon/core/vgroup.cc
@@ -383,7 +383,7 @@ VGroup::insertInfrontOf( VObject* newObject, VObject* oldObject )
{
newObject->setParent( this );
- m_objects.insert( m_objects.tqfind( oldObject ), newObject );
+ m_objects.insert( m_objects.find( oldObject ), newObject );
invalidateBoundingBox();
}
diff --git a/karbon/core/vlayer.cc b/karbon/core/vlayer.cc
index 49c3bc11..dddfe6ce 100644
--- a/karbon/core/vlayer.cc
+++ b/karbon/core/vlayer.cc
@@ -111,7 +111,7 @@ VLayer::downwards( const VObject& object )
{
if( m_objects.getFirst() == &object ) return;
- int index = m_objects.tqfind( &object );
+ int index = m_objects.find( &object );
bool bLast = m_objects.getLast() == &object;
m_objects.remove( index );
diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cc
index 4f279cd7..1442d90c 100644
--- a/karbon/core/vpath.cc
+++ b/karbon/core/vpath.cc
@@ -416,7 +416,7 @@ bool
VSubpath::pointIsInside( const KoPoint& p ) const
{
// If the point is not inside the boundingbox, it cannot be inside the path either.
- if( !boundingBox().tqcontains( p ) )
+ if( !boundingBox().contains( p ) )
return false;
// First check if the point is inside the knot polygon (beziers are treated
diff --git a/karbon/core/vselection.cc b/karbon/core/vselection.cc
index b7cc2167..77809ac5 100644
--- a/karbon/core/vselection.cc
+++ b/karbon/core/vselection.cc
@@ -135,7 +135,7 @@ VSelection::append( VObject* object )
// only append if item is not deleted or not already in list
if( object->state() != deleted )
{
- if( ! m_objects.tqcontainsRef( object ) )
+ if( ! m_objects.containsRef( object ) )
m_objects.append( object );
object->setState( selected );
invalidateBoundingBox();
@@ -295,7 +295,7 @@ VSelection::handleNode( const KoPoint &point ) const
{
for( uint i = node_lt; i <= node_rb; ++i )
{
- if( m_handleRect[i].tqcontains( point ) )
+ if( m_handleRect[i].contains( point ) )
return static_cast<VHandleNode>( i );
}
diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cc
index 9f215b59..e73445ee 100644
--- a/karbon/core/vtext.cc
+++ b/karbon/core/vtext.cc
@@ -660,7 +660,7 @@ VText::buildRequest( TQString family, int weight, int slant, double size, int &i
{
// Strip those stupid [Xft or whatever]...
int pos;
- if( ( pos = family.tqfind( '[' ) ) )
+ if( ( pos = family.find( '[' ) ) )
family = family.left( pos );
// Use FontConfig to locate & select fonts and use FreeType2 to open them