diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-03 00:48:10 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-05 11:40:38 +0900 |
commit | c75fee7ff7bdf6e1d1380e641c746e3fc7eb04bf (patch) | |
tree | b3315369fc4a83faa3679957c98da185b285baa3 /kig/modes | |
parent | c407c4552feb9568ca2aef8c42288e30b7d0f034 (diff) | |
download | tdeedu-c75fee7ff7bdf6e1d1380e641c746e3fc7eb04bf.tar.gz tdeedu-c75fee7ff7bdf6e1d1380e641c746e3fc7eb04bf.zip |
Replaced various '#define' with actual strings - part 5
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit f08f58fdc18573fbdf637e872a0a4646be58628c)
Diffstat (limited to 'kig/modes')
-rw-r--r-- | kig/modes/construct_mode.cpp | 6 | ||||
-rw-r--r-- | kig/modes/dragrectmode.cpp | 2 | ||||
-rw-r--r-- | kig/modes/label.cpp | 2 | ||||
-rw-r--r-- | kig/modes/macro.cpp | 6 | ||||
-rw-r--r-- | kig/modes/moving.cpp | 6 | ||||
-rw-r--r-- | kig/modes/normal.cpp | 6 | ||||
-rw-r--r-- | kig/modes/popup.cpp | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/kig/modes/construct_mode.cpp b/kig/modes/construct_mode.cpp index 02bb98fc..cc07c78a 100644 --- a/kig/modes/construct_mode.cpp +++ b/kig/modes/construct_mode.cpp @@ -182,7 +182,7 @@ void BaseConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const mdoc.emitStatusBarText( selectStatement( getCalcers( mparents ), w ) ); w.updateCurPix(); - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() ); Coordinate ncoord = w.fromScreen( p ); if ( shiftpressed ) @@ -330,7 +330,7 @@ void PointConstructMode::mouseMoved( bool shiftpressed ) { w.updateCurPix(); - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() ); Coordinate ncoord = w.fromScreen( p ); if ( shiftpressed ) @@ -529,7 +529,7 @@ void TestConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const w.setCursor( KCursor::blankCursor() ); w.updateCurPix(); - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() ); TQPoint qloc = p + TQPoint( -40, 0 ); Coordinate loc = w.fromScreen( qloc ); diff --git a/kig/modes/dragrectmode.cpp b/kig/modes/dragrectmode.cpp index 29b00886..1bb39cae 100644 --- a/kig/modes/dragrectmode.cpp +++ b/kig/modes/dragrectmode.cpp @@ -48,7 +48,7 @@ void DragRectMode::moved( const TQPoint& p, KigWidget& w ) std::vector<TQRect> overlay; if ( mstartselected ) { - KigPainter pt( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter pt( w.screenInfo(), &w.curPix, mdoc.document() ); pt.drawFilledRect( TQRect( p, mstart ) ); overlay = pt.overlay(); }; diff --git a/kig/modes/label.cpp b/kig/modes/label.cpp index 12f0d57c..73d26808 100644 --- a/kig/modes/label.cpp +++ b/kig/modes/label.cpp @@ -231,7 +231,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w ) TQString s = d->locationparent->imp()->type()->attachToThisStatement(); mdoc.emitStatusBarText( s ); - KigPainter p( w->screenInfo(), TQT_TQPAINTDEVICE(&w->curPix), mdoc.document() ); + KigPainter p( w->screenInfo(), &w->curPix, mdoc.document() ); // set the text next to the arrow cursor TQPoint point = e->pos(); diff --git a/kig/modes/macro.cpp b/kig/modes/macro.cpp index 8fe16b4d..35315b26 100644 --- a/kig/modes/macro.cpp +++ b/kig/modes/macro.cpp @@ -167,7 +167,7 @@ void DefineMacroMode::dragRect( const TQPoint& p, KigWidget& w ) std::vector<ObjectHolder*>* objs = mwizard->currentPage() == mwizard->mpgiven ? &mgiven : &mfinal; DragRectMode dm( p, mdoc, w ); mdoc.runMode( &dm ); - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); if ( ! dm.cancelled() ) { std::vector<ObjectHolder*> ret = dm.ret(); @@ -196,7 +196,7 @@ void DefineMacroMode::leftClickedObject( ObjectHolder* o, const TQPoint&, if ( isselected ) objs->erase( iter ); else objs->push_back( o ); - KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); + KigPainter p( w.screenInfo(), &w.stillPix, mdoc.document() ); p.drawObject( o, !isselected ); w.updateCurPix( p.overlay() ); w.updateWidget(); @@ -224,7 +224,7 @@ void DefineMacroMode::mouseMoved( const std::vector<ObjectHolder*>& os, const TQ // statusbar text mdoc.emitStatusBarText( selectstat ); - KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() ); // set the text next to the arrow cursor TQPoint point = pt; diff --git a/kig/modes/moving.cpp b/kig/modes/moving.cpp index 593c7077..d7d07e89 100644 --- a/kig/modes/moving.cpp +++ b/kig/modes/moving.cpp @@ -55,13 +55,13 @@ void MovingModeBase::initScreen( const std::vector<ObjectCalcer*>& in ) std::inserter( notmovingobjs, notmovingobjs.begin() ) ); mview.clearStillPix(); - KigPainter p( mview.screenInfo(), TQT_TQPAINTDEVICE(&mview.stillPix), mdoc.document() ); + KigPainter p( mview.screenInfo(), &mview.stillPix, mdoc.document() ); p.drawGrid( mdoc.document().coordinateSystem(), mdoc.document().grid(), mdoc.document().axes() ); p.drawObjects( notmovingobjs.begin(), notmovingobjs.end(), false ); mview.updateCurPix(); - KigPainter p2( mview.screenInfo(), TQT_TQPAINTDEVICE(&mview.curPix), mdoc.document() ); + KigPainter p2( mview.screenInfo(), &mview.curPix, mdoc.document() ); p2.drawObjects( drawableset.begin(), drawableset.end(), true ); } @@ -91,7 +91,7 @@ void MovingModeBase::mouseMoved( TQMouseEvent* e, KigWidget* v ) for ( std::vector<ObjectCalcer*>::iterator i = mcalcable.begin(); i != mcalcable.end(); ++i ) ( *i )->calc( mdoc.document() ); - KigPainter p( v->screenInfo(), TQT_TQPAINTDEVICE(&v->curPix), mdoc.document() ); + KigPainter p( v->screenInfo(), &v->curPix, mdoc.document() ); // TODO: only draw the explicitly moving objects as selected, the // other ones as deselected.. Needs some support from the // subclasses.. diff --git a/kig/modes/normal.cpp b/kig/modes/normal.cpp index 9a30c213..2ca6f8b0 100644 --- a/kig/modes/normal.cpp +++ b/kig/modes/normal.cpp @@ -133,7 +133,7 @@ void NormalMode::dragRect( const TQPoint& p, KigWidget& w ) DragRectMode d( p, mdoc, w ); mdoc.runMode( &d ); - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); if ( ! d.cancelled() ) { @@ -174,7 +174,7 @@ void NormalMode::dragObject( const std::vector<ObjectHolder*>& oco, const TQPoin void NormalMode::leftClickedObject( ObjectHolder* o, const TQPoint&, KigWidget& w, bool ctrlOrShiftDown ) { - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); if ( ! o ) { @@ -269,7 +269,7 @@ void NormalMode::mouseMoved( const std::vector<ObjectHolder*>& os, // statusbar text mdoc.emitStatusBarText( stat ); - KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() ); // set the text next to the arrow cursor TQPoint point = plc; diff --git a/kig/modes/popup.cpp b/kig/modes/popup.cpp index c11df7ae..a9c74915 100644 --- a/kig/modes/popup.cpp +++ b/kig/modes/popup.cpp @@ -470,7 +470,7 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in TQPixmap p( 20, 20 ); p.fill( popup.eraseColor() ); ScreenInfo si( Rect( -1, -1, 2, 2 ), p.rect() ); - KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false ); + KigPainter ptr( si, &p, popup.part().document(), false ); PointImp pt( Coordinate( 0, 0 ) ); ObjectDrawer d( color, -1, true, TQt::SolidLine, i ); d.draw( pt, ptr, false ); @@ -484,7 +484,7 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in TQPixmap p( 50, 20 ); p.fill( popup.eraseColor() ); ScreenInfo si( Rect( -2.5, -1, 5, 2 ), p.rect() ); - KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false ); + KigPainter ptr( si, &p, popup.part().document(), false ); LineImp line( Coordinate( -1, 0 ), Coordinate( 1, 0 ) ); TQt::PenStyle ps = penstyles[i]; ObjectDrawer d( color, -1, true, ps, 1 ); |