summaryrefslogtreecommitdiffstats
path: root/kontact
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit4c6f8d69e2d1501837affb472c4eb8fec4462240 (patch)
tree766a8ad7939fcf3eec534184c36bd0e0f80489e2 /kontact
parent469cc56a805bd3d6940d54adbef554877c29853c (diff)
downloadtdepim-4c6f8d69e2d1501837affb472c4eb8fec4462240.tar.gz
tdepim-4c6f8d69e2d1501837affb472c4eb8fec4462240.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kontact')
-rw-r--r--kontact/Thoughts2
-rw-r--r--kontact/interfaces/core.cpp2
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp8
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp2
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp4
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp4
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp2
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp30
-rw-r--r--kontact/plugins/weather/summarywidget.cpp2
-rw-r--r--kontact/src/aboutdialog.cpp2
-rw-r--r--kontact/src/mainwindow.cpp6
-rw-r--r--kontact/src/profilemanager.cpp14
13 files changed, 40 insertions, 40 deletions
diff --git a/kontact/Thoughts b/kontact/Thoughts
index 720836a7a..991209a7c 100644
--- a/kontact/Thoughts
+++ b/kontact/Thoughts
@@ -285,7 +285,7 @@ s like that.
d Yes, but of course one should always prefer in-process IPC if possible. DCOP
d currently _works_ for Kontact, but that's all about it. It isn't exactly elegant.
d The only advantange of the current approach is that we can allow the user to
-d run one of the parts standalone. I am not really sure we want that. I used to tqfind
+d run one of the parts standalone. I am not really sure we want that. I used to find
d it desireable, but I am not sure anymore.
MiB: But that's the whole idea behind Kontact---to be able to integrate apps
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index d47058276..997ad8c48 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -57,7 +57,7 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
kdDebug(5601) << "Core::createPart(): " << libname << endl;
TQMap<TQCString,KParts::ReadOnlyPart *>::ConstIterator it;
- it = mParts.tqfind( libname );
+ it = mParts.find( libname );
if ( it != mParts.end() ) return it.data();
kdDebug(5601) << "Creating new KPart" << endl;
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index bc0d683e7..97fc9fad1 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -108,12 +108,12 @@ void KCMKMailSummary::initFolders()
DCOPRef folderRef = kmail.call( "getFolder(TQString)", *it );
folderRef.call( "displayName()" ).get( displayName );
}
- if ( (*it).tqcontains( '/' ) == 1 ) {
- if ( mFolderMap.tqfind( *it ) == mFolderMap.end() )
+ if ( (*it).contains( '/' ) == 1 ) {
+ if ( mFolderMap.find( *it ) == mFolderMap.end() )
mFolderMap.insert( *it, new TQListViewItem( mFolderView,
displayName ) );
} else {
- const int pos = (*it).tqfindRev( '/' );
+ const int pos = (*it).findRev( '/' );
const TQString parentFolder = (*it).left( pos );
mFolderMap.insert( *it,
new TQCheckListItem( mFolderMap[ parentFolder ],
@@ -137,7 +137,7 @@ void KCMKMailSummary::loadFolders()
TQMap<TQString, TQListViewItem*>::Iterator it;
for ( it = mFolderMap.begin(); it != mFolderMap.end(); ++it ) {
if ( TQCheckListItem *qli = dynamic_cast<TQCheckListItem*>( it.data() ) ) {
- if ( folders.tqcontains( it.key() ) ) {
+ if ( folders.contains( it.key() ) ) {
qli->setOn( true );
mFolderView->ensureItemVisible( it.data() );
} else {
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 2f67846ac..8f3b668b3 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -117,7 +117,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
TQStringList::ConstIterator it;
DCOPRef kmail( "kmail", "KMailIface" );
for ( it = folders.begin(); it != folders.end(); ++it ) {
- if ( activeFolders.tqcontains( *it ) ) {
+ if ( activeFolders.contains( *it ) ) {
DCOPRef folderRef = kmail.call( "getFolder(TQString)", *it );
const int numMsg = folderRef.call( "messages()" );
const int numUnreadMsg = folderRef.call( "unreadMessages()" );
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 649f366c9..03be389c2 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -141,9 +141,9 @@ void SummaryWidget::updateView()
// Fill Appointment Pixmap Field
label = new TQLabel( this );
- if ( ev->categories().tqcontains( "Birthday" ) ) {
+ if ( ev->categories().contains( "Birthday" ) ) {
label->setPixmap( pmb );
- } else if ( ev->categories().tqcontains( "Anniversary" ) ) {
+ } else if ( ev->categories().contains( "Anniversary" ) ) {
label->setPixmap( pma );
} else {
label->setPixmap( pm );
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 7c3d05875..63dc312e2 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -271,7 +271,7 @@ void KCMKontactKNT::deleteFeed()
if ( !item )
return;
- if ( mCustomFeeds.tqfind( item ) == mCustomFeeds.end() )
+ if ( mCustomFeeds.find( item ) == mCustomFeeds.end() )
return;
mCustomFeeds.remove( item );
@@ -317,7 +317,7 @@ void KCMKontactKNT::allCurrentChanged( TQListViewItem *item )
bool delState = false;
if ( newsItem && newsItem->isSelected() ) {
addState = true;
- delState = (mCustomFeeds.tqfind( newsItem ) != mCustomFeeds.end());
+ delState = (mCustomFeeds.find( newsItem ) != mCustomFeeds.end());
}
mAddButton->setEnabled( addState );
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 136454adf..3a5f8b3a7 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -228,7 +228,7 @@ void SDSummaryWidget::updateView()
// No reason to show the date year
TQString savefmt = KGlobal::locale()->dateFormat();
KGlobal::locale()->setDateFormat( KGlobal::locale()->
- dateFormat().tqreplace( 'Y', ' ' ) );
+ dateFormat().replace( 'Y', ' ' ) );
// Search for Birthdays and Anniversaries in the Addressbook
KABC::AddressBook::Iterator it;
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 1f7164f80..a2b5003b3 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -157,7 +157,7 @@ void KCMKontactSummary::load()
if ( var.toBool() == true ) {
PluginItem *item = new PluginItem( *it, mPluginView );
- if ( activeSummaries.tqfind( (*it)->pluginName() ) != activeSummaries.end() )
+ if ( activeSummaries.find( (*it)->pluginName() ) != activeSummaries.end() )
item->setOn( true );
}
}
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 0589a9768..f9dbd83e6 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -168,7 +168,7 @@ void SummaryViewPart::updateWidgets()
TQValueList<Kontact::Plugin*>::ConstIterator it = plugins.begin();
for ( ; it != end; ++it ) {
Kontact::Plugin *plugin = *it;
- if ( activeSummaries.tqfind( plugin->identifier() ) == activeSummaries.end() )
+ if ( activeSummaries.find( plugin->identifier() ) == activeSummaries.end() )
continue;
Kontact::Summary *summary = plugin->createSummaryWidget( mFrame );
@@ -181,8 +181,8 @@ void SummaryViewPart::updateWidgets()
connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
- if ( !mLeftColumnSummaries.tqcontains( plugin->identifier() ) &&
- !mRightColumnSummaries.tqcontains( plugin->identifier() ) ) {
+ if ( !mLeftColumnSummaries.contains( plugin->identifier() ) &&
+ !mRightColumnSummaries.contains( plugin->identifier() ) ) {
mLeftColumnSummaries.append( plugin->identifier() );
}
@@ -197,13 +197,13 @@ void SummaryViewPart::updateWidgets()
{
TQStringList::Iterator strIt;
for ( strIt = mLeftColumnSummaries.begin(); strIt != mLeftColumnSummaries.end(); ++strIt ) {
- if ( loadedSummaries.tqfind( *strIt ) == loadedSummaries.end() ) {
+ if ( loadedSummaries.find( *strIt ) == loadedSummaries.end() ) {
strIt = mLeftColumnSummaries.remove( strIt );
--strIt;
}
}
for ( strIt = mRightColumnSummaries.begin(); strIt != mRightColumnSummaries.end(); ++strIt ) {
- if ( loadedSummaries.tqfind( *strIt ) == loadedSummaries.end() ) {
+ if ( loadedSummaries.find( *strIt ) == loadedSummaries.end() ) {
strIt = mRightColumnSummaries.remove( strIt );
--strIt;
}
@@ -223,12 +223,12 @@ void SummaryViewPart::updateWidgets()
TQStringList::Iterator strIt;
for ( strIt = mLeftColumnSummaries.begin(); strIt != mLeftColumnSummaries.end(); ++strIt ) {
- if ( mSummaries.tqfind( *strIt ) != mSummaries.end() )
+ if ( mSummaries.find( *strIt ) != mSummaries.end() )
mLeftColumn->addWidget( mSummaries[ *strIt ] );
}
for ( strIt = mRightColumnSummaries.begin(); strIt != mRightColumnSummaries.end(); ++strIt ) {
- if ( mSummaries.tqfind( *strIt ) != mSummaries.end() )
+ if ( mSummaries.find( *strIt ) != mSummaries.end() )
mRightColumn->addWidget( mSummaries[ *strIt ] );
}
@@ -247,18 +247,18 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
return;
if ( target == mFrame ) {
- if ( mLeftColumn->tqfindWidget( widget ) == -1 && mRightColumn->tqfindWidget( widget ) == -1 )
+ if ( mLeftColumn->findWidget( widget ) == -1 && mRightColumn->findWidget( widget ) == -1 )
return;
} else {
- if ( mLeftColumn->tqfindWidget( target ) == -1 && mRightColumn->tqfindWidget( target ) == -1 ||
- mLeftColumn->tqfindWidget( widget ) == -1 && mRightColumn->tqfindWidget( widget ) == -1 )
+ if ( mLeftColumn->findWidget( target ) == -1 && mRightColumn->findWidget( target ) == -1 ||
+ mLeftColumn->findWidget( widget ) == -1 && mRightColumn->findWidget( widget ) == -1 )
return;
}
- if ( mLeftColumn->tqfindWidget( widget ) != -1 ) {
+ if ( mLeftColumn->findWidget( widget ) != -1 ) {
mLeftColumn->remove( widget );
mLeftColumnSummaries.remove( widgetName( widget ) );
- } else if ( mRightColumn->tqfindWidget( widget ) != -1 ) {
+ } else if ( mRightColumn->findWidget( widget ) != -1 ) {
mRightColumn->remove( widget );
mRightColumnSummaries.remove( widgetName( widget ) );
}
@@ -286,7 +286,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
return;
}
- int targetPos = mLeftColumn->tqfindWidget( target );
+ int targetPos = mLeftColumn->findWidget( target );
if ( targetPos != -1 ) {
if ( tqalignment == TQt::AlignBottom )
targetPos++;
@@ -294,7 +294,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
mLeftColumn->insertWidget( targetPos, widget );
mLeftColumnSummaries.insert( mLeftColumnSummaries.at( targetPos ), widgetName( widget ) );
} else {
- targetPos = mRightColumn->tqfindWidget( target );
+ targetPos = mRightColumn->findWidget( target );
if ( tqalignment == TQt::AlignBottom )
targetPos++;
@@ -346,7 +346,7 @@ TQStringList SummaryViewPart::configModules() const
TQStringList cm = it.data()->configModules();
TQStringList::ConstIterator strIt;
for ( strIt = cm.begin(); strIt != cm.end(); ++strIt )
- if ( !(*strIt).isEmpty() && !modules.tqcontains( *strIt ) )
+ if ( !(*strIt).isEmpty() && !modules.contains( *strIt ) )
modules.append( *strIt );
}
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 926f70a73..611a7c1c6 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -140,7 +140,7 @@ void SummaryWidget::updateView()
.tqarg( i18n( "Rel. Humidity" ) )
.tqarg( (*it).relativeHumidity() );
- TQToolTip::add( label, labelText.tqreplace( " ", "&nbsp;" ) );
+ TQToolTip::add( label, labelText.replace( " ", "&nbsp;" ) );
label = new TQLabel( cover, this );
label->tqsetAlignment( AlignLeft );
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index 02e48e771..1bbd0ef6c 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -93,7 +93,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
text += "<a href=\"" + home + "\">" + home + "</a><br>";
}
- text.tqreplace( "\n", "<br>" );
+ text.replace( "\n", "<br>" );
KActiveLabel *label = new KActiveLabel( text, topFrame );
label->tqsetAlignment( AlignTop );
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 8439b4fce..b719a57d5 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -226,7 +226,7 @@ void MainWindow::activatePluginModule()
if ( !mActiveModule.isEmpty() ) {
PluginList::ConstIterator end = mPlugins.end();
for ( PluginList::ConstIterator it = mPlugins.begin(); it != end; ++it )
- if ( ( *it )->identifier().tqcontains( mActiveModule ) ) {
+ if ( ( *it )->identifier().contains( mActiveModule ) ) {
selectPlugin( *it );
return;
}
@@ -828,7 +828,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
mPartsStack->raiseWidget( view );
view->show();
- if ( mFocusWidgets.tqcontains( plugin->identifier() ) ) {
+ if ( mFocusWidgets.contains( plugin->identifier() ) ) {
tqfocusWidget = mFocusWidgets[ plugin->identifier() ];
if ( tqfocusWidget )
tqfocusWidget->setFocus();
@@ -1101,7 +1101,7 @@ void MainWindow::readProperties( KConfig *config )
for ( ; it != end; ++it ) {
Plugin *plugin = *it;
if ( !plugin->isRunningStandalone() ) {
- TQStringList::ConstIterator activePlugin = activePlugins.tqfind( plugin->identifier() );
+ TQStringList::ConstIterator activePlugin = activePlugins.find( plugin->identifier() );
if ( activePlugin != activePlugins.end() ) {
plugin->readProperties( config );
}
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index 005779414..50b2a71d4 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -152,7 +152,7 @@ void Kontact::ProfileManager::writeConfig() const
Kontact::Profile Kontact::ProfileManager::readFromConfiguration( const TQString& configFile, bool isLocal )
{
KConfig profileCfg( configFile, true /*read-only*/, false /*no KDE global*/ );
- const TQString configDir = configFile.left( configFile.tqfindRev( TQDir::separator(), -1 ) );
+ const TQString configDir = configFile.left( configFile.findRev( TQDir::separator(), -1 ) );
profileCfg.setGroup( "Kontact Profile" );
const TQString id = profileCfg.readEntry( "Identifier" );
Kontact::Profile profile( id );
@@ -199,7 +199,7 @@ void Kontact::ProfileManager::readConfig()
for ( ProfileMap::ConstIterator it = globalProfiles.begin(), end = globalProfiles.end(); it != end; ++it )
{
- if ( !profiles.tqcontains( it.key() ) )
+ if ( !profiles.contains( it.key() ) )
profiles[it.key()] = it.data();
}
@@ -252,7 +252,7 @@ void Kontact::ProfileManager::saveToProfile( const TQString& id )
bool Kontact::ProfileManager::addProfile( const Kontact::Profile& profile, bool syncConfig )
{
const TQString id = profile.id();
- if ( m_profiles.tqcontains( id ) )
+ if ( m_profiles.contains( id ) )
return false;
m_profiles[id] = profile;
emit profileAdded( id );
@@ -266,7 +266,7 @@ bool Kontact::ProfileManager::addProfile( const Kontact::Profile& profile, bool
void Kontact::ProfileManager::loadProfile( const TQString& id )
{
- if ( !m_profiles.tqcontains( id ) )
+ if ( !m_profiles.contains( id ) )
return;
emit profileLoaded( id );
}
@@ -278,7 +278,7 @@ void Kontact::ProfileManager::removeProfile( const Kontact::Profile& profile )
void Kontact::ProfileManager::removeProfile( const TQString& id )
{
- if ( !m_profiles.tqcontains( id ) )
+ if ( !m_profiles.contains( id ) )
return;
Kontact::Profile profile = profileById( id );
if ( profile.isLocal() ) {
@@ -292,7 +292,7 @@ void Kontact::ProfileManager::removeProfile( const TQString& id )
Kontact::ProfileManager::ExportError Kontact::ProfileManager::exportProfileToDirectory( const TQString& id, const TQString& path )
{
- if ( !m_profiles.tqcontains( id ) )
+ if ( !m_profiles.contains( id ) )
return SuccessfulExport;
if ( !TQDir( path ).exists() )
@@ -332,7 +332,7 @@ TQString Kontact::ProfileManager::generateNewId() const
while ( true )
{
const TQString newId = KApplication::randomString( 10 );
- if ( !m_profiles.tqcontains( newId ) )
+ if ( !m_profiles.contains( newId ) )
return newId;
}
}