diff options
Diffstat (limited to 'kded')
-rw-r--r-- | kded/kbuildservicefactory.cpp | 6 | ||||
-rw-r--r-- | kded/kbuildservicegroupfactory.cpp | 10 | ||||
-rw-r--r-- | kded/kbuildservicetypefactory.cpp | 10 | ||||
-rw-r--r-- | kded/kbuildsycoca.cpp | 10 | ||||
-rw-r--r-- | kded/kctimefactory.cpp | 4 | ||||
-rw-r--r-- | kded/kded.cpp | 16 | ||||
-rw-r--r-- | kded/kdedmodule.cpp | 4 | ||||
-rw-r--r-- | kded/khostname.cpp | 10 | ||||
-rw-r--r-- | kded/vfolder_menu.cpp | 66 |
9 files changed, 68 insertions, 68 deletions
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp index dcd77c87b..30be4f213 100644 --- a/kded/kbuildservicefactory.cpp +++ b/kded/kbuildservicefactory.cpp @@ -67,7 +67,7 @@ KSycocaEntry * KBuildServiceFactory::createEntry( const TQString& file, const char *resource ) { TQString name = file; - int pos = name.tqfindRev('/'); + int pos = name.findRev('/'); if (pos != -1) { name = name.mid(pos+1); @@ -227,7 +227,7 @@ KBuildServiceFactory::saveInitList(TQDataStream &str) void KBuildServiceFactory::addEntry(KSycocaEntry *newEntry, const char *resource) { - if (m_dupeDict.tqfind(newEntry)) + if (m_dupeDict.find(newEntry)) return; KSycocaFactory::addEntry(newEntry, resource); @@ -244,7 +244,7 @@ KBuildServiceFactory::addEntry(KSycocaEntry *newEntry, const char *resource) TQString name = service->desktopEntryName(); m_nameDict->add( name, newEntry ); - m_serviceDict.tqreplace(name, service); + m_serviceDict.replace(name, service); TQString relName = service->desktopEntryPath(); m_relNameDict->add( relName, newEntry ); diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp index 164dd81e3..7499eda84 100644 --- a/kded/kbuildservicegroupfactory.cpp +++ b/kded/kbuildservicegroupfactory.cpp @@ -59,7 +59,7 @@ KBuildServiceGroupFactory::createEntry( const TQString&, const char * ) void KBuildServiceGroupFactory::addNewEntryTo( const TQString &menuName, KService *newEntry) { KServiceGroup *entry = 0; - KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(menuName); + KSycocaEntry::Ptr *ptr = m_entryDict->find(menuName); if (ptr) entry = dynamic_cast<KServiceGroup *>(ptr->data()); @@ -74,7 +74,7 @@ void KBuildServiceGroupFactory::addNewEntryTo( const TQString &menuName, KServic KServiceGroup * KBuildServiceGroupFactory::addNew( const TQString &menuName, const TQString& file, KServiceGroup *entry, bool isDeleted) { - KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(menuName); + KSycocaEntry::Ptr *ptr = m_entryDict->find(menuName); if (ptr) { kdWarning(7021) << "KBuildServiceGroupFactory::addNew( " << menuName << ", " << file << " ): menu already exists!" << endl; @@ -94,14 +94,14 @@ KBuildServiceGroupFactory::addNew( const TQString &menuName, const TQString& fil // Make sure parent dir exists. KServiceGroup *parentEntry = 0; TQString parent = menuName.left(menuName.length()-1); - int i = parent.tqfindRev('/'); + int i = parent.findRev('/'); if (i > 0) { parent = parent.left(i+1); } else { parent = "/"; } parentEntry = 0; - ptr = m_entryDict->tqfind(parent); + ptr = m_entryDict->find(parent); if (ptr) parentEntry = dynamic_cast<KServiceGroup *>(ptr->data()); if (!parentEntry) @@ -123,7 +123,7 @@ KBuildServiceGroupFactory::addNewChild( const TQString &parent, const char *reso TQString name = "#parent#"+parent; KServiceGroup *entry = 0; - KSycocaEntry::Ptr *ptr = m_entryDict->tqfind(name); + KSycocaEntry::Ptr *ptr = m_entryDict->find(name); if (ptr) entry = dynamic_cast<KServiceGroup *>(ptr->data()); diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp index e27a83cc4..1b09d10c6 100644 --- a/kded/kbuildservicetypefactory.cpp +++ b/kded/kbuildservicetypefactory.cpp @@ -69,7 +69,7 @@ KSycocaEntry * KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource) { TQString name = file; - int pos = name.tqfindRev('/'); + int pos = name.findRev('/'); if (pos != -1) { name = name.mid(pos+1); @@ -183,8 +183,8 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str) for ( ; patit != pat.end() ; ++patit ) { const TQString &pattern = *patit; - if ( pattern.tqfindRev('*') == 0 - && pattern.tqfindRev('.') == 1 + if ( pattern.findRev('*') == 0 + && pattern.findRev('.') == 1 && pattern.length() <= 6 ) // it starts with "*.", has no other '*' and no other '.', and is max 6 chars // => fast patttern @@ -193,7 +193,7 @@ KBuildServiceTypeFactory::savePatternLists(TQDataStream &str) otherPatterns.append( pattern ); // Assumption : there is only one mimetype for that pattern // It doesn't really make sense otherwise, anyway. - dict.tqreplace( pattern, mimeType ); + dict.replace( pattern, mimeType ); } } } @@ -267,7 +267,7 @@ KBuildServiceTypeFactory::addEntry(KSycocaEntry *newEntry, const char *resource) TQMap<TQString,TQVariant::Type>::ConstIterator pit = pd.begin(); for( ; pit != pd.end(); ++pit ) { - if (!m_propertyTypeDict.tqcontains(pit.key())) + if (!m_propertyTypeDict.contains(pit.key())) m_propertyTypeDict.insert(pit.key(), pit.data()); else if (m_propertyTypeDict[pit.key()] != pit.data()) kdWarning(7021) << "Property '"<< pit.key() << "' is defined multiple times ("<< serviceType->name() <<")" <<endl; diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp index 584531d8c..041c9db3a 100644 --- a/kded/kbuildsycoca.cpp +++ b/kded/kbuildsycoca.cpp @@ -203,15 +203,15 @@ KSycocaEntry *KBuildSycoca::createEntry(const TQString &file, bool addToFactory) // Re-use old entry if (g_factory == g_bsgf) // Strip .directory from service-group entries { - entry = g_entryDict->tqfind(file.left(file.length()-10)); + entry = g_entryDict->find(file.left(file.length()-10)); } else if (g_factory == g_bsf) { - entry = g_entryDict->tqfind(file); + entry = g_entryDict->find(file); } else { - entry = g_entryDict->tqfind(file); + entry = g_entryDict->find(file); } // remove from g_ctimeDict; if g_ctimeDict is not empty // after all files have been processed, it means @@ -300,7 +300,7 @@ bool KBuildSycoca::build() ++it1 ) { KSycocaResource res = (*it1); - if (!allResources.tqcontains(res.resource)) + if (!allResources.contains(res.resource)) allResources.append(res.resource); } } @@ -428,7 +428,7 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM if (timeStamp && (timeStamp == oldTimestamp)) { - entry = dynamic_cast<KServiceGroup *> (g_serviceGroupEntryDict->tqfind(subName)); + entry = dynamic_cast<KServiceGroup *> (g_serviceGroupEntryDict->find(subName)); if (entry && (entry->directoryEntryPath() != directoryFile)) entry = 0; // Can't reuse this one! } diff --git a/kded/kctimefactory.cpp b/kded/kctimefactory.cpp index 98471af48..746a1c433 100644 --- a/kded/kctimefactory.cpp +++ b/kded/kctimefactory.cpp @@ -72,7 +72,7 @@ void KCTimeInfo::addCTime(const TQString &path, TQ_UINT32 ctime) { assert(!path.isEmpty()); - ctimeDict.tqreplace(path, new TQ_UINT32(ctime)); + ctimeDict.replace(path, new TQ_UINT32(ctime)); } TQ_UINT32 @@ -94,6 +94,6 @@ KCTimeInfo::fillCTimeDict(TQDict<TQ_UINT32> &dict) KSycocaEntry::read(*m_str, path); (*m_str) >> ctime; if (path.isEmpty()) break; - dict.tqreplace(path, new TQ_UINT32(ctime)); + dict.replace(path, new TQ_UINT32(ctime)); } } diff --git a/kded/kded.cpp b/kded/kded.cpp index 7f8ec9121..257ab3731 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -247,7 +247,7 @@ void Kded::noDemandLoad(const TQString &obj) KDEDModule *Kded::loadModule(const TQCString &obj, bool onDemand) { - KDEDModule *module = m_modules.tqfind(obj); + KDEDModule *module = m_modules.find(obj); if (module) return module; KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop"); @@ -260,7 +260,7 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand) if (s && !s->library().isEmpty()) { TQCString obj = s->desktopEntryName().latin1(); - KDEDModule *oldModule = m_modules.tqfind(obj); + KDEDModule *oldModule = m_modules.find(obj); if (oldModule) return oldModule; @@ -374,7 +374,7 @@ void Kded::slotApplicationRemoved(const TQCString &appId) it.current()->removeAll(appId); } - TQValueList<long> *windowIds = m_windowIdList.tqfind(appId); + TQValueList<long> *windowIds = m_windowIdList.find(appId); if (windowIds) { for( TQValueList<long>::ConstIterator it = windowIds->begin(); @@ -428,7 +428,7 @@ void Kded::updateResourceList() it != dirs.end(); ++it ) { - if (m_allResourceDirs.tqfind(*it) == m_allResourceDirs.end()) + if (m_allResourceDirs.find(*it) == m_allResourceDirs.end()) { m_allResourceDirs.append(*it); readDirectory(*it); @@ -603,18 +603,18 @@ void Kded::readDirectory( const TQString& _path ) bool Kded::isWindowRegistered(long windowId) { - return m_globalWindowIdList.tqfind(windowId) != 0; + return m_globalWindowIdList.find(windowId) != 0; } // DCOP void Kded::registerWindowId(long windowId) { - m_globalWindowIdList.tqreplace(windowId, &windowId); + m_globalWindowIdList.replace(windowId, &windowId); TQCString sender = callingDcopClient()->senderId(); if( sender.isEmpty()) // local call sender = callingDcopClient()->appId(); - TQValueList<long> *windowIds = m_windowIdList.tqfind(sender); + TQValueList<long> *windowIds = m_windowIdList.find(sender); if (!windowIds) { windowIds = new TQValueList<long>; @@ -636,7 +636,7 @@ void Kded::unregisterWindowId(long windowId) TQCString sender = callingDcopClient()->senderId(); if( sender.isEmpty()) // local call sender = callingDcopClient()->appId(); - TQValueList<long> *windowIds = m_windowIdList.tqfind(sender); + TQValueList<long> *windowIds = m_windowIdList.find(sender); if (windowIds) { windowIds->remove(windowId); diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp index 426ec21da..ca28a5c62 100644 --- a/kded/kdedmodule.cpp +++ b/kded/kdedmodule.cpp @@ -69,14 +69,14 @@ void KDEDModule::insert(const TQCString &app, const TQCString &key, KShared *obj // appKey acts as a placeholder KEntryKey appKey(app, 0); - d->objMap->tqreplace(appKey, 0); + d->objMap->replace(appKey, 0); KEntryKey indexKey(app, key); // Prevent deletion in case the same object is inserted again. KSharedPtr<KShared> _obj = obj; - d->objMap->tqreplace(indexKey, _obj); + d->objMap->replace(indexKey, _obj); resetIdle(); } diff --git a/kded/khostname.cpp b/kded/khostname.cpp index 4965ae684..9b57e5362 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -82,7 +82,7 @@ KHostName::KHostName() display = ::getenv("DISPLAY"); // strip the screen number from the display - display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); + display.replace(TQRegExp("\\.[0-9]+$"), ""); if (display.isEmpty()) { fprintf(stderr, "%s", i18n("Error: DISPLAY environment variable not set.\n").local8Bit().data()); @@ -145,14 +145,14 @@ void KHostName::changeX() TQCString authName = entries[1]; TQCString authKey = entries[2]; - int i = netId.tqfindRev(':'); + int i = netId.findRev(':'); if (i == -1) continue; TQCString netDisplay = netId.mid(i); if (netDisplay != display) continue; - i = netId.tqfind('/'); + i = netId.find('/'); if (i == -1) continue; @@ -208,7 +208,7 @@ void KHostName::changeDcop() if (!newName.isEmpty()) { - int i = line1.tqfindRev(':'); + int i = line1.findRev(':'); if (i == -1) { fprintf(stderr, "Warning: File '%s' has unexpected format.\n", fname.data()); @@ -340,7 +340,7 @@ void KHostName::changeSessionManager() fprintf(stderr, "Warning: No session management specified.\n"); return; } - int i = sm.tqfindRev(':'); + int i = sm.findRev(':'); if ((i == -1) || (sm.left(6) != "local/")) { fprintf(stderr, "Warning: Session Management socket '%s' has unexpected format.\n", sm.data()); diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp index ce938c7cb..b1c3a612a 100644 --- a/kded/vfolder_menu.cpp +++ b/kded/vfolder_menu.cpp @@ -39,7 +39,7 @@ static void foldNode(TQDomElement &docElem, TQDomElement &e, TQMap<TQString,TQDo { if (s.isEmpty()) s = e.text(); - TQMap<TQString,TQDomElement>::iterator it = dupeList.tqfind(s); + TQMap<TQString,TQDomElement>::iterator it = dupeList.find(s); if (it != dupeList.end()) { kdDebug(7021) << e.tagName() << " and " << s << " requires combining!" << endl; @@ -69,7 +69,7 @@ static void replaceNode(TQDomElement &docElem, TQDomNode &n, const TQStringList void VFolderMenu::registerFile(const TQString &file) { - int i = file.tqfindRev('/'); + int i = file.findRev('/'); if (i < 0) return; @@ -108,8 +108,8 @@ TQStringList VFolderMenu::allDirectories() static void track(const TQString &menuId, const TQString &menuName, TQDict<KService> *includeList, TQDict<KService> *excludeList, TQDict<KService> *itemList, const TQString &comment) { - if (itemList->tqfind(menuId)) - printf("%s: %s INCL %d EXCL %d\n", menuName.latin1(), comment.latin1(), includeList->tqfind(menuId) ? 1 : 0, excludeList->tqfind(menuId) ? 1 : 0); + if (itemList->find(menuId)) + printf("%s: %s INCL %d EXCL %d\n", menuName.latin1(), comment.latin1(), includeList->find(menuId) ? 1 : 0, excludeList->find(menuId) ? 1 : 0); } void @@ -117,7 +117,7 @@ VFolderMenu::includeItems(TQDict<KService> *items1, TQDict<KService> *items2) { for(TQDictIterator<KService> it(*items2); it.current(); ++it) { - items1->tqreplace(it.current()->menuId(), it.current()); + items1->replace(it.current()->menuId(), it.current()); } } @@ -128,7 +128,7 @@ VFolderMenu::matchItems(TQDict<KService> *items1, TQDict<KService> *items2) { TQString id = it.current()->menuId(); ++it; - if (!items2->tqfind(id)) + if (!items2->find(id)) items1->remove(id); } } @@ -145,7 +145,7 @@ VFolderMenu::excludeItems(TQDict<KService> *items1, TQDict<KService> *items2) VFolderMenu::SubMenu* VFolderMenu::takeSubMenu(SubMenu *parentMenu, const TQString &menuName) { - int i = menuName.tqfind('/'); + int i = menuName.find('/'); TQString s1 = i > 0 ? menuName.left(i) : menuName; TQString s2 = menuName.mid(i+1); @@ -231,7 +231,7 @@ VFolderMenu::mergeMenu(SubMenu *menu1, SubMenu *menu2, bool reversePriority) void VFolderMenu::insertSubMenu(SubMenu *parentMenu, const TQString &menuName, SubMenu *newMenu, bool reversePriority) { - int i = menuName.tqfind('/'); + int i = menuName.find('/'); TQString s1 = menuName.left(i); TQString s2 = menuName.mid(i+1); @@ -271,12 +271,12 @@ VFolderMenu::insertSubMenu(SubMenu *parentMenu, const TQString &menuName, SubMen void VFolderMenu::insertService(SubMenu *parentMenu, const TQString &name, KService *newService) { - int i = name.tqfind('/'); + int i = name.find('/'); if (i == -1) { // Add it here - parentMenu->items.tqreplace(newService->menuId(), newService); + parentMenu->items.replace(newService->menuId(), newService); return; } @@ -324,7 +324,7 @@ VFolderMenu::~VFolderMenu() for(appsInfo *info = m_appsInfoStack.first(); \ info; info = m_appsInfoStack.next()) \ { \ - KService::List *list = info->dictCategories.tqfind(category); \ + KService::List *list = info->dictCategories.find(category); \ if (list) for(KService::List::ConstIterator it = list->begin(); \ it != list->end(); ++it) \ { @@ -336,7 +336,7 @@ VFolderMenu::findApplication(const TQString &relPath) for(appsInfo *info = m_appsInfoStack.first(); info; info = m_appsInfoStack.next()) { - KService *s = info->applications.tqfind(relPath); + KService *s = info->applications.find(relPath); if (s) return s; } @@ -347,7 +347,7 @@ void VFolderMenu::addApplication(const TQString &id, KService *service) { service->setMenuId(id); - m_appsInfo->applications.tqreplace(id, service); + m_appsInfo->applications.replace(id, service); } void @@ -364,7 +364,7 @@ VFolderMenu::buildApplicationIndex(bool unusedOnly) KService *s = it.current(); TQDictIterator<KService> tmpIt = it; ++it; - if (unusedOnly && m_usedAppsDict.tqfind(s->menuId())) + if (unusedOnly && m_usedAppsDict.find(s->menuId())) { // Remove and skip this one info->applications.remove(tmpIt.currentKey()); @@ -376,7 +376,7 @@ VFolderMenu::buildApplicationIndex(bool unusedOnly) it2 != cats.end(); ++it2) { const TQString &cat = *it2; - KService::List *list = info->dictCategories.tqfind(cat); + KService::List *list = info->dictCategories.find(cat); if (!list) { list = new KService::List(); @@ -603,7 +603,7 @@ VFolderMenu::mergeMenus(TQDomElement &docElem, TQString &name) else if( e.tagName() == "Menu") { TQString name; mergeMenus(e, name); - TQMap<TQString,TQDomElement>::iterator it = menuNodes.tqfind(name); + TQMap<TQString,TQDomElement>::iterator it = menuNodes.find(name); if (it != menuNodes.end()) { TQDomElement docElem2 = *it; @@ -719,7 +719,7 @@ VFolderMenu::pushDocInfo(const TQString &fileName, const TQString &baseDir) return; } int i; - i = baseName.tqfindRev('/'); + i = baseName.findRev('/'); if (i > 0) { m_docInfo.baseDir = baseName.left(i+1); @@ -739,7 +739,7 @@ VFolderMenu::pushDocInfoParent(const TQString &basePath, const TQString &baseDir m_docInfo.baseDir = baseDir; - TQString fileName = basePath.mid(basePath.tqfindRev('/')+1); + TQString fileName = basePath.mid(basePath.findRev('/')+1); m_docInfo.baseName = fileName.left( fileName.length() - 5 ); TQString baseName = TQDir::cleanDirPath(m_docInfo.baseDir + fileName); @@ -937,7 +937,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items) FOR_ALL_APPLICATIONS(it) { KService *s = it.current(); - items->tqreplace(s->menuId(), s); + items->replace(s->menuId(), s); } FOR_ALL_APPLICATIONS_END @@ -958,7 +958,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items) FOR_CATEGORY(domElem.text(), it) { KService *s = *it; - items->tqreplace(s->menuId(), s); + items->replace(s->menuId(), s); } FOR_CATEGORY_END } @@ -967,7 +967,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items) FOR_ALL_APPLICATIONS(it) { KService *s = it.current(); - items->tqreplace(s->menuId(), s); + items->replace(s->menuId(), s); } FOR_ALL_APPLICATIONS_END } @@ -977,7 +977,7 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items) kdDebug(7021) << "Adding file " << filename << endl; KService *s = findApplication(filename); if (s) - items->tqreplace(filename, s); + items->replace(filename, s); } } @@ -1071,7 +1071,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl; { TQString id = name; // Strip path from id - int i = id.tqfindRev('/'); + int i = id.findRev('/'); if (i >= 0) id = id.mid(i+1); @@ -1079,7 +1079,7 @@ kdDebug(7021) << "processKDELegacyDirs()" << endl; // TODO: add Legacy category addApplication(id, service); - items.tqreplace(service->menuId(), service); + items.replace(service->menuId(), service); if (service->categories().isEmpty()) insertService(m_currentMenu, name, service); @@ -1144,10 +1144,10 @@ kdDebug(7021) << "processLegacyDir(" << dir << ", " << relDir << ", " << prefix // TODO: Add legacy category addApplication(id, service); - items.tqreplace(service->menuId(), service); + items.replace(service->menuId(), service); if (service->categories().isEmpty()) - m_currentMenu->items.tqreplace(id, service); + m_currentMenu->items.replace(id, service); } } } @@ -1305,7 +1305,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for <KDE>" << endl; processKDELegacyDirs(); - m_legacyNodes.tqreplace("<KDE>", m_currentMenu); + m_legacyNodes.replace("<KDE>", m_currentMenu); m_currentMenu = oldMenu; kdeLegacyDirsDone = true; @@ -1318,7 +1318,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for <KDE>" << endl; TQString prefix = e.attributes().namedItem("prefix").toAttr().value(); - if (m_defaultLegacyDirs.tqcontains(dir)) + if (m_defaultLegacyDirs.contains(dir)) { if (!kdeLegacyDirsDone) { @@ -1328,7 +1328,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl; processKDELegacyDirs(); - m_legacyNodes.tqreplace("<KDE>", m_currentMenu); + m_legacyNodes.replace("<KDE>", m_currentMenu); m_currentMenu = oldMenu; kdeLegacyDirsDone = true; @@ -1343,7 +1343,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl; processLegacyDir(dir, TQString::null, prefix); - m_legacyNodes.tqreplace(dir, m_currentMenu); + m_legacyNodes.replace(dir, m_currentMenu); m_currentMenu = oldMenu; } } @@ -1421,7 +1421,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl; { // Add legacy nodes to Menu structure TQString dir = absoluteDir(e.text(), e.attribute("__BaseDir")); - SubMenu *legacyMenu = m_legacyNodes.tqfind(dir); + SubMenu *legacyMenu = m_legacyNodes.find(dir); if (legacyMenu) { mergeMenu(m_currentMenu, legacyMenu); @@ -1432,7 +1432,7 @@ kdDebug(7021) << "Processing KDE Legacy dirs for " << dir << endl; { // Add legacy nodes to Menu structure TQString dir = "<KDE>"; - SubMenu *legacyMenu = m_legacyNodes.tqfind(dir); + SubMenu *legacyMenu = m_legacyNodes.find(dir); if (legacyMenu) { mergeMenu(m_currentMenu, legacyMenu); @@ -1618,7 +1618,7 @@ VFolderMenu::markUsedApplications(TQDict<KService> *items) { for(TQDictIterator<KService> it(*items); it.current(); ++it) { - m_usedAppsDict.tqreplace(it.current()->menuId(), it.current()); + m_usedAppsDict.replace(it.current()->menuId(), it.current()); } } |