diff options
Diffstat (limited to 'knewstuff')
-rw-r--r-- | knewstuff/downloaddialog.cpp | 22 | ||||
-rw-r--r-- | knewstuff/entry.cpp | 14 | ||||
-rw-r--r-- | knewstuff/provider.cpp | 6 | ||||
-rw-r--r-- | knewstuff/security.cpp | 10 |
4 files changed, 26 insertions, 26 deletions
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index 40605f40d..cda530e86 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -421,19 +421,19 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants) TQString lang = KGlobal::locale()->language(); - if(variants.tqcontains("score")) + if(variants.contains("score")) { KListViewItem *tmp_r = new NumSortListViewItem(lv_r, entry->name(lang), entry->version(), TQString("%1").arg(entry->rating())); tmp_r->setPixmap(0, pix); } - if(variants.tqcontains("downloads")) + if(variants.contains("downloads")) { KListViewItem *tmp_d = new NumSortListViewItem(lv_d, entry->name(lang), entry->version(), TQString("%1").arg(entry->downloads())); tmp_d->setPixmap(0, pix); } - if(variants.tqcontains("latest")) + if(variants.contains("latest")) { KListViewItem *tmp_l = new DateSortListViewItem(lv_l, entry->name(lang), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate())); @@ -559,11 +559,11 @@ void DownloadDialog::install(Entry *e) m_entryitem->setPixmap(0, pix); TQListViewItem *item; - item = lv_r->tqfindItem(e->name(lang), 0); + item = lv_r->findItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); - item = lv_d->tqfindItem(e->name(lang), 0); + item = lv_d->findItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); - item = lv_l->tqfindItem(e->name(lang), 0); + item = lv_l->findItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); } @@ -651,19 +651,19 @@ void DownloadDialog::slotSelected() if(m_curtab != 0) { lv_r->clearSelection(); - item = lv_r->tqfindItem(e->name(lang), 0); + item = lv_r->findItem(e->name(lang), 0); if(item) lv_r->setSelected(item, true); } if(m_curtab != 1) { lv_d->clearSelection(); - item = lv_d->tqfindItem(e->name(lang), 0); + item = lv_d->findItem(e->name(lang), 0); if(item) lv_d->setSelected(item, true); } if(m_curtab != 2) { lv_l->clearSelection(); - item = lv_l->tqfindItem(e->name(lang), 0); + item = lv_l->findItem(e->name(lang), 0); if(item) lv_l->setSelected(item, true); } @@ -743,7 +743,7 @@ void DownloadDialog::slotPage(TQWidget *w) kdDebug() << "changed widget!!!" << endl; - if(m_map.tqfind(w) == m_map.end()) return; + if(m_map.find(w) == m_map.end()) return; d->m_page = w; @@ -794,7 +794,7 @@ void DownloadDialog::loadProvider(Provider *p) for(TQStringList::Iterator it = variants.begin(); it != variants.end(); it++) { TQString url = p->downloadUrlVariant((*it)).url(); - if(!urls.tqcontains(url)) + if(!urls.contains(url)) { urls[url] = TQStringList(); } diff --git a/knewstuff/entry.cpp b/knewstuff/entry.cpp index e224bb0a3..55d60579c 100644 --- a/knewstuff/entry.cpp +++ b/knewstuff/entry.cpp @@ -47,11 +47,11 @@ static EntryPrivate *d(const Entry *e) d_ptr = new TQPtrDict<EntryPrivate>(); d_ptr->setAutoDelete(true); } - EntryPrivate *ret = d_ptr->tqfind((void*)e); + EntryPrivate *ret = d_ptr->find((void*)e); if(!ret) { ret = new EntryPrivate(); - d_ptr->tqreplace((void*)e, ret); + d_ptr->replace((void*)e, ret); } return ret; } @@ -84,7 +84,7 @@ void Entry::setName( const TQString &name, const TQString &lang ) { d(this)->mNameMap.insert( lang, name ); - if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); } // BCI part ends here @@ -105,7 +105,7 @@ Entry::~Entry() { if (d_ptr) { - EntryPrivate *p = d_ptr->tqfind(this); + EntryPrivate *p = d_ptr->find(this); if (p) d_ptr->remove(p); @@ -166,7 +166,7 @@ void Entry::setSummary( const TQString &text, const TQString &lang ) { mSummaryMap.insert( lang, text ); - if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); } TQString Entry::summary( const TQString &lang ) const @@ -221,7 +221,7 @@ void Entry::setPayload( const KURL &url, const TQString &lang ) { mPayloadMap.insert( lang, url ); - if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); } KURL Entry::payload( const TQString &lang ) const @@ -244,7 +244,7 @@ void Entry::setPreview( const KURL &url, const TQString &lang ) { mPreviewMap.insert( lang, url ); - if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); } KURL Entry::preview( const TQString &lang ) const diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp index 813aee041..c1d12853c 100644 --- a/knewstuff/provider.cpp +++ b/knewstuff/provider.cpp @@ -53,11 +53,11 @@ static ProviderPrivate *d_prov(const Provider *p) d_ptr_prov = new TQPtrDict<ProviderPrivate>(); d_ptr_prov->setAutoDelete(true); } - ProviderPrivate *ret = d_ptr_prov->tqfind((void*)p); + ProviderPrivate *ret = d_ptr_prov->find((void*)p); if(!ret) { ret = new ProviderPrivate(); - d_ptr_prov->tqreplace((void*)p, ret); + d_ptr_prov->replace((void*)p, ret); } return ret; } @@ -89,7 +89,7 @@ Provider::~Provider() { if (d_ptr_prov) { - ProviderPrivate *p = d_ptr_prov->tqfind(this); + ProviderPrivate *p = d_ptr_prov->find(this); if (p) d_ptr_prov->remove(p); diff --git a/knewstuff/security.cpp b/knewstuff/security.cpp index 7db2ccfe7..247c6d5bc 100644 --- a/knewstuff/security.cpp +++ b/knewstuff/security.cpp @@ -125,7 +125,7 @@ void Security::slotDataArrived(KProcIO *procIO) key.mail=data.section('<', -1, -1); key.mail.truncate(key.mail.length() - 1); key.name=data.section('<',0,0); - if (key.name.tqfind("(")!=-1) + if (key.name.find("(")!=-1) key.name=key.name.section('(',0,0); m_keys[shortId] = key; } @@ -137,7 +137,7 @@ void Security::slotDataArrived(KProcIO *procIO) m_result &= SIGNED_BAD_CLEAR; m_result |= SIGNED_OK; TQString id = data.section(" ", 1 , 1).right(8); - if (!m_keys.tqcontains(id)) + if (!m_keys.contains(id)) { m_result |= UNKNOWN; } else @@ -154,7 +154,7 @@ void Security::slotDataArrived(KProcIO *procIO) { m_result |= SIGNED_BAD; TQString id = data.section(" ", 1 , 1).right(8); - if (!m_keys.tqcontains(id)) + if (!m_keys.contains(id)) { m_result |= UNKNOWN; } else @@ -170,7 +170,7 @@ void Security::slotDataArrived(KProcIO *procIO) break; case Sign: - if (data.tqfind("passphrase.enter") != -1) + if (data.find("passphrase.enter") != -1) { TQCString password; KeyStruct key = m_keys[m_secretKey]; @@ -187,7 +187,7 @@ void Security::slotDataArrived(KProcIO *procIO) return; } } else - if (data.tqfind("BAD_PASSPHRASE") != -1) + if (data.find("BAD_PASSPHRASE") != -1) { m_result |= BAD_PASSPHRASE; } |