summaryrefslogtreecommitdiffstats
path: root/kpovmodeler
diff options
context:
space:
mode:
Diffstat (limited to 'kpovmodeler')
-rw-r--r--kpovmodeler/baseinsertrules.xml142
-rw-r--r--kpovmodeler/pm2dcontrolpoint.cpp2
-rw-r--r--kpovmodeler/pmaddcommand.cpp2
-rw-r--r--kpovmodeler/pmdeclareedit.cpp6
-rw-r--r--kpovmodeler/pmdeletecommand.cpp6
-rw-r--r--kpovmodeler/pmdialogeditbase.cpp8
-rw-r--r--kpovmodeler/pmdockwidget.cpp18
-rw-r--r--kpovmodeler/pmdocumentationmap.cpp2
-rw-r--r--kpovmodeler/pmenumproperty.cpp4
-rw-r--r--kpovmodeler/pmerrordialog.cpp2
-rw-r--r--kpovmodeler/pmglview.cpp2
-rw-r--r--kpovmodeler/pmimagemapedit.cpp8
-rw-r--r--kpovmodeler/pminsertrules.dtd16
-rw-r--r--kpovmodeler/pminsertrulesystem.cpp48
-rw-r--r--kpovmodeler/pminsertrulesystem.h12
-rw-r--r--kpovmodeler/pmiomanager.cpp6
-rw-r--r--kpovmodeler/pmlayoutsettings.cpp4
-rw-r--r--kpovmodeler/pmlibraryhandle.cpp6
-rw-r--r--kpovmodeler/pmmetaobject.h2
-rw-r--r--kpovmodeler/pmmovecommand.cpp12
-rw-r--r--kpovmodeler/pmobjectselect.cpp4
-rw-r--r--kpovmodeler/pmparser.cpp16
-rw-r--r--kpovmodeler/pmpart.cpp14
-rw-r--r--kpovmodeler/pmpluginmanager.cpp2
-rw-r--r--kpovmodeler/pmpovrayformat.cpp4
-rw-r--r--kpovmodeler/pmpovrayparser.cpp6
-rw-r--r--kpovmodeler/pmpovraysettings.cpp4
-rw-r--r--kpovmodeler/pmpovraywidget.cpp2
-rw-r--r--kpovmodeler/pmprismedit.cpp10
-rw-r--r--kpovmodeler/pmprototypemanager.cpp10
-rw-r--r--kpovmodeler/pmrendermanager.cpp14
-rw-r--r--kpovmodeler/pmresourcelocator.cpp2
-rw-r--r--kpovmodeler/pmscanner.h6
-rw-r--r--kpovmodeler/pmshell.cpp6
-rw-r--r--kpovmodeler/pmsymboltable.cpp4
-rw-r--r--kpovmodeler/pmtruetypecache.cpp4
-rw-r--r--kpovmodeler/pmvector.cpp2
-rw-r--r--kpovmodeler/pmviewfactory.cpp6
38 files changed, 212 insertions, 212 deletions
diff --git a/kpovmodeler/baseinsertrules.xml b/kpovmodeler/baseinsertrules.xml
index 1d6547ce..ad1917d9 100644
--- a/kpovmodeler/baseinsertrules.xml
+++ b/kpovmodeler/baseinsertrules.xml
@@ -182,11 +182,11 @@
</rule>
<rule>
<class name="Texture"/>
- <tqcontains><class name="Texture"/></tqcontains>
+ <contains><class name="Texture"/></contains>
</rule>
<rule>
<class name="InteriorTexture"/>
- <tqcontains><class name="InteriorTexture"/></tqcontains>
+ <contains><class name="InteriorTexture"/></contains>
</rule>
</targetclass>
@@ -211,16 +211,16 @@
<class name="SolidColor"/>
<class name="ColorList"/>
<class name="DensityList"/>
- <not><tqcontains><group name="Sum"/></tqcontains></not>
+ <not><contains><group name="Sum"/></contains></not>
</rule>
<rule>
<class name="Pattern"/>
<and>
<not>
- <tqcontains>
+ <contains>
<class name="Pattern"/>
<group name="ListPattern"/>
- </tqcontains>
+ </contains>
</not>
<not><after><group name="Map"/></after></not>
<not><after><class name="Warp"/></after></not>
@@ -236,11 +236,11 @@
<group name="Map"/>
<and>
<not>
- <tqcontains>
+ <contains>
<group name="Map"/>
<group name="ListPattern"/>
<class name="SolidColor"/>
- </tqcontains>
+ </contains>
</not>
<not><before><class name="Pattern"/></before></not>
</and>
@@ -297,15 +297,15 @@
</rule>
<rule>
<class name="LooksLike"/>
- <not><tqcontains><class name="LooksLike"/></tqcontains></not>
+ <not><contains><class name="LooksLike"/></contains></not>
</rule>
<rule>
<class name="ProjectedThrough"/>
- <not><tqcontains><class name="ProjectedThrough"/></tqcontains></not>
+ <not><contains><class name="ProjectedThrough"/></contains></not>
</rule>
<rule>
<class name="Photons"/>
- <not><tqcontains><class name="Photons"/></tqcontains></not>
+ <not><contains><class name="Photons"/></contains></not>
</rule>
</targetclass>
@@ -420,9 +420,9 @@
<rule>
<class name="GraphicalObject"/>
<not>
- <tqcontains>
+ <contains>
<class name="GraphicalObject"/>
- </tqcontains>
+ </contains>
</not>
</rule>
</targetclass>
@@ -435,9 +435,9 @@
<rule>
<class name="GraphicalObject"/>
<not>
- <tqcontains>
+ <contains>
<class name="GraphicalObject"/>
- </tqcontains>
+ </contains>
</not>
</rule>
</targetclass>
@@ -450,9 +450,9 @@
<rule>
<class name="GraphicalObject"/>
<not>
- <tqcontains>
+ <contains>
<class name="GraphicalObject"/>
- </tqcontains>
+ </contains>
</not>
</rule>
</targetclass>
@@ -485,7 +485,7 @@
<rule>
<class name="BumpMap"/>
<not>
- <tqcontains>
+ <contains>
<class name="BumpMap"/>
<class name="NormalList"/>
<class name="Pattern"/>
@@ -493,31 +493,31 @@
<class name="SlopeMap"/>
<class name="Warp"/>
<class name="BlendMapModifiers"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
<class name="NormalList"/>
<not>
- <tqcontains>
+ <contains>
<class name="BumpMap"/>
<class name="NormalList"/>
<class name="Pattern"/>
<class name="NormalMap"/>
<class name="SlopeMap"/>
<class name="Warp"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
<class name="Pattern"/>
<and>
<not>
- <tqcontains>
+ <contains>
<class name="BumpMap"/>
<class name="NormalList"/>
<class name="Pattern"/>
- </tqcontains>
+ </contains>
</not>
<not><after><class name="NormalMap"/></after></not>
<not><after><class name="SlopeMap"/></after></not>
@@ -534,11 +534,11 @@
<class name="NormalMap"/>
<and>
<not>
- <tqcontains>
+ <contains>
<class name="BumpMap"/>
<class name="NormalMap"/>
<class name="NormalList"/>
- </tqcontains>
+ </contains>
</not>
<not><after><class name="SlopeMap"/></after></not>
<not><after><class name="BlendMapModifiers"/></after></not>
@@ -549,11 +549,11 @@
<class name="SlopeMap"/>
<and>
<not>
- <tqcontains>
+ <contains>
<class name="BumpMap"/>
<class name="SlopeMap"/>
<class name="NormalList"/>
- </tqcontains>
+ </contains>
</not>
<not><after><class name="BlendMapModifiers"/></after></not>
<not><after><group name="Transformations"/></after></not>
@@ -563,14 +563,14 @@
<rule>
<class name="BlendMapModifiers"/>
<and>
- <not><tqcontains><class name="BlendMapModifiers"/></tqcontains></not>
+ <not><contains><class name="BlendMapModifiers"/></contains></not>
<or>
<not>
- <tqcontains>
+ <contains>
<class name="BumpMap"/>
<class name="NormalMap"/>
<class name="SlopeMap"/>
- </tqcontains>
+ </contains>
</not>
<after><class name="NormalMap"/></after>
<after><class name="SlopeMap"/></after>
@@ -613,17 +613,17 @@
<rule>
<group name="Color"/>
<group name="ListPattern"/>
- <not><tqcontains><group name="Sum"/></tqcontains></not>
+ <not><contains><group name="Sum"/></contains></not>
</rule>
<rule>
<class name="Pattern"/>
<and>
<not>
- <tqcontains>
+ <contains>
<group name="Color"/>
<class name="Pattern"/>
<group name="ListPattern"/>
- </tqcontains>
+ </contains>
</not>
<not><after><group name="Map"/></after></not>
<not><after><class name="Warp"/></after></not>
@@ -639,11 +639,11 @@
<group name="Map"/>
<and>
<not>
- <tqcontains>
+ <contains>
<group name="Map"/>
<group name="ListPattern"/>
<group name="Color"/>
- </tqcontains>
+ </contains>
</not>
<not><before><class name="Pattern"/></before></not>
</and>
@@ -652,10 +652,10 @@
<class name="BlendMapModifiers"/>
<and>
<not>
- <tqcontains>
+ <contains>
<class name="BlendMapModifiers"/>
<group name="Color"/>
- </tqcontains>
+ </contains>
</not>
<not><before><group name="Map"/></before></not>
<not><before><class name="Pattern"/></before></not>
@@ -695,18 +695,18 @@
</rule>
<rule>
<class name="GlobalSettings"/>
- <not><tqcontains><class name="GlobalSettings"/></tqcontains></not>
+ <not><contains><class name="GlobalSettings"/></contains></not>
</rule>
</targetclass>
<targetclass name="GlobalSettings">
<rule>
<class name="Radiosity"/>
- <not><tqcontains><class name="Radiosity"/></tqcontains></not>
+ <not><contains><class name="Radiosity"/></contains></not>
</rule>
<rule>
<class name="GlobalPhotons"/>
- <not><tqcontains><class name="GlobalPhotons"/></tqcontains></not>
+ <not><contains><class name="GlobalPhotons"/></contains></not>
</rule>
</targetclass>
@@ -734,56 +734,56 @@
<rule>
<class name="MaterialMap"/>
<not>
- <tqcontains>
+ <contains>
<class name="TextureList"/>
<group name="SumMap"/>
<group name="SumPigment"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
<class name="Pigment"/>
<not>
- <tqcontains>
+ <contains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Pigment"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
<class name="Normal"/>
<not>
- <tqcontains>
+ <contains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Normal"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
<class name="Finish"/>
<not>
- <tqcontains>
+ <contains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Finish"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
<class name="Pattern"/>
<and>
<not>
- <tqcontains>
+ <contains>
<class name="Pattern"/>
<class name="TextureList"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
<not><after><class name="TextureMap"/></after></not>
<not><after><class name="Warp"/></after></not>
@@ -795,12 +795,12 @@
<class name="TextureMap"/>
<and>
<not>
- <tqcontains>
+ <contains>
<class name="TextureMap"/>
<class name="TextureList"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
<not><before><class name="Pattern"/></before></not>
<not><after><class name="BlendMapModifiers"/></after></not>
@@ -809,12 +809,12 @@
<rule>
<class name="TextureList"/>
<not>
- <tqcontains>
+ <contains>
<class name="TextureList"/>
<group name="SumMap"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
@@ -829,10 +829,10 @@
<class name="BlendMapModifiers"/>
<and>
<not>
- <tqcontains>
+ <contains>
<class name="MaterialMap"/>
<class name="BlendMapModifiers"/>
- </tqcontains>
+ </contains>
</not>
<not><before><class name="TextureMap"/></before></not>
<not><before><class name="Pattern"/></before></not>
@@ -860,56 +860,56 @@
<rule>
<class name="MaterialMap"/>
<not>
- <tqcontains>
+ <contains>
<class name="TextureList"/>
<group name="SumMap"/>
<group name="SumPigment"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
<class name="Pigment"/>
<not>
- <tqcontains>
+ <contains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Pigment"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
<class name="Normal"/>
<not>
- <tqcontains>
+ <contains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Normal"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
<class name="Finish"/>
<not>
- <tqcontains>
+ <contains>
<class name="TextureList"/>
<group name="SumMap"/>
<class name="Finish"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
<class name="Pattern"/>
<and>
<not>
- <tqcontains>
+ <contains>
<class name="Pattern"/>
<class name="TextureList"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
<not><after><class name="TextureMap"/></after></not>
<not><after><class name="Warp"/></after></not>
@@ -921,12 +921,12 @@
<class name="TextureMap"/>
<and>
<not>
- <tqcontains>
+ <contains>
<class name="TextureMap"/>
<class name="TextureList"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
<not><before><class name="Pattern"/></before></not>
<not><after><class name="BlendMapModifiers"/></after></not>
@@ -935,12 +935,12 @@
<rule>
<class name="TextureList"/>
<not>
- <tqcontains>
+ <contains>
<class name="TextureList"/>
<group name="SumMap"/>
<group name="SumPigment"/>
<class name="MaterialMap"/>
- </tqcontains>
+ </contains>
</not>
</rule>
<rule>
@@ -955,10 +955,10 @@
<class name="BlendMapModifiers"/>
<and>
<not>
- <tqcontains>
+ <contains>
<class name="MaterialMap"/>
<class name="BlendMapModifiers"/>
- </tqcontains>
+ </contains>
</not>
<not><before><class name="TextureMap"/></before></not>
<not><before><class name="Pattern"/></before></not>
diff --git a/kpovmodeler/pm2dcontrolpoint.cpp b/kpovmodeler/pm2dcontrolpoint.cpp
index 244b106f..f8450715 100644
--- a/kpovmodeler/pm2dcontrolpoint.cpp
+++ b/kpovmodeler/pm2dcontrolpoint.cpp
@@ -197,7 +197,7 @@ PMVector PM2DControlPoint::to3D( const PMVector& v ) const
void PM2DControlPoint::addLinkedPoint( PM2DControlPoint* p )
{
- if( !m_linkedPoints.tqcontainsRef( p ) )
+ if( !m_linkedPoints.containsRef( p ) )
m_linkedPoints.append( p );
}
diff --git a/kpovmodeler/pmaddcommand.cpp b/kpovmodeler/pmaddcommand.cpp
index 1f34e82c..5b258312 100644
--- a/kpovmodeler/pmaddcommand.cpp
+++ b/kpovmodeler/pmaddcommand.cpp
@@ -186,7 +186,7 @@ void PMAddCommand::undo( PMCommandManager* theManager )
if( decl )
{
m_links.append( lit.current( ) );
- if( !m_linkedDeclares.tqcontainsRef( decl ) )
+ if( !m_linkedDeclares.containsRef( decl ) )
m_linkedDeclares.append( decl );
}
}
diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp
index 49ee6366..3693bf6d 100644
--- a/kpovmodeler/pmdeclareedit.cpp
+++ b/kpovmodeler/pmdeclareedit.cpp
@@ -162,14 +162,14 @@ bool PMDeclareEdit::isDataValid( )
// valid identifer!
PMReservedWordDict* dict = PMScanner::reservedWords( );
- if( dict->tqfind( text.latin1( ) ) != -1 )
+ if( dict->find( text.latin1( ) ) != -1 )
{
KMessageBox::error( this, i18n( "You can't use a povray reserved word"
" as an identifier!" ), i18n( "Error" ) );
return false;
}
dict = PMScanner::directives( );
- if( dict->tqfind( text.latin1( ) ) != -1 )
+ if( dict->find( text.latin1( ) ) != -1 )
{
KMessageBox::error( this, i18n( "You can't use a povray directive"
" as an identifier!" ), i18n( "Error" ) );
@@ -178,7 +178,7 @@ bool PMDeclareEdit::isDataValid( )
// no reserved word
PMSymbolTable* st = part( )->symbolTable( );
- if( st->tqfind( text ) )
+ if( st->find( text ) )
{
KMessageBox::error( this, i18n( "Please enter a unique identifier!" ),
i18n( "Error" ) );
diff --git a/kpovmodeler/pmdeletecommand.cpp b/kpovmodeler/pmdeletecommand.cpp
index 663dae09..aa7497b2 100644
--- a/kpovmodeler/pmdeletecommand.cpp
+++ b/kpovmodeler/pmdeletecommand.cpp
@@ -105,7 +105,7 @@ void PMDeleteCommand::execute( PMCommandManager* theManager )
if( decl )
{
m_links.append( oit.current( ) );
- if( !m_linkedDeclares.tqcontainsRef( decl ) )
+ if( !m_linkedDeclares.containsRef( decl ) )
m_linkedDeclares.append( decl );
}
}
@@ -232,7 +232,7 @@ int PMDeleteCommand::errorFlags( PMPart* )
for( obj = links.current( ); obj && !insideSelection;
obj = obj->tqparent( ) )
{
- if( m_deletedObjects.tqfind( obj ) )
+ if( m_deletedObjects.find( obj ) )
insideSelection = true;
}
@@ -241,7 +241,7 @@ int PMDeleteCommand::errorFlags( PMPart* )
bool stop = false;
for( obj = links.current( ); obj && !stop; obj = obj->tqparent( ) )
{
- if( m_deletedObjects.tqfind( obj ) )
+ if( m_deletedObjects.find( obj ) )
stop = true;
else
m_deletedObjects.insert( obj, new bool( true ) );
diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp
index 21430704..542d3e20 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -408,8 +408,8 @@ void PMDialogEditBase::slotTexturePreview( )
{
link = rit.current( )->linkedObject( );
if( link )
- if( !neededDeclares.tqcontainsRef( link ) )
- if( !objectsToSerialize.tqfind( link ) )
+ if( !neededDeclares.containsRef( link ) )
+ if( !objectsToSerialize.find( link ) )
neededDeclares.append( link );
}
objectsToSerialize.insert( it.current( ), it.current( ) );
@@ -434,7 +434,7 @@ void PMDialogEditBase::slotTexturePreview( )
{
if( otr->type( ) == "Declare" )
{
- if( objectsToSerialize.tqfind( otr ) )
+ if( objectsToSerialize.find( otr ) )
{
dev->serialize( otr );
numDeclares--;
@@ -542,7 +542,7 @@ void PMDialogEditBase::slotPreviewFinished( int exitStatus )
"See the povray output for details." )
.tqarg( exitStatus ) );
}
- else if( m_pRenderWidget->povrayOutput( ).tqcontains( "ERROR" ) )
+ else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) )
{
KMessageBox::error( this, i18n( "There were errors while rendering.\n"
"See the povray output for details." ) );
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index a9e10a2d..b964f671 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -1464,10 +1464,10 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
}
w = p;
}
- if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "PMDockSplitter", "_dock_split_" ) ) return 0L;
- if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "PMDockTabGroup", "_dock_tab" ) ) return 0L;
+ if ( qt_find_obj_child( TQT_TQOBJECT(w), "PMDockSplitter", "_dock_split_" ) ) return 0L;
+ if ( qt_find_obj_child( TQT_TQOBJECT(w), "PMDockTabGroup", "_dock_tab" ) ) return 0L;
if (!childDockWidgetList) return 0L;
- if ( childDockWidgetList->tqfind(w) != -1 ) return 0L;
+ if ( childDockWidgetList->find(w) != -1 ) return 0L;
if ( currentDragWidget->isGroup && ((PMDockWidget*)w)->parentDockTabGroup() ) return 0L;
PMDockWidget* www = (PMDockWidget*)w;
@@ -1511,7 +1511,7 @@ void PMDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const
while ( it.current() ) {
if ( it.current()->isWidgetType() ) {
w = (TQWidget*)it.current();
- if ( w->isVisible() && w->tqgeometry().tqcontains(pos) ) {
+ if ( w->isVisible() && w->tqgeometry().contains(pos) ) {
if ( w->inherits("PMDockWidget") ) ww = w;
findChildDockWidget( ww, w, w->mapFromParent(pos) );
return;
@@ -1809,8 +1809,8 @@ void PMDockManager::writeConfig(TQDomElement &base)
nList.first();
while ( nList.current() ) {
PMDockWidget *obj = getDockWidgetFromName( nList.current() );
- if (obj->isGroup && (nameList.tqfind( obj->firstName.latin1() ) == -1
- || nameList.tqfind(obj->lastName.latin1()) == -1)) {
+ if (obj->isGroup && (nameList.find( obj->firstName.latin1() ) == -1
+ || nameList.find(obj->lastName.latin1()) == -1)) {
// Skip until tqchildren are saved (why?)
nList.next();
if ( !nList.current() ) nList.first();
@@ -2034,7 +2034,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
}
/*************************************************************************************************/
if ( obj->isGroup ){
- if ( findList.tqfind( obj->firstName.latin1() ) != -1 && findList.tqfind( obj->lastName.latin1() ) != -1 ){
+ if ( findList.find( obj->firstName.latin1() ) != -1 && findList.find( obj->lastName.latin1() ) != -1 ){
c->writeEntry( cname+":type", "GROUP");
if ( !obj->tqparent() ){
@@ -2057,9 +2057,9 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
} else {
/*************************************************************************************************/
//debug(" Skip %s", nList.current());
- //if ( findList.tqfind( obj->firstName ) == -1 )
+ //if ( findList.find( obj->firstName ) == -1 )
// debug(" ? Not found %s", obj->firstName);
- //if ( findList.tqfind( obj->lastName ) == -1 )
+ //if ( findList.find( obj->lastName ) == -1 )
// debug(" ? Not found %s", obj->lastName);
nList.next();
if ( !nList.current() ) nList.first();
diff --git a/kpovmodeler/pmdocumentationmap.cpp b/kpovmodeler/pmdocumentationmap.cpp
index 8fe29ce6..df2bf620 100644
--- a/kpovmodeler/pmdocumentationmap.cpp
+++ b/kpovmodeler/pmdocumentationmap.cpp
@@ -30,7 +30,7 @@ KStaticDeleter<PMDocumentationMap> PMDocumentationMap::s_staticDeleter;
TQString PMDocumentationVersion::documentation( const TQString& className ) const
{
- if( m_map.tqcontains( className ) )
+ if( m_map.contains( className ) )
return m_map[className];
return m_index;
}
diff --git a/kpovmodeler/pmenumproperty.cpp b/kpovmodeler/pmenumproperty.cpp
index 73a3446f..b300fafc 100644
--- a/kpovmodeler/pmenumproperty.cpp
+++ b/kpovmodeler/pmenumproperty.cpp
@@ -40,7 +40,7 @@ TQStringList PMEnumProperty::enumValues( ) const
bool PMEnumProperty::setProtected( PMObject* obj, const PMVariant& v )
{
- PMEnumStringValueMap::iterator it = m_stringMap.tqfind( v.stringData( ) );
+ PMEnumStringValueMap::iterator it = m_stringMap.find( v.stringData( ) );
if( it == m_stringMap.end( ) )
return false;
setEnum( obj, it.data( ) );
@@ -50,7 +50,7 @@ bool PMEnumProperty::setProtected( PMObject* obj, const PMVariant& v )
PMVariant PMEnumProperty::getProtected( const PMObject* obj )
{
int v = getEnum( obj );
- PMEnumValueStringMap::const_iterator it = m_valueMap.tqfind( v );
+ PMEnumValueStringMap::const_iterator it = m_valueMap.find( v );
if( it == m_valueMap.end( ) )
return PMVariant( TQString() );
return it.data( );
diff --git a/kpovmodeler/pmerrordialog.cpp b/kpovmodeler/pmerrordialog.cpp
index b8a11630..2ff5994f 100644
--- a/kpovmodeler/pmerrordialog.cpp
+++ b/kpovmodeler/pmerrordialog.cpp
@@ -53,7 +53,7 @@ PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags,
PMObject* obj = pit.current( )->linkedObject( );
for( ; obj; obj = obj->tqparent( ) )
{
- TQPtrList<PMMessage>* pList = m_messageDict.tqfind( obj );
+ TQPtrList<PMMessage>* pList = m_messageDict.find( obj );
if( !pList )
{
pList = new TQPtrList<PMMessage>;
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 91e6d797..9b7779ae 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -1064,7 +1064,7 @@ PMVector PMGLView::mousePosition( PMControlPoint* cp, int x, int y )
result[1] = screenToInternalY( y );
if( cp )
{
- index = m_controlPoints.tqfindRef( cp );
+ index = m_controlPoints.findRef( cp );
if( index >= 0 )
{
p = m_controlPointsPosition.at( ( uint ) index );
diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp
index 5e322d95..3804d89d 100644
--- a/kpovmodeler/pmimagemapedit.cpp
+++ b/kpovmodeler/pmimagemapedit.cpp
@@ -535,7 +535,7 @@ void PMImageMapEdit::slotAddFilterEntry( )
if( button )
{
- int index = m_filterAddButtons.tqfindRef( button );
+ int index = m_filterAddButtons.findRef( button );
if( index >= 0 )
{
entriesFilters = filters( );
@@ -561,7 +561,7 @@ void PMImageMapEdit::slotRemoveFilterEntry( )
if( button )
{
- int index = m_filterRemoveButtons.tqfindRef( button );
+ int index = m_filterRemoveButtons.findRef( button );
if( index >= 0 )
{
entriesFilters = filters( );
@@ -583,7 +583,7 @@ void PMImageMapEdit::slotAddTransmitEntry( )
if( button )
{
- int index = m_transmitAddButtons.tqfindRef( button );
+ int index = m_transmitAddButtons.findRef( button );
if( index >= 0 )
{
entriesTransmits = transmits( );
@@ -609,7 +609,7 @@ void PMImageMapEdit::slotRemoveTransmitEntry( )
if( button )
{
- int index = m_transmitRemoveButtons.tqfindRef( button );
+ int index = m_transmitRemoveButtons.findRef( button );
if( index >= 0 )
{
entriesTransmits = transmits( );
diff --git a/kpovmodeler/pminsertrules.dtd b/kpovmodeler/pminsertrules.dtd
index 4b9a46d7..a3c2128c 100644
--- a/kpovmodeler/pminsertrules.dtd
+++ b/kpovmodeler/pminsertrules.dtd
@@ -39,23 +39,23 @@
Insert a list of groups and classes (the object classes that can be inserted)
and one condition. If the condition is omitted,
the classes can allways be inserted. -->
-<!ELEMENT rule ((group | class)+, (and | or | not | before | after | tqcontains
+<!ELEMENT rule ((group | class)+, (and | or | not | before | after | contains
| greater | less | equal)?)>
<!-- Simple negation. Insert one condition -->
-<!ELEMENT not (and | or | before | after | tqcontains | greater | less | equal)>
+<!ELEMENT not (and | or | before | after | contains | greater | less | equal)>
<!-- Logical and. Insert any number of conditions -->
-<!ELEMENT and (and | or | not | before | after | tqcontains | greater | less | equal)+>
+<!ELEMENT and (and | or | not | before | after | contains | greater | less | equal)+>
<!-- Logical or. Insert any number of conditions -->
-<!ELEMENT or (and | or | not | before | after | tqcontains | greater | less | equal)+>
+<!ELEMENT or (and | or | not | before | after | contains | greater | less | equal)+>
-<!-- Condition. Value is true if the object already tqcontains
+<!-- Condition. Value is true if the object already contains
objects of the given class or group before the insert point. -->
<!ELEMENT before (class | group)>
-<!-- Condition. Value is true if the object already tqcontains
+<!-- Condition. Value is true if the object already contains
objects of the given class or group after the insert point. -->
<!ELEMENT after (class | group)>
@@ -71,9 +71,9 @@
is less than the second. -->
<!ELEMENT less ((property | count | const), (property | count | const))>
-<!-- Condition. Value is true if the object tqcontains
+<!-- Condition. Value is true if the object contains
objects of the given classes and groups. -->
-<!ELEMENT tqcontains (group | class)+>
+<!ELEMENT contains (group | class)+>
<!-- Value. Value is the class property of the object, where the
diff --git a/kpovmodeler/pminsertrulesystem.cpp b/kpovmodeler/pminsertrulesystem.cpp
index 1090837f..0cd2a4d0 100644
--- a/kpovmodeler/pminsertrulesystem.cpp
+++ b/kpovmodeler/pminsertrulesystem.cpp
@@ -136,7 +136,7 @@ bool isCondition( TQDomElement& e )
{
return( e.tagName( ) == "not" || e.tagName( ) == "and" ||
e.tagName( ) == "or" || e.tagName( ) == "before" ||
- e.tagName( ) == "after" || e.tagName( ) == "tqcontains" ||
+ e.tagName( ) == "after" || e.tagName( ) == "contains" ||
e.tagName( ) == "greater" || e.tagName( ) == "less" ||
e.tagName( ) == "equal" );
}
@@ -168,7 +168,7 @@ PMRuleCondition* newCondition( TQDomElement& e,
return new PMRuleBefore( e, globalGroups, localGroups );
if( e.tagName( ) == "after" )
return new PMRuleAfter( e, globalGroups, localGroups );
- if( e.tagName( ) == "tqcontains" )
+ if( e.tagName( ) == "contains" )
return new PMRuleContains( e, globalGroups, localGroups );
if( e.tagName( ) == "greater" )
return new PMRuleGreater( e, globalGroups, localGroups );
@@ -383,7 +383,7 @@ PMRuleBefore::PMRuleBefore( TQDomElement& e,
TQPtrList<PMRuleDefineGroup>& localGroups )
: PMRuleCondition( )
{
- m_tqcontains = false;
+ m_contains = false;
TQDomNode m = e.firstChild( );
while( !m.isNull( ) )
{
@@ -405,23 +405,23 @@ PMRuleBefore::~PMRuleBefore( )
bool PMRuleBefore::evaluate( const PMObject* )
{
- return m_tqcontains;
+ return m_contains;
}
void PMRuleBefore::countChildProtected( const TQString& className,
bool afterInsertPoint )
{
- if( afterInsertPoint && !m_tqcontains )
+ if( afterInsertPoint && !m_contains )
{
TQPtrListIterator<PMRuleCategory> it( m_categories );
- for( ; it.current( ) && !m_tqcontains; ++it )
- m_tqcontains = it.current( )->matches( className );
+ for( ; it.current( ) && !m_contains; ++it )
+ m_contains = it.current( )->matches( className );
}
}
void PMRuleBefore::resetProtected( )
{
- m_tqcontains = false;
+ m_contains = false;
}
PMRuleAfter::PMRuleAfter( TQDomElement& e,
@@ -429,7 +429,7 @@ PMRuleAfter::PMRuleAfter( TQDomElement& e,
TQPtrList<PMRuleDefineGroup>& localGroups )
: PMRuleCondition( )
{
- m_tqcontains = false;
+ m_contains = false;
TQDomNode m = e.firstChild( );
while( !m.isNull( ) )
{
@@ -451,23 +451,23 @@ PMRuleAfter::~PMRuleAfter( )
bool PMRuleAfter::evaluate( const PMObject* )
{
- return m_tqcontains;
+ return m_contains;
}
void PMRuleAfter::countChildProtected( const TQString& className,
bool afterInsertPoint )
{
- if( !afterInsertPoint && !m_tqcontains )
+ if( !afterInsertPoint && !m_contains )
{
TQPtrListIterator<PMRuleCategory> it( m_categories );
- for( ; it.current( ) && !m_tqcontains; ++it )
- m_tqcontains = it.current( )->matches( className );
+ for( ; it.current( ) && !m_contains; ++it )
+ m_contains = it.current( )->matches( className );
}
}
void PMRuleAfter::resetProtected( )
{
- m_tqcontains = false;
+ m_contains = false;
}
PMRuleContains::PMRuleContains( TQDomElement& e,
@@ -475,7 +475,7 @@ PMRuleContains::PMRuleContains( TQDomElement& e,
TQPtrList<PMRuleDefineGroup>& localGroups )
: PMRuleCondition( )
{
- m_tqcontains = false;
+ m_contains = false;
TQDomNode m = e.firstChild( );
while( !m.isNull( ) )
{
@@ -497,22 +497,22 @@ PMRuleContains::~PMRuleContains( )
bool PMRuleContains::evaluate( const PMObject* )
{
- return m_tqcontains;
+ return m_contains;
}
void PMRuleContains::countChildProtected( const TQString& className, bool )
{
- if( !m_tqcontains )
+ if( !m_contains )
{
TQPtrListIterator<PMRuleCategory> it( m_categories );
- for( ; it.current( ) && !m_tqcontains; ++it )
- m_tqcontains = it.current( )->matches( className );
+ for( ; it.current( ) && !m_contains; ++it )
+ m_contains = it.current( )->matches( className );
}
}
void PMRuleContains::resetProtected( )
{
- m_tqcontains = false;
+ m_contains = false;
}
PMRuleCompare::PMRuleCompare( TQDomElement& e,
@@ -829,7 +829,7 @@ PMInsertRuleSystem::~PMInsertRuleSystem( )
void PMInsertRuleSystem::loadRules( const TQString& fileName )
{
PMRuleClass::s_pPrototypeManager = m_pPart->prototypeManager( );
- if( m_loadedFiles.tqfind( fileName ) != m_loadedFiles.end( ) )
+ if( m_loadedFiles.find( fileName ) != m_loadedFiles.end( ) )
return;
m_loadedFiles.push_back( fileName );
@@ -877,7 +877,7 @@ void PMInsertRuleSystem::loadRules( const TQString& fileName )
PMRuleTargetClass* target = 0;
if( !m_rulesDict.isEmpty( ) )
- target = m_rulesDict.tqfind( className );
+ target = m_rulesDict.find( className );
if( target )
target->appendRules( ce, m_groups );
@@ -908,7 +908,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
PMMetaObject* meta = parentObject->tqmetaObject( );
for( ; meta && !possible; meta = meta->superClass( ) )
{
- PMRuleTargetClass* tc = m_rulesDict.tqfind( meta->className( ) );
+ PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) );
if( tc )
{
// check the exception list
@@ -999,7 +999,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
PMMetaObject* meta = parentObject->tqmetaObject( );
for( ; meta; meta = meta->superClass( ) )
{
- PMRuleTargetClass* tc = m_rulesDict.tqfind( meta->className( ) );
+ PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) );
if( tc )
targetClassList.append( tc );
}
diff --git a/kpovmodeler/pminsertrulesystem.h b/kpovmodeler/pminsertrulesystem.h
index 0f13a099..2559fdba 100644
--- a/kpovmodeler/pminsertrulesystem.h
+++ b/kpovmodeler/pminsertrulesystem.h
@@ -344,7 +344,7 @@ private:
};
/**
- * Condition. Value is true if the object already tqcontains
+ * Condition. Value is true if the object already contains
* objects of certaint classes before the insert point.
*/
class PMRuleBefore : public PMRuleCondition
@@ -371,11 +371,11 @@ protected:
virtual void resetProtected( );
private:
TQPtrList<PMRuleCategory> m_categories;
- bool m_tqcontains;
+ bool m_contains;
};
/**
- * Condition. Value is true if the object already tqcontains
+ * Condition. Value is true if the object already contains
* objects of certaint classes after the insert point.
*/
class PMRuleAfter : public PMRuleCondition
@@ -402,11 +402,11 @@ protected:
virtual void resetProtected( );
private:
TQPtrList<PMRuleCategory> m_categories;
- bool m_tqcontains;
+ bool m_contains;
};
/**
- * Condition. Value is true if the object already tqcontains
+ * Condition. Value is true if the object already contains
* objects of certaint classes.
*/
class PMRuleContains : public PMRuleCondition
@@ -433,7 +433,7 @@ protected:
virtual void resetProtected( );
private:
TQPtrList<PMRuleCategory> m_categories;
- bool m_tqcontains;
+ bool m_contains;
};
/**
diff --git a/kpovmodeler/pmiomanager.cpp b/kpovmodeler/pmiomanager.cpp
index 14aab5f5..946f2bc5 100644
--- a/kpovmodeler/pmiomanager.cpp
+++ b/kpovmodeler/pmiomanager.cpp
@@ -47,9 +47,9 @@ void PMIOManager::addFormat( PMIOFormat* format )
{
if( !format )
return;
- if( !m_formats.tqcontainsRef( format ) )
+ if( !m_formats.containsRef( format ) )
{
- if( !m_dict.tqfind( format->name( ) ) )
+ if( !m_dict.find( format->name( ) ) )
{
m_formats.append( format );
m_dict.insert( format->name( ), format );
@@ -73,7 +73,7 @@ void PMIOManager::removeFormat( const TQString& name )
PMIOFormat* PMIOManager::format( const TQString& name ) const
{
- return m_dict.tqfind( name );
+ return m_dict.find( name );
}
PMIOFormat* PMIOManager::formatForMimeType( const TQString& mime ) const
diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp
index a1be809b..578391c8 100644
--- a/kpovmodeler/pmlayoutsettings.cpp
+++ b/kpovmodeler/pmlayoutsettings.cpp
@@ -262,7 +262,7 @@ void PMLayoutSettings::slotAddLayout( )
new_name = i18n( "Unnamed" );
str.setNum( i );
- while( m_pViewLayouts->tqfindItem( new_name, TQt::ExactMatch ) )
+ while( m_pViewLayouts->findItem( new_name, TQt::ExactMatch ) )
{
new_name = i18n( "Unnamed" ) + str;
i++;
@@ -275,7 +275,7 @@ void PMLayoutSettings::slotAddLayout( )
m_currentViewLayout++;
m_viewLayouts.insert( m_currentViewLayout, l );
displayLayoutList( );
- m_pViewLayouts->setCurrentItem( m_pViewLayouts->tqfindItem( new_name, TQt::ExactMatch ) );
+ m_pViewLayouts->setCurrentItem( m_pViewLayouts->findItem( new_name, TQt::ExactMatch ) );
m_pRemoveLayout->setEnabled( true );
}
diff --git a/kpovmodeler/pmlibraryhandle.cpp b/kpovmodeler/pmlibraryhandle.cpp
index 36ed2d2a..8ba0f387 100644
--- a/kpovmodeler/pmlibraryhandle.cpp
+++ b/kpovmodeler/pmlibraryhandle.cpp
@@ -302,7 +302,7 @@ PMLibraryHandle::PMResult PMLibraryHandle::createNewSubLibrary( const TQString /
if( m_readOnly )
return PMLibraryHandle::ReadOnlyLib;
- if( m_libraries.tqfind( subLibName ) )
+ if( m_libraries.find( subLibName ) )
return PMLibraryHandle::ExistingDir;
s = s+ "/libXXXXXX";
@@ -364,14 +364,14 @@ PMLibraryHandle::PMResult PMLibraryHandle::changeParentLibrary( const TQString&
{
PMLibraryHandle lib = PMLibraryHandle( *itr.current( ) );
lib.changeParentLibrary( newPath );
- m_libraries.tqreplace( itr.currentKey( ), new TQString( newPath + "/" + lib.path( ) ) );
+ m_libraries.replace( itr.currentKey( ), new TQString( newPath + "/" + lib.path( ) ) );
}
PMLibraryHandle::EntryIterator objItr( m_objects );
for( ; objItr.current( ); ++objItr )
{
TQString test = newPath + "/" + objItr.current( )->section( '/', -1 );
- m_objects.tqreplace( objItr.currentKey( ), new TQString( newPath + "/" + objItr.current( )->section( '/', -1 ) ) );
+ m_objects.replace( objItr.currentKey( ), new TQString( newPath + "/" + objItr.current( )->section( '/', -1 ) ) );
}
saveLibraryInfo( );
diff --git a/kpovmodeler/pmmetaobject.h b/kpovmodeler/pmmetaobject.h
index a0b3ce90..95822fc9 100644
--- a/kpovmodeler/pmmetaobject.h
+++ b/kpovmodeler/pmmetaobject.h
@@ -402,7 +402,7 @@ public:
*/
PMPropertyBase* property( const TQString& name ) const
{
- return m_propertiesDict.tqfind( name );
+ return m_propertiesDict.find( name );
}
private:
diff --git a/kpovmodeler/pmmovecommand.cpp b/kpovmodeler/pmmovecommand.cpp
index e45a8bf3..124de7a3 100644
--- a/kpovmodeler/pmmovecommand.cpp
+++ b/kpovmodeler/pmmovecommand.cpp
@@ -281,7 +281,7 @@ int PMMoveCommand::errorFlags( PMPart* )
for( obj = links.current( ); obj && !insideSelection;
obj = obj->tqparent( ) )
{
- if( deletedObjects.tqfind( obj ) )
+ if( deletedObjects.find( obj ) )
insideSelection = true;
}
@@ -290,7 +290,7 @@ int PMMoveCommand::errorFlags( PMPart* )
bool stop = false;
for( obj = links.current( ); obj && !stop; obj = obj->tqparent( ) )
{
- if( deletedObjects.tqfind( obj ) )
+ if( deletedObjects.find( obj ) )
stop = true;
else
deletedObjects.insert( obj, new bool( true ) );
@@ -327,7 +327,7 @@ int PMMoveCommand::errorFlags( PMPart* )
// check if insert point is before the top level
// tqparent object
- if( !objectsAfterInsertPosition.tqfind( obj ) )
+ if( !objectsAfterInsertPosition.find( obj ) )
{
stop = false;
obj = obj->prevSibling( );
@@ -335,7 +335,7 @@ int PMMoveCommand::errorFlags( PMPart* )
{
if( obj == m_pAfter )
stop = true;
- else if( objectsAfterInsertPosition.tqfind( obj ) )
+ else if( objectsAfterInsertPosition.find( obj ) )
stop = true;
else
obj = obj->prevSibling( );
@@ -419,13 +419,13 @@ int PMMoveCommand::errorFlags( PMPart* )
if( linked )
{
- if( !deletedObjects.tqfind( linked ) )
+ if( !deletedObjects.find( linked ) )
{
// Object is linked to a declare and the declare
// will not be moved.
// Check, if the insert point is after the declare
- if( !declaresBeforeInsertPosition.tqfind( linked ) )
+ if( !declaresBeforeInsertPosition.find( linked ) )
ok = false;
}
}
diff --git a/kpovmodeler/pmobjectselect.cpp b/kpovmodeler/pmobjectselect.cpp
index 5469c487..e234921a 100644
--- a/kpovmodeler/pmobjectselect.cpp
+++ b/kpovmodeler/pmobjectselect.cpp
@@ -202,7 +202,7 @@ int PMObjectSelect::selectObject( PMObject* link,
while( o && !l && last )
{
- if( t.tqfindIndex( o->type( ) ) >= 0 )
+ if( t.findIndex( o->type( ) ) >= 0 )
s.m_pListBox->insertItem( new PMListBoxObject( o ) );
if( o == last )
@@ -325,7 +325,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy
if( o->type( ) == "Declare" )
{
decl = ( PMDeclare* ) o;
- if( declareTypes.tqfindIndex( decl->declareType( ) ) >= 0 )
+ if( declareTypes.findIndex( decl->declareType( ) ) >= 0 )
s.m_pListBox->insertItem( new PMListBoxObject( o ) );
}
diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp
index e2801943..99398ce7 100644
--- a/kpovmodeler/pmparser.cpp
+++ b/kpovmodeler/pmparser.cpp
@@ -304,9 +304,9 @@ bool PMParser::insertChild( PMObject* child, PMObject* tqparent )
void PMParser::checkID( PMDeclare* decl )
{
PMSymbolTable* st = m_pPart->symbolTable( );
- PMSymbol* s = m_pLocalST.tqfind( decl->id( ) );
+ PMSymbol* s = m_pLocalST.find( decl->id( ) );
if( !s )
- s = st->tqfind( decl->id( ) );
+ s = st->find( decl->id( ) );
if( s )
{
@@ -336,7 +336,7 @@ void PMParser::checkID( PMDeclare* decl )
void PMParser::checkID( const TQString& id, const PMValue& v )
{
PMSymbolTable* st = m_pPart->symbolTable( );
- PMSymbol* s = m_pLocalST.tqfind( id );
+ PMSymbol* s = m_pLocalST.find( id );
if( s )
{
@@ -374,9 +374,9 @@ PMDeclare* PMParser::checkLink( const TQString& id )
bool ok = false;
// is object declared?
- PMSymbol* s = m_pLocalST.tqfind( id );
+ PMSymbol* s = m_pLocalST.find( id );
if( !s )
- s = t->tqfind( id );
+ s = t->find( id );
if( !s )
printError( i18n( "Undefined object \"%1\"." ).tqarg( id ) );
@@ -386,7 +386,7 @@ PMDeclare* PMParser::checkLink( const TQString& id )
{
// the object is declared
// is the id already in m_okDeclares
- bool* lok = m_okDeclares.tqfind( id );
+ bool* lok = m_okDeclares.find( id );
if( lok )
ok = true;
else
@@ -425,9 +425,9 @@ PMDeclare* PMParser::checkLink( const TQString& id )
PMSymbol* PMParser::getSymbol( const TQString& id ) const
{
- PMSymbol* s = m_pLocalST.tqfind( id );
+ PMSymbol* s = m_pLocalST.find( id );
if( !s )
- s = m_pPart->symbolTable( )->tqfind( id );
+ s = m_pPart->symbolTable( )->find( id );
return s;
}
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index 7dec1524..01b36deb 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -1023,7 +1023,7 @@ bool PMPart::setActiveObject( const TQString& name )
tmpObj = activeObject( );
// get the first element
- pos = objPath.tqfind( '/' );
+ pos = objPath.find( '/' );
if( pos != -1 )
{
pathElem = objPath.mid( 0, pos );
@@ -1040,10 +1040,10 @@ bool PMPart::setActiveObject( const TQString& name )
if( !pathElem.isEmpty( ) )
{
// Special treatment for brackets
- firstBracket = pathElem.tqfind( '[' );
+ firstBracket = pathElem.find( '[' );
if( firstBracket != -1 )
{
- lastBracket = pathElem.tqfindRev( ']' );
+ lastBracket = pathElem.findRev( ']' );
objIndex = pathElem.mid( firstBracket + 1, lastBracket - firstBracket - 1).toInt( );
pathElem = pathElem.left( firstBracket );
}
@@ -1070,7 +1070,7 @@ bool PMPart::setActiveObject( const TQString& name )
}
// Get the next element
- pos = objPath.tqfind( '/' );
+ pos = objPath.find( '/' );
if( pos != -1 )
{
pathElem = objPath.mid( 0, pos );
@@ -1864,7 +1864,7 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m,
else
m_pNewSelection = 0;
}
- if( m_selectedObjects.tqcontainsRef( obj ) )
+ if( m_selectedObjects.containsRef( obj ) )
{
m_selectedObjects.removeRef( obj );
if( m_selectedObjects.isEmpty( ) )
@@ -1903,7 +1903,7 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m,
if( obj->isA( "Declare" ) )
{
PMDeclare* decl = ( PMDeclare* ) obj;
- PMSymbol* s = m_pSymbolTable->tqfind( decl->id( ) );
+ PMSymbol* s = m_pSymbolTable->find( decl->id( ) );
if( !s )
m_pSymbolTable->insert( decl->id( ),
new PMSymbol( decl->id( ), decl ) );
@@ -1977,7 +1977,7 @@ void PMPart::slotIDChanged( PMObject* obj, const TQString& oldID )
if( obj->isA( "Declare" ) )
{
PMDeclare* d = ( PMDeclare* ) obj;
- PMSymbol* s = m_pSymbolTable->tqfind( oldID );
+ PMSymbol* s = m_pSymbolTable->find( oldID );
if( s )
{
if( s->type( ) == PMSymbol::Object )
diff --git a/kpovmodeler/pmpluginmanager.cpp b/kpovmodeler/pmpluginmanager.cpp
index 1453f76d..7af50d5c 100644
--- a/kpovmodeler/pmpluginmanager.cpp
+++ b/kpovmodeler/pmpluginmanager.cpp
@@ -81,7 +81,7 @@ PMPluginManager* PMPluginManager::theManager( )
void PMPluginManager::registerPart( PMPart* p )
{
- if( !m_parts.tqcontainsRef( p ) )
+ if( !m_parts.containsRef( p ) )
{
m_parts.append( p );
Plugin::loadPlugins( p, p, PMFactory::instance( ), false );
diff --git a/kpovmodeler/pmpovrayformat.cpp b/kpovmodeler/pmpovrayformat.cpp
index 9824680a..35e0881a 100644
--- a/kpovmodeler/pmpovrayformat.cpp
+++ b/kpovmodeler/pmpovrayformat.cpp
@@ -32,7 +32,7 @@ PMPovrayFormat::~PMPovrayFormat( )
void PMPovrayFormat::registerMethod( const TQString& className,
PMPovraySerializeMethod method )
{
- PMPovraySerializeMethodInfo* info = m_methodDict.tqfind( className );
+ PMPovraySerializeMethodInfo* info = m_methodDict.find( className );
if( info )
kdWarning( PMArea ) << "Serialization method for " << className
<< " shadows old implementation" << endl;
@@ -48,5 +48,5 @@ void PMPovrayFormat::removeMethod( const TQString& className )
const PMPovraySerializeMethodInfo* PMPovrayFormat::serializationMethod(
const TQString& className )
{
- return m_methodDict.tqfind( className );
+ return m_methodDict.find( className );
}
diff --git a/kpovmodeler/pmpovrayparser.cpp b/kpovmodeler/pmpovrayparser.cpp
index 5889cd19..ad19c67f 100644
--- a/kpovmodeler/pmpovrayparser.cpp
+++ b/kpovmodeler/pmpovrayparser.cpp
@@ -4658,7 +4658,7 @@ bool PMPovrayParser::parseNormalMap( PMNormalMap* normalMap )
{
oldConsumed = m_consumedTokens;
- // If we tqfind '}' no need to search for an entry
+ // If we find '}' no need to search for an entry
if( m_token != '}' && parseToken( '[' ) )
{
if( !parseFloat( f_number1 ) )
@@ -4958,7 +4958,7 @@ bool PMPovrayParser::parseSlopeMap( PMSlopeMap* slopeMap )
{
oldConsumed = m_consumedTokens;
- // If we tqfind '}' no need to search for an entry
+ // If we find '}' no need to search for an entry
if( m_token != '}' && parseToken( '[' ) )
{
if( !parseFloat( f_number1 ) )
@@ -5014,7 +5014,7 @@ bool PMPovrayParser::parseDensityMap( PMDensityMap* densityMap )
{
oldConsumed = m_consumedTokens;
- // If we tqfind '}' no need to search for an entry
+ // If we find '}' no need to search for an entry
if( m_token != '}' && parseToken( '[' ) )
{
if( !parseFloat( f_number1 ) )
diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp
index 59ed9a71..4f6b8474 100644
--- a/kpovmodeler/pmpovraysettings.cpp
+++ b/kpovmodeler/pmpovraysettings.cpp
@@ -193,7 +193,7 @@ void PMPovraySettings::slotAddPath( )
TQString path = KFileDialog::getExistingDirectory( TQString(), this );
if( !path.isEmpty( ) )
{
- TQListBoxItem* item = m_pLibraryPaths->tqfindItem( path, ExactMatch );
+ TQListBoxItem* item = m_pLibraryPaths->findItem( path, ExactMatch );
if( !item )
{
m_pLibraryPaths->insertItem( path, m_selectionIndex + 1 );
@@ -250,7 +250,7 @@ void PMPovraySettings::slotEditPath( )
TQString path = KFileDialog::getExistingDirectory( text, this );
if( !path.isEmpty( ) )
{
- TQListBoxItem* item = m_pLibraryPaths->tqfindItem( path, ExactMatch );
+ TQListBoxItem* item = m_pLibraryPaths->findItem( path, ExactMatch );
if( !item )
m_pLibraryPaths->changeItem( path, m_selectionIndex );
else if( item != lbi )
diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp
index 6e462edd..c86eabe1 100644
--- a/kpovmodeler/pmpovraywidget.cpp
+++ b/kpovmodeler/pmpovraywidget.cpp
@@ -337,7 +337,7 @@ void PMPovrayWidget::slotRenderingFinished( int returntqStatus )
"See the povray output for details." )
.tqarg( returntqStatus ) );
}
- else if( m_pRenderWidget->povrayOutput( ).tqcontains( "ERROR" ) )
+ else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) )
{
KMessageBox::error( this, i18n( "There were errors while rendering.\n"
"See the povray output for details." ) );
diff --git a/kpovmodeler/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp
index db85654d..5ce7910d 100644
--- a/kpovmodeler/pmprismedit.cpp
+++ b/kpovmodeler/pmprismedit.cpp
@@ -452,7 +452,7 @@ void PMPrismEdit::slotAddPointAbove( )
TQPushButton* bt = ( TQPushButton* ) sender( );
if( bt )
{
- int subIndex = m_addAboveButtons.tqfindRef( bt );
+ int subIndex = m_addAboveButtons.findRef( bt );
if( subIndex >= 0 )
{
PMVectorListEdit* ed = m_points.at( subIndex );
@@ -488,7 +488,7 @@ void PMPrismEdit::slotAddPointBelow( )
TQPushButton* bt = ( TQPushButton* ) sender( );
if( bt )
{
- int subIndex = m_addBelowButtons.tqfindRef( bt );
+ int subIndex = m_addBelowButtons.findRef( bt );
if( subIndex >= 0 )
{
PMVectorListEdit* ed = m_points.at( subIndex );
@@ -524,7 +524,7 @@ void PMPrismEdit::slotRemovePoint( )
TQPushButton* bt = ( TQPushButton* ) sender( );
if( bt )
{
- int subIndex = m_removeButtons.tqfindRef( bt );
+ int subIndex = m_removeButtons.findRef( bt );
if( subIndex >= 0 )
{
PMVectorListEdit* ed = m_points.at( subIndex );
@@ -560,7 +560,7 @@ void PMPrismEdit::slotAddSubPrism( )
TQPushButton* button = ( TQPushButton* ) sender( );
if( button )
{
- int index = m_subPrismAddButtons.tqfindRef( button );
+ int index = m_subPrismAddButtons.findRef( button );
if( index >= 0 )
{
TQValueList< TQValueList<PMVector> > points = splinePoints( );
@@ -600,7 +600,7 @@ void PMPrismEdit::slotRemoveSubPrism( )
TQPushButton* button = ( TQPushButton* ) sender( );
if( button )
{
- int index = m_subPrismRemoveButtons.tqfindRef( button );
+ int index = m_subPrismRemoveButtons.findRef( button );
if( index >= 0 )
{
TQValueList< TQValueList<PMVector> > points = splinePoints( );
diff --git a/kpovmodeler/pmprototypemanager.cpp b/kpovmodeler/pmprototypemanager.cpp
index 1df5540f..fd02e50b 100644
--- a/kpovmodeler/pmprototypemanager.cpp
+++ b/kpovmodeler/pmprototypemanager.cpp
@@ -148,7 +148,7 @@ void PMPrototypeManager::addPrototype( PMObject* obj )
return;
PMMetaObject* tqmetaObject = obj->tqmetaObject( );
- PMMetaObject* m2 = m_metaDict.tqfind( tqmetaObject->className( ) );
+ PMMetaObject* m2 = m_metaDict.find( tqmetaObject->className( ) );
if( m2 )
{
kdError( PMArea ) << "PMPrototypeManager: Class '"
@@ -168,7 +168,7 @@ void PMPrototypeManager::addPrototype( PMObject* obj )
// insert the meta object and all super classes into the hash table
while( tqmetaObject )
{
- if( m_metaDict.tqfind( tqmetaObject->className( ) ) )
+ if( m_metaDict.find( tqmetaObject->className( ) ) )
tqmetaObject = 0;
else
{
@@ -206,7 +206,7 @@ PMObject* PMPrototypeManager::newObject( const TQString& name ) const
if( name.isEmpty( ) )
return 0;
- PMMetaObject* meta = m_metaDict.tqfind( name );
+ PMMetaObject* meta = m_metaDict.find( name );
if( !meta )
return 0;
return meta->newObject( m_pPart );
@@ -216,7 +216,7 @@ PMMetaObject* PMPrototypeManager::tqmetaObject( const TQString& name ) const
{
if( name.isNull( ) )
return 0;
- return m_metaDict.tqfind( name );
+ return m_metaDict.find( name );
}
bool PMPrototypeManager::isA( const TQString& className,
@@ -236,7 +236,7 @@ bool PMPrototypeManager::isA( PMMetaObject* c,
TQString PMPrototypeManager::className( const TQString& lowercase ) const
{
- TQMap<TQString, TQString>::const_iterator it = m_lowerCaseDict.tqfind( lowercase );
+ TQMap<TQString, TQString>::const_iterator it = m_lowerCaseDict.find( lowercase );
if( it != m_lowerCaseDict.end( ) )
return *it;
return TQString();
diff --git a/kpovmodeler/pmrendermanager.cpp b/kpovmodeler/pmrendermanager.cpp
index ff7d5987..5d6edbbb 100644
--- a/kpovmodeler/pmrendermanager.cpp
+++ b/kpovmodeler/pmrendermanager.cpp
@@ -146,7 +146,7 @@ void PMRenderManager::addView( PMGLView* view, PMObject* active, PMObject* top,
restart = true;
else if( graphicalChange )
{
- m_renderTasks.tqfindRef( task );
+ m_renderTasks.findRef( task );
m_renderTasks.take( );
m_renderTasks.prepend( task );
restart = true;
@@ -205,12 +205,12 @@ void PMRenderManager::removeView( PMGLView* view )
bool PMRenderManager::containsTask( PMGLView* view ) const
{
PMRenderTaskListIterator it( m_renderTasks );
- bool tqcontains = false;
+ bool contains = false;
- for( ; it.current( ) && !tqcontains; ++it )
+ for( ; it.current( ) && !contains; ++it )
if( it.current( )->view( ) == view )
- tqcontains = true;
- return tqcontains;
+ contains = true;
+ return contains;
}
TQColor PMRenderManager::controlPointColor( int i ) const
@@ -1411,7 +1411,7 @@ void PMRenderManager::renderGrid( )
glEnd( );
TQString label = TQString( "%1" ).tqarg( x * signx, 0, 'g', 4 );
- if( approxZero( x ) && label.tqfind( "e-" ) )
+ if( approxZero( x ) && label.find( "e-" ) )
label = "0";
renderString( label, screenx + 3, height / 2 - fontHeight - 2 );
@@ -1432,7 +1432,7 @@ void PMRenderManager::renderGrid( )
glEnd( );
TQString label = TQString( "%1" ).tqarg( y * signy, 0, 'g', 4 );
- if( approxZero( y ) && label.tqfind( "e-" ) )
+ if( approxZero( y ) && label.find( "e-" ) )
label = "0";
renderString( label, -width / 2 + 3, screeny + 2 );
diff --git a/kpovmodeler/pmresourcelocator.cpp b/kpovmodeler/pmresourcelocator.cpp
index 46ab9502..e8fb9eb0 100644
--- a/kpovmodeler/pmresourcelocator.cpp
+++ b/kpovmodeler/pmresourcelocator.cpp
@@ -56,7 +56,7 @@ TQString PMResourceLocator::lookUp( const TQString& file )
kdDebug( PMArea ) << "LookUp: " << file << endl;
- TQString* ps = m_cache.tqfind( file );
+ TQString* ps = m_cache.find( file );
if( ps )
return *ps;
diff --git a/kpovmodeler/pmscanner.h b/kpovmodeler/pmscanner.h
index b18d1722..43c8aef3 100644
--- a/kpovmodeler/pmscanner.h
+++ b/kpovmodeler/pmscanner.h
@@ -49,13 +49,13 @@ public:
/**
* Returns the token constant for the key if found, otherwise -1
*/
- int operator[] ( const char* key ) const { return tqfind( key ); }
+ int operator[] ( const char* key ) const { return find( key ); }
/**
* Returns the token constant for the key if found, otherwise -1
*/
- int tqfind( const char* key ) const
+ int find( const char* key ) const
{
- int* result = TQAsciiDict<int>::tqfind( key );
+ int* result = TQAsciiDict<int>::find( key );
if( result )
return *result;
return -1;
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 27249472..e03ce3b8 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -344,7 +344,7 @@ void PMShell::slotDockWidgetClosed( )
const TQObject* o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender( )));
if( o && o->inherits( "PMDockWidget" ) )
{
- if( m_objectsToDelete.tqcontainsRef( o ) == 0 )
+ if( m_objectsToDelete.containsRef( o ) == 0 )
{
m_objectsToDelete.append( o );
TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotDeleteClosedObjects( ) ) );
@@ -602,7 +602,7 @@ void PMShell::setCaption( const TQString& caption )
else
{
if( !m_pPathAction->isChecked( ) )
- tmp = caption.right( caption.length( ) - caption.tqfindRev( '/' ) - 1 );
+ tmp = caption.right( caption.length( ) - caption.findRev( '/' ) - 1 );
else
tmp = caption;
}
@@ -656,7 +656,7 @@ bool PMShell::overwriteURL( const KURL& u )
void PMShell::slotSelectedLayout( int id )
{
- TQMenuItem* menu = m_pViewLayoutsAction->popupMenu( )->tqfindItem( id );
+ TQMenuItem* menu = m_pViewLayoutsAction->popupMenu( )->findItem( id );
PMViewLayoutManager::theManager( )->displayLayout( menu->text( ), this );
}
diff --git a/kpovmodeler/pmsymboltable.cpp b/kpovmodeler/pmsymboltable.cpp
index fa04d78e..5cb72b94 100644
--- a/kpovmodeler/pmsymboltable.cpp
+++ b/kpovmodeler/pmsymboltable.cpp
@@ -85,7 +85,7 @@ TQString PMSymbolTable::findNewID( const TQString& prefix )
TQString testID;
unsigned int number;
- int* lastNumber = m_lastID.tqfind( prefix );
+ int* lastNumber = m_lastID.find( prefix );
if( lastNumber )
number = *lastNumber + 1;
else
@@ -95,7 +95,7 @@ TQString PMSymbolTable::findNewID( const TQString& prefix )
do
{
testID = prefix + TQString( "%1" ).tqarg( number );
- symbol = tqfind( testID );
+ symbol = find( testID );
if( symbol )
number++;
}
diff --git a/kpovmodeler/pmtruetypecache.cpp b/kpovmodeler/pmtruetypecache.cpp
index d3fcf8d5..41e4296a 100644
--- a/kpovmodeler/pmtruetypecache.cpp
+++ b/kpovmodeler/pmtruetypecache.cpp
@@ -57,7 +57,7 @@ PMTrueTypeFont* PMTrueTypeCache::lookUp( const TQString& file )
if( file.isEmpty( ) )
return 0;
- PMTrueTypeFont* f = m_cache.tqfind( file );
+ PMTrueTypeFont* f = m_cache.find( file );
if( !f )
{
FT_Face face;
@@ -151,7 +151,7 @@ PMTrueTypeOutline* PMTrueTypeFont::outline( TQChar c )
if( isValid( ) )
{
TQString str( c );
- ol = m_cache.tqfind( str );
+ ol = m_cache.find( str );
if( !ol )
{
FT_UInt glyphIndex = findGlyphIndex( c );
diff --git a/kpovmodeler/pmvector.cpp b/kpovmodeler/pmvector.cpp
index e1b71d37..13ba6ba4 100644
--- a/kpovmodeler/pmvector.cpp
+++ b/kpovmodeler/pmvector.cpp
@@ -575,7 +575,7 @@ TQString PMVector::serializeXML( ) const
bool PMVector::loadXML( const TQString& str )
{
int i;
- int size = str.tqcontains( ' ' ) + 1;
+ int size = str.contains( ' ' ) + 1;
TQString tmp( str );
TQTextStream s( &tmp, IO_ReadOnly );
TQString val;
diff --git a/kpovmodeler/pmviewfactory.cpp b/kpovmodeler/pmviewfactory.cpp
index f997d4eb..ac4704b6 100644
--- a/kpovmodeler/pmviewfactory.cpp
+++ b/kpovmodeler/pmviewfactory.cpp
@@ -64,7 +64,7 @@ void PMViewFactory::addViewType( PMViewTypeFactory* vt )
PMViewBase* PMViewFactory::newViewInstance( const TQString& viewType,
TQWidget* tqparent, PMPart* part ) const
{
- PMViewTypeFactory* f = m_dict.tqfind( viewType );
+ PMViewTypeFactory* f = m_dict.find( viewType );
if( f )
return f->newInstance( tqparent, part );
@@ -74,7 +74,7 @@ PMViewBase* PMViewFactory::newViewInstance( const TQString& viewType,
PMViewOptions* PMViewFactory::newOptionsInstance( const TQString& viewType ) const
{
- PMViewTypeFactory* f = m_dict.tqfind( viewType );
+ PMViewTypeFactory* f = m_dict.find( viewType );
if( f )
return f->newOptionsInstance( );
@@ -84,7 +84,7 @@ PMViewOptions* PMViewFactory::newOptionsInstance( const TQString& viewType ) con
PMViewTypeFactory* PMViewFactory::viewFactory( const TQString& viewType ) const
{
- return m_dict.tqfind( viewType );
+ return m_dict.find( viewType );
}
const TQPtrList<PMViewTypeFactory>& PMViewFactory::viewTypes( ) const