Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 6c3f7a55fb.
pull/1/head
Timothy Pearson 11 years ago
parent 6c3f7a55fb
commit 2d7b541a4e

@ -74,7 +74,7 @@ Q_OBJECT
// Preferences setting handling
bool m_showPreferences;
// if should update the highlighting after the next repaint
// if should update the highlighting after the next tqrepaint
bool m_updateButtonHighlighting;
// use always the non-cool font?

@ -20,7 +20,7 @@ button::button(blinkenGame::color c) : m_selected(false), m_color(c)
KConfig *kc = kapp->config();
kc->setGroup("General");
TQString cs = getColorString();
TQString pixmap = TQString("images/%1h.png").arg(cs);
TQString pixmap = TQString("images/%1h.png").tqarg(cs);
switch (c)
{

@ -119,7 +119,7 @@ class myTabWidget : public TQTabWidget
TQSize tabBarSizeHint() const
{
return tabBar() -> sizeHint();
return tabBar() -> tqsizeHint();
}
};
@ -133,10 +133,10 @@ highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true
KConfig *cfg = kapp -> config();
for (int i = 1; i <= 3; i++)
{
cfg -> setGroup(TQString("Level%1").arg(i));
cfg -> setGroup(TQString("Level%1").tqarg(i));
for (int j = 1; j <= 5; j++)
{
m_scores[i-1].append(tqMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(j))));
m_scores[i-1].append(tqMakePair(cfg->readNumEntry(TQString("Score%1").tqarg(j)), cfg->readEntry(TQString("Name%1").tqarg(j))));
}
}
@ -170,12 +170,12 @@ void highScoreDialog::addScore(int level, int score, const TQString &name)
m_scores[level].remove(--m_scores[level].end());
KConfig *cfg = kapp -> config();
cfg -> setGroup(TQString("Level%1").arg(level + 1));
cfg -> setGroup(TQString("Level%1").tqarg(level + 1));
int j;
for (it = m_scores[level].begin(), j = 1; it != m_scores[level].end(); ++it, j++)
{
cfg->writeEntry(TQString("Score%1").arg(j), (*it).first);
cfg->writeEntry(TQString("Name%1").arg(j), (*it).second);
cfg->writeEntry(TQString("Score%1").tqarg(j), (*it).first);
cfg->writeEntry(TQString("Name%1").tqarg(j), (*it).second);
}
cfg -> sync();
}

@ -7,7 +7,7 @@
* (at your option) any later version. *
***************************************************************************/
#include <brush.h>
#include <tqbrush.h>
#include <tqcolor.h>
#include <tqpainter.h>
@ -100,7 +100,7 @@ void number::paintDigit(TQPainter &p, int number) const
{
// make gcc happy
const int *n = m_number0;
int shape;
int tqshape;
switch (number)
{
@ -147,25 +147,25 @@ void number::paintDigit(TQPainter &p, int number) const
{
for (int j = 0; j < 4; j++)
{
shape = n[j + i * 4];
if (shape == 0)
tqshape = n[j + i * 4];
if (tqshape == 0)
{
p.fillRect(7 * (j-1), 7 * (i-1), 6, 6, TQt::red);
}
else if (shape != 5)
else if (tqshape != 5)
{
if (shape == 1) p.translate(7 * (j-1), 7 * (i-1));
else if (shape == 2)
if (tqshape == 1) p.translate(7 * (j-1), 7 * (i-1));
else if (tqshape == 2)
{
p.translate(7 * j - 2, 7 * (i-1));
p.rotate(90);
}
else if (shape == 3)
else if (tqshape == 3)
{
p.translate(7 * j - 2, 7 * i - 2);
p.rotate(180);
}
else if (shape == 4)
else if (tqshape == 4)
{
p.translate(7 * (j-1), 7 * i - 2);
p.rotate(270);
@ -173,19 +173,19 @@ void number::paintDigit(TQPainter &p, int number) const
p.drawPie(0, 0, 11, 11, 90 * 16, 16 * 90);
if (shape == 1) p.translate(-7 * (j-1), -7 * (i-1));
else if (shape == 2)
if (tqshape == 1) p.translate(-7 * (j-1), -7 * (i-1));
else if (tqshape == 2)
{
p.rotate(-90);
p.translate(-(7 * j - 2), -7 * (i-1));
}
else if (shape == 3)
else if (tqshape == 3)
{
p.rotate(-180);
p.translate(-(7 * j - 2), -(7 * i - 2));
}
else if (shape == 4)
else if (tqshape == 4)
{
p.rotate(-270);
p.translate(- (7 * (j-1)), -(7 * i - 2));

@ -19,7 +19,7 @@ Add:
- The menustructure is now more consistent
- One icon has been added
- Make the mainwidget a QScrollView. This make sizehandling easier
- Improved layout of the detailed information dialog
- Improved tqlayout of the detailed information dialog
- Added a widget which shows you a table of the isotopes
- Added EqChem, a chemical equation solver
- Added several glossary-items

@ -1,7 +1,7 @@
Release plan
============
Status: Under discussion
tqStatus: Under discussion
Overview

@ -32,7 +32,7 @@
#include <tqlabel.h>
#include <tqimage.h>
#include <tqwhatsthis.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqwidgetstack.h>
@ -94,10 +94,10 @@ void DetailedInfoDlg::setElement(Element *element)
KHTMLPart* DetailedInfoDlg::addHTMLTab( const TQString& title, const TQString& icontext, const TQString& iconname )
{
TQFrame *frame = addPage(title, icontext, BarIcon(iconname));
TQVBoxLayout *layout = new TQVBoxLayout( frame );
layout->setMargin( 0 );
TQVBoxLayout *tqlayout = new TQVBoxLayout( frame );
tqlayout->setMargin( 0 );
KHTMLPart *w = new KHTMLPart( frame, "html-part", TQT_TQOBJECT(frame) );
layout->addWidget( w->view() );
tqlayout->addWidget( w->view() );
return w;
}
@ -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" ).arg( m_element->block() ) );
html.append( i18n( "Block: %1" ).tqarg( 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" ).arg( m_element->parsedOrbits() ) + "</b>" );
html.append( "<b>" + i18n( "Electronic configuration: %1" ).tqarg( 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" ).arg( m_element->adjustUnits( Element::DENSITY ) ) + "</b>" );
html.append( "<b>" + i18n( "Density: %1" ).tqarg( 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" ).arg( m_element->adjustRadius( Element::COVALENT ) ) + "</b>" );
html.append( "<b>" + i18n( "Covalent Radius: %1" ).tqarg( 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)" ).arg( m_element->adjustRadius(Element::IONIC) ).arg( m_element->ioncharge() ) );
html.append( i18n( "<b>Ionic Radius (Charge): %1</b> (%2)" ).tqarg( m_element->adjustRadius(Element::IONIC) ).tqarg( 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" ).arg( m_element->adjustRadius(Element::VDW) ) + "</b>" );
html.append( "<b>" + i18n( "van der Waals Radius: %1" ).tqarg( 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" ).arg( m_element->adjustRadius(Element::ATOMIC) ) + "</b>" );
html.append( "<b>" + i18n( "Atomic Radius: %1" ).tqarg( 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" ).arg( m_element->adjustUnits( Element::MASS ) ) + "</b>" );
html.append( "<b>" + i18n( "Mass: %1" ).tqarg( 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").arg(m_element->scientist() );
html += "<br />" + i18n("It was discovered by %1").tqarg(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" ).arg( KGlobal::locale()->formatLong( m_element->abundance() ) ) );
html.append( i18n( "Abundance in crustal rocks: %1 ppm" ).tqarg( 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" ).arg( KalziumUtils::localizedValue( m_element->meanmass(), 6 ) ) );
html.append( i18n( "Mean mass: %1 u" ).tqarg( 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" ).arg( m_element->nameOrigin() ) );
html.append( i18n( "Origin of the name: %1" ).tqarg( 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" ).arg( m_element->adjustUnits( Element::MELTINGPOINT ) ) );
html.append( i18n( "Melting Point: %1" ).tqarg( 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" ).arg( m_element->adjustUnits( Element::BOILINGPOINT ) ) );
html.append( i18n( "Boiling Point: %1" ).tqarg( 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" ).arg( m_element->adjustUnits( Element::EN ) ) );
html.append( i18n( "Electronegativity: %1" ).tqarg( 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 " ).arg( m_element->adjustUnits(Element::EA) ) );
html.append( i18n( "Electron affinity: %1 " ).tqarg( 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" ).arg( TQString::number( i+1 ), m_element->adjustUnits( Element::IE, ionlist[i] ) ) );
"%1. Ionization energy: %2" ).tqarg( 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" ).arg( KalziumUtils::localizedValue( ( *it )->weight(), 6 ) ) );
// html.append( i18n( "%1 u" ).arg( TQString::number( ( *it )->weight() ) ));
html.append( i18n( "%1 u" ).tqarg( KalziumUtils::localizedValue( ( *it )->weight(), 6 ) ) );
// html.append( i18n( "%1 u" ).tqarg( 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%" ).arg( KalziumUtils::localizedValue( ( *it )->percentage(), 6 ) ) );
html.append( i18n( "this can for example be '24%'", "%1%" ).tqarg( 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" ).arg( KalziumUtils::localizedValue( ( *it )->alphadecay(), 6 ) ) );
html.append( i18n( " %1" ).arg( TQChar( 945 ) ) );
html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->alphadecay(), 6 ) ) );
html.append( i18n( " %1" ).tqarg( TQChar( 945 ) ) );
if ( ( *it )->alphapercentage() < 100.0)
html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( (*it )->alphapercentage(), 6 ) ) );
html.append( i18n( "(%1%)" ).tqarg( 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" ).arg( KalziumUtils::localizedValue( ( *it )->betaminusdecay(), 6 ) ) );
html.append( i18n( " %1<sup>-</sup>" ).arg( TQChar( 946 ) ) );
html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->betaminusdecay(), 6 ) ) );
html.append( i18n( " %1<sup>-</sup>" ).tqarg( TQChar( 946 ) ) );
if ( ( *it )->betaminuspercentage() < 100.0)
html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->betaminuspercentage(), 6 ) ));
html.append( i18n( "(%1%)" ).tqarg( 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" ).arg( KalziumUtils::localizedValue( ( *it )->betaplusdecay(), 6 ) ) );
html.append( i18n( " %1<sup>+</sup>" ).arg(TQChar( 946 ) ) );
html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->betaplusdecay(), 6 ) ) );
html.append( i18n( " %1<sup>+</sup>" ).tqarg(TQChar( 946 ) ) );
if ( ( *it )->betapluspercentage() == ( *it )->ecpercentage() ) {
if ( ( *it )->ecdecay() > 0.0 ) {
html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) );
html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) );
}
html.append( i18n( "Acronym of Electron Capture"," EC" ) );
}
if ( ( *it )->betapluspercentage() < 100.0)
html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->betapluspercentage(), 6 ) ) );
html.append( i18n( "(%1%)" ).tqarg( 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" ).arg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) );
html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) );
html.append( i18n( "Acronym of Electron Capture"," EC" ) );
if ( ( *it )->ecpercentage() < 100.0 )
html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->ecpercentage(), 6 ) ) );
html.append( i18n( "(%1%)" ).tqarg( 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>" ).arg( v ).arg( TQChar( 956 ) ) );
html.append( i18n( "%1 %2<sub>n</sub>" ).tqarg( v ).tqarg( 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)" ).arg( element_name ).arg( m_elementNumber ) );
setCaption( i18n( "For example Carbon (6)" , "%1 (%2)" ).tqarg( element_name ).tqarg( 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." ).arg( element_name ) );
piclabel->setText( i18n( "No picture of %1 found." ).tqarg( 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." )
.arg( m_element->elname() )
.arg( m_element->elname() )
.arg( m_element->parsedOrbits() ) );
.tqarg( m_element->elname() )
.tqarg( m_element->elname() )
.tqarg( 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." ).arg( element_name ) );
m_spectrumLabel->setText( i18n( "No spectrum of %1 found." ).tqarg( element_name ) );
m_spectrumStack->raiseWidget( m_spectrumLabel );
}
}

@ -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" ).arg( KalziumUtils::localizedValue( val, 6 ) );
v = i18n( "%1 is a length, eg: 12.3 pm", "%1 pm" ).tqarg( 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" ).arg( strVal );
v = i18n( "%1 is the temperature in Kelvin", "%1 K" ).tqarg( strVal );
break;
case 1://Kelvin to Celsius
v = i18n( "%1 is the temperature in Celsius", "%1 %2C" ).arg( strVal ).arg( TQChar(0xB0) );
v = i18n( "%1 is the temperature in Celsius", "%1 %2C" ).tqarg( strVal ).tqarg( TQChar(0xB0) );
break;
case 2: // Kelvin to Fahrenheit
v = i18n( "%1 is the temperature in Fahrenheit", "%1 %2F" ).arg( strVal ).arg( TQChar(0xB0) );
v = i18n( "%1 is the temperature in Fahrenheit", "%1 %2F" ).tqarg( strVal ).tqarg( TQChar(0xB0) );
break;
case 3: // Kelvin to Rankine
v = i18n( "%1 is the temperature in Rankine", "%1 %2Ra" ).arg( strVal ).arg( TQChar(0xB0) );
v = i18n( "%1 is the temperature in Rankine", "%1 %2Ra" ).tqarg( strVal ).tqarg( TQChar(0xB0) );
break;
case 4: // Kelvin to Reaumur
v = i18n( "%1 is the temperature in Reaumur", "%1 %2R" ).arg( strVal ).arg( TQChar(0xB0) );
v = i18n( "%1 is the temperature in Reaumur", "%1 %2R" ).tqarg( strVal ).tqarg( TQChar(0xB0) );
break;
}
}
@ -186,12 +186,12 @@ const TQString Element::adjustUnits( const int type )
{
if ( Prefs::energies() == 0 )
{
v = i18n( "%1 kJ/mol" ).arg( KalziumUtils::localizedValue( val, 6 ) );
v = i18n( "%1 kJ/mol" ).tqarg( KalziumUtils::localizedValue( val, 6 ) );
}
else // use electronvolt
{
val/=96.6;
v = i18n( "%1 eV" ).arg( KalziumUtils::localizedValue( val, 6 ) );
v = i18n( "%1 eV" ).tqarg( 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" ).arg( KalziumUtils::localizedValue( val, 6 ) );
v = i18n( "%1 u" ).tqarg( 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" ).arg( KalziumUtils::localizedValue( val, 6 ) );
v = i18n( "%1 g/L" ).tqarg( KalziumUtils::localizedValue( val, 6 ) );
}
else//liquid or solid
{
v = i18n( "%1 g/cm<sup>3</sup>" ).arg( KalziumUtils::localizedValue( val, 6 ));
v = i18n( "%1 g/cm<sup>3</sup>" ).tqarg( 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" ).arg( TQString::number( val ) );
v = i18n( "This element was discovered in the year %1" ).tqarg( TQString::number( val ) );
}
}

@ -26,7 +26,7 @@
#include <kapplication.h>
//QT-Includes
#include <layout.h>
#include <tqlayout.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
@ -41,7 +41,7 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name )
yData = new AxisData();
TQHBoxLayout *layout = new TQHBoxLayout(plainPage(), 0, KDialog::spacingHint() );
TQHBoxLayout *tqlayout = new TQHBoxLayout(plainPage(), 0, KDialog::spacingHint() );
m_pPlotSetupWidget = new PlotSetupWidget( plainPage(), "plotsetup" );
m_pPlotSetupWidget->from->setMaxValue( d->numberOfElements() - 1 );
@ -51,10 +51,10 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name )
m_pPlotWidget->setMinimumWidth( 200 );
m_pPlotWidget->resize( 400, m_pPlotWidget->height() );
layout->addWidget( m_pPlotSetupWidget );
layout->addWidget( m_pPlotWidget );
layout->setStretchFactor( m_pPlotSetupWidget, 0 );
layout->setStretchFactor( m_pPlotWidget, 1 );
tqlayout->addWidget( m_pPlotSetupWidget );
tqlayout->addWidget( m_pPlotWidget );
tqlayout->setStretchFactor( m_pPlotSetupWidget, 0 );
tqlayout->setStretchFactor( m_pPlotWidget, 1 );
// setup the list of names
EList::iterator it = d->ElementList.begin();

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <layout.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqstring.h>
@ -50,7 +50,7 @@ eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent)
{
settingsChanged();
TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView layout");
TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView tqlayout");
m_eqResult = new EqResult(this);
m_eqedit = new KLineEdit(this);

@ -61,7 +61,7 @@ void AnswerItem::paint( TQPainter* painter )
TQRect r ( 0, 0, listBox()->contentsWidth(), height( listBox() ) );
painter->fillRect( r, m_bgcolor );
TQColorGroup cg = listBox()->colorGroup();
TQColorGroup cg = listBox()->tqcolorGroup();
cg.setColor( TQColorGroup::Background, m_bgcolor );
m_richtext->draw(painter, 0, 0, r, cg );
@ -101,7 +101,7 @@ EqResult::~EqResult()
void EqResult::add(const TQString & question, const TQString & answer)
{
TQColor bgcolor = colorGroup().base();
TQColor bgcolor = tqcolorGroup().base();
if ( m_alternate_color )
bgcolor = bgcolor.dark( 120 );

@ -52,24 +52,24 @@ TQString Isotope::halflifeAsString()
if ( !seconds() )//years
{
if ( m_halflife > 1000000 )
halflife = i18n("%1 million years").arg( KalziumUtils::localizedValue( m_halflife/1000000.0, 2 ) );
halflife = i18n("%1 million years").tqarg( KalziumUtils::localizedValue( m_halflife/1000000.0, 2 ) );
if ( m_halflife > 1000000000 )
halflife = i18n("%1 billion years").arg( KalziumUtils::localizedValue( m_halflife/1000000000.0, 2 ) );
halflife = i18n("%1 billion years").tqarg( KalziumUtils::localizedValue( m_halflife/1000000000.0, 2 ) );
else
halflife = i18n("%1 years").arg( KalziumUtils::localizedValue( m_halflife, 2 ) );
halflife = i18n("%1 years").tqarg( KalziumUtils::localizedValue( m_halflife, 2 ) );
}
else
{
if ( m_halflife < 120 )
halflife = i18n("%1 seconds").arg( KalziumUtils::localizedValue( m_halflife, 2 ) );
halflife = i18n("%1 seconds").tqarg( KalziumUtils::localizedValue( m_halflife, 2 ) );
else if ( m_halflife > 1000 )
halflife = i18n("%1 minutes").arg( KalziumUtils::localizedValue( m_halflife/60.0, 2 ) );
halflife = i18n("%1 minutes").tqarg( KalziumUtils::localizedValue( m_halflife/60.0, 2 ) );
else if ( m_halflife > 3600 )
halflife = i18n("%1 hours").arg( KalziumUtils::localizedValue( m_halflife/( 60*60 ), 2 ) );
halflife = i18n("%1 hours").tqarg( KalziumUtils::localizedValue( m_halflife/( 60*60 ), 2 ) );
if ( m_halflife > 86400 ) //one day
halflife = i18n("%1 days").arg( KalziumUtils::localizedValue( m_halflife/( 60*60*24 ), 2 ) );
halflife = i18n("%1 days").tqarg( KalziumUtils::localizedValue( m_halflife/( 60*60*24 ), 2 ) );
if ( m_halflife > ( 31536000 * 2 ) ) //two year
halflife = i18n("%1 years").arg( KalziumUtils::localizedValue( m_halflife/( 3600.0*365 ), 2 ) );
halflife = i18n("%1 years").tqarg( KalziumUtils::localizedValue( m_halflife/( 3600.0*365 ), 2 ) );
}
return halflife;

@ -33,7 +33,7 @@
#include "config.h"
#include <tqdockwindow.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqtoolbox.h>
#include <tqslider.h>
#include <tqscrollview.h>
@ -212,7 +212,7 @@ void Kalzium::setupSidebars()
TQVBoxLayout *lay = new TQVBoxLayout( fake, 5 );
lay->activate();
m_detailWidget = new DetailedGraphicalOverview( fake, "DetailedGraphicalOverview" );
m_detailWidget->setMinimumSize( 200, m_detailWidget->minimumSize().height() );
m_detailWidget->setMinimumSize( 200, m_detailWidget->tqminimumSize().height() );
connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectedNumber( int ) ));
lay->addWidget( m_detailWidget );
lay->addItem( new TQSpacerItem( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding ) );
@ -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" ).arg( e->elname() ).arg(e->number() ).arg( KalziumUtils::localizedValue( e->mass(), 6 ) ) , IDS_ELEMENTINFO );
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 );
}
void Kalzium::openInformationDialog( int number )

@ -106,7 +106,7 @@ class Kalzium : public KMainWindow
KToggleAction *m_actionCrystal;
/**
* the layout of the central Widget ( CentralWidget )
* the tqlayout of the central Widget ( CentralWidget )
*/
TQVBoxLayout *m_pCentralLayout;

@ -128,10 +128,10 @@ void KalziumTip::display()
TQString elementname = m_tippedElement->elname();
TQString number = i18n( "Number: %1" )
.arg( TQString::number(m_tippedElement->number()) );
.tqarg( TQString::number(m_tippedElement->number()) );
TQString mass = i18n( "Mass: %1" )
.arg( KalziumUtils::localizedValue(m_tippedElement->mass(), 6) );
.tqarg( KalziumUtils::localizedValue(m_tippedElement->mass(), 6) );
m_richText = new TQSimpleRichText("<qt><h1>" + elementname + "</h1><p>"
+ number + "</p><p>"
@ -206,13 +206,13 @@ void KalziumTip::displayInternal()
}
// draw text shadow
TQColorGroup cg = colorGroup();
TQColorGroup cg = tqcolorGroup();
cg.setColor(TQColorGroup::Text, cg.background().dark(115));
int shadowOffset = TQApplication::reverseLayout() ? -1 : 1;
m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, textY + 1, TQRect(), cg);
// draw text
cg = colorGroup();
cg = tqcolorGroup();
m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg);
}

@ -37,7 +37,7 @@
#include <ktoolbar.h>
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqtooltip.h>
@ -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" )
.arg( (*it)->count() )
.arg( (*it)->element()->elname() );
.tqarg( (*it)->count() )
.tqarg( (*it)->element()->elname() );
complexString
+= i18n( "For example: 1 Seaborgium. Cumulative Mass: 263.119 u (39.25%)",
"%1 %2. Cumulative Mass: %3 u (%4%)\n" )
.arg( (*it)->count() )
.arg( (*it)->element()->elname() )
.arg( (*it)->count() * (*it)->element()->mass() )
.arg( KalziumUtils::strippedValue( (( (*it)->count() * (*it)->element()->mass() )
.tqarg( (*it)->count() )
.tqarg( (*it)->element()->elname() )
.tqarg( (*it)->count() * (*it)->element()->mass() )
.tqarg( 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" ).arg( m_mass ) );
resultMass->setText( i18n( "Molecular mass: %1 u" ).tqarg( 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> " )
.arg( (*it)->element()->symbol() )
.arg( (*it)->count() );
.tqarg( (*it)->element()->symbol() )
.tqarg( (*it)->count() );
}
return str;

@ -69,7 +69,7 @@
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
@ -83,7 +83,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>10</height>

@ -48,7 +48,7 @@ Parser::start(const TQString& _str)
}
else {
m_index = 0;
m_nextChar = m_str.at(0).latin1();
m_nextChar = m_str.tqat(0).latin1();
getNextToken();
}
}
@ -148,7 +148,7 @@ Parser::getNextChar()
m_nextChar = -1;
}
else
m_nextChar = m_str.at(++m_index).latin1();
m_nextChar = m_str.tqat(++m_index).latin1();
// Take care of null-terminated strings.
if (m_nextChar == 0) {

@ -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 repaint... Feel *free* to remove these two lines if you foind a better
// on tqrepaint... Feel *free* to remove these two lines if you foind a better
// solution...
doFullDraw = true;
update();

@ -26,7 +26,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>layout4</cstring>
<cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@ -69,7 +69,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout2</cstring>
<cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@ -114,7 +114,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>layout3</cstring>
<cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>60</height>

@ -36,7 +36,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout32</cstring>
<cstring>tqlayout32</cstring>
</property>
<vbox>
<property name="name">
@ -44,7 +44,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout28</cstring>
<cstring>tqlayout28</cstring>
</property>
<hbox>
<property name="name">
@ -70,7 +70,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout29</cstring>
<cstring>tqlayout29</cstring>
</property>
<hbox>
<property name="name">
@ -96,7 +96,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout30</cstring>
<cstring>tqlayout30</cstring>
</property>
<hbox>
<property name="name">
@ -122,7 +122,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout31</cstring>
<cstring>tqlayout31</cstring>
</property>
<hbox>
<property name="name">
@ -163,7 +163,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout26</cstring>
<cstring>tqlayout26</cstring>
</property>
<vbox>
<property name="name">
@ -171,7 +171,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout23</cstring>
<cstring>tqlayout23</cstring>
</property>
<hbox>
<property name="name">
@ -197,7 +197,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout24</cstring>
<cstring>tqlayout24</cstring>
</property>
<hbox>
<property name="name">
@ -223,7 +223,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout25</cstring>
<cstring>tqlayout25</cstring>
</property>
<hbox>
<property name="name">
@ -249,7 +249,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout26</cstring>
<cstring>tqlayout26</cstring>
</property>
<hbox>
<property name="name">
@ -290,7 +290,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout22</cstring>
<cstring>tqlayout22</cstring>
</property>
<vbox>
<property name="name">
@ -298,7 +298,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout12</cstring>
<cstring>tqlayout12</cstring>
</property>
<hbox>
<property name="name">
@ -324,7 +324,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout19</cstring>
<cstring>tqlayout19</cstring>
</property>
<hbox>
<property name="name">
@ -350,7 +350,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout18</cstring>
<cstring>tqlayout18</cstring>
</property>
<hbox>
<property name="name">
@ -376,7 +376,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout17</cstring>
<cstring>tqlayout17</cstring>
</property>
<hbox>
<property name="name">
@ -402,7 +402,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout16</cstring>
<cstring>tqlayout16</cstring>
</property>
<hbox>
<property name="name">
@ -428,7 +428,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout15</cstring>
<cstring>tqlayout15</cstring>
</property>
<hbox>
<property name="name">
@ -454,7 +454,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout14</cstring>
<cstring>tqlayout14</cstring>
</property>
<hbox>
<property name="name">
@ -480,7 +480,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout13</cstring>
<cstring>tqlayout13</cstring>
</property>
<hbox>
<property name="name">
@ -521,7 +521,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout14</cstring>
<cstring>tqlayout14</cstring>
</property>
<vbox>
<property name="name">
@ -529,7 +529,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout13</cstring>
<cstring>tqlayout13</cstring>
</property>
<hbox>
<property name="name">
@ -558,7 +558,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout6</cstring>
<cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
@ -584,7 +584,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout7</cstring>
<cstring>tqlayout7</cstring>
</property>
<hbox>
<property name="name">
@ -625,7 +625,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout36</cstring>
<cstring>tqlayout36</cstring>
</property>
<vbox>
<property name="name">
@ -633,7 +633,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout12_2</cstring>
<cstring>tqlayout12_2</cstring>
</property>
<hbox>
<property name="name">