diff options
Diffstat (limited to 'kivio/kiviopart/kiviosdk')
-rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_common.cpp | 4 | ||||
-rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp | 8 | ||||
-rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp | 2 | ||||
-rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_layer.cpp | 10 | ||||
-rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_stencil.cpp | 4 | ||||
-rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp | 14 | ||||
-rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h | 2 | ||||
-rw-r--r-- | kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp | 2 |
8 files changed, 23 insertions, 23 deletions
diff --git a/kivio/kiviopart/kiviosdk/kivio_common.cpp b/kivio/kiviopart/kiviosdk/kivio_common.cpp index e43c9fda..b67efc23 100644 --- a/kivio/kiviopart/kiviosdk/kivio_common.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_common.cpp @@ -224,7 +224,7 @@ TQColor XmlReadColor( const TQDomElement &e, const TQString &att, const TQColor bool ok=false; TQColor newColor; - if( val.tqcontains("#") ) // Is it #RRGGBB format? + if( val.contains("#") ) // Is it #RRGGBB format? { newColor.setNamedColor(val); return newColor; @@ -393,7 +393,7 @@ KoRect XmlReadRect( const TQDomElement &e, const TQString &att, const KoRect &de // Read the attribute TQString val = e.attribute( att ); - if (val.tqfind("[") == 0 && val.tqfind("]") == (int)val.length()-1) { + if (val.find("[") == 0 && val.find("]") == (int)val.length()-1) { val.remove(0,1); val.remove(val.length()-1,1); TQStringList vlist = TQStringList::split(",",val); diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp index e3cf726b..4407d2d0 100644 --- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp @@ -417,7 +417,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file) if(svgChild.hasAttribute("d")) { - if(svgChild.attribute("d").tqcontains('z') || svgChild.attribute("d").tqcontains('Z')) + if(svgChild.attribute("d").contains('z') || svgChild.attribute("d").contains('Z')) { isClosed = true; kivioShape.setAttribute("type", "ClosedPath"); @@ -451,12 +451,12 @@ bool KivioDiaStencilSpawner::load(const TQString &file) for( uint idx = 0; idx < styles.count(); idx++) { //kdDebug(43000) << "Style: " << styles[idx] << endl; - if( isClosed && styles[idx].tqcontains("fill:")) + if( isClosed && styles[idx].contains("fill:")) { TQDomElement fillStyle = kivio.createElement("KivioFillStyle"); - if( styles[idx].tqcontains("forground")) + if( styles[idx].contains("forground")) fillStyle.setAttribute("color", "#0000"); - else if (styles[idx].tqcontains("background")) + else if (styles[idx].contains("background")) fillStyle.setAttribute("color", "#ffff"); fillStyle.setAttribute("colorStyle", "1"); diff --git a/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp index 2965ee74..c83f41f4 100644 --- a/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp @@ -503,7 +503,7 @@ void KivioGroupStencil::searchForConnections( KivioPage *p ) pStencil->searchForConnections( p ); // Restore it - m_pGroupList->tqfind( pCur ); + m_pGroupList->find( pCur ); pStencil = m_pGroupList->next(); } diff --git a/kivio/kiviopart/kiviosdk/kivio_layer.cpp b/kivio/kiviopart/kiviosdk/kivio_layer.cpp index 999d053d..13ed44f5 100644 --- a/kivio/kiviopart/kiviosdk/kivio_layer.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_layer.cpp @@ -81,7 +81,7 @@ KivioLayer::~KivioLayer() bool KivioLayer::addStencil( KivioStencil *pStencil ) { - int pos = m_pDeletedStencilList->tqfindRef(pStencil); + int pos = m_pDeletedStencilList->findRef(pStencil); if ( pos != -1 ) m_pDeletedStencilList->take( pos); @@ -92,14 +92,14 @@ bool KivioLayer::addStencil( KivioStencil *pStencil ) void KivioLayer::takeStencilFromList( KivioStencil *pStencil ) { - int pos=m_pStencilList->tqfindRef(pStencil); + int pos=m_pStencilList->findRef(pStencil); m_pStencilList->take( pos ); m_pDeletedStencilList->append( pStencil ); } void KivioLayer::insertStencil( KivioStencil *pStencil ) { - int pos=m_pDeletedStencilList->tqfindRef(pStencil); + int pos=m_pDeletedStencilList->findRef(pStencil); if ( pos != -1 ) m_pDeletedStencilList->take( pos); @@ -532,7 +532,7 @@ void KivioLayer::searchForConnections( KivioPage *p ) pStencil->searchForConnections( p ); // Restore it - m_pStencilList->tqfind( pCur ); + m_pStencilList->find( pCur ); pStencil = m_pStencilList->next(); } @@ -540,7 +540,7 @@ void KivioLayer::searchForConnections( KivioPage *p ) KivioStencil *KivioLayer::takeStencil( KivioStencil *p ) { - m_pStencilList->tqfind( p ); + m_pStencilList->find( p ); return m_pStencilList->take(); } diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil.cpp index 915df3bb..5533a257 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_stencil.cpp @@ -256,8 +256,8 @@ void KivioStencil::move(double xOffset, double yOffset) bool KivioStencil::isInRect(const KoRect& rect) { bool retVal; - retVal = rect.tqcontains(m_x, m_y); - retVal = retVal && rect.tqcontains(m_x + m_w, m_y + m_h); + retVal = rect.contains(m_x, m_y); + retVal = retVal && rect.contains(m_x + m_w, m_y + m_h); return retVal; } diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp index 64d5a7c9..c2e54a58 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp @@ -118,23 +118,23 @@ KivioStencilSpawner* KivioStencilSpawnerSet::loadFile( const TQString &fileName KivioStencilSpawner *pSpawner; - if( fileName.tqcontains( ".sml", false ) ) + if( fileName.contains( ".sml", false ) ) { pSpawner = new KivioSMLStencilSpawner(this); } - else if( fileName.tqcontains( ".ksp", false ) ) + else if( fileName.contains( ".ksp", false ) ) { pSpawner = new KivioPluginStencilSpawner(this); } - else if( fileName.tqcontains( ".so", false ) ) + else if( fileName.contains( ".so", false ) ) { pSpawner = new KivioPluginStencilSpawner(this); } - else if( fileName.tqcontains( ".spy", false ) ) + else if( fileName.contains( ".spy", false ) ) { pSpawner = new KivioPyStencilSpawner(this); } - else if( fileName.tqcontains( ".tqshape", false ) ) + else if( fileName.contains( ".tqshape", false ) ) { pSpawner = new KivioDiaStencilSpawner(this); } @@ -167,7 +167,7 @@ TQString KivioStencilSpawnerSet::readTitle( const TQString &dir ) { kdDebug(43000) << "KivioStencilSpawnerSet::readTitle() - Error opening stencil set title: " << dir << "/desc" << endl; - return dir.right(dir.length() - dir.tqfindRev('/')-1); + return dir.right(dir.length() - dir.findRev('/')-1); } d.setContent(&f); @@ -289,7 +289,7 @@ TQString KivioStencilSpawnerSet::readDescription(const TQString& dir) } -KivioStencilSpawner* KivioStencilSpawnerSet::tqfind( const TQString& id) +KivioStencilSpawner* KivioStencilSpawnerSet::find( const TQString& id) { if(!m_pSpawners || m_pSpawners->isEmpty()) { return 0; diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h index 9b215560..22b6d964 100644 --- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h +++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h @@ -61,7 +61,7 @@ class KivioStencilSpawnerSet void setId( const TQString &s ) { m_id=s; } KivioStencilSpawner *spawnerAt( int i ) { return m_pSpawners->at(i); } - KivioStencilSpawner *tqfind( const TQString& ); + KivioStencilSpawner *find( const TQString& ); int count() { return m_pSpawners->count(); } diff --git a/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp b/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp index 71910eff..5906ab16 100644 --- a/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp +++ b/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp @@ -408,7 +408,7 @@ namespace Kivio { bool retVal = true; for(it = m_points.begin(); it != m_points.end(); ++it) { - retVal = retVal && rect.tqcontains((*it)); + retVal = retVal && rect.contains((*it)); } return retVal; |