From da4be7880ff1de6415ab6256afd2514e64f5fa2e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kpovmodeler/baseinsertrules.xml | 142 ++++++++++++++++++------------------- kpovmodeler/pm2dcontrolpoint.cpp | 2 +- kpovmodeler/pmaddcommand.cpp | 2 +- kpovmodeler/pmdeclareedit.cpp | 6 +- kpovmodeler/pmdeletecommand.cpp | 6 +- kpovmodeler/pmdialogeditbase.cpp | 8 +-- kpovmodeler/pmdockwidget.cpp | 18 ++--- kpovmodeler/pmdocumentationmap.cpp | 2 +- kpovmodeler/pmenumproperty.cpp | 4 +- kpovmodeler/pmerrordialog.cpp | 2 +- kpovmodeler/pmglview.cpp | 2 +- kpovmodeler/pmimagemapedit.cpp | 8 +-- kpovmodeler/pminsertrules.dtd | 16 ++--- kpovmodeler/pminsertrulesystem.cpp | 48 ++++++------- kpovmodeler/pminsertrulesystem.h | 12 ++-- kpovmodeler/pmiomanager.cpp | 6 +- kpovmodeler/pmlayoutsettings.cpp | 4 +- kpovmodeler/pmlibraryhandle.cpp | 6 +- kpovmodeler/pmmetaobject.h | 2 +- kpovmodeler/pmmovecommand.cpp | 12 ++-- kpovmodeler/pmobjectselect.cpp | 4 +- kpovmodeler/pmparser.cpp | 16 ++--- kpovmodeler/pmpart.cpp | 14 ++-- kpovmodeler/pmpluginmanager.cpp | 2 +- kpovmodeler/pmpovrayformat.cpp | 4 +- kpovmodeler/pmpovrayparser.cpp | 6 +- kpovmodeler/pmpovraysettings.cpp | 4 +- kpovmodeler/pmpovraywidget.cpp | 2 +- kpovmodeler/pmprismedit.cpp | 10 +-- kpovmodeler/pmprototypemanager.cpp | 10 +-- kpovmodeler/pmrendermanager.cpp | 14 ++-- kpovmodeler/pmresourcelocator.cpp | 2 +- kpovmodeler/pmscanner.h | 6 +- kpovmodeler/pmshell.cpp | 6 +- kpovmodeler/pmsymboltable.cpp | 4 +- kpovmodeler/pmtruetypecache.cpp | 4 +- kpovmodeler/pmvector.cpp | 2 +- kpovmodeler/pmviewfactory.cpp | 6 +- 38 files changed, 212 insertions(+), 212 deletions(-) (limited to 'kpovmodeler') 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 @@ - + - + @@ -211,16 +211,16 @@ - + - + - + @@ -236,11 +236,11 @@ - + - + @@ -297,15 +297,15 @@ - + - + - + @@ -420,9 +420,9 @@ - + - + @@ -435,9 +435,9 @@ - + - + @@ -450,9 +450,9 @@ - + - + @@ -485,7 +485,7 @@ - + @@ -493,31 +493,31 @@ - + - + - + - + - + @@ -534,11 +534,11 @@ - + - + @@ -549,11 +549,11 @@ - + - + @@ -563,14 +563,14 @@ - + - + - + @@ -613,17 +613,17 @@ - + - + - + @@ -639,11 +639,11 @@ - + - + @@ -652,10 +652,10 @@ - + - + @@ -695,18 +695,18 @@ - + - + - + @@ -734,56 +734,56 @@ - + - + - + - + - + - + - + - + - + - + @@ -795,12 +795,12 @@ - + - + @@ -809,12 +809,12 @@ - + - + @@ -829,10 +829,10 @@ - + - + @@ -860,56 +860,56 @@ - + - + - + - + - + - + - + - + - + - + @@ -921,12 +921,12 @@ - + - + @@ -935,12 +935,12 @@ - + - + @@ -955,10 +955,10 @@ - + - + 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::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* pList = m_messageDict.tqfind( obj ); + TQPtrList* pList = m_messageDict.find( obj ); if( !pList ) { pList = new TQPtrList; 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. --> - - + - + - + - - @@ -71,9 +71,9 @@ is less than the second. --> - - +