diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
| commit | 0b843b137f8f7e7f3d43f7a7beafc51129668981 (patch) | |
| tree | 09538b7f7ba02e3de1a85552e4cbca78e6e2e28a | |
| parent | af0ea06e33ec0c61ec44f279a738efd22263ac17 (diff) | |
| download | digikam-0b843b13.tar.gz digikam-0b843b13.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/digikam@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
108 files changed, 473 insertions, 473 deletions
diff --git a/digikam/digikam/album.cpp b/digikam/digikam/album.cpp index f419993..203bfbc 100644 --- a/digikam/digikam/album.cpp +++ b/digikam/digikam/album.cpp @@ -200,7 +200,7 @@ Album::Type Album::type() const void Album::setExtraData(const void* key, void* value) { - m_extraMap.tqreplace(key, value); + m_extraMap.replace(key, value); } void Album::removeExtraData(const void* key) @@ -211,7 +211,7 @@ void Album::removeExtraData(const void* key) void* Album::extraData(const void* key) const { typedef TQMap<const void*, void*> Map; - Map::const_iterator it = m_extraMap.tqfind(key); + Map::const_iterator it = m_extraMap.find(key); if (it == m_extraMap.end()) return 0; diff --git a/digikam/digikam/albumdb.cpp b/digikam/digikam/albumdb.cpp index 121b960..e0adbf2 100644 --- a/digikam/digikam/albumdb.cpp +++ b/digikam/digikam/albumdb.cpp @@ -140,7 +140,7 @@ void AlbumDB::initDB() return; } - if (!values.tqcontains("Albums")) + if (!values.contains("Albums")) { if (!execSql( TQString("CREATE TABLE Albums\n" " (id INTEGER PRIMARY KEY,\n" @@ -608,8 +608,8 @@ int AlbumDB::addSearch(const TQString& name, const KURL& url) TQString str("INSERT INTO Searches (name, url) \n" "VALUES('$$@@$$', '$$##$$');"); - str.tqreplace("$$@@$$", escapeString(name)); - str.tqreplace("$$##$$", escapeString(url.url())); + str.replace("$$@@$$", escapeString(name)); + str.replace("$$##$$", escapeString(url.url())); if (!execSql(str)) { @@ -625,8 +625,8 @@ void AlbumDB::updateSearch(int searchID, const TQString& name, TQString str = TQString("UPDATE Searches SET name='$$@@$$', url='$$##$$' \n" "WHERE id=%1") .tqarg(searchID); - str.tqreplace("$$@@$$", escapeString(name)); - str.tqreplace("$$##$$", escapeString(url.url())); + str.replace("$$@@$$", escapeString(name)); + str.replace("$$##$$", escapeString(url.url())); execSql(str); } @@ -719,7 +719,7 @@ bool AlbumDB::execSql(const TQString& sql, TQStringList* const values, TQString AlbumDB::escapeString(TQString str) const { - str.tqreplace( "'", "''" ); + str.replace( "'", "''" ); return str; } @@ -932,7 +932,7 @@ void AlbumDB::addItemTag(TQ_LLONG imageID, int tagID) .tqarg(imageID) .tqarg(tagID) ); - if (!d->recentlyAssignedTags.tqcontains(tagID)) + if (!d->recentlyAssignedTags.contains(tagID)) { d->recentlyAssignedTags.push_front(tagID); if (d->recentlyAssignedTags.size() > 10) diff --git a/digikam/digikam/albumdb_sqlite2.cpp b/digikam/digikam/albumdb_sqlite2.cpp index a9a2085..0361a0b 100644 --- a/digikam/digikam/albumdb_sqlite2.cpp +++ b/digikam/digikam/albumdb_sqlite2.cpp @@ -82,7 +82,7 @@ void AlbumDB_Sqlite2::setDBPath(const TQString& path) TQStringList values; execSql("SELECT * FROM sqlite_master", &values); - m_valid = values.tqcontains("Albums"); + m_valid = values.contains("Albums"); } bool AlbumDB_Sqlite2::execSql(const TQString& sql, TQStringList* const values, diff --git a/digikam/digikam/albumfiletip.cpp b/digikam/digikam/albumfiletip.cpp index 307f7c7..ee96ee6 100644 --- a/digikam/digikam/albumfiletip.cpp +++ b/digikam/digikam/albumfiletip.cpp @@ -378,7 +378,7 @@ void AlbumFileTip::updateText() #endif TQString ext = fileInfo.extension(false).upper(); - if (!ext.isEmpty() && rawFilesExt.upper().tqcontains(ext)) + if (!ext.isEmpty() && rawFilesExt.upper().contains(ext)) { str = i18n("RAW Image"); dims = metaData.getImageDimensions(); diff --git a/digikam/digikam/albumfolderview.cpp b/digikam/digikam/albumfolderview.cpp index 7a15e09..e390939 100644 --- a/digikam/digikam/albumfolderview.cpp +++ b/digikam/digikam/albumfolderview.cpp @@ -196,7 +196,7 @@ int AlbumFolderViewItem::id() const else { return ( - (AlbumSettings::instance()->getAlbumCollectionNames() - .tqfindIndex(text(0)) ) ); + .findIndex(text(0)) ) ); } } else @@ -339,7 +339,7 @@ void AlbumFolderView::slotTextFolderFilterChanged(const TQString& filter) if (palbum->isRoot()) continue; - bool match = palbum->title().lower().tqcontains(search); + bool match = palbum->title().lower().contains(search); bool doesExpand = false; if (!match) { @@ -347,7 +347,7 @@ void AlbumFolderView::slotTextFolderFilterChanged(const TQString& filter) Album* tqparent = palbum->tqparent(); while (tqparent && !tqparent->isRoot()) { - if (tqparent->title().lower().tqcontains(search)) + if (tqparent->title().lower().contains(search)) { match = true; break; @@ -363,7 +363,7 @@ void AlbumFolderView::slotTextFolderFilterChanged(const TQString& filter) AlbumIterator it(palbum); while (it.current()) { - if ((*it)->title().lower().tqcontains(search)) + if ((*it)->title().lower().contains(search)) { match = true; doesExpand = true; @@ -1458,7 +1458,7 @@ AlbumFolderViewItem* AlbumFolderView::findParentByCollection(PAlbum* album, bool TQStringList collectionList = AlbumSettings::instance()->getAlbumCollectionNames(); TQString collection = album->collection(); - if (collection.isEmpty() || !collectionList.tqcontains(collection)) + if (collection.isEmpty() || !collectionList.contains(collection)) collection = i18n("Uncategorized Albums"); AlbumFolderViewItem* tqparent = 0; @@ -1622,7 +1622,7 @@ void AlbumFolderView::slotRefresh(const TQMap<int, int>& albumsStatMap) if (item->album()) { int id = item->id(); - TQMap<int, int>::const_iterator it2 = albumsStatMap.tqfind(id); + TQMap<int, int>::const_iterator it2 = albumsStatMap.find(id); if ( it2 != albumsStatMap.end() ) item->setCount(it2.data()); } diff --git a/digikam/digikam/albumicongroupitem.cpp b/digikam/digikam/albumicongroupitem.cpp index 2186d39..16907a2 100644 --- a/digikam/digikam/albumicongroupitem.cpp +++ b/digikam/digikam/albumicongroupitem.cpp @@ -107,7 +107,7 @@ void AlbumIconGroupItem::paintBanner() if (!album->caption().isEmpty()) { TQString caption = album->caption(); - dateAndComments += " - " + caption.tqreplace("\n", " "); + dateAndComments += " - " + caption.replace("\n", " "); } prettyURL = album->prettyURL(); diff --git a/digikam/digikam/albumiconitem.cpp b/digikam/digikam/albumiconitem.cpp index 92236b1..11d160b 100644 --- a/digikam/digikam/albumiconitem.cpp +++ b/digikam/digikam/albumiconitem.cpp @@ -96,7 +96,7 @@ AlbumIconItem::~AlbumIconItem() TQString AlbumIconItem::squeezedText(TQPainter* p, int width, const TQString& text) { TQString fullText(text); - fullText.tqreplace("\n"," "); + fullText.replace("\n"," "); TQFontMetrics fm(p->fontMetrics()); int textWidth = fm.width(fullText); @@ -241,7 +241,7 @@ void AlbumIconItem::paintItem() d->dirty = true; - TQPixmap *thumbnail = d->view->pixmapManager()->tqfind(d->info->kurl()); + TQPixmap *thumbnail = d->view->pixmapManager()->find(d->info->kurl()); if (thumbnail) { r = d->view->itemPixmapRect(); diff --git a/digikam/digikam/albumiconview.cpp b/digikam/digikam/albumiconview.cpp index b55a5ea..c35f678 100644 --- a/digikam/digikam/albumiconview.cpp +++ b/digikam/digikam/albumiconview.cpp @@ -388,12 +388,12 @@ void AlbumIconView::slotImageListerNewItems(const ImageInfoList& itemList) KURL url( item->kurl() ); url.cleanPath(); - if (AlbumIconItem *oldItem = d->itemDict.tqfind(url.url())) + if (AlbumIconItem *oldItem = d->itemDict.find(url.url())) { slotImageListerDeleteItem(oldItem->imageInfo()); } - AlbumIconGroupItem* group = d->albumDict.tqfind(item->albumID()); + AlbumIconGroupItem* group = d->albumDict.find(item->albumID()); if (!group) { group = new AlbumIconGroupItem(this, item->albumID()); @@ -1116,7 +1116,7 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item) #endif // If the current item is not an image file. - if ( !imagefilter.tqcontains(currentFileExtension) ) + if ( !imagefilter.contains(currentFileExtension) ) { KMimeType::Ptr mimePtr = KMimeType::findByURL(item->imageInfo()->kurl(), 0, true, true); @@ -1142,7 +1142,7 @@ void AlbumIconView::slotDisplayItem(AlbumIconItem *item) AlbumIconItem *iconItem = static_cast<AlbumIconItem *>(it); TQString fileExtension = iconItem->imageInfo()->kurl().fileName().section( '.', -1 ); - if ( imagefilter.tqfind(fileExtension) != -1 ) + if ( imagefilter.find(fileExtension) != -1 ) { ImageInfo *info = new ImageInfo(*iconItem->imageInfo()); info->setViewItem(0); @@ -1703,7 +1703,7 @@ bool AlbumIconView::acceptToolTip(IconItem *item, const TQPoint &mousePos) { AlbumIconItem *iconItem = dynamic_cast<AlbumIconItem*>(item); - if (iconItem && iconItem->clickToOpenRect().tqcontains(mousePos)) + if (iconItem && iconItem->clickToOpenRect().contains(mousePos)) { return true; } @@ -2172,7 +2172,7 @@ AlbumIconItem* AlbumIconView::findItem(const TQPoint& pos) AlbumIconItem* AlbumIconView::findItem(const TQString& url) const { - return d->itemDict.tqfind(url); + return d->itemDict.find(url); } AlbumIconItem* AlbumIconView::nextItemToThumbnail() const diff --git a/digikam/digikam/albumiconviewfilter.cpp b/digikam/digikam/albumiconviewfilter.cpp index b9ed289..32e16fd 100644 --- a/digikam/digikam/albumiconviewfilter.cpp +++ b/digikam/digikam/albumiconviewfilter.cpp @@ -191,7 +191,7 @@ bool AlbumIconViewFilter::eventFilter(TQObject *object, TQEvent *e) if (e->type() == TQEvent::MouseButtonRelease) { TQMouseEvent* event = TQT_TQMOUSEEVENT(e); - if ( TQT_TQRECT_OBJECT(widget->rect()).tqcontains(event->pos()) && d->led->ledColor() != StatusLed::Gray) + if ( TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) && d->led->ledColor() != StatusLed::Gray) { // Reset all filters settings. d->textFilter->setText(TQString()); diff --git a/digikam/digikam/albumlister.cpp b/digikam/digikam/albumlister.cpp index 0a74deb..59d8234 100644 --- a/digikam/digikam/albumlister.cpp +++ b/digikam/digikam/albumlister.cpp @@ -296,7 +296,7 @@ bool AlbumLister::matchesFilter(const ImageInfo* info, bool &foundText) { for (it = d->tagFilter.begin(); it != d->tagFilter.end(); ++it) { - if (tagIDs.tqcontains(*it)) + if (tagIDs.contains(*it)) { match = true; break; @@ -309,7 +309,7 @@ bool AlbumLister::matchesFilter(const ImageInfo* info, bool &foundText) for (it = d->tagFilter.begin(); it != d->tagFilter.end(); ++it) { - if (!tagIDs.tqcontains(*it)) + if (!tagIDs.contains(*it)) break; } @@ -330,7 +330,7 @@ bool AlbumLister::matchesFilter(const ImageInfo* info, bool &foundText) if (!d->dayFilter.isEmpty()) { - match &= d->dayFilter.tqcontains(TQDateTime(info->dateTime().date(), TQTime())); + match &= d->dayFilter.contains(TQDateTime(info->dateTime().date(), TQTime())); } //-- Filter by rating --------------------------------------------------------- @@ -374,7 +374,7 @@ bool AlbumLister::matchesFilter(const ImageInfo* info, bool &foundText) { TQString imageFilesExt(AlbumSettings::instance()->getImageFileFilter()); imageFilesExt.append(AlbumSettings::instance()->getRawFileFilter()); - if (!imageFilesExt.upper().tqcontains(mimeType)) + if (!imageFilesExt.upper().contains(mimeType)) match = false; break; } @@ -400,28 +400,28 @@ bool AlbumLister::matchesFilter(const ImageInfo* info, bool &foundText) case MimeFilter::NoRAWFiles: { TQString rawFilesExt(AlbumSettings::instance()->getRawFileFilter()); - if (rawFilesExt.upper().tqcontains(mimeType)) + if (rawFilesExt.upper().contains(mimeType)) match = false; break; } case MimeFilter::RAWFiles: { TQString rawFilesExt(AlbumSettings::instance()->getRawFileFilter()); - if (!rawFilesExt.upper().tqcontains(mimeType)) + if (!rawFilesExt.upper().contains(mimeType)) match = false; break; } case MimeFilter::MoviesFiles: { TQString moviesFilesExt(AlbumSettings::instance()->getMovieFileFilter()); - if (!moviesFilesExt.upper().tqcontains(mimeType)) + if (!moviesFilesExt.upper().contains(mimeType)) match = false; break; } case MimeFilter::AudioFiles: { TQString audioFilesExt(AlbumSettings::instance()->getAudioFileFilter()); - if (!audioFilesExt.upper().tqcontains(mimeType)) + if (!audioFilesExt.upper().contains(mimeType)) match = false; break; } @@ -434,21 +434,21 @@ bool AlbumLister::matchesFilter(const ImageInfo* info, bool &foundText) if (!d->textFilter.isEmpty()) { foundText = false; - if (info->name().lower().tqcontains(d->textFilter.lower())) + if (info->name().lower().contains(d->textFilter.lower())) { foundText = true; } - if (info->caption().lower().tqcontains(d->textFilter.lower())) + if (info->caption().lower().contains(d->textFilter.lower())) foundText = true; TQStringList tags = info->tagNames(); for (TQStringList::const_iterator it = tags.constBegin() ; it != tags.constEnd() ; ++it) { - if ((*it).lower().tqcontains(d->textFilter.lower())) + if ((*it).lower().contains(d->textFilter.lower())) foundText = true; } // check for folder names PAlbum* palbum = AlbumManager::instance()->findPAlbum(info->albumID()); - if ((palbum && palbum->title().lower().tqcontains(d->textFilter.lower()))) + if ((palbum && palbum->title().lower().contains(d->textFilter.lower()))) { foundText = true; } @@ -596,12 +596,12 @@ void AlbumLister::slotData(KIO::Job*, const TQByteArray& data) ds >> size; ds >> dims; - if (d->itemMap.tqcontains(imageID)) + if (d->itemMap.contains(imageID)) { ImageInfo* info = d->itemMap[imageID]; d->itemMap.remove(imageID); - if (d->invalidatedItems.tqcontains(imageID)) + if (d->invalidatedItems.contains(imageID)) { emit signalDeleteItem(info); emit signalDeleteFilteredItem(info); diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp index ebbfca9..f164c92 100644 --- a/digikam/digikam/albummanager.cpp +++ b/digikam/digikam/albummanager.cpp @@ -448,7 +448,7 @@ void AlbumManager::scanPAlbums() AlbumInfo info = *it; info.url = TQDir::cleanDirPath(info.url); - if (!aMap.tqcontains(info.url)) + if (!aMap.contains(info.url)) { newAlbumList.append(info); } @@ -473,7 +473,7 @@ void AlbumManager::scanPAlbums() // doesn't delete albums and looks like child Albums don't get deleted. // But when the tqparent album gets deleted, the tqchildren are also deleted. - PAlbum* album = d->pAlbumDict.tqfind(it.key()); + PAlbum* album = d->pAlbumDict.find(it.key()); if (!album) continue; @@ -496,7 +496,7 @@ void AlbumManager::scanPAlbums() // Get its tqparent TQString purl = u.upURL().path(-1); - PAlbum* tqparent = d->pAlbumDict.tqfind(purl); + PAlbum* tqparent = d->pAlbumDict.find(purl); if (!tqparent) { DWarning() << k_funcinfo << "Could not find tqparent with url: " @@ -603,7 +603,7 @@ void AlbumManager::scanTAlbums() if (album->m_id == 0) continue; - TAlbum* tqparent = tagDict.tqfind(album->m_pid); + TAlbum* tqparent = tagDict.find(album->m_pid); if (tqparent) { album->setParent(tqparent); @@ -640,11 +640,11 @@ void AlbumManager::scanTAlbums() TagInfo info = *it; // check if we have already added this tag - if (tmap.tqcontains(info.id)) + if (tmap.contains(info.id)) continue; // Its a new album. Find the tqparent of the album - TagMap::iterator iter = tmap.tqfind(info.pid); + TagMap::iterator iter = tmap.find(info.pid); if (iter == tmap.end()) { DWarning() << "Failed to find tqparent tag for tag " @@ -724,7 +724,7 @@ void AlbumManager::scanSAlbums() SearchInfo info = *it; // check if we have already added this search - if (sMap.tqcontains(info.id)) + if (sMap.contains(info.id)) continue; bool simple = (info.url.queryItem("1.key") == TQString::tqfromLatin1("keyword")); @@ -852,7 +852,7 @@ PAlbum* AlbumManager::findPAlbum(const KURL& url) const path.remove(d->libraryPath); path = TQDir::cleanDirPath(path); - return d->pAlbumDict.tqfind(path); + return d->pAlbumDict.find(path); } PAlbum* AlbumManager::findPAlbum(int id) const @@ -862,7 +862,7 @@ PAlbum* AlbumManager::findPAlbum(int id) const int gid = d->rootPAlbum->globalID() + id; - return (PAlbum*)(d->albumIntDict.tqfind(gid)); + return (PAlbum*)(d->albumIntDict.find(gid)); } TAlbum* AlbumManager::findTAlbum(int id) const @@ -872,7 +872,7 @@ TAlbum* AlbumManager::findTAlbum(int id) const int gid = d->rootTAlbum->globalID() + id; - return (TAlbum*)(d->albumIntDict.tqfind(gid)); + return (TAlbum*)(d->albumIntDict.find(gid)); } SAlbum* AlbumManager::findSAlbum(int id) const @@ -882,7 +882,7 @@ SAlbum* AlbumManager::findSAlbum(int id) const int gid = d->rootSAlbum->globalID() + id; - return (SAlbum*)(d->albumIntDict.tqfind(gid)); + return (SAlbum*)(d->albumIntDict.find(gid)); } DAlbum* AlbumManager::findDAlbum(int id) const @@ -892,12 +892,12 @@ DAlbum* AlbumManager::findDAlbum(int id) const int gid = d->rootDAlbum->globalID() + id; - return (DAlbum*)(d->albumIntDict.tqfind(gid)); + return (DAlbum*)(d->albumIntDict.find(gid)); } Album* AlbumManager::findAlbum(int gid) const { - return d->albumIntDict.tqfind(gid); + return d->albumIntDict.find(gid); } TAlbum* AlbumManager::findTAlbum(const TQString &tagPath) const @@ -937,7 +937,7 @@ PAlbum* AlbumManager::createPAlbum(PAlbum* tqparent, return 0; } - if (name.tqcontains("/")) + if (name.contains("/")) { errMsg = i18n("Album name cannot contain '/'."); return 0; @@ -1016,7 +1016,7 @@ bool AlbumManager::renamePAlbum(PAlbum* album, const TQString& newName, return false; } - if (newName.tqcontains("/")) + if (newName.contains("/")) { errMsg = i18n("Album name cannot contain '/'"); return false; @@ -1121,7 +1121,7 @@ TAlbum* AlbumManager::createTAlbum(TAlbum* tqparent, const TQString& name, return 0; } - if (name.tqcontains("/")) + if (name.contains("/")) { errMsg = i18n("Tag name cannot contain '/'"); return 0; @@ -1222,7 +1222,7 @@ bool AlbumManager::renameTAlbum(TAlbum* album, const TQString& name, return false; } - if (name.tqcontains("/")) + if (name.contains("/")) { errMsg = i18n("Tag name cannot contain '/'"); return false; @@ -1542,14 +1542,14 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const TQByteArray& data) for ( TQMap<TQDateTime, int>::iterator it = datesStatMap.begin(); it != datesStatMap.end(); ++it ) { - TQMap<YearMonth, int>::iterator it2 = yearMonthMap.tqfind(YearMonth(it.key().date().year(), it.key().date().month())); + TQMap<YearMonth, int>::iterator it2 = yearMonthMap.find(YearMonth(it.key().date().year(), it.key().date().month())); if ( it2 == yearMonthMap.end() ) { yearMonthMap.insert( YearMonth(it.key().date().year(), it.key().date().month()), it.data() ); } else { - yearMonthMap.tqreplace( YearMonth(it.key().date().year(), it.key().date().month()), it2.data() + it.data() ); + yearMonthMap.replace( YearMonth(it.key().date().year(), it.key().date().month()), it2.data() + it.data() ); } } @@ -1563,12 +1563,12 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const TQByteArray& data) TQDate md(year, month, 1); // Do we already have this Month album - if (mAlbumMap.tqcontains(md)) + if (mAlbumMap.contains(md)) { // already there. remove Month album from map mAlbumMap.remove(md); - if (yAlbumMap.tqcontains(year)) + if (yAlbumMap.contains(year)) { // already there. remove from map yAlbumMap.remove(year); @@ -1640,7 +1640,7 @@ void AlbumManager::slotDirty(const TQString& path) if (url.isEmpty()) url = "/"; - if (d->dirtyAlbums.tqcontains(url)) + if (d->dirtyAlbums.contains(url)) return; // is the signal for the directory containing the database file? diff --git a/digikam/digikam/albummanager.h b/digikam/digikam/albummanager.h index 54c6272..63c7e03 100644 --- a/digikam/digikam/albummanager.h +++ b/digikam/digikam/albummanager.h @@ -188,7 +188,7 @@ public: */ //@{ /** - * Given a complete file url (kde url with file protocol), it will try to tqfind + * Given a complete file url (kde url with file protocol), it will try to find * a PAlbum corresponding to it. * \warning This should not be used, unless really necessary * @return PAlbum correspoding to supplied @p url diff --git a/digikam/digikam/albumpropsedit.cpp b/digikam/digikam/albumpropsedit.cpp index 8b027a1..3c0d32b 100644 --- a/digikam/digikam/albumpropsedit.cpp +++ b/digikam/digikam/albumpropsedit.cpp @@ -200,7 +200,7 @@ AlbumPropsEdit::AlbumPropsEdit(PAlbum* album, bool create) d->collectionCombo->insertItem( TQString() ); TQStringList collections = settings->getAlbumCollectionNames(); d->collectionCombo->insertStringList( collections ); - int collectionIndex = collections.tqfindIndex( album->collection() ); + int collectionIndex = collections.findIndex( album->collection() ); if ( collectionIndex != -1 ) { @@ -280,7 +280,7 @@ TQStringList AlbumPropsEdit::albumCollections() const } TQString currentCollection = d->collectionCombo->currentText(); - if ( collections.tqfindIndex( currentCollection ) == -1 ) + if ( collections.findIndex( currentCollection ) == -1 ) { collections.append(currentCollection); } diff --git a/digikam/digikam/albumsettings.cpp b/digikam/digikam/albumsettings.cpp index a0acb82..4ce7a11 100644 --- a/digikam/digikam/albumsettings.cpp +++ b/digikam/digikam/albumsettings.cpp @@ -500,7 +500,7 @@ TQStringList AlbumSettings::getAlbumCollectionNames() bool AlbumSettings::addAlbumCollectionName(const TQString& name) { - if (d->albumCollectionNames.tqcontains(name)) + if (d->albumCollectionNames.contains(name)) return false; d->albumCollectionNames.append(name); @@ -585,10 +585,10 @@ TQString AlbumSettings::getRawFileFilter() const bool AlbumSettings::addImageFileExtension(const TQString& newExt) { - if ( TQStringList::split(" ", d->imageFilefilter).tqcontains(newExt) || - TQStringList::split(" ", d->movieFilefilter).tqcontains(newExt) || - TQStringList::split(" ", d->audioFilefilter).tqcontains(newExt) || - TQStringList::split(" ", d->rawFilefilter ).tqcontains(newExt) ) + if ( TQStringList::split(" ", d->imageFilefilter).contains(newExt) || + TQStringList::split(" ", d->movieFilefilter).contains(newExt) || + TQStringList::split(" ", d->audioFilefilter).contains(newExt) || + TQStringList::split(" ", d->rawFilefilter ).contains(newExt) ) return false; d->imageFilefilter = d->imageFilefilter + ' ' + newExt; diff --git a/digikam/digikam/albumthumbnailloader.cpp b/digikam/digikam/albumthumbnailloader.cpp index cf8bead..a85e291 100644 --- a/digikam/digikam/albumthumbnailloader.cpp +++ b/digikam/digikam/albumthumbnailloader.cpp @@ -247,7 +247,7 @@ bool AlbumThumbnailLoader::getAlbumThumbnail(PAlbum *album) void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) { /* - TQPixmap* pix = d->cache->tqfind(album->iconKURL().path()); + TQPixmap* pix = d->cache->find(album->iconKURL().path()); if (pix) return pix; */ @@ -255,7 +255,7 @@ void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) // First check cached thumbnails. // At startup, this is not relevant, as the views will add their requests in a row. // This is to speed up context menu and IE imagedescedit - TagThumbnailMap::iterator ttit = d->tagThumbnailMap.tqfind(album->globalID()); + TagThumbnailMap::iterator ttit = d->tagThumbnailMap.find(album->globalID()); if (ttit != d->tagThumbnailMap.end()) { // It is not necessary to return cached icon asynchronously - they could be @@ -266,7 +266,7 @@ void AlbumThumbnailLoader::addURL(Album *album, const KURL &url) } // Check if the URL has already been added (ThumbnailJob will _not_ check this) - UrlAlbumMap::iterator it = d->urlAlbumMap.tqfind(url); + UrlAlbumMap::iterator it = d->urlAlbumMap.find(url); if (it == d->urlAlbumMap.end()) { @@ -362,7 +362,7 @@ void AlbumThumbnailLoader::slotGotThumbnailFromIcon(const KURL &url, const TQPix // We need to find all albums for which the given url has been requested, // and emit a signal for each album. - UrlAlbumMap::iterator it = d->urlAlbumMap.tqfind(url); + UrlAlbumMap::iterator it = d->urlAlbumMap.find(url); if (it != d->urlAlbumMap.end()) { @@ -451,7 +451,7 @@ void AlbumThumbnailLoader::slotThumbnailLost(const KURL &url) { // Same code as above, only different signal - UrlAlbumMap::iterator it = d->urlAlbumMap.tqfind(url); + UrlAlbumMap::iterator it = d->urlAlbumMap.find(url); if (it != d->urlAlbumMap.end()) { diff --git a/digikam/digikam/albumwidgetstack.cpp b/digikam/digikam/albumwidgetstack.cpp index b391cbd..8ab349e 100644 --- a/digikam/digikam/albumwidgetstack.cpp +++ b/digikam/digikam/albumwidgetstack.cpp @@ -150,7 +150,7 @@ void AlbumWidgetStack::setPreviewItem(ImageInfo* info, ImageInfo *previous, Imag settings->getMovieFileFilter().upper() + settings->getAudioFileFilter().lower() + settings->getAudioFileFilter().upper(); - if (mediaplayerfilter.tqcontains(currentFileExtension) ) + if (mediaplayerfilter.contains(currentFileExtension) ) { setPreviewMode(MediaPlayerMode); d->mediaPlayerView->setMediaPlayerFromUrl(info->kurl()); @@ -215,7 +215,7 @@ void AlbumWidgetStack::slotItemsUpdated(const KURL::List& list) previewMode() == MediaPlayerMode) // What we can do with media player ? return; - if (list.tqcontains(imagePreviewView()->getImageInfo()->kurl())) + if (list.contains(imagePreviewView()->getImageInfo()->kurl())) d->imagePreviewView->reload(); } diff --git a/digikam/digikam/cameralist.cpp b/digikam/digikam/cameralist.cpp index 84b86a9..0c2edf2 100644 --- a/digikam/digikam/cameralist.cpp +++ b/digikam/digikam/cameralist.cpp @@ -159,7 +159,7 @@ bool CameraList::save() bool CameraList::changeCameraAccessTime(const TQString& cameraTitle, const TQDateTime& newDate) { - CameraType* cam = tqfind(cameraTitle); + CameraType* cam = find(cameraTitle); if (cam) { cam->setLastAccess(newDate); @@ -206,7 +206,7 @@ TQPtrList<CameraType>* CameraList::cameraList() return &d->clist; } -CameraType* CameraList::tqfind(const TQString& title) +CameraType* CameraList::find(const TQString& title) { for (CameraType *ctype = d->clist.first(); ctype; ctype = d->clist.next()) diff --git a/digikam/digikam/cameralist.h b/digikam/digikam/cameralist.h index a36ca39..0a8b7e7 100644 --- a/digikam/digikam/cameralist.h +++ b/digikam/digikam/cameralist.h @@ -55,7 +55,7 @@ public: void insert(CameraType* ctype); void remove(CameraType* ctype); - CameraType* tqfind(const TQString& title); + CameraType* find(const TQString& title); CameraType* autoDetect(bool& retry); TQPtrList<CameraType>* cameraList(); diff --git a/digikam/digikam/datefolderview.cpp b/digikam/digikam/datefolderview.cpp index 1d26dc5..b5c1d45 100644 --- a/digikam/digikam/datefolderview.cpp +++ b/digikam/digikam/datefolderview.cpp @@ -351,7 +351,7 @@ void DateFolderView::loadViewState() { item = dynamic_cast<DateFolderItem*>(it.current()); id = item->date(); - if(openFolders.tqcontains(id)) + if(openFolders.contains(id)) d->listview->setOpen(item, true); else d->listview->setOpen(item, false); @@ -459,7 +459,7 @@ void DateFolderView::slotRefresh(const TQMap<YearMonth, int>& yearMonthMap) if (item->album()->range() == DAlbum::Month) { - TQMap<YearMonth, int>::const_iterator it2 = yearMonthMap.tqfind(YearMonth(date.year(), date.month())); + TQMap<YearMonth, int>::const_iterator it2 = yearMonthMap.find(YearMonth(date.year(), date.month())); if ( it2 != yearMonthMap.end() ) item->setCount(it2.data()); } diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp index c911caa..b27cae5 100644 --- a/digikam/digikam/digikamapp.cpp +++ b/digikam/digikam/digikamapp.cpp @@ -1044,7 +1044,7 @@ void DigikamApp::setupActions() KAction* findAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewQuickSearch()), actionCollection(), "search_quick"); findAction->setText(i18n("Search...")); - findAction->setIconSet(BarIcon("filetqfind")); + findAction->setIconSet(BarIcon("filefind")); KAction* advFindAction = KStdAction::find(TQT_TQOBJECT(d->view), TQT_SLOT(slotNewAdvancedSearch()), actionCollection(), "search_advanced"); @@ -1505,7 +1505,7 @@ void DigikamApp::slotDownloadImages() void DigikamApp::slotCameraConnect() { - CameraType* ctype = d->cameraList->tqfind(TQString::fromUtf8(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name())); + CameraType* ctype = d->cameraList->find(TQString::fromUtf8(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name())); if (ctype) { @@ -1890,7 +1890,7 @@ void DigikamApp::slotKipiPluginPlug() if (popup) { - if (!pluginActionsDisabled.tqcontains(actionName)) + if (!pluginActionsDisabled.contains(actionName)) popup->append( *it2 ); else DDebug() << "Plugin '" << actionName << "' disabled." << endl; @@ -1950,9 +1950,9 @@ void DigikamApp::slotChangeTheme(const TQString& theme) void DigikamApp::slotThemeChanged() { TQStringList themes(ThemeEngine::instance()->themeNames()); - int index = themes.tqfindIndex(d->albumSettings->getCurrentTheme()); + int index = themes.findIndex(d->albumSettings->getCurrentTheme()); if (index == -1) - index = themes.tqfindIndex(i18n("Default")); + index = themes.findIndex(i18n("Default")); d->themeMenuAction->setCurrentItem(index); } diff --git a/digikam/digikam/digikamview.cpp b/digikam/digikam/digikamview.cpp index 7488848..cbc0ba1 100644 --- a/digikam/digikam/digikamview.cpp +++ b/digikam/digikam/digikamview.cpp @@ -216,7 +216,7 @@ DigikamView::DigikamView(TQWidget *tqparent) d->leftSideBar->appendTab(d->dateFolderView, SmallIcon("date"), i18n("Calendar")); d->leftSideBar->appendTab(d->tagBox, SmallIcon("tag"), i18n("Tags")); d->leftSideBar->appendTab(d->timeLineView, SmallIcon("clock"), i18n("Timeline")); - d->leftSideBar->appendTab(d->searchBox, SmallIcon("tqfind"), i18n("Searches")); + d->leftSideBar->appendTab(d->searchBox, SmallIcon("find"), i18n("Searches")); // To the right. diff --git a/digikam/digikam/folderview.cpp b/digikam/digikam/folderview.cpp index f7d1c2c..b8ef84d 100644 --- a/digikam/digikam/folderview.cpp +++ b/digikam/digikam/folderview.cpp @@ -405,7 +405,7 @@ void FolderView::loadViewState() continue; // Start the album root always open - if(openFolders.tqcontains(item->id()) || item->id() == 0) + if(openFolders.contains(item->id()) || item->id() == 0) setOpen(item, true); else setOpen(item, false); diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp index 3a86f11..7c7b035 100644 --- a/digikam/digikam/iconview.cpp +++ b/digikam/digikam/iconview.cpp @@ -212,13 +212,13 @@ IconItem* IconView::findItem(const TQPoint& pos) IconViewPriv::ItemContainer *c = d->firstContainer; for (; c; c = c->next) { - if ( c->rect.tqcontains(pos) ) + if ( c->rect.contains(pos) ) { for (TQValueList<IconItem*>::iterator it = c->items.begin(); it != c->items.end(); ++it) { IconItem* item = *it; - if (item->rect().tqcontains(pos)) + if (item->rect().contains(pos)) return item; } } @@ -241,7 +241,7 @@ IconGroupItem* IconView::findGroup(const TQPoint& pos) rect.setBottom(bottom); - if ( rect.tqcontains(p) ) + if ( rect.contains(p) ) { return group; } @@ -397,7 +397,7 @@ void IconView::selectItem(IconItem* item, bool select) if (select) { - d->selectedItems.tqreplace(item, item); + d->selectedItems.replace(item, item); } else { @@ -802,7 +802,7 @@ void IconView::rebuildContainers() IconViewPriv::ItemContainer* c = d->lastContainer; while (item) { - if (c->rect.tqcontains(item->rect())) + if (c->rect.contains(item->rect())) { c->items.append(item); item = item->nextItem(); @@ -1113,7 +1113,7 @@ void IconView::contentsMouseMoveEvent(TQMouseEvent* e) if (KGlobalSettings::changeCursorOverIcon()) { - if (item && item->clickToOpenRect().tqcontains(e->pos())) + if (item && item->clickToOpenRect().contains(e->pos())) setCursor(KCursor::handCursor()); else unsetCursor(); @@ -1172,7 +1172,7 @@ void IconView::contentsMouseMoveEvent(TQMouseEvent* e) } else { - if (item->isSelected() && !d->prevSelectedItems.tqfind(item)) + if (item->isSelected() && !d->prevSelectedItems.find(item)) { item->setSelected(false, false); changed = true; @@ -1261,7 +1261,7 @@ void IconView::contentsMouseReleaseEvent(TQMouseEvent* e) prevCurrItem->tqrepaint(); if (KGlobalSettings::singleClick()) { - if (item->clickToOpenRect().tqcontains(e->pos())) + if (item->clickToOpenRect().contains(e->pos())) { itemClickedToOpen(item); } diff --git a/digikam/digikam/kdateedit.cpp b/digikam/digikam/kdateedit.cpp index 23a5092..6df09f2 100644 --- a/digikam/digikam/kdateedit.cpp +++ b/digikam/digikam/kdateedit.cpp @@ -58,7 +58,7 @@ class DateValidator : public TQValidator if ( length <= 0 ) return Intermediate; - if ( mKeywords.tqcontains( str.lower() ) ) + if ( mKeywords.contains( str.lower() ) ) return Acceptable; bool ok = false; @@ -229,7 +229,7 @@ TQDate KDateEdit::parseDate( bool *replaced ) const if ( text.isEmpty() ) result = TQDate(); - else if ( mKeywordMap.tqcontains( text.lower() ) ) { + else if ( mKeywordMap.contains( text.lower() ) ) { TQDate today = TQDate::tqcurrentDate(); int i = mKeywordMap[ text.lower() ]; if ( i >= 100 ) { @@ -299,7 +299,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: { TQMouseEvent *mouseEvent = (TQMouseEvent*)event; - if ( !TQT_TQRECT_OBJECT(mPopup->rect()).tqcontains( mouseEvent->pos() ) ) { + if ( !TQT_TQRECT_OBJECT(mPopup->rect()).contains( mouseEvent->pos() ) ) { TQPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() ); if ( TQApplication::widgetAt( globalPos, true ) == this ) { // The date picker is being closed by a click on the diff --git a/digikam/digikam/kipiinterface.cpp b/digikam/digikam/kipiinterface.cpp index 03a8777..f679f0c 100644 --- a/digikam/digikam/kipiinterface.cpp +++ b/digikam/digikam/kipiinterface.cpp @@ -214,14 +214,14 @@ void DigikamImageInfo::addAttributes(const TQMap<TQString, TQVariant>& res) TQMap<TQString, TQVariant> attributes = res; // Set digiKam Tags list of picture. - if (attributes.tqfind("tags") != attributes.end()) + if (attributes.find("tags") != attributes.end()) { TQStringList tags = attributes["tags"].asStringList(); //TODO } // Set digiKam Rating of picture. - if (attributes.tqfind("rating") != attributes.end()) + if (attributes.find("rating") != attributes.end()) { int rating = attributes["rating"].asInt(); if (rating >= RatingMin && rating <= RatingMax) @@ -342,9 +342,9 @@ static TQValueList<TQRegExp> makeFilterList( const TQString &filter ) return regExps; TQChar sep( ';' ); - int i = filter.tqfind( sep, 0 ); + int i = filter.find( sep, 0 ); - if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + if ( i == -1 && filter.find( ' ', 0 ) != -1 ) sep = TQChar( ' ' ); TQStringList list = TQStringList::split( sep, filter ); diff --git a/digikam/digikam/metadatahub.cpp b/digikam/digikam/metadatahub.cpp index 254e4c9..71102a5 100644 --- a/digikam/digikam/metadatahub.cpp +++ b/digikam/digikam/metadatahub.cpp @@ -283,7 +283,7 @@ void MetadataHub::loadTags(const TQValueList<TAlbum *> &loadedTags) // but are not contained in this set, have to be set to MetadataDisjoint for (TQValueList<TAlbum *>::iterator it = previousTags.begin(); it != previousTags.end(); ++it) { - TQMap<TAlbum *, TagtqStatus>::iterator mapIt = d->tags.tqfind(*it); + TQMap<TAlbum *, TagtqStatus>::iterator mapIt = d->tags.find(*it); if (mapIt != d->tags.end() && mapIt.data() == TagtqStatus(MetadataAvailable, true)) { mapIt.data() = TagtqStatus(MetadataDisjoint, true); @@ -304,7 +304,7 @@ void MetadataHub::loadTags(const TQStringList &loadedTagPaths) TQStringList toBeAdded; for (TQStringList::iterator it = d->tagList.begin(); it != d->tagList.end(); ++it) { - TQStringList::const_iterator newTagListIt = loadedTagPaths.tqfind(*it); + TQStringList::const_iterator newTagListIt = loadedTagPaths.find(*it); if (newTagListIt == loadedTagPaths.end()) { // it's not in the loadedTagPaths list. Remove it from intersection list. @@ -694,7 +694,7 @@ MetadataHub::TagtqStatus MetadataHub::tagtqStatus(TAlbum *album) const { if (!album) return TagtqStatus(MetadataInvalid); - TQMap<TAlbum *, TagtqStatus>::iterator mapIt = d->tags.tqfind(album); + TQMap<TAlbum *, TagtqStatus>::iterator mapIt = d->tags.find(album); if (mapIt == d->tags.end()) return TagtqStatus(MetadataInvalid); return mapIt.data(); diff --git a/digikam/digikam/monthwidget.cpp b/digikam/digikam/monthwidget.cpp index ad49264..99b4b24 100644 --- a/digikam/digikam/monthwidget.cpp +++ b/digikam/digikam/monthwidget.cpp @@ -297,7 +297,7 @@ void MonthWidget::mousePressEvent(TQMouseEvent *e) TQRect r3(d->currw, d->currh*2, d->currw*7, d->currh); // Click on a weekday - if( r3.tqcontains(e->pos())) + if( r3.contains(e->pos())) { int j = (e->pos().x() - d->currw)/d->currw; for (int i=0; i<6; i++) @@ -306,7 +306,7 @@ void MonthWidget::mousePressEvent(TQMouseEvent *e) } } // Click on a week - else if (r1.tqcontains(e->pos())) + else if (r1.contains(e->pos())) { int j = (e->pos().y() - 3*d->currh)/d->currh; for (int i=0; i<7; i++) @@ -315,7 +315,7 @@ void MonthWidget::mousePressEvent(TQMouseEvent *e) } } // Click on a day. - else if (r2.tqcontains(e->pos())) + else if (r2.contains(e->pos())) { int i, j; i = (e->pos().x() - d->currw)/d->currw; diff --git a/digikam/digikam/pixmapmanager.cpp b/digikam/digikam/pixmapmanager.cpp index a6f1609..7968831 100644 --- a/digikam/digikam/pixmapmanager.cpp +++ b/digikam/digikam/pixmapmanager.cpp @@ -123,9 +123,9 @@ void PixmapManager::setThumbnailSize(int size) } } -TQPixmap* PixmapManager::tqfind(const KURL& url) +TQPixmap* PixmapManager::find(const KURL& url) { - TQPixmap* pix = d->cache->tqfind(url.path()); + TQPixmap* pix = d->cache->find(url.path()); if (pix) return pix; @@ -194,16 +194,16 @@ void PixmapManager::slotFailedThumbnail(const KURL& url) AlbumSettings* settings = AlbumSettings::instance(); if (settings) { - if (settings->getImageFileFilter().upper().tqcontains(ext.upper()) || - settings->getRawFileFilter().upper().tqcontains(ext.upper())) + if (settings->getImageFileFilter().upper().contains(ext.upper()) || + settings->getRawFileFilter().upper().contains(ext.upper())) { img = DesktopIcon("image", KIcon::SizeEnormous).convertToImage(); } - else if (settings->getMovieFileFilter().upper().tqcontains(ext.upper())) + else if (settings->getMovieFileFilter().upper().contains(ext.upper())) { img = DesktopIcon("video", KIcon::SizeEnormous).convertToImage(); } - else if (settings->getAudioFileFilter().upper().tqcontains(ext.upper())) + else if (settings->getAudioFileFilter().upper().contains(ext.upper())) { img = DesktopIcon("sound", KIcon::SizeEnormous).convertToImage(); } @@ -241,7 +241,7 @@ void PixmapManager::slotCompleted() if (!item) return; - tqfind(item->imageInfo()->kurl()); + find(item->imageInfo()->kurl()); } int PixmapManager::cacheSize() const diff --git a/digikam/digikam/pixmapmanager.h b/digikam/digikam/pixmapmanager.h index 33c9a9c..d44439b 100644 --- a/digikam/digikam/pixmapmanager.h +++ b/digikam/digikam/pixmapmanager.h @@ -57,7 +57,7 @@ public: PixmapManager(AlbumIconView* view); ~PixmapManager(); - TQPixmap* tqfind(const KURL& path); + TQPixmap* find(const KURL& path); void remove(const KURL& path); void clear(); void setThumbnailSize(int size); diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp index 05aa059..87456d8 100644 --- a/digikam/digikam/scanlib.cpp +++ b/digikam/digikam/scanlib.cpp @@ -280,7 +280,7 @@ void ScanLib::updateItemsWithoutDate() { TQPair<TQString, int> fileID = tqMakePair(fi.fileName(),albumID); - if (m_filesToBeDeleted.tqfindIndex(fileID) == -1) + if (m_filesToBeDeleted.findIndex(fileID) == -1) { m_filesToBeDeleted.append(fileID); } @@ -370,7 +370,7 @@ void ScanLib::allFiles(const TQString& directory) { if ( fi->isFile()) { - if (filesFoundInDB.tqcontains(fi->fileName()) ) + if (filesFoundInDB.contains(fi->fileName()) ) { filesFoundInDB.erase(fi->fileName()); } @@ -393,7 +393,7 @@ void ScanLib::allFiles(const TQString& directory) TQMapIterator<TQString,bool> it; for (it = filesFoundInDB.begin(); it != filesFoundInDB.end(); ++it) { - if (m_filesToBeDeleted.tqfindIndex(tqMakePair(it.key(),albumID)) == -1) + if (m_filesToBeDeleted.findIndex(tqMakePair(it.key(),albumID)) == -1) { m_filesToBeDeleted.append(tqMakePair(it.key(),albumID)); } diff --git a/digikam/digikam/searchadvanceddialog.cpp b/digikam/digikam/searchadvanceddialog.cpp index 38709a7..225f63c 100644 --- a/digikam/digikam/searchadvanceddialog.cpp +++ b/digikam/digikam/searchadvanceddialog.cpp @@ -328,8 +328,8 @@ void SearchAdvancedDialog::slotGroupRules() it != groupsToUnGroupAndGroup.end(); ++it) { SearchAdvancedGroup* group = (SearchAdvancedGroup*)*it; - BaseList::iterator itemsToGroupPos = itemsToGroup.tqfind(group); - BaseList::iterator itPos = d->baseList.tqfind(group); + BaseList::iterator itemsToGroupPos = itemsToGroup.find(group); + BaseList::iterator itPos = d->baseList.find(group); TQValueList<SearchAdvancedRule*> childRules = group->childRules(); for (TQValueList<SearchAdvancedRule*>::iterator iter = childRules.begin(); iter != childRules.end(); ++iter) @@ -351,7 +351,7 @@ void SearchAdvancedDialog::slotGroupRules() SearchAdvancedRule* rule = (SearchAdvancedRule*)(*it); SearchAdvancedGroup* group = new SearchAdvancedGroup(d->rulesBox); - BaseList::iterator itPos = d->baseList.tqfind(rule); + BaseList::iterator itPos = d->baseList.find(rule); d->baseList.insert(itPos, group); for (BaseList::iterator it = itemsToGroup.begin(); @@ -407,7 +407,7 @@ void SearchAdvancedDialog::slotUnGroupRules() SearchAdvancedGroup *group = *it; TQValueList<SearchAdvancedRule*> childRules = group->childRules(); - BaseList::iterator itPos = d->baseList.tqfind(group); + BaseList::iterator itPos = d->baseList.find(group); for (TQValueList<SearchAdvancedRule*>::iterator iter = childRules.begin(); iter != childRules.end(); ++iter) diff --git a/digikam/digikam/searchfolderview.cpp b/digikam/digikam/searchfolderview.cpp index 9d49915..5ba8c41 100644 --- a/digikam/digikam/searchfolderview.cpp +++ b/digikam/digikam/searchfolderview.cpp @@ -152,7 +152,7 @@ void SearchFolderView::slotTextSearchFilterChanged(const TQString& filter) KURL url = salbum->kurl(); TQString type = url.queryItem("type"); - if (salbum->title().lower().tqcontains(search) && + if (salbum->title().lower().contains(search) && type != TQString("datesearch")) { atleastOneMatch = true; @@ -345,7 +345,7 @@ void SearchFolderView::slotAlbumAdded(Album* a) if (type == TQString("datesearch")) return; SearchFolderItem* item = new SearchFolderItem(this, album); - item->setPixmap(0, SmallIcon("tqfind", AlbumSettings::instance()->getDefaultTreeIconSize())); + item->setPixmap(0, SmallIcon("find", AlbumSettings::instance()->getDefaultTreeIconSize())); m_lastAddedItem = item; } @@ -399,8 +399,8 @@ void SearchFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, int { KPopupMenu popmenu(this); popmenu.insertTitle(SmallIcon("digikam"), i18n("My Searches")); - popmenu.insertItem(SmallIcon("filetqfind"), i18n("New Simple Search..."), 10); - popmenu.insertItem(SmallIcon("tqfind"), i18n("New Advanced Search..."), 11); + popmenu.insertItem(SmallIcon("filefind"), i18n("New Simple Search..."), 10); + popmenu.insertItem(SmallIcon("find"), i18n("New Advanced Search..."), 11); switch (popmenu.exec(TQCursor::pos())) { @@ -424,10 +424,10 @@ void SearchFolderView::slotContextMenu(TQListViewItem* item, const TQPoint&, int KPopupMenu popmenu(this); popmenu.insertTitle(SmallIcon("digikam"), i18n("My Searches")); - popmenu.insertItem(SmallIcon("filetqfind"), i18n("Edit Search..."), 10); + popmenu.insertItem(SmallIcon("filefind"), i18n("Edit Search..."), 10); if ( sItem->album()->isSimple() ) - popmenu.insertItem(SmallIcon("tqfind"), i18n("Edit as Advanced Search..."), 11); + popmenu.insertItem(SmallIcon("find"), i18n("Edit as Advanced Search..."), 11); popmenu.insertSeparator(-1); popmenu.insertItem(SmallIcon("editdelete"), i18n("Delete Search"), 12); diff --git a/digikam/digikam/searchquickdialog.cpp b/digikam/digikam/searchquickdialog.cpp index ca37cc5..1775755 100644 --- a/digikam/digikam/searchquickdialog.cpp +++ b/digikam/digikam/searchquickdialog.cpp @@ -125,7 +125,7 @@ SearchQuickDialog::SearchQuickDialog(TQWidget* tqparent, KURL& url) for (int i=1; i<=count; i++) { TQString val = m_url.queryItem(TQString::number(i) + ".val"); - if (!strList.tqcontains(val)) + if (!strList.contains(val)) { strList.append(val); } diff --git a/digikam/digikam/searchresultsview.cpp b/digikam/digikam/searchresultsview.cpp index cbe9326..8d36062 100644 --- a/digikam/digikam/searchresultsview.cpp +++ b/digikam/digikam/searchresultsview.cpp @@ -144,7 +144,7 @@ void SearchResultsView::slotData(KIO::Job*, const TQByteArray &data) { ds >> path; - SearchResultsItem* existingItem = (SearchResultsItem*) d->itemDict.tqfind(path); + SearchResultsItem* existingItem = (SearchResultsItem*) d->itemDict.find(path); if (existingItem) { existingItem->m_marked = true; @@ -196,7 +196,7 @@ void SearchResultsView::slotResult(KIO::Job *job) void SearchResultsView::slotGotThumbnail(const KURL& url, const TQPixmap& pix) { - TQIconViewItem* i = d->itemDict.tqfind(url.path()); + TQIconViewItem* i = d->itemDict.find(url.path()); if (i) i->setPixmap(pix); diff --git a/digikam/digikam/tagfilterview.cpp b/digikam/digikam/tagfilterview.cpp index 7de4c8b..be8a710 100644 --- a/digikam/digikam/tagfilterview.cpp +++ b/digikam/digikam/tagfilterview.cpp @@ -373,7 +373,7 @@ void TagFilterView::slotTextTagFilterChanged(const TQString& filter) if (talbum->isRoot()) continue; - bool match = talbum->title().lower().tqcontains(search); + bool match = talbum->title().lower().contains(search); bool doesExpand = false; if (!match) { @@ -381,7 +381,7 @@ void TagFilterView::slotTextTagFilterChanged(const TQString& filter) Album* tqparent = talbum->tqparent(); while (tqparent && !tqparent->isRoot()) { - if (tqparent->title().lower().tqcontains(search)) + if (tqparent->title().lower().contains(search)) { match = true; break; @@ -397,7 +397,7 @@ void TagFilterView::slotTextTagFilterChanged(const TQString& filter) AlbumIterator it(talbum); while (it.current()) { - if ((*it)->title().lower().tqcontains(search)) + if ((*it)->title().lower().contains(search)) { match = true; doesExpand = true; @@ -1333,7 +1333,7 @@ void TagFilterView::slotRefresh(const TQMap<int, int>& tagsStatMap) if (item->album()) { int id = item->id(); - TQMap<int, int>::const_iterator it2 = tagsStatMap.tqfind(id); + TQMap<int, int>::const_iterator it2 = tagsStatMap.find(id); if ( it2 != tagsStatMap.end() ) item->setCount(it2.data()); } @@ -1381,7 +1381,7 @@ void TagFilterView::loadViewState() continue; // Start the album root always open - if(openFolders.tqcontains(item->id()) || item->id() == 0) + if(openFolders.contains(item->id()) || item->id() == 0) setOpen(item, true); else setOpen(item, false); diff --git a/digikam/digikam/tagfolderview.cpp b/digikam/digikam/tagfolderview.cpp index 9f8717e..5ed6599 100644 --- a/digikam/digikam/tagfolderview.cpp +++ b/digikam/digikam/tagfolderview.cpp @@ -263,7 +263,7 @@ void TagFolderView::slotTextTagFilterChanged(const TQString& filter) if (talbum->isRoot()) continue; - bool match = talbum->title().lower().tqcontains(search); + bool match = talbum->title().lower().contains(search); bool doesExpand = false; if (!match) { @@ -271,7 +271,7 @@ void TagFolderView::slotTextTagFilterChanged(const TQString& filter) Album* tqparent = talbum->tqparent(); while (tqparent && !tqparent->isRoot()) { - if (tqparent->title().lower().tqcontains(search)) + if (tqparent->title().lower().contains(search)) { match = true; break; @@ -287,7 +287,7 @@ void TagFolderView::slotTextTagFilterChanged(const TQString& filter) AlbumIterator it(talbum); while (it.current()) { - if ((*it)->title().lower().tqcontains(search)) + if ((*it)->title().lower().contains(search)) { match = true; doesExpand = true; @@ -1027,7 +1027,7 @@ void TagFolderView::slotRefresh(const TQMap<int, int>& tagsStatMap) if (item->album()) { int id = item->id(); - TQMap<int, int>::const_iterator it2 = tagsStatMap.tqfind(id); + TQMap<int, int>::const_iterator it2 = tagsStatMap.find(id); if ( it2 != tagsStatMap.end() ) item->setCount(it2.data()); } diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp index dd52c7c..bb1aa6e 100644 --- a/digikam/digikam/tagspopupmenu.cpp +++ b/digikam/digikam/tagspopupmenu.cpp @@ -184,7 +184,7 @@ TQPopupMenu* TagsPopupMenu::buildSubMenu(int tagid) popup->insertSeparator(); TQPixmap pix = SyncJob::getTagThumbnail(album); - if ((d->mode == ASSIGN) && (d->assignedTags.tqcontains(album->id()))) + if ((d->mode == ASSIGN) && (d->assignedTags.contains(album->id()))) { popup->insertItem(new TagsPopupCheckedMenuItem(popup, album->title(), pix), d->addToID + album->id()); @@ -309,7 +309,7 @@ void TagsPopupMenu::iterateAndBuildMenu(TQPopupMenu *menu, TAlbum *album) TQPixmap pix = SyncJob::getTagThumbnail((TAlbum*)a); TQString t = a->title(); - t.tqreplace('&',"&&"); + t.replace('&',"&&"); if (a->firstChild()) { @@ -317,7 +317,7 @@ void TagsPopupMenu::iterateAndBuildMenu(TQPopupMenu *menu, TAlbum *album) } else { - if ((d->mode == ASSIGN) && (d->assignedTags.tqcontains(a->id()))) + if ((d->mode == ASSIGN) && (d->assignedTags.contains(a->id()))) { menu->insertItem(new TagsPopupCheckedMenuItem(this, a->title(), pix), d->addToID + a->id()); diff --git a/digikam/digikam/timelinefolderview.cpp b/digikam/digikam/timelinefolderview.cpp index a5bf7cc..e1ffca4 100644 --- a/digikam/digikam/timelinefolderview.cpp +++ b/digikam/digikam/timelinefolderview.cpp @@ -143,7 +143,7 @@ void TimeLineFolderView::slotTextSearchFilterChanged(const TQString& filter) KURL url = salbum->kurl(); TQString type = url.queryItem("type"); - if (salbum->title().lower().tqcontains(search) && + if (salbum->title().lower().contains(search) && type == TQString("datesearch") && salbum->title() != currentTimeLineSearchName()) { @@ -205,7 +205,7 @@ void TimeLineFolderView::slotAlbumAdded(Album* a) if (name == currentTimeLineSearchName()) return; TimeLineFolderItem* item = new TimeLineFolderItem(this, salbum); - item->setPixmap(0, SmallIcon("tqfind", AlbumSettings::instance()->getDefaultTreeIconSize())); + item->setPixmap(0, SmallIcon("find", AlbumSettings::instance()->getDefaultTreeIconSize())); } void TimeLineFolderView::slotAlbumDeleted(Album* a) diff --git a/digikam/digikam/timelineview.cpp b/digikam/digikam/timelineview.cpp index bdc0180..cfc379d 100644 --- a/digikam/digikam/timelineview.cpp +++ b/digikam/digikam/timelineview.cpp @@ -527,14 +527,14 @@ void TimeLineView::slotAlbumSelected(SAlbum* salbum) for (int i = 1 ; i <= count ; i+=2) { key = TQString("%1.val").tqarg(TQString::number(i)); - it2 = queries.tqfind(key); + it2 = queries.find(key); if (it2 != queries.end()) start = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate)); //DDebug() << key << " :: " << it2.data() << endl; key = TQString("%1.val").tqarg(TQString::number(i+1)); - it2 = queries.tqfind(key); + it2 = queries.find(key); if (it2 != queries.end()) end = TQDateTime(TQDate::fromString(it2.data(), Qt::ISODate)); diff --git a/digikam/digikam/timelinewidget.cpp b/digikam/digikam/timelinewidget.cpp index 5b6eb36..2a0e7b9 100644 --- a/digikam/digikam/timelinewidget.cpp +++ b/digikam/digikam/timelinewidget.cpp @@ -517,7 +517,7 @@ void TimeLineWidget::slotDatesMap(const TQMap<TQDateTime, int>& datesStatMap) // Stats Years values. - it_iP = d->yearStatMap.tqfind(year); + it_iP = d->yearStatMap.find(year); if ( it_iP == d->yearStatMap.end() ) { count = it.data(); @@ -526,7 +526,7 @@ void TimeLineWidget::slotDatesMap(const TQMap<TQDateTime, int>& datesStatMap) else { count = it_iP.data().first + it.data(); - d->yearStatMap.tqreplace( year, TimeLineWidgetPriv::StatPair(count, it_iP.data().second) ); + d->yearStatMap.replace( year, TimeLineWidgetPriv::StatPair(count, it_iP.data().second) ); } if (d->maxCountByYear < count) @@ -534,7 +534,7 @@ void TimeLineWidget::slotDatesMap(const TQMap<TQDateTime, int>& datesStatMap) // Stats Months values. - it_YP = d->monthStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, month)); + it_YP = d->monthStatMap.find(TimeLineWidgetPriv::YearRefPair(year, month)); if ( it_YP == d->monthStatMap.end() ) { count = it.data(); @@ -544,7 +544,7 @@ void TimeLineWidget::slotDatesMap(const TQMap<TQDateTime, int>& datesStatMap) else { count = it_YP.data().first + it.data(); - d->monthStatMap.tqreplace( TimeLineWidgetPriv::YearRefPair(year, month), + d->monthStatMap.replace( TimeLineWidgetPriv::YearRefPair(year, month), TimeLineWidgetPriv::StatPair(count, it_YP.data().second) ); } @@ -553,7 +553,7 @@ void TimeLineWidget::slotDatesMap(const TQMap<TQDateTime, int>& datesStatMap) // Stats Weeks values. - it_YP = d->weekStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); + it_YP = d->weekStatMap.find(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); if ( it_YP == d->weekStatMap.end() ) { count = it.data(); @@ -563,7 +563,7 @@ void TimeLineWidget::slotDatesMap(const TQMap<TQDateTime, int>& datesStatMap) else { count = it_YP.data().first + it.data(); - d->weekStatMap.tqreplace( TimeLineWidgetPriv::YearRefPair(yearForWeek, week), + d->weekStatMap.replace( TimeLineWidgetPriv::YearRefPair(yearForWeek, week), TimeLineWidgetPriv::StatPair(count, it_YP.data().second) ); } @@ -572,7 +572,7 @@ void TimeLineWidget::slotDatesMap(const TQMap<TQDateTime, int>& datesStatMap) // Stats Days values. - it_YP = d->dayStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, day)); + it_YP = d->dayStatMap.find(TimeLineWidgetPriv::YearRefPair(year, day)); if ( it_YP == d->dayStatMap.end() ) { count = it.data(); @@ -582,7 +582,7 @@ void TimeLineWidget::slotDatesMap(const TQMap<TQDateTime, int>& datesStatMap) else { count = it_YP.data().first + it.data(); - d->dayStatMap.tqreplace( TimeLineWidgetPriv::YearRefPair(year, day), + d->dayStatMap.replace( TimeLineWidgetPriv::YearRefPair(year, day), TimeLineWidgetPriv::StatPair(count, it_YP.data().second) ); } @@ -1127,7 +1127,7 @@ int TimeLineWidget::statForDateTime(const TQDateTime& dt, SelectionMode& selecte case Day: { TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it = - d->dayStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, day)); + d->dayStatMap.find(TimeLineWidgetPriv::YearRefPair(year, day)); if ( it != d->dayStatMap.end() ) { count = it.data().first; @@ -1138,7 +1138,7 @@ int TimeLineWidget::statForDateTime(const TQDateTime& dt, SelectionMode& selecte case Week: { TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it = - d->weekStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); + d->weekStatMap.find(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); if ( it != d->weekStatMap.end() ) { count = it.data().first; @@ -1149,7 +1149,7 @@ int TimeLineWidget::statForDateTime(const TQDateTime& dt, SelectionMode& selecte case Month: { TQMap<TimeLineWidgetPriv::YearRefPair, TimeLineWidgetPriv::StatPair>::iterator it = - d->monthStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, month)); + d->monthStatMap.find(TimeLineWidgetPriv::YearRefPair(year, month)); if ( it != d->monthStatMap.end() ) { count = it.data().first; @@ -1159,7 +1159,7 @@ int TimeLineWidget::statForDateTime(const TQDateTime& dt, SelectionMode& selecte } case Year: { - TQMap<int, TimeLineWidgetPriv::StatPair>::iterator it = d->yearStatMap.tqfind(year); + TQMap<int, TimeLineWidgetPriv::StatPair>::iterator it = d->yearStatMap.find(year); if ( it != d->yearStatMap.end() ) { count = it.data().first; @@ -1231,7 +1231,7 @@ void TimeLineWidget::updateWeekSelection(const TQDateTime dts, const TQDateTime dtsWeek = firstDayOfWeek(yearForWeek, week); dteWeek = dtsWeek.addDays(7); - it = d->weekStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); + it = d->weekStatMap.find(TimeLineWidgetPriv::YearRefPair(yearForWeek, week)); if ( it != d->weekStatMap.end() ) it.data().second = checkSelectionForDaysRange(dtsWeek, dteWeek); @@ -1253,7 +1253,7 @@ void TimeLineWidget::updateMonthSelection(const TQDateTime dts, const TQDateTime dtsMonth = TQDateTime(TQDate(year, month, 1)); dteMonth = dtsMonth.addDays(d->calendar->daysInMonth(dtsMonth.date())); - it = d->monthStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, month)); + it = d->monthStatMap.find(TimeLineWidgetPriv::YearRefPair(year, month)); if ( it != d->monthStatMap.end() ) it.data().second = checkSelectionForDaysRange(dtsMonth, dteMonth); @@ -1274,7 +1274,7 @@ void TimeLineWidget::updateYearSelection(const TQDateTime dts, const TQDateTime dtsYear = TQDateTime(TQDate(year, 1, 1)); dteYear = dtsYear.addDays(d->calendar->daysInYear(dtsYear.date())); - it = d->yearStatMap.tqfind(year); + it = d->yearStatMap.find(year); if ( it != d->yearStatMap.end() ) it.data().second = checkSelectionForDaysRange(dtsYear, dteYear); @@ -1314,7 +1314,7 @@ void TimeLineWidget::setDaysRangeSelection(const TQDateTime dts, const TQDateTim { year = dt.date().year(); day = d->calendar->dayOfYear(dt.date()); - it = d->dayStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, day)); + it = d->dayStatMap.find(TimeLineWidgetPriv::YearRefPair(year, day)); if ( it != d->dayStatMap.end() ) it.data().second = selected; @@ -1337,7 +1337,7 @@ TimeLineWidget::SelectionMode TimeLineWidget::checkSelectionForDaysRange(const T year = dt.date().year(); day = d->calendar->dayOfYear(dt.date()); - it = d->dayStatMap.tqfind(TimeLineWidgetPriv::YearRefPair(year, day)); + it = d->dayStatMap.find(TimeLineWidgetPriv::YearRefPair(year, day)); if ( it != d->dayStatMap.end() ) { items++; @@ -1626,10 +1626,10 @@ TQDateTime TimeLineWidget::dateTimeForPoint(const TQPoint& pt, bool &isOnSelecti selRect.setBottom(height()); selRect.setRight(d->startPos + (i+1)*d->barWidth); - if (selRect.tqcontains(pt)) + if (selRect.contains(pt)) isOnSelectionArea = true; - if (barRect.tqcontains(pt) || selRect.tqcontains(pt)) + if (barRect.contains(pt) || selRect.contains(pt)) { if (i >= d->nbItems) { @@ -1661,10 +1661,10 @@ TQDateTime TimeLineWidget::dateTimeForPoint(const TQPoint& pt, bool &isOnSelecti selRect.setBottom(height()); selRect.setRight(d->startPos - i*d->barWidth); - if (selRect.tqcontains(pt)) + if (selRect.contains(pt)) isOnSelectionArea = true; - if (barRect.tqcontains(pt) || selRect.tqcontains(pt)) + if (barRect.contains(pt) || selRect.contains(pt)) { if (i >= d->nbItems-1) { diff --git a/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp b/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp index 1101ae3..d11565c 100644 --- a/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp +++ b/digikam/digikam/upgradedb_sqlite2tosqlite3.cpp @@ -65,7 +65,7 @@ struct _Tag static TQString escapeString(TQString str) { - str.tqreplace( "'", "''" ); + str.replace( "'", "''" ); return str; } @@ -314,7 +314,7 @@ bool upgradeDB_Sqlite2ToSqlite3(const TQString& _libraryPath) TQString url = fi.dirPath(true); TQString name = fi.fileName(); - AlbumMap::iterator it1 = albumMap.tqfind(url); + AlbumMap::iterator it1 = albumMap.find(url); if (it1 == albumMap.end()) { DDebug() << "Could not find album with url: " << url << endl; diff --git a/digikam/imageplugins/border/border.cpp b/digikam/imageplugins/border/border.cpp index df5f90e..4049b57 100644 --- a/digikam/imageplugins/border/border.cpp +++ b/digikam/imageplugins/border/border.cpp @@ -228,7 +228,7 @@ void Border::bevel(Digikam::DImg &src, Digikam::DImg &dest, const Digikam::DColo { for(int y=0 ; y < height ; y++) { - if (btRegion.tqcontains(TQPoint(x, y))) + if (btRegion.contains(TQPoint(x, y))) dest.setPixelColor(x, y, btmColor); } } diff --git a/digikam/imageplugins/coreplugin/bwsepiatool.cpp b/digikam/imageplugins/coreplugin/bwsepiatool.cpp index b2d3d56..7d4b67a 100644 --- a/digikam/imageplugins/coreplugin/bwsepiatool.cpp +++ b/digikam/imageplugins/coreplugin/bwsepiatool.cpp @@ -112,7 +112,7 @@ PreviewPixmapFactory::PreviewPixmapFactory(BWSepiaTool* bwSepia) const TQPixmap* PreviewPixmapFactory::pixmap(int id) { - if (m_previewPixmapMap.tqfind(id) == 0) + if (m_previewPixmapMap.find(id) == 0) { TQPixmap pix = makePixmap(id); m_previewPixmapMap.insert(id, new TQPixmap(pix)); diff --git a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp index b5a79d0..0b4c4f8 100644 --- a/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp +++ b/digikam/imageplugins/coreplugin/imageeffect_bwsepia.cpp @@ -105,7 +105,7 @@ PreviewPixmapFactory::PreviewPixmapFactory(ImageEffect_BWSepia* bwSepia) const TQPixmap* PreviewPixmapFactory::pixmap(int id) { - if (m_previewPixmapMap.tqfind(id) == 0) + if (m_previewPixmapMap.find(id) == 0) { TQPixmap pix = makePixmap(id); m_previewPixmapMap.insert(id, new TQPixmap(pix)); diff --git a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp index fea8a1f..6a9d95e 100644 --- a/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp +++ b/digikam/imageplugins/coreplugin/ratiocrop/imageselectionwidget.cpp @@ -733,7 +733,7 @@ void ImageSelectionWidget::updatePixmap() { for (int x=d->rect.left() ; x <= d->rect.right() ; x++) { - if (! d->localRegionSelection.tqcontains(x, y, true) ) + if (! d->localRegionSelection.contains(x, y, true) ) { b = ptr[0]; g = ptr[1]; @@ -1280,20 +1280,20 @@ void ImageSelectionWidget::mousePressEvent ( TQMouseEvent * e ) } else { - if ( d->localTopLeftCorner.tqcontains( pm ) ) + if ( d->localTopLeftCorner.contains( pm ) ) d->currentResizing = ImageSelectionWidgetPriv::ResizingTopLeft; - else if ( d->localTopRightCorner.tqcontains( pm ) ) + else if ( d->localTopRightCorner.contains( pm ) ) d->currentResizing = ImageSelectionWidgetPriv::ResizingTopRight; - else if ( d->localBottomLeftCorner.tqcontains( pm ) ) + else if ( d->localBottomLeftCorner.contains( pm ) ) d->currentResizing = ImageSelectionWidgetPriv::ResizingBottomLeft; - else if ( d->localBottomRightCorner.tqcontains( pm ) ) + else if ( d->localBottomRightCorner.contains( pm ) ) d->currentResizing = ImageSelectionWidgetPriv::ResizingBottomRight; else { d->lastPos = pmVirtual; setCursor( KCursor::sizeAllCursor() ); - if (d->regionSelection.tqcontains( pmVirtual ) ) + if (d->regionSelection.contains( pmVirtual ) ) { d->moving = true; } @@ -1317,7 +1317,7 @@ void ImageSelectionWidget::mouseReleaseEvent ( TQMouseEvent * ) regionSelectionChanged(); d->currentResizing = ImageSelectionWidgetPriv::ResizingNone; } - else if ( d->regionSelection.tqcontains( d->lastPos ) ) + else if ( d->regionSelection.contains( d->lastPos ) ) { setCursor( KCursor::handCursor() ); regionSelectionMoved(); @@ -1406,13 +1406,13 @@ void ImageSelectionWidget::mouseMoveEvent ( TQMouseEvent * e ) } else { - if ( d->localTopLeftCorner.tqcontains( e->x(), e->y() ) || - d->localBottomRightCorner.tqcontains( e->x(), e->y() ) ) + if ( d->localTopLeftCorner.contains( e->x(), e->y() ) || + d->localBottomRightCorner.contains( e->x(), e->y() ) ) setCursor( KCursor::sizeFDiagCursor() ); - else if ( d->localTopRightCorner.tqcontains( e->x(), e->y() ) || - d->localBottomLeftCorner.tqcontains( e->x(), e->y() ) ) + else if ( d->localTopRightCorner.contains( e->x(), e->y() ) || + d->localBottomLeftCorner.contains( e->x(), e->y() ) ) setCursor( KCursor::sizeBDiagCursor() ); - else if ( d->localRegionSelection.tqcontains( e->x(), e->y() ) ) + else if ( d->localRegionSelection.contains( e->x(), e->y() ) ) setCursor( KCursor::handCursor() ); else setCursor( KCursor::arrowCursor() ); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c index 5c775fd..493aaea 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/open.c @@ -209,7 +209,7 @@ integer f_open(olist *a) #ifdef NON_ANSI_STDIO (void) strcpy(buf,"tmp.FXXXXXX"); (void) mktemp(buf); - goto tqreplace; + goto replace; #else if (!(b->ufd = tmpfile())) opnerr(a->oerr,errno,"open") @@ -236,7 +236,7 @@ integer f_open(olist *a) case 'r': /* Fortran 90 replace option */ case 'R': #ifdef NON_ANSI_STDIO - tqreplace: + replace: #endif if (tf = fopen(buf,f__w_mode[0])) fclose(tf); diff --git a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.h b/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.h index 60d0def..6b2f65c 100644 --- a/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.h +++ b/digikam/imageplugins/coreplugin/sharpnesseditor/matrix.h @@ -37,7 +37,7 @@ namespace DigikamImagesPluginCore * * Centered matrix. This is a square matrix where * the indices range from [-radius, radius]. -* The matrix tqcontains (2 * radius + 1) ** 2 elements. +* The matrix contains (2 * radius + 1) ** 2 elements. * **/ typedef struct diff --git a/digikam/imageplugins/hotpixels/blackframeparser.cpp b/digikam/imageplugins/hotpixels/blackframeparser.cpp index e5cffd3..8f1cfd5 100644 --- a/digikam/imageplugins/hotpixels/blackframeparser.cpp +++ b/digikam/imageplugins/hotpixels/blackframeparser.cpp @@ -183,7 +183,7 @@ void BlackFrameParser::consolidatePixels (TQValueList<HotPixel>& list) tmp = point; TQValueList<HotPixel>::Iterator point_below_it; - point_below_it = list.tqfind (tmp); //find any intersecting hotp below tmp + point_below_it = list.find (tmp); //find any intersecting hotp below tmp if (point_below_it != list.end()) { point_below =* point_below_it; diff --git a/digikam/imageplugins/hotpixels/hotpixelfixer.cpp b/digikam/imageplugins/hotpixels/hotpixelfixer.cpp index 190e094..079aff3 100644 --- a/digikam/imageplugins/hotpixels/hotpixelfixer.cpp +++ b/digikam/imageplugins/hotpixels/hotpixelfixer.cpp @@ -220,7 +220,7 @@ void HotPixelFixer::weightPixels (Digikam::DImg &img, HotPixel &px, int method, //for now I don't think it is finding the duplicates fine, so it uses //the previous one always... - //if (mWeightList.tqfind(w)==mWeightList.end()) + //if (mWeightList.find(w)==mWeightList.end()) //{ w.calculateWeights(); diff --git a/digikam/imageplugins/hotpixels/hotpixelstool.cpp b/digikam/imageplugins/hotpixels/hotpixelstool.cpp index 43d30d7..d09244a 100644 --- a/digikam/imageplugins/hotpixels/hotpixelstool.cpp +++ b/digikam/imageplugins/hotpixels/hotpixelstool.cpp @@ -223,7 +223,7 @@ void HotPixelsTool::prepareEffect() { HotPixel hp = (*it); - if ( area.tqcontains( hp.rect ) ) + if ( area.contains( hp.rect ) ) { hp.rect.moveTopLeft(TQPoint( hp.rect.x()-area.x(), hp.rect.y()-area.y() )); hotPixelsRegion.append(hp); diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp index 85b1584..5b7d04f 100644 --- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp +++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp @@ -223,7 +223,7 @@ void ImageEffect_HotPixels::prepareEffect() { HotPixel hp = (*it); - if ( area.tqcontains( hp.rect ) ) + if ( area.contains( hp.rect ) ) { hp.rect.moveTopLeft(TQPoint( hp.rect.x()-area.x(), hp.rect.y()-area.y() )); hotPixelsRegion.append(hp); diff --git a/digikam/imageplugins/inserttext/fontchooserwidget.cpp b/digikam/imageplugins/inserttext/fontchooserwidget.cpp index 8d0ec12..2aaddce 100644 --- a/digikam/imageplugins/inserttext/fontchooserwidget.cpp +++ b/digikam/imageplugins/inserttext/fontchooserwidget.cpp @@ -471,12 +471,12 @@ void FontChooserWidget::family_chosen_slot(const TQString& family) for ( TQStringList::Iterator it = styles.begin(); it != end; ++it ) { TQString style = *it; - int pos = style.tqfind("Plain"); - if(pos >=0) style = style.tqreplace(pos,5,i18n("Regular")); - pos = style.tqfind("Normal"); - if(pos >=0) style = style.tqreplace(pos,6,i18n("Regular")); - pos = style.tqfind("Oblique"); - if(pos >=0) style = style.tqreplace(pos,7,i18n("Italic")); + int pos = style.find("Plain"); + if(pos >=0) style = style.replace(pos,5,i18n("Regular")); + pos = style.find("Normal"); + if(pos >=0) style = style.replace(pos,6,i18n("Regular")); + pos = style.find("Oblique"); + if(pos >=0) style = style.replace(pos,7,i18n("Italic")); if(!styleListBox->findItem(style)) { styleListBox->insertItem(i18n(style.utf8())); @@ -592,9 +592,9 @@ void FontChooserWidget::setupDisplay() // 1st Fallback if ( (i == numEntries) ) { - if (family.tqcontains('[')) + if (family.contains('[')) { - family = family.left(family.tqfind('[')).stripWhiteSpace(); + family = family.left(family.find('[')).stripWhiteSpace(); for (i = 0; i < numEntries; i++) { if (family == familyListBox->text(i).lower()) @@ -699,10 +699,10 @@ void FontChooserWidget::addFont( TQStringList &list, const char *xfont ) TQString font = TQString::tqfromLatin1(ptr + 1); int pos; - if ( ( pos = font.tqfind( '-' ) ) > 0 ) { + if ( ( pos = font.find( '-' ) ) > 0 ) { font.truncate( pos ); - if ( font.tqfind( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) + if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) return; TQStringList::Iterator it = list.begin(); diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp index 93b5cb9..67dc98b 100644 --- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp +++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp @@ -247,7 +247,7 @@ void ImageEffect_InsertText::readUserSettings() m_transparentText->setChecked( config->readBoolEntry("Transparent Text", false) ); m_previewWidget->setPositionHint( config->readRectEntry("Position Hint") ); - static_cast<TQPushButton*>(m_alignButtonGroup->tqfind(m_alignTextMode))->setOn(true); + static_cast<TQPushButton*>(m_alignButtonGroup->find(m_alignTextMode))->setOn(true); slotAlignModeChanged(m_alignTextMode); } @@ -283,7 +283,7 @@ void ImageEffect_InsertText::resetValues() m_borderText->setChecked( false ); m_transparentText->setChecked( false ); m_previewWidget->resetEdit(); - static_cast<TQPushButton*>(m_alignButtonGroup->tqfind(ALIGN_LEFT))->setOn(true); + static_cast<TQPushButton*>(m_alignButtonGroup->find(ALIGN_LEFT))->setOn(true); m_fontChooserWidget->blockSignals(false); m_fontColorButton->blockSignals(false); diff --git a/digikam/imageplugins/inserttext/inserttexttool.cpp b/digikam/imageplugins/inserttext/inserttexttool.cpp index ae6b26b..220d747 100644 --- a/digikam/imageplugins/inserttext/inserttexttool.cpp +++ b/digikam/imageplugins/inserttext/inserttexttool.cpp @@ -237,7 +237,7 @@ void InsertTextTool::readSettings() m_transparentText->setChecked(config->readBoolEntry("Transparent Text", false)); m_previewWidget->setPositionHint(config->readRectEntry("Position Hint")); - static_cast<TQPushButton*>(m_alignButtonGroup->tqfind(m_alignTextMode))->setOn(true); + static_cast<TQPushButton*>(m_alignButtonGroup->find(m_alignTextMode))->setOn(true); slotAlignModeChanged(m_alignTextMode); } @@ -273,7 +273,7 @@ void InsertTextTool::slotResetSettings() m_borderText->setChecked(false); m_transparentText->setChecked(false); m_previewWidget->resetEdit(); - static_cast<TQPushButton*> (m_alignButtonGroup->tqfind(ALIGN_LEFT))->setOn(true); + static_cast<TQPushButton*> (m_alignButtonGroup->find(ALIGN_LEFT))->setOn(true); m_fontChooserWidget->blockSignals(false); m_fontColorButton->blockSignals(false); diff --git a/digikam/imageplugins/inserttext/inserttextwidget.cpp b/digikam/imageplugins/inserttext/inserttextwidget.cpp index 596470a..24fd8ec 100644 --- a/digikam/imageplugins/inserttext/inserttextwidget.cpp +++ b/digikam/imageplugins/inserttext/inserttextwidget.cpp @@ -126,7 +126,7 @@ void InsertTextWidget::setText(TQString text, TQFont font, TQColor color, int al /* if ( m_textFont.pointSize() != font.pointSize() && - !rect().tqcontains( m_textRect.x(), m_textRect.y() ) ) + !rect().contains( m_textRect.x(), m_textRect.y() ) ) { m_textFont = font; resetEdit(); @@ -575,7 +575,7 @@ void InsertTextWidget::resizeEvent(TQResizeEvent * e) void InsertTextWidget::mousePressEvent ( TQMouseEvent * e ) { if ( e->button() == Qt::LeftButton && - m_textRect.tqcontains( e->x(), e->y() ) ) + m_textRect.contains( e->x(), e->y() ) ) { m_xpos = e->x(); m_ypos = e->y(); @@ -592,7 +592,7 @@ void InsertTextWidget::mouseReleaseEvent ( TQMouseEvent * ) void InsertTextWidget::mouseMoveEvent ( TQMouseEvent * e ) { - if ( rect().tqcontains( e->x(), e->y() ) ) + if ( rect().contains( e->x(), e->y() ) ) { if ( e->state() == Qt::LeftButton && m_currentMoving ) { @@ -608,7 +608,7 @@ void InsertTextWidget::mouseMoveEvent ( TQMouseEvent * e ) m_ypos = newypos; setCursor( KCursor::handCursor() ); } - else if ( m_textRect.tqcontains( e->x(), e->y() ) ) + else if ( m_textRect.contains( e->x(), e->y() ) ) { setCursor ( KCursor::sizeAllCursor() ); } diff --git a/digikam/imageplugins/noisereduction/noisereduction.cpp b/digikam/imageplugins/noisereduction/noisereduction.cpp index c981422..3dc2a36 100644 --- a/digikam/imageplugins/noisereduction/noisereduction.cpp +++ b/digikam/imageplugins/noisereduction/noisereduction.cpp @@ -161,7 +161,7 @@ void NoiseReduction::filterImage(void) postProgress( progress ); } - // merge the source and destination (which currently tqcontains + // merge the source and destination (which currently contains // the blurred version) images for (row = 0 ; !m_cancel && (row < height) ; row++) diff --git a/digikam/imageplugins/perspective/perspectivewidget.cpp b/digikam/imageplugins/perspective/perspectivewidget.cpp index 07491e7..1aceb42 100644 --- a/digikam/imageplugins/perspective/perspectivewidget.cpp +++ b/digikam/imageplugins/perspective/perspectivewidget.cpp @@ -676,15 +676,15 @@ void PerspectiveWidget::resizeEvent(TQResizeEvent * e) void PerspectiveWidget::mousePressEvent ( TQMouseEvent * e ) { if ( e->button() == Qt::LeftButton && - m_rect.tqcontains( e->x(), e->y() )) + m_rect.contains( e->x(), e->y() )) { - if ( m_topLeftCorner.tqcontains( e->x(), e->y() ) ) + if ( m_topLeftCorner.contains( e->x(), e->y() ) ) m_currentResizing = ResizingTopLeft; - else if ( m_bottomRightCorner.tqcontains( e->x(), e->y() ) ) + else if ( m_bottomRightCorner.contains( e->x(), e->y() ) ) m_currentResizing = ResizingBottomRight; - else if ( m_topRightCorner.tqcontains( e->x(), e->y() ) ) + else if ( m_topRightCorner.contains( e->x(), e->y() ) ) m_currentResizing = ResizingTopRight; - else if ( m_bottomLeftCorner.tqcontains( e->x(), e->y() ) ) + else if ( m_bottomLeftCorner.contains( e->x(), e->y() ) ) m_currentResizing = ResizingBottomLeft; else { @@ -726,7 +726,7 @@ void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e ) TQPointArray unsablePoints; TQPoint pm(e->x(), e->y()); - if (!m_rect.tqcontains( pm )) + if (!m_rect.contains( pm )) { if (pm.x() > m_rect.right()) pm.setX(m_rect.right()); @@ -751,7 +751,7 @@ void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e ) m_w-1, 0 ); TQRegion unsableArea(unsablePoints); - if ( unsableArea.tqcontains(pm) ) return; + if ( unsableArea.contains(pm) ) return; m_topLeftPoint = pm - m_rect.topLeft(); setCursor( KCursor::sizeFDiagCursor() ); @@ -769,7 +769,7 @@ void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e ) m_w-1, m_h-1); TQRegion unsableArea(unsablePoints); - if ( unsableArea.tqcontains(pm) ) return; + if ( unsableArea.contains(pm) ) return; m_topRightPoint = pm - m_rect.topLeft(); setCursor( KCursor::sizeBDiagCursor() ); @@ -787,7 +787,7 @@ void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e ) 0, 0); TQRegion unsableArea(unsablePoints); - if ( unsableArea.tqcontains(pm) ) return; + if ( unsableArea.contains(pm) ) return; m_bottomLeftPoint = pm - m_rect.topLeft(); setCursor( KCursor::sizeBDiagCursor() ); @@ -805,7 +805,7 @@ void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e ) 0, m_w-1); TQRegion unsableArea(unsablePoints); - if ( unsableArea.tqcontains(pm) ) return; + if ( unsableArea.contains(pm) ) return; m_bottomRightPoint = pm - m_rect.topLeft(); setCursor( KCursor::sizeFDiagCursor() ); @@ -823,12 +823,12 @@ void PerspectiveWidget::mouseMoveEvent ( TQMouseEvent * e ) } else { - if ( m_topLeftCorner.tqcontains( e->x(), e->y() ) || - m_bottomRightCorner.tqcontains( e->x(), e->y() ) ) + if ( m_topLeftCorner.contains( e->x(), e->y() ) || + m_bottomRightCorner.contains( e->x(), e->y() ) ) setCursor( KCursor::sizeFDiagCursor() ); - else if ( m_topRightCorner.tqcontains( e->x(), e->y() ) || - m_bottomLeftCorner.tqcontains( e->x(), e->y() ) ) + else if ( m_topRightCorner.contains( e->x(), e->y() ) || + m_bottomLeftCorner.contains( e->x(), e->y() ) ) setCursor( KCursor::sizeBDiagCursor() ); else unsetCursor(); diff --git a/digikam/imageplugins/superimpose/superimposewidget.cpp b/digikam/imageplugins/superimpose/superimposewidget.cpp index aa0e50e..2c30b87 100644 --- a/digikam/imageplugins/superimpose/superimposewidget.cpp +++ b/digikam/imageplugins/superimpose/superimposewidget.cpp @@ -214,7 +214,7 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor) // check that selection is still inside original image TQRect orgImageRect(0, 0, m_w, m_h); - if (!orgImageRect.tqcontains(selection)) + if (!orgImageRect.contains(selection)) { // try to adjust if (selection.left() < 0) @@ -227,7 +227,7 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor) selection.moveRight(m_w); // was it successful? - if (selection.tqcontains(orgImageRect)) + if (selection.contains(orgImageRect)) return false; } @@ -244,7 +244,7 @@ bool SuperImposeWidget::zoomSelection(float deltaZoomFactor) void SuperImposeWidget::mousePressEvent ( TQMouseEvent * e ) { if ( isEnabled() && e->button() == Qt::LeftButton && - rect().tqcontains( e->x(), e->y() ) ) + rect().contains( e->x(), e->y() ) ) { switch (m_editMode) { @@ -305,7 +305,7 @@ void SuperImposeWidget::mouseMoveEvent ( TQMouseEvent * e ) break; } } - else if (rect().tqcontains( e->x(), e->y() )) + else if (rect().contains( e->x(), e->y() )) { setEditModeCursor(); } diff --git a/digikam/kioslave/digikamalbums.cpp b/digikam/kioslave/digikamalbums.cpp index 4afe89e..21024e3 100644 --- a/digikam/kioslave/digikamalbums.cpp +++ b/digikam/kioslave/digikamalbums.cpp @@ -103,8 +103,8 @@ static TQValueList<TQRegExp> makeFilterList( const TQString &filter ) return regExps; TQChar sep( ';' ); - int i = filter.tqfind( sep, 0 ); - if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + int i = filter.find( sep, 0 ); + if ( i == -1 && filter.find( ' ', 0 ) != -1 ) sep = TQChar( ' ' ); TQStringList list = TQStringList::split( sep, filter ); @@ -200,11 +200,11 @@ void kio_digikamalbums::special(const TQByteArray& data) if ( matchFilterList( regex, *it ) ) { - TQMap<int, int>::iterator it2 = albumsStatMap.tqfind(albumID); + TQMap<int, int>::iterator it2 = albumsStatMap.find(albumID); if ( it2 == albumsStatMap.end() ) albumsStatMap.insert(albumID, 1); else - albumsStatMap.tqreplace(albumID, it2.data() + 1); + albumsStatMap.replace(albumID, it2.data() + 1); } ++it; @@ -292,7 +292,7 @@ void kio_digikamalbums::special(const TQByteArray& data) #endif TQString ext = fileInfo.extension(false).upper(); - if (!ext.isEmpty() && rawFilesExt.upper().tqcontains(ext)) + if (!ext.isEmpty() && rawFilesExt.upper().contains(ext)) { Digikam::DMetadata metaData(base + name); dims = metaData.getImageDimensions(); @@ -1442,7 +1442,7 @@ void kio_digikamalbums::renameAlbum(const TQString& oldURL, const TQString& newU for (TQStringList::iterator it = values.begin(); it != values.end(); ++it) { newChildURL = *it; - newChildURL.tqreplace(oldURL, newURL); + newChildURL.replace(oldURL, newURL); m_sqlDB.execSql(TQString("UPDATE Albums SET url='%1' WHERE url='%2'") .tqarg(escapeString(newChildURL), escapeString(*it))); @@ -1844,7 +1844,7 @@ void kio_digikamalbums::scanOneAlbum(const TQString& url) TQString u = TQDir::cleanDirPath(url + '/' + fi->fileName()); - if (currAlbumList.tqcontains(u)) + if (currAlbumList.contains(u)) { continue; } @@ -1902,7 +1902,7 @@ void kio_digikamalbums::scanOneAlbum(const TQString& url) continue; } - if (currItemList.tqcontains(fi->fileName())) + if (currItemList.contains(fi->fileName())) { currItemList.remove(fi->fileName()); continue; diff --git a/digikam/kioslave/digikamdates.cpp b/digikam/kioslave/digikamdates.cpp index 67b1bdc..876051f 100644 --- a/digikam/kioslave/digikamdates.cpp +++ b/digikam/kioslave/digikamdates.cpp @@ -77,8 +77,8 @@ static TQValueList<TQRegExp> makeFilterList( const TQString &filter ) return regExps; TQChar sep( ';' ); - int i = filter.tqfind( sep, 0 ); - if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + int i = filter.find( sep, 0 ); + if ( i == -1 && filter.find( ' ', 0 ) != -1 ) sep = TQChar( ' ' ); TQStringList list = TQStringList::split( sep, filter ); @@ -158,14 +158,14 @@ void kio_digikamdates::special(const TQByteArray& data) if ( !dateTime.isValid() ) continue; - TQMap<TQDateTime, int>::iterator it2 = datesStatMap.tqfind(dateTime); + TQMap<TQDateTime, int>::iterator it2 = datesStatMap.find(dateTime); if ( it2 == datesStatMap.end() ) { datesStatMap.insert( dateTime, 1 ); } else { - datesStatMap.tqreplace( dateTime, it2.data() + 1 ); + datesStatMap.replace( dateTime, it2.data() + 1 ); } } diff --git a/digikam/kioslave/digikamsearch.cpp b/digikam/kioslave/digikamsearch.cpp index d45db62..a23e66a 100644 --- a/digikam/kioslave/digikamsearch.cpp +++ b/digikam/kioslave/digikamsearch.cpp @@ -92,8 +92,8 @@ static TQValueList<TQRegExp> makeFilterList( const TQString &filter ) return regExps; TQChar sep( ';' ); - int i = filter.tqfind( sep, 0 ); - if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + int i = filter.find( sep, 0 ); + if ( i == -1 && filter.find( ' ', 0 ) != -1 ) sep = TQChar( ' ' ); TQStringList list = TQStringList::split( sep, filter ); @@ -471,7 +471,7 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, query = " (Images.dirid IN " " (SELECT a.id FROM Albums a, Albums b " " WHERE a.url $$##$$ '%' || b.url || '%' AND b.id = $$@@$$))"; - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } @@ -516,7 +516,7 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, // " (SELECT imageid FROM ImageTags " // " WHERE tagid $$##$$ $$@@$$)) "; - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; @@ -544,7 +544,7 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, " WHERE TagsTree.pid = (SELECT id FROM Tags WHERE name LIKE $$@@$$) " " OR ImageTags.tagid = (SELECT id FROM Tags WHERE name LIKE $$@@$$) )) "; -// query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) +// query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) // + TQString::tqfromLatin1("'")); break; @@ -595,57 +595,57 @@ TQString kio_digikamsearch::subQuery(enum kio_digikamsearch::SKey key, { case(EQ): { - query.tqreplace("$$##$$", "="); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", "="); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(NE): { - query.tqreplace("$$##$$", "<>"); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", "<>"); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(LT): { - query.tqreplace("$$##$$", "<"); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", "<"); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(GT): { - query.tqreplace("$$##$$", ">"); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", ">"); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(LTE): { - query.tqreplace("$$##$$", "<="); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", "<="); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(GTE): { - query.tqreplace("$$##$$", ">="); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + query.replace("$$##$$", ">="); + query.replace("$$@@$$", TQString::tqfromLatin1("'") + escapeString(val) + TQString::tqfromLatin1("'")); break; } case(LIKE): { - query.tqreplace("$$##$$", "LIKE"); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) + query.replace("$$##$$", "LIKE"); + query.replace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) + TQString::tqfromLatin1("%'")); break; } case(NLIKE): { - query.tqreplace("$$##$$", "NOT LIKE"); - query.tqreplace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) + query.replace("$$##$$", "NOT LIKE"); + query.replace("$$@@$$", TQString::tqfromLatin1("'%") + escapeString(val) + TQString::tqfromLatin1("%'")); break; } diff --git a/digikam/kioslave/digikamtags.cpp b/digikam/kioslave/digikamtags.cpp index 4d530e0..34041c4 100644 --- a/digikam/kioslave/digikamtags.cpp +++ b/digikam/kioslave/digikamtags.cpp @@ -79,8 +79,8 @@ static TQValueList<TQRegExp> makeFilterList( const TQString &filter ) return regExps; TQChar sep( ';' ); - int i = filter.tqfind( sep, 0 ); - if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + int i = filter.find( sep, 0 ); + if ( i == -1 && filter.find( ' ', 0 ) != -1 ) sep = TQChar( ' ' ); TQStringList list = TQStringList::split( sep, filter ); @@ -165,11 +165,11 @@ void kio_digikamtagsProtocol::special(const TQByteArray& data) if ( matchFilterList( regex, *it ) ) { - TQMap<int, int>::iterator it2 = tagsStatMap.tqfind(tagID); + TQMap<int, int>::iterator it2 = tagsStatMap.find(tagID); if ( it2 == tagsStatMap.end() ) tagsStatMap.insert(tagID, 1); else - tagsStatMap.tqreplace(tagID, it2.data() + 1); + tagsStatMap.replace(tagID, it2.data() + 1); } ++it; diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp index 04f58dc..cc86b8e 100644 --- a/digikam/kioslave/digikamthumbnail.cpp +++ b/digikam/kioslave/digikamthumbnail.cpp @@ -281,7 +281,7 @@ bool kio_digikamthumbnailProtocol::loadByExtension(TQImage& image, const TQStrin return (loadDImg(image, path)); else if (ext == TQString("TIFF") || ext == TQString("TIF")) return (loadDImg(image, path)); - else if (rawFilesExt.upper().tqcontains(ext)) + else if (rawFilesExt.upper().contains(ext)) return (KDcrawIface::KDcraw::loadDcrawPreview(image, path)); } @@ -541,7 +541,7 @@ bool kio_digikamthumbnailProtocol::loadKDEThumbCreator(TQImage& image, const TQS return false; } - TQString mimeTypeAlt = mimeType.tqreplace(TQRegExp("/.*"), "/*"); + TQString mimeTypeAlt = mimeType.replace(TQRegExp("/.*"), "/*"); TQString plugin; diff --git a/digikam/kioslave/sqlitedb.cpp b/digikam/kioslave/sqlitedb.cpp index 9a7826c..c81a2ac 100644 --- a/digikam/kioslave/sqlitedb.cpp +++ b/digikam/kioslave/sqlitedb.cpp @@ -187,7 +187,7 @@ TQString SqliteDB::getSetting( const TQString& keyword ) extern TQString escapeString(const TQString& str) { TQString st(str); - st.tqreplace( "'", "''" ); + st.replace( "'", "''" ); return st; } diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp index 19684ac..2c41d65 100644 --- a/digikam/libs/dialogs/imagedialog.cpp +++ b/digikam/libs/dialogs/imagedialog.cpp @@ -275,7 +275,7 @@ ImageDialog::ImageDialog(TQWidget* tqparent, const KURL &url, bool singleSelect, // Add other files format witch are missing to All Images" type mime provided by KDE and remplace current. if (KDcrawIface::DcrawBinary::instance()->versionIsRight()) { - allPictures.insert(allPictures.tqfind("|"), TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()) + TQString(" *.JPE *.TIF")); + allPictures.insert(allPictures.find("|"), TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()) + TQString(" *.JPE *.TIF")); patternList.remove(patternList[0]); patternList.prepend(allPictures); // Added RAW file formats supported by dcraw program like a type mime. @@ -284,7 +284,7 @@ ImageDialog::ImageDialog(TQWidget* tqparent, const KURL &url, bool singleSelect, patternList.append(i18n("\n%1|Camera RAW files").tqarg(TQString(KDcrawIface::DcrawBinary::instance()->rawFiles()))); } #else - allPictures.insert(allPictures.tqfind("|"), TQString(KDcrawIface::KDcraw::rawFiles()) + TQString(" *.JPE *.TIF")); + allPictures.insert(allPictures.find("|"), TQString(KDcrawIface::KDcraw::rawFiles()) + TQString(" *.JPE *.TIF")); patternList.remove(patternList[0]); patternList.prepend(allPictures); // Added RAW file formats supported by dcraw program like a type mime. diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/digikam/libs/dialogs/rawcameradlg.cpp index e93be78..d32c2e7 100644 --- a/digikam/libs/dialogs/rawcameradlg.cpp +++ b/digikam/libs/dialogs/rawcameradlg.cpp @@ -161,7 +161,7 @@ void RawCameraDlg::slotSearchTextChanged(const TQString& filter) { TQListViewItem *item = it.current(); - if (item->text(0).lower().tqcontains(search)) + if (item->text(0).lower().contains(search)) { query = true; item->setVisible(true); diff --git a/digikam/libs/dimg/dimg.cpp b/digikam/libs/dimg/dimg.cpp index e863895..b1caeee 100644 --- a/digikam/libs/dimg/dimg.cpp +++ b/digikam/libs/dimg/dimg.cpp @@ -512,7 +512,7 @@ DImg::FORMAT DImg::fileFormat(const TQString& filePath) return PNG; else if (ext == TQString("TIFF") || ext == TQString("TIF")) return TIFF; - else if (rawFilesExt.upper().tqcontains(ext)) + else if (rawFilesExt.upper().contains(ext)) return RAW; if (ext == TQString("JP2") || ext == TQString("JPX") || // JPEG2000 file format ext == TQString("JPC") || // JPEG2000 code stream @@ -702,22 +702,22 @@ TQByteArray DImg::getICCProfil() const void DImg::setComments(const TQByteArray& commentsData) { - m_priv->metaData.tqreplace(COM, commentsData); + m_priv->metaData.replace(COM, commentsData); } void DImg::setExif(const TQByteArray& exifData) { - m_priv->metaData.tqreplace(EXIF, exifData); + m_priv->metaData.replace(EXIF, exifData); } void DImg::setIptc(const TQByteArray& iptcData) { - m_priv->metaData.tqreplace(IPTC, iptcData); + m_priv->metaData.replace(IPTC, iptcData); } void DImg::setICCProfil(const TQByteArray& profile) { - m_priv->metaData.tqreplace(ICC, profile); + m_priv->metaData.replace(ICC, profile); } TQByteArray DImg::metadata(DImg::METADATA key) const @@ -766,7 +766,7 @@ void DImg::setAttribute(const TQString& key, const TQVariant& value) TQVariant DImg::attribute(const TQString& key) const { - if (m_priv->attributes.tqcontains(key)) + if (m_priv->attributes.contains(key)) return m_priv->attributes[key]; return TQVariant(); @@ -779,7 +779,7 @@ void DImg::setEmbeddedText(const TQString& key, const TQString& text) TQString DImg::embeddedText(const TQString& key) const { - if (m_priv->embeddedText.tqcontains(key)) + if (m_priv->embeddedText.contains(key)) return m_priv->embeddedText[key]; return TQString(); diff --git a/digikam/libs/dimg/loaders/iccjpeg.c b/digikam/libs/dimg/loaders/iccjpeg.c index dc57124..e74a98d 100644 --- a/digikam/libs/dimg/loaders/iccjpeg.c +++ b/digikam/libs/dimg/loaders/iccjpeg.c @@ -133,7 +133,7 @@ write_icc_profile (j_compress_ptr cinfo, void setup_read_icc_profile (j_decompress_ptr cinfo) { - /* Tell the library to keep any APP2 data it may tqfind */ + /* Tell the library to keep any APP2 data it may find */ jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF); } diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp index ae43e6f..d84367e 100644 --- a/digikam/libs/dimg/loaders/pngloader.cpp +++ b/digikam/libs/dimg/loaders/pngloader.cpp @@ -627,7 +627,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer) TQString software("digiKam "); software.append(digikam_version); TQString libpngver(PNG_HEADER_VERSION_STRING); - libpngver.tqreplace('\n', ' '); + libpngver.replace('\n', ' '); software.append(TQString(" (%1)").tqarg(libpngver)); png_text text; text.key = (png_charp)("Software"); diff --git a/digikam/libs/dimg/loaders/tiffloader.cpp b/digikam/libs/dimg/loaders/tiffloader.cpp index 472be42..024692b 100644 --- a/digikam/libs/dimg/loaders/tiffloader.cpp +++ b/digikam/libs/dimg/loaders/tiffloader.cpp @@ -571,7 +571,7 @@ bool TIFFLoader::save(const TQString& filePath, DImgLoaderObserver *observer) TQString soft = metaData.getExifTagString("Exif.Image.Software"); TQString libtiffver(TIFFLIB_VERSION_STR); - libtiffver.tqreplace('\n', ' '); + libtiffver.replace('\n', ' '); soft.append(TQString(" ( %1 )").tqarg(libtiffver)); TIFFSetField(tif, TIFFTAG_SOFTWARE, (const char*)soft.ascii()); diff --git a/digikam/libs/greycstoration/CImg.h b/digikam/libs/greycstoration/CImg.h index 71ed11f..7bbf3f9 100644 --- a/digikam/libs/greycstoration/CImg.h +++ b/digikam/libs/greycstoration/CImg.h @@ -4989,7 +4989,7 @@ namespace cimg_library { } //! Find a character in a C-string. - inline int strtqfind(const char *const s, const char c) { + inline int strfind(const char *const s, const char c) { if (!s) return -1; int l; for (l = cimg::strlen(s); l>=0 && s[l]!=c; --l) {} return l; @@ -5047,7 +5047,7 @@ namespace cimg_library { //! Compute the basename of a filename. inline const char* basename(const char *const s) { - return (cimg_OS!=2)?(s?s+1+cimg::strtqfind(s,'/'):0):(s?s+1+cimg::strtqfind(s,'\\'):0); + return (cimg_OS!=2)?(s?s+1+cimg::strfind(s,'/'):0):(s?s+1+cimg::strfind(s,'\\'):0); } // Generate a random filename. @@ -5527,7 +5527,7 @@ namespace cimg_library { //! Split a filename into two strings 'body' and 'extension'. inline const char *split_filename(const char *const filename, char *const body=0) { if (!filename) { if (body) body[0]='\0'; return 0; } - int l = cimg::strtqfind(filename,'.'); + int l = cimg::strfind(filename,'.'); if (l>=0) { if (body) { cimg_std::strncpy(body,filename,l); body[l]='\0'; }} else { if (body) cimg_std::strcpy(body,filename); l = (int)cimg::strlen(filename)-1; } return filename+l+1; @@ -9875,7 +9875,7 @@ namespace cimg_library { \par Image structure - The \ref CImg<\c T> structure tqcontains \a six fields : + The \ref CImg<\c T> structure contains \a six fields : - \ref width defines the number of \a columns of the image (size along the X-axis). - \ref height defines the number of \a rows of the image (size along the Y-axis). - \ref depth defines the number of \a slices of the image (size along the Z-axis). @@ -11076,7 +11076,7 @@ namespace cimg_library { //! Return \c true if specified referenced value is inside image boundaries. If true, returns pixel coordinates in (x,y,z,v). template<typename t> - bool tqcontains(const T& pixel, t& x, t& y, t& z, t& v) const { + bool contains(const T& pixel, t& x, t& y, t& z, t& v) const { const unsigned long wh = width*height, whz = wh*depth, siz = whz*dim; const T *const ppixel = &pixel; if (is_empty() || ppixel<data || ppixel>=data+siz) return false; @@ -11092,7 +11092,7 @@ namespace cimg_library { //! Return \c true if specified referenced value is inside image boundaries. If true, returns pixel coordinates in (x,y,z). template<typename t> - bool tqcontains(const T& pixel, t& x, t& y, t& z) const { + bool contains(const T& pixel, t& x, t& y, t& z) const { const unsigned long wh = width*height, whz = wh*depth, siz = whz*dim; const T *const ppixel = &pixel; if (is_empty() || ppixel<data || ppixel>=data+siz) return false; @@ -11106,7 +11106,7 @@ namespace cimg_library { //! Return \c true if specified referenced value is inside image boundaries. If true, returns pixel coordinates in (x,y). template<typename t> - bool tqcontains(const T& pixel, t& x, t& y) const { + bool contains(const T& pixel, t& x, t& y) const { const unsigned long wh = width*height, siz = wh*depth*dim; const T *const ppixel = &pixel; if (is_empty() || ppixel<data || ppixel>=data+siz) return false; @@ -11118,7 +11118,7 @@ namespace cimg_library { //! Return \c true if specified referenced value is inside image boundaries. If true, returns pixel coordinates in (x). template<typename t> - bool tqcontains(const T& pixel, t& x) const { + bool contains(const T& pixel, t& x) const { const T *const ppixel = &pixel; if (is_empty() || ppixel<data || ppixel>=data+size()) return false; x = (t)(((unsigned long)(ppixel - data))%width); @@ -11126,7 +11126,7 @@ namespace cimg_library { } //! Return \c true if specified referenced value is inside the image boundaries. - bool tqcontains(const T& pixel) const { + bool contains(const T& pixel) const { const T *const ppixel = &pixel; return !is_empty() && ppixel>=data && ppixel<data+size(); } @@ -12049,8 +12049,8 @@ namespace cimg_library { int xm = 0, ym = 0, zm = 0, vm = 0, xM = 0, yM = 0, zM = 0, vM = 0; - tqcontains(*pm,xm,ym,zm,vm); - tqcontains(*pM,xM,yM,zM,vM); + contains(*pm,xm,ym,zm,vm); + contains(*pM,xM,yM,zM,vM); return CImg<Tfloat>(1,12).fill((Tfloat)m,(Tfloat)M,mean_value,variance_value, (Tfloat)xm,(Tfloat)ym,(Tfloat)zm,(Tfloat)vm, (Tfloat)xM,(Tfloat)yM,(Tfloat)zM,(Tfloat)vM); @@ -29775,7 +29775,7 @@ namespace cimg_library { unsigned int nb_images = 0; do ++nb_images; while (TIFFReadDirectory(tif)); if (nfirst_frame>=nb_images || (nlast_frame!=~0U && nlast_frame>=nb_images)) - cimg::warn("CImg<%s>::load_tiff() : File '%s' tqcontains %u image(s), specified frame range is [%u,%u] (step %u).", + cimg::warn("CImg<%s>::load_tiff() : File '%s' contains %u image(s), specified frame range is [%u,%u] (step %u).", pixel_type(),filename,nb_images,nfirst_frame,nlast_frame,nstep_frame); if (nfirst_frame>=nb_images) return assign(); if (nlast_frame>=nb_images) nlast_frame = nb_images-1; @@ -33391,49 +33391,49 @@ namespace cimg_library { //! Return \c true if one of the image list contains the specified referenced value. If true, set coordinates (n,x,y,z,v). template<typename t> - bool tqcontains(const T& pixel, t& n, t& x, t&y, t& z, t& v) const { + bool contains(const T& pixel, t& n, t& x, t&y, t& z, t& v) const { if (is_empty()) return false; - cimglist_for(*this,l) if (data[l].tqcontains(pixel,x,y,z,v)) { n = (t)l; return true; } + cimglist_for(*this,l) if (data[l].contains(pixel,x,y,z,v)) { n = (t)l; return true; } return false; } //! Return \c true if one of the image list contains the specified referenced value. If true, set coordinates (n,x,y,z). template<typename t> - bool tqcontains(const T& pixel, t& n, t& x, t&y, t& z) const { + bool contains(const T& pixel, t& n, t& x, t&y, t& z) const { t v; - return tqcontains(pixel,n,x,y,z,v); + return contains(pixel,n,x,y,z,v); } //! Return \c true if one of the image list contains the specified referenced value. If true, set coordinates (n,x,y). template<typename t> - bool tqcontains(const T& pixel, t& n, t& x, t&y) const { + bool contains(const T& pixel, t& n, t& x, t&y) const { t z,v; - return tqcontains(pixel,n,x,y,z,v); + return contains(pixel,n,x,y,z,v); } //! Return \c true if one of the image list contains the specified referenced value. If true, set coordinates (n,x). template<typename t> - bool tqcontains(const T& pixel, t& n, t& x) const { + bool contains(const T& pixel, t& n, t& x) const { t y,z,v; - return tqcontains(pixel,n,x,y,z,v); + return contains(pixel,n,x,y,z,v); } //! Return \c true if one of the image list contains the specified referenced value. If true, set coordinates (n). template<typename t> - bool tqcontains(const T& pixel, t& n) const { + bool contains(const T& pixel, t& n) const { t x,y,z,v; - return tqcontains(pixel,n,x,y,z,v); + return contains(pixel,n,x,y,z,v); } //! Return \c true if one of the image list contains the specified referenced value. - bool tqcontains(const T& pixel) const { + bool contains(const T& pixel) const { unsigned int n,x,y,z,v; - return tqcontains(pixel,n,x,y,z,v); + return contains(pixel,n,x,y,z,v); } //! Return \c true if the list contains the image 'img'. If true, returns the position (n) of the image in the list. template<typename t> - bool tqcontains(const CImg<T>& img, t& n) const { + bool contains(const CImg<T>& img, t& n) const { if (is_empty()) return false; const CImg<T> *const ptr = &img; cimglist_for(*this,i) if (data+i==ptr) { n = (t)i; return true; } @@ -33441,9 +33441,9 @@ namespace cimg_library { } //! Return \c true if the list contains the image img. - bool tqcontains(const CImg<T>& img) const { + bool contains(const CImg<T>& img) const { unsigned int n; - return tqcontains(img,n); + return contains(img,n); } //@} @@ -35922,7 +35922,7 @@ namespace cimg_library { unsigned int nb_images = 0; do ++nb_images; while (TIFFReadDirectory(tif)); if (nfirst_frame>=nb_images || (nlast_frame!=~0U && nlast_frame>=nb_images)) - cimg::warn("CImgList<%s>::load_tiff() : File '%s' tqcontains %u image(s), specified frame range is [%u,%u] (step %u).", + cimg::warn("CImgList<%s>::load_tiff() : File '%s' contains %u image(s), specified frame range is [%u,%u] (step %u).", pixel_type(),filename,nb_images,nfirst_frame,nlast_frame,nstep_frame); if (nfirst_frame>=nb_images) return assign(); if (nlast_frame>=nb_images) nlast_frame = nb_images-1; diff --git a/digikam/libs/imageproperties/imagedescedittab.cpp b/digikam/libs/imageproperties/imagedescedittab.cpp index 8aefd4b..865bd2a 100644 --- a/digikam/libs/imageproperties/imagedescedittab.cpp +++ b/digikam/libs/imageproperties/imagedescedittab.cpp @@ -1558,7 +1558,7 @@ void ImageDescEditTab::slotTagsSearchChanged(const TQString& filter) if (tag->isRoot()) continue; - bool match = tag->title().lower().tqcontains(search); + bool match = tag->title().lower().contains(search); bool doesExpand = false; if (!match) { @@ -1566,7 +1566,7 @@ void ImageDescEditTab::slotTagsSearchChanged(const TQString& filter) Album* tqparent = tag->tqparent(); while (tqparent && !tqparent->isRoot()) { - if (tqparent->title().lower().tqcontains(search)) + if (tqparent->title().lower().contains(search)) { match = true; break; @@ -1582,7 +1582,7 @@ void ImageDescEditTab::slotTagsSearchChanged(const TQString& filter) AlbumIterator it(tag); while (it.current()) { - if ((*it)->title().lower().tqcontains(search)) + if ((*it)->title().lower().contains(search)) { match = true; doesExpand = true; diff --git a/digikam/libs/imageproperties/imagepropertiestab.cpp b/digikam/libs/imageproperties/imagepropertiestab.cpp index dc686d3..9a26ddf 100644 --- a/digikam/libs/imageproperties/imagepropertiestab.cpp +++ b/digikam/libs/imageproperties/imagepropertiestab.cpp @@ -443,7 +443,7 @@ void ImagePropertiesTab::setCurrentURL(const KURL& url) #endif TQString ext = fileInfo.extension(false).upper(); - if (!ext.isEmpty() && rawFilesExt.upper().tqcontains(ext)) + if (!ext.isEmpty() && rawFilesExt.upper().contains(ext)) { d->labelImageMime->setText(i18n("RAW Image")); compression = i18n("None"); diff --git a/digikam/libs/imageproperties/talbumlistview.cpp b/digikam/libs/imageproperties/talbumlistview.cpp index a7e9d30..aebfbb4 100644 --- a/digikam/libs/imageproperties/talbumlistview.cpp +++ b/digikam/libs/imageproperties/talbumlistview.cpp @@ -445,7 +445,7 @@ void TAlbumListView::slotRefresh(const TQMap<int, int>& tagsStatMap) if (item->album()) { int id = item->id(); - TQMap<int, int>::const_iterator it2 = tagsStatMap.tqfind(id); + TQMap<int, int>::const_iterator it2 = tagsStatMap.find(id); if ( it2 != tagsStatMap.end() ) item->setCount(it2.data()); } @@ -480,7 +480,7 @@ void TAlbumListView::loadViewState() continue; // Start the album root always open - if(openFolders.tqcontains(item->id()) || item->id() == 0) + if(openFolders.contains(item->id()) || item->id() == 0) setOpen(item, true); else setOpen(item, false); diff --git a/digikam/libs/themeengine/themeengine.cpp b/digikam/libs/themeengine/themeengine.cpp index f89b62c..8ea0adb 100644 --- a/digikam/libs/themeengine/themeengine.cpp +++ b/digikam/libs/themeengine/themeengine.cpp @@ -229,7 +229,7 @@ void ThemeEngine::slotChangeTheme(const TQString& name) void ThemeEngine::setCurrentTheme(const TQString& name) { - Theme* theme = d->themeDict.tqfind(name); + Theme* theme = d->themeDict.find(name); if (!theme) { d->currTheme = d->defaultTheme; @@ -253,7 +253,7 @@ void ThemeEngine::setCurrentTheme(const TQString& name) void ThemeEngine::setCurrentTheme(const Theme& theme, const TQString& name, bool loadFromDisk) { - Theme* t = d->themeDict.tqfind(name); + Theme* t = d->themeDict.find(name); if (t) { d->themeDict.remove(name); @@ -454,31 +454,31 @@ bool ThemeEngine::loadTheme() resource = resourceValue(rootElem, "BannerBevel"); if (!resource.isEmpty()) { - if (resource.tqcontains("flat", false)) + if (resource.contains("flat", false)) t->bannerBevel = Theme::FLAT; - else if (resource.tqcontains("sunken", false)) + else if (resource.contains("sunken", false)) t->bannerBevel = Theme::SUNKEN; - else if (resource.tqcontains("raised", false)) + else if (resource.contains("raised", false)) t->bannerBevel = Theme::RAISED; } resource = resourceValue(rootElem, "BannerGradient"); if (!resource.isEmpty()) { - if (resource.tqcontains("solid", false)) + if (resource.contains("solid", false)) t->bannerGrad = Theme::SOLID; - else if (resource.tqcontains("horizontal", false)) + else if (resource.contains("horizontal", false)) t->bannerGrad = Theme::HORIZONTAL; - else if (resource.tqcontains("vertical", false)) + else if (resource.contains("vertical", false)) t->bannerGrad = Theme::VERTICAL; - else if (resource.tqcontains("diagonal", false)) + else if (resource.contains("diagonal", false)) t->bannerGrad = Theme::DIAGONAL; } resource = resourceValue(rootElem, "BannerBorder"); if (!resource.isEmpty()) { - t->bannerBorder = resource.tqcontains("true", false); + t->bannerBorder = resource.contains("true", false); } resource = resourceValue(rootElem, "BannerBorderColor"); @@ -500,31 +500,31 @@ bool ThemeEngine::loadTheme() resource = resourceValue(rootElem, "ThumbnailRegularBevel"); if (!resource.isEmpty()) { - if (resource.tqcontains("flat", false)) + if (resource.contains("flat", false)) t->thumbRegBevel = Theme::FLAT; - else if (resource.tqcontains("sunken", false)) + else if (resource.contains("sunken", false)) t->thumbRegBevel = Theme::SUNKEN; - else if (resource.tqcontains("raised", false)) + else if (resource.contains("raised", false)) t->thumbRegBevel = Theme::RAISED; } resource = resourceValue(rootElem, "ThumbnailRegularGradient"); if (!resource.isEmpty()) { - if (resource.tqcontains("solid", false)) + if (resource.contains("solid", false)) t->thumbRegGrad = Theme::SOLID; - else if (resource.tqcontains("horizontal", false)) + else if (resource.contains("horizontal", false)) t->thumbRegGrad = Theme::HORIZONTAL; - else if (resource.tqcontains("vertical", false)) + else if (resource.contains("vertical", false)) t->thumbRegGrad = Theme::VERTICAL; - else if (resource.tqcontains("diagonal", false)) + else if (resource.contains("diagonal", false)) t->thumbRegGrad = Theme::DIAGONAL; } resource = resourceValue(rootElem, "ThumbnailRegularBorder"); if (!resource.isEmpty()) { - t->thumbRegBorder = resource.tqcontains("true", false); + t->thumbRegBorder = resource.contains("true", false); } resource = resourceValue(rootElem, "ThumbnailRegularBorderColor"); @@ -544,31 +544,31 @@ bool ThemeEngine::loadTheme() resource = resourceValue(rootElem, "ThumbnailSelectedBevel"); if (!resource.isEmpty()) { - if (resource.tqcontains("flat", false)) + if (resource.contains("flat", false)) t->thumbSelBevel = Theme::FLAT; - else if (resource.tqcontains("sunken", false)) + else if (resource.contains("sunken", false)) t->thumbSelBevel = Theme::SUNKEN; - else if (resource.tqcontains("raised", false)) + else if (resource.contains("raised", false)) t->thumbSelBevel = Theme::RAISED; } resource = resourceValue(rootElem, "ThumbnailSelectedGradient"); if (!resource.isEmpty()) { - if (resource.tqcontains("solid", false)) + if (resource.contains("solid", false)) t->thumbSelGrad = Theme::SOLID; - else if (resource.tqcontains("horizontal", false)) + else if (resource.contains("horizontal", false)) t->thumbSelGrad = Theme::HORIZONTAL; - else if (resource.tqcontains("vertical", false)) + else if (resource.contains("vertical", false)) t->thumbSelGrad = Theme::VERTICAL; - else if (resource.tqcontains("diagonal", false)) + else if (resource.contains("diagonal", false)) t->thumbSelGrad = Theme::DIAGONAL; } resource = resourceValue(rootElem, "ThumbnailSelectedBorder"); if (!resource.isEmpty()) { - t->thumbSelBorder = resource.tqcontains("true", false); + t->thumbSelBorder = resource.contains("true", false); } resource = resourceValue(rootElem, "ThumbnailSelectedBorderColor"); @@ -590,31 +590,31 @@ bool ThemeEngine::loadTheme() resource = resourceValue(rootElem, "ListviewRegularBevel"); if (!resource.isEmpty()) { - if (resource.tqcontains("flat", false)) + if (resource.contains("flat", false)) t->listRegBevel = Theme::FLAT; - else if (resource.tqcontains("sunken", false)) + else if (resource.contains("sunken", false)) t->listRegBevel = Theme::SUNKEN; - else if (resource.tqcontains("raised", false)) + else if (resource.contains("raised", false)) t->listRegBevel = Theme::RAISED; } resource = resourceValue(rootElem, "ListviewRegularGradient"); if (!resource.isEmpty()) { - if (resource.tqcontains("solid", false)) + if (resource.contains("solid", false)) t->listRegGrad = Theme::SOLID; - else if (resource.tqcontains("horizontal", false)) + else if (resource.contains("horizontal", false)) t->listRegGrad = Theme::HORIZONTAL; - else if (resource.tqcontains("vertical", false)) + else if (resource.contains("vertical", false)) t->listRegGrad = Theme::VERTICAL; - else if (resource.tqcontains("diagonal", false)) + else if (resource.contains("diagonal", false)) t->listRegGrad = Theme::DIAGONAL; } resource = resourceValue(rootElem, "ListviewRegularBorder"); if (!resource.isEmpty()) { - t->listRegBorder = resource.tqcontains("true", false); + t->listRegBorder = resource.contains("true", false); } resource = resourceValue(rootElem, "ListviewRegularBorderColor"); @@ -634,31 +634,31 @@ bool ThemeEngine::loadTheme() resource = resourceValue(rootElem, "ListviewSelectedBevel"); if (!resource.isEmpty()) { - if (resource.tqcontains("flat", false)) + if (resource.contains("flat", false)) t->listSelBevel = Theme::FLAT; - else if (resource.tqcontains("sunken", false)) + else if (resource.contains("sunken", false)) t->listSelBevel = Theme::SUNKEN; - else if (resource.tqcontains("raised", false)) + else if (resource.contains("raised", false)) t->listSelBevel = Theme::RAISED; } resource = resourceValue(rootElem, "ListviewSelectedGradient"); if (!resource.isEmpty()) { - if (resource.tqcontains("solid", false)) + if (resource.contains("solid", false)) t->listSelGrad = Theme::SOLID; - else if (resource.tqcontains("horizontal", false)) + else if (resource.contains("horizontal", false)) t->listSelGrad = Theme::HORIZONTAL; - else if (resource.tqcontains("vertical", false)) + else if (resource.contains("vertical", false)) t->listSelGrad = Theme::VERTICAL; - else if (resource.tqcontains("diagonal", false)) + else if (resource.contains("diagonal", false)) t->listSelGrad = Theme::DIAGONAL; } resource = resourceValue(rootElem, "ListviewSelectedBorder"); if (!resource.isEmpty()) { - t->listSelBorder = resource.tqcontains("true", false); + t->listSelBorder = resource.contains("true", false); } resource = resourceValue(rootElem, "ListviewSelectedBorderColor"); diff --git a/digikam/libs/threadimageio/loadingcache.cpp b/digikam/libs/threadimageio/loadingcache.cpp index 66e2848..e2b39fe 100644 --- a/digikam/libs/threadimageio/loadingcache.cpp +++ b/digikam/libs/threadimageio/loadingcache.cpp @@ -91,7 +91,7 @@ LoadingCache::~LoadingCache() DImg *LoadingCache::retrieveImage(const TQString &cacheKey) { - return d->imageCache.tqfind(cacheKey); + return d->imageCache.find(cacheKey); } bool LoadingCache::putImage(const TQString &cacheKey, DImg *img, const TQString &filePath) @@ -171,7 +171,7 @@ void LoadingCache::customEvent(TQCustomEvent *) TQString watchPath = it.current()->attribute("loadingCacheFilePath").toString(); if (!watchPath.isEmpty()) { - if (!d->watchedFiles.tqcontains(watchPath)) + if (!d->watchedFiles.contains(watchPath)) toBeAdded.append(watchPath); toBeRemoved.remove(watchPath); } @@ -206,7 +206,7 @@ void LoadingCache::addLoadingProcess(LoadingProcess *process) LoadingProcess *LoadingCache::retrieveLoadingProcess(const TQString &cacheKey) { - return d->loadingDict.tqfind(cacheKey); + return d->loadingDict.find(cacheKey); } void LoadingCache::removeLoadingProcess(LoadingProcess *process) diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp index 2cf81c0..1673e84 100644 --- a/digikam/libs/thumbbar/thumbbar.cpp +++ b/digikam/libs/thumbbar/thumbbar.cpp @@ -780,7 +780,7 @@ void ThumbBarView::slotGotThumbnail(const KURL& url, const TQPixmap& pix) { if (!pix.isNull()) { - ThumbBarItem* item = d->itemDict.tqfind(url.url()); + ThumbBarItem* item = d->itemDict.find(url.url()); if (!item) return; @@ -797,7 +797,7 @@ void ThumbBarView::slotGotThumbnail(const KURL& url, const TQPixmap& pix) void ThumbBarView::slotFailedThumbnail(const KURL& url) { - ThumbBarItem* item = d->itemDict.tqfind(url.url()); + ThumbBarItem* item = d->itemDict.find(url.url()); if (!item) return; @@ -972,7 +972,7 @@ TQString ThumbBarToolTip::tipContent(ThumbBarItem* item) #endif TQString ext = fileInfo.extension(false).upper(); - if (!ext.isEmpty() && rawFilesExt.upper().tqcontains(ext)) + if (!ext.isEmpty() && rawFilesExt.upper().contains(ext)) { str = i18n("RAW Image"); dims = metaData.getImageDimensions(); diff --git a/digikam/libs/thumbbar/thumbnailjob.cpp b/digikam/libs/thumbbar/thumbnailjob.cpp index 73c198c..2226828 100644 --- a/digikam/libs/thumbbar/thumbnailjob.cpp +++ b/digikam/libs/thumbbar/thumbnailjob.cpp @@ -151,7 +151,7 @@ void ThumbnailJob::addItems(const KURL::List& urlList) bool ThumbnailJob::setNextItemToLoad(const KURL& url) { - KURL::List::const_iterator it = d->urlList.tqfind(url); + KURL::List::const_iterator it = d->urlList.find(url); if (it != d->urlList.end()) { d->next_url = *it; @@ -175,7 +175,7 @@ void ThumbnailJob::processNext() return; } - KURL::List::iterator it = d->urlList.tqfind(d->next_url); + KURL::List::iterator it = d->urlList.find(d->next_url); if (it == d->urlList.end()) { it = d->urlList.begin(); diff --git a/digikam/libs/widgets/common/dcursortracker.cpp b/digikam/libs/widgets/common/dcursortracker.cpp index c2fe358..0d718c1 100644 --- a/digikam/libs/widgets/common/dcursortracker.cpp +++ b/digikam/libs/widgets/common/dcursortracker.cpp @@ -65,7 +65,7 @@ bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e) case TQEvent::MouseMove: { TQMouseEvent *event = TQT_TQMOUSEEVENT(e); - if (m_enable && (TQT_TQRECT_OBJECT(widget->rect()).tqcontains(event->pos()) || + if (m_enable && (TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) || (event->stateAfter() & Qt::LeftButton))) { show(); @@ -82,7 +82,7 @@ bool DCursorTracker::eventFilter(TQObject *object, TQEvent *e) case TQEvent::MouseButtonRelease: { TQMouseEvent* event = TQT_TQMOUSEEVENT(e); - if ( !TQT_TQRECT_OBJECT(widget->rect()).tqcontains(event->pos()) ) + if ( !TQT_TQRECT_OBJECT(widget->rect()).contains(event->pos()) ) { hide(); } diff --git a/digikam/libs/widgets/common/paniconwidget.cpp b/digikam/libs/widgets/common/paniconwidget.cpp index 984d173..2591ad6 100644 --- a/digikam/libs/widgets/common/paniconwidget.cpp +++ b/digikam/libs/widgets/common/paniconwidget.cpp @@ -248,7 +248,7 @@ void PanIconWidget::hideEvent(TQHideEvent *e) void PanIconWidget::mousePressEvent ( TQMouseEvent * e ) { if ( (e->button() == Qt::LeftButton || e->button() == Qt::MidButton) && - m_localRegionSelection.tqcontains( e->x(), e->y() ) ) + m_localRegionSelection.contains( e->x(), e->y() ) ) { d->xpos = e->x(); d->ypos = e->y(); @@ -292,7 +292,7 @@ void PanIconWidget::mouseMoveEvent ( TQMouseEvent * e ) } else { - if ( m_localRegionSelection.tqcontains( e->x(), e->y() ) ) + if ( m_localRegionSelection.contains( e->x(), e->y() ) ) setCursor( KCursor::handCursor() ); else setCursor( KCursor::arrowCursor() ); diff --git a/digikam/libs/widgets/common/previewwidget.cpp b/digikam/libs/widgets/common/previewwidget.cpp index 8af3e87..700a45b 100644 --- a/digikam/libs/widgets/common/previewwidget.cpp +++ b/digikam/libs/widgets/common/previewwidget.cpp @@ -498,7 +498,7 @@ void PreviewWidget::viewportPaintEvent(TQPaintEvent *e) for (int i = x1 ; i < x2 ; i += d->tileSize) { TQString key = TQString("%1,%2").tqarg(i).tqarg(j); - TQPixmap *pix = d->tileCache.tqfind(key); + TQPixmap *pix = d->tileCache.find(key); if (!pix) { diff --git a/digikam/libs/widgets/common/statuszoombar.cpp b/digikam/libs/widgets/common/statuszoombar.cpp index 9f2b002..b2ccdea 100644 --- a/digikam/libs/widgets/common/statuszoombar.cpp +++ b/digikam/libs/widgets/common/statuszoombar.cpp @@ -56,7 +56,7 @@ TQSliderReverseWheel::~TQSliderReverseWheel() void TQSliderReverseWheel::wheelEvent(TQWheelEvent * e) { - if ( e->orientation() != orientation() && !TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()) ) + if ( e->orientation() != orientation() && !TQT_TQRECT_OBJECT(rect()).contains(e->pos()) ) return; static float offset = 0; diff --git a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp index 2490710..c38031b 100644 --- a/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp +++ b/digikam/libs/widgets/iccprofiles/iccprofilewidget.cpp @@ -261,22 +261,22 @@ bool ICCProfileWidget::decodeMetadata() DMetadata::MetaDataMap metaDataMap; if ( !TQString(cmsTakeProductName(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Name", TQString(cmsTakeProductName(hProfile)).tqreplace("\n", " ")); + metaDataMap.insert("Icc.Header.Name", TQString(cmsTakeProductName(hProfile)).replace("\n", " ")); if ( !TQString(cmsTakeProductDesc(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Description", TQString(cmsTakeProductDesc(hProfile)).tqreplace("\n", " ")); + metaDataMap.insert("Icc.Header.Description", TQString(cmsTakeProductDesc(hProfile)).replace("\n", " ")); if ( !TQString(cmsTakeProductInfo(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Information", TQString(cmsTakeProductInfo(hProfile)).tqreplace("\n", " ")); + metaDataMap.insert("Icc.Header.Information", TQString(cmsTakeProductInfo(hProfile)).replace("\n", " ")); if ( !TQString(cmsTakeManufacturer(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Manufacturer", TQString(cmsTakeManufacturer(hProfile)).tqreplace("\n", " ")); + metaDataMap.insert("Icc.Header.Manufacturer", TQString(cmsTakeManufacturer(hProfile)).replace("\n", " ")); if ( !TQString(cmsTakeModel(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Model", TQString(cmsTakeModel(hProfile)).tqreplace("\n", " ")); + metaDataMap.insert("Icc.Header.Model", TQString(cmsTakeModel(hProfile)).replace("\n", " ")); if ( !TQString(cmsTakeCopyright(hProfile)).isEmpty() ) - metaDataMap.insert("Icc.Header.Copyright", TQString(cmsTakeCopyright(hProfile)).tqreplace("\n", " ")); + metaDataMap.insert("Icc.Header.Copyright", TQString(cmsTakeCopyright(hProfile)).replace("\n", " ")); metaDataMap.insert("Icc.Header.ProfileID", TQString::number((uint)*cmsTakeProfileID(hProfile))); metaDataMap.insert("Icc.Header.ProfileVersion", TQString::number((uint)cmsGetProfileICCversion(hProfile))); @@ -422,7 +422,7 @@ void ICCProfileWidget::buildView() TQString ICCProfileWidget::getTagTitle(const TQString& key) { - ICCTagInfoMap::Iterator it = d->iccTagsDescription.tqfind(key); + ICCTagInfoMap::Iterator it = d->iccTagsDescription.find(key); if (it != d->iccTagsDescription.end()) return(it.data().title()); @@ -438,7 +438,7 @@ void ICCProfileWidget::slotSaveMetadataToFile() TQString ICCProfileWidget::getTagDescription(const TQString& key) { - ICCTagInfoMap::Iterator it = d->iccTagsDescription.tqfind(key); + ICCTagInfoMap::Iterator it = d->iccTagsDescription.find(key); if (it != d->iccTagsDescription.end()) return(it.data().description()); diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp index 168501f..94d3c42 100644 --- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp @@ -497,7 +497,7 @@ void ImageGuideWidget::resizeEvent(TQResizeEvent* e) void ImageGuideWidget::mousePressEvent(TQMouseEvent* e) { if ( !d->focus && e->button() == Qt::LeftButton && - d->rect.tqcontains( e->x(), e->y() ) && d->spotVisible ) + d->rect.contains( e->x(), e->y() ) && d->spotVisible ) { d->focus = true; d->spot.setX(e->x()-d->rect.x()); @@ -508,7 +508,7 @@ void ImageGuideWidget::mousePressEvent(TQMouseEvent* e) void ImageGuideWidget::mouseReleaseEvent(TQMouseEvent* e) { - if ( d->rect.tqcontains( e->x(), e->y() ) && d->focus && d->spotVisible) + if ( d->rect.contains( e->x(), e->y() ) && d->focus && d->spotVisible) { d->focus = false; updatePreview(); @@ -587,11 +587,11 @@ void ImageGuideWidget::mouseReleaseEvent(TQMouseEvent* e) void ImageGuideWidget::mouseMoveEvent(TQMouseEvent* e) { - if ( d->rect.tqcontains( e->x(), e->y() ) && !d->focus && d->spotVisible ) + if ( d->rect.contains( e->x(), e->y() ) && !d->focus && d->spotVisible ) { setCursor( KCursor::crossCursor() ); } - else if ( d->rect.tqcontains( e->x(), e->y() ) && d->focus && d->spotVisible ) + else if ( d->rect.contains( e->x(), e->y() ) && d->focus && d->spotVisible ) { d->spot.setX(e->x()-d->rect.x()); d->spot.setY(e->y()-d->rect.y()); diff --git a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp index 470a908..96e56df 100644 --- a/digikam/libs/widgets/imageplugins/imageregionwidget.cpp +++ b/digikam/libs/widgets/imageplugins/imageregionwidget.cpp @@ -291,7 +291,7 @@ void ImageRegionWidget::viewportPaintExtraData() { pt = d->hightlightPoints.point(i); - if ( getImageRegionToRender().tqcontains(pt) ) + if ( getImageRegionToRender().contains(pt) ) { int x = (int)(((double)pt.x() * tileSize()) / floor(tileSize() / zoomFactor())); int y = (int)(((double)pt.y() * tileSize()) / floor(tileSize() / zoomFactor())); diff --git a/digikam/libs/widgets/metadata/metadatalistview.cpp b/digikam/libs/widgets/metadata/metadatalistview.cpp index 1258c4e..ef79c2e 100644 --- a/digikam/libs/widgets/metadata/metadatalistview.cpp +++ b/digikam/libs/widgets/metadata/metadatalistview.cpp @@ -162,7 +162,7 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt { // We using the filter to make a more user friendly output (Simple Mode) - if (tagsfilter.tqcontains(it.key().section('.', 2, 2))) + if (tagsfilter.contains(it.key().section('.', 2, 2))) { TQString tagTitle = m_parent->getTagTitle(it.key()); new MetadataListViewItem(parentifDItem, it.key(), tagTitle, it.data()); @@ -216,7 +216,7 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& ifds, const TQSt { // We using the filter to make a more user friendly output (Simple Mode) - if (tagsFilter.tqcontains(it.key().section('.', 2, 2))) + if (tagsFilter.contains(it.key().section('.', 2, 2))) { TQString tagTitle = m_parent->getTagTitle(it.key()); new MetadataListViewItem(parentifDItem, it.key(), tagTitle, it.data()); @@ -264,8 +264,8 @@ void MetadataListView::slotSearchTextChanged(const TQString& filter) MetadataListViewItem *item = dynamic_cast<MetadataListViewItem*>(it.current()); if (item) { - if (item->text(0).lower().tqcontains(search) || - item->text(1).lower().tqcontains(search)) + if (item->text(0).lower().contains(search) || + item->text(1).lower().contains(search)) { query = true; item->setVisible(true); diff --git a/digikam/project/Doxyfile b/digikam/project/Doxyfile index e3c8981..e9735e9 100644 --- a/digikam/project/Doxyfile +++ b/digikam/project/Doxyfile @@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \ is \ provides \ specifies \ - tqcontains \ + contains \ represents \ a \ an \ diff --git a/digikam/project/NEWS.0.9.1 b/digikam/project/NEWS.0.9.1 index f955957..e37db98 100644 --- a/digikam/project/NEWS.0.9.1 +++ b/digikam/project/NEWS.0.9.1 @@ -102,7 +102,7 @@ General : Native slideshow tool : preaparing slideshow is now cancelable. ---------------------------------------------------------------------------- digiKam and DigikamImagePlugins BUGFIX FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): -001 ==> 115157 : Usability: Image comments/tags dialog: hard to tqfind/see all +001 ==> 115157 : Usability: Image comments/tags dialog: hard to find/see all already selected tags (and to 'de'select them). 002 ==> 132309 : Wish: enhance video support in digiKam. 003 ==> 115153 : Assigns tags not only to selected images with drag and drop. diff --git a/digikam/project/NEWS.0.9.2 b/digikam/project/NEWS.0.9.2 index e26f43a..bc2a408 100644 --- a/digikam/project/NEWS.0.9.2 +++ b/digikam/project/NEWS.0.9.2 @@ -9,7 +9,7 @@ digiKam BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org): 063 ==> 146436 : digiKam try to include Exiv2 library headers. 064 ==> 146464 : Light Table does not deal with colour management. 065 ==> 142133 : Typo English documentation docbook. -066 ==> 146744 : Tag that tqcontains '&' is not displayed correctly in menus. +066 ==> 146744 : Tag that contains '&' is not displayed correctly in menus. ********************************************************************************************** diff --git a/digikam/showfoto/showfoto.cpp b/digikam/showfoto/showfoto.cpp index 961f2ce..fb2b2d4 100644 --- a/digikam/showfoto/showfoto.cpp +++ b/digikam/showfoto/showfoto.cpp @@ -839,9 +839,9 @@ void ShowFoto::openFolder(const KURL& url) } // Because KImageIO return only *.JPEG and *.TIFF mime types. - if ( filter.tqcontains("*.TIFF") ) + if ( filter.contains("*.TIFF") ) filter.append (" *.TIF"); - if ( filter.tqcontains("*.JPEG") ) + if ( filter.contains("*.JPEG") ) { filter.append (" *.JPG"); filter.append (" *.JPE"); diff --git a/digikam/themedesigner/themediconitem.cpp b/digikam/themedesigner/themediconitem.cpp index eb2a964..c36ad22 100644 --- a/digikam/themedesigner/themediconitem.cpp +++ b/digikam/themedesigner/themediconitem.cpp @@ -55,7 +55,7 @@ static void dateToString(const TQDateTime& datetime, TQString& str) static TQString squeezedText(TQPainter* p, int width, const TQString& text) { TQString fullText(text); - fullText.tqreplace("\n"," "); + fullText.replace("\n"," "); TQFontMetrics fm(p->fontMetrics()); int textWidth = fm.width(fullText); if (textWidth > width) diff --git a/digikam/utilities/batch/batchthumbsgenerator.cpp b/digikam/utilities/batch/batchthumbsgenerator.cpp index 1350343..9a2c901 100644 --- a/digikam/utilities/batch/batchthumbsgenerator.cpp +++ b/digikam/utilities/batch/batchthumbsgenerator.cpp @@ -154,7 +154,7 @@ void BatchThumbsGenerator::rebuildAllThumbs(int size) !d->cancel && (it2 != albumItemsPath.end()); ++it2) { TQFileInfo fi(*it2); - if (filesFilter.tqcontains(fi.extension(false))) + if (filesFilter.contains(fi.extension(false))) pathSorted.append(*it2); } diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp index 91f8f0b..a66f6ac 100644 --- a/digikam/utilities/cameragui/albumselectdialog.cpp +++ b/digikam/utilities/cameragui/albumselectdialog.cpp @@ -361,14 +361,14 @@ void AlbumSelectDialog::slotSearchTextChanged(const TQString& filter) if (palbum->isRoot()) continue; - bool match = palbum->title().lower().tqcontains(search); + bool match = palbum->title().lower().contains(search); if (!match) { // check if any of the parents match the search Album* tqparent = palbum->tqparent(); while (tqparent && !tqparent->isRoot()) { - if (tqparent->title().lower().tqcontains(search)) + if (tqparent->title().lower().contains(search)) { match = true; break; @@ -384,7 +384,7 @@ void AlbumSelectDialog::slotSearchTextChanged(const TQString& filter) AlbumIterator it(palbum); while (it.current()) { - if ((*it)->title().lower().tqcontains(search)) + if ((*it)->title().lower().contains(search)) { match = true; break; diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp index 4203fdf..0bbac23 100644 --- a/digikam/utilities/cameragui/cameraiconview.cpp +++ b/digikam/utilities/cameragui/cameraiconview.cpp @@ -335,7 +335,7 @@ void CameraIconView::addItem(const GPItemInfo& info) void CameraIconView::removeItem(const TQString& folder, const TQString& file) { - CameraIconViewItem* item = d->itemDict.tqfind(folder+file); + CameraIconViewItem* item = d->itemDict.find(folder+file); if (!item) return; d->itemDict.remove(folder+file); @@ -347,7 +347,7 @@ void CameraIconView::removeItem(const TQString& folder, const TQString& file) CameraIconViewItem* CameraIconView::findItem(const TQString& folder, const TQString& file) { - return d->itemDict.tqfind(folder+file); + return d->itemDict.find(folder+file); } int CameraIconView::countItemsByFolder(TQString folder) @@ -370,7 +370,7 @@ int CameraIconView::countItemsByFolder(TQString folder) void CameraIconView::setThumbnail(const TQString& folder, const TQString& filename, const TQImage& image) { - CameraIconViewItem* item = d->itemDict.tqfind(folder+filename); + CameraIconViewItem* item = d->itemDict.find(folder+filename); if (!item) return; @@ -390,7 +390,7 @@ void CameraIconView::ensureItemVisible(const GPItemInfo& itemInfo) void CameraIconView::ensureItemVisible(const TQString& folder, const TQString& file) { - CameraIconViewItem* item = d->itemDict.tqfind(folder+file); + CameraIconViewItem* item = d->itemDict.find(folder+file); if (!item) return; @@ -511,7 +511,7 @@ TQString CameraIconView::defaultDownloadName(CameraIconViewItem *viewItem) TQString CameraIconView::getTemplatedName(const GPItemInfo* itemInfo, int position) { TQString ext = itemInfo->name; - int pos = ext.tqfindRev('.'); + int pos = ext.findRev('.'); if (pos < 0) ext = ""; else diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp index 2ae852e..3274c25 100644 --- a/digikam/utilities/cameragui/cameraui.cpp +++ b/digikam/utilities/cameragui/cameraui.cpp @@ -928,8 +928,8 @@ void CameraUI::slotFileList(const GPItemInfoList& fileList) for(it = fileList.begin() ; it != fileList.end() ; ++it) { info.setFile((*it).name); - if (!fileNames.tqcontains(info.fileName().lower()) && - !fileExts.tqcontains(info.extension(false).lower())) + if (!fileNames.contains(info.fileName().lower()) && + !fileExts.contains(info.extension(false).lower())) { kdDebug() << info.fileName() << " : " << (*it).mtime << endl; @@ -1004,9 +1004,9 @@ void CameraUI::slotUpload() // Add RAW file format to All Images" type mime and remplace current. #if KDCRAW_VERSION < 0x000106 - allPictures.insert(allPictures.tqfind("|"), TQString(KDcrawIface::DcrawBinary::instance()->rawFiles())); + allPictures.insert(allPictures.find("|"), TQString(KDcrawIface::DcrawBinary::instance()->rawFiles())); #else - allPictures.insert(allPictures.tqfind("|"), TQString(KDcrawIface::KDcraw::rawFiles())); + allPictures.insert(allPictures.find("|"), TQString(KDcrawIface::KDcraw::rawFiles())); #endif patternList.remove(patternList[0]); patternList.prepend(allPictures); @@ -1546,7 +1546,7 @@ void CameraUI::slotExifFromData(const TQByteArray& exifData) if (!exifData.isEmpty()) { - int i = exifData.tqfind(*exifHeader); + int i = exifData.find(*exifHeader); if (i != -1) { DDebug() << "Exif header found at position " << i << endl; @@ -1589,7 +1589,7 @@ void CameraUI::slotItemsSelected(CameraIconViewItem* item, bool selected) if (selected) { // if selected item is in the list of item which will be deleted, set no current item - if (d->currentlyDeleting.tqfind(item->itemInfo()->folder + item->itemInfo()->name) + if (d->currentlyDeleting.find(item->itemInfo()->folder + item->itemInfo()->name) == d->currentlyDeleting.end()) { KURL url(item->itemInfo()->folder + '/' + item->itemInfo()->name); @@ -1647,10 +1647,10 @@ void CameraUI::addFileExtension(const TQString& ext) if (!settings) return; - if (settings->getImageFileFilter().upper().tqcontains(ext.upper()) || - settings->getMovieFileFilter().upper().tqcontains(ext.upper()) || - settings->getAudioFileFilter().upper().tqcontains(ext.upper()) || - settings->getRawFileFilter().upper().tqcontains(ext.upper())) + if (settings->getImageFileFilter().upper().contains(ext.upper()) || + settings->getMovieFileFilter().upper().contains(ext.upper()) || + settings->getAudioFileFilter().upper().contains(ext.upper()) || + settings->getRawFileFilter().upper().contains(ext.upper())) return; settings->setImageFileFilter(settings->getImageFileFilter() + TQString(" *.") + ext); diff --git a/digikam/utilities/cameragui/dkcamera.cpp b/digikam/utilities/cameragui/dkcamera.cpp index f5abe39..8f31885 100644 --- a/digikam/utilities/cameragui/dkcamera.cpp +++ b/digikam/utilities/cameragui/dkcamera.cpp @@ -90,19 +90,19 @@ TQString DKCamera::mimeType(const TQString& fileext) const else if (ext == "tif") ext = "tiff"; - if (m_rawFilter.tqcontains(ext)) + if (m_rawFilter.contains(ext)) { mime = TQString("image/x-raw"); } - else if (m_imageFilter.tqcontains(ext)) + else if (m_imageFilter.contains(ext)) { mime = TQString("image/") + ext; } - else if (m_movieFilter.tqcontains(ext)) + else if (m_movieFilter.contains(ext)) { mime = TQString("video/") + ext; } - else if (m_audioFilter.tqcontains(ext)) + else if (m_audioFilter.contains(ext)) { mime = TQString("audio/") + ext; } diff --git a/digikam/utilities/cameragui/renamecustomizer.cpp b/digikam/utilities/cameragui/renamecustomizer.cpp index 3d57ac3..9857feb 100644 --- a/digikam/utilities/cameragui/renamecustomizer.cpp +++ b/digikam/utilities/cameragui/renamecustomizer.cpp @@ -355,7 +355,7 @@ TQString RenameCustomizer::newName(const TQDateTime &dateTime, int index, const name += seq; if (d->addCameraNameBox->isChecked()) - name += TQString("-%1").tqarg(d->cameraTitle.simplifyWhiteSpace().tqreplace(" ", "")); + name += TQString("-%1").tqarg(d->cameraTitle.simplifyWhiteSpace().replace(" ", "")); name += d->renameCustomSuffix->text(); name += extension; diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index f089259..9344655 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -524,7 +524,7 @@ void Canvas::paintViewport(const TQRect& er, bool antialias) for (int i = x1 ; i < x2 ; i += d->tileSize) { TQString key = TQString("%1,%2").tqarg(i).tqarg(j); - TQPixmap *pix = d->tileCache.tqfind(key); + TQPixmap *pix = d->tileCache.find(key); if (!pix) { @@ -795,22 +795,22 @@ void Canvas::contentsMouseMoveEvent(TQMouseEvent *e) d->lbActive = false; d->rbActive = false; - if (lt.tqcontains(e->x(), e->y())) + if (lt.contains(e->x(), e->y())) { viewport()->setCursor(TQt::SizeFDiagCursor); d->ltActive = true; } - else if (rb.tqcontains(e->x(), e->y())) + else if (rb.contains(e->x(), e->y())) { viewport()->setCursor(TQt::SizeFDiagCursor); d->rbActive = true; } - else if (lb.tqcontains(e->x(), e->y())) + else if (lb.contains(e->x(), e->y())) { viewport()->setCursor(TQt::SizeBDiagCursor); d->lbActive = true; } - else if (rt.tqcontains(e->x(), e->y())) + else if (rt.contains(e->x(), e->y())) { viewport()->setCursor(TQt::SizeBDiagCursor); d->rtActive = true; diff --git a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp index d806b3c..bf5ca1a 100644 --- a/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp +++ b/digikam/utilities/imageeditor/canvas/imagepluginloader.cpp @@ -98,7 +98,7 @@ ImagePluginLoader::ImagePluginLoader(TQObject *tqparent, SplashScreen *splash) for (iter = offers.begin() ; iter != offers.end() ; ++iter) { KService::Ptr service = *iter; - if (!d->obsoleteImagePluginsList.tqcontains(service->library())) + if (!d->obsoleteImagePluginsList.contains(service->library())) imagePluginsList2Load.append(service->library()); } @@ -167,7 +167,7 @@ void ImagePluginLoader::loadPluginsFromList(const TQStringList& list) KService::Ptr service = *iter; ImagePlugin *plugin; - if (!list.tqcontains(service->library()) && service->library() != "digikamimageplugin_core") + if (!list.contains(service->library()) && service->library() != "digikamimageplugin_core") { if ((plugin = pluginIsLoaded(service->name())) != NULL) d->pluginList.remove(ImagePluginLoaderPrivate::PluginType(service->name(),plugin)); diff --git a/digikam/utilities/imageeditor/canvas/undocache.cpp b/digikam/utilities/imageeditor/canvas/undocache.cpp index 20f07b0..81c5c34 100644 --- a/digikam/utilities/imageeditor/canvas/undocache.cpp +++ b/digikam/utilities/imageeditor/canvas/undocache.cpp @@ -169,7 +169,7 @@ void UndoCache::erase(int level) .tqarg(d->cachePrefix) .tqarg(level); - if(d->cacheFilenames.tqfind(cacheFile) == d->cacheFilenames.end()) + if(d->cacheFilenames.find(cacheFile) == d->cacheFilenames.end()) return; ::unlink(TQFile::encodeName(cacheFile)); diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp index e3bdcdb..e90218a 100644 --- a/digikam/utilities/imageeditor/editor/editorwindow.cpp +++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp @@ -750,7 +750,7 @@ void EditorWindow::slotZoomTo100Percents() void EditorWindow::slotZoomSelected() { TQString txt = d->zoomCombo->currentText(); - txt = txt.left(txt.tqfind('%')); + txt = txt.left(txt.find('%')); slotZoomTextChanged(txt); } @@ -1600,13 +1600,13 @@ bool EditorWindow::startingSaveAs(const KURL& url) imgExtPattern.append (" "); } imgExtPattern.append (" TIF TIFF"); - if ( imgExtPattern.tqcontains("JPEG") ) + if ( imgExtPattern.contains("JPEG") ) { imgExtPattern.append (" JPG"); imgExtPattern.append (" JPE"); } - if ( !imgExtPattern.tqcontains( m_savingContext->format.upper() ) ) + if ( !imgExtPattern.contains( m_savingContext->format.upper() ) ) { KMessageBox::error(this, i18n("Target image file format \"%1\" unsupported.") .tqarg(m_savingContext->format)); @@ -1880,9 +1880,9 @@ void EditorWindow::slotRawCameraList() void EditorWindow::slotThemeChanged() { TQStringList themes(ThemeEngine::instance()->themeNames()); - int index = themes.tqfindIndex(ThemeEngine::instance()->getCurrentThemeName()); + int index = themes.findIndex(ThemeEngine::instance()->getCurrentThemeName()); if (index == -1) - index = themes.tqfindIndex(i18n("Default")); + index = themes.findIndex(i18n("Default")); m_themeMenuAction->setCurrentItem(index); diff --git a/digikam/utilities/imageeditor/editor/imagewindow.cpp b/digikam/utilities/imageeditor/editor/imagewindow.cpp index c026568..94145d3 100644 --- a/digikam/utilities/imageeditor/editor/imagewindow.cpp +++ b/digikam/utilities/imageeditor/editor/imagewindow.cpp @@ -460,7 +460,7 @@ void ImageWindow::loadCurrentList(const TQString& caption, bool allowSaving) void ImageWindow::slotLoadCurrent() { - KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); + KURL::List::iterator it = d->urlList.find(d->urlCurrent); if (it != d->urlList.end()) { @@ -487,8 +487,8 @@ void ImageWindow::slotForward() if(!promptUserSave(d->urlCurrent)) return; - KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); - int index = d->imageInfoList.tqfind(d->imageInfoCurrent); + KURL::List::iterator it = d->urlList.find(d->urlCurrent); + int index = d->imageInfoList.find(d->imageInfoCurrent); if (it != d->urlList.end()) { @@ -507,8 +507,8 @@ void ImageWindow::slotBackward() if(!promptUserSave(d->urlCurrent)) return; - KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); - int index = d->imageInfoList.tqfind(d->imageInfoCurrent); + KURL::List::iterator it = d->urlList.find(d->urlCurrent); + int index = d->imageInfoList.find(d->imageInfoCurrent); if (it != d->urlList.begin()) { @@ -712,7 +712,7 @@ void ImageWindow::slotAssignRating(int rating) void ImageWindow::slotUpdateItemInfo() { - uint index = d->urlList.tqfindIndex(d->urlCurrent); + uint index = d->urlList.findIndex(d->urlCurrent); m_rotatedOrFlipped = false; @@ -799,7 +799,7 @@ void ImageWindow::saveIsComplete() emit signalFileModified(m_savingContext->destinationURL); // all that is done in slotLoadCurrent, except for loading - KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); + KURL::List::iterator it = d->urlList.find(d->urlCurrent); setViewToURL(*it); if (++it != d->urlList.end()) @@ -829,10 +829,10 @@ void ImageWindow::saveAsIsComplete() ImageInfo newInfo(d->imageInfoCurrent->copyItem(dstAlbum, m_savingContext->destinationURL.fileName())); - if ( d->urlList.tqfind(m_savingContext->destinationURL) == d->urlList.end() ) + if ( d->urlList.find(m_savingContext->destinationURL) == d->urlList.end() ) { // The image file did not exist in the list. - KURL::List::iterator it = d->urlList.tqfind(m_savingContext->srcURL); - int index = d->urlList.tqfindIndex(m_savingContext->srcURL); + KURL::List::iterator it = d->urlList.find(m_savingContext->srcURL); + int index = d->urlList.findIndex(m_savingContext->srcURL); d->urlList.insert(it, m_savingContext->destinationURL); d->imageInfoCurrent = new ImageInfo(newInfo); d->imageInfoList.insert(index, d->imageInfoCurrent); @@ -845,7 +845,7 @@ void ImageWindow::saveAsIsComplete() { d->imageInfoCurrent = new ImageInfo(newInfo); // setAutoDelete is true - d->imageInfoList.tqreplace(d->imageInfoList.at(), d->imageInfoCurrent); + d->imageInfoList.replace(d->imageInfoList.at(), d->imageInfoCurrent); break; } } @@ -869,7 +869,7 @@ void ImageWindow::saveAsIsComplete() emit signalFileAdded(m_savingContext->destinationURL); // all that is done in slotLoadCurrent, except for loading - KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); + KURL::List::iterator it = d->urlList.find(d->urlCurrent); if (it != d->urlList.end()) { @@ -995,8 +995,8 @@ void ImageWindow::deleteCurrentItem(bool ask, bool permanently) emit signalFileDeleted(d->urlCurrent); KURL CurrentToRemove = d->urlCurrent; - KURL::List::iterator it = d->urlList.tqfind(d->urlCurrent); - int index = d->imageInfoList.tqfind(d->imageInfoCurrent); + KURL::List::iterator it = d->urlList.find(d->urlCurrent); + int index = d->imageInfoList.find(d->imageInfoCurrent); if (it != d->urlList.end()) { diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp index 2b66ba1..98e2437 100644 --- a/digikam/utilities/imageeditor/tools/imageprint.cpp +++ b/digikam/utilities/imageeditor/tools/imageprint.cpp @@ -292,7 +292,7 @@ TQString ImagePrint::minimizeString( TQString text, const TQFontMetrics& metrics if ( mid <= 5 ) return TQString(); - text.tqreplace( mid - 1, 3, "..." ); + text.replace( mid - 1, 3, "..." ); } return text; diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp index 37147bf..e93866a 100644 --- a/digikam/utilities/lighttable/lighttablewindow.cpp +++ b/digikam/utilities/lighttable/lighttablewindow.cpp @@ -599,7 +599,7 @@ void LightTableWindow::loadImageInfos(const ImageInfoList &list, { TQString fileExtension = (*it)->kurl().fileName().section( '.', -1 ); - if ( imagefilter.tqfind(fileExtension) != -1 && + if ( imagefilter.find(fileExtension) != -1 && !d->barView->findItemByInfo(*it) ) { new LightTableBarItem(d->barView, *it); @@ -1652,9 +1652,9 @@ void LightTableWindow::slotRawCameraList() void LightTableWindow::slotThemeChanged() { TQStringList themes(ThemeEngine::instance()->themeNames()); - int index = themes.tqfindIndex(AlbumSettings::instance()->getCurrentTheme()); + int index = themes.findIndex(AlbumSettings::instance()->getCurrentTheme()); if (index == -1) - index = themes.tqfindIndex(i18n("Default")); + index = themes.findIndex(i18n("Default")); d->themeMenuAction->setCurrentItem(index); } diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp index fbff311..e1f30b8 100644 --- a/digikam/utilities/setup/cameraselection.cpp +++ b/digikam/utilities/setup/cameraselection.cpp @@ -256,7 +256,7 @@ CameraSelection::~CameraSelection() void CameraSelection::slotUMSCameraLinkUsed() { - TQListViewItem *item = d->listView->tqfindItem(d->UMSCameraNameShown, 0); + TQListViewItem *item = d->listView->findItem(d->UMSCameraNameShown, 0); if (item) { d->listView->setCurrentItem(item); @@ -266,7 +266,7 @@ void CameraSelection::slotUMSCameraLinkUsed() void CameraSelection::slotPTPCameraLinkUsed() { - TQListViewItem *item = d->listView->tqfindItem(d->PTPCameraNameShown, 0); + TQListViewItem *item = d->listView->findItem(d->PTPCameraNameShown, 0); if (item) { d->listView->setCurrentItem(item); @@ -282,7 +282,7 @@ void CameraSelection::setCamera(const TQString& title, const TQString& model, if (camModel == d->UMSCameraNameActual) camModel = d->UMSCameraNameShown; - TQListViewItem* item = d->listView->tqfindItem(camModel, 0); + TQListViewItem* item = d->listView->findItem(camModel, 0); if (!item) return; d->listView->setSelected(item, true); @@ -290,12 +290,12 @@ void CameraSelection::setCamera(const TQString& title, const TQString& model, d->titleEdit->setText(title); - if (port.tqcontains("usb")) + if (port.contains("usb")) { d->usbButton->setChecked(true); slotPortChanged(); } - else if (port.tqcontains("serial")) + else if (port.contains("serial")) { d->serialButton->setChecked(true); @@ -386,7 +386,7 @@ void CameraSelection::slotSelectionChanged(TQListViewItem *item) TQStringList plist; GPCamera::getCameraSupportedPorts(model, plist); - if (plist.tqcontains("serial")) + if (plist.contains("serial")) { d->serialButton->setEnabled(true); d->serialButton->setChecked(true); @@ -398,7 +398,7 @@ void CameraSelection::slotSelectionChanged(TQListViewItem *item) d->serialButton->setEnabled(false); } - if (plist.tqcontains("usb")) + if (plist.contains("usb")) { d->usbButton->setEnabled(true); d->usbButton->setChecked(true); @@ -477,7 +477,7 @@ void CameraSelection::slotSearchTextChanged(const TQString& filter) { TQListViewItem *item = it.current(); - if (item->text(0).lower().tqcontains(search)) + if (item->text(0).lower().contains(search)) { query = true; item->setVisible(true); diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp index cb11f39..4495314 100644 --- a/digikam/utilities/setup/setupcamera.cpp +++ b/digikam/utilities/setup/setupcamera.cpp @@ -107,7 +107,7 @@ SetupCamera::SetupCamera( TQWidget* tqparent ) d->editButton->setText( i18n( "&Edit..." ) ); d->editButton->setIconSet(SmallIcon("configure")); d->autoDetectButton->setText( i18n( "Auto-&Detect" ) ); - d->autoDetectButton->setIconSet(SmallIcon("tqfind")); + d->autoDetectButton->setIconSet(SmallIcon("find")); d->removeButton->setEnabled(false); d->editButton->setEnabled(false); @@ -252,7 +252,7 @@ void SetupCamera::slotAutoDetectCamera() if (port.startsWith("usb:")) port = "usb:"; - if (d->listView->tqfindItem(model, 1)) + if (d->listView->findItem(model, 1)) { KMessageBox::information(this, i18n("Camera '%1' (%2) is already in list.").tqarg(model).tqarg(port)); } diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp index 8e89f68..1cb4368 100644 --- a/digikam/utilities/setup/setupicc.cpp +++ b/digikam/utilities/setup/setupicc.cpp @@ -406,13 +406,13 @@ void SetupICC::applySettings() config->writeEntry("ManagedView", d->managedView->isChecked()); config->writePathEntry("InProfileFile", - *(d->inICCPath.tqfind(d->inProfilesKC->itemHighlighted()))); + *(d->inICCPath.find(d->inProfilesKC->itemHighlighted()))); config->writePathEntry("WorkProfileFile", - *(d->workICCPath.tqfind(d->workProfilesKC->itemHighlighted()))); + *(d->workICCPath.find(d->workProfilesKC->itemHighlighted()))); config->writePathEntry("MonitorProfileFile", - *(d->monitorICCPath.tqfind(d->monitorProfilesKC->itemHighlighted()))); + *(d->monitorICCPath.find(d->monitorProfilesKC->itemHighlighted()))); config->writePathEntry("ProofProfileFile", - *(d->proofICCPath.tqfind(d->proofProfilesKC->itemHighlighted()))); + *(d->proofICCPath.find(d->proofProfilesKC->itemHighlighted()))); } void SetupICC::readSettings(bool restore) @@ -666,22 +666,22 @@ void SetupICC::slotToggledWidgets(bool t) void SetupICC::slotClickedWork() { - profileInfo(*(d->workICCPath.tqfind(d->workProfilesKC->itemHighlighted()))); + profileInfo(*(d->workICCPath.find(d->workProfilesKC->itemHighlighted()))); } void SetupICC::slotClickedIn() { - profileInfo(*(d->inICCPath.tqfind(d->inProfilesKC->itemHighlighted()))); + profileInfo(*(d->inICCPath.find(d->inProfilesKC->itemHighlighted()))); } void SetupICC::slotClickedMonitor() { - profileInfo(*(d->monitorICCPath.tqfind(d->monitorProfilesKC->itemHighlighted()))); + profileInfo(*(d->monitorICCPath.find(d->monitorProfilesKC->itemHighlighted()))); } void SetupICC::slotClickedProof() { - profileInfo(*(d->proofICCPath.tqfind(d->proofProfilesKC->itemHighlighted()))); + profileInfo(*(d->proofICCPath.find(d->proofProfilesKC->itemHighlighted()))); } void SetupICC::profileInfo(const TQString& profile) diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp index a6e8064..1102de9 100644 --- a/digikam/utilities/slideshow/slideshow.cpp +++ b/digikam/utilities/slideshow/slideshow.cpp @@ -181,7 +181,7 @@ SlideShow::~SlideShow() void SlideShow::setCurrent(const KURL& url) { - int index = d->settings.fileList.tqfindIndex(url); + int index = d->settings.fileList.findIndex(url); if (index != -1) { d->currentImage = url; |