From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:31 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 94844816550ad672ccfcdc25659c625546239998. --- karbon/commands/vshapecmd.cc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'karbon/commands/vshapecmd.cc') diff --git a/karbon/commands/vshapecmd.cc b/karbon/commands/vshapecmd.cc index 9a59fcd9..ae0ad2dc 100644 --- a/karbon/commands/vshapecmd.cc +++ b/karbon/commands/vshapecmd.cc @@ -25,33 +25,33 @@ #include "vshapecmd.h" -VShapeCmd::VShapeCmd( VDocument* doc, const TQString& name, VPath* shape, const TQString& icon ) - : VCommand( doc, name, icon ), m_shape( shape ) +VShapeCmd::VShapeCmd( VDocument* doc, const TQString& name, VPath* tqshape, const TQString& icon ) + : VCommand( doc, name, icon ), m_tqshape( tqshape ) { } void VShapeCmd::execute() { - if( !m_shape ) + if( !m_tqshape ) return; - if( m_shape->state() == VObject::deleted ) + if( m_tqshape->state() == VObject::deleted ) { document()->selection()->clear(); - m_shape->setState( VObject::normal ); - document()->selection()->append( m_shape ); + m_tqshape->setState( VObject::normal ); + document()->selection()->append( m_tqshape ); } else { - m_shape->setState( VObject::normal ); - m_shape->setFill( *( document()->selection()->fill() ) ); - m_shape->setStroke( *( document()->selection()->stroke() ) ); + m_tqshape->setState( VObject::normal ); + m_tqshape->setFill( *( document()->selection()->fill() ) ); + m_tqshape->setStroke( *( document()->selection()->stroke() ) ); // Add path: - document()->append( m_shape ); + document()->append( m_tqshape ); document()->selection()->clear(); - document()->selection()->append( m_shape ); + document()->selection()->append( m_tqshape ); } setSuccess( true ); @@ -60,11 +60,11 @@ VShapeCmd::execute() void VShapeCmd::unexecute() { - if( !m_shape ) + if( !m_tqshape ) return; - document()->selection()->take( *m_shape ); - m_shape->setState( VObject::deleted ); + document()->selection()->take( *m_tqshape ); + m_tqshape->setState( VObject::deleted ); setSuccess( false ); } -- cgit v1.2.1