diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
commit | 6e21bc798ba1066147d69dcc2d5c222ffafb9a90 (patch) | |
tree | 36613dfe2f86f8ccb96a30f3880507341228eeb0 /kparts | |
parent | 1e9fe867b0def399c63c42f35e83c3575e91ff83 (diff) | |
download | tdelibs-6e21bc798ba1066147d69dcc2d5c222ffafb9a90.tar.gz tdelibs-6e21bc798ba1066147d69dcc2d5c222ffafb9a90.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kparts')
-rw-r--r-- | kparts/browserextension.cpp | 4 | ||||
-rw-r--r-- | kparts/browserinterface.cpp | 2 | ||||
-rw-r--r-- | kparts/browserrun.cpp | 4 | ||||
-rw-r--r-- | kparts/historyprovider.cpp | 4 | ||||
-rw-r--r-- | kparts/partmanager.cpp | 16 | ||||
-rw-r--r-- | kparts/plugin.cpp | 4 |
6 files changed, 17 insertions, 17 deletions
diff --git a/kparts/browserextension.cpp b/kparts/browserextension.cpp index f014255b4..e3ae1a516 100644 --- a/kparts/browserextension.cpp +++ b/kparts/browserextension.cpp @@ -374,7 +374,7 @@ BrowserExtension::BrowserExtension( KParts::ReadOnlyPart *parent, for ( int i=0 ; it != itEnd ; ++it, ++i ) { // Does the extension have a slot with the name of this action ? - d->m_actionStatus.setBit( i, slotNames.tqcontains( it.key()+"()" ) ); + d->m_actionStatus.setBit( i, slotNames.contains( it.key()+"()" ) ); } connect( m_part, TQT_SIGNAL( completed() ), @@ -552,7 +552,7 @@ void BrowserExtension::slotSetActionText( const char * name, const TQString& tex TQString BrowserExtension::actionText( const char * name ) const { int actionNumber = (*s_actionNumberMap)[ name ]; - TQMap<int, TQString>::ConstIterator it = d->m_actionText.tqfind( actionNumber ); + TQMap<int, TQString>::ConstIterator it = d->m_actionText.find( actionNumber ); if ( it != d->m_actionText.end() ) return *it; return TQString::null; diff --git a/kparts/browserinterface.cpp b/kparts/browserinterface.cpp index 52200a20b..6882132fe 100644 --- a/kparts/browserinterface.cpp +++ b/kparts/browserinterface.cpp @@ -19,7 +19,7 @@ BrowserInterface::~BrowserInterface() void BrowserInterface::callMethod( const char *name, const TQVariant &argument ) { - int slot = tqmetaObject()->tqfindSlot( name ); + int slot = tqmetaObject()->findSlot( name ); if ( slot == -1 ) return; diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp index a0d7aee80..5546cdd97 100644 --- a/kparts/browserrun.cpp +++ b/kparts/browserrun.cpp @@ -128,7 +128,7 @@ void BrowserRun::scanFile() } // Set the PropagateHttpHeader meta-data if it has not already been set... - if (!m_args.metaData().tqcontains("PropagateHttpHeader")) + if (!m_args.metaData().contains("PropagateHttpHeader")) m_args.metaData().insert("PropagateHttpHeader", "TRUE"); } @@ -236,7 +236,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString& m_sMimeType = mimeType; TQString extension; TQString fileName = m_suggestedFilename.isEmpty() ? m_strURL.fileName() : m_suggestedFilename; - int extensionPos = fileName.tqfindRev( '.' ); + int extensionPos = fileName.findRev( '.' ); if ( extensionPos != -1 ) extension = fileName.mid( extensionPos ); // keep the '.' KTempFile tempFile( TQString::null, extension ); diff --git a/kparts/historyprovider.cpp b/kparts/historyprovider.cpp index d62d94b3a..17cf609a1 100644 --- a/kparts/historyprovider.cpp +++ b/kparts/historyprovider.cpp @@ -63,13 +63,13 @@ HistoryProvider::~HistoryProvider() bool HistoryProvider::contains( const TQString& item ) const { - return (bool) d->dict.tqfind( item ); + return (bool) d->dict.find( item ); } void HistoryProvider::insert( const TQString& item ) { // no need to allocate memory, we only want to have fast lookup, no mapping - d->dict.tqreplace( item, (void*) 1 ); + d->dict.replace( item, (void*) 1 ); emit inserted( item ); } diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp index e1f211b84..ca8a3a76d 100644 --- a/kparts/partmanager.cpp +++ b/kparts/partmanager.cpp @@ -206,7 +206,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev ) { TQPoint pos; - if ( !d->m_managedTopLevelWidgets.tqcontainsRef( w->tqtopLevelWidget() ) ) + if ( !d->m_managedTopLevelWidgets.containsRef( w->tqtopLevelWidget() ) ) return false; if ( d->m_bIgnoreScrollBars && w->inherits( TQSCROLLBAR_OBJECT_NAME_STRING ) ) @@ -313,7 +313,7 @@ Part * PartManager::findPartFromWidget( TQWidget * widget, const TQPoint &pos ) for ( ; it.current() ; ++it ) { Part *part = it.current()->hitTest( widget, pos ); - if ( part && d->m_parts.tqfindRef( part ) != -1 ) + if ( part && d->m_parts.findRef( part ) != -1 ) return part; } return 0L; @@ -332,7 +332,7 @@ Part * PartManager::findPartFromWidget( TQWidget * widget ) void PartManager::addPart( Part *part, bool setActive ) { - if ( d->m_parts.tqfindRef( part ) != -1 ) // don't add parts more than once :) + if ( d->m_parts.findRef( part ) != -1 ) // don't add parts more than once :) { #ifdef DEBUG_PARTMANAGER kdWarning(1000) << k_funcinfo << part << " already added" << kdBacktrace(5) << endl; @@ -368,7 +368,7 @@ void PartManager::addPart( Part *part, bool setActive ) void PartManager::removePart( Part *part ) { - if ( d->m_parts.tqfindRef( part ) == -1 ) + if ( d->m_parts.findRef( part ) == -1 ) { kdFatal(1000) << TQString(TQString("Can't remove part %1, not in KPartManager's list.").arg(part->name())) << endl; return; @@ -394,7 +394,7 @@ void PartManager::replacePart( Part * oldPart, Part * newPart, bool setActive ) { //kdDebug(1000) << "replacePart " << oldPart->name() << "-> " << newPart->name() << " setActive=" << setActive << endl; // This methods does exactly removePart + addPart but without calling setActivePart(0) in between - if ( d->m_parts.tqfindRef( oldPart ) == -1 ) + if ( d->m_parts.findRef( oldPart ) == -1 ) { kdFatal(1000) << TQString(TQString("Can't remove part %1, not in KPartManager's list.").arg(oldPart->name())) << endl; return; @@ -410,7 +410,7 @@ void PartManager::replacePart( Part * oldPart, Part * newPart, bool setActive ) void PartManager::setActivePart( Part *part, TQWidget *widget ) { - if ( part && d->m_parts.tqfindRef( part ) == -1 ) + if ( part && d->m_parts.findRef( part ) == -1 ) { kdWarning( 1000 ) << "PartManager::setActivePart : trying to activate a non-registered part! " << part->name() << endl; return; // don't allow someone call setActivePart with a part we don't know about @@ -565,7 +565,7 @@ void PartManager::addManagedTopLevelWidget( const TQWidget *topLevel ) if ( !topLevel->isTopLevel() ) return; - if ( d->m_managedTopLevelWidgets.tqcontainsRef( topLevel ) ) + if ( d->m_managedTopLevelWidgets.containsRef( topLevel ) ) return; d->m_managedTopLevelWidgets.append( topLevel ); @@ -578,7 +578,7 @@ void PartManager::removeManagedTopLevelWidget( const TQWidget *topLevel ) if ( !topLevel->isTopLevel() ) return; - if ( d->m_managedTopLevelWidgets.tqfindRef( topLevel ) == -1 ) + if ( d->m_managedTopLevelWidgets.findRef( topLevel ) == -1 ) return; d->m_managedTopLevelWidgets.remove(); diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp index b9b60fc0b..a42839c23 100644 --- a/kparts/plugin.cpp +++ b/kparts/plugin.cpp @@ -107,7 +107,7 @@ TQValueList<Plugin::PluginInfo> Plugin::pluginInfos( const KInstance * instance if ( fInfo.extension() == TQString::tqfromLatin1( "desktop" ) ) continue; - TQMap<TQString,TQStringList>::Iterator mapIt = sortedPlugins.tqfind( fInfo.fileName() ); + TQMap<TQString,TQStringList>::Iterator mapIt = sortedPlugins.find( fInfo.fileName() ); if ( mapIt == sortedPlugins.end() ) mapIt = sortedPlugins.insert( fInfo.fileName(), TQStringList() ); @@ -249,7 +249,7 @@ void Plugin::loadPlugins( TQObject *parent, KXMLGUIClient* parentGUIClient, KIns else { // no user-setting, load plugin default setting TQString relPath = TQString( instance->instanceName() ) + "/" + (*pIt).m_relXMLFileName; - relPath.truncate( relPath.tqfindRev( '.' ) ); // remove extension + relPath.truncate( relPath.findRev( '.' ) ); // remove extension relPath += ".desktop"; //kdDebug(1000) << "looking for " << relPath << endl; const TQString desktopfile = instance->dirs()->findResource( "data", relPath ); |