summaryrefslogtreecommitdiffstats
path: root/kspread/dialogs
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:38:41 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:38:41 -0600
commitf0de9e167e289ab7dc33e57f077c1f04ec7c68c8 (patch)
tree1fc538e179833e62caec21956bfe47a252be5a72 /kspread/dialogs
parent11191ef0b9908604d1d7aaca382b011ef22c454c (diff)
downloadkoffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.tar.gz
koffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kspread/dialogs')
-rw-r--r--kspread/dialogs/font_cell_format.ui2
-rw-r--r--kspread/dialogs/kspread_dlg_cons.cc10
-rw-r--r--kspread/dialogs/kspread_dlg_database.cc22
-rw-r--r--kspread/dialogs/kspread_dlg_database.h2
-rw-r--r--kspread/dialogs/kspread_dlg_format.cc8
-rw-r--r--kspread/dialogs/kspread_dlg_goalseek.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_layout.cc30
-rw-r--r--kspread/dialogs/kspread_dlg_layout.h10
-rw-r--r--kspread/dialogs/kspread_dlg_paperlayout.cc16
-rw-r--r--kspread/dialogs/kspread_dlg_preference.cc14
-rw-r--r--kspread/dialogs/kspread_dlg_reference.cc6
-rw-r--r--kspread/dialogs/kspread_dlg_showColRow.cc6
-rw-r--r--kspread/dialogs/kspread_dlg_sort.cc18
-rw-r--r--kspread/dialogs/kspread_dlg_styles.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_subtotal.cc2
15 files changed, 77 insertions, 77 deletions
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 -&gt; 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 );