diff options
Diffstat (limited to 'kopete/plugins')
34 files changed, 130 insertions, 130 deletions
diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp index b8f32bcf..149eab7a 100644 --- a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp @@ -176,7 +176,7 @@ TQTextCodec* BookmarksPlugin::getPageEncoding( const TQByteArray& data ) } //kdDebug(14501) << temp.mid(pos, rx.matchedLength()) << endl; temp = temp.mid(pos, rx.matchedLength()-1); - temp = temp.mid( temp.tqfind("charset", 0, false)+7); + temp = temp.mid( temp.find("charset", 0, false)+7); temp = temp.remove('=').simplifyWhiteSpace(); for( pos = 0 ; temp[pos].isLetterOrNumber() || temp[pos] == '-' ; pos++ ); temp = temp.left( pos ); diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp index 2c8f440f..5e1235f6 100644 --- a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp +++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp @@ -104,7 +104,7 @@ void BookmarksPreferences::load() m_settings.isFolderForEachContact() == BookmarksPrefsSettings::UnselectedContacts ); list = m_settings.getContactsList(); for( it = list.begin() ; it != list.end() ; ++it){ - if ( ( item = p_dialog->contactList->tqfindItem(*it, TQt::ExactMatch ) ) ){ + if ( ( item = p_dialog->contactList->findItem(*it, TQt::ExactMatch ) ) ){ p_dialog->contactList->setSelected( item, true ); } } diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp index 55a89d30..3fd4fb3c 100644 --- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp @@ -71,9 +71,9 @@ bool BookmarksPrefsSettings::useSubfolderForContact( TQString nickname ) case Always: return true; case SelectedContacts: - return ( m_contactslist.tqfind( nickname ) != m_contactslist.end() ); + return ( m_contactslist.find( nickname ) != m_contactslist.end() ); case UnselectedContacts: - return ( m_contactslist.tqfind( nickname ) == m_contactslist.end() ); + return ( m_contactslist.find( nickname ) == m_contactslist.end() ); } } return false; diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp index 330c8d5d..8a651288 100644 --- a/kopete/plugins/alias/aliaspreferences.cpp +++ b/kopete/plugins/alias/aliaspreferences.cpp @@ -205,7 +205,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin ) if( *it2 == protocol->pluginId() ) { TQPair<Kopete::Protocol*, TQString> pr( protocol, *it ); - if( protocolMap.tqfind( pr ) == protocolMap.end() ) + if( protocolMap.find( pr ) == protocolMap.end() ) { Kopete::CommandHandler::commandHandler()->registerAlias( protocol, @@ -331,7 +331,7 @@ void AliasPreferences::slotAddAlias() if( alias.startsWith( TQString::tqfromLatin1("/") ) ) alias = alias.section( '/', 1 ); - if( alias.tqcontains( TQRegExp("[_=]") ) ) + if( alias.contains( TQRegExp("[_=]") ) ) { KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. An" " alias name cannot contain the characters \"_\" or \"=\"." @@ -420,7 +420,7 @@ void AliasPreferences::slotEditAlias() TQString alias = editDialog.alias->text(); if( alias.startsWith( TQString::tqfromLatin1("/") ) ) alias = alias.section( '/', 1 ); - if( alias.tqcontains( TQRegExp("[_=]") ) ) + if( alias.contains( TQRegExp("[_=]") ) ) { KMessageBox::error( this, i18n("<qt>Could not add alias <b>%1</b>. An" " alias name cannot contain the characters \"_\" or \"=\"." diff --git a/kopete/plugins/alias/editaliasdialog.cpp b/kopete/plugins/alias/editaliasdialog.cpp index 1adeea03..356848c0 100644 --- a/kopete/plugins/alias/editaliasdialog.cpp +++ b/kopete/plugins/alias/editaliasdialog.cpp @@ -48,4 +48,4 @@ void EditAliasDialog::checkButtonsEnabled() #include "editaliasdialog.moc" -// kate: space-indent off; tqreplace-tabs off; tab-width 4; indent-mode csands; +// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands; diff --git a/kopete/plugins/alias/editaliasdialog.h b/kopete/plugins/alias/editaliasdialog.h index 7176904c..76d33122 100644 --- a/kopete/plugins/alias/editaliasdialog.h +++ b/kopete/plugins/alias/editaliasdialog.h @@ -36,4 +36,4 @@ public slots: #endif -// kate: space-indent off; tqreplace-tabs off; tab-width 4; indent-mode csands; +// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands; diff --git a/kopete/plugins/autoreplace/autoreplaceconfig.cpp b/kopete/plugins/autoreplace/autoreplaceconfig.cpp index 09ef9d05..2537f44a 100644 --- a/kopete/plugins/autoreplace/autoreplaceconfig.cpp +++ b/kopete/plugins/autoreplace/autoreplaceconfig.cpp @@ -63,7 +63,7 @@ void AutoReplaceConfig::load() TQStringList AutoReplaceConfig::defaultAutoReplaceList() { - return TQStringList::split( ",", i18n( "list_of_words_to_tqreplace", + return TQStringList::split( ",", i18n( "list_of_words_to_replace", "ur,your,r,are,u,you,theres,there is,arent,are not,dont,do not" ) ); } diff --git a/kopete/plugins/autoreplace/autoreplaceplugin.cpp b/kopete/plugins/autoreplace/autoreplaceplugin.cpp index 62060ef3..d3470481 100644 --- a/kopete/plugins/autoreplace/autoreplaceplugin.cpp +++ b/kopete/plugins/autoreplace/autoreplaceplugin.cpp @@ -26,7 +26,7 @@ #include "autoreplaceconfig.h" typedef KGenericFactory<AutoReplacePlugin> AutoReplacePluginFactory; -K_EXPORT_COMPONENT_FACTORY( kopete_autotqreplace, AutoReplacePluginFactory( "kopete_autotqreplace" ) ) +K_EXPORT_COMPONENT_FACTORY( kopete_autoreplace, AutoReplacePluginFactory( "kopete_autoreplace" ) ) AutoReplacePlugin * AutoReplacePlugin::pluginStatic_ = 0L; AutoReplacePlugin::AutoReplacePlugin( TQObject *tqparent, const char * name, const TQStringList & ) @@ -86,7 +86,7 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg ) { TQString before = re.cap(1); TQString after = re.cap(3); - replaced_message.tqreplace( re, before + map.tqfind( it.key() ).data() + after ); + replaced_message.replace( re, before + map.find( it.key() ).data() + after ); isReplaced=true; } } @@ -101,8 +101,8 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg ) { TQString replaced_message = msg.plainBody(); // eventually add . at the end of the lines, sent lines only - replaced_message.tqreplace( TQRegExp( "([a-z])$" ), "\\1." ); - // replaced_message.tqreplace(TQRegExp( "([\\w])$" ), "\\1." ); + replaced_message.replace( TQRegExp( "([a-z])$" ), "\\1." ); + // replaced_message.replace(TQRegExp( "([\\w])$" ), "\\1." ); // the message is now the one with replaced words msg.setBody( replaced_message, Kopete::Message::PlainText ); diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.cpp b/kopete/plugins/autoreplace/autoreplacepreferences.cpp index 628cb679..59d79b09 100644 --- a/kopete/plugins/autoreplace/autoreplacepreferences.cpp +++ b/kopete/plugins/autoreplace/autoreplacepreferences.cpp @@ -34,7 +34,7 @@ typedef KGenericFactory<AutoReplacePreferences> AutoReplacePreferencesFactory; -K_EXPORT_COMPONENT_FACTORY( kcm_kopete_autotqreplace, AutoReplacePreferencesFactory( "kcm_kopete_autotqreplace" ) ) +K_EXPORT_COMPONENT_FACTORY( kcm_kopete_autoreplace, AutoReplacePreferencesFactory( "kcm_kopete_autoreplace" ) ) AutoReplacePreferences::AutoReplacePreferences( TQWidget *tqparent, const char * /* name */, const TQStringList &args ) : KCAutoConfigModule( AutoReplacePreferencesFactory::instance(), tqparent, args ) @@ -123,7 +123,7 @@ void AutoReplacePreferences::slotAddCouple() TQListViewItem * lvi; TQListViewItem * oldLvi = 0; // see if we are replacing an existing entry - if ( ( oldLvi = preferencesDialog->m_list->tqfindItem( k, 0 ) ) ) + if ( ( oldLvi = preferencesDialog->m_list->findItem( k, 0 ) ) ) delete oldLvi; lvi = new TQListViewItem( preferencesDialog->m_list, k, v ); // Triggers a size, tqgeometry and content update diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp index a35a4cf4..79920c88 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp @@ -87,7 +87,7 @@ void ConnectionStatusPlugin::slotProcessExited( KProcess *process ) if ( process == m_process ) { - setConnectedtqStatus( m_buffer.tqcontains( "default" ) ); + setConnectedtqStatus( m_buffer.contains( "default" ) ); m_buffer = TQString(); delete m_process; m_process = 0L; diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index bd1ce0dc..7b2cb8bf 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -155,13 +155,13 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg ) { TQString body = msg.plainBody(); if( !body.startsWith( TQString::tqfromLatin1("-----BEGIN PGP MESSAGE----") ) - || !body.tqcontains( TQString::tqfromLatin1("-----END PGP MESSAGE----") ) ) + || !body.contains( TQString::tqfromLatin1("-----END PGP MESSAGE----") ) ) return; if( msg.direction() != Kopete::Message::Inbound ) { TQString plainBody; - if ( m_cachedMessages.tqcontains( body ) ) + if ( m_cachedMessages.contains( body ) ) { plainBody = m_cachedMessages[ body ]; m_cachedMessages.remove( body ); @@ -179,9 +179,9 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg ) plainBody = TQStyleSheet::escape( plainBody ); //this is the same algoritm as in Kopete::Message::escapedBody(); - plainBody.tqreplace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "<br/>" ) ) - .tqreplace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( " " ) ) - .tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); + plainBody.replace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "<br/>" ) ) + .replace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( " " ) ) + .replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); } msg.setBody( TQString::tqfromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>") @@ -202,7 +202,7 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg ) //the Message::unescape is there because client like fire replace linebreak by <BR> to work even if the protocol doesn't allow newlines (IRC) // cf http://fire.sourceforge.net/forums/viewtopic.php?t=174 and Bug #96052 - if(body.tqcontains("<")) + if(body.contains("<")) body= Kopete::Message::unescape(body); body = KgpgInterface::KgpgDecryptText( body, mPrivateKeyID ); diff --git a/kopete/plugins/cryptography/kgpginterface.cpp b/kopete/plugins/cryptography/kgpginterface.cpp index d74f9baa..fb407523 100644 --- a/kopete/plugins/cryptography/kgpginterface.cpp +++ b/kopete/plugins/cryptography/kgpginterface.cpp @@ -50,12 +50,12 @@ TQString KgpgInterface::KgpgEncryptText(TQString text,TQString userIDs, TQString userIDs=userIDs.simplifyWhiteSpace(); Options=Options.stripWhiteSpace(); - int ct=userIDs.tqfind(" "); + int ct=userIDs.find(" "); while (ct!=-1) // if multiple keys... { dests+=" --recipient "+userIDs.section(' ',0,0); userIDs.remove(0,ct+1); - ct=userIDs.tqfind(" "); + ct=userIDs.find(" "); } dests+=" --recipient "+userIDs; @@ -95,7 +95,7 @@ TQString KgpgInterface::KgpgDecryptText(TQString text,TQString userID) { /// pipe for passphrase //userID=TQString::fromUtf8(userID); - userID.tqreplace('<',"<"); + userID.replace('<',"<"); TQString passdlg=i18n("Enter passphrase for <b>%1</b>:").tqarg(userID); if (counter>1) passdlg.prepend(i18n("<b>Bad passphrase</b><br> You have %1 tries left.<br>").tqarg(TQString::number(4-counter))); @@ -151,18 +151,18 @@ TQString KgpgInterface::checkForUtf8(TQString txt) for (s = txt.ascii(); *s && !(*s & 0x80); s++) ; - if (*s && !strchr (txt.ascii(), 0xc3) && (txt.tqfind("\\x")==-1)) + if (*s && !strchr (txt.ascii(), 0xc3) && (txt.find("\\x")==-1)) return txt; /* The string is not in UTF-8 */ //if (strchr (txt.ascii(), 0xc3)) return (txt+" +++"); - if (txt.tqfind("\\x")==-1) + if (txt.find("\\x")==-1) return TQString::fromUtf8(txt.ascii()); - // if (!strchr (txt.ascii(), 0xc3) || (txt.tqfind("\\x")!=-1)) { - for ( int idx = 0 ; (idx = txt.tqfind( "\\x", idx )) >= 0 ; ++idx ) { + // if (!strchr (txt.ascii(), 0xc3) || (txt.find("\\x")!=-1)) { + for ( int idx = 0 ; (idx = txt.find( "\\x", idx )) >= 0 ; ++idx ) { char str[2] = "x"; str[0] = (char) TQString( txt.mid( idx + 2, 2 ) ).toShort( 0, 16 ); - txt.tqreplace( idx, 4, str ); + txt.replace( idx, 4, str ); } if (!strchr (txt.ascii(), 0xc3)) return TQString::fromUtf8(txt.ascii()); diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp index 1f3d5a39..f4d4072f 100644 --- a/kopete/plugins/cryptography/kgpgselkey.cpp +++ b/kopete/plugins/cryptography/kgpgselkey.cpp @@ -170,13 +170,13 @@ KgpgSelKey::KgpgSelKey(TQWidget *tqparent, const char *name,bool showlocal):KDia TQString KgpgSelKey::extractKeyName(TQString fullName) { TQString kMail; - if (fullName.tqfind("<")!=-1) + if (fullName.find("<")!=-1) { kMail=fullName.section('<',-1,-1); kMail.truncate(kMail.length()-1); } TQString kName=fullName.section('<',0,0); - if (kName.tqfind("(")!=-1) kName=kName.section('(',0,0); + if (kName.find("(")!=-1) kName=kName.section('(',0,0); return TQString(kMail+" ("+kName+")").stripWhiteSpace(); } diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index 661fd717..d3d3ecd7 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -269,7 +269,7 @@ void popupPublic::sort() if (current==NULL) return; - if ((untrustedList.tqfind(current->text(2))!=untrustedList.end()) && (!current->text(2).isEmpty())){ + if ((untrustedList.find(current->text(2))!=untrustedList.end()) && (!current->text(2).isEmpty())){ if (current->isSelected()) { current->setSelected(false); reselect=true; @@ -279,7 +279,7 @@ void popupPublic::sort() while ( current->nextSibling() ) { current = current->nextSibling(); - if ((untrustedList.tqfind(current->text(2))!=untrustedList.end()) && (!current->text(2).isEmpty())) { + if ((untrustedList.find(current->text(2))!=untrustedList.end()) && (!current->text(2).isEmpty())) { if (current->isSelected()) { current->setSelected(false); reselect=true; @@ -433,13 +433,13 @@ void popupPublic::slotprocread(KProcIO *p) untrustedList<<id; break; } - if (keyString[11].tqfind('D')!=-1) dead=true; + if (keyString[11].find('D')!=-1) dead=true; tst=keyString[9]; - if (tst.tqfind("<")!=-1) { + if (tst.find("<")!=-1) { keymail=tst.section('<',-1,-1); keymail.truncate(keymail.length()-1); keyname=tst.section('<',0,0); - //if (keyname.tqfind("(")!=-1) + //if (keyname.find("(")!=-1) // keyname=keyname.section('(',0,0); } else { keymail=TQString(); @@ -454,7 +454,7 @@ void popupPublic::slotprocread(KProcIO *p) UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey); //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").tqarg(id).tqarg(tr).tqarg(val)); //sub->setSelectable(false); - if (seclist.tqfind(tst,0,FALSE)!=-1) + if (seclist.find(tst,0,FALSE)!=-1) item->setPixmap(0,keyPair); else item->setPixmap(0,keySingle); diff --git a/kopete/plugins/highlight/highlightplugin.cpp b/kopete/plugins/highlight/highlightplugin.cpp index 843d7ed5..4eee907e 100644 --- a/kopete/plugins/highlight/highlightplugin.cpp +++ b/kopete/plugins/highlight/highlightplugin.cpp @@ -70,8 +70,8 @@ void HighlightPlugin::slotIncomingMessage( Kopete::Message& msg ) { ++it; if(f->isRegExp ? - msg.plainBody().tqcontains(TQRegExp(f->search , f->caseSensitive)) : - msg.plainBody().tqcontains(f->search , f->caseSensitive) ) + msg.plainBody().contains(TQRegExp(f->search , f->caseSensitive)) : + msg.plainBody().contains(f->search , f->caseSensitive) ) { if(f->setBG) msg.setBg(f->BG); diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui index 360af41e..eaca281c 100644 --- a/kopete/plugins/highlight/highlightprefsbase.ui +++ b/kopete/plugins/highlight/highlightprefsbase.ui @@ -127,7 +127,7 @@ </sizepolicy> </property> <property name="text"> - <string>If the message tqcontains:</string> + <string>If the message contains:</string> </property> </widget> <widget class="KLineEdit"> diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp index 5a84e021..76b29a5c 100644 --- a/kopete/plugins/history/converter.cpp +++ b/kopete/plugins/history/converter.cpp @@ -118,7 +118,7 @@ void HistoryPlugin::convertOldHistory() while ( (fi2 = it2.current()) != 0 ) { //we assume that all "-" are dots. (like in hotmail.com) - TQString contactId=fi2->fileName().tqreplace(".log" , TQString()).tqreplace("-" , "."); + TQString contactId=fi2->fileName().replace(".log" , TQString()).replace("-" , "."); if(!contactId.isEmpty() ) { @@ -213,9 +213,9 @@ void HistoryPlugin::convertOldHistory() if(!docElem.isNull()) { TQDate date(year,month,1); - TQString name = protocolId.tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + TQString name = protocolId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + TQString::tqfromLatin1( "/" ) + - contactId.tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + contactId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + date.toString(".yyyyMM"); KSaveFile file( locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ); if( file.status() == 0 ) @@ -275,9 +275,9 @@ void HistoryPlugin::convertOldHistory() if(!docElem.isNull()) { TQDate date(year,month,1); - TQString name = protocolId.tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + TQString name = protocolId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + TQString::tqfromLatin1( "/" ) + - contactId.tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + contactId.replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + date.toString(".yyyyMM"); KSaveFile file( locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ); if( file.status() == 0 ) diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index b61738ae..e86f08b7 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -125,7 +125,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* tqparent, } if (mMetaContact) - mMainWidget->contactComboBox->setCurrentItem(mMetaContactList.tqfind(mMetaContact)+1); + mMainWidget->contactComboBox->setCurrentItem(mMetaContactList.find(mMetaContact)+1); mMainWidget->dateSearchLine->setListView(mMainWidget->dateListView); mMainWidget->dateListView->setSorting(0, 0); //newest-first @@ -231,7 +231,7 @@ void HistoryDialog::slotLoadDays() for (unsigned int i=0; i<dayList.count(); i++) { TQDate c2Date(pair.date().year(),pair.date().month(),dayList[i]); - if (mInit.dateMCList.tqfind(pair) == mInit.dateMCList.end()) + if (mInit.dateMCList.find(pair) == mInit.dateMCList.end()) new KListViewDateItem(mMainWidget->dateListView, c2Date, pair.metaContact()); } mMainWidget->searchProgress->advance(1); @@ -255,13 +255,13 @@ void HistoryDialog::init(Kopete::Contact *c) { // Get year and month list TQRegExp rx( "\\.(\\d\\d\\d\\d)(\\d\\d)" ); - const TQString contact_in_filename=c->contactId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ); + const TQString contact_in_filename=c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ); TQFileInfo *fi; // BEGIN check if there are Kopete 0.7.x TQDir d1(locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().tqreplace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) )); d1.setFilter( TQDir::Files | TQDir::NoSymLinks ); d1.setSorting( TQDir::Name ); @@ -272,7 +272,7 @@ void HistoryDialog::init(Kopete::Contact *c) TQFileInfoListIterator it1( *list1 ); while ( (fi = it1.current()) != 0 ) { - if(fi->fileName().tqcontains(contact_in_filename)) + if(fi->fileName().contains(contact_in_filename)) { rx.search(fi->fileName()); @@ -288,9 +288,9 @@ void HistoryDialog::init(Kopete::Contact *c) // END of kopete 0.7.x check TQString logDir = locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().tqreplace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + + c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + TQString::tqfromLatin1( "/" ) + - c->account()->accountId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) ); TQDir d(logDir); d.setFilter( TQDir::Files | TQDir::NoSymLinks ); @@ -301,7 +301,7 @@ void HistoryDialog::init(Kopete::Contact *c) TQFileInfoListIterator it( *list ); while ( (fi = it.current()) != 0 ) { - if(fi->fileName().tqcontains(contact_in_filename)) + if(fi->fileName().contains(contact_in_filename)) { rx.search(fi->fileName()); @@ -375,7 +375,7 @@ void HistoryDialog::setMessages(TQValueList<Kopete::Message> msgs) if (!mMainWidget->searchLine->text().isEmpty()) // If there is a search, then we hightlight the keywords { - body = body.tqreplace(mMainWidget->searchLine->text(), "<span style=\"background-color:yellow\">" + mMainWidget->searchLine->text() + "</span>", false); + body = body.replace(mMainWidget->searchLine->text(), "<span style=\"background-color:yellow\">" + mMainWidget->searchLine->text() + "</span>", false); } resultHTML += "(<b>" + (*it).timestamp().time().toString() + "</b>) " @@ -482,7 +482,7 @@ void HistoryDialog::slotSearch() TQDate month(curItem->date().year(),curItem->date().month(),1); // if we haven't searched the relevant history logs, search them now - if (!monthsSearched[month].tqcontains(curItem->metaContact())) + if (!monthsSearched[month].contains(curItem->metaContact())) { monthsSearched[month].push_back(curItem->metaContact()); TQPtrList<Kopete::Contact> contacts = curItem->metaContact()->contacts(); @@ -505,12 +505,12 @@ void HistoryDialog::slotSearch() while(!stream.atEnd()) { textLine = stream.readLine(); - if (textLine.tqcontains(mMainWidget->searchLine->text(), false)) + if (textLine.contains(mMainWidget->searchLine->text(), false)) { if(rx.search(textLine) != -1) { // only match message body - if (rx.cap(2).tqcontains(mMainWidget->searchLine->text())) + if (rx.cap(2).contains(mMainWidget->searchLine->text())) matches[TQDate(curItem->date().year(),curItem->date().month(),rx.cap(1).toInt())].push_back(curItem->metaContact()); } // this will happen when multiline messages are searched, properly @@ -525,7 +525,7 @@ void HistoryDialog::slotSearch() } // relevant logfiles have been searched now, check if current date matches - if (matches[curItem->date()].tqcontains(curItem->metaContact())) + if (matches[curItem->date()].contains(curItem->metaContact())) curItem->setVisible(true); // Next date item diff --git a/kopete/plugins/history/historylogger.cpp b/kopete/plugins/history/historylogger.cpp index 714fe966..063ba73d 100644 --- a/kopete/plugins/history/historylogger.cpp +++ b/kopete/plugins/history/historylogger.cpp @@ -125,7 +125,7 @@ TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, unsigned int return TQDomDocument(); } - if(!m_metaContact->contacts().tqcontains(c)) + if(!m_metaContact->contacts().contains(c)) { if(contain) *contain=false; @@ -133,7 +133,7 @@ TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, unsigned int } TQMap<unsigned int , TQDomDocument> documents = m_documents[c]; - if (documents.tqcontains(month)) + if (documents.contains(month)) return documents[month]; @@ -156,7 +156,7 @@ TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, const TQDate return TQDomDocument(); } - if(!m_metaContact->contacts().tqcontains(c)) + if(!m_metaContact->contacts().contains(c)) { if(contain) *contain=false; @@ -223,7 +223,7 @@ void HistoryLogger::appendMessage( const Kopete::Message &msg , const Kopete::Co } - if(!c || !m_metaContact->contacts().tqcontains(c) ) + if(!c || !m_metaContact->contacts().contains(c) ) { /*TQPtrList<Kopete::Contact> contacts= m_metaContact->contacts(); TQPtrListIterator<Kopete::Contact> it( contacts ); @@ -418,7 +418,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines, return messages; } - if(c && !m_metaContact->contacts().tqcontains(c) ) + if(c && !m_metaContact->contacts().contains(c) ) return messages; if(sens ==0 ) //if no sens are selected, just continue in the previous sens @@ -473,7 +473,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines, // date, this date will bocomes the limit. TQDomNode n; - if(m_currentElements.tqcontains(*it)) + if(m_currentElements.contains(*it)) n=m_currentElements[*it]; else //there is not yet "next message" register, so we will take the first (for the current month) { @@ -512,7 +512,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines, } else //we don't have to merge the history. just take the next item in the contact { - if(m_currentElements.tqcontains(currentContact)) + if(m_currentElements.contains(currentContact)) msgElem=m_currentElements[currentContact]; else { @@ -572,7 +572,7 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines, if(!m_hideOutgoing || dir != Kopete::Message::Outbound) { //parse only if we don't hide it - if( m_filter.isNull() || ( m_filterRegExp? msgElem.text().tqcontains(TQRegExp(m_filter,m_filterCaseSensitive)) : msgElem.text().tqcontains(m_filter,m_filterCaseSensitive) )) + if( m_filter.isNull() || ( m_filterRegExp? msgElem.text().contains(TQRegExp(m_filter,m_filterCaseSensitive)) : msgElem.text().contains(m_filter,m_filterCaseSensitive) )) { TQString f=msgElem.attribute("from" ); const Kopete::Contact *from=(f.isNull() || !currentContact) ? 0L : currentContact->account()->contacts()[f]; @@ -663,11 +663,11 @@ TQValueList<Kopete::Message> HistoryLogger::readMessages(unsigned int lines, TQString HistoryLogger::getFileName(const Kopete::Contact* c, TQDate date) { - TQString name = c->protocol()->pluginId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + TQString name = c->protocol()->pluginId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + TQString::tqfromLatin1( "/" ) + - c->account()->accountId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + TQString::tqfromLatin1( "/" ) + - c->contactId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + date.toString(".yyyyMM"); TQString filename=locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ; @@ -676,9 +676,9 @@ TQString HistoryLogger::getFileName(const Kopete::Contact* c, TQDate date) TQFileInfo fi(filename); if(!fi.exists()) { - name = c->protocol()->pluginId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + name = c->protocol()->pluginId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + TQString::tqfromLatin1( "/" ) + - c->contactId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + date.toString(".yyyyMM"); TQString filename2=locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ; @@ -702,7 +702,7 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c) // BEGIN check if there are Kopete 0.7.x TQDir d1(locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().tqreplace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) )); d1.setFilter( TQDir::Files | TQDir::NoSymLinks ); d1.setSorting( TQDir::Name ); @@ -712,7 +712,7 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c) while ( (fi = it1.current()) != 0 ) { - if(fi->fileName().tqcontains(c->contactId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ))) + if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ))) { rx.search(fi->fileName()); int result = 12*(TQDate::tqcurrentDate().year() - rx.cap(1).toUInt()) +TQDate::tqcurrentDate().month() - rx.cap(2).toUInt(); @@ -730,9 +730,9 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c) TQDir d(locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().tqreplace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + + c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + TQString::tqfromLatin1( "/" ) + - c->account()->accountId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) )); d.setFilter( TQDir::Files | TQDir::NoSymLinks ); @@ -742,7 +742,7 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c) TQFileInfoListIterator it( *list ); while ( (fi = it.current()) != 0 ) { - if(fi->fileName().tqcontains(c->contactId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ))) + if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ))) { rx.search(fi->fileName()); int result = 12*(TQDate::tqcurrentDate().year() - rx.cap(1).toUInt()) +TQDate::tqcurrentDate().month() - rx.cap(2).toUInt(); @@ -838,7 +838,7 @@ TQValueList<int> HistoryLogger::getDaysForMonth(TQDate date) pos += rxTime.matchedLength(); int day=rxTime.capturedTexts()[1].toInt(); - if ( day !=lastDay && dayList.tqfind(day) == dayList.end()) // avoid duplicates + if ( day !=lastDay && dayList.find(day) == dayList.end()) // avoid duplicates { dayList.append(rxTime.capturedTexts()[1].toInt()); lastDay=day; diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index 789b331c..3c83c371 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -76,7 +76,7 @@ HistoryPlugin::HistoryPlugin( TQObject *tqparent, const char *name, const TQStri TQValueList<Kopete::ChatSession*> sessions = Kopete::ChatSessionManager::self()->sessions(); for (TQValueListIterator<Kopete::ChatSession*> it= sessions.begin(); it!=sessions.end() ; ++it) { - if(!m_loggers.tqcontains(*it)) + if(!m_loggers.contains(*it)) { m_loggers.insert(*it, new HistoryGUIClient( *it ) ); connect( *it, TQT_SIGNAL(closing(Kopete::ChatSession*)), @@ -102,7 +102,7 @@ void HistoryPlugin::messageDisplayed(const Kopete::Message &m) if(m.direction()==Kopete::Message::Internal || !m.manager()) return; - if(!m_loggers.tqcontains(m.manager())) + if(!m_loggers.contains(m.manager())) { m_loggers.insert(m.manager() , new HistoryGUIClient( m.manager() ) ); connect(m.manager(), TQT_SIGNAL(closing(Kopete::ChatSession*)), @@ -149,7 +149,7 @@ void HistoryPlugin::slotViewCreated( KopeteView* v ) if(!m_currentChatSession) return; //i am sorry - if(!m_loggers.tqcontains(m_currentChatSession)) + if(!m_loggers.contains(m_currentChatSession)) { m_loggers.insert(m_currentChatSession , new HistoryGUIClient( m_currentChatSession ) ); connect( m_currentChatSession, TQT_SIGNAL(closing(Kopete::ChatSession*)), diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp index 154a176a..19fbe54b 100644 --- a/kopete/plugins/latex/latexguiclient.cpp +++ b/kopete/plugins/latex/latexguiclient.cpp @@ -57,7 +57,7 @@ void LatexGUIClient::slotPreview() Kopete::Message msg = m_manager->view()->currentMessage(); TQString messageText = msg.plainBody(); - if(!messageText.tqcontains("$$")) //we haven't found any latex strings + if(!messageText.contains("$$")) //we haven't found any latex strings { KMessageBox::sorry(reinterpret_cast<TQWidget*>(m_manager->view()) , i18n("There are no latex in the message you are typing. The latex formula must be included between $$ and $$ "), i18n("No Latex Formula") ); return; diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp index 61fab8a6..75ccdaf9 100644 --- a/kopete/plugins/latex/latexplugin.cpp +++ b/kopete/plugins/latex/latexplugin.cpp @@ -101,7 +101,7 @@ void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg ) } TQString messageText = msg.plainBody(); - if( !messageText.tqcontains("$$")) + if( !messageText.contains("$$")) return; //kdDebug() << k_funcinfo << " Using converter: " << m_convScript << endl; @@ -132,7 +132,7 @@ void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg ) if(!securityCheck(formul)) continue; - TQString fileName=handleLatex(formul.tqreplace("$$","")); + TQString fileName=handleLatex(formul.replace("$$","")); // get the image and encode it with base64 #if ENCODED_IMAGE_MODE @@ -167,8 +167,8 @@ void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg ) continue; imagePxWidth = theImage.width(); imagePxHeight = theImage.height(); - TQString escapedLATEX=TQStyleSheet::escape(it.key()).tqreplace("\"","""); //we need the escape quotes because that string will be in a title="" argument, but not the \n - messageText.tqreplace(Kopete::Message::escape(it.key()), " <img width=\"" + TQString::number(imagePxWidth) + "\" height=\"" + TQString::number(imagePxHeight) + "\" src=\"" + (*it) + "\" alt=\"" + escapedLATEX +"\" title=\"" + escapedLATEX +"\" /> "); + TQString escapedLATEX=TQStyleSheet::escape(it.key()).replace("\"","""); //we need the escape quotes because that string will be in a title="" argument, but not the \n + messageText.replace(Kopete::Message::escape(it.key()), " <img width=\"" + TQString::number(imagePxWidth) + "\" height=\"" + TQString::number(imagePxHeight) + "\" src=\"" + (*it) + "\" alt=\"" + escapedLATEX +"\" title=\"" + escapedLATEX +"\" /> "); } msg.setBody( messageText, Kopete::Message::RichText ); @@ -187,7 +187,7 @@ void LatexPlugin::slotMessageAboutToSend( Kopete::Message& msg) return; TQString messageText = msg.plainBody(); - if( !messageText.tqcontains("$$")) + if( !messageText.contains("$$")) return; /* if( msg.from()->protocol()->pluginId()!="MSNProtocol" ) return;*/ @@ -206,7 +206,7 @@ void LatexPlugin::slotMessageAboutToSend( Kopete::Message& msg) if(!url.isNull()) { - TQString escapedLATEX= TQStyleSheet::escape(messageText).tqreplace("\"","""); + TQString escapedLATEX= TQStyleSheet::escape(messageText).replace("\"","""); TQString messageText="<img src=\"" + url + "\" alt=\"" + escapedLATEX + "\" title=\"" + escapedLATEX +"\" />"; msg.setBody( messageText, Kopete::Message::RichText ); } @@ -241,7 +241,7 @@ TQString LatexPlugin::handleLatex(const TQString &latexFormula) bool LatexPlugin::securityCheck(const TQString &latexFormula) { - return !latexFormula.tqcontains(TQRegExp("\\\\(def|let|futurelet|newcommand|renewcomment|else|fi|write|input|include" + return !latexFormula.contains(TQRegExp("\\\\(def|let|futurelet|newcommand|renewcomment|else|fi|write|input|include" "|chardef|catcode|makeatletter|noexpand|toksdef|every|errhelp|errorstopmode|scrollmode|nonstopmode|batchmode" "|read|csname|newhelp|relax|afterground|afterassignment|expandafter|noexpand|special|command|loop|repeat|toks" "|output|line|mathcode|name|item|section|mbox|DeclareRobustCommand)[^a-zA-Z]")); diff --git a/kopete/plugins/motionautoaway/COPYING.motion b/kopete/plugins/motionautoaway/COPYING.motion index 0a56ad07..0b84a43f 100644 --- a/kopete/plugins/motionautoaway/COPYING.motion +++ b/kopete/plugins/motionautoaway/COPYING.motion @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp index 73e08d4a..3f068c06 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp +++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp @@ -59,7 +59,7 @@ void NetMeetingInvitation::parseInvitation(const TQString& msg) TQRegExp rx("Invitation-Command: ([A-Z]*)"); rx.search(msg); TQString command=rx.cap(1); - if( msg.tqcontains("Invitation-Command: INVITE") ) + if( msg.contains("Invitation-Command: INVITE") ) { MSNInvitation::parseInvitation(msg); //for the cookie @@ -98,7 +98,7 @@ void NetMeetingInvitation::parseInvitation(const TQString& msg) } } } - else if( msg.tqcontains("Invitation-Command: ACCEPT") ) + else if( msg.contains("Invitation-Command: ACCEPT") ) { if( ! incoming() ) { diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp index 715f26e6..3cdb4b21 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.cpp +++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp @@ -81,7 +81,7 @@ void NetMeetingPlugin::slotNewKMM(Kopete::ChatSession *KMM) void NetMeetingPlugin::slotInvitation(MSNInvitation*& invitation, const TQString &bodyMSG , long unsigned int /*cookie*/ , MSNChatSession* msnMM , MSNContact* c ) { - if(!invitation && bodyMSG.tqcontains(NetMeetingInvitation::applicationID())) + if(!invitation && bodyMSG.contains(NetMeetingInvitation::applicationID())) { invitation=new NetMeetingInvitation(true,c,msnMM); invitation->parseInvitation(bodyMSG); diff --git a/kopete/plugins/nowlistening/nlnoatun.cpp b/kopete/plugins/nowlistening/nlnoatun.cpp index 4f414a11..e563eb0e 100644 --- a/kopete/plugins/nowlistening/nlnoatun.cpp +++ b/kopete/plugins/nowlistening/nlnoatun.cpp @@ -39,7 +39,7 @@ void NLNoatun::update() m_playing = false; TQString newTrack; // see if it's registered with DCOP - TQCString appname = tqfind(); + TQCString appname = find(); if ( !appname.isEmpty() ) { // see if it's playing @@ -97,7 +97,7 @@ void NLNoatun::update() kdDebug( 14307 ) << "NLNoatun::update() - noatun not found" << endl; } -TQCString NLNoatun::tqfind() const +TQCString NLNoatun::find() const { TQCString app = "noatun"; if ( !m_client->isApplicationRegistered( app ) ) diff --git a/kopete/plugins/nowlistening/nlnoatun.h b/kopete/plugins/nowlistening/nlnoatun.h index 30956611..85e1aaac 100644 --- a/kopete/plugins/nowlistening/nlnoatun.h +++ b/kopete/plugins/nowlistening/nlnoatun.h @@ -32,7 +32,7 @@ class NLNoatun : public NLMediaPlayer NLNoatun( DCOPClient *client ); virtual void update(); protected: - TQCString tqfind() const; + TQCString find() const; TQString currentProperty( TQCString appname, TQString property ) const; DCOPClient *m_client; }; diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp index ca9c9316..b72df2a7 100644 --- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp +++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp @@ -205,7 +205,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg) for( Kopete::Contact *c = dest.first() ; c ; c = dest.next() ) { const TQString& cId = c->contactId(); - if( 0 == d->m_musicSentTo.tqcontains( cId ) ) + if( 0 == d->m_musicSentTo.contains( cId ) ) { mustSendAnyway = true; @@ -318,7 +318,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic() { if(statusSong.search(advert) != -1) { - advert = advert.tqreplace(statusSong, TQString(" (%1)").tqarg(mediaPlayerAdvert(false)) ); + advert = advert.replace(statusSong, TQString(" (%1)").tqarg(mediaPlayerAdvert(false)) ); } else { @@ -327,7 +327,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic() } else { - advert = advert.tqreplace(statusSong, ""); + advert = advert.replace(statusSong, ""); } } else @@ -432,7 +432,7 @@ TQString NowListeningPlugin::substDepthFirst( NLMediaPlayer *player, // recursively replace contents of matching () TQString substitution = substDepthFirst( player, in.mid( i + 1, j - i - 1), true ) ; - in.tqreplace ( i, j - i + 1, substitution ); + in.replace ( i, j - i + 1, substitution ); // perform substitution and return the result i = i + substitution.length() - 1; break; @@ -446,34 +446,34 @@ TQString NowListeningPlugin::substDepthFirst( NLMediaPlayer *player, // no () found, perform substitution! // get each string (to) to substitute for (from) bool done = false; - if ( in.tqcontains ( "%track" ) ) + if ( in.contains ( "%track" ) ) { if ( track.isEmpty() ) track = i18n("Unknown track"); - in.tqreplace( "%track", track ); + in.replace( "%track", track ); done = true; } - if ( in.tqcontains ( "%artist" ) && !artist.isEmpty() ) + if ( in.contains ( "%artist" ) && !artist.isEmpty() ) { if ( artist.isEmpty() ) artist = i18n("Unknown artist"); - in.tqreplace( "%artist", artist ); + in.replace( "%artist", artist ); done = true; } - if ( in.tqcontains ( "%album" ) && !album.isEmpty() ) + if ( in.contains ( "%album" ) && !album.isEmpty() ) { if ( album.isEmpty() ) album = i18n("Unknown album"); - in.tqreplace( "%album", album ); + in.replace( "%album", album ); done = true; } - if ( in.tqcontains ( "%player" ) && !playerName.isEmpty() ) + if ( in.contains ( "%player" ) && !playerName.isEmpty() ) { if ( playerName.isEmpty() ) playerName = i18n("Unknown player"); - in.tqreplace( "%player", playerName ); + in.replace( "%player", playerName ); done = true; } // make whether we return anything dependent on whether we diff --git a/kopete/plugins/smpppdcs/detectornetstat.cpp b/kopete/plugins/smpppdcs/detectornetstat.cpp index a08f2c4f..ca800e7f 100644 --- a/kopete/plugins/smpppdcs/detectornetstat.cpp +++ b/kopete/plugins/smpppdcs/detectornetstat.cpp @@ -66,7 +66,7 @@ void DetectorNetstat::slotProcessStdout(KProcess *, char *buffer, int buflen) { void DetectorNetstat::slotProcessExited(KProcess *process) { kdDebug(14312) << k_funcinfo << m_buffer << endl; if(process == m_process) { - m_connector->setConnectedtqStatus(m_buffer.tqcontains("default")); + m_connector->setConnectedtqStatus(m_buffer.contains("default")); m_buffer = TQString(); delete m_process; m_process = 0L; diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp index 14f133c1..01aac790 100644 --- a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp +++ b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp @@ -153,7 +153,7 @@ void SMPPPDCSPlugin::connectAllowed() { } #endif - if(!list.tqcontains(it.current()->protocol()->pluginId() + "_" + it.current()-> + if(!list.contains(it.current()->protocol()->pluginId() + "_" + it.current()-> accountId())) { it.current()->connect(); } @@ -178,7 +178,7 @@ void SMPPPDCSPlugin::disconnectAllowed() { } #endif - if(!list.tqcontains(it.current()->protocol()->pluginId() + "_" + it.current()->accountId())) { + if(!list.contains(it.current()->protocol()->pluginId() + "_" + it.current()->accountId())) { it.current()->disconnect(); } } diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp index de950965..944779f1 100644 --- a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp +++ b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp @@ -134,7 +134,7 @@ void SMPPPDCSPreferences::load() while(it.current()) { TQCheckListItem * cli = dynamic_cast<TQCheckListItem *>(it.current()); if(rex.search(cli->text(0)) > -1) { - bool isOn = list.tqcontains(rex.cap(2) + "Protocol_" + rex.cap(1)); + bool isOn = list.contains(rex.cap(2) + "Protocol_" + rex.cap(1)); // m_accountMapOld[cli->text(0)].m_on = isOn; m_accountMapCur[cli->text(0)].m_on = isOn; cli->setOn(isOn); diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp index 7d4cbe76..8f25623e 100644 --- a/kopete/plugins/statistics/statisticsdb.cpp +++ b/kopete/plugins/statistics/statisticsdb.cpp @@ -68,7 +68,7 @@ StatisticsDB::StatisticsDB() // Creates the tables if they do not exist. TQStringList result = query("SELECT name FROM sqlite_master WHERE type='table'"); - if (!result.tqcontains("contacts")) + if (!result.contains("contacts")) { query(TQString("CREATE TABLE contacts " "(id INTEGER PRIMARY KEY," @@ -77,7 +77,7 @@ StatisticsDB::StatisticsDB() ");")); } - if (!result.tqcontains("contactstatus")) + if (!result.contains("contactstatus")) { kdDebug() << "[Statistics] Database empty"<< endl; query(TQString("CREATE TABLE contactstatus " @@ -89,7 +89,7 @@ StatisticsDB::StatisticsDB() ");")); } - if (!result.tqcontains("commonstats")) + if (!result.contains("commonstats")) { // To store things like the contact answer time etc. query(TQString("CREATE TABLE commonstats" @@ -102,7 +102,7 @@ StatisticsDB::StatisticsDB() } /// @fixme This is not used anywhere - if (!result.tqcontains("statsgroup")) + if (!result.contains("statsgroup")) { query(TQString("CREATE TABLE statsgroup" "(id INTEGER PRIMARY KEY," diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp index 09015d7a..1d37768f 100644 --- a/kopete/plugins/statistics/statisticsplugin.cpp +++ b/kopete/plugins/statistics/statisticsplugin.cpp @@ -101,7 +101,7 @@ StatisticsPlugin::~StatisticsPlugin() void StatisticsPlugin::slotAboutToReceive(Kopete::Message& m) { - if ( statisticsMetaContactMap.tqcontains(m.from()->metaContact()) ) + if ( statisticsMetaContactMap.contains(m.from()->metaContact()) ) statisticsMetaContactMap[m.from()->metaContact()]->newMessageReceived(m); } @@ -118,7 +118,7 @@ void StatisticsPlugin::slotViewClosed(Kopete::ChatSession* session) for (; it.current(); ++it) { // If this contact is not in other chat sessions - if (!it.current()->manager() && statisticsMetaContactMap.tqcontains(it.current()->metaContact())) + if (!it.current()->manager() && statisticsMetaContactMap.contains(it.current()->metaContact())) statisticsMetaContactMap[it.current()->metaContact()]->setIsChatWindowOpen(false); } } @@ -129,7 +129,7 @@ void StatisticsPlugin::slotViewStatistics() kdDebug() << k_funcinfo << "statistics - dialog :"+ mc->displayName() << endl; - if ( mc && statisticsMetaContactMap.tqcontains(mc) ) + if ( mc && statisticsMetaContactMap.contains(mc) ) { (new StatisticsDialog(statisticsMetaContactMap[mc], db()))->show(); } @@ -137,7 +137,7 @@ void StatisticsPlugin::slotViewStatistics() void StatisticsPlugin::slotOnlineStatusChanged(Kopete::MetaContact *mc, Kopete::OnlineStatus::StatusType status) { - if ( statisticsMetaContactMap.tqcontains(mc) ) + if ( statisticsMetaContactMap.contains(mc) ) statisticsMetaContactMap[mc]->onlineStatusChanged(status); } @@ -164,7 +164,7 @@ void StatisticsPlugin::slotMetaContactAdded(Kopete::MetaContact *mc) void StatisticsPlugin::slotMetaContactRemoved(Kopete::MetaContact *mc) { - if (statisticsMetaContactMap.tqcontains(mc)) + if (statisticsMetaContactMap.contains(mc)) { StatisticsContact *sc = statisticsMetaContactMap[mc]; statisticsMetaContactMap.remove(mc); @@ -175,7 +175,7 @@ void StatisticsPlugin::slotMetaContactRemoved(Kopete::MetaContact *mc) void StatisticsPlugin::slotContactAdded( Kopete::Contact *c) { - if (statisticsMetaContactMap.tqcontains(c->metaContact())) + if (statisticsMetaContactMap.contains(c->metaContact())) { StatisticsContact *sc = statisticsMetaContactMap[c->metaContact()]; sc->contactAdded(c); @@ -185,7 +185,7 @@ void StatisticsPlugin::slotContactAdded( Kopete::Contact *c) void StatisticsPlugin::slotContactRemoved( Kopete::Contact *c) { - if (statisticsMetaContactMap.tqcontains(c->metaContact())) + if (statisticsMetaContactMap.contains(c->metaContact())) statisticsMetaContactMap[c->metaContact()]->contactRemoved(c); statisticsContactMap.remove(c->contactId()); @@ -195,7 +195,7 @@ void StatisticsPlugin::dcopStatisticsDialog(TQString id) { kdDebug() << k_funcinfo << "statistics - DCOP dialog :" << id << endl; - if (statisticsContactMap.tqcontains(id)) + if (statisticsContactMap.contains(id)) { (new StatisticsDialog(statisticsContactMap[id], db()))->show(); } @@ -241,7 +241,7 @@ bool StatisticsPlugin::dcopWastqStatus(TQString id, TQDateTime dateTime, Kopete: { kdDebug() << k_funcinfo << "statistics - DCOP wasOnline :" << id << endl; - if (dateTime.isValid() && statisticsContactMap.tqcontains(id)) + if (dateTime.isValid() && statisticsContactMap.contains(id)) { return statisticsContactMap[id]->wastqStatus(dateTime, status); } @@ -261,7 +261,7 @@ TQString StatisticsPlugin::dcoptqStatus(TQString id, TQString dateTime) { TQDateTime dt = TQDateTime::fromString(dateTime); - if (dt.isValid() && statisticsContactMap.tqcontains(id)) + if (dt.isValid() && statisticsContactMap.contains(id)) { return statisticsContactMap[id]->statusAt(dt); } @@ -273,7 +273,7 @@ TQString StatisticsPlugin::dcopMaintqStatus(TQString id, int timeStamp) { TQDateTime dt; dt.setTime_t(timeStamp); - if (dt.isValid() && statisticsContactMap.tqcontains(id)) + if (dt.isValid() && statisticsContactMap.contains(id)) { return statisticsContactMap[id]->mainStatusDate(dt.date()); } diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index 175cb9d8..4d6c2d88 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -241,7 +241,7 @@ TQString TranslatorPlugin::translateMessage( const TQString &msg, const TQString } // We search for src_dst - if(! m_languages->supported( m_service ).tqcontains( from + "_" + to ) ) + if(! m_languages->supported( m_service ).contains( from + "_" + to ) ) { kdDebug( 14308 ) << k_funcinfo << from << "_" << to << " is not supported by service " << m_service << endl; return TQString(); |