summaryrefslogtreecommitdiffstats
path: root/kspread/commands.cc
diff options
context:
space:
mode:
Diffstat (limited to 'kspread/commands.cc')
-rw-r--r--kspread/commands.cc78
1 files changed, 39 insertions, 39 deletions
diff --git a/kspread/commands.cc b/kspread/commands.cc
index a4788bda..490bee81 100644
--- a/kspread/commands.cc
+++ b/kspread/commands.cc
@@ -77,7 +77,7 @@ TQString MergeCellCommand::name() const
if( rangeName.isEmpty() )
return i18n("Merge Cells");
else
- return i18n("Merge Cells %1").tqarg( rangeName );
+ return i18n("Merge Cells %1").arg( rangeName );
}
void MergeCellCommand::execute()
@@ -174,7 +174,7 @@ void HideSheetCommand::unexecute()
TQString HideSheetCommand::name() const
{
- TQString n = TQString( i18n("Hide Sheet %1") ).tqarg( sheetName );
+ TQString n = TQString( i18n("Hide Sheet %1") ).arg( sheetName );
if( n.length() > 64 ) n = i18n("Hide Sheet");
return n;
}
@@ -205,7 +205,7 @@ void ShowSheetCommand::unexecute()
TQString ShowSheetCommand::name() const
{
- TQString n = TQString( i18n("Show Sheet %1") ).tqarg( sheetName );
+ TQString n = TQString( i18n("Show Sheet %1") ).arg( sheetName );
if( n.length() > 64 ) n = i18n("Show Sheet");
return n;
}
@@ -590,37 +590,37 @@ ChangeObjectGeometryCommand::~ChangeObjectGeometryCommand()
void ChangeObjectGeometryCommand::execute()
{
- doc->tqrepaint( obj->tqgeometry() );
+ doc->repaint( obj->geometry() );
- KoRect tqgeometry = obj->tqgeometry();
- tqgeometry.moveBy( m_diff.x(), m_diff.y() );
- tqgeometry.setWidth( tqgeometry.width() + r_diff.width() );
- tqgeometry.setHeight( tqgeometry.height() + r_diff.height() );
- obj->setGeometry( tqgeometry );
+ KoRect geometry = obj->geometry();
+ geometry.moveBy( m_diff.x(), m_diff.y() );
+ geometry.setWidth( geometry.width() + r_diff.width() );
+ geometry.setHeight( geometry.height() + r_diff.height() );
+ obj->setGeometry( geometry );
// if ( object->isSelected())
// doc->updateObjectStatusBarItem();
- doc->tqrepaint( obj );
+ doc->repaint( obj );
}
void ChangeObjectGeometryCommand::unexecute()
{
- doc->tqrepaint( obj->tqgeometry() );
+ doc->repaint( obj->geometry() );
- KoRect tqgeometry = obj->tqgeometry();
- tqgeometry.moveBy( -m_diff.x(), -m_diff.y() );
- tqgeometry.setWidth( tqgeometry.width() - r_diff.width() );
- tqgeometry.setHeight( tqgeometry.height() - r_diff.height() );
- obj->setGeometry( tqgeometry );
+ KoRect geometry = obj->geometry();
+ geometry.moveBy( -m_diff.x(), -m_diff.y() );
+ geometry.setWidth( geometry.width() - r_diff.width() );
+ geometry.setHeight( geometry.height() - r_diff.height() );
+ obj->setGeometry( geometry );
// if ( object->isSelected())
// doc->updateObjectStatusBarItem();
- doc->tqrepaint( obj );
+ doc->repaint( obj );
}
TQString ChangeObjectGeometryCommand::name() const
{
- /*if ( fabs( obj->tqgeometry().width() - newGeometry.width() )<1e-3 && fabs( obj->tqgeometry().height() - newGeometry.height() ) < 1e-3 )
+ /*if ( fabs( obj->geometry().width() - newGeometry.width() )<1e-3 && fabs( obj->geometry().height() - newGeometry.height() ) < 1e-3 )
return i18n("Move Object");
else */
return i18n("Resize Object");
@@ -665,7 +665,7 @@ void RemoveObjectCommand::execute()
}
obj->setSelected( false );
- doc->tqrepaint( obj );
+ doc->repaint( obj );
executed = true;
}
@@ -677,7 +677,7 @@ void RemoveObjectCommand::unexecute()
EmbeddedKOfficeObject *eko = dynamic_cast<EmbeddedKOfficeObject *>(obj);
eko->embeddedObject()->setDeleted(false);
}
- doc->tqrepaint( obj );
+ doc->repaint( obj );
executed = false;
}
@@ -689,18 +689,18 @@ TQString RemoveObjectCommand::name() const
return i18n("Remove Object");
}
-InsertObjectCommand::InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry& _entry, Canvas *_canvas ) //child
+InsertObjectCommand::InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry& _entry, Canvas *_canvas ) //child
{
- tqgeometry = _tqgeometry;
+ geometry = _geometry;
entry = _entry;
canvas = _canvas;
type = OBJECT_KOFFICE_PART;
obj = 0;
}
-InsertObjectCommand::InsertObjectCommand(const KoRect& _tqgeometry, KoDocumentEntry& _entry, const TQRect& _data, Canvas *_canvas ) //chart
+InsertObjectCommand::InsertObjectCommand(const KoRect& _geometry, KoDocumentEntry& _entry, const TQRect& _data, Canvas *_canvas ) //chart
{
- tqgeometry = _tqgeometry;
+ geometry = _geometry;
entry = _entry;
data = _data;
canvas = _canvas;
@@ -708,10 +708,10 @@ InsertObjectCommand::InsertObjectCommand(const KoRect& _tqgeometry, KoDocumentEn
obj = 0;
}
-InsertObjectCommand::InsertObjectCommand( const KoRect& _tqgeometry , KURL& _file, Canvas *_canvas ) //picture
+InsertObjectCommand::InsertObjectCommand( const KoRect& _geometry , KURL& _file, Canvas *_canvas ) //picture
{
//In the case of pictures, only the top left point of the rectangle is relevant
- tqgeometry = _tqgeometry;
+ geometry = _geometry;
file = _file;
canvas = _canvas;
type = OBJECT_PICTURE;
@@ -737,7 +737,7 @@ void InsertObjectCommand::execute()
if ( obj ) //restore the object which was removed from the object list in InsertObjectCommand::unexecute()
{
canvas->doc()->embeddedObjects().append( obj );
- canvas->doc()->tqrepaint( obj );
+ canvas->doc()->repaint( obj );
}
else
{
@@ -746,17 +746,17 @@ void InsertObjectCommand::execute()
{
case OBJECT_CHART:
{
- success = canvas->activeSheet()->insertChart( tqgeometry, entry, data );
+ success = canvas->activeSheet()->insertChart( geometry, entry, data );
break;
}
case OBJECT_KOFFICE_PART:
{
- success = canvas->activeSheet()->insertChild( tqgeometry, entry );
+ success = canvas->activeSheet()->insertChild( geometry, entry );
break;
}
case OBJECT_PICTURE:
{
- success = canvas->activeSheet()->insertPicture( tqgeometry.topLeft() , file );
+ success = canvas->activeSheet()->insertPicture( geometry.topLeft() , file );
break;
}
default:
@@ -780,7 +780,7 @@ void InsertObjectCommand::unexecute()
canvas->doc()->embeddedObjects().removeRef( obj );
obj->setSelected( false );
- canvas->doc()->tqrepaint( obj );
+ canvas->doc()->repaint( obj );
executed = false;
}
@@ -871,7 +871,7 @@ void GeometryPropertiesCommand::execute()
{
it.current()->setProtect( m_newValue );
if ( it.current()->isSelected() )
- m_doc->tqrepaint( it.current() );
+ m_doc->repaint( it.current() );
}
else if ( m_type == KeepRatio)
it.current()->setKeepRatio( m_newValue );
@@ -887,7 +887,7 @@ void GeometryPropertiesCommand::unexecute()
{
obj->setProtect( *m_oldValue.at(i) );
if ( obj->isSelected() )
- m_doc->tqrepaint( obj );
+ m_doc->repaint( obj );
}
else if ( m_type == KeepRatio)
obj->setKeepRatio( *m_oldValue.at(i) );
@@ -920,13 +920,13 @@ void MoveObjectByCmd::execute()
TQRect oldRect;
for ( unsigned int i = 0; i < objects.count(); i++ ) {
- doc->tqrepaint( objects.at( i )->tqgeometry() );
+ doc->repaint( objects.at( i )->geometry() );
- KoRect r = objects.at( i )->tqgeometry();
+ KoRect r = objects.at( i )->geometry();
r.moveBy( diff.x(), diff.y() );
objects.at( i )->setGeometry( r );
- doc->tqrepaint( objects.at( i ) );
+ doc->repaint( objects.at( i ) );
}
}
@@ -935,12 +935,12 @@ void MoveObjectByCmd::unexecute()
TQRect oldRect;
for ( unsigned int i = 0; i < objects.count(); i++ ) {
- doc->tqrepaint( objects.at( i )->tqgeometry() );
+ doc->repaint( objects.at( i )->geometry() );
- KoRect r = objects.at( i )->tqgeometry();
+ KoRect r = objects.at( i )->geometry();
r.moveBy( -diff.x(), -diff.y() );
objects.at( i )->setGeometry( r );
- doc->tqrepaint( objects.at( i ) );
+ doc->repaint( objects.at( i ) );
}
}