From 627b091fad9df13695f249588e8a58f524eda0fa Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- konq-plugins/adblock/adblock.cpp | 4 +- konq-plugins/akregator/akregatorplugin.cpp | 10 ++--- konq-plugins/akregator/konqfeedicon.cpp | 2 +- konq-plugins/arkplugin/arkplugin.cpp | 10 ++--- konq-plugins/dirfilter/dirfilterplugin.cpp | 6 +-- konq-plugins/domtreeviewer/domtreecommands.cpp | 4 +- konq-plugins/domtreeviewer/domtreeview.cpp | 4 +- konq-plugins/fsview/fsview.cpp | 4 +- konq-plugins/fsview/treemap.cpp | 24 +++++------ konq-plugins/fsview/treemap.h | 2 +- konq-plugins/imagerotation/exif.py | 2 +- konq-plugins/kuick/kdirmenu.cpp | 4 +- konq-plugins/kuick/kmetamenu.cpp | 4 +- konq-plugins/kuick/kuick_plugin.cpp | 2 +- konq-plugins/rellinks/plugin_rellinks.cpp | 8 ++-- konq-plugins/rsync/rsyncplugin.cpp | 46 +++++++++++----------- konq-plugins/searchbar/searchbar.cpp | 18 ++++----- konq-plugins/sidebar/mediaplayer/mediawidget.cpp | 2 +- konq-plugins/sidebar/metabar/Doxyfile | 2 +- konq-plugins/sidebar/metabar/src/configdialog.cpp | 6 +-- konq-plugins/sidebar/metabar/src/defaultplugin.cpp | 2 +- konq-plugins/sidebar/metabar/src/httpplugin.cpp | 8 ++-- konq-plugins/sidebar/metabar/src/metabarwidget.cpp | 2 +- konq-plugins/sidebar/metabar/src/serviceloader.cpp | 8 ++-- .../sidebar/newsticker/nsstacktabwidget.cpp | 8 ++-- konq-plugins/sidebar/newsticker/sidebar_news.cpp | 2 +- konq-plugins/uachanger/uachangerplugin.cpp | 16 ++++---- konq-plugins/validators/plugin_validators.cpp | 2 +- konq-plugins/webarchiver/archivedialog.cpp | 12 +++--- konq-plugins/webarchiver/plugin_webarchiver.cpp | 10 ++--- 30 files changed, 117 insertions(+), 117 deletions(-) (limited to 'konq-plugins') diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index 9d0fdb3..74d07cd 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -176,7 +176,7 @@ void AdBlock::fillWithImages(AdElementList &elements) if (!url.isEmpty() && url != m_part->baseURL().url()) { AdElement element(url, "image", "IMG", false); - if (!elements.tqcontains( element )) + if (!elements.contains( element )) elements.append( element); } } @@ -203,7 +203,7 @@ void AdBlock::fillWithHtmlTag(AdElementList &elements, if (!url.isEmpty() && url != m_part->baseURL().url()) { AdElement element(url, tagName.string(), category, false); - if (!elements.tqcontains( element )) + if (!elements.contains( element )) elements.append( element); } } diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index 4402cd4..684bc20 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -103,16 +103,16 @@ AkregatorMenu::~AkregatorMenu() bool AkregatorMenu::isFeedUrl(const TQString &url) { - if (url.tqcontains(".htm", false) != 0) return false; - if (url.tqcontains("rss", false) != 0) return true; - if (url.tqcontains("rdf", false) != 0) return true; - if (url.tqcontains("xml", false) != 0) return true; + if (url.contains(".htm", false) != 0) return false; + if (url.contains("rss", false) != 0) return true; + if (url.contains("rdf", false) != 0) return true; + if (url.contains("xml", false) != 0) return true; return false; } bool AkregatorMenu::isFeedUrl(const KFileItem * item) { - if ( m_feedMimeTypes.tqcontains( item->mimetype() ) ) + if ( m_feedMimeTypes.contains( item->mimetype() ) ) return true; else { diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index a1b993e..f8cedbd 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -110,7 +110,7 @@ bool KonqFeedIcon::feedFound() for (unsigned int j = 0; j < node.attributes().length(); j++) { doc += node.attributes().item(j).nodeName().string() + "=\""; - doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).tqreplace("\"", """); + doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).replace("\"", """); doc += "\" "; } doc += "/>"; diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index c1d18a1..6c49555 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -73,7 +73,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis while ( ( item = it.current() ) != 0 ) { ++it; - if ( m_extractMimeTypes.tqcontains( item->mimetype() ) ) + if ( m_extractMimeTypes.contains( item->mimetype() ) ) { hasArchives = true; } @@ -442,7 +442,7 @@ void ArkMenu::stripExtension( TQString & name ) ext = (*it).remove( '*' ); if ( name.endsWith( ext ) ) { - name = name.left( name.tqfindRev( ext ) ) + '/'; + name = name.left( name.findRev( ext ) ) + '/'; break; } } @@ -456,13 +456,13 @@ void ArkMenu::slotCompressAs( int pos ) TQStringList filelist( m_urlStringList ); //if KMimeType returns .ZIP, .7Z or .RAR. convert them to lowercase - if ( m_extensionList[ pos ].tqcontains ( ".ZIP" ) ) + if ( m_extensionList[ pos ].contains ( ".ZIP" ) ) m_extensionList[ pos ] = ".zip"; - if ( m_extensionList[ pos ].tqcontains ( ".RAR" ) ) + if ( m_extensionList[ pos ].contains ( ".RAR" ) ) m_extensionList[ pos ] = ".rar"; - if ( m_extensionList[ pos ].tqcontains ( ".7Z" ) ) + if ( m_extensionList[ pos ].contains ( ".7Z" ) ) m_extensionList[ pos ] = ".7z"; if ( filelist.count() == 1) diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index ea5fe77..eb06bbc 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -438,11 +438,11 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list) continue; TQString mimeType = mime->name(); - if (!m_pMimeInfo.tqcontains (mimeType)) + if (!m_pMimeInfo.contains (mimeType)) { MimeInfo& mimeInfo = m_pMimeInfo[mimeType]; TQStringList filters = m_part->mimeFilter (); - mimeInfo.useAsFilter = (!filters.isEmpty () && filters.tqcontains (mimeType)); + mimeInfo.useAsFilter = (!filters.isEmpty () && filters.contains (mimeType)); mimeInfo.mimeComment = mime->comment(); mimeInfo.iconName = mime->icon(KURL(), false); mimeInfo.filenames.insert(name, false); @@ -474,7 +474,7 @@ void DirFilterPlugin::slotItemRemoved (const KFileItem* item) TQString mimeType = item->mimetype().stripWhiteSpace(); - if (m_pMimeInfo.tqcontains (mimeType)) { + if (m_pMimeInfo.contains (mimeType)) { MimeInfo info = m_pMimeInfo [mimeType]; if (info.filenames.size () > 1) diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp index e8f8f05..7eef49d 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.cpp +++ b/konq-plugins/domtreeviewer/domtreecommands.cpp @@ -401,8 +401,8 @@ void ChangeCDataCommand::apply() if (!shouldReapply()) { oldValue = cdata.data(); has_newlines = - TQConstString(value.tqunicode(), value.length()).string().tqcontains('\n') - || TQConstString(oldValue.tqunicode(), oldValue.length()).string().tqcontains('\n'); + TQConstString(value.tqunicode(), value.length()).string().contains('\n') + || TQConstString(oldValue.tqunicode(), oldValue.length()).string().contains('\n'); } cdata.setData(value); addChangedNode(cdata); diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index fb0760a..84f78ac 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -503,7 +503,7 @@ void DOMTreeView::searchRecursive(DOMListViewItem* cur_item, const TQString& sea bool caseSensitive) { const TQString text(cur_item->text(0)); - if (text.tqcontains(searchText, caseSensitive) > 0) { + if (text.contains(searchText, caseSensitive) > 0) { cur_item->setUnderline(true); cur_item->setItalic(true); m_listView->setCurrentItem(cur_item); @@ -1168,7 +1168,7 @@ void DOMTreeView::slotEditAttribute(TQListViewItem *lvi, const TQPoint &, int co slotItemRenamed(lvi, attrName, 0); // Reget, item may have been changed - lvi = nodeAttributes->tqfindItem(attrName, 0); + lvi = nodeAttributes->findItem(attrName, 0); } if (lvi && lvi->text(1) != attrValue) diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index 48d97f7..a22e8b2 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -133,7 +133,7 @@ void FSView::setPath(TQString p) if (!fi.isDir()) { _path = fi.dirPath(true); } - _pathDepth = _path.tqcontains('/'); + _pathDepth = _path.contains('/'); KURL u; u.setPath(_path); @@ -170,7 +170,7 @@ bool FSView::getDirMetric(const TQString& k, { TQMap::iterator it; - it = _dirMetric.tqfind(k); + it = _dirMetric.find(k); if (it == _dirMetric.end()) return false; s = (*it).size; diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index 285230d..f77b37f 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -1093,7 +1093,7 @@ void TreeMapTip::maybeTip( const TQPoint& pos ) if (rList) { TQRect* r; for(r=rList->first();r;r=rList->next()) - if (r->tqcontains(pos)) + if (r->contains(pos)) tip(*r, p->tipString(i)); } } @@ -1433,10 +1433,10 @@ void TreeMapWidget::setMinimalArea(int area) void TreeMapWidget::deletingItem(TreeMapItem* i) { // remove any references to the item to be deleted - while(_selection.tqfindRef(i) > -1) + while(_selection.findRef(i) > -1) _selection.remove(); - while(_tmpSelection.tqfindRef(i) > -1) + while(_tmpSelection.findRef(i) > -1) _tmpSelection.remove(); if (_current == i) _current = 0; @@ -1478,7 +1478,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const TreeMapItem* p = _base; TreeMapItem* i; - if (!TQT_TQRECT_OBJECT(rect()).tqcontains(x, y)) return 0; + if (!TQT_TQRECT_OBJECT(rect()).contains(x, y)) return 0; if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl; while (1) { @@ -1495,7 +1495,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const << "-" << i->tqitemRect().width() << "x" << i->tqitemRect().height() << ")" << endl; - if (i->tqitemRect().tqcontains(x, y)) { + if (i->tqitemRect().contains(x, y)) { if (DEBUG_DRAWING) kdDebug(90100) << " .. Got. Index " << idx << endl; @@ -1546,7 +1546,7 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const (i->tqitemRect().height() <1))) { TreeMapItem* p = i->tqparent(); if (!p) break; - int idx = p->tqchildren()->tqfindRef(i); + int idx = p->tqchildren()->findRef(i); idx--; if (idx<0) i = p; @@ -1596,12 +1596,12 @@ TreeMapItemList TreeMapWidget::diff(TreeMapItemList& l1, TreeMapItem* item; while ( (item = it1.current()) != 0 ) { ++it1; - if (l2.tqcontainsRef(item) > 0) continue; + if (l2.containsRef(item) > 0) continue; l.append(item); } while ( (item = it2.current()) != 0 ) { ++it2; - if (l1.tqcontainsRef(item) > 0) continue; + if (l1.containsRef(item) > 0) continue; l.append(item); } @@ -1668,12 +1668,12 @@ bool TreeMapWidget::clearSelection(TreeMapItem* tqparent) bool TreeMapWidget::isSelected(TreeMapItem* i) const { - return _selection.tqcontainsRef(i)>0; + return _selection.containsRef(i)>0; } bool TreeMapWidget::isTmpSelected(TreeMapItem* i) { - return _tmpSelection.tqcontainsRef(i)>0; + return _tmpSelection.containsRef(i)>0; } @@ -1938,7 +1938,7 @@ int nextVisible(TreeMapItem* i) TreeMapItem* p = i->tqparent(); if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->tqchildren()->tqfindRef(i); + int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; while (idx < (int)p->tqchildren()->count()-1) { @@ -1956,7 +1956,7 @@ int prevVisible(TreeMapItem* i) TreeMapItem* p = i->tqparent(); if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->tqchildren()->tqfindRef(i); + int idx = p->tqchildren()->findRef(i); if (idx<0) return -1; while (idx > 0) { diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index 47665ea..8ce6aca 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -321,7 +321,7 @@ public: virtual double sum() const; virtual double value() const; - // tqreplace "Default" position with setting from TreeMapWidget + // replace "Default" position with setting from TreeMapWidget virtual Position position(int) const; virtual const TQFont& font() const; virtual bool isMarked(int) const; diff --git a/konq-plugins/imagerotation/exif.py b/konq-plugins/imagerotation/exif.py index f056b51..ea65c6e 100755 --- a/konq-plugins/imagerotation/exif.py +++ b/konq-plugins/imagerotation/exif.py @@ -763,7 +763,7 @@ class EXIF_header: # special case: null-terminated ASCII string if count != 0: self.file.seek(self.offset+offset) - values=self.file.read(count).strip().tqreplace('\x00','') + values=self.file.read(count).strip().replace('\x00','') else: values='' elif tag == 0x927C or tag == 0x9286: # MakerNote or UserComment diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 1174ee3..22d45b4 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -76,10 +76,10 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { KIcon::DefaultState, 0, true); if(icon.isNull()) icon = CICON("folder"); - insertItem( icon, escapedPath.tqreplace( "&", "&&" ), submenu ); + insertItem( icon, escapedPath.replace( "&", "&&" ), submenu ); } else - insertItem( folder, escapedPath.tqreplace( "&", "&&" ), submenu ); + insertItem( folder, escapedPath.replace( "&", "&&" ), submenu ); tqchildren.append( submenu ); connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)), this, TQT_SLOT(slotFileSelected(const TQString &))); diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index 451f127..90682ac 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -85,7 +85,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, } if ( url.isLocalFile() - && dirList.tqfind( url.path() ) == dirList.end() + && dirList.find( url.path() ) == dirList.end() && TQFileInfo( url.path() ).isWritable() && TQFileInfo( url.path() ).isDir() && kapp->authorizeURLAction("list", url, url) ) @@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, continue; } TQString escapedDir = *it; - KAction *action = new KAction(escapedDir.tqreplace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this)); + KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this)); action->plug(this ); actions.append( action ); ++it; diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 27152e7..9ea88a8 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -82,7 +82,7 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... for(int i= popup->count(); i >=1; i--) { int id = popup->idAt( i ); TQString text = popup->text( id ); - if( text.tqcontains("kuick_plugin") ) { + if( text.contains("kuick_plugin") ) { popup->removeItem( id ); if (isKDesktop && !kapp->authorize("editable_desktop_icons")) { diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index e77e1e3..d3576d7 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -91,7 +91,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *tqparent, const char *name, const TQStr kaction_map["last"]->setWhatsThis( i18n("

This link references the end of a sequence of documents.

") ); // ------------ special items -------------------------- - kaction_map["search"] = new KAction( i18n("&Search"), "filetqfind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); + kaction_map["search"] = new KAction( i18n("&Search"), "filefind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); kaction_map["search"]->setWhatsThis( i18n("

This link references the search.

") ); // ------------ Document structure links --------------- @@ -310,7 +310,7 @@ void RelLinksPlugin::updateToolbar() { // escape ampersand before settings as action title, otherwise the menu entry will interpret it as an // accelerator - title.tqreplace('&', "&&"); + title.replace('&', "&&"); // -- Menus activation -- @@ -561,7 +561,7 @@ void RelLinksPlugin::disableAll() { TQString RelLinksPlugin::getLinkType(const TQString &lrel) { // Relations to ignore... - if (lrel.tqcontains("stylesheet") + if (lrel.contains("stylesheet") || lrel == "script" || lrel == "icon" || lrel == "shortcut icon" @@ -583,7 +583,7 @@ TQString RelLinksPlugin::getLinkType(const TQString &lrel) { return "last"; if (lrel == "toc") return "contents"; - if (lrel == "tqfind") + if (lrel == "find") return "search"; if (lrel == "alternative stylesheet") return "alternate stylesheet"; diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index b223a93..a0987ff 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -521,7 +521,7 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { buf.truncate(buf.length()-1); myDebug( << "establishing: got " << buf << endl); - while (childPid && ((pos = buf.tqfind('\n')) >= 0 || buf.endsWith(":") || buf.endsWith("?"))) { + while (childPid && ((pos = buf.find('\n')) >= 0 || buf.endsWith(":") || buf.endsWith("?"))) { if (m_progressDialogExists == true) { tqApp->processEvents(); } @@ -530,8 +530,8 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { buf = buf.mid(pos); if (str == "\n") continue; - //if (str.tqcontains("rsync error:")) { - if (str.tqcontains("rsync:") || str.tqcontains("failed.") || (str.tqcontains("Could not") && str.endsWith("."))) { + //if (str.contains("rsync error:")) { + if (str.contains("rsync:") || str.contains("failed.") || (str.contains("Could not") && str.endsWith("."))) { KMessageBox::error(NULL, str); } else if (!str.isEmpty()) { @@ -590,20 +590,20 @@ int RsyncPlugin::establishConnectionRsync(char *buffer, KIO::fileoffset_t len) { } if (m_progressDialogExists == true) { - if (str.tqcontains("exit()") && str.tqcontains("ICE default IO")) { + if (str.contains("exit()") && str.contains("ICE default IO")) { if (m_progressDialogExists == true) { m_progressDialog->progressBar()->setValue(m_progressDialog->progressBar()->totalSteps()); } } else { - if (str.tqcontains(", to-check=")) { + if (str.contains(", to-check=")) { // Parse the to-check output TQString tocheck_out_cur; TQString tocheck_out_tot; - tocheck_out_cur = str.mid(str.tqfind(", to-check=") + 11, str.length()); - tocheck_out_tot = tocheck_out_cur.mid(tocheck_out_cur.tqfind("/") + 1, tocheck_out_cur.length()); - tocheck_out_cur = tocheck_out_cur.left(tocheck_out_cur.tqfind("/")); - tocheck_out_tot = tocheck_out_tot.left(tocheck_out_tot.tqfind(")")); + tocheck_out_cur = str.mid(str.find(", to-check=") + 11, str.length()); + tocheck_out_tot = tocheck_out_cur.mid(tocheck_out_cur.find("/") + 1, tocheck_out_cur.length()); + tocheck_out_cur = tocheck_out_cur.left(tocheck_out_cur.find("/")); + tocheck_out_tot = tocheck_out_tot.left(tocheck_out_tot.find(")")); m_progressDialog->progressBar()->setTotalSteps(tocheck_out_tot.toInt()-1); m_progressDialog->progressBar()->setValue(tocheck_out_tot.toInt()-tocheck_out_cur.toInt()-2); } @@ -629,7 +629,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, buf.truncate(buf.length()-1); myDebug( << "establishing: got " << buf << endl); - while (childPid && (((pos = buf.tqfind('\n')) >= 0) || buf.endsWith(":") || buf.endsWith("?") || buf.endsWith("]"))) { + while (childPid && (((pos = buf.find('\n')) >= 0) || buf.endsWith(":") || buf.endsWith("?") || buf.endsWith("]"))) { if (m_progressDialogExists == true) { tqApp->processEvents(); } @@ -638,8 +638,8 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, buf = buf.mid(pos); if (str == "\n") continue; - //if (str.tqcontains("rsync error:")) { - if (str.tqcontains("rsync:") || str.tqcontains("failed.") || (str.tqcontains("Could not") && str.endsWith("."))) { + //if (str.contains("rsync error:")) { + if (str.contains("rsync:") || str.contains("failed.") || (str.contains("Could not") && str.endsWith("."))) { KMessageBox::error(NULL, str); } else if (!str.isEmpty()) { @@ -686,7 +686,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, return 0; } else if (buf.endsWith("?") || buf.endsWith("? []")) { - buf.tqreplace("[]", ""); + buf.replace("[]", ""); if (buf.endsWith("? []")) { int rc = KMessageBox::questionYesNo(NULL, buf); if (rc == KMessageBox::Yes) { @@ -717,8 +717,8 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, } TQString file_name; file_name = buf; - file_name.tqreplace("[]", ""); - file_name.tqreplace(TQString("changed "), ""); + file_name.replace("[]", ""); + file_name.replace(TQString("changed "), ""); //file_name = file_name.simplifyWhiteSpace(); KDialogBase *dialog= new KDialogBase(i18n("User Intervention Required"), KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel, KDialogBase::Yes, KDialogBase::Cancel, NULL, "warningYesNoCancel", true, true, i18n("Use &Local File"), i18n("Use &Remote File"), i18n("&Ignore")); int rc = KMessageBox::createKMessageBox(dialog, TQMessageBox::Warning, TQString("") + i18n("WARNING: Both the local and remote file have been modified") + TQString("

") + i18n("Local") + TQString(": ") + localfolder + TQString("/") + file_name + TQString("
") + i18n("Remote") + TQString(": ") + remotepath + TQString("/") + file_name + TQString("

") + i18n("Please select the file to duplicate (the other will be overwritten)") + TQString("
") + i18n("Or, select Ignore to skip synchronization of this file for now"), TQStringList(), TQString(), NULL, 1); @@ -735,7 +735,7 @@ int RsyncPlugin::establishConnectionUnison(char *buffer, KIO::fileoffset_t len, } if (m_progressDialogExists == true) { - if (str.tqcontains("exit()") && str.tqcontains("ICE default IO")) { + if (str.contains("exit()") && str.contains("ICE default IO")) { if (m_progressDialogExists == true) { m_progressDialog->progressBar()->setFormat("%v / %m"); m_progressDialog->progressBar()->setTotalSteps(2); @@ -822,7 +822,7 @@ TQString RsyncPlugin::findLocalFolderByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -841,7 +841,7 @@ TQString RsyncPlugin::findSyncMethodByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -860,7 +860,7 @@ TQString RsyncPlugin::findLoginSyncEnabledByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -879,7 +879,7 @@ TQString RsyncPlugin::findLogoutSyncEnabledByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -898,7 +898,7 @@ TQString RsyncPlugin::findTimedSyncEnabledByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i++; @@ -917,7 +917,7 @@ int RsyncPlugin::deleteLocalFolderByName(TQString folderurl) { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); for (TQStringList::Iterator i(cfgfolderlist.begin()); i != cfgfolderlist.end(); ++i) { if (TQString::compare((*i), folderurl_stripped) == 0) { i=cfgfolderlist.remove(i); @@ -937,7 +937,7 @@ int RsyncPlugin::addLocalFolderByName(TQString folderurl, TQString remoteurl, TQ { TQString folderurl_stripped; folderurl_stripped = folderurl; - folderurl_stripped.tqreplace(TQString("file://"), TQString("")); + folderurl_stripped.replace(TQString("file://"), TQString("")); cfgfolderlist.append(folderurl); cfgfolderlist.append(remoteurl); cfgfolderlist.append(syncmethod); diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index b4cf210..aa9dc27 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -206,7 +206,7 @@ void SearchBarPlugin::nextSearchEntry() } else { - TQStringList::ConstIterator it = m_searchEngines.tqfind(m_currentEngine); + TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); it++; if(it==m_searchEngines.end()) { @@ -236,7 +236,7 @@ void SearchBarPlugin::previousSearchEntry() } else { - TQStringList::ConstIterator it = m_searchEngines.tqfind(m_currentEngine); + TQStringList::ConstIterator it = m_searchEngines.find(m_currentEngine); if(it==m_searchEngines.begin()) { m_searchMode = FindInThisPage; @@ -318,7 +318,7 @@ void SearchBarPlugin::setIcon() TQString hinttext; if(m_searchMode == FindInThisPage) { - m_searchIcon = SmallIcon("tqfind"); + m_searchIcon = SmallIcon("find"); hinttext = i18n("Find in This Page"); } else @@ -382,7 +382,7 @@ void SearchBarPlugin::showSelectionMenu() list << "kurisearchfilter" << "kuriikwsfilter"; m_popupMenu = new TQPopupMenu(m_searchCombo, "search selection menu"); - m_popupMenu->insertItem(SmallIcon("tqfind"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()), 0, 999); + m_popupMenu->insertItem(SmallIcon("find"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()), 0, 999); m_popupMenu->insertSeparator(); int i=-1; @@ -681,12 +681,12 @@ void SearchBarPlugin::gsJobFinished(KIO::Job* job) if (((KIO::TransferJob*)job)->error() == 0) { TQString temp; - temp = m_gsData.mid(m_gsData.tqfind('(') + 1, m_gsData.tqfindRev(')') - m_gsData.tqfind('(') - 1); - temp = temp.mid(temp.tqfind('(') + 1, temp.tqfind(')') - temp.tqfind('(') - 1); + temp = m_gsData.mid(m_gsData.find('(') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1); + temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1); temp.remove('"'); TQStringList compList1 = TQStringList::split(',', temp); - temp = m_gsData.mid(m_gsData.tqfind(')') + 1, m_gsData.tqfindRev(')') - m_gsData.tqfind('(') - 1); - temp = temp.mid(temp.tqfind('(') + 1, temp.tqfind(')') - temp.tqfind('(') - 1); + temp = m_gsData.mid(m_gsData.find(')') + 1, m_gsData.findRev(')') - m_gsData.find('(') - 1); + temp = temp.mid(temp.find('(') + 1, temp.find(')') - temp.find('(') - 1); temp.remove('"'); temp.remove(','); temp.remove('s'); @@ -723,7 +723,7 @@ void SearchBarPlugin::gsSetCompletedText(const TQString& text) currentText = m_searchCombo->currentText(); if (currentText == text.left(currentText.length())) { - m_searchCombo->lineEdit()->setText(text.left(text.tqfind('(') - 1)); + m_searchCombo->lineEdit()->setText(text.left(text.find('(') - 1)); m_searchCombo->lineEdit()->setCursorPosition(currentText.length()); m_searchCombo->lineEdit()->setSelection(currentText.length(), m_searchCombo->currentText().length() - currentText.length()); } diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index a95ae83..436b678 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -100,7 +100,7 @@ void KSB_MediaWidget::playerTimeout() Position->setRange(0, range); if (needLengthUpdate) { - int counter = player->lengthString().length() - (player->lengthString().tqfind("/")+1); + int counter = player->lengthString().length() - (player->lengthString().find("/")+1); TQString length=player->lengthString().right(counter); needLengthUpdate=false; } diff --git a/konq-plugins/sidebar/metabar/Doxyfile b/konq-plugins/sidebar/metabar/Doxyfile index 4dfd560..586093d 100644 --- a/konq-plugins/sidebar/metabar/Doxyfile +++ b/konq-plugins/sidebar/metabar/Doxyfile @@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \ is \ provides \ specifies \ - tqcontains \ + contains \ represents \ a \ an \ diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index ebcf170..e6acdbd 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -222,7 +222,7 @@ ConfigDialog::ConfigDialog(TQWidget *tqparent, const char *name) : TQDialog(tqpa ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), *it, text, SmallIcon("network")); - TQListBoxItem *avItem = actionSelector->availableListBox()->tqfindItem(text, TQt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, TQt::ExactMatch); if(avItem){ delete avItem; } @@ -236,7 +236,7 @@ ConfigDialog::ConfigDialog(TQWidget *tqparent, const char *name) : TQDialog(tqpa ActionListItem *item = new ActionListItem(actionSelector->selectedListBox(), TQString(*it), text, SmallIcon(icon)); - TQListBoxItem *avItem = actionSelector->availableListBox()->tqfindItem(text, TQt::ExactMatch); + TQListBoxItem *avItem = actionSelector->availableListBox()->findItem(text, TQt::ExactMatch); if(avItem){ delete avItem; } @@ -576,7 +576,7 @@ void ConfigDialog::loadThemes() theme_list.remove(".."); themes->insertStringList(theme_list); - if(theme_list.tqfind(theme) != theme_list.end()){ + if(theme_list.find(theme) != theme_list.end()){ foundTheme = true; } } diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index 5839a64..3f2f7c9 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -418,7 +418,7 @@ bool DefaultPlugin::handleRequest(const KURL &url) if(protocol == "exec"){ int id = url.host().toInt(); - TQMap::Iterator it = runMap.tqfind(id); + TQMap::Iterator it = runMap.find(id); if(it != runMap.end()){ KFileItem *item = m_items.getFirst(); diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp index b90852d..aa09cd3 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp @@ -60,10 +60,10 @@ void HTTPPlugin::killJobs() void HTTPPlugin::loadInformation(DOM::HTMLElement node) { /*DOM::DOMString innerHTML; - innerHTML += "

"; + innerHTML += ""; innerHTML += "
    "; innerHTML += i18n("Keyword"); - innerHTML += "
"; innerHTML += "
    setUserStyleSheet(tmp); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index c9ac8b4..8ef445c 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -52,7 +52,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int KURL url = item.url(); TQString mimeType = item.mimetype(); - TQString mimeGroup = mimeType.left(mimeType.tqfind('/')); + TQString mimeGroup = mimeType.left(mimeType.find('/')); urlList.clear(); urlList.append(url); @@ -96,7 +96,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int if(cfg.hasKey("X-KDE-Require")){ const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" ); - if (capabilities.tqcontains( "Write" )){ + if (capabilities.contains( "Write" )){ continue; } } @@ -123,7 +123,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int // if we have a mimetype, see if we have an exact or a type globbed match if(!ok && (!mimeType.isEmpty() && *it == mimeType) || - (!mimeGroup.isEmpty() && ((*it).right(1) == "*" && (*it).left((*it).tqfind('/')) == mimeGroup))) + (!mimeGroup.isEmpty() && ((*it).right(1) == "*" && (*it).left((*it).find('/')) == mimeGroup))) { checkTheMimetypes = true; } @@ -132,7 +132,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int ok = true; for(TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex){ - if( ((*itex).right(1) == "*" && (*itex).left((*itex).tqfind('/')) == mimeGroup) || + if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) || ((*itex) == mimeType)) { ok = false; diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index 9c29b7c..f8a1c92 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -161,7 +161,7 @@ namespace KSB_News { void NSStackTabWidget::updateTitle(NSPanel *nsp) { - TQPushButton *pb = (TQPushButton *)pagesheader.tqfind(nsp); + TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); if (! pb->pixmap()) pb->setText(nsp->title()); } @@ -169,7 +169,7 @@ namespace KSB_News { void NSStackTabWidget::updatePixmap(NSPanel *nsp) { - TQPushButton *pb = (TQPushButton *)pagesheader.tqfind(nsp); + TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp); TQPixmap pixmap = nsp->pixmap(); if ((pixmap.width() > 88) || (pixmap.height() > 31)) { TQImage image = pixmap.convertToImage(); @@ -197,7 +197,7 @@ namespace KSB_News { return; // Find current ScrollView - TQWidget *sv = pages.tqfind(nsp); + TQWidget *sv = pages.find(nsp); // Change visible page if (currentPage != sv) { @@ -352,7 +352,7 @@ namespace KSB_News { bool NSStackTabWidget::isRegistered(const TQString &key) { m_our_rsssources = SidebarSettings::sources(); - if (m_our_rsssources.tqfindIndex(key) == -1) + if (m_our_rsssources.findIndex(key) == -1) return false; else return true; diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index 97f24e3..d59413d 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -191,7 +191,7 @@ namespace KSB_News { if (NSPanel *nsp = getNSPanelByKey(key)) { newswidget->delStackTab(nsp); - delete nspanelptrlist.take(nspanelptrlist.tqfindRef(nsp)); + delete nspanelptrlist.take(nspanelptrlist.findRef(nsp)); } else kdWarning() << "removedSource called for non-existing id" << endl; diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index fb5d840..f76f0de 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -101,10 +101,10 @@ void UAChangerPlugin::parseDescFiles() TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - TQStringList::Iterator it = languageList.tqfind(TQFL1("C")); + TQStringList::Iterator it = languageList.find(TQFL1("C")); if( it != languageList.end() ) { - if( languageList.tqcontains( TQFL1("en") ) > 0 ) + if( languageList.contains( TQFL1("en") ) > 0 ) languageList.remove( it ); else (*it) = TQFL1("en"); @@ -124,14 +124,14 @@ void UAChangerPlugin::parseDescFiles() if ( (*it)->property("X-KDE-UA-DYNAMIC-ENTRY").toBool() ) { - tmp.tqreplace( TQFL1("appSysName"), TQFL1(utsn.sysname) ); - tmp.tqreplace( TQFL1("appSysRelease"), TQFL1(utsn.release) ); - tmp.tqreplace( TQFL1("appMachineType"), TQFL1(utsn.machine) ); - tmp.tqreplace( TQFL1("appLanguage"), languageList.join(TQFL1(", ")) ); - tmp.tqreplace( TQFL1("appPlatform"), TQFL1("X11") ); + tmp.replace( TQFL1("appSysName"), TQFL1(utsn.sysname) ); + tmp.replace( TQFL1("appSysRelease"), TQFL1(utsn.release) ); + tmp.replace( TQFL1("appMachineType"), TQFL1(utsn.machine) ); + tmp.replace( TQFL1("appLanguage"), languageList.join(TQFL1(", ")) ); + tmp.replace( TQFL1("appPlatform"), TQFL1("X11") ); } - if ( m_lstIdentity.tqcontains(tmp) ) + if ( m_lstIdentity.contains(tmp) ) continue; // Ignore dups! m_lstIdentity << tmp; diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index 3ee1f91..6bd4fee 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -181,7 +181,7 @@ void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) { KMessageBox::sorry( m_part->widget(), - i18n("The selected URL cannot be verified because it tqcontains " + i18n("The selected URL cannot be verified because it contains " "a password. Sending this URL to %1 would put the security " "of %2 at risk.") .tqarg(validatorUrl.host()).tqarg(partUrl.host())); diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index 77ca40d..802b2fe 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -284,7 +284,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas ((nodeName == "IMG" || nodeName == "INPUT" || nodeName == "SCRIPT") && attrName == "SRC") || ((nodeName == "BODY" || nodeName == "TABLE" || nodeName == "TH" || nodeName == "TD") && attrName == "BACKGROUND")) { // Some people use carriage return in file names and browsers support that! - attrValue = handleLink(baseURL, attrValue.tqreplace(TQRegExp("\\s"), "")); + attrValue = handleLink(baseURL, attrValue.replace(TQRegExp("\\s"), "")); } /* * ## Make recursion level configurable @@ -425,7 +425,7 @@ void ArchiveDialog::downloadNext() TQString tarFileName; // Only download file once - if (m_downloadedURLDict.tqcontains(url.url())) { + if (m_downloadedURLDict.contains(url.url())) { tarFileName = m_downloadedURLDict[url.url()]; #ifdef DEBUG_WAR kdDebug(90110) << "File already downloaded: " << url.url() @@ -512,7 +512,7 @@ TQString ArchiveDialog::getUniqueFileName(const TQString& fileName) kdDebug(90110) << "getUniqueFileName(..): [" << fileName << "]" << endl; #endif - while (uniqueFileName.isEmpty() || m_linkDict.tqcontains(uniqueFileName)) + while (uniqueFileName.isEmpty() || m_linkDict.contains(uniqueFileName)) uniqueFileName = TQString::number(id++) + fileName; return uniqueFileName; @@ -532,14 +532,14 @@ TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& str int endUrl = 0; int length = string.length(); while (pos < length && pos >= 0) { - pos = str.tqfind("url(", pos); + pos = str.find("url(", pos); if (pos!=-1) { pos += 4; // url( if (str[pos]=='"' || str[pos]=='\'') // CSS 'feature' pos++; startUrl = pos; - pos = str.tqfind(")",startUrl); + pos = str.find(")",startUrl); endUrl = pos; if (str[pos-1]=='"' || str[pos-1]=='\'') // CSS 'feature' endUrl--; @@ -555,7 +555,7 @@ TQString ArchiveDialog::analyzeInternalCSS(const KURL& _url, const TQString& str kdDebug () << "url: " << url << endl; #endif - str = str.tqreplace(startUrl, endUrl-startUrl, url); + str = str.replace(startUrl, endUrl-startUrl, url); pos++; } } diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index 280b0e2..0b6ed68 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -78,12 +78,12 @@ void PluginWebArchiver::slotSaveToArchive() // Replace space with underscore, proposed Frank Pieczynski - archiveName.tqreplace( "\\s:", " "); + archiveName.replace( "\\s:", " "); archiveName = archiveName.simplifyWhiteSpace(); - archiveName.tqreplace( "?", ""); - archiveName.tqreplace( ":", ""); - archiveName.tqreplace( "/", ""); - archiveName = archiveName.tqreplace( TQRegExp("\\s+"), "_"); + archiveName.replace( "?", ""); + archiveName.replace( ":", ""); + archiveName.replace( "/", ""); + archiveName = archiveName.replace( TQRegExp("\\s+"), "_"); archiveName = KGlobalSettings::documentPath() + "/" + archiveName + ".war" ; -- cgit v1.2.1