From f0de9e167e289ab7dc33e57f077c1f04ec7c68c8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:38:41 -0600 Subject: Remove additional unneeded tq method conversions --- filters/kspread/opencalc/opencalcexport.cc | 6 +++--- filters/kspread/opencalc/opencalcimport.cc | 4 ++-- filters/kspread/opencalc/opencalcstyleexport.cc | 18 +++++++++--------- filters/kspread/opencalc/status.html | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'filters/kspread/opencalc') diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc index 828d817a..ce1a55ad 100644 --- a/filters/kspread/opencalc/opencalcexport.cc +++ b/filters/kspread/opencalc/opencalcexport.cc @@ -844,7 +844,7 @@ void OpenCalcExport::exportDefaultCellStyle( TQDomDocument & doc, TQDomElement & TQDomElement style = doc.createElement( "style:properties" ); style.setAttribute( "style:font-name", font.family() ); - style.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( font.pointSize() ) ); + style.setAttribute( "fo:font-size", TQString( "%1pt" ).arg( font.pointSize() ) ); style.setAttribute( "style:decimal-places", TQString::number( locale->fracDigits() ) ); style.setAttribute( "fo:language", language ); style.setAttribute( "fo:country", country ); @@ -881,8 +881,8 @@ void OpenCalcExport::exportPageAutoStyles( TQDomDocument & doc, TQDomElement & a height = sheet->print()->paperHeight() / 10; } - TQString sWidth = TQString( "%1cm" ).tqarg( width ); - TQString sHeight = TQString( "%1cm" ).tqarg( height ); + TQString sWidth = TQString( "%1cm" ).arg( width ); + TQString sHeight = TQString( "%1cm" ).arg( height ); TQDomElement pageMaster = doc.createElement( "style:page-master" ); pageMaster.setAttribute( "style:name", "pm1" ); diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc index 0fbe52e0..8e0327c9 100644 --- a/filters/kspread/opencalc/opencalcimport.cc +++ b/filters/kspread/opencalc/opencalcimport.cc @@ -1387,7 +1387,7 @@ void OpenCalcImport::loadOasisMasterLayoutPage( Sheet * table,KoStyleStack &styl kdDebug(30518)<<" table-centering unknown :"<print()->setPaperLayout( left, top, right, bottom, format, orientation ); @@ -2289,7 +2289,7 @@ bool OpenCalcImport::createStyleMap( TQDomDocument const & styles ) if ( d > 1.0 ) { TQString message( i18n("This document was created with OpenOffice.org version '%1'. This filter was written for version 1.0. Reading this file could cause strange behavior, crashes or incorrect display of the data. Do you want to continue converting the document?") ); - message.tqarg( content.attributeNS( ooNS::office, "version", TQString() ) ); + message.arg( content.attributeNS( ooNS::office, "version", TQString() ) ); if ( KMessageBox::warningYesNo( 0, message, i18n( "Unsupported document version" ) ) == KMessageBox::No ) return false; } diff --git a/filters/kspread/opencalc/opencalcstyleexport.cc b/filters/kspread/opencalc/opencalcstyleexport.cc index f075713a..9585ae13 100644 --- a/filters/kspread/opencalc/opencalcstyleexport.cc +++ b/filters/kspread/opencalc/opencalcstyleexport.cc @@ -111,7 +111,7 @@ TQString OpenCalcStyles::cellStyle( CellStyle const & cs ) m_cellStyles.append( t ); - t->name = TQString( "ce%1" ).tqarg( m_cellStyles.count() ); + t->name = TQString( "ce%1" ).arg( m_cellStyles.count() ); return t->name; } @@ -132,7 +132,7 @@ TQString OpenCalcStyles::columnStyle( ColumnStyle const & cs ) m_columnStyles.append( t ); - t->name = TQString( "co%1" ).tqarg( m_columnStyles.count() ); + t->name = TQString( "co%1" ).arg( m_columnStyles.count() ); return t->name; } @@ -158,7 +158,7 @@ TQString OpenCalcStyles::rowStyle( RowStyle const & rs ) m_rowStyles.append( t ); - t->name = TQString( "ro%1" ).tqarg( m_rowStyles.count() ); + t->name = TQString( "ro%1" ).arg( m_rowStyles.count() ); return t->name; } @@ -179,14 +179,14 @@ TQString OpenCalcStyles::sheetStyle( SheetStyle const & ts ) m_sheetStyles.append( t ); - t->name = TQString( "ta%1" ).tqarg( m_sheetStyles.count() ); + t->name = TQString( "ta%1" ).arg( m_sheetStyles.count() ); return t->name; } TQString convertPenToString( TQPen const & pen ) { - TQString s( TQString( "%1cm solid " ).tqarg( pen.width() * 0.035 ) ); + TQString s( TQString( "%1cm solid " ).arg( pen.width() * 0.035 ) ); s += pen.color().name(); return s; @@ -212,7 +212,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl if ( t->font.bold() != m_defaultFont.bold() ) prop.setAttribute( "fo:font-weight", ( t->font.bold() ? "bold" : "light" ) ); - prop.setAttribute( "fo:font-size", TQString( "%1pt" ).tqarg( t->font.pointSize() ) ); + prop.setAttribute( "fo:font-size", TQString( "%1pt" ).arg( t->font.pointSize() ) ); if ( t->font.underline() != m_defaultFont.underline() ) { @@ -250,7 +250,7 @@ void OpenCalcStyles::addCellStyles( TQDomDocument & doc, TQDomElement & autoStyl if ( t->indent > 0.0 ) { - prop.setAttribute( "fo:margin-left", TQString( "%1pt" ).tqarg( t->indent ) ); + prop.setAttribute( "fo:margin-left", TQString( "%1pt" ).arg( t->indent ) ); if ( t->alignX == Format::Undefined ) prop.setAttribute( "fo:text-align", "start" ); } @@ -323,7 +323,7 @@ void OpenCalcStyles::addColumnStyles( TQDomDocument & doc, TQDomElement & autoSt TQDomElement prop = doc.createElement( "style:properties" ); if ( t->breakB != ::Style::none ) prop.setAttribute( "fo:break-before", ( t->breakB == ::Style::automatic ? "auto" : "page" ) ); - prop.setAttribute( "style:column-width", TQString( "%1cm" ).tqarg( t->size ) ); + prop.setAttribute( "style:column-width", TQString( "%1cm" ).arg( t->size ) ); ts.appendChild( prop ); autoStyles.appendChild( ts ); @@ -346,7 +346,7 @@ void OpenCalcStyles::addRowStyles( TQDomDocument & doc, TQDomElement & autoStyle ts.setAttribute( "style:family", "table-row" ); TQDomElement prop = doc.createElement( "style:properties" ); - prop.setAttribute( "style:row-height", TQString( "%1cm" ).tqarg( t->size ) ); + prop.setAttribute( "style:row-height", TQString( "%1cm" ).arg( t->size ) ); if ( t->breakB != ::Style::none ) prop.setAttribute( "fo:break-before", ( t->breakB == ::Style::automatic ? "auto" : "page" ) ); diff --git a/filters/kspread/opencalc/status.html b/filters/kspread/opencalc/status.html index dfaed8a4..2bd1fc05 100644 --- a/filters/kspread/opencalc/status.html +++ b/filters/kspread/opencalc/status.html @@ -139,7 +139,7 @@ KOffice filters status:   OpenOffice.org Calc Page sizes, header and footer (including variable converting)
Font (sizes, attributes, color)
Background color
- Text tqalignment, angle, vertical text, text wrap and indents
+ Text alignment, angle, vertical text, text wrap and indents
Merged Cells
DontPrint flag
Comments
@@ -172,7 +172,7 @@ KOffice filters status:   OpenOffice.org Calc Jan 18, 2003 - page tqlayout, header, footer
Jan 19, 2003 - Added support for fonts, text color, background color, formula conversion
- Jan 19, 2003 - text tqalignment, indents, comments, NoPrint, Merged Cells
+ Jan 19, 2003 - text alignment, indents, comments, NoPrint, Merged Cells
Jan 19, 2003 - angle, vertical text, text wrap
Jan 19, 2003 - named area, hidden columns and rows
Jan 20, 2003 - cell borders
-- cgit v1.2.1