diff options
Diffstat (limited to 'conduits')
-rw-r--r-- | conduits/abbrowserconduit/abbrowser-conduit.cc | 22 | ||||
-rw-r--r-- | conduits/abbrowserconduit/kabcRecord.cc | 2 | ||||
-rw-r--r-- | conduits/abbrowserconduit/resolutionDialog.cc | 2 | ||||
-rw-r--r-- | conduits/docconduit/DOC-converter.cc | 6 | ||||
-rw-r--r-- | conduits/docconduit/doc-conduit.cc | 10 | ||||
-rw-r--r-- | conduits/knotes/knotes-action.cc | 4 | ||||
-rw-r--r-- | conduits/malconduit/mal-conduit.cc | 4 | ||||
-rw-r--r-- | conduits/memofileconduit/memofile-conduit.cc | 4 | ||||
-rw-r--r-- | conduits/memofileconduit/memofileconduit.xmi | 2 | ||||
-rw-r--r-- | conduits/memofileconduit/memofiles.cc | 18 | ||||
-rw-r--r-- | conduits/memofileconduit/memofiles.h | 4 | ||||
-rw-r--r-- | conduits/null/null-conduit.cc | 2 | ||||
-rw-r--r-- | conduits/null/null-conduit.h | 2 | ||||
-rw-r--r-- | conduits/sysinfoconduit/sysinfo-conduit.cc | 26 | ||||
-rw-r--r-- | conduits/vcalconduit/kcalRecord.cc | 6 |
15 files changed, 57 insertions, 57 deletions
diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc index 7de5582..8885bbf 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.cc +++ b/conduits/abbrowserconduit/abbrowser-conduit.cc @@ -171,7 +171,7 @@ void AbbrowserConduit::_mapContactsToPilot(TQMap < recordid_t, TQString > &idCon // if we do (this can come from a copy/paste in kaddressbook, etc.), then we need // to reset our Addressee so that we can assign him a new pilot Id later and sync // him properly. if we don't do this, we'll lose one of these on the pilot. - if (!idContactMap.tqcontains(id)) + if (!idContactMap.contains(id)) { idContactMap.insert(id, aContact.uid()); } @@ -619,7 +619,7 @@ void AbbrowserConduit::slotPalmRecToPC() } // already synced, so skip: - if(syncedIds.tqcontains(palmRec->id())) + if(syncedIds.contains(palmRec->id())) { KPILOT_DELETE(palmRec); TQTimer::singleShot(0, this, TQT_SLOT(slotPalmRecToPC())); @@ -696,7 +696,7 @@ void AbbrowserConduit::slotPCRecToPalm() } // look into the list of already synced record ids to see if the addressee hasn't already been synced - if (syncedIds.tqcontains(rid)) + if (syncedIds.contains(rid)) { DEBUGKPILOT << ": address with id " << rid << " already synced." << endl; TQTimer::singleShot(0, this, TQT_SLOT(slotPCRecToPalm())); @@ -819,7 +819,7 @@ void AbbrowserConduit::slotDeleteUnsyncedPCRecords() AddressBook::Iterator abit; for (abit = aBook->begin(); abit != aBook->end(); ++abit) { - if (!uids.tqcontains((*abit).uid())) + if (!uids.contains((*abit).uid())) { DEBUGKPILOT<<"Deleting addressee "<<(*abit).realName()<<" from PC (is not on HH, and syncing with HH->PC direction)"<<endl; abChanged = true; @@ -843,7 +843,7 @@ void AbbrowserConduit::slotDeleteUnsyncedHHRecords() RecordIDList::iterator it; for ( it = ids.begin(); it != ids.end(); ++it ) { - if (!syncedIds.tqcontains(*it)) + if (!syncedIds.contains(*it)) { DEBUGKPILOT<<"Deleting record with ID "<<*it<<" from handheld (is not on PC, and syncing with PC->HH direction)"<<endl; fDatabase->deleteRecord(*it); @@ -1150,7 +1150,7 @@ bool AbbrowserConduit::_deleteAddressee(Addressee &pcAddr, PilotAddress*backupAd if (palmAddr) { - if (!syncedIds.tqcontains(palmAddr->id())) { + if (!syncedIds.contains(palmAddr->id())) { DEBUGKPILOT << fname << ": adding id:["<< palmAddr->id() << "] to syncedIds." << endl; syncedIds.append(palmAddr->id()); } @@ -1160,7 +1160,7 @@ bool AbbrowserConduit::_deleteAddressee(Addressee &pcAddr, PilotAddress*backupAd } else if (backupAddr) { - if (!syncedIds.tqcontains(backupAddr->id())) { + if (!syncedIds.contains(backupAddr->id())) { DEBUGKPILOT << fname << ": adding id:["<< backupAddr->id() << "] to syncedIds." << endl; syncedIds.append(backupAddr->id()); } @@ -1205,7 +1205,7 @@ bool AbbrowserConduit::_savePalmAddr(PilotAddress *palmAddr, Addressee &pcAddr) if(pilotId != 0) { palmAddr->setID(pilotId); - if (!syncedIds.tqcontains(pilotId)) { + if (!syncedIds.contains(pilotId)) { DEBUGKPILOT << fname << ": adding id:["<< pilotId << "] to syncedIds." << endl; syncedIds.append(pilotId); } @@ -1339,14 +1339,14 @@ bool AbbrowserConduit::_equal(const PilotAddress *piAddress, const Addressee &ab return false; } for (TQStringList::Iterator it = abEmails.begin(); it != abEmails.end(); it++) { - if (!piEmails.tqcontains(*it)) + if (!piEmails.contains(*it)) { DEBUGKPILOT << fname << ": pilot e-mail missing" << endl; return false; } } for (TQStringList::Iterator it = piEmails.begin(); it != piEmails.end(); it++) { - if (!abEmails.tqcontains(*it)) + if (!abEmails.contains(*it)) { DEBUGKPILOT << fname << ": kabc e-mail missing" << endl; return false; @@ -1861,7 +1861,7 @@ Addressee AbbrowserConduit::_findMatch(const PilotAddress & pilotAddress) const { if (rid==pilotAddress.id()) return abEntry;// yes, we found it // skip this addressee, as it can an other corresponding address on the handheld - if (allIds.tqcontains(rid)) continue; + if (allIds.contains(rid)) continue; } } diff --git a/conduits/abbrowserconduit/kabcRecord.cc b/conduits/abbrowserconduit/kabcRecord.cc index b503031..91cbcb1 100644 --- a/conduits/abbrowserconduit/kabcRecord.cc +++ b/conduits/abbrowserconduit/kabcRecord.cc @@ -236,7 +236,7 @@ unsigned int KABCSync::bestMatchedCategory(const TQStringList &pccategories, // See if the suggested hhcategory is in the list, and if // so that is the best match. if (Pilot::validCategory(hhcategory) && - pccategories.tqcontains(info.categoryName(hhcategory))) + pccategories.contains(info.categoryName(hhcategory))) { return hhcategory; } diff --git a/conduits/abbrowserconduit/resolutionDialog.cc b/conduits/abbrowserconduit/resolutionDialog.cc index 0064a68..ca61afe 100644 --- a/conduits/abbrowserconduit/resolutionDialog.cc +++ b/conduits/abbrowserconduit/resolutionDialog.cc @@ -160,7 +160,7 @@ void ResolutionCheckListItem::setCaption(TQString caption) void ResolutionCheckListItem::updateText() { TQString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").tqarg(fCaption).tqarg(fText)); - newText.tqreplace(TQRegExp(CSL1("\n")), + newText.replace(TQRegExp(CSL1("\n")), i18n("Denoting newlines in Address entries. No need to translate", " | ")); setText(0, newText); } diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc index 06f45b7..2e25b61 100644 --- a/conduits/docconduit/DOC-converter.cc +++ b/conduits/docconduit/DOC-converter.cc @@ -79,7 +79,7 @@ int docMatchBookmark::findMatches(TQString doctext, bmkList &fBookmarks) { #endif while (pos >= 0 && found<to) { - pos = doctext.tqfind(pattern, pos); + pos = doctext.find(pattern, pos); #ifdef DEBUG DEBUGKPILOT<<"Result of search: pos="<<pos<<endl; #endif @@ -120,8 +120,8 @@ int docRegExpBookmark::findMatches(TQString doctext, bmkList &fBookmarks) // TODO: use the subexpressions from the regexp for the bmk name ($1..$9) (given as separate regexp) TQString bmkText(bmkName); for (int i=0; i<=rx.numCaptures(); ++i) { - bmkText.tqreplace(CSL1("$%1").tqarg(i), rx.cap(i)); - bmkText.tqreplace(CSL1("\\%1").tqarg(i), rx.cap(i)); + bmkText.replace(CSL1("$%1").tqarg(i), rx.cap(i)); + bmkText.replace(CSL1("\\%1").tqarg(i), rx.cap(i)); } fBookmarks.append(new docBookmark(bmkText.left(16), pos)); } diff --git a/conduits/docconduit/doc-conduit.cc b/conduits/docconduit/doc-conduit.cc index 0bce0fe..0ac14f1 100644 --- a/conduits/docconduit/doc-conduit.cc +++ b/conduits/docconduit/doc-conduit.cc @@ -414,7 +414,7 @@ void DOCConduit::syncNextDB() { // if creator and/or type don't match, go to next db if (!isCorrectDBTypeCreator(dbinfo) || - fDBNames.tqcontains(TQString::tqfromLatin1(dbinfo.name))) + fDBNames.contains(TQString::tqfromLatin1(dbinfo.name))) { TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB())); return; @@ -474,7 +474,7 @@ void DOCConduit::syncNextTXT() memset(&dbinfo.name[0], 0, 33); strncpy(&dbinfo.name[0], fl.baseName(TRUE).latin1(), 30); - bool alreadySynced=fDBNames.tqcontains(fl.baseName(TRUE)); + bool alreadySynced=fDBNames.contains(fl.baseName(TRUE)); if (!alreadySynced) { docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name), txtfilename, pdbfilename, eSyncNone); @@ -529,7 +529,7 @@ void DOCConduit::checkPDBFiles() { // Get the doc title and check if it has already been synced (in the synced docs list of in fDBNames to be synced) // If the doc title doesn't appear in either list, install it to the Handheld, and add it to the list of dbs to be synced. TQString dbname=fl.baseName(TRUE).left(30); - if (!fDBNames.tqcontains(dbname) && !fDBListSynced.tqcontains(dbname)) { + if (!fDBNames.contains(dbname) && !fDBListSynced.contains(dbname)) { if (fHandle->installFiles(pdbfilename, false)) { DBInfo dbinfo; // Include all "extensions" except the last. This allows full stops inside the database name (e.g. abbreviations) @@ -559,7 +559,7 @@ void DOCConduit::checkDeletedDocs() FUNCTIONSETUP; for (TQStringList::Iterator it=fDBListSynced.begin(); it!=fDBListSynced.end(); ++it ) { - if (!fDBNames.tqcontains(*it)) { + if (!fDBNames.contains(*it)) { // We need to delete this doc: TQString dbname(*it); TQString txtfilename=constructTXTFileName(dbname); @@ -702,7 +702,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) sinfo.direction = eSyncNone; PilotDatabase*docdb=openDOCDatabase(TQString::tqfromLatin1(sinfo.dbinfo.name)); - if (!fDBListSynced.tqcontains(sinfo.handheldDB)) { + if (!fDBListSynced.contains(sinfo.handheldDB)) { // the database wasn't included on last sync, so it has to be new. #ifdef DEBUG DEBUGKPILOT<<"Database "<<sinfo.dbinfo.name<<" wasn't included in the previous sync!"<<endl; diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc index e29dedc..7664f46 100644 --- a/conduits/knotes/knotes-action.cc +++ b/conduits/knotes/knotes-action.cc @@ -288,7 +288,7 @@ void KNotesAction::listNotes() FUNCTIONSETUP; KCal::Journal::List notes = fP->fNotesResource->journals(); - DEBUGKPILOT << fname << ": the resource tqcontains " << notes.size() + DEBUGKPILOT << fname << ": the resource contains " << notes.size() << " note(s)." << endl; KCal::Journal::List::ConstIterator it; @@ -521,7 +521,7 @@ bool KNotesAction::deleteNoteOnPilot() while ( i != fP->fIdList.end() ) { // TODO DCOP_REMOVE - if (fP->fNotes.tqcontains((*i).note())) + if (fP->fNotes.contains((*i).note())) { #ifdef DEBUG DEBUGKPILOT << fname << ": Note " << (*i).note() << " still exists." << endl; diff --git a/conduits/malconduit/mal-conduit.cc b/conduits/malconduit/mal-conduit.cc index 10f1352..69a3f19 100644 --- a/conduits/malconduit/mal-conduit.cc +++ b/conduits/malconduit/mal-conduit.cc @@ -309,8 +309,8 @@ void MALConduit::printLogMessage(TQString msg) FUNCTIONSETUP; // Remove the pseudo-progressbar: TQString newmsg(msg); - newmsg.tqreplace( TQRegExp("^\\s*\\.*\\s*"), ""); - newmsg.tqreplace( TQRegExp("\\s*\\.*\\s*$"), ""); + newmsg.replace( TQRegExp("^\\s*\\.*\\s*"), ""); + newmsg.replace( TQRegExp("\\s*\\.*\\s*$"), ""); if (newmsg.length()>0) { emit logMessage(newmsg); diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc index 233f6af..42461f5 100644 --- a/conduits/memofileconduit/memofile-conduit.cc +++ b/conduits/memofileconduit/memofile-conduit.cc @@ -187,7 +187,7 @@ bool MemofileConduit::setAppInfo() for (unsigned int i = 0; i < Pilot::CATEGORY_COUNT; i++) { - if (fCategories.tqcontains(i)) { + if (fCategories.contains(i)) { fMemoAppInfo->setCategoryName(i,fCategories[i]); } } @@ -448,7 +448,7 @@ void MemofileConduit::deleteUnsyncedHHRecords() Pilot::RecordIDList::iterator it; for ( it = ids.begin(); it != ids.end(); ++it ) { - if (!_memofiles->tqfind(*it)) + if (!_memofiles->find(*it)) { DEBUGKPILOT << fname << "Deleting record with ID "<< *it <<" from handheld " diff --git a/conduits/memofileconduit/memofileconduit.xmi b/conduits/memofileconduit/memofileconduit.xmi index 9088d35..8e8ef1e 100644 --- a/conduits/memofileconduit/memofileconduit.xmi +++ b/conduits/memofileconduit/memofileconduit.xmi @@ -92,7 +92,7 @@ </UML:Operation> <UML:Operation visibility="private" xmi.id="97" type="void" name="ensureDirectoryReady" /> <UML:Operation visibility="public" xmi.id="98" type="void" name="loadIds" /> - <UML:Operation visibility="public" xmi.id="99" type="Memofile" name="tqfind" > + <UML:Operation visibility="public" xmi.id="99" type="Memofile" name="find" > <UML:Parameter visibility="public" xmi.id="100" value="" type=TQSTRING_OBJECT_NAME_STRING name="category" /> <UML:Parameter visibility="public" xmi.id="101" value="" type=TQSTRING_OBJECT_NAME_STRING name="filename" /> </UML:Operation> diff --git a/conduits/memofileconduit/memofiles.cc b/conduits/memofileconduit/memofiles.cc index c8ce67b..db3d8ca 100644 --- a/conduits/memofileconduit/memofiles.cc +++ b/conduits/memofileconduit/memofiles.cc @@ -89,7 +89,7 @@ void Memofiles::load (bool loadAll) // DEBUGKPILOT << fname // << ": checking category: [" << categoryName // << "], file: [" << file << "]." << endl; - Memofile * memofile = tqfind(categoryName, file); + Memofile * memofile = find(categoryName, file); if (NULL == memofile) { memofile = new Memofile(category, categoryName, file, _baseDirectory); memofile->setModified(true); @@ -316,7 +316,7 @@ bool Memofiles::loadFromMetadata () return true; } -Memofile * Memofiles::tqfind (recordid_t id) +Memofile * Memofiles::find (recordid_t id) { Memofile * memofile; @@ -331,7 +331,7 @@ Memofile * Memofiles::tqfind (recordid_t id) } -Memofile * Memofiles::tqfind (const TQString & category, const TQString & filename) +Memofile * Memofiles::find (const TQString & category, const TQString & filename) { Memofile * memofile; @@ -353,7 +353,7 @@ void Memofiles::deleteMemo(PilotMemo * memo) if (! memo->isDeleted()) return; - Memofile * memofile = tqfind(memo->id()); + Memofile * memofile = find(memo->id()); if (memofile) { memofile->deleteFile(); _memofiles.remove(memofile); @@ -375,7 +375,7 @@ void Memofiles::addModifiedMemo (PilotMemo * memo) + TQString::number(memo->id()) + CSL1("], title: [") + memo->getTitle() + CSL1("]. "); - Memofile * memofile = tqfind(memo->id()); + Memofile * memofile = find(memo->id()); if (NULL == memofile) { _cudCounter.created(); @@ -653,7 +653,7 @@ TQString Memofiles::filename(PilotMemo * memo) if (filename.isEmpty()) { TQString text = memo->text(); - int i = text.tqfind(CSL1("\n")); + int i = text.find(CSL1("\n")); if (i > 1) { filename = text.left(i); } @@ -666,7 +666,7 @@ TQString Memofiles::filename(PilotMemo * memo) TQString category = _categories[memo->category()]; - Memofile * memofile = tqfind(category, filename); + Memofile * memofile = find(category, filename); // if we couldn't find a memofile with this filename, or if the // memofile that is found is the same as the memo that we're looking @@ -683,7 +683,7 @@ TQString Memofiles::filename(PilotMemo * memo) // for trouble. while (NULL != memofile && uniq <=20) { newfilename = TQString(filename + CSL1(".") + TQString::number(uniq++) ); - memofile = tqfind(category, newfilename); + memofile = find(category, newfilename); } return newfilename; @@ -694,7 +694,7 @@ TQString Memofiles::sanitizeName(TQString name) TQString clean = name; // safety net. we can't save a // filesystem separator as part of a filename, now can we? - clean.tqreplace('/', CSL1("-")); + clean.replace('/', CSL1("-")); return clean; } diff --git a/conduits/memofileconduit/memofiles.h b/conduits/memofileconduit/memofiles.h index 290cf3a..72b6ed4 100644 --- a/conduits/memofileconduit/memofiles.h +++ b/conduits/memofileconduit/memofiles.h @@ -55,8 +55,8 @@ public: TQPtrList<Memofile> getModified(); TQPtrList<Memofile> getAll() { return _memofiles; } ; - Memofile * tqfind (const TQString & category, const TQString & filename); - Memofile * tqfind (recordid_t id); + Memofile * find (const TQString & category, const TQString & filename); + Memofile * find (recordid_t id); MemoCategoryMap readCategoryMetadata(); void setCategories(MemoCategoryMap map) { _categories = map; } ; diff --git a/conduits/null/null-conduit.cc b/conduits/null/null-conduit.cc index 29d2499..c8e0b3a 100644 --- a/conduits/null/null-conduit.cc +++ b/conduits/null/null-conduit.cc @@ -57,7 +57,7 @@ NullConduit::NullConduit(KPilotLink *d, const TQStringList &l) : ConduitAction(d,n,l), fDatabase(0L), - fFailImmediately( l.tqcontains( CSL1("--fail") )) + fFailImmediately( l.contains( CSL1("--fail") )) { FUNCTIONSETUP; fConduitName=i18n("Null"); diff --git a/conduits/null/null-conduit.h b/conduits/null/null-conduit.h index 48593d9..4cdbbde 100644 --- a/conduits/null/null-conduit.h +++ b/conduits/null/null-conduit.h @@ -45,7 +45,7 @@ class PilotDatabase; class NullConduit : public ConduitAction { public: - /** Constructor. Special case is if @p tqcontains + /** Constructor. Special case is if @p contains * @c --fail as an argument to the conduit, then * the conduit will fail instead of trivially succeeding. */ diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc index b46f5a3..3ee13e2 100644 --- a/conduits/sysinfoconduit/sysinfo-conduit.cc +++ b/conduits/sysinfoconduit/sysinfo-conduit.cc @@ -520,13 +520,13 @@ void SysInfoConduit::writeFile() for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) { TQRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").tqarg(*it).tqarg(*it)); re.setMinimal(true); - output.tqreplace(re, CSL1("\\1")); + output.replace(re, CSL1("\\1")); } // Do a loop through all keys in fValues TQMap<TQString,TQString>::Iterator it; for ( it = fValues.begin(); it != fValues.end(); ++it ) { - output.tqreplace(CSL1("#%1#").tqarg(it.key()), it.data()); + output.replace(CSL1("#%1#").tqarg(it.key()), it.data()); } // Insert the list of databases @@ -552,27 +552,27 @@ void SysInfoConduit::writeFile() * %8 .. modifyDate * %9 .. backupDate */ - newpatt.tqreplace(CSL1("%0"), TQString::tqfromLatin1(dbi.name)); + newpatt.replace(CSL1("%0"), TQString::tqfromLatin1(dbi.name)); set_long(&tmpchr[0],dbi.type); - newpatt.tqreplace(CSL1("%1"), TQString::tqfromLatin1(tmpchr)); + newpatt.replace(CSL1("%1"), TQString::tqfromLatin1(tmpchr)); set_long(&tmpchr[0],dbi.creator); - newpatt.tqreplace(CSL1("%2"), TQString::tqfromLatin1(tmpchr)); - newpatt.tqreplace(CSL1("%3"), TQString::number(dbi.index)); - newpatt.tqreplace(CSL1("%4"), TQString::number(dbi.flags)); - newpatt.tqreplace(CSL1("%5"), TQString::number(dbi.miscFlags)); - newpatt.tqreplace(CSL1("%6"), TQString::number(dbi.version)); + newpatt.replace(CSL1("%2"), TQString::tqfromLatin1(tmpchr)); + newpatt.replace(CSL1("%3"), TQString::number(dbi.index)); + newpatt.replace(CSL1("%4"), TQString::number(dbi.flags)); + newpatt.replace(CSL1("%5"), TQString::number(dbi.miscFlags)); + newpatt.replace(CSL1("%6"), TQString::number(dbi.version)); TQDateTime tm; tm.setTime_t(dbi.createDate); - newpatt.tqreplace(CSL1("%7"), tm.toString(Qt::LocalDate)); + newpatt.replace(CSL1("%7"), tm.toString(Qt::LocalDate)); tm.setTime_t(dbi.modifyDate); - newpatt.tqreplace(CSL1("%8"), tm.toString(Qt::LocalDate)); + newpatt.replace(CSL1("%8"), tm.toString(Qt::LocalDate)); tm.setTime_t(dbi.backupDate); - newpatt.tqreplace(CSL1("%9"), tm.toString(Qt::LocalDate)); + newpatt.replace(CSL1("%9"), tm.toString(Qt::LocalDate)); dbstring.append(newpatt); } // Now, just replace the whole found pattern by the string we just constructed. - output.tqreplace(re.cap(0), dbstring); + output.replace(re.cap(0), dbstring); } // Write out the result diff --git a/conduits/vcalconduit/kcalRecord.cc b/conduits/vcalconduit/kcalRecord.cc index e7f8c68..598866d 100644 --- a/conduits/vcalconduit/kcalRecord.cc +++ b/conduits/vcalconduit/kcalRecord.cc @@ -63,7 +63,7 @@ void KCalSync::setCategory(PilotRecordBase *de, if (de->category() != Pilot::Unfiled) { deCategory = Pilot::categoryName(&info,de->category()); - if (eventCategories.tqcontains(deCategory)) + if (eventCategories.contains(deCategory)) { // Found, so leave the category unchanged. return; @@ -86,7 +86,7 @@ void KCalSync::setCategory(PilotRecordBase *de, continue; } - if (availableHandheldCategories.tqcontains(*it)) + if (availableHandheldCategories.contains(*it)) { // Since the string is in the list of available categories, // this *can't* fail. @@ -122,7 +122,7 @@ void KCalSync::setCategory(KCal::Incidence *e, if ( Pilot::validCategory(cat) && (cat != Pilot::Unfiled)) { - if (!cats.tqcontains(newcat)) + if (!cats.contains(newcat)) { // if this event only has one category associated with it, then we can // safely assume that what we should be doing here is changing it to match |