From 96698e12d1d6ba8072e9365334277438c3cf0e4a Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kig/modes/base_mode.cc | 2 +- kig/modes/construct_mode.cc | 60 ++++++++++++++++++++-------------------- kig/modes/construct_mode.h | 2 +- kig/modes/edittypebase.ui | 2 +- kig/modes/label.cc | 22 +++++++-------- kig/modes/macrowizardbase.ui | 2 +- kig/modes/moving.cc | 32 ++++++++++----------- kig/modes/moving.h | 2 +- kig/modes/textlabelwizard.cc | 2 +- kig/modes/textlabelwizard.h | 2 +- kig/modes/textlabelwizardbase.ui | 2 +- kig/modes/typesdialogbase.ui | 2 +- 12 files changed, 66 insertions(+), 66 deletions(-) (limited to 'kig/modes') diff --git a/kig/modes/base_mode.cc b/kig/modes/base_mode.cc index e470f938..b4f33b21 100644 --- a/kig/modes/base_mode.cc +++ b/kig/modes/base_mode.cc @@ -38,7 +38,7 @@ BaseMode::~BaseMode() void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) { // touch screens don't send a mouseMoved event before a click event, - // aptqparently, so we simulate it. + // apparently, so we simulate it. mouseMoved( e, v ); // get rid of text still showing... 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::const_iterator it; - std::vector testargs = getCalcers( mtqparents ); + std::vector testargs = getCalcers( mparents ); for ( std::vector::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::iterator it = std::find( mtqparents.begin(), mtqparents.end(), o ); - std::vector nargs = getCalcers( mtqparents ); + std::vector::iterator it = std::find( mparents.begin(), mparents.end(), o ); + std::vector 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 args = getCalcers( mtqparents ); + std::vector args = getCalcers( mparents ); args.push_back( mpt.get() ); if ( wantArgs( args, mdoc.document(), w ) ) { @@ -179,7 +179,7 @@ void BaseConstructMode::rightClicked( const std::vector&, const T void BaseConstructMode::mouseMoved( const std::vector& 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& os, const mcursor->move( ncoord, mdoc.document() ); mcursor->calc( mdoc.document() ); - std::vector args = getCalcers( mtqparents ); + std::vector args = getCalcers( mparents ); bool duplicationchecked = false; std::vector goodargs; if ( ! os.empty() ) { std::vector::const_iterator it; - std::vector testargs = getCalcers( mtqparents ); + std::vector testargs = getCalcers( mparents ); for ( std::vector::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& os, const } else { - std::vector args = getCalcers( mtqparents ); + std::vector args = getCalcers( mparents ); args.push_back( mpt.get() ); - std::vector argscursor = getCalcers( mtqparents ); + std::vector 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& os, const void BaseConstructMode::selectObject( ObjectHolder* o, KigWidget& w ) { - mtqparents.push_back( o ); - std::vector args = getCalcers( mtqparents ); + mparents.push_back( o ); + std::vector 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& os, Kig { for ( std::vector::const_iterator i = os.begin(); i != os.end(); ++i ) { - std::vector args = getCalcers( mtqparents ); + std::vector 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 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 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 ) ); diff --git a/kig/modes/construct_mode.h b/kig/modes/construct_mode.h index 67fe5e28..be937723 100644 --- a/kig/modes/construct_mode.h +++ b/kig/modes/construct_mode.h @@ -71,7 +71,7 @@ class BaseConstructMode // only sensible place where to deallocate it is in the destructor // of this class // ObjectHolder* mcursorholder; - std::vector mtqparents; + std::vector mparents; void leftReleased( TQMouseEvent* e, KigWidget* v ); diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui index cdcdded6..e69d9f13 100644 --- a/kig/modes/edittypebase.ui +++ b/kig/modes/edittypebase.ui @@ -275,7 +275,7 @@ okSlot() cancelSlot() - + klineedit.h klineedit.h diff --git a/kig/modes/label.cc b/kig/modes/label.cc index 3471d6dc..298e75d0 100644 --- a/kig/modes/label.cc +++ b/kig/modes/label.cc @@ -64,7 +64,7 @@ public: // the property objects we'll be using as args, we keep a reference // to them in the args object, and keep a pointer to them ( or 0 ) // in the correct order in args ( separately, because we can't use - // the order of the tqparents of a ReferenceObject, and certainly + // the order of the parents of a ReferenceObject, and certainly // can't give 0 as a tqparent.. argvect args; @@ -391,7 +391,7 @@ void TextLabelModeBase::updateLinksLabel() d->wiz->myCustomWidget1->addText( s.mid( prevpos ), buf ); d->wiz->myCustomWidget1->applyEdit( buf ); - d->wiz->retqlayoutArgsPage(); + d->wiz->relayoutArgsPage(); d->wiz->resize( d->wiz->size() ); } @@ -471,10 +471,10 @@ TextLabelRedefineMode::TextLabelRedefineMode( KigPart& d, ObjectTypeCalcer* labe : TextLabelModeBase( d ), mlabel( label ) { assert( label->imp()->inherits( TextImp::stype() ) ); - std::vector tqparents = label->tqparents(); - assert( tqparents.size() >= 3 ); - std::vector firstthree( tqparents.begin(), tqparents.begin() + 3 ); - std::vector rest( tqparents.begin() + 3, tqparents.end() ); + std::vector parents = label->parents(); + assert( parents.size() >= 3 ); + std::vector firstthree( parents.begin(), parents.begin() + 3 ); + std::vector rest( parents.begin() + 3, parents.end() ); firstthree = TextType::instance()->argParser().parse( firstthree ); assert( firstthree[0]->imp()->inherits( IntImp::stype() ) ); @@ -509,10 +509,10 @@ void TextLabelRedefineMode::finish( const argvect& props, bool needframe, ObjectCalcer* locationtqparent ) { - std::vector tqparents = mlabel->tqparents(); - assert( tqparents.size() >= 3 ); - std::vector firstthree( tqparents.begin(), tqparents.begin() + 3 ); - std::vector rest( tqparents.begin() + 3, tqparents.end() ); + std::vector parents = mlabel->parents(); + assert( parents.size() >= 3 ); + std::vector firstthree( parents.begin(), parents.begin() + 3 ); + std::vector rest( parents.begin() + 3, parents.end() ); firstthree = TextType::instance()->argParser().parse( firstthree ); KigCommand* kc = new KigCommand( mdoc, i18n( "Change Label" ) ); @@ -538,7 +538,7 @@ void TextLabelRedefineMode::finish( static_cast( firstthree[2] )->setImp( new StringImp( s ) ); mon.finish( kc ); - std::vector oldtqparents = mlabel->tqparents(); + std::vector oldparents = mlabel->parents(); std::vector p; for ( argvect::const_iterator i = props.begin(); i != props.end(); ++i ) diff --git a/kig/modes/macrowizardbase.ui b/kig/modes/macrowizardbase.ui index 54fd95b2..fefd5c6f 100644 --- a/kig/modes/macrowizardbase.ui +++ b/kig/modes/macrowizardbase.ui @@ -180,7 +180,7 @@ - + klineedit.h klineedit.h diff --git a/kig/modes/moving.cc b/kig/modes/moving.cc index 980a5feb..d6f2c74b 100644 --- a/kig/modes/moving.cc +++ b/kig/modes/moving.cc @@ -129,8 +129,8 @@ MovingMode::MovingMode( const std::vector& os, const Coordinate& emo.push_back( ( *i )->calcer() ); d->refmap[( *i )->calcer()] = (*i)->moveReferencePoint(); objs.insert( ( *i )->calcer() ); - std::vector tqparents = ( *i )->calcer()->movableParents(); - objs.insert( tqparents.begin(), tqparents.end() ); + std::vector parents = ( *i )->calcer()->movableParents(); + objs.insert( parents.begin(), parents.end() ); }; emo = calcPath( emo ); @@ -176,12 +176,12 @@ PointRedefineMode::PointRedefineMode( ObjectHolder* p, KigPart& d, KigWidget& v { assert( dynamic_cast( p->calcer() ) ); moldtype = static_cast( p->calcer() )->type(); - std::vector oldtqparents = p->calcer()->tqparents(); - std::copy( oldtqparents.begin(), oldtqparents.end(), std::back_inserter( moldtqparents ) ); + std::vector oldparents = p->calcer()->parents(); + std::copy( oldparents.begin(), oldparents.end(), std::back_inserter( moldparents ) ); - std::vector tqparents = getAllParents( mp->calcer() ); - mmon = new MonitorDataObjects( tqparents ); - std::vector moving = tqparents; + std::vector parents = getAllParents( mp->calcer() ); + mmon = new MonitorDataObjects( parents ); + std::vector moving = parents; std::set tqchildren = getAllChildren( mp->calcer() ); std::copy( tqchildren.begin(), tqchildren.end(), std::back_inserter( moving ) ); initScreen( moving ); @@ -224,22 +224,22 @@ void PointRedefineMode::stopMove() assert( dynamic_cast( mp->calcer() ) ); ObjectTypeCalcer* mpcalc = static_cast( mp->calcer() ); - std::vector newtqparents = mpcalc->tqparents(); - std::vector newtqparentsref( - newtqparents.begin(), newtqparents.end() ); + std::vector newparents = mpcalc->parents(); + std::vector newparentsref( + newparents.begin(), newparents.end() ); const ObjectType* newtype = mpcalc->type(); - std::vector oldtqparents; - for( std::vector::iterator i = moldtqparents.begin(); - i != moldtqparents.end(); ++i ) - oldtqparents.push_back( i->get() ); + std::vector oldparents; + for( std::vector::iterator i = moldparents.begin(); + i != moldparents.end(); ++i ) + oldparents.push_back( i->get() ); mpcalc->setType( moldtype ); - mpcalc->setParents( oldtqparents ); + mpcalc->setParents( oldparents ); mp->calc( mdoc.document() ); KigCommand* command = new KigCommand( mdoc, i18n( "Redefine Point" ) ); command->addTask( - new ChangeParentsAndTypeTask( mpcalc, newtqparents, newtype ) ); + new ChangeParentsAndTypeTask( mpcalc, newparents, newtype ) ); mmon->finish( command ); mdoc.history()->addCommand( command ); } diff --git a/kig/modes/moving.h b/kig/modes/moving.h index 8a75e62a..7c27aa4e 100644 --- a/kig/modes/moving.h +++ b/kig/modes/moving.h @@ -88,7 +88,7 @@ class PointRedefineMode : public MovingModeBase { ObjectHolder* mp; - std::vector moldtqparents; + std::vector moldparents; const ObjectType* moldtype; MonitorDataObjects* mmon; void stopMove(); diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc index 70f484d8..b79f4a5e 100644 --- a/kig/modes/textlabelwizard.cc +++ b/kig/modes/textlabelwizard.cc @@ -81,7 +81,7 @@ void TextLabelWizard::linkClicked( int which ) mmode->linkClicked( which ); } -void TextLabelWizard::retqlayoutArgsPage() +void TextLabelWizard::relayoutArgsPage() { select_arguments_pageLayout->activate(); tqrepaint(); diff --git a/kig/modes/textlabelwizard.h b/kig/modes/textlabelwizard.h index 2d192e7c..c6f0a7ca 100644 --- a/kig/modes/textlabelwizard.h +++ b/kig/modes/textlabelwizard.h @@ -35,7 +35,7 @@ public: void reject(); void accept(); - void retqlayoutArgsPage(); + void relayoutArgsPage(); private slots: void textChanged(); void linkClicked( int which ); diff --git a/kig/modes/textlabelwizardbase.ui b/kig/modes/textlabelwizardbase.ui index c4b7979e..8f12ca3c 100644 --- a/kig/modes/textlabelwizardbase.ui +++ b/kig/modes/textlabelwizardbase.ui @@ -106,7 +106,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac 789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495 - + linkslabel.h diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui index 3001454b..8da4d05a 100644 --- a/kig/modes/typesdialogbase.ui +++ b/kig/modes/typesdialogbase.ui @@ -323,7 +323,7 @@ contextMenuRequested( TQListViewItem* i, const QPoint& p, int c ) cancelSlot() - + klistview.h kpushbutton.h -- cgit v1.2.1