summaryrefslogtreecommitdiffstats
path: root/kig/modes/construct_mode.cc
diff options
context:
space:
mode:
Diffstat (limited to 'kig/modes/construct_mode.cc')
-rw-r--r--kig/modes/construct_mode.cc60
1 files changed, 30 insertions, 30 deletions
diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc
index 67f83632..d4702314 100644
--- a/kig/modes/construct_mode.cc
+++ b/kig/modes/construct_mode.cc
@@ -76,13 +76,13 @@ void BaseConstructMode::leftReleased( TQMouseEvent* e, KigWidget* v )
if ( !tqmoco.empty() )
{
std::vector<ObjectHolder*>::const_iterator it;
- std::vector<ObjectCalcer*> testargs = getCalcers( mtqparents );
+ std::vector<ObjectCalcer*> testargs = getCalcers( mparents );
for ( std::vector<ObjectHolder*>::const_iterator i = tqmoco.begin(); i != tqmoco.end(); ++i )
{
- it = std::find( mtqparents.begin(), mtqparents.end(), *i );
+ it = std::find( mparents.begin(), mparents.end(), *i );
bool newdup =
- ( it == mtqparents.end() ) ||
- isAlreadySelectedOK( testargs, it - mtqparents.begin() );
+ ( it == mparents.end() ) ||
+ isAlreadySelectedOK( testargs, it - mparents.begin() );
if ( newdup )
{
testargs.push_back( ( *i )->calcer() );
@@ -103,16 +103,16 @@ void BaseConstructMode::leftReleased( TQMouseEvent* e, KigWidget* v )
void BaseConstructMode::leftClickedObject(
ObjectHolder* o, const TQPoint& p, KigWidget& w, bool )
{
- std::vector<ObjectHolder*>::iterator it = std::find( mtqparents.begin(), mtqparents.end(), o );
- std::vector<ObjectCalcer*> nargs = getCalcers( mtqparents );
+ std::vector<ObjectHolder*>::iterator it = std::find( mparents.begin(), mparents.end(), o );
+ std::vector<ObjectCalcer*> nargs = getCalcers( mparents );
//
// mp: duplicationchecked controls whether the arguments list is
// free of duplications or if a duplication is safe (asking this to
// the Constructor class through the "isAlreadySelectedOK" method).
//
bool duplicationchecked =
- ( it == mtqparents.end() ) ||
- isAlreadySelectedOK( nargs, it - mtqparents.begin() );
+ ( it == mparents.end() ) ||
+ isAlreadySelectedOK( nargs, it - mparents.begin() );
if ( o && duplicationchecked )
{
nargs.push_back( o->calcer() );
@@ -123,7 +123,7 @@ void BaseConstructMode::leftClickedObject(
}
}
- nargs = getCalcers( mtqparents );
+ nargs = getCalcers( mparents );
nargs.push_back( mpt.get() );
if ( wantArgs( nargs, mdoc.document(), w ) )
{
@@ -137,7 +137,7 @@ void BaseConstructMode::leftClickedObject(
return;
}
- nargs = getCalcers( mtqparents );
+ nargs = getCalcers( mparents );
nargs.push_back( mcursor );
if ( wantArgs( nargs, mdoc.document(), w ) )
@@ -157,7 +157,7 @@ void BaseConstructMode::leftClickedObject(
void BaseConstructMode::midClicked( const TQPoint& p, KigWidget& w )
{
- std::vector<ObjectCalcer*> args = getCalcers( mtqparents );
+ std::vector<ObjectCalcer*> args = getCalcers( mparents );
args.push_back( mpt.get() );
if ( wantArgs( args, mdoc.document(), w ) )
{
@@ -179,7 +179,7 @@ void BaseConstructMode::rightClicked( const std::vector<ObjectHolder*>&, const T
void BaseConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const TQPoint& p,
KigWidget& w, bool shiftpressed )
{
- mdoc.emitStatusBarText( selectStatement( getCalcers( mtqparents ), w ) );
+ mdoc.emitStatusBarText( selectStatement( getCalcers( mparents ), w ) );
w.updateCurPix();
KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() );
@@ -192,19 +192,19 @@ void BaseConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const
mcursor->move( ncoord, mdoc.document() );
mcursor->calc( mdoc.document() );
- std::vector<ObjectCalcer*> args = getCalcers( mtqparents );
+ std::vector<ObjectCalcer*> args = getCalcers( mparents );
bool duplicationchecked = false;
std::vector<ObjectHolder*> goodargs;
if ( ! os.empty() )
{
std::vector<ObjectHolder*>::const_iterator it;
- std::vector<ObjectCalcer*> testargs = getCalcers( mtqparents );
+ std::vector<ObjectCalcer*> testargs = getCalcers( mparents );
for ( std::vector<ObjectHolder*>::const_iterator i = os.begin(); i != os.end(); ++i )
{
- it = std::find( mtqparents.begin(), mtqparents.end(), *i );
+ it = std::find( mparents.begin(), mparents.end(), *i );
bool newdup =
- ( it == mtqparents.end() ) ||
- isAlreadySelectedOK( args, it - mtqparents.begin() );
+ ( it == mparents.end() ) ||
+ isAlreadySelectedOK( args, it - mparents.begin() );
if ( newdup )
{
testargs.push_back( ( *i )->calcer() );
@@ -229,9 +229,9 @@ void BaseConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const
}
else
{
- std::vector<ObjectCalcer*> args = getCalcers( mtqparents );
+ std::vector<ObjectCalcer*> args = getCalcers( mparents );
args.push_back( mpt.get() );
- std::vector<ObjectCalcer*> argscursor = getCalcers( mtqparents );
+ std::vector<ObjectCalcer*> argscursor = getCalcers( mparents );
argscursor.push_back( mcursor );
bool text = true;
if ( wantArgs( args, mdoc.document(), w ) )
@@ -274,15 +274,15 @@ void BaseConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const
void BaseConstructMode::selectObject( ObjectHolder* o, KigWidget& w )
{
- mtqparents.push_back( o );
- std::vector<ObjectCalcer*> args = getCalcers( mtqparents );
+ mparents.push_back( o );
+ std::vector<ObjectCalcer*> args = getCalcers( mparents );
if ( wantArgs( args, mdoc.document(), w ) == ArgsParser::Complete )
{
handleArgs( args, w );
};
- w.redrawScreen( mtqparents );
+ w.redrawScreen( mparents );
}
PointConstructMode::PointConstructMode( KigPart& d )
@@ -373,7 +373,7 @@ void BaseConstructMode::selectObjects( const std::vector<ObjectHolder*>& os, Kig
{
for ( std::vector<ObjectHolder*>::const_iterator i = os.begin(); i != os.end(); ++i )
{
- std::vector<ObjectCalcer*> args = getCalcers( mtqparents );
+ std::vector<ObjectCalcer*> args = getCalcers( mparents );
assert( wantArgs( args, mdoc.document(), w ) != ArgsParser::Complete );
selectObject( *i, w );
};
@@ -482,17 +482,17 @@ void TestConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p,
TQPoint qloc = p + TQPoint( -40, 0 );
Coordinate loc = w.fromScreen( qloc );
- std::vector<ObjectCalcer*> tqparents;
- tqparents.push_back( new ObjectConstCalcer( new IntImp( test_has_frame_dflt ) ) );
- tqparents.push_back( new ObjectConstCalcer( new PointImp( loc ) ) );
- tqparents.push_back( new ObjectConstCalcer( new StringImp( TQString::tqfromLatin1( "%1" ) ) ) );
+ std::vector<ObjectCalcer*> parents;
+ parents.push_back( new ObjectConstCalcer( new IntImp( test_has_frame_dflt ) ) );
+ parents.push_back( new ObjectConstCalcer( new PointImp( loc ) ) );
+ parents.push_back( new ObjectConstCalcer( new StringImp( TQString::tqfromLatin1( "%1" ) ) ) );
assert( mresult->imp()->inherits( TestResultImp::stype() ) );
- tqparents.push_back(
+ parents.push_back(
new ObjectPropertyCalcer(
mresult.get(), mresult->imp()->propertiesInternalNames().tqfindIndex( "test-result" ) ) );
- tqparents.back()->calc( mdoc.document() );
+ parents.back()->calc( mdoc.document() );
- ObjectCalcer* ret = new ObjectTypeCalcer( TextType::instance(), tqparents );
+ ObjectCalcer* ret = new ObjectTypeCalcer( TextType::instance(), parents );
ret->calc( mdoc.document() );
mdoc.addObject( new ObjectHolder( ret ) );
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 10:12:08 +0000