diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-07 21:14:06 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-07 21:14:06 +0000 |
commit | a40b0e89b6b20ba9039d3f79e73afbeac6954ccb (patch) | |
tree | 07779032ca48d6e8e71887a329141f8e635c901c /kimagemapeditor | |
parent | a2bae01d006ea8053e85bc16d09a8cf40a4b0b75 (diff) | |
download | tdewebdev-a40b0e89b6b20ba9039d3f79e73afbeac6954ccb.tar.gz tdewebdev-a40b0e89b6b20ba9039d3f79e73afbeac6954ccb.zip |
Rename incorrect instances of tqrepaint[...] to repaint[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1240369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kimagemapeditor')
-rw-r--r-- | kimagemapeditor/drawzone.cpp | 56 | ||||
-rw-r--r-- | kimagemapeditor/drawzone.h | 4 | ||||
-rw-r--r-- | kimagemapeditor/imagemap.cpp | 22 | ||||
-rw-r--r-- | kimagemapeditor/imagemap.h | 2 | ||||
-rw-r--r-- | kimagemapeditor/kimagemapeditor.cpp | 20 | ||||
-rw-r--r-- | kimagemapeditor/kimecommands.cpp | 8 |
6 files changed, 56 insertions, 56 deletions
diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp index 152f5300..3ed3465a 100644 --- a/kimagemapeditor/drawzone.cpp +++ b/kimagemapeditor/drawzone.cpp @@ -189,7 +189,7 @@ void DrawZone::setZoom(double z) p.flush(); resizeContents(visibleWidth()>imageRect.width() ? visibleWidth() : imageRect.width(), visibleHeight()>imageRect.height() ? visibleHeight() : imageRect.height()); - tqrepaintContents(0,0,contentsWidth(),contentsHeight(),true); + repaintContents(0,0,contentsWidth(),contentsHeight(),true); } TQPoint DrawZone::translateFromZoom(const TQPoint & p) const { @@ -379,7 +379,7 @@ void DrawZone::contentsMousePressEvent(TQMouseEvent* e) r=oldArea->selectionRect(); if (currentArea) { r= r | currentArea->selectionRect(); - tqrepaintContents(translateToZoom(r),false); + repaintContents(translateToZoom(r),false); } @@ -501,7 +501,7 @@ void DrawZone::contentsMouseReleaseEvent(TQMouseEvent *e) { imageMapEditor->updateActionAccess(); imageMapEditor->updateSelection(); - tqrepaintContents(imageRect,false); + repaintContents(imageRect,false); } else { currentAction=None; } @@ -509,11 +509,11 @@ void DrawZone::contentsMouseReleaseEvent(TQMouseEvent *e) { if (currentArea) { currentArea->setMoving(false); - tqrepaintArea(*currentArea); + repaintArea(*currentArea); } delete oldArea; oldArea=0L; -// tqrepaintContents(0,0,contentsWidth(),contentsHeight(),false); +// repaintContents(0,0,contentsWidth(),contentsHeight(),false); imageMapEditor->slotUpdateSelectionCoords(); } @@ -550,7 +550,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e) currentArea->setRect(TQRect(drawStart,drawCurrent).normalize()); TQRect newRect=translateToZoom(currentArea->selectionRect()); TQRect r=oldRect | newRect; - tqrepaintContents(r,false); + repaintContents(r,false); imageMapEditor->slotUpdateSelectionCoords( currentArea->rect() ); } else if (currentAction==DrawCircle) { @@ -576,7 +576,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e) currentArea->setRect(TQRect(drawStart,endPoint).normalize()); TQRect newRect=translateToZoom(currentArea->rect()); TQRect r=oldRect | newRect; - tqrepaintContents(r,false); + repaintContents(r,false); imageMapEditor->slotUpdateSelectionCoords( currentArea->rect() ); } else if ( currentAction==DrawPolygon ) { @@ -584,14 +584,14 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e) currentArea->moveSelectionPoint(currentSelectionPoint,drawCurrent); TQRect newRect=translateToZoom(currentArea->rect()); TQRect r=oldRect | newRect; - tqrepaintContents(r,false); + repaintContents(r,false); } else if ( currentAction==DrawFreehand) { TQRect oldRect=translateToZoom(currentArea->rect()); currentArea->insertCoord(currentArea->countSelectionPoints(), drawCurrent); TQRect newRect=translateToZoom(currentArea->rect()); TQRect r=oldRect | newRect; - tqrepaintContents(r,false); + repaintContents(r,false); } else if ( currentAction==MoveArea ) { TQRect oldRect=translateToZoom(currentArea->selectionRect()); @@ -599,7 +599,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e) TQRect newRect=translateToZoom(currentArea->selectionRect()); TQRect r=oldRect | newRect; currentArea->setMoving(true); - tqrepaintContents(r,false); + repaintContents(r,false); drawStart=drawCurrent; imageMapEditor->slotUpdateSelectionCoords(); } else @@ -608,7 +608,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e) currentArea->moveSelectionPoint(currentSelectionPoint,drawCurrent); TQRect newRect=translateToZoom(currentArea->selectionRect()); TQRect r=oldRect | newRect; - tqrepaintContents(r,false); + repaintContents(r,false); imageMapEditor->slotUpdateSelectionCoords(); } else if (currentAction==DoSelect) { @@ -630,26 +630,26 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e) } */ // We don't have to tqrepaint the hole selection rectangle - // only the borders have to be tqrepainted. + // only the borders have to be repainted. // So we have to create 4 rectangles for every rectangle // which represent the borders and then tqrepaint them. TQRect lb,rb,tb,bb; createBorderRectangles(translateToZoom(r),lb,rb,tb,bb); - tqrepaintContents(lb,false); - tqrepaintContents(rb,false); - tqrepaintContents(tb,false); - tqrepaintContents(bb,false); + repaintContents(lb,false); + repaintContents(rb,false); + repaintContents(tb,false); + repaintContents(bb,false); createBorderRectangles(translateToZoom(oldSelectionRect),lb,rb,tb,bb); - tqrepaintContents(lb,false); - tqrepaintContents(rb,false); - tqrepaintContents(tb,false); - tqrepaintContents(bb,false); + repaintContents(lb,false); + repaintContents(rb,false); + repaintContents(tb,false); + repaintContents(bb,false); -// tqrepaintContents(oldSelectionRect | r,false); +// repaintContents(oldSelectionRect | r,false); oldSelectionRect = r; -// tqrepaintContents(translateToZoom(r),false); +// repaintContents(translateToZoom(r),false); //+ imageMapEditor->updateSelection(); @@ -658,7 +658,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e) // TQRect r2(drawStart.x(),drawStart.y(),drawOld.x()-drawStart.x(),drawOld.y()-drawStart.y()); // r2 = r2.normalize(); // r = translateToZoom(r | r2); -// tqrepaintContents(r,false); +// repaintContents(r,false); } else if ( currentAction==None ) { @@ -782,17 +782,17 @@ void DrawZone::cancelDrawing() TQRect r = translateToZoom(currentArea->selectionRect()); delete currentArea; currentArea = 0L; - tqrepaintContents(r,false); + repaintContents(r,false); imageMapEditor->slotUpdateSelectionCoords(); } } -void DrawZone::tqrepaintArea(const Area & a) { - tqrepaintContents(translateToZoom(a.selectionRect()),false); +void DrawZone::repaintArea(const Area & a) { + repaintContents(translateToZoom(a.selectionRect()),false); } -void DrawZone::tqrepaintRect(const TQRect & r) { - tqrepaintContents(translateToZoom(r),false); +void DrawZone::repaintRect(const TQRect & r) { + repaintContents(translateToZoom(r),false); } void DrawZone::drawContents(TQPainter* p,int clipx,int clipy,int clipw,int cliph) diff --git a/kimagemapeditor/drawzone.h b/kimagemapeditor/drawzone.h index f1b1d410..35838619 100644 --- a/kimagemapeditor/drawzone.h +++ b/kimagemapeditor/drawzone.h @@ -42,8 +42,8 @@ public: ~DrawZone(); TQImage picture() const; - void tqrepaintArea(const Area & a); - void tqrepaintRect(const TQRect & r); + void repaintArea(const Area & a); + void repaintRect(const TQRect & r); void cancelDrawing(); void setPicture(const TQImage &_image); diff --git a/kimagemapeditor/imagemap.cpp b/kimagemapeditor/imagemap.cpp index 070b54fa..188a443a 100644 --- a/kimagemapeditor/imagemap.cpp +++ b/kimagemapeditor/imagemap.cpp @@ -77,7 +77,7 @@ void ImageMap::setZoom(double z) { p.flush(); resizeContents(visibleWidth()>imageRect.width() ? visibleWidth() : imageRect.width(), visibleHeight()>imageRect.height() ? visibleHeight() : imageRect.height()); - tqrepaintContents(0,0,contentsWidth(),contentsHeight(),true); + repaintContents(0,0,contentsWidth(),contentsHeight(),true); } TQPoint ImageMap::translateFromZoom(const TQPoint & p) const { @@ -172,7 +172,7 @@ void ImageMap::contentsMousePressEvent(TQMouseEvent* e) { r=oldArea->selectionRect(); if (currentArea) { r= r | currentArea->selectionRect(); - tqrepaintContents(translateToZoom(r),false); + repaintContents(translateToZoom(r),false); } } @@ -233,8 +233,8 @@ void ImageMap::contentsMouseReleaseEvent(TQMouseEvent *e) { imageMapEditor->slotUpdateSelectionCoords(); if (currentArea) - tqrepaintArea(*currentArea); -// tqrepaintContents(0,0,contentsWidth(),contentsHeight(),false); + repaintArea(*currentArea); +// repaintContents(0,0,contentsWidth(),contentsHeight(),false); } @@ -264,7 +264,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) { currentArea->setRect(TQRect(drawStart,drawCurrent).normalize()); TQRect newRect=translateToZoom(currentArea->rect()); TQRect r=oldRect | newRect; - tqrepaintContents(r,false); + repaintContents(r,false); imageMapEditor->slotUpdateSelectionCoords(currentArea->rect()); } else if (currentAction==DrawCircle) { @@ -272,7 +272,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) { currentArea->setRect(TQRect(drawStart,drawCurrent).normalize()); TQRect newRect=translateToZoom(currentArea->rect()); TQRect r=oldRect | newRect; - tqrepaintContents(r,false); + repaintContents(r,false); imageMapEditor->slotUpdateSelectionCoords(currentArea->rect()); } else if ( currentAction==DrawPolygon ) { @@ -280,7 +280,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) { currentArea->moveSelectionPoint(currentSelectionPoint,drawCurrent); TQRect newRect=translateToZoom(currentArea->rect()); TQRect r=oldRect | newRect; - tqrepaintContents(r,false); + repaintContents(r,false); imageMapEditor->slotUpdateSelectionCoords(currentArea->rect()); } else if ( currentAction==MoveArea ) { @@ -288,7 +288,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) { currentArea->moveBy((drawCurrent-drawStart).x(),(drawCurrent-drawStart).y()); TQRect newRect=translateToZoom(currentArea->selectionRect()); TQRect r=oldRect | newRect; - tqrepaintContents(r,false); + repaintContents(r,false); drawStart=drawCurrent; imageMapEditor->slotUpdateSelectionCoords(); } else @@ -297,7 +297,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) { currentArea->moveSelectionPoint(currentSelectionPoint,drawCurrent); TQRect newRect=translateToZoom(currentArea->selectionRect()); TQRect r=oldRect | newRect; - tqrepaintContents(r,false); + repaintContents(r,false); imageMapEditor->slotUpdateSelectionCoords(); } imageMapEditor->slotChangeStatusCoords(drawCurrent.x(),drawCurrent.y()); @@ -321,8 +321,8 @@ void ImageMap::resizeEvent(TQResizeEvent* e) { } -void ImageMap::tqrepaintArea(const Area & a) { - tqrepaintContents(translateToZoom(a.selectionRect()),false); +void ImageMap::repaintArea(const Area & a) { + repaintContents(translateToZoom(a.selectionRect()),false); } void ImageMap::drawContents(TQPainter* p,int clipx,int clipy,int clipw,int cliph) { diff --git a/kimagemapeditor/imagemap.h b/kimagemapeditor/imagemap.h index 5f24560e..eb31cc1c 100644 --- a/kimagemapeditor/imagemap.h +++ b/kimagemapeditor/imagemap.h @@ -55,7 +55,7 @@ public: ~ImageMap(); void setZoom(double z); void setPicture(const TQImage &_image); - void tqrepaintArea(const Area & a); + void repaintArea(const Area & a); TQImage picture() const; TQPoint translateFromZoom(const TQPoint & p) const; TQPoint translateToZoom(const TQPoint & p) const; diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index cfb5ee8c..a2ec27d4 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -1015,7 +1015,7 @@ void KImageMapEditor::deleteArea( Area * area ) area->deleteListViewItem(); } - drawZone->tqrepaintRect(redrawRect); + drawZone->repaintRect(redrawRect); // Only to disable cut and copy actions @@ -1037,7 +1037,7 @@ void KImageMapEditor::deleteSelected() { } - drawZone->tqrepaintArea( *currentSelected ); + drawZone->repaintArea( *currentSelected ); // Only to disable cut and copy actions if (areas->count()==0) deselectAll(); @@ -1083,7 +1083,7 @@ void KImageMapEditor::select(Area* a) currentSelected->add(a); updateActionAccess(); slotUpdateSelectionCoords(); -// drawZone->tqrepaintArea( *a); +// drawZone->repaintArea( *a); } @@ -1106,7 +1106,7 @@ void KImageMapEditor::slotSelectionChanged() ? select( it.current() ) : deselect( it.current() ); - drawZone->tqrepaintArea( *it.current()); + drawZone->repaintArea( *it.current()); } } @@ -1122,7 +1122,7 @@ void KImageMapEditor::select( TQListViewItem* item) if (it.current()->listViewItem() == item ) { select( it.current() ); - drawZone->tqrepaintArea( *it.current()); + drawZone->repaintArea( *it.current()); } } @@ -1162,7 +1162,7 @@ void KImageMapEditor::slotAreaChanged(Area *area) area->listViewItem()->setPixmap(1,makeListViewPix(*area)); } - drawZone->tqrepaintArea(*area); + drawZone->repaintArea(*area); } @@ -1170,7 +1170,7 @@ void KImageMapEditor::deselect(Area* a) { if (a) { currentSelected->remove(a); -// drawZone->tqrepaintArea(*a); +// drawZone->repaintArea(*a); updateActionAccess(); slotUpdateSelectionCoords(); } @@ -1290,7 +1290,7 @@ void KImageMapEditor::updateUpDownBtn() areaListView->upBtn->setEnabled(false); } - drawZone->tqrepaintArea(*currentSelected); + drawZone->repaintArea(*currentSelected); // if the last Area is in the selection can't move down if (list.tqfind( areas->getLast() ) == -1) @@ -1309,7 +1309,7 @@ void KImageMapEditor::deselectAll() { TQRect redrawRect= currentSelected->selectionRect(); currentSelected->reset(); - drawZone->tqrepaintRect(redrawRect); + drawZone->repaintRect(redrawRect); updateActionAccess(); } @@ -1324,7 +1324,7 @@ Area* KImageMapEditor::onArea(const TQPoint & p) const { int KImageMapEditor::showTagEditor(Area *a) { if (!a) return 0; - drawZone->tqrepaintArea(*a); + drawZone->repaintArea(*a); AreaDialog *dialog= new AreaDialog(this,a); connect (dialog, TQT_SIGNAL(areaChanged(Area*)), this, TQT_SLOT(slotAreaChanged(Area*))); diff --git a/kimagemapeditor/kimecommands.cpp b/kimagemapeditor/kimecommands.cpp index 1d2b08ee..e47f1b8f 100644 --- a/kimagemapeditor/kimecommands.cpp +++ b/kimagemapeditor/kimecommands.cpp @@ -147,7 +147,7 @@ MoveCommand::~MoveCommand () { void MoveCommand::execute() { - // only for tqrepainting reasons + // only for repainting reasons Area* tempArea = _areaSelection->clone(); _areaSelection->moveTo( _newPoint.x(), _newPoint.y() ); @@ -269,15 +269,15 @@ void AddPointCommand::execute() void AddPointCommand::unexecute() { // TQRect *selectionPoint = _areaSelection->onSelectionPoint(_point); - Area* tqrepaintArea = _areaSelection->clone(); + Area* repaintArea = _areaSelection->clone(); _areaSelection->removeCoord(_coordpos); _areaSelection->setMoving(false); _document->slotAreaChanged( _areaSelection ); - _document->slotAreaChanged( tqrepaintArea ); + _document->slotAreaChanged( repaintArea ); - delete tqrepaintArea; + delete repaintArea; } RemovePointCommand::RemovePointCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea) |