summaryrefslogtreecommitdiffstats
path: root/kig/modes/moving.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:43 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:43 -0600
commit2d7b541a4e0095d40e37aaefbf9c4a9b9d149302 (patch)
tree628c1676b27475e583cfd0c2105bb41b646654bf /kig/modes/moving.cc
parent6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3 (diff)
downloadtdeedu-2d7b541a4e0095d40e37aaefbf9c4a9b9d149302.tar.gz
tdeedu-2d7b541a4e0095d40e37aaefbf9c4a9b9d149302.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.
Diffstat (limited to 'kig/modes/moving.cc')
-rw-r--r--kig/modes/moving.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/kig/modes/moving.cc b/kig/modes/moving.cc
index 593c7077..7c3148da 100644
--- a/kig/modes/moving.cc
+++ b/kig/modes/moving.cc
@@ -143,8 +143,8 @@ MovingMode::MovingMode( const std::vector<ObjectHolder*>& os, const Coordinate&
std::set<ObjectCalcer*> tmp = objs;
for ( std::set<ObjectCalcer*>::const_iterator i = tmp.begin(); i != tmp.end(); ++i )
{
- std::set<ObjectCalcer*> children = getAllChildren(*i);
- objs.insert( children.begin(), children.end() );
+ std::set<ObjectCalcer*> tqchildren = getAllChildren(*i);
+ objs.insert( tqchildren.begin(), tqchildren.end() );
}
initScreen( calcPath( std::vector<ObjectCalcer*>( objs.begin(), objs.end() ) ) );
@@ -154,7 +154,7 @@ void MovingMode::stopMove()
{
TQString text = d->emo.size() == 1 ?
d->emo[0]->imp()->type()->moveAStatement() :
- i18n( "Move %1 Objects" ).arg( d->emo.size() );
+ i18n( "Move %1 Objects" ).tqarg( d->emo.size() );
KigCommand* mc = new KigCommand( mdoc, text );
d->mon->finish( mc );
mdoc.history()->addCommand( mc );
@@ -182,8 +182,8 @@ PointRedefineMode::PointRedefineMode( ObjectHolder* p, KigPart& d, KigWidget& v
std::vector<ObjectCalcer*> parents = getAllParents( mp->calcer() );
mmon = new MonitorDataObjects( parents );
std::vector<ObjectCalcer*> moving = parents;
- std::set<ObjectCalcer*> children = getAllChildren( mp->calcer() );
- std::copy( children.begin(), children.end(), std::back_inserter( moving ) );
+ std::set<ObjectCalcer*> tqchildren = getAllChildren( mp->calcer() );
+ std::copy( tqchildren.begin(), tqchildren.end(), std::back_inserter( moving ) );
initScreen( moving );
}