diff options
403 files changed, 1520 insertions, 1520 deletions
diff --git a/dcoprss/cache.cpp b/dcoprss/cache.cpp index 1e7d260c..0636c674 100644 --- a/dcoprss/cache.cpp +++ b/dcoprss/cache.cpp @@ -108,7 +108,7 @@ void Cache::save() void Cache::touch( const TQString &key ) { - CacheEntry *entry = tqfind( key ); + CacheEntry *entry = find( key ); if ( !entry ) return; entry->m_timeStamp = TQDateTime::tqcurrentDateTime(); diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp index fd18c0ef..c36e982c 100644 --- a/dcoprss/feedbrowser.cpp +++ b/dcoprss/feedbrowser.cpp @@ -32,7 +32,7 @@ void CategoryItem::init() m_populated = false; m_dcopIface = 0; - setText( 0, m_category.mid( m_category.tqfindRev( '/' ) + 1 ).tqreplace( '_', ' ' ) ); + setText( 0, m_category.mid( m_category.findRev( '/' ) + 1 ).replace( '_', ' ' ) ); } void CategoryItem::setOpen( bool open ) diff --git a/dcoprss/query.cpp b/dcoprss/query.cpp index 0c6dd2f5..b3d48eaf 100644 --- a/dcoprss/query.cpp +++ b/dcoprss/query.cpp @@ -58,7 +58,7 @@ void QueryService::cachedCall( const TQString &method, const TQString cacheKey = Cache::getCacheKey( m_xmlrpcServer->url().url(), method, args ); - CacheEntry *cacheEntry = Cache::self().tqfind( cacheKey ); + CacheEntry *cacheEntry = Cache::self().find( cacheKey ); if ( cacheEntry != 0 && cacheEntry->isValid() ) { kdDebug() << "Using cached result." << endl; SlotCaller::call( this, slot, cacheEntry->result() ); @@ -74,7 +74,7 @@ void QueryService::updateCache( const KXMLRPC::Query::Result &result ) result.method(), result.args() ); - CacheEntry *cacheEntry = Cache::self().tqfind( cacheKey ); + CacheEntry *cacheEntry = Cache::self().find( cacheKey ); if ( cacheEntry == 0 ) { kdDebug() << "Inserting returned result into cache." << endl; Cache::self().insert( cacheKey, result ); diff --git a/dcoprss/service.cpp b/dcoprss/service.cpp index ec6b62c4..54e987b2 100644 --- a/dcoprss/service.cpp +++ b/dcoprss/service.cpp @@ -45,7 +45,7 @@ TQStringList RSSService::list() DCOPRef RSSService::add(TQString id) { - if(m_list.tqfind(id) == 0L) { // add a new one only if we need to + if(m_list.find(id) == 0L) { // add a new one only if we need to m_list.insert(id, new RSSDocument(id)); added(id); saveLinks(); diff --git a/filesharing/advanced/kcm_sambaconf/common.cpp b/filesharing/advanced/kcm_sambaconf/common.cpp index 48ce7220..4dbbd209 100644 --- a/filesharing/advanced/kcm_sambaconf/common.cpp +++ b/filesharing/advanced/kcm_sambaconf/common.cpp @@ -34,7 +34,7 @@ void setComboToString(TQComboBox* combo,const TQString & s) { - int i = combo->listBox()->index(combo->listBox()->tqfindItem(s,TQt::ExactMatch)); + int i = combo->listBox()->index(combo->listBox()->findItem(s,TQt::ExactMatch)); combo->setCurrentItem(i); } diff --git a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui.h b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui.h index 32f859e8..d5ebac97 100644 --- a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui.h +++ b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui.h @@ -14,7 +14,7 @@ void GroupSelectDlg::init(const TQStringList & specifiedGroups) for (TQStringList::Iterator it = unixGroups.begin(); it != unixGroups.end(); ++it) { - if ( ! specifiedGroups.tqcontains(*it)) + if ( ! specifiedGroups.contains(*it)) new TQListViewItem(groupListView, *it, TQString::number(getGroupGID(*it))); } } diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp index 041aadda..70d2bda6 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp @@ -397,8 +397,8 @@ void HiddenFileView::checkBoxClicked(TQCheckBox* chkBox,KToggleAction* action,TQ if (rx) { // perhaps it is matched by a wildcard string TQString p = rx->pattern(); - if ( p.tqfind("*") > -1 || - p.tqfind("?") > -1 ) + if ( p.find("*") > -1 || + p.find("?") > -1 ) { // TODO after message freeze: why show three times the wildcard string? Once should be enough. // TODO remove <b></b> and use <qt> instead diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 05a30547..ce411c69 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -1010,7 +1010,7 @@ void KcmSambaConf::loadCommands(SambaShare*) void KcmSambaConf::setComboIndexToValue(TQComboBox* box, const TQString & value, SambaShare* share) { - int i = box->listBox()->index(box->listBox()->tqfindItem(share->getValue(value,false,true),TQt::ExactMatch)); + int i = box->listBox()->index(box->listBox()->findItem(share->getValue(value,false,true),TQt::ExactMatch)); box->setCurrentItem(i); } @@ -1078,7 +1078,7 @@ void KcmSambaConf::loadUserTab() { TQStringList::Iterator it; - it=added.tqfind(unixUser->name); + it=added.find(unixUser->name); if (it == added.end()) new KListViewItem(_interface->unixUsersListView, unixUser->name, TQString::number(unixUser->uid)); } @@ -1311,7 +1311,7 @@ void KcmSambaConf::save() { bool KcmSambaConf::getSocketBoolValue( const TQString & str, const TQString & name ) { TQString s = str; - int i = s.tqfind(name ,0,false); + int i = s.find(name ,0,false); if (i > -1) { @@ -1335,7 +1335,7 @@ bool KcmSambaConf::getSocketBoolValue( const TQString & str, const TQString & na int KcmSambaConf::getSocketIntValue( const TQString & str, const TQString & name ) { TQString s = str; - int i = s.tqfind(name ,0,false); + int i = s.find(name ,0,false); if (i > -1) { @@ -1344,7 +1344,7 @@ int KcmSambaConf::getSocketIntValue( const TQString & str, const TQString & name { s = s.remove(0,1); - i = s.tqfind(" "); + i = s.find(" "); if (i < 0) i = s.length(); else diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 63795a12..2ba52a57 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -115,7 +115,7 @@ TQString SambaFile::findShareByPath(const TQString & path) const { SambaShare* share = it.current(); - TQString *s = share->tqfind("path"); + TQString *s = share->find("path"); if (s) { KURL curUrl(*s); curUrl.adjustPath(-1); @@ -222,7 +222,7 @@ TQString SambaFile::getUnusedName(const TQString alreadyUsedName) const int i = 2; - while (_sambaConfig->tqfind(s)) + while (_sambaConfig->find(s)) { s = init+TQString::number(i); i++; @@ -235,7 +235,7 @@ TQString SambaFile::getUnusedName(const TQString alreadyUsedName) const SambaShare* SambaFile::newShare(const TQString & name) { - if (_sambaConfig->tqfind(name)) + if (_sambaConfig->find(name)) return 0L; SambaShare* share = new SambaShare(name,_sambaConfig); @@ -293,7 +293,7 @@ void SambaFile::removeShareByPath(const TQString & path) { /** No descriptions */ SambaShare* SambaFile::getShare(const TQString & share) const { - SambaShare *s = _sambaConfig->tqfind(share); + SambaShare *s = _sambaConfig->find(share); return s; } @@ -353,7 +353,7 @@ int SambaFile::getSambaVersion() { if (testParam.start(KProcess::Block,KProcess::Stdout)) { - if (_parmOutput.tqfind("3") > -1) + if (_parmOutput.find("3") > -1) _sambaVersion = 3; } @@ -434,7 +434,7 @@ void SambaFile::parseParmStdOutput() // parameter // parameter - int i = line.tqfind('='); + int i = line.find('='); if (i>-1) { TQString name = line.left(i).stripWhiteSpace(); @@ -564,7 +564,7 @@ bool SambaFile::openFile() { } // parameter - int i = completeLine.tqfind('='); + int i = completeLine.find('='); if (i>-1) { @@ -604,7 +604,7 @@ bool SambaFile::saveTo(const TQString & path) for ( TQStringList::Iterator it = shareList.begin(); it != shareList.end(); ++it ) { - SambaShare* share = _sambaConfig->tqfind(*it); + SambaShare* share = _sambaConfig->find(*it); // First add all comments of the share to the file TQStringList comments = share->getComments(); @@ -637,7 +637,7 @@ bool SambaFile::saveTo(const TQString & path) } // Add the option - s << *optionIt << " = " << *share->tqfind(*optionIt) << endl; + s << *optionIt << " = " << *share->find(*optionIt) << endl; } diff --git a/filesharing/advanced/kcm_sambaconf/sambashare.cpp b/filesharing/advanced/kcm_sambaconf/sambashare.cpp index 5c9c69ed..c4f02af9 100644 --- a/filesharing/advanced/kcm_sambaconf/sambashare.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambashare.cpp @@ -58,8 +58,8 @@ bool SambaShare::setName(const TQString & name, bool testWetherExists) { if ( testWetherExists && - _sambaFile->tqfind(name) && - _sambaFile->tqfind(name) != this) + _sambaFile->find(name) && + _sambaFile->find(name) != this) return false; _name = name; @@ -82,7 +82,7 @@ TQString SambaShare::getValue(const TQString & name, bool globalValue, bool defa { TQString synonym = getSynonym(name); - TQString* str = tqfind(synonym); + TQString* str = find(synonym); TQString ret; if (str) { @@ -113,7 +113,7 @@ TQString SambaShare::getGlobalValue(const TQString & name, bool defaultValue) if (!_sambaFile) return getValue(name,false,defaultValue); - SambaShare* globals = _sambaFile->tqfind("global"); + SambaShare* globals = _sambaFile->find("global"); TQString s = globals->getValue(name,false,defaultValue); @@ -219,12 +219,12 @@ void SambaShare::setValue(const TQString & name, const TQString & value, bool gl } - if (!tqfind(synonym)) + if (!find(synonym)) { _optionList.append(synonym); } - tqreplace(synonym,new TQString(newValue)); + replace(synonym,new TQString(newValue)); } void SambaShare::setValue(const TQString & name, bool value, bool globalValue, bool defaultValue) @@ -266,7 +266,7 @@ void SambaShare::setComments(const TQString & name, const TQStringList & comment TQString synonym = getSynonym(name); - _commentList.tqreplace(name,new TQStringList(commentList)); + _commentList.replace(name,new TQStringList(commentList)); } /** @@ -274,7 +274,7 @@ void SambaShare::setComments(const TQString & name, const TQStringList & comment **/ TQStringList SambaShare::getComments(const TQString & name) { - TQStringList* list = _commentList.tqfind(getSynonym(name)); + TQStringList* list = _commentList.find(getSynonym(name)); if (list) return TQStringList(*list); @@ -285,7 +285,7 @@ TQStringList SambaShare::getComments(const TQString & name) bool SambaShare::hasComments(const TQString & name) { - return 0L != _commentList.tqfind(getSynonym(name)); + return 0L != _commentList.find(getSynonym(name)); } /** @@ -316,10 +316,10 @@ TQStringList SambaShare::getOptionList() **/ bool SambaShare::isPrinter() { - TQString* str = tqfind("printable"); + TQString* str = find("printable"); if (!str) - str = tqfind("print ok"); + str = find("print ok"); return str!=0; } diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp index 406e609f..b964d700 100644 --- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp @@ -99,10 +99,10 @@ SambaUserList SmbPasswdFile::getSambaUserList() SambaUser* user = new SambaUser(l[0],l[1].toInt()); user->gid = getUserGID(l[0]); - user->isUserAccount = l[4].tqcontains('U'); - user->hasNoPassword = l[4].tqcontains('N');; - user->isDisabled = l[4].tqcontains('D');; - user->isWorkstationTrustAccount = l[4].tqcontains('W');; + user->isUserAccount = l[4].contains('U'); + user->hasNoPassword = l[4].contains('N');; + user->isDisabled = l[4].contains('D');; + user->isWorkstationTrustAccount = l[4].contains('W');; list.append(user); } f.close(); diff --git a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui.h b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui.h index 25c08453..12cc488f 100644 --- a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui.h +++ b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui.h @@ -62,7 +62,7 @@ SO_RCVLOWATSpin->setValue( getIntValue( s, "SO_RCVLOWAT") ); bool SocketOptionsDlg::getBoolValue( const TQString & str, const TQString & name ) { TQString s = str; - int i = s.tqfind(name ,0,false); + int i = s.find(name ,0,false); if (i > -1) { @@ -85,7 +85,7 @@ bool SocketOptionsDlg::getBoolValue( const TQString & str, const TQString & name int SocketOptionsDlg::getIntValue( const TQString & str, const TQString & name ) { TQString s = str; - int i = s.tqfind(name ,0,false); + int i = s.find(name ,0,false); if (i > -1) { @@ -94,7 +94,7 @@ int SocketOptionsDlg::getIntValue( const TQString & str, const TQString & name ) { s = s.remove(0,1); - i = s.tqfind(" "); + i = s.find(" "); if (i < 0) i = s.length(); else diff --git a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui.h b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui.h index ef505ea0..6a53e28c 100644 --- a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui.h +++ b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui.h @@ -15,7 +15,7 @@ void UserSelectDlg::init(const TQStringList & specifiedUsers, SambaShare* share) for (SambaUser * user = sambaList.first(); user; user = sambaList.next() ) { - if (! specifiedUsers.tqcontains(user->name)) + if (! specifiedUsers.contains(user->name)) new TQListViewItem(userListView, user->name, TQString::number(user->uid), TQString::number(user->gid)); } diff --git a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp index 36393114..366a3f15 100644 --- a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp @@ -240,7 +240,7 @@ void UserTabImpl::setAllowedUser(int i, const TQString & name) _specifiedUsers << name2; } - if (name2.tqcontains(' ')) + if (name2.contains(' ')) name2 = "\""+name2+"\""; diff --git a/filesharing/advanced/nfs/nfsentry.cpp b/filesharing/advanced/nfs/nfsentry.cpp index 8c71053d..b54a3169 100644 --- a/filesharing/advanced/nfs/nfsentry.cpp +++ b/filesharing/advanced/nfs/nfsentry.cpp @@ -27,8 +27,8 @@ NFSHost::NFSHost(const TQString & hostString) TQString s = hostString; - int l = s.tqfind('('); - int r = s.tqfind(')'); + int l = s.find('('); + int r = s.find(')'); initParams(); @@ -90,7 +90,7 @@ void NFSHost::parseParamsString(const TQString & s) do { - i = rest.tqfind(",",0); + i = rest.find(",",0); if (i==-1) p = rest; @@ -251,7 +251,7 @@ void NFSHost::setParam(const TQString & s) rootSquash = false; return; } - int i = p.tqfind("=",0); + int i = p.find("=",0); // get anongid or anonuid if (i>-1) @@ -306,7 +306,7 @@ TQString NFSEntry::toString() const { TQString s = _path.stripWhiteSpace(); - if (_path.tqfind(' ') > -1) { + if (_path.find(' ') > -1) { s = '"'+s+'"'; } diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp index 4caea490..ebc33a9c 100644 --- a/filesharing/advanced/nfs/nfsfile.cpp +++ b/filesharing/advanced/nfs/nfsfile.cpp @@ -61,7 +61,7 @@ void NFSFile::removeEntry(NFSEntry *entry) bool NFSFile::hasEntry(NFSEntry *entry) { - return 0 < _entries.tqcontains(entry); + return 0 < _entries.contains(entry); } @@ -151,7 +151,7 @@ bool NFSFile::load() // Handle quotation marks if ( completeLine[0] == '"' ) { - int i = completeLine.tqfind('"',1); + int i = completeLine.find('"',1); if (i == -1) { kdError() << "NFSFile: Parse error: Missing quotation mark: " << completeLine << endl; @@ -161,9 +161,9 @@ bool NFSFile::load() hosts = completeLine.mid(i+1); } else { // no quotation marks - int i = completeLine.tqfind(' '); + int i = completeLine.find(' '); if (i == -1) - i = completeLine.tqfind('\t'); + i = completeLine.find('\t'); if (i == -1) path = completeLine; diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp index 304386c4..e4f52356 100644 --- a/filesharing/simple/groupconfigdlg.cpp +++ b/filesharing/simple/groupconfigdlg.cpp @@ -110,8 +110,8 @@ TQString prettyString(const KUser &user) { TQString fromPrettyString(const TQString & s) { // Jan Schaefer (jan) // i j - int i = s.tqfind('('); - int j = s.tqfind(')'); + int i = s.find('('); + int j = s.find(')'); TQString loginName = s.mid(i+1,j-i-1); return loginName; } @@ -293,7 +293,7 @@ void GroupConfigDlg::slotChangeGroup() { TQString groupName = combo->currentText(); if (groupName != m_fileShareGroup.name()) { TQString oldGroup = m_fileShareGroup.name(); - if (allGroups.tqcontains(KUserGroup(groupName))) + if (allGroups.contains(KUserGroup(groupName))) setFileShareGroup(KUserGroup(groupName)); else { if (!createFileShareGroup(groupName)) { diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp index eda347e4..74ad2e0b 100644 --- a/kdict/applet/kdictapplet.cpp +++ b/kdict/applet/kdictapplet.cpp @@ -286,7 +286,7 @@ void DictApplet::sendCommand(const TQCString &fun, const TQString &data) return; } else { QCStringList list = client->remoteObjects("kdict"); - if (list.tqfindIndex("KDictIface")==-1) { + if (list.findIndex("KDictIface")==-1) { waiting = 1; delayedFunc = fun.copy(); delayedData = data; @@ -313,7 +313,7 @@ void DictApplet::sendDelayedCommand() return; } else { QCStringList list = client->remoteObjects("kdict"); - if (list.tqfindIndex("KDictIface")==-1) { + if (list.findIndex("KDictIface")==-1) { waiting++; TQTimer::singleShot(100, this, TQT_SLOT(sendDelayedCommand())); return; diff --git a/kdict/dict.cpp b/kdict/dict.cpp index 11d5e12b..8e55061c 100644 --- a/kdict/dict.cpp +++ b/kdict/dict.cpp @@ -215,7 +215,7 @@ void DictAsyncClient::define() TQString lastDb; TQStringList::iterator it; for (it = job->matches.begin(); it != job->matches.end(); ++it) { - int pos = (*it).tqfind(' '); + int pos = (*it).find(' '); if (pos != -1) { if (lastDb != (*it).left(pos)) { if (lastDb.length() > 0) @@ -430,7 +430,7 @@ bool DictAsyncClient::getDefinitions() } resultAppend("</p></pre>\n"); - if (hashList.tqfind(context.hexDigest())>=0) // duplicate?? + if (hashList.find(context.hexDigest())>=0) // duplicate?? job->result.truncate(oldResPos); // delete the whole definition else { hashList.append(context.hexDigest()); @@ -1521,7 +1521,7 @@ JobData* DictInterface::generateQuery(JobData::QueryType type, TQString query) return 0L; if (query.length()>300) // shorten if necessary query.truncate(300); - query = query.tqreplace(TQRegExp("[\"\\]"), ""); // remove remaining illegal chars... + query = query.replace(TQRegExp("[\"\\]"), ""); // remove remaining illegal chars... if (query.isEmpty()) return 0L; @@ -1537,7 +1537,7 @@ JobData* DictInterface::generateQuery(JobData::QueryType type, TQString query) if ((global->currentDatabase > 0)&& // database set (global->currentDatabase < global->databaseSets.count()+1)) { for (int i = 0;i<(int)global->serverDatabases.count();i++) - if ((global->databaseSets.at(global->currentDatabase-1))->tqfindIndex(global->serverDatabases[i])>0) + if ((global->databaseSets.at(global->currentDatabase-1))->findIndex(global->serverDatabases[i])>0) newjob->databases.append(global->serverDatabases[i].utf8().data()); if (newjob->databases.count()==0) { KMessageBox::sorry(global->topLevel, i18n("Please select at least one database.")); diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp index e633c2a2..76e05c6f 100644 --- a/kdict/matchview.cpp +++ b/kdict/matchview.cpp @@ -176,7 +176,7 @@ void MatchView::updateStrategyCombo() bool MatchView::selectStrategy(const TQString &strategy) const { - int newCurrent = global->strategies.tqfindIndex(strategy); + int newCurrent = global->strategies.findIndex(strategy); if (newCurrent == -1) return false; else { diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index 40aac513..61411cd2 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -231,7 +231,7 @@ void QueryView::saveQuery() if (!browseList.isEmpty()) { BrowseData* brw = browseList.at(browsePos); TQString fName = brw->queryText+".html"; - fName.tqreplace(TQRegExp("[\\s/]"),"_"); + fName.replace(TQRegExp("[\\s/]"),"_"); SaveHelper helper(fName,"*.html",global->topLevel); TQFile *file = helper.getFile(TQString()); @@ -282,7 +282,7 @@ void QueryView::copySelection() void QueryView::showFindDialog() { - KAction *act = part->actionCollection()->action("tqfind"); + KAction *act = part->actionCollection()->action("find"); if (act) act->activate(); } diff --git a/kdict/sets.cpp b/kdict/sets.cpp index a7621b35..e4fccd2b 100644 --- a/kdict/sets.cpp +++ b/kdict/sets.cpp @@ -269,7 +269,7 @@ void DbSetsDialog::activateSet(int num) } else { w_set->setCurrentItem(num); for (unsigned int i=0;i<global->serverDatabases.count();i++) - if (global->databaseSets.at(num)->tqfindIndex(global->serverDatabases[i])>0) + if (global->databaseSets.at(num)->findIndex(global->serverDatabases[i])>0) w_leftBox->insertItem(global->serverDatabases[i]); else w_rightBox->insertItem(global->serverDatabases[i]); diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 48a5c30a..31cb4dfa 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -203,7 +203,7 @@ bool TopLevel::setDatabase(TQString db) { kdDebug(5004) << "*DCOP call* TopLevel::setDatabase()" << endl; - int newCurrent = global->databases.tqfindIndex(db); + int newCurrent = global->databases.findIndex(db); if (newCurrent == -1) return false; else { diff --git a/kdnssd/ioslave/dnssd.cpp b/kdnssd/ioslave/dnssd.cpp index 5358a49d..da587f5f 100644 --- a/kdnssd/ioslave/dnssd.cpp +++ b/kdnssd/ioslave/dnssd.cpp @@ -327,7 +327,7 @@ void ZeroConfProtocol::allReported() } void ZeroConfProtocol::newType(DNSSD::RemoteService::Ptr srv) { - if (mergedtypes.tqcontains(srv->type())>0) return; + if (mergedtypes.contains(srv->type())>0) return; mergedtypes << srv->type(); UDSEntry entry; kdDebug() << "Got new entry " << srv->type() << endl; diff --git a/kfile-plugins/torrent/bdict.cpp b/kfile-plugins/torrent/bdict.cpp index f19c70b9..75bda831 100644 --- a/kfile-plugins/torrent/bdict.cpp +++ b/kfile-plugins/torrent/bdict.cpp @@ -114,7 +114,7 @@ BDict::~BDict () BInt *BDict::findInt (const char *key) { - BBase *base = tqfind(key); + BBase *base = find(key); if (base && base->type_id() == bInt) return dynamic_cast<BInt*>(base); @@ -124,7 +124,7 @@ BInt *BDict::findInt (const char *key) BList *BDict::findList (const char *key) { - BBase *base = tqfind(key); + BBase *base = find(key); if (base && base->type_id() == bList) return dynamic_cast<BList*>(base); @@ -134,7 +134,7 @@ BList *BDict::findList (const char *key) BDict *BDict::findDict (const char *key) { - BBase *base = tqfind(key); + BBase *base = find(key); if (base && base->type_id() == bDict) return dynamic_cast<BDict*>(base); @@ -144,7 +144,7 @@ BDict *BDict::findDict (const char *key) BString *BDict::findStr (const char *key) { - BBase *base = tqfind(key); + BBase *base = find(key); if (base && base->type_id() == bString) return dynamic_cast<BString*>(base); @@ -199,7 +199,7 @@ bool BDict::writeToDevice(TQIODevice &device) device.writeBlock(utfString.data(), utfString.size() - 1); // Write out the key's data - BBase *base = m_map.tqfind(*key_iter); + BBase *base = m_map.find(*key_iter); if (!base->writeToDevice (device)) return false; } diff --git a/kfile-plugins/torrent/bdict.h b/kfile-plugins/torrent/bdict.h index b50e46eb..61be065b 100644 --- a/kfile-plugins/torrent/bdict.h +++ b/kfile-plugins/torrent/bdict.h @@ -106,7 +106,7 @@ class BDict : public BBase * @return true, if there is a value for the @p key in the * dictionary, false otherwise */ - virtual bool tqcontains (const char *key) { return m_map.tqfind(key) != 0; } + virtual bool contains (const char *key) { return m_map.find(key) != 0; } /** * Returns a pointer to the BBase descendant keyed by @p key. You @@ -118,7 +118,7 @@ class BDict : public BBase * matches the key * @see BBase */ - virtual BBase *tqfind (const char *key) { return m_map.tqfind(key); } + virtual BBase *find (const char *key) { return m_map.find(key); } /** * Convienience function to find and return a BInt keyed by @p key. diff --git a/kfile-plugins/torrent/bint.cpp b/kfile-plugins/torrent/bint.cpp index 0e23731c..db73aa72 100644 --- a/kfile-plugins/torrent/bint.cpp +++ b/kfile-plugins/torrent/bint.cpp @@ -46,12 +46,12 @@ void BInt::init (ByteTape &tape) tape ++; // Move to start of digits TQByteArray &dict (tape.data()); - if (dict.tqfind('e', tape.pos()) == -1) + if (dict.find('e', tape.pos()) == -1) return; // Copy the part from the start to the e. The values in-between // should be digits, perhaps preceded by a negative sign. - int length = dict.tqfind('e', tape.pos()) - tape.pos(); + int length = dict.find('e', tape.pos()) - tape.pos(); char *ptr = dict.data(); // Get start of buffer ptr += tape.pos(); // Advance to current position in tape diff --git a/kfile-plugins/torrent/bstring.cpp b/kfile-plugins/torrent/bstring.cpp index acf16190..258c97c7 100644 --- a/kfile-plugins/torrent/bstring.cpp +++ b/kfile-plugins/torrent/bstring.cpp @@ -44,15 +44,15 @@ void BString::init (ByteTape &tape) { TQByteArray &dict(tape.data()); - if (dict.tqfind(':', tape.pos()) == -1) + if (dict.find(':', tape.pos()) == -1) { - kdDebug(7034) << "Can't tqfind : for string!" << endl; + kdDebug(7034) << "Can't find : for string!" << endl; return; } // Copy the part from start to :, as it will be a number // That number is the number of characters to read - int length = dict.tqfind(':', tape.pos()) - tape.pos(); + int length = dict.find(':', tape.pos()) - tape.pos(); char *ptr = dict.data(); ptr += tape.pos(); diff --git a/kfile-plugins/torrent/kfile_torrent.cpp b/kfile-plugins/torrent/kfile_torrent.cpp index a5de60f0..a4cff355 100644 --- a/kfile-plugins/torrent/kfile_torrent.cpp +++ b/kfile-plugins/torrent/kfile_torrent.cpp @@ -166,7 +166,7 @@ bool KTorrentPlugin::readInfo (KFileMetaInfo &info, unsigned int) // If a torrent has a key, but it is of the wrong type, then it isn't a valid // torrent, and so we should just die. - if (m_dict->tqcontains("announce")) + if (m_dict->contains("announce")) { BString *str = m_dict->findStr ("announce"); if (!str) @@ -174,7 +174,7 @@ bool KTorrentPlugin::readInfo (KFileMetaInfo &info, unsigned int) appendItem (group, "announce", TQString(str->get_string())); } - if (m_dict->tqcontains("creation date")) + if (m_dict->contains("creation date")) { BInt *the_data = m_dict->findInt ("creation date"); TQDateTime my_date; @@ -198,7 +198,7 @@ bool KTorrentPlugin::readInfo (KFileMetaInfo &info, unsigned int) if (!info_dict) return false; - if (!info_dict->tqcontains("length")) + if (!info_dict->contains("length")) { /* Has more than one file. The list of files is contained in a * list called, appropriately enough, 'files' @@ -223,7 +223,7 @@ bool KTorrentPlugin::readInfo (KFileMetaInfo &info, unsigned int) appendItem (group, "NumFiles", num_files); appendItem (group, "length", length); - if (info_dict->tqcontains("name")) + if (info_dict->contains("name")) { BString *str = info_dict->findStr("name"); if (!str) @@ -244,7 +244,7 @@ bool KTorrentPlugin::readInfo (KFileMetaInfo &info, unsigned int) appendItem (group, "piece length", piece_length->get_value()); - if (m_dict->tqcontains("comment")) + if (m_dict->contains("comment")) { BString *comment = m_dict->findStr("comment"); if (!comment) @@ -383,7 +383,7 @@ bool KTorrentPlugin::writeInfo(const KFileMetaInfo &info) const TQString the_name = info[*it][key].value().toString(); // Remove trailing slashes - the_name.tqreplace (TQRegExp("/*$"), ""); + the_name.replace (TQRegExp("/*$"), ""); name_str->setValue (the_name); } diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp index 7d429757..acd8f6fb 100644 --- a/kget/dlgDirectories.cpp +++ b/kget/dlgDirectories.cpp @@ -86,7 +86,7 @@ void DlgDirectories::addEntry() TQString ext = le_ext->text(); TQString dir = le_dir->url(); - if (ext.tqcontains(",") || dir.tqcontains(",") || ext.isEmpty() || dir.isEmpty()) { + if (ext.contains(",") || dir.contains(",") || ext.isEmpty() || dir.isEmpty()) { KMessageBox::error(this, i18n("Each row consists of exactly one\nextension type and one folder."), i18n("Error")); return; } @@ -122,7 +122,7 @@ void DlgDirectories::changeEntry() TQString ext = le_ext->text(); TQString dir = le_dir->url(); - if (ext.tqcontains(",") || dir.tqcontains(",") || ext.isEmpty() || dir.isEmpty()) { + if (ext.contains(",") || dir.contains(",") || ext.isEmpty() || dir.isEmpty()) { KMessageBox::error(this, i18n("Each row consists of exactly one\nextension type and one folder."), i18n("Error")); return; } diff --git a/kget/kfileio.h b/kget/kfileio.h index c47eb173..84a50cd2 100644 --- a/kget/kfileio.h +++ b/kget/kfileio.h @@ -20,7 +20,7 @@ #ifndef kfileio_h #define kfileio_h -/** Load a file. Returns a pointer to the memory-block that tqcontains +/** Load a file. Returns a pointer to the memory-block that contains * the loaded file. Returns a NULL string if the file could not be loaded. * If withDialogs is FALSE no warning dialogs are opened if there are * problems. diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp index 6e830d67..aa65437e 100644 --- a/kget/kmainwidget.cpp +++ b/kget/kmainwidget.cpp @@ -555,7 +555,7 @@ void KMainWidget::slotImportTextFile() list = kFileToString(filename.path()); // file not accessible -> give error message i = 0; - while ((j = list.tqfind('\n', i)) != -1) { + while ((j = list.find('\n', i)) != -1) { TQString newtransfer = list.mid(i, j - i); addTransfer(newtransfer); i = j + 1; @@ -2466,7 +2466,7 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) return false; } // if we find this URL in the list - Transfer *transfer = myTransferList->tqfind( url ); + Transfer *transfer = myTransferList->find( url ); if ( transfer ) { if ( transfer->gettqStatus() != Transfer::ST_FINISHED ) diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp index 7ce11939..b87743ed 100644 --- a/kget/logwindow.cpp +++ b/kget/logwindow.cpp @@ -45,8 +45,8 @@ // res.simplifyWhiteSpace(); // int pos; -// while ( (pos = res.tqfind(' ')) != -1) { -// res.tqreplace(pos, 1, new TQChar( 0x00a0 ), 1); +// while ( (pos = res.find(' ')) != -1) { +// res.replace(pos, 1, new TQChar( 0x00a0 ), 1); // } // return res; @@ -58,14 +58,14 @@ static TQString removeHTML(const TQString & str) TQString res = str; int pos; - // tqreplace <br/> with a newline - while ((pos = res.tqfind("<br/>")) != -1) { - res.tqreplace(pos, 4, "\n"); + // replace <br/> with a newline + while ((pos = res.find("<br/>")) != -1) { + res.replace(pos, 4, "\n"); } // remove all tags - while ((pos = res.tqfind('<')) != -1) { - int pos2 = res.tqfind('>', pos); + while ((pos = res.find('<')) != -1) { + int pos2 = res.find('>', pos); if (pos2 == -1) { pos2 = res.length() + 1; @@ -112,7 +112,7 @@ SeparatedLog::SeparatedLog(TQWidget * tqparent):TQWidget(tqparent) void SeparatedLog::addLog(uint id, const TQString & filename, const TQString & message) { - if (!trMap.tqcontains(id)) { + if (!trMap.contains(id)) { trMap.insert(id, message); TQListViewItem *last=lv_log->lastItem(); new TQListViewItem(lv_log, last); diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index 9de03889..2686d168 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -211,7 +211,7 @@ bool TransferList::areTransfersQueuedOrScheduled() } -Transfer * TransferList::tqfind(const KURL& _src) +Transfer * TransferList::find(const KURL& _src) { TransferIterator it(this); diff --git a/kget/transferlist.h b/kget/transferlist.h index e9c7d546..c20ce411 100644 --- a/kget/transferlist.h +++ b/kget/transferlist.h @@ -77,7 +77,7 @@ public: return phasesNum; } bool updatetqStatus(int counter); - Transfer * tqfind(const KURL& _src); + Transfer * find(const KURL& _src); bool areTransfersQueuedOrScheduled(); void readTransfers(const KURL& file); diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp index 40e304fb..5fc86dcc 100644 --- a/knewsticker/common/configaccess.cpp +++ b/knewsticker/common/configaccess.cpp @@ -379,9 +379,9 @@ bool ArticleFilter::matches(Article::Ptr a) const bool matches; if (condition() == i18n("contain")) - matches = a->headline().tqcontains(expression()); + matches = a->headline().contains(expression()); else if (condition() == i18n("do not contain")) - matches = !a->headline().tqcontains(expression()); + matches = !a->headline().contains(expression()); else if (condition() == i18n("equal")) matches = (a->headline() == expression()); else if (condition() == i18n("do not equal")) @@ -594,7 +594,7 @@ NewsSourceBase *ConfigAccess::newsSource(const TQString &newsSource) nsd = NewsSourceDefault[i]; if (nsd.enabled) nsd.enabled = (nsd.language == TQString::tqfromLatin1("C") || - KGlobal::locale()->languageList().tqcontains(nsd.language)); + KGlobal::locale()->languageList().contains(nsd.language)); break; } diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index 545aba63..a25bc569 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -429,19 +429,19 @@ void KNewsTickerMenu::populateMenu() NewsSourceBase::Ptr ns = *nIt; KPopupMenu *submenu = new KPopupMenu; - int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), TQT_TQOBJECT(this), TQT_SLOT(slotCheckNews(int)), 0, sources.tqfindIndex(ns) + 1000); - setItemParameter(checkNewsId, sources.tqfindIndex(ns)); + int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), TQT_TQOBJECT(this), TQT_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000); + setItemParameter(checkNewsId, sources.findIndex(ns)); submenu->insertSeparator(); - if (m_parent->m_pendingNewsUpdates.tqcontains(ns->newsSourceName())) { + if (m_parent->m_pendingNewsUpdates.contains(ns->newsSourceName())) { submenu->insertItem(noArticlesIcon, i18n("Currently Being Updated, No Articles Available")); } else if (!ns->articles().isEmpty()) { const Article::List articles = ns->articles(); Article::List::ConstIterator artIt = articles.begin(); for (; artIt != articles.end(); ++artIt) { Article::Ptr a = *artIt; - TQString headline = a->headline().tqreplace('&', "&&"); + TQString headline = a->headline().replace('&', "&&"); int id; if ( a->read() ) id = submenu->insertItem(oldArticleIcon, headline, this, TQT_SLOT(slotOpenArticle(int)), 0, articleIdx+2000); @@ -454,7 +454,7 @@ void KNewsTickerMenu::populateMenu() submenu->insertItem(noArticlesIcon, i18n("No Articles Available")); } - insertItem(ns->icon(), ns->newsSourceName().tqreplace('&', "&&"), submenu); + insertItem(ns->icon(), ns->newsSourceName().replace('&', "&&"), submenu); } if (!m_parent->m_cfg->newsSources().isEmpty()) diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp index 34024edc..b13db0f5 100644 --- a/knewsticker/knewstickerconfig.cpp +++ b/knewsticker/knewstickerconfig.cpp @@ -234,7 +234,7 @@ bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e) if ( TQTextDrag::decode(d, newSourceUrl) ) { // <HACK> // This is just for http://www.webreference.com/services/news/ - newSourceUrl = newSourceUrl.tqreplace( TQRegExp("^view-source:http%3A//"), "http://" ); + newSourceUrl = newSourceUrl.replace( TQRegExp("^view-source:http%3A//"), "http://" ); // </HACK> newSourceUrl = newSourceUrl.stripWhiteSpace(); @@ -565,7 +565,7 @@ void KNewsTickerConfig::getNewsIcon(NewsSourceItem *item, const KURL &url) void KNewsTickerConfig::slotGotNewsIcon(const KURL &url, const TQPixmap &pixmap) { - if (m_itemIconMap.tqfind(url.url()) == m_itemIconMap.end()) { + if (m_itemIconMap.find(url.url()) == m_itemIconMap.end()) { kdDebug(5005) << "Got unknown icon for URL " << url << endl; return; } diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp index d291b12e..e992b118 100644 --- a/knewsticker/knewstickerstub/knewstickerstub.cpp +++ b/knewsticker/knewstickerstub/knewstickerstub.cpp @@ -57,9 +57,9 @@ int main(int argc, char **argv) // TODO: Use the "Suggest" functionality from addnewssourcedlgimpl.cpp here. TQString name = i18n("Unknown"); - if (newsSources.tqcontains(name)) + if (newsSources.contains(name)) for (unsigned int i = 0; ; i++) - if (!newsSources.tqcontains(i18n("Unknown %1").tqarg(i))) { + if (!newsSources.contains(i18n("Unknown %1").tqarg(i))) { name = i18n("Unknown %1").tqarg(i); break; } diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp index 76d81050..b24e87f9 100644 --- a/knewsticker/newsscroller.cpp +++ b/knewsticker/newsscroller.cpp @@ -177,7 +177,7 @@ void NewsScroller::dropEvent(TQDropEvent* event) if ( TQTextDrag::decode(event, newSourceUrl) ) { // <HACK> // This is just for http://www.webreference.com/services/news/ - newSourceUrl = newSourceUrl.tqreplace(TQRegExp( + newSourceUrl = newSourceUrl.replace(TQRegExp( TQString::tqfromLatin1("^view-source:http%3A//")), TQString::tqfromLatin1("http://")); // </HACK> @@ -190,9 +190,9 @@ void NewsScroller::dropEvent(TQDropEvent* event) TQStringList newsSources = configFrontend.newsSources(); TQString name = i18n("Unknown"); - if (newsSources.tqcontains(name)) + if (newsSources.contains(name)) for (unsigned int i = 0; ; i++) - if (!newsSources.tqcontains(i18n("Unknown %1").tqarg(i))) { + if (!newsSources.contains(i18n("Unknown %1").tqarg(i))) { name = i18n("Unknown %1").tqarg(i); break; } @@ -256,7 +256,7 @@ void NewsScroller::scroll(int distance, bool interpret_directions) TQPoint pt = mapFromGlobal(TQCursor::pos()); - if (contentsRect().tqcontains(pt)) + if (contentsRect().contains(pt)) updateActive(pt); update(); @@ -548,7 +548,7 @@ bool NewsScroller::updateActive(const TQPoint &pt) rect.setWidth(width()); } - if (rect.tqcontains(pt)) + if (rect.contains(pt)) break; } if (*it) diff --git a/kopete/KABC_INTEG_NOTES b/kopete/KABC_INTEG_NOTES index 02bc5bbe..6bcc7f95 100644 --- a/kopete/KABC_INTEG_NOTES +++ b/kopete/KABC_INTEG_NOTES @@ -33,7 +33,7 @@ Goals (-ve): *) don't store information that's not worth sharing in the address book gregj's goals -kopete should not tqreplace server side data with kabc derived data nor upload information that wasn't present on the server before. +kopete should not replace server side data with kabc derived data nor upload information that wasn't present on the server before. E.g. we know someones telephone nr. but we don't want to put this information back on server if it was not present there before. Update IMO is ok. brunes goals diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp index 82da868a..abc0d1f2 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp @@ -202,7 +202,7 @@ void AddContactWizard::accept() TQCheckListItem *check = dynamic_cast<TQCheckListItem *>( it.current() ); if ( check && check->isOn() ) { - if(m_groupItems.tqcontains(check)) + if(m_groupItems.contains(check)) metaContact->addToGroup(m_groupItems[check]); else //it's a new group metaContact->addToGroup( Kopete::ContactList::self()->findGroup( check->text() ) ); @@ -271,7 +271,7 @@ void AddContactWizard::next() usedAccounts.append( i->protocol()->pluginId() + i->accountId() ); - if(protocolPages.tqcontains(i)) + if(protocolPages.contains(i)) continue; AddContactPage *addPage = i->protocol()->createAddContactWidget(this, i ); @@ -293,7 +293,7 @@ void AddContactWizard::next() for ( it = protocolPages.begin(); it != protocolPages.end(); ++it ) { Kopete::Account *i=it.key(); - if( !i || !usedAccounts.tqcontains( i->protocol()->pluginId() + i->accountId() ) ) + if( !i || !usedAccounts.contains( i->protocol()->pluginId() + i->accountId() ) ) { delete it.data(); protocolPages.remove(it); diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp index 9cafeada..9ac26ad3 100644 --- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp +++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp @@ -55,7 +55,7 @@ public: if( TQListViewItem *item = m_listView->itemAt( pos ) ) { TQRect tqitemRect = m_listView->tqitemRect( item ); - if( tqitemRect.tqcontains( pos ) ) + if( tqitemRect.contains( pos ) ) tip( tqitemRect, static_cast<ContactItem*>( item )->contact()->toolTip() ); } } @@ -183,14 +183,14 @@ void ChatMembersListWidget::slotContextMenu( KListView*, TQListViewItem *item, c void ChatMembersListWidget::slotContactAdded( const Kopete::Contact *contact ) { - if ( !m_members.tqcontains( contact ) ) + if ( !m_members.contains( contact ) ) m_members.insert( contact, new ContactItem( this, const_cast<Kopete::Contact*>( contact ) ) ); } void ChatMembersListWidget::slotContactRemoved( const Kopete::Contact *contact ) { kdDebug(14000) << k_funcinfo << endl; - if ( m_members.tqcontains( contact ) && contact != session()->myself() ) + if ( m_members.contains( contact ) && contact != session()->myself() ) { delete m_members[ contact ]; m_members.remove( contact ); @@ -199,7 +199,7 @@ void ChatMembersListWidget::slotContactRemoved( const Kopete::Contact *contact ) void ChatMembersListWidget::slotContactStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &status ) { - if ( m_members.tqcontains( contact ) ) + if ( m_members.contains( contact ) ) m_members[contact]->settqStatus( status ); } diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index e91c49fe..2f16217c 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -950,7 +950,7 @@ void ChatMessagePart::copy(bool justselection /* default false */) KMultipleDrag *drag = new KMultipleDrag( ); drag->addDragObject( textdrag ); if(!htmltext.isEmpty()) { - htmltext.tqreplace( TQChar( 0xa0 ), ' ' ); + htmltext.replace( TQChar( 0xa0 ), ' ' ); TQTextDrag *htmltextdrag = new TQTextDrag(htmltext, 0L); htmltextdrag->setSubtype("html"); drag->addDragObject( htmltextdrag ); @@ -1025,9 +1025,9 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const protocolIcon = KGlobal::iconLoader()->iconPath( iconName, KIcon::Small ); nickLink=TQString::tqfromLatin1("<a href=\"kopetemessage://%1/?protocolId=%2&accountId=%3\" class=\"KopeteDisplayName\">") - .tqarg( TQStyleSheet::escape(message.from()->contactId()).tqreplace('"',"""), - TQStyleSheet::escape(message.from()->protocol()->pluginId()).tqreplace('"',"""), - TQStyleSheet::escape(message.from()->account()->accountId() ).tqreplace('"',""")); + .tqarg( TQStyleSheet::escape(message.from()->contactId()).replace('"',"""), + TQStyleSheet::escape(message.from()->protocol()->pluginId()).replace('"',"""), + TQStyleSheet::escape(message.from()->account()->accountId() ).replace('"',""")); } else { @@ -1036,15 +1036,15 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const // Replace sender (contact nick) - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%sender%"), nickLink+nick+"</a>" ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%sender%"), nickLink+nick+"</a>" ); // Replace time, by default display only time and display seconds(that was true means). - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%time%"), KGlobal::locale()->formatTime(message.timestamp().time(), true) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%time%"), KGlobal::locale()->formatTime(message.timestamp().time(), true) ); // Replace %screenName% (contact ID) - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%senderScreenName%"), nickLink+TQStyleSheet::escape(contactId)+"</a>" ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%senderScreenName%"), nickLink+TQStyleSheet::escape(contactId)+"</a>" ); // Replace service name (protocol name) - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%service%"), TQStyleSheet::escape(service) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%service%"), TQStyleSheet::escape(service) ); // Replace protocolIcon (sender statusIcon) - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%senderStatusIcon%"), TQStyleSheet::escape(protocolIcon).tqreplace('"',""") ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%senderStatusIcon%"), TQStyleSheet::escape(protocolIcon).replace('"',""") ); // Look for %time{X}% TQRegExp timeRegExp("%time\\{([^}]*)\\}%"); @@ -1052,7 +1052,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const while( (pos=timeRegExp.search(resultHTML , pos) ) != -1 ) { TQString timeKeyword = formatTime( timeRegExp.cap(1), message.timestamp() ); - resultHTML = resultHTML.tqreplace( pos , timeRegExp.cap(0).length() , timeKeyword ); + resultHTML = resultHTML.replace( pos , timeRegExp.cap(0).length() , timeKeyword ); } // Look for %textbackgroundcolor{X}% @@ -1069,7 +1069,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const int textPos=0; while( (textPos=textBackgroundRegExp.search(resultHTML, textPos) ) != -1 ) { - resultHTML = resultHTML.tqreplace( textPos , textBackgroundRegExp.cap(0).length() , bgColor ); + resultHTML = resultHTML.replace( textPos , textBackgroundRegExp.cap(0).length() , bgColor ); } // Replace userIconPath @@ -1098,7 +1098,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const else if(message.direction() == Kopete::Message::Outbound) photoPath = TQString::fromUtf8("Outgoing/buddy_icon.png"); } - resultHTML = resultHTML.tqreplace(TQString::fromUtf8("%userIconPath%"), photoPath); + resultHTML = resultHTML.replace(TQString::fromUtf8("%userIconPath%"), photoPath); } // Replace messages. @@ -1113,7 +1113,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const } // Set message direction("rtl"(Right-To-Left) or "ltr"(Left-to-right)) - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%messageDirection%"), message.isRightToLeft() ? "rtl" : "ltr" ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%messageDirection%"), message.isRightToLeft() ? "rtl" : "ltr" ); // These colors are used for coloring nicknames. I tried to use // colors both visible on light and dark background. @@ -1149,12 +1149,12 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const if ( doLight && lightColorName.isNull() ) lightColorName = TQColor( colorName ).light( light ).name(); - resultHTML = resultHTML.tqreplace( textPos , senderColorRegExp.cap(0).length(), + resultHTML = resultHTML.replace( textPos , senderColorRegExp.cap(0).length(), doLight ? lightColorName : colorName ); } // Replace message at the end, maybe someone could put a Adium keyword in his message :P - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%message%"), formatMessageBody(message) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%message%"), formatMessageBody(message) ); // TODO: %status // resultHTML = addNickLinks( resultHTML ); @@ -1180,13 +1180,13 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) destinationName = remoteContact->nickName(); // Replace %chatName%, create a internal span to update it by DOM when asked. - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%chatName%"), TQString("<span id=\"KopeteHeaderChatNameInternal\">%1</span>").tqarg( formatName(d->manager->displayName()) ) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%chatName%"), TQString("<span id=\"KopeteHeaderChatNameInternal\">%1</span>").tqarg( formatName(d->manager->displayName()) ) ); // Replace %sourceName% - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%sourceName%"), formatName(sourceName) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%sourceName%"), formatName(sourceName) ); // Replace %destinationName% - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%destinationName%"), formatName(destinationName) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%destinationName%"), formatName(destinationName) ); // For %timeOpened%, display the date and time (also the seconds). - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%timeOpened%"), KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true, true ) ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%timeOpened%"), KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true, true ) ); // Look for %timeOpened{X}% TQRegExp timeRegExp("%timeOpened\\{([^}]*)\\}%"); @@ -1194,7 +1194,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) while( (pos=timeRegExp.search(resultHTML, pos) ) != -1 ) { TQString timeKeyword = formatTime( timeRegExp.cap(1), TQDateTime::tqcurrentDateTime() ); - resultHTML = resultHTML.tqreplace( pos , timeRegExp.cap(0).length() , timeKeyword ); + resultHTML = resultHTML.replace( pos , timeRegExp.cap(0).length() , timeKeyword ); } // Get contact image paths #if 0 @@ -1207,8 +1207,8 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) if( photoOutgoingPath.isEmpty() ) photoOutgoingPath = TQString::fromUtf8("Outgoing/buddy_icon.png"); - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%incomingIconPath%"), photoIncomingPath); - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%outgoingIconPath%"), photoOutgoingPath); + resultHTML = resultHTML.replace( TQString::fromUtf8("%incomingIconPath%"), photoIncomingPath); + resultHTML = resultHTML.replace( TQString::fromUtf8("%outgoingIconPath%"), photoOutgoingPath); #endif TQString photoIncoming, photoOutgoing; if( remoteContact->metaContact() && !remoteContact->metaContact()->picture().isNull() ) @@ -1230,8 +1230,8 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) } - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%incomingIconPath%"), photoIncoming); - resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%outgoingIconPath%"), photoOutgoing ); + resultHTML = resultHTML.replace( TQString::fromUtf8("%incomingIconPath%"), photoIncoming); + resultHTML = resultHTML.replace( TQString::fromUtf8("%outgoingIconPath%"), photoOutgoing ); } return resultHTML; diff --git a/kopete/kopete/chatwindow/chatmessagepart.h b/kopete/kopete/chatwindow/chatmessagepart.h index 97a3c3a3..b7f36da1 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.h +++ b/kopete/kopete/chatwindow/chatmessagepart.h @@ -186,7 +186,7 @@ private: TQString textUnderMouse(); /** - * Format(tqreplace) style keywords for messages (incoming, outgoing, internal) + * Format(replace) style keywords for messages (incoming, outgoing, internal) * Use formatStyleKeywords(const TQString &sourceHTML) for header and footer. * * @param sourceHTML the source html which contains the keywords @@ -196,7 +196,7 @@ private: */ TQString formatStyleKeywords( const TQString &sourceHTML, const Kopete::Message &message ); /** - * Format(tqreplace) style keywords for header and footers. + * Format(replace) style keywords for header and footers. * For messages, use formatStyleKeywords(const TQString &sourceHTML, Kopete::Message &message) instead. * * @param sourceHTML HTML source needed to be replaced. diff --git a/kopete/kopete/chatwindow/chattexteditpart.cpp b/kopete/kopete/chatwindow/chattexteditpart.cpp index 9936b234..b6f214d2 100644 --- a/kopete/kopete/chatwindow/chattexteditpart.cpp +++ b/kopete/kopete/chatwindow/chattexteditpart.cpp @@ -130,8 +130,8 @@ void ChatTextEditPart::complete() if ( parIdx > 0 ) { - int firstSpace = txt.tqfindRev( TQRegExp( TQString::tqfromLatin1("\\s\\S+") ), parIdx - 1 ) + 1; - int lastSpace = txt.tqfind( TQRegExp( TQString::tqfromLatin1("[\\s\\:]") ), firstSpace ); + int firstSpace = txt.findRev( TQRegExp( TQString::tqfromLatin1("\\s\\S+") ), parIdx - 1 ) + 1; + int lastSpace = txt.find( TQRegExp( TQString::tqfromLatin1("[\\s\\:]") ), firstSpace ); if( lastSpace == -1 ) lastSpace = txt.length(); @@ -262,14 +262,14 @@ void ChatTextEditPart::sendMessage() if ( txt.isEmpty() || txt == "\n" ) return; - if ( m_lastMatch.isNull() && ( txt.tqfind( TQRegExp( TQString::tqfromLatin1("^\\w+:\\s") ) ) > -1 ) ) + if ( m_lastMatch.isNull() && ( txt.find( TQRegExp( TQString::tqfromLatin1("^\\w+:\\s") ) ) > -1 ) ) { //no last match and it finds something of the form of "word:" at the start of a line - TQString search = txt.left( txt.tqfind(':') ); + TQString search = txt.left( txt.find(':') ); if( !search.isEmpty() ) { TQString match = mComplete->makeCompletion( search ); if( !match.isNull() ) - edit()->setText( txt.tqreplace(0,search.length(),match) ); + edit()->setText( txt.replace(0,search.length(),match) ); } } diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index 9d42e9f4..52b82768 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -970,7 +970,7 @@ void ChatView::dragEnterEvent ( TQDragEnterEvent * event ) Kopete::Contact *c=it.current(); if(c && c->account() == m_manager->account()) { - if( c != m_manager->myself() && !m_manager->members().tqcontains(c) && c->isOnline()) + if( c != m_manager->myself() && !m_manager->members().contains(c) && c->isOnline()) event->accept(); } } @@ -1024,7 +1024,7 @@ void ChatView::dropEvent ( TQDropEvent * event ) Kopete::Contact *c=it.current(); if(c && c->account() == m_manager->account() && c->isOnline()) { - if( c != m_manager->myself() && !m_manager->members().tqcontains(c) ) + if( c != m_manager->myself() && !m_manager->members().contains(c) ) m_manager->inviteContact(c->contactId()); } } diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp index 64bf5099..e88c13cc 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp @@ -98,21 +98,21 @@ KopeteChatWindow *KopeteChatWindow::window( Kopete::ChatSession *manager ) switch( KopetePrefs::prefs()->chatWindowPolicy() ) { case GROUP_BY_ACCOUNT: //Open chats from the same protocol in the same window - if( accountMap.tqcontains( manager->account() ) ) + if( accountMap.contains( manager->account() ) ) myWindow = accountMap[ manager->account() ]; else windowCreated = true; break; case GROUP_BY_GROUP: //Open chats from the same group in the same window - if( group && groupMap.tqcontains( group ) ) + if( group && groupMap.contains( group ) ) myWindow = groupMap[ group ]; else windowCreated = true; break; case GROUP_BY_METACONTACT: //Open chats from the same metacontact in the same window - if( mcMap.tqcontains( metaContact ) ) + if( mcMap.contains( metaContact ) ) myWindow = mcMap[ metaContact ]; else windowCreated = true; @@ -149,13 +149,13 @@ KopeteChatWindow *KopeteChatWindow::window( Kopete::ChatSession *manager ) { myWindow = new KopeteChatWindow(); - if ( !accountMap.tqcontains( manager->account() ) ) + if ( !accountMap.contains( manager->account() ) ) accountMap.insert( manager->account(), myWindow ); - if ( !mcMap.tqcontains( metaContact ) ) + if ( !mcMap.contains( metaContact ) ) mcMap.insert( metaContact, myWindow ); - if ( group && !groupMap.tqcontains( group ) ) + if ( group && !groupMap.contains( group ) ) groupMap.insert( group, myWindow ); } @@ -857,7 +857,7 @@ void KopeteChatWindow::setActiveView( TQWidget *widget ) m_activeView = view; - if( !chatViewList.tqcontains( view ) ) + if( !chatViewList.contains( view ) ) attachChatView( view ); connect( m_activeView, TQT_SIGNAL( canSendChanged(bool) ), this, TQT_SLOT( slotUpdateSendEnabled() ) ); diff --git a/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp b/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp index 646b8259..1bc64959 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp @@ -157,7 +157,7 @@ void ChatWindowStyle::listVariants() { TQString variantName = *it, variantPath; // Retrieve only the file name. - variantName = variantName.left(variantName.tqfindRev(".")); + variantName = variantName.left(variantName.findRev(".")); // variantPath is relative to baseHref. variantPath = TQString("Variants/%1").tqarg(*it); d->variantsList.insert(variantName, variantPath); diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp index 56f1844a..c7ee3673 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp @@ -98,7 +98,7 @@ void ChatWindowStyleManager::loadStyles() { TQStringList chatStyles = KGlobal::dirs()->findDirs( "appdata", TQString::fromUtf8( "styles" ) ); TQString localStyleDir( locateLocal( "appdata", TQString::fromUtf8("styles/"),true) ); - if( !chatStyles.tqcontains(localStyleDir)) + if( !chatStyles.contains(localStyleDir)) chatStyles<<localStyleDir; TQStringList::const_iterator it; @@ -289,14 +289,14 @@ bool ChatWindowStyleManager::removeStyle(const TQString &stylePath) // Find for the current style in avaiableStyles map. KURL urlStyle(stylePath); TQString styleName=urlStyle.fileName(); - StyleList::Iterator foundStyle = d->availableStyles.tqfind(styleName); + StyleList::Iterator foundStyle = d->availableStyles.find(styleName); // TQMap iterator return end() if it found no item. if(foundStyle != d->availableStyles.end()) { d->availableStyles.remove(foundStyle); // Remove and delete style from pool if needed. - if( d->stylePool.tqcontains(stylePath) ) + if( d->stylePool.contains(stylePath) ) { ChatWindowStyle *deletedStyle = d->stylePool[stylePath]; d->stylePool.remove(stylePath); @@ -314,7 +314,7 @@ bool ChatWindowStyleManager::removeStyle(const TQString &stylePath) ChatWindowStyle *ChatWindowStyleManager::getStyleFromPool(const TQString &stylePath) { - if( d->stylePool.tqcontains(stylePath) ) + if( d->stylePool.contains(stylePath) ) { // NOTE: This is a hidden config switch for style developers // Check in the config if the cache is disabled. @@ -348,19 +348,19 @@ void ChatWindowStyleManager::slotNewStyles(const KFileItemList &dirList) while( (item = it.current()) != 0 ) { // Ignore data dir(from deprecated XSLT themes) - if( !item->url().fileName().tqcontains(TQString::fromUtf8("data")) ) + if( !item->url().fileName().contains(TQString::fromUtf8("data")) ) { kdDebug(14000) << k_funcinfo << "Listing: " << item->url().fileName() << endl; // If the style path is already in the pool, that's mean the style was updated on disk // Reload the style - if( d->stylePool.tqcontains(item->url().path()) ) + if( d->stylePool.contains(item->url().path()) ) { kdDebug(14000) << k_funcinfo << "Updating style: " << item->url().path() << endl; d->stylePool[item->url().path()]->reload(); // Add to avaialble if required. - if( !d->availableStyles.tqcontains(item->url().fileName()) ) + if( !d->availableStyles.contains(item->url().fileName()) ) d->availableStyles.insert(item->url().fileName(), item->url().path()); } else diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp index 34c0781b..0b8d6126 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp @@ -73,7 +73,7 @@ KopeteEmoticonAction::KopeteEmoticonAction( TQObject* tqparent, const char* name for( TQMap<TQString, TQStringList>::const_iterator it = emoticonsMap.constBegin(); it != emoticonsMap.constEnd(); ++it ) { - if( ( *it ).tqcontains( ":)" ) || ( *it ).tqcontains( ":-)" ) ) + if( ( *it ).contains( ":)" ) || ( *it ).contains( ":-)" ) ) { icon = it.key(); break; diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp index 356f0528..bc7a65cb 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp +++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp @@ -136,7 +136,7 @@ void KopeteAccountConfig::slotItemSelected() m_view->mButtonDown->setEnabled( itemSelected->itemBelow() ); Kopete::Account *account = itemSelected->account(); - TQColor color= m_newColors.tqcontains(account) ? m_newColors[account] : account->color(); + TQColor color= m_newColors.contains(account) ? m_newColors[account] : account->color(); m_view->mUseColor->setEnabled( true ); m_view->mUseColor->setChecked( color.isValid() ); m_view->mColorButton->setColor( color ); diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 650e6da8..883d4193 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -529,7 +529,7 @@ void AppearanceConfig::updateEmoticonlist() } // Where is that theme in our big-list-o-themes? - TQListBoxItem *item = d->mPrfsEmoticons->icon_theme_list->tqfindItem( p->iconTheme() ); + TQListBoxItem *item = d->mPrfsEmoticons->icon_theme_list->findItem( p->iconTheme() ); if (item) // found it... make it the currently selected theme d->mPrfsEmoticons->icon_theme_list->setCurrentItem( item ); diff --git a/kopete/kopete/config/appearance/tooltipeditdialog.cpp b/kopete/kopete/config/appearance/tooltipeditdialog.cpp index b5f55973..7da37fac 100644 --- a/kopete/kopete/config/appearance/tooltipeditdialog.cpp +++ b/kopete/kopete/config/appearance/tooltipeditdialog.cpp @@ -75,7 +75,7 @@ TooltipEditDialog::TooltipEditDialog(TQWidget *tqparent, const char* name) { usedIt--; // only add if that property key is really known - if(propmap.tqcontains(*usedIt) && !propmap[*usedIt].isPrivate()) + if(propmap.contains(*usedIt) && !propmap[*usedIt].isPrivate()) { new TooltipItem(mMainWidget->lstUsedItems, propmap[*usedIt].label(), *usedIt); @@ -87,7 +87,7 @@ TooltipEditDialog::TooltipEditDialog(TQWidget *tqparent, const char* name) Kopete::ContactPropertyTmpl::Map::ConstIterator it; for(it = propmap.begin(); it != propmap.end(); ++it) { - if((usedKeys.tqcontains(it.key())==0) && (!it.data().isPrivate())) + if((usedKeys.contains(it.key())==0) && (!it.data().isPrivate())) new TooltipItem(mMainWidget->lstUnusedItems, it.data().label(), it.key()); } diff --git a/kopete/kopete/contactlist/kabcexport.cpp b/kopete/kopete/contactlist/kabcexport.cpp index 2e99c2a4..7d380c9a 100644 --- a/kopete/kopete/contactlist/kabcexport.cpp +++ b/kopete/kopete/contactlist/kabcexport.cpp @@ -106,7 +106,7 @@ KabcExportWizard::KabcExportWizard( TQWidget *tqparent, const char *name ) TQCheckListItem * lvi = new ContactLVI( it.current(), m_contactList, it.current()->displayName(), TQCheckListItem::CheckBox ); lvi->setOn( false ); - if ( it.current()->metaContactId().tqcontains(':') ) + if ( it.current()->metaContactId().contains(':') ) { lvi->setOn( true ); lvi->setEnabled( true ); diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index 15ae230c..414d8c22 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -524,7 +524,7 @@ void KopeteContactListView::slotAddSubContactActionNewAccount(Kopete::Account* a void KopeteContactListView::slotAddSubContactActionAccountDeleted(const Kopete::Account *account) { kdDebug(14000) << k_funcinfo << endl; - if ( m_accountAddContactMap.tqcontains( account ) ) + if ( m_accountAddContactMap.contains( account ) ) { KAction *action = m_accountAddContactMap[account]; m_accountAddContactMap.remove( account ); @@ -713,7 +713,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, connect( popup, TQT_SIGNAL( aboutToHide() ), contactMenu, TQT_SLOT( deleteLater() ) ); TQString nick=c->property(Kopete::Global::Properties::self()->nickName()).value().toString(); TQString text= nick.isEmpty() ? c->contactId() : i18n( "Translators: format: '<displayName> (<id>)'", "%2 <%1>" ). arg( c->contactId(), nick ); - text=text.tqreplace("&","&&"); // cf BUG 115449 + text=text.replace("&","&&"); // cf BUG 115449 if ( text.length() > 41 ) text = text.left( 38 ) + TQString::tqfromLatin1( "..." ); @@ -1326,14 +1326,14 @@ void KopeteContactListView::slotViewSelectionChanged() if(metaLVI) { m_selectedContacts.append( metaLVI ); - if(!contacts.tqcontains(metaLVI->metaContact())) + if(!contacts.contains(metaLVI->metaContact())) contacts.append( metaLVI->metaContact() ); } KopeteGroupViewItem *groupLVI=dynamic_cast<KopeteGroupViewItem*>(item); if(groupLVI) { m_selectedGroups.append( groupLVI ); - if(!groups.tqcontains(groupLVI->group())) + if(!groups.contains(groupLVI->group())) groups.append( groupLVI->group() ); } @@ -1362,7 +1362,7 @@ void KopeteContactListView::updateActionsForSelection( if(singleContactSelected) { TQString kabcid=contacts.first()->metaContactId(); - inkabc= !kabcid.isEmpty() && !kabcid.tqcontains(":"); + inkabc= !kabcid.isEmpty() && !kabcid.contains(":"); } actionSendFile->setEnabled( singleContactSelected && contacts.first()->canAcceptFiles()); @@ -1482,7 +1482,7 @@ void KopeteContactListView::slotMoveToGroup() insertUndoItem( new UndoItem( UndoItem::MetaContactAdd , m ) ); } } - else if( !m->groups().tqcontains( to ) ) + else if( !m->groups().contains( to ) ) { m->moveToGroup( g, to ); @@ -1515,7 +1515,7 @@ void KopeteContactListView::slotCopyToGroup() if( m->isTemporary() ) return; - if( !m->groups().tqcontains( to ) ) + if( !m->groups().contains( to ) ) { m->addToGroup( to ); diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index dc7fec18..c7529f44 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -611,7 +611,7 @@ void KopeteMetaContactLVI::slotMoveToGroup() else { Kopete::Group *to = Kopete::ContactList::self()->getGroup( m_actionMove->currentText() ); - if ( !m_metaContact->groups().tqcontains( to ) ) + if ( !m_metaContact->groups().contains( to ) ) m_metaContact->moveToGroup( group(), to ); } } diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp index 26a70974..961dec84 100644 --- a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp +++ b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp @@ -162,7 +162,7 @@ void parseKey( const TQString &group, const TQString &key, const TQString &value else if ( key == "Modules" ) { TQString newValue = value; - newValue.tqreplace ( ".plugin", ".desktop" ); + newValue.replace ( ".plugin", ".desktop" ); qcout << "Plugins=" << newValue; } else diff --git a/kopete/kopete/kconf_update/kopete-nameTracking.cpp b/kopete/kopete/kconf_update/kopete-nameTracking.cpp index 0a76c371..f1a4e37d 100644 --- a/kopete/kopete/kconf_update/kopete-nameTracking.cpp +++ b/kopete/kopete/kconf_update/kopete-nameTracking.cpp @@ -58,7 +58,7 @@ int main() // check if it's a contact by checking for "protocol" substring in the tag, // and the presence of a contactId child element. TQString pluginId = elem.attribute( TQString::tqfromLatin1( "plugin-id" ) ); - bool isProtocol = ( pluginId.tqcontains( "protocol", false ) > 0 ); // case-insensitive search + bool isProtocol = ( pluginId.contains( "protocol", false ) > 0 ); // case-insensitive search bool hasContactId = false; TQDomNode field = elem.firstChild(); while( !field.isNull() ) diff --git a/kopete/kopete/kimifaceimpl.cpp b/kopete/kopete/kimifaceimpl.cpp index 6e621c04..b9fffeb2 100644 --- a/kopete/kopete/kimifaceimpl.cpp +++ b/kopete/kopete/kimifaceimpl.cpp @@ -58,7 +58,7 @@ TQStringList KIMIfaceImpl::allContacts() TQPtrListIterator<Kopete::MetaContact> it( list ); for( ; it.current(); ++it ) { - if ( !it.current()->metaContactId().tqcontains(':') ) + if ( !it.current()->metaContactId().contains(':') ) result.append( it.current()->metaContactId() ); } @@ -72,7 +72,7 @@ TQStringList KIMIfaceImpl::reachableContacts() TQPtrListIterator<Kopete::MetaContact> it( list ); for( ; it.current(); ++it ) { - if ( it.current()->isReachable() && !it.current()->metaContactId().tqcontains(':') ) + if ( it.current()->isReachable() && !it.current()->metaContactId().contains(':') ) result.append( it.current()->metaContactId() ); } @@ -86,7 +86,7 @@ TQStringList KIMIfaceImpl::onlineContacts() TQPtrListIterator<Kopete::MetaContact> it( list ); for( ; it.current(); ++it ) { - if ( it.current()->isOnline() && !it.current()->metaContactId().tqcontains(':') ) + if ( it.current()->isOnline() && !it.current()->metaContactId().contains(':') ) result.append( it.current()->metaContactId() ); } @@ -100,7 +100,7 @@ TQStringList KIMIfaceImpl::fileTransferContacts() TQPtrListIterator<Kopete::MetaContact> it( list ); for( ; it.current(); ++it ) { - if ( it.current()->canAcceptFiles() && !it.current()->metaContactId().tqcontains(':') ) + if ( it.current()->canAcceptFiles() && !it.current()->metaContactId().contains(':') ) result.append( it.current()->metaContactId() ); } @@ -338,7 +338,7 @@ void KIMIfaceImpl::slotMetaContactAdded( Kopete::MetaContact *mc ) void KIMIfaceImpl::slotContactStatusChanged( Kopete::MetaContact *mc ) { - if ( !mc->metaContactId().tqcontains( ':' ) ) + if ( !mc->metaContactId().contains( ':' ) ) { int p = -1; Kopete::OnlineStatus status = mc->status(); diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index 8dbb1dad..f5654947 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -931,7 +931,7 @@ void KopeteWindow::showEvent( TQShowEvent * ) void KopeteWindow::slotAutoHide() { - if ( this->tqgeometry().tqcontains( TQCursor::pos() ) == false ) + if ( this->tqgeometry().contains( TQCursor::pos() ) == false ) { /* The autohide-timer doesn't need to emit * timeouts when the window is hidden already. */ diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp index 82b55015..1a0dbc30 100644 --- a/kopete/kopete/systemtray.cpp +++ b/kopete/kopete/systemtray.cpp @@ -423,8 +423,8 @@ TQString KopeteSystemTray::squashMessage( const Kopete::Message& msg ) rx.cap( 1 ) + TQString::tqfromLatin1( " ..." ); // find last occurrence of URL (the one inside the <a> tag) - int revUrlOffset = msgText.tqfindRev( fullUrl ); - msgText.tqreplace( revUrlOffset, + int revUrlOffset = msgText.findRev( fullUrl ); + msgText.replace( revUrlOffset, fullUrl.length(), shorterUrl ); } } diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp index 0468acdf..2b2ef9ba 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp @@ -223,7 +223,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) TQCursor cursor; - if ( m_selectedRegion.tqcontains( mev->pos() ) + if ( m_selectedRegion.contains( mev->pos() ) && m_selectedRegion!=m_originalPixmap.rect() ) { m_state=Moving; diff --git a/kopete/libkopete/kabcpersistence.cpp b/kopete/libkopete/kabcpersistence.cpp index f1acaea1..b68533b9 100644 --- a/kopete/libkopete/kabcpersistence.cpp +++ b/kopete/libkopete/kabcpersistence.cpp @@ -53,7 +53,7 @@ static TQString unionContents( TQString arg1, TQString arg2 ) TQStringList outList = TQStringList::split( separator, arg1 ); TQStringList arg2List = TQStringList::split( separator, arg2 ); for ( TQStringList::iterator it = arg2List.begin(); it != arg2List.end(); ++it ) - if ( !outList.tqcontains( *it ) ) + if ( !outList.contains( *it ) ) outList.append( *it ); TQString out = outList.join( separator ); return out; @@ -173,7 +173,7 @@ void KABCPersistence::write( MetaContact * mc ) void KABCPersistence::writeAddressBook( const KABC::Resource * res) { - if ( !s_pendingResources.tqcontainsRef( res ) ) + if ( !s_pendingResources.containsRef( res ) ) s_pendingResources.append( res ); if ( !s_addrBookWritePending ) { @@ -305,7 +305,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) // Is it in the contact list? // First discard anything after an 0xE120, this is used by IRC to separate nick and server group name, but // IRC doesn't support this properly yet, so the user will have to select an appropriate account manually - int separatorPos = (*it).tqfind( TQChar( 0xE120 ) ); + int separatorPos = (*it).find( TQChar( 0xE120 ) ); if ( separatorPos != -1 ) *it = (*it).left( separatorPos ); @@ -420,12 +420,12 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) // FIXME: Remove when IM address API is in KABC (KDE 4) void KABCPersistence::splitField( const TQString &str, TQString &app, TQString &name, TQString &value ) { - int colon = str.tqfind( ':' ); + int colon = str.find( ':' ); if ( colon != -1 ) { TQString tmp = str.left( colon ); value = str.mid( colon + 1 ); - int dash = tmp.tqfind( '-' ); + int dash = tmp.find( '-' ); if ( dash != -1 ) { app = tmp.left( dash ); name = tmp.mid( dash + 1 ); diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index fd7bb7a8..64907727 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -367,7 +367,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, continue; } TQWidget *childWidget = (TQWidget *)object; - if(d->ignore.tqcontainsRef(childWidget)){ + if(d->ignore.containsRef(childWidget)){ continue; } @@ -408,7 +408,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, propertyMap->setProperty(childWidget, setting); valueChanged = true; } - if(trackChanges && changedMap.tqfind(TQString::tqfromLatin1(childWidget->className())) != + if(trackChanges && changedMap.find(TQString::tqfromLatin1(childWidget->className())) != changedMap.end()) { connect(childWidget, changedMap[TQString::tqfromLatin1(childWidget->className())], @@ -416,7 +416,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, } #ifndef NDEBUG else if(trackChanges && - changedMap.tqfind(TQString::tqfromLatin1(childWidget->className())) == changedMap.end()) + changedMap.find(TQString::tqfromLatin1(childWidget->className())) == changedMap.end()) { // Without a signal kautoconfigdialog could incorectly // enable/disable the buttons diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp index f3671d10..69bf272a 100644 --- a/kopete/libkopete/kopeteaccountmanager.cpp +++ b/kopete/libkopete/kopeteaccountmanager.cpp @@ -220,7 +220,7 @@ TQColor AccountManager::guessColor( Protocol *protocol ) const Account* AccountManager::registerAccount( Account *account ) { - if( !account || d->accounts.tqcontains( account ) ) + if( !account || d->accounts.contains( account ) ) return account; if( account->accountId().isEmpty() ) @@ -314,7 +314,7 @@ void AccountManager::removeAccount( Account *account ) Group* group = mc->groups().first(); TQPtrList<MetaContact> groupMembers = group->members(); ContactList::self()->removeMetaContact( mc ); - if ( groupMembers.count() == 1 && groupMembers.tqfindRef( mc ) != -1 ) + if ( groupMembers.count() == 1 && groupMembers.findRef( mc ) != -1 ) ContactList::self()->removeGroup( group ); } } diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp index cf6ff95e..b85eef03 100644 --- a/kopete/libkopete/kopeteblacklister.cpp +++ b/kopete/libkopete/kopeteblacklister.cpp @@ -53,7 +53,7 @@ BlackLister::~BlackLister() bool BlackLister::isBlocked(const TQString &contactId) { - return (d->blacklist.tqfind( contactId ) != d->blacklist.end() ); + return (d->blacklist.find( contactId ) != d->blacklist.end() ); } bool BlackLister::isBlocked(Contact *contact) diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp index f396a659..9c19ebb5 100644 --- a/kopete/libkopete/kopetechatsession.cpp +++ b/kopete/libkopete/kopetechatsession.cpp @@ -118,7 +118,7 @@ void Kopete::ChatSession::setContactOnlineStatus( const Kopete::Contact *contact const Kopete::OnlineStatus Kopete::ChatSession::contactOnlineStatus( const Kopete::Contact *contact ) const { - if ( d->contacttqStatus.tqcontains( contact ) ) + if ( d->contacttqStatus.contains( contact ) ) return d->contacttqStatus[ contact ]; return contact->onlinetqStatus(); @@ -275,7 +275,7 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) { TQString nick=myself()->property(Kopete::Global::Properties::self()->nickName()).value().toString(); if ( KopetePrefs::prefs()->highlightEnabled() && !nick.isEmpty() && - msg.plainBody().tqcontains( TQRegExp( TQString::tqfromLatin1( "\\b(%1)\\b" ).tqarg( nick ), false ) ) ) + msg.plainBody().contains( TQRegExp( TQString::tqfromLatin1( "\\b(%1)\\b" ).tqarg( nick ), false ) ) ) { msg.setImportance( Kopete::Message::Highlight ); } @@ -296,7 +296,7 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialtqStatus, bool suppress ) { - if( !d->contacttqStatus.tqcontains(c) ) + if( !d->contacttqStatus.contains(c) ) d->contacttqStatus[ c ] = initialtqStatus; addContact( c, suppress ); } @@ -304,7 +304,7 @@ void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::On void Kopete::ChatSession::addContact( const Kopete::Contact *c, bool suppress ) { //kdDebug( 14010 ) << k_funcinfo << endl; - if ( d->mContactList.tqcontains( c ) ) + if ( d->mContactList.contains( c ) ) { kdDebug( 14010 ) << k_funcinfo << "Contact already exists" <<endl; emit contactAdded( c, suppress ); @@ -359,7 +359,7 @@ void Kopete::ChatSession::addContact( const Kopete::Contact *c, bool suppress ) void Kopete::ChatSession::removeContact( const Kopete::Contact *c, const TQString& reason, Kopete::Message::MessageFormat format, bool suppressNotification ) { kdDebug( 14010 ) << k_funcinfo << endl; - if ( !c || !d->mContactList.tqcontains( c ) ) + if ( !c || !d->mContactList.contains( c ) ) return; if ( d->mContactList.count() == 1 ) @@ -472,7 +472,7 @@ void Kopete::ChatSession::slotContactDestroyed( Kopete::Contact *contact ) if(contact == myself()) deleteLater(); - if( !contact || !d->mContactList.tqcontains( contact ) ) + if( !contact || !d->mContactList.contains( contact ) ) return; //This is a workaround to prevent crash if the contact get deleted. diff --git a/kopete/libkopete/kopetechatsessionmanager.cpp b/kopete/libkopete/kopetechatsessionmanager.cpp index 24029604..5c7388e3 100644 --- a/kopete/libkopete/kopetechatsessionmanager.cpp +++ b/kopete/libkopete/kopetechatsessionmanager.cpp @@ -81,7 +81,7 @@ ChatSession* ChatSessionManager::findChatSession(const Contact *user, Contact *tmpContact; for (tmpContact = contactlist.first(); tmpContact && halfMatch; tmpContact = contactlist.next()) { - if ( !chatContacts.tqcontainsRef( tmpContact ) ) + if ( !chatContacts.containsRef( tmpContact ) ) halfMatch = false; } @@ -91,7 +91,7 @@ ChatSession* ChatSessionManager::findChatSession(const Contact *user, bool fullMatch = true; for (tmpContact = chatContacts.first(); tmpContact && fullMatch; tmpContact = chatContacts.next()) { - if ( !contactlist.tqcontainsRef( tmpContact ) ) + if ( !contactlist.containsRef( tmpContact ) ) fullMatch = false; } // We have a winner diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index a01d06e4..c182a495 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -168,7 +168,7 @@ void Kopete::CommandHandler::registerCommand( TQObject *tqparent, const TQString void Kopete::CommandHandler::unregisterCommand( TQObject *tqparent, const TQString &command ) { - if( p->pluginCommands[ tqparent ].tqfind(command) ) + if( p->pluginCommands[ tqparent ].find(command) ) p->pluginCommands[ tqparent ].remove( command ); } @@ -184,7 +184,7 @@ void Kopete::CommandHandler::registerAlias( TQObject *tqparent, const TQString & void Kopete::CommandHandler::unregisterAlias( TQObject *tqparent, const TQString &alias ) { - if( p->pluginCommands[ tqparent ].tqfind(alias) ) + if( p->pluginCommands[ tqparent ].find(alias) ) p->pluginCommands[ tqparent ].remove( alias ); } @@ -470,7 +470,7 @@ void Kopete::CommandHandler::slotViewCreated( KopeteView *view ) void Kopete::CommandHandler::slotPluginLoaded( Kopete::Plugin *plugin ) { connect( plugin, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( slotPluginDestroyed( TQObject * ) ) ); - if( !p->pluginCommands.tqcontains( plugin ) ) + if( !p->pluginCommands.contains( plugin ) ) { //Create a TQDict optomized for a larger # of commands, and case insensitive CommandList mCommands(31, false); diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp index 5dc2871d..029565d0 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -575,7 +575,7 @@ TQStringList Contact::properties() const bool Contact::hasProperty(const TQString &key) const { - return d->properties.tqcontains(key); + return d->properties.contains(key); } const ContactProperty &Contact::property(const TQString &key) const diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp index 65960dcf..421354a6 100644 --- a/kopete/libkopete/kopetecontactlist.cpp +++ b/kopete/libkopete/kopetecontactlist.cpp @@ -218,7 +218,7 @@ TQPtrList<Group> ContactList::selectedGroups() const void ContactList::addMetaContact( MetaContact *mc ) { - if ( d->contacts.tqcontains( mc ) ) + if ( d->contacts.contains( mc ) ) return; d->contacts.append( mc ); @@ -232,13 +232,13 @@ void ContactList::addMetaContact( MetaContact *mc ) void ContactList::removeMetaContact(MetaContact *m) { - if ( !d->contacts.tqcontains(m) ) + if ( !d->contacts.contains(m) ) { kdDebug(14010) << k_funcinfo << "Trying to remove a not listed MetaContact." << endl; return; } - if ( d->selectedMetaContacts.tqcontains( m ) ) + if ( d->selectedMetaContacts.contains( m ) ) { d->selectedMetaContacts.remove( m ); setSelectedItems( d->selectedMetaContacts, d->selectedGroups ); @@ -259,7 +259,7 @@ void ContactList::removeMetaContact(MetaContact *m) void ContactList::addGroup( Group * g ) { - if(!d->groups.tqcontains(g) ) + if(!d->groups.contains(g) ) { d->groups.append( g ); emit groupAdded( g ); @@ -269,7 +269,7 @@ void ContactList::addGroup( Group * g ) void ContactList::removeGroup( Group *g ) { - if ( d->selectedGroups.tqcontains( g ) ) + if ( d->selectedGroups.contains( g ) ) { d->selectedGroups.remove( g ); setSelectedItems( d->selectedMetaContacts, d->selectedGroups ); @@ -396,7 +396,7 @@ void ContactList::loadXML() TQString versionString = list.attribute( TQString::tqfromLatin1( "version" ), TQString() ); uint version = 0; if( TQRegExp( TQString::tqfromLatin1( "[0-9]+\\.[0-9]" ) ).exactMatch( versionString ) ) - version = versionString.tqreplace( TQString::tqfromLatin1( "." ), TQString() ).toUInt(); + version = versionString.replace( TQString::tqfromLatin1( "." ), TQString() ).toUInt(); if( version < Private::ContactListVersion ) { @@ -542,7 +542,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers { app = id; key = TQString::tqfromLatin1( "All" ); - val = data.tqreplace( separator, TQChar( 0xE000 ) ); + val = data.replace( separator, TQChar( 0xE000 ) ); } if( !app.isEmpty() ) @@ -668,8 +668,8 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers // Unescape '||' for( TQStringList::iterator it = strList.begin(); it != strList.end(); ++it ) { - ( *it ).tqreplace( TQString::tqfromLatin1( "\\|;" ), TQString::tqfromLatin1( "|" ) ). - tqreplace( TQString::tqfromLatin1( "\\\\" ), TQString::tqfromLatin1( "\\" ) ); + ( *it ).replace( TQString::tqfromLatin1( "\\|;" ), TQString::tqfromLatin1( "|" ) ). + replace( TQString::tqfromLatin1( "\\\\" ), TQString::tqfromLatin1( "\\" ) ); } uint idx = 0; diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp index b876c791..28766a0b 100644 --- a/kopete/libkopete/kopetecontactlistelement.cpp +++ b/kopete/libkopete/kopetecontactlistelement.cpp @@ -72,7 +72,7 @@ void ContactListElement::setPluginData( Plugin *p, const TQString &key, const TQ TQMap<TQString, TQString> ContactListElement::pluginData( Plugin *plugin ) const { - if ( !d->pluginData.tqcontains( plugin->pluginId() ) ) + if ( !d->pluginData.contains( plugin->pluginId() ) ) return TQMap<TQString, TQString>(); return d->pluginData[ plugin->pluginId() ]; @@ -80,7 +80,7 @@ TQMap<TQString, TQString> ContactListElement::pluginData( Plugin *plugin ) const TQString ContactListElement::pluginData( Plugin *plugin, const TQString &key ) const { - if ( !d->pluginData.tqcontains( plugin->pluginId() ) || !d->pluginData[ plugin->pluginId() ].tqcontains( key ) ) + if ( !d->pluginData.contains( plugin->pluginId() ) || !d->pluginData[ plugin->pluginId() ].contains( key ) ) return TQString(); return d->pluginData[ plugin->pluginId() ][ key ]; @@ -222,7 +222,7 @@ bool ContactListElement::fromXML( const TQDomElement& element ) TQString ContactListElement::icon( ContactListElement::IconState state ) const { - if ( d->icons.tqcontains( state ) ) + if ( d->icons.contains( state ) ) return d->icons[state]; return d->icons[ None ]; diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp index 2dae6117..e7643142 100644 --- a/kopete/libkopete/kopeteglobal.cpp +++ b/kopete/libkopete/kopeteglobal.cpp @@ -69,7 +69,7 @@ Properties::~Properties() const ContactPropertyTmpl &Properties::tmpl(const TQString &key) const { - if(d->mTemplates.tqcontains(key)) + if(d->mTemplates.contains(key)) { /*kdDebug(14000) << k_funcinfo << "Found template for key = '" << key << "'" << endl;*/ @@ -82,7 +82,7 @@ const ContactPropertyTmpl &Properties::tmpl(const TQString &key) const bool Properties::registerTemplate(const TQString &key, const ContactPropertyTmpl &tmpl) { - if(d->mTemplates.tqcontains(key)) + if(d->mTemplates.contains(key)) { kdDebug(14000) << k_funcinfo << "Called for EXISTING key = '" << key << "'" << endl; @@ -103,7 +103,7 @@ void Properties::unregisterTemplate(const TQString &key) bool Properties::isRegistered(const TQString &key) { - return d->mTemplates.tqcontains(key); + return d->mTemplates.contains(key); } const ContactPropertyTmpl &Properties::fullName() const @@ -197,7 +197,7 @@ const ContactPropertyTmpl &Properties::createProp(const TQString &key, /*kdDebug(14000) << k_funcinfo << "key = " << key << ", label = " << label << endl;*/ - if(!d->mTemplates.tqcontains(key)) + if(!d->mTemplates.contains(key)) { /* kdDebug(14000) << k_funcinfo << "CREATING NEW ContactPropertyTmpl WITH key = " << key << diff --git a/kopete/libkopete/kopetegroup.cpp b/kopete/libkopete/kopetegroup.cpp index ac221223..fc1290ba 100644 --- a/kopete/libkopete/kopetegroup.cpp +++ b/kopete/libkopete/kopetegroup.cpp @@ -93,7 +93,7 @@ TQPtrList<MetaContact> Group::members() const // members is a *copy* of the meta contacts, so using first(), next() and remove() is fine. for( members.first(); members.current(); ) { - if ( members.current()->groups().tqcontains( this ) ) + if ( members.current()->groups().contains( this ) ) members.next(); else members.remove(); diff --git a/kopete/libkopete/kopetemessage.cpp b/kopete/libkopete/kopetemessage.cpp index db3b24ef..0dfedd69 100644 --- a/kopete/libkopete/kopetemessage.cpp +++ b/kopete/libkopete/kopetemessage.cpp @@ -199,20 +199,20 @@ void Message::doSetBody( const TQString &_body, Message::MessageFormat f ) { //This is coming from the RichTextEditor component. //Strip off the containing HTML document - body.tqreplace( TQRegExp( TQString::tqfromLatin1(".*<body[^>]*>(.*)</body>.*") ), TQString::tqfromLatin1("\\1") ); + body.replace( TQRegExp( TQString::tqfromLatin1(".*<body[^>]*>(.*)</body>.*") ), TQString::tqfromLatin1("\\1") ); //Strip <p> tags - body.tqreplace( TQString::tqfromLatin1("<p>"), TQString() ); + body.replace( TQString::tqfromLatin1("<p>"), TQString() ); //Replace </p> with a <br/> - body.tqreplace( TQString::tqfromLatin1("</p>"), TQString::tqfromLatin1("<br/>") ); + body.replace( TQString::tqfromLatin1("</p>"), TQString::tqfromLatin1("<br/>") ); //Remove trailing </br> if ( body.endsWith( TQString::tqfromLatin1("<br/>") ) ) body.truncate( body.length() - 5 ); body.remove( TQString::tqfromLatin1("\n") ); - body.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); + body.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); } /* else if( f == ParsedHTML ) @@ -255,23 +255,23 @@ TQString Message::unescape( const TQString &xml ) data.simplifyWhiteSpace(); int pos; - while ( ( pos = data.tqfind( '<' ) ) != -1 ) + while ( ( pos = data.find( '<' ) ) != -1 ) { - int endPos = data.tqfind( '>', pos + 1 ); + int endPos = data.find( '>', pos + 1 ); if( endPos == -1 ) break; // No more complete elements left // Take the part between < and >, and extract the element name from that int matchWidth = endPos - pos + 1; TQString match = data.mid( pos + 1, matchWidth - 2 ).simplifyWhiteSpace(); - int elemEndPos = match.tqfind( ' ' ); + int elemEndPos = match.find( ' ' ); TQString elem = ( elemEndPos == -1 ? match.lower() : match.left( elemEndPos ).lower() ); if ( elem == TQString::tqfromLatin1( "img" ) ) { // Replace smileys with their original text' const TQString attrTitle = TQString::tqfromLatin1( "title=\"" ); - int titlePos = match.tqfind( attrTitle, elemEndPos ); - int titleEndPos = match.tqfind( '"', titlePos + attrTitle.length() ); + int titlePos = match.find( attrTitle, elemEndPos ); + int titleEndPos = match.find( '"', titlePos + attrTitle.length() ); if( titlePos == -1 || titleEndPos == -1 ) { // Not a smiley but a normal <img> @@ -282,7 +282,7 @@ TQString Message::unescape( const TQString &xml ) { TQString orig = match.mid( titlePos + attrTitle.length(), titleEndPos - titlePos - attrTitle.length() ); - data.tqreplace( pos, matchWidth, orig ); + data.replace( pos, matchWidth, orig ); pos += orig.length(); } } @@ -290,7 +290,7 @@ TQString Message::unescape( const TQString &xml ) elem == TQString::tqfromLatin1( "br" ) ) { // Replace paragraph, div and line breaks with a newline - data.tqreplace( pos, matchWidth, '\n' ); + data.replace( pos, matchWidth, '\n' ); pos++; } else @@ -302,12 +302,12 @@ TQString Message::unescape( const TQString &xml ) } // Replace stuff starting with '&' - data.tqreplace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); - data.tqreplace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); - data.tqreplace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); - data.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); - data.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); - data.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); //this one is used in jabber: note, we should escape all &#xx; + data.replace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); + data.replace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); + data.replace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); + data.replace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); + data.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); + data.replace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); //this one is used in jabber: note, we should escape all &#xx; return data; } @@ -316,13 +316,13 @@ TQString Message::escape( const TQString &text ) { TQString html = TQStyleSheet::escape( text ); //Replace carriage returns inside the text - html.tqreplace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "<br />" ) ); + html.replace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "<br />" ) ); //Replace a tab with 4 spaces - html.tqreplace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( " " ) ); + html.replace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( " " ) ); //Replace multiple spaces with //do not replace every space so we break the linebreak - html.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); + html.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); return html; } @@ -403,7 +403,7 @@ TQString Message::parseLinks( const TQString &message, MessageFormat format ) { TQString curr = *it; // > in HTML means start-of-tag if and only if it's the first one after a < - int tagclose = curr.tqfind( TQChar('>') ); + int tagclose = curr.find( TQChar('>') ); // no >: the HTML is broken, but we can cope if ( tagclose == -1 ) continue; @@ -425,24 +425,24 @@ TQString Message::parseLinks( const TQString &message, MessageFormat format ) //Replace http/https/ftp links: // Replace (stuff)://[user:password@](linkstuff) with a link - result.tqreplace( + result.replace( TQRegExp( makeRegExp("\\w+://%1?\\w%2").tqarg( userAndPassword, urlSection ) ), TQString::tqfromLatin1("\\1<a href=\"\\2\" title=\"\\2\">\\2</a>\\3" ) ); // Replace www.X.Y(linkstuff) with a http: link - result.tqreplace( + result.replace( TQRegExp( makeRegExp("%1?www\\.%2%3").tqarg( userAndPassword, domain, urlSection ) ), TQString::tqfromLatin1("\\1<a href=\"http://\\2\" title=\"http://\\2\">\\2</a>\\3" ) ); //Replace Email Links // Replace user@domain with a mailto: link - result.tqreplace( + result.replace( TQRegExp( makeRegExp("%1@%2").tqarg( name, domain ) ), TQString::tqfromLatin1("\\1<a href=\"mailto:\\2\" title=\"mailto:\\2\">\\2</a>\\3") ); //Workaround for Bug 85061: Highlighted URLs adds a ' ' after the URL itself // the trailing is included in the url. - result.tqreplace( TQRegExp( TQString::tqfromLatin1("(<a href=\"[^\"]+)( )(\")") ) , TQString::tqfromLatin1("\\1\\3") ); + result.replace( TQRegExp( TQString::tqfromLatin1("(<a href=\"[^\"]+)( )(\")") ) , TQString::tqfromLatin1("\\1\\3") ); return result; } diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp index a031f5bd..c671ace4 100644 --- a/kopete/libkopete/kopetemetacontact.cpp +++ b/kopete/libkopete/kopetemetacontact.cpp @@ -127,7 +127,7 @@ MetaContact::~MetaContact() void MetaContact::addContact( Contact *c ) { - if( d->contacts.tqcontains( c ) ) + if( d->contacts.contains( c ) ) { kdWarning(14010) << "Ignoring attempt to add duplicate contact " << c->contactId() << "!" << endl; } @@ -193,7 +193,7 @@ void MetaContact::updateOnlineStatus() void MetaContact::removeContact(Contact *c, bool deleted) { - if( !d->contacts.tqcontains( c ) ) + if( !d->contacts.contains( c ) ) { kdDebug(14010) << k_funcinfo << " Contact is not in this metaContact " << endl; } @@ -640,7 +640,7 @@ TQString MetaContact::displayName() const TQString nameFromKABC( const TQString &id ) /*const*/ { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); - if ( ! id.isEmpty() && !id.tqcontains(':') ) + if ( ! id.isEmpty() && !id.contains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) @@ -666,7 +666,7 @@ TQString nameFromContact( Kopete::Contact *c) /*const*/ contactName = c->property( Global::Properties::self()->nickName()).value().toString(); //the replace is there to workaround the Bug 95444 - return contactName.isEmpty() ? c->contactId() : contactName.tqreplace('\n',TQString::fromUtf8("")); + return contactName.isEmpty() ? c->contactId() : contactName.replace('\n',TQString::fromUtf8("")); } KURL MetaContact::customPhoto() const @@ -739,7 +739,7 @@ TQImage photoFromContact( Kopete::Contact *contact) /*const*/ TQImage photoFromKABC( const TQString &id ) /*const*/ { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); - if ( ! id.isEmpty() && !id.tqcontains(':') ) + if ( ! id.isEmpty() && !id.contains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) @@ -859,14 +859,14 @@ void MetaContact::slotPropertyChanged( Contact* subcontact, const TQString &key, void MetaContact::moveToGroup( Group *from, Group *to ) { - if ( !from || !groups().tqcontains( from ) ) + if ( !from || !groups().contains( from ) ) { // We're adding, not moving, because 'from' is illegal addToGroup( to ); return; } - if ( !to || groups().tqcontains( to ) ) + if ( !to || groups().contains( to ) ) { // We're removing, not moving, because 'to' is illegal removeFromGroup( from ); @@ -890,7 +890,7 @@ void MetaContact::moveToGroup( Group *from, Group *to ) void MetaContact::removeFromGroup( Group *group ) { - if ( !group || !groups().tqcontains( group ) || ( isTemporary() && group->type() == Group::Temporary ) ) + if ( !group || !groups().contains( group ) || ( isTemporary() && group->type() == Group::Temporary ) ) { return; } @@ -912,13 +912,13 @@ void MetaContact::removeFromGroup( Group *group ) void MetaContact::addToGroup( Group *to ) { - if ( !to || groups().tqcontains( to ) ) + if ( !to || groups().contains( to ) ) return; if ( d->temporary && to->type() != Group::Temporary ) return; - if ( d->groups.tqcontains( Group::topLevel() ) ) + if ( d->groups.contains( Group::topLevel() ) ) { d->groups.remove( Group::topLevel() ); emit removedFromGroup( this, Group::topLevel() ); @@ -1058,7 +1058,7 @@ bool MetaContact::fromXML( const TQDomElement& element ) // return false; //the replace is there to workaround the Bug 95444 - d->displayName = contactElement.text().tqreplace('\n',TQString::fromUtf8("")); + d->displayName = contactElement.text().replace('\n',TQString::fromUtf8("")); if ( contactElement.hasAttribute(NSCID_ELEM) && contactElement.hasAttribute(NSPID_ELEM) && contactElement.hasAttribute(NSAID_ELEM)) { @@ -1291,7 +1291,7 @@ void MetaContact::slotUpdateAddressBookPicture() { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); TQString id = metaContactId(); - if ( !id.isEmpty() && !id.tqcontains(':') ) + if ( !id.isEmpty() && !id.contains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) diff --git a/kopete/libkopete/kopetenotifydataobject.cpp b/kopete/libkopete/kopetenotifydataobject.cpp index 9cde4133..16ec1889 100644 --- a/kopete/libkopete/kopetenotifydataobject.cpp +++ b/kopete/libkopete/kopetenotifydataobject.cpp @@ -39,13 +39,13 @@ Kopete::NotifyDataObject::~NotifyDataObject() Kopete::NotifyEvent * Kopete::NotifyDataObject::notifyEvent( const TQString &event ) const { - Kopete::NotifyEvent *evt = d->events.tqfind( event ); + Kopete::NotifyEvent *evt = d->events.find( event ); return evt; } void Kopete::NotifyDataObject::setNotifyEvent( const TQString& event, Kopete::NotifyEvent *notifyEvent ) { - d->events.tqreplace( event, notifyEvent ); + d->events.replace( event, notifyEvent ); } bool Kopete::NotifyDataObject::removeNotifyEvent( const TQString &event ) diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp index c0cef12f..e94f92d8 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.cpp +++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp @@ -151,7 +151,7 @@ TQPixmap OnlineStatusManager::cacheLookupByObject( const OnlineStatus &statusFor TQString fp = fingerprint( statusFor, icon, size, color, idle ); // look it up in the cache - TQPixmap *theIcon= d->iconCache.tqfind( fp ); + TQPixmap *theIcon= d->iconCache.find( fp ); if ( !theIcon ) { // cache miss @@ -165,7 +165,7 @@ TQPixmap OnlineStatusManager::cacheLookupByObject( const OnlineStatus &statusFor TQPixmap OnlineStatusManager::cacheLookupByMimeSource( const TQString &mimeSource ) { // look it up in the cache - const TQPixmap *theIcon= d->iconCache.tqfind( mimeSource ); + const TQPixmap *theIcon= d->iconCache.find( mimeSource ); if ( !theIcon ) { // need to return an invalid pixmap diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 06176178..8595cb94 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -282,7 +282,7 @@ void PluginManager::loadAllPlugins() continue; TQString pluginName = (*it2)->pluginName(); - bool inMap = pluginsMap.tqcontains( pluginName ); + bool inMap = pluginsMap.contains( pluginName ); if ( (inMap && pluginsMap[pluginName]) || (!inMap && (*it2)->isPluginEnabledByDefault()) ) { if ( !plugin( pluginName ) ) @@ -372,7 +372,7 @@ Plugin *PluginManager::loadPluginInternal( const TQString &pluginId ) return 0L; } - if ( d->loadedPlugins.tqcontains( info ) ) + if ( d->loadedPlugins.contains( info ) ) return d->loadedPlugins[ info ]; int error = 0; @@ -479,7 +479,7 @@ Plugin* PluginManager::plugin( const TQString &_pluginId ) const if ( !info ) return 0L; - if ( d->loadedPlugins.tqcontains( info ) ) + if ( d->loadedPlugins.contains( info ) ) return d->loadedPlugins[ info ]; else return 0L; diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp index c9805f9a..644ded69 100644 --- a/kopete/libkopete/kopeteprefs.cpp +++ b/kopete/libkopete/kopeteprefs.cpp @@ -128,10 +128,10 @@ void KopetePrefs::load() config->setGroup("ContactList"); setThemeURL(config->readEntry("ThemeURL")); - int n = tqmetaObject()->tqfindProperty( "contactListDisplayMode" ); + int n = tqmetaObject()->findProperty( "contactListDisplayMode" ); TQString value = config->readEntry("DisplayMode",TQString::tqfromLatin1("Default")); mContactListDisplayMode = (ContactDisplayMode)tqmetaObject()->property( n )->keyToValue( value.latin1() ); - n = tqmetaObject()->tqfindProperty( "contactListIconMode" ); + n = tqmetaObject()->findProperty( "contactListIconMode" ); value = config->readEntry("IconMode", TQString::tqfromLatin1("IconDefault")); mContactListIconMode = (IconDisplayMode) tqmetaObject()->property( n )->keyToValue( value.latin1() ); @@ -229,9 +229,9 @@ void KopetePrefs::save() config->setGroup("ContactList"); config->writeEntry("ThemeURL", mThemeURL); - int n = tqmetaObject()->tqfindProperty( "contactListDisplayMode" ); + int n = tqmetaObject()->findProperty( "contactListDisplayMode" ); config->writeEntry("DisplayMode", tqmetaObject()->property( n )->valueToKey( mContactListDisplayMode )); - n = tqmetaObject()->tqfindProperty( "contactListIconMode" ); + n = tqmetaObject()->findProperty( "contactListIconMode" ); config->writeEntry("IconMode", tqmetaObject()->property( n )->valueToKey( mContactListIconMode )); config->writeEntry("IndentContacts", mContactListIndentContacts); config->writeEntry("UseCustomFonts", mContactListUseCustomFonts); diff --git a/kopete/libkopete/kopeteproperties.h b/kopete/libkopete/kopeteproperties.h index a73a10c7..bb27b82f 100644 --- a/kopete/libkopete/kopeteproperties.h +++ b/kopete/libkopete/kopeteproperties.h @@ -137,7 +137,7 @@ public: * name their custom data differently. Names are bound by the same rules as are laid out * for naming properties in PropertyBase<Parent>::name. */ - void setCustomPropertyData( const char *name, PropertyData *data ) const { _storage.tqreplace( name, data ); } + void setCustomPropertyData( const char *name, PropertyData *data ) const { _storage.replace( name, data ); } /** * Gets the stored property data with name @p name. Returns a null diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp index 3677cbe3..f471d577 100644 --- a/kopete/libkopete/kopeteprotocol.cpp +++ b/kopete/libkopete/kopeteprotocol.cpp @@ -197,7 +197,7 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) // Inside libkabc the use of TQChar( 0xE000 ) has been standardized // as separator for the string lists, use this also for the 'normal' // serialized data. - if( serializedData.tqcontains( it.key() ) ) + if( serializedData.contains( it.key() ) ) serializedData[ it.key() ] = serializedData[ it.key() ] + TQChar( 0xE000 ) + it.data(); else serializedData[ it.key() ] = it.data(); @@ -205,7 +205,7 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) for( it = ad.begin(); it != ad.end(); ++it ) { - if( addressBookData.tqcontains( it.key() ) ) + if( addressBookData.contains( it.key() ) ) addressBookData[ it.key() ] = addressBookData[ it.key() ] + TQChar( 0xE000 ) + it.data(); else addressBookData[ it.key() ] = it.data(); diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp index f9fef1b6..e80788bf 100644 --- a/kopete/libkopete/private/kopetecommand.cpp +++ b/kopete/libkopete/private/kopetecommand.cpp @@ -102,8 +102,8 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession // Translate %s to the whole string and %n to current nickname - formatString.tqreplace( TQString::tqfromLatin1("%n"), manager->myself()->nickName() ); - formatString.tqreplace( TQString::tqfromLatin1("%s"), args ); + formatString.replace( TQString::tqfromLatin1("%n"), manager->myself()->nickName() ); + formatString.replace( TQString::tqfromLatin1("%s"), args ); // Translate %1..%N to word1..wordN diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index 9c41d44d..26375517 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -183,7 +183,7 @@ TQValueList<Emoticons::Token> Emoticons::tokenize( const TQString& message, uint p = c; continue; } /* strict requires space before the emoticon */ - if ( d->emoticonMap.tqcontains( c ) ) + if ( d->emoticonMap.contains( c ) ) { emoticonList = d->emoticonMap[ c ]; bool found = false; @@ -192,7 +192,7 @@ TQValueList<Emoticons::Token> Emoticons::tokenize( const TQString& message, uint // If this is an HTML, then search for the HTML form of the emoticon. // For instance <o) => >o) needle = ( mode & SkipHTML ) ? (*it).matchTextEscaped : (*it).matchText; - if ( ( pos == (size_t)message.tqfind( needle, pos ) ) ) + if ( ( pos == (size_t)message.find( needle, pos ) ) ) { if( mode & StrictParse ) { @@ -214,7 +214,7 @@ TQValueList<Emoticons::Token> Emoticons::tokenize( const TQString& message, uint { if( inHTMLEntity ){ // If we are in an HTML entitiy such as > - int htmlEnd = message.tqfind( ';', pos ); + int htmlEnd = message.find( ';', pos ); // Search for where it ends if( htmlEnd == -1 ) { diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 4650ffb9..1d6feced 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -110,7 +110,7 @@ KopeteView *KopeteViewManager::view( Kopete::ChatSession* session, const TQStrin { // kdDebug(14000) << k_funcinfo << endl; - if( d->managerMap.tqcontains( session ) && d->managerMap[ session ] ) + if( d->managerMap.contains( session ) && d->managerMap[ session ] ) { return d->managerMap[ session ]; } @@ -161,7 +161,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi bool outgoingMessage = ( msg.direction() == Kopete::Message::Outbound ); - if( !outgoingMessage || d->managerMap.tqcontains( manager ) ) + if( !outgoingMessage || d->managerMap.contains( manager ) ) { d->foreignMessage=!outgoingMessage; //let know for the view we are about to create manager->view(true,msg.requestedPlugin())->appendMessage( msg ); @@ -329,7 +329,7 @@ void KopeteViewManager::slotViewDestroyed( KopeteView *closingView ) { // kdDebug( 14000 ) << k_funcinfo << endl; - if( d->managerMap.tqcontains( closingView->msgManager() ) ) + if( d->managerMap.contains( closingView->msgManager() ) ) { d->managerMap.remove( closingView->msgManager() ); // closingView->msgManager()->setCanBeDeleted( true ); @@ -343,7 +343,7 @@ void KopeteViewManager::slotChatSessionDestroyed( Kopete::ChatSession *manager ) { // kdDebug( 14000 ) << k_funcinfo << endl; - if( d->managerMap.tqcontains( manager ) ) + if( d->managerMap.contains( manager ) ) { KopeteView *v=d->managerMap[ manager ]; v->closeView( true ); diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index ab0ee31a..e8ada405 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -71,7 +71,7 @@ void KopeteEmoticonTest::testEmoticonParser() TQString fileName = *it; kdDebug() << "testcase: " << fileName << endl; TQString outputFileName = fileName; - outputFileName.tqreplace("input","output"); + outputFileName.replace("input","output"); // open the input file TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName); TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName); @@ -94,10 +94,10 @@ void KopeteEmoticonTest::testEmoticonParser() inputFile.close(); expectedFile.close(); - TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).tqreplace( "smile.png", TQString() ); + TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString() ); Kopete::Emoticons::self(); - TQString result = emo.parse( inputData ).tqreplace( path, TQString() ); + TQString result = emo.parse( inputData ).replace( path, TQString() ); // HACK to know the test case we applied, concatenate testcase name to both // input and expected string. WIll remove when I can add some sort of metadata diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp index 55a44f87..5603b911 100644 --- a/kopete/libkopete/tests/kopetemessage_test.cpp +++ b/kopete/libkopete/tests/kopetemessage_test.cpp @@ -259,7 +259,7 @@ void KopeteMessage_Test::testLinkParser() { TQString fileName = *it; TQString outputFileName = fileName; - outputFileName.tqreplace("input","output"); + outputFileName.replace("input","output"); // open the input file TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName); TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName); @@ -283,8 +283,8 @@ void KopeteMessage_Test::testLinkParser() expectedFile.close(); // use a concrete url - inputData.tqreplace( "$URL","http://www.kde.org" ); - expectedData.tqreplace( "$URL","http://www.kde.org" ); + inputData.replace( "$URL","http://www.kde.org" ); + expectedData.replace( "$URL","http://www.kde.org" ); // set message format for parsing according to textcase filename convention Kopete::Message::MessageFormat format; diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp index d67c3671..a0ce53af 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.cpp +++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp @@ -154,7 +154,7 @@ void AddressBookSelectorWidget::slotAddAddresseeClicked() Kopete::KABCPersistence::self()->writeAddressBook( 0 ); slotLoadAddressees(); // select the addressee we just added - TQListViewItem * added = addresseeListView->tqfindItem( addresseeName, 1 ); + TQListViewItem * added = addresseeListView->findItem( addresseeName, 1 ); kListViewSearchLine->clear(); kListViewSearchLine->updateSearch(); addresseeListView->setSelected( added, true ); diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index 1f23da15..b4c156fb 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -76,7 +76,7 @@ Component *ComponentBase::componentAt( const TQPoint &pt ) { for ( uint n = 0; n < components(); ++n ) { - if ( component( n )->rect().tqcontains( pt ) ) + if ( component( n )->rect().contains( pt ) ) { if ( Component *comp = component( n )->componentAt( pt ) ) return comp; @@ -117,7 +117,7 @@ void ComponentBase::componentResized( Component * ) std::pair<TQString,TQRect> ComponentBase::toolTip( const TQPoint &relativePos ) { for ( uint n = 0; n < components(); ++n ) - if ( component( n )->rect().tqcontains( relativePos ) ) + if ( component( n )->rect().contains( relativePos ) ) return component( n )->toolTip( relativePos ); return std::make_pair( TQString(), TQRect() ); diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp index 61a4f14e..6da2b351 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.cpp +++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp @@ -244,7 +244,7 @@ void MetaContactSelectorWidget::selectMetaContact( Kopete::MetaContact *mc ) void MetaContactSelectorWidget::excludeMetaContact( Kopete::MetaContact *mc ) { - if( d->excludedMetaContacts.tqfindIndex(mc) == -1 ) + if( d->excludedMetaContacts.findIndex(mc) == -1 ) { d->excludedMetaContacts.append(mc); } @@ -264,7 +264,7 @@ void MetaContactSelectorWidget::slotLoadMetaContacts() TQPtrList<Kopete::MetaContact> metaContacts = Kopete::ContactList::self()->metaContacts(); for( Kopete::MetaContact *mc = metaContacts.first(); mc ; mc = metaContacts.next() ) { - if( !mc->isTemporary() && (d->excludedMetaContacts.tqfindIndex(mc) == -1) ) + if( !mc->isTemporary() && (d->excludedMetaContacts.findIndex(mc) == -1) ) { new MetaContactSelectorWidgetLVI(mc, d->widget->metaContactListView); } 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(); diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp index e1eb5487..e100af2e 100644 --- a/kopete/protocols/gadu/gaduaway.cpp +++ b/kopete/protocols/gadu/gaduaway.cpp @@ -51,7 +51,7 @@ GaduAway::GaduAway( GaduAccount* account, TQWidget* tqparent, const char* name ) s = GaduProtocol::protocol()->statusToWithDescription( ks ); if ( s == GG_STATUS_NOT_AVAIL_DESCR ) { - ui_->statusGroup_->tqfind( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( TRUE ); + ui_->statusGroup_->find( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( TRUE ); ui_->statusGroup_->setButton( GG_STATUS_AVAIL_DESCR ); } else { diff --git a/kopete/protocols/gadu/gaducontactlist.cpp b/kopete/protocols/gadu/gaducontactlist.cpp index 9c003751..67050bce 100644 --- a/kopete/protocols/gadu/gaducontactlist.cpp +++ b/kopete/protocols/gadu/gaducontactlist.cpp @@ -45,7 +45,7 @@ GaduContactsList::GaduContactsList( TQString sList ) return; } - if ( ( !sList.tqcontains( '\n' ) && sList.tqcontains( ';' ) ) || !sList.tqcontains( ';' ) ) { + if ( ( !sList.contains( '\n' ) && sList.contains( ';' ) ) || !sList.contains( ';' ) ) { return; } diff --git a/kopete/protocols/gadu/gadudcc.cpp b/kopete/protocols/gadu/gadudcc.cpp index 6e5b416a..b44ba883 100644 --- a/kopete/protocols/gadu/gadudcc.cpp +++ b/kopete/protocols/gadu/gadudcc.cpp @@ -78,7 +78,7 @@ GaduDCC::unregisterAccount( unsigned int id ) return false; } - if ( !accounts.tqcontains( id ) ) { + if ( !accounts.contains( id ) ) { kdDebug(14100) << "attempt to unregister not registered account" << endl; initmutex.unlock(); return false; @@ -118,7 +118,7 @@ GaduDCC::registerAccount( GaduAccount* account ) aid = account->accountId().toInt(); - if ( accounts.tqcontains( aid ) ) { + if ( accounts.contains( aid ) ) { kdDebug(14100) << "attempt to register already registered account" << endl; initmutex.unlock(); return false; @@ -168,7 +168,7 @@ GaduDCC::slotIncoming( gg_dcc* incoming, bool& handled ) GaduDCC::~GaduDCC() { - if ( accounts.tqcontains( accountId ) ) { + if ( accounts.contains( accountId ) ) { kdDebug( 14100 ) << "unregister account " << accountId << " in destructor " << endl; unregisterAccount( accountId ); } diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index f152b942..e95f80d1 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -384,7 +384,7 @@ GaduDCCTransaction::watcher() { return; break; case GG_EVENT_DCC_NEED_FILE_INFO: - if (gaduDCC_->requests.tqcontains(dccSock_->peer_uin)) { + if (gaduDCC_->requests.contains(dccSock_->peer_uin)) { TQString filePath = gaduDCC_->requests[dccSock_->peer_uin]; kdDebug() << "Callback request found. Sending " << filePath << endl; gaduDCC_->requests.remove(dccSock_->peer_uin); diff --git a/kopete/protocols/gadu/gadurichtextformat.cpp b/kopete/protocols/gadu/gadurichtextformat.cpp index 9e46b967..9dcdbc21 100644 --- a/kopete/protocols/gadu/gadurichtextformat.cpp +++ b/kopete/protocols/gadu/gadurichtextformat.cpp @@ -150,7 +150,7 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) output->rtf.resize(0); // test first if there is any HTML formating in it - if( htmlString.tqfind( TQString::tqfromLatin1("</span") ) > -1 ) { + if( htmlString.find( TQString::tqfromLatin1("</span") ) > -1 ) { TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") ); findTags.setMinimal( true ); int pos = 0; @@ -199,7 +199,7 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) } TQString rep = TQString("<span style=\"%1\">%2</span>" ).tqarg( styleHTML ).tqarg( replacement ); - htmlString.tqreplace( findTags.pos( 0 ), rep.length(), replacement ); + htmlString.replace( findTags.pos( 0 ), rep.length(), replacement ); replacement = unescapeGaduMessage( replacement ); output->message += replacement; @@ -245,7 +245,7 @@ GaduRichTextFormat::unescapeGaduMessage( TQString& ns ) { TQString s; s = Kopete::Message::unescape( ns ); - s.tqreplace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); + s.replace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); return s; } @@ -282,10 +282,10 @@ GaduRichTextFormat::insertRtf( uint position) TQString GaduRichTextFormat::escapeBody( TQString& input ) { - input.tqreplace( '<', TQString::tqfromLatin1("<") ); - input.tqreplace( '>', TQString::tqfromLatin1(">") ); - input.tqreplace( '\n', TQString::tqfromLatin1( "<br />" ) ); - input.tqreplace( '\t', TQString::tqfromLatin1( " " ) ); - input.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); + input.replace( '<', TQString::tqfromLatin1("<") ); + input.replace( '>', TQString::tqfromLatin1(">") ); + input.replace( '\n', TQString::tqfromLatin1( "<br />" ) ); + input.replace( '\t', TQString::tqfromLatin1( " " ) ); + input.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " " ) ); return input; } diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index f7fe5970..6490a1e3 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -265,7 +265,7 @@ GaduSession::sendMessage( uin_t recipient, const Kopete::Message& msg, int msgCl } else { sendMsg = msg.plainBody(); - sendMsg.tqreplace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); + sendMsg.replace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); cpMsg = textcodec->fromUnicode( sendMsg ); return gg_send_message( session_, msgClass, recipient, (const unsigned char *)cpMsg.data() ); diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index ddcf1918..f034cea7 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -1059,7 +1059,7 @@ void GroupWiseAccount::receivetqStatus( const TQString & contactId, TQ_UINT16 st c->setProperty( protocol()->propAwayMessage, awayMessage ); } else - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't tqfind " << contactId << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't find " << contactId << endl; } void GroupWiseAccount::changeOurtqStatus( GroupWise::tqStatus status, const TQString & awayMessage, const TQString & autoReply ) @@ -1377,7 +1377,7 @@ void GroupWiseAccount::slotLeavingConference( GroupWiseChatSession * sess ) if( isConnected () ) m_client->leaveConference( sess->guid() ); m_chatSessions.remove( sess ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "m_chatSessions now tqcontains:" << m_chatSessions.count() << " managers" << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "m_chatSessions now contains:" << m_chatSessions.count() << " managers" << endl; Kopete::ContactPtrList members = sess->members(); for ( Kopete::Contact * contact = members.first(); contact; contact = members.next() ) { diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index 0dd78a71..06ac510f 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -52,7 +52,7 @@ GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn : Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( parentId ), m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false ) { - if ( dn.tqfind( '=' ) != -1 ) + if ( dn.find( '=' ) != -1 ) { m_dn = dn; } @@ -96,17 +96,17 @@ void GroupWiseContact::updateDetails( const ContactDetails & details ) TQMap<TQString, TQString>::Iterator it; // work phone number - if ( ( it = m_serverProperties.tqfind( "telephoneNumber" ) ) + if ( ( it = m_serverProperties.find( "telephoneNumber" ) ) != m_serverProperties.end() ) setProperty( protocol()->propPhoneWork, it.data() ); // mobile phone number - if ( ( it = m_serverProperties.tqfind( "mobile" ) ) + if ( ( it = m_serverProperties.find( "mobile" ) ) != m_serverProperties.end() ) setProperty( protocol()->propPhoneMobile, it.data() ); // email - if ( ( it = m_serverProperties.tqfind( "Internet EMail Address" ) ) + if ( ( it = m_serverProperties.find( "Internet EMail Address" ) ) != m_serverProperties.end() ) setProperty( protocol()->propEmail, it.data() ); diff --git a/kopete/protocols/groupwise/gwcontactlist.cpp b/kopete/protocols/groupwise/gwcontactlist.cpp index 03e66f45..306a457c 100644 --- a/kopete/protocols/groupwise/gwcontactlist.cpp +++ b/kopete/protocols/groupwise/gwcontactlist.cpp @@ -199,7 +199,7 @@ void GWFolder::dump( unsigned int depth ) { TQString s; s.fill( ' ', ++depth * 2 ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s <<"Folder " << displayName << " id: " << id << " tqcontains: " << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s <<"Folder " << displayName << " id: " << id << " contains: " << endl; const TQObjectList l = childrenListObject(); if ( !l.isEmpty() ) { diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index c45371b9..a9f0c816 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -307,7 +307,7 @@ void GroupWiseChatSession::slotActionInviteAboutToShow() TQDictIterator<Kopete::Contact> it( account()->contacts() ); for( ; it.current(); ++it ) { - if( !members().tqcontains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) + if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { KAction *a=new KopeteContactAction( it.current(), this, TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index 4abdab9f..0a9e09ee 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -264,7 +264,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) TQString GroupWiseProtocol::dnToDotted( const TQString & dn ) { TQRegExp rx("[a-zA-Z]*=(.*)$", false ); - if( !dn.tqfind( '=' ) ) // if it's not a DN, return it unprocessed + if( !dn.find( '=' ) ) // if it's not a DN, return it unprocessed return dn; // split the dn into elements diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp index 87333c41..d285b8af 100644 --- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp @@ -29,7 +29,7 @@ #include "chatroommanager.h" ChatroomManager::ChatroomManager( Client * tqparent, const char *name) - : TQObject(tqparent, name), m_client( tqparent ), m_tqreplace( false ) + : TQObject(tqparent, name), m_client( tqparent ), m_replace( false ) { } @@ -49,7 +49,7 @@ GroupWise::ChatroomMap ChatroomManager::rooms() void ChatroomManager::getChatrooms( bool refresh ) { - m_tqreplace = !refresh; + m_replace = !refresh; SearchChatTask * sct = new SearchChatTask( m_client->rootTask() ); sct->search( ( refresh ? SearchChatTask::SinceLastSearch : SearchChatTask::FetchAll ) ); connect( sct, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatroomList() ) ); @@ -62,7 +62,7 @@ void ChatroomManager::slotGotChatroomList() SearchChatTask * sct = (SearchChatTask *)sender(); if ( sct ) { - if ( m_tqreplace ) + if ( m_replace ) m_rooms.clear(); TQValueList<ChatroomSearchResult> roomsFound = sct->results(); @@ -94,7 +94,7 @@ void ChatroomManager::slotGotChatCounts() const TQMap< TQString, int >::iterator end = newCounts.end(); for ( ; it != end; ++it ) - if ( m_rooms.tqcontains( it.key() ) ) + if ( m_rooms.contains( it.key() ) ) m_rooms[ it.key() ].participantsCount = it.data(); } emit updated(); @@ -102,7 +102,7 @@ void ChatroomManager::slotGotChatCounts() void ChatroomManager::requestProperties( const TQString & displayName ) { - if ( 0 /*m_rooms.tqcontains( displayName ) */) + if ( 0 /*m_rooms.contains( displayName ) */) emit gotProperties( m_rooms[ displayName ] ); else { diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h index 60f55b01..2cb73cbf 100644 --- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h +++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h @@ -61,7 +61,7 @@ class ChatroomManager : public TQObject private: Client * m_client; GroupWise::ChatroomMap m_rooms; - bool m_tqreplace; + bool m_replace; }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp index c91f652d..e7395157 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.cpp +++ b/kopete/protocols/groupwise/libgroupwise/client.cpp @@ -365,10 +365,10 @@ void Client::ct_messageReceived( const ConferenceEvent & messageEvent ) // we can drop these once the server reenables the sending of unformatted text // redundant linebreak at the end of the message TQRegExp rx(" </span> </span> </span><br>$"); - transformedEvent.message.tqreplace( rx, "</span></span></span>" ); + transformedEvent.message.replace( rx, "</span></span></span>" ); // missing linebreak after first line of an encrypted message TQRegExp ry("-----BEGIN PGP MESSAGE----- </span> </span> </span>"); - transformedEvent.message.tqreplace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" ); + transformedEvent.message.replace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" ); emit messageReceived( transformedEvent ); } diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp index 7b071f35..79ecf419 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp @@ -185,7 +185,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef LIBGW_DEBUG - CoreProtocol::debug( TQString( "tqcontains: %1 bytes" ).tqarg( bytes.count() ) ); + CoreProtocol::debug( TQString( "contains: %1 bytes" ).tqarg( bytes.count() ) ); for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); @@ -300,7 +300,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) //debug( " - it's a single string" ); const Field::SingleField *sField = static_cast<const Field::SingleField*>( field ); // TQString encoded = KURL::encode_string( sField->value().toString(), 106 /* UTF-8 */); -// encoded.tqreplace( "%20", "+" ); +// encoded.replace( "%20", "+" ); // dout << encoded.ascii(); snprintf( valString, NMFIELD_MAX_STR_LENGTH, "%s", url_escape_string( sField->value().toString().utf8() ).data() ); diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h index f08e350e..b55ba48e 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h +++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h @@ -58,11 +58,11 @@ public: EventTransfer( const TQ_UINT32 eventType, const TQString & source, TQDateTime timeStamp ); ~EventTransfer(); /** - * Access the bittqmask that describes the transfer's contents. Use @ref Contents to determine what it tqcontains + * Access the bittqmask that describes the transfer's contents. Use @ref Contents to determine what it contains */ TQ_UINT32 contents(); /** - * Convenience accessors to see what the transfer tqcontains + * Convenience accessors to see what the transfer contains */ bool hasEventType(); bool hasSource(); diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp index e2e5269a..8b5f9708 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp @@ -378,7 +378,7 @@ void cs_dump( const TQByteArray &bytes ) { //#define GW_CLIENTSTREAM_DEBUG 1 #ifdef GW_CLIENTSTREAM_DEBUG - CoreProtocol::debug( TQString( "tqcontains: %1 bytes " ).tqarg( bytes.count() ) ); + CoreProtocol::debug( TQString( "contains: %1 bytes " ).tqarg( bytes.count() ) ); uint count = 0; while ( count < bytes.count() ) { diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.cpp b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp index 94f82937..a89f2057 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwfield.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp @@ -36,16 +36,16 @@ FieldList::~FieldList() { } -FieldListIterator FieldList::tqfind( TQCString tag ) +FieldListIterator FieldList::find( TQCString tag ) { FieldListIterator it = begin(); - return tqfind( it, tag ); + return find( it, tag ); } -FieldListIterator FieldList::tqfind( FieldListIterator &it, TQCString tag ) +FieldListIterator FieldList::find( FieldListIterator &it, TQCString tag ) { FieldListIterator theEnd = end(); - //cout << "FieldList::tqfind() looking for " << tag.data() << endl; + //cout << "FieldList::find() looking for " << tag.data() << endl; for ( ; it != theEnd; ++it ) { //cout << " - on " << (*it)->tag().data() << endl; @@ -113,7 +113,7 @@ SingleField * FieldList::findSingleField( TQCString tag ) SingleField * FieldList::findSingleField( FieldListIterator &it, TQCString tag ) { - FieldListIterator found = tqfind( it, tag ); + FieldListIterator found = find( it, tag ); if ( found == end() ) return 0; else @@ -128,7 +128,7 @@ MultiField * FieldList::findMultiField( TQCString tag ) MultiField * FieldList::findMultiField( FieldListIterator &it, TQCString tag ) { - FieldListIterator found = tqfind( it, tag ); + FieldListIterator found = find( it, tag ); if ( found == end() ) return 0; else diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.h b/kopete/protocols/groupwise/libgroupwise/gwfield.h index 6d3cb5a9..4e1b1f94 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwfield.h +++ b/kopete/protocols/groupwise/libgroupwise/gwfield.h @@ -194,18 +194,18 @@ namespace Field */ virtual ~FieldList(); /** - * Locate the first occurrence of a given field in the list. Same semantics as TQValueList::tqfind(). + * Locate the first occurrence of a given field in the list. Same semantics as TQValueList::find(). * @param tag The tag name of the field to search for. * @return An iterator pointing to the first occurrence found, or end() if none was found. */ - FieldListIterator tqfind( TQCString tag ); + FieldListIterator find( TQCString tag ); /** * Locate the first occurrence of a given field in the list, starting at the supplied iterator * @param tag The tag name of the field to search for. * @param it An iterator within the list, to start searching from. * @return An iterator pointing to the first occurrence found, or end() if none was found. */ - FieldListIterator tqfind( FieldListIterator &it, TQCString tag ); + FieldListIterator find( FieldListIterator &it, TQCString tag ); /** * Get the index of the first occurrence of tag, or -1 if not found */ diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp index a887c8cc..4960310a 100644 --- a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp @@ -59,21 +59,21 @@ bool PrivacyManager::isPrivacyLocked() bool PrivacyManager::isBlocked( const TQString & dn ) { if ( m_defaultDeny ) - return !m_allowList.tqcontains( dn ); + return !m_allowList.contains( dn ); else - return m_denyList.tqcontains( dn ); + return m_denyList.contains( dn ); } void PrivacyManager::setAllow( const TQString & dn ) { if ( m_defaultDeny ) { - if ( !m_allowList.tqcontains( dn ) ) + if ( !m_allowList.contains( dn ) ) addAllow( dn ); } else { - if ( m_denyList.tqcontains( dn ) ) + if ( m_denyList.contains( dn ) ) removeDeny( dn ); } } @@ -82,12 +82,12 @@ void PrivacyManager::setDeny( const TQString & dn ) { if ( m_defaultDeny ) { - if ( m_allowList.tqcontains( dn ) ) + if ( m_allowList.contains( dn ) ) removeAllow( dn ); } else { - if ( !m_denyList.tqcontains( dn ) ) + if ( !m_denyList.contains( dn ) ) addDeny( dn ); } } @@ -243,7 +243,7 @@ TQStringList PrivacyManager::difference( const TQStringList & lhs, const TQStrin const TQStringList::ConstIterator rhsEnd = rhs.end(); for ( TQStringList::ConstIterator lhsIt = lhs.begin(); lhsIt != lhsEnd; ++lhsIt ) { - if ( rhs.tqfind( *lhsIt ) == rhsEnd ) + if ( rhs.find( *lhsIt ) == rhsEnd ) diff.append( *lhsIt ); } return diff; diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp index 652cd5f2..c455eaec 100644 --- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp @@ -53,8 +53,8 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) if ( !readGroupWiseLine( headerFirst ) ) return 0; // pull out the HTTP return code - int firstSpace = headerFirst.tqfind( ' ' ); - TQString rtnField = headerFirst.mid( firstSpace, headerFirst.tqfind( ' ', firstSpace + 1 ) ); + int firstSpace = headerFirst.find( ' ' ); + TQString rtnField = headerFirst.mid( firstSpace, headerFirst.find( ' ', firstSpace + 1 ) ); bool ok = true; int rtnCode; int packetState = -1; @@ -116,7 +116,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) int resultCode = 0; Field::FieldListIterator it; Field::FieldListIterator end = m_collatingFields.end(); - it = m_collatingFields.tqfind( NM_A_SZ_TRANSACTION_ID ); + it = m_collatingFields.find( NM_A_SZ_TRANSACTION_ID ); if ( it != end ) { Field::SingleField * sf = dynamic_cast<Field::SingleField*>( *it ); @@ -128,7 +128,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) delete sf; } } - it = m_collatingFields.tqfind( NM_A_SZ_RESULT_CODE ); + it = m_collatingFields.find( NM_A_SZ_RESULT_CODE ); if ( it != end ) { Field::SingleField * sf = dynamic_cast<Field::SingleField*>( *it ); diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc index 35fea9d1..afe7b18e 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.cc +++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc @@ -1732,17 +1732,17 @@ void ParStyle::clearFormatting() TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) { TQString str = _str; - str.tqreplace(TQRegExp("&"), "&"); - str.tqreplace(TQRegExp("<"), "<"); - str.tqreplace(TQRegExp(">"), ">"); - str.tqreplace(TQRegExp("\""), """); - str.tqreplace(TQRegExp("\r"), ""); + str.replace(TQRegExp("&"), "&"); + str.replace(TQRegExp("<"), "<"); + str.replace(TQRegExp(">"), ">"); + str.replace(TQRegExp("\""), """); + str.replace(TQRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.tqreplace(TQRegExp("\n"), "<br>\n"); + str.replace(TQRegExp("\n"), "<br>\n"); break; case quoteXML: - str.tqreplace(TQRegExp("\n"), "<br/>\n"); + str.replace(TQRegExp("\n"), "<br/>\n"); break; default: break; @@ -1759,7 +1759,7 @@ TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) TQString s = " "; for (int i = 1; i < len; i++) s += " "; - str.tqreplace(pos, len, s); + str.replace(pos, len, s); } return str; } diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll index 70d4daa5..7f2f1841 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.ll +++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll @@ -67,17 +67,17 @@ void ParStyle::clearFormatting() QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) { QString str = _str; - str.tqreplace(QRegExp("&"), "&"); - str.tqreplace(QRegExp("<"), "<"); - str.tqreplace(QRegExp(">"), ">"); - str.tqreplace(QRegExp("\""), """); - str.tqreplace(QRegExp("\r"), ""); + str.replace(QRegExp("&"), "&"); + str.replace(QRegExp("<"), "<"); + str.replace(QRegExp(">"), ">"); + str.replace(QRegExp("\""), """); + str.replace(QRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.tqreplace(QRegExp("\n"), "<br>\n"); + str.replace(QRegExp("\n"), "<br>\n"); break; case quoteXML: - str.tqreplace(QRegExp("\n"), "<br/>\n"); + str.replace(QRegExp("\n"), "<br/>\n"); break; default: break; @@ -94,7 +94,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) QString s = " "; for (int i = 1; i < len; i++) s += " "; - str.tqreplace(pos, len, s); + str.replace(pos, len, s); } return str; } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp index 08f04b40..fa28ece0 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp @@ -59,9 +59,9 @@ bool ChatCountsTask::take( Transfer * transfer ) } Field::FieldList counts = resultsArray->fields(); const Field::FieldListIterator end = counts.end(); - for ( Field::FieldListIterator it = counts.tqfind( NM_A_FA_CHAT ); + for ( Field::FieldListIterator it = counts.find( NM_A_FA_CHAT ); it != end; - it = counts.tqfind( ++it, NM_A_FA_CHAT ) ) + it = counts.find( ++it, NM_A_FA_CHAT ) ) { Field::MultiField * mf = static_cast<Field::MultiField *>( *it ); Field::FieldList chat = mf->fields(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp index 8af45d93..6d252a4d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp @@ -40,7 +40,7 @@ bool EventTask::forMe( Transfer * transfer, EventTransfer*& event ) const { // see if we are supposed to handle this kind of event // consider speeding this up by having 1 handler per event - return ( m_eventCodes.tqfind( event->eventType() ) != m_eventCodes.end() ); + return ( m_eventCodes.find( event->eventType() ) != m_eventCodes.end() ); } return false; } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp index 81898ca2..1c8e1d39 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp @@ -72,9 +72,9 @@ bool GetChatSearchResultsTask::take( Transfer * transfer ) } Field::FieldList matches = resultsArray->fields(); const Field::FieldListIterator end = matches.end(); - for ( Field::FieldListIterator it = matches.tqfind( NM_A_FA_CHAT ); + for ( Field::FieldListIterator it = matches.find( NM_A_FA_CHAT ); it != end; - it = matches.tqfind( ++it, NM_A_FA_CHAT ) ) + it = matches.find( ++it, NM_A_FA_CHAT ) ) { Field::MultiField * mf = static_cast<Field::MultiField *>( *it ); Field::FieldList chat = mf->fields(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp index 27a0c7f0..5f2cbe18 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp @@ -58,9 +58,9 @@ bool GetDetailsTask::take( Transfer * transfer ) // parse received details and signal like billio Field::MultiField * container = 0; Field::FieldListIterator end = detailsFields.end(); - for ( Field::FieldListIterator it = detailsFields.tqfind( NM_A_FA_RESULTS ); + for ( Field::FieldListIterator it = detailsFields.find( NM_A_FA_RESULTS ); it != end; - it = detailsFields.tqfind( ++it, NM_A_FA_RESULTS ) ) + it = detailsFields.find( ++it, NM_A_FA_RESULTS ) ) { container = static_cast<Field::MultiField *>( *it ); ContactDetails cd = extractUserDetails( container ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp index 35fab516..d8a4c709 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp @@ -59,9 +59,9 @@ bool JoinChatTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = participants->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); it != end; - it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) + it = contactList.find( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) @@ -83,9 +83,9 @@ bool JoinChatTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = invitees->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); it != end; - it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) + it = contactList.find( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp index 63a57fda..9ab94d0d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp @@ -59,9 +59,9 @@ bool JoinConferenceTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = participants->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); it != end; - it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) + it = contactList.find( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) @@ -85,9 +85,9 @@ bool JoinConferenceTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = invitees->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); it != end; - it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) + it = contactList.find( ++it, NM_A_SZ_DN ) ) { contact = static_cast<Field::SingleField *>( *it ); if ( contact ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp index 2474aaaa..a3a0f556 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp @@ -80,18 +80,18 @@ bool LoginTask::take( Transfer * transfer ) Field::FieldList contactListFields = contactList->fields(); Field::MultiField * container; // read folders - for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_FOLDER ); + for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_FOLDER ); it != contactListFields.end(); - it = contactListFields.tqfind( ++it, NM_A_FA_FOLDER ) ) + it = contactListFields.find( ++it, NM_A_FA_FOLDER ) ) { container = static_cast<Field::MultiField *>( *it ); extractFolder( container ); } // read contacts - for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_CONTACT ); + for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_CONTACT ); it != contactListFields.end(); - it = contactListFields.tqfind( ++it, NM_A_FA_CONTACT ) ) + it = contactListFields.find( ++it, NM_A_FA_CONTACT ) ) { container = static_cast<Field::MultiField *>( *it ); extractContact( container ); @@ -241,12 +241,12 @@ void LoginTask::extractPrivacy( Field::FieldList & fields ) TQStringList denyList; // read blocking // may be a single field or may be an array - Field::FieldListIterator it = fields.tqfind( NM_A_LOCKED_ATTR_LIST ); + Field::FieldListIterator it = fields.find( NM_A_LOCKED_ATTR_LIST ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) ) { - if ( sf->value().toString().tqfind( NM_A_BLOCKING ) ) + if ( sf->value().toString().find( NM_A_BLOCKING ) ) privacyLocked = true; } else if ( Field::MultiField * mf = dynamic_cast<Field::MultiField *>( *it ) ) @@ -284,7 +284,7 @@ TQStringList LoginTask::readPrivacyItems( const TQCString & tag, Field::FieldLis { TQStringList items; - Field::FieldListIterator it = fields.tqfind( tag ); + Field::FieldListIterator it = fields.find( tag ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) ) @@ -308,7 +308,7 @@ TQStringList LoginTask::readPrivacyItems( const TQCString & tag, Field::FieldLis void LoginTask::extractCustomStatuses( Field::FieldList & fields ) { - Field::FieldListIterator it = fields.tqfind( NM_A_FA_CUSTOM_STATUSES ); + Field::FieldListIterator it = fields.find( NM_A_FA_CUSTOM_STATUSES ); if ( it != fields.end() ) { if ( Field::MultiField * mf = dynamic_cast<Field::MultiField *>( *it ) ) @@ -342,7 +342,7 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields ) void LoginTask::extractKeepalivePeriod( Field::FieldList & fields ) { - Field::FieldListIterator it = fields.tqfind( NM_A_UD_KEEPALIVE ); + Field::FieldListIterator it = fields.find( NM_A_UD_KEEPALIVE ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast<Field::SingleField *>( *it ) ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp index 1cc33e75..3fadb5a5 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp @@ -69,9 +69,9 @@ bool PollSearchResultsTask::take( Transfer * transfer ) } Field::FieldList matches = resultsArray->fields(); const Field::FieldListIterator end = matches.end(); - for ( Field::FieldListIterator it = matches.tqfind( NM_A_FA_CONTACT ); + for ( Field::FieldListIterator it = matches.find( NM_A_FA_CONTACT ); it != end; - it = matches.tqfind( ++it, NM_A_FA_CONTACT ) ) + it = matches.find( ++it, NM_A_FA_CONTACT ) ) { Field::MultiField * mf = static_cast<Field::MultiField *>( *it ); Field::FieldList contact = mf->fields(); @@ -79,7 +79,7 @@ bool PollSearchResultsTask::take( Transfer * transfer ) m_results.append( cd ); } - // first field: NM_A_SZ_STATUS tqcontains + // first field: NM_A_SZ_STATUS contains #define SEARCH_PENDING 0 #define SEARCH_INPROGRESS 1 #define SEARCH_COMPLETED 2 diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp index 69cd1991..0eb61409 100644 --- a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp @@ -11,12 +11,12 @@ int main() { buildFakeContactList(); // look for a field in the list -/* if ( fl.tqfind( NM_A_FA_MESSAGE ) != fl.end() ) +/* if ( fl.find( NM_A_FA_MESSAGE ) != fl.end() ) printf( "Found a field, where there was supposed to be one :)\n" ); else printf( "Didn't find a field, where there was supposed to be one :(\n" ); Field::FieldListIterator it; - if ( (it = fl.tqfind( NM_A_SZ_OBJECT_ID ) ) != fl.end() ) + if ( (it = fl.find( NM_A_SZ_OBJECT_ID ) ) != fl.end() ) printf( "Found a field, where there was NOT supposed to be one :(\n" ); else printf( "Didn't find a field, where there wasn't supposed to be one :)\n" );*/ @@ -26,19 +26,19 @@ int main() printf( "\nNow testing find routines.\n"); // find the field containing the contact list - Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.tqfind( NM_A_FA_CONTACT_LIST ) ) ); + Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.find( NM_A_FA_CONTACT_LIST ) ) ); if ( clf ) { Field::FieldList cl = clf->fields(); // look for a folder in the list - Field::FieldListIterator it = cl.tqfind( NM_A_FA_FOLDER ); + Field::FieldListIterator it = cl.find( NM_A_FA_FOLDER ); if ( it != cl.end() ) printf( "Found the first folder :)\n"); else printf( "Didn't find the first folder, where did it go? :(\n"); printf( "Looking for a second folder :)\n"); - it = cl.tqfind( ++it, NM_A_FA_FOLDER ); + it = cl.find( ++it, NM_A_FA_FOLDER ); if ( it == cl.end() ) printf( "Didn't find a second folder :)\n" ); else diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp index 315a60d0..c10fda5c 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp @@ -41,8 +41,8 @@ bool UserDetailsManager::known( const TQString & dn ) { if ( dn == m_client->userDN() ) return true; - // TODO: replace with m_detailsMap.tqcontains( dn ); - TQStringList::Iterator found = m_detailsMap.keys().tqfind( dn ); + // TODO: replace with m_detailsMap.contains( dn ); + TQStringList::Iterator found = m_detailsMap.keys().find( dn ); // we always know the local user's details, so don't look them up return ( found !=m_detailsMap.keys().end() ); } @@ -85,7 +85,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU // don't request details we already have unless the caller specified this if ( onlyUnknown && known( *it ) ) break; - TQStringList::Iterator found = m_pendingDNs.tqfind( *it ); + TQStringList::Iterator found = m_pendingDNs.find( *it ); if ( found == m_pendingDNs.end() ) { m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).tqarg( (*it) ) ); diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui index 508f4015..e6c6a2f6 100644 --- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui +++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui @@ -84,7 +84,7 @@ <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> - <string>tqcontains</string> + <string>contains</string> </property> </item> <item> @@ -104,7 +104,7 @@ <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> - <string>tqcontains</string> + <string>contains</string> </property> </item> <item> @@ -129,7 +129,7 @@ <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> - <string>tqcontains</string> + <string>contains</string> </property> </item> <item> @@ -168,7 +168,7 @@ <widget class="TQComboBox" row="4" column="1"> <item> <property name="text"> - <string>tqcontains</string> + <string>contains</string> </property> </item> <item> @@ -209,7 +209,7 @@ <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> - <string>tqcontains</string> + <string>contains</string> </property> </item> <item> diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index 1835bb4b..45121c34 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -329,7 +329,7 @@ void IRCChannelContact::slotIncomingUserIsAway( const TQString &nick, const TQSt if( nick.lower() == account->mySelf()->nickName().lower() ) { IRCUserContact *c = account->mySelf(); - if (manager() && manager()->members().tqcontains(c)) + if (manager() && manager()->members().contains(c)) { Kopete::OnlineStatus status = manager()->contactOnlineStatus(c); if (status == m_protocol->m_UserStatusOp) diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp index 93888b55..7df5894c 100644 --- a/kopete/protocols/irc/irccontact.cpp +++ b/kopete/protocols/irc/irccontact.cpp @@ -229,7 +229,7 @@ void IRCContact::slotSendMsg(Kopete::Message &message, Kopete::ChatSession *) // Two-liner in color: // <span style="color:#403897">Hello<br />World</span> - if (htmlString.tqfind(TQString::tqfromLatin1("</span")) > -1) + if (htmlString.find(TQString::tqfromLatin1("</span")) > -1) { TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") ); findTags.setMinimal( true ); @@ -363,7 +363,7 @@ bool IRCContact::isChatting(const Kopete::ChatSession *avoid) const for (TQValueList<Kopete::ChatSession*>::Iterator it= sessions.begin(); it!=sessions.end() ; ++it) { if( (*it) != avoid && (*it)->account() == account && - (*it)->members().tqcontains(this) ) + (*it)->members().contains(this) ) { return true; } @@ -413,7 +413,7 @@ void IRCContact::receivedMessage( KIRC::Engine::ServerMessageType type, const KIRC::EntityPtrList &to, const TQString &msg) { - if (to.tqcontains(m_entity)) + if (to.contains(m_entity)) { IRCContact *fromContact = ircAccount()->getContact(from); Kopete::Message message(fromContact, manager()->members(), msg, Kopete::Message::Inbound, diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp index f304a2ed..fb49e08e 100644 --- a/kopete/protocols/irc/irccontactmanager.cpp +++ b/kopete/protocols/irc/irccontactmanager.cpp @@ -260,7 +260,7 @@ void IRCContactManager::slotContactAdded( Kopete::MetaContact *contact ) void IRCContactManager::addToNotifyList(const TQString &nick) { - if (!m_NotifyList.tqcontains(nick.lower())) + if (!m_NotifyList.contains(nick.lower())) { m_NotifyList.append(nick); checkOnlineNotifyList(); @@ -269,7 +269,7 @@ void IRCContactManager::addToNotifyList(const TQString &nick) void IRCContactManager::removeFromNotifyList(const TQString &nick) { - if (m_NotifyList.tqcontains(nick.lower())) + if (m_NotifyList.contains(nick.lower())) m_NotifyList.remove(nick.lower()); } diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index a3182a14..e30bfa90 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -376,7 +376,7 @@ void IRCProtocol::slotMessageFilter( Kopete::Message &msg ) TQString messageText = msg.escapedBody(); //Add right click for channels, only replace text not in HTML tags - messageText.tqreplace( TQRegExp( TQString::tqfromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::tqfromLatin1("<span class=\"KopeteLink\" type=\"IRCChannel\">\\1</span>") ); + messageText.replace( TQRegExp( TQString::tqfromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::tqfromLatin1("<span class=\"KopeteLink\" type=\"IRCChannel\">\\1</span>") ); msg.setBody( messageText, Kopete::Message::RichText ); } @@ -807,7 +807,7 @@ void IRCProtocol::editNetworks( const TQString &networkName ) connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); if( !networkName.isEmpty() ) - netConf->networkList->setSelected( netConf->networkList->tqfindItem( networkName ), true ); + netConf->networkList->setSelected( netConf->networkList->findItem( networkName ), true ); //slotUpdateNetworkConfig(); // unnecessary, setSelected emits selectionChanged @@ -952,7 +952,7 @@ void IRCProtocol::slotDeleteHost() { disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port); - TQListBoxItem * justAdded = netConf->hostList->tqfindItem( entryText ); + TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); netConf->hostList->removeItem( netConf->hostList->index( justAdded ) ); connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); @@ -972,13 +972,13 @@ void IRCProtocol::slotNewNetwork() IRCNetwork *net = new IRCNetwork; // give it the name of 'New Network' (incrementing number if needed) TQString netName = TQString::tqfromLatin1( "New Network" ); - if ( m_networks.tqfind( netName ) ) + if ( m_networks.find( netName ) ) { int newIdx = 1; do { netName = TQString::tqfromLatin1( "New Network #%1" ).tqarg( newIdx++ ); } - while ( m_networks.tqfind( netName ) && newIdx < 100 ); + while ( m_networks.find( netName ) && newIdx < 100 ); if ( newIdx == 100 ) // pathological case return; } @@ -986,7 +986,7 @@ void IRCProtocol::slotNewNetwork() // and add it to the networks dict and list m_networks.insert( net->name, net ); netConf->networkList->insertItem( net->name ); - TQListBoxItem * justAdded = netConf->networkList->tqfindItem( net->name ); + TQListBoxItem * justAdded = netConf->networkList->findItem( net->name ); netConf->networkList->setSelected( justAdded, true ); netConf->networkList->setBottomItem( netConf->networkList->index( justAdded ) ); } @@ -1022,7 +1022,7 @@ void IRCProtocol::slotNewHost() TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port); netConf->hostList->insertItem( entryText ); // select it in the gui - TQListBoxItem * justAdded = netConf->hostList->tqfindItem( entryText ); + TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); netConf->hostList->setSelected( justAdded, true ); //netConf->hostList->setBottomItem( netConf->hostList->index( justAdded ) ); } @@ -1056,7 +1056,7 @@ void IRCProtocol::slotRenameNetwork() m_networks.remove( m_uiCurrentNetworkSelection ); m_networks.insert( net->name, net ); // ui - int idx = netConf->networkList->index( netConf->networkList->tqfindItem( m_uiCurrentNetworkSelection ) ); + int idx = netConf->networkList->index( netConf->networkList->findItem( m_uiCurrentNetworkSelection ) ); m_uiCurrentNetworkSelection = net->name; netConf->networkList->changeItem( net->name, idx ); // changes the selection!!! netConf->networkList->sort(); @@ -1190,7 +1190,7 @@ void IRCProtocol::slotMoveServerUp() if( !selectedNetwork || !selectedHost ) return; - TQValueList<IRCHost*>::iterator pos = selectedNetwork->hosts.tqfind( selectedHost ); + TQValueList<IRCHost*>::iterator pos = selectedNetwork->hosts.find( selectedHost ); if( pos != selectedNetwork->hosts.begin() ) { TQValueList<IRCHost*>::iterator lastPos = pos; @@ -1217,7 +1217,7 @@ void IRCProtocol::slotMoveServerDown() if( !selectedNetwork || !selectedHost ) return; - TQValueList<IRCHost*>::iterator pos = selectedNetwork->hosts.tqfind( selectedHost ); + TQValueList<IRCHost*>::iterator pos = selectedNetwork->hosts.find( selectedHost ); if( *pos != selectedNetwork->hosts.back() ) { TQValueList<IRCHost*>::iterator nextPos = selectedNetwork->hosts.remove( pos ); diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp index 3200d72d..9188963f 100644 --- a/kopete/protocols/irc/ircservercontact.cpp +++ b/kopete/protocols/irc/ircservercontact.cpp @@ -154,7 +154,7 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString // :Global!service@rizon.net NOTICE foobar :[Logon News - Oct 12 2005] Due to growing problems ... // :somenick!~fooobar@somehostname.fi NOTICE foobar :hello - if (orig.tqcontains('!')) { + if (orig.contains('!')) { ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").tqarg( orig.section('!', 0, 0), orig.section('!', 1, 1), diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index 2c039e94..bec7c4b7 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -504,7 +504,7 @@ void IRCUserContact::updateInfo() void IRCUserContact::newWhoReply( const TQString &channel, const TQString &user, const TQString &host, const TQString &server, bool away, const TQString &flags, uint hops, const TQString &realName ) { - if( !mInfo.channels.tqcontains( channel ) ) + if( !mInfo.channels.contains( channel ) ) mInfo.channels.append( channel ); mInfo.userName = user; diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 7bd9bfe8..88306027 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -70,7 +70,7 @@ TQStringList KCodecAction::supportedEncodings(bool usAscii) { TQTextCodec *codec = KGlobal::charsets()->codecForName(*it); TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it); - if (mimeNames.tqfind(mimeName) == mimeNames.end()) + if (mimeNames.find(mimeName) == mimeNames.end()) { encodings.append(KGlobal::charsets()->languageForEncoding(*it) + " ( " + mimeName + " )"); diff --git a/kopete/protocols/irc/ksparser.cpp b/kopete/protocols/irc/ksparser.cpp index ea7e72cd..79ff605e 100644 --- a/kopete/protocols/irc/ksparser.cpp +++ b/kopete/protocols/irc/ksparser.cpp @@ -178,10 +178,10 @@ TQString KSParser::pushTag(const TQString &tag, const TQString &attributes) { TQString res; m_tags.push(tag); - if(!m_attributes.tqcontains(tag)) + if(!m_attributes.contains(tag)) m_attributes.insert(tag, attributes); else if(!attributes.isEmpty()) - m_attributes.tqreplace(tag, attributes); + m_attributes.replace(tag, attributes); res.append("<" + tag); if(!m_attributes[tag].isEmpty()) res.append(" " + m_attributes[tag]); @@ -205,7 +205,7 @@ TQString KSParser::pushColorTag(const TQColor &fgColor, const TQColor &bgColor) TQString KSParser::popTag(const TQString &tag) { - if (!m_tags.tqcontains(tag)) + if (!m_tags.contains(tag)) return TQString(); TQString res; @@ -224,7 +224,7 @@ TQString KSParser::popTag(const TQString &tag) TQString KSParser::toggleTag(const TQString &tag) { - return m_attributes.tqcontains(tag)?popTag(tag):pushTag(tag); + return m_attributes.contains(tag)?popTag(tag):pushTag(tag); } TQString KSParser::popAll() diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index 167d7a22..786b4594 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -277,7 +277,7 @@ bool Engine::_bind(TQDict<KIRC::MessageRedirector> &dict, if (!mr) { mr = new MessageRedirector(this, minArgs, maxArgs, helpMessage); - dict.tqreplace(command, mr); + dict.replace(command, mr); } return mr->connect(object, member); diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h index e086afc1..ac3fb00c 100644 --- a/kopete/protocols/irc/libkirc/kircengine.h +++ b/kopete/protocols/irc/libkirc/kircengine.h @@ -175,7 +175,7 @@ public: { return m_status == Connected; } inline void setCodec( const TQString &nick, const TQTextCodec *codec ) - { codecs.tqreplace( nick, codec ); } + { codecs.replace( nick, codec ); } /* Custom CTCP replies handling */ inline TQString &customCtcp( const TQString &s ) diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp index 83a4257c..05477710 100644 --- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp @@ -143,8 +143,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName, { TQFileInfo file(fileName); TQString noWhiteSpace = file.fileName(); - if (noWhiteSpace.tqcontains(' ') > 0) - noWhiteSpace.tqreplace(TQRegExp("\\s+"), "_"); + if (noWhiteSpace.contains(' ') > 0) + noWhiteSpace.replace(TQRegExp("\\s+"), "_"); TransferServer *server = TransferHandler::self()->createServer(this, nickname, type, fileName, file.size()); @@ -284,7 +284,7 @@ void Engine::CtcpReply_ping(Message &msg) if (difference < 1) { diffString = TQString::number(difference); - diffString.remove((diffString.tqfind('.') -1), 2); + diffString.remove((diffString.find('.') -1), 2); diffString.truncate(3); diffString.append("milliseconds"); } @@ -293,7 +293,7 @@ void Engine::CtcpReply_ping(Message &msg) diffString = TQString::number(difference); TQString seconds = diffString.section('.', 0, 0); TQString millSec = diffString.section('.', 1, 1); - millSec.remove(millSec.tqfind('.'), 1); + millSec.remove(millSec.find('.'), 1); millSec.truncate(3); diffString = TQString::tqfromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec); } diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp index 0c1d3ef0..6f45b0c1 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.cpp +++ b/kopete/protocols/irc/libkirc/kircmessage.cpp @@ -201,10 +201,10 @@ TQString Message::quote(const TQString &str) { TQString tmp = str; TQChar q('\020'); - tmp.tqreplace(q, q+TQString(q)); - tmp.tqreplace(TQChar('\r'), q+TQString::tqfromLatin1("r")); - tmp.tqreplace(TQChar('\n'), q+TQString::tqfromLatin1("n")); - tmp.tqreplace(TQChar('\0'), q+TQString::tqfromLatin1("0")); + tmp.replace(q, q+TQString(q)); + tmp.replace(TQChar('\r'), q+TQString::tqfromLatin1("r")); + tmp.replace(TQChar('\n'), q+TQString::tqfromLatin1("n")); + tmp.replace(TQChar('\0'), q+TQString::tqfromLatin1("0")); return tmp; } @@ -216,13 +216,13 @@ TQString Message::unquote(const TQString &str) char b[3] = { 020, 020, '\0' }; const char b2[2] = { 020, '\0' }; - tmp.tqreplace( b, b2 ); + tmp.replace( b, b2 ); b[1] = 'r'; - tmp.tqreplace( b, "\r"); + tmp.replace( b, "\r"); b[1] = 'n'; - tmp.tqreplace( b, "\n"); + tmp.replace( b, "\n"); b[1] = '0'; - tmp.tqreplace( b, "\0"); + tmp.replace( b, "\0"); return tmp; } @@ -230,16 +230,16 @@ TQString Message::unquote(const TQString &str) TQString Message::ctcpQuote(const TQString &str) { TQString tmp = str; - tmp.tqreplace( TQChar('\\'), TQString::tqfromLatin1("\\\\")); - tmp.tqreplace( (char)1, TQString::tqfromLatin1("\\1")); + tmp.replace( TQChar('\\'), TQString::tqfromLatin1("\\\\")); + tmp.replace( (char)1, TQString::tqfromLatin1("\\1")); return tmp; } TQString Message::ctcpUnquote(const TQString &str) { TQString tmp = str; - tmp.tqreplace("\\\\", "\\"); - tmp.tqreplace("\\1", "\1" ); + tmp.replace("\\\\", "\\"); + tmp.replace("\\1", "\1" ); return tmp; } @@ -276,7 +276,7 @@ bool Message::matchForIRCRegExp(TQRegExp ®exp, const TQTextCodec *codec, cons msg.m_ctcpMessage = new Message(); msg.m_ctcpMessage->m_raw = codec->fromUnicode(ctcpUnquote(msg.m_ctcpRaw)); - int space = ctcpRaw.tqfind(' '); + int space = ctcpRaw.find(' '); if (!matchForIRCRegExp(msg.m_ctcpMessage->m_raw, codec, *msg.m_ctcpMessage)) { TQCString command; diff --git a/kopete/protocols/irc/libkirc/kircmessage.h b/kopete/protocols/irc/libkirc/kircmessage.h index 80dcfa79..fb38a476 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.h +++ b/kopete/protocols/irc/libkirc/kircmessage.h @@ -112,7 +112,7 @@ public: inline const TQString &command() const { return m_command; } - /** \brief The number of command arguments this message tqcontains. + /** \brief The number of command arguments this message contains. */ inline size_t argsSize() const { return m_args.size(); } diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index f14f1a3e..4dcf9ce8 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -206,12 +206,12 @@ void KSSLSocket::setMetaData( const TQString &key, const TQVariant &data ) bool KSSLSocket::hasMetaData( const TQString &key ) { - return d->metaData.tqcontains(key); + return d->metaData.contains(key); } TQString KSSLSocket::metaData( const TQString &key ) { - if( d->metaData.tqcontains(key) ) + if( d->metaData.contains(key) ) return d->metaData[key]; return TQString(); } diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index e4e574bc..2d5e0b13 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -315,7 +315,7 @@ void ChannelList::slotChannelListed( const TQString &channel, uint users, const void ChannelList::checkSearchResult( const TQString &channel, uint users, const TQString &topic ) { if( ( mUsers == 0 || mUsers <= users ) && - ( mSearch.isEmpty() || channel.tqcontains( mSearch, false ) || topic.tqcontains( mSearch, false ) ) + ( mSearch.isEmpty() || channel.contains( mSearch, false ) || topic.contains( mSearch, false ) ) ) { new ChannelListItem( mChannelList, channel, TQString::number(users), topic ); diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index a380d3c4..2ee8423e 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -164,7 +164,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) // find all groups our contact is in but that are not in the server side roster for ( unsigned i = 0; i < metaContact()->groups().count (); i++ ) { - if ( item.groups().tqfind ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () ) + if ( item.groups().find ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () ) groupsToRemoveFrom.append ( metaContact()->groups().at ( i ) ); } @@ -193,7 +193,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) * risk removing the contact from the visible contact list. In this * case, we need to make sure at least the top level group stays. */ - if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.tqcontains ( Kopete::Group::topLevel () ) ) ) + if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.contains ( Kopete::Group::topLevel () ) ) ) { groupsToRemoveFrom.remove ( Kopete::Group::topLevel () ); } @@ -630,7 +630,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard ) TQImage contactPhoto; TQString fullJid = mRosterItem.jid().full(); - TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.tqreplace(TQRegExp("[./~]"),"-") +".png"); + TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.replace(TQRegExp("[./~]"),"-") +".png"); // photo() is a TQByteArray if ( !vCard.photo().isEmpty() ) diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index 39011f81..5b69d489 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -96,7 +96,7 @@ void JabberBookmarks::slotReceivedBookmarks( ) void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid) { - if(m_conferencesJID.tqcontains(jid.full()) || !m_account->isConnected()) + if(m_conferencesJID.contains(jid.full()) || !m_account->isConnected()) { return; } diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index eb5efabf..6161099e 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -117,7 +117,7 @@ TQStringList JabberCapabilitiesManager::CapabilitiesInformation::jids() const for( ; it != itEnd; ++it) { TQString jid( (*it).first ); - if( !jids.tqcontains(jid) ) + if( !jids.contains(jid) ) jids.push_back(jid); } @@ -163,7 +163,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::addJid(const Jid& jid, { TQPair<TQString,JabberAccount*> jidAccountPair(jid.full(),account); - if( !m_jids.tqcontains(jidAccountPair) ) + if( !m_jids.contains(jidAccountPair) ) { m_jids.push_back(jidAccountPair); updateLastSeen(); @@ -172,7 +172,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::addJid(const Jid& jid, void JabberCapabilitiesManager::CapabilitiesInformation::removeJid(const Jid& jid) { - kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Unregistering " << TQString(jid.full()).tqreplace('%',"%%") << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Unregistering " << TQString(jid.full()).replace('%',"%%") << endl; TQValueList<TQPair<TQString,JabberAccount*> >::Iterator it = m_jids.begin(); while( it != m_jids.end() ) @@ -400,7 +400,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const { if( !d->capabilitiesInformationMap[*newCapsIt].discovered() && d->capabilitiesInformationMap[*newCapsIt].pendingRequests() == 0 ) { - kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(node + "#" + (*newCapsIt).extensions()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node + "#" + (*newCapsIt).extensions()) << endl; d->capabilitiesInformationMap[*newCapsIt].setPendingRequests(1); requestDiscoInfo(account, jid, node + "#" + (*newCapsIt).extensions()); @@ -410,7 +410,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const else { // Remove all caps specifications - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(node).tqarg(version) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node).tqarg(version) << endl; d->jidCapabilitiesMap.remove( jid.full() ); } @@ -448,7 +448,7 @@ void JabberCapabilitiesManager::discoRequestFinished() DiscoItem item = discoInfo->item(); Jid jid = discoInfo->jid(); - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(discoInfo->node()).tqarg(discoInfo->success()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(discoInfo->node()).tqarg(discoInfo->success()) << endl; TQStringList tokens = TQStringList::split("#",discoInfo->node()); @@ -486,7 +486,7 @@ void JabberCapabilitiesManager::discoRequestFinished() TQPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->tqparent()); if( jidAccountPair.second ) { - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).tqreplace('%',"%%")) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl; requestDiscoInfo( jidAccountPair.second, jidAccountPair.first, discoInfo->node() ); } else @@ -563,7 +563,7 @@ void JabberCapabilitiesManager::loadCachedInformation() bool JabberCapabilitiesManager::capabilitiesEnabled(const Jid &jid) const { - return d->jidCapabilitiesMap.tqcontains( jid.full() ); + return d->jidCapabilitiesMap.contains( jid.full() ); } XMPP::Features JabberCapabilitiesManager::features(const Jid& jid) const @@ -599,7 +599,7 @@ TQString JabberCapabilitiesManager::clientName(const Jid& jid) const if (name.startsWith("www.")) name = name.right(name.length() - 4); - int cut_pos = name.tqfind("."); + int cut_pos = name.find("."); if (cut_pos != -1) { name = name.left(cut_pos); } diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index 60c109ae..d10f4201 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -253,7 +253,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat jabberMessage.setSubject ( message.subject () ); jabberMessage.setTimeStamp ( message.timestamp () ); - if ( message.plainBody().tqfind ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) + if ( message.plainBody().find ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) { /* * This message is encrypted, so we need to set @@ -270,7 +270,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat // remove PGP header and footer from message encryptedBody.truncate ( encryptedBody.length () - TQString("-----END PGP MESSAGE-----").length () - 2 ); - encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.tqfind ( "\n\n" ) - 2 ); + encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.find ( "\n\n" ) - 2 ); // assign payload to message jabberMessage.setXEncrypted ( encryptedBody ); @@ -286,16 +286,16 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat { TQString xhtmlBody = message.escapedBody(); - // According to JEP-0071 8.9 it is only RECOMMANDED to tqreplace \n with <br/> + // According to JEP-0071 8.9 it is only RECOMMANDED to replace \n with <br/> // which mean that some implementation (gaim 2 beta) may still think that \n are linebreak. // and considered the fact that KTextEditor generate a well indented XHTML, we need to remove all \n from it // see Bug 121627 // Anyway, theses client that do like that are *WRONG* considreded the example of jep-71 where there are lot of // linebreak that are not interpreted. - Olivier 2006-31-03 - xhtmlBody.tqreplace("\n",""); + xhtmlBody.replace("\n",""); // is not a valid XML entity - xhtmlBody.tqreplace(" " , " "); + xhtmlBody.replace(" " , " "); // Remove trailing line break xhtmlBody.remove( TQRegExp( "<br/>$" ) ); @@ -358,4 +358,4 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat #include "jabberchatsession.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; tqreplace-tabs off; space-indent off; +// kate: tab-width 4; replace-tabs off; space-indent off; diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp index 99a768fc..cf37ffd8 100644 --- a/kopete/protocols/jabber/jabberclient.cpp +++ b/kopete/protocols/jabber/jabberclient.cpp @@ -272,7 +272,7 @@ void JabberClient::addS5BServerAddress ( const TQString &address ) // now filter the list without dupes for ( TQStringList::Iterator it = d->s5bAddressList.begin (); it != d->s5bAddressList.end (); ++it ) { - if ( !newList.tqcontains ( *it ) ) + if ( !newList.contains ( *it ) ) newList.append ( *it ); } @@ -284,7 +284,7 @@ void JabberClient::removeS5BServerAddress ( const TQString &address ) { TQStringList newList; - TQStringList::iterator it = d->s5bAddressList.tqfind ( address ); + TQStringList::iterator it = d->s5bAddressList.find ( address ); if ( it != d->s5bAddressList.end () ) { d->s5bAddressList.remove ( it ); @@ -300,7 +300,7 @@ void JabberClient::removeS5BServerAddress ( const TQString &address ) // now filter the list without dupes for ( TQStringList::Iterator it = d->s5bAddressList.begin (); it != d->s5bAddressList.end (); ++it ) { - if ( !newList.tqcontains ( *it ) ) + if ( !newList.contains ( *it ) ) newList.append ( *it ); } @@ -859,8 +859,8 @@ void JabberClient::slotPsiDebug ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); - msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); + msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); + msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); emit debugMessage ( "Psi: " + msg ); @@ -870,8 +870,8 @@ void JabberClient::slotIncomingXML ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); - msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); + msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); + msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); emit debugMessage ( "XML IN: " + msg ); @@ -881,8 +881,8 @@ void JabberClient::slotOutgoingXML ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.tqreplace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); - msg = msg.tqreplace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); + msg = msg.replace( TQRegExp( "<password>[^<]*</password>\n" ), "<password>[Filtered]</password>\n" ); + msg = msg.replace( TQRegExp( "<digest>[^<]*</digest>\n" ), "<digest>[Filtered]</digest>\n" ); emit debugMessage ( "XML OUT: " + msg ); diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index f873387f..c6147ae1 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -213,7 +213,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions () * and the resources' respective status icons for the rest. */ TQIconSet iconSet ( !i ? - protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.tqfind(*it) ).iconFor ( account () )); + protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () )); actionSelectResource->insert ( new KAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ), actionSelectResource, TQString::number( i ).latin1() ) ); @@ -795,7 +795,7 @@ void JabberContact::slotChatSessionDeleted ( TQObject *sender ) JabberChatSession *manager = static_cast<JabberChatSession *>(sender); - mManagers.remove ( mManagers.tqfind ( manager ) ); + mManagers.remove ( mManagers.find ( manager ) ); } diff --git a/kopete/protocols/jabber/jabbercontactpool.cpp b/kopete/protocols/jabber/jabbercontactpool.cpp index 369cb9d9..43724d28 100644 --- a/kopete/protocols/jabber/jabbercontactpool.cpp +++ b/kopete/protocols/jabber/jabbercontactpool.cpp @@ -93,7 +93,7 @@ JabberContact *JabberContactPool::addContact ( const XMPP::RosterItem &contact, JabberTransport *transport=0l; TQString legacyId; //find if the contact should be added to a transport. - if(mAccount->transports().tqcontains(contact.jid().domain())) + if(mAccount->transports().contains(contact.jid().domain())) { transport=mAccount->transports()[contact.jid().domain()]; legacyId=transport->legacyId( contact.jid() ); @@ -222,7 +222,7 @@ void JabberContactPool::slotContactDestroyed ( Kopete::Contact *contact ) else { //this is a legacy contact. we have no way to get the real Jid at this point, we can only guess it. - TQString contactId= contact->contactId().tqreplace('@','%') + "@" + contact->account()->myself()->contactId(); + TQString contactId= contact->contactId().replace('@','%') + "@" + contact->account()->myself()->contactId(); mAccount->resourcePool()->removeAllResources ( XMPP::Jid ( contactId ) ) ; } diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp index ff5ae32c..f536a1c9 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp +++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp @@ -89,7 +89,7 @@ void JabberGroupChatManager::slotMessageSent ( Kopete::Message &message, Kopete: jabberMessage.setSubject ( message.subject () ); jabberMessage.setTimeStamp ( message.timestamp () ); - if ( message.plainBody().tqfind ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) + if ( message.plainBody().find ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) { /* * This message is encrypted, so we need to set @@ -106,7 +106,7 @@ void JabberGroupChatManager::slotMessageSent ( Kopete::Message &message, Kopete: // remove PGP header and footer from message encryptedBody.truncate ( encryptedBody.length () - TQString("-----END PGP MESSAGE-----").length () - 2 ); - encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.tqfind ( "\n\n" ) - 2 ); + encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.find ( "\n\n" ) - 2 ); // assign payload to message jabberMessage.setXEncrypted ( encryptedBody ); diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index c88b8841..87b797c3 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -185,7 +185,7 @@ Kopete::Account *JabberProtocol::createNewAccount (const TQString & accountId) if( Kopete::AccountManager::self()->findAccount( pluginId() , accountId ) ) return 0L; //the account may already exist if greated just above - int slash=accountId.tqfind('/'); + int slash=accountId.find('/'); if(slash>=0) { TQString realAccountId=accountId.left(slash); diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index 8bd9a915..218c9aae 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -298,7 +298,7 @@ TQString JabberTransport::legacyId( const XMPP::Jid & jid ) if(jid.node().isEmpty()) return TQString(); TQString node = jid.node(); - return node.tqreplace("%","@"); + return node.replace("%","@"); } void JabberTransport::jabberAccountRemoved( ) diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index 344071c6..594be2d4 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -123,8 +123,8 @@ void JingleClientSlots::callDestroyed(cricket::Call *call) void JingleClientSlots::sendStanza(cricket::SessionClient*, const buzz::XmlElement *stanza) { TQString st(stanza->Str().c_str()); - st.tqreplace("cli:iq","iq"); - st.tqreplace(":cli=","="); + st.replace("cli:iq","iq"); + st.replace(":cli=","="); fprintf(stderr,"bling\n"); voiceCaller_->sendStanza(st.latin1()); fprintf(stderr,"blong\n"); @@ -266,7 +266,7 @@ JingleVoiceCaller::~JingleVoiceCaller() bool JingleVoiceCaller::calling(const Jid& jid) { - return calls_.tqcontains(jid.full()); + return calls_.contains(jid.full()); } void JingleVoiceCaller::call(const Jid& jid) @@ -316,7 +316,7 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call) { qDebug("jinglevoicecaller.cpp: Registering call\n"); kdDebug(14000) << k_funcinfo << jid.full() << endl; - if (!calls_.tqcontains(jid.full())) { + if (!calls_.contains(jid.full())) { calls_[jid.full()] = call; } // else { @@ -340,7 +340,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza) if (doc.documentElement().tagName() == "presence") { Jid from = Jid(doc.documentElement().attribute("from")); TQString type = doc.documentElement().attribute("type"); - if (type == "unavailable" && calls_.tqcontains(from.full())) { + if (type == "unavailable" && calls_.contains(from.full())) { qDebug("JingleVoiceCaller: User went offline without closing a call."); removeCall(from); emit terminated(from); diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index 3f3bd6ca..0225b177 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -93,7 +93,7 @@ public: XMPP::Jid jid(session->remote_address().c_str()); // Do nothing if the session do not contain a peers. - //if( !voiceSession->peers().tqcontains(jid) ) + //if( !voiceSession->peers().contains(jid) ) if( !hasPeer(voiceSession->peers(), jid) ) return; @@ -142,8 +142,8 @@ public: void OnSendingStanza(cricket::SessionClient*, const buzz::XmlElement *buzzStanza) { TQString irisStanza(buzzStanza->Str().c_str()); - irisStanza.tqreplace("cli:iq","iq"); - irisStanza.tqreplace(":cli=","="); + irisStanza.replace("cli:iq","iq"); + irisStanza.replace(":cli=","="); voiceSession->sendStanza(irisStanza); } diff --git a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro index 8482614c..53c8e293 100644 --- a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro +++ b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro @@ -88,7 +88,7 @@ SOURCES += \ $$JINGLE_CPP/talk/session/phone/linphonemediaengine.cc \ $$JINGLE_CPP/talk/session/phone/voicechannel.cc -#tqcontains(DEFINES, HAVE_PORTAUDIO) { +#contains(DEFINES, HAVE_PORTAUDIO) { # SOURCES += \ # $$JINGLE_CPP/talk/session/phone/portaudiomediaengine.cc #} @@ -128,11 +128,11 @@ SOURCES += \ $$JINGLE_CPP/talk/third_party/mediastreamer/mswrite.c \ $$JINGLE_CPP/talk/third_party/mediastreamer/sndcard.c -tqcontains(DEFINES, HAVE_ALSA_ASOUNDLIB_H) { +contains(DEFINES, HAVE_ALSA_ASOUNDLIB_H) { SOURCES += $$JINGLE_CPP/talk/third_party/mediastreamer/alsacard.c } -tqcontains(DEFINES, HAVE_PORTAUDIO) { +contains(DEFINES, HAVE_PORTAUDIO) { SOURCES += $$JINGLE_CPP/talk/third_party/mediastreamer/portaudiocard.c } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc index 38e22c2e..f10489f7 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc @@ -66,7 +66,7 @@ void MessageQueueManager::Add(MessageQueue *message_queue) { void MessageQueueManager::Remove(MessageQueue *message_queue) { CritScope cs(&crit_); std::vector<MessageQueue *>::iterator iter; - iter = std::tqfind(message_queues_.begin(), message_queues_.end(), message_queue); + iter = std::find(message_queues_.begin(), message_queues_.end(), message_queue); if (iter != message_queues_.end()) message_queues_.erase(iter); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc index 2ea7530f..5274c29d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc @@ -261,7 +261,7 @@ void NetworkManager::GetNetworks(std::vector<Network*>& result) { CreateNetworks(list); for (uint32 i = 0; i < list.size(); ++i) { - NetworkMap::iterator iter = networks_.tqfind(list[i]->name()); + NetworkMap::iterator iter = networks_.find(list[i]->name()); Network* network; if (iter == networks_.end()) { @@ -313,12 +313,12 @@ Network::Network(const std::string& name, uint32 ip) } void Network::StartSession(NetworkSession* session) { - assert(std::tqfind(sessions_.begin(), sessions_.end(), session) == sessions_.end()); + assert(std::find(sessions_.begin(), sessions_.end(), session) == sessions_.end()); sessions_.push_back(session); } void Network::StopSession(NetworkSession* session) { - SessionList::iterator iter = std::tqfind(sessions_.begin(), sessions_.end(), session); + SessionList::iterator iter = std::find(sessions_.begin(), sessions_.end(), session); if (iter != sessions_.end()) sessions_.erase(iter); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc index 5cdc4743..e1f0db4e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc @@ -353,7 +353,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, std::string A2 = method + ":" + uri; std::string middle; - if (args.tqfind("qop") != args.end()) { + if (args.find("qop") != args.end()) { args["qop"] = "auth"; middle = args["nonce"] + ":" + ncount + ":" + cnonce + ":" + args["qop"]; } else { @@ -375,13 +375,13 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, ss << ", realm=" << Quote(args["realm"]); ss << ", nonce=" << Quote(args["nonce"]); ss << ", uri=" << Quote(uri); - if (args.tqfind("qop") != args.end()) { + if (args.find("qop") != args.end()) { ss << ", qop=" << args["qop"]; ss << ", nc=" << ncount; ss << ", cnonce=" << Quote(cnonce); } ss << ", response=\"" << dig_response << "\""; - if (args.tqfind("opaque") != args.end()) { + if (args.find("opaque") != args.end()) { ss << ", opaque=" << Quote(args["opaque"]); } response = ss.str(); @@ -483,7 +483,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, size_t len = password.GetLength()+1; char * sensitive = new char[len]; password.CopyTo(sensitive, true); - std::string::size_type pos = username.tqfind('\\'); + std::string::size_type pos = username.find('\\'); if (pos == std::string::npos) { auth_id.UserLength = static_cast<unsigned long>( _min(sizeof(userbuf) - 1, username.size())); @@ -1100,7 +1100,7 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) { const char * direction = (input ? " << " : " >> "); std::string str(data, len); while (!str.empty()) { - std::string::size_type pos = str.tqfind('\n'); + std::string::size_type pos = str.find('\n'); std::string substr = str; if (pos == std::string::npos) { substr = str; @@ -1114,9 +1114,9 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) { } // Filter out any private data - std::string::size_type pos_private = substr.tqfind("Email"); + std::string::size_type pos_private = substr.find("Email"); if (pos_private == std::string::npos) { - pos_private = substr.tqfind("Passwd"); + pos_private = substr.find("Passwd"); } if (pos_private == std::string::npos) { LOG(level_) << label_ << direction << substr; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc index e781b03d..40c1fbfe 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc @@ -350,14 +350,14 @@ void CallClient::OnStatusUpdate(const buzz::tqStatus& status) { (*roster_)[key] = item; } else { Console()->Printf("Removing from roster: %s", key.c_str()); - RosterMap::iterator iter = roster_->tqfind(key); + RosterMap::iterator iter = roster_->find(key); if (iter != roster_->end()) roster_->erase(iter); } } void CallClient::PrintRoster() { - Console()->Printf("Roster tqcontains %d callable", roster_->size()); + Console()->Printf("Roster contains %d callable", roster_->size()); RosterMap::iterator iter = roster_->begin(); while (iter != roster_->end()) { Console()->Printf("%s - %s", diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc index ee14fe94..cee7058a 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc @@ -48,7 +48,7 @@ IsXmlSpace(int ch) { static bool ListContainsToken(const std::string & list, const std::string & token) { - size_t i = list.tqfind(token); + size_t i = list.find(token); if (i == std::string::npos || token.empty()) return false; bool boundary_before = (i == 0 || IsXmlSpace(list[i - 1])); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h index 0677932b..2cb80ae2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h @@ -114,12 +114,12 @@ public: // Knowledge of other clients' silly automatic status strings - // Don't show these. std::string QuiettqStatus() const { - if (jid_.resource().tqfind("Psi") != std::string::npos) { + if (jid_.resource().find("Psi") != std::string::npos) { if (status_ == "Online" || - status_.tqfind("Auto tqStatus") != std::string::npos) + status_.find("Auto tqStatus") != std::string::npos) return STR_EMPTY; } - if (jid_.resource().tqfind("Gaim") != std::string::npos) { + if (jid_.resource().find("Gaim") != std::string::npos) { if (status_ == "Sorry, I ran out for a bit!") return STR_EMPTY; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc index 492559ae..66191f12 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc @@ -55,12 +55,12 @@ std::string XmppAuth::ChooseBestSaslMechanism( std::vector<std::string>::const_iterator it; // a token is the weakest auth - 15s, service-limited, so prefer it. - it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN"); + it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN"); if (it != mechanisms.end()) return "X-GOOGLE-TOKEN"; // a cookie is the next weakest - 14 days - it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE"); + it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE"); if (it != mechanisms.end()) return "X-GOOGLE-COOKIE"; @@ -70,7 +70,7 @@ std::string XmppAuth::ChooseBestSaslMechanism( // as a last resort, use plain authentication if (jid_.domain() != "google.com") { - it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN"); + it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN"); if (it != mechanisms.end()) return "PLAIN"; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc index d07e2e5d..eb53efeb 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc @@ -381,7 +381,7 @@ bool P2PSocket::CreateConnections(const Candidate &remote_candidate, } if ((origin_port != NULL) && - tqfind(ports_.begin(), ports_.end(), origin_port) == ports_.end()) { + find(ports_.begin(), ports_.end(), origin_port) == ports_.end()) { if (CreateConnection(origin_port, remote_candidate, origin_port, readable)) created = true; } @@ -783,7 +783,7 @@ void P2PSocket::OnConnectionDestroyed(Connection *connection) { // Remove this connection from the list. std::vector<Connection*>::iterator iter = - tqfind(connections_.begin(), connections_.end(), connection); + find(connections_.begin(), connections_.end(), connection); assert(iter != connections_.end()); connections_.erase(iter); @@ -807,7 +807,7 @@ void P2PSocket::OnPortDestroyed(Port* port) { assert(worker_thread_ == Thread::Current()); // Remove this port from the list (if we didn't drop it already). - std::vector<Port*>::iterator iter = tqfind(ports_.begin(), ports_.end(), port); + std::vector<Port*>::iterator iter = find(ports_.begin(), ports_.end(), port); if (iter != ports_.end()) ports_.erase(iter); @@ -843,7 +843,7 @@ const std::vector<Connection *>& P2PSocket::connections() { // Set options on ourselves is simply setting options on all of our available // port objects. int P2PSocket::SetOption(Socket::Option opt, int value) { - OptionMap::iterator it = options_.tqfind(opt); + OptionMap::iterator it = options_.find(opt); if (it == options_.end()) { options_.insert(std::make_pair(opt, value)); } else if (it->second == value) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc index c9272597..14549b5b 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc @@ -171,7 +171,7 @@ Port::~Port() { } Connection* Port::GetConnection(const SocketAddress& remote_addr) { - AddressMap::const_iterator iter = connections_.tqfind(remote_addr); + AddressMap::const_iterator iter = connections_.find(remote_addr); if (iter != connections_.end()) return iter->second; else @@ -449,7 +449,7 @@ void Port::Start() { } void Port::OnConnectionDestroyed(Connection* conn) { - AddressMap::iterator iter = connections_.tqfind(conn->remote_candidate().address()); + AddressMap::iterator iter = connections_.find(conn->remote_candidate().address()); assert(iter != connections_.end()); connections_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc index 002033dc..bb52a1d5 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc @@ -105,14 +105,14 @@ RelayServer::~RelayServer() { void RelayServer::AddInternalSocket(AsyncPacketSocket* socket) { assert(internal_sockets_.end() == - std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket)); + std::find(internal_sockets_.begin(), internal_sockets_.end(), socket)); internal_sockets_.push_back(socket); socket->SignalReadPacket.connect(this, &RelayServer::OnInternalPacket); } void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) { SocketList::iterator iter = - std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket); + std::find(internal_sockets_.begin(), internal_sockets_.end(), socket); assert(iter != internal_sockets_.end()); internal_sockets_.erase(iter); socket->SignalReadPacket.disconnect(this); @@ -120,14 +120,14 @@ void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) { void RelayServer::AddExternalSocket(AsyncPacketSocket* socket) { assert(external_sockets_.end() == - std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket)); + std::find(external_sockets_.begin(), external_sockets_.end(), socket)); external_sockets_.push_back(socket); socket->SignalReadPacket.connect(this, &RelayServer::OnExternalPacket); } void RelayServer::RemoveExternalSocket(AsyncPacketSocket* socket) { SocketList::iterator iter = - std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket); + std::find(external_sockets_.begin(), external_sockets_.end(), socket); assert(iter != external_sockets_.end()); external_sockets_.erase(iter); socket->SignalReadPacket.disconnect(this); @@ -143,7 +143,7 @@ void RelayServer::OnInternalPacket( // If this did not come from an existing connection, it should be a STUN // allocate request. - ConnectionMap::iterator piter = connections_.tqfind(ap); + ConnectionMap::iterator piter = connections_.find(ap); if (piter == connections_.end()) { HandleStunAllocate(bytes, size, ap, socket); return; @@ -186,7 +186,7 @@ void RelayServer::OnExternalPacket( assert(!ap.destination().IsAny()); // If this connection already exists, then forward the traffic. - ConnectionMap::iterator piter = connections_.tqfind(ap); + ConnectionMap::iterator piter = connections_.find(ap); if (piter != connections_.end()) { // TODO: Check the HMAC. RelayServerConnection* ext_conn = piter->second; @@ -220,7 +220,7 @@ void RelayServer::OnExternalPacket( // TODO: Check the HMAC. // The binding should already be present. - BindingMap::iterator biter = bindings_.tqfind(username); + BindingMap::iterator biter = bindings_.find(username); if (biter == bindings_.end()) { // TODO: Turn this back on. This is the sign of a client bug. //std::cerr << "Dropping packet: no binding with username" << std::endl; @@ -299,7 +299,7 @@ void RelayServer::HandleStunAllocate( RelayServerBinding* binding; - BindingMap::iterator biter = bindings_.tqfind(username); + BindingMap::iterator biter = bindings_.find(username); if (biter != bindings_.end()) { binding = biter->second; @@ -453,18 +453,18 @@ void RelayServer::HandleStunSend( } void RelayServer::AddConnection(RelayServerConnection* conn) { - assert(connections_.tqfind(conn->addr_pair()) == connections_.end()); + assert(connections_.find(conn->addr_pair()) == connections_.end()); connections_[conn->addr_pair()] = conn; } void RelayServer::RemoveConnection(RelayServerConnection* conn) { - ConnectionMap::iterator iter = connections_.tqfind(conn->addr_pair()); + ConnectionMap::iterator iter = connections_.find(conn->addr_pair()); assert(iter != connections_.end()); connections_.erase(iter); } void RelayServer::RemoveBinding(RelayServerBinding* binding) { - BindingMap::iterator iter = bindings_.tqfind(binding->username()); + BindingMap::iterator iter = bindings_.find(binding->username()); assert(iter != bindings_.end()); bindings_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc index d146d63c..4c1c09d9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc @@ -63,7 +63,7 @@ Session *SessionManager::CreateSession(const std::string &name, const SessionID& void SessionManager::DestroySession(Session *session) { if (session != NULL) { - std::map<SessionID, Session *>::iterator it = session_map_.tqfind(session->id()); + std::map<SessionID, Session *>::iterator it = session_map_.find(session->id()); if (it != session_map_.end()) { SignalSessionDestroy(session); session_map_.erase(it); @@ -74,7 +74,7 @@ void SessionManager::DestroySession(Session *session) { Session *SessionManager::GetSession(const SessionID& id) { // If the id isn't present, the [] operator will make a NULL entry - std::map<SessionID, Session *>::iterator it = session_map_.tqfind(id); + std::map<SessionID, Session *>::iterator it = session_map_.find(id); if (it != session_map_.end()) return (*it).second; return NULL; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc index e0257451..2f0d67b8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc @@ -109,7 +109,7 @@ void SocketManager::DestroySocket_w(P2PSocket *socket) { // Only if socket exists CritScope cs(&critSM_); std::vector<P2PSocket *>::iterator it; - it = std::tqfind(sockets_.begin(), sockets_.end(), socket); + it = std::find(sockets_.begin(), sockets_.end(), socket); if (it == sockets_.end()) return; sockets_.erase(it); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc index 34a62547..14d64735 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc @@ -59,14 +59,14 @@ void StunRequestManager::Send(StunRequest* request) { void StunRequestManager::SendDelayed(StunRequest* request, int delay) { request->set_manager(this); - assert(requests_.tqfind(request->id()) == requests_.end()); + assert(requests_.find(request->id()) == requests_.end()); requests_[request->id()] = request; thread_->PostDelayed(delay, request, MSG_STUN_SEND, NULL); } void StunRequestManager::Remove(StunRequest* request) { assert(request->manager() == this); - RequestMap::iterator iter = requests_.tqfind(request->id()); + RequestMap::iterator iter = requests_.find(request->id()); if (iter != requests_.end()) { assert(iter->second == request); requests_.erase(iter); @@ -84,7 +84,7 @@ void StunRequestManager::Clear() { } bool StunRequestManager::CheckResponse(StunMessage* msg) { - RequestMap::iterator iter = requests_.tqfind(msg->transaction_id()); + RequestMap::iterator iter = requests_.find(msg->transaction_id()); if (iter == requests_.end()) return false; @@ -113,7 +113,7 @@ bool StunRequestManager::CheckResponse(const char* data, size_t size) { std::string id; id.append(data + 4, 16); - RequestMap::iterator iter = requests_.tqfind(id); + RequestMap::iterator iter = requests_.find(id); if (iter == requests_.end()) return false; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc index 42c4a876..5192595c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc @@ -372,7 +372,7 @@ void BasicPortAllocatorSession::AddAllocatedPort(Port* port, void BasicPortAllocatorSession::OnAddressReady(Port *port) { assert(Thread::Current() == network_thread_); - std::vector<PortData>::iterator it = std::tqfind(ports_.begin(), ports_.end(), port); + std::vector<PortData>::iterator it = std::find(ports_.begin(), ports_.end(), port); assert(it != ports_.end()); assert(!it->ready); it->ready = true; @@ -418,7 +418,7 @@ void BasicPortAllocatorSession::OnProtocolEnabled(AllocationSequence * seq, Prot void BasicPortAllocatorSession::OnPortDestroyed(Port* port) { assert(Thread::Current() == network_thread_); std::vector<PortData>::iterator iter = - tqfind(ports_.begin(), ports_.end(), port); + find(ports_.begin(), ports_.end(), port); assert(iter != ports_.end()); ports_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc index 7a79d044..31b12e92 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc @@ -56,7 +56,7 @@ Session *Call::InitiateSession(const buzz::Jid &jid) { void Call::AcceptSession(Session *session) { std::vector<Session *>::iterator it; - it = std::tqfind(sessions_.begin(), sessions_.end(), session); + it = std::find(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Accept(session_client_->CreateAcceptSessionDescription(session->remote_description())); @@ -64,7 +64,7 @@ void Call::AcceptSession(Session *session) { void Call::RedirectSession(Session *session, const buzz::Jid &to) { std::vector<Session *>::iterator it; - it = std::tqfind(sessions_.begin(), sessions_.end(), session); + it = std::find(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Redirect(to.Str()); @@ -72,16 +72,16 @@ void Call::RedirectSession(Session *session, const buzz::Jid &to) { void Call::RejectSession(Session *session) { std::vector<Session *>::iterator it; - it = std::tqfind(sessions_.begin(), sessions_.end(), session); + it = std::find(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Reject(); } void Call::TerminateSession(Session *session) { - assert(std::tqfind(sessions_.begin(), sessions_.end(), session) != sessions_.end()); + assert(std::find(sessions_.begin(), sessions_.end(), session) != sessions_.end()); std::vector<Session *>::iterator it; - it = std::tqfind(sessions_.begin(), sessions_.end(), session); + it = std::find(sessions_.begin(), sessions_.end(), session); if (it != sessions_.end()) (*it)->Terminate(); } @@ -127,14 +127,14 @@ void Call::AddSession(Session *session) { void Call::RemoveSession(Session *session) { // Remove session from list std::vector<Session *>::iterator it_session; - it_session = std::tqfind(sessions_.begin(), sessions_.end(), session); + it_session = std::find(sessions_.begin(), sessions_.end(), session); if (it_session == sessions_.end()) return; sessions_.erase(it_session); // Destroy session channel std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.tqfind(session->id()); + it_channel = channel_map_.find(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = it_channel->second; channel_map_.erase(it_channel); @@ -149,7 +149,7 @@ void Call::RemoveSession(Session *session) { } VoiceChannel* Call::GetChannel(Session* session) { - std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.tqfind(session->id()); + std::map<SessionID, VoiceChannel *>::iterator it = channel_map_.find(session->id()); assert(it != channel_map_.end()); return it->second; } @@ -184,7 +184,7 @@ void Call::Join(Call *call, bool enable) { // Move channel std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = call->channel_map_.tqfind(session->id()); + it_channel = call->channel_map_.find(session->id()); if (it_channel != call->channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; call->channel_map_.erase(it_channel); @@ -196,7 +196,7 @@ void Call::Join(Call *call, bool enable) { void Call::StartConnectionMonitor(Session *session, int cms) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.tqfind(session->id()); + it_channel = channel_map_.find(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->SignalConnectionMonitor.connect(this, &Call::OnConnectionMonitor); @@ -206,7 +206,7 @@ void Call::StartConnectionMonitor(Session *session, int cms) { void Call::StopConnectionMonitor(Session *session) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.tqfind(session->id()); + it_channel = channel_map_.find(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->StopConnectionMonitor(); @@ -216,7 +216,7 @@ void Call::StopConnectionMonitor(Session *session) { void Call::StartAudioMonitor(Session *session, int cms) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.tqfind(session->id()); + it_channel = channel_map_.find(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->SignalAudioMonitor.connect(this, &Call::OnAudioMonitor); @@ -226,7 +226,7 @@ void Call::StartAudioMonitor(Session *session, int cms) { void Call::StopAudioMonitor(Session *session) { std::map<SessionID, VoiceChannel *>::iterator it_channel; - it_channel = channel_map_.tqfind(session->id()); + it_channel = channel_map_.find(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->StopAudioMonitor(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc index e5e6758d..98634b12 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc @@ -119,7 +119,7 @@ void ChannelManager::DestroyVoiceChannel_w(VoiceChannel *voice_channel) { CritScope cs(&crit_); // Destroy voice channel. assert(initialized_); - std::vector<VoiceChannel *>::iterator it = std::tqfind(channels_.begin(), + std::vector<VoiceChannel *>::iterator it = std::find(channels_.begin(), channels_.end(), voice_channel); assert(it != channels_.end()); if (it == channels_.end()) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc index a8f0a511..46dc7b42 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc @@ -202,7 +202,7 @@ void PhoneSessionClient::DestroyCall(Call *call) { // Remove it from calls_ map and delete - std::map<uint32, Call *>::iterator it = calls_.tqfind(call->id()); + std::map<uint32, Call *>::iterator it = calls_.find(call->id()); if (it != calls_.end()) calls_.erase(it); @@ -212,7 +212,7 @@ void PhoneSessionClient::DestroyCall(Call *call) { void PhoneSessionClient::OnSessionDestroy(Session *session) { // Find the call this session is in, remove it - std::map<SessionID, Call *>::iterator it = session_map_.tqfind(session->id()); + std::map<SessionID, Call *>::iterator it = session_map_.find(session->id()); assert(it != session_map_.end()); if (it != session_map_.end()) { Call *call = (*it).second; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c index d243bf76..e83eb8dc 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c @@ -81,7 +81,7 @@ static gint compare(gconstpointer a, gconstpointer b) static GList *g_list_append_if_new(GList *l,gpointer data) { GList *res=l; - if (g_list_tqfind(res,data)==NULL) + if (g_list_find(res,data)==NULL) res=g_list_append(res,data); return(res); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c index c73081a2..6d410392 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c @@ -419,7 +419,7 @@ GList *filter_list=NULL; void ms_filter_register(MSFilterInfo *info) { gpointer tmp; - tmp=g_list_tqfind(filter_list,info); + tmp=g_list_find(filter_list,info); if (tmp==NULL) filter_list=g_list_append(filter_list,(gpointer)info); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc index 570a8be5..d6d4c7b4 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc @@ -170,7 +170,7 @@ static std::string SuggestPrefix(const std::string & ns) { if (last - first > 4) last = first + 3; std::string candidate(AsciiLower(ns.substr(first, last - first))); - if (candidate.tqfind("xml") != 0) + if (candidate.find("xml") != 0) return candidate; break; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc index 48a89504..b742e03a 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc @@ -56,13 +56,13 @@ Jid::Jid(const std::string & jid_string) { } // First find the slash and slice of that part - size_t slash = jid_string.tqfind('/'); + size_t slash = jid_string.find('/'); std::string resource_name = (slash == std::string::npos ? STR_EMPTY : jid_string.substr(slash + 1)); // Now look for the node std::string node_name; - size_t at = jid_string.tqfind('@'); + size_t at = jid_string.find('@'); size_t domain_begin; if (at < slash && at != std::string::npos) { node_name = jid_string.substr(0, at); @@ -80,13 +80,13 @@ Jid::Jid(const std::string & jid_string) { // avoid allocating these constants repeatedly std::string domain_name; - if (domain_length == 9 && jid_string.tqfind("gmail.com", domain_begin) == domain_begin) { + if (domain_length == 9 && jid_string.find("gmail.com", domain_begin) == domain_begin) { domain_name = STR_GMAIL_COM; } - else if (domain_length == 14 && jid_string.tqfind("googlemail.com", domain_begin) == domain_begin) { + else if (domain_length == 14 && jid_string.find("googlemail.com", domain_begin) == domain_begin) { domain_name = STR_GOOGLEMAIL_COM; } - else if (domain_length == 10 && jid_string.tqfind("google.com", domain_begin) == domain_begin) { + else if (domain_length == 10 && jid_string.find("google.com", domain_begin) == domain_begin) { domain_name = STR_GOOGLE_COM; } else { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h index 488dc56e..659820f5 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h @@ -49,7 +49,7 @@ public: return ""; } - std::vector<std::string>::const_iterator it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN"); + std::vector<std::string>::const_iterator it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN"); if (it == mechanisms.end()) { return ""; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc index 50ca23c1..38f268b9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc @@ -91,7 +91,7 @@ XmppEngineImpl::RemoveIqHandler(XmppIqCookie cookie, std::vector<XmppIqEntry*, std::allocator<XmppIqEntry*> >::iterator pos; - pos = std::tqfind(iq_entries_->begin(), + pos = std::find(iq_entries_->begin(), iq_entries_->end(), reinterpret_cast<XmppIqEntry*>(cookie)); diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/kioslave/jabberdisco.cpp index ae95eadb..3a8b6d88 100644 --- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp +++ b/kopete/protocols/jabber/kioslave/jabberdisco.cpp @@ -57,7 +57,7 @@ void JabberDiscoProtocol::setHost ( const TQString &host, int port, const TQStri m_host = host; m_port = !port ? 5222 : port; - m_user = TQString(user).tqreplace ( "%", "@" ); + m_user = TQString(user).replace ( "%", "@" ); m_password = pass; } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp index 2064e4ab..ca3b804c 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp @@ -58,13 +58,13 @@ static TQString extractLine(TQByteArray *buf, bool *found) static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg) { - int n = line.tqfind(' '); + int n = line.find(' '); if(n == -1) return false; if(proto) *proto = line.mid(0, n); ++n; - int n2 = line.tqfind(' ', n); + int n2 = line.find(' ', n); if(n2 == -1) return false; if(code) diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp index 2e6d0779..fbc9a39f 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp @@ -229,14 +229,14 @@ void HttpPoll::http_result() // get id and packet TQString id; TQString cookie = d->http.getHeader("Set-Cookie"); - int n = cookie.tqfind("ID="); + int n = cookie.find("ID="); if(n == -1) { reset(); error(ErrRead); return; } n += 3; - int n2 = cookie.tqfind(';', n); + int n2 = cookie.find(';', n); if(n2 != -1) id = cookie.mid(n, n2-n); else @@ -406,13 +406,13 @@ static TQString extractLine(TQByteArray *buf, bool *found) static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg) { - int n = line.tqfind(' '); + int n = line.find(' '); if(n == -1) return false; if(proto) *proto = line.mid(0, n); ++n; - int n2 = line.tqfind(' ', n); + int n2 = line.find(' ', n); if(n2 == -1) return false; if(code) @@ -508,7 +508,7 @@ TQString HttpProxyPost::getHeader(const TQString &var) const { for(TQStringList::ConstIterator it = d->headerLines.begin(); it != d->headerLines.end(); ++it) { const TQString &s = *it; - int n = s.tqfind(": "); + int n = s.find(": "); if(n == -1) continue; TQString v = s.mid(0, n); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp index 39fbfdda..b94399ce 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp @@ -116,7 +116,7 @@ public: class NDnsManager::Private { public: - Item *tqfind(const NDns *n) + Item *find(const NDns *n) { TQPtrListIterator<Item> it(list); for(Item *i; (i = it.current()); ++it) { @@ -126,7 +126,7 @@ public: return 0; } - Item *tqfind(const NDnsWorker *w) + Item *find(const NDnsWorker *w) { TQPtrListIterator<Item> it(list); for(Item *i; (i = it.current()); ++it) { @@ -184,7 +184,7 @@ void NDnsManager::resolve(NDns *self, const TQString &name) void NDnsManager::stop(NDns *self) { - Item *i = d->tqfind(self); + Item *i = d->find(self); if(!i) return; // disassociate @@ -200,7 +200,7 @@ void NDnsManager::stop(NDns *self) bool NDnsManager::isBusy(const NDns *self) const { - Item *i = d->tqfind(self); + Item *i = d->find(self); return (i ? true: false); } @@ -210,7 +210,7 @@ bool NDnsManager::event(TQEvent *e) NDnsWorkerEvent *we = static_cast<NDnsWorkerEvent*>(e); we->worker->wait(); // ensure that the thread is terminated - Item *i = d->tqfind(we->worker); + Item *i = d->find(we->worker); if(!i) { // should NOT happen return true; diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h index 12b9ad55..3e52c5d2 100644 --- a/kopete/protocols/jabber/libiris/iris/include/im.h +++ b/kopete/protocols/jabber/libiris/iris/include/im.h @@ -220,10 +220,10 @@ namespace XMPP ResourceList(); ~ResourceList(); - ResourceList::Iterator tqfind(const TQString &); + ResourceList::Iterator find(const TQString &); ResourceList::Iterator priority(); - ResourceList::ConstIterator tqfind(const TQString &) const; + ResourceList::ConstIterator find(const TQString &) const; ResourceList::ConstIterator priority() const; private: @@ -273,8 +273,8 @@ namespace XMPP Roster(); ~Roster(); - Roster::Iterator tqfind(const Jid &); - Roster::ConstIterator tqfind(const Jid &) const; + Roster::Iterator find(const Jid &); + Roster::ConstIterator find(const Jid &) const; private: class RosterPrivate *d; @@ -711,8 +711,8 @@ namespace XMPP ~LiveRoster(); void flagAllForDelete(); - LiveRoster::Iterator tqfind(const Jid &, bool compareRes=true); - LiveRoster::ConstIterator tqfind(const Jid &, bool compareRes=true) const; + LiveRoster::Iterator find(const Jid &, bool compareRes=true); + LiveRoster::ConstIterator find(const Jid &, bool compareRes=true) const; private: class LiveRosterPrivate; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp index 90cf1364..090cc9df 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp @@ -42,7 +42,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->nameprep_table.tqfind(in); + Result *r = that->nameprep_table.find(in); if(r) { if(!r->norm) @@ -78,7 +78,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->nodeprep_table.tqfind(in); + Result *r = that->nodeprep_table.find(in); if(r) { if(!r->norm) @@ -114,7 +114,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->resourceprep_table.tqfind(in); + Result *r = that->resourceprep_table.find(in); if(r) { if(!r->norm) @@ -248,7 +248,7 @@ void Jid::set(const TQString &s) { TQString rest, domain, node, resource; TQString norm_domain, norm_node, norm_resource; - int x = s.tqfind('/'); + int x = s.find('/'); if(x != -1) { rest = s.mid(0, x); resource = s.mid(x+1); @@ -262,7 +262,7 @@ void Jid::set(const TQString &s) return; } - x = rest.tqfind('@'); + x = rest.find('@'); if(x != -1) { node = rest.mid(0, x); domain = rest.mid(x+1); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp index 80ce5366..3fa7d6c3 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp @@ -232,10 +232,10 @@ private: if(mightChangeEncoding) { while(1) { - int n = out.tqfind('<'); + int n = out.find('<'); if(n != -1) { // we need a closing bracket - int n2 = out.tqfind('>', n); + int n2 = out.find('>', n); if(n2 != -1) { ++n2; TQString h = out.mid(n, n2-n); @@ -278,8 +278,8 @@ private: if(h.left(5) != "<?xml") return ""; - int endPos = h.tqfind(">"); - int startPos = h.tqfind("encoding"); + int endPos = h.find(">"); + int startPos = h.find("encoding"); if(startPos < endPos && startPos != -1) { TQString encoding; do { @@ -335,7 +335,7 @@ private: bool checkForBadChars(const TQString &s) { - int len = s.tqfind('<'); + int len = s.find('<'); if(len == -1) len = s.length(); else diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp index 5a6bc64f..89c98a91 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp @@ -440,7 +440,7 @@ void BasicProtocol::handleDocOpen(const Parser::Event &pe) int minor = 0; TQString verstr = atts.value("version"); if(!verstr.isEmpty()) { - int n = verstr.tqfind('.'); + int n = verstr.find('.'); if(n != -1) { major = verstr.mid(0, n).toInt(); minor = verstr.mid(n+1).toInt(); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp index da78fef1..c825a2ca 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp @@ -78,7 +78,7 @@ public: PropList list; int at = 0; while(1) { - int n = str.tqfind('=', at); + int n = str.find('=', at); if(n == -1) break; TQCString var, val; @@ -86,14 +86,14 @@ public: at = n + 1; if(str[at] == '\"') { ++at; - n = str.tqfind('\"', at); + n = str.find('\"', at); if(n == -1) break; val = str.mid(at, n-at); at = n + 1; } else { - n = str.tqfind(',', at); + n = str.find(',', at); if(n != -1) { val = str.mid(at, n-at); at = n; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp index fe7275ad..59b28f8b 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp @@ -1115,7 +1115,7 @@ void ClientStream::sasl_authCheck(const TQString &user, const TQString &) // printf("authcheck: [%s], [%s]\n", user.latin1(), authzid.latin1()); //#endif TQString u = user; - int n = u.tqfind('@'); + int n = u.find('@'); if(n != -1) u.truncate(n); d->srv.user = u; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp index 5f682371..91111ea9 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp @@ -98,7 +98,7 @@ static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const } // 'clip' means to remove any unwanted (and unneeded) characters, such as a trailing newline if(clip) { - int n = out.tqfindRev('>'); + int n = out.findRev('>'); out.truncate(n+1); } return out; @@ -128,12 +128,12 @@ static void createRootXmlTags(const TQDomElement &root, TQString *xmlHeader, TQS } // parse the tags out - int n = str.tqfind('<'); - int n2 = str.tqfind('>', n); + int n = str.find('<'); + int n2 = str.find('>', n); ++n2; *tagOpen = str.mid(n, n2-n); - n2 = str.tqfindRev('>'); - n = str.tqfindRev('<'); + n2 = str.findRev('>'); + n = str.findRev('<'); ++n2; *tagClose = str.mid(n, n2-n); @@ -329,7 +329,7 @@ TQString XmlProtocol::elementToString(const TQDomElement &e, bool clip) for(n = 0; n < al.count(); ++n) { TQDomAttr a = al.item(n).toAttr(); TQString s = a.name(); - int x = s.tqfind(':'); + int x = s.find(':'); if(x != -1) s = s.mid(x+1); else diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 86a01e60..7b425696 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -790,7 +790,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s) void Client::updateSelfPresence(const Jid &j, const tqStatus &s) { - ResourceList::Iterator rit = d->resourceList.tqfind(j.resource()); + ResourceList::Iterator rit = d->resourceList.find(j.resource()); bool found = (rit == d->resourceList.end()) ? false: true; // unavailable? remove the resource @@ -822,7 +822,7 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s) void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s) { - ResourceList::Iterator rit = i->resourceList().tqfind(j.resource()); + ResourceList::Iterator rit = i->resourceList().find(j.resource()); bool found = (rit == i->resourceList().end()) ? false: true; // unavailable? remove the resource @@ -950,7 +950,7 @@ void Client::importRosterItem(const RosterItem &item) // Remove if(item.subscription().type() == Subscription::Remove) { - LiveRoster::Iterator it = d->roster.tqfind(item.jid()); + LiveRoster::Iterator it = d->roster.find(item.jid()); if(it != d->roster.end()) { rosterItemRemoved(*it); d->roster.remove(it); @@ -959,7 +959,7 @@ void Client::importRosterItem(const RosterItem &item) } // Add/Update else { - LiveRoster::Iterator it = d->roster.tqfind(item.jid()); + LiveRoster::Iterator it = d->roster.find(item.jid()); if(it != d->roster.end()) { LiveRosterItem &i = *it; i.setFlagForDelete(false); @@ -1001,7 +1001,7 @@ void Client::setPresence(const tqStatus &s) // update our resourceList ppPresence(jid(), s); - //ResourceList::Iterator rit = d->resourceList.tqfind(resource()); + //ResourceList::Iterator rit = d->resourceList.find(resource()); //Resource &r = *rit; //r.settqStatus(s); } @@ -1097,7 +1097,7 @@ void Client::addExtension(const TQString& ext, const Features& features) void Client::removeExtension(const TQString& ext) { - if (d->extension_features.tqcontains(ext)) { + if (d->extension_features.contains(ext)) { d->extension_features.remove(ext); d->capsExt = extensions().join(" "); } @@ -1499,7 +1499,7 @@ void LiveRoster::flagAllForDelete() (*it).setFlagForDelete(true); } -LiveRoster::Iterator LiveRoster::tqfind(const Jid &j, bool compareRes) +LiveRoster::Iterator LiveRoster::find(const Jid &j, bool compareRes) { Iterator it; for(it = begin(); it != end(); ++it) { @@ -1509,7 +1509,7 @@ LiveRoster::Iterator LiveRoster::tqfind(const Jid &j, bool compareRes) return it; } -LiveRoster::ConstIterator LiveRoster::tqfind(const Jid &j, bool compareRes) const +LiveRoster::ConstIterator LiveRoster::find(const Jid &j, bool compareRes) const { ConstIterator it; for(it = begin(); it != end(); ++it) { diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index fb9de2e8..522e52f9 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -421,12 +421,12 @@ bool Message::containsEvents() const bool Message::containsEvent(MsgEvent e) const { - return d->eventList.tqcontains(e); + return d->eventList.contains(e); } void Message::addEvent(MsgEvent e) { - if (!d->eventList.tqcontains(e)) { + if (!d->eventList.contains(e)) { if (e == CancelEvent || containsEvent(CancelEvent)) d->eventList.clear(); // Reset list d->eventList += e; @@ -1018,10 +1018,10 @@ ResourceList::~ResourceList() { } -ResourceList::Iterator ResourceList::tqfind(const TQString & _tqfind) +ResourceList::Iterator ResourceList::find(const TQString & _find) { for(ResourceList::Iterator it = begin(); it != end(); ++it) { - if((*it).name() == _tqfind) + if((*it).name() == _find) return it; } @@ -1040,10 +1040,10 @@ ResourceList::Iterator ResourceList::priority() return highest; } -ResourceList::ConstIterator ResourceList::tqfind(const TQString & _tqfind) const +ResourceList::ConstIterator ResourceList::find(const TQString & _find) const { for(ResourceList::ConstIterator it = begin(); it != end(); ++it) { - if((*it).name() == _tqfind) + if((*it).name() == _find) return it; } @@ -1222,7 +1222,7 @@ Roster::~Roster() { } -Roster::Iterator Roster::tqfind(const Jid &j) +Roster::Iterator Roster::find(const Jid &j) { for(Roster::Iterator it = begin(); it != end(); ++it) { if((*it).jid().compare(j)) @@ -1232,7 +1232,7 @@ Roster::Iterator Roster::tqfind(const Jid &j) return end(); } -Roster::ConstIterator Roster::tqfind(const Jid &j) const +Roster::ConstIterator Roster::find(const Jid &j) const { for(Roster::ConstIterator it = begin(); it != end(); ++it) { if((*it).jid().compare(j)) @@ -1512,7 +1512,7 @@ bool Features::test(const TQStringList &ns) const { TQStringList::ConstIterator it = ns.begin(); for ( ; it != ns.end(); ++it) - if ( _list.tqfind( *it ) != _list.end() ) + if ( _list.find( *it ) != _list.end() ) return true; return false; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp index bab5665b..45ef7a04 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -35,9 +35,9 @@ using namespace XMPP; static TQString lineEncode(TQString str) { - str.tqreplace(TQRegExp("\\\\"), "\\\\"); // backslash to double-backslash - str.tqreplace(TQRegExp("\\|"), "\\p"); // pipe to \p - str.tqreplace(TQRegExp("\n"), "\\n"); // newline to \n + str.replace(TQRegExp("\\\\"), "\\\\"); // backslash to double-backslash + str.replace(TQRegExp("\\|"), "\\p"); // pipe to \p + str.replace(TQRegExp("\n"), "\\n"); // newline to \n return str; } @@ -1417,7 +1417,7 @@ bool JT_ServInfo::take(const TQDomElement &e) } else if (node.startsWith(client()->capsNode() + "#")) { TQString ext = node.right(node.length()-client()->capsNode().length()-1); - if (client()->extensions().tqcontains(ext)) { + if (client()->extensions().contains(ext)) { const TQStringList& l = client()->extension(ext).list(); for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { feature = doc()->createElement("feature"); diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch index 2fcf782b..489afab4 100644 --- a/kopete/protocols/jabber/libiris/jingle_iris.patch +++ b/kopete/protocols/jabber/libiris/jingle_iris.patch @@ -159,7 +159,7 @@ diff -ur psi/iris/xmpp-im/client.cpp psi-jingle/iris/xmpp-im/client.cpp + +void Client::removeExtension(const QString& ext) +{ -+ if (d->extension_features.tqcontains(ext)) { ++ if (d->extension_features.contains(ext)) { + d->extension_features.remove(ext); + d->capsExt = extensions().join(" "); + } @@ -354,7 +354,7 @@ diff -ur psi/iris/xmpp-im/xmpp_tasks.cpp psi-jingle/iris/xmpp-im/xmpp_tasks.cpp + } + else if (node.startsWith(client()->capsNode() + "#")) { + QString ext = node.right(node.length()-client()->capsNode().length()-1); -+ if (client()->extensions().tqcontains(ext)) { ++ if (client()->extensions().contains(ext)) { + const QStringList& l = client()->extension(ext).list(); + for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { + feature = doc()->createElement("feature"); diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 44278511..e4139786 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -520,7 +520,7 @@ void dlgJabberVCard::slotSelectPhoto() img = img.copy(0, (img.height()-img.width())/2, img.height(), img.height()); } - m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().tqreplace(TQRegExp("[./~]"),"-") +".png"); + m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().replace(TQRegExp("[./~]"),"-") +".png"); if( img.save(m_photoPath, "PNG") ) { m_mainWidget->lblPhoto->setPixmap( TQPixmap(img) ); diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 9a769122..2b5ad749 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -200,7 +200,7 @@ void JabberEditAccountWidget::writeConfig () bool JabberEditAccountWidget::validateData () { - if(!mID->text().tqcontains('@')) + if(!mID->text().contains('@')) { KMessageBox::sorry(this, i18n("The Jabber ID you have chosen is invalid. " "Please make sure it is in the form user@server.com, like an email address."), diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index dee7534a..cc7cd0fc 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -58,7 +58,7 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *tqparent mMainWidget = new DlgJabberRegisterAccount ( this ); setMainWidget ( mMainWidget ); - // tqreplace "Ok" button with a "Register" button + // replace "Ok" button with a "Register" button KGuiItem registerButton = KStdGuiItem::ok(); registerButton.setText ( i18n ( "Register" ) ); setButtonOK ( registerButton ); diff --git a/kopete/protocols/meanwhile/meanwhilesession.cpp b/kopete/protocols/meanwhile/meanwhilesession.cpp index 5f367540..3b880932 100644 --- a/kopete/protocols/meanwhile/meanwhilesession.cpp +++ b/kopete/protocols/meanwhile/meanwhilesession.cpp @@ -426,7 +426,7 @@ void MeanwhileSession::syncContactsToServer() if (contactgroup->type() == Kopete::Group::TopLevel) { stgroup = topstgroup; } else { - /* tqfind (or create) a matching sametime list group */ + /* find (or create) a matching sametime list group */ stgroup = mwSametimeList_findGroup(list, contactgroup->displayName().ascii()); if (stgroup == 0L) { @@ -555,10 +555,10 @@ TQString MeanwhileSession::getNickName(struct mwLoginInfo *logininfo) TQString MeanwhileSession::getNickName(TQString name) { - int index = name.tqfind(" - "); + int index = name.find(" - "); if (index != -1) name = name.remove(0, index + 3); - index = name.tqfind('/'); + index = name.find('/'); if (index != -1) name = name.left(index); diff --git a/kopete/protocols/meanwhile/meanwhilesession.h b/kopete/protocols/meanwhile/meanwhilesession.h index 9d583a8b..040d0c2a 100644 --- a/kopete/protocols/meanwhile/meanwhilesession.h +++ b/kopete/protocols/meanwhile/meanwhilesession.h @@ -229,7 +229,7 @@ private: TQString getNickName(struct mwLoginInfo *logininfo); /** - * Resolve a contact to tqfind (and set) the display name. This requires the + * Resolve a contact to find (and set) the display name. This requires the * session to be connected to use the meanwhile resolve service. * @param contact The contact to resolve */ diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp index 91f3361a..acf9c8db 100644 --- a/kopete/protocols/msn/dispatcher.cpp +++ b/kopete/protocols/msn/dispatcher.cpp @@ -94,7 +94,7 @@ void Dispatcher::requestDisplayIcon(const TQString& from, const TQString& msnObj TQString context = TQString::fromUtf8(KCodecs::base64Encode(msnObject.utf8())); // NOTE remove the \0 character automatically // appended to a TQCString. - context.tqreplace("=", TQString()); + context.replace("=", TQString()); TQString content = "EUF-GUID: {A4268EEC-FEC5-49E5-95C3-F126696BDBF6}\r\n" "SessionID: " + TQString::number(sessionId) + "\r\n" @@ -247,7 +247,7 @@ void Dispatcher::slotReadMessage(const TQString &from, const TQByteArray& stream return; } - if(m_messageBuffer.tqcontains(receivedMessage.header.identifier)) + if(m_messageBuffer.contains(receivedMessage.header.identifier)) { kdDebug(14140) << k_funcinfo << TQString("retrieving buffered messsage, %1").tqarg(receivedMessage.header.identifier) @@ -282,7 +282,7 @@ void Dispatcher::dispatch(const P2P::Message& message) if(message.header.sessionId > 0) { - if(m_sessions.tqcontains(message.header.sessionId)){ + if(m_sessions.contains(message.header.sessionId)){ messageHandler = m_sessions[message.header.sessionId]; } } @@ -294,7 +294,7 @@ void Dispatcher::dispatch(const P2P::Message& message) if(regex.search(body) > 0) { TQ_UINT32 sessionId = regex.cap(1).toUInt(); - if(m_sessions.tqcontains(sessionId)){ + if(m_sessions.contains(sessionId)){ // Retrieve the message handler associated with the specified session Id. messageHandler = m_sessions[sessionId]; } @@ -303,7 +303,7 @@ void Dispatcher::dispatch(const P2P::Message& message) { // Otherwise, try to retrieve the message handler // based on the acknowlegded unique identifier. - if(m_sessions.tqcontains(message.header.ackUniqueIdentifier)){ + if(m_sessions.contains(message.header.ackUniqueIdentifier)){ messageHandler = m_sessions[message.header.ackUniqueIdentifier]; } @@ -407,7 +407,7 @@ void Dispatcher::dispatch(const P2P::Message& message) m_sessions.insert(sessionId.toUInt(), current); // Determine the display icon being requested. - TQString fileName = objectList.tqcontains(msnobj) + TQString fileName = objectList.contains(msnobj) ? objectList[msnobj] : m_pictureUrl; TQFile *source = new TQFile(fileName); diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 567ff91e..f99117bc 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -92,7 +92,7 @@ MSNAccount::MSNAccount( MSNProtocol *tqparent, const TQString& AccountID, const m_reverseList = config->readListEntry( "reverseList" ) ; // Load the avatar - m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ); + m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().replace(TQRegExp("[./~]"),"-") +".png" ); resetPictureObject(true); static_cast<MSNContact *>( myself() )->setInfo( "PHH", config->readEntry("PHH") ); @@ -288,7 +288,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS kdDebug( 14140 ) << k_funcinfo << status.description() << endl; // HACK: When changing song, do don't anything while connected - if( reason.tqcontains("[Music]") && ( status == MSNProtocol::protocol()->UNK || status == MSNProtocol::protocol()->CNT ) ) + if( reason.contains("[Music]") && ( status == MSNProtocol::protocol()->UNK || status == MSNProtocol::protocol()->CNT ) ) return; // Only send personal message when logged. @@ -296,7 +296,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS { // Only update the personal/status message, don't change the online status // since it's the same. - if( reason.tqcontains("[Music]") ) + if( reason.contains("[Music]") ) { TQString personalMessage = reason.section("[Music]", 1); setPersonalMessage( MSNProtocol::PersonalMessageMusic, personalMessage ); @@ -359,7 +359,7 @@ void MSNAccount::slotDebugRawCommand() if ( result == TQDialog::Accepted && m_notifySocket ) { m_notifySocket->sendCommand( dlg->command(), dlg->params(), - dlg->addId(), dlg->msg().tqreplace( "\n", "\r\n" ).utf8() ); + dlg->addId(), dlg->msg().replace( "\n", "\r\n" ).utf8() ); } delete dlg; #endif @@ -503,7 +503,7 @@ void MSNAccount::setPersonalMessage( MSNProtocol::PersonalMessageType type, cons void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &groupGuid ) { - if ( m_groupList.tqcontains( groupGuid ) ) + if ( m_groupList.contains( groupGuid ) ) { // Group can already be in the list since the idle timer does a 'List Groups' // command. Simply return, don't issue a warning. @@ -587,7 +587,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou m_groupList.insert( groupGuid, fallBack ); // We have pending groups that we need add a contact to - if ( tmp_addToNewGroup.tqcontains(groupName) ) + if ( tmp_addToNewGroup.contains(groupName) ) { TQStringList list=tmp_addToNewGroup[groupName]; for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) @@ -601,7 +601,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou { // If we get to here, we're currently adding a new contact, add the groupGUID to the groupList // to add when contact will be added to contactlist. - if( tmp_addNewContactToGroup.tqcontains( contactId ) ) + if( tmp_addNewContactToGroup.contains( contactId ) ) tmp_addNewContactToGroup[contactId].append(groupGuid); else tmp_addNewContactToGroup.insert(contactId, TQStringList(groupGuid) ); @@ -613,7 +613,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou void MSNAccount::slotGroupRenamed( const TQString &groupGuid, const TQString& groupName ) { - if ( m_groupList.tqcontains( groupGuid ) ) + if ( m_groupList.contains( groupGuid ) ) { m_groupList[ groupGuid ]->setPluginData( protocol(), accountId() + " id", groupGuid ); m_groupList[ groupGuid ]->setPluginData( protocol(), accountId() + " displayName", groupName ); @@ -627,7 +627,7 @@ void MSNAccount::slotGroupRenamed( const TQString &groupGuid, const TQString& gr void MSNAccount::slotGroupRemoved( const TQString& groupGuid ) { - if ( m_groupList.tqcontains( groupGuid ) ) + if ( m_groupList.contains( groupGuid ) ) { m_groupList[ groupGuid ]->setPluginData( protocol(), TQMap<TQString,TQString>() ); m_groupList.remove( groupGuid ); @@ -638,7 +638,7 @@ void MSNAccount::addGroup( const TQString &groupName, const TQString& contactToA { if ( !contactToAdd.isNull() ) { - if( tmp_addToNewGroup.tqcontains(groupName) ) + if( tmp_addToNewGroup.contains(groupName) ) { tmp_addToNewGroup[groupName].append(contactToAdd); //A group with the same name is about to be added, @@ -664,7 +664,7 @@ void MSNAccount::slotKopeteGroupRenamed( Kopete::Group *g ) { if ( !g->pluginData( protocol(), accountId() + " id" ).isEmpty() && g->displayName() != g->pluginData( protocol(), accountId() + " displayName" ) && - m_groupList.tqcontains( g->pluginData( protocol(), accountId() + " id" ) ) ) + m_groupList.contains( g->pluginData( protocol(), accountId() + " id" ) ) ) { notifySocket()->renameGroup( g->displayName(), g->pluginData( protocol(), accountId() + " id" ) ); } @@ -683,7 +683,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g ) if ( !g->pluginData( protocol(), accountId() + " id" ).isEmpty() ) { TQString groupGuid = g->pluginData( protocol(), accountId() + " id" ); - if ( !m_groupList.tqcontains( groupGuid ) ) + if ( !m_groupList.contains( groupGuid ) ) { // the group is maybe already removed in the server slotGroupRemoved( groupGuid ); @@ -716,7 +716,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g ) for ( ; it.current(); ++it ) { MSNContact *c = static_cast<MSNContact *>( it.current() ); - if ( c && c->serverGroups().tqcontains( groupGuid ) ) + if ( c && c->serverGroups().contains( groupGuid ) ) { /** don't do that becasue theses may already have been sent m_notifySocket->removeContact( c->contactId(), groupNumber, MSNProtocol::FL ); @@ -804,11 +804,11 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ for ( TQStringList::ConstIterator it = contactGroups.begin(); it != contactGroups.end(); ++it ) { TQString newServerGroupID = *it; - if(m_groupList.tqcontains(newServerGroupID)) + if(m_groupList.contains(newServerGroupID)) { Kopete::Group *newServerGroup=m_groupList[ newServerGroupID ] ; c->contactAddedToGroup( newServerGroupID, newServerGroup ); - if( !c->metaContact()->groups().tqcontains(newServerGroup) ) + if( !c->metaContact()->groups().contains(newServerGroup) ) { // The contact has been added in a group by another client c->metaContact()->addToGroup( newServerGroup ); @@ -822,7 +822,7 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ if(old_group) { TQString oldnewID=old_group->pluginData(protocol() , accountId() +" id"); - if ( !oldnewID.isEmpty() && contactGroups.tqcontains( oldnewID ) ) + if ( !oldnewID.isEmpty() && contactGroups.contains( oldnewID ) ) continue; //ok, it's correctn no need to do anything. c->metaContact()->removeFromGroup( old_group ); @@ -851,7 +851,7 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ it != contactGroups.end(); ++it ) { TQString groupGuid = *it; - if(m_groupList.tqcontains(groupGuid)) + if(m_groupList.contains(groupGuid)) { c->contactAddedToGroup( groupGuid, m_groupList[ groupGuid ] ); metaContact->addToGroup( m_groupList[ groupGuid ] ); @@ -910,7 +910,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, c->removeProperty( Kopete::Global::Properties::self()->nickName() ); c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid ); // Add the new contact to the group he belongs. - if ( tmp_addNewContactToGroup.tqcontains(handle) ) + if ( tmp_addNewContactToGroup.contains(handle) ) { TQStringList list = tmp_addNewContactToGroup[handle]; for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) @@ -919,7 +919,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, // If the group didn't exist yet (yay for async operations), don't add the contact to the group // Let slotGroupAdded do it. - if( m_groupList.tqcontains(groupGuid) ) + if( m_groupList.contains(groupGuid) ) { kdDebug( 14140 ) << k_funcinfo << "Adding " << handle << " to group: " << groupGuid << endl; notifySocket()->addContact( handle, MSNProtocol::FL, TQString(), contactGuid, groupGuid ); @@ -955,10 +955,10 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, c->setOnlineStatus( MSNProtocol::protocol()->FLN ); if ( c->metaContact() && c->metaContact()->isTemporary() ) - c->metaContact()->setTemporary( false, m_groupList.tqcontains( groupGuid ) ? m_groupList[ groupGuid ] : 0L ); + c->metaContact()->setTemporary( false, m_groupList.contains( groupGuid ) ? m_groupList[ groupGuid ] : 0L ); else { - if(m_groupList.tqcontains(groupGuid)) + if(m_groupList.contains(groupGuid)) { if( c->metaContact() ) c->metaContact()->addToGroup( m_groupList[groupGuid] ); @@ -968,7 +968,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, } } - if ( !handle.isEmpty() && !m_allowList.tqcontains( handle ) && !m_blockList.tqcontains( handle ) ) + if ( !handle.isEmpty() && !m_allowList.contains( handle ) && !m_blockList.contains( handle ) ) { kdDebug(14140) << k_funcinfo << "Trying to add contact to AL. " << endl; notifySocket()->addContact(handle, MSNProtocol::AL, TQString(), TQString(), TQString() ); @@ -978,7 +978,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, { if ( contacts()[ handle ] ) static_cast<MSNContact *>( contacts()[ handle ] )->setBlocked( true ); - if ( !m_blockList.tqcontains( handle ) ) + if ( !m_blockList.contains( handle ) ) { m_blockList.append( handle ); configGroup()->writeEntry( "blockList" , m_blockList ) ; @@ -988,7 +988,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, { if ( contacts()[ handle ] ) static_cast<MSNContact *>( contacts()[ handle ] )->setAllowed( true ); - if ( !m_allowList.tqcontains( handle ) ) + if ( !m_allowList.contains( handle ) ) { m_allowList.append( handle ); configGroup()->writeEntry( "allowList" , m_allowList ) ; @@ -1004,7 +1004,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, // 'new user' dialog, which makes it impossible to add those here. // Not necessarily bad, but the usability effects need more thought // before I declare it good :- ) - if ( !m_allowList.tqcontains( handle ) && !m_blockList.tqcontains( handle ) ) + if ( !m_allowList.contains( handle ) && !m_blockList.contains( handle ) ) { TQString nick; //in most case, the public name is not know if(publicName!=handle) // so we don't whos it if it is not know @@ -1034,7 +1034,7 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis { m_blockList.remove( handle ); configGroup()->writeEntry( "blockList" , m_blockList ) ; - if ( !m_allowList.tqcontains( handle ) ) + if ( !m_allowList.contains( handle ) ) notifySocket()->addContact( handle, MSNProtocol::AL, TQString(), TQString(), TQString() ); if(c) @@ -1044,7 +1044,7 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis { m_allowList.remove( handle ); configGroup()->writeEntry( "allowList" , m_allowList ) ; - if ( !m_blockList.tqcontains( handle ) ) + if ( !m_blockList.contains( handle ) ) notifySocket()->addContact( handle, MSNProtocol::BL, TQString(), TQString(), TQString() ); if(c) @@ -1118,7 +1118,7 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis for ( ; it.current(); ++it ) { MSNContact *c2 = static_cast<MSNContact *>( it.current() ); - if ( c2->serverGroups().tqcontains( *stringIt ) ) + if ( c2->serverGroups().contains( *stringIt ) ) { still_have_contact=true; break; @@ -1241,16 +1241,16 @@ void MSNAccount::slotContactAddedNotifyDialogClosed(const TQString& handle) if ( !dialog->authorized() ) { - if ( m_allowList.tqcontains( handle ) ) + if ( m_allowList.contains( handle ) ) m_notifySocket->removeContact( handle, MSNProtocol::AL, TQString(), TQString() ); - else if ( !m_blockList.tqcontains( handle ) ) + else if ( !m_blockList.contains( handle ) ) m_notifySocket->addContact( handle, MSNProtocol::BL, TQString(), TQString(), TQString() ); } else { - if ( m_blockList.tqcontains( handle ) ) + if ( m_blockList.contains( handle ) ) m_notifySocket->removeContact( handle, MSNProtocol::BL, TQString(), TQString() ); - else if ( !m_allowList.tqcontains( handle ) ) + else if ( !m_allowList.contains( handle ) ) m_notifySocket->addContact( handle, MSNProtocol::AL, TQString(), TQString(), TQString() ); } @@ -1351,7 +1351,7 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrList<Kopet if( !groupId.isEmpty() ) { // Something got corrupted on contactlist.xml - if( !m_groupList.tqcontains(groupId) ) + if( !m_groupList.contains(groupId) ) { // Clear the group plugin data. group->setPluginData( protocol() , accountId() + " id" , TQString()); @@ -1365,7 +1365,7 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrList<Kopet else { // Add the group that the contact belong to add it when we will receive the contact GUID. - if( tmp_addNewContactToGroup.tqcontains( contactId ) ) + if( tmp_addNewContactToGroup.contains( contactId ) ) tmp_addNewContactToGroup[contactId].append(groupId); else tmp_addNewContactToGroup.insert(contactId, TQStringList(groupId) ); diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 6e0bc03e..74c2bd63 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -316,7 +316,7 @@ void MSNChatSession::slotActionInviteAboutToShow() TQDictIterator<Kopete::Contact> it( account()->contacts() ); for( ; it.current(); ++it ) { - if( !members().tqcontains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) + if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { KAction *a=new KopeteContactAction( it.current(), this, TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); @@ -359,7 +359,7 @@ void MSNChatSession::slotInviteOtherContact() if( !ok ) return; - if( handle.tqcontains('@') != 1 || handle.tqcontains('.') <1) + if( handle.contains('@') != 1 || handle.contains('.') <1) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("<qt>You must enter a valid email address.</qt>"), i18n("MSN Plugin")); @@ -399,7 +399,7 @@ void MSNChatSession::sendMessageQueue() void MSNChatSession::slotAcknowledgement(unsigned int id, bool ack) { - if ( !m_messagesSent.tqcontains( id ) ) + if ( !m_messagesSent.contains( id ) ) { // This is maybe a ACK/NAK for a non-messaging message return; @@ -433,14 +433,14 @@ void MSNChatSession::slotInvitation(const TQString &handle, const TQString &msg) rx.search(msg); long unsigned int cookie=rx.cap(1).toUInt(); - if(m_invitations.tqcontains(cookie)) + if(m_invitations.contains(cookie)) { MSNInvitation *msnI=m_invitations[cookie]; msnI->parseInvitation(msg); } - else if( msg.tqcontains("Invitation-Command: INVITE") ) + else if( msg.contains("Invitation-Command: INVITE") ) { - if( msg.tqcontains(MSNFileTransferSocket::applicationID()) ) + if( msg.contains(MSNFileTransferSocket::applicationID()) ) { MSNFileTransferSocket *MFTS=new MSNFileTransferSocket(myself()->account()->accountId(),c,true,this); connect(MFTS, TQT_SIGNAL( done(MSNInvitation*) ) , this , TQT_SLOT( invitationDone(MSNInvitation*) )); @@ -603,7 +603,7 @@ void MSNChatSession::slotDebugRawCommand() if( result == TQDialog::Accepted && m_chatService ) { m_chatService->sendCommand( dlg->command(), dlg->params(), - dlg->addId(), dlg->msg().tqreplace("\n","\r\n").utf8() ); + dlg->addId(), dlg->msg().replace("\n","\r\n").utf8() ); } delete dlg; #endif diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 8e7742f0..cb4bfaa6 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -317,7 +317,7 @@ void MSNContact::setClientFlags( uint flags ) setProperty( MSNProtocol::protocol()->propClient , i18n("Windows Mobile") ); else if( flags & MSNProtocol::MSNMobileDevice) setProperty( MSNProtocol::protocol()->propClient , i18n("MSN Mobile") ); - else if( m_obj.tqcontains("kopete") ) + else if( m_obj.contains("kopete") ) setProperty( MSNProtocol::protocol()->propClient , i18n("Kopete") ); } @@ -458,7 +458,7 @@ void MSNContact::sync( unsigned int changed ) if( !group->pluginData( protocol() , account()->accountId() + " id" ).isEmpty() ) { TQString Gid=group->pluginData( protocol(), account()->accountId() + " id" ); - if( !static_cast<MSNAccount*>( account() )->m_groupList.tqcontains(Gid) ) + if( !static_cast<MSNAccount*>( account() )->m_groupList.contains(Gid) ) { // ohoh! something is corrupted on the contactlist.xml // anyway, we never should add a contact to an unexisting group on the server. // This shouln't be possible anymore 2004-06-10 -Olivier @@ -476,7 +476,7 @@ void MSNContact::sync( unsigned int changed ) m_moving=true; } } - else if( !m_serverGroups.tqcontains(Gid) ) + else if( !m_serverGroups.contains(Gid) ) { //Add the contact to the group on the server notify->addContact( contactId(), MSNProtocol::FL, TQString(), guid(), Gid ); @@ -506,7 +506,7 @@ void MSNContact::sync( unsigned int changed ) for( TQMap<TQString, Kopete::Group*>::Iterator it = m_serverGroups.begin();(count > 1 && it != m_serverGroups.end()); ++it ) { - if( !static_cast<MSNAccount*>( account() )->m_groupList.tqcontains(it.key()) ) + if( !static_cast<MSNAccount*>( account() )->m_groupList.contains(it.key()) ) { // ohoh! something is corrupted on the contactlist.xml // anyway, we never should add a contact to an unexisting group on the server. @@ -523,7 +523,7 @@ void MSNContact::sync( unsigned int changed ) Kopete::Group *group=it.data(); if(!group) //we can't trust the data of it() see in MSNProtocol::deserializeContact why group=static_cast<MSNAccount*>( account() )->m_groupList[it.key()]; - if( !metaContact()->groups().tqcontains(group) ) + if( !metaContact()->groups().contains(group) ) { m_moving=true; notify->removeContact( contactId(), MSNProtocol::FL, guid(), it.key() ); @@ -672,7 +672,7 @@ void MSNContact::setDisplayPicture(KTempFile *f) //copy the temp file somewere else. // in a better world, the file could be dirrectly wrote at the correct location. // but the custom emoticon code is to deeply merged in the display picture code while it could be separated. - TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; KIO::Job *j=KIO::file_move( KURL::fromPathOrURL( f->name() ) , KURL::fromPathOrURL( newlocation ) , -1, true /*overwrite*/ , false /*resume*/ , false /*showProgressInfo*/ ); @@ -685,7 +685,7 @@ void MSNContact::setDisplayPicture(KTempFile *f) void MSNContact::slotEmitDisplayPictureChanged() { - TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; setProperty( Kopete::Global::Properties::self()->photo() , newlocation ); emit displayPictureChanged(); } diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp index c08bd3eb..31d16aeb 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.cpp +++ b/kopete/protocols/msn/msnfiletransfersocket.cpp @@ -331,7 +331,7 @@ TQString MSNFileTransferSocket::invitationHead() TQTimer::singleShot( 10 * 60000, this, TQT_SLOT(slotTimer()) ); //the user has 10 mins to accept or refuse or initiate the transfer return TQString( MSNInvitation::invitationHead()+ - "Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.tqfindRev( '/' ) - 1 ) +"\r\n" + "Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.findRev( '/' ) - 1 ) +"\r\n" "Application-FileSize: "+ TQString::number(size()) +"\r\n\r\n").utf8(); } @@ -340,7 +340,7 @@ void MSNFileTransferSocket::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") ) { rx=TQRegExp("Application-File: ([^\\r\\n]*)"); rx.search(msg); @@ -357,7 +357,7 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg) TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), this, TQT_SLOT( slotFileTransferRefused( const Kopete::FileTransferInfo & ) ) ); } - else if( msg.tqcontains("Invitation-Command: ACCEPT") ) + else if( msg.contains("Invitation-Command: ACCEPT") ) { if(incoming()) { diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index 7db79dd1..41d2d834 100644 --- a/kopete/protocols/msn/msnnotifysocket.cpp +++ b/kopete/protocols/msn/msnnotifysocket.cpp @@ -108,7 +108,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) kdDebug(14140) << k_funcinfo << endl; TQString handle; - if(m_tmpHandles.tqcontains(id)) + if(m_tmpHandles.contains(id)) handle=m_tmpHandles[id]; TQString msg; @@ -465,12 +465,12 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString if( list == "FL" ) { // Removing a contact - if( data.tqcontains( ' ' ) < 2 ) + if( data.contains( ' ' ) < 2 ) { contactGuid = data.section( ' ', 1, 1 ); } // Removing a contact from a group - else if( data.tqcontains( ' ' ) < 3 ) + else if( data.contains( ' ' ) < 3 ) { contactGuid = data.section( ' ', 1, 1 ); groupGuid = data.section( ' ', 2, 2 ); @@ -633,7 +633,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString "<body onload=\"document.pform.submit(); \">\n" "<form name=\"pform\" action=\"" + from_action_url + "\" method=\"POST\">\n" "<input type=\"hidden\" name=\"mode\" value=\"ttl\">\n" - "<input type=\"hidden\" name=\"login\" value=\"" + UserID.left( UserID.tqfind('@') ) + "\">\n" + "<input type=\"hidden\" name=\"login\" value=\"" + UserID.left( UserID.find('@') ) + "\">\n" "<input type=\"hidden\" name=\"username\" value=\"" + UserID + "\">\n" "<input type=\"hidden\" name=\"sid\" value=\"" + m_sid + "\">\n" "<input type=\"hidden\" name=\"kv\" value=\"" + m_kv + "\">\n" @@ -735,7 +735,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) { TQString msg = TQString::fromUtf8(bytes, bytes.size()); - if(msg.tqcontains("text/x-msmsgsinitialmdatanotification")) + if(msg.contains("text/x-msmsgsinitialmdatanotification")) { //Mail-Data: <MD><E><I>301</I><IU>1</IU><O>4</O><OU>2</OU></E><Q><TQTM>409600</TQTM><TQNM>204800</TQNM></Q></MD> // MD - Mail Data @@ -758,14 +758,14 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); } } - else if(msg.tqcontains("text/x-msmsgsactivemailnotification")) + else if(msg.contains("text/x-msmsgsactivemailnotification")) { //this sends the server if mails are deleted - TQString m = msg.right(msg.length() - msg.tqfind("Message-Delta:") ); - m = m.left(msg.tqfind("\r\n")); - mailCount = mailCount - m.right(m.length() -m.tqfind(" ")-1).toUInt(); + TQString m = msg.right(msg.length() - msg.find("Message-Delta:") ); + m = m.left(msg.find("\r\n")); + mailCount = mailCount - m.right(m.length() -m.find(" ")-1).toUInt(); } - else if(msg.tqcontains("text/x-msmsgsemailnotification")) + else if(msg.contains("text/x-msmsgsemailnotification")) { //this sends the server if a new mail has arrived TQRegExp rx("From-Addr: ([A-Za-z0-9@._\\-]*)"); @@ -779,28 +779,28 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) 0 , 0 , i18n( "Open Inbox..." ) ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); } - else if(msg.tqcontains("text/x-msmsgsprofile")) + else if(msg.contains("text/x-msmsgsprofile")) { //Hotmail profile - if(msg.tqcontains("MSPAuth:")) + if(msg.contains("MSPAuth:")) { TQRegExp rx("MSPAuth: ([A-Za-z0-9$!*]*)"); rx.search(msg); m_MSPAuth=rx.cap(1); } - if(msg.tqcontains("sid:")) + if(msg.contains("sid:")) { TQRegExp rx("sid: ([0-9]*)"); rx.search(msg); m_sid=rx.cap(1); } - if(msg.tqcontains("kv:")) + if(msg.contains("kv:")) { TQRegExp rx("kv: ([0-9]*)"); rx.search(msg); m_kv=rx.cap(1); } - if(msg.tqcontains("LoginTime:")) + if(msg.contains("LoginTime:")) { TQRegExp rx("LoginTime: ([0-9]*)"); rx.search(msg); @@ -812,14 +812,14 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) time(&actualTime); m_loginTime=TQString::number((unsigned long)actualTime); } - if(msg.tqcontains("EmailEnabled:")) + if(msg.contains("EmailEnabled:")) { TQRegExp rx("EmailEnabled: ([0-9]*)"); rx.search(msg); m_isHotmailAccount = (rx.cap(1).toUInt() == 1); emit hotmailSeted(m_isHotmailAccount); } - if(msg.tqcontains("ClientIP:")) + if(msg.contains("ClientIP:")) { TQRegExp rx("ClientIP: ([0-9.]*)"); rx.search(msg); @@ -829,7 +829,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) // We are logged when we receive the initial profile from Hotmail. m_isLogged = true; } - else if (msg.tqcontains("NOTIFICATION")) + else if (msg.contains("NOTIFICATION")) { // MSN alert (i.e. NOTIFICATION) [for docs see http://www.hypothetic.org/docs/msn/client/notification.php] // format of msg is as follows: @@ -849,7 +849,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) TQString notificationDOMAsString(msg); TQRegExp rx( "&(?!amp;)" ); // match ampersands but not & - notificationDOMAsString.tqreplace(rx, "&"); + notificationDOMAsString.replace(rx, "&"); TQDomDocument alertDOM; alertDOM.setContent(notificationDOMAsString); @@ -1008,7 +1008,7 @@ TQString MSNNotifySocket::processCurrentMedia( const TQString &mediaXmlElement ) currentMedia = format; for(uint i=0; i<formatterStrings.size(); i++) { - currentMedia = currentMedia.tqreplace(TQString("{%1}").tqarg(i), formatterStrings[i]); + currentMedia = currentMedia.replace(TQString("{%1}").tqarg(i), formatterStrings[i]); } if( type == TQString::fromUtf8("Music") ) diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp index 587826ad..4337e9b2 100644 --- a/kopete/protocols/msn/msnprotocol.cpp +++ b/kopete/protocols/msn/msnprotocol.cpp @@ -104,9 +104,9 @@ Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaConta c->setInfo( "PHM" , serializedData[ "PHM" ] ); c->setProperty( propGuid, contactGuid ); - c->setBlocked( (bool)(lists.tqcontains('B')) ); - c->setAllowed( (bool)(lists.tqcontains('A')) ); - c->setReversed( (bool)(lists.tqcontains('R')) ); + c->setBlocked( (bool)(lists.contains('B')) ); + c->setAllowed( (bool)(lists.contains('A')) ); + c->setReversed( (bool)(lists.contains('R')) ); return c; } @@ -154,7 +154,7 @@ MSNProtocol* MSNProtocol::protocol() bool MSNProtocol::validContactId(const TQString& userid) { - return ( userid.tqcontains('@') ==1 && userid.tqcontains('.') >=1 && userid.tqcontains(' ') == 0); + return ( userid.contains('@') ==1 && userid.contains('.') >=1 && userid.contains(' ') == 0); } TQImage MSNProtocol::scalePicture(const TQImage &picture) diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp index 681ce8d4..9e28beb2 100644 --- a/kopete/protocols/msn/msnsecureloginhandler.cpp +++ b/kopete/protocols/msn/msnsecureloginhandler.cpp @@ -74,7 +74,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob) "OrgVerb=GET," "OrgURL=http%3A%2F%2Fmessenger%2Emsn%2Ecom," "sign-in=" + KURL::encode_string(m_accountId) + - ",pwd=" + KURL::encode_string( m_password ).tqreplace(',',"%2C") + + ",pwd=" + KURL::encode_string( m_password ).replace(',',"%2C") + "," + m_authentification + "\r\n"; // warning, this debug contains the password @@ -105,7 +105,7 @@ void MSNSecureLoginHandler::slotTweenerReceived(KIO::Job *authJob) // kdDebug(14140) << k_funcinfo << "HTTP headers: " << httpHeaders << endl; // Check if we get "401 Unauthorized", thats means it's a bad password. - if(httpHeaders.tqcontains(TQString::fromUtf8("401 Unauthorized"))) + if(httpHeaders.contains(TQString::fromUtf8("401 Unauthorized"))) { // kdDebug(14140) << k_funcinfo << "MSN Login Bad password." << endl; emit loginBadPassword(); diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index 3e5d84fd..6dc8fa94 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -249,12 +249,12 @@ void MSNSocket::slotDataReceived() // Check if all data has arrived. rawData = TQString(TQCString(buffer, avail + 1)); - bool headers = (rawData.tqfind(TQRegExp("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)")) != -1); + bool headers = (rawData.find(TQRegExp("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)")) != -1); if(headers) { // The http header packet arrived. - int endOfHeaders = rawData.tqfind("\r\n\r\n"); + int endOfHeaders = rawData.find("\r\n\r\n"); if((endOfHeaders + 4) == avail) { // Only the response headers data is included. @@ -314,17 +314,17 @@ void MSNSocket::slotDataReceived() // Retrieve the X-MSN-Messenger header. TQString header = response.getHeaders()->getValue("X-MSN-Messenger"); - TQStringList parts = TQStringList::split(";", header.tqreplace(" ", "")); + TQStringList parts = TQStringList::split(";", header.replace(" ", "")); if(!header.isNull() && (parts.count() >= 2)) { - if(parts[0].tqfind("SessionID", 0) != -1) + if(parts[0].find("SessionID", 0) != -1) { // Assign the session id. m_sessionId = parts[0].section("=", 1, 1); }else error = true; - if(parts[1].tqfind("GW-IP", 0) != -1) + if(parts[1].find("GW-IP", 0) != -1) { // Assign the gateway IP address. m_gwip = parts[1].section("=", 1, 1); @@ -333,7 +333,7 @@ void MSNSocket::slotDataReceived() if(parts.count() > 2) - if((parts[2].tqfind("Session", 0) != -1) && (parts[2].section("=", 1, 1) == "close")) + if((parts[2].find("Session", 0) != -1) && (parts[2].section("=", 1, 1) == "close")) { // The http session has been closed by the server, disconnect. kdDebug(14140) << k_funcinfo << "Session closed." << endl; @@ -390,7 +390,7 @@ void MSNSocket::slotDataReceived() // all MSN commands start with one or more uppercase characters. // For now just check the first three chars, let's see how accurate it is. // Additionally, if we receive an MSN-P2P packet, strip off anything after the P2P header. - rawData = TQString( TQCString( buffer, ((!m_useHttp)? avail : ret) + 1 ) ).stripWhiteSpace().tqreplace( + rawData = TQString( TQCString( buffer, ((!m_useHttp)? avail : ret) + 1 ) ).stripWhiteSpace().replace( TQRegExp( "(P2P-Dest:.[a-zA-Z@.]*).*" ), "\\1\n\n(Stripped binary data)" ); bool isBinary = false; @@ -446,7 +446,7 @@ void MSNSocket::slotReadLine() if ( index != -1 ) { TQString command = TQString::fromUtf8( m_buffer.take( index + 2 ), index ); - command.tqreplace( "\r\n", "" ); + command.replace( "\r\n", "" ); //kdDebug( 14141 ) << k_funcinfo << command << endl; // Don't block the GUI while parsing data, only do a single line! @@ -502,7 +502,7 @@ bool MSNSocket::pollReadBlock() void MSNSocket::parseLine( const TQString &str ) { TQString cmd = str.section( ' ', 0, 0 ); - TQString data = str.section( ' ', 2 ).tqreplace( "\r\n" , "" ); + TQString data = str.section( ' ', 2 ).replace( "\r\n" , "" ); bool isNum; uint id = str.section( ' ', 1, 1 ).toUInt( &isNum ); @@ -517,7 +517,7 @@ void MSNSocket::parseLine( const TQString &str ) //kdDebug( 14140 ) << k_funcinfo << "Parsing command " << cmd << " (ID " << id << "): '" << data << "'" << endl; - data.tqreplace( "\r\n", "" ); + data.replace( "\r\n", "" ); bool isError; uint errorCode = cmd.toUInt( &isError ); if ( isError ) @@ -725,7 +725,7 @@ void MSNSocket::slotReadyWrite() // Simple check to avoid dumping the binary data from the icons and emoticons to kdDebug: // When sending an MSN-P2P packet, strip off anything after the P2P header. - TQString debugData = TQString( *it ).stripWhiteSpace().tqreplace( + TQString debugData = TQString( *it ).stripWhiteSpace().replace( TQRegExp( "(P2P-Dest:.[a-zA-Z@.]*).*" ), "\\1\n\n(Stripped binary data)" ); kdDebug( 14141 ) << k_funcinfo << "Sending command: " << debugData << endl; @@ -790,10 +790,10 @@ TQString MSNSocket::unescape( const TQString &str ) { TQString str2 = KURL::decode_string( str, 106 ); //remove msn+ colors code - str2 = str2.tqreplace( TQRegExp("[\\x1-\\x8]"), "" ); // old msn+ colors + str2 = str2.replace( TQRegExp("[\\x1-\\x8]"), "" ); // old msn+ colors // added by kaoul <erwin.kwolek at gmail.com> - str2 = str2.tqreplace( TQRegExp("\\xB7[&@\'#0]"),""); // dot ... - str2 = str2.tqreplace( TQRegExp("\\xB7\\$,?\\d{1,2}"),""); // dot dollar (comma)? 0-99 + str2 = str2.replace( TQRegExp("\\xB7[&@\'#0]"),""); // dot ... + str2 = str2.replace( TQRegExp("\\xB7\\$,?\\d{1,2}"),""); // dot dollar (comma)? 0-99 return str2; } @@ -1031,7 +1031,7 @@ MSNSocket::WebResponse::WebResponse(const TQByteArray& bytes) // Parse the HTTP status header TQRegExp re("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)"); - headerEnd = data.tqfind("\r\n"); + headerEnd = data.find("\r\n"); header = data.left( (headerEnd == -1) ? 20 : headerEnd ); re.search(header); @@ -1039,7 +1039,7 @@ MSNSocket::WebResponse::WebResponse(const TQByteArray& bytes) m_statusDescription = re.cap(2); // Remove the web response status header. - data = data.mid(headerEnd + 2, (data.tqfind("\r\n\r\n") + 2) - (headerEnd + 2)); + data = data.mid(headerEnd + 2, (data.find("\r\n\r\n") + 2) - (headerEnd + 2)); // Create a MimeMessage, removing the HTTP status header m_headers = new MimeMessage(data); diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index b0052552..f5cc890a 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -93,8 +93,8 @@ void MSNSwitchBoardSocket::connectToSwitchBoard(TQString ID, TQString address, T m_ID = ID; m_auth = auth; - TQString server = address.left( address.tqfind( ":" ) ); - uint port = address.right( address.length() - address.tqfindRev( ":" ) - 1 ).toUInt(); + TQString server = address.left( address.find( ":" ) ); + uint port = address.right( address.length() - address.findRev( ":" ) - 1 ).toUInt(); TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ), this, TQT_SLOT(slotReadMessage( const TQByteArray & ) ) ); @@ -191,7 +191,7 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint id , // new user joins the chat, update user in chat list TQString handle = data.section( ' ', 0, 0 ); TQString screenname = unescape(data.section( ' ', 1, 1 )); - if( !m_chatMembers.tqcontains( handle ) ) + if( !m_chatMembers.contains( handle ) ) m_chatMembers.append( handle ); emit userJoined( handle, screenname, false ); } @@ -199,7 +199,7 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint id , { // we have joined a multi chat session- this are the users in this chat TQString handle = data.section( ' ', 2, 2 ); - if( !m_chatMembers.tqcontains( handle ) ) + if( !m_chatMembers.contains( handle ) ) m_chatMembers.append( handle ); TQString screenname = unescape(data.section( ' ', 3, 3)); @@ -214,7 +214,7 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint id , // some has disconnect from chat, update user in chat list cleanQueue(); //in case some message are waiting their emoticons, never mind, send them - TQString handle = data.section( ' ', 0, 0 ).tqreplace( "\r\n" , "" ); + TQString handle = data.section( ' ', 0, 0 ).replace( "\r\n" , "" ); userLeftChat( handle, (data.section( ' ', 1, 1 ) == "1" ) ? i18n("timeout") : TQString() ); } else if( cmd == "MSG" ) @@ -265,13 +265,13 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) else if( type== "text/x-msmsgscontrol" ) { TQString message; - message = msg.right( msg.length() - msg.tqfindRev( " " ) - 1 ); - message = message.tqreplace( "\r\n" ,"" ); + message = msg.right( msg.length() - msg.findRev( " " ) - 1 ); + message = message.replace( "\r\n" ,"" ); emit receivedTypingMsg( message.lower(), true ); } else if(type == "text/x-msnmsgr-datacast") { - if(msg.tqcontains("ID:")) + if(msg.contains("ID:")) { TQRegExp rx("ID: ([0-9]*)"); rx.search(msg); @@ -293,7 +293,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) TQColor fontColor; TQFont font; - if ( msg.tqcontains( "X-MMS-IM-Format" ) ) + if ( msg.contains( "X-MMS-IM-Format" ) ) { TQString fontName; TQString fontInfo; @@ -329,7 +329,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) } } - fontName = parseFontAttr(fontInfo, "FN").tqreplace( "%20" , " " ); + fontName = parseFontAttr(fontInfo, "FN").replace( "%20" , " " ); // Some clients like Trillian and Kopete itself send a font // name of 'MS Serif' since MS changed the server to @@ -343,10 +343,10 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) font = TQFont( fontName, parseFontAttr( fontInfo, "PF" ).toInt(), // font size - ef.tqcontains( 'B' ) ? TQFont::Bold : TQFont::Normal, - ef.tqcontains( 'I' ) ); - font.setUnderline(ef.tqcontains( 'U' )); - font.setStrikeOut(ef.tqcontains( 'S' )); + ef.contains( 'B' ) ? TQFont::Bold : TQFont::Normal, + ef.contains( 'I' ) ); + font.setUnderline(ef.contains( 'U' )); + font.setStrikeOut(ef.contains( 'S' )); } } @@ -359,17 +359,17 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) others.append( m_account->contacts()[ *it2 ] ); } - TQString message=msg.right( msg.length() - msg.tqfind("\r\n\r\n") - 4 ); + TQString message=msg.right( msg.length() - msg.find("\r\n\r\n") - 4 ); //Stupid MSN PLUS colors code. message with incorrect charactere are not showed correctly in the chatwindow. //TODO: parse theses one to show the color too in Kopete - message.tqreplace("\3","").tqreplace("\4","").tqreplace("\2","").tqreplace("\5","").tqreplace("\6","").tqreplace("\7",""); + message.replace("\3","").replace("\4","").replace("\2","").replace("\5","").replace("\6","").replace("\7",""); if(!m_account->contacts()[m_msgHandle]) { //this may happens if the contact has been deleted. kdDebug(14140) << k_funcinfo <<"WARNING: contact is null, adding it" <<endl; - if( !m_chatMembers.tqcontains( m_msgHandle ) ) + if( !m_chatMembers.contains( m_msgHandle ) ) m_chatMembers.append( m_msgHandle ); emit userJoined( m_msgHandle , m_msgHandle , false); } @@ -432,7 +432,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) TQString txt=rx.cap(1); kdDebug(14140) << k_funcinfo << "emoticon: " << txt << " msnobj: " << msnobj<< endl; - if( !m_emoticons.tqcontains(msnobj) || !m_emoticons[msnobj].second ) + if( !m_emoticons.contains(msnobj) || !m_emoticons[msnobj].second ) { m_emoticons.insert(msnobj, tqMakePair(txt,(KTempFile*)0L)); MSNContact *c=static_cast<MSNContact*>(m_account->contacts()[m_msgHandle]); @@ -493,7 +493,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) } - else if(type == "image/gif" || msg.tqcontains("Message-ID:")) + else if(type == "image/gif" || msg.contains("Message-ID:")) { // Incoming inkformatgif. TQRegExp regex("Message-ID: \\{([0-9A-F\\-]*)\\}"); @@ -536,7 +536,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) if(!messageId.isNull()) { - if(m_inkMessageBuffer.tqcontains(messageId)) + if(m_inkMessageBuffer.contains(messageId)) { if(chunks.isNull()) { @@ -660,7 +660,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) } #if 0 //this is to test webcam - if(msg.plainBody().tqcontains("/webcam")) + if(msg.plainBody().contains("/webcam")) { PeerDispatcher()->startWebcam( m_myHandle , m_msgHandle); return -3; @@ -678,7 +678,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) { for ( TQStringList::const_iterator itr2 = itr.data().constBegin(); itr2 != itr.data().constEnd(); ++itr2 ) { - if ( msg.plainBody().tqcontains( *itr2 ) ) + if ( msg.plainBody().contains( *itr2 ) ) sendCustomEmoticon( *itr2, itr.key() ); } } @@ -748,7 +748,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) head += "; RL=1"; head += "\r\n"; - TQString message= msg.plainBody().tqreplace( "\n" , "\r\n" ); + TQString message= msg.plainBody().replace( "\n" , "\r\n" ); //-- Check if the message isn't too big, TODO: do that at the libkopete level. int len_H=head.utf8().length(); // != head.length() because i need the size in butes and @@ -888,7 +888,7 @@ void MSNSwitchBoardSocket::userLeftChat(const TQString& handle , const TQString { emit userLeft( handle, reason ); - if( m_chatMembers.tqcontains( handle ) ) + if( m_chatMembers.contains( handle ) ) m_chatMembers.remove( handle ); if(m_chatMembers.isEmpty()) @@ -907,7 +907,7 @@ void MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin { kdDebug(14141) << k_funcinfo << msnObj << endl; - if(m_emoticons.tqcontains(msnObj)) + if(m_emoticons.contains(msnObj)) { //it's an emoticon m_emoticons[msnObj].second=file; @@ -941,7 +941,7 @@ void MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin { //this may happens if the contact has been deleted. kdDebug(14140) << k_funcinfo <<"WARNING: contact is null, adding it" <<endl; - if( !m_chatMembers.tqcontains( m_msgHandle ) ) + if( !m_chatMembers.contains( m_msgHandle ) ) m_chatMembers.append( m_msgHandle ); emit userJoined( m_msgHandle , m_msgHandle , false); } @@ -976,7 +976,7 @@ void MSNSwitchBoardSocket::slotIncomingFileTransfer(const TQString& from, const { //this may happens if the contact has been deleted. kdDebug(14140) << k_funcinfo <<"WARNING: contact is null, adding it" <<endl; - if( !m_chatMembers.tqcontains( m_msgHandle ) ) + if( !m_chatMembers.contains( m_msgHandle ) ) m_chatMembers.append( m_msgHandle ); emit userJoined( m_msgHandle , m_msgHandle , false); } @@ -1013,7 +1013,7 @@ Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kms { TQString es=TQStyleSheet::escape(it.data().first); KTempFile *f=it.data().second; - if(message.tqcontains(es) && f) + if(message.contains(es) && f) { TQString imgPath = f->name(); TQImage iconImage(imgPath); @@ -1021,11 +1021,11 @@ Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kms * emoticons like that. So, in that case, we show like the MSN client */ #if 0 TQString em = TQRegExp::escape( es ); - message.tqreplace( TQRegExp(TQString::tqfromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)), + message.replace( TQRegExp(TQString::tqfromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)), TQString::tqfromLatin1("\\1<img align=\"center\" width=\"") + #endif //match any occurence which is not in a html tag. - message.tqreplace( TQRegExp(TQString::tqfromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))), + message.replace( TQRegExp(TQString::tqfromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))), TQString::tqfromLatin1("<img align=\"center\" width=\"") + TQString::number(iconImage.width()) + TQString::tqfromLatin1("\" height=\"") + @@ -1060,12 +1060,12 @@ TQString MSNSwitchBoardSocket::parseFontAttr(TQString str, TQString attr) TQString tmp; int pos1=0, pos2=0; - pos1 = str.tqfind(attr + "="); + pos1 = str.find(attr + "="); if (pos1 == -1) return ""; - pos2 = str.tqfind(";", pos1+3); + pos2 = str.find(";", pos1+3); if (pos2 == -1) tmp = str.mid(pos1+3, str.length() - pos1 - 3); diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp index 6b913816..593cfc74 100644 --- a/kopete/protocols/msn/transport.cpp +++ b/kopete/protocols/msn/transport.cpp @@ -51,7 +51,7 @@ TransportBridge* Transport::getBridge (const TQString& to, TQ_UINT16 port, Trans { TransportBridge *bridge = 0l; KInetSocketAddress address; - if (mAddresses.tqcontains(to)) + if (mAddresses.contains(to)) { address = mAddresses[to]; } diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index b165c9f4..aa16e07e 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -159,7 +159,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->ui->m_blp->setChecked( config->readEntry( "BLP" ) == "BL" ); d->pictureUrl = locateLocal( "appdata", "msnpicture-" + - account->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" ); + account->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" ); d->ui->m_displayPicture->setPixmap( d->pictureUrl ); d->ui->m_useDisplayPicture->setChecked( config->readBoolEntry( "exportCustomPicture" )); @@ -227,7 +227,7 @@ Kopete::Account * MSNEditAccountWidget::apply() if( d->ui->m_useDisplayPicture->isChecked() && !d->pictureData.isNull() ) { d->pictureUrl = locateLocal( "appdata", "msnpicture-" + - account()->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" ); + account()->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" ); if ( d->pictureData.save( d->pictureUrl, "PNG" ) ) { static_cast<MSNAccount *>( account() )->setPictureUrl( d->pictureUrl ); diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index 2c2023c2..584ae803 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -312,13 +312,13 @@ void Webcam::processMessage(const Message& message) makeSIPMessage(producerxml); } } - else if(m_content.tqcontains("<producer>") || m_content.tqcontains("<viewer>")) + else if(m_content.contains("<producer>") || m_content.contains("<viewer>")) { TQRegExp rx("<rid>([0-9]*)</rid>.*<session>([0-9]*)</session>"); rx.search(m_content); TQString rid=rx.cap(1); TQString sess=rx.cap(2); - if(m_content.tqcontains("<producer>")) + if(m_content.contains("<producer>")) { TQString viewerxml=xml(sess.toUInt() , rid.toUInt()); @@ -370,7 +370,7 @@ void Webcam::processMessage(const Message& message) while(true) { an++; - if(!m_content.tqcontains( TQString("<tcpipaddress%1>").tqarg(an) )) + if(!m_content.contains( TQString("<tcpipaddress%1>").tqarg(an) )) break; rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").tqarg(an).tqarg(an)); rx.search(m_content); @@ -416,7 +416,7 @@ void Webcam::processMessage(const Message& message) kdDebug(14140) << k_funcinfo << "connect to " << sock << " - "<< sock->peerAddress().toString() << " ; " << sock->localAddress().toString() << endl; } } - else if(m_content.tqcontains("receivedViewerData")) + else if(m_content.contains("receivedViewerData")) { //I'm happy you received the xml i sent, really. } diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index 201d7d01..cc890add 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -127,53 +127,53 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio //font-size:xxpt -> <font ptsize=xx> s=message.escapedBody(); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), TQString::tqfromLatin1("<style>\\1;\"\\2</style>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("\\2")); //okay now change the <font ptsize="xx"> to <font size="xx"> //0-9 are size 1 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")), TQString::tqfromLatin1("<font size=\"1\">")); //10-11 are size 2 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")), TQString::tqfromLatin1("<font size=\"2\">")); //12-13 are size 3 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")), TQString::tqfromLatin1("<font size=\"3\">")); //14-16 are size 4 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")), TQString::tqfromLatin1("<font size=\"4\">")); //17-22 are size 5 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), TQString::tqfromLatin1("<font size=\"5\">")); //23-29 are size 6 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">")); //30- (and any I missed) are size 7 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">")); - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") ); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") ); kdDebug(14190) << k_funcinfo << "sending " << s << endl; @@ -280,7 +280,7 @@ TQString AIMAccount::sanitizedMessage( const TQString& message ) continue; if ( fontEl.hasAttribute( "back" ) ) { - kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Found attribute to tqreplace. Doing replacement" << endl; + kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Found attribute to replace. Doing replacement" << endl; TQString backgroundColor = fontEl.attribute( "back" ); backgroundColor.insert( 0, "background-color: " ); backgroundColor.append( ';' ); diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index 7f14d3ba..c71fed4d 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -127,16 +127,16 @@ void AIMContact::setAwayMessage(const TQString &message) kdDebug(14152) << k_funcinfo << "Called for '" << contactId() << "', away msg='" << message << "'" << endl; TQString filteredMessage = message; - filteredMessage.tqreplace( + filteredMessage.replace( TQRegExp(TQString::tqfromLatin1("<[hH][tT][mM][lL].*>(.*)</[hH][tT][mM][lL]>")), TQString::tqfromLatin1("\\1")); - filteredMessage.tqreplace( + filteredMessage.replace( TQRegExp(TQString::tqfromLatin1("<[bB][oO][dD][yY].*>(.*)</[bB][oO][dD][yY]>")), TQString::tqfromLatin1("\\1") ); TQRegExp fontRemover( TQString::tqfromLatin1("<[fF][oO][nN][tT].*>(.*)</[fF][oO][nN][tT]>") ); fontRemover.setMinimal(true); - while ( filteredMessage.tqfind( fontRemover ) != -1 ) - filteredMessage.tqreplace( fontRemover, TQString::tqfromLatin1("\\1") ); + while ( filteredMessage.find( fontRemover ) != -1 ) + filteredMessage.replace( fontRemover, TQString::tqfromLatin1("\\1") ); setProperty(mProtocol->awayMessage, filteredMessage); } @@ -392,56 +392,56 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *) //font-size:xxpt -> <font ptsize=xx> s=message.escapedBody(); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")), TQString::tqfromLatin1("<style>\\1;\"\\2</style>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>")); - s.tqreplace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")), + s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")), TQString::tqfromLatin1("\\2")); //okay now change the <font ptsize="xx"> to <font size="xx"> //0-9 are size 1 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")), TQString::tqfromLatin1("<font size=\"1\">")); //10-11 are size 2 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")), TQString::tqfromLatin1("<font size=\"2\">")); //12-13 are size 3 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")), TQString::tqfromLatin1("<font size=\"3\">")); //14-16 are size 4 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")), TQString::tqfromLatin1("<font size=\"4\">")); //17-22 are size 5 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")), TQString::tqfromLatin1("<font size=\"5\">")); //23-29 are size 6 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">")); //30- (and any I missed) are size 7 - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">")); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">")); // strip left over line break s.remove(TQRegExp(TQString::tqfromLatin1("<br\b[^>]*>$"))); - s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") ); + s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") ); // strip left over line break s.remove( TQRegExp( TQString::tqfromLatin1( "<br>$" ) ) ); diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index 0808fde9..b3d4205f 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.cpp +++ b/kopete/protocols/oscar/aim/aimprotocol.cpp @@ -81,54 +81,54 @@ void AIMProtocolHandler::handleURL(const KURL &url) const TQString command = url.path(); TQString realCommand, firstParam, secondParam; bool needContactAddition = false; - if ( command.tqfind( "goim", 0, false ) != -1 ) + if ( command.find( "goim", 0, false ) != -1 ) { realCommand = "goim"; kdDebug(14152) << k_funcinfo << "Handling send IM request" << endl; command.remove(0,4); - if ( command.tqfind( "?screenname=", 0, false ) == -1 ) + if ( command.find( "?screenname=", 0, false ) == -1 ) { kdWarning(14152) << k_funcinfo << "Unhandled AIM URI:" << url.url() << endl; return; } command.remove( 0, 12 ); - int andSign = command.tqfind( "&" ); + int andSign = command.find( "&" ); if ( andSign > 0 ) command = command.left( andSign ); firstParam = command; - firstParam.tqreplace( "+", " " ); + firstParam.replace( "+", " " ); needContactAddition = true; } else - if ( command.tqfind( "addbuddy", 0, false ) != -1 ) + if ( command.find( "addbuddy", 0, false ) != -1 ) { realCommand = "addbuddy"; kdDebug(14152) << k_funcinfo << "Handling AIM add buddy request" << endl; command.remove( 0, 8 ); - if ( command.tqfind( "?screenname=", 0, false ) == -1 ) + if ( command.find( "?screenname=", 0, false ) == -1 ) { kdWarning(14152) << k_funcinfo << "Unhandled AIM URI:" << url.url() << endl; return; } command.remove(0, 12); - int andSign = command.tqfind("&"); + int andSign = command.find("&"); if ( andSign > 0 ) command = command.left(andSign); - command.tqreplace("+", " "); + command.replace("+", " "); firstParam = command; needContactAddition = true; } else - if ( command.tqfind( "gochat", 0, false ) != -1 ) + if ( command.find( "gochat", 0, false ) != -1 ) { realCommand = "gochat"; kdDebug(14152) << k_funcinfo << "Handling AIM chat room request" << endl; command.remove( 0, 6 ); - if ( command.tqfind( "?RoomName=", 0, false ) == -1 ) + if ( command.find( "?RoomName=", 0, false ) == -1 ) { kdWarning(14152) << "Unhandled AIM URI: " << url.url() << endl; return; @@ -136,7 +136,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const command.remove( 0, 10 ); - int andSign = command.tqfind("&"); + int andSign = command.find("&"); if (andSign > 0) // strip off anything else for now { firstParam = command.left(andSign); @@ -146,7 +146,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const command.remove( 0, 10 ); //remove "&Exchange=" secondParam = command; kdDebug(14152) << k_funcinfo << firstParam << " " << secondParam << endl; - firstParam.tqreplace("+", " "); + firstParam.replace("+", " "); } Kopete::Account *account = 0; @@ -283,7 +283,7 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac uint ssiGid = 0, ssiBid = 0, ssiType = 0xFFFF; TQString ssiName; bool ssiWaitingAuth = false; - if ( serializedData.tqcontains( "ssi_type" ) ) + if ( serializedData.contains( "ssi_type" ) ) { ssiName = serializedData["ssi_name"]; TQString authtqStatus = serializedData["ssi_waitingAuth"]; diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index cc016684..767c519d 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -221,4 +221,4 @@ void AIMUserInfoDialog::slotMailClicked(const TQString&, const TQString &address #include "aimuserinfo.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index 9b13ab64..59979073 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -936,4 +936,4 @@ void ICQContact::slotVisibleTo() } #endif #include "icqcontact.moc" -//kate: indent-mode csands; tab-width 4; tqreplace-tabs off; space-indent off; +//kate: indent-mode csands; tab-width 4; replace-tabs off; space-indent off; diff --git a/kopete/protocols/oscar/icq/icqcontact.h b/kopete/protocols/oscar/icq/icqcontact.h index 6184bf9b..59a87d4d 100644 --- a/kopete/protocols/oscar/icq/icqcontact.h +++ b/kopete/protocols/oscar/icq/icqcontact.h @@ -153,4 +153,4 @@ private slots: }; #endif -//kate: tab-width 4; indent-mode csands; space-indent off; tqreplace-tabs off; +//kate: tab-width 4; indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index e7a5dc6c..a6888cee 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -673,7 +673,7 @@ void ICQProtocol::setComboFromTable(TQComboBox *box, const TQMap<int, TQString> { // kdDebug(14153) << k_funcinfo << "Called." << endl; TQMap<int, TQString>::ConstIterator it; - it = map.tqfind(value); + it = map.find(value); if (!(*it)) return; @@ -770,21 +770,21 @@ Kopete::Contact *ICQProtocol::deserializeContact( Kopete::MetaContact *metaConta uint ssiGid = 0, ssiBid = 0, ssiType = 0xFFFF; TQString ssiName; bool ssiWaitingAuth = false; - if ( serializedData.tqcontains( "ssi_name" ) ) + if ( serializedData.contains( "ssi_name" ) ) ssiName = serializedData["ssi_name"]; - if ( serializedData.tqcontains( "ssi_waitingAuth" ) ) + if ( serializedData.contains( "ssi_waitingAuth" ) ) { TQString authtqStatus = serializedData["ssi_waitingAuth"]; if ( authtqStatus == "true" ) ssiWaitingAuth = true; } - if ( serializedData.tqcontains( "ssi_gid" ) ) + if ( serializedData.contains( "ssi_gid" ) ) ssiGid = serializedData["ssi_gid"].toUInt(); - if ( serializedData.tqcontains( "ssi_bid" ) ) + if ( serializedData.contains( "ssi_bid" ) ) ssiBid = serializedData["ssi_bid"].toUInt(); - if ( serializedData.tqcontains( "ssi_type" ) ) + if ( serializedData.contains( "ssi_type" ) ) ssiType = serializedData["ssi_type"].toUInt(); Oscar::SSI item( ssiName, ssiGid, ssiBid, ssiType, TQValueList<TLV>(), 0 ); diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp index 05d9eb70..84ce12e7 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp @@ -123,4 +123,4 @@ void ICQAddContactPage::searchDialogDestroyed() #include "icqaddcontactpage.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; tqreplace-tabs off; +// kate: indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h index ba658f94..aebd4afa 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h @@ -58,4 +58,4 @@ private: #endif -//kate: space-indent off; tqreplace-tabs off; indent-mode csands; +//kate: space-indent off; replace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp index 874c2075..3feb48bf 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp @@ -187,4 +187,4 @@ void ICQEditAccountWidget::slotOpenRegister() #include "icqeditaccountwidget.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; tqreplace-tabs off; +// kate: indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h index c9affe90..2ef9e703 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h @@ -50,4 +50,4 @@ protected: }; #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; tqreplace-tabs off; +// kate: indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp index 57c551aa..aabf046d 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp @@ -315,6 +315,6 @@ void ICQSearchDialog::newSearch() clearFields(); } -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; #include "icqsearchdialog.moc" diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h index 2dcdd502..f9bfa81e 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h @@ -67,4 +67,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 3c327198..5c1d4500 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -186,5 +186,5 @@ void ICQUserInfoWidget::fillMoreInfo( const ICQMoreUserInfo& ui ) #include "icquserinfowidget.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h index 6fd5d84a..16d1d5d9 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h @@ -56,4 +56,4 @@ private: #endif -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp index 56fa497f..74b6b5f9 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp @@ -220,7 +220,7 @@ void AimLoginTask::handleLoginResponse() { TQString ip = TQString( server.data ); kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(5) [SERVER] " << ip << endl; - int index = ip.tqfind( ':' ); + int index = ip.find( ':' ); m_bosHost = ip.left( index ); ip.remove( 0 , index+1 ); //get rid of the colon and everything before it m_bosPort = ip.left(4); //we only need 4 bytes diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp index b4dfff4a..23231179 100644 --- a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp +++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp @@ -147,4 +147,4 @@ void ChangeVisibilityTask::sendEditEnd() send( t5 ); } -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.h b/kopete/protocols/oscar/liboscar/changevisibilitytask.h index 9d8676b3..33d0c306 100644 --- a/kopete/protocols/oscar/liboscar/changevisibilitytask.h +++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.h @@ -55,4 +55,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index 53e38ed1..41ee73bd 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -1099,7 +1099,7 @@ void Client::requestServerRedirect( WORD family, WORD exchange, if ( !c ) return; - if ( d->redirectionServices.tqfindIndex( family ) == -1 ) + if ( d->redirectionServices.findIndex( family ) == -1 ) d->redirectionServices.append( family ); //don't add families twice if ( d->currentRedirect != 0 ) @@ -1129,7 +1129,7 @@ void Client::haveServerForRedirect( const TQString& host, const TQByteArray& coo ServerRedirectTask* srt = dynamic_cast<ServerRedirectTask*>( o ); //create a new connection and set it up - int colonPos = host.tqfind(':'); + int colonPos = host.find(':'); TQString realHost, realPort; if ( colonPos != -1 ) { @@ -1350,4 +1350,4 @@ bool Client::hasIconConnection( ) const } #include "client.moc" -//kate: tab-width 4; indent-mode csands; space-indent off; tqreplace-tabs off; +//kate: tab-width 4; indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp index d85ca4df..4a09f3f9 100644 --- a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp +++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp @@ -98,7 +98,7 @@ bool CloseConnectionTask::take( Transfer* transfer ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(5) [SERVER] " << TQString( server.data ) << endl; TQString ip = server.data; - int index = ip.tqfind( ':' ); + int index = ip.find( ':' ); m_bosHost = ip.left( index ); ip.remove( 0 , index+1 ); //get rid of the colon and everything before it m_bosPort = ip; diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.h b/kopete/protocols/oscar/liboscar/closeconnectiontask.h index 8bda062f..27830b31 100644 --- a/kopete/protocols/oscar/liboscar/closeconnectiontask.h +++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.h @@ -59,4 +59,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; tab-width 4; tqreplace-tabs off; +//kate: indent-mode csands; space-indent off; tab-width 4; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/connection.cpp b/kopete/protocols/oscar/liboscar/connection.cpp index 03452153..b94a9082 100644 --- a/kopete/protocols/oscar/liboscar/connection.cpp +++ b/kopete/protocols/oscar/liboscar/connection.cpp @@ -96,7 +96,7 @@ void Connection::close() bool Connection::isSupported( int family ) const { - return ( d->familyList.tqfindIndex( family ) != -1 ); + return ( d->familyList.findIndex( family ) != -1 ); } TQValueList<int> Connection::supportedFamilies() const diff --git a/kopete/protocols/oscar/liboscar/connectionhandler.cpp b/kopete/protocols/oscar/liboscar/connectionhandler.cpp index 3f2c1eff..1cac6611 100644 --- a/kopete/protocols/oscar/liboscar/connectionhandler.cpp +++ b/kopete/protocols/oscar/liboscar/connectionhandler.cpp @@ -112,7 +112,7 @@ Connection* ConnectionHandler::defaultConnection() const void ConnectionHandler::addChatInfoForConnection( Connection* c, Oscar::WORD exchange, const TQString& room ) { - if ( d->connections.tqfindIndex( c ) == -1 ) + if ( d->connections.findIndex( c ) == -1 ) d->connections.append( c ); ConnectionRoomInfo info = tqMakePair( exchange, room ); @@ -137,7 +137,7 @@ Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, cons TQString ConnectionHandler::chatRoomForConnection( Connection* c ) { - if ( d->connections.tqfindIndex( c ) == -1 ) + if ( d->connections.findIndex( c ) == -1 ) return TQString(); TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end(); @@ -156,7 +156,7 @@ TQString ConnectionHandler::chatRoomForConnection( Connection* c ) Oscar::WORD ConnectionHandler::exchangeForConnection( Connection* c ) { - if ( d->connections.tqfindIndex( c ) == -1 ) + if ( d->connections.findIndex( c ) == -1 ) return 0xFFFF; TQMap<Connection*, ConnectionRoomInfo>::iterator it, itEnd = d->chatRoomConnections.end(); diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.cpp b/kopete/protocols/oscar/liboscar/coreprotocol.cpp index 472618fe..638ed6c0 100644 --- a/kopete/protocols/oscar/liboscar/coreprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/coreprotocol.cpp @@ -152,7 +152,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef OSCAR_COREPROTOCOL_DEBUG - kdDebug(OSCAR_RAW_DEBUG) << "tqcontains: " << bytes.count() << " bytes" << endl; + kdDebug(OSCAR_RAW_DEBUG) << "contains: " << bytes.count() << " bytes" << endl; for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); diff --git a/kopete/protocols/oscar/liboscar/icqtask.cpp b/kopete/protocols/oscar/liboscar/icqtask.cpp index ccedd0d9..1c8d98ae 100644 --- a/kopete/protocols/oscar/liboscar/icqtask.cpp +++ b/kopete/protocols/oscar/liboscar/icqtask.cpp @@ -148,4 +148,4 @@ void ICQTask::setRequestSubType( WORD subType ) #include "icqtask.moc" -//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/icquserinfo.cpp b/kopete/protocols/oscar/liboscar/icquserinfo.cpp index a4a5f78c..bc37d313 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfo.cpp +++ b/kopete/protocols/oscar/liboscar/icquserinfo.cpp @@ -259,4 +259,4 @@ ICQWPSearchInfo::ICQWPSearchInfo() -//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/icquserinfo.h b/kopete/protocols/oscar/liboscar/icquserinfo.h index 685859a6..ae51462d 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfo.h +++ b/kopete/protocols/oscar/liboscar/icquserinfo.h @@ -210,4 +210,4 @@ typedef TQValueList<ICQInfoItem> ICQInfoItemList; */ #endif -//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; +//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp index 6a915ca8..6e8dd5d7 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp @@ -231,4 +231,4 @@ TQString ICQUserInfoRequestTask::notesInfoFor( const TQString& contact ) #include "icquserinfotask.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.h b/kopete/protocols/oscar/liboscar/icquserinfotask.h index 27aa4a68..437ac4ca 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfotask.h +++ b/kopete/protocols/oscar/liboscar/icquserinfotask.h @@ -75,4 +75,4 @@ private: }; #endif -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp index e2387368..9c12d473 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp @@ -138,4 +138,4 @@ void KNetworkByteStream::slotError( int code ) #include "oscarbytestream.moc" -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.h b/kopete/protocols/oscar/liboscar/oscarbytestream.h index 3b310eab..bf11446b 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.h +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.h @@ -69,5 +69,5 @@ private: #endif -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp index 085bac9e..3c2edeaf 100644 --- a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp @@ -266,7 +266,7 @@ void ClientStream::write( Transfer *request ) void cs_dump( const TQByteArray &bytes ) { #if 0 - qDebug( "tqcontains: %i bytes ", bytes.count() ); + qDebug( "contains: %i bytes ", bytes.count() ); uint count = 0; while ( count < bytes.count() ) { diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.cpp b/kopete/protocols/oscar/liboscar/oscarconnector.cpp index 03db367d..9f33eb76 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.cpp +++ b/kopete/protocols/oscar/liboscar/oscarconnector.cpp @@ -105,4 +105,4 @@ void KNetworkConnector::setOptHostPort( const TQString &host, TQ_UINT16 port ) #include "oscarconnector.moc" -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.h b/kopete/protocols/oscar/liboscar/oscarconnector.h index 20a44123..9441c3c6 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.h +++ b/kopete/protocols/oscar/liboscar/oscarconnector.h @@ -67,4 +67,4 @@ private: #endif -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cc index 7559a253..e9048c21 100644 --- a/kopete/protocols/oscar/liboscar/rtf.cc +++ b/kopete/protocols/oscar/liboscar/rtf.cc @@ -1630,17 +1630,17 @@ void ParStyle::clearFormatting() TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) { TQString str = _str; - str.tqreplace(TQRegExp("&"), "&"); - str.tqreplace(TQRegExp("<"), "<"); - str.tqreplace(TQRegExp(">"), ">"); - str.tqreplace(TQRegExp("\""), """); - str.tqreplace(TQRegExp("\r"), ""); + str.replace(TQRegExp("&"), "&"); + str.replace(TQRegExp("<"), "<"); + str.replace(TQRegExp(">"), ">"); + str.replace(TQRegExp("\""), """); + str.replace(TQRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.tqreplace(TQRegExp("\n"), "<br>\n"); + str.replace(TQRegExp("\n"), "<br>\n"); break; case quoteXML: - str.tqreplace(TQRegExp("\n"), "<br/>\n"); + str.replace(TQRegExp("\n"), "<br/>\n"); break; default: break; @@ -1657,7 +1657,7 @@ TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) TQString s = " "; for (int i = 1; i < len; i++) s += " "; - str.tqreplace(pos, len, s); + str.replace(pos, len, s); } return str; } diff --git a/kopete/protocols/oscar/liboscar/rtf.ll b/kopete/protocols/oscar/liboscar/rtf.ll index 63c04c96..47d1bdf7 100644 --- a/kopete/protocols/oscar/liboscar/rtf.ll +++ b/kopete/protocols/oscar/liboscar/rtf.ll @@ -67,17 +67,17 @@ void ParStyle::clearFormatting() QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) { QString str = _str; - str.tqreplace(QRegExp("&"), "&"); - str.tqreplace(QRegExp("<"), "<"); - str.tqreplace(QRegExp(">"), ">"); - str.tqreplace(QRegExp("\""), """); - str.tqreplace(QRegExp("\r"), ""); + str.replace(QRegExp("&"), "&"); + str.replace(QRegExp("<"), "<"); + str.replace(QRegExp(">"), ">"); + str.replace(QRegExp("\""), """); + str.replace(QRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.tqreplace(QRegExp("\n"), "<br>\n"); + str.replace(QRegExp("\n"), "<br>\n"); break; case quoteXML: - str.tqreplace(QRegExp("\n"), "<br/>\n"); + str.replace(QRegExp("\n"), "<br/>\n"); break; default: break; @@ -94,7 +94,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) QString s = " "; for (int i = 1; i < len; i++) s += " "; - str.tqreplace(pos, len, s); + str.replace(pos, len, s); } return str; } diff --git a/kopete/protocols/oscar/liboscar/ssimanager.cpp b/kopete/protocols/oscar/liboscar/ssimanager.cpp index 630b8f6b..45f69340 100644 --- a/kopete/protocols/oscar/liboscar/ssimanager.cpp +++ b/kopete/protocols/oscar/liboscar/ssimanager.cpp @@ -97,7 +97,7 @@ WORD SSIManager::nextContactId() return 0xFFFF; } - if ( d->itemIdList.tqcontains( d->nextContactId ) == 0 ) + if ( d->itemIdList.contains( d->nextContactId ) == 0 ) d->itemIdList.append( d->nextContactId ); return d->nextContactId++; @@ -116,7 +116,7 @@ WORD SSIManager::nextGroupId() return 0xFFFF; } - if ( d->groupIdList.tqcontains( d->nextGroupId ) == 0 ) + if ( d->groupIdList.contains( d->nextGroupId ) == 0 ) d->groupIdList.append( d->nextGroupId ); return d->nextGroupId++; @@ -449,7 +449,7 @@ bool SSIManager::updateGroup( const Oscar::SSI& group ) d->SSIList.remove( oldGroup ); } - if ( d->SSIList.tqfindIndex( group ) != -1 ) + if ( d->SSIList.findIndex( group ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New group is already in list." << endl; return false; @@ -496,7 +496,7 @@ bool SSIManager::removeGroup( const TQString &group ) bool SSIManager::newContact( const Oscar::SSI& contact ) { - if ( d->SSIList.tqfindIndex( contact ) == -1 ) + if ( d->SSIList.findIndex( contact ) == -1 ) { kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Adding contact '" << contact.name() << "' to SSI list" << endl; addID( contact ); @@ -518,7 +518,7 @@ bool SSIManager::updateContact( const Oscar::SSI& contact ) d->SSIList.remove( oldContact ); } - if ( d->SSIList.tqfindIndex( contact ) != -1 ) + if ( d->SSIList.findIndex( contact ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New contact is already in list." << endl; return false; @@ -562,7 +562,7 @@ bool SSIManager::removeContact( const TQString &contact ) bool SSIManager::newItem( const Oscar::SSI& item ) { - if ( d->SSIList.tqfindIndex( item ) != -1 ) + if ( d->SSIList.findIndex( item ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Item is already in list." << endl; return false; @@ -584,7 +584,7 @@ bool SSIManager::updateItem( const Oscar::SSI& item ) d->SSIList.remove( oldItem ); } - if ( d->SSIList.tqfindIndex( item ) != -1 ) + if ( d->SSIList.findIndex( item ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New item is already in list." << endl; return false; @@ -614,12 +614,12 @@ void SSIManager::addID( const Oscar::SSI& item ) { if ( item.type() == ROSTER_GROUP ) { - if ( d->groupIdList.tqcontains( item.gid() ) == 0 ) + if ( d->groupIdList.contains( item.gid() ) == 0 ) d->groupIdList.append( item.gid() ); } else { - if ( d->itemIdList.tqcontains( item.bid() ) == 0 ) + if ( d->itemIdList.contains( item.bid() ) == 0 ) d->itemIdList.append( item.bid() ); } } @@ -646,7 +646,7 @@ WORD SSIManager::findFreeId( const TQValueList<WORD>& idList, WORD fromId ) cons { for ( WORD id = fromId; id < 0x8000; id++ ) { - if ( idList.tqcontains( id ) == 0 ) + if ( idList.contains( id ) == 0 ) return id; } diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp index 536f2f39..e69222c1 100644 --- a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp +++ b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp @@ -120,5 +120,5 @@ void TypingNotifyTask::setParams( const TQString& contact, int notifyType ) #include "typingnotifytask.moc" -// kate: indent-mode csands; space-indent off; tqreplace-tabs off; +// kate: indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.h b/kopete/protocols/oscar/liboscar/typingnotifytask.h index e99951fc..b815005a 100644 --- a/kopete/protocols/oscar/liboscar/typingnotifytask.h +++ b/kopete/protocols/oscar/liboscar/typingnotifytask.h @@ -60,4 +60,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/userinfotask.cpp b/kopete/protocols/oscar/liboscar/userinfotask.cpp index 4cda87a0..c91dea47 100644 --- a/kopete/protocols/oscar/liboscar/userinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/userinfotask.cpp @@ -44,7 +44,7 @@ bool UserInfoTask::forMe( const Transfer * transfer ) const if ( st->snacService() == 0x0002 && st->snacSubtype() == 0x0006 ) { - if ( m_contactSequenceMap.tqfind( st->snacRequest() ) == m_contactSequenceMap.end() ) + if ( m_contactSequenceMap.find( st->snacRequest() ) == m_contactSequenceMap.end() ) return false; else { diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.cpp b/kopete/protocols/oscar/liboscar/usersearchtask.cpp index a386d8cf..48a5684f 100644 --- a/kopete/protocols/oscar/liboscar/usersearchtask.cpp +++ b/kopete/protocols/oscar/liboscar/usersearchtask.cpp @@ -312,4 +312,4 @@ void UserSearchTask::searchWhitePages( const ICQWPSearchInfo& info ) #include "usersearchtask.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/warningtask.cpp b/kopete/protocols/oscar/liboscar/warningtask.cpp index 00a0294d..d2fb1f83 100644 --- a/kopete/protocols/oscar/liboscar/warningtask.cpp +++ b/kopete/protocols/oscar/liboscar/warningtask.cpp @@ -91,6 +91,6 @@ void WarningTask::onGo() send( t ); } -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; #include "warningtask.moc" diff --git a/kopete/protocols/oscar/liboscar/warningtask.h b/kopete/protocols/oscar/liboscar/warningtask.h index d5e720be..0ce90cea 100644 --- a/kopete/protocols/oscar/liboscar/warningtask.h +++ b/kopete/protocols/oscar/liboscar/warningtask.h @@ -57,4 +57,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index 38d01121..95fd6505 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -644,7 +644,7 @@ void OscarAccount::updateVersionUpdaterStamp() void OscarAccount::ssiContactAdded( const Oscar::SSI& item ) { - if ( d->addContactMap.tqcontains( Oscar::normalize( item.name() ) ) ) + if ( d->addContactMap.contains( Oscar::normalize( item.name() ) ) ) { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Received confirmation from server. adding " << item.name() << " to the contact list" << endl; diff --git a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp index 10f6edb3..d5136a7e 100644 --- a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp +++ b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp @@ -81,7 +81,7 @@ OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* tqparent, m_encodings.insert(1015, i18n("UTF-16 Unicode")); m_encodingUI->encodingCombo->insertStringList( m_encodings.values() ); - if( (initialEncodingIndex = m_encodings.keys().tqfindIndex(initialEncoding)) == -1 ) + if( (initialEncodingIndex = m_encodings.keys().findIndex(initialEncoding)) == -1 ) { kdWarning() << k_funcinfo << "Requested encoding mib " << initialEncoding << " not in encoding list - defaulting to first encoding item" @@ -100,7 +100,7 @@ OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* tqparent, int OscarEncodingSelectionDialog::selectedEncoding() const { TQString encoding = m_encodingUI->encodingCombo->currentText(); - int mib = m_encodings.keys()[ m_encodings.values().tqfindIndex(encoding) ]; + int mib = m_encodings.keys()[ m_encodings.values().findIndex(encoding) ]; if( mib == -1 ) return 0; diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.cpp b/kopete/protocols/oscar/oscarvisibilitydialog.cpp index c2fa021e..1c717e98 100644 --- a/kopete/protocols/oscar/oscarvisibilitydialog.cpp +++ b/kopete/protocols/oscar/oscarvisibilitydialog.cpp @@ -70,7 +70,7 @@ void OscarVisibilityDialog::slotAddToVisible() TQString contactId = m_contactMap[itm->text()]; m_visibleListChangesMap[contactId] = Add; - if ( !m_visibilityUI->visibleContacts->tqfindItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) ) + if ( !m_visibilityUI->visibleContacts->findItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) ) m_visibilityUI->visibleContacts->insertItem( itm->text() ); } @@ -94,7 +94,7 @@ void OscarVisibilityDialog::slotAddToInvisible() TQString contactId = m_contactMap[itm->text()]; m_invisibleListChangesMap[contactId] = Add; - if ( !m_visibilityUI->invisibleContacts->tqfindItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) ) + if ( !m_visibilityUI->invisibleContacts->findItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) ) m_visibilityUI->invisibleContacts->insertItem( itm->text() ); } diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 35d7c274..82bd0017 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -419,7 +419,7 @@ void GSMLib::customEvent(TQCustomEvent* e) TQString text = ge->Text; // Locate a contact - SMSContact* contact = static_cast<SMSContact*>( m_account->contacts().tqfind( nr )); + SMSContact* contact = static_cast<SMSContact*>( m_account->contacts().find( nr )); if ( contact==NULL ) { // No contact found, make a new one diff --git a/kopete/protocols/sms/services/kopete_unix_serial.cpp b/kopete/protocols/sms/services/kopete_unix_serial.cpp index e8650de0..c40f831b 100644 --- a/kopete/protocols/sms/services/kopete_unix_serial.cpp +++ b/kopete/protocols/sms/services/kopete_unix_serial.cpp @@ -280,13 +280,13 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, // for the first call getLine() waits only 3 seconds // because of _timeoutVal = 3 string s = getLine(); - if (s.tqfind("OK") != string::npos || - s.tqfind("CABLE: GSM") != string::npos) + if (s.find("OK") != string::npos || + s.find("CABLE: GSM") != string::npos) { foundOK = true; readTries = 0; // found OK, exit loop } - else if (s.tqfind("ERROR") != string::npos) + else if (s.find("ERROR") != string::npos) readTries = 0; // error, exit loop } @@ -301,8 +301,8 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, while (readTries-- > 0) { string s = getLine(); - if (s.tqfind("OK") != string::npos || - s.tqfind("CABLE: GSM") != string::npos) + if (s.find("OK") != string::npos || + s.find("CABLE: GSM") != string::npos) { _readNotifier = new TQSocketNotifier(_fd, TQSocketNotifier::Read); connect( _readNotifier, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated())); diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index c886cb3d..e2f607aa 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -71,7 +71,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p TQStringList args = TQStringList::split(':',s); TQStringList options = TQStringList::split(' ', args[0]); - names.append(options[0].tqreplace(0,1,"")); + names.append(options[0].replace(0,1,"")); bool hidden = false; for(unsigned i = 1; i < options.count(); i++) @@ -92,16 +92,16 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p else values.append(""); - if( args[0].tqcontains("Message") || args[0].tqcontains("message") - || args[0].tqcontains("message") || args[0].tqcontains("nachricht") - || args[0].tqcontains("Msg") || args[0].tqcontains("Mensagem") ) + if( args[0].contains("Message") || args[0].contains("message") + || args[0].contains("message") || args[0].contains("nachricht") + || args[0].contains("Msg") || args[0].contains("Mensagem") ) { for( unsigned i = 0; i < options.count(); i++) { - if (options[i].tqcontains("Size=")) + if (options[i].contains("Size=")) { TQString option = options[i]; - option.tqreplace(0,5,""); + option.replace(0,5,""); m_maxSize = option.toInt(); } } @@ -111,7 +111,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p { for (TQStringList::Iterator it=numberWords.begin(); it != numberWords.end(); ++it) { - if (args[0].tqcontains(*it)) + if (args[0].contains(*it)) { telPos = names.count() - 1; if (args[0] == *it) @@ -119,7 +119,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p // kdDebug(14160) << "Exact match for " << args[0] << endl; exactNumberMatch = true; } -// kdDebug(14160) << "args[0] (" << args[0] << ") tqcontains " << *it << endl; +// kdDebug(14160) << "args[0] (" << args[0] << ") contains " << *it << endl; } } } diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index bc95a458..fcafc9fb 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -72,7 +72,7 @@ void SMSAccount::loadConfig() void SMSAccount::translateNumber(TQString &theNumber) { if(theNumber[0] == TQChar('0') && theSubEnable) - theNumber.tqreplace(0, 1, theSubCode); + theNumber.replace(0, 1, theSubCode); } const bool SMSAccount::splitNowMsgTooLong(int msgLength) diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index 497429f9..a3ee592e 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -88,7 +88,7 @@ bool WinPopupLib::checkHost(const TQString &Name) TQMap<TQString, WorkGroup>::Iterator end = theGroups.end(); for(TQMap<TQString, WorkGroup>::Iterator i = theGroups.begin(); i != end && !ret; i++) { - if ((*i).Hosts().tqcontains(Name.upper())) { + if ((*i).Hosts().contains(Name.upper())) { ret = true; break; } @@ -208,7 +208,7 @@ void WinPopupLib::slotReadProcessExited(KProcess *r) TQMap<TQString, TQString>::ConstIterator end = currentGroups.end(); for (TQMap<TQString, TQString>::ConstIterator i = currentGroups.begin(); i != end; i++) { TQString groupMaster = i.data(); - if (!done.tqcontains(groupMaster)) todo += groupMaster; + if (!done.contains(groupMaster)) todo += groupMaster; } } @@ -360,4 +360,4 @@ void WinPopupLib::settingsChanged(const TQString &smbClient, int groupFreq) #include "libwinpopup.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h index 1392dd46..686252ea 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h @@ -90,4 +90,4 @@ signals: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index 9366d31f..2b90459e 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -206,4 +206,4 @@ void WPAccount::setOnlineStatus(const Kopete::OnlineStatus &status, const TQStri #include "wpaccount.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h index 19209a65..d11d5885 100644 --- a/kopete/protocols/winpopup/wpaccount.h +++ b/kopete/protocols/winpopup/wpaccount.h @@ -105,4 +105,4 @@ private: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp index c463cc02..a681f48b 100644 --- a/kopete/protocols/winpopup/wpaddcontact.cpp +++ b/kopete/protocols/winpopup/wpaddcontact.cpp @@ -112,4 +112,4 @@ bool WPAddContact::apply(Kopete::Account *theAccount, Kopete::MetaContact *theMe #include "wpaddcontact.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpaddcontact.h b/kopete/protocols/winpopup/wpaddcontact.h index 1828bcf9..03b3d51d 100644 --- a/kopete/protocols/winpopup/wpaddcontact.h +++ b/kopete/protocols/winpopup/wpaddcontact.h @@ -56,4 +56,4 @@ public slots: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp index 3e70b349..1fd29905 100644 --- a/kopete/protocols/winpopup/wpcontact.cpp +++ b/kopete/protocols/winpopup/wpcontact.cpp @@ -38,7 +38,7 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons if (theNickName.isEmpty()) { // Construct nickname from hostname with first letter to upper. GF theNickName = newHostName.lower(); - theNickName = theNickName.tqreplace(0, 1, theNickName[0].upper()); + theNickName = theNickName.replace(0, 1, theNickName[0].upper()); } setNickName(theNickName); @@ -186,4 +186,4 @@ void WPContact::slotSendMessage( Kopete::Message& message ) #include "wpcontact.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h index c7bc336f..6843d6c2 100644 --- a/kopete/protocols/winpopup/wpcontact.h +++ b/kopete/protocols/winpopup/wpcontact.h @@ -84,4 +84,4 @@ private: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp index 2fa5775c..05312330 100644 --- a/kopete/protocols/winpopup/wpeditaccount.cpp +++ b/kopete/protocols/winpopup/wpeditaccount.cpp @@ -71,7 +71,7 @@ WPEditAccount::WPEditAccount(TQWidget *tqparent, Kopete::Account *theAccount) if (tmp != 0) { gethostname(tmp, 255); theHostName = tmp; - if (theHostName.tqcontains('.') != 0) theHostName.remove(theHostName.tqfind('.'), theHostName.length()); + if (theHostName.contains('.') != 0) theHostName.remove(theHostName.find('.'), theHostName.length()); theHostName = theHostName.upper(); } @@ -135,4 +135,4 @@ Kopete::Account *WPEditAccount::apply() #include "wpeditaccount.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpeditaccount.h b/kopete/protocols/winpopup/wpeditaccount.h index 5817709a..f573c000 100644 --- a/kopete/protocols/winpopup/wpeditaccount.h +++ b/kopete/protocols/winpopup/wpeditaccount.h @@ -55,4 +55,4 @@ public slots: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 66ef7fac..610cb598 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -184,4 +184,4 @@ void WPProtocol::sendMessage(const TQString &Body, const TQString &Destination) #include "wpprotocol.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpprotocol.h b/kopete/protocols/winpopup/wpprotocol.h index aa7f6955..defd7dc8 100644 --- a/kopete/protocols/winpopup/wpprotocol.h +++ b/kopete/protocols/winpopup/wpprotocol.h @@ -92,4 +92,4 @@ private: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index 5090836d..d5e01138 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -111,4 +111,4 @@ void WPUserInfo::slotCloseClicked() #include "wpuserinfo.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpuserinfo.h b/kopete/protocols/winpopup/wpuserinfo.h index c0bd533c..bea23dc8 100644 --- a/kopete/protocols/winpopup/wpuserinfo.h +++ b/kopete/protocols/winpopup/wpuserinfo.h @@ -59,4 +59,4 @@ class WPUserInfo : public KDialogBase #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp index c9c5828b..573c5ccf 100644 --- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp +++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp @@ -115,7 +115,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef YAHOO_COREPROTOCOL_DEBUG - kdDebug(YAHOO_RAW_DEBUG) << " tqcontains " << bytes.count() << " bytes" << endl; + kdDebug(YAHOO_RAW_DEBUG) << " contains " << bytes.count() << " bytes" << endl; for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); @@ -196,7 +196,7 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire ) kdDebug(YAHOO_RAW_DEBUG) << " - not a valid YMSG packet. Trying to recover." << endl; TQTextStream s( wire, IO_ReadOnly ); TQString remaining = s.read(); - int pos = remaining.tqfind( "YMSG", bytesParsed ); + int pos = remaining.find( "YMSG", bytesParsed ); if( pos >= 0 ) { kdDebug(YAHOO_RAW_DEBUG) << "Recover successful." << endl; diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp index 10056a61..f48bd52d 100644 --- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp @@ -104,8 +104,8 @@ void FileTransferNotifierTask::parseFileTransfer( YMSGTransfer *t ) return; - unsigned int left = url.tqfindRev( '/' ) + 1; - unsigned int right = url.tqfindRev( '?' ); + unsigned int left = url.findRev( '/' ) + 1; + unsigned int right = url.findRev( '?' ); filename = url.mid( left, right - left ); emit incomingFileTransfer( from, url, expires, msg, filename, size, TQPixmap() ); diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index 439b39f7..7c46229b 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -359,9 +359,9 @@ void LoginTask::sendAuthSixteenStage3(const TQString& cryptString) TQString cryptStringHash = KMD5( cryptString.ascii() ).base64Digest(); - cryptStringHash = cryptStringHash.tqreplace('+', '.'); - cryptStringHash = cryptStringHash.tqreplace('/', '_'); - cryptStringHash = cryptStringHash.tqreplace('=', '-'); + cryptStringHash = cryptStringHash.replace('+', '.'); + cryptStringHash = cryptStringHash.replace('/', '_'); + cryptStringHash = cryptStringHash.replace('=', '-'); YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceAuthResp, m_stateOnConnect); t->setId( m_sessionID ); diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index b456746a..a9916851 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -132,9 +132,9 @@ void ModifyYABTask::slotRead() TQByteArray ar( socket->bytesAvailable() ); socket->readBlock( ar.data (), ar.size () ); TQString data( ar ); - data = data.right( data.length() - data.tqfind("<?xml") ); + data = data.right( data.length() - data.find("<?xml") ); - if( m_data.tqfind("</ab>") < 0 ) + if( m_data.find("</ab>") < 0 ) return; // Need more data m_socket->close(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index 1b24b860..f4e8dcf9 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -163,7 +163,7 @@ void SendPictureTask::readResult() TQString buf( ar ); m_socket->close(); - if( buf.tqfind( "error", 0, false ) >= 0 ) + if( buf.find( "error", 0, false ) >= 0 ) { kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Picture upload failed" << endl; setSuccess( false ); diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index 41d5019d..d50d68b2 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -425,9 +425,9 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket ) case UserRequest: { who.append( info->buffer->buffer() ); - who = who.mid( 2, who.tqfind('\n') - 3); - kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.tqfindIndex( who ) << endl; - if( accessGranted.tqfindIndex( who ) >= 0 ) + who = who.mid( 2, who.find('\n') - 3); + kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.findIndex( who ) << endl; + if( accessGranted.findIndex( who ) >= 0 ) { grantAccess( who ); } diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp index cee71da6..65c48f54 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp @@ -36,13 +36,13 @@ void YABEntry::fromTQDomElement( const TQDomElement &e ) privateURL = e.attribute("pu"); title = e.attribute("ti"); corporation = e.attribute("co"); - workAdress = e.attribute("wa").tqreplace( "
", "\n" ); + workAdress = e.attribute("wa").replace( "
", "\n" ); workCity = e.attribute("wc"); workState = e.attribute("ws"); workZIP = e.attribute("wz"); workCountry = e.attribute("wn"); workURL = e.attribute("wu"); - privateAdress = e.attribute("ha").tqreplace( "
", "\n" ); + privateAdress = e.attribute("ha").replace( "
", "\n" ); privateCity = e.attribute("hc"); privateState = e.attribute("hs"); privateZIP = e.attribute("hz"); @@ -55,7 +55,7 @@ void YABEntry::fromTQDomElement( const TQDomElement &e ) additional2 = e.attribute("c2"); additional3 = e.attribute("c3"); additional4 = e.attribute("c4"); - notes = e.attribute("cm").tqreplace( "
", "\n" ); + notes = e.attribute("cm").replace( "
", "\n" ); imAIM = e.attribute("ima"); imGoogleTalk = e.attribute("img"); imICQ = e.attribute("imq"); @@ -86,13 +86,13 @@ void YABEntry::fromTQDomDocument( const TQDomDocument &d ) privateURL = d.elementsByTagName("pu").item(0).toElement().text(); title = d.elementsByTagName("ti").item(0).toElement().text(); corporation = d.elementsByTagName("co").item(0).toElement().text(); - workAdress = d.elementsByTagName("wa").item(0).toElement().text().tqreplace( "
", "\n" ); + workAdress = d.elementsByTagName("wa").item(0).toElement().text().replace( "
", "\n" ); workCity = d.elementsByTagName("wc").item(0).toElement().text(); workState = d.elementsByTagName("ws").item(0).toElement().text(); workZIP = d.elementsByTagName("wz").item(0).toElement().text(); workCountry = d.elementsByTagName("wn").item(0).toElement().text(); workURL = d.elementsByTagName("wu").item(0).toElement().text(); - privateAdress = d.elementsByTagName("ha").item(0).toElement().text().tqreplace( "
", "\n" ); + privateAdress = d.elementsByTagName("ha").item(0).toElement().text().replace( "
", "\n" ); privateCity = d.elementsByTagName("hc").item(0).toElement().text(); privateState = d.elementsByTagName("hs").item(0).toElement().text(); privateZIP = d.elementsByTagName("hz").item(0).toElement().text(); @@ -105,7 +105,7 @@ void YABEntry::fromTQDomDocument( const TQDomDocument &d ) additional2 = d.elementsByTagName("c2").item(0).toElement().text(); additional3 = d.elementsByTagName("c3").item(0).toElement().text(); additional4 = d.elementsByTagName("c4").item(0).toElement().text(); - notes = d.elementsByTagName("cm").item(0).toElement().text().tqreplace( "
", "\n" ); + notes = d.elementsByTagName("cm").item(0).toElement().text().replace( "
", "\n" ); imAIM = d.elementsByTagName("ima").item(0).toElement().text(); imGoogleTalk = d.elementsByTagName("img").item(0).toElement().text(); imICQ = d.elementsByTagName("imq").item(0).toElement().text(); @@ -135,13 +135,13 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const e.setAttribute( "pu", privateURL ); e.setAttribute( "ti", title ); e.setAttribute( "co", corporation ); - e.setAttribute( "wa", TQString( workAdress ).tqreplace( '\n', "
" ) ); + e.setAttribute( "wa", TQString( workAdress ).replace( '\n', "
" ) ); e.setAttribute( "wc", workCity ); e.setAttribute( "ws", workState ); e.setAttribute( "wz", workZIP ); e.setAttribute( "wn", workCountry ); e.setAttribute( "wu", workURL ); - e.setAttribute( "ha", TQString( privateAdress ).tqreplace( '\n', "
" ) ); + e.setAttribute( "ha", TQString( privateAdress ).replace( '\n', "
" ) ); e.setAttribute( "hc", privateCity ); e.setAttribute( "hs", privateState ); e.setAttribute( "hz", privateZIP ); @@ -152,7 +152,7 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const e.setAttribute( "c2", additional2 ); e.setAttribute( "c3", additional3 ); e.setAttribute( "c4", additional4 ); - e.setAttribute( "cm", TQString( notes ).tqreplace( '\n', "
" ) ); + e.setAttribute( "cm", TQString( notes ).replace( '\n', "
" ) ); e.setAttribute( "ima", imAIM ); e.setAttribute( "img", imGoogleTalk ); e.setAttribute( "imq", imICQ ); diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index 81b2f53e..a317cb12 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -45,8 +45,8 @@ void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int ch kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << url << endl; KIO::TransferJob *transfer; TQString Url = url.url(); - TQString ext = Url.left( Url.tqfindRev( "?" ) ); - ext = ext.right( ext.length() - ext.tqfindRev( "." ) ); + TQString ext = Url.left( Url.findRev( "?" ) ); + ext = ext.right( ext.length() - ext.findRev( "." ) ); transfer = KIO::get( url, false, false ); connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp index ed673c2f..6b69bc70 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp @@ -138,4 +138,4 @@ void KNetworkByteStream::slotError( int code ) #include "yahoobytestream.moc" -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h index 4ed96d3a..e84f70b0 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h @@ -66,4 +66,4 @@ private: #endif // YAHOOBYTESTREAM_H -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp index 45716e35..3a15b03c 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp @@ -256,7 +256,7 @@ void ClientStream::write( Transfer *request ) void cs_dump( const TQByteArray &bytes ) { #if 0 - qDebug( "tqcontains: %i bytes ", bytes.count() ); + qDebug( "contains: %i bytes ", bytes.count() ); uint count = 0; while ( count < bytes.count() ) { diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp index 0e0f8436..dc54bf82 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp @@ -108,4 +108,4 @@ void KNetworkConnector::setOptHostPort( const TQString &host, TQ_UINT16 port ) #include "yahooconnector.moc" -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h index 9a33a2e7..667138ed 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h @@ -64,4 +64,4 @@ private: #endif -// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp index a5f27b86..6291f252 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp +++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp @@ -65,9 +65,9 @@ void YahooInviteListImpl::addInvitees( const TQStringList &invitees ) for( TQStringList::const_iterator it = invitees.begin(); it != invitees.end(); it++ ) { - if( m_inviteeList.tqfind( *it ) == m_inviteeList.end() ) + if( m_inviteeList.find( *it ) == m_inviteeList.end() ) m_inviteeList.push_back( *it ); - if( m_buddyList.tqfind( *it ) != m_buddyList.end() ) + if( m_buddyList.find( *it ) != m_buddyList.end() ) m_buddyList.remove( *it ); } @@ -80,9 +80,9 @@ void YahooInviteListImpl::removeInvitees( const TQStringList &invitees ) for( TQStringList::const_iterator it = invitees.begin(); it != invitees.end(); it++ ) { - if( m_buddyList.tqfind( *it ) == m_buddyList.end() ) + if( m_buddyList.find( *it ) == m_buddyList.end() ) m_buddyList.push_back( *it ); - if( m_inviteeList.tqfind( *it ) != m_inviteeList.end() ) + if( m_inviteeList.find( *it ) != m_inviteeList.end() ) m_inviteeList.remove( *it ); } diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index 536f975b..2b3e357e 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -256,5 +256,5 @@ void YahooUserInfoDialog::setData( const YABEntry &yab ) #include "yahoouserinfodialog.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h index a2cff58e..b7f9f3d2 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h @@ -54,4 +54,4 @@ private: #endif -//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index 315b4d45..93395746 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -167,16 +167,16 @@ TQString YahooAccount::stripMsgColorCodes(const TQString& msg) TQString filteredMsg = msg; //Handle bold, underline and italic messages - filteredMsg.tqreplace( "\033[1m", "<b>" ); - filteredMsg.tqreplace( "\033[x1m", "</b>" ); - filteredMsg.tqreplace( "\033[2m", "<i>" ); - filteredMsg.tqreplace( "\033[x2m", "</i>" ); - filteredMsg.tqreplace( "\033[4m", "<u>" ); - filteredMsg.tqreplace( "\033[x4m", "</u>" ); + filteredMsg.replace( "\033[1m", "<b>" ); + filteredMsg.replace( "\033[x1m", "</b>" ); + filteredMsg.replace( "\033[2m", "<i>" ); + filteredMsg.replace( "\033[x2m", "</i>" ); + filteredMsg.replace( "\033[4m", "<u>" ); + filteredMsg.replace( "\033[x4m", "</u>" ); //GAIM doesn't check for ^[[3m. Does this ever get sent? - filteredMsg.tqreplace( "\033[3m", "<i>" ); - filteredMsg.tqreplace( "\033[x3m", "</i>" ); + filteredMsg.replace( "\033[3m", "<i>" ); + filteredMsg.replace( "\033[x3m", "</i>" ); //Strip link tags filteredMsg.remove( "\033[lm" ); @@ -196,26 +196,26 @@ TQColor YahooAccount::getMsgColor(const TQString& msg) //kdDebug(YAHOO_GEN_DEBUG) << "msg is " << msg; //Please note that some of the colors are hard-coded to //match the yahoo colors - if ( msg.tqfind("\033[38m") != -1 ) + if ( msg.find("\033[38m") != -1 ) return TQt::red; - if ( msg.tqfind("\033[34m") != -1 ) + if ( msg.find("\033[34m") != -1 ) return TQt::green; - if ( msg.tqfind("\033[31m") != -1 ) + if ( msg.find("\033[31m") != -1 ) return TQt::blue; - if ( msg.tqfind("\033[39m") != -1 ) + if ( msg.find("\033[39m") != -1 ) return TQt::yellow; - if ( msg.tqfind("\033[36m") != -1 ) + if ( msg.find("\033[36m") != -1 ) return TQt::darkMagenta; - if ( msg.tqfind("\033[32m") != -1 ) + if ( msg.find("\033[32m") != -1 ) return TQt::cyan; - if ( msg.tqfind("\033[37m") != -1 ) + if ( msg.find("\033[37m") != -1 ) return TQColor("#FFAA39"); - if ( msg.tqfind("\033[35m") != -1 ) + if ( msg.find("\033[35m") != -1 ) return TQColor("#FFD8D8"); - if ( msg.tqfind("\033[#") != -1 ) + if ( msg.find("\033[#") != -1 ) { - kdDebug(YAHOO_GEN_DEBUG) << "Custom color is " << msg.mid(msg.tqfind("\033[#")+2,7) << endl; - return TQColor(msg.mid(msg.tqfind("\033[#")+2,7)); + kdDebug(YAHOO_GEN_DEBUG) << "Custom color is " << msg.mid(msg.find("\033[#")+2,7) << endl; + return TQColor(msg.mid(msg.find("\033[#")+2,7)); } //return a default value just in case @@ -1053,7 +1053,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) kdDebug(YAHOO_GEN_DEBUG) << "Message after stripping color codes '" << newMsgText << "'" << endl; - newMsgText.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); + newMsgText.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); // Replace Font tags regExp.setMinimal( true ); @@ -1063,7 +1063,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("<font\\1style=\"font-size:\\2pt\">" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("<font\\1style=\"font-size:\\2pt\">" ) ); } } @@ -1095,7 +1095,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("<" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("<" ) ); } } regExp.setPattern( "([^\"bui])>" ); @@ -1104,22 +1104,22 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) pos = regExp.search( newMsgText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1>" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("\\1>" ) ); } } // add closing tags when needed regExp.setMinimal( false ); regExp.setPattern( "(<b>.*)(?!</b>)" ); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</b>" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</b>" ) ); regExp.setPattern( "(<i>.*)(?!</i>)" ); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</i>" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</i>" ) ); regExp.setPattern( "(<u>.*)(?!</u>)" ); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</u>" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</u>" ) ); regExp.setPattern( "(<font.*)(?!</font>)" ); - newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1</font>" ) ); + newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</font>" ) ); - newMsgText.tqreplace( TQString::tqfromLatin1( "\r" ), TQString::tqfromLatin1( "<br/>" ) ); + newMsgText.replace( TQString::tqfromLatin1( "\r" ), TQString::tqfromLatin1( "<br/>" ) ); return newMsgText; } @@ -1208,7 +1208,7 @@ void YahooAccount::slotGotConfInvite( const TQString & who, const TQString & roo kdDebug(YAHOO_GEN_DEBUG) << who << " has invited you to join the conference \"" << room << "\" : " << msg << endl; kdDebug(YAHOO_GEN_DEBUG) << "Members: " << members << endl; - if( !m_pendingConfInvites.tqcontains( room ) ) // We have to keep track of the invites as the server will send the same invite twice if it gets canceled by the host + if( !m_pendingConfInvites.contains( room ) ) // We have to keep track of the invites as the server will send the same invite twice if it gets canceled by the host m_pendingConfInvites.push_back( room ); else { @@ -1321,7 +1321,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.tqcontains( room ) ) + if( !m_conferences.contains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1338,7 +1338,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo void YahooAccount::slotConfUserJoin( const TQString &who, const TQString &room ) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.tqcontains( room ) ) + if( !m_conferences.contains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1355,7 +1355,7 @@ void YahooAccount::slotConfUserJoin( const TQString &who, const TQString &room ) void YahooAccount::slotConfUserLeave( const TQString & who, const TQString &room ) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.tqcontains( room ) ) + if( !m_conferences.contains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1390,7 +1390,7 @@ void YahooAccount::slotConfMessage( const TQString &who, const TQString &room, c { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.tqcontains( room ) ) + if( !m_conferences.contains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1522,7 +1522,7 @@ void YahooAccount::slotGotFile( const TQString & who, const TQString & url , l void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQString& fileName) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_pendingFileTransfers.tqcontains( transfer->info().internalId() ) ) + if( !m_pendingFileTransfers.contains( transfer->info().internalId() ) ) return; m_pendingFileTransfers.remove( transfer->info().internalId() ); @@ -1531,7 +1531,7 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS //Create directory if it doesn't already exist TQDir dir; TQString path = TQFileInfo( fileName ).dirPath(); - for( int i = 1; i <= path.tqcontains('/'); ++i ) + for( int i = 1; i <= path.contains('/'); ++i ) { if( !dir.exists( path.section( '/', 0, i ) ) ) { @@ -1554,7 +1554,7 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS void YahooAccount::slotReceiveFileRefused( const Kopete::FileTransferInfo& info ) { - if( !m_pendingFileTransfers.tqcontains( info.internalId() ) ) + if( !m_pendingFileTransfers.contains( info.internalId() ) ) return; m_pendingFileTransfers.remove( info.internalId() ); @@ -1676,7 +1676,7 @@ void YahooAccount::slotGotWebcamInvite( const TQString& who ) return; } - if( m_pendingWebcamInvites.tqcontains( who ) ) + if( m_pendingWebcamInvites.contains( who ) ) return; m_pendingWebcamInvites.append( who ); @@ -1723,7 +1723,7 @@ void YahooAccount::slotGotBuddyIconChecksum(const TQString &who, int checksum) } if ( checksum == kc->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() && - TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ) ) + TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().replace(TQRegExp("[./~]"),"-") +".png" ) ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Icon already exists. I will not request it again." << endl; return; @@ -1741,7 +1741,7 @@ void YahooAccount::slotGotBuddyIconInfo(const TQString &who, KURL url, int check } if ( checksum == kc->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() && - TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) )) + TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().replace(TQRegExp("[./~]"),"-") +".png" ) )) { kdDebug(YAHOO_GEN_DEBUG) << "Icon already exists. I will not download it again." << endl; return; diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h index 5a093872..ac70d510 100644 --- a/kopete/protocols/yahoo/yahooaccount.h +++ b/kopete/protocols/yahoo/yahooaccount.h @@ -93,7 +93,7 @@ public: /** * Returns true if contact @p id is on the server-side contact list */ - bool isOnServer(const TQString &id) { return IDs.tqcontains(id); } + bool isOnServer(const TQString &id) { return IDs.contains(id); } /** * Returns true if we have the server-side contact list diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index b9b510a9..8d34689b 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -95,7 +95,7 @@ void YahooConferenceChatSession::slotInviteOthers() Kopete::Contact *myself = account()->myself(); for( ; it.current(); ++it ) { - if( (*it) != myself && !members().tqcontains( *it ) ) + if( (*it) != myself && !members().contains( *it ) ) buddies.push_back( (*it)->contactId() ); } diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index 377103c8..06559f8f 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -232,7 +232,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) ); } } @@ -243,7 +243,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) ); } } @@ -254,7 +254,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) ); } } @@ -265,7 +265,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) ); } } @@ -276,7 +276,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) ); } } @@ -287,7 +287,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) ); + newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) ); } } @@ -298,18 +298,18 @@ TQString YahooContact::prepareMessage( const TQString &messageText ) pos = regExp.search( messageText, pos ); if ( pos >= 0 ) { pos += regExp.matchedLength(); - newMsg.tqreplace( regExp, TQString::tqfromLatin1("\\2") ); + newMsg.replace( regExp, TQString::tqfromLatin1("\\2") ); } } // convert escaped chars - newMsg.tqreplace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); - newMsg.tqreplace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); - newMsg.tqreplace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); - newMsg.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); - newMsg.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); - newMsg.tqreplace( TQString::tqfromLatin1( "<br />" ), TQString::tqfromLatin1( "\r" ) ); - newMsg.tqreplace( TQString::tqfromLatin1( "<br/>" ), TQString::tqfromLatin1( "\r" ) ); + newMsg.replace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); + newMsg.replace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); + newMsg.replace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); + newMsg.replace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); + newMsg.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); + newMsg.replace( TQString::tqfromLatin1( "<br />" ), TQString::tqfromLatin1( "\r" ) ); + newMsg.replace( TQString::tqfromLatin1( "<br/>" ), TQString::tqfromLatin1( "\r" ) ); return newMsg; } @@ -549,7 +549,7 @@ void YahooContact::setDisplayPicture(const TQByteArray &data, int checksum) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << data.size() << endl; - TQString newlocation = locateLocal( "appdata", "yahoopictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation = locateLocal( "appdata", "yahoopictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; setProperty( YahooProtocol::protocol()->iconCheckSum, checksum ); TQFile f( newlocation ); @@ -590,7 +590,7 @@ const YABEntry *YahooContact::yabEntry() void YahooContact::slotEmitDisplayPictureChanged() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - TQString newlocation=locateLocal( "appdata", "yahoopictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation=locateLocal( "appdata", "yahoopictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; setProperty( Kopete::Global::Properties::self()->photo(), TQString() ); setProperty( Kopete::Global::Properties::self()->photo() , newlocation ); emit displayPictureChanged(); @@ -838,5 +838,5 @@ void YahooContact::readYABEntry() #include "yahoocontact.moc" // vim: set noet ts=4 sts=4 sw=4: -//kate: space-indent off; tqreplace-tabs off; indent-mode csands; +//kate: space-indent off; replace-tabs off; indent-mode csands; diff --git a/kopete/styles/Hacker/gpl.txt b/kopete/styles/Hacker/gpl.txt index fa85e301..3912109b 100644 --- a/kopete/styles/Hacker/gpl.txt +++ b/kopete/styles/Hacker/gpl.txt @@ -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/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp index 9e49679d..f6eb7dd4 100644 --- a/kpf/src/AppletItem.cpp +++ b/kpf/src/AppletItem.cpp @@ -132,7 +132,7 @@ namespace KPF break; } - if (!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) + if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos())) { break; } diff --git a/kpf/src/ByteRange.cpp b/kpf/src/ByteRange.cpp index b5bdf0a1..2db5de6b 100644 --- a/kpf/src/ByteRange.cpp +++ b/kpf/src/ByteRange.cpp @@ -128,7 +128,7 @@ namespace KPF { kpfDebug << "addByteRange(" << s << ")" << endl; - int dashPos = s.tqfind('-'); + int dashPos = s.find('-'); if (-1 == dashPos) { diff --git a/kpf/src/Request.cpp b/kpf/src/Request.cpp index 886aac44..702b4989 100644 --- a/kpf/src/Request.cpp +++ b/kpf/src/Request.cpp @@ -56,7 +56,7 @@ namespace KPF { TQString line(*it); - int colonPos = line.tqfind(':'); + int colonPos = line.find(':'); if (-1 != colonPos) { @@ -114,7 +114,7 @@ namespace KPF s.remove(0, 5); - int dotPos = s.tqfind('.'); + int dotPos = s.find('.'); if (-1 != dotPos) { @@ -367,7 +367,7 @@ namespace KPF // Double slash -> slash. TQRegExp r("\\/\\/+"); - s.tqreplace(r, "/"); + s.replace(r, "/"); return s; } diff --git a/kpf/src/Response.cpp b/kpf/src/Response.cpp index 1299fd44..67d4f206 100644 --- a/kpf/src/Response.cpp +++ b/kpf/src/Response.cpp @@ -152,9 +152,9 @@ namespace KPF { TQString line(str.readLine()); - line.tqreplace(regexpMessage, responseName(code)); - line.tqreplace(regexpCode, TQString::number(code)); - line.tqreplace(regexpResource, request.path()); + line.replace(regexpMessage, responseName(code)); + line.replace(regexpCode, TQString::number(code)); + line.replace(regexpResource, request.path()); html = line + "\r\n"; } diff --git a/kpf/src/Server.cpp b/kpf/src/Server.cpp index 00904132..62566b63 100644 --- a/kpf/src/Server.cpp +++ b/kpf/src/Server.cpp @@ -255,7 +255,7 @@ namespace KPF // simply not be found, but I'm worried that the TQDir/TQFile/TQFileInfo // stuff might try to expand it, so I'm not taking any chances. - if (d->request.path().tqcontains("..") || d->request.path().tqcontains('~')) + if (d->request.path().contains("..") || d->request.path().contains('~')) { kpfDebug << d->id << ": readRequest: bogus path" << endl; d->state = Responding; diff --git a/kppp/Rules/checkrules b/kppp/Rules/checkrules index 2ac45ec1..9e695d5b 100755 --- a/kppp/Rules/checkrules +++ b/kppp/Rules/checkrules @@ -4,8 +4,8 @@ KPPP=`which kppp` || (echo "cannot find kppp"; exit 1) cd `dirname $0 2> /dev/null` || (echo "\"dirname\" required"; exit 1) -FILESTOCHECK=`tqfind -name "*.rst" -type f 2> /dev/null` || \ - (echo "\"tqfind\" required\""; exit 1) +FILESTOCHECK=`find -name "*.rst" -type f 2> /dev/null` || \ + (echo "\"find\" required\""; exit 1) for i in ${FILESTOCHECK} do diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp index b9280eda..6ee8ee45 100644 --- a/kppp/accounting.cpp +++ b/kppp/accounting.cpp @@ -384,11 +384,11 @@ void ExecutableAccounting::gotData(KProcess */*proc*/, char *buffer, int /*bufle // split string TQString b(buffer); - pos = b.tqfind(':'); + pos = b.find(':'); while(pos != -1 && nFields < 8) { field[nFields++] = b.mid(last_pos, pos-last_pos); last_pos = pos+1; - pos = b.tqfind(':', last_pos); + pos = b.find(':', last_pos); } for(int i = 0; i < nFields;i++) @@ -398,9 +398,9 @@ void ExecutableAccounting::gotData(KProcess */*proc*/, char *buffer, int /*bufle TQString s(buffer); int del1, del2, del3; - del1 = s.tqfind(':'); - del2 = s.tqfind(':', del1+1); - del3 = s.tqfind(':', del2+1); + del1 = s.find(':'); + del2 = s.find(':', del1+1); + del3 = s.find(':', del2+1); if(del1 == -1 || del2 == -1 || del3 == -1) { // TODO: do something usefull here return; diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index cbfe03d7..eadace7e 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -293,7 +293,7 @@ void AccountWidget::newaccount() { if(result == TQDialog::Accepted) { accountlist_l->insertItem(gpppdata.accname()); - accountlist_l->setSelected(accountlist_l->tqfindItem(gpppdata.accname()), + accountlist_l->setSelected(accountlist_l->findItem(gpppdata.accname()), true); emit resetaccounts(); gpppdata.save(); diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp index 4cad3aeb..fd456202 100644 --- a/kppp/acctselect.cpp +++ b/kppp/acctselect.cpp @@ -134,7 +134,7 @@ AccountingSelector::AccountingSelector(TQWidget *tqparent, bool _isnewaccount, c TQString AccountingSelector::fileNameToName(TQString s) { - s.tqreplace('_', " "); + s.replace('_', " "); return KURL::decode_string(s); } @@ -142,7 +142,7 @@ TQString AccountingSelector::fileNameToName(TQString s) { TQString AccountingSelector::nameToFileName(TQString s) { - s.tqreplace(' ', "_"); + s.replace(' ', "_"); return s; } diff --git a/kppp/connect.cpp b/kppp/connect.cpp index bb2c17a2..b02da8db 100644 --- a/kppp/connect.cpp +++ b/kppp/connect.cpp @@ -425,7 +425,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { return; } - if(readbuffer.tqcontains(gpppdata.modemBusyResp())) { + if(readbuffer.contains(gpppdata.modemBusyResp())) { timeout_timer->stop(); timeout_timer->start(gpppdata.modemTimeout()*1000); @@ -451,7 +451,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { return; } - if(readbuffer.tqcontains(gpppdata.modemNoDialtoneResp())) { + if(readbuffer.contains(gpppdata.modemNoDialtoneResp())) { timeout_timer->stop(); messg->setText(i18n("No Dial Tone")); @@ -461,7 +461,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { return; } - if(readbuffer.tqcontains(gpppdata.modemNoCarrierResp())) { + if(readbuffer.contains(gpppdata.modemNoCarrierResp())) { if (gpppdata.get_redial_on_nocarrier()) { timeout_timer->stop(); timeout_timer->start(gpppdata.modemTimeout()*1000); @@ -492,7 +492,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { return; } - if(readbuffer.tqcontains(gpppdata.modemDLPResp())) { + if(readbuffer.contains(gpppdata.modemDLPResp())) { timeout_timer->stop(); messg->setText(i18n("Digital Line Protection Detected.")); @@ -583,12 +583,12 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { if (scriptCommand == "Send" || scriptCommand == "SendNoEcho") { TQString bm = i18n("Sending %1"); - // tqreplace %USERNAME% and %PASSWORD% + // replace %USERNAME% and %PASSWORD% TQString arg = scriptArgument; TQRegExp re1("%USERNAME%"); TQRegExp re2("%PASSWORD%"); - arg = arg.tqreplace(re1, gpppdata.storedUsername()); - arg = arg.tqreplace(re2, gpppdata.storedPassword()); + arg = arg.replace(re1, gpppdata.storedUsername()); + arg = arg.replace(re2, gpppdata.storedPassword()); if (scriptCommand == "Send") bm = bm.tqarg(scriptArgument); @@ -752,7 +752,7 @@ void ConnectWidget::timerEvent(TQTimerEvent *) { // variable (from the subsequent scan). TQString ts = scriptArgument; - int vstart = ts.tqfind( "##" ); + int vstart = ts.find( "##" ); if( vstart != -1 ) { ts.remove( vstart, 2 ); ts.insert( vstart, scanvar ); @@ -994,11 +994,11 @@ void ConnectWidget::checkBuffers() { // Let's check if we are finished with scanning: // The scanstring have to be in the buffer and the latest character // was a carriage return or an linefeed (depending on modem setup) - if( scanning && scanbuffer.tqcontains(scanstr) && + if( scanning && scanbuffer.contains(scanstr) && ( scanbuffer.right(1) == "\n" || scanbuffer.right(1) == "\r") ) { scanning = false; - int vstart = scanbuffer.tqfind( scanstr ) + scanstr.length(); + int vstart = scanbuffer.find( scanstr ) + scanstr.length(); scanvar = scanbuffer.mid( vstart, scanbuffer.length() - vstart); scanvar = scanvar.stripWhiteSpace(); @@ -1008,10 +1008,10 @@ void ConnectWidget::checkBuffers() { } if(expecting) { - if(readbuffer.tqcontains(expectstr)) { + if(readbuffer.contains(expectstr)) { expecting = false; // keep everything after the expected string - readbuffer.remove(0, readbuffer.tqfind(expectstr) + expectstr.length()); + readbuffer.remove(0, readbuffer.find(expectstr) + expectstr.length()); TQString ts = i18n("Found: %1").tqarg(expectstr); emit debugMessage(ts); @@ -1021,7 +1021,7 @@ void ConnectWidget::checkBuffers() { } } - if (loopend && readbuffer.tqcontains(loopstr[loopnest])) { + if (loopend && readbuffer.contains(loopstr[loopnest])) { expecting = false; readbuffer = ""; TQString ts = i18n("Looping: %1").tqarg(loopstr[loopnest]); @@ -1127,7 +1127,7 @@ void ConnectWidget::setExpect(const TQString &n) { expectstr = n; TQString ts = i18n("Expecting: %1").tqarg(n); - ts.tqreplace(TQRegExp("\n"), "<LF>"); + ts.replace(TQRegExp("\n"), "<LF>"); emit debugMessage(ts); // check if the expected string is in the read buffer already. @@ -1382,7 +1382,7 @@ void auto_hostname() { if (hostname_entry != 0L) { new_hostname=hostname_entry->h_name; - dot=new_hostname.tqfind('.'); + dot=new_hostname.find('.'); new_hostname=new_hostname.remove(dot,new_hostname.length()-dot); Requester::rq->setHostname(new_hostname); modified_hostname = TRUE; @@ -1427,11 +1427,11 @@ void add_domain(const TQString &domain) { write(fd, tmp.data(), tmp.length()); for(int j=0; j < i; j++) { - if((resolv[j].tqcontains("domain") || - ( resolv[j].tqcontains("nameserver") - && !resolv[j].tqcontains("#kppp temp entry") + if((resolv[j].contains("domain") || + ( resolv[j].contains("nameserver") + && !resolv[j].contains("#kppp temp entry") && gpppdata.exDNSDisabled())) - && !resolv[j].tqcontains("#entry disabled by kppp")) { + && !resolv[j].contains("#entry disabled by kppp")) { TQCString tmp = "# " + resolv[j].local8Bit() + " \t#entry disabled by kppp\n"; write(fd, tmp, tmp.length()); @@ -1510,8 +1510,8 @@ void removedns() { if((fd = Requester::rq->openResolv(O_WRONLY|O_TRUNC)) >= 0) { for(int j=0; j < i; j++) { - if(resolv[j].tqcontains("#kppp temp entry")) continue; - if(resolv[j].tqcontains("#entry disabled by kppp")) { + if(resolv[j].contains("#kppp temp entry")) continue; + if(resolv[j].contains("#entry disabled by kppp")) { TQCString tmp = resolv[j].local8Bit(); write(fd, tmp.data()+2, tmp.length() - 27); write(fd, "\n", 1); diff --git a/kppp/edit.cpp b/kppp/edit.cpp index e9f049ab..fb1156be 100644 --- a/kppp/edit.cpp +++ b/kppp/edit.cpp @@ -724,7 +724,7 @@ DNSWidget::DNSWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) void DNSWidget::DNS_Edit_Changed(const TQString &text) { TQRegExp r("[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+"); - add->setEnabled(text.tqfind(r) != -1); + add->setEnabled(text.find(r) != -1); } void DNSWidget::DNS_Entry_Selected(int) { diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index 7549581a..4a335d45 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -733,7 +733,7 @@ void KPPPWidget::beginConnect() { if(!info2.exists()){ TQString string; - string = i18n("kppp can not tqfind:\n %1\nPlease make sure you have setup " + string = i18n("kppp can not find:\n %1\nPlease make sure you have setup " "your modem device properly " "and/or adjust the location of the modem device on " "the modem tab of " @@ -994,7 +994,7 @@ void KPPPWidget::resetVolume(const TQString &s) { */ TQString KPPPWidget::encodeWord(const TQString &s) { TQString r = s; - r.tqreplace(TQRegExp("\\"), "\\\\"); + r.replace(TQRegExp("\\"), "\\\\"); return r; } diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 8ac58c16..80adc7bf 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -304,7 +304,7 @@ void MonthlyWidget::plotMonth() { con = li->connectionName(); // this connection name not in the list and combo box - if(lstConnections.tqfindIndex(con) == -1) { + if(lstConnections.findIndex(con) == -1) { lstConnections.append(con); cboConnections->insertItem(con); } @@ -513,7 +513,7 @@ void MonthlyWidget::exportWizard() { con = li->connectionName(); // this connection name not in the list and combo box - if(lstConnections.tqfindIndex(con) == -1) { + if(lstConnections.findIndex(con) == -1) { lstConnections.append(con); cboConnections->insertItem(con); } diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp index 74488dca..4da23213 100644 --- a/kppp/modemdb.cpp +++ b/kppp/modemdb.cpp @@ -152,7 +152,7 @@ TQStringList *ModemDatabase::models(TQString vendor) { for(uint i = 0; i < modems.count(); i++) { CharDict *dict = modems.at(i); - if(dict->tqfind("Vendor") != 0) { + if(dict->find("Vendor") != 0) { if(vendor == *(*dict)["Vendor"] && (*(*dict)["Name"]).at(0) != '!') sl->append(*(*dict)["Name"]); } @@ -179,7 +179,7 @@ void ModemDatabase::loadModem(const TQString &key, CharDict &dict) { // e = it->current(); while(!it.key().isNull()) { - if(dict.tqfind(it.key()) == 0) { + if(dict.find(it.key()) == 0) { dict.insert(it.key(), new TQString(it.data())); } it++; @@ -187,7 +187,7 @@ void ModemDatabase::loadModem(const TQString &key, CharDict &dict) { // check name attribute if(dict["Name"] == 0 || key[0]=='!') { - dict.tqreplace("Name", new TQString(key)); + dict.replace("Name", new TQString(key)); } // check tqparent attribute @@ -217,16 +217,16 @@ void ModemDatabase::load() { // if(strcmp(it->latin1(), "Common") == 0) { if(*it == "Common") { TQString s = i18n("Hayes(tm) compatible modem"); - c->tqreplace("Name", new TQString (s)); + c->replace("Name", new TQString (s)); s = i18n("<Generic>"); - c->tqreplace("Vendor", new TQString(s)); + c->replace("Vendor", new TQString(s)); } modems.append(c); if(modemDB->hasKey("Vendor")) { TQString vendor = modemDB->readEntry("Vendor"); - if(lvendors->tqfindIndex(vendor) == -1) + if(lvendors->findIndex(vendor) == -1) lvendors->append(vendor); } ++it; diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp index 9aa79b8a..737d468a 100644 --- a/kppp/modeminfo.cpp +++ b/kppp/modeminfo.cpp @@ -207,7 +207,7 @@ void ModemTransfer::readtty() { if (step == 0) return; - readbuffer.tqreplace(TQRegExp("[\n\r]")," "); // remove stray \n and \r + readbuffer.replace(TQRegExp("[\n\r]")," "); // remove stray \n and \r readbuffer = readbuffer.stripWhiteSpace(); // strip of leading or trailing white // space diff --git a/kppp/modems.cpp b/kppp/modems.cpp index 6fb3a650..84b0979e 100644 --- a/kppp/modems.cpp +++ b/kppp/modems.cpp @@ -159,7 +159,7 @@ void ModemsWidget::newmodem() { if(result == TQDialog::Accepted) { modemlist_l->insertItem(gpppdata.modname()); - modemlist_l->setSelected(modemlist_l->tqfindItem(gpppdata.modname()), + modemlist_l->setSelected(modemlist_l->findItem(gpppdata.modname()), true); emit resetmodems(); gpppdata.save(); diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp index e856dd2c..62dfeaa9 100644 --- a/kppp/pppdata.cpp +++ b/kppp/pppdata.cpp @@ -929,7 +929,7 @@ bool PPPData::setAccountByIndex(int i) { bool PPPData::isUniqueAccname(const TQString &n) { - if(n.tqcontains(':')) + if(n.contains(':')) return false; int current = caccount; for(int i=0; i <= accounthighcount; i++) { diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp index 597cd53d..a5075b3e 100644 --- a/kppp/ppplog.cpp +++ b/kppp/ppplog.cpp @@ -163,7 +163,7 @@ void PPPL_AnalyseLog(TQStringList &list, TQStringList &result) { for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { // look for remote message - int pos = (*it).tqfind(rmsg); + int pos = (*it).find(rmsg); if (pos != -1) { TQString str = (*it); @@ -180,7 +180,7 @@ void PPPL_AnalyseLog(TQStringList &list, TQStringList &result) { for(uint k = 0; hints[k].regexp != 0; k++) { TQRegExp rx(hints[k].regexp); TQString l(*it); - if(l.tqcontains(rx)) { + if(l.contains(rx)) { result.append(i18n(hints[k].answer)); break; } @@ -206,11 +206,11 @@ void PPPL_ShowLog() { TQString conn = TQString::tqfromLatin1("Connect:"); TQStringList::ConstIterator it = sl.begin(); for( ; it != sl.end(); it++) { - if((*it).tqfind(lcp) >= 0) { + if((*it).find(lcp) >= 0) { foundLCP = true; break; } - if((*it).tqfind(conn) >= 0) + if((*it).find(conn) >= 0) foundConnect = true; } if(foundConnect && !foundLCP) { diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp index a86b915d..f27c5528 100644 --- a/kppp/providerdb.cpp +++ b/kppp/providerdb.cpp @@ -143,11 +143,11 @@ void ProviderDB::accept() { while(it != map.end()) { TQString key = it.key(); TQString value = *it; - if(value.tqcontains(re_username)) - value.tqreplace(re_username, page4->username()); + if(value.contains(re_username)) + value.replace(re_username, page4->username()); - if(value.tqcontains(re_password)) - value.tqreplace(re_password, page4->password()); + if(value.contains(re_password)) + value.replace(re_password, page4->password()); gpppdata.writeConfig(gpppdata.currentAccountGroup(), key, value); @@ -296,7 +296,7 @@ void PDB_Provider::setDir(const TQString &_dir) { TQString dir1 = KGlobal::dirs()->findDirs("appdata", "Provider").first(); TQRegExp re1(" "); - dir = dir.tqreplace(re1, "_"); + dir = dir.replace(re1, "_"); dir1 += dir; TQDir d(dir1); @@ -458,7 +458,7 @@ void urlEncode(TQString &s) { TQString s1, tmp; for(uint i = 0; i < s.length(); i++) { - if(TQString(UNENCODED_CHARS).tqfind(s[i]) >= 0) + if(TQString(UNENCODED_CHARS).find(s[i]) >= 0) s1 += s[i]; else { tmp.sprintf("%%%03i", s[i].tqunicode()); diff --git a/kppp/ruleset.cpp b/kppp/ruleset.cpp index 6c2131a6..ef9d9517 100644 --- a/kppp/ruleset.cpp +++ b/kppp/ruleset.cpp @@ -127,7 +127,7 @@ int RuleSet::load(const TQString &filename) { } while(!f.atEnd() && backslashed); // strip whitespace - line = line.tqreplace(TQRegExp("[ \t\r]"), ""); + line = line.replace(TQRegExp("[ \t\r]"), ""); // skip comment lines if((line.left(1) == "#") || line.isEmpty()) continue; @@ -183,7 +183,7 @@ void RuleSet::addRule(RULE r) { } bool RuleSet::parseEntry(RULE &ret, TQString s, int year) { - if(s.tqcontains(TQRegExp("^[0-9]+/[0-9]+$"))) { + if(s.contains(TQRegExp("^[0-9]+/[0-9]+$"))) { int d, m; sscanf(s.ascii(), "%d/%d", &m, &d); ret.type = 1; @@ -192,7 +192,7 @@ bool RuleSet::parseEntry(RULE &ret, TQString s, int year) { return TRUE; } - if(s.tqcontains(TQRegExp("^[0-9]+\\.[0-9]+$"))) { + if(s.contains(TQRegExp("^[0-9]+\\.[0-9]+$"))) { int d, m; sscanf(s.ascii(), "%d.%d", &d, &m); ret.type = 1; @@ -245,7 +245,7 @@ bool RuleSet::parseEntries(TQString s, int year, s = "monday..sunday"; while(s.length()) { - int pos = s.tqfind(','); + int pos = s.find(','); TQString token; if(pos == -1) { token = s; @@ -258,9 +258,9 @@ bool RuleSet::parseEntries(TQString s, int year, // we've a token, now check if it defines a // range RULE r; - if(token.tqcontains("..")) { + if(token.contains("..")) { TQString left, right; - left = token.left(token.tqfind("..")); + left = token.left(token.find("..")); right = token.right(token.length()-2-left.length()); RULE lr, rr; if(parseEntry(lr, left, year) && parseEntry(rr, right, year)) { @@ -317,13 +317,13 @@ bool RuleSet::parseRate(double &costs, double &len, double &after, TQString s) { bool RuleSet::parseLine(const TQString &s) { - // ### use TQRegExp::cap() instead of mid() and tqfind() + // ### use TQRegExp::cap() instead of mid() and find() // for our french friends -- Bernd - if(s.tqcontains(TQRegExp("flat_init_costs=\\(.*"))) { + if(s.contains(TQRegExp("flat_init_costs=\\(.*"))) { // parse the time fields - TQString token = s.mid(s.tqfind("flat_init_costs=(") + 17, - s.tqfind(")")-s.tqfind("flat_init_costs=(") - 17); + TQString token = s.mid(s.find("flat_init_costs=(") + 17, + s.find(")")-s.find("flat_init_costs=(") - 17); // printf("TOKEN=%s\n",token.ascii()); double after; @@ -342,17 +342,17 @@ bool RuleSet::parseLine(const TQString &s) { } - if(s.tqcontains(TQRegExp("on\\(.*\\)between\\(.*\\)use\\(.*\\)"))) { + if(s.contains(TQRegExp("on\\(.*\\)between\\(.*\\)use\\(.*\\)"))) { // parse the time fields - TQString token = s.mid(s.tqfind("between(") + 8, - s.tqfind(")use")-s.tqfind("between(") - 8); + TQString token = s.mid(s.find("between(") + 8, + s.find(")use")-s.find("between(") - 8); TQTime t1, t2; if(!parseTime(t1, t2, token)) return FALSE; // parse the rate fields - token = s.mid(s.tqfind("use(") + 4, - s.tqfindRev(")")-s.tqfind("use(") - 4); + token = s.mid(s.find("use(") + 4, + s.findRev(")")-s.find("use(") - 4); double costs; double len; double after; @@ -360,8 +360,8 @@ bool RuleSet::parseLine(const TQString &s) { return FALSE; // parse the days - token = s.mid(s.tqfind("on(") + 3, - s.tqfind(")betw")-s.tqfind("on(") - 3); + token = s.mid(s.find("on(") + 3, + s.find(")betw")-s.find("on(") - 3); if(!parseEntries(token, TQDate::tqcurrentDate().year(), t1, t2, costs, len, after)) return FALSE; @@ -370,14 +370,14 @@ bool RuleSet::parseLine(const TQString &s) { } // check for the name - if(s.tqcontains(TQRegExp("name=.*"))) { + if(s.contains(TQRegExp("name=.*"))) { _name = s.right(s.length()-5); return !_name.isEmpty(); } // check default entry - if(s.tqcontains(TQRegExp("default=\\(.*\\)"))) { + if(s.contains(TQRegExp("default=\\(.*\\)"))) { TQString token = s.mid(9, s.length() - 10); double after; if(parseRate(default_costs, default_len, after, token)) @@ -385,7 +385,7 @@ bool RuleSet::parseLine(const TQString &s) { } // check for "minimum costs" - if(s.tqcontains(TQRegExp("minimum_costs=.*"))) { + if(s.contains(TQRegExp("minimum_costs=.*"))) { TQString token = s.right(s.length() - strlen("minimum_costs=")); bool ok; _minimum_costs = token.toDouble(&ok); @@ -398,7 +398,7 @@ bool RuleSet::parseLine(const TQString &s) { return TRUE; } - if(s.tqcontains(TQRegExp("currency_digits=.*"))) { + if(s.contains(TQRegExp("currency_digits=.*"))) { TQString token = s.mid(16, s.length() - 16); bool ok; _currency_digits = token.toInt(&ok); @@ -406,11 +406,11 @@ bool RuleSet::parseLine(const TQString &s) { } // "currency_position" is deprecated so we'll simply ignore it - if(s.tqcontains(TQRegExp("currency_position=.*"))) + if(s.contains(TQRegExp("currency_position=.*"))) return TRUE; // check per connection fee - if(s.tqcontains(TQRegExp("per_connection="))) { + if(s.contains(TQRegExp("per_connection="))) { TQString token = s.mid(15, s.length()-15); bool ok; pcf = token.toDouble(&ok); diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index 5719ad65..e6384ccd 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -303,9 +303,9 @@ bool KRDC::parseHost(TQString &str, Protocol &prot, TQString &serverHost, int &s if(s.startsWith("smb:/")>0) { //we know it's more likely to be windows.. s = "rdp:/" + s.section("smb:/", 1); prot = PROTOCOL_RDP; - } else if(s.tqcontains("://") > 0) { + } else if(s.contains("://") > 0) { s = s.section("://",1); - } else if(s.tqcontains(":/") > 0) { + } else if(s.contains(":/") > 0) { s = s.section(":/", 1); } } diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp index 2ce61c2e..a76e31d1 100644 --- a/krdc/maindialogwidget.cpp +++ b/krdc/maindialogwidget.cpp @@ -148,9 +148,9 @@ TQString MainDialogWidget::remoteHost() void MainDialogWidget::hostChanged( const TQString &text ) { - emit hostValid(text.tqcontains(TQRegExp(":[0-9]+$")) || - text.tqcontains(TQRegExp("^vnc:/.+")) || - text.tqcontains(TQRegExp("^rdp:/.+"))); + emit hostValid(text.contains(TQRegExp(":[0-9]+$")) || + text.contains(TQRegExp("^vnc:/.+")) || + text.contains(TQRegExp("^rdp:/.+"))); } void MainDialogWidget::toggleBrowsingArea() @@ -166,7 +166,7 @@ void MainDialogWidget::enableBrowsingArea( bool enable ) m_browsingPanel->show(); m_browsingPanel->setMaximumSize(1000, 1000); m_browsingPanel->setEnabled(true); - m_browseButton->setText(m_browseButton->text().tqreplace(">>", "<<")); + m_browseButton->setText(m_browseButton->text().replace(">>", "<<")); } else { @@ -174,7 +174,7 @@ void MainDialogWidget::enableBrowsingArea( bool enable ) m_browsingPanel->hide(); m_browsingPanel->setMaximumSize(0, 0); m_browsingPanel->setEnabled(false); - m_browseButton->setText(m_browseButton->text().tqreplace("<<", ">>")); + m_browseButton->setText(m_browseButton->text().replace("<<", ">>")); int h = tqminimumSize().height()-hOffset; setMinimumSize(tqminimumSize().width(), (h > 0) ? h : 0); resize(width(), height()-hOffset); @@ -344,11 +344,11 @@ void MainDialogWidget::lastSignalServices( bool success ) void MainDialogWidget::foundScopes( TQStringList scopeList ) { - int di = scopeList.tqfindIndex( DEFAULT_SCOPE ); + int di = scopeList.findIndex( DEFAULT_SCOPE ); if ( di >= 0 ) scopeList[ di ] = i18n( "default" ); - int ct = scopeList.tqfindIndex( m_scopeCombo->currentText() ); + int ct = scopeList.findIndex( m_scopeCombo->currentText() ); m_scopeCombo->clear(); m_scopeCombo->insertStringList( scopeList ); if ( ct >= 0 ) diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index e5add6c8..59ac4c9f 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -659,7 +659,7 @@ bool KVncView::x11Event(XEvent *e) { case XK_Shift_R: if (pressed) m_mods[s] = true; - else if (m_mods.tqcontains(s)) + else if (m_mods.contains(s)) m_mods.remove(s); else unpressModifiers(); diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp index 5e12ca08..f20076de 100644 --- a/krfb/kinetd/kinetd.cpp +++ b/krfb/kinetd/kinetd.cpp @@ -257,11 +257,11 @@ TQStringList PortListener::processServiceTemplate(const TQString &a) { TQString hostName = address->nodeName(); KUser u; TQString x = a; // replace does not work in const TQString. Why?? - l.append(x.tqreplace(TQRegExp("%h"), KServiceRegistry::encodeAttributeValue(hostName)) - .tqreplace(TQRegExp("%p"), TQString::number(m_port)) - .tqreplace(TQRegExp("%u"), KServiceRegistry::encodeAttributeValue(u.loginName())) - .tqreplace(TQRegExp("%i"), KServiceRegistry::encodeAttributeValue(m_uuid)) - .tqreplace(TQRegExp("%f"), KServiceRegistry::encodeAttributeValue(u.fullName()))); + l.append(x.replace(TQRegExp("%h"), KServiceRegistry::encodeAttributeValue(hostName)) + .replace(TQRegExp("%p"), TQString::number(m_port)) + .replace(TQRegExp("%u"), KServiceRegistry::encodeAttributeValue(u.loginName())) + .replace(TQRegExp("%i"), KServiceRegistry::encodeAttributeValue(m_uuid)) + .replace(TQRegExp("%f"), KServiceRegistry::encodeAttributeValue(u.fullName()))); } return l; } diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp index c9215d46..d4b520d6 100644 --- a/krfb/krfb/trayicon.cpp +++ b/krfb/krfb/trayicon.cpp @@ -124,7 +124,7 @@ void TrayIcon::setDesktopControlSetting(bool b) { void TrayIcon::mousePressEvent(TQMouseEvent *e) { - if (!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) + if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos())) return; if (e->button() == Qt::LeftButton) { diff --git a/krfb/libvncserver/fontsel.c b/krfb/libvncserver/fontsel.c index 5d7664de..100db817 100644 --- a/krfb/libvncserver/fontsel.c +++ b/krfb/libvncserver/fontsel.c @@ -54,7 +54,7 @@ int main(int argc,char** argv) rfbScreen = s; font=rfbLoadConsoleFont(DEFAULTFONT); if(!font) { - fprintf(stderr,"Couldn't tqfind %s\n",DEFAULTFONT); + fprintf(stderr,"Couldn't find %s\n",DEFAULTFONT); exit(1); } diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h index 55051819..ef79227c 100644 --- a/krfb/libvncserver/rfb.h +++ b/krfb/libvncserver/rfb.h @@ -263,7 +263,7 @@ typedef struct _rfbScreenInfo themselves end up invoking drawing routines. Removing the cursor (rfbUndrawCursor) is eventually achieved by - doing a CopyArea from a pixmap to the screen, where the pixmap tqcontains + doing a CopyArea from a pixmap to the screen, where the pixmap contains the saved contents of the screen under the cursor. Before doing this, however, we set cursorIsDrawn to FALSE. Then, when CopyArea is called, it sees that cursorIsDrawn is FALSE and so doesn't feel the need to diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp index df1e9509..c9459864 100644 --- a/ksirc/FilterRuleEditor.cpp +++ b/ksirc/FilterRuleEditor.cpp @@ -228,13 +228,13 @@ void FilterRuleEditor::lowerRule() TQString FilterRuleEditor::convertSpecial(TQString str) { - str.tqreplace(TQRegExp("\\$"), "$$"); + str.replace(TQRegExp("\\$"), "$$"); return str; } TQString FilterRuleEditor::convertSpecialBack(TQString str) { - str.tqreplace(TQRegExp("\\$\\$"), "$"); + str.replace(TQRegExp("\\$\\$"), "$"); return str; } diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp index f005394b..9f9bebf8 100644 --- a/ksirc/KSOpenkSirc/open_ksirc.cpp +++ b/ksirc/KSOpenkSirc/open_ksirc.cpp @@ -137,7 +137,7 @@ void open_ksirc::insertGroupList() Server *serv; for ( serv=Groups.first(); serv != 0; serv=Groups.next() ) { - if (tempgroups.tqfind(serv->group()) == -1) + if (tempgroups.find(serv->group()) == -1) tempgroups.inSort( serv->group() ); } @@ -307,8 +307,8 @@ void open_ksirc::clickConnect() conf->setGroup("ServerList"); conf->writeEntry("StorePasswords", CheckB_StorePassword->isChecked()); TQStringList recent = conf->readListEntry("RecentServers"); - if(recent.tqcontains(server)){ - TQStringList::Iterator it = recent.tqfind(server); + if(recent.contains(server)){ + TQStringList::Iterator it = recent.find(server); recent.remove(it); } diff --git a/ksirc/KSPrefs/page_colors.cpp b/ksirc/KSPrefs/page_colors.cpp index a31acb64..0aca72ed 100644 --- a/ksirc/KSPrefs/page_colors.cpp +++ b/ksirc/KSPrefs/page_colors.cpp @@ -162,13 +162,13 @@ void PageColors::readConfig( const KSOColors *opts ) conf->setGroup("ColourSchemes"); themeLB->clear(); TQStringList names = conf->readListEntry("Names"); - if(names.tqcontains("Custom")){ - names.remove(names.tqfind("Custom")); + if(names.contains("Custom")){ + names.remove(names.find("Custom")); } names.prepend("Custom"); themeLB->insertStringList(names); - if(themeLB->tqfindItem(ksopts->colourTheme, TQt::ExactMatch)) - themeLB->setCurrentItem(themeLB->tqfindItem(ksopts->colourTheme, TQt::ExactMatch)); + if(themeLB->findItem(ksopts->colourTheme, TQt::ExactMatch)) + themeLB->setCurrentItem(themeLB->findItem(ksopts->colourTheme, TQt::ExactMatch)); else themeLB->setCurrentItem(0); themeLE->setText(themeLB->currentText()); @@ -243,7 +243,7 @@ void PageColors::themeAddPB_clicked() kdDebug(5008) << "Got add: " << themeLB->currentText() << endl; - m_dcol.tqreplace(name, new KSOColors()); + m_dcol.replace(name, new KSOColors()); m_dcol[name]->backgroundColor = backCBtn->color(); m_dcol[name]->selBackgroundColor = selBackCBtn->color(); @@ -257,11 +257,11 @@ void PageColors::themeAddPB_clicked() m_dcol[name]->nickForeground = nickFGCBtn->color(); m_dcol[name]->nickBackground = nickBGCBtn->color(); - if(themeLB->tqfindItem(name, TQt::ExactMatch) == 0){ + if(themeLB->findItem(name, TQt::ExactMatch) == 0){ themeLB->insertItem(name); } - themeLB->setCurrentItem(themeLB->tqfindItem(name, TQt::ExactMatch)); + themeLB->setCurrentItem(themeLB->findItem(name, TQt::ExactMatch)); } diff --git a/ksirc/KSPrefs/page_general.cpp b/ksirc/KSPrefs/page_general.cpp index 119201e1..f90016a5 100644 --- a/ksirc/KSPrefs/page_general.cpp +++ b/ksirc/KSPrefs/page_general.cpp @@ -87,15 +87,15 @@ void PageGeneral::readConfig( const KSOGeneral *opts ) // remove utf16/ucs2 as it just doesn't work for IRC TQStringList::Iterator encodingIt = encodings.begin(); while ( encodingIt != encodings.end() ) { - if ( ( *encodingIt ).tqfind( "utf16" ) != -1 || - ( *encodingIt ).tqfind( "iso-10646" ) != -1 ) + if ( ( *encodingIt ).find( "utf16" ) != -1 || + ( *encodingIt ).find( "iso-10646" ) != -1 ) encodingIt = encodings.remove( encodingIt ); else ++encodingIt; } encodings.prepend( i18n( "Default" ) ); encodingsCB->insertStringList(encodings); - int eindex = encodings.tqfindIndex(ksopts->channel["global"]["global"].encoding); + int eindex = encodings.findIndex(ksopts->channel["global"]["global"].encoding); if(eindex == -1) encodingsCB->setCurrentItem(0); else diff --git a/ksirc/KSPrefs/page_startup.cpp b/ksirc/KSPrefs/page_startup.cpp index 37b3f875..60e3402f 100644 --- a/ksirc/KSPrefs/page_startup.cpp +++ b/ksirc/KSPrefs/page_startup.cpp @@ -49,7 +49,7 @@ void PageStartup::saveConfig() for( ; it != items.end(); ++it){ ksopts->server[*it] = server[*it]; } - if(!ksopts->server.tqcontains("global")){ + if(!ksopts->server.contains("global")){ ksopts->server["global"] = glb; } @@ -65,7 +65,7 @@ void PageStartup::readConfig( const KSOptions *opts ) if(it.data().globalCopy == false) serverLB->insertItem(it.key()); } - TQListBoxItem *item = serverLB->listBox()->tqfindItem("global"); + TQListBoxItem *item = serverLB->listBox()->findItem("global"); serverLB->listBox()->setSelected(item, true); changing = false; clickedLB(serverLB->listBox()->index(item)); @@ -107,7 +107,7 @@ void PageStartup::clickedLB(int index) { TQString text = serverLB->text(index); - if(!server.tqcontains(text)){ + if(!server.contains(text)){ server[text] = server["global"]; server[text].globalCopy = true; } diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp index bedc0328..d2f5d228 100644 --- a/ksirc/KSTicker/ksticker.cpp +++ b/ksirc/KSTicker/ksticker.cpp @@ -151,7 +151,7 @@ void KSTicker::mergeString(TQString str) int value = nickColourMaker::colourMaker()->findIdx(rx.cap(1)); if(value >= 0){ TQString newText = TQString("~%1\\1~c").tqarg(value); - str.tqreplace(rx, newText); + str.replace(rx, newText); } } @@ -162,8 +162,8 @@ void KSTicker::mergeString(TQString str) int found = 0; TQStringList::Iterator it = strlist.begin(); for(; it != strlist.end(); it++){ - if(((*it).tqfind(ksopts->server["global"].nick, 0, FALSE) == -1) && - ((*it).tqfind(ksopts->server["global"].altNick, 0, FALSE) == -1)){ + if(((*it).find(ksopts->server["global"].nick, 0, FALSE) == -1) && + ((*it).find(ksopts->server["global"].altNick, 0, FALSE) == -1)){ strlist.remove(it); found = 1; break; diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index 904aedf1..581bd2dc 100644 --- a/ksirc/KSTicker/ksttest.cpp +++ b/ksirc/KSTicker/ksttest.cpp @@ -46,7 +46,7 @@ void StdInTicker::readsocket(int socket) int bytes = read(socket, buf, 1024); if(bytes){ TQCString str(buf, bytes); - str.tqreplace(TQRegExp("\n"), " // "); + str.replace(TQRegExp("\n"), " // "); mergeString(str); } } diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp index 80eb2eec..2baa2381 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -93,7 +93,7 @@ int aHistLineEdit::cursorPosition() const void aHistLineEdit::slotMaybeResize() { /* - if(TQTextEdit::text().tqcontains("\n")){ + if(TQTextEdit::text().contains("\n")){ setText(text()); setCursorPosition(text().length()); } @@ -385,7 +385,7 @@ void aHistLineEdit::paste() } else { TQString paste = TQApplication::tqclipboard()->text(TQClipboard::Selection); - paste.tqreplace("\n", " ~ "); + paste.replace("\n", " ~ "); insert(paste); } } diff --git a/ksirc/alistbox.cpp b/ksirc/alistbox.cpp index 9702cd5e..ca0609e8 100644 --- a/ksirc/alistbox.cpp +++ b/ksirc/alistbox.cpp @@ -208,7 +208,7 @@ int aListBox::findNick(const TQString &str) index = searchFor(str, found, FALSE); if(found == TRUE) return index; -// debug("Did not tqfind: %s", str.data()); +// debug("Did not find: %s", str.data()); return -1; } diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp index 9c65c3bb..ece0864e 100644 --- a/ksirc/chanparser.cpp +++ b/ksirc/chanparser.cpp @@ -143,12 +143,12 @@ parseResult * ChannelParser::parseSSFEtqStatus(TQString string) /* * fix up modes which may have gotten the (away) part */ - if(modes.tqcontains("away")){ + if(modes.contains("away")){ modes = ""; } bool away = false; - if(string.tqcontains("(away)")) + if(string.contains("(away)")) away = true; if(away){ @@ -165,29 +165,29 @@ parseResult * ChannelParser::parseSSFEtqStatus(TQString string) } top->ksircProcess()->setNick(nick); - if (chanmode.tqfindRev("t") != -1) + if (chanmode.findRev("t") != -1) top->channelButtons->setProtectMode(true); else top->channelButtons->setProtectMode(false); - if (chanmode.tqfindRev("m") != -1) + if (chanmode.findRev("m") != -1) top->channelButtons->setModerateMode(true); else top->channelButtons->setModerateMode(false); - if (chanmode.tqfindRev("n") != -1) + if (chanmode.findRev("n") != -1) top->channelButtons->setNooutsideMode(true); else top->channelButtons->setNooutsideMode(false); - if (chanmode.tqfindRev("i") != -1) + if (chanmode.findRev("i") != -1) top->channelButtons->setMenuItemMode(0, true); else top->channelButtons->setMenuItemMode(0, false); - if (chanmode.tqfindRev("s") != -1) + if (chanmode.findRev("s") != -1) top->channelButtons->setMenuItemMode(3, true); else top->channelButtons->setMenuItemMode(3, false); - if (modes.tqfindRev("i") != -1) + if (modes.findRev("i") != -1) top->channelButtons->setMenuItemMode(4, true); else top->channelButtons->setMenuItemMode(4, false); - if (modes.tqfindRev("w") != -1) + if (modes.findRev("w") != -1) top->channelButtons->setMenuItemMode(5, true); else top->channelButtons->setMenuItemMode(5, false); - if (modes.tqfindRev("s") != -1) + if (modes.findRev("s") != -1) top->channelButtons->setMenuItemMode(6, true); else top->channelButtons->setMenuItemMode(6, false); @@ -300,7 +300,7 @@ parseResult * ChannelParser::parseSSFEPrompt(TQString string) } if(last[0] == '['){ /* strip time stamp */ - prompt = last.mid(last.tqfind(' ')); + prompt = last.mid(last.find(' ')); } else { prompt = last; @@ -399,7 +399,7 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string) top->nicks->clear(); } - //int start = string.tqfind(": ", 0, FALSE); // Find start of nicks + //int start = string.find(": ", 0, FALSE); // Find start of nicks //if (start < 0) // return new parseError(string, i18n("Could not find start of nicks")); // @@ -638,7 +638,7 @@ parseResult * ChannelParser::parseINFOChangeNick(TQString string) //kdDebug(5008) << "Nick change: " << string << endl; TQRegExp rx("(\\S+) is now known as (\\S+)"); if(rx.search(string) == -1){ - if(string.tqcontains("already taken")){ + if(string.contains("already taken")){ return new parseSucc(" " + string, ksopts->errorColor, "user|error"); } @@ -747,7 +747,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) TQString modes, args, channel; int found = 0; - if(string.tqfind("for user") >= 0) + if(string.find("for user") >= 0) return new parseSucc(" " + string, ksopts->infoColor, "user|mode"); /* @@ -993,7 +993,7 @@ parseResult * ChannelParser::parseINFOTopic(TQString string) if(rx.search( string ) != -1){ TQString channel = rx.cap(1); TQString topic = rx.cap(2); - topic.tqreplace( TQRegExp( "~~" ), "~" ); + topic.replace( TQRegExp( "~~" ), "~" ); /* * check where it's going. @@ -1025,7 +1025,7 @@ parseResult * ChannelParser::parseINFOTopic(TQString string) if(top->channelInfo().channel().lower() == channel.lower()){ TQString topic = rx.cap(3); //kdDebug(5008) << "Topic: " << topic << endl; - topic.tqreplace(TQRegExp("~~"), "~"); + topic.replace(TQRegExp("~~"), "~"); /* * topic is in double quotes, so remove them */ @@ -1042,6 +1042,6 @@ parseResult * ChannelParser::parseINFOTopic(TQString string) void ChannelParser::highlightNick(TQString &string, TQString &nick) { TQRegExp rx(TQString("(^|\\s+)%1(\\s+|$)").tqarg(TQRegExp::escape(nick))); - string.tqreplace(rx, "\\1~n" + nick + "~n\\2"); + string.replace(rx, "\\1~n" + nick + "~n\\2"); } diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp index ebdc9eed..c16c8048 100644 --- a/ksirc/colorpicker.cpp +++ b/ksirc/colorpicker.cpp @@ -249,7 +249,7 @@ bool ColorBar::focusNextPrevChild( bool next ) void ColorBar::mousePressEvent( TQMouseEvent *ev ) { const TQPoint &p = ev->pos(); - if ( contentsRect().tqcontains( p ) ) + if ( contentsRect().contains( p ) ) { m_focusedCell = p.x() / m_cellSize; update(); diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp index 961d01d4..74fdd56e 100644 --- a/ksirc/dccNew.cpp +++ b/ksirc/dccNew.cpp @@ -47,7 +47,7 @@ dccNew::dccNew( TQWidget *tqparent, const char *name, int type, TQString nick ) TQString name = (*it).section("::", 1); kdDebug(5008) << "Looking at: " << *it << "/" << name << endl; - aListBox *a = static_cast<aListBox *>(TQT_TQWIDGET(objFinder::tqfind(name.latin1(), "aListBox"))); + aListBox *a = static_cast<aListBox *>(TQT_TQWIDGET(objFinder::find(name.latin1(), "aListBox"))); if(a){ TQListBoxItem *i; for(i = a->firstItem(); i != 0x0; i = i->next()){ @@ -56,7 +56,7 @@ dccNew::dccNew( TQWidget *tqparent, const char *name, int type, TQString nick ) } } else { - kdDebug(5008) << "Didn't tqfind: " << name << endl; + kdDebug(5008) << "Didn't find: " << name << endl; } } diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp index 4e6020e9..f2805426 100644 --- a/ksirc/displayMgrMDI.cpp +++ b/ksirc/displayMgrMDI.cpp @@ -152,7 +152,7 @@ void DisplayMgrMDI::setCaption(TQWidget *w, const TQString& cap) w->setCaption(cap); TQString esc = cap; - esc.tqreplace("&", "&&"); + esc.replace("&", "&&"); kdDebug(5008) << "Set caption: " << esc << endl; m_topLevel->tabWidget()->setTabLabel( w, esc ); @@ -213,10 +213,10 @@ void DisplayMgrMDI::reparentReq() TQMenuData *tmenu = kst->menuBar(); if(tmenu){ - TQMenuItem *menui = tmenu->tqfindItem(DMM_MDI_ID); + TQMenuItem *menui = tmenu->findItem(DMM_MDI_ID); if(menui){ TQMenuData *cmenu = menui->popup(); - if(cmenu->tqfindItem(DMM_DEATCH_ID) && cmenu->isItemChecked(DMM_DEATCH_ID)){ + if(cmenu->findItem(DMM_DEATCH_ID) && cmenu->isItemChecked(DMM_DEATCH_ID)){ kst->reparent( topLevel()->tabWidget(), 0, TQPoint( 0, 0 ), true ); show(kst); cmenu->setItemChecked(DMM_DEATCH_ID, false); @@ -293,9 +293,9 @@ void DisplayMgrMDI::moveWindow(int step) m_topLevel->setUpdatesEnabled(false); m_topLevel->hideWidget(w); - int space = w->caption().tqfind(" "); + int space = w->caption().find(" "); TQString esc = space < 1 ? w->caption():w->caption().left(space); - esc.tqreplace("&", "&&"); + esc.replace("&", "&&"); kdDebug(5008) << "Insert tab: " << esc << endl; m_topLevel->tabWidget()->insertTab( w, esc, index ); m_topLevel->tabWidget()->showPage( w ); diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp index cdb3d2ae..4c553df6 100644 --- a/ksirc/dockservercontroller.cpp +++ b/ksirc/dockservercontroller.cpp @@ -240,9 +240,9 @@ void dockServerController::subItemActivated(int sub_id) servercontroller::self()->new_toplevel(KSircChannel(server, nick)); } else { - KSircProcess *kp = servercontroller::self()->processes().tqfind(server); + KSircProcess *kp = servercontroller::self()->processes().find(server); if(kp){ - KSircTopLevel *wm = dynamic_cast<KSircTopLevel *>(kp->getWindowList().tqfind("!default")); + KSircTopLevel *wm = dynamic_cast<KSircTopLevel *>(kp->getWindowList().find("!default")); if(wm){ if(cmd == i18n("Ping")){ wm->sirc_line_return("/ping " + nick + "\n"); @@ -433,10 +433,10 @@ void dockServerController::configNotify() void dockServerController::raiseWindow(TQString server, TQString name) { TQCString txt = server.utf8() + "_" + name.utf8() + "_toplevel"; - TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt, "KSircTopLevel")); + TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::find(txt, "KSircTopLevel")); if(obj == 0x0){ txt = server.utf8() + "_!" + name.utf8() + "_toplevel"; - obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt, "KSircTopLevel")); + obj = dynamic_cast<TQWidget *>( objFinder::find(txt, "KSircTopLevel")); } if(obj != 0x0){ diff --git a/ksirc/dsirc b/ksirc/dsirc index eddc5fd2..f358fcd7 100755 --- a/ksirc/dsirc +++ b/ksirc/dsirc @@ -2082,7 +2082,7 @@ sub donumeric { if ($cmd eq '401') { &yetonearg; &yetonearg; - &tell("*\cb?\cb* Cannot tqfind $newarg on irc$from"); + &tell("*\cb?\cb* Cannot find $newarg on irc$from"); } elsif ($cmd eq '402') { &yetonearg; &yetonearg; @@ -2176,7 +2176,7 @@ sub donumeric { eval $err; $@ =~ s/\n$//, &tell("*\cbE\cb* error in userhost: $@") if $@ ne ''; } else { - &tell("*\cb?\cb* Cannot tqfind $n on irc"); + &tell("*\cb?\cb* Cannot find $n on irc"); } } } elsif ($cmd eq '303') { diff --git a/ksirc/ioDCC.cpp b/ksirc/ioDCC.cpp index e718a452..7f601ace 100644 --- a/ksirc/ioDCC.cpp +++ b/ksirc/ioDCC.cpp @@ -58,7 +58,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // Then we look at the one time start/stop messages. They only arrive // once in a long long time (compared to the byte messages) so if it takes // a few extra clock cycles to find them, who cares? - if(str.tqfind("DCC GET read:", 0) != -1){ /*fold01*/ + if(str.find("DCC GET read:", 0) != -1){ /*fold01*/ TQRegExp rx("read: (.+) who: (.+) bytes: (.*)"); if(rx.search(str)){ TQString key = TQString("%1/%2").tqarg(rx.cap(1)).tqarg(rx.cap(2)); @@ -73,7 +73,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.tqfind("DCC SEND write:", 0) != -1){ /*fold01*/ + else if(str.find("DCC SEND write:", 0) != -1){ /*fold01*/ TQRegExp rx("write: (.+) who: (.+) bytes: (.*)"); if(rx.search(str)){ TQString key = TQString("%1/%2").tqarg(rx.cap(1)).tqarg(rx.cap(2)); @@ -84,7 +84,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.tqfind("INBOUND DCC SEND", 0) != -1){ /*FOLD01*/ + else if(str.find("INBOUND DCC SEND", 0) != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) file: (.+) size: (.*) ip: (.+) port: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -127,7 +127,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "DCC SEND was unable to parse: " << str << endl; } } - else if(str.tqfind("Sent DCC SEND", 0) != -1){ /*FOLD01*/ + else if(str.find("Sent DCC SEND", 0) != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) file: (.+) size: (.*)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -164,7 +164,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "DCC SENT was unable to parse: " << str << endl; } } - else if(str.tqfind("DCC CHAT OFFERED", 0) != -1){ /*FOLD01*/ + else if(str.find("DCC CHAT OFFERED", 0) != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) ip: (.+) port: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -182,7 +182,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "DCC CHAT SEND was unable to parse: " << str << endl; } } - else if(str.tqfind("DCC CHAT SEND", 0) != -1){ /*FOLD01*/ + else if(str.find("DCC CHAT SEND", 0) != -1){ /*FOLD01*/ TQRegExp rx("who: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -198,7 +198,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "DCC CHAT SEND was unable to parse: " << str << endl; } } - else if(str.tqfind("DCC SEND terminated") != -1){ /*FOLD01*/ + else if(str.find("DCC SEND terminated") != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) file: (.+) reason: (.*)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -222,7 +222,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.tqfind ("DCC GET terminated") != -1){ /*fold01*/ + else if(str.find ("DCC GET terminated") != -1){ /*fold01*/ kdDebug(5008) << "Term: " << str << endl; TQRegExp rx("who: (.+) file: (.+) reason: (.*)"); if(rx.search(str)){ @@ -247,7 +247,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) kdDebug(5008) << "DCC Get term failed to parse: " << str << endl; } } - else if(str.tqfind("DCC GET resumed") != -1){ /*fold01*/ + else if(str.find("DCC GET resumed") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -262,7 +262,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.tqfind("DCC SEND resumed") != -1){ /*fold01*/ + else if(str.find("DCC SEND resumed") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -273,7 +273,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.tqfind("DCC GET established") != -1){ /*fold01*/ + else if(str.find("DCC GET established") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -284,7 +284,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.tqfind("DCC SEND established") != -1){ /*fold01*/ + else if(str.find("DCC SEND established") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+) ip: (\\S+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -297,7 +297,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.tqfind("DCC CHAT established") != -1){ /*FOLD01*/ + else if(str.find("DCC CHAT established") != -1){ /*FOLD01*/ TQRegExp rx("who: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -307,7 +307,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.tqfind("DCC CHAT inbound established") != -1){ /*FOLD01*/ + else if(str.find("DCC CHAT inbound established") != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) ip: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -319,7 +319,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.tqfind("DCC GET failed") != -1){ /*fold01*/ + else if(str.find("DCC GET failed") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+) reason: (.*)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -332,7 +332,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) KPassivePopup::message(i18n("DCC Get with %1 for %2 failed because of %3").tqarg(who).tqarg(filename).tqarg(error), mgr->mgr()); } } - else if(str.tqfind("DCC CHAT failed") != -1){ /*FOLD01*/ + else if(str.find("DCC CHAT failed") != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) reason: (.*)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -343,19 +343,19 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) KPassivePopup::message(i18n("DCC Chat with %1 failed because of %2").tqarg(who).tqarg(error), mgr->mgr()); } } - else if(str.tqfind("DCC CHAT renamed") != -1){ /*FOLD01*/ + else if(str.find("DCC CHAT renamed") != -1){ /*FOLD01*/ TQRegExp rx("who: (.+) to: (.+)"); if(rx.search(str)){ TQString oldwho = rx.cap(1); TQString newwho = rx.cap(2); TQString oldwin = "=" + oldwho; - if(proc->getWindowList().tqfind(oldwin)){ - proc->getWindowList().tqfind(oldwin)->control_message(CHANGE_CHANNEL,TQString("=" +newwho).lower()); + if(proc->getWindowList().find(oldwin)){ + proc->getWindowList().find(oldwin)->control_message(CHANGE_CHANNEL,TQString("=" +newwho).lower()); } } } - else if(str.tqfind("Closing DCC GET") != -1){ /*fold01*/ + else if(str.find("Closing DCC GET") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -366,7 +366,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } -// else if(str.tqfind("Closing DCC SEND") != -1){ /*FOLD01*/ +// else if(str.find("Closing DCC SEND") != -1){ /*FOLD01*/ // TQRegExp rx("who: (.+) file: (.+)"); // if(rx.search(str)){ // TQString who = rx.cap(1); @@ -377,7 +377,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // } // } // } - else if(str.tqfind("Closing DCC CHAT") != -1){ /*fold01*/ + else if(str.find("Closing DCC CHAT") != -1){ /*fold01*/ TQRegExp rx("who: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -386,7 +386,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) } } } - else if(str.tqfind("No DCC SEND") != -1){ /*fold01*/ + else if(str.find("No DCC SEND") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -412,7 +412,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) toDel.clear(); } } - else if(str.tqfind("No DCC GET") != -1){ /*fold01*/ + else if(str.find("No DCC GET") != -1){ /*fold01*/ TQRegExp rx("who: (.+) file: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -436,7 +436,7 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) toDel.clear(); } } - else if(str.tqfind("No DCC CHAT") != -1){ /*fold01*/ + else if(str.find("No DCC CHAT") != -1){ /*fold01*/ TQRegExp rx("who: (.+)"); if(rx.search(str)){ TQString who = rx.cap(1); @@ -482,9 +482,9 @@ void KSircIODCC::getFile() { /* TQString text = pending->fileListing()->text(pending->fileListing()->currentItem()); - int pos = text.tqfind(" ", 0); + int pos = text.find(" ", 0); TQString nick = text.mid(0, pos); - pos = text.tqfind(" ", pos+1) + 1; + pos = text.find(" ", pos+1) + 1; TQString filename = text.mid(pos, text.length() - pos); //if(DlgList[filename]->isVisible() == FALSE) // DlgList[filename]->show(); @@ -503,9 +503,9 @@ void KSircIODCC::forgetFile() { /* TQString text = pending->fileListing()->text(pending->fileListing()->currentItem()); - int pos = text.tqfind(" ", 0); + int pos = text.find(" ", 0); TQString nick = text.mid(0, pos); - pos = text.tqfind(" ", pos+1) + 1; + pos = text.find(" ", pos+1) + 1; TQString filename = text.mid(pos, text.length() - pos); TQString command = "/dcc close get " + nick + " " + filename + "\n"; emit outputLine(command.ascii()); diff --git a/ksirc/ioLAG.cpp b/ksirc/ioLAG.cpp index ee79094d..0a1a2ec7 100644 --- a/ksirc/ioLAG.cpp +++ b/ksirc/ioLAG.cpp @@ -32,9 +32,9 @@ KSircIOLAG::~KSircIOLAG() void KSircIOLAG::sirc_receive(TQCString str, bool) { - if(str.tqcontains("*L*")){ + if(str.contains("*L*")){ int s1, s2; - s1 = str.tqfind("*L* ") + 4; + s1 = str.find("*L* ") + 4; s2 = str.length(); if(s1 < 0 || s2 < 0){ kdDebug(5008) << "Lag mesage broken: " << str << endl; diff --git a/ksirc/ioNotify.cpp b/ksirc/ioNotify.cpp index c590c180..b3b4a52f 100644 --- a/ksirc/ioNotify.cpp +++ b/ksirc/ioNotify.cpp @@ -26,10 +26,10 @@ KSircIONotify::~KSircIONotify() void KSircIONotify::sirc_receive(TQCString str, bool) { - if(str.tqcontains("*)*")){ + if(str.contains("*)*")){ int s1, s2; - s1 = str.tqfind("Signon by") + 10; - s2 = str.tqfind(" ", s1); + s1 = str.find("Signon by") + 10; + s2 = str.find(" ", s1); if(s1 < 0 || s2 < 0){ kdDebug(5008) << "Nick Notify mesage broken: " << str << endl; return; @@ -37,10 +37,10 @@ void KSircIONotify::sirc_receive(TQCString str, bool) TQString nick = str.mid(s1, s2 - s1); emit notify_online(nick); } - else if(str.tqcontains("*(*")){ + else if(str.contains("*(*")){ int s1, s2; - s1 = str.tqfind("Signoff by") + 11; - s2 = str.tqfind(" ", s1); + s1 = str.find("Signoff by") + 11; + s2 = str.find(" ", s1); if(s1 < 0 || s2 < 0){ kdDebug(5008) << "Nick Notify mesage broken: " << str << endl; return; diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp index e6514537..d63fba7b 100644 --- a/ksirc/iocontroller.cpp +++ b/ksirc/iocontroller.cpp @@ -193,7 +193,7 @@ void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) } if(buffer[buffer.length()-1] != '\n'){ - pos = buffer.tqfindRev('\n'); + pos = buffer.findRev('\n'); if(pos != -1){ holder = buffer.right(buffer.length()-(pos+1)); buffer.truncate(pos+1); @@ -222,7 +222,7 @@ void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) m_debugLB->setUpdatesEnabled(false); do{ - pos2 = buffer.tqfind('\n', pos); + pos2 = buffer.find('\n', pos); if(pos2 == -1) pos2 = buffer.length(); @@ -236,7 +236,7 @@ void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) //kdDebug(5008) << "Line: " << line << endl; if((line.length() > 0) && (line[0] == '~')){ - pos3 = line.tqfind('~', 1); + pos3 = line.find('~', 1); if(pos3 > 1){ name = line.mid(1,pos3-1).lower(); name = name.lower(); diff --git a/ksirc/ksirc.cpp b/ksirc/ksirc.cpp index b391b28a..296e9049 100644 --- a/ksirc/ksirc.cpp +++ b/ksirc/ksirc.cpp @@ -120,7 +120,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) if ( !server.isEmpty() ) { TQString ser = TQString::fromLocal8Bit( server ); TQString port = "6667"; - if(ser.tqcontains(":")){ + if(ser.contains(":")){ port = ser.section(":", 1, 1); ser = ser.section(":", 0, 0); } diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index e0eb019c..3c07d8ad 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -203,7 +203,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * tq default_follow_focus = TRUE; KSircChannel ci(kss.server(), "!no_channel"); new_toplevel(ci, true); // - TopList.tqreplace("!default", TopList[ci.channel()]); + TopList.replace("!default", TopList[ci.channel()]); running_window = FALSE; // set false so next changes the first name @@ -341,7 +341,7 @@ void KSircProcess::new_toplevel(const KSircChannel &channelInfo, bool safe) // TopList.remove("!no_channel"); // We're no longer !no_channel TopList["!no_channel"]->control_message(CHANGE_CHANNEL, channelInfo.server() + "!!!" + channelInfo.channel() + "!!!" + channelInfo.key()); } - else if(TopList.tqfind(channelInfo.channel()) == 0x0){ // If the window doesn't exist, continue + else if(TopList.find(channelInfo.channel()) == 0x0){ // If the window doesn't exist, continue // If AutoCreate windows is on, let's make sure we're not being flooded. if(ksopts->autoCreateWin == TRUE && safe == false){ time_t current_time = time(NULL); @@ -407,7 +407,7 @@ void KSircProcess::new_toplevel(const KSircChannel &channelInfo, bool safe) wm->lineEdit()->setFocus(); // Give focus back to the linee, someone takes it away on new create } else { - TQWidget *w = dynamic_cast<TQWidget *>(TopList.tqfind(channelInfo.channel())); + TQWidget *w = dynamic_cast<TQWidget *>(TopList.find(channelInfo.channel())); if(w) displayMgr->raise(w); } @@ -452,7 +452,7 @@ void KSircProcess::close_toplevel(KSircTopLevel *wm, TQString name) } if (isDefault) - TopList.tqreplace("!default", it.current()); + TopList.replace("!default", it.current()); // Let's let em know she's deleted! if(ksopts->autoCreateWin == TRUE){ @@ -526,7 +526,7 @@ void KSircProcess::default_window(KSircTopLevel *w) // if(w && (default_follow_focus == TRUE)) - TopList.tqreplace("!default", w); + TopList.replace("!default", w); } diff --git a/ksirc/ksopts.cpp b/ksirc/ksopts.cpp index 38bf27fa..c0d6a927 100644 --- a/ksirc/ksopts.cpp +++ b/ksirc/ksopts.cpp @@ -251,7 +251,7 @@ void KSOptions::load( int sections ) /* * do global first */ - if(channel.tqcontains("global") == FALSE){ + if(channel.contains("global") == FALSE){ KSOChannel global; ChannelOpMap coMap; channel.insert(TQString("global"), coMap); @@ -315,7 +315,7 @@ void KSOptions::load( int sections ) /* * do global first */ - if(server.tqcontains("global") == FALSE){ + if(server.contains("global") == FALSE){ KSOServer global; server.insert(TQString("global"), global); server["global"].server = "global"; @@ -490,11 +490,11 @@ void KSOptions::save( int sections ) void KSOptions::channelSetup(TQString serv, TQString chan) { - if(channel.tqcontains(serv) == FALSE){ + if(channel.contains(serv) == FALSE){ ChannelOpMap coMap; channel.insert(serv, coMap); } - if(channel[serv].tqcontains(chan) == FALSE){ + if(channel[serv].contains(chan) == FALSE){ KSOChannel ksoc; ksoc = channel["global"]["global"]; channel[serv].insert(chan, ksoc); @@ -524,7 +524,7 @@ void KSOptions::applyChannelGlobal(void) void KSOptions::serverSetup(TQString serv) { - if(server.tqcontains(serv) == FALSE){ + if(server.contains(serv) == FALSE){ KSOServer ksos; ksos = server["global"]; server.insert(serv, ksos); diff --git a/ksirc/ksparser.cpp b/ksirc/ksparser.cpp index cfdf59f5..e2ebf903 100644 --- a/ksirc/ksparser.cpp +++ b/ksirc/ksparser.cpp @@ -141,10 +141,10 @@ TQString KSParser::pushTag(const TQString &tag, const TQString &attributes) { TQString res; m_tags.push(tag); - if (!m_attributes.tqcontains(tag)) + if (!m_attributes.contains(tag)) m_attributes.insert(tag, attributes); else if (!attributes.isEmpty()) - m_attributes.tqreplace(tag, attributes); + m_attributes.replace(tag, attributes); res.append("<" + tag); if (!m_attributes[tag].isEmpty()) res.append(" " + m_attributes[tag]); @@ -153,7 +153,7 @@ TQString KSParser::pushTag(const TQString &tag, const TQString &attributes) TQString KSParser::popTag(const TQString &tag) { - if (!m_tags.tqcontains(tag)) + if (!m_tags.contains(tag)) return TQString(); TQString res; @@ -172,7 +172,7 @@ TQString KSParser::popTag(const TQString &tag) TQString KSParser::toggleTag(const TQString &tag, const TQString &attributes) { - return m_attributes.tqcontains(tag) ? popTag(tag) : pushTag(tag, attributes); + return m_attributes.contains(tag) ? popTag(tag) : pushTag(tag, attributes); } TQString KSParser::popAll() diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index b12f8864..1ad22239 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -57,7 +57,7 @@ TQPixmap ksTextViewLoadPixmap( const TQString &icon ) qAddPostRoutine( cleanupKSTextViewPixmapDict ); } - TQPixmap *pix = ksTextViewPixmapDict->tqfind( icon ); + TQPixmap *pix = ksTextViewPixmapDict->find( icon ); if ( !pix ) { TQImage img; @@ -586,22 +586,22 @@ TQString Tokenizer::convertToRichText( const PString &ptext ) { TQString entity = KGlobal::charsets()->toEntity( ch ); indexAdjustment = entity.length() - 1; - result.tqreplace( i, 1, entity ); + result.replace( i, 1, entity ); } */ if ( ch == '<' ) { - result.tqreplace( i, 1, "<" ); + result.replace( i, 1, "<" ); indexAdjustment = 3; } else if ( ch == '>' ) { - result.tqreplace( i, 1, ">" ); + result.replace( i, 1, ">" ); indexAdjustment = 3; } else if ( ch == '&' ) { - result.tqreplace( i, 1, "&" ); + result.replace( i, 1, "&" ); indexAdjustment = 4; } @@ -1056,7 +1056,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection if ( start.line == this ) { - const int idx = m_items.tqfindRef( start.item ); + const int idx = m_items.findRef( start.item ); assert( idx != -1 ); } else @@ -1070,7 +1070,7 @@ TQString TextLine::updateSelection( const SelectionPoint &start, const Selection { const int oldCurrent = m_items.at(); - const int idx = m_items.tqfindRef( end.item ); + const int idx = m_items.findRef( end.item ); assert( idx != -1 ); lastItem = m_items.next(); @@ -1381,11 +1381,11 @@ TQString TextParag::updateSelection( const SelectionPoint &start, const Selectio // sanity check // (don't put it lower because it changes the current list item) if ( end.parag == this ) - assert( m_lines.tqfindRef( end.line ) != -1 ); + assert( m_lines.findRef( end.line ) != -1 ); if ( start.parag == this ) { - int idx = m_lines.tqfindRef( start.line ); + int idx = m_lines.findRef( start.line ); assert( idx != -1 ); } else @@ -1742,7 +1742,7 @@ bool TextView::removeParag( const TextParagIterator ¶g ) return false; TextParag *paragPtr = parag.m_paragIt.current(); - const int idx = m_parags.tqfindRef( paragPtr ); + const int idx = m_parags.findRef( paragPtr ); if ( idx == -1 ) return false; @@ -2138,8 +2138,8 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection } else { - assert( m_parags.tqfindRef( end.parag ) != -1 ); - const int idx = m_parags.tqfindRef( start.parag ); + assert( m_parags.findRef( end.parag ) != -1 ); + const int idx = m_parags.findRef( start.parag ); assert( idx != -1 ); TextParag *p = m_parags.current(); diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h index b523d274..e033c0a0 100644 --- a/ksirc/kstextview.h +++ b/ksirc/kstextview.h @@ -81,12 +81,12 @@ public: ConstIterator findAttribute( const char *key ) const { TQString qkey( key ); - return tqfind( StringPtr( qkey ) ); + return find( StringPtr( qkey ) ); } Iterator findAttribute( const char *key ) { TQString qkey( key ); - return tqfind( StringPtr( qkey ) ); + return find( StringPtr( qkey ) ); } StringPtr operator[]( const char *key ) const diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp index 85d0fd1f..8ad1ffd3 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -131,11 +131,11 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const // '<nick message<' , which is supposedly a bug in TQt's reordering. The // same is done for [nick] and >nick< to catch queries. TQRegExp bidiRe( "^(<\\S+>)(.+)$" ); - text.tqreplace( bidiRe, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe2( "^(\\[\\S+\\])(.+)$" ); - text.tqreplace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe3( "^(>\\S+<)(.+)$" ); - text.tqreplace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp nickCol( "~n(.+)~n" ); nickCol.setMinimal(true); @@ -168,7 +168,7 @@ TQString KSircView::addLine(const TQString &pixmap, const TQColor &color, const newText.append("</r>"); } } - text.tqreplace(pos, nickCol.matchedLength(), newText); + text.replace(pos, nickCol.matchedLength(), newText); } //kdDebug(5008) << "After Text: " << text << endl; diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp index 122a934a..ffe0bb4c 100644 --- a/ksirc/mditoplevel.cpp +++ b/ksirc/mditoplevel.cpp @@ -76,7 +76,7 @@ MDITopLevel::~MDITopLevel() void MDITopLevel::addWidget( TQWidget *widget, bool show ) { - if ( m_tabWidgets.tqcontainsRef( widget ) ) + if ( m_tabWidgets.containsRef( widget ) ) return; kdDebug(5008) << "In add widget" << endl; @@ -121,7 +121,7 @@ void MDITopLevel::hideWidget( TQWidget *widget ) void MDITopLevel::showWidget( TQWidget *widget ) { if(m_tab->indexOf(widget) == -1){ - int space = widget->caption().tqfind(" "); + int space = widget->caption().find(" "); TQString cap = space < 1 ? widget->caption():widget->caption().left(space); m_tab->addTab( widget, cap); m_tab->showPage( widget ); @@ -180,7 +180,7 @@ bool MDITopLevel::eventFilter( TQObject *obj, TQEvent *ev ) TQWidget *widget = dynamic_cast<TQWidget *>( obj ); - if ( !widget || !m_tabWidgets.tqcontainsRef( widget ) ) + if ( !widget || !m_tabWidgets.containsRef( widget ) ) return false; if ( m_tab->currentPage() == widget ) @@ -214,7 +214,7 @@ void MDITopLevel::slotMarkPageDirty( bool addressed ) if ( window != m_tab->currentPage() ) { - if ( m_addressed.tqcontainsRef( window ) ) + if ( m_addressed.containsRef( window ) ) addressed = true; else if ( addressed ) { m_addressed.append( window ); @@ -231,7 +231,7 @@ void MDITopLevel::slotChangeChannelName( const TQString &, const TQString &chann return; TQString esc = channelName; - esc.tqreplace("&", "&&"); + esc.replace("&", "&&"); m_tab->setTabLabel( window, esc ); removeFromAddressedList( window ); } diff --git a/ksirc/objFinder.cpp b/ksirc/objFinder.cpp index 27b3d0f2..c5283dbd 100644 --- a/ksirc/objFinder.cpp +++ b/ksirc/objFinder.cpp @@ -49,7 +49,7 @@ void objFinder::insert(TQObject *obj, const char *key){ emit objFind->inserted(obj); } -TQObject *objFinder::tqfind(const char *name, const char *inherits){ +TQObject *objFinder::find(const char *name, const char *inherits){ TQObject *found; TQDictIterator<TQObject> it(*objList); uint len = strlen(name); diff --git a/ksirc/objFinder.h b/ksirc/objFinder.h index 7303a31b..7da02dc4 100644 --- a/ksirc/objFinder.h +++ b/ksirc/objFinder.h @@ -14,7 +14,7 @@ public: virtual ~objFinder(); static void insert(TQObject *obj, const char *key = 0); - static TQObject *tqfind(const char *name, const char *inherits); + static TQObject *find(const char *name, const char *inherits); static void dumpTree(); static TQStringList allObjects(); diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp index a4e13f3c..771a5676 100644 --- a/ksirc/puke/controller.cpp +++ b/ksirc/puke/controller.cpp @@ -590,7 +590,7 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm) obj = tqparent(); } else { - obj = objFinder::tqfind(name, 0x0); + obj = objFinder::find(name, 0x0); if(obj == 0){ wIret.fd = 0; wIret.iWinId = 0; @@ -642,10 +642,10 @@ void PukeController::hdlrPukeDeleteWidget(int fd, PukeMessage *pm) kdDebug(5008) << "WidgetRunner:: no such set of widget descriptors?" << endl; throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_CONNECTION)); } - if(qidWS->tqfind(wI.iWinId)){ + if(qidWS->find(wI.iWinId)){ // Remove the list item then delete the widget. This will stop // the destroyed signal from trying to remove it again. - PObject *pw = qidWS->tqfind(wI.iWinId)->pwidget; + PObject *pw = qidWS->find(wI.iWinId)->pwidget; qidWS->remove(wI.iWinId); delete pw; pw = 0; pmRet.iCommand = PUKE_WIDGET_DELETE_ACK; @@ -661,8 +661,8 @@ void PukeController::hdlrPukeDeleteWidget(int fd, PukeMessage *pm) throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_WIDGET)); } - WidgetList[fd]->tqfind(wI.iWinId)->pwidget->manTerm(); - delete WidgetList[fd]->tqfind(wI.iWinId)->pwidget; + WidgetList[fd]->find(wI.iWinId)->pwidget->manTerm(); + delete WidgetList[fd]->find(wI.iWinId)->pwidget; PukeMessage pmRet = *pm; pmRet.iCommand = PUKE_WIDGET_DELETE_ACK; @@ -745,7 +745,7 @@ void PukeController::closefd(int fd) bool PukeController::checkWidgetId(widgetId *pwi) { if(WidgetList[pwi->fd] != NULL) - if(WidgetList[pwi->fd]->tqfind(pwi->iWinId) != NULL) + if(WidgetList[pwi->fd]->find(pwi->iWinId) != NULL) return TRUE; return FALSE; @@ -753,7 +753,7 @@ bool PukeController::checkWidgetId(widgetId *pwi) PObject *PukeController::id2pobject(widgetId *pwi){ if(checkWidgetId(pwi) == TRUE){ - return WidgetList[pwi->fd]->tqfind(pwi->iWinId)->pwidget; + return WidgetList[pwi->fd]->find(pwi->iWinId)->pwidget; } throw(errorNoSuchWidget(*pwi)); return 0; // never reached @@ -899,7 +899,7 @@ void PukeController::messageHandler(int fd, PukeMessage *pm) { } else{ if(checkWidgetId(&wI) == TRUE){ - WidgetList[wI.fd]->tqfind(wI.iWinId)->pwidget->messageHandler(fd, pm); + WidgetList[wI.fd]->find(wI.iWinId)->pwidget->messageHandler(fd, pm); } else{ PukeMessage pmRet; @@ -943,7 +943,7 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm) wIret.fd = wI.fd; if(checkWidgetId(&wI) == TRUE){ - PObject *obj = WidgetList[wI.fd]->tqfind(wI.iWinId)->pwidget; + PObject *obj = WidgetList[wI.fd]->find(wI.iWinId)->pwidget; if(obj->widget()->isWidgetType() == FALSE){ throw(errorCommandFailed(PUKE_INVALID, 0)); } diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index c525ec65..1f4e62d7 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -767,10 +767,10 @@ void servercontroller::WindowSelected(TQListViewItem *item) return; TQString txt = TQString(parent_server->text(0)) + "_" + item->text(0) + "_toplevel"; - TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt.utf8(), "KSircTopLevel")); + TQWidget *obj = dynamic_cast<TQWidget *>( objFinder::find(txt.utf8(), "KSircTopLevel")); if(obj == 0x0){ txt =TQString(parent_server->text(0)) + "_!" + item->text(0) + "_toplevel"; - obj = dynamic_cast<TQWidget *>( objFinder::tqfind(txt.utf8(), "KSircTopLevel")); + obj = dynamic_cast<TQWidget *>( objFinder::find(txt.utf8(), "KSircTopLevel")); } if(obj != 0x0){ diff --git a/ksirc/stringparserstate.h b/ksirc/stringparserstate.h index 06167267..04fb96ea 100644 --- a/ksirc/stringparserstate.h +++ b/ksirc/stringparserstate.h @@ -33,7 +33,7 @@ public: { if ( m_current >= m_end ) return true; - return m_endItems.tqfindIndex( currentValue() ) != -1; + return m_endItems.findIndex( currentValue() ) != -1; } ConstIterator current() const { return m_current; } diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp index 3afa199d..1932fa03 100644 --- a/ksirc/topic.cpp +++ b/ksirc/topic.cpp @@ -51,11 +51,11 @@ void KSircTopic::setText( const TQString &_text) TQString richText( "<font color=\"%1\">" ); richText = richText.tqarg( ksopts->textColor.name() ); - text.tqreplace('&', "&"); - text.tqreplace('<', "<"); - text.tqreplace('>', ">"); + text.replace('&', "&"); + text.replace('<', "<"); + text.replace('>', ">"); - text.tqreplace('~', "~~"); + text.replace('~', "~~"); // ### a bit of a hack: turn '<nick> message' into // <span><nick><span> message' . span itself isn't supported but it @@ -65,11 +65,11 @@ void KSircTopic::setText( const TQString &_text) // '<nick message<' , which is supposedly a bug in TQt's reordering. The // same is done for [nick] and >nick< to catch queries. TQRegExp bidiRe( "^(<\\S+>)(.+)$" ); - text.tqreplace( bidiRe, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe2( "^(\\[\\S+\\])(.+)$" ); - text.tqreplace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe3( "^(>\\S+<)(.+)$" ); - text.tqreplace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); KSParser parser; richText += parser.parse( text ); @@ -228,9 +228,9 @@ TQPopupMenu *KSircTopicEditor::createPopupMenu( const TQPoint &pos ) void KSircTopicEditor::slotMaybeResize() { - if(text().tqcontains("\n")){ + if(text().contains("\n")){ TQString s = text(); - s.tqreplace('\n', " "); + s.replace('\n', " "); setText(s); setCursorPosition(0, s.length()); } diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index 43b2201e..bdc14b1d 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -189,8 +189,8 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf // remove utf16/ucs2 as it just doesn't work for IRC TQStringList::Iterator encodingIt = encodings.begin(); while ( encodingIt != encodings.end() ) { - if ( ( *encodingIt ).tqfind( "utf16" ) != -1 || - ( *encodingIt ).tqfind( "iso-10646" ) != -1 ) + if ( ( *encodingIt ).find( "utf16" ) != -1 || + ( *encodingIt ).find( "iso-10646" ) != -1 ) encodingIt = encodings.remove( encodingIt ); else ++encodingIt; @@ -200,7 +200,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf encodingAction->setItems( encodings ); encodingAction->plug( file ); - int eindex = encodings.tqfindIndex(ksopts->chan(m_channelInfo).encoding); + int eindex = encodings.findIndex(ksopts->chan(m_channelInfo).encoding); if(eindex == -1) encodingAction->setCurrentItem( 0 ); else @@ -553,7 +553,7 @@ KSircTopLevel::~KSircTopLevel() ksit.atEnd() == 0; ++ksit) { TQString rt = ksit.richText(); - if(rt.tqcontains("<img src=\"user|servinfo\">")) + if(rt.contains("<img src=\"user|servinfo\">")) continue; kdDebug(5008) << rt << endl; @@ -719,7 +719,7 @@ void KSircTopLevel::TabNickCompletion(int dir) s = linee->text(); tab_saved = s; end = linee->cursorPosition() - 1; - start = s.tqfindRev(" ", end, FALSE); + start = s.findRev(" ", end, FALSE); tab_start = start; tab_end = end; first = true; @@ -765,9 +765,9 @@ void KSircTopLevel::TabNickCompletion(int dir) tab_pressed -= 1; tab_nick = findNick(s.mid(0, end+1), tab_pressed); } - s.tqreplace(0, end + 1, ""); + s.replace(0, end + 1, ""); if(s[0] == ':') - s.tqreplace(0, 2, ""); + s.replace(0, 2, ""); s.prepend(tab_nick + ": "); extra = 2; } @@ -784,11 +784,11 @@ void KSircTopLevel::TabNickCompletion(int dir) } if((uint) end == s.length() - 1){ /* if we're at the end add a space */ - s.tqreplace(start + 1, end - start, tab_nick + " "); + s.replace(start + 1, end - start, tab_nick + " "); extra = 1; } else { - s.tqreplace(start + 1, end - start, tab_nick); + s.replace(start + 1, end - start, tab_nick); extra = 0; } } @@ -845,12 +845,12 @@ void KSircTopLevel::sirc_receive(TQString str, bool broadcast) bool addressedLine = false; - if(line.message.tqcontains( ">~o")){ /* highlighted with our nick */ + if(line.message.contains( ">~o")){ /* highlighted with our nick */ addressedLine = true; } // detect /msg's -- needed when auto-create-window is off - if ( line.message.tqfind( TQRegExp( "^\\[~b.+~b\\].+$" ) ) == 0 ) + if ( line.message.find( TQRegExp( "^\\[~b.+~b\\].+$" ) ) == 0 ) addressedLine = true; if ( addressedLine == true && line.message.startsWith("* " + ksircProcess()->getNick())) @@ -911,7 +911,7 @@ void KSircTopLevel::sirc_write(const TQString &str) plain.startsWith("/j ") || plain.startsWith("/query ")) { - TQString s = plain.mid(plain.tqfind(' ')+1); + TQString s = plain.mid(plain.find(' ')+1); TQStringList channels = TQStringList::split(",", s); TQStringList::ConstIterator it = channels.begin(); @@ -949,7 +949,7 @@ void KSircTopLevel::sirc_write(const TQString &str) bool ssl = false; if(server.startsWith("+")){ - server.tqreplace(0, 1, ""); + server.replace(0, 1, ""); ssl = true; } @@ -1075,7 +1075,7 @@ bool KSircTopLevel::parse_input(const TQString &string, TQString &plainText) } // If it contains our nick, move the speaker to the top // of the nick completion list - if(string.tqcontains("~o")){ + if(string.contains("~o")){ TQRegExp rx("<(\\S+)>"); if ( (rx.search(logString) >= 0) && (rx.cap(1) != ksircProcess()->getNick()) ) { @@ -1121,7 +1121,7 @@ void KSircTopLevel::returnPressed() } while(s.length() > IRC_SAFE_MAX_LINE){ - int wrap = s.tqfindRev(' ', IRC_SAFE_MAX_LINE); + int wrap = s.findRev(' ', IRC_SAFE_MAX_LINE); if(wrap == -1) wrap = IRC_SAFE_MAX_LINE; sirc_line_return(s.left(wrap)); @@ -1156,7 +1156,7 @@ void KSircTopLevel::UserParseMenu(int id) if (action.length() && action[0] == '/') action.remove(0, 1); s = TQString("/eval &docommand(eval{\"%1\"});\n").tqarg(action); - s.tqreplace(TQRegExp("\\$\\$"), "$"); + s.replace(TQRegExp("\\$\\$"), "$"); sirc_write(s); } @@ -1342,7 +1342,7 @@ void KSircTopLevel::control_message(int command, TQString str) file->setItemChecked(beepitem, ksopts->chan(m_channelInfo).beepOnMsg); file->setItemChecked(tsitem, ksopts->chan(m_channelInfo).timeStamp); file->setItemChecked(fjpitem, ksopts->chan(m_channelInfo).filterJoinPart); - int eindex = encodingAction->items().tqfindIndex(ksopts->chan(m_channelInfo).encoding); + int eindex = encodingAction->items().findIndex(ksopts->chan(m_channelInfo).encoding); //kdDebug(5008) << "in change channel we want: " << ksopts->chan(m_channelInfo).encoding << " eindex: " << eindex << endl; encodingAction->setCurrentItem(eindex < 0 ? 0 : eindex); setEncoding(); @@ -1373,7 +1373,7 @@ void KSircTopLevel::control_message(int command, TQString str) file->setItemChecked(beepitem, ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].beepOnMsg); file->setItemChecked(tsitem, ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].timeStamp); { - int eindex = encodingAction->items().tqfindIndex(ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].encoding); + int eindex = encodingAction->items().findIndex(ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].encoding); //kdDebug(5008) << "in re-readconfig we want: " << ksopts->channel[m_channelInfo.server()][m_channelInfo.channel()].encoding << " eindex: " << eindex << endl; encodingAction->setCurrentItem(eindex < 0 ? 0 : eindex); setEncoding(); @@ -1448,7 +1448,7 @@ TQString KSircTopLevel::findNick(TQString part, uint which) } for(uint i=0; i < nicks->count(); i++){ - if (matches.tqcontains(nicks->text(i))) + if (matches.contains(nicks->text(i))) continue; if(nicks->text(i).length() >= part.length()){ if(nicks->text(i).lower().startsWith( part.lower())){ @@ -1470,7 +1470,7 @@ TQString KSircTopLevel::findNick(TQString part, uint which) void KSircTopLevel::removeCompleteNick(const TQString &nick) { - TQStringList::Iterator it = completeNicks.tqfind(nick); + TQStringList::Iterator it = completeNicks.find(nick); if (it != completeNicks.end()) completeNicks.remove(it); } @@ -1483,7 +1483,7 @@ void KSircTopLevel::addCompleteNick(const TQString &nick) void KSircTopLevel::changeCompleteNick(const TQString &oldNick, const TQString &newNick) { - TQStringList::Iterator it = completeNicks.tqfind(oldNick); + TQStringList::Iterator it = completeNicks.find(oldNick); if (it != completeNicks.end()) *it = newNick; } @@ -1568,7 +1568,7 @@ void KSircTopLevel::slotTextDropped( const TQString& _text ) if (text[text.length()-1] != '\n') text += "\n"; - int lines = text.tqcontains("\n"); + int lines = text.contains("\n"); int approx_lines = text.length() / 75; if ( lines > approx_lines ) approx_lines = lines; @@ -1622,7 +1622,7 @@ void KSircTopLevel::slotTextDropped( const TQString& _text ) linee->update(); } else{ - text.tqreplace(TQRegExp("\n"), ""); + text.replace(TQRegExp("\n"), ""); linee->setText(text); linee->setCursorPosition( curPos + _text.length() ); } @@ -1834,7 +1834,7 @@ void KSircTopLevel::cmd_process(int id) void KSircTopLevel::showDCCMgr() { - KSircMessageReceiver *kmr = ksircProcess()->mrList().tqfind("!dcc"); + KSircMessageReceiver *kmr = ksircProcess()->mrList().find("!dcc"); if(kmr){ KSircIODCC *dcc = static_cast<KSircIODCC *>(kmr); if(dcc){ diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp index df14af8a..53090af0 100644 --- a/ktalkd/ktalkd/readcfg++.cpp +++ b/ktalkd/ktalkd/readcfg++.cpp @@ -181,7 +181,7 @@ int process_config_file(void) { // Where is ktalkdlg installed ? TQString ktalkdlg_dir = locate("exe", "ktalkdlg"); - ktalkdlg_dir.truncate( ktalkdlg_dir.tqfindRev('/') ); + ktalkdlg_dir.truncate( ktalkdlg_dir.findRev('/') ); // Has to be done, for any $KDEBINDIR in ktalkdrc. setenv("KDEBINDIR", TQFile::encodeName(ktalkdlg_dir), 0/*don't overwrite*/); diff --git a/ktalkd/ktalkd/unixsock.cpp b/ktalkd/ktalkd/unixsock.cpp index c99264b0..9547ccf5 100644 --- a/ktalkd/ktalkd/unixsock.cpp +++ b/ktalkd/ktalkd/unixsock.cpp @@ -105,7 +105,7 @@ bool sendToKtalk (const char *username, const char *announce) // by me but someone else!) // // Besides, this approach allows me to snoop on the - // talk requests other users receive; if I want to tqfind + // talk requests other users receive; if I want to find // out who's talking to janet, all I need is to write // a small app that listens on /tmp/ktalk-janet-foo // diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp index 9e2996e5..3ca199fb 100644 --- a/ktalkd/ktalkdlg/ktalkdlg.cpp +++ b/ktalkd/ktalkdlg/ktalkdlg.cpp @@ -140,7 +140,7 @@ int main (int argc, char **argv) TQString konsole = locate("exe", "konsole"); TQString konsole_dir = konsole; - konsole_dir.truncate( konsole.tqfindRev('/') ); + konsole_dir.truncate( konsole.findRev('/') ); setenv("KDEBINDIR", TQFile::encodeName(konsole_dir).data(), 0/*don't overwrite*/); TQString cmd0 = cfg->readPathEntry ("talkprg", konsole + " -e talk"); diff --git a/lanbrowsing/kcmlisa/findnic.cpp b/lanbrowsing/kcmlisa/findnic.cpp index 7de4b19c..61996018 100644 --- a/lanbrowsing/kcmlisa/findnic.cpp +++ b/lanbrowsing/kcmlisa/findnic.cpp @@ -192,8 +192,8 @@ NICList* findNICs() void suggestSettingsForAddress(const TQString& addrMask, LisaConfigInfo& lci) { - TQString ip=addrMask.left(addrMask.tqfind("/")); - TQString tqmask=addrMask.mid(addrMask.tqfind("/")+1); + TQString ip=addrMask.left(addrMask.find("/")); + TQString tqmask=addrMask.mid(addrMask.find("/")+1); if (tqmask[tqmask.length()-1]==';') tqmask=tqmask.left(tqmask.length()-1); diff --git a/lanbrowsing/kcmlisa/setupwizard.cpp b/lanbrowsing/kcmlisa/setupwizard.cpp index ab73259c..82873c00 100644 --- a/lanbrowsing/kcmlisa/setupwizard.cpp +++ b/lanbrowsing/kcmlisa/setupwizard.cpp @@ -546,7 +546,7 @@ void SetupWizard::checkIPAddress(const TQString& addr) TQString address=addr.simplifyWhiteSpace(); TQRegExp regex("^\\d+\\.\\d+\\.\\d+\\.\\d+\\s*/\\s*\\d+\\.\\d+\\.\\d+\\.\\d+$"); setNextEnabled(m_noNicPage, (regex.search(address,0)!=-1)); -// setNextEnabled(m_noNicPage, (regex.tqfind(address,0)!=-1)); +// setNextEnabled(m_noNicPage, (regex.find(address,0)!=-1)); } void SetupWizard::applyLisaConfigInfo(LisaConfigInfo& lci) diff --git a/lanbrowsing/lisa/addressvalidator.cpp b/lanbrowsing/lisa/addressvalidator.cpp index 3ac8ccf0..70207ece 100644 --- a/lanbrowsing/lisa/addressvalidator.cpp +++ b/lanbrowsing/lisa/addressvalidator.cpp @@ -74,20 +74,20 @@ void AddressValidator::setValidAddresses(MyString addressSpecs) nextPart=addressSpecs.left(pos); addressSpecs=addressSpecs.mid(pos+1); dcerr<<"setValidAddresses: nextPart: "<<nextPart<<std::endl; - if ((nextPart.tqcontains('.')==3) && (nextPart.tqcontains('-')==0)) + if ((nextPart.contains('.')==3) && (nextPart.contains('-')==0)) { addSpec(EXACTADDR_SPEC,inet_addr(nextPart.data())); dcerr<<"setValidAddresses: exact addr: " <<std::ios::hex<<inet_addr(nextPart.data())<<std::ios::dec<<std::endl; } - else if ((nextPart.tqcontains('-')==1) && (nextPart.tqcontains('.')==6)) + else if ((nextPart.contains('-')==1) && (nextPart.contains('.')==6)) { int p2=nextPart.find("-"); MyString from=nextPart.left(p2); MyString to=nextPart.mid(p2+1); addSpec(RANGE_SPEC,ntohl(inet_addr(from.data())),ntohl(inet_addr(to.data()))); } - else if ((nextPart.tqcontains('-')==4) && (nextPart.tqcontains('.')==3)) + else if ((nextPart.contains('-')==4) && (nextPart.contains('.')==3)) { unsigned int i1=0; unsigned int i2=0; diff --git a/lanbrowsing/lisa/mystring.cpp b/lanbrowsing/lisa/mystring.cpp index 901c5db3..a66bafac 100644 --- a/lanbrowsing/lisa/mystring.cpp +++ b/lanbrowsing/lisa/mystring.cpp @@ -38,7 +38,7 @@ MyString stripWhiteSpace(MyString str) } //mainly taken from qcstring -int MyString::tqcontains(char c) +int MyString::contains(char c) { int count = 0; char const *d = c_str(); diff --git a/lanbrowsing/lisa/mystring.h b/lanbrowsing/lisa/mystring.h index 9e636e03..135e36c7 100644 --- a/lanbrowsing/lisa/mystring.h +++ b/lanbrowsing/lisa/mystring.h @@ -26,7 +26,7 @@ class MyString: public std::string else return (*this); }; - int tqcontains(char c); + int contains(char c); //char & operator[] (unsigned int i) {return ((string)(*this))[i];} //operator const char* () const {return c_str();} const char* data() const {return c_str();} diff --git a/lanbrowsing/lisa/netmanager.cpp b/lanbrowsing/lisa/netmanager.cpp index 43742564..46002ed1 100644 --- a/lanbrowsing/lisa/netmanager.cpp +++ b/lanbrowsing/lisa/netmanager.cpp @@ -365,10 +365,10 @@ MyString NetManager::getConfigFileName() int length=strlen(buf); if (buf[length-1]=='\n') buf[length-1]='\0'; MyString kdeDirs(buf); - while (kdeDirs.tqcontains(':')) + while (kdeDirs.contains(':')) { - MyString nextDir=kdeDirs.left(kdeDirs.tqfind(':')); - kdeDirs=kdeDirs.mid(kdeDirs.tqfind(':')+1); + MyString nextDir=kdeDirs.left(kdeDirs.find(':')); + kdeDirs=kdeDirs.mid(kdeDirs.find(':')+1); nextDir=nextDir+tmpBase; mdcerr<<"trying to open "<<nextDir<<std::endl; if (fileReadable(nextDir)) diff --git a/lanbrowsing/lisa/netscanner.cpp b/lanbrowsing/lisa/netscanner.cpp index fd6a86bf..5486c506 100644 --- a/lanbrowsing/lisa/netscanner.cpp +++ b/lanbrowsing/lisa/netscanner.cpp @@ -187,7 +187,7 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index) // mdcerr<<"NetScanner::getIPFromArray: -"<<tmp<<"-"<<std::endl; while (!tmp.isEmpty()) { - if (tmp.tqcontains('/')) + if (tmp.contains('/')) { //mdcerr<<"net/tqmask combination detected"<<std::endl; MyString netStr(tmp.left(tmp.find("/"))); @@ -207,7 +207,7 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index) //return string2Struct(ipInt2String(net)); } } - else if (tmp.tqcontains('-')==1) + else if (tmp.contains('-')==1) { //mdcerr<<"single range detected"<<std::endl; MyString fromIPStr(tmp.left(tmp.find("-"))); @@ -233,7 +233,7 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index) } } - else if (tmp.tqcontains('-')==4) + else if (tmp.contains('-')==4) { //mdcerr<<"multiple range detected"<<std::endl; int cp(tmp.find('-')); @@ -291,7 +291,7 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index) } } //single IP address - else if (tmp.tqcontains('.')==3) + else if (tmp.contains('.')==3) { //mdcerr<<"single IP address detected"<<std::endl; //if (tmpIndex==index) return string2Struct(tmp); @@ -316,7 +316,7 @@ void NetScanner::resetIPRange() MyString NetScanner::getNextIPRange() { - if (tmpIPRange.tqcontains(';')<1) return ""; + if (tmpIPRange.contains(';')<1) return ""; int cp(tmpIPRange.find(';')); MyString tmp(tmpIPRange.left(cp)); tmpIPRange=tmpIPRange.mid(cp+1); diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp index 22fa96ae..aad56fa6 100644 --- a/wifi/interface_wireless_wirelessextensions.cpp +++ b/wifi/interface_wireless_wirelessextensions.cpp @@ -313,7 +313,7 @@ TQStringList Interface_wireless_wirelessextensions::available_wifi_devices() TQString device; while (!procnetdev.atEnd()) { procnetdev.readLine (device, 9999); - int pos = device.tqfind (':'); + int pos = device.find (':'); if (pos == -1) continue; device = device.left(pos).stripWhiteSpace(); @@ -353,7 +353,7 @@ bool Interface_wireless_wirelessextensions::autodetect_device() wireless_info info; int result = get_info (socket, device, info); if ((result != -ENODEV) && (result != -ENOTSUP) && - (!ignoreInterfaces || ignoreInterfaces->tqfindIndex(device)==-1)) + (!ignoreInterfaces || ignoreInterfaces->findIndex(device)==-1)) { setActiveDevice(device); } @@ -564,29 +564,29 @@ Interface_wireless_wirelessextensions::parseScanData ( KProcIO * iwlist ) while ( iwlist->readln ( data, true ) >= 0 ) { kdDebug ( ) << "iwlist: " << data << "\n"; - if ( data.tqcontains ( "does not support scanning" ) ) + if ( data.contains ( "does not support scanning" ) ) KMessageBox::sorry ( 0, i18n ( "Your card does not support scanning. The results window will not contain any results." ), i18n ( "Scanning not possible" ) ); - if ( data.tqcontains ( "Scan completed" ) ) + if ( data.contains ( "Scan completed" ) ) cellcount = 0; // at the very beginning of a scan - if ( data.tqcontains ( "Cell" ) ) { + if ( data.contains ( "Cell" ) ) { cellcount++; // new cell discovered networks->setNumRows ( networks->numRows() +1 ); ignoreRemainingBits = false; } - if ( data.tqcontains ( "ESSID:" ) ) + if ( data.contains ( "ESSID:" ) ) { - TQString ssid = data.mid ( data.tqfind ( "\"" ) + 1, data.length ( ) - data.tqfind ( "\"" ) - 2 ); + TQString ssid = data.mid ( data.find ( "\"" ) + 1, data.length ( ) - data.find ( "\"" ) - 2 ); if ((ssid=="") || (ssid==" ")) ssid = "(hidden cell)"; networks->setText ( cellcount - 1, 0, ssid ); } - if ( data.tqcontains ( "Mode:" ) ) + if ( data.contains ( "Mode:" ) ) { - if ( data.tqcontains ( "Master" ) ) + if ( data.contains ( "Master" ) ) networks->setText ( cellcount - 1, 1, TQString ( i18n ( "Managed" ) ) ); - if ( data.tqcontains ( "Ad-Hoc" ) ) + if ( data.contains ( "Ad-Hoc" ) ) networks->setText ( cellcount - 1, 1, TQString ( i18n ( "Ad-Hoc" ) ) ); // if could be that this cell belongs to an SSID already discovered, or that there are more than one // hidden cells, which doesn't give any new information. So, we first search for duplicates and delete @@ -605,31 +605,31 @@ Interface_wireless_wirelessextensions::parseScanData ( KProcIO * iwlist ) } } } - if ( !ignoreRemainingBits && data.tqcontains ( "Encryption key:" ) ) + if ( !ignoreRemainingBits && data.contains ( "Encryption key:" ) ) { - if ( data.tqcontains ( "off" ) ) + if ( data.contains ( "off" ) ) networks->setText ( cellcount - 1, 3, TQString ( "off" ) ); else networks->setText ( cellcount - 1, 3, TQString ( "on" ) ); } - if ( !ignoreRemainingBits && data.tqcontains ( "Quality:" ) ) + if ( !ignoreRemainingBits && data.contains ( "Quality:" ) ) { - TQString quality = data.mid ( data.tqfind ( ":" ) + 1, data.tqfind ( "/" ) - data.tqfind ( ":" ) - 1 ); + TQString quality = data.mid ( data.find ( ":" ) + 1, data.find ( "/" ) - data.find ( ":" ) - 1 ); networks->setText ( cellcount - 1, 2, quality ); } - if ( !ignoreRemainingBits && data.tqcontains ( "Quality=" ) ) + if ( !ignoreRemainingBits && data.contains ( "Quality=" ) ) { - TQString quality = data.mid ( data.tqfind ( "=" ) + 1, data.tqfind ( "/" ) - data.tqfind ( "=" ) - 1 ); + TQString quality = data.mid ( data.find ( "=" ) + 1, data.find ( "/" ) - data.find ( "=" ) - 1 ); networks->setText ( cellcount - 1, 2, quality ); } - if ( !ignoreRemainingBits && data.tqcontains ( "wpa_ie" ) ) + if ( !ignoreRemainingBits && data.contains ( "wpa_ie" ) ) { networks->setText ( cellcount - 1, 3, TQString ( "WPA" ) ); } - if ( !ignoreRemainingBits && data.tqcontains ( "rsn_ie" ) ) + if ( !ignoreRemainingBits && data.contains ( "rsn_ie" ) ) { networks->setText ( cellcount - 1, 3, TQString ( "WPA2" ) ); } diff --git a/wifi/kcmwifi/vendorconfig.cpp b/wifi/kcmwifi/vendorconfig.cpp index 01936667..395cbc58 100644 --- a/wifi/kcmwifi/vendorconfig.cpp +++ b/wifi/kcmwifi/vendorconfig.cpp @@ -89,7 +89,7 @@ VendorConfig::initSuSE_92plus ( ) TQString var = buffer.section ( '=', 0, 0 ); TQString value = buffer.section ( '=', 1, 1 ); value = value.mid ( 1, value.length ( ) - 3 ); - kdDebug ( ) << "Variable " << var << " tqcontains " << value << ".\n"; + kdDebug ( ) << "Variable " << var << " contains " << value << ".\n"; // evaluate the meaningful lines if ( var == "WIRELESS_ESSID" ) { @@ -182,7 +182,7 @@ is incremented _after_ successful setup of each given config. */ // lines look like wireless-defaultkey bla, so split it into wireless-defaultkey and bla TQString var = buffer.section ( ' ', 0, 0 ); TQString value = buffer.section ( ' ', 1, 1 ); - kdDebug ( ) << "Variable " << var << " tqcontains " << value << ".\n"; + kdDebug ( ) << "Variable " << var << " contains " << value << ".\n"; // evaluate the meaningful lines if ( var.tqstartsWith ( "wireless", false ) ) { @@ -191,7 +191,7 @@ is incremented _after_ successful setup of each given config. */ newtab->le_networkName->setText ( value ); } - else if ( var.endsWith ( "mode" ) && !var.tqcontains ( "key" ) ) + else if ( var.endsWith ( "mode" ) && !var.contains ( "key" ) ) { newtab->cmb_wifiMode->setCurrentItem ( IfConfig::convertToWifiModeFromString ( value ) ); @@ -203,15 +203,15 @@ is incremented _after_ successful setup of each given config. */ newtab->cmb_speed->setCurrentItem ( IfConfig::convertToSpeedFromString ( value ) ); } - else if ( var.tqcontains ( "key" ) ) + else if ( var.contains ( "key" ) ) { // Could be any of key, key1, key2, ..., or defaultkey - if ( var.tqcontains ( "default" ) ) + if ( var.contains ( "default" ) ) { crypto->cmb_activeKey->setCurrentItem ( value.toInt ( ) ); } - else if ( var.tqcontains ( "mode" ) ) + else if ( var.contains ( "mode" ) ) { if ( value == "shared" || value == "sharedkey" || value == "restricted" ) { diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp index 1f3087ba..bce6afd9 100644 --- a/wifi/kcmwifi/wificonfig.cpp +++ b/wifi/kcmwifi/wificonfig.cpp @@ -246,9 +246,9 @@ TQString WifiConfig::autoDetectInterface() while ( !procFile.atEnd() ) { procFile.readLine( line, 9999 ); - if ( line.tqfind( ":" ) > 0 ) + if ( line.find( ":" ) > 0 ) { - line.truncate ( line.tqfind( ":" ) ); + line.truncate ( line.find( ":" ) ); list.append( line.stripWhiteSpace() ); } } @@ -264,7 +264,7 @@ TQString WifiConfig::autoDetectInterface() for ( TQStringList::Iterator it = list.begin (); it != list.end (); ++it ) { - if ( ((*it).tqcontains("wifi"))==0 ) { // if the name is wifiX, ignore + if ( ((*it).contains("wifi"))==0 ) { // if the name is wifiX, ignore KProcIO test; test << "iwconfig"; test << *it; @@ -288,9 +288,9 @@ void WifiConfig::slotTestInterface( KProcIO *proc ) { TQString output; proc->readln( output ); - if ( output.tqfind ( "no wireless extensions" ) == -1 ) + if ( output.find ( "no wireless extensions" ) == -1 ) { - output.truncate( output.tqfind ( " " ) ); + output.truncate( output.find ( " " ) ); m_detectedInterface = output.stripWhiteSpace(); printf("[kcontrol wificonfig] Wireless extensions not available on specified interface\n\r"); } @@ -328,7 +328,7 @@ Key IfConfig::activeKey() IfConfig::Speed IfConfig::convertToSpeedFromString( const TQString &s ) { - return ( IfConfig::Speed )speedList.tqfindIndex( s ); + return ( IfConfig::Speed )speedList.findIndex( s ); } void IfConfig::speedFromString( const TQString &s ) @@ -338,7 +338,7 @@ void IfConfig::speedFromString( const TQString &s ) IfConfig::WifiMode IfConfig::convertToWifiModeFromString( const TQString &s ) { - return ( IfConfig::WifiMode )wifiModeList.tqfindIndex( s ); + return ( IfConfig::WifiMode )wifiModeList.findIndex( s ); } void IfConfig::wifimodeFromString( const TQString &s ) @@ -348,7 +348,7 @@ void IfConfig::wifimodeFromString( const TQString &s ) IfConfig::CryptoMode IfConfig::convertToCryptoModeFromString( const TQString &s ) { - return ( IfConfig::CryptoMode )cryptoModeList.tqfindIndex( s ); + return ( IfConfig::CryptoMode )cryptoModeList.findIndex( s ); } void IfConfig::cryptomodeFromString( const TQString &s ) @@ -358,7 +358,7 @@ void IfConfig::cryptomodeFromString( const TQString &s ) IfConfig::PowerMode IfConfig::convertToPowerModeFromString( const TQString &s ) { - return ( IfConfig::PowerMode )powerModeList.tqfindIndex( s ); + return ( IfConfig::PowerMode )powerModeList.findIndex( s ); } void IfConfig::powermodeFromString( const TQString &s ) diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index 8cc88943..b7d49abb 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -163,9 +163,9 @@ KWiFiManagerApp::init_whois_db () while (datei.readLine (content, 255) != -1) { TQString temp (content); - content.truncate (content.tqfind (' ')); + content.truncate (content.find (' ')); content = content.upper (); - content2 = temp.right (temp.length () - temp.tqfind (' ') - 1); + content2 = temp.right (temp.length () - temp.find (' ') - 1); content2.truncate (content2.length () - 1); APs << content << content2; } |