diff options
Diffstat (limited to 'kspread')
50 files changed, 444 insertions, 444 deletions
diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html index 11184218..3c43a860 100644 --- a/kspread/DESIGN.html +++ b/kspread/DESIGN.html @@ -500,7 +500,7 @@ corresponding manipulator provides methods to store/recall the undo information) <p>Status: PLANNED.</p> <p>Formatting specifies how a cell should look like. It involves font -attributes like bold or italics, vertical and horizontal tqalignment, +attributes like bold or italics, vertical and horizontal alignment, rotation angle, shading, background color and so on. Each cell can have its own format, but bear also in mind that a whole row or column format should also apply.</p> diff --git a/kspread/OASIS.txt b/kspread/OASIS.txt index 2eb878c8..6aebbb9e 100644 --- a/kspread/OASIS.txt +++ b/kspread/OASIS.txt @@ -155,29 +155,29 @@ Merged cells </table:table-cell> <table:covered-table-cell table:style-name="ce3"/> -Cell horizontal tqalignment: top +Cell horizontal alignment: top <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:vertical-align="top"/> </style:style> -Cell horizontal tqalignment: middle +Cell horizontal alignment: middle <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:vertical-align="middle"/> </style:style> -Cell horizontal tqalignment: bottom +Cell horizontal alignment: bottom <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:vertical-align="bottom"/> </style:style> -Cell vertical tqalignment: top +Cell vertical alignment: top <style:style style:name="ce5" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:text-align="center" style:text-align-source="fix" style:repeat-content="none" fo:margin-left="0in" style:vertical-align="top"/> </style:style> -Cell vertical tqalignment: middle +Cell vertical alignment: middle <style:style style:name="ce6" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:text-align="center" style:text-align-source="fix" style:repeat-content="none" @@ -185,7 +185,7 @@ Cell vertical tqalignment: middle </style:style> -Cell vertical tqalignment: bottom +Cell vertical alignment: bottom <style:style style:name="ce7" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:text-align="center" style:text-align-source="fix" style:repeat-content="none" 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 ) ); } } diff --git a/kspread/commands.h b/kspread/commands.h index d0bd9132..b3622035 100644 --- a/kspread/commands.h +++ b/kspread/commands.h @@ -392,9 +392,9 @@ class RemoveObjectCommand : public KCommand class InsertObjectCommand : public KCommand { public: - InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry&, Canvas *_canvas ); //child - InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry&, const TQRect& _data, Canvas *_canvas ); //chart - InsertObjectCommand( const KoRect& _tqgeometry, KURL& _file, Canvas *_canvas ); //picture + InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry&, Canvas *_canvas ); //child + InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry&, const TQRect& _data, Canvas *_canvas ); //chart + InsertObjectCommand( const KoRect& _geometry, KURL& _file, Canvas *_canvas ); //picture ~InsertObjectCommand(); virtual void execute(); @@ -402,7 +402,7 @@ class InsertObjectCommand : public KCommand virtual TQString name() const; protected: - KoRect tqgeometry; + KoRect geometry; Canvas *canvas; bool executed; KoDocumentEntry entry; diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui index b7ae7fb9..0fe6fb41 100644 --- a/kspread/dialogs/font_cell_format.ui +++ b/kspread/dialogs/font_cell_format.ui @@ -206,7 +206,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignHCenter</set> </property> <property name="whatsThis" stdset="0"> diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc index 91589f9f..f24e691a 100644 --- a/kspread/dialogs/kspread_dlg_cons.cc +++ b/kspread/dialogs/kspread_dlg_cons.cc @@ -197,14 +197,14 @@ void ConsolidateDialog::slotOk() h <= ( ( desc == D_BOTH || desc == D_ROW ) ? 1 : 0 ) ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).tqarg( *( r.begin() ) )); + KMessageBox::error( this, i18n( "The range\n%1\nis too small" ).arg( *( r.begin() ) )); return; } if( (*it).range().bottom()==KS_rowMax || (*it).range().right()== KS_colMax ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( *( r.begin() ) )); + KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( *( r.begin() ) )); return; } @@ -220,7 +220,7 @@ void ConsolidateDialog::slotOk() if(currentRange.bottom()==KS_rowMax || currentRange.right()== KS_colMax) { m_pView->slotUpdateView( m_pView->activeSheet() ); - KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).tqarg( r[i])); + KMessageBox::error( this, i18n( "The range\n%1\nis too large" ).arg( r[i])); return; } if ( ( desc == D_NONE && ( w != w2 || h != h2 ) ) || @@ -228,7 +228,7 @@ void ConsolidateDialog::slotOk() ( desc == D_COL && w != w2 ) ) { m_pView->slotUpdateView( m_pView->activeSheet() ); - TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").tqarg( *( r.begin() ) ).tqarg( r[i] ); + TQString tmp = i18n( "The ranges\n%1\nand\n%2\nhave different size").arg( *( r.begin() ) ).arg( r[i] ); KMessageBox::error( this, tmp); return; } @@ -652,7 +652,7 @@ void ConsolidateDialog::slotReturnPressed() Range r( txt, m_pView->doc()->map() ); if ( !r.isValid() ) { - KMessageBox::error( this, i18n("The range\n%1\n is malformed").tqarg( txt )); + KMessageBox::error( this, i18n("The range\n%1\n is malformed").arg( txt )); return; } diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc index ca1ed59c..0d957265 100644 --- a/kspread/dialogs/kspread_dlg_database.cc +++ b/kspread/dialogs/kspread_dlg_database.cc @@ -139,11 +139,11 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * Frame16Layout->addWidget( TextLabel5, 5, 0 ); Frame5Layout->addWidget( Frame16 ); - m_databaseStatus = new TQLabel( Frame5, "m_databaseStatus" ); - m_databaseStatus->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databaseStatus->sizePolicy().hasHeightForWidth() ) ); - m_databaseStatus->setMaximumSize( TQSize( 32767, 30 ) ); - m_databaseStatus->setText( " " ); - Frame5Layout->addWidget( m_databaseStatus ); + m_databasetStatus = new TQLabel( Frame5, "m_databasetStatus" ); + m_databasetStatus->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databasetStatus->sizePolicy().hasHeightForWidth() ) ); + m_databasetStatus->setMaximumSize( TQSize( 32767, 30 ) ); + m_databasetStatus->setText( " " ); + Frame5Layout->addWidget( m_databasetStatus ); m_databaseLayout->addWidget( Frame5, 0, 1 ); @@ -717,10 +717,10 @@ bool DatabaseDialog::databaseDoNext() m_dbConnection->setPort( port ); } - m_databaseStatus->setText( i18n("Connecting to database...") ); + m_databasetStatus->setText( i18n("Connecting to database...") ); if ( m_dbConnection->open() ) { - m_databaseStatus->setText( i18n("Connected. Retrieving table information...") ); + m_databasetStatus->setText( i18n("Connected. Retrieving table information...") ); TQStringList sheetList( m_dbConnection->tables() ); if ( sheetList.isEmpty() ) @@ -741,7 +741,7 @@ bool DatabaseDialog::databaseDoNext() } m_sheetView->setEnabled( true ); - m_databaseStatus->setText( " " ); + m_databasetStatus->setText( " " ); } else { @@ -759,7 +759,7 @@ bool DatabaseDialog::databaseDoNext() errorMsg.append( error.databaseText() ); errorMsg.append( "\n" ); } - m_databaseStatus->setText( " " ); + m_databasetStatus->setText( " " ); KMessageBox::error( this, errorMsg ); return false; @@ -768,7 +768,7 @@ bool DatabaseDialog::databaseDoNext() else { KMessageBox::error( this, i18n("Driver could not be loaded") ); - m_databaseStatus->setText( " " ); + m_databasetStatus->setText( " " ); return false; } setNextEnabled(m_sheet, true); @@ -778,7 +778,7 @@ bool DatabaseDialog::databaseDoNext() bool DatabaseDialog::sheetsDoNext() { - m_databaseStatus->setText( i18n("Retrieving meta data of tables...") ); + m_databasetStatus->setText( i18n("Retrieving meta data of tables...") ); TQStringList sheets; for (TQListViewItem * item = (TQCheckListItem *) m_sheetView->firstChild(); item; item = item->nextSibling()) diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h index 9334935c..0bb859bd 100644 --- a/kspread/dialogs/kspread_dlg_database.h +++ b/kspread/dialogs/kspread_dlg_database.h @@ -88,7 +88,7 @@ class DatabaseDialog : public KWizard TQSqlDatabase * m_dbConnection; TQWidget * m_database; - TQLabel * m_databaseStatus; + TQLabel * m_databasetStatus; TQLineEdit * m_username; TQLineEdit * m_port; TQLineEdit * m_databaseName; diff --git a/kspread/dialogs/kspread_dlg_format.cc b/kspread/dialogs/kspread_dlg_format.cc index 6374c102..6163710b 100644 --- a/kspread/dialogs/kspread_dlg_format.cc +++ b/kspread/dialogs/kspread_dlg_format.cc @@ -106,7 +106,7 @@ void FormatDialog::slotActivated( int index ) if ( img.isEmpty() ) { TQString str( i18n( "Could not find image %1." ) ); - str = str.tqarg( m_entries[ index ].image ); + str = str.arg( m_entries[ index ].image ); KMessageBox::error( this, str ); enableButtonOK(false); @@ -118,7 +118,7 @@ void FormatDialog::slotActivated( int index ) if ( pix.isNull() ) { TQString str( i18n( "Could not load image %1." ) ); - str = str.tqarg( img ); + str = str.arg( img ); KMessageBox::error( this,str ); enableButtonOK(false); @@ -138,7 +138,7 @@ void FormatDialog::slotOk() if ( xml.isEmpty() ) { TQString str( i18n( "Could not find sheet-style XML file '%1'." ) ); - str = str.tqarg( m_entries[ m_combo->currentItem() ].xml ); + str = str.arg( m_entries[ m_combo->currentItem() ].xml ); KMessageBox::error( this, str ); return; } @@ -152,7 +152,7 @@ void FormatDialog::slotOk() if ( !parseXML( doc ) ) { TQString str( i18n( "Parsing error in sheet-style XML file %1." ) ); - str = str.tqarg( m_entries[ m_combo->currentItem() ].xml ); + str = str.arg( m_entries[ m_combo->currentItem() ].xml ); KMessageBox::error( this, str ); return; } diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc index a52d4df9..9eb92a45 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cc +++ b/kspread/dialogs/kspread_dlg_goalseek.cc @@ -459,7 +459,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal) // m_targetCell->setCalcDirtyFlag(); m_targetCell->calc( false ); - m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).tqarg( m_sourceEdit->text() ) ); + m_resultText->setText( i18n( "Goal seeking with cell %1 found a solution:" ).arg( m_sourceEdit->text() ) ); m_newValue->setText( m_pView->doc()->locale()->formatNumber( startA ) ); m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) ); m_restored = false; @@ -471,7 +471,7 @@ void GoalSeekDialog::startCalc(double _start, double _goal) m_targetCell->setCalcDirtyFlag(); m_sourceCell->sheet()->setRegionPaintDirty(m_sourceCell->cellRect()); m_targetCell->calc( false ); - m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).tqarg( m_sourceEdit->text() ) ); + m_resultText->setText( i18n( "Goal seeking with cell %1 has found NO solution." ).arg( m_sourceEdit->text() ) ); m_newValue->setText( "" ); m_currentValue->setText( m_pView->doc()->locale()->formatNumber( m_oldSource ) ); m_restored = true; diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc index 27e27868..f7878266 100644 --- a/kspread/dialogs/kspread_dlg_layout.cc +++ b/kspread/dialogs/kspread_dlg_layout.cc @@ -88,7 +88,7 @@ void PatternSelect::setPattern( const TQColor &_color, int _width, Qt::PenStyle penStyle = _style; penColor = _color; penWidth = _width; - tqrepaint(); + repaint(); } void PatternSelect::setUndefined() @@ -127,7 +127,7 @@ void PatternSelect::slotUnselect() setLineWidth( 1 ); setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - tqrepaint(); + repaint(); } void PatternSelect::slotSelect() @@ -136,7 +136,7 @@ void PatternSelect::slotSelect() setLineWidth( 2 ); setFrameStyle( TQFrame::Panel | TQFrame::Plain ); - tqrepaint(); + repaint(); } @@ -262,7 +262,7 @@ bool GeneralTab::checkParent( const TQString & parentName ) { KMessageBox::sorry( this, i18n( "The style cannot inherit from '%1' because of recursive references." ) - .tqarg( m_parentBox->currentText() ) ); + .arg( m_parentBox->currentText() ) ); return false; } @@ -1965,7 +1965,7 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg TQStringList tmpListFont; TQFontDatabase *fontDataBase = new TQFontDatabase(); - tmpListFont = fontDataBase->tqfamilies(); + tmpListFont = fontDataBase->families(); delete fontDataBase; family_combo->insertStringList( tmpListFont); @@ -1996,7 +1996,7 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg TQStringList lst; lst.append(""); for ( unsigned int i = 1; i < 100; ++i ) - lst.append( TQString( "%1" ).tqarg( i ) ); + lst.append( TQString( "%1" ).arg( i ) ); size_combo->insertStringList( lst ); @@ -2151,7 +2151,7 @@ void CellFormatPageFont::display_example(const TQFont& font) TQString string; fontChanged=true; example_label->setFont(font); - example_label->tqrepaint(); + example_label->repaint(); } void CellFormatPageFont::setCombos() @@ -2281,7 +2281,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial if ( dlg->isRowSelected ) width->setEnabled(false); - defaultWidth->setText(i18n("Default width (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName())); + defaultWidth->setText(i18n("Default width (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultWidthSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName())); if ( dlg->isRowSelected ) defaultWidth->setEnabled(false); @@ -2296,7 +2296,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial if ( dlg->isColumnSelected ) height->setEnabled(false); - defaultHeight->setText(i18n("Default height (%1 %2)").tqarg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).tqarg(dlg->getDoc()->unitName())); //annma + defaultHeight->setText(i18n("Default height (%1 %2)").arg(KoUnit::toUserValue(dlg->defaultHeightSize, dlg->getDoc()->unit()), 0, 'f', 2).arg(dlg->getDoc()->unitName())); //annma if ( dlg->isColumnSelected ) defaultHeight->setEnabled(false); @@ -3223,7 +3223,7 @@ void CellFormatPageBorder::preselect( BorderButton *_p ) vertical->setChanged(true); } } - area->tqrepaint(); + area->repaint(); } void CellFormatPageBorder::changeState( BorderButton *_p) @@ -3243,7 +3243,7 @@ void CellFormatPageBorder::changeState( BorderButton *_p) _p->setColor( colorGroup().text() ); } - area->tqrepaint(); + area->repaint(); } void CellFormatPageBorder::draw() @@ -3483,7 +3483,7 @@ if (rect.contains(TQPoint(_ev->x(),_ev->y()))) } } - area->tqrepaint(); + area->repaint(); } @@ -3505,7 +3505,7 @@ void BrushSelect::setPattern( const TQColor &_color,Qt::BrushStyle _style ) { brushStyle = _style; brushColor = _color; - tqrepaint(); + repaint(); } @@ -3535,7 +3535,7 @@ void BrushSelect::slotUnselect() setLineWidth( 1 ); setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - tqrepaint(); + repaint(); } void BrushSelect::slotSelect() @@ -3544,7 +3544,7 @@ void BrushSelect::slotSelect() setLineWidth( 2 ); setFrameStyle( TQFrame::Panel | TQFrame::Plain ); - tqrepaint(); + repaint(); } diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h index b8ec0bba..8d38663a 100644 --- a/kspread/dialogs/kspread_dlg_layout.h +++ b/kspread/dialogs/kspread_dlg_layout.h @@ -101,16 +101,16 @@ class PatternSelect : public TQFrame public: PatternSelect( TQWidget *parent, const char *_name ); - void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; tqrepaint(); } + void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; repaint(); } Qt::PenStyle getPenStyle() { return penStyle; } - void setColor( const TQColor &_col ) { penColor = _col; tqrepaint(); } + void setColor( const TQColor &_col ) { penColor = _col; repaint(); } const TQColor& getColor() { return penColor; } - void setPenWidth( int _w ) { penWidth = _w; tqrepaint(); } + void setPenWidth( int _w ) { penWidth = _w; repaint(); } int getPenWidth() { return penWidth; } void setPattern( const TQColor &_color, int _width, Qt::PenStyle _style ); void setUndefined(); - void setDefined() { undefined = FALSE; tqrepaint(); } + void setDefined() { undefined = FALSE; repaint(); } bool isDefined() { return !undefined; } @@ -389,7 +389,7 @@ class BrushSelect : public TQFrame public: BrushSelect( TQWidget *parent, const char *_name ); - void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; tqrepaint(); } + void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; repaint(); } Qt::BrushStyle getBrushStyle() const { return brushStyle; } TQColor getBrushColor() const { return brushColor; } void setBrushColor(const TQColor &_c) { brushColor=_c;} diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc index f0e6f664..7150b017 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cc +++ b/kspread/dialogs/kspread_dlg_paperlayout.cc @@ -194,17 +194,17 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) TQStringList lst; for( int i = 5; i < 500; i += 5 ) { - lst.append( TQString( i18n( "%1%" ) ).tqarg( i ) ); + lst.append( TQString( i18n( "%1%" ) ).arg( i ) ); if( tqRound( print->zoom() * 100 ) > i && tqRound( print->zoom() * 100 ) < i + 5 ) { - lst.append( TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) ) ); + lst.append( TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) ) ); } } m_cZoom->insertStringList( lst ); int number_of_entries = m_cZoom->count(); - TQString string = TQString( i18n( "%1%" ) ).tqarg( tqRound( print->zoom() * 100 ) ); + TQString string = TQString( i18n( "%1%" ) ).arg( tqRound( print->zoom() * 100 ) ); for (int i = 0; i < number_of_entries ; i++) { if ( string == (TQString) m_cZoom->text(i) ) @@ -227,11 +227,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) lstX.append( i18n( "No Limit" ) ); for( int i = 1; i <= 20; i += 1 ) { - lstX.append( TQString( "%1" ).tqarg( i ) ); + lstX.append( TQString( "%1" ).arg( i ) ); } if( print->pageLimitX() > 20 ) { - lstX.append( TQString( "%1" ).tqarg( print->pageLimitX() ) ); + lstX.append( TQString( "%1" ).arg( print->pageLimitX() ) ); } m_cLimitPagesX->insertStringList( lstX ); @@ -250,11 +250,11 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) lstY.append( i18n( "No Limit" ) ); for( int i = 1; i <= 20; i += 1 ) { - lstY.append( TQString( "%1" ).tqarg( i ) ); + lstY.append( TQString( "%1" ).arg( i ) ); } if( print->pageLimitY() > 20 ) { - lstY.append( TQString( "%1" ).tqarg( print->pageLimitY() ) ); + lstY.append( TQString( "%1" ).arg( print->pageLimitY() ) ); } m_cLimitPagesY->insertStringList( lstY ); @@ -407,7 +407,7 @@ void PaperLayout::slotOk() if ( m_rScalingZoom->isChecked() ) { kdDebug() << "Zoom is selected" << endl; - if( TQString( "%1%" ).tqarg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() ) + if( TQString( "%1%" ).arg( tqRound( print->zoom() * 100 ) ) != m_cZoom->currentText() ) { kdDebug() << "New zoom is different than original: " << m_cZoom->currentText() << endl; TQString zoomtext = m_cZoom->currentText(); diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc index 9d223e19..c4777a7b 100644 --- a/kspread/dialogs/kspread_dlg_preference.cc +++ b/kspread/dialogs/kspread_dlg_preference.cc @@ -192,12 +192,12 @@ void parameterLocale::updateDefaultSystemConfig() void parameterLocale::updateToMatchLocale(KLocale* locale) { - m_language->setText( i18n("Language: %1").tqarg( locale->language() )); - m_number->setText( i18n("Default number format: %1").tqarg( locale->formatNumber(12.55) )); - m_date->setText( i18n("Long date format: %1").tqarg( locale->formatDate( TQDate::currentDate() ))); - m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::currentDate() ,true) )); - m_time->setText( i18n("Time format: %1").tqarg( locale->formatTime( TQTime::currentTime() ) )); - m_money->setText( i18n("Currency format: %1").tqarg( locale->formatMoney(12.55) )); + m_language->setText( i18n("Language: %1").arg( locale->language() )); + m_number->setText( i18n("Default number format: %1").arg( locale->formatNumber(12.55) )); + m_date->setText( i18n("Long date format: %1").arg( locale->formatDate( TQDate::currentDate() ))); + m_shortDate->setText( i18n("Short date format: %1").arg( locale->formatDate( TQDate::currentDate() ,true) )); + m_time->setText( i18n("Time format: %1").arg( locale->formatTime( TQTime::currentTime() ) )); + m_money->setText( i18n("Currency format: %1").arg( locale->formatMoney(12.55) )); } configure::configure( View* _view, TQVBox *box , char *name ) @@ -488,7 +488,7 @@ miscParameters::miscParameters( View* _view,TQVBox *box, char *name ) // valIndent->setRange( 0.0, 100.0, 10.0 ); valIndent->setValue ( KoUnit::toUserValue( _indent, indentUnit ) ); TQWhatsThis::add(valIndent, i18n( "Lets you define the amount of indenting used by the Increase Indent and Decrease Indent option in the Format menu." ) ); - valIndent->setLabel(i18n("&Indentation step (%1):").tqarg(KoUnit::unitName(indentUnit))); + valIndent->setLabel(i18n("&Indentation step (%1):").arg(KoUnit::unitName(indentUnit))); msgError= new TQCheckBox(i18n("&Show error message for invalid formulae"),tmpTQGroupBox); msgError->setChecked(m_bMsgError); diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc index 1587e866..477cfd1c 100644 --- a/kspread/dialogs/kspread_dlg_reference.cc +++ b/kspread/dialogs/kspread_dlg_reference.cc @@ -110,7 +110,7 @@ reference::reference( View* parent, const char* name ) TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); connect( m_list, TQT_SIGNAL(highlighted ( TQListBoxItem * ) ), this, TQT_SLOT(slotHighlighted(TQListBoxItem * ))); - m_rangeName->setText(i18n("Area: %1").tqarg("")); + m_rangeName->setText(i18n("Area: %1").arg("")); resize( 250, 200 ); } @@ -134,7 +134,7 @@ void reference::displayAreaValues(TQString const & areaName) } } - tmpName = i18n("Area: %1").tqarg(tmpName); + tmpName = i18n("Area: %1").arg(tmpName); m_rangeName->setText(tmpName); } @@ -206,7 +206,7 @@ void reference::slotEdit() EditAreaName editDlg( m_pView, "EditArea", name ); editDlg.exec(); - m_rangeName->setText(i18n("Area: %1").tqarg("")); + m_rangeName->setText(i18n("Area: %1").arg("")); TQString tmp = m_list->text(m_list->currentItem()); if (!tmp.isEmpty()) displayAreaValues( tmp ); diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cc index 75a50cc3..0a32a44d 100644 --- a/kspread/dialogs/kspread_dlg_showColRow.cc +++ b/kspread/dialogs/kspread_dlg_showColRow.cc @@ -78,9 +78,9 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) for( it = listInt.begin(); it != listInt.end(); ++it ) { if(!showColNumber) - listCol+=i18n("Column: %1").tqarg(Cell::columnName(*it)); + listCol+=i18n("Column: %1").arg(Cell::columnName(*it)); else - listCol+=i18n("Column: %1").tqarg(text.setNum(*it)); + listCol+=i18n("Column: %1").arg(text.setNum(*it)); } list->insertStringList(listCol); } @@ -98,7 +98,7 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) qHeapSort(listInt); TQValueList<int>::Iterator it; for( it = listInt.begin(); it != listInt.end(); ++it ) - listRow+=i18n("Row: %1").tqarg(text.setNum(*it)); + listRow+=i18n("Row: %1").arg(text.setNum(*it)); list->insertStringList(listRow); } diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc index e903fcd5..6a7b2abc 100644 --- a/kspread/dialogs/kspread_dlg_sort.cc +++ b/kspread/dialogs/kspread_dlg_sort.cc @@ -351,7 +351,7 @@ void SortDialog::init() for (int i = r.left(); i <= right; ++i) { TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i); - TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i)); + TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i)); if (!guessName.isEmpty()) { @@ -359,13 +359,13 @@ void SortDialog::init() } else { - m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i)); + m_listColumn += i18n("Column %1").arg(Cell::columnName(i)); if ( i == r.left() ) selectionMayHaveHeader=false; } } - // m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i)); + // m_listColumn += i18n("Column %1").arg(Cell::columnName(i)); } // Entire rows selected ? else if ( util_isRowSelected(r) ) @@ -377,7 +377,7 @@ void SortDialog::init() for (int i = r.top(); i <= bottom; ++i) { TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i); - TQString rowName=i18n(" (Row %1)").tqarg(i); + TQString rowName=i18n(" (Row %1)").arg(i); if (!guessName.isEmpty()) { @@ -385,7 +385,7 @@ void SortDialog::init() } else { - m_listRow += i18n("Row %1").tqarg(i); + m_listRow += i18n("Row %1").arg(i); if ( i == r.top() ) selectionMayHaveHeader=false; @@ -419,13 +419,13 @@ void SortDialog::init() for (int i = r.left(); i <= right; ++i) { TQString guessName=m_pView->activeSheet()->guessColumnTitle(r,i); - TQString colName=i18n(" (Column %1)").tqarg(Cell::columnName(i)); + TQString colName=i18n(" (Column %1)").arg(Cell::columnName(i)); if (!guessName.isEmpty()) m_listColumn += guessName + colName; else { - m_listColumn += i18n("Column %1").tqarg(Cell::columnName(i)); + m_listColumn += i18n("Column %1").arg(Cell::columnName(i)); if (i == r.left()) selectionMayHaveHeader=false; @@ -435,13 +435,13 @@ void SortDialog::init() for (int i = r.top(); i <= bottom; ++i) { TQString guessName=m_pView->activeSheet()->guessRowTitle(r,i); - TQString rowName=i18n(" (Row %1)").tqarg(i); + TQString rowName=i18n(" (Row %1)").arg(i); if (!guessName.isEmpty()) m_listRow += guessName + rowName; else { - m_listRow += i18n("Row %1").tqarg(i); + m_listRow += i18n("Row %1").arg(i); if (i == r.top()) selectionMayHaveHeader=false; diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc index 787aac7c..dd0857e3 100644 --- a/kspread/dialogs/kspread_dlg_styles.cc +++ b/kspread/dialogs/kspread_dlg_styles.cc @@ -232,11 +232,11 @@ void StyleDlg::slotUser1() s = m_styleManager->defaultStyle(); int i = 1; - TQString newName( i18n( "style%1" ).tqarg( m_styleManager->count() + i ) ); + TQString newName( i18n( "style%1" ).arg( m_styleManager->count() + i ) ); while ( m_styleManager->style( newName ) != 0 ) { ++i; - newName = i18n( "style%1" ).tqarg( m_styleManager->count() + i ); + newName = i18n( "style%1" ).arg( m_styleManager->count() + i ); } CustomStyle * style = new CustomStyle( newName, s ); diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc index 1b899ebf..f88f3a7f 100644 --- a/kspread/dialogs/kspread_dlg_subtotal.cc +++ b/kspread/dialogs/kspread_dlg_subtotal.cc @@ -243,7 +243,7 @@ void SubtotalDialog::fillColumnBoxes() if ( text.length() > 0 ) { - text = col.tqarg( Cell::columnName( i ) ); + text = col.arg( Cell::columnName( i ) ); } m_dialog->m_columnBox->insertItem( text ); diff --git a/kspread/doc/PAINTING.html b/kspread/doc/PAINTING.html index d3c739a8..13a674db 100644 --- a/kspread/doc/PAINTING.html +++ b/kspread/doc/PAINTING.html @@ -129,7 +129,7 @@ that is demanded can be handled in several different ways:</p> <li>The content can be partially shown, i.e. cut. <li>The content can overflow into neighbor cell(s). Which cells that - are affected is dependent on tqalignment, if the neighbors are + are affected is dependent on alignment, if the neighbors are empty, etc, etc. </ul> <h3>Borders and overflow</h3> diff --git a/kspread/formula.cc b/kspread/formula.cc index 1e42867a..0f70feaf 100644 --- a/kspread/formula.cc +++ b/kspread/formula.cc @@ -1479,10 +1479,10 @@ TQString Formula::dump() const compile( tokens ); } - result = TQString("Expression: [%1]\n").tqarg( d->expression ); + result = TQString("Expression: [%1]\n").arg( d->expression ); #if 0 Value value = eval(); - result.append( TQString("Result: %1\n").tqarg( + result.append( TQString("Result: %1\n").arg( converter->asString(value).asString() ) ); #endif @@ -1491,12 +1491,12 @@ TQString Formula::dump() const { TQString vtext; Value val = d->constants[c]; - if( val.isString() ) vtext = TQString("[%1]").tqarg( val.asString() ); - else if( val.isNumber() ) vtext = TQString("%1").tqarg( val.asFloat() ); - else if( val.isBoolean() ) vtext = TQString("%1").tqarg( val.asBoolean() ? "True":"False"); + if( val.isString() ) vtext = TQString("[%1]").arg( val.asString() ); + else if( val.isNumber() ) vtext = TQString("%1").arg( val.asFloat() ); + else if( val.isBoolean() ) vtext = TQString("%1").arg( val.asBoolean() ? "True":"False"); else if( val.isError() ) vtext = "error"; else vtext = "???"; - result += TQString(" #%1 = %2\n").tqarg(c).tqarg( vtext ); + result += TQString(" #%1 = %2\n").arg(c).arg( vtext ); } result.append("\n"); @@ -1506,9 +1506,9 @@ TQString Formula::dump() const TQString ctext; switch( d->codes[i].type ) { - case Opcode::Load: ctext = TQString("Load #%1").tqarg( d->codes[i].index ); break; - case Opcode::Ref: ctext = TQString("Ref #%1").tqarg( d->codes[i].index ); break; - case Opcode::Function: ctext = TQString("Function (%1)").tqarg( d->codes[i].index ); break; + case Opcode::Load: ctext = TQString("Load #%1").arg( d->codes[i].index ); break; + case Opcode::Ref: ctext = TQString("Ref #%1").arg( d->codes[i].index ); break; + case Opcode::Function: ctext = TQString("Function (%1)").arg( d->codes[i].index ); break; case Opcode::Add: ctext = "Add"; break; case Opcode::Sub: ctext = "Sub"; break; case Opcode::Mul: ctext = "Mul"; break; diff --git a/kspread/kspread_brush.cc b/kspread/kspread_brush.cc index 3a66549b..f3c6953c 100644 --- a/kspread/kspread_brush.cc +++ b/kspread/kspread_brush.cc @@ -103,8 +103,8 @@ void KSpreadBrush::saveOasisFillStyle( KoGenStyle &styleObjectAuto, KoGenStyles& if ( m_unbalanced ) { - unbalancedx = TQString( "%1%" ).tqarg( m_xfactor / 4 + 50 ); - unbalancedy = TQString( "%1%" ).tqarg( m_yfactor / 4 + 50 ); + unbalancedx = TQString( "%1%" ).arg( m_xfactor / 4 + 50 ); + unbalancedy = TQString( "%1%" ).arg( m_yfactor / 4 + 50 ); } gradientStyle.addAttribute( "draw:cx", unbalancedx ); gradientStyle.addAttribute( "draw:cy", unbalancedy ); diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc index 6b7e191f..4d091a3d 100644 --- a/kspread/kspread_canvas.cc +++ b/kspread/kspread_canvas.cc @@ -1011,7 +1011,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev ) (int) _ev->y() ); if ( ( obj = getObject( p, activeSheet() ) ) && obj->isSelected() ) { - KoRect const bound = obj->tqgeometry(); + KoRect const bound = obj->geometry(); TQRect zoomedBound = doc()->zoomRect( KoRect(bound.left(), bound.top(), bound.width(), bound.height() ) ); @@ -1056,7 +1056,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev ) } //Check to see if the mouse is over a highlight range size grip and if it is, change the cursor - //tqshape to a resize arrow + //shape to a resize arrow if (highlightRangeSizeGripAt(ev_PosX,ev_PosY)) { if ( sheet->layoutDirection()==Sheet::RightToLeft ) @@ -1177,7 +1177,7 @@ void Canvas::mouseReleaseEvent( TQMouseEvent* /*_ev*/) doc()->addCommand( cmd ); } else { - tqrepaint(); + repaint(); } d->m_isMoving = false; break; @@ -1253,13 +1253,13 @@ void Canvas::processLeftClickAnchor() if ( KRun::isExecutableFile( d->anchor , type ) ) { - //TQString question = i18n("Do you want to open this link to '%1'?\n").tqarg(d->anchor); + //TQString question = i18n("Do you want to open this link to '%1'?\n").arg(d->anchor); //question += i18n("Note that opening a link to a local file may " // "compromise your system's security."); TQString question = i18n("This link points to the program or script '%1'.\n" - "Malicious programs can harm your computer. Are you sure that you want to run this program?").tqarg(d->anchor); + "Malicious programs can harm your computer. Are you sure that you want to run this program?").arg(d->anchor); // this will also start local programs, so adding a "don't warn again" // checkbox will probably be too dangerous int choice = KMessageBox::warningYesNo(this, question, i18n("Open Link?")); @@ -1352,9 +1352,9 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) d->m_resizeObject = obj; - d->m_ratio = static_cast<double>( obj->tqgeometry().width() ) / - static_cast<double>( obj->tqgeometry().height() ); - d->m_rectBeforeResize = obj->tqgeometry(); + d->m_ratio = static_cast<double>( obj->geometry().width() ) / + static_cast<double>( obj->geometry().height() ); + d->m_rectBeforeResize = obj->geometry(); } KoPoint docPoint ( doc()->unzoomPoint( _ev->pos() ) ); @@ -2150,13 +2150,13 @@ void Canvas::processEscapeKey(TQKeyEvent * event) case MT_RESIZE_RU: case MT_RESIZE_RD: { - TQRect oldBoundingRect = doc()->zoomRect( d->m_resizeObject->tqgeometry()/*getRepaintRect()*/); + TQRect oldBoundingRect = doc()->zoomRect( d->m_resizeObject->geometry()/*getRepaintRect()*/); d->m_resizeObject->setGeometry( d->m_rectBeforeResize ); oldBoundingRect.moveBy( (int)( -xOffset()*doc()->zoomedResolutionX() ) , (int)( -yOffset() * doc()->zoomedResolutionY()) ); activeSheet()->setRegionPaintDirty( oldBoundingRect ); - tqrepaint( oldBoundingRect ); + repaint( oldBoundingRect ); repaintObject( d->m_resizeObject ); d->m_ratio = 0.0; d->m_resizeObject = 0; @@ -3290,7 +3290,7 @@ KSpread::EmbeddedObject *Canvas::getObject( const TQPoint &pos, Sheet *_sheet ) { if ( itObject.current()->sheet() == _sheet ) { - KoRect const bound = ( itObject.current() )->tqgeometry(); + KoRect const bound = ( itObject.current() )->geometry(); TQRect zoomedBound = doc()->zoomRect( KoRect(bound.left(), bound.top(), bound.width(), bound.height() ) ); @@ -3429,7 +3429,7 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep { EmbeddedObject *obj = d->m_resizeObject; - KoRect objRect = obj->tqgeometry(); + KoRect objRect = obj->geometry(); objRect.moveBy( -xOffset(), -yOffset() ); TQRect oldBoundingRect( doc()->zoomRect( objRect ) ); @@ -3575,7 +3575,7 @@ void Canvas::resizeObject( ModifyType _modType, const KoPoint & point, bool keep // m_gl.repaintSnapping( sp, snapStatus ); // } - tqrepaint( oldBoundingRect ); + repaint( oldBoundingRect ); repaintObject( obj ); emit objectSizeChanged(); } @@ -3586,12 +3586,12 @@ void Canvas::finishResizeObject( const TQString &/*name*/, bool /*tqlayout*/ ) { if ( d->m_resizeObject ) { - KoPoint move = KoPoint( d->m_resizeObject->tqgeometry().x() - d->m_rectBeforeResize.x(), - d->m_resizeObject->tqgeometry().y() - d->m_rectBeforeResize.y() ); - KoSize size = KoSize( d->m_resizeObject->tqgeometry().width() - d->m_rectBeforeResize.width(), - d->m_resizeObject->tqgeometry().height() - d->m_rectBeforeResize.height() ); + KoPoint move = KoPoint( d->m_resizeObject->geometry().x() - d->m_rectBeforeResize.x(), + d->m_resizeObject->geometry().y() - d->m_rectBeforeResize.y() ); + KoSize size = KoSize( d->m_resizeObject->geometry().width() - d->m_rectBeforeResize.width(), + d->m_resizeObject->geometry().height() - d->m_rectBeforeResize.height() ); - if ( ( d->m_resizeObject->tqgeometry() ) != d->m_rectBeforeResize ) + if ( ( d->m_resizeObject->geometry() ) != d->m_rectBeforeResize ) { ChangeObjectGeometryCommand *resizeCmd = new ChangeObjectGeometryCommand( d->m_resizeObject, move, size ); // the command is not executed as the object is allready resized. @@ -3669,7 +3669,7 @@ void Canvas::deleteEditor (bool saveChanges, bool array) TQString t = d->cellEditor->text(); // Delete the cell editor first and after that update the document. - // That means we get a synchronous tqrepaint after the cell editor + // That means we get a synchronous repaint after the cell editor // widget is gone. Otherwise we may get painting errors. delete d->cellEditor; d->cellEditor = 0; @@ -3819,8 +3819,8 @@ bool Canvas::createEditor( EditorType ed, bool addFocus, bool captureArrowKeys ) void Canvas::repaintObject( EmbeddedObject *obj ) { - //Calculate where the object appears on the canvas widget and then tqrepaint that part of the widget - TQRect canvasRelativeGeometry = doc()->zoomRect( obj->tqgeometry() ); + //Calculate where the object appears on the canvas widget and then repaint that part of the widget + TQRect canvasRelativeGeometry = doc()->zoomRect( obj->geometry() ); canvasRelativeGeometry.moveBy( (int)( -xOffset()*doc()->zoomedResolutionX() ) , (int)( -yOffset() * doc()->zoomedResolutionY()) ); @@ -3828,17 +3828,17 @@ void Canvas::repaintObject( EmbeddedObject *obj ) /* if ( !obj->isSelected() ) { - KoRect g = obj->tqgeometry(); + KoRect g = obj->geometry(); g.moveBy( -xOffset(), -yOffset() ); - TQRect tqgeometry( doc()->zoomRect( g ) ); + TQRect geometry( doc()->zoomRect( g ) ); - update( tqgeometry ); + update( geometry ); } else { TQPainter p(this); p.translate( -xOffset() * doc()->zoomedResolutionX() , -yOffset() * doc()->zoomedResolutionY() ); - obj->draw(&p); //this goes faster than calling tqrepaint + obj->draw(&p); //this goes faster than calling repaint p.end(); }*/ } @@ -3888,7 +3888,7 @@ void Canvas::copyOasisObjects() for( ; itObject.current(); ++itObject ) { if ( itObject.current()->isSelected() ) - p.drawPixmap( itObject.current()->tqgeometry().toTQRect().left() - r.left(), itObject.current()->tqgeometry().toTQRect().top() - r.top(), itObject.current()->toPixmap( 1.0 , 1.0 ) ); + p.drawPixmap( itObject.current()->geometry().toTQRect().left() - r.left(), itObject.current()->geometry().toTQRect().top() - r.top(), itObject.current()->toPixmap( 1.0 , 1.0 ) ); } p.end(); if (!pixmap.isNull()) @@ -4202,7 +4202,7 @@ void Canvas::paintUpdates() paintHighlightedRanges(painter, unzoomedRect); paintNormalMarker(painter, unzoomedRect); - //restore clip region with tqchildren area + //restore clip region with children area painter.restore(); //painter.setClipRegion( rgnComplete ); } @@ -4223,7 +4223,7 @@ void Canvas::clipoutChildren( TQPainter& painter ) const { if ( ( itObject.current() )->sheet() == activeSheet() ) { - TQRect childGeometry = doc()->zoomRect( itObject.current()->tqgeometry()); + TQRect childGeometry = doc()->zoomRect( itObject.current()->geometry()); //The clipping region is given in device coordinates //so subtract the current offset (scroll position) of the canvas @@ -4232,7 +4232,7 @@ void Canvas::clipoutChildren( TQPainter& painter ) const if (painter.window().intersects(childGeometry)) rgn -= childGeometry; - //painter.fillRect( doc()->zoomRect( itObject.current()->tqgeometry() ), TQColor("red" ) ); + //painter.fillRect( doc()->zoomRect( itObject.current()->geometry() ), TQColor("red" ) ); } } @@ -4263,11 +4263,11 @@ void Canvas::paintChildren( TQPainter& painter, TQWMatrix& /*matrix*/ ) for( ; itObject.current(); ++itObject ) { - TQRect const zoomedObjectGeometry = doc()->zoomRect( itObject.current()->tqgeometry() ); + TQRect const zoomedObjectGeometry = doc()->zoomRect( itObject.current()->geometry() ); if ( ( itObject.current() )->sheet() == activeSheet() && zoomedWindowGeometry.intersects( zoomedObjectGeometry ) ) { - //To prevent unnecessary redrawing of the embedded object, we only tqrepaint + //To prevent unnecessary redrawing of the embedded object, we only repaint //if one or more of the cells underneath the object has been marked as 'dirty'. TQRect canvasRelativeGeometry = zoomedObjectGeometry; @@ -5036,9 +5036,9 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime ) TQString tmpSize; if ( m_iResizePos != y ) - tmpSize = i18n("Height: %1 %2").tqarg( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItY( m_iResizePos - y ), + tmpSize = i18n("Height: %1 %2").arg( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItY( m_iResizePos - y ), m_pView->doc()->unit() ) ) - .tqarg( m_pView->doc()->unitName() ); + .arg( m_pView->doc()->unitName() ); else tmpSize = i18n( "Hide Row" ); @@ -5738,9 +5738,9 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime ) TQString tmpSize; if ( m_iResizePos != x ) tmpSize = i18n("Width: %1 %2") - .tqarg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ), + .arg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ), m_pView->doc()->unit() ))) - .tqarg( m_pView->doc()->unitName() ); + .arg( m_pView->doc()->unitName() ); else tmpSize = i18n( "Hide Column" ); diff --git a/kspread/kspread_canvas.h b/kspread/kspread_canvas.h index ce6c3feb..d8411791 100644 --- a/kspread/kspread_canvas.h +++ b/kspread/kspread_canvas.h @@ -444,7 +444,7 @@ private: TQRect cellsInArea( const TQRect area ) const; /** - * Paints the tqchildren + * Paints the children */ void paintChildren( TQPainter& painter, TQWMatrix& matrix ); diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc index 705f77b4..0cbda2b4 100644 --- a/kspread/kspread_cell.cc +++ b/kspread/kspread_cell.cc @@ -1049,20 +1049,20 @@ TQString Cell::encodeFormula( bool _era, int _col, int _row ) const int col = 0; col = util_decodeColumnLabelText( buffer ); if ( fix1 ) - erg += TQString( "$%1" ).tqarg( col ); + erg += TQString( "$%1" ).arg( col ); else if (_era) - erg += TQChar(0xA7) + TQString( "%1" ).tqarg( col ); + erg += TQChar(0xA7) + TQString( "%1" ).arg( col ); else - erg += TQString( "#%1" ).tqarg( col - _col ); + erg += TQString( "#%1" ).arg( col - _col ); if ( fix2 ) - erg += TQString( "$%1#").tqarg( row ); + erg += TQString( "$%1#").arg( row ); else if (_era) - erg += TQChar(0xA7) + TQString( "%1#" ).tqarg( row ); + erg += TQChar(0xA7) + TQString( "%1#" ).arg( row ); else - erg += TQString( "#%1#" ).tqarg( row - _row ); + erg += TQString( "#%1#" ).arg( row - _row ); } } else @@ -1687,7 +1687,7 @@ void Cell::offsetAlign( int _col, int _row ) const double effTop = BORDER_SPACE + 0.5 * effTopBorderPen( _col, _row ).width(); const double effBottom = h - BORDER_SPACE - 0.5 * effBottomBorderPen( _col, _row ).width(); - // Calculate d->textY based on the vertical tqalignment and a few + // Calculate d->textY based on the vertical alignment and a few // other inputs. switch( ay ) { @@ -1846,7 +1846,7 @@ void Cell::offsetAlign( int _col, int _row ) a = Format::Left; } - // Calculate d->textX based on tqalignment and textwidth. + // Calculate d->textX based on alignment and textwidth. switch ( a ) { case Format::Left: d->textX = 0.5 * effLeftBorderPen( _col, _row ).width() + BORDER_SPACE; @@ -2052,7 +2052,7 @@ bool Cell::makeFormula() if (format()->sheet()->doc()->getShowMessageError()) { TQString tmp(i18n("Error in cell %1\n\n")); - tmp = tmp.tqarg( fullName() ); + tmp = tmp.arg( fullName() ); KMessageBox::error( (TQWidget*)0L, tmp); } setFlag(Flag_ParseError); @@ -2253,7 +2253,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, selected = selected && !( markerArea.contains( cellRef ) ); // Don't draw any selection at all when printing. - if ( painter.tqdevice()->isExtDev() || !drawCursor ) + if ( painter.device()->isExtDev() || !drawCursor ) selected = false; } @@ -2299,7 +2299,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, // 2. Paint the default borders if we are on screen or if we are printing // and the checkbox to do this is checked. - if ( painter.tqdevice()->devType() != TQInternal::Printer + if ( painter.device()->devType() != TQInternal::Printer || format()->sheet()->print()->printGrid()) paintDefaultBorders( painter, rect, cellRect, cellRef, paintBorderRight, paintBorderBottom, @@ -2336,7 +2336,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, // If we print pages, then we disable clipping, otherwise borders are // cut in the middle at the page borders. - if ( painter.tqdevice()->isExtDev() ) + if ( painter.device()->isExtDev() ) painter.setClipping( false ); // Paint the borders if this cell is not part of another merged cell. @@ -2350,7 +2350,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, } // Turn clipping back on. - if ( painter.tqdevice()->isExtDev() ) + if ( painter.device()->isExtDev() ) painter.setClipping( true ); // 5. Paint diagonal lines and page borders. @@ -2364,12 +2364,12 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, if ( !isObscured() ) { // 6a. Paint possible comment indicator. - if ( !painter.tqdevice()->isExtDev() + if ( !painter.device()->isExtDev() || format()->sheet()->print()->printCommentIndicator() ) paintCommentIndicator( painter, cellRect, cellRef, backgroundColor ); // 6b. Paint possible formula indicator. - if ( !painter.tqdevice()->isExtDev() + if ( !painter.device()->isExtDev() || format()->sheet()->print()->printFormulaIndicator() ) paintFormulaIndicator( painter, cellRect, backgroundColor ); @@ -2389,7 +2389,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, // b) something indicates that the text should not be painted // c) the sheet is protected and the cell is hidden. if ( !d->strOutText.isEmpty() - && ( !painter.tqdevice()->isExtDev() + && ( !painter.device()->isExtDev() || !format()->getDontprintText( cellRef.x(), cellRef.y() ) ) && !( format()->sheet()->isProtected() && format()->isHideAll( cellRef.x(), cellRef.y() ) ) ) @@ -2402,7 +2402,7 @@ void Cell::paintCell( const KoRect &rect, TQPainter & painter, // cells, then paint the obscuring cell(s). Otherwise don't do // anything so that we don't cause an infinite loop. if ( isObscured() && paintingObscured == 0 && - !( sheetDir == Sheet::RightToLeft && painter.tqdevice()->isExtDev() ) ) + !( sheetDir == Sheet::RightToLeft && painter.device()->isExtDev() ) ) { //kdDebug(36001) << "painting cells that obscure " << name() << endl; @@ -2723,7 +2723,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect, TQColor bg( backgroundColor ); // Handle printers separately. - if ( !painter.tqdevice()->isExtDev() ) { + if ( !painter.device()->isExtDev() ) { if ( bg.isValid() ) painter.setBackgroundColor( bg ); else @@ -2742,7 +2742,7 @@ void Cell::paintBackground( TQPainter& painter, const KoRect &cellRect, } // Erase the background of the cell. - if ( !painter.tqdevice()->isExtDev() ) + if ( !painter.device()->isExtDev() ) painter.eraseRect( zoomedCellRect ); // Get a background brush @@ -2791,7 +2791,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect, Doc* doc = sheet()->doc(); Sheet::LayoutDirection sheetDir = format()->sheet()->layoutDirection(); - bool paintingToExternalDevice = painter.tqdevice()->isExtDev(); + bool paintingToExternalDevice = painter.device()->isExtDev(); // Each cell is responsible for drawing it's top and left portions // of the "default" grid. --Or not drawing it if it shouldn't be @@ -2948,7 +2948,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( doc->zoomItX( TQMAX( rect.left(), cellRect.x() ) ), doc->zoomItY( TQMAX( rect.top(), cellRect.y() + dt ) ), @@ -2995,7 +2995,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { painter.drawLine( doc->zoomItX( TQMAX( rect.left(), cellRect.x() + dl ) ), doc->zoomItY( TQMAX( rect.top(), cellRect.bottom() ) ), doc->zoomItX( TQMIN( rect.right(), cellRect.right() - dr ) ), @@ -3026,7 +3026,7 @@ void Cell::paintCommentIndicator( TQPainter& painter, && cellRect.width() > 10.0 && cellRect.height() > 10.0 && ( sheet()->print()->printCommentIndicator() - || ( !painter.tqdevice()->isExtDev() && sheet()->getShowCommentIndicator() ) ) ) { + || ( !painter.device()->isExtDev() && sheet()->getShowCommentIndicator() ) ) ) { TQColor penColor = TQt::red; // If background has high red part, switch to blue. @@ -3123,7 +3123,7 @@ void Cell::paintMoreTextIndicator( TQPainter& painter, // Show a red triangle when it's not possible to write all text in cell. // Don't print the red triangle if we're printing. if( testFlag( Flag_CellTooShortX ) && - !painter.tqdevice()->isExtDev() && + !painter.device()->isExtDev() && cellRect.height() > 4.0 && cellRect.width() > 4.0 ) { @@ -3180,7 +3180,7 @@ void Cell::paintText( TQPainter& painter, // Resolve the text color if invalid (=default). if ( !textColorPrint.isValid() ) { - if ( painter.tqdevice()->isExtDev() ) + if ( painter.device()->isExtDev() ) textColorPrint = TQt::black; else textColorPrint = TQApplication::tqpalette().active().text(); @@ -3466,7 +3466,7 @@ void Cell::paintPageBorders( TQPainter& painter, bool paintBorderBottom ) { // Not screen? Return immediately. - if ( painter.tqdevice()->isExtDev() ) + if ( painter.device()->isExtDev() ) return; if ( ! format()->sheet()->isShowPageBorders() ) @@ -3628,7 +3628,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { // FIXME: There is probably Cut&Paste bugs here as well as below. // The TQMIN/TQMAX and left/right pairs don't really make sense. // @@ -3675,7 +3675,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( TQMAX( zrect_left, zcellRect_left ), TQMAX( zrect_top, zcellRect_top - top ), @@ -3716,7 +3716,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( zcellRect_top >= zrect_top + top_penWidth / 2) painter.drawLine( TQMAX( zrect_left, zcellRect_left ), zcellRect_top, @@ -3738,7 +3738,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( zcellRect_bottom <= zrect_bottom + bottom_penWidth / 2) painter.drawLine( TQMAX( zrect_left, zcellRect_left ), zcellRect_bottom, @@ -3762,7 +3762,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, #if 0 // Look at the cells on our corners. It may happen that we // just erased parts of their borders corner, so we might need - // to tqrepaint these corners. + // to repaint these corners. // TQPen vert_pen, horz_pen; int vert_penWidth, horz_penWidth; @@ -3810,7 +3810,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, painter.setPen( vert_pen ); // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( TQMAX( zrect_left, zcellRect_right ), TQMAX( zrect_top, zcellRect_top ), @@ -3860,7 +3860,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, painter.setPen( vert_pen ); //If we are on paper printout, we limit the length of the lines //On paper, we always have full cells, on screen not - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( TQMAX( zrect_left, zcellRect_left ), TQMAX( zrect_top, zcellRect_top ), @@ -3913,7 +3913,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, painter.setPen( vert_pen ); // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( TQMAX( zrect_left, zcellRect_right ), TQMAX( zrect_top, zcellRect_bottom - bottom ), @@ -3965,7 +3965,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect, painter.setPen( vert_pen ); // If we are on paper printout, we limit the length of the lines. // On paper, we always have full cells, on screen not. - if ( painter.tqdevice()->isExtDev() ) { + if ( painter.device()->isExtDev() ) { if ( sheetDir == Sheet::RightToLeft ) painter.drawLine( TQMAX( zrect_left, zcellRect_left ), TQMAX( zrect_top, zcellRect_bottom - bottom ), @@ -5232,7 +5232,7 @@ TQDomElement Cell::save( TQDomDocument& doc, { TQDomElement dateMin = doc.createElement( "datemin" ); TQString tmp("%1/%2/%3"); - tmp = tmp.tqarg(d->extra()->validity->dateMin.year()).tqarg(d->extra()->validity->dateMin.month()).tqarg(d->extra()->validity->dateMin.day()); + tmp = tmp.arg(d->extra()->validity->dateMin.year()).arg(d->extra()->validity->dateMin.month()).arg(d->extra()->validity->dateMin.day()); dateMin.appendChild( doc.createTextNode( tmp ) ); validity.appendChild( dateMin ); } @@ -5240,7 +5240,7 @@ TQDomElement Cell::save( TQDomDocument& doc, { TQDomElement dateMax = doc.createElement( "datemax" ); TQString tmp("%1/%2/%3"); - tmp = tmp.tqarg(d->extra()->validity->dateMax.year()).tqarg(d->extra()->validity->dateMax.month()).tqarg(d->extra()->validity->dateMax.day()); + tmp = tmp.arg(d->extra()->validity->dateMax.year()).arg(d->extra()->validity->dateMax.month()).arg(d->extra()->validity->dateMax.day()); dateMax.appendChild( doc.createTextNode( tmp ) ); validity.appendChild( dateMax ); } @@ -5312,7 +5312,7 @@ bool Cell::saveCellResult( TQDomDocument& doc, TQDomElement& result, TQDate dd = value().asDateTime().date(); dataType = "Date"; str = "%1/%2/%3"; - str = str.tqarg(dd.year()).tqarg(dd.month()).tqarg(dd.day()); + str = str.arg(dd.year()).arg(dd.month()).arg(dd.day()); } else if( isTime() ) { @@ -6048,25 +6048,25 @@ void Cell::loadOasisObjects( const TQDomElement &parent, KoOasisLoadingContext& if ( !point.isValid() ) continue; - KoRect tqgeometry = obj->tqgeometry(); - tqgeometry.setLeft( tqgeometry.left() + sheet()->columnPos( d->column, 0 ) ); - tqgeometry.setTop( tqgeometry.top() + sheet()->rowPos( d->row, 0 ) ); + KoRect geometry = obj->geometry(); + geometry.setLeft( geometry.left() + sheet()->columnPos( d->column, 0 ) ); + geometry.setTop( geometry.top() + sheet()->rowPos( d->row, 0 ) ); TQString str = e.attributeNS( KoXmlNS::table, "end-x", TQString() ); if ( !str.isNull() ) { uint end_x = (uint) KoUnit::parseValue( str ); - tqgeometry.setRight( sheet()->columnPos( point.column(), 0) + end_x ); + geometry.setRight( sheet()->columnPos( point.column(), 0) + end_x ); } str = e.attributeNS( KoXmlNS::table, "end-y", TQString() ); if ( !str.isNull() ) { uint end_y = (uint) KoUnit::parseValue( str ); - tqgeometry.setBottom( sheet()->rowPos( point.row(), 0) + end_y ); + geometry.setBottom( sheet()->rowPos( point.row(), 0) + end_y ); } - obj->setGeometry( tqgeometry ); + obj->setGeometry( geometry ); } } } diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc index c277e991..8a580ecb 100644 --- a/kspread/kspread_doc.cc +++ b/kspread/kspread_doc.cc @@ -218,7 +218,7 @@ Doc::Doc( TQWidget *parentWidget, const char *widgetName, TQObject* parent, cons if ( !name ) { TQString tmp( "Document%1" ); - tmp = tmp.tqarg( d->s_docId++ ); + tmp = tmp.arg( d->s_docId++ ); setName( tmp.local8Bit());//tmp.latin1() ); dcopObject(); } @@ -998,7 +998,7 @@ bool Doc::loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const if ( localName.isEmpty() ) setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) ); else - setErrorMessage( i18n( "This document is not a spreadsheet, but %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) ); + setErrorMessage( i18n( "This document is not a spreadsheet, but %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) ); deleteLoadingInfo(); return false; } @@ -1086,7 +1086,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc ) if ( spread.attribute( "mime" ) != "application/x-kspread" && spread.attribute( "mime" ) != "application/vnd.kde.kspread" ) { d->isLoading = false; - setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kspread or application/vnd.kde.kspread, got %1" ).tqarg( spread.attribute("mime") ) ); + setErrorMessage( i18n( "Invalid document. Expected mimetype application/x-kspread or application/vnd.kde.kspread, got %1" ).arg( spread.attribute("mime") ) ); return false; } @@ -1095,7 +1095,7 @@ bool Doc::loadXML( TQIODevice *, const TQDomDocument& doc ) { int ret = KMessageBox::warningContinueCancel( 0, i18n("This document was created with a newer version of KSpread (syntax version: %1)\n" - "When you open it with this version of KSpread, some information may be lost.").tqarg(d->syntaxVersion), + "When you open it with this version of KSpread, some information may be lost.").arg(d->syntaxVersion), i18n("File Format Mismatch"), KStdGuiItem::cont() ); if ( ret == KMessageBox::Cancel ) { @@ -1731,7 +1731,7 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect, const Sheet* sheet, bool /*drawCursor*/) { // - // Clip away tqchildren + // Clip away children // TQRegion rgn = painter.clipRegion(); @@ -1749,7 +1749,7 @@ void Doc::paintCellRegions(TQPainter& painter, const TQRect &viewRect, matrix = painter.worldMatrix(); } -// TQPtrListIterator<KoDocumentChild> it( tqchildren() ); +// TQPtrListIterator<KoDocumentChild> it( children() ); // for( ; it.current(); ++it ) { // // if ( ((Child*)it.current())->sheet() == sheet && // // !m_pView->hasDocumentInWindow( it.current()->document() ) ) @@ -2192,7 +2192,7 @@ void Doc::emitBeginOperation(bool waitCursor) //are expected to be completed in a short time anyway. TQCursor* activeOverride = static_cast<TQCursor*>(TQApplication::overrideCursor()); - if (waitCursor && ( (!activeOverride) || (activeOverride->tqshape() != TQt::waitCursor.tqshape()) ) ) + if (waitCursor && ( (!activeOverride) || (activeOverride->shape() != TQt::waitCursor.shape()) ) ) { TQApplication::setOverrideCursor(TQt::waitCursor); } @@ -2200,7 +2200,7 @@ void Doc::emitBeginOperation(bool waitCursor) // /* just duplicate the current cursor on the stack, then */ // else if (TQApplication::overrideCursor() != NULL) // { -// TQApplication::setOverrideCursor(TQApplication::overrideCursor()->tqshape()); +// TQApplication::setOverrideCursor(TQApplication::overrideCursor()->shape()); // } KoDocument::emitBeginOperation(); @@ -2379,7 +2379,7 @@ KoPictureCollection *Doc::pictureCollection() return &d->m_pictureCollection; } -void Doc::tqrepaint( const TQRect& rect ) +void Doc::repaint( const TQRect& rect ) { TQRect r; TQPtrListIterator<KoView> it( views() ); @@ -2393,7 +2393,7 @@ void Doc::tqrepaint( const TQRect& rect ) } } -void Doc::tqrepaint( EmbeddedObject *obj ) +void Doc::repaint( EmbeddedObject *obj ) { TQPtrListIterator<KoView> it( views() ); for( ; it.current(); ++it ) @@ -2404,7 +2404,7 @@ void Doc::tqrepaint( EmbeddedObject *obj ) } } -void Doc::tqrepaint( const KoRect& rect ) +void Doc::repaint( const KoRect& rect ) { TQRect r; TQPtrListIterator<KoView> it( views() ); diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h index 63320a96..64d1fbf5 100644 --- a/kspread/kspread_doc.h +++ b/kspread/kspread_doc.h @@ -565,7 +565,7 @@ public: virtual void emitBeginOperation(); /** - * Mark the end of an operation and triggers a tqrepaint of any cells or regions of cells which + * Mark the end of an operation and triggers a repaint of any cells or regions of cells which * have been marked as 'dirty' via calls to Sheet::setRegionPaintDirty * See above comment to emitBeginOperation(bool). */ @@ -640,10 +640,10 @@ public: void loadConfigFromFile(); bool configLoadFromFile() const; - // tqrepaint (update) all views - void tqrepaint( const TQRect& ); - void tqrepaint( EmbeddedObject* ); - void tqrepaint( const KoRect& ); + // repaint (update) all views + void repaint( const TQRect& ); + void repaint( EmbeddedObject* ); + void repaint( const KoRect& ); virtual void addShell( KoMainWindow *shell ); diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc index 721412ca..44a3d178 100644 --- a/kspread/kspread_editors.cc +++ b/kspread/kspread_editors.cc @@ -828,7 +828,7 @@ void CellEditor::setEditorFont(TQFont const & font, bool updateSize) d->fontLength = fm.width('x'); int mw = fm.width( d->textEdit->text() ) + d->fontLength; - // don't make it smaller: then we would have to tqrepaint the obscured cells + // don't make it smaller: then we would have to repaint the obscured cells if (mw < width()) mw = width(); diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc index ecebff60..b0960735 100644 --- a/kspread/kspread_format.cc +++ b/kspread/kspread_format.cc @@ -2725,7 +2725,7 @@ void RowFormat::setBottomBorderPen( const TQPen & p ) Format::setBottomBorderPen( p ); } -void RowFormat::setHide( bool _hide, bool tqrepaint ) +void RowFormat::setHide( bool _hide, bool repaint ) { if ( _hide != m_bHide ) // only if we change the status { @@ -2734,14 +2734,14 @@ void RowFormat::setHide( bool _hide, bool tqrepaint ) // Lower maximum size by height of row m_pSheet->adjustSizeMaxY ( - dblHeight() ); m_bHide = _hide; //hide must be set after we requested the height - m_pSheet->emit_updateRow( this, m_iRow, tqrepaint ); + m_pSheet->emit_updateRow( this, m_iRow, repaint ); } else { // Rise maximum size by height of row m_bHide = _hide; //unhide must be set before we request the height m_pSheet->adjustSizeMaxY ( dblHeight() ); - m_pSheet->emit_updateRow( this, m_iRow, tqrepaint ); + m_pSheet->emit_updateRow( this, m_iRow, repaint ); } } } diff --git a/kspread/kspread_format.h b/kspread/kspread_format.h index ed89807a..41e3f0ae 100644 --- a/kspread/kspread_format.h +++ b/kspread/kspread_format.h @@ -557,7 +557,7 @@ public: /** * Sets the hide flag */ - void setHide( bool _hide, bool tqrepaint = true ); + void setHide( bool _hide, bool repaint = true ); bool isHide()const { return m_bHide;} bool operator==( const RowFormat& other ) const; diff --git a/kspread/kspread_functions_information.cc b/kspread/kspread_functions_information.cc index 52ae0f99..2a5775aa 100644 --- a/kspread/kspread_functions_information.cc +++ b/kspread/kspread_functions_information.cc @@ -158,8 +158,8 @@ Value func_info (valVector args, ValueCalc *calc, FuncExtra *) struct utsname name; if (uname (&name) >= 0) { - TQString os = TQString("%1 %2 (%3)").tqarg( name.sysname ). - tqarg( name.release ).tqarg( name.machine ); + TQString os = TQString("%1 %2 (%3)").arg( name.sysname ). + arg( name.release ).arg( name.machine ); return Value (os); } } diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cc index 73370e03..a24c8cf2 100644 --- a/kspread/kspread_map.cc +++ b/kspread/kspread_map.cc @@ -80,7 +80,7 @@ void Map::setProtected( TQCString const & passwd ) Sheet* Map::createSheet() { TQString s( i18n("Sheet%1") ); - s = s.tqarg( tableId++ ); + s = s.arg( tableId++ ); Sheet *t = new Sheet ( this, s , s.utf8()); t->setSheetName( s, true ); // huh? (Werner) return t; diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cc index 82ee585f..8c273700 100644 --- a/kspread/kspread_object.cc +++ b/kspread/kspread_object.cc @@ -55,8 +55,8 @@ class View; * EmbeddedObject * **********************************************************/ -EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry ) - : m_tqgeometry( _tqgeometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, Qt::SolidLine ) +EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _geometry ) + : m_geometry( _geometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, Qt::SolidLine ) { angle = 0.0; inObjList = true; @@ -66,23 +66,23 @@ EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry ) EmbeddedObject::~EmbeddedObject() { } -KoRect EmbeddedObject::tqgeometry() +KoRect EmbeddedObject::geometry() { - return m_tqgeometry; + return m_geometry; } void EmbeddedObject::setGeometry( const KoRect &rect ) { - m_tqgeometry = rect; + m_geometry = rect; } void EmbeddedObject::moveBy( const KoPoint &_point ) { - m_tqgeometry.moveTopLeft( m_tqgeometry.topLeft() + _point ); + m_geometry.moveTopLeft( m_geometry.topLeft() + _point ); } void EmbeddedObject::moveBy( double _dx, double _dy ) { - m_tqgeometry.moveTopLeft( m_tqgeometry.topLeft() + KoPoint( _dx, _dy ) ); + m_geometry.moveTopLeft( m_geometry.topLeft() + KoPoint( _dx, _dy ) ); } void EmbeddedObject::resizeBy( const KoSize & _size ) @@ -92,7 +92,7 @@ void EmbeddedObject::resizeBy( const KoSize & _size ) void EmbeddedObject::resizeBy( double _dx, double _dy) { - m_tqgeometry.setSize( KoSize( m_tqgeometry.width()+_dx, m_tqgeometry.height()+_dy) ); + m_geometry.setSize( KoSize( m_geometry.width()+_dx, m_geometry.height()+_dy) ); } // call (possibly reimplemented) setSize bool EmbeddedObject::load( const TQDomElement& /*element*/ ) @@ -105,10 +105,10 @@ void EmbeddedObject::loadOasis(const TQDomElement &element, KoOasisLoadingContex { if(element.hasAttributeNS( KoXmlNS::draw, "name" )) m_objectName = element.attributeNS( KoXmlNS::draw, "name", TQString()); - m_tqgeometry.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x", TQString() ) ) ); - m_tqgeometry.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y", TQString() ) ) ); - m_tqgeometry.setWidth(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() )) ); - m_tqgeometry.setHeight(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) ) ); + m_geometry.setX( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "x", TQString() ) ) ); + m_geometry.setY( KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "y", TQString() ) ) ); + m_geometry.setWidth(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "width", TQString() )) ); + m_geometry.setHeight(KoUnit::parseValue( element.attributeNS( KoXmlNS::svg, "height", TQString() ) ) ); //kdDebug()<<" orig.x() :"<<orig.x() <<" orig.y() :"<<orig.y() <<"ext.width() :"<<ext.width()<<" ext.height(): "<<ext.height()<<endl; KoStyleStack &styleStack = context.styleStack(); @@ -126,15 +126,15 @@ void EmbeddedObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) { xmlWriter.addAttribute( "draw:id", "object" + TQString::number( indexObj ) ); //save all into pt - xmlWriter.addAttributePt( "svg:x", sheet()->doc()->savingWholeDocument() ? m_tqgeometry.x() : m_tqgeometry.x() + 20.0 ); - xmlWriter.addAttributePt( "svg:y", sheet()->doc()->savingWholeDocument() ? m_tqgeometry.y() : m_tqgeometry.y() + 20.0 ); - xmlWriter.addAttributePt( "svg:width", m_tqgeometry.width() ); - xmlWriter.addAttributePt( "svg:height", m_tqgeometry.height() ); + xmlWriter.addAttributePt( "svg:x", sheet()->doc()->savingWholeDocument() ? m_geometry.x() : m_geometry.x() + 20.0 ); + xmlWriter.addAttributePt( "svg:y", sheet()->doc()->savingWholeDocument() ? m_geometry.y() : m_geometry.y() + 20.0 ); + xmlWriter.addAttributePt( "svg:width", m_geometry.width() ); + xmlWriter.addAttributePt( "svg:height", m_geometry.height() ); // if ( kAbs( angle ) > 1E-6 ) // { // double value = -1 * ( ( double )angle* M_PI )/180.0; -// TQString str=TQString( "rotate (%1)" ).tqarg( value ); +// TQString str=TQString( "rotate (%1)" ).arg( value ); // xmlWriter.addAttribute( "draw:transform", str ); // } } @@ -187,7 +187,7 @@ TQPixmap EmbeddedObject::toPixmap(double /*xZoom*/ , double /*yZoom*/) void EmbeddedObject::calculateRequiredZoom( TQSize desiredSize, double& xZoom, double& yZoom) { - TQSize actualSize = tqgeometry().size().toTQSize(); + TQSize actualSize = geometry().size().toTQSize(); xZoom = (double) desiredSize.width() / (double)actualSize.width(); yZoom = (double) desiredSize.height() / (double)actualSize.height(); @@ -199,8 +199,8 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode ) return; _painter->save(); - KoRect bound( tqgeometry().left(), tqgeometry().top(), - tqgeometry().width() , tqgeometry().height() ); + KoRect bound( geometry().left(), geometry().top(), + geometry().width() , geometry().height() ); TQRect zoomedBound = sheet()->doc()->zoomRect( bound ) ; //_painter->setPen( TQPen( TQt::black, 1, TQPen::SolidLine ) ); @@ -261,14 +261,14 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode ) _painter->restore(); } -TQCursor EmbeddedObject::getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry) const +TQCursor EmbeddedObject::getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &geometry) const { int px = /*sheet()->doc()->zoomItX*/(_point.x()); int py = /*sheet()->doc()->zoomItY*/(_point.y()); - int ox = /*sheet()->doc()->zoomItX*/(/*orig*/tqgeometry.x()); - int oy = /*sheet()->doc()->zoomItY*/(/*orig*/tqgeometry.y()); - int ow = /*sheet()->doc()->zoomItX*/(/*ext*/tqgeometry.width()); - int oh = /*sheet()->doc()->zoomItY*/(/*ext*/tqgeometry.height()); + int ox = /*sheet()->doc()->zoomItX*/(/*orig*/geometry.x()); + int oy = /*sheet()->doc()->zoomItY*/(/*orig*/geometry.y()); + int ow = /*sheet()->doc()->zoomItX*/(/*ext*/geometry.width()); + int oh = /*sheet()->doc()->zoomItY*/(/*ext*/geometry.height()); // if ( angle != 0.0 ) // { @@ -367,10 +367,10 @@ void EmbeddedObject::doDelete() * EmbeddedKOfficeObject * **********************************************************/ -EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry ) - : EmbeddedObject( _sheet, tqgeometry ), m_parent(parent) +EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& geometry ) + : EmbeddedObject( _sheet, geometry ), m_parent(parent) { - m_embeddedObject = new KoDocumentChild(parent, doc, tqgeometry.toTQRect() ); + m_embeddedObject = new KoDocumentChild(parent, doc, geometry.toTQRect() ); } EmbeddedKOfficeObject::EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet ) @@ -399,7 +399,7 @@ bool EmbeddedKOfficeObject::saveOasisObjectAttributes( KSpreadOasisSaveContext & kdDebug() << "EmbeddedKOfficeObject::saveOasisPart " << sc.partIndexObj << endl; sc.xmlWriter.startElement( "draw:object" ); - const TQString name = TQString( "Object_%1" ).tqarg( sc.partIndexObj + 1 ); + const TQString name = TQString( "Object_%1" ).arg( sc.partIndexObj + 1 ); ++sc.partIndexObj; m_embeddedObject->saveOasisAttributes( sc.xmlWriter, name ); @@ -417,7 +417,7 @@ bool EmbeddedKOfficeObject::load( const TQDomElement& element ) { kdDebug() << "Loading EmbeddedKOfficeObject" << endl; bool result = embeddedObject()->load( element ); - setGeometry( KoRect::fromTQRect( embeddedObject()->tqgeometry() ) ); + setGeometry( KoRect::fromTQRect( embeddedObject()->geometry() ) ); return result; } @@ -436,7 +436,7 @@ void EmbeddedKOfficeObject::loadOasis(const TQDomElement &element, KoOasisLoadin TQDomElement EmbeddedKOfficeObject::save( TQDomDocument& doc ) { kdDebug() << "Saving EmbeddedKOfficeObject" << endl; - embeddedObject()->setGeometry( tqgeometry().toTQRect() ); + embeddedObject()->setGeometry( geometry().toTQRect() ); return m_embeddedObject->save( doc ); } @@ -446,21 +446,21 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter ) int const penw = pen.width() ; KoRect bound( 0, 0, - tqgeometry().width() - ( 2 * penw ), tqgeometry().height() - ( 2 * penw ) ); + geometry().width() - ( 2 * penw ), geometry().height() - ( 2 * penw ) ); TQRect const zoomedBound = sheet()->doc()->zoomRect( bound ); _painter->save(); - int const xOffset = sheet()->doc()->zoomItX( tqgeometry().left() + penw); - int const yOffset = sheet()->doc()->zoomItY( tqgeometry().top() + penw ); + int const xOffset = sheet()->doc()->zoomItX( geometry().left() + penw); + int const yOffset = sheet()->doc()->zoomItY( geometry().top() + penw ); - TQRect new_tqgeometry = zoomedBound; + TQRect new_geometry = zoomedBound; //if ( translate ) //{ _painter->translate( xOffset , yOffset ); - new_tqgeometry.moveBy( xOffset , yOffset ); - new_tqgeometry.moveBy( -_painter->window().x(), -_painter->window().y() ); + new_geometry.moveBy( xOffset , yOffset ); + new_geometry.moveBy( -_painter->window().x(), -_painter->window().y() ); //} _painter->setClipRect( zoomedBound, TQPainter::CoordPainter ); @@ -477,7 +477,7 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter ) zoomY ); - embeddedObject()->setGeometry( new_tqgeometry ); + embeddedObject()->setGeometry( new_geometry ); _painter->restore(); EmbeddedObject::draw( _painter ); @@ -485,10 +485,10 @@ void EmbeddedKOfficeObject::draw( TQPainter *_painter ) TQPixmap EmbeddedKOfficeObject::toPixmap( double xZoom , double yZoom ) { - TQPixmap pixmap( (int)( tqgeometry().width()*xZoom ), (int)( tqgeometry().height()*yZoom ) ); + TQPixmap pixmap( (int)( geometry().width()*xZoom ), (int)( geometry().height()*yZoom ) ); TQPainter painter(&pixmap); - TQRect bound( 0,0,(int)( tqgeometry().width()*xZoom ), (int)(tqgeometry().height()*yZoom) ); + TQRect bound( 0,0,(int)( geometry().width()*xZoom ), (int)(geometry().height()*yZoom) ); embeddedObject()->document()->paintEverything(painter,bound, embeddedObject()->isTransparent(), 0, @@ -516,10 +516,10 @@ void EmbeddedKOfficeObject::deactivate() void EmbeddedKOfficeObject::updateChildGeometry() { // KoZoomHandler* zh = m_sheet->doc(); -// embeddedObject()->setGeometry( zh->zoomRect( tqgeometry() ), true ); +// embeddedObject()->setGeometry( zh->zoomRect( geometry() ), true ); // return; -// TQRect r = sheet()->doc()->zoomRect( tqgeometry() ); +// TQRect r = sheet()->doc()->zoomRect( geometry() ); // if ( _canvas ) // { // kdDebug() << "_canvas->xOffset():" << _canvas->xOffset() << endl; @@ -537,8 +537,8 @@ void EmbeddedKOfficeObject::updateChildGeometry() * **********************************************************/ -EmbeddedChart::EmbeddedChart( Doc *_spread, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry ) - : EmbeddedKOfficeObject( _spread, _sheet, doc, tqgeometry ) +EmbeddedChart::EmbeddedChart( Doc *_spread, Sheet *_sheet, KoDocument* doc, const KoRect& geometry ) + : EmbeddedKOfficeObject( _spread, _sheet, doc, geometry ) { m_pBinding = 0; } @@ -687,8 +687,8 @@ KoChart::Part* EmbeddedChart::chart() * EmbeddedPictureObject * **********************************************************/ -EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection ) - : EmbeddedObject( _sheet, _tqgeometry ) +EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection ) + : EmbeddedObject( _sheet, _geometry ) { imageCollection = _imageCollection; pen = KoPen( TQt::black, 1.0, Qt::NoPen ); @@ -706,8 +706,8 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqge } -EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection, const KoPictureKey & key ) - : EmbeddedObject( _sheet, _tqgeometry ) +EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection, const KoPictureKey & key ) + : EmbeddedObject( _sheet, _geometry ) { imageCollection = _imageCollection; @@ -1149,10 +1149,10 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin void EmbeddedPictureObject::drawShadow( TQPainter* /*_painter*/, KoZoomHandler* /*_zoomHandler*/) { -// const double ox = /*orig*/m_tqgeometry.x(); -// const double oy = /*orig*/m_tqgeometry.y(); -// const double ow = /*ext*/m_tqgeometry.width(); -// const double oh = /*ext*/m_tqgeometry.height(); +// const double ox = /*orig*/m_geometry.x(); +// const double oy = /*orig*/m_geometry.y(); +// const double ow = /*ext*/m_geometry.width(); +// const double oh = /*ext*/m_geometry.height(); // // _painter->save(); // @@ -1208,7 +1208,7 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) { const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1 : pen.width() ) / 2.0 ); - TQSize size( _zoomHandler->zoomSize( m_tqgeometry.size() /*ext*/ ) ); + TQSize size( _zoomHandler->zoomSize( m_geometry.size() /*ext*/ ) ); //kdDebug(33001) << "EmbeddedPictureObject::generatePixmap size= " << size << endl; TQPixmap pixmap(size); TQPainter paint; @@ -1221,8 +1221,8 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) paint.setBrush( getBrush() ); TQRect rect( (int)( penw ), (int)( penw ), - (int)( _zoomHandler->zoomItX( /*ext*/m_tqgeometry.width() ) - 2.0 * penw ), - (int)( _zoomHandler->zoomItY( /*ext*/m_tqgeometry.height() ) - 2.0 * penw ) ); + (int)( _zoomHandler->zoomItX( /*ext*/m_geometry.width() ) - 2.0 * penw ), + (int)( _zoomHandler->zoomItY( /*ext*/m_geometry.height() ) - 2.0 * penw ) ); // if ( getFillType() == FT_BRUSH || !gradient ) paint.drawRect( rect ); @@ -1231,8 +1231,8 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) // gradient->setSize( size ); // paint.drawPixmap( (int)( penw ), (int)( penw ), // gradient->pixmap(), 0, 0, -// (int)( _zoomHandler->zoomItX( m_tqgeometry/*ext*/.width() ) - 2 * penw ), -// (int)( _zoomHandler->zoomItY( m_tqgeometry/*ext*/.height() ) - 2 * penw ) ); +// (int)( _zoomHandler->zoomItX( m_geometry/*ext*/.width() ) - 2 * penw ), +// (int)( _zoomHandler->zoomItY( m_geometry/*ext*/.height() ) - 2 * penw ) ); // } @@ -1260,10 +1260,10 @@ void EmbeddedPictureObject::draw( TQPainter *_painter/*, KoZoomHandler*_zoomHand // if ( shadowDistance > 0 && !drawContour ) // drawShadow(_painter, _zoomHandler); - const double ox = /*orig*/m_tqgeometry.x(); - const double oy = /*orig*/m_tqgeometry.y(); - const double ow = /*ext*/m_tqgeometry.width(); - const double oh = /*ext*/m_tqgeometry.height(); + const double ox = /*orig*/m_geometry.x(); + const double oy = /*orig*/m_geometry.y(); + const double ow = /*ext*/m_geometry.width(); + const double oh = /*ext*/m_geometry.height(); //const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1.0 : pen.width() ) / 2.0 ); _painter->save(); diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h index 46074109..b66d67ac 100644 --- a/kspread/kspread_object.h +++ b/kspread/kspread_object.h @@ -108,13 +108,13 @@ enum AlignType { class EmbeddedObject { public: - EmbeddedObject( Sheet *_sheet, const KoRect& _tqgeometry ); + EmbeddedObject( Sheet *_sheet, const KoRect& _geometry ); virtual ~EmbeddedObject(); virtual ObjType getType() const { return OBJECT_GENERAL; } virtual TQString getTypeString() const { return TQString(); } - KoRect tqgeometry(); + KoRect geometry(); void setGeometry( const KoRect &rect ); virtual void moveBy( const KoPoint &_point ); virtual void moveBy( double _dx, double _dy ); @@ -183,7 +183,7 @@ class EmbeddedObject void paintSelection( TQPainter *_painter, SelectionMode selectionMode ); - virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &tqgeometry ) const; + virtual TQCursor getCursor( const TQPoint &_point, ModifyType &_modType, TQRect &geometry ) const; virtual void removeFromObjList() { inObjList = false; } @@ -217,7 +217,7 @@ class EmbeddedObject */ void calculateRequiredZoom( TQSize desiredSize , double& xZoom, double& yZoom ); - KoRect m_tqgeometry; + KoRect m_geometry; Sheet *m_sheet; Canvas *m_canvas; TQString m_objectName; @@ -238,7 +238,7 @@ class EmbeddedObject class EmbeddedKOfficeObject : public EmbeddedObject { public: - EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& tqgeometry ); + EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet, KoDocument* doc, const KoRect& geometry ); EmbeddedKOfficeObject( Doc *parent, Sheet *_sheet ); virtual ~EmbeddedKOfficeObject(); virtual ObjType getType() const { return OBJECT_KOFFICE_PART; } @@ -314,8 +314,8 @@ class EmbeddedChart : public EmbeddedKOfficeObject class EmbeddedPictureObject : public EmbeddedObject { public: - EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection ); - EmbeddedPictureObject(Sheet *_sheet, const KoRect& _tqgeometry, KoPictureCollection *_imageCollection, const KoPictureKey & key ); + EmbeddedPictureObject(Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection ); + EmbeddedPictureObject(Sheet *_sheet, const KoRect& _geometry, KoPictureCollection *_imageCollection, const KoPictureKey & key ); EmbeddedPictureObject( Sheet *_sheet, KoPictureCollection *_imageCollection ); virtual ~EmbeddedPictureObject(); EmbeddedPictureObject &operator=( const EmbeddedPictureObject & ); diff --git a/kspread/kspread_propertyEditor.cpp b/kspread/kspread_propertyEditor.cpp index 6f38c25e..3b84a3db 100644 --- a/kspread/kspread_propertyEditor.cpp +++ b/kspread/kspread_propertyEditor.cpp @@ -280,7 +280,7 @@ KCommand * PropertyEditor::getCommand() TQPtrListIterator<EmbeddedObject> it( m_objects ); for ( ; it.current(); ++it ) { - KoRect oldRect = it.current()->tqgeometry()/*getRect()*/; + KoRect oldRect = it.current()->geometry()/*getRect()*/; KoRect newRect = oldRect; if ( change & GeneralProperty::Left ) @@ -446,7 +446,7 @@ GeneralProperty::GeneralValue PropertyEditor::getGeneralValue() generalValue.m_protect = protect ? STATE_ON : STATE_OFF; keepRatio = it.current()->isKeepRatio(); generalValue.m_keepRatio = keepRatio ? STATE_ON : STATE_OFF; - generalValue.m_rect = it.current()->tqgeometry()/*getRect()*/; + generalValue.m_rect = it.current()->geometry()/*getRect()*/; ++it; } diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc index 0e7f7bcc..a888a392 100644 --- a/kspread/kspread_sheet.cc +++ b/kspread/kspread_sheet.cc @@ -151,7 +151,7 @@ void ChartBinding::cellChanged( Cell* /*changedCell*/ ) //Ensure display gets updated by marking all cells underneath the chart as //dirty - const TQRect chartGeometry = m_child->tqgeometry().toTQRect(); + const TQRect chartGeometry = m_child->geometry().toTQRect(); double tmp; int left = sheet()->leftColumn( chartGeometry.left() , tmp ); @@ -201,7 +201,7 @@ void ChartBinding::cellChanged( Cell* /*changedCell*/ ) // Force a redraw of the chart on all views - /** TODO - replace the call below with something that will tqrepaint this chart */ + /** TODO - replace the call below with something that will repaint this chart */ #endif // sheet()->emit_polygonInvalidated( m_child->framePointArray() ); } @@ -1819,7 +1819,7 @@ struct SetSelectionFirstLetterUpperWorker : public Sheet::CellWorker cell->setDisplayDirtyFlag(); TQString tmp = cell->text(); int len = tmp.length(); - cell->setCellText( (tmp.tqat(0).upper()+tmp.right(len-1)) ); + cell->setCellText( (tmp.at(0).upper()+tmp.right(len-1)) ); cell->clearDisplayDirtyFlag(); } }; @@ -6129,7 +6129,7 @@ KoRect Sheet::getRealRect( bool all ) { if ( all || ( it.current()->isSelected() && ! it.current()->isProtect() ) ) - rect |= it.current()->tqgeometry(); + rect |= it.current()->geometry(); } return rect; @@ -6149,12 +6149,12 @@ KCommand *Sheet::moveObject(View *_view, double diffx, double diffy) if ( it.current()->isSelected() && !it.current()->isProtect()) { _objects.append( it.current() ); - KoRect tqgeometry = it.current()->tqgeometry(); - tqgeometry.moveBy( -canvas->xOffset(), -canvas->yOffset() ); - TQRect br = doc()->zoomRect( tqgeometry/*it.current()->tqgeometry()*/ ); + KoRect geometry = it.current()->geometry(); + geometry.moveBy( -canvas->xOffset(), -canvas->yOffset() ); + TQRect br = doc()->zoomRect( geometry/*it.current()->geometry()*/ ); br.moveBy( doc()->zoomItX( diffx ), doc()->zoomItY( diffy ) ); br.moveBy( doc()->zoomItX( -canvas->xOffset() ), doc()->zoomItY( -canvas->yOffset() ) ); - canvas->tqrepaint( br ); // Previous position + canvas->repaint( br ); // Previous position canvas->repaintObject( it.current() ); // New position createCommand=true; } @@ -6179,18 +6179,18 @@ KCommand *Sheet::moveObject(View *_view,const KoPoint &_move,bool key) { if ( it.current()->isSelected() && !it.current()->isProtect()) { - KoRect tqgeometry = it.current()->tqgeometry(); - tqgeometry.moveBy( -canvas->xOffset(), -canvas->yOffset() ); - TQRect oldBoundingRect = doc()->zoomRect( tqgeometry ); + KoRect geometry = it.current()->geometry(); + geometry.moveBy( -canvas->xOffset(), -canvas->yOffset() ); + TQRect oldBoundingRect = doc()->zoomRect( geometry ); - KoRect r = it.current()->tqgeometry(); + KoRect r = it.current()->geometry(); r.moveBy( _move.x(), _move.y() ); it.current()->setGeometry( r ); _objects.append( it.current() ); - canvas->tqrepaint( oldBoundingRect ); + canvas->repaint( oldBoundingRect ); canvas->repaintObject( it.current() ); } } @@ -6235,7 +6235,7 @@ void Sheet::unifyObjectName( EmbeddedObject *object ) { if ( rx.search( objectName ) != -1 ) { objectName.remove( rx ); } - objectName += TQString(" (%1)").tqarg( count ); + objectName += TQString(" (%1)").arg( count ); object->setObjectName( objectName ); } } @@ -6479,7 +6479,7 @@ bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext& loadRowFormat( rowElement, rowIndex, oasisContext, /*rowNode.isNull() ,*/ styleMap ); kdDebug()<<" table-row found :index row after "<<rowIndex<<endl; } - else if ( rowElement.localName() == "tqshapes" ) + else if ( rowElement.localName() == "shapes" ) loadOasisObjects( rowElement, oasisContext ); } } @@ -6685,7 +6685,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack ) kdDebug()<<" table-centering unknown :"<<str<<endl; #endif } - format = TQString( "%1x%2" ).tqarg( width ).tqarg( height ); + format = TQString( "%1x%2" ).arg( width ).arg( height ); kdDebug()<<" format : "<<format<<endl; d->print->setPaperLayout( left, top, right, bottom, format, orientation ); @@ -8071,7 +8071,7 @@ void Sheet::updateCell( Cell */*cell*/, int _column, int _row ) updateCellArea(cellArea); } -void Sheet::emit_updateRow( RowFormat *_format, int _row, bool tqrepaint ) +void Sheet::emit_updateRow( RowFormat *_format, int _row, bool repaint ) { if ( doc()->isLoading() ) return; @@ -8081,7 +8081,7 @@ void Sheet::emit_updateRow( RowFormat *_format, int _row, bool tqrepaint ) if ( c->row() == _row ) c->setLayoutDirtyFlag( true ); - if ( tqrepaint ) + if ( repaint ) { //All the cells in this row, or below this row will need to be repainted //So add that region of the sheet to the paint dirty list. @@ -8256,7 +8256,7 @@ bool Sheet::saveChildren( KoStore* _store, const TQString &_path ) { if ( it.current()->sheet() == this && ( it.current()->getType() == OBJECT_KOFFICE_PART || it.current()->getType() == OBJECT_CHART ) ) { - TQString path = TQString( "%1/%2" ).tqarg( _path ).tqarg( i++ ); + TQString path = TQString( "%1/%2" ).arg( _path ).arg( i++ ); if ( !dynamic_cast<EmbeddedKOfficeObject*>( it.current() )->embeddedObject()->document()->saveToStore( _store, path ) ) return false; } @@ -8279,7 +8279,7 @@ bool Sheet::saveOasisObjects( KoStore */*store*/, KoXmlWriter &xmlWriter, KoGenS { if ( !objectFound ) { - xmlWriter.startElement( "table:tqshapes" ); + xmlWriter.startElement( "table:shapes" ); objectFound = true; } if ( !it.current()->saveOasisObject(sc) ) @@ -8565,7 +8565,7 @@ void Sheet::printDebug() cellDescr += " | "; cellDescr += cell->text(); if ( cell->isFormula() ) - cellDescr += TQString(" [result: %1]").tqarg( cell->value().asString() ); + cellDescr += TQString(" [result: %1]").arg( cell->value().asString() ); kdDebug(36001) << cellDescr << endl; } } diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h index 2947728c..ff6272ac 100644 --- a/kspread/kspread_sheet.h +++ b/kspread/kspread_sheet.h @@ -240,11 +240,11 @@ public: Doc* doc() const; /** - * Saves the sheet and all it's tqchildren in XML format + * Saves the sheet and all it's children in XML format */ virtual TQDomElement saveXML( TQDomDocument& ); /** - * Loads the sheet and all it's tqchildren in XML format + * Loads the sheet and all it's children in XML format */ virtual bool loadXML( const TQDomElement& ); @@ -259,12 +259,12 @@ public: void saveOasisPrintStyleLayout( KoGenStyle &style ) const; /** - * Saves a tqchildren + * Saves a children */ virtual bool saveChildren( KoStore* _store, const TQString &_path ); bool saveOasisObjects( KoStore *store, KoXmlWriter &xmlWriter, KoGenStyles& mainStyles, int & indexObj, int &partIndexObj ); /** - * Loads a tqchildren + * Loads a children */ virtual bool loadChildren( KoStore* _store ); @@ -991,9 +991,9 @@ public: void autofill( TQRect &src, TQRect &dest ); - bool insertChild( const KoRect& _tqgeometry, KoDocumentEntry& ); + bool insertChild( const KoRect& _geometry, KoDocumentEntry& ); - bool insertChart( const KoRect& _tqgeometry, KoDocumentEntry&, const TQRect& _data ); + bool insertChart( const KoRect& _geometry, KoDocumentEntry&, const TQRect& _data ); /** @@ -1016,7 +1016,7 @@ public: */ bool insertPicture( const KoPoint& point, const TQPixmap& pixmap ); - void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _tqgeometry ); + void changeChildGeometry( EmbeddedKOfficeObject *_child, const KoRect& _geometry ); const TQColorGroup& colorGroup() { return widget()->colorGroup(); } @@ -1033,7 +1033,7 @@ public: * Checks if the argument _column is out of the current maximum range of the vertical border * If this is the case, the current maximum value m_iMaxColumn is adjusted and the vertical border * is resized. - * Use this function with care, as it involves a tqrepaint of the border, when it is out of range. + * Use this function with care, as it involves a repaint of the border, when it is out of range. */ void checkRangeHBorder ( int _column ); @@ -1048,7 +1048,7 @@ public: * Checks if the argument _row is out of the current maximum range of the horizontal border * If this is the case, the current maximum value m_iMaxRow is adjusted and the horizontal border * is resized. - * Use this function with care, as it involves a tqrepaint of the border, when it is out of range. + * Use this function with care, as it involves a repaint of the border, when it is out of range. */ void checkRangeVBorder ( int _row ); @@ -1102,7 +1102,7 @@ public: */ void refreshView(const Region& region); - void emit_updateRow( RowFormat *_format, int _row, bool tqrepaint = true ); + void emit_updateRow( RowFormat *_format, int _row, bool repaint = true ); void emit_updateColumn( ColumnFormat *_format, int _column ); /** diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc index 6f9a4f8b..a70445eb 100644 --- a/kspread/kspread_sheetprint.cc +++ b/kspread/kspread_sheetprint.cc @@ -126,8 +126,8 @@ TQRect SheetPrint::cellsPrintRange() } } - // Now look at the tqchildren - TQPtrListIterator<KoDocumentChild> cit( m_pDoc->tqchildren() ); + // Now look at the children + TQPtrListIterator<KoDocumentChild> cit( m_pDoc->children() ); double dummy; int i; for( ; cit.current(); ++cit ) @@ -190,7 +190,7 @@ bool SheetPrint::pageNeedsPrinting( TQRect& page_range ) } // filled = true; - //Page empty, but maybe tqchildren on it? + //Page empty, but maybe children on it? TQRect intView = TQRect( TQPoint( m_pDoc->zoomItX( m_pSheet->dblColumnPos( page_range.left() ) ), m_pDoc->zoomItY( m_pSheet->dblRowPos( page_range.top() ) ) ), @@ -199,7 +199,7 @@ bool SheetPrint::pageNeedsPrinting( TQRect& page_range ) m_pDoc->zoomItY( m_pSheet->dblRowPos( page_range.bottom() ) + m_pSheet->rowFormat( page_range.bottom() )->dblHeight() ) ) ); - TQPtrListIterator<KoDocumentChild> it( m_pDoc->tqchildren() ); + TQPtrListIterator<KoDocumentChild> it( m_pDoc->children() ); for( ;it.current(); ++it ) { TQRect bound = it.current()->boundingRect(); @@ -295,7 +295,7 @@ bool SheetPrint::print( TQPainter &painter, KPrinter *_printer ) ( obj->getType() == OBJECT_CHART && m_bPrintCharts ) ) ) continue; - TQRect zoomRect = m_pDoc->zoomRect( itObject.current()->tqgeometry() ); + TQRect zoomRect = m_pDoc->zoomRect( itObject.current()->geometry() ); TQPixmap *p = new TQPixmap( zoomRect.size() ); TQPainter painter(p); painter.fillRect( p->rect(), TQColor("white") ); @@ -575,24 +575,24 @@ void SheetPrint::printRect( TQPainter& painter, const KoPoint& topLeft, } // - // Draw the tqchildren + // Draw the children // TQRect zoomedView = m_pDoc->zoomRect( view ); - //TQPtrListIterator<KoDocumentChild> it( m_pDoc->tqchildren() ); + //TQPtrListIterator<KoDocumentChild> it( m_pDoc->children() ); //TQPtrListIterator<EmbeddedObject> itObject( m_pDoc->embeddedObjects() ); TQValueList<PrintObject *>::iterator itObject; for ( itObject = m_printObjects.begin(); itObject != m_printObjects.end(); ++itObject ) { EmbeddedObject *obj = (*itObject)->obj; // TQString tmp=TQString("Testing child %1/%2 %3/%4 against view %5/%6 %7/%8") -// .tqarg(it.current()->contentRect().left()) -// .tqarg(it.current()->contentRect().top()) -// .tqarg(it.current()->contentRect().right()) -// .tqarg(it.current()->contentRect().bottom()) -// .tqarg(view.left()).tqarg(view.top()).tqarg(zoomedView.right()).tqarg(zoomedView.bottom()); +// .arg(it.current()->contentRect().left()) +// .arg(it.current()->contentRect().top()) +// .arg(it.current()->contentRect().right()) +// .arg(it.current()->contentRect().bottom()) +// .arg(view.left()).arg(view.top()).arg(zoomedView.right()).arg(zoomedView.bottom()); // kdDebug(36001)<<tmp<<" offset "<<_childOffset.x()<<"/"<<_childOffset.y()<<endl; - KoRect const bound = obj->tqgeometry(); + KoRect const bound = obj->geometry(); TQRect zoomedBound = m_pDoc->zoomRect( KoRect(bound.left(), bound.top(), bound.width(), bound.height() ) ); @@ -614,14 +614,14 @@ void SheetPrint::printRect( TQPainter& painter, const KoPoint& topLeft, -zoomedView.top() + m_pDoc->zoomItY( topLeft.y() ) ); //obj->draw( &painter ); - painter.drawPixmap( m_pDoc->zoomRect( obj->tqgeometry() ).topLeft(), *(*itObject)->p ); //draw the cached object + painter.drawPixmap( m_pDoc->zoomRect( obj->geometry() ).topLeft(), *(*itObject)->p ); //draw the cached object //painter.fillRect(zoomedBound, TQBrush("red")); //for debug purpose painter.restore(); } } - //Don't let obscuring cells and tqchildren overpaint this area + //Don't let obscuring cells and children overpaint this area clipRegion -= TQRegion ( m_pDoc->zoomItX( leftBorderPts() + topLeft.x() ), m_pDoc->zoomItY( topBorderPts() + topLeft.y() ), m_pDoc->zoomItX( xpos ), @@ -1303,7 +1303,7 @@ TQString SheetPrint::completeHeading( const TQString &_data, int _page, const TQ full_name=p->pw_gecos; if( email_addr.isEmpty()) - email_addr = TQString("%1@%2").tqarg(p->pw_name).tqarg(hostname); + email_addr = TQString("%1@%2").arg(p->pw_name).arg(hostname); tmp = _data; int pos = 0; diff --git a/kspread/kspread_sheetprint.h b/kspread/kspread_sheetprint.h index 0062476d..94affb99 100644 --- a/kspread/kspread_sheetprint.h +++ b/kspread/kspread_sheetprint.h @@ -449,7 +449,7 @@ private: * the printing frame. * * @param _childOffset KoPoint used to calculate the correct position of - * tqchildren, if there are repeated columns/rows. + * children, if there are repeated columns/rows. */ void printPage( TQPainter &_painter, const TQRect& page_range, const KoRect& view, const KoPoint _childOffset ); @@ -492,7 +492,7 @@ private: /** * Returns a rect, which contains the cols and rows to be printed. - * It respects the printrange and the tqchildren + * It respects the printrange and the children */ TQRect cellsPrintRange(); diff --git a/kspread/kspread_toolbox.cc b/kspread/kspread_toolbox.cc index 8a483154..b868d913 100644 --- a/kspread/kspread_toolbox.cc +++ b/kspread/kspread_toolbox.cc @@ -102,7 +102,7 @@ void ToolBox::childEvent( TQChildEvent* ev ) void ToolBox::mousePressEvent( TQMouseEvent* ev ) { - m_startPos = tqgeometry().topLeft(); + m_startPos = geometry().topLeft(); m_mousePos = ev->globalPos(); } diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cc index 47edd2ac..2bbbd0a0 100644 --- a/kspread/kspread_util.cc +++ b/kspread/kspread_util.cc @@ -76,16 +76,16 @@ int KSpread::util_decodeColumnLabelText( const TQString &_col ) TQString KSpread::util_rangeColumnName( const TQRect &_area) { return TQString("%1:%2") - .tqarg( Cell::columnName( _area.left())) - .tqarg( Cell::columnName(_area.right())); + .arg( Cell::columnName( _area.left())) + .arg( Cell::columnName(_area.right())); } //used in dialogs/kspread_dlg_papertqlayout.cc TQString KSpread::util_rangeRowName( const TQRect &_area) { return TQString("%1:%2") - .tqarg( _area.top()) - .tqarg(_area.bottom()); + .arg( _area.top()) + .arg(_area.bottom()); } TQString KSpread::util_rangeName(const TQRect &_area) @@ -933,7 +933,7 @@ TQString KSpread::convertOasisPenToString( const TQPen & pen ) // a fast algorithm for diagonals. A line width of 1 will // also produce a 1 pixel wide line, but uses a slower more // accurate algorithm for diagonals. - TQString s = TQString( "%1pt " ).tqarg( (pen.width() == 0) ? 1 : pen.width() ); + TQString s = TQString( "%1pt " ).arg( (pen.width() == 0) ? 1 : pen.width() ); switch( pen.style() ) { case TQt::NoPen: diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index 89c5ff35..b54932da 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -237,7 +237,7 @@ public: TQPopupMenu *popupRow; TQPopupMenu *popupColumn; - TQPopupMenu* popupChild; // for embedded tqchildren + TQPopupMenu* popupChild; // for embedded children TQPopupMenu* popupListChoose; // for list of choose // the child for which the popup menu has been opened. @@ -1473,7 +1473,7 @@ bool KPSheetSelectPage::isValid(TQString& /*msg*/) TQString KPSheetSelectPage::printOptionForIndex(unsigned int index) { - return TQString("sheetprintorder%1").tqarg(index); + return TQString("sheetprintorder%1").arg(index); } void KPSheetSelectPage::prependAvailableSheet(const TQString& sheetname) @@ -1880,7 +1880,7 @@ View::~View() // of embedded child documents possible repaints in Sheet are not // performed. The repains can happen if you delete an embedded document, // which leads to an regionInvalidated() signal emission in KoView, which calls - // tqrepaint, etc.etc. :-) (Simon) + // repaint, etc.etc. :-) (Simon) delete d->selection; delete d->choice; @@ -3832,8 +3832,8 @@ void View::setActiveSheet( Sheet * _t, bool updateSheet ) if ( updateSheet ) { d->tabBar->setActiveTab( _t->sheetName() ); - d->vBorderWidget->tqrepaint(); - d->hBorderWidget->tqrepaint(); + d->vBorderWidget->repaint(); + d->hBorderWidget->repaint(); d->activeSheet->setRegionPaintDirty(TQRect(TQPoint(0,0), TQPoint(KS_colMax, KS_rowMax))); d->canvas->slotMaxColumn( d->activeSheet->maxColumn() ); d->canvas->slotMaxRow( d->activeSheet->maxRow() ); @@ -3914,8 +3914,8 @@ void View::changeSheet( const TQString& _name ) updateBorderButton(); //update visible area - d->vBorderWidget->tqrepaint(); - d->hBorderWidget->tqrepaint(); + d->vBorderWidget->repaint(); + d->hBorderWidget->repaint(); d->canvas->slotMaxColumn( d->activeSheet->maxColumn() ); d->canvas->slotMaxRow( d->activeSheet->maxRow() ); t->setRegionPaintDirty( t->visibleRect( d->canvas ) ); @@ -4971,7 +4971,7 @@ void View::print( KPrinter &prt ) Sheet* sheet = doc()->map()->findSheet(*sheetlistiterator); if (sheet == NULL) { - kdWarning() << i18n("Sheet %1 could not be found for printing").tqarg(*sheetlistiterator) << endl; + kdWarning() << i18n("Sheet %1 could not be found for printing").arg(*sheetlistiterator) << endl; continue; } @@ -5038,7 +5038,7 @@ void View::print( KPrinter &prt ) if( !prt.previewOnly() ) { KMessageBox::information( 0, - i18n("Nothing to print for sheet %1.").tqarg( + i18n("Nothing to print for sheet %1.").arg( d->activeSheet->sheetName()) ); //@todo: make sure we really can comment this out, // what to do with partially broken printouts? @@ -5051,13 +5051,13 @@ void View::print( KPrinter &prt ) this->setActiveSheet(selectedsheet); } -void View::insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _e ) +void View::insertChart( const TQRect& _geometry, KoDocumentEntry& _e ) { if ( !d->activeSheet ) return; // Transform the view coordinates to document coordinates - KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry ); + KoRect unzoomedRect = doc()->unzoomRect( _geometry ); unzoomedRect.moveBy( d->canvas->xOffset(), d->canvas->yOffset() ); InsertObjectCommand *cmd = 0; @@ -5073,13 +5073,13 @@ void View::insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _e ) cmd->execute(); } -void View::insertChild( const TQRect& _tqgeometry, KoDocumentEntry& _e ) +void View::insertChild( const TQRect& _geometry, KoDocumentEntry& _e ) { if ( !d->activeSheet ) return; // Transform the view coordinates to document coordinates - KoRect unzoomedRect = doc()->unzoomRect( _tqgeometry ); + KoRect unzoomedRect = doc()->unzoomRect( _geometry ); unzoomedRect.moveBy( d->canvas->xOffset(), d->canvas->yOffset() ); InsertObjectCommand *cmd = new InsertObjectCommand( unzoomedRect, _e, d->canvas ); @@ -5135,11 +5135,11 @@ void View::slotUpdateChildGeometry( EmbeddedKOfficeObject */*_child*/ ) assert( f != 0L ); // Are we already up to date ? - if ( _child->tqgeometry() == f->partGeometry() ) + if ( _child->geometry() == f->partGeometry() ) return; // TODO zooming - f->setPartGeometry( _child->tqgeometry() ); + f->setPartGeometry( _child->geometry() ); */ } @@ -5498,7 +5498,7 @@ KoDocument * View::hitTest( const TQPoint& /*pos*/ ) // return 0; // } // -// TQPtrListIterator<KoDocumentChild> it( doc()->tqchildren() ); +// TQPtrListIterator<KoDocumentChild> it( doc()->children() ); // for (; it.current(); ++it ) // { // // Is the child document on the visible sheet ? @@ -6401,7 +6401,7 @@ void View::styleDialog() d->activeSheet->setRegionPaintDirty( d->activeSheet->visibleRect( d->canvas ) ); } if ( d->canvas ) - d->canvas->tqrepaint(); + d->canvas->repaint(); } void View::paperLayoutDlg() @@ -6748,9 +6748,9 @@ void View::zoomMinus() if ( d->activeSheet != 0L ) d->activeSheet->setLayoutDirtyFlag(); - d->canvas->tqrepaint(); - d->vBorderWidget->tqrepaint(); - d->hBorderWidget->tqrepaint(); + d->canvas->repaint(); + d->vBorderWidget->repaint(); + d->hBorderWidget->repaint(); } void View::zoomPlus() @@ -6763,9 +6763,9 @@ void View::zoomPlus() if ( d->activeSheet != 0L ) d->activeSheet->setLayoutDirtyFlag(); - d->canvas->tqrepaint(); - d->vBorderWidget->tqrepaint(); - d->hBorderWidget->tqrepaint(); + d->canvas->repaint(); + d->vBorderWidget->repaint(); + d->hBorderWidget->repaint(); } */ @@ -6911,9 +6911,9 @@ void View::slotAddSheet( Sheet *_sheet ) void View::slotRefreshView() { refreshView(); - d->canvas->tqrepaint(); - d->vBorderWidget->tqrepaint(); - d->hBorderWidget->tqrepaint(); + d->canvas->repaint(); + d->vBorderWidget->repaint(); + d->hBorderWidget->repaint(); } void View::slotUpdateView( Sheet *_sheet ) diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h index 2dfecfa5..f9ce1bdd 100644 --- a/kspread/kspread_view.h +++ b/kspread/kspread_view.h @@ -253,22 +253,22 @@ public: /** * - * @param _tqgeometry is the zoomed tqgeometry of the new child. + * @param _geometry is the zoomed geometry of the new child. * @param _entry is the entry to insert. * * @todo check validity of @p _entry docs. */ - void insertChart( const TQRect& _tqgeometry, KoDocumentEntry& _entry ); + void insertChart( const TQRect& _geometry, KoDocumentEntry& _entry ); /** * - * @param _tqgeometry is the tqgeometry of the new child. + * @param _geometry is the geometry of the new child. * @param _entry is the entry to insert. * * @todo check validity of @p _entry docs. */ - void insertChild( const TQRect& _tqgeometry, KoDocumentEntry& _entry ); + void insertChild( const TQRect& _geometry, KoDocumentEntry& _entry ); - // void insertPicture( const TQRect& _tqgeometry, KURL& _file ); + // void insertPicture( const TQRect& _geometry, KURL& _file ); virtual void print( KPrinter &printer ); virtual void setupPrinter( KPrinter &printer ); @@ -321,7 +321,7 @@ public: void updateShowSheetMenu(); /** - * Mark all selected cells / regions of cells as 'dirty' (ie. requiring a tqrepaint) + * Mark all selected cells / regions of cells as 'dirty' (ie. requiring a repaint) * They will be repainted on the next call to paintUpdates() */ void markSelectionAsDirty(); diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc index bed111ba..57e52fcf 100644 --- a/kspread/manipulator.cc +++ b/kspread/manipulator.cc @@ -1444,20 +1444,20 @@ double AdjustColumnRowManipulator::adjustColumnHelper(Cell* cell, int col, int r if ( cell->textWidth() > long_max ) { double indent = 0.0; - Format::Align tqalignment = cell->format()->align(cell->column(), cell->row()); - if (tqalignment == Format::Undefined) + Format::Align alignment = cell->format()->align(cell->column(), cell->row()); + if (alignment == Format::Undefined) { if (cell->value().isNumber() || cell->isDate() || cell->isTime()) { - tqalignment = Format::Right; + alignment = Format::Right; } else { - tqalignment = Format::Left; + alignment = Format::Left; } } - if (tqalignment == Format::Left) + if (alignment == Format::Left) { indent = cell->format()->getIndent( cell->column(), cell->row() ); } diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index 730cd404..e1a1d4c3 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -578,7 +578,7 @@ void TQtCalculator::updateGeometry() s.setWidth(mSmallPage->fontMetrics().width("MMM")); s.setHeight(mSmallPage->fontMetrics().lineSpacing()); - l = (TQObjectList*)mSmallPage->tqchildren(); // silence please + l = (TQObjectList*)mSmallPage->children(); // silence please for(uint i=0; i < l->count(); i++) { @@ -593,7 +593,7 @@ void TQtCalculator::updateGeometry() } } - l = (TQObjectList*)mLargePage->tqchildren(); // silence please + l = (TQObjectList*)mLargePage->children(); // silence please int h1 = pbF->minimumSize().height(); int h2 = (int)((((float)h1 + 4.0) / 5.0)); diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc index 1bb16a95..c0d5c1ca 100644 --- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc +++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc @@ -194,7 +194,7 @@ void PluginInsertCalendar::slotInsertCalendar(const TQDate &start, const TQDate int row = selection.y(); int col = selection.x(); int colstart = col; //this is where we get back after each week - sheet->setText(row,colstart,i18n("Calendar from %1 to %2").tqarg(start.toString()).tqarg(end.toString())); + sheet->setText(row,colstart,i18n("Calendar from %1 to %2").arg(start.toString()).arg(end.toString())); TQDate current(start); // TQDate previous(current); diff --git a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp index 108516dc..9f67dfbb 100644 --- a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp +++ b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.cpp @@ -45,9 +45,9 @@ using namespace Kross::KSpreadCore; KSpreadCoreModule::KSpreadCoreModule(Kross::Api::Manager* manager) : Kross::Api::Module("kspreadcore") , m_manager(manager) { - TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren(); - kdDebug() << " there are " << tqchildren.size() << endl; - for(TQMap<TQString, Object::Ptr>::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++) + TQMap<TQString, Object::Ptr> children = manager->getChildren(); + kdDebug() << " there are " << children.size() << endl; + for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++) { kdDebug() << it.key() << " " << it.data() << endl; } diff --git a/kspread/tests/inspector.cc b/kspread/tests/inspector.cc index 17179793..d44b7bf3 100644 --- a/kspread/tests/inspector.cc +++ b/kspread/tests/inspector.cc @@ -65,7 +65,7 @@ static TQString boolAsString( bool b ) static TQString longAsHexstring( long l ) { - return TQString("%1").tqarg(l, 8, 16); + return TQString("%1").arg(l, 8, 16); } static TQString dirAsString( Sheet::LayoutDirection dir ) diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cc index 0c9e9e97..5b4864ad 100644 --- a/kspread/tests/testrunner.cc +++ b/kspread/tests/testrunner.cc @@ -108,7 +108,7 @@ void TestRunner::runTest() if( tester ) { d->logView->clear(); - d->logView->append( TQString("Test: %1").tqarg( testName ) ); + d->logView->append( TQString("Test: %1").arg( testName ) ); TQApplication::setOverrideCursor(TQt::waitCursor); tester->run(); @@ -117,13 +117,13 @@ void TestRunner::runTest() TQStringList errorList = tester->errors(); if( tester->failed() ) { - d->logView->append( TQString( "%1 tests, <b>%2 failed.</b>").tqarg( tester->count() ). + d->logView->append( TQString( "%1 tests, <b>%2 failed.</b>").arg( tester->count() ). arg( tester->failed() ) ); for( unsigned k = 0; k < errorList.count(); k++ ) d->logView->append( errorList[k] ); } else - d->logView->append( TQString( "%1 tests, everything is OK. ").tqarg( tester->count() ) ); + d->logView->append( TQString( "%1 tests, everything is OK. ").arg( tester->count() ) ); d->logView->append( "Test finished." ); } diff --git a/kspread/valueformatter.cc b/kspread/valueformatter.cc index 9e3c57da..1eda41da 100644 --- a/kspread/valueformatter.cc +++ b/kspread/valueformatter.cc @@ -358,15 +358,15 @@ TQString ValueFormatter::fractionFormat (double value, FormatType fmtType) diff = fabs(result - calc); } } - if( index1 == 0 ) return TQString("%1").tqarg( floor(value) ); - if( index1 == index ) return TQString("%1").tqarg( floor(value)+1 ); + if( index1 == 0 ) return TQString("%1").arg( floor(value) ); + if( index1 == index ) return TQString("%1").arg( floor(value)+1 ); if( floor(value) == 0) - return TQString("%1/%2").tqarg( index1 ).tqarg( index ); + return TQString("%1/%2").arg( index1 ).arg( index ); return TQString("%1 %2/%3") - .tqarg( floor(value) ) - .tqarg( index1 ) - .tqarg( index ); + .arg( floor(value) ) + .arg( index1 ) + .arg( index ); } @@ -407,12 +407,12 @@ TQString ValueFormatter::fractionFormat (double value, FormatType fmtType) else { if ( floor(value) == 0 ) - return TQString("%1/%2").tqarg(numerator).tqarg(denominator); + return TQString("%1/%2").arg(numerator).arg(denominator); else return TQString("%1 %2/%3") - .tqarg(floor(value)) - .tqarg(numerator) - .tqarg(denominator); + .arg(floor(value)) + .arg(numerator) + .arg(denominator); } } @@ -436,35 +436,35 @@ TQString ValueFormatter::timeFormat (const TQDateTime &dt, FormatType fmtType) if (fmtType == Time_format1) { // 9 : 01 AM return TQString("%1:%2 %3") - .tqarg((pm ? h - 12 : h),2) - .tqarg(minute,2) - .tqarg(AMPM); + .arg((pm ? h - 12 : h),2) + .arg(minute,2) + .arg(AMPM); } if (fmtType == Time_format2) { //9:01:05 AM return TQString("%1:%2:%3 %4") - .tqarg((pm ? h-12 : h),2) - .tqarg(minute,2) - .tqarg(second,2) - .tqarg(AMPM); + .arg((pm ? h-12 : h),2) + .arg(minute,2) + .arg(second,2) + .arg(AMPM); } if (fmtType == Time_format3) { return TQString("%1 %2 %3 %4 %5 %6") // 9 h 01 min 28 s - .tqarg(hour,2) - .tqarg(i18n("h")) - .tqarg(minute,2) - .tqarg(i18n("min")) - .tqarg(second,2) - .tqarg(i18n("s")); + .arg(hour,2) + .arg(i18n("h")) + .arg(minute,2) + .arg(i18n("min")) + .arg(second,2) + .arg(i18n("s")); } if (fmtType == Time_format4) { // 9:01 - return TQString("%1:%2").tqarg(hour, 2).tqarg(minute, 2); + return TQString("%1:%2").arg(hour, 2).arg(minute, 2); } if (fmtType == Time_format5) { // 9:01:12 - return TQString("%1:%2:%3").tqarg(hour, 2).tqarg(minute, 2).tqarg(second, 2); + return TQString("%1:%2:%3").arg(hour, 2).arg(minute, 2).arg(second, 2); } TQDate d1(dt.date()); @@ -476,15 +476,15 @@ TQString ValueFormatter::timeFormat (const TQDateTime &dt, FormatType fmtType) if (fmtType == Time_format6) { // [mm]:ss m += (h * 60); - return TQString("%1:%2").tqarg(m, 1).tqarg(second, 2); + return TQString("%1:%2").arg(m, 1).arg(second, 2); } if (fmtType == Time_format7) { // [h]:mm:ss - return TQString("%1:%2:%3").tqarg(h, 1).tqarg(minute, 2).tqarg(second, 2); + return TQString("%1:%2:%3").arg(h, 1).arg(minute, 2).arg(second, 2); } if (fmtType == Time_format8) { // [h]:mm m += (h * 60); - return TQString("%1:%2").tqarg(h, 1).tqarg(minute, 2); + return TQString("%1:%2").arg(h, 1).arg(minute, 2); } return converter->locale()->formatTime( dt.time(), false ); @@ -540,7 +540,7 @@ TQString ValueFormatter::dateFormat (const TQDate &date, FormatType fmtType) tmp += TQString::number(date.year()); } else if (fmtType == date_format10) { /*F-99 */ - tmp = converter->locale()->calendar()->monthString(date, false).tqat(0) + "-"; + tmp = converter->locale()->calendar()->monthString(date, false).at(0) + "-"; tmp += TQString::number(date.year()).right(2); } else if (fmtType == date_format11) { /*18/Feb */ |