diff options
Diffstat (limited to 'kword/KWFrameDia.cpp')
| -rw-r--r-- | kword/KWFrameDia.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index 2130e235..0d722d15 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -1325,7 +1325,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) { TQRect r = m_prev3->contentsRect(); TQRect rect(r.x()+OFFSETX,r.y()+OFFSETY,r.width()-OFFSETX,r.y()+OFFSETY+Ko_SPACE); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_topBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_topBorder.color != m_bColor->color() ) ||(m_topBorder.getStyle()!=KoBorder::getStyle(m_cStyle->currentText()) )) && m_bTop->isOn() ) @@ -1339,7 +1339,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) m_bTop->setOn(!m_bTop->isOn()); } rect.setCoords(r.x()+OFFSETX,r.height()-OFFSETY-Ko_SPACE,r.width()-OFFSETX,r.height()-OFFSETY); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_bottomBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_bottomBorder.color != m_bColor->color() ) ||(m_bottomBorder.getStyle()!=KoBorder::getStyle(m_cStyle->currentText()) )) && m_bBottom->isOn() ) @@ -1354,7 +1354,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) } rect.setCoords(r.x()+OFFSETX,r.y()+OFFSETY,r.x()+Ko_SPACE+OFFSETX,r.height()-OFFSETY); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_leftBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_leftBorder.color != m_bColor->color() ) @@ -1369,7 +1369,7 @@ void KWFrameDia::slotPressEvent(TQMouseEvent *ev) m_bLeft->setOn(!m_bLeft->isOn()); } rect.setCoords(r.width()-OFFSETX-Ko_SPACE,r.y()+OFFSETY,r.width()-OFFSETX,r.height()-OFFSETY); - if(rect.tqcontains(TQPoint(ev->x(),ev->y()))) + if(rect.contains(TQPoint(ev->x(),ev->y()))) { if( ( ((int)m_rightBorder.penWidth() != m_cWidth->currentText().toInt()) ||(m_rightBorder.color != m_bColor->color() ) @@ -2099,7 +2099,7 @@ bool KWFrameDia::applyChanges() KWTextFrameSet *frameSet = new KWTextFrameSet( m_doc, name ); frameSet->addFrame( m_frame ); KWPage *page = m_doc->pageManager()->page(m_frame); - if( page->rect().tqcontains(rect) ) { + if( page->rect().contains(rect) ) { m_frame->setRect( px, py, pw, ph ); //don't change margins when frame is protected. if ( m_paddingConfigWidget && ( !m_tab1 || (m_tab1 && m_cbProtectContent && !m_cbProtectContent->isChecked())) ) @@ -2198,7 +2198,7 @@ bool KWFrameDia::applyChanges() //kdDebug() << "New geom: " << m_sx->text().toDouble() << ", " << m_sy->text().toDouble() // << " " << m_sw->text().toDouble() << "x" << m_sh->text().toDouble() << endl; - if( m_doc->pageManager()->page(f)->rect().tqcontains(rect) ) + if( m_doc->pageManager()->page(f)->rect().contains(rect) ) { FrameIndex index( f ); KoRect initialRect = f->normalize(); |