From 36c36b53a129509d56fdaa0a7c9fcbcacd0c5826 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/kdewebdev@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kimagemapeditor/drawzone.cpp | 8 ++-- kimagemapeditor/imagemap.cpp | 8 ++-- kimagemapeditor/imageslistview.cpp | 8 ++-- kimagemapeditor/kimagemapeditor.cpp | 96 ++++++++++++++++++------------------- kimagemapeditor/kimearea.cpp | 34 ++++++------- kimagemapeditor/kimearea.h | 10 ++-- kimagemapeditor/kimedialogs.cpp | 12 ++--- kimagemapeditor/mapslistview.cpp | 6 +-- kimagemapeditor/qextfileinfo.cpp | 10 ++-- 9 files changed, 96 insertions(+), 96 deletions(-) (limited to 'kimagemapeditor') diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp index 3ed3465a..275fb86f 100644 --- a/kimagemapeditor/drawzone.cpp +++ b/kimagemapeditor/drawzone.cpp @@ -238,7 +238,7 @@ void DrawZone::contentsMousePressEvent(TQMouseEvent* e) drawStart=e->pos(); // Check if it's on picture if not // move it to the picture's border - if (!imageRect.tqcontains(drawStart)) { + if (!imageRect.contains(drawStart)) { if (drawStart.x()>imageRect.right()) drawStart.setX(imageRect.right()); if (drawStart.x()imageRect.right()) drawEnd.setX(imageRect.right()); if (drawEnd.x()selectionPoints()->count()>2) - && (currentArea->selectionPoints()->first()->tqcontains(drawEnd) + && (currentArea->selectionPoints()->first()->contains(drawEnd) || (e->button()==Qt::RightButton))) { currentArea->setFinished(true); @@ -528,7 +528,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e) // If outside the image // set it to the border - if (!imageRect.tqcontains(drawCurrent)) { + if (!imageRect.contains(drawCurrent)) { if (drawCurrent.x()>imageRect.right()) drawCurrent.setX(imageRect.right()); if (drawCurrent.x()pos(); // Check if it's on picture if not // move it to the picture's border - if (!imageRect.tqcontains(drawStart)) { + if (!imageRect.contains(drawStart)) { if (drawStart.x()>imageRect.right()) drawStart.setX(imageRect.right()); if (drawStart.x()imageRect.right()) drawEnd.setX(imageRect.right()); if (drawEnd.x()selectionPoints()->count()>2) - && (currentArea->selectionPoints()->first()->tqcontains(drawEnd) + && (currentArea->selectionPoints()->first()->contains(drawEnd) || (e->button()==RightButton))) { currentArea->setFinished(true); @@ -243,7 +243,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) { // If outside the image // set it to the border - if (!imageRect.tqcontains(drawCurrent)) { + if (!imageRect.contains(drawCurrent)) { if (drawCurrent.x()>imageRect.right()) drawCurrent.setX(imageRect.right()); if (drawCurrent.x()tqfind("src")) - src=*_imageTag->tqfind("src"); - if (_imageTag->tqfind("usemap")) - usemap=*_imageTag->tqfind("usemap"); + if (_imageTag->find("src")) + src=*_imageTag->find("src"); + if (_imageTag->find("usemap")) + usemap=*_imageTag->find("usemap"); setText(0,src); setText(1,usemap); diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index abc6edd1..5a08d551 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -1100,7 +1100,7 @@ void KImageMapEditor::slotSelectionChanged() for ( ; it.current() != 0L; ++it) { - if ( it.current()->listViewItem()->isSelected() != (list.tqcontainsRef(it.current()) > 0) ) + if ( it.current()->listViewItem()->isSelected() != (list.containsRef(it.current()) > 0) ) { it.current()->listViewItem()->isSelected() ? select( it.current() ) @@ -1280,7 +1280,7 @@ void KImageMapEditor::updateUpDownBtn() return; } // if the first Area is in the selection can't move up - if (list.tqfind( areas->getFirst() ) == -1) + if (list.find( areas->getFirst() ) == -1) { forwardOneAction->setEnabled(true); areaListView->upBtn->setEnabled(true); @@ -1293,7 +1293,7 @@ void KImageMapEditor::updateUpDownBtn() drawZone->repaintArea(*currentSelected); // if the last Area is in the selection can't move down - if (list.tqfind( areas->getLast() ) == -1) + if (list.find( areas->getLast() ) == -1) { backOneAction->setEnabled(true); areaListView->downBtn->setEnabled(true); @@ -1315,7 +1315,7 @@ void KImageMapEditor::deselectAll() Area* KImageMapEditor::onArea(const TQPoint & p) const { for (Area* s=areas->first();s!=0L;s=areas->next()) { - if (s->tqcontains(p)) + if (s->contains(p)) return s; } return 0L; @@ -1861,9 +1861,9 @@ bool KImageMapEditor::openHTMLFile(const KURL & url, const TQString & mapName, c attr=new TQDict(getTagAttributes(s,temp)); origcode.append(temp); - if (attr->tqfind("tagname")) { + if (attr->find("tagname")) { - if (attr->tqfind("tagname")->lower()=="img") { + if (attr->find("tagname")->lower()=="img") { HtmlImgElement *el = new HtmlImgElement(origcode); el->imgTag = static_cast(attr); images->append(el->imgTag); @@ -1871,12 +1871,12 @@ bool KImageMapEditor::openHTMLFile(const KURL & url, const TQString & mapName, c origcode = TQString(); } else - if (attr->tqfind("tagname")->lower()=="map") { + if (attr->find("tagname")->lower()=="map") { map = new MapTag(); - map->name=(*attr->tqfind("name")); + map->name=(*attr->find("name")); readMap=true; } else - if (attr->tqfind("tagname")->lower()=="/map") { + if (attr->find("tagname")->lower()=="/map") { readMap=false; maps->append(map); HtmlMapElement *el = new HtmlMapElement(origcode); @@ -1886,7 +1886,7 @@ bool KImageMapEditor::openHTMLFile(const KURL & url, const TQString & mapName, c origcode = TQString(); } else if (readMap) { - if (attr->tqfind("tagname")->lower()=="area") { + if (attr->find("tagname")->lower()=="area") { map->prepend(attr); } } else { @@ -1924,7 +1924,7 @@ bool KImageMapEditor::openHTMLFile(const KURL & url, const TQString & mapName, c if (images->count() == 1) { if (images->first()) { ImageTag* imgTag = images->first(); - TQString *src = imgTag->tqfind("src"); + TQString *src = imgTag->find("src"); if (src) imageUrl = KURL(url,*src); } @@ -1936,12 +1936,12 @@ bool KImageMapEditor::openHTMLFile(const KURL & url, const TQString & mapName, c ImageTag* imageTag; for ( imageTag = images->first(); imageTag; imageTag = images->next() ) { - TQString *usemap = imageTag->tqfind("usemap"); + TQString *usemap = imageTag->find("usemap"); if (usemap) { // Remove the # TQString usemapName = usemap->right(usemap->length()-1); if (usemapName == map->name) { - TQString *src = imageTag->tqfind("src"); + TQString *src = imageTag->find("src"); if (src) imageUrl = KURL(url,*src); } @@ -2005,7 +2005,7 @@ bool KImageMapEditor::openHTMLFile(const KURL & url, const TQString & mapName, c */ HtmlElement* KImageMapEditor::findHtmlElement(const TQString & containingText) { for (HtmlElement * el = _htmlContent.first(); el; el = _htmlContent.next() ) { - if (el->htmlCode.tqcontains(containingText,false)) { + if (el->htmlCode.contains(containingText,false)) { return el; } } @@ -2038,7 +2038,7 @@ void KImageMapEditor::addMap(const TQString & name = TQString()) { // if we found one add the new map right after the body tag if (bodyTag) { - uint index = _htmlContent.tqfind(bodyTag); + uint index = _htmlContent.find(bodyTag); // Add a newline before the map _htmlContent.insert(index+1, new HtmlElement("\n")); @@ -2160,8 +2160,8 @@ void KImageMapEditor::setMap(HtmlMapElement* mapElement) { for (AreaTag *tag=map->first();tag!=0L;tag=map->next()) { TQString tqshape="rect"; - if (tag->tqfind("tqshape")) - tqshape=*tag->tqfind("tqshape"); + if (tag->find("tqshape")) + tqshape=*tag->find("tqshape"); Area::ShapeType type=Area::Rectangle; if (tqshape=="circle") @@ -2173,35 +2173,35 @@ void KImageMapEditor::setMap(HtmlMapElement* mapElement) { Area* a=AreaCreator::create(type); - if (tag->tqfind("href")) - a->setAttribute("href",*tag->tqfind("href")); + if (tag->find("href")) + a->setAttribute("href",*tag->find("href")); - if (tag->tqfind("alt")) - a->setAttribute("alt",*tag->tqfind("alt")); + if (tag->find("alt")) + a->setAttribute("alt",*tag->find("alt")); - if (tag->tqfind("target")) - a->setAttribute("target",*tag->tqfind("target")); + if (tag->find("target")) + a->setAttribute("target",*tag->find("target")); - if (tag->tqfind("title")) - a->setAttribute("title",*tag->tqfind("title")); + if (tag->find("title")) + a->setAttribute("title",*tag->find("title")); - if (tag->tqfind("onclick")) - a->setAttribute("onclick",*tag->tqfind("onclick")); + if (tag->find("onclick")) + a->setAttribute("onclick",*tag->find("onclick")); - if (tag->tqfind("onmousedown")) - a->setAttribute("onmousedown",*tag->tqfind("onmousedown")); + if (tag->find("onmousedown")) + a->setAttribute("onmousedown",*tag->find("onmousedown")); - if (tag->tqfind("onmouseup")) - a->setAttribute("onmouseup",*tag->tqfind("onmouseup")); + if (tag->find("onmouseup")) + a->setAttribute("onmouseup",*tag->find("onmouseup")); - if (tag->tqfind("onmouseover")) - a->setAttribute("onmouseover",*tag->tqfind("onmouseover")); + if (tag->find("onmouseover")) + a->setAttribute("onmouseover",*tag->find("onmouseover")); - if (tag->tqfind("onmousemove")) - a->setAttribute("onmousemove",*tag->tqfind("onmousemove")); + if (tag->find("onmousemove")) + a->setAttribute("onmousemove",*tag->find("onmousemove")); - if (tag->tqfind("onmouseout")) - a->setAttribute("onmouseout",*tag->tqfind("onmouseout")); + if (tag->find("onmouseout")) + a->setAttribute("onmouseout",*tag->find("onmouseout")); @@ -2211,8 +2211,8 @@ void KImageMapEditor::setMap(HtmlMapElement* mapElement) { continue; } - if (tag->tqfind("coords")) - a->setCoords(*tag->tqfind("coords")); + if (tag->find("coords")) + a->setCoords(*tag->find("coords")); a->setMoving(false); addArea(a); @@ -2375,7 +2375,7 @@ void KImageMapEditor::slotBackOne() // move every selected Area one step lower for (int i=areas->count()-2; i > -1; i--) { - if (list.tqfind( areas->at(i) ) > -1 ) + if (list.find( areas->at(i) ) > -1 ) { a = areas->at(i); areas->remove(a); @@ -2399,7 +2399,7 @@ void KImageMapEditor::slotForwardOne() // move every selected Area one step higher for (int i=1; i < (int)areas->count(); i++) { - if (list.tqfind( areas->at(i) ) > -1 ) + if (list.find( areas->at(i) ) > -1 ) { a = areas->at(i); areas->remove(a); @@ -2683,7 +2683,7 @@ void KImageMapEditor::addImage(const KURL & imgUrl) { HtmlElement *bodyEl = findHtmlElement("selectedImage(); if (selected) { - TQString *url = selected->tqfind("src"); + TQString *url = selected->find("src"); if (url) { setPicture(KURL(*url)); } @@ -2746,11 +2746,11 @@ void KImageMapEditor::imageUsemap() { TQString usemap; - if (imageTag->tqfind("usemap")) - usemap=*imageTag->tqfind("usemap"); + if (imageTag->find("usemap")) + usemap=*imageTag->find("usemap"); TQStringList maps = mapsListView->getMaps(); - int index = maps.tqfindIndex(usemap); + int index = maps.findIndex(usemap); if (index == -1) { maps.prepend(""); index = 0; @@ -2764,7 +2764,7 @@ void KImageMapEditor::imageUsemap() { i18n("Enter the usemap value:"), maps,index,true,&ok,widget()); if (ok) { - imageTag->tqreplace("usemap", new TQString(input)); + imageTag->replace("usemap", new TQString(input)); imagesListView->updateImage(imageTag); setModified(true); @@ -2772,7 +2772,7 @@ void KImageMapEditor::imageUsemap() { HtmlImgElement* imgEl = findHtmlImgElement(imageTag); imgEl->htmlCode = "<"; - TQString *tagName = imgEl->imgTag->tqfind("tagname"); + TQString *tagName = imgEl->imgTag->find("tagname"); imgEl->htmlCode += TQString(*tagName); TQDictIterator it( *imgEl->imgTag ); diff --git a/kimagemapeditor/kimearea.cpp b/kimagemapeditor/kimearea.cpp index 4a6be5be..e3cb169f 100644 --- a/kimagemapeditor/kimearea.cpp +++ b/kimagemapeditor/kimearea.cpp @@ -85,7 +85,7 @@ Area::~Area() { } -bool Area::tqcontains(const TQPoint &) const { +bool Area::contains(const TQPoint &) const { return false; } @@ -100,7 +100,7 @@ TQString Area::attribute(const TQString & name) const void Area::setAttribute(const TQString & name, const TQString & value) { - _attributes.tqreplace(name.lower(),value); + _attributes.replace(name.lower(),value); if (value.isEmpty()) _attributes.remove(name.lower()); } @@ -279,9 +279,9 @@ void Area::removeCoord(int pos) { bool Area::removeSelectionPoint(TQRect * r) { - if (_selectionPoints->tqcontains(r)) + if (_selectionPoints->contains(r)) { - removeCoord(_selectionPoints->tqfind(r)); + removeCoord(_selectionPoints->find(r)); return true; } @@ -447,7 +447,7 @@ TQRect* Area::onSelectionPoint(const TQPoint & p, double zoom) const r2.moveCenter(r2.center()*zoom); - if (r2.tqcontains(p)) + if (r2.contains(p)) { return r; @@ -683,8 +683,8 @@ TQString RectArea::coordsToString() const return retStr; } -bool RectArea::tqcontains(const TQPoint & p) const{ - return rect().tqcontains(p); +bool RectArea::contains(const TQPoint & p) const{ + return rect().contains(p); } void RectArea::moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p) @@ -841,10 +841,10 @@ TQString CircleArea::coordsToString() const return retStr; } -bool CircleArea::tqcontains(const TQPoint & p) const +bool CircleArea::contains(const TQPoint & p) const { TQRegion r(_rect,TQRegion::Ellipse); - return r.tqcontains(p); + return r.contains(p); } void CircleArea::moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p) @@ -1160,12 +1160,12 @@ int PolyArea::addCoord(const TQPoint & p) } -bool PolyArea::tqcontains(const TQPoint & p) const +bool PolyArea::contains(const TQPoint & p) const { // A line can't contain a point if (_coords->count() >2 ) { TQRegion r(*_coords); - return r.tqcontains(p); + return r.contains(p); } else return false; @@ -1338,7 +1338,7 @@ void AreaSelection::add(Area *a) for (Area* area = list.first(); area != 0L; area = list.next() ) { - if ( _areas->tqfind( area ) == -1 ) { + if ( _areas->find( area ) == -1 ) { _areas->append( area ); // Must come before area->setSelected area->setSelected( true ); } @@ -1346,7 +1346,7 @@ void AreaSelection::add(Area *a) } else { - if ( _areas->tqfind( a ) == -1 ) { + if ( _areas->find( a ) == -1 ) { _areas->append( a ); // Must come before a->setSelected a->setSelected( true ); } @@ -1357,7 +1357,7 @@ void AreaSelection::add(Area *a) void AreaSelection::remove(Area *a) { - if (_areas->tqfind(a) == -1) + if (_areas->find(a) == -1) return; a->setSelected( false ); @@ -1378,14 +1378,14 @@ void AreaSelection::reset() tqinvalidate(); } -bool AreaSelection::tqcontains(const TQPoint & p) const +bool AreaSelection::contains(const TQPoint & p) const { bool b=false; AreaListIterator it=getAreaListIterator(); for ( ; it.current() != 0L; ++it ) { - if ( it.current()->tqcontains( p ) ) + if ( it.current()->contains( p ) ) { b=true; break; @@ -1730,7 +1730,7 @@ bool AreaSelection::isMoving() const **/ bool AreaSelection::allAreasWithin(const TQRect & r) const { - if ( ! r.tqcontains(rect()) ) + if ( ! r.contains(rect()) ) { AreaListIterator it=getAreaListIterator(); diff --git a/kimagemapeditor/kimearea.h b/kimagemapeditor/kimearea.h index 5c084a02..8bf4b6e6 100644 --- a/kimagemapeditor/kimearea.h +++ b/kimagemapeditor/kimearea.h @@ -73,7 +73,7 @@ public: virtual Area* clone() const; // Default implementation; is specified by subclasses - virtual bool tqcontains(const TQPoint &) const; + virtual bool contains(const TQPoint &) const; // Default implementation; is specified by subclasses virtual TQString coordsToString() const; virtual void draw(TQPainter &); @@ -172,7 +172,7 @@ class RectArea : public Area virtual ~RectArea(); virtual Area* clone() const; - virtual bool tqcontains(const TQPoint & p) const; + virtual bool contains(const TQPoint & p) const; virtual TQString coordsToString() const; virtual void draw(TQPainter & p); virtual void moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p); @@ -194,7 +194,7 @@ class CircleArea : public Area virtual ~CircleArea(); virtual Area* clone() const; - virtual bool tqcontains(const TQPoint & p) const; + virtual bool contains(const TQPoint & p) const; virtual TQString coordsToString() const; virtual void draw(TQPainter & p); virtual void moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p); @@ -217,7 +217,7 @@ class PolyArea :public Area virtual ~PolyArea(); virtual Area* clone() const; - virtual bool tqcontains(const TQPoint & p) const; + virtual bool contains(const TQPoint & p) const; virtual TQString coordsToString() const; virtual void draw(TQPainter & p); virtual void moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p); @@ -294,7 +294,7 @@ class AreaSelection : public Area { /** * Overiden Methods of the Area class */ - virtual bool tqcontains(const TQPoint & p) const; + virtual bool contains(const TQPoint & p) const; /** * diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index 4cb26986..cd7999f0 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -687,10 +687,10 @@ void ImageMapChooseDialog::initImageListTable(TQWidget* tqparent) { for (ImageTag *tag = images->first(); tag!=0L; tag=images->next()) { TQString src=""; TQString usemap=""; - if (tag->tqfind("src")) - src=*tag->tqfind("src"); - if (tag->tqfind("usemap")) - usemap=*tag->tqfind("usemap"); + if (tag->find("src")) + src=*tag->find("src"); + if (tag->find("usemap")) + usemap=*tag->find("usemap"); imageListTable->setText(row,0,src); imageListTable->setText(row,1,usemap); @@ -711,8 +711,8 @@ void ImageMapChooseDialog::slotImageChanged() { int i=imageListTable->currentRow(); TQImage pix; - if (images->at(i)->tqfind("src")) { - TQString str=*images->at(i)->tqfind("src"); + if (images->at(i)->find("src")) { + TQString str=*images->at(i)->find("src"); // relative url pixUrl=KURL(baseUrl,str); pix=TQImage(pixUrl.path()); diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp index d215e157..b3a2758d 100644 --- a/kimagemapeditor/mapslistview.cpp +++ b/kimagemapeditor/mapslistview.cpp @@ -56,7 +56,7 @@ void MapsListView::addMaps(TQPtrList * maps) { } void MapsListView::selectMap(const TQString & name) { - TQListViewItem* item = _listView->tqfindItem(name,0); + TQListViewItem* item = _listView->findItem(name,0); if (item) { selectMap(item); } else @@ -83,7 +83,7 @@ TQString MapsListView::selectedMap() { } void MapsListView::removeMap(const TQString & name) { - TQListViewItem* item = _listView->tqfindItem(name,0); + TQListViewItem* item = _listView->findItem(name,0); if (item) { _listView->takeItem(item); _listView->setSelected(_listView->currentItem(),true); @@ -108,7 +108,7 @@ void MapsListView::slotItemRenamed(TQListViewItem* item) { void MapsListView::changeMapName(const TQString & oldName, const TQString & newName) { // kdDebug() << "MapsListView::changeMapName : " << oldName << " to " << newName << endl; - TQListViewItem* item = _listView->tqfindItem(oldName,0); + TQListViewItem* item = _listView->findItem(oldName,0); if (item) { item->setText(0,newName); // kdDebug() << "MapsListView::changeMapName : successful" << endl; diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index 072a854e..c3aad2a7 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -52,8 +52,8 @@ KURL QExtFileInfo::toRelative(const KURL& urlToConvert,const KURL& baseURL) int pos1=0; for (;;) { - pos=path.tqfind("/"); - pos1=basePath.tqfind("/"); + pos=path.find("/"); + pos1=basePath.find("/"); if ( pos<0 || pos1<0 ) break; if ( path.left(pos+1 ) == basePath.left(pos1+1) ) { @@ -65,7 +65,7 @@ KURL QExtFileInfo::toRelative(const KURL& urlToConvert,const KURL& baseURL) }; if ( basePath == "/" ) basePath=""; - int level = basePath.tqcontains("/"); + int level = basePath.contains("/"); for (int i=0; i=0 ) + while ( (pos = cutname.find("../")) >=0 ) { cutname.remove( 0, pos+3 ); cutdir.remove( cutdir.length()-1, 1 ); - cutdir.remove( cutdir.tqfindRev('/')+1 , 1000); + cutdir.remove( cutdir.findRev('/')+1 , 1000); } resultURL.setPath(TQDir::cleanDirPath(cutdir+cutname)); } -- cgit v1.2.1