summaryrefslogtreecommitdiffstats
path: root/kalzium/src
diff options
context:
space:
mode:
Diffstat (limited to 'kalzium/src')
-rw-r--r--kalzium/src/detailinfodlg.cpp78
-rw-r--r--kalzium/src/element.cpp24
-rw-r--r--kalzium/src/isotope.cpp16
-rw-r--r--kalzium/src/kalzium.cpp2
-rw-r--r--kalzium/src/kalziumtip.cpp4
-rw-r--r--kalzium/src/molcalcwidget.cpp18
-rw-r--r--kalzium/src/molcalcwidgetbase.ui2
-rw-r--r--kalzium/src/parser.cpp4
-rw-r--r--kalzium/src/periodictableview.cpp2
-rw-r--r--kalzium/src/somwidget_impl.cpp6
-rw-r--r--kalzium/src/spectrum.cpp22
-rw-r--r--kalzium/src/spectrumwidget.cpp16
-rw-r--r--kalzium/src/timewidget_impl.cpp2
13 files changed, 98 insertions, 98 deletions
diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp
index d925ac7a..727700d4 100644
--- a/kalzium/src/detailinfodlg.cpp
+++ b/kalzium/src/detailinfodlg.cpp
@@ -122,43 +122,43 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type)
html.append( "<div><table summary=\"header\"><tr><td>" );
html.append( m_element->symbol() );
html.append( "<td><td>" );
- html.append( i18n( "Block: %1" ).tqarg( m_element->block() ) );
+ html.append( i18n( "Block: %1" ).arg( m_element->block() ) );
html.append( "</td></tr></table></div>" );
html.append( "<table summary=\"characteristics\" class=\"characterstics\">");
switch ( type )
{
case CHEMICAL:
html.append( "<tr><td><img src=\"structure.png\" alt=\"icon\"/></td><td>" );
- html.append( "<b>" + i18n( "Electronic configuration: %1" ).tqarg( m_element->parsedOrbits() ) + "</b>" );
+ html.append( "<b>" + i18n( "Electronic configuration: %1" ).arg( m_element->parsedOrbits() ) + "</b>" );
html.append( "</td></tr>" );
html.append( "<tr><td><img src=\"density.png\" alt=\"icon\"/></td><td>" );
- html.append( "<b>" + i18n( "Density: %1" ).tqarg( m_element->adjustUnits( Element::DENSITY ) ) + "</b>" );
+ html.append( "<b>" + i18n( "Density: %1" ).arg( m_element->adjustUnits( Element::DENSITY ) ) + "</b>" );
html.append( "</td></tr>" );
html.append( "<tr><td><img src=\"radius.png\" alt=\"icon\"/></td><td><b>" );
- html.append( "<b>" + i18n( "Covalent Radius: %1" ).tqarg( m_element->adjustRadius( Element::COVALENT ) ) + "</b>" );
+ html.append( "<b>" + i18n( "Covalent Radius: %1" ).arg( m_element->adjustRadius( Element::COVALENT ) ) + "</b>" );
html.append( "</td></tr>" );
if ( m_element->radius(Element::IONIC) > 0.0 )
{
html.append( "<tr><td><img src=\"radius.png\" alt=\"icon\"/></td><td>" );
- html.append( i18n( "<b>Ionic Radius (Charge): %1</b> (%2)" ).tqarg( m_element->adjustRadius(Element::IONIC) ).tqarg( m_element->ioncharge() ) );
+ html.append( i18n( "<b>Ionic Radius (Charge): %1</b> (%2)" ).arg( m_element->adjustRadius(Element::IONIC) ).arg( m_element->ioncharge() ) );
html.append( "</td></tr>" );
}
if ( m_element->radius(Element::VDW) > 0.0 )
{
html.append( "<tr><td><img src=\"radius.png\" alt=\"icon\"/></td><td>" );
- html.append( "<b>" + i18n( "van der Waals Radius: %1" ).tqarg( m_element->adjustRadius(Element::VDW) ) + "</b>" );
+ html.append( "<b>" + i18n( "van der Waals Radius: %1" ).arg( m_element->adjustRadius(Element::VDW) ) + "</b>" );
html.append( "</td></tr>" );
}
if ( m_element->radius(Element::ATOMIC) > 0.0 )
{
html.append( "<tr><td><img src=\"radius.png\" alt=\"icon\"/></td><td><b>" );
- html.append( "<b>" + i18n( "Atomic Radius: %1" ).tqarg( m_element->adjustRadius(Element::ATOMIC) ) + "</b>" );
+ html.append( "<b>" + i18n( "Atomic Radius: %1" ).arg( m_element->adjustRadius(Element::ATOMIC) ) + "</b>" );
html.append( "</td></tr>" );
}
html.append( "<tr><td stype=\"text-align:center\"><img src=\"mass.png\" alt=\"icon\"/></td><td>" );
- html.append( "<b>" + i18n( "Mass: %1" ).tqarg( m_element->adjustUnits( Element::MASS ) ) + "</b>" );
+ html.append( "<b>" + i18n( "Mass: %1" ).arg( m_element->adjustUnits( Element::MASS ) ) + "</b>" );
html.append( "</td></tr>" );
if ( !m_element->isotopes().isEmpty() )
{
@@ -171,22 +171,22 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type)
html.append( "<tr><td><img src=\"discovery.png\" alt=\"icon\"/></td><td>" );
html.append( m_element->adjustUnits( Element::DATE ) );
if ( !m_element->scientist( ).isEmpty() )
- html += "<br />" + i18n("It was discovered by %1").tqarg(m_element->scientist() );
+ html += "<br />" + i18n("It was discovered by %1").arg(m_element->scientist() );
html.append( "</td></tr>" );
if ( m_element->abundance() > 0 ){
html.append( "<tr><td><img src=\"abundance.png\" alt=\"icon\"/></td><td>" );
- html.append( i18n( "Abundance in crustal rocks: %1 ppm" ).tqarg( KGlobal::locale()->formatLong( m_element->abundance() ) ) );
+ html.append( i18n( "Abundance in crustal rocks: %1 ppm" ).arg( KGlobal::locale()->formatLong( m_element->abundance() ) ) );
html.append( "</td></tr>" );
}
html.append( "<tr><td><img src=\"mass.png\" alt=\"icon\"/></td><td>" );
- html.append( i18n( "Mean mass: %1 u" ).tqarg( KalziumUtils::localizedValue( m_element->meanmass(), 6 ) ) );
+ html.append( i18n( "Mean mass: %1 u" ).arg( KalziumUtils::localizedValue( m_element->meanmass(), 6 ) ) );
html.append( "</td></tr>" );
if ( !m_element->nameOrigin().isEmpty() )
{
html.append( "<tr><td><img src=\"book.png\" alt=\"icon\"/></td><td>" );
- html.append( i18n( "Origin of the name: %1" ).tqarg( m_element->nameOrigin() ) );
+ html.append( i18n( "Origin of the name: %1" ).arg( m_element->nameOrigin() ) );
html.append( "</td></tr>" );
}
if ( m_element->artificial() || m_element->radioactive() )
@@ -203,16 +203,16 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type)
break;
case ENERGY:
html.append( "<tr><td><img src=\"meltingpoint.png\" alt=\"icon\"/></td><td>" );
- html.append( i18n( "Melting Point: %1" ).tqarg( m_element->adjustUnits( Element::MELTINGPOINT ) ) );
+ html.append( i18n( "Melting Point: %1" ).arg( m_element->adjustUnits( Element::MELTINGPOINT ) ) );
html.append( "</td></tr>" );
html.append( "<tr><td><img src=\"boilingpoint.png\" alt=\"icon\"/></td><td>" );
- html.append( i18n( "Boiling Point: %1" ).tqarg( m_element->adjustUnits( Element::BOILINGPOINT ) ) );
+ html.append( i18n( "Boiling Point: %1" ).arg( m_element->adjustUnits( Element::BOILINGPOINT ) ) );
html.append( "</td></tr>" );
html.append( "<tr><td><img src=\"structure.png\" alt=\"icon\"/></td><td>" );
- html.append( i18n( "Electronegativity: %1" ).tqarg( m_element->adjustUnits( Element::EN ) ) );
+ html.append( i18n( "Electronegativity: %1" ).arg( m_element->adjustUnits( Element::EN ) ) );
html.append( "</td></tr>" );
html.append( "<tr><td><img src=\"electronaffinity.png\" alt=\"icon\"/></td><td>" );
- html.append( i18n( "Electron affinity: %1 " ).tqarg( m_element->adjustUnits(Element::EA) ) );
+ html.append( i18n( "Electron affinity: %1 " ).arg( m_element->adjustUnits(Element::EA) ) );
html.append( "</td></tr>" );
@@ -221,7 +221,7 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type)
{
html.append( "<tr><td><img src=\"ionisation.png\" alt=\"icon\"/></td><td>" );
html.append( i18n("the first variable is a number. The result is for example '1.' or '5.', the second is the value of the ionisation energy",
- "%1. Ionization energy: %2" ).tqarg( TQString::number( i+1 ), m_element->adjustUnits( Element::IE, ionlist[i] ) ) );
+ "%1. Ionization energy: %2" ).arg( TQString::number( i+1 ), m_element->adjustUnits( Element::IE, ionlist[i] ) ) );
html.append( "</td></tr>" );
}
break;
@@ -264,13 +264,13 @@ TQString DetailedInfoDlg::isotopeTable()
{
html.append( "<tr><td align=\"right\">" );
if ( ( *it )->weight() > 0.0 )
- html.append( i18n( "%1 u" ).tqarg( KalziumUtils::localizedValue( ( *it )->weight(), 6 ) ) );
- // html.append( i18n( "%1 u" ).tqarg( TQString::number( ( *it )->weight() ) ));
+ html.append( i18n( "%1 u" ).arg( KalziumUtils::localizedValue( ( *it )->weight(), 6 ) ) );
+ // html.append( i18n( "%1 u" ).arg( TQString::number( ( *it )->weight() ) ));
html.append( "</td><td>" );
html.append( TQString::number( ( *it )->neutrons() ) );
html.append( "</td><td>" );
if ( ( *it )->percentage() > 0.0 )
- html.append( i18n( "this can for example be '24%'", "%1%" ).tqarg( KalziumUtils::localizedValue( ( *it )->percentage(), 6 ) ) );
+ html.append( i18n( "this can for example be '24%'", "%1%" ).arg( KalziumUtils::localizedValue( ( *it )->percentage(), 6 ) ) );
html.append( "</td><td>" );
if ( ( *it )->halflife() > 0.0 ) {
html.append( ( *it )->halflifeAsString() );
@@ -278,49 +278,49 @@ TQString DetailedInfoDlg::isotopeTable()
html.append( "</td><td>" );
if ( ( *it )->alphapercentage() > 0.0 ){
if ( ( *it )->alphadecay() > 0.0 )
- html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->alphadecay(), 6 ) ) );
- html.append( i18n( " %1" ).tqarg( TQChar( 945 ) ) );
+ html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->alphadecay(), 6 ) ) );
+ html.append( i18n( " %1" ).arg( TQChar( 945 ) ) );
if ( ( *it )->alphapercentage() < 100.0)
- html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( (*it )->alphapercentage(), 6 ) ) );
+ html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( (*it )->alphapercentage(), 6 ) ) );
if ( ( *it )->betaminuspercentage() > 0.0 || ( *it )->betapluspercentage() > 0.0 || ( *it )->ecpercentage() > 0.0)
html.append( i18n( ", " ) );
}
if ( ( *it )->betaminuspercentage() > 0.0 ){
if ( ( *it )->betaminusdecay() > 0.0 )
- html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->betaminusdecay(), 6 ) ) );
- html.append( i18n( " %1<sup>-</sup>" ).tqarg( TQChar( 946 ) ) );
+ html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->betaminusdecay(), 6 ) ) );
+ html.append( i18n( " %1<sup>-</sup>" ).arg( TQChar( 946 ) ) );
if ( ( *it )->betaminuspercentage() < 100.0)
- html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( ( *it )->betaminuspercentage(), 6 ) ));
+ html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->betaminuspercentage(), 6 ) ));
if ( ( *it )->betapluspercentage() > 0.0 || ( *it )->ecpercentage() > 0.0 )
html.append( i18n( ", " ) );
}
if ( ( *it )->betapluspercentage() > 0.0 ){
if ( ( *it )->betaplusdecay() > 0.0 )
- html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->betaplusdecay(), 6 ) ) );
- html.append( i18n( " %1<sup>+</sup>" ).tqarg(TQChar( 946 ) ) );
+ html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->betaplusdecay(), 6 ) ) );
+ html.append( i18n( " %1<sup>+</sup>" ).arg(TQChar( 946 ) ) );
if ( ( *it )->betapluspercentage() == ( *it )->ecpercentage() ) {
if ( ( *it )->ecdecay() > 0.0 ) {
- html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) );
+ html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) );
}
html.append( i18n( "Acronym of Electron Capture"," EC" ) );
}
if ( ( *it )->betapluspercentage() < 100.0)
- html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( ( *it )->betapluspercentage(), 6 ) ) );
+ html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->betapluspercentage(), 6 ) ) );
html += " ";
}
if ( ( *it )->ecpercentage() > 0.0 && ( *it )->ecpercentage()!=( *it )->betapluspercentage()){
if ( ( *it )->ecdecay() > 0.0 )
- html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) );
+ html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) );
html.append( i18n( "Acronym of Electron Capture"," EC" ) );
if ( ( *it )->ecpercentage() < 100.0 )
- html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( ( *it )->ecpercentage(), 6 ) ) );
+ html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->ecpercentage(), 6 ) ) );
}
html.append( "</td><td>" );
html.append( ( *it )->spin() );
html.append( "</td><td>" );
if ( !( *it )->magmoment().isEmpty() ) {
TQString v = KGlobal::locale()->formatNumber( ( *it )->magmoment(), false, 6 );
- html.append( i18n( "%1 %2<sub>n</sub>" ).tqarg( v ).tqarg( TQChar( 956 ) ) );
+ html.append( i18n( "%1 %2<sub>n</sub>" ).arg( v ).arg( TQChar( 956 ) ) );
}
html.append( "</td></tr>" );
@@ -379,7 +379,7 @@ void DetailedInfoDlg::reloadContent()
const TQString element_symbol = m_element->symbol();
// updating caption
- setCaption( i18n( "For example Carbon (6)" , "%1 (%2)" ).tqarg( element_name ).tqarg( m_elementNumber ) );
+ setCaption( i18n( "For example Carbon (6)" , "%1 (%2)" ).arg( element_name ).arg( m_elementNumber ) );
// updating overview tab
dTab->setElement( m_element );
@@ -395,15 +395,15 @@ void DetailedInfoDlg::reloadContent()
piclabel->setPixmap( pic );
}
else
- piclabel->setText( i18n( "No picture of %1 found." ).tqarg( element_name ) );
+ piclabel->setText( i18n( "No picture of %1 found." ).arg( element_name ) );
// updating atomic model tab
wOrbits->setElementNumber( m_elementNumber );
TQWhatsThis::add( wOrbits,
i18n( "Here you can see the atomic hull of %1. %2 has the configuration %3." )
- .tqarg( m_element->elname() )
- .tqarg( m_element->elname() )
- .tqarg( m_element->parsedOrbits() ) );
+ .arg( m_element->elname() )
+ .arg( m_element->elname() )
+ .arg( m_element->parsedOrbits() ) );
// updating html tabs
fillHTMLTab( m_htmlpages["chemical"], getHtml( CHEMICAL ) );
@@ -422,7 +422,7 @@ void DetailedInfoDlg::reloadContent()
}
else
{
- m_spectrumLabel->setText( i18n( "No spectrum of %1 found." ).tqarg( element_name ) );
+ m_spectrumLabel->setText( i18n( "No spectrum of %1 found." ).arg( element_name ) );
m_spectrumStack->raiseWidget( m_spectrumLabel );
}
}
diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp
index f85023c0..b5342952 100644
--- a/kalzium/src/element.cpp
+++ b/kalzium/src/element.cpp
@@ -106,7 +106,7 @@ const TQString Element::adjustRadius( RADIUSTYPE rtype )
if ( val <= 0 )
v = i18n( "Value unknown" );
else
- v = i18n( "%1 is a length, eg: 12.3 pm", "%1 pm" ).tqarg( KalziumUtils::localizedValue( val, 6 ) );
+ v = i18n( "%1 is a length, eg: 12.3 pm", "%1 pm" ).arg( KalziumUtils::localizedValue( val, 6 ) );
return v;
}
@@ -151,19 +151,19 @@ const TQString Element::adjustUnits( const int type )
TQString strVal = KalziumUtils::localizedValue( newvalue, 6 );
switch (Prefs::temperature()) {
case 0: //Kelvin
- v = i18n( "%1 is the temperature in Kelvin", "%1 K" ).tqarg( strVal );
+ v = i18n( "%1 is the temperature in Kelvin", "%1 K" ).arg( strVal );
break;
case 1://Kelvin to Celsius
- v = i18n( "%1 is the temperature in Celsius", "%1 %2C" ).tqarg( strVal ).tqarg( TQChar(0xB0) );
+ v = i18n( "%1 is the temperature in Celsius", "%1 %2C" ).arg( strVal ).arg( TQChar(0xB0) );
break;
case 2: // Kelvin to Fahrenheit
- v = i18n( "%1 is the temperature in Fahrenheit", "%1 %2F" ).tqarg( strVal ).tqarg( TQChar(0xB0) );
+ v = i18n( "%1 is the temperature in Fahrenheit", "%1 %2F" ).arg( strVal ).arg( TQChar(0xB0) );
break;
case 3: // Kelvin to Rankine
- v = i18n( "%1 is the temperature in Rankine", "%1 %2Ra" ).tqarg( strVal ).tqarg( TQChar(0xB0) );
+ v = i18n( "%1 is the temperature in Rankine", "%1 %2Ra" ).arg( strVal ).arg( TQChar(0xB0) );
break;
case 4: // Kelvin to Reaumur
- v = i18n( "%1 is the temperature in Reaumur", "%1 %2R" ).tqarg( strVal ).tqarg( TQChar(0xB0) );
+ v = i18n( "%1 is the temperature in Reaumur", "%1 %2R" ).arg( strVal ).arg( TQChar(0xB0) );
break;
}
}
@@ -186,12 +186,12 @@ const TQString Element::adjustUnits( const int type )
{
if ( Prefs::energies() == 0 )
{
- v = i18n( "%1 kJ/mol" ).tqarg( KalziumUtils::localizedValue( val, 6 ) );
+ v = i18n( "%1 kJ/mol" ).arg( KalziumUtils::localizedValue( val, 6 ) );
}
else // use electronvolt
{
val/=96.6;
- v = i18n( "%1 eV" ).tqarg( KalziumUtils::localizedValue( val, 6 ) );
+ v = i18n( "%1 eV" ).arg( KalziumUtils::localizedValue( val, 6 ) );
}
}
}
@@ -201,7 +201,7 @@ const TQString Element::adjustUnits( const int type )
if ( val <= 0 )
v = i18n( "Value unknown" );
else
- v = i18n( "%1 u" ).tqarg( KalziumUtils::localizedValue( val, 6 ) );
+ v = i18n( "%1 u" ).arg( KalziumUtils::localizedValue( val, 6 ) );
}
else if ( type == DENSITY ) // its a density
{
@@ -213,11 +213,11 @@ const TQString Element::adjustUnits( const int type )
{
if ( boiling() < 295.0 && melting() < 295.0)//gasoline
{
- v = i18n( "%1 g/L" ).tqarg( KalziumUtils::localizedValue( val, 6 ) );
+ v = i18n( "%1 g/L" ).arg( KalziumUtils::localizedValue( val, 6 ) );
}
else//liquid or solid
{
- v = i18n( "%1 g/cm<sup>3</sup>" ).tqarg( KalziumUtils::localizedValue( val, 6 ));
+ v = i18n( "%1 g/cm<sup>3</sup>" ).arg( KalziumUtils::localizedValue( val, 6 ));
}
}
}
@@ -230,7 +230,7 @@ const TQString Element::adjustUnits( const int type )
}
else
{
- v = i18n( "This element was discovered in the year %1" ).tqarg( TQString::number( val ) );
+ v = i18n( "This element was discovered in the year %1" ).arg( TQString::number( val ) );
}
}
diff --git a/kalzium/src/isotope.cpp b/kalzium/src/isotope.cpp
index 3b2dbe63..268e99d4 100644
--- a/kalzium/src/isotope.cpp
+++ b/kalzium/src/isotope.cpp
@@ -52,24 +52,24 @@ TQString Isotope::halflifeAsString()
if ( !seconds() )//years
{
if ( m_halflife > 1000000 )
- halflife = i18n("%1 million years").tqarg( KalziumUtils::localizedValue( m_halflife/1000000.0, 2 ) );
+ halflife = i18n("%1 million years").arg( KalziumUtils::localizedValue( m_halflife/1000000.0, 2 ) );
if ( m_halflife > 1000000000 )
- halflife = i18n("%1 billion years").tqarg( KalziumUtils::localizedValue( m_halflife/1000000000.0, 2 ) );
+ halflife = i18n("%1 billion years").arg( KalziumUtils::localizedValue( m_halflife/1000000000.0, 2 ) );
else
- halflife = i18n("%1 years").tqarg( KalziumUtils::localizedValue( m_halflife, 2 ) );
+ halflife = i18n("%1 years").arg( KalziumUtils::localizedValue( m_halflife, 2 ) );
}
else
{
if ( m_halflife < 120 )
- halflife = i18n("%1 seconds").tqarg( KalziumUtils::localizedValue( m_halflife, 2 ) );
+ halflife = i18n("%1 seconds").arg( KalziumUtils::localizedValue( m_halflife, 2 ) );
else if ( m_halflife > 1000 )
- halflife = i18n("%1 minutes").tqarg( KalziumUtils::localizedValue( m_halflife/60.0, 2 ) );
+ halflife = i18n("%1 minutes").arg( KalziumUtils::localizedValue( m_halflife/60.0, 2 ) );
else if ( m_halflife > 3600 )
- halflife = i18n("%1 hours").tqarg( KalziumUtils::localizedValue( m_halflife/( 60*60 ), 2 ) );
+ halflife = i18n("%1 hours").arg( KalziumUtils::localizedValue( m_halflife/( 60*60 ), 2 ) );
if ( m_halflife > 86400 ) //one day
- halflife = i18n("%1 days").tqarg( KalziumUtils::localizedValue( m_halflife/( 60*60*24 ), 2 ) );
+ halflife = i18n("%1 days").arg( KalziumUtils::localizedValue( m_halflife/( 60*60*24 ), 2 ) );
if ( m_halflife > ( 31536000 * 2 ) ) //two year
- halflife = i18n("%1 years").tqarg( KalziumUtils::localizedValue( m_halflife/( 3600.0*365 ), 2 ) );
+ halflife = i18n("%1 years").arg( KalziumUtils::localizedValue( m_halflife/( 3600.0*365 ), 2 ) );
}
return halflife;
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index 25d51465..8ff66e4d 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -422,7 +422,7 @@ void Kalzium::setupStatusBar()
void Kalzium::slotStatusbar( int num )
{
Element *e = KalziumDataObject::instance()->element( num );
- statusBar()->changeItem( i18n( "For example: \"Carbon (6), Mass: 12.0107 u\"", "%1 (%2), Mass: %3 u" ).tqarg( e->elname() ).tqarg(e->number() ).tqarg( KalziumUtils::localizedValue( e->mass(), 6 ) ) , IDS_ELEMENTINFO );
+ statusBar()->changeItem( i18n( "For example: \"Carbon (6), Mass: 12.0107 u\"", "%1 (%2), Mass: %3 u" ).arg( e->elname() ).arg(e->number() ).arg( KalziumUtils::localizedValue( e->mass(), 6 ) ) , IDS_ELEMENTINFO );
}
void Kalzium::openInformationDialog( int number )
diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp
index 57bdb15e..462d76f8 100644
--- a/kalzium/src/kalziumtip.cpp
+++ b/kalzium/src/kalziumtip.cpp
@@ -128,10 +128,10 @@ void KalziumTip::display()
TQString elementname = m_tippedElement->elname();
TQString number = i18n( "Number: %1" )
- .tqarg( TQString::number(m_tippedElement->number()) );
+ .arg( TQString::number(m_tippedElement->number()) );
TQString mass = i18n( "Mass: %1" )
- .tqarg( KalziumUtils::localizedValue(m_tippedElement->mass(), 6) );
+ .arg( KalziumUtils::localizedValue(m_tippedElement->mass(), 6) );
m_richText = new TQSimpleRichText("<qt><h1>" + elementname + "</h1><p>"
+ number + "</p><p>"
diff --git a/kalzium/src/molcalcwidget.cpp b/kalzium/src/molcalcwidget.cpp
index f9fd90ce..60eb5108 100644
--- a/kalzium/src/molcalcwidget.cpp
+++ b/kalzium/src/molcalcwidget.cpp
@@ -82,16 +82,16 @@ void MolcalcWidget::updateUI()
for ( ; it != itEnd; ++it ) {
// Update the resultLabel
str += i18n( "For example: \"1 Carbon\" or \"3 Oxygen\"", "%1 %2\n" )
- .tqarg( (*it)->count() )
- .tqarg( (*it)->element()->elname() );
+ .arg( (*it)->count() )
+ .arg( (*it)->element()->elname() );
complexString
+= i18n( "For example: 1 Seaborgium. Cumulative Mass: 263.119 u (39.25%)",
"%1 %2. Cumulative Mass: %3 u (%4%)\n" )
- .tqarg( (*it)->count() )
- .tqarg( (*it)->element()->elname() )
- .tqarg( (*it)->count() * (*it)->element()->mass() )
- .tqarg( KalziumUtils::strippedValue( (( (*it)->count() * (*it)->element()->mass() )
+ .arg( (*it)->count() )
+ .arg( (*it)->element()->elname() )
+ .arg( (*it)->count() * (*it)->element()->mass() )
+ .arg( KalziumUtils::strippedValue( (( (*it)->count() * (*it)->element()->mass() )
/ m_mass ) * 100 ) );
}
resultLabel->setText( str );
@@ -100,7 +100,7 @@ void MolcalcWidget::updateUI()
resultComposition->setText( compositionString(m_elementMap) );
// The mass
- resultMass->setText( i18n( "Molecular mass: %1 u" ).tqarg( m_mass ) );
+ resultMass->setText( i18n( "Molecular mass: %1 u" ).arg( m_mass ) );
TQToolTip::add( resultMass, complexString );
TQToolTip::add( resultComposition, complexString );
@@ -126,8 +126,8 @@ TQString MolcalcWidget::compositionString( ElementCountMap &_map )
ElementCountMap::Iterator itEnd = _map.end();
for (; it != itEnd; ++it) {
str += i18n( "%1<sub>%2</sub> " )
- .tqarg( (*it)->element()->symbol() )
- .tqarg( (*it)->count() );
+ .arg( (*it)->element()->symbol() )
+ .arg( (*it)->count() );
}
return str;
diff --git a/kalzium/src/molcalcwidgetbase.ui b/kalzium/src/molcalcwidgetbase.ui
index 777b49a4..d09964e3 100644
--- a/kalzium/src/molcalcwidgetbase.ui
+++ b/kalzium/src/molcalcwidgetbase.ui
@@ -69,7 +69,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kalzium/src/parser.cpp b/kalzium/src/parser.cpp
index 9edd9f1f..a23b1078 100644
--- a/kalzium/src/parser.cpp
+++ b/kalzium/src/parser.cpp
@@ -48,7 +48,7 @@ Parser::start(const TQString& _str)
}
else {
m_index = 0;
- m_nextChar = m_str.tqat(0).latin1();
+ m_nextChar = m_str.at(0).latin1();
getNextToken();
}
}
@@ -148,7 +148,7 @@ Parser::getNextChar()
m_nextChar = -1;
}
else
- m_nextChar = m_str.tqat(++m_index).latin1();
+ m_nextChar = m_str.at(++m_index).latin1();
// Take care of null-terminated strings.
if (m_nextChar == 0) {
diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp
index 950f232e..1f4ed64d 100644
--- a/kalzium/src/periodictableview.cpp
+++ b/kalzium/src/periodictableview.cpp
@@ -328,7 +328,7 @@ void PerodicTableView::resizeEvent( TQResizeEvent * /*e*/ )
table->resize( width(), height() );
table2->resize( width(), height() );
// XXX: I know it isn't the best way, but otherwise the table won't be redrawn
- // on tqrepaint... Feel *free* to remove these two lines if you foind a better
+ // on repaint... Feel *free* to remove these two lines if you foind a better
// solution...
doFullDraw = true;
update();
diff --git a/kalzium/src/somwidget_impl.cpp b/kalzium/src/somwidget_impl.cpp
index 5f0f45cd..c0b8ef6a 100644
--- a/kalzium/src/somwidget_impl.cpp
+++ b/kalzium/src/somwidget_impl.cpp
@@ -35,7 +35,7 @@ SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *parent, const char* name )
{
m_list = KalziumDataObject::instance()->ElementList;
- text->setAlignment( text->tqalignment() | TQt::WordBreak );
+ text->setAlignment( text->alignment() | TQt::WordBreak );
text->setTextFormat( TQt::RichText );
text->setReadOnly( true );
text->setPaletteBackgroundColor( paletteBackgroundColor() );
@@ -139,7 +139,7 @@ void SOMWidgetIMPL::setNewTemp( double newtemp )
htmlcode += i18n( "Elements with melting point around this temperature:" ) + "<br>";
for ( uint i = 0; i < listMeltingPoint.count(); i++ )
{
- htmlcode += "&nbsp;<b>&middot;</b>&nbsp;" + i18n( "For example: Carbon (300K)", "%1 (%2)" ).tqarg( listMeltingPoint[i] ).tqarg( listMeltingPointValue[i] ) + "<br>";
+ htmlcode += "&nbsp;<b>&middot;</b>&nbsp;" + i18n( "For example: Carbon (300K)", "%1 (%2)" ).arg( listMeltingPoint[i] ).arg( listMeltingPointValue[i] ) + "<br>";
}
htmlcode += "<br>";
}
@@ -153,7 +153,7 @@ void SOMWidgetIMPL::setNewTemp( double newtemp )
htmlcode += i18n( "Elements with boiling point around this temperature:" ) + "<br>";
for ( uint i = 0; i < listBoilingPoint.count(); i++ )
{
- htmlcode += "&nbsp;<b>&middot;</b>&nbsp;" + i18n( "For example: Carbon (300K)", "%1 (%2)" ).tqarg( listBoilingPoint[i] ).tqarg( listBoilingPointValue[i] ) + "<br>";
+ htmlcode += "&nbsp;<b>&middot;</b>&nbsp;" + i18n( "For example: Carbon (300K)", "%1 (%2)" ).arg( listBoilingPoint[i] ).arg( listBoilingPointValue[i] ) + "<br>";
}
htmlcode += "<br>";
}
diff --git a/kalzium/src/spectrum.cpp b/kalzium/src/spectrum.cpp
index 45c62180..5fea3d8e 100644
--- a/kalzium/src/spectrum.cpp
+++ b/kalzium/src/spectrum.cpp
@@ -130,17 +130,17 @@ TQString Spectrum::bandsAsHtml()
for (;it!=itEnd;++it)
{
html += TQString( "<tr>" )
- + "<td>" + i18n( "Wavelength: %1 nm" ).tqarg( ( *it ).wavelength ) + "</td>"
- + "<td>" + i18n( "Intensity: %1" ).tqarg( ( *it ).intensity ) + "</td>"
- + "<td>" + i18n( "Probability: %1 10<sup>8</sup>s<sup>-1</sup>" ).tqarg( ( *it ).aki ) + "</td>"
- + "<td>" + i18n( "Energy 1: %1" ).tqarg( ( *it ).energy1 ) + "</td>"
- + "<td>" + i18n( "Energy 2: %1" ).tqarg( ( *it ).energy2 ) + "</td>"
- + "<td>" + i18n( "Electron Configuration 1: %1" ).tqarg( ( *it ).electronconfig1 ) + "</td>"
- + "<td>" + i18n( "Electron Configuration 2: %1" ).tqarg( ( *it ).electronconfig2 ) + "</td>"
- + "<td>" + i18n( "Term 1: %1" ).tqarg( ( *it ).term1 ) + "</td>"
- + "<td>" + i18n( "Term 2: %1" ).tqarg( ( *it ).term2 ) + "</td>"
- + "<td>" + i18n( "J 1: %1" ).tqarg( ( *it ).J1 ) + "</td>"
- + "<td>" + i18n( "J 2: %1" ).tqarg( ( *it ).J2 ) + "</td>"
+ + "<td>" + i18n( "Wavelength: %1 nm" ).arg( ( *it ).wavelength ) + "</td>"
+ + "<td>" + i18n( "Intensity: %1" ).arg( ( *it ).intensity ) + "</td>"
+ + "<td>" + i18n( "Probability: %1 10<sup>8</sup>s<sup>-1</sup>" ).arg( ( *it ).aki ) + "</td>"
+ + "<td>" + i18n( "Energy 1: %1" ).arg( ( *it ).energy1 ) + "</td>"
+ + "<td>" + i18n( "Energy 2: %1" ).arg( ( *it ).energy2 ) + "</td>"
+ + "<td>" + i18n( "Electron Configuration 1: %1" ).arg( ( *it ).electronconfig1 ) + "</td>"
+ + "<td>" + i18n( "Electron Configuration 2: %1" ).arg( ( *it ).electronconfig2 ) + "</td>"
+ + "<td>" + i18n( "Term 1: %1" ).arg( ( *it ).term1 ) + "</td>"
+ + "<td>" + i18n( "Term 2: %1" ).arg( ( *it ).term2 ) + "</td>"
+ + "<td>" + i18n( "J 1: %1" ).arg( ( *it ).J1 ) + "</td>"
+ + "<td>" + i18n( "J 2: %1" ).arg( ( *it ).J2 ) + "</td>"
+ "</tr>\n";
}
diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp
index 3a72f2a6..bc0d2af1 100644
--- a/kalzium/src/spectrumwidget.cpp
+++ b/kalzium/src/spectrumwidget.cpp
@@ -70,7 +70,7 @@ void SpectrumWidget::paintEvent( TQPaintEvent * /*e*/ )
m_pixmap.fill( this, width(), height() );
TQPainter p;
- p.tqbegin( &m_pixmap, this );
+ p.begin( &m_pixmap, this );
p.fillRect( 0, 0, width(), m_realHeight, TQt::black );
paintBands( &p );
@@ -378,15 +378,15 @@ void SpectrumWidget::drawTooltip( TQPainter *p )
{
p->setPen( TQt::white );
TQPoint pt = mapFromGlobal( TQCursor::pos() );
- p->drawText( pt, i18n("Wavelength: %1").tqarg(m_band.wavelength) );
+ p->drawText( pt, i18n("Wavelength: %1").arg(m_band.wavelength) );
pt.setY( pt.y() + 15 );
- p->drawText( pt, i18n("Intensity: %1").tqarg(m_band.intensity) );
+ p->drawText( pt, i18n("Intensity: %1").arg(m_band.intensity) );
pt.setY( pt.y() + 15 );
- p->drawText( pt, i18n("Energy 1, Energy 2: %1, %2").tqarg(m_band.energy1).tqarg( m_band.energy2 ));
+ p->drawText( pt, i18n("Energy 1, Energy 2: %1, %2").arg(m_band.energy1).arg( m_band.energy2 ));
pt.setY( pt.y() + 15 );
- p->drawText( pt, i18n("Term 1, Term 2: %1, %2").tqarg(m_band.term1).tqarg( m_band.term2 ));
+ p->drawText( pt, i18n("Term 1, Term 2: %1, %2").arg(m_band.term1).arg( m_band.term2 ));
pt.setY( pt.y() + 15 );
- p->drawText( pt, i18n("J 1, J 2: %1, %2").tqarg(m_band.J1).tqarg( m_band.J2 ));
+ p->drawText( pt, i18n("J 1, J 2: %1, %2").arg(m_band.J1).arg( m_band.J2 ));
}
void SpectrumWidget::mouseReleaseEvent( TQMouseEvent *e )
@@ -415,9 +415,9 @@ TQPixmap SpectrumWidget::pixmap()
TQString text;
if( m_type == EmissionSpectrum )
- text = i18n( "Emission spectrum of %1" ).tqarg( m_spectrum->parentElement()->elname() );
+ text = i18n( "Emission spectrum of %1" ).arg( m_spectrum->parentElement()->elname() );
else
- text = i18n( "Absorption spectrum of %1" ).tqarg( m_spectrum->parentElement()->elname() );
+ text = i18n( "Absorption spectrum of %1" ).arg( m_spectrum->parentElement()->elname() );
TQPainter p( &tmp );
p.setPen( TQt::black );
diff --git a/kalzium/src/timewidget_impl.cpp b/kalzium/src/timewidget_impl.cpp
index 885e65cf..e3e65638 100644
--- a/kalzium/src/timewidget_impl.cpp
+++ b/kalzium/src/timewidget_impl.cpp
@@ -23,7 +23,7 @@
TimeWidgetIMPL::TimeWidgetIMPL( TQWidget *parent, const char* name )
: TimeWidget( parent, name )
{
- text->setAlignment( text->tqalignment() | TQt::WordBreak );
+ text->setAlignment( text->alignment() | TQt::WordBreak );
text->setTextFormat( TQt::RichText );
text->setReadOnly( true );
text->setPaletteBackgroundColor( paletteBackgroundColor() );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-29 15:52:02 +0000