diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 04766b207afba7961d4d802313e426f5a2fbef63 (patch) | |
| tree | c888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp | |
| parent | b6edfe41c9395f2e20784cbf0e630af6426950a3 (diff) | |
| download | koffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp')
| -rw-r--r-- | kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp index 1046e9d8..6f00df1a 100644 --- a/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp +++ b/kivio/kiviopart/kiviosdk/kivio_sml_stencil.cpp @@ -741,9 +741,9 @@ void KivioSMLStencil::drawOutlineTextBox( KivioShape *pShape, KivioIntraStencilD p.setPen( TQColor(0, 0, 0) ); int tf = pShapeData->vTextAlign() | pShapeData->hTextAlign(); p.drawText( 0, 0, _w, _h, tf | TQt::WordBreak, pShapeData->text() ); - TQBitmap tqmask; - tqmask = pix; - pix.setMask(tqmask); + TQBitmap mask; + mask = pix; + pix.setMask(mask); painter->drawPixmap(_x, _y, pix); } @@ -1976,24 +1976,24 @@ bool KivioSMLStencil::checkCollisionTextBox( KivioShape *, KoPoint * ) int KivioSMLStencil::resizeHandlePositions() { // Calculate the resize handle positions - int tqmask = KIVIO_RESIZE_HANDLE_POSITION_ALL; + int mask = KIVIO_RESIZE_HANDLE_POSITION_ALL; if( m_pProtection->at( kpWidth ) ) { - tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW); + mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpE | krhpW); } if( m_pProtection->at( kpHeight ) ) { - tqmask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS); + mask &= ~(krhpNE | krhpNW | krhpSW | krhpSE | krhpN | krhpS); } if( m_pProtection->at( kpAspect ) ) { - tqmask = KIVIO_RESIZE_HANDLE_POSITION_CORNERS; + mask = KIVIO_RESIZE_HANDLE_POSITION_CORNERS; } - return tqmask; + return mask; } KivioLineStyle KivioSMLStencil::lineStyle() |