TDE
/
tdeedu
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeedu
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 999f961ff5
commit 746abe8440
298 changed files with 1792 additions and 1792 deletions
Show Stats Download Patch File Download Diff File

2
blinken/src/blinken.h
Unescape View File

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

2
blinken/src/button.cpp
Unescape View File

@ -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").tqarg(cs);
TQString pixmap = TQString("images/%1h.png").arg(cs);
switch (c)
{

10
blinken/src/highscoredialog.cpp
Unescape View File

@ -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").tqarg(i));
cfg -> setGroup(TQString("Level%1").arg(i));
for (int j = 1; j <= 5; j++)
{
m_scores[i-1].append(tqMakePair(cfg->readNumEntry(TQString("Score%1").tqarg(j)), cfg->readEntry(TQString("Name%1").tqarg(j))));
m_scores[i-1].append(tqMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(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").tqarg(level + 1));
cfg -> setGroup(TQString("Level%1").arg(level + 1));
int j;
for (it = m_scores[level].begin(), j = 1; it != m_scores[level].end(); ++it, j++)
{
cfg->writeEntry(TQString("Score%1").tqarg(j), (*it).first);
cfg->writeEntry(TQString("Name%1").tqarg(j), (*it).second);
cfg->writeEntry(TQString("Score%1").arg(j), (*it).first);
cfg->writeEntry(TQString("Name%1").arg(j), (*it).second);
}
cfg -> sync();
}

24
blinken/src/number.cpp
Unescape View File

@ -100,7 +100,7 @@ void number::paintDigit(TQPainter &p, int number) const
{
// make gcc happy
const int *n = m_number0;
int tqshape;
int shape;
switch (number)
{
@ -147,25 +147,25 @@ void number::paintDigit(TQPainter &p, int number) const
{
for (int j = 0; j < 4; j++)
{
tqshape = n[j + i * 4];
if (tqshape == 0)
shape = n[j + i * 4];
if (shape == 0)
{
p.fillRect(7 * (j-1), 7 * (i-1), 6, 6, TQt::red);
}
else if (tqshape != 5)
else if (shape != 5)
{
if (tqshape == 1) p.translate(7 * (j-1), 7 * (i-1));
else if (tqshape == 2)
if (shape == 1) p.translate(7 * (j-1), 7 * (i-1));
else if (shape == 2)
{
p.translate(7 * j - 2, 7 * (i-1));
p.rotate(90);
}
else if (tqshape == 3)
else if (shape == 3)
{
p.translate(7 * j - 2, 7 * i - 2);
p.rotate(180);
}
else if (tqshape == 4)
else if (shape == 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 (tqshape == 1) p.translate(-7 * (j-1), -7 * (i-1));
else if (tqshape == 2)
if (shape == 1) p.translate(-7 * (j-1), -7 * (i-1));
else if (shape == 2)
{
p.rotate(-90);
p.translate(-(7 * j - 2), -7 * (i-1));
}
else if (tqshape == 3)
else if (shape == 3)
{
p.rotate(-180);
p.translate(-(7 * j - 2), -(7 * i - 2));
}
else if (tqshape == 4)
else if (shape == 4)
{
p.rotate(-270);
p.translate(- (7 * (j-1)), -(7 * i - 2));

78
kalzium/src/detailinfodlg.cpp
Unescape View File

@ -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 );
}
}

24
kalzium/src/element.cpp
Unescape View File

@ -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 ) );
}
}

16
kalzium/src/isotope.cpp
Unescape View File

@ -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;

2
kalzium/src/kalzium.cpp
Unescape View File

@ -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 )

4
kalzium/src/kalziumtip.cpp
Unescape View File

@ -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>"

18
kalzium/src/molcalcwidget.cpp
Unescape View File

@ -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;

2
kalzium/src/molcalcwidgetbase.ui
Unescape View File

@ -69,7 +69,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

4
kalzium/src/parser.cpp
Unescape View File

@ -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) {

2
kalzium/src/periodictableview.cpp
Unescape View File

@ -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();

6
kalzium/src/somwidget_impl.cpp
Unescape View File

@ -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>";
}

22
kalzium/src/spectrum.cpp
Unescape View File

@ -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";
}

16
kalzium/src/spectrumwidget.cpp
Unescape View File

@ -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 );

2
kalzium/src/timewidget_impl.cpp
Unescape View File

@ -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() );

4
kanagram/data/fruits.kvtml
Unescape View File

@ -93,7 +93,7 @@ Valid xml means:
<o r="Large yellow citrus fruit with acidic, juicy pulp" >grapefruit</o>
</e>
<e>
<o r="Fuzzy brown egg-tqshaped fruit with slightly green flesh" >kiwi</o>
<o r="Fuzzy brown egg-shaped fruit with slightly green flesh" >kiwi</o>
</e>
<e>
<o r="Yellow oval fruit with juicy acidic flesh" >lemon</o>
@ -117,7 +117,7 @@ Valid xml means:
<o r="Juicy fruit with sweet yellowish flesh" >peach</o>
</e>
<e>
<o r="Small, bell-tqshaped juicy, gritty-textured fruit" >pear</o>
<o r="Small, bell-shaped juicy, gritty-textured fruit" >pear</o>
</e>
<e>
<o r="Resembling a pine cone, with a tangy sweet taste" >pineapple</o>

2
kanagram/data/space.kvtml
Unescape View File

@ -78,7 +78,7 @@ Valid xml means:
<o r="Medium-sized icy object orbiting the Sun" >comet</o>
</e>
<e>
<o r="Grouping of stars which can form a tqshape or pattern" >constellation</o>
<o r="Grouping of stars which can form a shape or pattern" >constellation</o>
</e>
<e>
<o r="Person from Russia who travels into space" >cosmonaut</o>

2
kanagram/data/vegetables.kvtml
Unescape View File

@ -84,7 +84,7 @@ Valid xml means:
<o r="Also known as garbanzo beans, with a nut-like flavor" >chickpeas</o>
</e>
<e>
<o r="Long, green, cylinder-tqshaped vegetable" >cucumber</o>
<o r="Long, green, cylinder-shaped vegetable" >cucumber</o>
</e>
<e>
<o r="A bulb made up of sections of cloves" >garlic</o>

2
kanagram/src/kanagram.cpp
Unescape View File

@ -225,7 +225,7 @@ void Kanagram::paintEvent(TQPaintEvent *)
p.setPen(TQPen(black, 3));
//Draw the border of the input box
TQRect borderRect = m_inputBox->tqgeometry();
TQRect borderRect = m_inputBox->geometry();
borderRect.setLeft(borderRect.left() - 2);
borderRect.setTop(borderRect.top() - 2);
borderRect.setWidth(borderRect.width() + 2 * 1);

2
kanagram/src/kanagramgame.cpp
Unescape View File

@ -48,7 +48,7 @@ void KanagramGame::checkFile()
{
if (!TQFile::exists(locate("appdata", m_filename))) {
TQString msg = i18n("File %1 cannot be found.\n Please ensure that Kanagram is properly installed.")
.tqarg(m_filename);
.arg(m_filename);
KMessageBox::sorry(m_parent, msg, i18n("Error"));
exit(0);
}

10
kanagram/src/keduvocdocument.cpp
Unescape View File

@ -107,7 +107,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
TQFile f(tmpfile);
if (!f.open(IO_ReadOnly))
{
KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").tqarg(url.path()));
KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").arg(url.path()));
return false;
}
@ -163,7 +163,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
// TODO new readers provide an explicite error message
// the two messages should be merged
TQString format = i18n("Could not load \"%1\"\nDo you want to try again?");
TQString msg = format.tqarg(url.path());
TQString msg = format.arg(url.path());
int result = KMessageBox::warningContinueCancel(0, msg,
kapp->makeStdCaption(i18n("I/O Failure")),
i18n("&Retry"));
@ -211,7 +211,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f
if (!f.open(IO_WriteOnly))
{
KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").tqarg(tmp.path()));
KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").arg(tmp.path()));
return false;
}
@ -253,7 +253,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f
// TODO new writers provide an explicite error message
// the two messages should be merged
TQString format = i18n("Could not save \"%1\"\nDo you want to try again?");
TQString msg = format.tqarg(tmp.path());
TQString msg = format.arg(tmp.path());
int result = KMessageBox::warningContinueCancel(0, msg,
kapp->makeStdCaption(i18n("I/O Failure")),
i18n("&Retry"));
@ -989,7 +989,7 @@ KEduVocDocument::FileType KEduVocDocument::detectFT(const TQString &filename)
line.insert (0, c1);
f.close();
bool stat = is.tqdevice()->status();
bool stat = is.device()->status();
if (stat != IO_Ok)
return kvd_none;
if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l')

40
kanagram/src/keduvockvtmlreader.cpp
Unescape View File

@ -131,7 +131,7 @@ bool KEduVocKvtmlReader::readArticle(TQDomElement &domElementParent)
{
if (domElementEntry.tagName() != KV_ART_ENTRY)
{
domError(i18n("expected tag <%1>").tqarg(KV_ART_ENTRY));
domError(i18n("expected tag <%1>").arg(KV_ART_ENTRY));
return false;
}
@ -1059,7 +1059,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
if (domElementExpressionChild.tagName() != KV_ORG)
{
// must be preceded by "original"
domError(i18n("starting tag <%1> is missing").tqarg(KV_ORG));
domError(i18n("starting tag <%1> is missing").arg(KV_ORG));
return false;
}
@ -1139,7 +1139,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bConjug)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bConjug = true;
@ -1152,7 +1152,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bComparison)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bComparison = true;
@ -1165,7 +1165,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bMultipleChoice)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bMultipleChoice = true;
@ -1236,7 +1236,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
if (domElementExpressionChild.tagName() != KV_TRANS)
{
// "original" must be followed by "translations"
domError(i18n("starting tag <%1> is missing").tqarg(KV_TRANS));
domError(i18n("starting tag <%1> is missing").arg(KV_TRANS));
return false;
}
@ -1317,7 +1317,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bConjug)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bConjug = true;
@ -1330,7 +1330,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bComparison)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bComparison = true;
@ -1343,7 +1343,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
{
if (bMultipleChoice)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
return false;
}
bMultipleChoice = true;
@ -1456,7 +1456,7 @@ if (lines != 0)
{
if (lessgroup)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
lessgroup = true;
@ -1468,7 +1468,7 @@ if (lines != 0)
{
if (articlegroup)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
articlegroup = true;
@ -1480,7 +1480,7 @@ if (lines != 0)
{
if (conjuggroup)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
conjuggroup = true;
@ -1492,7 +1492,7 @@ if (lines != 0)
{
if (optgroup)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
optgroup = true;
@ -1504,7 +1504,7 @@ if (lines != 0)
{
if (attrgroup)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
attrgroup = true;
@ -1516,7 +1516,7 @@ if (lines != 0)
{
if (tensegroup)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
tensegroup = true;
@ -1528,7 +1528,7 @@ if (lines != 0)
{
if (usagegroup)
{
domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
return false;
}
usagegroup = true;
@ -1590,7 +1590,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
if( domElementKvtml.tagName() != KV_DOCTYPE )
{
domError(i18n("Tag <%1> was expected "
"but tag <%2> was read." ).tqarg(KV_DOCTYPE).tqarg(domElementKvtml.tagName()));
"but tag <%2> was read." ).arg(KV_DOCTYPE).arg(domElementKvtml.tagName()));
return false;
}
@ -1667,7 +1667,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
{
TQString ln = i18n("File:\t%1\n").tqarg(m_doc->URL().path());
TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
TQString format = i18n(
"Your document contains an unknown tag <%1>. " // keep trailing space
@ -1676,7 +1676,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
"Loading is aborted because KVocTrain cannot "
"read documents with unknown elements.\n"
);
TQString msg = format.tqarg(elem);
TQString msg = format.arg(elem);
TQApplication::setOverrideCursor( arrowCursor, true );
TQString s = kapp->makeStdCaption(i18n("Unknown Element"));
KMessageBox::sorry(0, ln+msg, s);
@ -1687,7 +1687,7 @@ void KEduVocKvtmlReader::domError(const TQString &text )
{
TQApplication::setOverrideCursor( arrowCursor, true );
TQString s = kapp->makeStdCaption(i18n("Error"));
TQString ln = i18n("File:\t%1\n").tqarg(m_doc->URL().path());
TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
TQString msg = text;
KMessageBox::error(0, ln+msg, s);
TQApplication::restoreOverrideCursor();

2
kanagram/src/leitnersystemview.cpp
Unescape View File

@ -116,7 +116,7 @@ void LeitnerSystemView::setSystem(LeitnerSystem* leitnersystem)
//calculate the new sizes
calculateSize();
updateContents();
//tqrepaint
//repaint
//update();
//TQPainter* p = new TQPainter(this);
//drawContents( p, 0, 0, 0, 0 );

2
kbruch/src/fractionbasewidget.cpp
Unescape View File

@ -161,7 +161,7 @@ void FractionBaseWidget::setColorAndFont()
/* set font */
m_font = SettingsClass::taskFont();
// tqrepaint
// repaint
update();
return;

10
kbruch/src/statisticsview.cpp
Unescape View File

@ -150,14 +150,14 @@ void StatisticsView::addCorrect()
{
++m_count;
++m_correct;
(void) calc(); /* tqrepaint the statistics */
(void) calc(); /* repaint the statistics */
}
/* called, if a task was solved wrong */
void StatisticsView::addWrong()
{
++m_count;
(void) calc(); /* tqrepaint the statistics */
(void) calc(); /* repaint the statistics */
}
@ -169,7 +169,7 @@ void StatisticsView::calc()
TQString new_text;
TQString number;
new_text = TQString("<b>%1</b>").tqarg(m_count);
new_text = TQString("<b>%1</b>").arg(m_count);
result1Label->setText(new_text);
/* we have to be careful with division by 0 */
@ -179,11 +179,11 @@ void StatisticsView::calc()
result3Label->setText("- (- %)");
} else {
/* set the correct label */
new_text = TQString("%1 (%2 %)").tqarg(m_correct).tqarg(int(double(m_correct) / m_count * 100));
new_text = TQString("%1 (%2 %)").arg(m_correct).arg(int(double(m_correct) / m_count * 100));
result2Label->setText(new_text);
/* set the incorrect label */
new_text = TQString("%1 (%2 %)").tqarg(m_count - m_correct).tqarg(int(double(m_count - m_correct) / m_count * 100));
new_text = TQString("%1 (%2 %)").arg(m_count - m_correct).arg(int(double(m_count - m_correct) / m_count * 100));
result3Label->setText(new_text);
}
}

4
keduca/keduca/keducaview.cpp
Unescape View File

@ -209,7 +209,7 @@ void KEducaView::showRecord()
// SHOW QUESTION *******************************************************************
_questionText->setPixmap( _keducaFile->getPicturePixmap() );
questionTextTemp = "<table width=100%><tr><td><b>"
+ i18n("Question %1").tqarg(_keducaFileIndex) + "</b>";
+ i18n("Question %1").arg(_keducaFileIndex) + "</b>";
if( _keducaFile->getTotalPoints() > 0 )
questionTextTemp += "</td><td align=center bgColor=#336699><font color=#ffffff><b>"
@ -266,7 +266,7 @@ void KEducaView::showRecord()
KMessageBox::information( this,
i18n( "You have %1 seconds to complete this question.\n\n"
"Press OK when you are ready." )
.tqarg( _keducaFile->getQuestion(FileRead::TQF_TIME) ) );
.arg( _keducaFile->getQuestion(FileRead::TQF_TIME) ) );
}
int timeout = _keducaFile->getQuestionInt(FileRead::TQF_TIME);

20
keduca/keducabuilder/kcontroladdeditbase.ui
Unescape View File

@ -160,7 +160,7 @@
<property name="text">
<string>&amp;Question:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@ -174,7 +174,7 @@
<property name="text">
<string>&amp;Type:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@ -188,7 +188,7 @@
<property name="text">
<string>&amp;Picture:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@ -227,7 +227,7 @@
<property name="text">
<string>P&amp;oint:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@ -241,7 +241,7 @@
<property name="text">
<string>Ti&amp;me:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@ -255,7 +255,7 @@
<property name="text">
<string>T&amp;ip:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@ -274,7 +274,7 @@
<property name="text">
<string>&amp;Explain:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@ -552,7 +552,7 @@
<property name="text">
<string>&amp;Answer:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@ -566,7 +566,7 @@
<property name="text">
<string>&amp;Value:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@ -605,7 +605,7 @@
<property name="text">
<string>&amp;Points:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">

18
keduca/keducabuilder/kcontrolheaderbase.ui
Unescape View File

@ -139,7 +139,7 @@
<property name="text">
<string>Title:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -150,7 +150,7 @@
<property name="text">
<string>Language:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -161,7 +161,7 @@
<property name="text">
<string>Category:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -172,7 +172,7 @@
<property name="text">
<string>Type:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -223,7 +223,7 @@
<property name="text">
<string>Level:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -262,7 +262,7 @@
<property name="text">
<string>Default picture:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignJustify|AlignVCenter</set>
</property>
</widget>
@ -291,7 +291,7 @@
<property name="text">
<string>Name:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -317,7 +317,7 @@
<property name="text">
<string>Web page:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -328,7 +328,7 @@
<property name="text">
<string>Email:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>

4
keduca/keducabuilder/keducabuilder.cpp
Unescape View File

@ -284,7 +284,7 @@ bool KEducaBuilder::currentFileMayBeReplaced()
int res = KMessageBox::warningYesNoCancel( widget(),
// ask the user to save
i18n( "The document \"%1\" has been modified.\n"
"Do you want to save it?" ).tqarg( _keducaFile->getCurrentURL().fileName() ),
"Do you want to save it?" ).arg( _keducaFile->getCurrentURL().fileName() ),
i18n( "Save Document?" ), KStdGuiItem::save(), KStdGuiItem::discard() );
switch (res)
{
@ -485,7 +485,7 @@ void KEducaBuilder::slotFilePrint()
TQString file = _keducaFile->getCurrentURL().fileName();
if (file.isEmpty())
file = i18n("Test");
if(printer->setup(this, i18n("Print %1").tqarg(file)))
if(printer->setup(this, i18n("Print %1").arg(file)))
{
TQPaintDeviceMetrics metrics(printer);
TQPainter p;

2
keduca/keducabuilder/keducaeditorstartdialog.cpp
Unescape View File

@ -62,7 +62,7 @@ void KEducaEditorStartDialog::buildRecentFilesList()
// read file list
for( unsigned int i = 1 ; i <= _maxRecentDocumentItems ; i++ )
{
key = TQString( "File%1" ).tqarg( i );
key = TQString( "File%1" ).arg( i );
value = config->readEntry( key, TQString() );
if (!value.isNull())

6
keduca/keducabuilder/ktagcombobox.cpp
Unescape View File

@ -84,7 +84,7 @@ void KTagComboBox::internalActivate( int index )
if (_current == index) return;
_current = index;
emit activated( index );
tqrepaint();
repaint();
}
void KTagComboBox::internalHighlight( int index )
@ -158,7 +158,7 @@ void KTagComboBox::changeItem( const TQString &text, int index )
{
_popup->changeItem( text, index);
if (index == _current)
tqrepaint();
repaint();
}
void KTagComboBox::paintEvent( TQPaintEvent * ev)
@ -210,7 +210,7 @@ void KTagComboBox::setCurrentItem(int i)
{
if (i < 0 || i >= count()) return;
_current = i;
tqrepaint();
repaint();
}
void KTagComboBox::setCurrentItem(const TQString &code)

2
keduca/libkeduca/kgallerydialogbase.ui
Unescape View File

@ -45,7 +45,7 @@
<property name="text">
<string>Name:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>

2
kgeography/src/answersdialog.cpp
Unescape View File

@ -67,7 +67,7 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector<userAnswer> &
lay -> addItem(new TQSpacerItem(20, 20, TQSizePolicy::Fixed, TQSizePolicy::Fixed), totalAnswers + 3, 2);
l1 = new TQLabel(i18n("You answered correctly %1 out of %2 questions.").tqarg(correctAnswers).tqarg(totalAnswers), p_container);
l1 = new TQLabel(i18n("You answered correctly %1 out of %2 questions.").arg(correctAnswers).arg(totalAnswers), p_container);
l1 -> setAlignment(TQt::AlignCenter);
lay->addMultiCellWidget(l1, totalAnswers + 4, totalAnswers + 4, 0, 4);

2
kgeography/src/askwidget.cpp
Unescape View File

@ -98,7 +98,7 @@ void askWidget::resetAnswers()
void askWidget::updateLabel()
{
p_answers -> setText(i18n("Correct answers: %1/%2").tqarg(p_correctAnswers).tqarg(p_correctAnswers + p_incorrectAnswers));
p_answers -> setText(i18n("Correct answers: %1/%2").arg(p_correctAnswers).arg(p_correctAnswers + p_incorrectAnswers));
}
#include "askwidget.moc"

4
kgeography/src/capitaldivisionasker.cpp
Unescape View File

@ -34,11 +34,11 @@ bool capitalDivisionAsker::nextBoxAskerQuestionHook(const TQString &division, in
{
TQString capitalName = i18n(p_map -> getFileName().utf8(), p_capital.utf8());
TQString text = i18n("%1 is the capital of...");
setQuestion(text.tqarg(capitalName));
setQuestion(text.arg(capitalName));
}
else
{
TQString s = TQString("%1 is the capital of...").tqarg(p_capital);
TQString s = TQString("%1 is the capital of...").arg(p_capital);
setQuestion(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_rb[i] -> setText(i18n(p_map -> getFileName().utf8(), division.utf8()));

4
kgeography/src/divisioncapitalasker.cpp
Unescape View File

@ -30,11 +30,11 @@ bool divisionCapitalAsker::nextBoxAskerQuestionHook(const TQString &division, in
{
TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8());
TQString text = i18n("The capital of %1 is...");
setQuestion(text.tqarg(divisionName));
setQuestion(text.arg(divisionName));
}
else
{
TQString s = TQString("The capital of %1 is...").tqarg(division);
TQString s = TQString("The capital of %1 is...").arg(division);
setQuestion(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_currentAnswer.setQuestion(i18n(p_map -> getFileName().utf8(), division.utf8()));

4
kgeography/src/divisionflagasker.cpp
Unescape View File

@ -33,11 +33,11 @@ bool divisionFlagAsker::nextBoxAskerQuestionHook(const TQString &division, int i
{
TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8());
TQString text = i18n("The flag of %1 is...");
setQuestion(text.tqarg(divisionName));
setQuestion(text.arg(divisionName));
}
else
{
TQString s = TQString("The flag of %1 is...").tqarg(division);
TQString s = TQString("The flag of %1 is...").arg(division);
setQuestion(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_currentAnswer.setCorrectAnswer(im);

16
kgeography/src/kgeography.cpp
Unescape View File

@ -113,7 +113,7 @@ void kgeography::showEvent(TQShowEvent *)
}
else
{
KMessageBox::error(this, i18n("Could not open last used map. Error parsing %1: %2").tqarg(file).tqarg(reader.getError()));
KMessageBox::error(this, i18n("Could not open last used map. Error parsing %1: %2").arg(file).arg(reader.getError()));
delete reader.getMap();
openMap();
}
@ -169,7 +169,7 @@ void kgeography::askCapitalDivisions()
int i;
bool ok;
showResultsDialog();
i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
if (ok)
{
removeOldAskWidget();
@ -185,7 +185,7 @@ void kgeography::askDivisionCapitals()
int i;
bool ok;
showResultsDialog();
i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
if (ok)
{
removeOldAskWidget();
@ -201,7 +201,7 @@ void kgeography::askMap()
int i;
bool ok;
showResultsDialog();
i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(true)), 1, 1, p_map -> count(true), 1, &ok);
i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(true)), 1, 1, p_map -> count(true), 1, &ok);
if (ok)
{
removeOldAskWidget();
@ -219,7 +219,7 @@ void kgeography::askFlagDivisions()
int i;
bool ok;
showResultsDialog();
i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
if (ok)
{
removeOldAskWidget();
@ -235,7 +235,7 @@ void kgeography::askDivisionFlags()
int i;
bool ok;
showResultsDialog();
i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").tqarg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
i = KInputDialog::getInteger(i18n("Number of Questions"), i18n("How many questions do you want? (1 to %1)").arg(p_map -> count(false)), 1, 1, p_map -> count(false), 1, &ok);
if (ok)
{
removeOldAskWidget();
@ -292,11 +292,11 @@ void kgeography::setMap(KGmap *m)
{
TQString mapName = i18n(p_map -> getFileName().utf8(), p_map -> getName().utf8());
TQString text = i18n("<qt>Current map:<br><b>%1<b></qt>");
p_currentMap -> setText(text.tqarg(mapName));
p_currentMap -> setText(text.arg(mapName));
}
else
{
TQString s = TQString("<qt>Current map:<br><b>%1</b></qt>").tqarg(p_map -> getName());
TQString s = TQString("<qt>Current map:<br><b>%1</b></qt>").arg(p_map -> getName());
p_currentMap -> setText(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_consult -> setEnabled(true);

6
kgeography/src/mapasker.cpp
Unescape View File

@ -104,7 +104,7 @@ void mapAsker::handleMapClick(TQRgb c, const TQPoint &p)
{
TQString aux, cap;
aux = p_map -> getWhatIs(c, !p_asker);
if (aux == "nothing") KMessageBox::error(this, i18n("You have found a bug in a map. Please contact the author and tell the %1 map has nothing associated to color %2,%3,%4.").tqarg(p_map -> getFile()).tqarg(tqRed(c)).tqarg(tqGreen(c)).tqarg(tqBlue(c)));
if (aux == "nothing") KMessageBox::error(this, i18n("You have found a bug in a map. Please contact the author and tell the %1 map has nothing associated to color %2,%3,%4.").arg(p_map -> getFile()).arg(tqRed(c)).arg(tqGreen(c)).arg(tqBlue(c)));
else if (p_shouldClearPopup)
{
p_popupManager.clear();
@ -175,11 +175,11 @@ void mapAsker::nextQuestionHook(const TQString &division)
{
TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8());
TQString text = i18n("Please click on:\n%1");
p_next -> setText(text.tqarg(divisionName));
p_next -> setText(text.arg(divisionName));
}
else
{
TQString s = TQString("Please click on:\n%1").tqarg(division);
TQString s = TQString("Please click on:\n%1").arg(division);
p_next -> setText(i18n(p_map -> getFileName().utf8(), s.utf8()));
}
p_currentAnswer.setQuestion(i18n(p_map -> getFileName().utf8(), division.utf8()));

2
kgeography/src/mapchooser.cpp
Unescape View File

@ -36,7 +36,7 @@ mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Ch
{
if (!p_reader.parseMap(*it))
{
KMessageBox::error(this, i18n("Error parsing %1: %2").tqarg(*it).tqarg(p_reader.getError()));
KMessageBox::error(this, i18n("Error parsing %1: %2").arg(*it).arg(p_reader.getError()));
delete p_reader.getMap();
}
else

32
kgeography/src/mapparser.cpp
Unescape View File

@ -37,7 +37,7 @@ bool mapReader::parseMap(const TQString &path)
}
else
{
p_error = i18n("%1 does not exist.").tqarg(path);
p_error = i18n("%1 does not exist.").arg(path);
}
return false;
}
@ -74,19 +74,19 @@ bool mapParser::startElement(const TQString&, const TQString &name, const TQStri
if (prev.isEmpty())
{
b = name == "map";
if (!b) p_error = i18n("The map description file should begin with the %1 tag").tqarg("map");
if (!b) p_error = i18n("The map description file should begin with the %1 tag").arg("map");
}
else if (prev == "map")
{
if (name != "mapFile" && name != "name" && name != "division")
{
b = false;
p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4 and %5").tqarg(name).tqarg(prev).tqarg("mapFile").tqarg("name").tqarg("division");
p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4 and %5").arg(name).arg(prev).arg("mapFile").arg("name").arg("division");
}
else if ((name == "mapFile" && p_mapFileSet) || (name == "name" && p_mapNameSet))
{
b = false;
p_error = i18n("%1 tag has already been set").tqarg(name);
p_error = i18n("%1 tag has already been set").arg(name);
}
p_colorSet = false;
if (name == "division")
@ -102,21 +102,21 @@ bool mapParser::startElement(const TQString&, const TQString &name, const TQStri
prev == "ignore")
{
b = false;
p_error = i18n("There can not be a tag inside %1 tag").tqarg(prev);
p_error = i18n("There can not be a tag inside %1 tag").arg(prev);
}
else if (prev == "division")
{
if (name != "color" && name != "name" && name != "ignore" && name != "flag" && name != "capital")
{
b = false;
p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4, %5, %6 and %7").tqarg(name).tqarg(prev).tqarg("color").tqarg("name").tqarg("ignore").tqarg("capital").tqarg("flag");
p_error = i18n("%1 is not a valid tag inside tag %2. Valid tags are %3, %4, %5, %6 and %7").arg(name).arg(prev).arg("color").arg("name").arg("ignore").arg("capital").arg("flag");
}
else if ((name == "name" && p_divisionNameSet) || (name == "color" && p_colorSet) ||
(name == "ignore" && p_divisionIgnoreSet) || (name == "flag" && p_flagFileSet) ||
(name == "capital" && p_capitalSet))
{
b = false;
p_error = i18n("%1 tag has already been set").tqarg(name);
p_error = i18n("%1 tag has already been set").arg(name);
}
p_red = -1;
p_green = -1;
@ -146,7 +146,7 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &)
{
b = p_map -> setMapFile(p_path + p_contents);
p_mapFileSet = true;
if (!b) p_error = i18n("File %1 does not exist").tqarg(p_path + p_contents);
if (!b) p_error = i18n("File %1 does not exist").arg(p_path + p_contents);
}
else if (aux == "division")
{
@ -154,9 +154,9 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &)
b = p_divisionNameSet;
if (!b) p_error = i18n("There is a division without name");
b = b && p_map -> addDivision(p_division);
if (!b) p_error = i18n("There is already either a division called %1 or a division with the same colors as %2").tqarg(p_division -> getName()).tqarg(p_division -> getName());
if (!b) p_error = i18n("There is already either a division called %1 or a division with the same colors as %2").arg(p_division -> getName()).arg(p_division -> getName());
b = b && (p_capitalSet || !p_division -> canAsk(false));
if (!b) p_error = i18n("Division %1 has no capital").tqarg(p_division -> getName());
if (!b) p_error = i18n("Division %1 has no capital").arg(p_division -> getName());
}
else if (p_previousTags == ":map:division:name")
{
@ -173,17 +173,17 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &)
if (p_red == -1)
{
b = false;
p_error = i18n("Tag %1 has not the %2 tag.").tqarg("<color>").tqarg("<red>");
p_error = i18n("Tag %1 has not the %2 tag.").arg("<color>").arg("<red>");
}
else if (p_green == -1)
{
b = false;
p_error = i18n("Tag %1 has not the %2 tag.").tqarg("<color>").tqarg("<green>");
p_error = i18n("Tag %1 has not the %2 tag.").arg("<color>").arg("<green>");
}
else if (p_blue == -1)
{
b = false;
p_error = i18n("Tag %1 has not the %2 tag.").tqarg("<color>").tqarg("<blue>");
p_error = i18n("Tag %1 has not the %2 tag.").arg("<color>").arg("<blue>");
}
else p_colorSet = true;
}
@ -217,14 +217,14 @@ bool mapParser::endElement(const TQString &, const TQString &, const TQString &)
else
{
b = false;
p_error = i18n("Invalid value in tag %1").tqarg("<ignore>");
p_error = i18n("Invalid value in tag %1").arg("<ignore>");
}
}
else if (aux == "flag")
{
b = p_division -> setFlagFile(p_path + "flags/" + p_contents);
p_flagFileSet = true;
if (!b) p_error = i18n("Could not find flag file %1").tqarg(p_path + "flags/" + p_contents);
if (!b) p_error = i18n("Could not find flag file %1").arg(p_path + "flags/" + p_contents);
}
else if (aux == "map")
{
@ -258,7 +258,7 @@ bool mapParser::endDocument()
}
else if (!p_mapNameSet) aux = "name";
else if (!p_mapFileSet) aux = "mapFile";
p_error = i18n("Tag %1 is missing.").tqarg(aux);
p_error = i18n("Tag %1 is missing.").arg(aux);
return false;
}

2
khangman/ChangeLog
Unescape View File

@ -1,5 +1,5 @@
June 23, 2005
- add timers for KPassivePopup (Hint and Already Guessed) to allow young tqchildren to read (young tqchildren need more time)
- add timers for KPassivePopup (Hint and Already Guessed) to allow young children to read (young children need more time)
- fixed hint position
- tooltip if no Win dialog to say the game is finished (is displayed for 4 seconds)

4
khangman/khangman/data/en/easy.kvtml
Unescape View File

@ -3,7 +3,7 @@
<kvtml encoding="UTF-8">
<e>
<o>playtime</o>
<t>time assigned for tqchildren to play</t>
<t>time assigned for children to play</t>
</e>
<e>
<o>furniture</o>
@ -134,7 +134,7 @@
<t>large group of persons</t>
</e>
<e>
<o>tqchildren</o>
<o>children</o>
<t>young humans</t>
</e>
<e>

10
khangman/khangman/khangman.cpp
Unescape View File

@ -420,22 +420,22 @@ void KHangMan::loadLangToolBar()
m_allData.clear();
if (!m_noSpecialChars) {
TQString myString=TQString("khangman/%1.txt").tqarg(Prefs::selectedLanguage());
TQString myString=TQString("khangman/%1.txt").arg(Prefs::selectedLanguage());
TQFile myFile;
myFile.setName(locate("data", myString));
// Let's look in local TDEHOME dir then
if (!myFile.exists()) {
TQString myString=TQString("khangman/data/%1/%1.txt")
.tqarg(Prefs::selectedLanguage())
.tqarg(Prefs::selectedLanguage());
.arg(Prefs::selectedLanguage())
.arg(Prefs::selectedLanguage());
myFile.setName(locate("data",myString));
kdDebug() << myString << endl;
}
if (!myFile.exists()) {
TQString mString=i18n("File $TDEDIR/share/apps/khangman/%1.txt not found;\n"
"check your installation.").tqarg(Prefs::selectedLanguage());
"check your installation.").arg(Prefs::selectedLanguage());
KMessageBox::sorry( this, mString,
i18n("Error") );
kapp->quit();
@ -457,7 +457,7 @@ void KHangMan::loadLangToolBar()
secondToolbar->insertButton (charIcon(m_allData[i].at(0)), i,
TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this),
TQT_SLOT( slotPasteChar()), true,
i18n("Inserts the character %1").tqarg(m_allData[i]), i+1 );
i18n("Inserts the character %1").arg(m_allData[i]), i+1 );
}
if (Prefs::showCharToolbar())

14
khangman/khangman/khangmanview.cpp
Unescape View File

@ -467,7 +467,7 @@ void KHangManView::slotTry()
TQLabel *popLabel = new TQLabel( vb);
popLabel->setFont(TQFont("Sans Serif", 14, TQFont::Normal));
popLabel->setText(i18n("<qt>You lost!\nThe word was\n<b>%1</b></qt>").tqarg(m_word));
popLabel->setText(i18n("<qt>You lost!\nThe word was\n<b>%1</b></qt>").arg(m_word));
popup->setView( vb );
TQPoint abspos = popup->pos();
@ -586,15 +586,15 @@ void KHangManView::game()
// Check if the data files are installed in the correct dir.
TQString myString = TQString("khangman/data/%1/%2")
.tqarg(Prefs::selectedLanguage())
.tqarg(Prefs::levelFile());
.arg(Prefs::selectedLanguage())
.arg(Prefs::levelFile());
TQFile myFile;
myFile.setName(locate("data", myString));
if (!myFile.exists()) {
TQString mString = i18n("File $TDEDIR/share/apps/khangman/data/%1/%2 not found!\n"
"Check your installation, please!")
.tqarg(Prefs::selectedLanguage())
.tqarg(Prefs::levelFile());
.arg(Prefs::selectedLanguage())
.arg(Prefs::levelFile());
KMessageBox::sorry( this, mString, i18n("Error") );
kapp->quit();
}
@ -666,7 +666,7 @@ void KHangManView::game()
void KHangManView::readFile()
{
kdDebug() << "in read kvtml file " << endl;
TQString myString=TQString("khangman/data/%1/%2").tqarg(Prefs::selectedLanguage()).tqarg(Prefs::levelFile());
TQString myString=TQString("khangman/data/%1/%2").arg(Prefs::selectedLanguage()).arg(Prefs::levelFile());
myString= locate("data", myString);
KEduVocDataItemList verbs = KEduVocData::parse(myString);
@ -728,7 +728,7 @@ void KHangManView::loadAnimation()
for (uint i = 0; i < 11; i++) {
m_animationPics[i].load(locate( "data",
TQString("khangman/pics/%1/animation%2.png")
.tqarg(m_themeName).tqarg(i) ));
.arg(m_themeName).arg(i) ));
}
}

4
khangman/khangman/timerdlg.ui
Unescape View File

@ -64,7 +64,7 @@
<string>Time during which the Hint is displayed</string>
</property>
<property name="whatsThis" stdset="0">
<string>You can set the time for displaying the Hint tooltip. Default is 3 seconds but younger tqchildren might need longer time to be able to read the Hint.</string>
<string>You can set the time for displaying the Hint tooltip. Default is 3 seconds but younger children might need longer time to be able to read the Hint.</string>
</property>
</widget>
<spacer row="2" column="0">
@ -178,7 +178,7 @@
<string>Time during which the Already Guessed tooltip is displayed</string>
</property>
<property name="whatsThis" stdset="0">
<string>You can set the time for displaying the Already Guessed tooltip after you try a letter that was already guessed. Default is 3 seconds but younger tqchildren might need longer time to be able to understand they are trying a letter that was already guessed.</string>
<string>You can set the time for displaying the Already Guessed tooltip after you try a letter that was already guessed. Default is 3 seconds but younger children might need longer time to be able to understand they are trying a letter that was already guessed.</string>
</property>
</widget>
<spacer row="3" column="1">

8
kig/ChangeLog
Unescape View File

@ -936,7 +936,7 @@
and made a sort of skeleton to modify type's data.
* Made buttons of some dialogs like other KDE dialogs ones (with
icons and correct tqalignment).
icons and correct alignment).
* Kig now ask the user when exporting type(s) to an already
existant file.
@ -1143,7 +1143,7 @@
* Fix the moving system again, it now only redraws exactly those
objects that need to be redrawn. E.g. when a constrained point
was moved, before it was assumed that all of its parents, and
their tqchildren would move, whereas in reality, a constrained point
their children would move, whereas in reality, a constrained point
does not move the curve it is constrained to. This is now taken
into account for. This much optimizes the case where we move the
constrained point in examples/sine-curve.kig.
@ -1438,7 +1438,7 @@
2003-05-24 Dominique Devriese <devriese@kde.org>
* when the user tries to construct a macro that constructs an
object from its tqchildren, warn him instead of
object from its children, warn him instead of
crashing... Thanks to Stephan Binner for the bug report
* improve the export to image dialog, as suggested by Stephan Binner
@ -1516,7 +1516,7 @@
* organise the filters directory more sanely
* fix for deleting: remove deleted objects from their tqchildren, so
* fix for deleting: remove deleted objects from their children, so
they don't appear in saved files
2003-05-07 Dominique Devriese <devriese@kde.org>

4
kig/DESIGN
Unescape View File

@ -185,7 +185,7 @@ All this gives labels in Kig a lot of flexibility.
2.2 Locuses
Locuses are a mathematical concept that has been modelled in Kig.
Loosely defined, a locus is the mathematical tqshape defined by the set
Loosely defined, a locus is the mathematical shape defined by the set
of points that a certain point moves through while another point is
moved over its constraints. This can be used to define mathematical
objects like conics, and various other things. It has been modelled
@ -258,7 +258,7 @@ the constrained point. This is wrong because when the constrained
point moves within the limits of the curve constraining it, the locus
does by definition not change. Also, if the constrained point is
redefined so that it is no longer constrained to any curve, this is a
major problem, because it would tqinvalidate the locus. Another point
major problem, because it would invalidate the locus. Another point
is that in practice, the locus depends on more objects than its
parents alone. This is not a good thing, because it makes it
impossible to optimise drawing of the objects, using the information

8
kig/TODO
Unescape View File

@ -50,7 +50,7 @@
- make DoubleImp a "visible" object with uses like Dr. Geo numeric
values.
- Provide some nice stuff for differential tqgeometry: velocity vector
- Provide some nice stuff for differential geometry: velocity vector
of a curve, curvature vector, osculating parabole. Most of this is
not too difficult to implement, but very cool :)
@ -58,9 +58,9 @@
allow for importing from/exporting to other formula formats such as
KFormula, OOFormula and MathML.
- other types of fillable tqshapes, like arc sector, arc segment...
- other types of fillable shapes, like arc sector, arc segment...
- defined integrals, as a particular case of filled tqshapes.
- defined integrals, as a particular case of filled shapes.
- improve *a lot* the transformation support for cubics.
@ -141,7 +141,7 @@
- write cabri-filter-status.txt.
- add "Tools": easy tools designed for tqgeometry, like Angle converter and
- add "Tools": easy tools designed for geometry, like Angle converter and
so on...
- save a "session", i.e.: record how a document is moved, and save it to

2
kig/filters/cabri-filter.cc
Unescape View File

@ -549,7 +549,7 @@ KigDocument* KigFilterCabri::load( const TQString& file )
else
{
notSupported( file, i18n( "This Cabri file contains a \"%1\" object, "
"which Kig does not currently support." ).tqarg( TQString(obj.type) ) );
"which Kig does not currently support." ).arg( TQString(obj.type) ) );
return 0;
}

2
kig/filters/drgeo-filter-chooserbase.ui
Unescape View File

@ -33,7 +33,7 @@
<string>The current Dr. Geo file contains more than one figure.
Please select which to import:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>

30
kig/filters/drgeo-filter.cc
Unescape View File

@ -106,9 +106,9 @@ KigDocument* KigFilterDrgeo::load( const TQString& file )
if ( figures.isEmpty() ) {
if( nmacros > 0 )
warning( i18n( "The Dr. Geo file \"%1\" is a macro file so it contains no "
"figures." ).tqarg( file ) );
"figures." ).arg( file ) );
else
warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).tqarg( file ) );
warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).arg( file ) );
return false;
}
@ -333,7 +333,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
{
// oc = fact->constrainedPointCalcer( parents[0], value );
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}
@ -387,7 +387,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}
@ -419,7 +419,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}
@ -432,7 +432,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}
@ -453,7 +453,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}
@ -469,7 +469,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}
@ -490,7 +490,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}
@ -529,7 +529,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
bool ok3;
double dvalue = value.toDouble( &ok3 );
if ( ok3 )
value = TQString( "%1" ).tqarg( dvalue, 0, 'g', 3 );
value = TQString( "%1" ).arg( dvalue, 0, 'g', 3 );
oc = fact->labelCalcer( value, m, false, std::vector<ObjectCalcer*>(), *ret );
}
else if ( domelem.attribute( "type" ) == "pt_abscissa" )
@ -618,7 +618,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}
@ -636,7 +636,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}
@ -677,7 +677,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}
@ -689,7 +689,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}
@ -709,7 +709,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
kdDebug() << ">>>>>>>>> UNKNOWN OBJECT" << endl;
#endif
notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
}

2
kig/filters/drgeo-filter.h
Unescape View File

@ -26,7 +26,7 @@ class KigDocument;
class TQString;
/**
* This is an import filter for the GNOME tqgeometry program DrGeo.
* This is an import filter for the GNOME geometry program DrGeo.
*/
class KigFilterDrgeo
: public KigFilter

6
kig/filters/exporter.cc
Unescape View File

@ -156,7 +156,7 @@ void ImageExporter::run( const KigPart& doc, KigWidget& w )
{
KMessageBox::sorry( &w,
i18n( "The file \"%1\" could not be opened. Please check if the file permissions are set correctly." )
.tqarg( filename ) );
.arg( filename ) );
return;
};
@ -169,7 +169,7 @@ void ImageExporter::run( const KigPart& doc, KigWidget& w )
p.drawObjects( doc.document().objects(), false );
if ( ! img.save( filename, type.latin1() ) )
{
KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to image \"%1\"" ).tqarg( filename ) );
KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to image \"%1\"" ).arg( filename ) );
}
}
@ -593,7 +593,7 @@ void XFigExporter::run( const KigPart& doc, KigWidget& w )
{
KMessageBox::sorry( &w, i18n( "The file \"%1\" could not be opened. Please "
"check if the file permissions are set correctly." )
.tqarg( file_name ) );
.arg( file_name ) );
return;
};
TQTextStream stream( &file );

6
kig/filters/filter.cc
Unescape View File

@ -73,14 +73,14 @@ void KigFilter::fileNotFound( const TQString& file ) const
i18n( "The file \"%1\" could not be opened. "
"This probably means that it does not "
"exist, or that it cannot be opened due to "
"its permissions" ).tqarg( file ) );
"its permissions" ).arg( file ) );
}
void KigFilter::parseError( const TQString& file, const TQString& explanation ) const
{
const TQString text =
i18n( "An error was encountered while parsing the file \"%1\". It "
"cannot be opened." ).tqarg( file );
"cannot be opened." ).arg( file );
const TQString title = i18n( "Parse Error" );
if ( explanation.isNull() )
@ -92,7 +92,7 @@ void KigFilter::parseError( const TQString& file, const TQString& explanation )
void KigFilter::notSupported( const TQString& file, const TQString& explanation ) const
{
KMessageBox::detailedSorry( 0,
i18n( "Kig cannot open the file \"%1\"." ).tqarg( file ),
i18n( "Kig cannot open the file \"%1\"." ).arg( file ),
explanation, i18n( "Not Supported" ) );
}

2
kig/filters/filter.h
Unescape View File

@ -55,7 +55,7 @@ protected:
{ \
TQString locs = i18n( "An error was encountered at " \
"line %1 in file %2." ) \
.tqarg( __LINE__ ).tqarg( __FILE__ ); \
.arg( __LINE__ ).arg( __FILE__ ); \
parseError( file, locs ); \
return 0; \
}

2
kig/filters/kgeo-filter.h
Unescape View File

@ -25,7 +25,7 @@ class KSimpleConfig;
/**
* This is an import filter for files generated by the program KGeo,
* which was an interactive tqgeometry program in tdeedu. Kig is
* which was an interactive geometry program in tdeedu. Kig is
* supposed to be its successor, and this import filter is part of my
* attempt to achieve that :)
*

8
kig/filters/latexexporter.cc
Unescape View File

@ -228,9 +228,9 @@ void LatexExportImpVisitor::plotGenericCurve( const CurveImp* imp )
if ( width == -1 ) width = 1;
TQString prefix = TQString( "\\pscurve[linecolor=%1,linewidth=%2,%3]" )
.tqarg( mcurcolorid )
.tqarg( width / 100.0 )
.tqarg( writeStyle( mcurobj->drawer()->style() ) );
.arg( mcurcolorid )
.arg( width / 100.0 )
.arg( writeStyle( mcurobj->drawer()->style() ) );
std::vector< std::vector< Coordinate > > coordlist;
coordlist.push_back( std::vector< Coordinate >() );
@ -507,7 +507,7 @@ void LatexExporter::run( const KigPart& doc, KigWidget& w )
{
KMessageBox::sorry( &w, i18n( "The file \"%1\" could not be opened. Please "
"check if the file permissions are set correctly." )
.tqarg( file_name ) );
.arg( file_name ) );
return;
};

8
kig/filters/native-filter.cc
Unescape View File

@ -193,7 +193,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
if ( major > 0 || minor > 9 )
{
notSupported( file, i18n( "This file was created by Kig version \"%1\", "
"which this version cannot open." ).tqarg( version ) );
"which this version cannot open." ).arg( version ) );
return false;
}
else if ( major == 0 && minor <= 3 )
@ -204,7 +204,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
"You can try to open this file with an older Kig "
"version (0.4 to 0.6),\n"
"and then save it again, which will save it in the "
"new format." ).tqarg( version ) );
"new format." ).arg( version ) );
return false;
}
else if ( major == 0 && minor <= 6 )
@ -338,7 +338,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, const TQDomElement&
"which this Kig version does not support."
"Perhaps you have compiled Kig without support "
"for this object type,"
"or perhaps you are using an older Kig version." ).tqarg( tmp ) );
"or perhaps you are using an older Kig version." ).arg( tmp ) );
return false;
};
@ -485,7 +485,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement&
"which this Kig version does not support."
"Perhaps you have compiled Kig without support "
"for this object type,"
"or perhaps you are using an older Kig version." ).tqarg( tmp ) );
"or perhaps you are using an older Kig version." ).arg( tmp ) );
return false;
}

4
kig/filters/svgexporter.cc
Unescape View File

@ -81,7 +81,7 @@ void SVGExporter::run( const KigPart& part, KigWidget& w )
{
KMessageBox::sorry( &w, i18n( "The file \"%1\" could not be opened. Please "
"check if the file permissions are set correctly." )
.tqarg( file_name ) );
.arg( file_name ) );
return;
};
@ -105,7 +105,7 @@ void SVGExporter::run( const KigPart& part, KigWidget& w )
if ( !pic.save( file_name, "SVG" ) )
{
KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to SVG file \"%1\"" ).tqarg( file_name ) );
KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to SVG file \"%1\"" ).arg( file_name ) );
}
}

2
kig/kfile/kfile_kig.cpp
Unescape View File

@ -114,7 +114,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
TQString compatversion = main.attribute( "CompatibilityVersion" );
if ( compatversion.isEmpty() )
compatversion = i18n( "%1 represents Kig version",
"%1 (as the version)" ).tqarg( version );
"%1 (as the version)" ).arg( version );
appendItem( metagroup, "CompatVersion", compatversion );
// reading the Coordinate System...

2
kig/kig/kig.cpp
Unescape View File

@ -219,7 +219,7 @@ bool Kig::queryClose()
switch( KMessageBox::warningYesNoCancel
(
widget(),
i18n("Save changes to document %1?").tqarg(m_part->url().path()),
i18n("Save changes to document %1?").arg(m_part->url().path()),
i18n("Save Changes?"),KStdGuiItem::save(),KStdGuiItem::discard()
))
{

24
kig/kig/kig_commands.cpp
Unescape View File

@ -97,7 +97,7 @@ KigCommand* KigCommand::removeCommand( KigPart& doc, const std::vector<ObjectHol
if ( os.size() == 1 )
text = os.back()->imp()->type()->removeAStatement();
else
text = i18n( "Remove %1 Objects" ).tqarg( os.size() );
text = i18n( "Remove %1 Objects" ).arg( os.size() );
KigCommand* ret = new KigCommand( doc, text );
ret->addTask( new RemoveObjectsTask( os ) );
return ret;
@ -109,7 +109,7 @@ KigCommand* KigCommand::addCommand( KigPart& doc, const std::vector<ObjectHolder
if ( os.size() == 1 )
text = os.back()->imp()->type()->addAStatement();
else
text = i18n( "Add %1 Objects" ).tqarg( os.size() );
text = i18n( "Add %1 Objects" ).arg( os.size() );
KigCommand* ret = new KigCommand( doc, text );
ret->addTask( new AddObjectsTask( os ) );
return ret;
@ -181,11 +181,11 @@ void ChangeObjectConstCalcerTask::execute( KigPart& doc )
{
mnewimp = mcalcer->switchImp( mnewimp );
std::set<ObjectCalcer*> alltqchildren = getAllChildren( mcalcer.get() );
std::vector<ObjectCalcer*> alltqchildrenvect( alltqchildren.begin(), alltqchildren.end() );
alltqchildrenvect = calcPath( alltqchildrenvect );
for ( std::vector<ObjectCalcer*>::iterator i = alltqchildrenvect.begin();
i != alltqchildrenvect.end(); ++i )
std::set<ObjectCalcer*> allchildren = getAllChildren( mcalcer.get() );
std::vector<ObjectCalcer*> allchildrenvect( allchildren.begin(), allchildren.end() );
allchildrenvect = calcPath( allchildrenvect );
for ( std::vector<ObjectCalcer*>::iterator i = allchildrenvect.begin();
i != allchildrenvect.end(); ++i )
( *i )->calc( doc.document() );
}
@ -313,11 +313,11 @@ void ChangeParentsAndTypeTask::execute( KigPart& doc )
for ( std::vector<ObjectCalcer*>::iterator i = newparents.begin(); i != newparents.end(); ++i )
( *i )->calc( doc.document() );
d->o->calc( doc.document() );
std::set<ObjectCalcer*> alltqchildren = getAllChildren( d->o );
std::vector<ObjectCalcer*> alltqchildrenvect( alltqchildren.begin(), alltqchildren.end() );
alltqchildrenvect = calcPath( alltqchildrenvect );
for ( std::vector<ObjectCalcer*>::iterator i = alltqchildrenvect.begin();
i != alltqchildrenvect.end(); ++i )
std::set<ObjectCalcer*> allchildren = getAllChildren( d->o );
std::vector<ObjectCalcer*> allchildrenvect( allchildren.begin(), allchildren.end() );
allchildrenvect = calcPath( allchildrenvect );
for ( std::vector<ObjectCalcer*>::iterator i = allchildrenvect.begin();
i != allchildrenvect.end(); ++i )
( *i )->calc( doc.document() );
}

8
kig/kig/kig_part.cpp
Unescape View File

@ -369,7 +369,7 @@ bool KigPart::openFile()
{
KMessageBox::sorry( widget(),
i18n( "The file \"%1\" you tried to open does not exist. "
"Please verify that you entered the correct path." ).tqarg( m_file ),
"Please verify that you entered the correct path." ).arg( m_file ),
i18n( "File Not Found" ) );
return false;
};
@ -390,7 +390,7 @@ bool KigPart::openFile()
"question would be worth implementing support for, you can "
"always ask us nicely on mailto:toscano.pino@tiscali.it "
"or do the work yourself and send me a patch."
).tqarg(mimeType->name()),
).arg(mimeType->name()),
i18n( "Format Not Supported" )
);
return false;
@ -466,7 +466,7 @@ void KigPart::_addObject( ObjectHolder* o )
void KigPart::delObject( ObjectHolder* o )
{
// we delete all tqchildren and their tqchildren etc. too...
// we delete all children and their children etc. too...
std::vector<ObjectHolder*> os;
os.push_back( o );
delObjects( os );
@ -619,7 +619,7 @@ bool KigPart::internalSaveAs()
{
int ret = KMessageBox::warningContinueCancel( m_widget,
i18n( "The file \"%1\" already exists. Do you wish to overwrite it?" )
.tqarg( file_name ), i18n( "Overwrite File?" ), i18n("Overwrite") );
.arg( file_name ), i18n( "Overwrite File?" ), i18n("Overwrite") );
if ( ret != KMessageBox::Continue )
{
return false;

16
kig/misc/calcpaths.cc
Unescape View File

@ -75,7 +75,7 @@ void localdfs( ObjectCalcer* obj,
std::vector<ObjectCalcer*>& all)
{
visited.push_back( obj );
const std::vector<ObjectCalcer*> o = obj->tqchildren();
const std::vector<ObjectCalcer*> o = obj->children();
for ( std::vector<ObjectCalcer*>::const_iterator i = o.begin(); i != o.end(); ++i )
{
if ( std::find( visited.begin(), visited.end(), *i ) == visited.end() )
@ -98,7 +98,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& os )
// the general idea here:
// first we build a new Objects variable. For every object in os,
// we put all of its tqchildren at the end of it, and we do the same
// we put all of its children at the end of it, and we do the same
// for the ones we add..
// "all" is the Objects var we're building...
@ -115,7 +115,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& os )
{
for ( std::vector<ObjectCalcer*>::const_iterator i = tmp.begin(); i != tmp.end(); ++i )
{
const std::vector<ObjectCalcer*> o = (*i)->tqchildren();
const std::vector<ObjectCalcer*> o = (*i)->children();
std::copy( o.begin(), o.end(), std::back_inserter( all ) );
std::copy( o.begin(), o.end(), std::back_inserter( tmp2 ) );
};
@ -148,7 +148,7 @@ bool addBranch( const std::vector<ObjectCalcer*>& o, const ObjectCalcer* to, std
if ( *i == to )
rb = true;
else
if ( addBranch( (*i)->tqchildren(), to, ret ) )
if ( addBranch( (*i)->children(), to, ret ) )
{
rb = true;
ret.push_back( *i );
@ -163,7 +163,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& from, con
for ( std::vector<ObjectCalcer*>::const_iterator i = from.begin(); i != from.end(); ++i )
{
(void) addBranch( (*i)->tqchildren(), to, all );
(void) addBranch( (*i)->children(), to, all );
};
std::vector<ObjectCalcer*> ret;
@ -193,7 +193,7 @@ static bool visit( const ObjectCalcer* o, const std::vector<ObjectCalcer*>& from
// this function returns true if the visited object depends on one
// of the objects in from. If we encounter objects that are on the
// side of the tree path ( they do not depend on from themselves,
// but their direct tqchildren do ), then we add them to ret.
// but their direct children do ), then we add them to ret.
if ( std::find( from.begin(), from.end(), o ) != from.end() ) return true;
std::vector<bool> deps( o->parents().size(), false );
@ -289,8 +289,8 @@ std::set<ObjectCalcer*> getAllChildren( const std::vector<ObjectCalcer*> objs )
i != cur.end(); ++i )
{
ret.insert( *i );
std::vector<ObjectCalcer*> tqchildren = (*i)->tqchildren();
next.insert( tqchildren.begin(), tqchildren.end() );
std::vector<ObjectCalcer*> children = (*i)->children();
next.insert( children.begin(), children.end() );
};
cur = next;
};

4
kig/misc/calcpaths.h
Unescape View File

@ -30,7 +30,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& os );
/**
* This is a different function for more or less the same purpose. It
* takes a few Objects, which are considered to have been calced
* already. Then, it puts the necessary part of their tqchildren in the
* already. Then, it puts the necessary part of their children in the
* right order, so that calc()-ing correctly updates all of their data
* ( they're calc'ed in the right order, i mean... ). The objects in
* from are normally not included in the output, unless they appear
@ -42,7 +42,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& from, con
* This function returns all objects on the side of the path through
* the dependency tree from from down to to. This means that we look
* for any objects that don't depend on any of the objects in from
* themselves, but of which one of the direct tqchildren does. We need
* themselves, but of which one of the direct children does. We need
* this function for Locus stuff...
*/
std::vector<ObjectCalcer*> sideOfTreePath( const std::vector<ObjectCalcer*>& from, const ObjectCalcer* to );

4
kig/misc/coordinate_system.cpp
Unescape View File

@ -146,7 +146,7 @@ TQString EuclideanCoords::fromScreen( const Coordinate& p, const KigDocument& d
int l = kigMax( 0, (int) ( 3 - log10( m ) ) );
TQString xs = KGlobal::locale()->formatNumber( p.x, l );
TQString ys = KGlobal::locale()->formatNumber( p.y, l );
return TQString::fromLatin1( "( %1; %2 )" ).tqarg( xs ).tqarg( ys );
return TQString::fromLatin1( "( %1; %2 )" ).arg( xs ).arg( ys );
}
Coordinate EuclideanCoords::toScreen(const TQString& s, bool& ok) const
@ -354,7 +354,7 @@ TQString PolarCoords::fromScreen( const Coordinate& pt, const KigDocument& d ) c
TQString rs = KGlobal::locale()->formatNumber( r, l );
TQString ts = KGlobal::locale()->formatNumber( theta, 0 );
return TQString::fromLatin1("( %1; %2° )").tqarg( rs ).tqarg( ts );
return TQString::fromLatin1("( %1; %2° )").arg( rs ).arg( ts );
}
TQString PolarCoords::coordinateFormatNotice() const

2
kig/misc/kigfiledialog.cc
Unescape View File

@ -53,7 +53,7 @@ void KigFileDialog::accept()
{
int ret = KMessageBox::warningContinueCancel( this,
i18n( "The file \"%1\" already exists. Do you wish to overwrite it?" )
.tqarg( sFile ), i18n( "Overwrite File?" ), i18n("Overwrite") );
.arg( sFile ), i18n( "Overwrite File?" ), i18n("Overwrite") );
if ( ret != KMessageBox::Continue )
{
KFileDialog::reject();

2
kig/misc/kiginputdialog.cc
Unescape View File

@ -85,7 +85,7 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
d->m_textEdit->setText( label );
d->m_textEdit->setReadOnly( true );
d->m_textEdit->setFocusPolicy( TQ_NoFocus );
// d->m_textEdit->setAlignment( d->m_textEdit->tqalignment() | TQt::WordBreak );
// d->m_textEdit->setAlignment( d->m_textEdit->alignment() | TQt::WordBreak );
d->m_textEdit->setFrameStyle( TQFrame::NoFrame );
mainlay->addWidget( d->m_textEdit );

8
kig/misc/lists.cc
Unescape View File

@ -301,13 +301,13 @@ bool MacroList::load( const TQString& f, std::vector<Macro*>& ret, const KigPart
TQFile file( f );
if ( ! file.open( IO_ReadOnly ) )
{
KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).tqarg( f ) );
KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).arg( f ) );
return false;
}
TQDomDocument doc( "KigMacroFile" );
if ( !doc.setContent( &file ) )
{
KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).tqarg( f ) );
KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).arg( f ) );
return false;
}
file.close();
@ -318,7 +318,7 @@ bool MacroList::load( const TQString& f, std::vector<Macro*>& ret, const KigPart
else
{
KMessageBox::detailedSorry(
0, i18n( "Kig cannot open the macro file \"%1\"." ).tqarg( f ),
0, i18n( "Kig cannot open the macro file \"%1\"." ).arg( f ),
i18n( "This file was created by a very old Kig version (pre-0.4). "
"Support for this format has been removed from recent Kig versions. "
"You can try to import this macro using a previous Kig version "
@ -372,7 +372,7 @@ bool MacroList::loadNew( const TQDomElement& docelem, std::vector<Macro*>& ret,
assert( hierarchy );
// if the macro has no name, we give it a bogus name...
if ( name.isEmpty() )
name = i18n( "Unnamed Macro #%1" ).tqarg( unnamedindex++ );
name = i18n( "Unnamed Macro #%1" ).arg( unnamedindex++ );
MacroConstructor* ctor =
new MacroConstructor( *hierarchy, i18n( name.latin1() ), i18n( description.latin1() ), iconfile );
delete hierarchy;

4
kig/misc/object_hierarchy.cc
Unescape View File

@ -478,7 +478,7 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement&
#define KIG_GENERIC_PARSE_ERROR \
{ \
error = i18n( "An error was encountered at line %1 in file %2." ) \
.tqarg( __LINE__ ).tqarg( __FILE__ ); \
.arg( __LINE__ ).arg( __FILE__ ); \
return 0; \
}
@ -544,7 +544,7 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement&
"which this Kig version does not support."
"Perhaps you have compiled Kig without support "
"for this object type,"
"or perhaps you are using an older Kig version." ).tqarg( TQString(typen) );
"or perhaps you are using an older Kig version." ).arg( TQString(typen) );
return 0;
}

2
kig/misc/object_hierarchy.h
Unescape View File

@ -73,7 +73,7 @@ public:
std::vector<ObjectImp*> calc( const Args& a, const KigDocument& doc ) const;
/**
* saves the ObjectHierarchy data in tqchildren xml tags of \p parent ..
* saves the ObjectHierarchy data in children xml tags of \p parent ..
*/
void serialize( TQDomElement& parent, TQDomDocument& doc ) const;
/**

14
kig/misc/special_constructors.cc
Unescape View File

@ -210,14 +210,14 @@ const int LocusConstructor::wantArgs(
if ( dynamic_cast<ObjectTypeCalcer*>( os.front() ) &&
static_cast<ObjectTypeCalcer*>( os.front() )->type()->inherits( ObjectType::ID_ConstrainedPointType ) )
{
std::set<ObjectCalcer*> tqchildren = getAllChildren( os.front() );
return tqchildren.find( os.back() ) != tqchildren.end() ? ret : ArgsParser::Invalid;
std::set<ObjectCalcer*> children = getAllChildren( os.front() );
return children.find( os.back() ) != children.end() ? ret : ArgsParser::Invalid;
}
if ( dynamic_cast<ObjectTypeCalcer*>( os.back() ) &&
static_cast<ObjectTypeCalcer*>( os.back() )->type()->inherits( ObjectType::ID_ConstrainedPointType ) )
{
std::set<ObjectCalcer*> tqchildren = getAllChildren( os.back() );
return tqchildren.find( os.front() ) != tqchildren.end() ? ret : ArgsParser::Invalid;
std::set<ObjectCalcer*> children = getAllChildren( os.back() );
return children.find( os.front() ) != children.end() ? ret : ArgsParser::Invalid;
}
return ArgsParser::Invalid;
}
@ -682,7 +682,7 @@ void PolygonBCVConstructor::handlePrelim(
ptn = PointImp( where );
ptn.draw( p );
if ( i > 5 ) continue;
text = TextImp( TQString( "(%1)" ).tqarg(i), where, false );
text = TextImp( TQString( "(%1)" ).arg(i), where, false );
text.draw( p );
}
p.setStyle( Qt::DotLine );
@ -752,13 +752,13 @@ TQString PolygonBCVConstructor::useText( const ObjectCalcer&, const std::vector<
{
TQString result = TQString(
i18n( "Adjust the number of sides (%1/%2)" )
).tqarg( nsides ).tqarg( winding );
).arg( nsides ).arg( winding );
return result;
} else
{
TQString result = TQString(
i18n( "Adjust the number of sides (%1)" )
).tqarg( nsides );
).arg( nsides );
return result;
}
break;

4
kig/modes/label.cc
Unescape View File

@ -376,7 +376,7 @@ void TextLabelModeBase::updateLinksLabel()
}
else
// otherwise, we show a stub...
linktext = i18n( "argument %1" ).tqarg( count + 1 );
linktext = i18n( "argument %1" ).arg( count + 1 );
d->wiz->myCustomWidget1->addLink( linktext, buf );
// set pos and prevpos to the next char after the last match, so
@ -406,7 +406,7 @@ void TextLabelModeBase::linkClicked( int i )
d->mwawd = ReallySelectingArgs;
d->mwaaws = i;
mdoc.emitStatusBarText( i18n( "Selecting argument %1" ).tqarg( i + 1 ) );
mdoc.emitStatusBarText( i18n( "Selecting argument %1" ).arg( i + 1 ) );
}
void TextLabelModeBase::redrawScreen( KigWidget* w )

4
kig/modes/label.h
Unescape View File

@ -35,7 +35,7 @@ class ObjectCalcer;
/**
* this is the base class for TextLabelConstructionMode and
* TextLabelRedefineMode.. most of the work is done in this class,
* with some specific things delegated to the tqchildren.. Template
* with some specific things delegated to the children.. Template
* method pattern, right ? :)
*/
class TextLabelModeBase
@ -65,7 +65,7 @@ protected:
void setLocationParent( ObjectCalcer* o );
/**
* objects you pass here, should be newly created property objects,
* that have no tqchildren..
* that have no children..
*/
void setPropertyObjects( const argvect& props );
void setFrame( bool f );

2
kig/modes/macrowizardbase.ui
Unescape View File

@ -55,7 +55,7 @@
<property name="text">
<string>Select the "given" objects for your new macro and press "Next".</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>

10
kig/modes/moving.cc
Unescape View File

@ -143,8 +143,8 @@ MovingMode::MovingMode( const std::vector<ObjectHolder*>& os, const Coordinate&
std::set<ObjectCalcer*> tmp = objs;
for ( std::set<ObjectCalcer*>::const_iterator i = tmp.begin(); i != tmp.end(); ++i )
{
std::set<ObjectCalcer*> tqchildren = getAllChildren(*i);
objs.insert( tqchildren.begin(), tqchildren.end() );
std::set<ObjectCalcer*> children = getAllChildren(*i);
objs.insert( children.begin(), children.end() );
}
initScreen( calcPath( std::vector<ObjectCalcer*>( objs.begin(), objs.end() ) ) );
@ -154,7 +154,7 @@ void MovingMode::stopMove()
{
TQString text = d->emo.size() == 1 ?
d->emo[0]->imp()->type()->moveAStatement() :
i18n( "Move %1 Objects" ).tqarg( d->emo.size() );
i18n( "Move %1 Objects" ).arg( d->emo.size() );
KigCommand* mc = new KigCommand( mdoc, text );
d->mon->finish( mc );
mdoc.history()->addCommand( mc );
@ -182,8 +182,8 @@ PointRedefineMode::PointRedefineMode( ObjectHolder* p, KigPart& d, KigWidget& v
std::vector<ObjectCalcer*> parents = getAllParents( mp->calcer() );
mmon = new MonitorDataObjects( parents );
std::vector<ObjectCalcer*> moving = parents;
std::set<ObjectCalcer*> tqchildren = getAllChildren( mp->calcer() );
std::copy( tqchildren.begin(), tqchildren.end(), std::back_inserter( moving ) );
std::set<ObjectCalcer*> children = getAllChildren( mp->calcer() );
std::copy( children.begin(), children.end(), std::back_inserter( moving ) );
initScreen( moving );
}

6
kig/modes/popup.cc
Unescape View File

@ -198,12 +198,12 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
else if ( single )
{
if ( !objs[0]->name().isNull() )
title = TQString::fromLatin1( "%1 %2" ).tqarg( objs[0]->imp()->type()->translatedName() ).tqarg( objs[0]->name() );
title = TQString::fromLatin1( "%1 %2" ).arg( objs[0]->imp()->type()->translatedName() ).arg( objs[0]->name() );
else
title = objs[0]->imp()->type()->translatedName();
}
else
title = i18n( "%1 Objects" ).tqarg( objs.size() );
title = i18n( "%1 Objects" ).arg( objs.size() );
insertTitle( title, 1 );
if ( !empty )
@ -1182,7 +1182,7 @@ ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view,
for ( uint i = 0; i < mobjs.size(); i++ )
{
insertItem( !mobjs[i]->name().isEmpty()
? TQString::fromLatin1( "%1 %2" ).tqarg( mobjs[i]->imp()->type()->translatedName() ).tqarg( mobjs[i]->name() )
? TQString::fromLatin1( "%1 %2" ).arg( mobjs[i]->imp()->type()->translatedName() ).arg( mobjs[i]->name() )
: mobjs[i]->imp()->type()->translatedName(),
i );
}

2
kig/modes/textlabelwizard.cc
Unescape View File

@ -84,7 +84,7 @@ void TextLabelWizard::linkClicked( int which )
void TextLabelWizard::relayoutArgsPage()
{
select_arguments_pageLayout->activate();
tqrepaint();
repaint();
}
void TextLabelWizard::slotHelpClicked()

4
kig/modes/textlabelwizardbase.ui
Unescape View File

@ -34,7 +34,7 @@
<string>Enter the text for your label here and press "Next".
If you want to show variable parts, then put %1, %2, ... at the appropriate places (e.g. "This segment is %1 units long.").</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -71,7 +71,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac
<property name="text">
<string>Now select the argument(s) you need. For every argument, click on it, select an object and a property in the Kig window, and click finish when you are done...</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>

2
kig/modes/typesdialog.cpp
Unescape View File

@ -173,7 +173,7 @@ void TypesDialog::exportType()
TQFile fi( file_name );
if ( fi.exists() )
if ( KMessageBox::warningContinueCancel( this, i18n( "The file \"%1\" already exists. "
"Do you wish to overwrite it?" ).tqarg( fi.name() ),
"Do you wish to overwrite it?" ).arg( fi.name() ),
i18n( "Overwrite File?" ), i18n("Overwrite") ) == KMessageBox::Cancel )
return;
MacroList::instance()->save( types, file_name );

8
kig/objects/bogus_imp.cc
Unescape View File

@ -88,22 +88,22 @@ InvalidImp::InvalidImp()
void InvalidImp::fillInNextEscape( TQString& s, const KigDocument& ) const
{
s = s.tqarg( "[invalid]" );
s = s.arg( "[invalid]" );
}
void DoubleImp::fillInNextEscape( TQString& s, const KigDocument& ) const
{
s = s.tqarg( mdata );
s = s.arg( mdata );
}
void IntImp::fillInNextEscape( TQString& s, const KigDocument& ) const
{
s = s.tqarg( mdata );
s = s.arg( mdata );
}
void StringImp::fillInNextEscape( TQString& s, const KigDocument& ) const
{
s = s.tqarg( mdata );
s = s.arg( mdata );
}
HierarchyImp::HierarchyImp( const ObjectHierarchy& h )

16
kig/objects/circle_imp.cc
Unescape View File

@ -235,8 +235,8 @@ TQString CircleImp::polarEquationString( const KigDocument& w ) const
{
TQString ret = i18n( "rho = %1 [centered at %2]" );
ConicPolarData data = polarData();
ret = ret.tqarg( data.pdimen, 0, 'g', 3 );
ret = ret.tqarg( w.coordinateSystem().fromScreen( data.focus1, w ) );
ret = ret.arg( data.pdimen, 0, 'g', 3 );
ret = ret.arg( w.coordinateSystem().fromScreen( data.focus1, w ) );
return ret;
}
@ -244,18 +244,18 @@ TQString CircleImp::cartesianEquationString( const KigDocument& ) const
{
TQString ret = i18n( "x² + y² + %1 x + %2 y + %3 = 0" );
ConicCartesianData data = cartesianData();
ret = ret.tqarg( data.coeffs[3], 0, 'g', 3 );
ret = ret.tqarg( data.coeffs[4], 0, 'g', 3 );
ret = ret.tqarg( data.coeffs[5], 0, 'g', 3 );
ret = ret.arg( data.coeffs[3], 0, 'g', 3 );
ret = ret.arg( data.coeffs[4], 0, 'g', 3 );
ret = ret.arg( data.coeffs[5], 0, 'g', 3 );
return ret;
}
TQString CircleImp::simplyCartesianEquationString( const KigDocument& ) const
{
TQString ret = i18n( "( x - %1 )² + ( y - %2 )² = %3" );
ret = ret.tqarg( mcenter.x, 0, 'g', 3 );
ret = ret.tqarg( mcenter.y, 0, 'g', 3 );
ret = ret.tqarg( mradius * mradius, 0, 'g', 3 );
ret = ret.arg( mcenter.x, 0, 'g', 3 );
ret = ret.arg( mcenter.y, 0, 'g', 3 );
ret = ret.arg( mradius * mradius, 0, 'g', 3 );
return ret;
}

20
kig/objects/conic_imp.cc
Unescape View File

@ -204,12 +204,12 @@ TQString ConicImp::cartesianEquationString( const KigDocument& ) const
{
TQString ret = i18n( "%1 x² + %2 y² + %3 xy + %4 x + %5 y + %6 = 0" );
ConicCartesianData data = cartesianData();
ret = ret.tqarg( data.coeffs[0], 0, 'g', 3 );
ret = ret.tqarg( data.coeffs[1], 0, 'g', 3 );
ret = ret.tqarg( data.coeffs[2], 0, 'g', 3 );
ret = ret.tqarg( data.coeffs[3], 0, 'g', 3 );
ret = ret.tqarg( data.coeffs[4], 0, 'g', 3 );
ret = ret.tqarg( data.coeffs[5], 0, 'g', 3 );
ret = ret.arg( data.coeffs[0], 0, 'g', 3 );
ret = ret.arg( data.coeffs[1], 0, 'g', 3 );
ret = ret.arg( data.coeffs[2], 0, 'g', 3 );
ret = ret.arg( data.coeffs[3], 0, 'g', 3 );
ret = ret.arg( data.coeffs[4], 0, 'g', 3 );
ret = ret.arg( data.coeffs[5], 0, 'g', 3 );
return ret;
}
@ -218,11 +218,11 @@ TQString ConicImp::polarEquationString( const KigDocument& w ) const
TQString ret = i18n( "rho = %1/(1 + %2 cos theta + %3 sin theta)\n [centered at %4]" );
const ConicPolarData data = polarData();
ret = ret.tqarg( data.pdimen, 0, 'g', 3 );
ret = ret.tqarg( -data.ecostheta0, 0, 'g', 3 );
ret = ret.tqarg( -data.esintheta0, 0, 'g', 3 );
ret = ret.arg( data.pdimen, 0, 'g', 3 );
ret = ret.arg( -data.ecostheta0, 0, 'g', 3 );
ret = ret.arg( -data.esintheta0, 0, 'g', 3 );
ret = ret.tqarg( w.coordinateSystem().fromScreen( data.focus1, w ) );
ret = ret.arg( w.coordinateSystem().fromScreen( data.focus1, w ) );
return ret;
}

20
kig/objects/cubic_imp.cc
Unescape View File

@ -417,18 +417,18 @@ TQString CubicImp::cartesianEquationString( const KigDocument& ) const
*/
TQString ret = i18n( "%6 x³ + %9 y³ + %7 x²y + %8 xy² + %5 y² + %3 x² + %4 xy + %1 x + %2 y" );
ret = ret.tqarg( mdata.coeffs[1], 0, 'g', 3 );
ret = ret.tqarg( mdata.coeffs[2], 0, 'g', 3 );
ret = ret.tqarg( mdata.coeffs[3], 0, 'g', 3 );
ret = ret.tqarg( mdata.coeffs[4], 0, 'g', 3 );
ret = ret.tqarg( mdata.coeffs[5], 0, 'g', 3 );
ret = ret.tqarg( mdata.coeffs[6], 0, 'g', 3 );
ret = ret.tqarg( mdata.coeffs[7], 0, 'g', 3 );
ret = ret.tqarg( mdata.coeffs[8], 0, 'g', 3 );
ret = ret.tqarg( mdata.coeffs[9], 0, 'g', 3 );
ret = ret.arg( mdata.coeffs[1], 0, 'g', 3 );
ret = ret.arg( mdata.coeffs[2], 0, 'g', 3 );
ret = ret.arg( mdata.coeffs[3], 0, 'g', 3 );
ret = ret.arg( mdata.coeffs[4], 0, 'g', 3 );
ret = ret.arg( mdata.coeffs[5], 0, 'g', 3 );
ret = ret.arg( mdata.coeffs[6], 0, 'g', 3 );
ret = ret.arg( mdata.coeffs[7], 0, 'g', 3 );
ret = ret.arg( mdata.coeffs[8], 0, 'g', 3 );
ret = ret.arg( mdata.coeffs[9], 0, 'g', 3 );
ret.append( i18n( " + %1 = 0" ) );
ret = ret.tqarg( mdata.coeffs[0], 0, 'g', 3 );
ret = ret.arg( mdata.coeffs[0], 0, 'g', 3 );
// we should find a common place to do this...
ret.replace( "+ -", "- " );

4
kig/objects/line_imp.cc
Unescape View File

@ -186,8 +186,8 @@ const TQString AbstractLineImp::equationString() const
TQString::fromUtf8( r > 0 ? "+" : "-" ) +
TQString::fromUtf8( " %2" );
ret = ret.tqarg( m, 0, 'g', 3 );
ret = ret.tqarg( abs( r ), 0, 'g', 3 );
ret = ret.arg( m, 0, 'g', 3 );
ret = ret.arg( abs( r ), 0, 'g', 3 );
return ret;
}

12
kig/objects/object_calcer.cc
Unescape View File

@ -106,16 +106,16 @@ std::vector<ObjectCalcer*> ObjectTypeCalcer::parents() const
void ObjectCalcer::addChild( ObjectCalcer* c )
{
mtqchildren.push_back( c );
mchildren.push_back( c );
ref();
}
void ObjectCalcer::delChild( ObjectCalcer* c )
{
std::vector<ObjectCalcer*>::iterator i = std::find( mtqchildren.begin(), mtqchildren.end(), c );
assert( i != mtqchildren.end() );
std::vector<ObjectCalcer*>::iterator i = std::find( mchildren.begin(), mchildren.end(), c );
assert( i != mchildren.end() );
mtqchildren.erase( i );
mchildren.erase( i );
deref();
}
@ -175,9 +175,9 @@ ObjectImp* ObjectConstCalcer::switchImp( ObjectImp* newimp )
return ret;
}
std::vector<ObjectCalcer*> ObjectCalcer::tqchildren() const
std::vector<ObjectCalcer*> ObjectCalcer::children() const
{
return mtqchildren;
return mchildren;
}
const ObjectImpType* ObjectPropertyCalcer::impRequirement(

6
kig/objects/object_calcer.h
Unescape View File

@ -77,10 +77,10 @@ protected:
void ref();
void deref();
// we keep track of our tqchildren, so algorithms can easily walk over
// we keep track of our children, so algorithms can easily walk over
// the dependency graph..
std::vector<ObjectCalcer*> mtqchildren;
std::vector<ObjectCalcer*> mchildren;
ObjectCalcer();
public:
@ -102,7 +102,7 @@ public:
/**
* Returns the child ObjectCalcer's of this ObjectCalcer.
*/
std::vector<ObjectCalcer*> tqchildren() const;
std::vector<ObjectCalcer*> children() const;
virtual ~ObjectCalcer();
/**

6
kig/objects/object_factory.cc
Unescape View File

@ -299,12 +299,12 @@ void ObjectFactory::redefinePoint(
std::mem_fun( calcmeth ) );
ObjectCalcer* v = 0;
// we don't want one of our tqchildren as a parent...
std::set<ObjectCalcer*> tqchildren = getAllChildren( point );
// we don't want one of our children as a parent...
std::set<ObjectCalcer*> children = getAllChildren( point );
for ( std::vector<ObjectCalcer*>::iterator i = os.begin();
i != os.end(); ++i )
if ( (*i)->imp()->inherits( CurveImp::stype() ) &&
tqchildren.find( *i ) == tqchildren.end() )
children.find( *i ) == children.end() )
{
v = *i;
break;

2
kig/objects/object_holder.cc
Unescape View File

@ -160,5 +160,5 @@ TQString ObjectHolder::selectStatement() const
if ( n.isEmpty() )
return i18n( imp()->type()->selectStatement() );
else
return i18n( imp()->type()->selectNameStatement() ).tqarg( n );
return i18n( imp()->type()->selectNameStatement() ).arg( n );
}

2
kig/objects/object_imp.h
Unescape View File

@ -170,7 +170,7 @@ public:
* Returns a translatable string of the form "Select point %1". %1
* will be filled in by whomever calls this function with the name
* of the object in question. This function should be used as
* follows: i18n( x->selectNameStatement() ).tqarg( xname ).
* follows: i18n( x->selectNameStatement() ).arg( xname ).
*/
const char* selectNameStatement() const;

4
kig/objects/object_imp_factory.cc
Unescape View File

@ -291,7 +291,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
#define KIG_GENERIC_PARSE_ERROR \
{ \
error = i18n( "An error was encountered at line %1 in file %2." ) \
.tqarg( __LINE__ ).tqarg( __FILE__ ); \
.arg( __LINE__ ).arg( __FILE__ ); \
return 0; \
}
@ -504,7 +504,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
"which this Kig version does not support."
"Perhaps you have compiled Kig without support "
"for this object type,"
"or perhaps you are using an older Kig version." ).tqarg( type );
"or perhaps you are using an older Kig version." ).arg( type );
return 0;
}

2
kig/objects/point_imp.cc
Unescape View File

@ -137,7 +137,7 @@ void PointImp::setCoordinate( const Coordinate& c )
void PointImp::fillInNextEscape( TQString& s, const KigDocument& doc ) const
{
s = s.tqarg( doc.coordinateSystem().fromScreen( mc, doc ) );
s = s.arg( doc.coordinateSystem().fromScreen( mc, doc ) );
}
void PointImp::visit( ObjectImpVisitor* vtor ) const

2
kig/scripting/newscriptwizardbase.ui
Unescape View File

@ -34,7 +34,7 @@
<string>Select the argument objects ( if any )
in the Kig window and press "Next".</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

2
kig/scripting/script-common.cc
Unescape View File

@ -58,7 +58,7 @@ TQString ScriptType::templateCode( ScriptType::Type type, std::list<ObjectHolder
if ( !firstarg ) tempcode += ", ";
else firstarg = false;
TQString n = ( *i )->name();
tempcode += n.isEmpty() ? temparg.tqarg( id ) : n;
tempcode += n.isEmpty() ? temparg.arg( id ) : n;
id++;
};
tempcode +=

4
kig/scripting/script_mode.cc
Unescape View File

@ -204,7 +204,7 @@ bool ScriptCreationMode::queryFinish()
KMessageBox::detailedSorry(
mwizard, i18n( "The Python interpreter caught an error during the execution of your "
"script. Please fix the script and click the Finish button again." ),
i18n( "The Python Interpreter generated the following error output:\n%1").tqarg( errtrace.data() ) );
i18n( "The Python Interpreter generated the following error output:\n%1").arg( errtrace.data() ) );
}
else
{
@ -322,7 +322,7 @@ bool ScriptEditMode::queryFinish()
KMessageBox::detailedSorry(
mpart.widget(), i18n( "The Python interpreter caught an error during the execution of your "
"script. Please fix the script." ),
i18n( "The Python Interpreter generated the following error output:\n%1").tqarg( errtrace.data() ) );
i18n( "The Python Interpreter generated the following error output:\n%1").arg( errtrace.data() ) );
}
else
{

6
kiten/dict.cpp
Unescape View File

@ -41,7 +41,7 @@ void msgerr(const TQString &msg, const TQString &dict = TQString())
{
TQString output = msg;
if (!dict.isNull())
output = msg.tqarg(dict);
output = msg.arg(dict);
KMessageBox::error(0, output);
}
}
@ -50,7 +50,7 @@ using namespace Dict;
TextType Dict::textType(const TQString &text)
{
ushort first = text.tqat(0).tqunicode();
ushort first = text.at(0).tqunicode();
if (first < 0x3000)
return Text_Latin;
@ -487,7 +487,7 @@ TQRegExp Dict::Index::createRegExp(SearchType type, const TQString &text, Dictio
regExp = "%1";
}
return TQRegExp(regExp.tqarg(text), caseSensitive);
return TQRegExp(regExp.arg(text), caseSensitive);
}
int Index::stringCompare(File &file, int index, TQCString str)

540
kiten/edict
View File

File diff suppressed because it is too large Load Diff

26
kiten/kanjidic
Unescape View File

@ -689,7 +689,7 @@
珪 373E U73ea B96 S10 N2937 V3638 L2564 MN20972 MP7.0914 P1-4-6 I4f6.4 Q1411.4 Ygui1 Wgyu ケイ たま {jade scepter or tablet (authority symbol)}
型 373F U578b B32 G4 S9 F482 N1077 V1010 H2638 DK1685 L680 K423 DO685 MN5030 MP3.0171 E468 IN888 DS595 DT523 DJ1318 DG353 P2-6-3 I3b6.11 Q1210.4 DR3272 Yxing2 Whyeong ケイ かた -がた {mould} {type} {model}
契 3740 U5951 B37 G8 S9 F898 N1177 V1155 H2639 DK1686 L1549 K1153 O980 DO1132 MN5917X MP3.0589 E1195 IN565 DJ751 DG417 P2-6-3 I2f7.6 Q5743.2 DR1463 Yqi4 Yxie4 Yqie4 Wgye Wgeul ケイ ちぎ.る {pledge} {promise} {vow}
形 3741 U5f62 B59 G2 S7 F418 N1589 V1713 H846 DK565 L1711 K408 O414 DO223 MN9969 MP4.0784 E104 IN395 DS200 DT141 DC306 DJ509 DB3.6 DG615 P1-4-3 I3j4.1 Q1242.2 DR3260 Yxing2 Whyeong ケイ ギョウ かた -がた かたち なり T1 ち {tqshape} {form} {style}
形 3741 U5f62 B59 G2 S7 F418 N1589 V1713 H846 DK565 L1711 K408 O414 DO223 MN9969 MP4.0784 E104 IN395 DS200 DT141 DC306 DJ509 DB3.6 DG615 P1-4-3 I3j4.1 Q1242.2 DR3260 Yxing2 Whyeong ケイ ギョウ かた -がた かたち なり T1 ち {shape} {form} {style}
径 3742 U5f84 B60 G4 S8 XJ0574D XJ06D74 F1435 N1602 V1730 H291 DK216 L882 K1451 O576 DO1630 MN10080P MP4.0820 E845 IN1475 DT502 DJ1448 DG622 P1-3-5 I3i5.5 Q2721.4 DR2072 Yjing4 Wgyeong ケイ みち こみち さしわたし ただちに {diameter} {path} {method}
恵 3743 U6075 B61 G8 S10 XJ0582A F925 N1681 V1847 H2659 DK1704 L612 K875 O1226 DO1498 MN10618P MP4.1049 E1196 IN1219 DJ1077 DG781 P2-6-4 I4k6.16 Q5033.6 DR1558 Yhui4 Whye ケイ エ めぐ.む めぐ.み T1 あや け さと さとし しげ へい み やす {favor} {blessing} {grace} {kindness}
慶 3744 U6176 B53 C61 G8 S15 F1300 N1539 V1967 H3173 DK2029 L2001 K962 O2425 DO1033 MN11145 MP4.1168 E1204 IN1632 DJ1732 DG799 P3-3-12 I3q12.8 Q0024.7 DR567 Yqing4 Wgyeong Wgang ケイ よろこ.び T1 き きよん け みち む やす よし {jubilation} {congratulate} {rejoice} {be happy}
@ -1081,7 +1081,7 @@
士 3B4E U58eb B33 G4 S3 F526 N1160 V1117 H3405 DK2129 L319 K301 O41 DO59 MN5638 MP3.0279 E494 IN572 DS410 DT441 DC386 DJ755 DG393 P4-3-2 I3p0.1 Q4010.0 DR1472 Yshi4 Wsa シ T1 お ま T2 さむらい {gentleman} {samurai}
始 3B4F U59cb B38 G3 S8 XJ13037 XJ1326B F244 N1208 V1203 H281 DK211 L747 K465 O1092 DO545 MN6166 MP3.0661 E288 IN494 DS225 DT299 DC321 DJ129 DB2.16 DG439 P1-3-5 I3e5.9 Q4346.0 DR1777 Yshi3 Wsi シ はじ.める -はじ.める はじ.まる T1 もと {commence} {begin}
姉 3B50 U59c9 B38 G2 S8 XJ1393D F1473 N1207 V1201 H280 DK210 L413 K1329 O847 DO120 MN6165 MP3.0661 E498 IN407 DS413 DT159 DJ77 DB3.15 DG438 P1-3-5 I3e5.8 Q4042.7 DR1744 ZSP1-3-4 Yzi3 Wja シ あね はは {elder sister}
姿 3B51 U59ff B38 G6 S9 F441 N1215 V1216 H2636 DK1684 L474 K592 O1217 DO1133 MN6257X MP3.0699 E877 IN929 DT883 DJ661 DG429 P2-6-3 I3e6.10 Q3740.4 DR369 Yzi1 Wja シ すがた T1 しな {figure} {form} {tqshape}
姿 3B51 U59ff B38 G6 S9 F441 N1215 V1216 H2636 DK1684 L474 K592 O1217 DO1133 MN6257X MP3.0699 E877 IN929 DT883 DJ661 DG429 P2-6-3 I3e6.10 Q3740.4 DR369 Yzi1 Wja シ すがた T1 しな {figure} {form} {shape}
子 3B52 U5b50 B39 G1 S3 F72 N1264 V1281 H3390 DK2125 L95 K56 O38 DO61 MN6930 MP3.0776 E25 IN103 DS31 DT18 DC42 DJ69 DB2.18 DG455 P4-3-1 I2c0.1 Q1740.7 DR3547 ZSP4-2-1 Yzi3 Yzi2 Yzi5 Wja シ ス ツ こ -こ ね T1 い き ぎ く け ねっ {child} {sign of the rat} {11PM-1AM} {first sign of Chinese zodiac}
屍 3B53 U5c4d B44 S9 N1391 V1420 H3099 L2222 MN7688 MP4.0152 P3-3-6 I3r6.2 Q7721.1 Yshi1 Wsi シ しかばね {corpse}
市 3B54 U5e02 B8 C50 G2 S5 F42 N284 V1549 H1993 DK1258 L412 K78 O195 DO119 MN8775 MP4.0397 E130 IN181 DS222 DT109 DC305 DJ547 DB2.4 DG556 P2-2-3 I2j3.1 Q0022.7 DR444 ZBP4-4-3 Yshi4 Wsi シ いち T1 い ち {market} {city} {town}
@ -1375,7 +1375,7 @@
証 3E5A U8a3c B149 G5 S12 XJ06B7A F306 N4341 V5589 H1506 DK1010 L380 K430 O1660 DO697 MN35341 MP10.0423 E715 IN484 DS816 DT754 DC448 DJ666 DG1672 P1-7-5 I7a5.5 Q0161.1 DR3073 Yzheng4 Wjeung ショウ あかし {evidence} {proof} {certificate}
詔 3E5B U8a54 B149 G8 S12 F2239 N4333 V5581 H1505 DK1009 L342 K2023 O1658 DO1213 MN35379 MP10.0429 E1407 IN1885 DJ1935 DG1673 P1-7-5 I7a5.10 Q0766.2 DR3077 Yzhao4 Wjo ショウ みことのり T1 さとし のり {imperial edict}
詳 3E5C U8a73 B149 G8 S13 F1178 N4357 V5607 H1526 DK1026 L550 K1172 O1927 DO896 MN35446 MP10.0456 E1409 IN1577 DJ944 DG1682 P1-7-6 I7a6.12 Q0865.1 DR3055 Yxiang2 Wsang Wyang ショウ くわ.しい つまび.らか T1 よし {detailed} {full} {minute} {accurate} {well-informed}
象 3E5D U8c61 B152 G4 S12 F394 N4472 V5744 H2134 DK1350 L1976 K575 O1761 DO809 MN36372 MP10.0657 E533 IN739 DS663 DT591 DJ939 DG1718 P2-2-10 I2n10.1 Q2723.2 DR2551 ZPP2-6-6 Yxiang4 Wsang ショウ ゾウ かたど.る T1 きさ {elephant} {pattern after} {imitate} {image} {tqshape} {sign (of the times)}
象 3E5D U8c61 B152 G4 S12 F394 N4472 V5744 H2134 DK1350 L1976 K575 O1761 DO809 MN36372 MP10.0657 E533 IN739 DS663 DT591 DJ939 DG1718 P2-2-10 I2n10.1 Q2723.2 DR2551 ZPP2-6-6 Yxiang4 Wsang ショウ ゾウ かたど.る T1 きさ {elephant} {pattern after} {imitate} {image} {shape} {sign (of the times)}
賞 3E5E U8cde B42 C154 G4 S15 F426 N1372 V5815 H2618 DK1677 L796 K507 O2377 DO621 MN36813 MP10.0774 E511 IN500 DS641 DT625 DJ711 DG1738 P2-5-10 I3n12.1 Q9080.6 DR1061 ZPP2-3-12 Yshang3 Wsang ショウ ほ.める {prize} {reward} {praise}
醤 3E5F U91a4 B164 S17 XJ16273 F2485 N4801 V6186 L2746 MN40011X MP11.0394 P2-10-7 Q2760.1 Yjiang4 Wjang ショウ ひしお {a kind of miso}
鉦 3E60 U9266 B167 S13 N4839 V6246 L2770 O1941 MN40322 MP11.0522 P1-8-5 I8a5.7 Q8111.1 Yzheng1 Wjeong セイ ショウ かね {bell} {gong} {chimes}
@ -2357,7 +2357,7 @@
髭 4926 U9aed B190 S16 S17 XJ16829 N5262 V6812 L2047 O2697 MN45399X MP12.0641 P2-10-6 I3j13.2 Q7211.1 Yzi1 Wja シ ひげ くちひげ {beard} {mustache}
彦 4927 U5f66 B117 C59 G9 S9 F1117 N3347 V1714 H3295 DK2072 L1716 K1076 O1007 DO1931 MN9981 MP4.0793 IN2067 P3-6-3 I5b4.4 Q0022.2 DR460 ZPP2-2-7 ZPP2-4-5 Yyan4 Weon ゲン ひこ T1 よし こ ひろ やす {lad} {boy (ancient)}
膝 4928 U819d B130 S15 F2320 N3814 V4868 L2461 O2281 MN29837 MP9.0361 P1-4-11 I4b11.4 Q7423.2 DR3942 Yxi1 Wseul シツ ひざ {knee} {lap}
菱 4929 U83f1 B140 S11 F1229 N3977 V5092 L1517 K980 O1449 MN31219X MP9.0723 P2-3-8 I3k8.20 Q4440.7 DR1967 ZRP2-4-8 Yling2 Wreung リョウ ひし {diamond (tqshape)} {water chestnut} {rhombus}
菱 4929 U83f1 B140 S11 F1229 N3977 V5092 L1517 K980 O1449 MN31219X MP9.0723 P2-3-8 I3k8.20 Q4440.7 DR1967 ZRP2-4-8 Yling2 Wreung リョウ ひし {diamond (shape)} {water chestnut} {rhombus}
肘 492A U8098 B130 S7 S9 N3730 V4761 L2464 MN29268 MP9.0253 P1-4-3 I4b3.3 Q7420.0 Yzhou3 Wju チュウ ひじ {elbow} {arm}
弼 492B U5f3c B57 S12 XJ13C6F N1573 V1697 O2092 MN9826 MP4.0765 P1-3-9 I3h9.2 Q1722.7 Ybi4 Wpil ヒツ たす.ける ゆだめ T1 すけ たすく {help}
必 492C U5fc5 B3 G4 S5 F265 N129 V1781 H15 DK6 L635 K292 O120 DO281 MN10299 MP4.0951 E568 IN520 DS497 DT453 DC188 DJ423 DB3.16 DG767 P1-1-4 I0a5.16 Q3300.0 DR359 ZPP4-5-4 Ybi4 Wpil ヒツ かなら.ず {invariably} {certain} {inevitable}
@ -2500,7 +2500,7 @@
遍 4A57 U904d B162 G8 S12 S11 F1845 N4718 V6086 H3136 DK2002 L1824 K1861 O1805 DO1279 MN39001P MP11.0112 E1783 IN1160 DJ1177 DG711 P3-3-9 I2q9.16 Q3330.2 DR3053 Ybian4 Ypian4 Wpyeon ヘン あまね.く {everywhere} {times} {widely} {generally}
便 4A58 U4fbf B9 G4 S9 F729 N450 V219 H95 DK71 L991 K578 DO265 MN659 MP1.0772 E582 IN330 DS510 DT533 DJ227 DB3.8 DG101 P1-2-7 I2a7.5 Q2124.6 DR2166 Ybian4 Ypian2 Wpyeon Wbyeon ベン ビン たよ.り {convenience}
勉 4A59 U52c9 B4 C19 G3 S10 F1066 N228 V543 H3318 DK2088 L1975 K946 O1263 DO852 MN2384P MP2.0390 E390 IN735 DS317 DT366 DJ140 DB2.11 DG219 P3-8-2 I2n8.1 Q2421.2 DR2557 Ymian3 Wmyeon ベン つと.める T1 ひこ やつ {exertion}
娩 4A5A U5a29 B38 S11 N1219 V1233 MN6337 MP3.0714 P1-3-8 Q4741.6 ZRP1-3-7 Ymian3 Ywan3 Wman ベン {bear (tqchildren)}
娩 4A5A U5a29 B38 S11 N1219 V1233 MN6337 MP3.0714 P1-3-8 Q4741.6 ZRP1-3-7 Ymian3 Ywan3 Wman ベン {bear (children)}
弁 4A5B U5f01 B28 C55 G5 S5 XJ0517E XJ05221 XJ06122 XJ06D67 F619 N846 V1663 H2004 DK1264 L742 K793 O275 DO513 MN9588 MP4.0664 E786 IN711 DS715 DT654 DJ1116 DG262 P2-2-3 I0a5.30 Q2344.0 Ybian4 Wbyeon Wban ベン ヘン わきま.える わ.ける はなびら あらそ.う T1 べ {valve} {petal} {braid} {speech} {dialect} {discrimination} {dispose of} {distinguish}
鞭 4A5C U97ad B177 S18 N5104 V6595 L2783 O2752 MN42937 MP12.0171 P1-9-9 I3k15.8 Q4154.6 Ybian1 Wpyeon ベン ヘン むち むちうつ {whip} {rod}
保 4A5D U4fdd B9 G5 S9 F146 N455 V222 H96 DK72 L997 K166 O781 DO351 MN702 MP1.0788 E787 IN489 DS716 DT705 DC163 DJ665 DG102 P1-2-7 I2a7.11 Q2629.4 DR2164 Ybao3 Wbo ホ ホウ たも.つ T1 う お ぶ もり やす やすし {protect} {guarantee} {keep} {preserve} {sustain} {support}
@ -2968,7 +2968,7 @@
丐 5022 U4e10 B1 S4 XH262 N11 V11 MN22 MP1.0264 P4-4-1 I2m2.3 Q1020.7 Ygai4 Wgal Wgae カイ こ.う {beggar} {beg} {give}
丕 5023 U4e15 B1 S5 V18 O163 MN30 MP1.0267 P2-4-1 I0a5.2 Q1010.9 Ypi1 Wbi ヒ おお.きい {large} {great} {grand} {glorious} {distinguished}
个 5024 U4e2a B9 C2 S3 XH1960 N340 V25 H1959 MN70 MP1.0286 P2-2-1 Q8020.0 Yge4 Wga Wgae カ コ {counter for articles} {individual}
丱 5025 U4e31 B2 S5 V29 MN77 MP1.0318 P1-2-3 I0a5.4 Q2277.0 Yguan4 Wgwan カン ケン {saguaro-like kanji} {horn-tqshaped locks of hair} {young} {tender}
丱 5025 U4e31 B2 S5 V29 MN77 MP1.0318 P1-2-3 I0a5.4 Q2277.0 Yguan4 Wgwan カン ケン {saguaro-like kanji} {horn-shaped locks of hair} {young} {tender}
丶 5026 U4e36 B3 S1 V32 H3344 MN91 MP1.0320 P4-1-4 I0a1.3 Q3000.0 Yzhu3 Wju チュ T2 てん {dot} {tick or dot radical (no. 3)}
丼 5027 U4e3c B4 C3 S5 F2088 N171 V37 L2884 O206 MN101 MP1.0337 P4-5-4 I0a5.40 Q5500.0 Yjing3 Ydan3 Wjeong トン タン ショウ セイ どんぶり {bowl} {bowl of food}
丿 5028 U4e3f B4 S1 V39 H3345 MN106 MP1.0338 P4-1-4 I0a1.2 Q2000.0 Ypie3 Wbyeol ヘツ えい よう T1 の T2 ノ のかんむり {kana-no radical (no. 4)}
@ -3101,7 +3101,7 @@
冑 5149 U5191 B130 C13 S9 XH3747 V395 MN1537 MP2.0117 P2-5-4 I2r7.2 Q5022.7 Yzhou4 Wju チュウ かぶと よろい {helmet}
冓 514A U5193 B13 S10 V396 MN1540 MP2.0120 P2-5-5 I0a10.14 Q5555.7 Q5544.7 Ygou4 Wgu コウ かま.える {put together} {inner palace}
冕 514B U5195 B13 S11 N624 V397 MN1545 MP2.0120 P2-2-9 Q6041.6 Ymian3 Wmyeon ベン メン かんむり {crown}
冖 514C U5196 B14 S2 V398 H3353 MN1565 MP2.0122 P4-2-1 I2i0.1 Q3702.0 Ymi4 Wmyeog ベキ T2 わかんむり べきかんむり {wa-tqshaped crown radical (no. 14)}
冖 514C U5196 B14 S2 V398 H3353 MN1565 MP2.0122 P4-2-1 I2i0.1 Q3702.0 Ymi4 Wmyeog ベキ T2 わかんむり べきかんむり {wa-shaped crown radical (no. 14)}
冤 514D U51a4 B14 S10 XJ05563 F2382 N631 V404 MN1587X MP2.0128 P2-2-8 Q3741.3 Yyuan1 Wweon エン {false charge} {hatred}
冦 514E U51a6 B14 S10 XJ05564 XJ13A5A XH1313 V402 MN1590 MP2.0133 P2-2-8 Q3721.4 Ykou4 Wgu コウ あだ.する {foe} {enemy} {revenge} {grudge} {feud}
冢 514F U51a2 B14 S10 XH1120 V403 MN1585 MP2.0127 P2-2-8 I2i8.1 Q3723.2 Yzhong3 Wchong チョウ つか おお.う {mound} {hillock}
@ -3488,15 +3488,15 @@
孕 5554 U5b55 B39 S5 N1266 V1283 L2208 O274 MN6938 MP3.0815 P2-2-3 I2c2.1 Q1740.7 Yyun4 Wing ヨウ はら.む T1 はらみ もと {become pregnant}
孚 5555 U5b5a B39 S7 V1286 O483 MN6948 MP3.0824 P2-4-3 I2c4.2 Q2040.7 Yfu2 Wbu フ たまご はぐく.む {sincere} {nourish} {encase}
孛 5556 U5b5b B39 S7 V1288 MN6949 MP3.0824 P2-4-3 I2k4.1 Q4040.7 Ybei4 Wpae Wbal ハイ ブツ ボツ {comet} {dark} {obscure}
孥 5557 U5b65 B39 S8 V1290 MN6967 MP3.0858 P2-5-3 I2c5.2 Q4740.7 Ynu2 Wno ド ヌ つまこ {child} {wife and tqchildren} {servant} {slave}
孥 5557 U5b65 B39 S8 V1290 MN6967 MP3.0858 P2-5-3 I2c5.2 Q4740.7 Ynu2 Wno ド ヌ つまこ {child} {wife and children} {servant} {slave}
孩 5558 U5b69 B39 S9 N1272 V1295 MN6977 MP3.0585 P1-3-6 I2c6.1 Q1048.2 Yhai2 Whae ガイ カイ ちのみご {baby} {infancy}
孰 5559 U5b70 B8 C39 S11 N316 V1297 MN6995 MP3.0877 P1-8-3 I3d7.14 Q0541.7 Q0441.7 Yshu2 Wsug ジュク いずれ たれ {which} {how} {who}
孳 555A U5b73 B12 C39 S12 N603 V1299 MN7011X MP3.0879 P2-3-9 I2o9.2 Q4440.7 Yzi1 Yzi4 Wja ジ シ う.む しげ.る {increase} {bear tqchildren} {also N1274}
孳 555A U5b73 B12 C39 S12 N603 V1299 MN7011X MP3.0879 P2-3-9 I2o9.2 Q4440.7 Yzi1 Yzi4 Wja ジ シ う.む しげ.る {increase} {bear children} {also N1274}
孵 555B U5b75 B4 C39 S14 N244 V1301 MN7021 MP3.0880 P1-4-10 I3n10.5 Q7274.7 Yfu1 Wbu フ か.えす {hatch} {incubate}
學 555C U5b78 B39 S16 XJ03358 XJ0555D XJ14157 XH2889 XH1271 N1275 V1302 H2898 MN7033 MP3.0881 P2-13-3 Q7740.7 Yxue2 Yxiao2 Whag ガク まな.ぶ T1 さとる {learning} {knowledge} {school}
斈 555D U6588 B67 S7 XJ03358 XJ0555C XJ14157 XH1271 N2065 V2365 H2039 MN13453 MP5.0602 P2-2-5 Q0040.7 Yxue2 Whag ガク まな.ぶ {learning} {knowledge} {school}
孺 555E U5b7a B39 S17 N1276 V1303 MN7042 MP3.0893 P1-3-14 I2c14.1 Q1142.7 Yru2 Yru4 Wyu ジュ おさない ちのみご {child}
宀 555F U5b80 B40 S3 V1304 H3425 MN7054 MP3.0895 P4-3-4 I3m0.1 Q3032.7 Ymian2 Wmyeon ベン メン T2 うかんむり {tqshaped crown}
宀 555F U5b80 B40 S3 V1304 H3425 MN7054 MP3.0895 P4-3-4 I3m0.1 Q3032.7 Ymian2 Wmyeon ベン メン T2 うかんむり {shaped crown}
它 5560 U5b83 B40 S5 V1306 MN7057 MP3.0897 P2-3-2 I3m2.3 Q3071.1 Yta1 Wda Wsa タ へび {other}
宦 5561 U5ba6 B40 S10 S9 N1298 V1325 MN7138 MP3.1004 P2-3-7 I3m7.14 Q3071.7 Yhuan4 Whwan カン つかさ {official}
宸 5562 U5bb8 B40 S10 N1305 V1331 MN7171 MP3.1032 P2-3-7 I3m7.13 Q3023.2 Ychen2 Wsin シン のき {eaves} {palace} {imperial courtesy}
@ -3582,7 +3582,7 @@
嶬 5654 U5dac B46 S16 V1514 MN8510 MP4.0309 P1-3-13 I3o13.3 Q2875.3 Yyi1 Weui ギ {high} {steep}
嶮 5655 U5dae B46 S16 XH5000 N1437 V1513 H759 MN8520 MP4.0309 P1-3-13 I3o13.2 Q2878.6 Yxian3 Wheom ケン けわ.しい {inaccessible place} {impregnable position} {steep place} {sharp eyes}
嶽 5656 U5dbd B46 S17 XJ03359 XH208 F2135 N1439 V1516 H2377 L2987 O2775 MN8566 MP4.0314 P2-3-14 Q2223.4 Yyue4 Wag ガク たけ T1 たき {peak}
嶐 5657 U5d90 B46 S14 V1508 MN8447 MP4.0304 P2-3-11 I3o11.4 Q2221.4 Ylong2 Wryung リュ やまのかたち {tqshape of a mountain}
嶐 5657 U5d90 B46 S14 V1508 MN8447 MP4.0304 P2-3-11 I3o11.4 Q2221.4 Ylong2 Wryung リュ やまのかたち {shape of a mountain}
嶷 5658 U5db7 B46 S17 N1441 V1518 O2774 MN8545 MP4.0311 P2-3-14 I3o14.1 Q2248.1 Yyi2 Weui Weog ギョク ギ さと.い {wise}
嶼 5659 U5dbc B46 S16 N1438 V1515 MN8561 MP4.0313 P1-3-13 I3o13.1 Q2778.1 Yyu3 Wseo ショ しま {island}
巉 565A U5dc9 B46 S20 V1520 MN8618 MP4.0313 P1-3-17 I3o18.1 Q2771.6 Ychan2 Wcham ザン サン {rising precipitously} {rising steeply}
@ -4610,7 +4610,7 @@
疥 614E U75a5 B104 S9 N3026 V3781 MN22057 MP7.1157 P3-5-4 I5i4.3 Q0012.8 Yjie4 Wgae カイ はたけ {scabby eruption}
疣 614F U75a3 B104 S9 XJ0666F N3027 V3782 MN22050 MP7.1157 P3-5-4 I5i4.1 Q0011.4 Yyou2 Wu ユ ユウ いぼ {wart}
痂 6150 U75c2 B104 S10 N3038 V3793 MN22122 MP7.1167 P3-5-5 I5i5.7 Q0016.0 Yjia1 Wga カ ケ かさ かさ.ぶた {scab} {dry up} {slough}
疳 6151 U75b3 B104 S10 N3032 V3789 MN22085 MP7.1161 P3-5-5 I5i5.1 Q0017.5 Ygan1 Wgam カン {tqchildren's diseases}
疳 6151 U75b3 B104 S10 N3032 V3789 MN22085 MP7.1161 P3-5-5 I5i5.1 Q0017.5 Ygan1 Wgam カン {children's diseases}
痃 6152 U75c3 B104 S10 N3034 V3790 MN22124 MP7.1167 P3-5-5 I5i5.11 Q0013.2 Yxuan2 Whyeon ゲン ケン {cramps}
疵 6153 U75b5 B104 S11 N3047 V3805 H3282 MN22089X MP7.1161 P3-5-6 I5i6.3 Q0011.1 ZSP3-5-5 Yci1 Yci2 Wja シ きず {crack} {flaw} {scratch} {speck}
疽 6154 U75bd B104 S10 N3031 V3787 MN22106 MP7.1163 P3-5-5 I5i5.5 Q0011.7 Yju1 Wjeo ソ ショ かさ {carbuncle}
@ -4749,7 +4749,7 @@
碼 627B U78bc B112 S15 V4030 MN24368 MP8.0389 P1-5-10 I5a10.1 Q1162.7 Yma3 Wma バ メ やあど やある {number} {wharf} {agate} {yard (91.44 cm)}
磅 627C U78c5 B112 S15 V4032 MN24386 MP8.0391 P1-5-10 I5a10.4 Q1062.7 Ybang4 Ypang1 Ypang2 Wbang Wpaeng ボウ ホウ ぽんど {become obstructed} {pound (sterling, lb)}
磊 627D U78ca B112 S15 N3213 V4036 MN24394 MP8.0392 P2-5-10 I5a10.8 Q1066.1 Ylei3 Wroe ライ {many stones}
磬 627E U78ec B112 S16 V4042 MN24454 MP8.0401 P2-11-5 I5a11.4 Q4760.1 Yqing4 Wgyeong ケイ {upside-V-tqshaped gong}
磬 627E U78ec B112 S16 V4042 MN24454 MP8.0401 P2-11-5 I5a11.4 Q4760.1 Yqing4 Wgyeong ケイ {upside-V-shaped gong}
磧 6321 U78e7 B112 S16 V4041 MN24448 MP8.0398 P1-5-11 I5a11.3 Q1568.6 Yqi4 Wjeog セキ かわら {expanse of sand} {pebbly beach}
磚 6322 U78da B112 S16 N3219 V4043 MN24418 MP8.0396 P1-5-11 I5a11.1 Q1564.3 Yzhuan1 Wjeon セン かわら {tile}
磽 6323 U78fd B112 S17 V4047 MN24494 MP8.0405 P1-5-12 I5a12.3 Q1461.1 Yqiao1 Wgyo コウ キョウ {rocky} {barren}

26
kiten/kiten.cpp
Unescape View File

@ -172,7 +172,7 @@ void TopLevel::addToList()
if (learnList.isEmpty())
createLearn();
else
StatusBar->message(i18n("%1 added to learn list of all open learn windows").tqarg(toAddKanji.kanji()));
StatusBar->message(i18n("%1 added to learn list of all open learn windows").arg(toAddKanji.kanji()));
emit add(toAddKanji);
}
@ -257,12 +257,12 @@ void TopLevel::handleSearchResult(Dict::SearchResult results)
addAction->setEnabled(true);
_ResultView->append(TQString("<p>%1</p>").tqarg(i18n("HTML Entity: %1").tqarg(TQString("&amp;#x%1;").tqarg(TQString::number(toAddKanji.kanji().tqat(0).tqunicode(), 16))))); // show html entity
_ResultView->append(TQString("<p>%1</p>").arg(i18n("HTML Entity: %1").arg(TQString("&amp;#x%1;").arg(TQString::number(toAddKanji.kanji().at(0).tqunicode(), 16))))); // show html entity
// now show some compounds in which this kanji appears
TQString kanji = toAddKanji.kanji();
_ResultView->addHeader(i18n("%1 in compounds").tqarg(kanji));
_ResultView->addHeader(i18n("%1 in compounds").arg(kanji));
Dict::SearchResult compounds = _Asyndeta.retrieveIndex()->search(TQRegExp(kanji), kanji, true);
bool common = true;
@ -498,7 +498,7 @@ void TopLevel::strokeSearch()
// must be in kanjidic mode
kanjiCB->setChecked(true);
doSearch(TQString("S%1 ").tqarg(strokesString), regexp);
doSearch(TQString("S%1 ").arg(strokesString), regexp);
}
void TopLevel::gradeSearch()
@ -519,7 +519,7 @@ void TopLevel::gradeSearch()
return;
}
TQString text = TQString("G%1 ").tqarg(grade);
TQString text = TQString("G%1 ").arg(grade);
TQRegExp regexp = TQRegExp(text);
kanjiCB->setChecked(true);
@ -585,7 +585,7 @@ void TopLevel::setResults(unsigned int results, unsigned int fullNum)
TQString str = i18n("%n result","%n results",results);
if (results < fullNum)
str += i18n(" out of %1").tqarg(fullNum);
str += i18n(" out of %1").arg(fullNum);
StatusBar->message(str);
setCaption(str);
@ -681,7 +681,7 @@ TQRegExp TopLevel::readingSearchItems(bool kanji)
else
regexp = "\\[%1\\]";
regexp = regexp.tqarg(text);
regexp = regexp.arg(text);
return TQRegExp(regexp, Config::caseSensitive());
}
@ -699,7 +699,7 @@ TQRegExp TopLevel::kanjiSearchItems(bool beginning)
else
regexp = "^%1\\W";
regexp = regexp.tqarg(text);
regexp = regexp.arg(text);
return TQRegExp(regexp, Config::caseSensitive());
}
@ -717,7 +717,7 @@ TQRegExp TopLevel::searchItems()
else
regexp = "%1";
regexp = regexp.tqarg(text);
regexp = regexp.arg(text);
return TQRegExp(regexp, Config::caseSensitive());
}
@ -772,12 +772,12 @@ void TopLevel::radSearch(const TQStringList &_list, unsigned int strokes, unsign
already = true;
}
hist.text = i18n("Radical(s): %1").tqarg(prettyRadicalString);
hist.text = i18n("Radical(s): %1").arg(prettyRadicalString);
if (strokes)
hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1 and %2 strokes").tqarg(prettyRadicalString).tqarg(strokes), true));
hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1 and %2 strokes").arg(prettyRadicalString).arg(strokes), true));
else
hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1").tqarg(prettyRadicalString), true));
hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1").arg(prettyRadicalString), true));
TQString strokesString;
if (strokes)
@ -800,7 +800,7 @@ void TopLevel::radSearch(const TQStringList &_list, unsigned int strokes, unsign
for (it = list.begin(); it != list.end(); ++it)
{
Dict::SearchResult results = _Asyndeta.retrieveIndex()->searchKanji(TQRegExp(strokes? (TQString("S%1 ").tqarg(strokesString)) : (TQString("^") + (*it)) ), (*it), comCB->isChecked());
Dict::SearchResult results = _Asyndeta.retrieveIndex()->searchKanji(TQRegExp(strokes? (TQString("S%1 ").arg(strokesString)) : (TQString("^") + (*it)) ), (*it), comCB->isChecked());
hist.outOf += results.outOf;
if (results.count < 1)

6
kiten/kloader.cpp
Unescape View File

@ -79,7 +79,7 @@ bool KLoader::open(void)
{
if(!d->file->open(IO_ReadOnly))
{
d->error = i18n("Could not read from %1.").tqarg(d->url.prettyURL());
d->error = i18n("Could not read from %1.").arg(d->url.prettyURL());
return false;
}
}
@ -87,14 +87,14 @@ bool KLoader::open(void)
{
if(!KIO::NetAccess::download(d->url, d->tempFile))
{
d->error = i18n("Could not read from %1.").tqarg(d->url.prettyURL());
d->error = i18n("Could not read from %1.").arg(d->url.prettyURL());
return false;
}
d->file = new TQFile(d->tempFile);
if(!d->file->open(IO_ReadOnly))
{
d->error = i18n("Could not read from %1.").tqarg(d->tempFile);
d->error = i18n("Could not read from %1.").arg(d->tempFile);
return false;
}
}

2
kiten/ksaver.cpp
Unescape View File

@ -85,7 +85,7 @@ bool KSaver::open(void)
}
else
{
d->error = i18n("Could not write to %1.").tqarg(d->url.prettyURL());
d->error = i18n("Could not write to %1.").arg(d->url.prettyURL());
return false;
}
}

22
kiten/learn.cpp
Unescape View File

@ -299,7 +299,7 @@ void Learn::update()
TQString kanji = curKanji.kanji();
Dict::SearchResult compounds = index->search(TQRegExp(kanji), kanji, true);
View->addHeader(i18n("%1 in compounds").tqarg(kanji));
View->addHeader(i18n("%1 in compounds").arg(kanji));
for (TQValueListIterator<Dict::Entry> it = compounds.list.begin(); it != compounds.list.end(); ++it)
{
@ -315,12 +315,12 @@ void Learn::updateGrade()
int grade = getCurrentGrade();
TQString regexp("G%1 ");
regexp = regexp.tqarg(grade);
regexp = regexp.arg(grade);
Dict::SearchResult result = index->searchKanji(TQRegExp(regexp), regexp, false);
list = result.list;
statusBar()->message(i18n("%1 entries in grade %2").tqarg(list.count()).tqarg(grade));
statusBar()->message(i18n("%1 entries in grade %2").arg(list.count()).arg(grade));
list.remove(list.begin());
current = list.begin();
@ -351,7 +351,7 @@ void Learn::read(const KURL &url)
// ignore whitespace
if (!kanji.isSpace())
{
TQRegExp regexp ( TQString("^%1\\W").tqarg(kanji) );
TQRegExp regexp ( TQString("^%1\\W").arg(kanji) );
Dict::SearchResult res = index->searchKanji(regexp, kanji, false);
Dict::Entry first = Dict::firstEntry(res);
if (first.extendedKanjiInfo())
@ -444,7 +444,7 @@ void Learn::write(const KURL &url)
stream.setCodec(&codec);
for (TQListViewItemIterator it(List); it.current(); ++it)
stream << it.current()->text(0).tqat(0);
stream << it.current()->text(0).at(0);
if (!saver.close())
{
@ -456,7 +456,7 @@ void Learn::write(const KURL &url)
setClean();
statusBar()->message(i18n("%1 written").tqarg(url.prettyURL()));
statusBar()->message(i18n("%1 written").arg(url.prettyURL()));
}
void Learn::saveScores()
@ -485,13 +485,13 @@ void Learn::add(Dict::Entry toAdd, bool noEmit)
{
if (it.current()->text(0) == kanji)
{
statusBar()->message(i18n("%1 already on your list").tqarg(kanji));
statusBar()->message(i18n("%1 already on your list").arg(kanji));
return;
}
}
}
statusBar()->message(i18n("%1 added to your list").tqarg(kanji));
statusBar()->message(i18n("%1 added to your list").arg(kanji));
KConfig &config = *Config::self()->config();
int score = 0;
@ -515,7 +515,7 @@ void Learn::addAll()
int grade = getCurrentGrade();
TQString regexp("G%1 ");
regexp = regexp.tqarg(grade);
regexp = regexp.arg(grade);
Dict::SearchResult result = index->searchKanji(TQRegExp(regexp), regexp, false);
for (TQValueListIterator<Dict::Entry> i = result.list.begin(); i != result.list.end(); ++i)
@ -607,7 +607,7 @@ void Learn::del()
void Learn::print()
{
View->clear();
View->addHeader(TQString("<h1>%1</h1>").tqarg(i18n("Learning List")), 1);
View->addHeader(TQString("<h1>%1</h1>").arg(i18n("Learning List")), 1);
TQListViewItemIterator it(List);
for (; it.current(); ++it)
@ -774,7 +774,7 @@ void Learn::qnew() // new quiz kanji
nogood = false;
statusBar()->clear();
statusBar()->message(TQString("%1 %2 %3").tqarg(curItem->text(0)).tqarg(curItem->text(1)).tqarg(curItem->text(2)));
statusBar()->message(TQString("%1 %2 %3").arg(curItem->text(0)).arg(curItem->text(1)).arg(curItem->text(2)));
backAct->setEnabled(true);

38
kiten/widgets.cpp
Unescape View File

@ -59,7 +59,7 @@ void ResultView::addResult(Dict::Entry result, bool common)
{
if (result.dictName() != "__NOTSET")
{
addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).tqarg(result.dictName()), 5);
addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).arg(result.dictName()), 5);
return;
}
if (result.header() != "__NOTSET")
@ -70,9 +70,9 @@ void ResultView::addResult(Dict::Entry result, bool common)
TQString html;
if (result.kanaOnly())
html = TQString("<p><font size=\"+2\">%1</font> ").tqarg(result.firstReading());
html = TQString("<p><font size=\"+2\">%1</font> ").arg(result.firstReading());
else
html = TQString("<p><font size=\"+2\">%1</font>: %2 ").tqarg(putchars(result.kanji())).tqarg(result.firstReading());
html = TQString("<p><font size=\"+2\">%1</font>: %2 ").arg(putchars(result.kanji())).arg(result.firstReading());
TQStringList::Iterator it;
TQStringList Meanings = result.meanings();
@ -103,7 +103,7 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad)
{
if (result.dictName() != "__NOTSET")
{
addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).tqarg(result.dictName()), 5);
addHeader((common? i18n("Common results from %1") : i18n("Results from %1")).arg(result.dictName()), 5);
return;
}
if (result.header() != "__NOTSET")
@ -113,15 +113,15 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad)
}
TQString html;
html = TQString("<p><font size=\"+3\">%1</font>: %2 ").tqarg(putchars(result.kanji()));
html = TQString("<p><font size=\"+3\">%1</font>: %2 ").arg(putchars(result.kanji()));
unsigned int freq = result.freq();
if (freq == 0) // does it have a frequency?
html = html.tqarg(i18n("Rare"));
html = html.arg(i18n("Rare"));
else
// this isn't a number of times, it's simply an index of
// probability
html = html.tqarg(i18n("Probability rank #%1").tqarg(freq));
html = html.arg(i18n("Probability rank #%1").arg(freq));
html += "<br />";
@ -171,25 +171,25 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad)
switch (result.grade())
{
case 0:
html = html.tqarg(i18n("None"));
html = html.arg(i18n("None"));
break;
case 8:
html = html.tqarg(i18n("In Jouyou"));
html = html.arg(i18n("In Jouyou"));
break;
case 9:
html = html.tqarg(i18n("In Jinmeiyou"));
html = html.arg(i18n("In Jinmeiyou"));
break;
default:
html = html.tqarg(result.grade());
html = html.arg(result.grade());
}
html = html.tqarg(result.strokes());
html = html.arg(result.strokes());
if (result.miscount() != 0)
html.append(i18n(" Common Miscount: %1.").tqarg(result.miscount()));
html.append(i18n(" Common Miscount: %1.").arg(result.miscount()));
if (!!rad.radical())
html.append(i18n(" Largest radical: %1, with %2 strokes.").tqarg(TQString("<a href=\"__radical:%1\">%2</a>").tqarg(rad.radical()).tqarg(rad.radical())).tqarg(rad.strokes()));
html.append(i18n(" Largest radical: %1, with %2 strokes.").arg(TQString("<a href=\"__radical:%1\">%2</a>").arg(rad.radical()).arg(rad.radical())).arg(rad.strokes()));
html += "</p>";
@ -198,7 +198,7 @@ void ResultView::addKanjiResult(Dict::Entry result, bool common, Radical rad)
void ResultView::addHeader(const TQString &header, unsigned int degree)
{
append(TQString("<h%1>%2</h%3>").tqarg(degree).tqarg(header).tqarg(degree));
append(TQString("<h%1>%2</h%3>").arg(degree).arg(header).arg(degree));
}
TQString ResultView::putchars(const TQString &text)
@ -212,7 +212,7 @@ TQString ResultView::putchars(const TQString &text)
for (unsigned i = 0; i < len; i++)
{
if (Dict::textType(TQString(text.at(i))) == Dict::Text_Kanji)
ret.append(TQString("<a href=\"%1\">%1</a>").tqarg(text.tqat(i)).tqarg(text.tqat(i)));
ret.append(TQString("<a href=\"%1\">%1</a>").arg(text.at(i)).arg(text.at(i)));
else
ret.append(text.at(i));
}
@ -251,7 +251,7 @@ void ResultView::print(TQString title)
TQRect body(dpix, dpiy, metrics.width() - margin * dpix / margin * 2, metrics.height() - margin * dpiy / margin * 2);
TQSimpleRichText richText(title.isNull()? printText : i18n("<h1>Search for \"%1\"</h1>").tqarg(title) + printText, font(), context(), styleSheet(), mimeSourceFactory(), body.height(), TQt::black, false);
TQSimpleRichText richText(title.isNull()? printText : i18n("<h1>Search for \"%1\"</h1>").arg(title) + printText, font(), context(), styleSheet(), mimeSourceFactory(), body.height(), TQt::black, false);
richText.setWidth(&p, body.width());
TQRect view(body);
int page = 1;
@ -268,7 +268,7 @@ void ResultView::print(TQString title)
TQFont myFont(font());
myFont.setPointSize(9);
p.setFont(myFont);
TQString footer(TQString("%1 - Kiten").tqarg(TQString::number(page)));
TQString footer(TQString("%1 - Kiten").arg(TQString::number(page)));
p.drawText(view.right() - p.fontMetrics().width(footer), view.bottom() + p.fontMetrics().ascent() + 5, footer);
@ -391,7 +391,7 @@ void eEdit::save()
text.append(" ");
if (!kanji.isEmpty())
text.append(TQString("[%1] ").tqarg(reading));
text.append(TQString("[%1] ").arg(reading));
text.append(meanings);
if (common)

2
klatin/klatin/data/vocab/en/I2L.kvtml
Unescape View File

@ -151,7 +151,7 @@
</e>
<e>
<o>liberi (2)</o>
<t>tqchildren</t>
<t>children</t>
</e>
<e>
<o>libero (1)</o>

2
klatin/klatin/klatinchoose.ui
Unescape View File

@ -46,7 +46,7 @@
<string>Welcome to KLatin
Please Choose Section of Revision</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

26
klatin/klatin/klatingrammar.cpp
Unescape View File

@ -153,40 +153,40 @@ void KLatinGrammar::nextQuestion()
// Question string...
switch (m_grammarNumber) {
case 1:
questionString = i18n("What is the nominative singular of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the nominative singular of %1?").arg(m_noun[0]);
break;
case 2:
questionString = i18n("What is the vocative singular of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the vocative singular of %1?").arg(m_noun[0]);
break;
case 3:
questionString = i18n("What is the accusative singular of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the accusative singular of %1?").arg(m_noun[0]);
break;
case 4:
questionString = i18n("What is the genitive singular of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the genitive singular of %1?").arg(m_noun[0]);
break;
case 5:
questionString = i18n("What is the dative singular of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the dative singular of %1?").arg(m_noun[0]);
break;
case 6:
questionString = i18n("What is the ablative singular of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the ablative singular of %1?").arg(m_noun[0]);
break;
case 7:
questionString = i18n("What is the nominative plural of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the nominative plural of %1?").arg(m_noun[0]);
break;
case 8:
questionString = i18n("What is the vocative plural of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the vocative plural of %1?").arg(m_noun[0]);
break;
case 9:
questionString = i18n("What is the accusative plural of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the accusative plural of %1?").arg(m_noun[0]);
break;
case 10:
questionString = i18n("What is the genitive plural of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the genitive plural of %1?").arg(m_noun[0]);
break;
case 11:
questionString = i18n("What is the dative plural of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the dative plural of %1?").arg(m_noun[0]);
break;
case 12:
questionString = i18n("What is the ablative plural of %1?").tqarg(m_noun[0]);
questionString = i18n("What is the ablative plural of %1?").arg(m_noun[0]);
break;
}
@ -202,7 +202,7 @@ void KLatinGrammar::checkAnswer()
// Allow a tolerance of 1 retry
if (m_numWrong == 2) {
m_numWrong = 0;
KMessageBox::information(this, i18n("The correct answer was %1.").tqarg(m_noun[m_grammarNumber - 1]), i18n("Wrong"));
KMessageBox::information(this, i18n("The correct answer was %1.").arg(m_noun[m_grammarNumber - 1]), i18n("Wrong"));
if (ChooseSection->currentItem()==0)
loadDatabase();
else

12
klatin/klatin/klatingrammarwidget.ui
Unescape View File

@ -43,7 +43,7 @@
<property name="text">
<string>Grammar Section</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -110,7 +110,7 @@ Line 2
Line 3
Line 4</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -187,7 +187,7 @@ Line 4</string>
<property name="text">
<string>Score</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -228,7 +228,7 @@ Line 4</string>
<property name="text">
<string>0</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -241,7 +241,7 @@ Line 4</string>
<property name="text">
<string>/</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -261,7 +261,7 @@ Line 4</string>
<property name="name">
<cstring>PercentageLabel</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">

6
klatin/klatin/klatinresultsdialog.ui
Unescape View File

@ -31,7 +31,7 @@
<property name="text">
<string>&lt;b&gt;Your Results&lt;/b&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@ -119,7 +119,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="toolTip" stdset="0">
@ -150,7 +150,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="toolTip" stdset="0">

2
klatin/klatin/klatinsettings_vocabpage.ui
Unescape View File

@ -128,7 +128,7 @@
<property name="text">
<string>Number of questions:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
<property name="toolTip" stdset="0">

14
klatin/klatin/klatinverbs.cpp
Unescape View File

@ -202,12 +202,12 @@ void KLatinVerbs::nextQuestion()
"ARGUMENT %5 is the voice of the verb (Active, Passive). "
"ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and should not be translated. "
"The output string in English is something like: What is the first person singular present indicative active of amo?",
"What is the %1 person %2 %3 %4 %5 of %6?").tqarg(i18n(question.person[person]))
.tqarg(i18n(question.number[number]))
.tqarg(i18n(question.tense[tense]))
.tqarg(i18n(verbparts.mood[ChooseMood->currentItem()]))
.tqarg(i18n(verbparts.voice[ChooseVoice->currentItem()]))
.tqarg(m_currentVerb);
"What is the %1 person %2 %3 %4 %5 of %6?").arg(i18n(question.person[person]))
.arg(i18n(question.number[number]))
.arg(i18n(question.tense[tense]))
.arg(i18n(verbparts.mood[ChooseMood->currentItem()]))
.arg(i18n(verbparts.voice[ChooseVoice->currentItem()]))
.arg(m_currentVerb);
QuestionLabel->setText(QuestionString);
}
@ -226,7 +226,7 @@ void KLatinVerbs::checkAnswer()
// Retry tolerance...
if (m_numWrong == 2) {
m_numWrong = 0;
KMessageBox::information(this, i18n("The correct answer was %1.").tqarg(m_verb[m_verbNumber - 1]), i18n("Wrong"));
KMessageBox::information(this, i18n("The correct answer was %1.").arg(m_verb[m_verbNumber - 1]), i18n("Wrong"));
nextQuestion();
}
} else {

12
klatin/klatin/klatinverbswidget.ui
Unescape View File

@ -39,7 +39,7 @@
<property name="text">
<string>Verbs Section</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -154,7 +154,7 @@ Line 2
Line 3
Line 4</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -231,7 +231,7 @@ Line 4</string>
<property name="text">
<string>Score</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -272,7 +272,7 @@ Line 4</string>
<property name="text">
<string>0</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -285,7 +285,7 @@ Line 4</string>
<property name="text">
<string>/</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -305,7 +305,7 @@ Line 4</string>
<property name="name">
<cstring>PercentageLabel</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">

12
klatin/klatin/klatinvocabwidget.ui
Unescape View File

@ -37,7 +37,7 @@
<property name="text">
<string>Vocabulary Section</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -77,7 +77,7 @@
<property name="text">
<string>Question Word</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -152,7 +152,7 @@
<property name="text">
<string>Score</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -193,7 +193,7 @@
<property name="text">
<string>0</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -206,7 +206,7 @@
<property name="text">
<string>/</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@ -226,7 +226,7 @@
<property name="name">
<cstring>PercentageLabel</cstring>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">

14
klettres/klettres/klettres.cpp
Unescape View File

@ -285,11 +285,11 @@ void KLettres::loadSettings()
m_languageAction->setCurrentItem(Prefs::languageNumber());
TQString langString = m_languageNames[Prefs::languageNumber()];
langString.replace("&", TQString());
m_langLabel->setText(i18n("Current language is %1").tqarg(langString));
m_langLabel->setText(i18n("Current language is %1").arg(langString));
loadLangToolBar();
// load default level
m_levelAction->setCurrentItem(Prefs::level()-1);
m_levLabel->setText(i18n("Current level is %1").tqarg(Prefs::level()));
m_levLabel->setText(i18n("Current level is %1").arg(Prefs::level()));
if (Prefs::theme() == Prefs::EnumTheme::classroom) {
m_themeAction->setCurrentItem(0);
@ -358,7 +358,7 @@ void KLettres::updateLevMenu(int id)
{
//m_levelCombo->setCurrentItem(id);
m_levelAction->setCurrentItem(id);
m_levLabel->setText(i18n("Current level is %1").tqarg(Prefs::level()));
m_levLabel->setText(i18n("Current level is %1").arg(Prefs::level()));
}
void KLettres::slotChangeLanguage(int newLanguage)
@ -369,7 +369,7 @@ void KLettres::slotChangeLanguage(int newLanguage)
// Update the StatusBar
TQString langString = m_languageNames[newLanguage];
langString.replace("&", TQString());
m_langLabel->setText(i18n("Current language is %1").tqarg(langString));
m_langLabel->setText(i18n("Current language is %1").arg(langString));
loadLangToolBar();
// Change language effectively
bool ok = loadLayout(soundFactory->m_layoutsDocument);
@ -452,14 +452,14 @@ void KLettres::loadLangToolBar()
if (m_languages[Prefs::languageNumber()]== "cs" || m_languages[Prefs::languageNumber()]== "da" || m_languages[Prefs::languageNumber()]== "sk" || m_languages[Prefs::languageNumber()]== "es" || m_languages[Prefs::languageNumber()]== "de" || m_languages[Prefs::languageNumber()]== "nds")//Dutch, English, French and Italian have no special characters
{
allData.clear();
TQString myString=TQString("klettres/%1.txt").tqarg(m_languages[Prefs::languageNumber()]);
TQString myString=TQString("klettres/%1.txt").arg(m_languages[Prefs::languageNumber()]);
TQFile myFile;
myFile.setName(locate("data",myString));
if (!myFile.exists())
{
TQString mString=i18n("File $TDEDIR/share/apps/klettres/%1.txt not found;\n"
"please check your installation.").tqarg(m_languages[Prefs::languageNumber()]);
"please check your installation.").arg(m_languages[Prefs::languageNumber()]);
KMessageBox::sorry( this, mString,
i18n("Error") );
kapp->quit();
@ -475,7 +475,7 @@ void KLettres::loadLangToolBar()
openFileStream.close();
for (int i=0; i<(int) allData.count(); i++) {
if (!allData[i].isEmpty())
m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").tqarg(allData[i]), i+1 );
m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").arg(allData[i]), i+1 );
}
}
}

2
kmplot/kmplot/FktDlg.cpp
Unescape View File

@ -137,7 +137,7 @@ void FktDlg::slotEdit()
int const id = getId( currentItem->text().section( ";", 0, 0) ) ;
// find out the function type
char const prefix = m_view->parser()->ufkt[ m_view->parser()->ixValue(id) ].fstr.tqat(0).latin1();
char const prefix = m_view->parser()->ufkt[ m_view->parser()->ixValue(id) ].fstr.at(0).latin1();
if ( prefix == 'r')
slotEditPolar( id );

6
kmplot/kmplot/MainDlg.cpp
Unescape View File

@ -268,7 +268,7 @@ void MainDlg::slotSaveas()
if ( !url.isEmpty() )
{
// check if file exists and overwriting is ok.
if( !KIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).tqarg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
if( !KIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
{
if ( !kmplotio->save( url ) )
KMessageBox::error(m_parent, i18n("The file could not be saved") );
@ -293,7 +293,7 @@ void MainDlg::slotExport()
if(!url.isEmpty())
{
// check if file exists and overwriting is ok.
if( KIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).tqarg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return;
if( KIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return;
if( url.fileName().right(4).lower()==".svg")
{
@ -630,7 +630,7 @@ void MainDlg::loadConstants()
if ( tmp_constant == " " || tmp_constant == " ")
return;
constant = tmp_constant.tqat(0).upper().latin1();
constant = tmp_constant.at(0).upper().latin1();
if ( constant<'A' || constant>'Z')
constant = 'A';

6
kmplot/kmplot/editfunction.cpp
Unescape View File

@ -67,7 +67,7 @@ EditFunction::EditFunction( XParser* parser, TQWidget* parent, const char* name
editintegralpage = new EditIntegralPage( page2 );
for( int number = 0; number < SLIDER_COUNT; number++ )
{
editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).tqarg( number +1) );
editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).arg( number +1) );
}
connect( editfunctionpage->cmdParameter, TQT_SIGNAL ( clicked() ), this, TQT_SLOT( cmdParameter_clicked() ) );
connect( editfunctionpage->useNoParameter, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( noParameter_toggled(bool) ) );
@ -226,7 +226,7 @@ void EditFunction::accept()
if ( tmp_ufkt.dmin<View::xmin || tmp_ufkt.dmax>View::xmax )
{
KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").tqarg(View::xmin).tqarg(View::xmax) );
KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").arg(View::xmin).arg(View::xmax) );
showPage(0);
editfunctionpage->min->setFocus();
editfunctionpage->min->selectAll();
@ -433,7 +433,7 @@ void EditFunction::fixFunctionArguments(TQString &f_str)
char parameter_name;
if ( closeBracket-openBracket == 2) //the function atribute is only one character
{
char const function_name = f_str.tqat(openBracket+1).latin1();
char const function_name = f_str.at(openBracket+1).latin1();
parameter_name = 'a';
while ( parameter_name == function_name)
parameter_name++;

74
kmplot/kmplot/editfunctionpage.ui
Unescape View File

@ -418,14 +418,14 @@ Example: f(x)=x^2</string>
<slot access="public" specifier="">update()</slot>
<slot access="public" specifier="">update(int,int,int,int)</slot>
<slot access="public" specifier="">update(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint()</slot>
<slot access="public" specifier="">tqrepaint(bool)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">repaint()</slot>
<slot access="public" specifier="">repaint(bool)</slot>
<slot access="public" specifier="">repaint(int,int,int,int)</slot>
<slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">show()</slot>
<slot access="public" specifier="">hide()</slot>
<slot access="public" specifier="">setShown(bool)</slot>
@ -490,7 +490,7 @@ Example: f(x)=x^2</string>
<slot access="private" specifier="">setTextWorkaround(const QString&amp;)</slot>
<property type="CString">name</property>
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property>
<property type="Size">minimumSize</property>
<property type="Size">maximumSize</property>
@ -519,7 +519,7 @@ Example: f(x)=x^2</string>
<property type="Bool">frame</property>
<property type="EchoMode">echoMode</property>
<property type="Int">cursorPosition</property>
<property type="Alignment">tqalignment</property>
<property type="Alignment">alignment</property>
<property type="Bool">dragEnabled</property>
<property type="Bool">readOnly</property>
<property type="String">inputMask</property>
@ -565,14 +565,14 @@ Example: f(x)=x^2</string>
<slot access="public" specifier="">update()</slot>
<slot access="public" specifier="">update(int,int,int,int)</slot>
<slot access="public" specifier="">update(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint()</slot>
<slot access="public" specifier="">tqrepaint(bool)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">repaint()</slot>
<slot access="public" specifier="">repaint(bool)</slot>
<slot access="public" specifier="">repaint(int,int,int,int)</slot>
<slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">show()</slot>
<slot access="public" specifier="">hide()</slot>
<slot access="public" specifier="">setShown(bool)</slot>
@ -606,7 +606,7 @@ Example: f(x)=x^2</string>
<slot access="protected" specifier="">chooseColor()</slot>
<property type="CString">name</property>
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property>
<property type="Size">minimumSize</property>
<property type="Size">maximumSize</property>
@ -671,14 +671,14 @@ Example: f(x)=x^2</string>
<slot access="public" specifier="">update()</slot>
<slot access="public" specifier="">update(int,int,int,int)</slot>
<slot access="public" specifier="">update(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint()</slot>
<slot access="public" specifier="">tqrepaint(bool)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">repaint()</slot>
<slot access="public" specifier="">repaint(bool)</slot>
<slot access="public" specifier="">repaint(int,int,int,int)</slot>
<slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">show()</slot>
<slot access="public" specifier="">hide()</slot>
<slot access="public" specifier="">setShown(bool)</slot>
@ -713,7 +713,7 @@ Example: f(x)=x^2</string>
<slot access="private" specifier="">slotEmitRelativeValueChanged(int)</slot>
<property type="CString">name</property>
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property>
<property type="Size">minimumSize</property>
<property type="Size">maximumSize</property>
@ -777,14 +777,14 @@ Example: f(x)=x^2</string>
<slot access="public" specifier="">update()</slot>
<slot access="public" specifier="">update(int,int,int,int)</slot>
<slot access="public" specifier="">update(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint()</slot>
<slot access="public" specifier="">tqrepaint(bool)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">repaint()</slot>
<slot access="public" specifier="">repaint(bool)</slot>
<slot access="public" specifier="">repaint(int,int,int,int)</slot>
<slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">show()</slot>
<slot access="public" specifier="">hide()</slot>
<slot access="public" specifier="">setShown(bool)</slot>
@ -818,7 +818,7 @@ Example: f(x)=x^2</string>
<slot access="private" specifier="">slotSettingsChanged(int)</slot>
<property type="CString">name</property>
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property>
<property type="Size">minimumSize</property>
<property type="Size">maximumSize</property>

8
kmplot/kmplot/kconstanteditor.cpp
Unescape View File

@ -69,7 +69,7 @@ void KConstantEditor::cmdEdit_clicked()
{
if ( !varlist->currentItem() )
return;
constant = varlist->currentItem()->text(0).tqat(0).latin1();
constant = varlist->currentItem()->text(0).at(0).latin1();
value = varlist->currentItem()->text(1);
KEditConstant *dlg = new KEditConstant(m_view->parser(), constant, value);
@ -82,7 +82,7 @@ void KConstantEditor::cmdDelete_clicked()
if ( !varlist->currentItem() )
return;
constant = varlist->currentItem()->text(0).tqat(0).latin1();
constant = varlist->currentItem()->text(0).at(0).latin1();
value = varlist->currentItem()->text(1);
TQString str;
@ -136,7 +136,7 @@ void KConstantEditor::cmdDuplicate_clicked()
{
if (!varlist->currentItem())
return;
constant = varlist->currentItem()->text(0).tqat(0).latin1();
constant = varlist->currentItem()->text(0).at(0).latin1();
value = varlist->currentItem()->text(1);
TQStringList list;
@ -158,7 +158,7 @@ void KConstantEditor::cmdDuplicate_clicked()
TQStringList result = KInputDialog::getItemList(i18n("Choose Name"),i18n("Choose a name for the constant:"),list, TQStringList(), false, &found);
if (found)
{
constant = (*result.begin()).tqat(0).latin1();
constant = (*result.begin()).at(0).latin1();
emit newConstantSlot();
}

2
kmplot/kmplot/keditconstant.cpp
Unescape View File

@ -54,7 +54,7 @@ KEditConstant::~KEditConstant()
void KEditConstant::cmdOK_clicked()
{
constant = txtConstant->text().tqat(0).latin1();
constant = txtConstant->text().at(0).latin1();
value = txtValue->text();
if ( constant<'A' || constant>'Z')
{

14
kmplot/kmplot/kminmax.cpp
Unescape View File

@ -248,7 +248,7 @@ void KMinMax::cmdFind_clicked()
if ( dmin<View::xmin || dmax>View::xmax )
{
KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").tqarg(View::xmin).tqarg(View::xmax) );
KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").arg(View::xmin).arg(View::xmax) );
min->setFocus();
min->selectAll();
return;
@ -273,7 +273,7 @@ void KMinMax::cmdFind_clicked()
else if ( function.at(0).category() == TQChar::Letter_Uppercase)
{
p_mode = 3;
function.tqat(0) = function.tqat(0).lower();
function.at(0) = function.at(0).lower();
}
TQString fname, fstr;
@ -308,13 +308,13 @@ void KMinMax::cmdFind_clicked()
{
m_view->findMinMaxValue(ufkt,p_mode,true,dmin,dmax,parameter);
if ( !m_view->isCalculationStopped() )
KMessageBox::information(this,i18n("Minimum value:\nx: %1\ny: %2").tqarg(dmin).tqarg(dmax) );
KMessageBox::information(this,i18n("Minimum value:\nx: %1\ny: %2").arg(dmin).arg(dmax) );
}
else if ( m_mode == 1)
{
m_view->findMinMaxValue(ufkt,p_mode,false,dmin,dmax,parameter);
if ( !m_view->isCalculationStopped() )
KMessageBox::information(this,i18n("Maximum value:\nx: %1\ny: %2").tqarg(dmin).tqarg(dmax));
KMessageBox::information(this,i18n("Maximum value:\nx: %1\ny: %2").arg(dmin).arg(dmax));
}
else if ( m_mode == 2)
{
@ -336,7 +336,7 @@ void KMinMax::cmdFind_clicked()
{
m_view->setFocus();
m_view->update();
KMessageBox::information(this,i18n("The integral in the interval [%1, %2] is:\n%3").tqarg(dmin_tmp).tqarg(dmax).tqarg(dmin));
KMessageBox::information(this,i18n("The integral in the interval [%1, %2] is:\n%3").arg(dmin_tmp).arg(dmax).arg(dmin));
}
}
@ -367,7 +367,7 @@ void KMinMax::list_highlighted(TQListBoxItem* item)
else if ( function.at(0).category() == TQChar::Letter_Uppercase)
{
p_mode = 3;
function.tqat(0) = function.tqat(0).lower();
function.at(0) = function.at(0).lower();
}
TQString const sec_function = function.section('(',0,0);
for(TQValueVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it!=m_view->parser()->ufkt.end(); ++it)
@ -405,7 +405,7 @@ void KMinMax::cmdParameter_clicked()
else if ( function.at(0).category() == TQChar::Letter_Uppercase)
{
p_mode = 3;
function.tqat(0) = function.tqat(0).lower();
function.at(0) = function.at(0).lower();
}
TQString const sec_function = function.section('(',0,0);

2
kmplot/kmplot/kmplotio.cpp
Unescape View File

@ -538,7 +538,7 @@ void KmPlotIO::oldParseFunction( XParser *m_parser, const TQDomElement & n )
ufkt.fstr = tmp_fstr.left(pos);
if ( !m_parser->getext( &ufkt, tmp_fstr) )
{
KMessageBox::error(0,i18n("The function %1 could not be loaded").tqarg(ufkt.fstr));
KMessageBox::error(0,i18n("The function %1 could not be loaded").arg(ufkt.fstr));
return;
}
}

8
kmplot/kmplot/kparametereditor.cpp
Unescape View File

@ -89,7 +89,7 @@ void KParameterEditor::cmdNew_clicked()
}
if ( checkTwoOfIt(result) )
{
KMessageBox::error(0,i18n("The value %1 already exists and will therefore not be added.").tqarg(result));
KMessageBox::error(0,i18n("The value %1 already exists and will therefore not be added.").arg(result));
continue;
}
list->insertItem(result);
@ -116,7 +116,7 @@ void KParameterEditor::cmdEdit_clicked()
if ( checkTwoOfIt(result) )
{
if( result != list->currentText() )
KMessageBox::error(0,i18n("The value %1 already exists.").tqarg(result));
KMessageBox::error(0,i18n("The value %1 already exists.").arg(result));
continue;
}
list->removeItem( list->currentItem());
@ -179,7 +179,7 @@ void KParameterEditor::cmdImport_clicked()
}
else if ( !verbose)
{
if ( KMessageBox::warningContinueCancel(this,i18n("Line %1 is not a valid parameter value and will therefore not be included. Do you want to continue?").tqarg(i) ) == KMessageBox::Cancel)
if ( KMessageBox::warningContinueCancel(this,i18n("Line %1 is not a valid parameter value and will therefore not be included. Do you want to continue?").arg(i) ) == KMessageBox::Cancel)
{
file.close();
KIO::NetAccess::removeTempFile( tmpfile );
@ -206,7 +206,7 @@ void KParameterEditor::cmdExport_clicked()
if ( url.isEmpty() )
return;
if( !KIO::NetAccess::exists( url,false,this ) || KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).tqarg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
if( !KIO::NetAccess::exists( url,false,this ) || KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
{
TQString tmpfile;
TQFile file;

4
kmplot/kmplot/ksliderwindow.cpp
Unescape View File

@ -45,8 +45,8 @@
KSliderWindow::KSliderWindow(TQWidget* parent, int num ) :
SliderWindow( parent, "", false, TQt::WStyle_Tool-TQt::WStyle_Maximize ), m_num(num)
{
setCaption(i18n( "Slider %1" ).tqarg( num+1 ) );
TQToolTip::add( slider, i18n( "Slider no. %1" ).tqarg( num+1 ));
setCaption(i18n( "Slider %1" ).arg( num+1 ) );
TQToolTip::add( slider, i18n( "Slider no. %1" ).arg( num+1 ));
TQWhatsThis::add( this, i18n( "Move slider to change the parameter of the function plot connected to this slider." ) );
// load the min and max value + the current value

20
kmplot/kmplot/parser.cpp
Unescape View File

@ -959,33 +959,33 @@ int Parser::parserError(bool showMessageBox)
switch(err)
{
case 1: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Syntax error").tqarg(TQString::number(errpos)), "KmPlot");
"Syntax error").arg(TQString::number(errpos)), "KmPlot");
break;
case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Missing parenthesis").tqarg(TQString::number(errpos)), "KmPlot");
"Missing parenthesis").arg(TQString::number(errpos)), "KmPlot");
break;
case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Function name unknown").tqarg(TQString::number(errpos)), "KmPlot");
"Function name unknown").arg(TQString::number(errpos)), "KmPlot");
break;
case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Void function variable").tqarg(TQString::number(errpos)), "KmPlot");
"Void function variable").arg(TQString::number(errpos)), "KmPlot");
break;
case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Too many functions").tqarg(TQString::number(errpos)), "KmPlot");
"Too many functions").arg(TQString::number(errpos)), "KmPlot");
break;
case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Token-memory overflow").tqarg(TQString::number(errpos)), "KmPlot");
"Token-memory overflow").arg(TQString::number(errpos)), "KmPlot");
break;
case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Stack overflow").tqarg(TQString::number(errpos)), "KmPlot");
"Stack overflow").arg(TQString::number(errpos)), "KmPlot");
break;
case 8: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"Name of function not free.").tqarg(TQString::number(errpos)), "KmPlot");
"Name of function not free.").arg(TQString::number(errpos)), "KmPlot");
break;
case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n"
"recursive function not allowed.").tqarg(TQString::number(errpos)), "KmPlot");
"recursive function not allowed.").arg(TQString::number(errpos)), "KmPlot");
break;
case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1." ).tqarg(TQString::number(errpos)),
case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1." ).arg(TQString::number(errpos)),
"KmPlot");
break;
case 11: KMessageBox::error(0, i18n("Empty function"), "KmPlot");

2
kmplot/kmplot/qeditparametric.ui
Unescape View File

@ -48,7 +48,7 @@
<property name="text">
<string>Name:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">

4
kmplot/kmplot/qminmax.ui
Unescape View File

@ -51,7 +51,7 @@
<property name="text">
<string>Search between the x-value:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@ -62,7 +62,7 @@
<property name="text">
<string>and:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

2
kmplot/kmplot/sliderwindow.ui
Unescape View File

@ -69,7 +69,7 @@
<property name="text">
<string>0</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>

6
kmplot/kmplot/xparser.cpp
Unescape View File

@ -148,7 +148,7 @@ void XParser::findFunctionName(TQString &function_name, int const id, int const
for (bool ok=true; last_character<'x'; ++last_character)
{
if ( pos==0 && last_character == 'r') continue;
function_name.tqat(pos)=last_character;
function_name.at(pos)=last_character;
for( TQValueVector<Ufkt>::iterator it = ufkt.begin(); it != ufkt.end(); ++it)
{
if (it == ufkt.begin() && it->fname.isEmpty() ) continue;
@ -162,7 +162,7 @@ void XParser::findFunctionName(TQString &function_name, int const id, int const
}
ok = true;
}
function_name.tqat(pos)='f';
function_name.at(pos)='f';
function_name.append('f');
}
function_name = "e"; //this should never happen
@ -667,7 +667,7 @@ int XParser::addFunction(const TQString &f_str)
bool XParser::addFunction(const TQString &fstr_const, bool f_mode, bool f1_mode, bool f2_mode, bool integral_mode, bool integral_use_precision, int linewidth, int f1_linewidth, int f2_linewidth, int integral_linewidth, const TQString &str_dmin, const TQString &str_dmax, const TQString &str_startx, const TQString &str_starty, double integral_precision, TQRgb color, TQRgb f1_color, TQRgb f2_color, TQRgb integral_color, TQStringList str_parameter, int use_slider)
{
TQString fstr(fstr_const);
switch ( fstr.tqat(0).latin1() )
switch ( fstr.at(0).latin1() )
{
case 'r':
{

2
kpercentage/kpercentage/kpercentage.cpp
Unescape View File

@ -60,7 +60,7 @@ KPercentage::KPercentage( const char *name ) :
// prepare exercise window, that will use the fontsize above!
percent_main = new KPercentMain( this, "KPercentage" );
// fixed tqgeometry bacause of background pixmap
// fixed geometry bacause of background pixmap
setFixedSize( TQSize( 548, 248 ) );
/** load and set background pixmap */

38
kpercentage/kpercentage/kpercentage.docbook
Unescape View File

@ -243,7 +243,7 @@ Programming &kpercentage; plugins is a joy to behold. Just read through the next
should consult the docbook reference for further details. The example below was
taken from that reference and shortened a bit for readability. -->
<refentry id="re-1007-unmanagetqchildren-1">
<refentry id="re-1007-unmanagechildren-1">
<refmeta>
<refentrytitle>XtUnmanageChildren</refentrytitle>
<refmiscinfo>Xt - Geometry Management</refmiscinfo>
@ -251,26 +251,26 @@ taken from that reference and shortened a bit for readability. -->
<refnamediv>
<refname>XtUnmanageChildren
</refname>
<refpurpose>remove a list of tqchildren from a parent widget's managed list.
<refpurpose>remove a list of children from a parent widget's managed list.
</refpurpose>
<indexterm id="ix-1007-unmanagetqchildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
<indexterm id="ix-1007-unmanagetqchildren-2"><primary>XtUnmanageChildren</primary></indexterm>
<indexterm id="ix-1007-unmanagechildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm>
<indexterm id="ix-1007-unmanagechildren-2"><primary>XtUnmanageChildren</primary></indexterm>
</refnamediv>
<refsynopsisdiv>
<refsynopsisdivinfo>
<date>4 March 1996</date>
</refsynopsisdivinfo>
<synopsis>
void XtUnmanageChildren(<replaceable class="parameter">tqchildren</replaceable>, <replaceable class="parameter">num_tqchildren</replaceable>)
WidgetList <replaceable class="parameter">tqchildren</replaceable>;
Cardinal <replaceable class="parameter">num_tqchildren</replaceable>;
void XtUnmanageChildren(<replaceable class="parameter">children</replaceable>, <replaceable class="parameter">num_children</replaceable>)
WidgetList <replaceable class="parameter">children</replaceable>;
Cardinal <replaceable class="parameter">num_children</replaceable>;
</synopsis>
<refsect2 id="r2-1007-unmanagetqchildren-1">
<refsect2 id="r2-1007-unmanagechildren-1">
<title>Inputs</title>
<variablelist>
<varlistentry>
<term><replaceable class="parameter">tqchildren</replaceable>
<term><replaceable class="parameter">children</replaceable>
</term>
<listitem>
<para>Specifies an array of child widgets. Each child must be of
@ -279,26 +279,26 @@ class RectObj or any subclass thereof.
</listitem>
</varlistentry>
<varlistentry>
<term><replaceable class="parameter">num_tqchildren</replaceable>
<term><replaceable class="parameter">num_children</replaceable>
</term>
<listitem>
<para>Specifies the number of elements in <replaceable class="parameter">tqchildren</replaceable>.
<para>Specifies the number of elements in <replaceable class="parameter">children</replaceable>.
</para>
</listitem>
</varlistentry>
</variablelist>
</refsect2></refsynopsisdiv>
<refsect1 id="r1-1007-unmanagetqchildren-1">
<refsect1 id="r1-1007-unmanagechildren-1">
<title>Description
</title>
<para><function>XtUnmanageChildren()</function> unmaps the specified widgets
and removes them from their parent's tqgeometry management.
and removes them from their parent's geometry management.
The widgets will disappear from the screen, and (depending
on its parent) may no longer have screen space allocated for
them.
</para>
<para>Each of the widgets in the <replaceable class="parameter">tqchildren</replaceable> array must have
<para>Each of the widgets in the <replaceable class="parameter">children</replaceable> array must have
the same parent.
</para>
<para>See the &ldquo;Algorithm&rdquo; section below for full details of the
@ -306,13 +306,13 @@ widget unmanagement procedure.
</para>
</refsect1>
<refsect1 id="r1-1007-unmanagetqchildren-2">
<refsect1 id="r1-1007-unmanagechildren-2">
<title>Usage</title>
<para>Unmanaging widgets is the usual method for temporarily
making them invisible. They can be re-managed with
<function>XtManageChildren()</function>.
</para>
<para>You can unmap a widget, but leave it under tqgeometry
<para>You can unmap a widget, but leave it under geometry
management by calling <function>XtUnmapWidget()</function>. You can
destroy a widget's window without destroying the widget by
calling <function>XtUnrealizeWidget()</function>. You can destroy a
@ -329,7 +329,7 @@ method once.
</para>
</refsect1>
<refsect1 id="r1-1007-unmanagetqchildren-3">
<refsect1 id="r1-1007-unmanagechildren-3">
<title>Algorithm
</title>
<para><function>XtUnmanageChildren()</function> performs the following:
@ -358,11 +358,11 @@ by unmapping it.
</para>
</refsect1>
<refsect1 id="r1-1007-unmanagetqchildren-4">
<refsect1 id="r1-1007-unmanagechildren-4">
<title>Structures</title>
<para>The <type>WidgetList</type> type is simply an array of widgets:
</para>
<screen id="sc-1007-unmanagetqchildren-1">typedef Widget *WidgetList;
<screen id="sc-1007-unmanagechildren-1">typedef Widget *WidgetList;
</screen>
</refsect1>
</refentry>

12
kpercentage/kpercentage/kpercentmain.cpp
Unescape View File

@ -202,12 +202,12 @@ void KPercentMain::newTask()
line_edit_percentvalue->setFocusPolicy( TQ_NoFocus );
// set the number of managed tasks into a label
label_count->setText( TQString( i18n("You got %1 of %2 exercises.").tqarg(count).tqarg(number) ) ); // update Label for the Progress
label_count->setText( TQString( i18n("You got %1 of %2 exercises.").arg(count).arg(number) ) ); // update Label for the Progress
// progress_bar_count->setProgress( count*100 ); // updating Progrssbar
startTimer( 10 );
// set string which task is just workin on (Task x of y)
TQString taskNumber( i18n( "Exercise no. %1:" ).tqarg(count+1) );
TQString taskNumber( i18n( "Exercise no. %1:" ).arg(count+1) );
label_number->setText( taskNumber );
// label_number->adjustSize();
@ -292,8 +292,8 @@ void KPercentMain::slotApplyInput()
total_answers++;
progress_bar_right_wrong->setTotalSteps( total_answers );
progress_bar_right_wrong->setProgress( right_answers );
label_right->setText( i18n( "%1%\nright" ).tqarg( (100*right_answers)/total_answers ) );
label_wrong->setText( i18n( "%1%\nwrong" ).tqarg( 100-(100*right_answers)/total_answers ) );
label_right->setText( i18n( "%1%\nright" ).arg( (100*right_answers)/total_answers ) );
label_wrong->setText( i18n( "%1%\nwrong" ).arg( 100-(100*right_answers)/total_answers ) );
newTask(); // next task, perhaps
}
@ -304,8 +304,8 @@ void KPercentMain::slotApplyInput()
total_answers++;
progress_bar_right_wrong->setTotalSteps( total_answers );
progress_bar_right_wrong->setProgress( right_answers );
label_right->setText( i18n( "%1%\nright" ).tqarg( (100*right_answers)/total_answers ) );
label_wrong->setText( i18n( "%1%\nwrong" ).tqarg( 100-(100*right_answers)/total_answers ) );
label_right->setText( i18n( "%1%\nright" ).arg( (100*right_answers)/total_answers ) );
label_wrong->setText( i18n( "%1%\nwrong" ).arg( 100-(100*right_answers)/total_answers ) );
}
}
}

14
kstars/kstars/addcatdialog.cpp
Unescape View File

@ -145,10 +145,10 @@ TQString AddCatDialog::writeCatalogHeader() {
TQString name = ( acd->CatalogName->text().isEmpty() ? i18n("Custom") : acd->CatalogName->text() );
TQString pre = ( acd->Prefix->text().isEmpty() ? "CC" : acd->Prefix->text() );
TQString h = TQString("# Name: %1\n").tqarg( name );
h += TQString("# Prefix: %1\n").tqarg( pre );
h += TQString("# Color: %1\n").tqarg( acd->ColorButton->color().name() );
h += TQString("# Epoch: %1\n").tqarg( acd->Epoch->value() );
TQString h = TQString("# Name: %1\n").arg( name );
h += TQString("# Prefix: %1\n").arg( pre );
h += TQString("# Color: %1\n").arg( acd->ColorButton->color().name() );
h += TQString("# Epoch: %1\n").arg( acd->Epoch->value() );
h += TQString("# ");
for ( uint i=0; i < acd->FieldList->count(); ++i ) {
@ -194,7 +194,7 @@ void AddCatDialog::slotShowDataFile() {
void AddCatDialog::slotPreviewCatalog() {
if ( validateDataFile() ) {
KMessageBox::informationList( 0, i18n( "Preview of %1" ).tqarg( acd->CatalogName->text() ),
KMessageBox::informationList( 0, i18n( "Preview of %1" ).arg( acd->CatalogName->text() ),
TQStringList::split( "\n", CatalogContents ), i18n( "Catalog Preview" ) );
}
}
@ -210,7 +210,7 @@ void AddCatDialog::slotCreateCatalog() {
KURL u( acd->CatalogURL->url() );
int r=KMessageBox::warningContinueCancel( 0,
i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).tqarg( u.fileName() ),
"Overwrite it?" ).arg( u.fileName() ),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) );
@ -220,7 +220,7 @@ void AddCatDialog::slotCreateCatalog() {
TQFile OutFile( acd->CatalogURL->url() );
if ( ! OutFile.open( IO_WriteOnly ) ) {
KMessageBox::sorry( 0,
i18n( "Could not open the file %1 for writing." ).tqarg( acd->CatalogURL->url() ),
i18n( "Could not open the file %1 for writing." ).arg( acd->CatalogURL->url() ),
i18n( "Error Opening Output File" ) );
} else {
TQTextStream outStream( &OutFile );

2
kstars/kstars/addlinkdialog.cpp
Unescape View File

@ -26,7 +26,7 @@
#include "skyobject.h"
AddLinkDialog::AddLinkDialog( TQWidget *parent, const TQString &oname )
: KDialogBase( KDialogBase::Plain, i18n( "Add Custom URL to %1" ).tqarg( oname ), Ok|Cancel, Ok, parent ), ObjectName( oname ) {
: KDialogBase( KDialogBase::Plain, i18n( "Add Custom URL to %1" ).arg( oname ), Ok|Cancel, Ok, parent ), ObjectName( oname ) {
TQFrame *page = plainPage();
setMainWidget(page);

2
kstars/kstars/ccdpreviewui.ui
Unescape View File

@ -363,7 +363,7 @@
<property name="text">
<string>--</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="toolTip" stdset="0">

8
kstars/kstars/ccdpreviewwg.cpp
Unescape View File

@ -106,7 +106,7 @@ void CCDPreviewWG::setColorFrame(bool color)
TQString errMsg;
struct sockaddr_in pin;
struct hostent *serverHostName = gethostbyname(host.ascii());
errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").tqarg(host).tqarg(port);
errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").arg(host).arg(port);
memset(&pin, 0, sizeof(pin));
pin.sin_family = AF_INET;
@ -197,7 +197,7 @@ void CCDPreviewWG::updateFWHM()
fwhm_arcsec = (206.26 / focal_length) * fwhm * mu;
FWHMLabel->setText(TQString("%1").tqarg(fwhm_arcsec, 0, 'g', 3));
FWHMLabel->setText(TQString("%1").arg(fwhm_arcsec, 0, 'g', 3));
}
@ -263,14 +263,14 @@ void CCDPreviewWG::captureImage()
if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) )
{
TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( currentFileURL.prettyURL() );
TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() );
KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) );
}
}
}
else
{
TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() );
TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() );
KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) );
}

2
kstars/kstars/colorscheme.cpp
Unescape View File

@ -144,7 +144,7 @@ void ColorScheme::copy( const ColorScheme &cs ) {
TQString ColorScheme::colorNamed( const TQString &name ) const {
//TQString color( Palette[ name ] );
if ( ! hasColorNamed( name ) ) {
kdWarning() << i18n( "No color named \"%1\" found in color scheme." ).tqarg( name ) << endl;
kdWarning() << i18n( "No color named \"%1\" found in color scheme." ).arg( name ) << endl;
//color = "#FFFFFF"; //set to white if no color found
return "#FFFFFF";
}

2
kstars/kstars/data/tips
Unescape View File

@ -360,7 +360,7 @@
<html>
<p>You can construct your own field-of-view (FOV) symbols, using the
FOV Editor under the Tools menu. You can set the angular size, the
tqshape, and the color of your new symbols.
shape, and the color of your new symbols.
</p>
</html>
</tip>

50
kstars/kstars/detaildialog.cpp
Unescape View File

@ -135,20 +135,20 @@ void DetailDialog::createGeneralTab()
Data->Names->setText( s->longname() );
Data->Type->setText( s->sptype() + " " + i18n("star") );
Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).tqarg(
Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg(
KGlobal::locale()->formatNumber( s->mag(), 1 ) ) ); //show to tenths place
//distance
if ( s->distance() > 2000. || s->distance() < 0. ) // parallax < 0.5 mas
Data->Distance->setText( TQString(i18n("larger than 2000 parsecs", "> 2000 pc") ) );
else if ( s->distance() > 50.0 ) //show to nearest integer
Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).tqarg(
Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg(
TQString::number( int( s->distance() + 0.5 ) ) ) );
else if ( s->distance() > 10.0 ) //show to tenths place
Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).tqarg(
Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg(
KGlobal::locale()->formatNumber( s->distance(), 1 ) ) );
else //show to hundredths place
Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).tqarg(
Data->Distance->setText( i18n( "number in parsecs", "%1 pc" ).arg(
KGlobal::locale()->formatNumber( s->distance(), 2 ) ) );
//Note multiplicity/variablility in angular size label
@ -183,28 +183,28 @@ void DetailDialog::createGeneralTab()
//Magnitude: The moon displays illumination fraction instead
if ( selectedObject->name() == "Moon" ) {
Data->MagLabel->setText( i18n("Illumination:") );
Data->Mag->setText( TQString("%1 %").tqarg( int( ((KSMoon *)selectedObject)->illum()*100. ) ) );
Data->Mag->setText( TQString("%1 %").arg( int( ((KSMoon *)selectedObject)->illum()*100. ) ) );
} else {
Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).tqarg(
Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg(
KGlobal::locale()->formatNumber( ps->mag(), 1 ) ) ); //show to tenths place
}
//Distance from Earth. The moon requires a unit conversion
if ( ps->name() == "Moon" ) {
Data->Distance->setText( i18n("distance in kilometers", "%1 km").tqarg(
Data->Distance->setText( i18n("distance in kilometers", "%1 km").arg(
KGlobal::locale()->formatNumber( ps->rearth()*AU_KM ) ) );
} else {
Data->Distance->setText( i18n("distance in Astronomical Units", "%1 AU").tqarg(
Data->Distance->setText( i18n("distance in Astronomical Units", "%1 AU").arg(
KGlobal::locale()->formatNumber( ps->rearth() ) ) );
}
//Angular size; moon and sun in arcmin, others in arcsec
if ( ps->angSize() ) {
if ( ps->name() == "Sun" || ps->name() == "Moon" )
Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").tqarg(
Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg(
KGlobal::locale()->formatNumber( ps->angSize() ) ) );
else
Data->AngSize->setText( i18n("angular size in arcseconds", "%1 arcsec").tqarg(
Data->AngSize->setText( i18n("angular size in arcseconds", "%1 arcsec").arg(
KGlobal::locale()->formatNumber( ps->angSize()*60.0 ) ) );
} else {
Data->AngSize->setText( "--" );
@ -230,11 +230,11 @@ void DetailDialog::createGeneralTab()
if ( dso->ugc() != 0 ) {
if ( ! oname.isEmpty() ) oname += ", ";
oname += "UGC " + TQString("%1").tqarg( dso->ugc() );
oname += "UGC " + TQString("%1").arg( dso->ugc() );
}
if ( dso->pgc() != 0 ) {
if ( ! oname.isEmpty() ) oname += ", ";
oname += "PGC " + TQString("%1").tqarg( dso->pgc() );
oname += "PGC " + TQString("%1").arg( dso->pgc() );
}
if ( ! oname.isEmpty() ) pname += ", " + oname;
@ -245,7 +245,7 @@ void DetailDialog::createGeneralTab()
if ( dso->mag() > 90.0 )
Data->Mag->setText( "--" );
else
Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).tqarg(
Data->Mag->setText( i18n( "number in magnitudes", "%1 mag" ).arg(
KGlobal::locale()->formatNumber( dso->mag(), 1 ) ) ); //show to tenths place
//No distances at this point...
@ -253,10 +253,10 @@ void DetailDialog::createGeneralTab()
//Only show decimal place for small angular sizes
if ( dso->a() > 10.0 )
Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").tqarg(
Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg(
int( dso->a() ) ) );
else if ( dso->a() )
Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").tqarg(
Data->AngSize->setText( i18n("angular size in arcminutes", "%1 arcmin").arg(
KGlobal::locale()->formatNumber( dso->a(), 1 ) ) );
else
Data->AngSize->setText( "--" );
@ -315,8 +315,8 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo
//Replace the decimal point with localized decimal symbol
sEpoch.replace( ".", KGlobal::locale()->decimalSymbol() );
Pos->RALabel->setText( i18n( "RA (%1):" ).tqarg( sEpoch ) );
Pos->DecLabel->setText( i18n( "Dec (%1):" ).tqarg( sEpoch ) );
Pos->RALabel->setText( i18n( "RA (%1):" ).arg( sEpoch ) );
Pos->DecLabel->setText( i18n( "Dec (%1):" ).arg( sEpoch ) );
Pos->RA->setText( selectedObject->ra()->toHMSString() );
Pos->Dec->setText( selectedObject->dec()->toDMSString() );
Pos->Az->setText( selectedObject->az()->toDMSString() );
@ -331,7 +331,7 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo
ha.setH( 24.0 - ha.Hours() );
sgn = '-';
}
Pos->HA->setText( TQString("%1%2").tqarg(sgn).tqarg( ha.toHMSString() ) );
Pos->HA->setText( TQString("%1%2").arg(sgn).arg( ha.toHMSString() ) );
//Airmass is approximated as the secant of the zenith distance,
//equivalent to 1./sin(Alt). Beware of Inf at Alt=0!
@ -484,7 +484,7 @@ void DetailDialog::createLogTab()
vlay->addWidget( Log );
if ( selectedObject->userLog.isEmpty() )
Log->UserLog->setText(i18n("Record here observation logs and/or data on %1.").tqarg(selectedObject->translatedName()));
Log->UserLog->setText(i18n("Record here observation logs and/or data on %1.").arg(selectedObject->translatedName()));
else
Log->UserLog->setText(selectedObject->userLog);
@ -658,7 +658,7 @@ void DetailDialog::removeLinkDialog()
currentItemTitle = Links->ImagesList->currentText();
}
if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 link?").tqarg(currentItemTitle), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue)
if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 link?").arg(currentItemTitle), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue)
return;
switch (type)
@ -938,7 +938,7 @@ void DetailDialog::centerTelescope()
if (ConnectEle->state == PS_OFF)
{
KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").tqarg(indidev->label));
KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").arg(indidev->label));
return;
}
@ -992,8 +992,8 @@ void DetailDialog::centerTelescope()
if (useJ2000)
sp.apparentCoord(ksw->data()->ut().djd(), (long double) J2000);
RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second()));
DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec()));
RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour()).arg(sp.ra()->minute()).arg(sp.ra()->second()));
DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree()).arg(sp.dec()->arcmin()).arg(sp.dec()->arcsec()));
break;
@ -1009,8 +1009,8 @@ void DetailDialog::centerTelescope()
sp.setAlt(*ksw->map()->clickedPoint()->alt());
}
AzEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.az()->degree()).tqarg(sp.az()->arcmin()).tqarg(sp.az()->arcsec()));
AltEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.alt()->degree()).tqarg(sp.alt()->arcmin()).tqarg(sp.alt()->arcsec()));
AzEle->write_w->setText(TQString("%1:%2:%3").arg(sp.az()->degree()).arg(sp.az()->arcmin()).arg(sp.az()->arcsec()));
AltEle->write_w->setText(TQString("%1:%2:%3").arg(sp.alt()->degree()).arg(sp.alt()->arcmin()).arg(sp.alt()->arcsec()));
break;
}

10
kstars/kstars/details_data.ui
Unescape View File

@ -45,7 +45,7 @@
<property name="text">
<string>&lt;p align="center"&gt;Primary Name, Other Names&lt;/p&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@ -141,7 +141,7 @@
<property name="text">
<string>in</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -345,7 +345,7 @@
<property name="text">
<string>Magnitude:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -377,7 +377,7 @@
<property name="text">
<string>Distance:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -433,7 +433,7 @@
<property name="text">
<string>Size:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>

24
kstars/kstars/details_position.ui
Unescape View File

@ -154,7 +154,7 @@
<property name="text">
<string>Dec (2000.0):</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -178,7 +178,7 @@
<property name="text">
<string>RA (2000.0):</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -279,7 +279,7 @@
<property name="text">
<string>Altitude:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -303,7 +303,7 @@
<property name="text">
<string>Azimuth:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -364,7 +364,7 @@
<property name="text">
<string>Hour angle:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -440,7 +440,7 @@
<property name="text">
<string>Airmass:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -629,7 +629,7 @@
<property name="text">
<string>Set time:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -653,7 +653,7 @@
<property name="text">
<string>Transit time:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -677,7 +677,7 @@
<property name="text">
<string>Rise time:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -778,7 +778,7 @@
<property name="text">
<string>Azimuth at set:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -802,7 +802,7 @@
<property name="text">
<string>Altitude at transit:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -876,7 +876,7 @@
<property name="text">
<string>Azimuth at rise:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>

2
kstars/kstars/devicemanager.cpp
Unescape View File

@ -87,7 +87,7 @@ bool DeviceManager::indiConnect(TQString inHost, TQString inPort)
TQString errMsg;
struct sockaddr_in pin;
struct hostent *serverHostName = gethostbyname(host.ascii());
errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").tqarg(host).tqarg(port);
errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").arg(host).arg(port);
memset(&pin, 0, sizeof(pin));
pin.sin_family = AF_INET;

4
kstars/kstars/dms.cpp
Unescape View File

@ -120,8 +120,8 @@ bool dms::setFromString( const TQString &str, bool isDeg ) {
else {
double mx = fields[1].toDouble( &checkValue );
if ( checkValue ) {
fields[1] = TQString("%1").tqarg( int(mx) );
fields.append( TQString("%1").tqarg( int( 60.0*(mx - int(mx)) ) ) );
fields[1] = TQString("%1").arg( int(mx) );
fields.append( TQString("%1").arg( int( 60.0*(mx - int(mx)) ) ) );
} else {
setD( 0.0 );
return false;

2
kstars/kstars/finddialog.cpp
Unescape View File

@ -198,7 +198,7 @@ void FindDialog::setFilter( int f ) {
void FindDialog::slotOk() {
//If no valid object selected, show a sorry-box. Otherwise, emit accept()
if ( currentItem() == 0 ) {
TQString message = i18n( "No object named %1 found." ).tqarg( SearchBox->text() );
TQString message = i18n( "No object named %1 found." ).arg( SearchBox->text() );
KMessageBox::sorry( 0, message, i18n( "Bad object name" ) );
} else {
accept();

12
kstars/kstars/fitshistogram.cpp
Unescape View File

@ -75,14 +75,14 @@
void FITSHistogram::updateBoxes()
{
if (minSlider->value() == BARS)
minOUT->setText(TQString("%1").tqarg((int) viewer->stats.max));
minOUT->setText(TQString("%1").arg((int) viewer->stats.max));
else
minOUT->setText(TQString("%1").tqarg( (int) ( ceil (minSlider->value() * binSize) + viewer->stats.min)));
minOUT->setText(TQString("%1").arg( (int) ( ceil (minSlider->value() * binSize) + viewer->stats.min)));
if (maxSlider->value() == BARS)
maxOUT->setText(TQString("%1").tqarg((int) viewer->stats.max));
maxOUT->setText(TQString("%1").arg((int) viewer->stats.max));
else
maxOUT->setText(TQString("%1").tqarg( (int) ( ceil (maxSlider->value() * binSize) + viewer->stats.min)));
maxOUT->setText(TQString("%1").arg( (int) ( ceil (maxSlider->value() * binSize) + viewer->stats.min)));
update();
}
@ -217,9 +217,9 @@ void FITSHistogram::updateIntenFreq(int x)
int index = (int) ceil(x * binSize);
intensityOUT->setText(TQString("%1").tqarg((int) ( index + viewer->stats.min)));
intensityOUT->setText(TQString("%1").arg((int) ( index + viewer->stats.min)));
frequencyOUT->setText(TQString("%1").tqarg(histArray[x]));
frequencyOUT->setText(TQString("%1").arg(histArray[x]));
}

2
kstars/kstars/fitsimage.cpp
Unescape View File

@ -161,7 +161,7 @@ void FITSImage::contentsMouseMoveEvent ( TQMouseEvent * e )
if (validPoint)
{
viewer->statusBar()->changeItem(TQString("%1 , %2").tqarg( (int) x).tqarg( (int) y), 0);
viewer->statusBar()->changeItem(TQString("%1 , %2").arg( (int) x).arg( (int) y), 0);
viewer->statusBar()->changeItem( KGlobal::locale()->formatNumber( viewer->imgBuffer[(int) (y * width + x)], 3 ), 1 );
setCursor(TQt::CrossCursor);
}

26
kstars/kstars/fitsviewer.cpp
Unescape View File

@ -311,7 +311,7 @@ float * FITSViewer::loadData(const char *filename, float *buffer)
if (fread(tempData, 1, width * height * bpp, ifp->fp) != (unsigned int) (width * height * bpp))
{
KMessageBox::error(0, i18n("Unable to read FITS data from file. %1.\n").tqarg(strerror(errno)));
KMessageBox::error(0, i18n("Unable to read FITS data from file. %1.\n").arg(strerror(errno)));
return (NULL);
}
@ -388,7 +388,7 @@ void FITSViewer::calculateStats()
kdDebug() << "Average: " << stats.average << " - stddev: " << stats.stddev << endl;
kdDebug() << "Width: " << stats.width << " - Height " << stats.height << " - bitpix " << stats.bitpix << endl;*/
statusBar()->changeItem( TQString("%1 x %2").tqarg( (int) stats.width).tqarg( (int) stats.height), 2);
statusBar()->changeItem( TQString("%1 x %2").arg( (int) stats.width).arg( (int) stats.height), 2);
}
@ -555,7 +555,7 @@ void FITSViewer::fileSave()
{
int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).tqarg(currentURL.fileName()),
"Overwrite it?" ).arg(currentURL.fileName()),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) );
@ -692,7 +692,7 @@ void FITSViewer::fileSave()
}
else
{
TQString message = i18n( "Invalid URL: %1" ).tqarg( currentURL.url() );
TQString message = i18n( "Invalid URL: %1" ).arg( currentURL.url() );
KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) );
}
@ -880,15 +880,15 @@ void FITSViewer::fitsStatistics()
calculateStats();
stat.widthOUT->setText(TQString("%1").tqarg(stats.width));
stat.heightOUT->setText(TQString("%1").tqarg(stats.height));
stat.bitpixOUT->setText(TQString("%1").tqarg(stats.bitpix));
stat.maxOUT->setText(TQString("%1").tqarg(stats.max));
stat.minOUT->setText(TQString("%1").tqarg(stats.min));
stat.atMaxOUT->setText(TQString("%1").tqarg(stats.maxAt));
stat.atMinOUT->setText(TQString("%1").tqarg(stats.minAt));
stat.meanOUT->setText(TQString("%1").tqarg(stats.average));
stat.stddevOUT->setText(TQString("%1").tqarg(stats.stddev));
stat.widthOUT->setText(TQString("%1").arg(stats.width));
stat.heightOUT->setText(TQString("%1").arg(stats.height));
stat.bitpixOUT->setText(TQString("%1").arg(stats.bitpix));
stat.maxOUT->setText(TQString("%1").arg(stats.max));
stat.minOUT->setText(TQString("%1").arg(stats.min));
stat.atMaxOUT->setText(TQString("%1").arg(stats.maxAt));
stat.atMinOUT->setText(TQString("%1").arg(stats.minAt));
stat.meanOUT->setText(TQString("%1").arg(stats.average));
stat.stddevOUT->setText(TQString("%1").arg(stats.stddev));
stat.exec();

2
kstars/kstars/fov.cpp
Unescape View File

@ -77,7 +77,7 @@ void FOV::draw( TQPainter &p, float pixelsize ) {
int w = p.viewport().width();
int h = p.viewport().height();
switch ( tqshape() ) {
switch ( shape() ) {
case 0: { //Square
int s = int( pixelsize );
p.drawRect( (w - s)/2, (h - s)/2, s, s );

4
kstars/kstars/fov.h
Unescape View File

@ -32,14 +32,14 @@ class FOV {
public:
FOV();
FOV( TQString name ); //in this case, read params from fov.dat
FOV( TQString name, float size, int tqshape=0, TQString color="#FFFFFF" );
FOV( TQString name, float size, int shape=0, TQString color="#FFFFFF" );
~FOV() {}
// enum SHAPE { FOV_SQUARE=0, FOV_CIRCLE=1, FOV_CROSSHAIRS=2, FOV_BULLSEYE=3, FOV_UNKNOWN };
TQString name() const { return Name; }
void setName( const TQString &n ) { Name = n; }
int tqshape() const { return Shape; }
int shape() const { return Shape; }
void setShape( int s ) { Shape = s; }
float size() const { return Size; }
void setSize( float s ) { Size = s; }

6
kstars/kstars/fovdialog.cpp
Unescape View File

@ -134,7 +134,7 @@ void FOVDialog::paintEvent( TQPaintEvent * ) {
TQFont smallFont = p.font();
smallFont.setPointSize( p.font().pointSize() - 2 );
p.setFont( smallFont );
p.drawText( 0, fov->ViewBox->contentsRect().height(), i18n("angular size in arcminutes", "%1 arcmin").tqarg( KGlobal::locale()->formatNumber( f->size() ), 3 ) );
p.drawText( 0, fov->ViewBox->contentsRect().height(), i18n("angular size in arcminutes", "%1 arcmin").arg( KGlobal::locale()->formatNumber( f->size() ), 3 ) );
}
}
@ -164,7 +164,7 @@ void FOVDialog::slotEditFOV() {
newfdlg.ui->FOVName->setText( f->name() );
newfdlg.ui->FOVEdit->setText( KGlobal::locale()->formatNumber( f->size(), 3 ) );
newfdlg.ui->ColorButton->setColor( TQColor( f->color() ) );
newfdlg.ui->ShapeBox->setCurrentItem( f->tqshape() );
newfdlg.ui->ShapeBox->setCurrentItem( f->shape() );
newfdlg.slotUpdateFOV();
if ( newfdlg.exec() == TQDialog::Accepted ) {
@ -231,7 +231,7 @@ void NewFOV::paintEvent( TQPaintEvent * ) {
p.begin( ui->ViewBox );
p.fillRect( ui->ViewBox->contentsRect(), TQColor( "black" ) );
f.draw( p, (float)( 0.3*ui->ViewBox->contentsRect().width() ) );
p.drawText( 0, 0, i18n("angular size in arcminutes", "%1 arcmin").tqarg( KGlobal::locale()->formatNumber( f.size() ), 3 ) );
p.drawText( 0, 0, i18n("angular size in arcminutes", "%1 arcmin").arg( KGlobal::locale()->formatNumber( f.size() ), 3 ) );
p.end();
}

4
kstars/kstars/fovdialogui.ui
Unescape View File

@ -55,7 +55,7 @@
<string>Add a new FOV symbol</string>
</property>
<property name="whatsThis" stdset="0">
<string>Add a new field-of-view (FOV) symbol to the list. You can define the size, tqshape, and color of the new symbol.</string>
<string>Add a new field-of-view (FOV) symbol to the list. You can define the size, shape, and color of the new symbol.</string>
</property>
</widget>
<spacer>
@ -86,7 +86,7 @@
<string>Modify the highlighted FOV symbol</string>
</property>
<property name="whatsThis" stdset="0">
<string>Press this button to modify the highlighted FOV symbol. You can change its size, tqshape and color.</string>
<string>Press this button to modify the highlighted FOV symbol. You can change its size, shape and color.</string>
</property>
</widget>
<widget class="KPushButton">

2
kstars/kstars/geolocation.h
Unescape View File

@ -282,7 +282,7 @@ public:
*/
void geodToCart (void);
/**The geoid is an elliposid which fits the tqshape of the Earth. It is
/**The geoid is an elliposid which fits the shape of the Earth. It is
*characterized by two parameters: the semimajor axis and the
*flattening.
*

30
kstars/kstars/imagesequence.cpp
Unescape View File

@ -249,8 +249,8 @@ void imagesequence::startSequence()
currentFilter = filterCombo->currentText();
lastFilter = filterCombo->currentItem();
fullImgCountOUT->setText( TQString("%1").tqarg(seqTotalCount));
currentImgCountOUT->setText(TQString("%1").tqarg(seqCurrentCount));
fullImgCountOUT->setText( TQString("%1").arg(seqTotalCount));
currentImgCountOUT->setText(TQString("%1").arg(seqCurrentCount));
// Ok, now let's connect signals and slots for this device
connect(stdDevCCD, TQT_SIGNAL(FITSReceived(TQString)), this, TQT_SLOT(newFITS(TQString)));
@ -315,7 +315,7 @@ void imagesequence::checkCCD(int ccdNum)
if (!idevice)
{
KMessageBox::error(this, i18n("INDI device %1 no longer exists.").tqarg(targetCCD));
KMessageBox::error(this, i18n("INDI device %1 no longer exists.").arg(targetCCD));
CCDCombo->removeItem(ccdNum);
lastCCD = CCDCombo->currentItem();
if (lastCCD != -1)
@ -325,7 +325,7 @@ void imagesequence::checkCCD(int ccdNum)
if (!idevice->isOn())
{
KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").tqarg(targetCCD));
KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").arg(targetCCD));
CCDCombo->setCurrentItem(lastCCD);
return;
@ -344,7 +344,7 @@ void imagesequence::newFITS(TQString deviceLabel)
seqCurrentCount++;
imgProgress->setProgress(seqCurrentCount);
currentImgCountOUT->setText( TQString("%1").tqarg(seqCurrentCount));
currentImgCountOUT->setText( TQString("%1").arg(seqCurrentCount));
// if we're done
if (seqCurrentCount == seqTotalCount)
@ -395,7 +395,7 @@ bool imagesequence::verifyCCDIntegrity()
if (!idevice)
{
KMessageBox::error(this, i18n("INDI device %1 no longer exists.").tqarg(targetCCD));
KMessageBox::error(this, i18n("INDI device %1 no longer exists.").arg(targetCCD));
CCDCombo->removeItem(CCDCombo->currentItem());
lastCCD = CCDCombo->currentItem();
return false;
@ -403,7 +403,7 @@ bool imagesequence::verifyCCDIntegrity()
if (!idevice->isOn())
{
KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").tqarg(currentCCD));
KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").arg(currentCCD));
return false;
}
@ -449,7 +449,7 @@ bool imagesequence::verifyFilterIntegrity()
filterDevice = devMenu->findDeviceByLabel(targetFilter);
if (filterDevice == NULL)
{
KMessageBox::error(this, i18n("INDI device %1 no longer exists.").tqarg(targetFilter));
KMessageBox::error(this, i18n("INDI device %1 no longer exists.").arg(targetFilter));
filterCombo->removeItem(filterCombo->currentItem());
filterCombo->setCurrentItem(0);
currentFilter = filterCombo->currentText();
@ -461,7 +461,7 @@ bool imagesequence::verifyFilterIntegrity()
// #2 Make sure it's connected
if (!filterDevice->isOn())
{
KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").tqarg(targetFilter));
KMessageBox::error(this, i18n("%1 is disconnected. Establish a connection to the device using the INDI Control Panel.").arg(targetFilter));
filterCombo->setCurrentItem(0);
currentFilter = filterCombo->currentText();
filterPosCombo->clear();
@ -568,7 +568,7 @@ void imagesequence::captureImage()
if (seqExpose < exposeElem->min || seqExpose > exposeElem->max)
{
stopSequence();
KMessageBox::error(this, i18n("Expose duration is invalid. %1 supports expose durations from %2 to %3 seconds only.").tqarg(currentCCD).tqarg(exposeElem->min).tqarg(exposeElem->max));
KMessageBox::error(this, i18n("Expose duration is invalid. %1 supports expose durations from %2 to %3 seconds only.").arg(currentCCD).arg(exposeElem->min).arg(exposeElem->max));
return;
}
@ -580,7 +580,7 @@ void imagesequence::captureImage()
exposeElem->spinChanged(seqExpose);
}
else
exposeElem->write_w->setText( TQString("%1").tqarg(seqExpose));
exposeElem->write_w->setText( TQString("%1").arg(seqExpose));
}
@ -609,19 +609,19 @@ void imagesequence::updateFilterCombo(int filterNum)
if (filterList.empty())
for (unsigned int i=0; i <= filterMax; i++)
filterList << TQString("%1").tqarg(i);
filterList << TQString("%1").arg(i);
// Fill filter combo
if (filterList.count() <= filterMax)
{
filterPosCombo->insertStringList(filterList);
for (unsigned int i = filterList.count() ; i <= filterMax ; i++)
filterPosCombo->insertItem(TQString("%1").tqarg(i));
filterPosCombo->insertItem(TQString("%1").arg(i));
} else
{
// filterMax < filterList.count()
for (unsigned int i = 0 ; i <= filterMax ; i++)
filterPosCombo->insertItem(TQString("%1").tqarg(filterList[i]));
filterPosCombo->insertItem(TQString("%1").arg(filterList[i]));
}
@ -668,7 +668,7 @@ void imagesequence::selectFilter()
filterElem->spinChanged(filterElem->targetValue);
}
else
filterElem->write_w->setText(TQString("%1").tqarg(filterElem->targetValue));
filterElem->write_w->setText(TQString("%1").arg(filterElem->targetValue));
// We're done! Send it to the driver
filterProp->newText();

6
kstars/kstars/imageviewer.cpp
Unescape View File

@ -60,9 +60,9 @@ ImageViewer::~ImageViewer() {
if (!file->remove()) // if the file was not complete downloaded the suffix is ".part"
{
kdDebug()<<TQString("remove of %1 failed").tqarg(file->name())<<endl;
kdDebug()<<TQString("remove of %1 failed").arg(file->name())<<endl;
file->setName (file->name() + ".part"); // set new suffix to filename
kdDebug()<<TQString("try to remove %1").tqarg( file->name())<<endl;
kdDebug()<<TQString("try to remove %1").arg( file->name())<<endl;
if (file->remove())
kdDebug()<<"file removed\n";
else
@ -210,7 +210,7 @@ void ImageViewer::saveFileToDisc()
{
int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).tqarg(newURL.fileName()),
"Overwrite it?" ).arg(newURL.fileName()),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) );
if(r==KMessageBox::Cancel) return;

2
kstars/kstars/indi/apmount.cpp
Unescape View File

@ -731,7 +731,7 @@ void APMount::ISNewSwitch (const char *dev, const char *name, ISState *states, c
if ( ( err = setAlignmentMode(index) < 0) )
{
handleError(&AlignmentSP, err, "Setting tqalignment");
handleError(&AlignmentSP, err, "Setting alignment");
return;
}

2
kstars/kstars/indi/apogee/ApnCamera.cpp
Unescape View File

@ -128,7 +128,7 @@ bool CApnCamera::Expose( double Duration, bool Light )
PostRoiRows = 1;
}
// Set up the tqgeometry for a full frame device
// Set up the geometry for a full frame device
if ( m_ApnSensorInfo->m_EnableSingleRowOffset )
{
PreRoiVBinning += PreRoiRows;

2
kstars/kstars/indi/apogee/Camera_Example.cpp
Unescape View File

@ -295,7 +295,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset )
}
/////////////////////////////////////////////////////////////////////////////////
// Necessary tqgeometry settings
// Necessary geometry settings
if (CfgGet (inifp, "geometry", "rows", retbuf, sizeof(retbuf), &plen))
{

26
kstars/kstars/indi/apogee_ppi.cpp
Unescape View File

@ -891,7 +891,7 @@ bool ApogeeCam::initCamera()
{
LilXML *XMLParser = newLilXML();
XMLEle *root = NULL, *camera = NULL, *ele = NULL;
XMLEle *system = NULL, *tqgeometry = NULL, *temp = NULL, *ccd = NULL;
XMLEle *system = NULL, *geometry = NULL, *temp = NULL, *ccd = NULL;
XMLAtt *ap;
FILE *spFile = NULL;
char errmsg[1024];
@ -948,7 +948,7 @@ bool ApogeeCam::initCamera()
// Let's get the subsections now
system = findXMLEle(camera, "System");
tqgeometry = findXMLEle(camera, "Geometry");
geometry = findXMLEle(camera, "Geometry");
temp = findXMLEle(camera, "Temp");
ccd = findXMLEle(camera, "CCD");
@ -960,7 +960,7 @@ bool ApogeeCam::initCamera()
return false;
}
if (tqgeometry == NULL)
if (geometry == NULL)
{
IDLog("Error: Unable to find Geometry element in camera.\n");
IDMessage(mydev, "Error: Unable to find Geometry element in camera.");
@ -1000,7 +1000,7 @@ bool ApogeeCam::initCamera()
bAddr = hextoi(valuXMLAtt(findXMLAtt(system, "Base"))) & 0xFFF;
// Rows
ap = findXMLAtt(tqgeometry, "Rows");
ap = findXMLAtt(geometry, "Rows");
if (!ap)
{
IDLog("Error: Unable to find attribute Rows.\n");
@ -1012,7 +1012,7 @@ bool ApogeeCam::initCamera()
cam->m_Rows = hextoi(valuXMLAtt(ap));
// Columns
ap = findXMLAtt(tqgeometry, "Columns");
ap = findXMLAtt(geometry, "Columns");
if (!ap)
{
IDLog("Error: Unable to find attribute Columns.\n");
@ -1210,7 +1210,7 @@ bool ApogeeCam::initCamera()
}
// BIC
ele = findXMLEle(tqgeometry, "BIC");
ele = findXMLEle(geometry, "BIC");
if (ele)
{
val = hextoi(pcdataXMLEle(ele));
@ -1219,7 +1219,7 @@ bool ApogeeCam::initCamera()
}
// BIR
ele = findXMLEle(tqgeometry, "BIR");
ele = findXMLEle(geometry, "BIR");
if (ele)
{
val = hextoi(pcdataXMLEle(ele));
@ -1228,7 +1228,7 @@ bool ApogeeCam::initCamera()
}
// SKIPC
ele = findXMLEle(tqgeometry, "SKIPC");
ele = findXMLEle(geometry, "SKIPC");
if (ele)
{
val = hextoi(pcdataXMLEle(ele));
@ -1237,7 +1237,7 @@ bool ApogeeCam::initCamera()
}
// SKIPR
ele = findXMLEle(tqgeometry, "SKIPR");
ele = findXMLEle(geometry, "SKIPR");
if (ele)
{
val = hextoi(pcdataXMLEle(ele));
@ -1246,7 +1246,7 @@ bool ApogeeCam::initCamera()
}
// IMG COlS
ele = findXMLEle(tqgeometry, "ImgCols");
ele = findXMLEle(geometry, "ImgCols");
if (ele)
{
val = hextoi(pcdataXMLEle(ele));
@ -1257,7 +1257,7 @@ bool ApogeeCam::initCamera()
cam->m_ImgColumns = cam->m_Columns - cam->m_BIC - cam->m_SkipC;
// IMG ROWS
ele = findXMLEle(tqgeometry, "ImgRows");
ele = findXMLEle(geometry, "ImgRows");
if (ele)
{
val = hextoi(pcdataXMLEle(ele));
@ -1268,7 +1268,7 @@ bool ApogeeCam::initCamera()
cam->m_ImgRows = cam->m_Rows - cam->m_BIR - cam->m_SkipR;
// Hor Flush
ele = findXMLEle(tqgeometry, "HFlush");
ele = findXMLEle(geometry, "HFlush");
if (ele)
{
val = hextoi(pcdataXMLEle(ele));
@ -1277,7 +1277,7 @@ bool ApogeeCam::initCamera()
}
// Ver Flush
ele = findXMLEle(tqgeometry, "VFlush");
ele = findXMLEle(geometry, "VFlush");
if (ele)
{
val = hextoi(pcdataXMLEle(ele));

2
kstars/kstars/indi/lilxml.c
Unescape View File

@ -130,7 +130,7 @@ delLilXML (LilXML *lp)
freemem (lp);
}
/* delete ep and all its tqchildren */
/* delete ep and all its children */
void
delXMLEle (XMLEle *ep)
{

2
kstars/kstars/indi/lx200driver.c
Unescape View File

@ -728,7 +728,7 @@ int setCommandXYZ(int x, int y, int z, const char *cmd)
int setAlignmentMode(unsigned int alignMode)
{
fprintf(stderr , "Set tqalignment mode %d\n", alignMode);
fprintf(stderr , "Set alignment mode %d\n", alignMode);
switch (alignMode)
{

4
kstars/kstars/indi/lx200generic.cpp
Unescape View File

@ -909,7 +909,7 @@ void LX200Generic::ISNewSwitch (const char *dev, const char *name, ISState *stat
if ( ( err = setAlignmentMode(index) < 0) )
{
handleError(&AlignmentSw, err, "Setting tqalignment");
handleError(&AlignmentSw, err, "Setting alignment");
return;
}
@ -1790,7 +1790,7 @@ void LX200Generic::getAlignment()
signed char align = ACK();
if (align < 0)
{
IDSetSwitch (&AlignmentSw, "Failed to get telescope tqalignment.");
IDSetSwitch (&AlignmentSw, "Failed to get telescope alignment.");
return;
}

2
kstars/kstars/indi/webcam/ccvt_c2.c
Unescape View File

@ -8,7 +8,7 @@
#include "ccvt_types.h"
/* by suitable definition of PIXTYPE, can do yuv to rgb or bgr, with or
without word tqalignment */
without word alignment */
/* This doesn't exactly earn a prize in a programming beauty contest. */

2
kstars/kstars/indidevice.cpp
Unescape View File

@ -344,7 +344,7 @@ int INDI_D::setTextValue (INDI_P *pp, XMLEle *root, char errmsg[])
}
/* set the given BUTTONS or LIGHTS property from the given element.
* root should have some <switch> or <light> tqchildren.
* root should have some <switch> or <light> children.
* return 0 if ok else -1 with reason in errmsg
*/
int INDI_D::setLabelState (INDI_P *pp, XMLEle *root, char errmsg[])

16
kstars/kstars/indidriver.cpp
Unescape View File

@ -280,7 +280,7 @@ void INDIDriver::processDeviceStatus(int id)
}
localListView->selectedItem()->setPixmap(1, runningPix);
localListView->selectedItem()->setText(4, TQString("%1").tqarg(devices[i]->indiPort));
localListView->selectedItem()->setText(4, TQString("%1").arg(devices[i]->indiPort));
runServiceB->setEnabled(false);
stopServiceB->setEnabled(true);
@ -405,7 +405,7 @@ bool INDIDriver::runDevice(IDevice *dev)
dev->proc = new KProcess;
*dev->proc << "indiserver";
*dev->proc << "-v" << "-r" << "0" << "-p" << TQString("%1").tqarg(dev->indiPort) << dev->driver;
*dev->proc << "-v" << "-r" << "0" << "-p" << TQString("%1").arg(dev->indiPort) << dev->driver;
// Check Mode
dev->mode = localR->isChecked() ? IDevice::M_LOCAL : IDevice::M_SERVER;
@ -471,7 +471,7 @@ void INDIDriver::saveDevicesToDisk()
{
if (devices[i]->deviceType == KSTARS_TELESCOPE)
{
outstream << TQString("<device label='%1' focal_length='%2' aperture='%3'>").tqarg(devices[i]->label).tqarg(devices[i]->focal_length > 0 ? devices[i]->focal_length : -1).tqarg(devices[i]->aperture > 0 ? devices[i]->aperture : -1) << endl;
outstream << TQString("<device label='%1' focal_length='%2' aperture='%3'>").arg(devices[i]->label).arg(devices[i]->focal_length > 0 ? devices[i]->focal_length : -1).arg(devices[i]->aperture > 0 ? devices[i]->aperture : -1) << endl;
outstream << " <driver>" << devices[i]->driver << "</driver>" << endl;
outstream << " <version>" << devices[i]->version << "</version>" << endl;
@ -486,7 +486,7 @@ void INDIDriver::saveDevicesToDisk()
{
if (devices[i]->deviceType == KSTARS_CCD)
{
outstream << TQString("<device label='%1'>").tqarg(devices[i]->label) << endl;
outstream << TQString("<device label='%1'>").arg(devices[i]->label) << endl;
outstream << " <driver>" << devices[i]->driver << "</driver>" << endl;
outstream << " <version>" << devices[i]->version << "</version>" << endl;
outstream << "</device>" << endl;
@ -500,7 +500,7 @@ void INDIDriver::saveDevicesToDisk()
{
if (devices[i]->deviceType == KSTARS_FILTER)
{
outstream << TQString("<device label='%1'>").tqarg(devices[i]->label) << endl;
outstream << TQString("<device label='%1'>").arg(devices[i]->label) << endl;
outstream << " <driver>" << devices[i]->driver << "</driver>" << endl;
outstream << " <version>" << devices[i]->version << "</version>" << endl;
outstream << "</device>" << endl;
@ -514,7 +514,7 @@ void INDIDriver::saveDevicesToDisk()
{
if (devices[i]->deviceType == KSTARS_VIDEO)
{
outstream << TQString("<device label='%1'>").tqarg(devices[i]->label) << endl;
outstream << TQString("<device label='%1'>").arg(devices[i]->label) << endl;
outstream << " <driver>" << devices[i]->driver << "</driver>" << endl;
outstream << " <version>" << devices[i]->version << "</version>" << endl;
outstream << "</device>" << endl;
@ -781,7 +781,7 @@ void INDIDriver::addINDIHost()
if (hostItem->name == ksw->data()->INDIHostsList.at(i)->name &&
hostItem->portnumber == ksw->data()->INDIHostsList.at(i)->portnumber)
{
KMessageBox::error(0, i18n("Host: %1 Port: %2 already exists.").tqarg(hostItem->name).tqarg(hostItem->portnumber));
KMessageBox::error(0, i18n("Host: %1 Port: %2 already exists.").arg(hostItem->name).arg(hostItem->portnumber));
return;
}
@ -853,7 +853,7 @@ void INDIDriver::removeINDIHost()
return;
}
if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 client?").tqarg(clientListView->currentItem()->text(1)), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue)
if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove the %1 client?").arg(clientListView->currentItem()->text(1)), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue)
return;
ksw->data()->INDIHostsList.remove(i);

2
kstars/kstars/indigroup.cpp
Unescape View File

@ -39,7 +39,7 @@ INDI_G::INDI_G(INDI_D *parentDevice, TQString inName)
// FIXME what's the parent exactly?
// You can do this eaither way:
// 1. Propertycontainer is a TQFrame, then you make TQVBoxLayout for it (check form1.cpp)
// 2. Keep it as TQVBox and let it handle its tqchildren.
// 2. Keep it as TQVBox and let it handle its children.
// Depends on which one works best.
propertyContainer = new TQFrame(dp->groupContainer);
propertyLayout = new TQVBoxLayout(propertyContainer, 20, KDialog::spacingHint() );

4
kstars/kstars/indimenu.cpp
Unescape View File

@ -122,7 +122,7 @@ DeviceManager *dev;
if (drivers->devices[i]->state && drivers->devices[i]->managed == false && drivers->devices[i]->mode == IDevice::M_LOCAL)
{
dev = new DeviceManager(this, mgrCounter);
if (dev->indiConnect("localhost", TQString("%1").tqarg(drivers->devices[i]->indiPort)))
if (dev->indiConnect("localhost", TQString("%1").arg(drivers->devices[i]->indiPort)))
{
drivers->devices[i]->mgrID = mgrCounter;
drivers->devices[i]->managed = true;
@ -226,7 +226,7 @@ for (unsigned int i=0; i < mgr.count(); i++)
nset++;
if (nset)
currentLabel = deviceName + TQString(" %1").tqarg(nset+1);
currentLabel = deviceName + TQString(" %1").arg(nset+1);
else
currentLabel = deviceName;

8
kstars/kstars/indiproperty.cpp
Unescape View File

@ -178,7 +178,7 @@ void INDI_P::newText()
f_scansexa(lp->text.ascii(), &(lp->targetValue));
if ((lp->targetValue > lp->max || lp->targetValue < lp->min))
{
KMessageBox::error(0, i18n("Invalid range for element %1. Valid range is from %2 to %3").tqarg(lp->label).tqarg(lp->min).tqarg(lp->max));
KMessageBox::error(0, i18n("Invalid range for element %1. Valid range is from %2 to %3").arg(lp->label).arg(lp->min).arg(lp->max));
return;
}
}
@ -344,7 +344,7 @@ void INDI_P::newBlob()
if (!fp.open(IO_ReadOnly))
{
KMessageBox::error(0, i18n("Cannot open file %1 for reading").tqarg(filename));
KMessageBox::error(0, i18n("Cannot open file %1 for reading").arg(filename));
valid = false;
continue;
}
@ -354,7 +354,7 @@ void INDI_P::newBlob()
data_file = new char[fp.size()];
if (data_file == NULL)
{
KMessageBox::error(0, i18n("Not enough memory to load %1").tqarg(filename));
KMessageBox::error(0, i18n("Not enough memory to load %1").arg(filename));
fp.close();
valid = false;
continue;
@ -366,7 +366,7 @@ void INDI_P::newBlob()
data64 = new unsigned char[4*fp.size()/3+4];
if (data64 == NULL)
{
KMessageBox::error(0, i18n("Not enough memory to convert file %1 to base64").tqarg(filename));
KMessageBox::error(0, i18n("Not enough memory to convert file %1 to base64").arg(filename));
fp.close();
valid = false;
continue;

46
kstars/kstars/indistd.cpp
Unescape View File

@ -192,12 +192,12 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d
// We're done if we have DATA_OTHER
if (dataType == DATA_OTHER)
{
ksw->statusBar()->changeItem( i18n("Data file saved to %1").tqarg(filename), 0);
ksw->statusBar()->changeItem( i18n("Data file saved to %1").arg(filename), 0);
return;
}
else if (dataType == DATA_FITS && (batchMode || !Options::indiFITSDisplay()))
{
ksw->statusBar()->changeItem( i18n("FITS file saved to %1").tqarg(filename), 0);
ksw->statusBar()->changeItem( i18n("FITS file saved to %1").arg(filename), 0);
emit FITSReceived(dp->label);
return;
}
@ -445,7 +445,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d
{
seqPrefix = newPrefix;
seqLister->setNameFilter(TQString("%1_*.fits").tqarg(seqPrefix));
seqLister->setNameFilter(TQString("%1_*.fits").arg(seqPrefix));
setqCount = 0;
@ -509,9 +509,9 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d
TQTime newTime( ksw->data()->ut().time());
ExtDate newDate( ksw->data()->ut().date());
lp->write_w->setText(TQString("%1-%2-%3T%4:%5:%6").tqarg(newDate.year()).tqarg(newDate.month())
.tqarg(newDate.day()).tqarg(newTime.hour())
.tqarg(newTime.minute()).tqarg(newTime.second()));
lp->write_w->setText(TQString("%1-%2-%3T%4:%5:%6").arg(newDate.year()).arg(newDate.month())
.arg(newDate.day()).arg(newTime.hour())
.arg(newTime.minute()).arg(newTime.second()));
pp->newText();
pp = dp->findProp("SDTIME");
@ -543,8 +543,8 @@ void INDIStdDevice::updateLocation()
longEle = pp->findElement("LONG");
if (!longEle) return;
longEle->write_w->setText(TQString("%1:%2:%3").tqarg(tempLong.degree()).tqarg(tempLong.arcmin()).tqarg(tempLong.arcsec()));
latEle->write_w->setText(TQString("%1:%2:%3").tqarg(geo->lat()->degree()).tqarg(geo->lat()->arcmin()).tqarg(geo->lat()->arcsec()));
longEle->write_w->setText(TQString("%1:%2:%3").arg(tempLong.degree()).arg(tempLong.arcmin()).arg(tempLong.arcsec()));
latEle->write_w->setText(TQString("%1:%2:%3").arg(geo->lat()->degree()).arg(geo->lat()->arcmin()).arg(geo->lat()->arcsec()));
pp->newText();
}
@ -619,7 +619,7 @@ void INDIStdDevice::initDeviceOptions()
}
if ( Options::indiMessages() )
ksw->statusBar()->changeItem( i18n("%1 is online.").tqarg(dp->name), 0);
ksw->statusBar()->changeItem( i18n("%1 is online.").arg(dp->name), 0);
ksw->map()->forceUpdateNow();
}
@ -633,7 +633,7 @@ void INDIStdDevice::initDeviceOptions()
initDevCounter--;
if ( initDevCounter == 0 && Options::indiMessages() )
ksw->statusBar()->changeItem( i18n("%1 is online and ready.").tqarg(dp->name), 0);
ksw->statusBar()->changeItem( i18n("%1 is online and ready.").arg(dp->name), 0);
}
@ -779,12 +779,12 @@ void INDIStdDevice::timerDone()
DecEle = prop->findElement("DEC");
if (!DecEle) return;
RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour())
.tqarg(sp.ra()->minute())
.tqarg(sp.ra()->second()));
DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree())
.tqarg(sp.dec()->arcmin())
.tqarg(sp.dec()->arcsec()));
RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour())
.arg(sp.ra()->minute())
.arg(sp.ra()->second()));
DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree())
.arg(sp.dec()->arcmin())
.arg(sp.dec()->arcsec()));
prop->newText();
}
@ -928,8 +928,8 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN
if (useJ2000)
sp.apparentCoord(ksw->data()->ut().djd(), (long double) J2000);
RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second()));
DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec()));
RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour()).arg(sp.ra()->minute()).arg(sp.ra()->second()));
DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree()).arg(sp.dec()->arcmin()).arg(sp.dec()->arcsec()));
break;
@ -945,8 +945,8 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN
sp.setAlt(*ksw->map()->clickedPoint()->alt());
}
AzEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.az()->degree()).tqarg(sp.az()->arcmin()).tqarg(sp.az()->arcsec()));
AltEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.alt()->degree()).tqarg(sp.alt()->arcmin()).tqarg(sp.alt()->arcsec()));
AzEle->write_w->setText(TQString("%1:%2:%3").arg(sp.az()->degree()).arg(sp.az()->arcmin()).arg(sp.az()->arcsec()));
AltEle->write_w->setText(TQString("%1:%2:%3").arg(sp.alt()->degree()).arg(sp.alt()->arcmin()).arg(sp.alt()->arcsec()));
break;
}
@ -1026,9 +1026,9 @@ void INDIStdProperty::newTime()
ExtDate newDate( timedialog.selectedDate() );
timeEle->write_w->setText(TQString("%1-%2-%3T%4:%5:%6")
.tqarg(newDate.year()).tqarg(newDate.month())
.tqarg(newDate.day()).tqarg(newTime.hour())
.tqarg(newTime.minute()).tqarg(newTime.second()));
.arg(newDate.year()).arg(newDate.month())
.arg(newDate.day()).arg(newTime.hour())
.arg(newTime.minute()).arg(newTime.second()));
pp->newText();
}
else return;

4
kstars/kstars/infobox.h
Unescape View File

@ -40,7 +40,7 @@ class InfoBox : public TQObject {
TQ_OBJECT
public:
/**default constructor. Creates an infobox with empty text string
*and default tqgeometry
*and default geometry
*/
InfoBox();
@ -170,7 +170,7 @@ public:
/**@return the third line of text*/
TQString text3() const { return Text3; }
/**@return the tqgeometry of the box*/
/**@return the geometry of the box*/
TQRect rect() const;
/**@return TRUE if the box is anchored to the right window edge*/

8
kstars/kstars/kspopupmenu.cpp
Unescape View File

@ -51,7 +51,7 @@ void KSPopupMenu::createEmptyMenu( SkyObject *nullObj ) {
void KSPopupMenu::createStarMenu( StarObject *star ) {
//Add name, rise/set time, center/track, and detail-window items
initPopupMenu( star, star->translatedLongName(), i18n( "Spectral type: %1" ).tqarg(star->sptype()),
initPopupMenu( star, star->translatedLongName(), i18n( "Spectral type: %1" ).arg(star->sptype()),
i18n( "star" ) );
//If the star is named, add custom items to popup menu based on object's ImageList and InfoList
@ -349,7 +349,7 @@ void KSPopupMenu::setRiseSetLabels( SkyObject *obj ) {
if ( rtime.isValid() ) {
//We can round to the nearest minute by simply adding 30 seconds to the time.
rt = i18n( "Rise time: %1" ).tqarg( rtime.addSecs(30).toString( "hh:mm" ) );
rt = i18n( "Rise time: %1" ).arg( rtime.addSecs(30).toString( "hh:mm" ) );
} else if ( obj->alt()->Degrees() > 0 ) {
rt = i18n( "No rise time: Circumpolar" );
@ -365,7 +365,7 @@ void KSPopupMenu::setRiseSetLabels( SkyObject *obj ) {
if ( stime.isValid() ) {
//We can round to the nearest minute by simply adding 30 seconds to the time.
st = i18n( "the time at which an object falls below the horizon", "Set time: %1" ).tqarg( stime.addSecs(30).toString( "hh:mm" ) );
st = i18n( "the time at which an object falls below the horizon", "Set time: %1" ).arg( stime.addSecs(30).toString( "hh:mm" ) );
} else if ( obj->alt()->Degrees() > 0 ) {
st = i18n( "No set time: Circumpolar" );
@ -379,7 +379,7 @@ void KSPopupMenu::setRiseSetLabels( SkyObject *obj ) {
if ( ttime.isValid() ) {
//We can round to the nearest minute by simply adding 30 seconds to the time.
tt = i18n( "Transit time: %1" ).tqarg( ttime.addSecs(30).toString( "hh:mm" ) );
tt = i18n( "Transit time: %1" ).arg( ttime.addSecs(30).toString( "hh:mm" ) );
} else {
tt = "--:--";
}

2
kstars/kstars/kstars.cpp
Unescape View File

@ -103,7 +103,7 @@ KStars::~KStars()
Options::setFocusRA( skymap->focus()->ra()->Hours() );
Options::setFocusDec( skymap->focus()->dec()->Degrees() );
//Store Window tqgeometry in Options object
//Store Window geometry in Options object
Options::setWindowWidth( width() );
Options::setWindowHeight( height() );

2
kstars/kstars/kstars.h
Unescape View File

@ -382,7 +382,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface
public slots:
/**
*Update time-dependent data and (possibly) tqrepaint the sky map.
*Update time-dependent data and (possibly) repaint the sky map.
*@p automaticDSTchange change DST status automatically?
*/
void updateTime( const bool automaticDSTchange = true );

14
kstars/kstars/kstarsactions.cpp
Unescape View File

@ -452,7 +452,7 @@ void KStars::slotExportImage() {
{
int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).tqarg(fileURL.fileName()),
"Overwrite it?" ).arg(fileURL.fileName()),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) );
@ -501,7 +501,7 @@ void KStars::slotRunScript() {
if ( tmpfile.name() == fname ) { //upload to remote location
if ( ! KIO::NetAccess::upload( tmpfile.name(), fileURL, this ) ) {
TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( fileURL.prettyURL() );
TQString message = i18n( "Could not upload image to remote location: %1" ).arg( fileURL.prettyURL() );
KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) );
}
}
@ -528,7 +528,7 @@ void KStars::slotRunScript() {
}
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1" ).tqarg( f.name() );
TQString message = i18n( "Could not open file %1" ).arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
return;
}
@ -563,7 +563,7 @@ void KStars::slotRunScript() {
//FIXME STRINGS FREEZE
//Add statusbar message that script is running
//ks->statusBar()->changeItem( i18n( "Running script: %1" ).tqarg( fileURL.fileName() ), 0 );
//ks->statusBar()->changeItem( i18n( "Running script: %1" ).arg( fileURL.fileName() ), 0 );
KProcess p;
p << f.name();
@ -823,7 +823,7 @@ void KStars::slotTargetSymbol() {
Options::setFOVName( f.name() );
Options::setFOVSize( f.size() );
Options::setFOVShape( f.tqshape() );
Options::setFOVShape( f.shape() );
Options::setFOVColor( f.color() );
data()->fovSymbol.setName( Options::fOVName() );
data()->fovSymbol.setSize( Options::fOVSize() );
@ -856,7 +856,7 @@ void KStars::slotFOVEdit() {
for ( FOV *fov = fovdlg.FOVList.first(); fov; fov = fovdlg.FOVList.next() )
ostream << fov->name() << ":" << fov->size()
<< ":" << TQString("%1").tqarg( fov->tqshape() ) << ":" << fov->color() << endl;
<< ":" << TQString("%1").arg( fov->shape() ) << ":" << fov->color() << endl;
f.close();
}
@ -880,7 +880,7 @@ void KStars::slotFOVEdit() {
}
}
} else {
kdDebug() << i18n( "Could not open file: %1" ).tqarg( f.name() ) << endl;
kdDebug() << i18n( "Could not open file: %1" ).arg( f.name() ) << endl;
}
fovActionMenu->popupMenu()->insertSeparator();

72
kstars/kstars/kstarsdata.cpp
Unescape View File

@ -433,7 +433,7 @@ bool KStarsData::readCLineData( void ) {
}
if ( ! starFound )
kdWarning() << i18n( "No star named %1 found." ).tqarg(name) << endl;
kdWarning() << i18n( "No star named %1 found." ).arg(name) << endl;
}
}
file.close();
@ -584,7 +584,7 @@ bool KStarsData::readStarData( void ) {
if (Options::magLimitDrawStar() > loadUntilMag) loadUntilMag = Options::magLimitDrawStar();
for (unsigned int i=1; i<NHIPFILES+1; ++i) {
emit progressText( i18n( "Loading Star Data (%1%)" ).tqarg( int(100.*float(i)/float(NHIPFILES)) ) );
emit progressText( i18n( "Loading Star Data (%1%)" ).arg( int(100.*float(i)/float(NHIPFILES)) ) );
if (openStarFile(i) == true) {
while (starFileReader->hasMoreLines()) {
@ -788,7 +788,7 @@ bool KStarsData::readDeepSkyData( void ) {
snum = TQString().sprintf( "%02d", i+1 );
fname = "ngcic" + snum + ".dat";
emit progressText( i18n( "Loading NGC/IC Data (%1%)" ).tqarg( int(100.*float(i)/float(NNGCFILES)) ) );
emit progressText( i18n( "Loading NGC/IC Data (%1%)" ).arg( int(100.*float(i)/float(NNGCFILES)) ) );
if ( KSUtils::openDataFile( file, fname ) ) {
KSFileReader fileReader( file ); // close file is included
@ -1142,7 +1142,7 @@ bool KStarsData::addCatalog( TQString filename ) {
return true;
} else
kdWarning() << k_funcinfo << i18n("Error adding catalog: %1").tqarg( filename ) << endl;
kdWarning() << k_funcinfo << i18n("Error adding catalog: %1").arg( filename ) << endl;
return false;
}
@ -1220,7 +1220,7 @@ CustomCatalog* KStarsData::createCustomCatalog( TQString filename, bool showerrs
if ( d.count() == Columns.count() ) {
processCustomDataLine( i, d, Columns, CatalogPrefix, objList, showerrs, errs );
} else {
if ( showerrs ) errs.append( i18n( "Line %1 does not contain %2 fields. Skipping it." ).tqarg( i ).tqarg( Columns.count() ) );
if ( showerrs ) errs.append( i18n( "Line %1 does not contain %2 fields. Skipping it." ).arg( i ).arg( Columns.count() ) );
}
}
}
@ -1246,10 +1246,10 @@ CustomCatalog* KStarsData::createCustomCatalog( TQString filename, bool showerrs
} else { //Error opening catalog file
if ( showerrs )
KMessageBox::sorry( 0, i18n( "Could not open custom data file: %1" ).tqarg( filename ),
KMessageBox::sorry( 0, i18n( "Could not open custom data file: %1" ).arg( filename ),
i18n( "Error opening file" ) );
else
kdDebug() << i18n( "Could not open custom data file: %1" ).tqarg( filename ) << endl;
kdDebug() << i18n( "Could not open custom data file: %1" ).arg( filename ) << endl;
}
//Return the catalog
@ -1280,7 +1280,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C
if ( ! RA.setFromString( d[i], false ) ) {
if ( showerrs )
errs.append( i18n( "Line %1, field %2: Unable to parse RA value: %3" )
.tqarg(lnum).tqarg(i).tqarg(d[i]) );
.arg(lnum).arg(i).arg(d[i]) );
return false;
}
}
@ -1289,7 +1289,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C
if ( ! Dec.setFromString( d[i], true ) ) {
if ( showerrs )
errs.append( i18n( "Line %1, field %2: Unable to parse Dec value: %3" )
.tqarg(lnum).tqarg(i).tqarg(d[i]) );
.arg(lnum).arg(i).arg(d[i]) );
return false;
}
}
@ -1301,14 +1301,14 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C
if ( iType == 2 || iType > 8 ) {
if ( showerrs )
errs.append( i18n( "Line %1, field %2: Invalid object type: %3" )
.tqarg(lnum).tqarg(i).tqarg(d[i]) +
.arg(lnum).arg(i).arg(d[i]) +
i18n( "Must be one of 0, 1, 3, 4, 5, 6, 7, 8." ) );
return false;
}
} else {
if ( showerrs )
errs.append( i18n( "Line %1, field %2: Unable to parse Object type: %3" )
.tqarg(lnum).tqarg(i).tqarg(d[i]) );
.arg(lnum).arg(i).arg(d[i]) );
return false;
}
}
@ -1319,7 +1319,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C
if ( ! ok ) {
if ( showerrs )
errs.append( i18n( "Line %1, field %2: Unable to parse Magnitude: %3" )
.tqarg(lnum).tqarg(i).tqarg(d[i]) );
.arg(lnum).arg(i).arg(d[i]) );
return false;
}
}
@ -1330,7 +1330,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C
if ( ! ok ) {
if ( showerrs )
errs.append( i18n( "Line %1, field %2: Unable to parse Major Axis: %3" )
.tqarg(lnum).tqarg(i).tqarg(d[i]) );
.arg(lnum).arg(i).arg(d[i]) );
return false;
}
}
@ -1341,7 +1341,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C
if ( ! ok ) {
if ( showerrs )
errs.append( i18n( "Line %1, field %2: Unable to parse Minor Axis: %3" )
.tqarg(lnum).tqarg(i).tqarg(d[i]) );
.arg(lnum).arg(i).arg(d[i]) );
return false;
}
}
@ -1352,7 +1352,7 @@ bool KStarsData::processCustomDataLine( int lnum, TQStringList d, TQStringList C
if ( ! ok ) {
if ( showerrs )
errs.append( i18n( "Line %1, field %2: Unable to parse Position Angle: %3" )
.tqarg(lnum).tqarg(i).tqarg(d[i]) );
.arg(lnum).arg(i).arg(d[i]) );
return false;
}
}
@ -1400,7 +1400,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
} else { //duplicate name in header
if ( showerrs )
errs.append( i18n( "Parsing header: " ) +
i18n( "Extra Name field in header: %1. Will be ignored" ).tqarg( d.mid(iname) ) );
i18n( "Extra Name field in header: %1. Will be ignored" ).arg( d.mid(iname) ) );
}
} else if ( iprefix == 0 ) { //line contains catalog prefix
iprefix = d.find(":")+2;
@ -1409,7 +1409,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
} else { //duplicate prefix in header
if ( showerrs )
errs.append( i18n( "Parsing header: " ) +
i18n( "Extra Prefix field in header: %1. Will be ignored" ).tqarg( d.mid(iprefix) ) );
i18n( "Extra Prefix field in header: %1. Will be ignored" ).arg( d.mid(iprefix) ) );
}
} else if ( icolor == 0 ) { //line contains catalog prefix
icolor = d.find(":")+2;
@ -1418,7 +1418,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
} else { //duplicate prefix in header
if ( showerrs )
errs.append( i18n( "Parsing header: " ) +
i18n( "Extra Color field in header: %1. Will be ignored" ).tqarg( d.mid(icolor) ) );
i18n( "Extra Color field in header: %1. Will be ignored" ).arg( d.mid(icolor) ) );
}
} else if ( iepoch == 0 ) { //line contains catalog epoch
iepoch = d.find(":")+2;
@ -1428,13 +1428,13 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
if ( !ok ) {
if ( showerrs )
errs.append( i18n( "Parsing header: " ) +
i18n( "Could not convert Epoch to float: %1. Using 2000. instead" ).tqarg( d.mid(iepoch) ) );
i18n( "Could not convert Epoch to float: %1. Using 2000. instead" ).arg( d.mid(iepoch) ) );
CatalogEpoch = 2000.; //adopt default value
}
} else { //duplicate epoch in header
if ( showerrs )
errs.append( i18n( "Parsing header: " ) +
i18n( "Extra Epoch field in header: %1. Will be ignored" ).tqarg( d.mid(iepoch) ) );
i18n( "Extra Epoch field in header: %1. Will be ignored" ).arg( d.mid(iepoch) ) );
}
} else if ( ! foundDataColumns ) { //don't try to parse data column descriptors if we already found them
//Chomp off leading "#" character
@ -1466,12 +1466,12 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column
fields.append( "Ig" ); //skip this column
if ( showerrs )
errs.append( i18n( "Parsing header: " ) +
i18n( "Duplicate data field descriptor \"%1\" will be ignored" ).tqarg( s ) );
i18n( "Duplicate data field descriptor \"%1\" will be ignored" ).arg( s ) );
} else { //Invalid field
fields.append( "Ig" ); //skip this column
if ( showerrs )
errs.append( i18n( "Parsing header: " ) +
i18n( "Invalid data field descriptor \"%1\" will be ignored" ).tqarg( s ) );
i18n( "Invalid data field descriptor \"%1\" will be ignored" ).arg( s ) );
}
}
@ -1774,20 +1774,20 @@ void KStarsData::initError(TQString s, bool required = false) {
message = i18n( "The file %1 could not be found. "
"KStars cannot run properly without this file. "
"To continue loading, place the file in one of the "
"following locations, then press Retry:\n\n" ).tqarg( s )
+ TQString( "\t$(TDEDIR)/share/apps/kstars/%1\n" ).tqarg( s )
+ TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).tqarg( s )
"following locations, then press Retry:\n\n" ).arg( s )
+ TQString( "\t$(TDEDIR)/share/apps/kstars/%1\n" ).arg( s )
+ TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).arg( s )
+ i18n( "Otherwise, press Cancel to shutdown." );
caption = i18n( "Critical File Not Found: %1" ).tqarg( s );
caption = i18n( "Critical File Not Found: %1" ).arg( s );
} else {
message = i18n( "The file %1 could not be found. "
"KStars can still run without this file. "
"However, to avoid seeing this message in the future, you can "
"place the file in one of the following locations, then press Retry:\n\n" ).tqarg( s )
+ TQString( "\t$(TDEDIR)/share/apps/kstars/%1\n" ).tqarg( s )
+ TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).tqarg( s )
+ i18n( "Otherwise, press Cancel to continue loading without this file." ).tqarg( s );
caption = i18n( "Non-Critical File Not Found: %1" ).tqarg( s );
"place the file in one of the following locations, then press Retry:\n\n" ).arg( s )
+ TQString( "\t$(TDEDIR)/share/apps/kstars/%1\n" ).arg( s )
+ TQString( "\t~/.kde/share/apps/kstars/%1\n\n" ).arg( s )
+ i18n( "Otherwise, press Cancel to continue loading without this file." ).arg( s );
caption = i18n( "Non-Critical File Not Found: %1" ).arg( s );
}
if ( KMessageBox::warningContinueCancel( 0, message, caption, i18n( "Retry" ) ) == KMessageBox::Continue ) {
@ -1839,7 +1839,7 @@ void KStarsData::slotInitialize() {
case 2: //Load stellar database//
emit progressText(i18n("Loading Star Data (%1%)" ).tqarg(0) );
emit progressText(i18n("Loading Star Data (%1%)" ).arg(0) );
if ( !readStarData( ) )
initError( "hipNNN.dat", true );
if (!readVARData())
@ -1850,7 +1850,7 @@ void KStarsData::slotInitialize() {
case 3: //Load NGC/IC database and custom catalogs//
emit progressText( i18n("Loading NGC/IC Data (%1%)" ).tqarg(0) );
emit progressText( i18n("Loading NGC/IC Data (%1%)" ).arg(0) );
if ( !readDeepSkyData( ) )
initError( "ngcicN.dat", true );
@ -2345,7 +2345,7 @@ bool KStarsData::executeScript( const TQString &scriptname, SkyMap *map ) {
TQFile f( scriptname );
if ( !f.open( IO_ReadOnly) ) {
kdDebug() << i18n( "Could not open file %1" ).tqarg( f.name() ) << endl;
kdDebug() << i18n( "Could not open file %1" ).arg( f.name() ) << endl;
return false;
}
@ -2445,7 +2445,7 @@ bool KStarsData::executeScript( const TQString &scriptname, SkyMap *map ) {
cmdCount++;
} else {
kdWarning() << i18n( "Could not set time: %1 / %2 / %3 ; %4:%5:%6" )
.tqarg(day).tqarg(mth).tqarg(yr).tqarg(hr).tqarg(min).tqarg(sec) << endl;
.arg(day).arg(mth).arg(yr).arg(hr).arg(min).arg(sec) << endl;
}
} else if ( fn[0] == "changeViewOption" && fn.count() == 3 ) {
bool bOk(false), nOk(false), dOk(false);
@ -2559,7 +2559,7 @@ bool KStarsData::executeScript( const TQString &scriptname, SkyMap *map ) {
}
if ( !cityFound )
kdWarning() << i18n( "Could not set location named %1, %2, %3" ).tqarg(city).tqarg(province).tqarg(country) << endl;
kdWarning() << i18n( "Could not set location named %1, %2, %3" ).arg(city).arg(province).arg(country) << endl;
}
}
} //end while

34
kstars/kstars/kstarsdcop.cpp
Unescape View File

@ -191,7 +191,7 @@ void KStars::readConfig() {
//Reset date, if one was stored
if ( data()->StoredDate.isValid() ) {
data()->changeDateTime( geo()->LTtoUT( data()->StoredDate ) );
data()->StoredDate.setDJD( (long double)INVALID_DAY ); //tqinvalidate StoredDate
data()->StoredDate.setDJD( (long double)INVALID_DAY ); //invalidate StoredDate
}
map()->forceUpdate();
@ -365,7 +365,7 @@ void KStars::loadColorScheme( const TQString _name ) {
ok = data()->colorScheme()->load( filename );
}
if ( ! ok ) kdDebug() << i18n( "Unable to load color scheme named %1. Also tried %2." ).tqarg( name ).tqarg( filename );
if ( ! ok ) kdDebug() << i18n( "Unable to load color scheme named %1. Also tried %2." ).arg( name ).arg( filename );
}
if ( ok ) {
@ -418,7 +418,7 @@ void KStars::exportImage( const TQString url, int w, int h ) {
else if ( ext.lower() == "gif" ) { format = "GIF"; }
else if ( ext.lower() == "pnm" ) { format = "PNM"; }
else if ( ext.lower() == "bmp" ) { format = "BMP"; }
else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).tqarg( fname ) << endl; }
else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).arg( fname ) << endl; }
map()->exportSkyImage( TQT_TQPAINTDEVICE(&skyimage) );
kapp->processEvents(10000);
@ -447,12 +447,12 @@ void KStars::exportImage( const TQString url, int w, int h ) {
bitBlt( &outimage, dx, dy, &skyimage, sx, sy, sw, sh );
}
if ( ! outimage.save( fname, format ) ) kdDebug() << i18n( "Error: Unable to save image: %1 " ).tqarg( fname ) << endl;
else kdDebug() << i18n( "Image saved to file: %1" ).tqarg( fname ) << endl;
if ( ! outimage.save( fname, format ) ) kdDebug() << i18n( "Error: Unable to save image: %1 " ).arg( fname ) << endl;
else kdDebug() << i18n( "Image saved to file: %1" ).arg( fname ) << endl;
if ( tmpfile.name() == fname ) { //attempt to upload image to remote location
if ( ! KIO::NetAccess::upload( tmpfile.name(), fileURL, this ) ) {
TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( fileURL.prettyURL() );
TQString message = i18n( "Could not upload image to remote location: %1" ).arg( fileURL.prettyURL() );
KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) );
}
}
@ -661,13 +661,13 @@ void KStars::setINDITargetCoord(TQString deviceName, double RA, double DEC)
if (!el) return;
if (!el->write_w) return;
el->write_w->setText(TQString("%1").tqarg(RA));
el->write_w->setText(TQString("%1").arg(RA));
el = prop->findElement("DEC");
if (!el) return;
if (!el->write_w) return;
el->write_w->setText(TQString("%1").tqarg(DEC));
el->write_w->setText(TQString("%1").arg(DEC));
prop->newText();
@ -705,13 +705,13 @@ void KStars::setINDITargetName(TQString deviceName, TQString objectName)
if (!el) return;
if (!el->write_w) return;
el->write_w->setText(TQString("%1").tqarg(target->ra()->Hours()));
el->write_w->setText(TQString("%1").arg(target->ra()->Hours()));
el = prop->findElement("DEC");
if (!el) return;
if (!el->write_w) return;
el->write_w->setText(TQString("%1").tqarg(target->dec()->Degrees()));
el->write_w->setText(TQString("%1").arg(target->dec()->Degrees()));
prop->newText();
@ -813,7 +813,7 @@ void KStars::setINDIFocusSpeed(TQString deviceName, unsigned int speed)
if (!el) return;
if (!el->write_w) return;
el->write_w->setText(TQString("%1").tqarg(speed));
el->write_w->setText(TQString("%1").arg(speed));
prop->newText();
@ -865,13 +865,13 @@ void KStars::setINDIGeoLocation(TQString deviceName, double longitude, double la
if (!el) return;
if (!el->write_w) return;
el->write_w->setText(TQString("%1").tqarg(longitude));
el->write_w->setText(TQString("%1").arg(longitude));
el = prop->findElement("LAT");
if (!el) return;
if (!el->write_w) return;
el->write_w->setText(TQString("%1").tqarg(latitude));
el->write_w->setText(TQString("%1").arg(latitude));
prop->newText();
@ -907,7 +907,7 @@ void KStars::setINDIFocusTimeout(TQString deviceName, int timeout)
if (!el) return;
if (el->write_w)
el->write_w->setText(TQString("%1").tqarg(timeout));
el->write_w->setText(TQString("%1").arg(timeout));
else if (el->spin_w)
el->spin_w->setValue(timeout);
@ -944,7 +944,7 @@ void KStars::startINDIExposure(TQString deviceName, int timeout)
if (!el) return;
if (el->write_w)
el->write_w->setText(TQString("%1").tqarg(timeout));
el->write_w->setText(TQString("%1").arg(timeout));
else if (el->spin_w)
el->spin_w->setValue(timeout);
@ -981,7 +981,7 @@ void KStars::setINDIFilterNum(TQString deviceName, int filter_num)
if (!el) return;
if (el->write_w)
el->write_w->setText(TQString("%1").tqarg(filter_num));
el->write_w->setText(TQString("%1").arg(filter_num));
else if (el->spin_w)
el->spin_w->setValue(filter_num);
@ -1061,7 +1061,7 @@ void KStars::setINDICCDTemp(TQString deviceName, int temp)
if (!el) return;
if (el->write_w)
el->write_w->setText(TQString("%1").tqarg(temp));
el->write_w->setText(TQString("%1").arg(temp));
else if (el->spin_w)
el->spin_w->setValue(temp);

2
kstars/kstars/kstarsinit.cpp
Unescape View File

@ -335,7 +335,7 @@ void KStars::initFOV() {
}
}
} else {
kdDebug() << i18n( "Could not open file: %1" ).tqarg( f.name() ) << endl;
kdDebug() << i18n( "Could not open file: %1" ).arg( f.name() ) << endl;
}
fovActionMenu->popupMenu()->insertSeparator();

10
kstars/kstars/kstarssplash.cpp
Unescape View File

@ -71,7 +71,7 @@ KStarsSplash::KStarsSplash( TQWidget *parent, const char* name )
topLayout->activate();
disableResize();
setMessage(TQString()); // force tqrepaint of widget with no text
setMessage(TQString()); // force repaint of widget with no text
}
KStarsSplash::~KStarsSplash() {
@ -80,8 +80,8 @@ KStarsSplash::~KStarsSplash() {
void KStarsSplash::paintEvent( TQPaintEvent* ) {
bitBlt( Banner, 0, 0, splashImage, 0, 0, -1, -1 );
label->tqrepaint(); // standard text label
textCurrentStatus->tqrepaint(); // status text label
label->repaint(); // standard text label
textCurrentStatus->repaint(); // status text label
}
void KStarsSplash::closeEvent( TQCloseEvent *e ) {
@ -91,10 +91,10 @@ void KStarsSplash::closeEvent( TQCloseEvent *e ) {
void KStarsSplash::setMessage( TQString s ) {
textCurrentStatus->setText( s );
tqrepaint(); // tqrepaint splash screen
repaint(); // repaint splash screen
/**
*Flush all event data. This is needed because events will buffered and
*tqrepaint call will queued in event buffer. With flush all X11 events of
*repaint call will queued in event buffer. With flush all X11 events of
*this application will flushed.
*/
kapp->flush();

2
kstars/kstars/kstarssplash.h
Unescape View File

@ -51,7 +51,7 @@ class KStarsSplash : public KDialogBase
protected:
/**Paint event to redraw the widgets. This only gets called when the timer fires.
*It should also tqrepaint if another window was on top of the splash screen, but
*It should also repaint if another window was on top of the splash screen, but
*this may be difficult to implement (it may be that the program is too busy loading data
*to notice that a redraw is required).
*/

8
kstars/kstars/kswizardui.ui
Unescape View File

@ -95,7 +95,7 @@
&lt;p&gt;To get started, press the &lt;b&gt;Next&lt;/b&gt; button.&lt;/p&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -225,7 +225,7 @@ country.&lt;/p&gt;
&lt;p&gt;Once you have selected a City, press &lt;b&gt;Next&lt;/b&gt;.&lt;/p&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -358,7 +358,7 @@ country.&lt;/p&gt;
<property name="text">
<string>Latitude:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
</widget>
@ -721,7 +721,7 @@ button to proceed. &lt;/p&gt;
&lt;p&gt;You can also use this tool later, by selecting
&lt;b&gt;Download data&lt;/b&gt; from the &lt;b&gt;File&lt;/b&gt; menu.&lt;/p&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>

6
kstars/kstars/locationdialog.cpp
Unescape View File

@ -283,7 +283,7 @@ void LocationDialog::filterCity( void ) {
if ( GeoBox->firstItem() ) // set first item in list as selected
GeoBox->setCurrentItem( GeoBox->firstItem() );
MapView->tqrepaint();
MapView->repaint();
}
void LocationDialog::changeCity( void ) {
@ -298,7 +298,7 @@ void LocationDialog::changeCity( void ) {
}
}
MapView->tqrepaint();
MapView->repaint();
//Fill the fields at the bottom of the window with the selected city's data.
if ( SelectedCity ) {
@ -437,7 +437,7 @@ void LocationDialog::findCitiesNear( int lng, int lat ) {
if ( GeoBox->firstItem() ) // set first item in list as selected
GeoBox->setCurrentItem( GeoBox->firstItem() );
tqrepaint();
repaint();
}
bool LocationDialog::checkLongLat( void ) {

2
kstars/kstars/locationdialog.h
Unescape View File

@ -117,7 +117,7 @@ public slots:
void filterCity( void );
/**
*When the selected city in the TQListBox changes, tqrepaint the MapCanvas
*When the selected city in the TQListBox changes, repaint the MapCanvas
*so that the crosshairs icon appears on the newly selected city.
*/
void changeCity( void );

8
kstars/kstars/main.cpp
Unescape View File

@ -79,7 +79,7 @@ int main(int argc, char *argv[])
else if ( ext.lower() == "gif" ) { format = "GIF"; }
else if ( ext.lower() == "pnm" ) { format = "PNM"; }
else if ( ext.lower() == "bmp" ) { format = "BMP"; }
else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).tqarg( fname ) << endl; }
else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).arg( fname ) << endl; }
//parse width and height
bool ok(false);
@ -165,8 +165,8 @@ int main(int argc, char *argv[])
map->exportSkyImage( TQT_TQPAINTDEVICE(&sky) );
kapp->processEvents(100000);
if ( ! sky.save( fname, format ) ) kdWarning() << i18n( "Unable to save image: %1 " ).tqarg( fname ) << endl;
else kdDebug() << i18n( "Saved to file: %1" ).tqarg( fname ) << endl;
if ( ! sky.save( fname, format ) ) kdWarning() << i18n( "Unable to save image: %1 " ).arg( fname ) << endl;
else kdDebug() << i18n( "Saved to file: %1" ).arg( fname ) << endl;
delete map;
delete dat;
@ -179,7 +179,7 @@ int main(int argc, char *argv[])
TQString datestring = args->getOption( "date" );
if ( ! datestring.isEmpty() && ! KStarsDateTime::fromString( datestring ).isValid() ) {
kdWarning() << i18n("Specified date (%1) is invalid. Will use current CPU date instead." ).tqarg( datestring ) << endl;
kdWarning() << i18n("Specified date (%1) is invalid. Will use current CPU date instead." ).arg( datestring ) << endl;
datestring = "";
}

6
kstars/kstars/mapcanvas.h
Unescape View File

@ -50,7 +50,7 @@ public:
~MapCanvas();
public slots:
/**Set the tqgeometry of the map widget (overloaded from TQWidget).
/**Set the geometry of the map widget (overloaded from TQWidget).
*Resizes the size of the map pixmap to match the widget, and resets
*the Origin TQPoint so it remains at the center of the widget.
*@note this is called automatically by resize events.
@ -61,13 +61,13 @@ public slots:
*/
virtual void setGeometry( int x, int y, int w, int h );
/**Set the tqgeometry of the map widget (overloaded from TQWidget).
/**Set the geometry of the map widget (overloaded from TQWidget).
*Resizes the size of the map pixmap to match the widget, and resets
*the Origin TQPoint so it remains at the center of the widget.
*This function behaves just like the above function. It differs
*only in the data type of its argument.
*@note this is called automatically by resize events.
*@p r TQRect describing tqgeometry
*@p r TQRect describing geometry
*/
virtual void setGeometry( const TQRect &r );

4
kstars/kstars/newfovui.ui
Unescape View File

@ -832,10 +832,10 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to
<cstring>ShapeBox</cstring>
</property>
<property name="toolTip" stdset="0">
<string>Select a tqshape for the field-of-view symbol</string>
<string>Select a shape for the field-of-view symbol</string>
</property>
<property name="whatsThis" stdset="0">
<string>Select a tqshape for the field-of-view (FOV) symbol. The possible tqshapes are:
<string>Select a shape for the field-of-view (FOV) symbol. The possible shapes are:
Circle, Square, Crosshairs, Bullseye.</string>
</property>

6
kstars/kstars/opscolors.cpp
Unescape View File

@ -123,7 +123,7 @@ void OpsColors::slotPreset( int index ) {
TQStringList::Iterator it = PresetFileList.at( index );
bool result = setColors( *it );
if (!result) {
TQString message = i18n( "The specified color scheme file (%1) could not be found, or was corrupt." ).tqarg( TQString(*it) );
TQString message = i18n( "The specified color scheme file (%1) could not be found, or was corrupt." ).arg( TQString(*it) );
KMessageBox::sorry( 0, message, i18n( "Could Not Set Color Scheme" ) );
}
}
@ -213,7 +213,7 @@ void OpsColors::slotRemovePreset() {
TQFile colorFile;
colorFile.setName( locateLocal( "appdata", filename ) ); //determine filename in local user KDE directory tree.
if ( !colorFile.remove() ) {
TQString message = i18n( "Could not delete the file: %1" ).tqarg( colorFile.name() );
TQString message = i18n( "Could not delete the file: %1" ).arg( colorFile.name() );
KMessageBox::sorry( 0, message, i18n( "Error Deleting File" ) );
}
@ -224,7 +224,7 @@ void OpsColors::slotRemovePreset() {
for( unsigned int i=0; i<slist.count(); ++i )
stream << slist[i] << endl;
} else {
TQString message = i18n( "Could not find an entry named %1 in colors.dat." ).tqarg( name );
TQString message = i18n( "Could not find an entry named %1 in colors.dat." ).arg( name );
KMessageBox::sorry( 0, message, i18n( "Scheme Not Found" ) );
}
cdatFile.close();

4
kstars/kstars/simclock.cpp
Unescape View File

@ -163,7 +163,7 @@ void SimClock::setUTC(const KStarsDateTime &newtime) {
}
kdDebug() << i18n( "Setting clock: UTC: %1 JD: %2" )
.tqarg( UTC.toString() ).tqarg( KGlobal::locale()->formatNumber( UTC.djd() ) ) << endl;
.arg( UTC.toString() ).arg( KGlobal::locale()->formatNumber( UTC.djd() ) ) << endl;
emit timeChanged();
} else {
kdDebug() << i18n( "Cannot set SimClock: Invalid Date/Time." ) << endl;
@ -172,7 +172,7 @@ void SimClock::setUTC(const KStarsDateTime &newtime) {
void SimClock::setScale(float s) {
if (Scale != s ) {
kdDebug() << i18n( "New clock scale: %1 sec" ).tqarg( s ) << endl;
kdDebug() << i18n( "New clock scale: %1 sec" ).arg( s ) << endl;
Scale = s;
if (tmr.isActive()) {
julianmark = UTC.djd();

4
kstars/kstars/skymap.cpp
Unescape View File

@ -1179,7 +1179,7 @@ void SkyMap::forceUpdate( bool now )
}
computeSkymap = true;
if ( now ) tqrepaint();
if ( now ) repaint();
else update();
}
@ -1313,7 +1313,7 @@ void SkyMap::setMouseMoveCursor()
{
if (mouseButtonDown)
{
setCursor (9); // cursor tqshape defined in qt
setCursor (9); // cursor shape defined in qt
mouseMoveCursor = true;
}
}

12
kstars/kstars/skymap.h
Unescape View File

@ -369,7 +369,7 @@ public:
*/
bool isAngleMode() const {return angularDistanceMode;}
/**@short update the tqgeometry of the angle ruler
/**@short update the geometry of the angle ruler
*/
void updateAngleRuler();
@ -389,7 +389,7 @@ public:
/**@short Draw the current Sky map to a pixmap which is to be printed or exported to a file.
*
*Each of the draw functions is called, with a value for the Scale parameter computed to fit the
*tqgeometry of the TQPaintDevice.
*geometry of the TQPaintDevice.
*@param pd pointer to the TQPaintDevice on which to draw.
*@see KStars::slotExportImage()
*@see KStars::slotPrint()
@ -623,7 +623,7 @@ private slots:
*/
void slotTransientLabel();
/**Set the tqshape of mouse cursor to a cross with 4 arrows. */
/**Set the shape of mouse cursor to a cross with 4 arrows. */
void setMouseMoveCursor();
private:
@ -777,7 +777,7 @@ private:
void drawBoxes( TQPainter &p );
/**Draw symbols at the position of each Telescope currently being controlled by KStars.
*@note The tqshape of the Telescope symbol is currently a hard-coded bullseye.
*@note The shape of the Telescope symbol is currently a hard-coded bullseye.
*@note there is no scale factor because this is only used for drawing onto the screen, not printing.
*@param psky reference to the TQPainter on which to draw (this should be the Sky pixmap).
*/
@ -901,11 +901,11 @@ private:
*/
double findPA( SkyObject *o, int x, int y, double scale=1.0 );
/**@short Sets the tqshape of the default mouse cursor to a cross.
/**@short Sets the shape of the default mouse cursor to a cross.
*/
void setDefaultMouseCursor();
/**@short Sets the tqshape of the mouse cursor to a magnifying glass.
/**@short Sets the shape of the mouse cursor to a magnifying glass.
*/
void setZoomMouseCursor();

2
kstars/kstars/skymapdraw.cpp
Unescape View File

@ -1859,7 +1859,7 @@ void SkyMap::exportSkyImage( const TQPaintDevice *pd ) {
bool drawCBounds( Options::showCBounds() );
bool drawGrid( Options::showGrid() );
p.tqbegin( const_cast<TQPaintDevice*>(pd) );
p.begin( const_cast<TQPaintDevice*>(pd) );
TQPaintDeviceMetrics pdm( p.device() );
//scale image such that it fills 90% of the x or y dimension on the paint device

4
kstars/kstars/skymapevents.cpp
Unescape View File

@ -453,7 +453,7 @@ void SkyMap::mouseMoveEvent( TQMouseEvent *e ) {
if ( ZoomRect.center().x() > 0 && ZoomRect.center().y() > 0 ) {
//cancel operation if the user let go of CTRL
if ( !( e->state() & ControlButton ) ) {
ZoomRect = TQRect(); //tqinvalidate ZoomRect
ZoomRect = TQRect(); //invalidate ZoomRect
update();
} else {
//Resize the rectangle so that it passes through the cursor position
@ -600,7 +600,7 @@ void SkyMap::mouseReleaseEvent( TQMouseEvent * ) {
ksw->zoom( Options::zoomFactor() * factor );
setDefaultMouseCursor();
ZoomRect = TQRect(); //tqinvalidate ZoomRect
ZoomRect = TQRect(); //invalidate ZoomRect
forceUpdate();
} else {
setDefaultMouseCursor();

14
kstars/kstars/skyobject.cpp
Unescape View File

@ -344,27 +344,27 @@ TQString SkyObject::messageFromTitle( const TQString &imageTitle ) {
//HST Image
if ( imageTitle == i18n( "Show HST Image" ) || imageTitle.contains("HST") ) {
message = i18n( "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]" ).tqarg( longname() );
message = i18n( "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]" ).arg( longname() );
//Spitzer Image
} else if ( imageTitle.contains( i18n( "Show Spitzer Image" ) ) ) {
message = i18n( "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]" ).tqarg( longname() );
message = i18n( "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]" ).arg( longname() );
//SEDS Image
} else if ( imageTitle == i18n( "Show SEDS Image" ) ) {
message = i18n( "%1: SEDS, http://www.seds.org [free for non-commercial use]" ).tqarg( longname() );
message = i18n( "%1: SEDS, http://www.seds.org [free for non-commercial use]" ).arg( longname() );
//Kitt Peak AOP Image
} else if ( imageTitle == i18n( "Show KPNO AOP Image" ) ) {
message = i18n( "%1: Advanced Observing Program at Kitt Peak National Observatory [free for non-commercial use; no physical reproductions]" ).tqarg( longname() );
message = i18n( "%1: Advanced Observing Program at Kitt Peak National Observatory [free for non-commercial use; no physical reproductions]" ).arg( longname() );
//NOAO Image
} else if ( imageTitle.contains( i18n( "Show NOAO Image" ) ) ) {
message = i18n( "%1: National Optical Astronomy Observatories and AURA [free for non-commercial use]" ).tqarg( longname() );
message = i18n( "%1: National Optical Astronomy Observatories and AURA [free for non-commercial use]" ).arg( longname() );
//VLT Image
} else if ( imageTitle.contains( "VLT" ) ) {
message = i18n( "%1: Very Large Telescope, operated by the European Southern Observatory [free for non-commercial use; no reproductions]" ).tqarg( longname() );
message = i18n( "%1: Very Large Telescope, operated by the European Southern Observatory [free for non-commercial use; no reproductions]" ).arg( longname() );
//All others
} else if ( imageTitle.startsWith( i18n( "Show" ) ) ) {
@ -384,7 +384,7 @@ void SkyObject::saveUserLog( const TQString &newLog ) {
//Do nothing if new log is the "default" message
//(keep going if new log is empty; we'll want to delete its current entry)
if ( newLog == (i18n("Record here observation logs and/or data on %1.").tqarg(name())) || newLog.isEmpty() )
if ( newLog == (i18n("Record here observation logs and/or data on %1.").arg(name())) || newLog.isEmpty() )
return;
// header label

18
kstars/kstars/skypoint.cpp
Unescape View File

@ -589,7 +589,7 @@ TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<S
//Should not happen:
if ( p1List.count() == 0 ) {
kdWarning() << "A: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl;
kdWarning() << "A: " << i18n("No constellation found for point: (%1, %2)").arg(ra()->toHMSString()).arg(dec()->toDMSString()) << endl;
return i18n("Unknown");
}
@ -630,7 +630,7 @@ TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<S
}
if ( ilow2 == -1 ) { //whoops, what happened?
kdWarning() << "B: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl;
kdWarning() << "B: " << i18n("No constellation found for point: (%1, %2)").arg(ra()->toHMSString()).arg(dec()->toDMSString()) << endl;
return i18n("Unknown");
}
@ -643,7 +643,7 @@ TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<S
abbrev = name1List[ ilower ];
else { //doh!
kdWarning() << "C: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl;
kdWarning() << "C: " << i18n("No constellation found for point: (%1, %2)").arg(ra()->toHMSString()).arg(dec()->toDMSString()) << endl;
return i18n("Unknown");
}
@ -663,7 +663,7 @@ TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<S
}
if ( iup2 == -1 ) { //whoops, what happened?
kdWarning() << "D: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl;
kdWarning() << "D: " << i18n("No constellation found for point: (%1, %2)").arg(ra()->toHMSString()).arg(dec()->toDMSString()) << endl;
return i18n("Unknown");
}
@ -676,7 +676,7 @@ TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<S
abbrev = name1List[ iupper ];
else { //doh!
kdWarning() << "E: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl;
kdWarning() << "E: " << i18n("No constellation found for point: (%1, %2)").arg(ra()->toHMSString()).arg(dec()->toDMSString()) << endl;
return i18n("Unknown");
}
}
@ -713,7 +713,7 @@ TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<S
abbrev = name1List[ iupper ];
else { //doh!
kdWarning() << "F: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl;
kdWarning() << "F: " << i18n("No constellation found for point: (%1, %2)").arg(ra()->toHMSString()).arg(dec()->toDMSString()) << endl;
return i18n("Unknown");
}
} else { //pdc > 0.0, so search down
@ -732,7 +732,7 @@ TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<S
}
if ( ilow2 == -1 ) { //whoops, what happened?
kdWarning() << "G: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl;
kdWarning() << "G: " << i18n("No constellation found for point: (%1, %2)").arg(ra()->toHMSString()).arg(dec()->toDMSString()) << endl;
return i18n("Unknown");
}
@ -745,7 +745,7 @@ TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<S
abbrev = name1List[ ilower ];
else { //doh!
kdWarning() << "H: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl;
kdWarning() << "H: " << i18n("No constellation found for point: (%1, %2)").arg(ra()->toHMSString()).arg(dec()->toDMSString()) << endl;
return i18n("Unknown");
}
}
@ -761,7 +761,7 @@ TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<S
//If we reach here, then neither name1 nor name2 were shared between the bracketing segments!
else {
kdWarning() << "I: " << i18n("No constellation found for point: (%1, %2)").tqarg(ra()->toHMSString()).tqarg(dec()->toDMSString()) << endl;
kdWarning() << "I: " << i18n("No constellation found for point: (%1, %2)").arg(ra()->toHMSString()).arg(dec()->toDMSString()) << endl;
return i18n("Unknown");
}

6
kstars/kstars/streamwg.cpp
Unescape View File

@ -90,7 +90,7 @@ void StreamWG::setColorFrame(bool color)
TQString errMsg;
struct sockaddr_in pin;
struct hostent *serverHostName = gethostbyname(host.ascii());
errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").tqarg(host).tqarg(port);
errMsg = TQString("Connection to INDI host at %1 on port %2 failed.").arg(host).arg(port);
memset(&pin, 0, sizeof(pin));
pin.sin_family = AF_INET;
@ -254,14 +254,14 @@ void StreamWG::captureImage()
if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) )
{
TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( currentFileURL.prettyURL() );
TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() );
KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) );
}
}
}
else
{
TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() );
TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() );
KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) );
}

6
kstars/kstars/telescopeprop.cpp
Unescape View File

@ -213,10 +213,10 @@ void telescopeProp::updateScopeDetails(int index)
versionEdit->setText(indi_driver->devices[finalIndex]->version);
if (indi_driver->devices[finalIndex]->focal_length != -1)
focalEdit->setText(TQString("%1").tqarg(indi_driver->devices[finalIndex]->focal_length));
focalEdit->setText(TQString("%1").arg(indi_driver->devices[finalIndex]->focal_length));
if (indi_driver->devices[finalIndex]->aperture != -1)
apertureEdit->setText(TQString("%1").tqarg(indi_driver->devices[finalIndex]->aperture));
apertureEdit->setText(TQString("%1").arg(indi_driver->devices[finalIndex]->aperture));
}
@ -228,7 +228,7 @@ void telescopeProp::removeScope()
index = telescopeListBox->currentItem();
finalIndex = findDeviceIndex(index);
if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove %1?").tqarg(indi_driver->devices[finalIndex]->label), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue)
if (KMessageBox::warningContinueCancel( 0, i18n("Are you sure you want to remove %1?").arg(indi_driver->devices[finalIndex]->label), i18n("Delete Confirmation"),KStdGuiItem::del())!=KMessageBox::Continue)
return;
telescopeListBox->removeItem(index);

14
kstars/kstars/telescopewizard.ui
Unescape View File

@ -141,7 +141,7 @@ This Wizard will help you to connect to your telescope and control it from KStar
&lt;br&gt;&lt;br&gt;
Please click next to continue.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -167,7 +167,7 @@ Please click next to continue.</string>
Please select your telescope model from the list below. Click next after selecting a model.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -274,12 +274,12 @@ Please select your telescope model from the list below. Click next after selecti
<property name="text">
<string>&lt;h3&gt;2. Align Your Telescope&lt;/h3&gt;
You need to align your telescope before you can control it properly from KStars. Please refer to your telescope manual for tqalignment instructions.
You need to align your telescope before you can control it properly from KStars. Please refer to your telescope manual for alignment instructions.
&lt;br&gt;&lt;br&gt;
After a successful tqalignment, connect your telescope's RS232 interface to your computer's serial or USB port.
After a successful alignment, connect your telescope's RS232 interface to your computer's serial or USB port.
&lt;br&gt;&lt;br&gt;&lt;br&gt;Click next to continue.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -306,7 +306,7 @@ After a successful tqalignment, connect your telescope's RS232 interface to your
Verify if the following time, date, and location settings are correct. If any of the settings are incorrect, you can correct them via the &lt;tt&gt;Set time&lt;/tt&gt; and &lt;tt&gt;Set Location&lt;/tt&gt; buttons.
</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -524,7 +524,7 @@ Verify if the following time, date, and location settings are correct. If any of
Enter the port number your telescope is connected to. If you only have one serial port in your computer, the port is usually &lt;tt&gt;/dev/ttyS0&lt;/tt&gt;
&lt;br&gt;&lt;br&gt;If you are unsure about the port number, you can leave the field empty and KStars will try to scan the ports for attached telescopes. Beware that the autoscan process might take a few minutes to complete. </string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>

14
kstars/kstars/telescopewizardprocess.cpp
Unescape View File

@ -74,11 +74,11 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* na
dateOut->setText( TQString().sprintf("%d-%02d-%02d", newDate.year(), newDate.month(), newDate.day()));
if (ksw->geo()->translatedProvince().isEmpty())
locationOut->setText( TQString("%1, %2").tqarg(ksw->geo()->translatedName()).tqarg(ksw->geo()->translatedCountry()));
locationOut->setText( TQString("%1, %2").arg(ksw->geo()->translatedName()).arg(ksw->geo()->translatedCountry()));
else
locationOut->setText( TQString("%1, %2, %3").tqarg(ksw->geo()->translatedName())
.tqarg(ksw->geo()->translatedProvince())
.tqarg(ksw->geo()->translatedCountry()));
locationOut->setText( TQString("%1, %2, %3").arg(ksw->geo()->translatedName())
.arg(ksw->geo()->translatedProvince())
.arg(ksw->geo()->translatedCountry()));
for (unsigned int i=0; i < indidriver->devices.size(); i++)
@ -211,9 +211,9 @@ void telescopeWizardProcess::newLocation()
ksw->slotGeoLocator();
locationOut->setText( TQString("%1, %2, %3").tqarg(ksw->geo()->translatedName())
.tqarg(ksw->geo()->translatedProvince())
.tqarg(ksw->geo()->translatedCountry()));
locationOut->setText( TQString("%1, %2, %3").arg(ksw->geo()->translatedName())
.arg(ksw->geo()->translatedProvince())
.arg(ksw->geo()->translatedCountry()));
timeOut->setText( TQString().sprintf("%02d:%02d:%02d", ksw->data()->lt().time().hour(), ksw->data()->lt().time().minute(), ksw->data()->lt().time().second()));
dateOut->setText( TQString().sprintf("%d-%02d-%02d", ksw->data()->lt().date().year(),

2
kstars/kstars/thumbnaileditor.cpp
Unescape View File

@ -63,7 +63,7 @@ TQPixmap ThumbnailEditor::thumbnail() {
void ThumbnailEditor::slotUpdateCropLabel() {
TQRect *r = ui->ImageCanvas->cropRect();
ui->CropLabel->setText( i18n( "Crop region: [%1,%2 %3x%4]" )
.tqarg( r->left() ).tqarg( r->top() ).tqarg( r->width() ).tqarg( r->height() ) );
.arg( r->left() ).arg( r->top() ).arg( r->width() ).arg( r->height() ) );
}
TQPixmap ThumbImage::croppedImage() {

4
kstars/kstars/thumbnaileditorui.ui
Unescape View File

@ -48,7 +48,7 @@
<property name="text">
<string>Crop region: [0,0 200 x 200]</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@ -65,7 +65,7 @@
<property name="text">
<string>(crop region will be scaled to 200x200)</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

6
kstars/kstars/thumbnailpicker.cpp
Unescape View File

@ -85,9 +85,9 @@ void ThumbnailPicker::slotFillList() {
//Query Google Image Search:
KURL gURL( "http://images.google.com/images" );
//Search for the primary name, or longname and primary name
TQString sName = TQString("\"%1\"").tqarg( Object->name() );
TQString sName = TQString("\"%1\"").arg( Object->name() );
if ( Object->longname() != Object->name() ) {
sName = TQString("\"%1\" ").tqarg( Object->longname() ) + sName;
sName = TQString("\"%1\" ").arg( Object->longname() ) + sName;
}
gURL.addQueryItem( "q", sName ); //add the Google-image query string
@ -313,7 +313,7 @@ void ThumbnailPicker::slotSetFromURL() {
if ( im.isNull() ) {
KMessageBox::sorry( 0,
i18n("Failed to load image at %1").tqarg( localFile.name() ),
i18n("Failed to load image at %1").arg( localFile.name() ),
i18n("Failed to Load Image") );
return;
}

6
kstars/kstars/timebox.cpp
Unescape View File

@ -102,8 +102,8 @@ TQTime timeBox::createTime ( bool *ok )
if ( fields.count() == 2 ) {
double mx = fields[1].toDouble( &checkValue );
if ( checkValue ) {
fields[1] = TQString("%1").tqarg( int(mx) );
fields.append( TQString("%1").tqarg( int( 60.0*(mx - int(mx)) ) ) );
fields[1] = TQString("%1").arg( int(mx) );
fields.append( TQString("%1").arg( int( 60.0*(mx - int(mx)) ) ) );
} else {
fields.append( TQString( "0" ) );
}
@ -141,7 +141,7 @@ TQTime timeBox::createTime ( bool *ok )
}
// if ( !valueFound )
// KMessageBox::sorry( 0, errMsg.tqarg( "Angle" ), i18n( "Could Not Set Value" ) );
// KMessageBox::sorry( 0, errMsg.arg( "Angle" ), i18n( "Could Not Set Value" ) );
return qt;

8
kstars/kstars/tools/altvstime.cpp
Unescape View File

@ -190,7 +190,7 @@ void AltVsTime::slotAddSource(void) {
avtUI->decBox->TQWidget::setFocus();
}
View->tqrepaint(false);
View->repaint(false);
}
//Use find dialog to choose an object
@ -201,7 +201,7 @@ void AltVsTime::slotBrowseObject(void) {
processObject( o );
}
View->tqrepaint();
View->repaint();
}
void AltVsTime::processObject( SkyObject *o, bool forceAdd ) {
@ -323,7 +323,7 @@ void AltVsTime::slotClear(void) {
avtUI->decBox->clear();
avtUI->epochName->clear();
View->clearObjectList();
View->tqrepaint();
View->repaint();
}
void AltVsTime::slotClearBoxes(void) {
@ -437,7 +437,7 @@ void AltVsTime::slotUpdateDateLoc(void) {
setLSTLimits();
slotHighlight();
View->tqrepaint();
View->repaint();
delete num;
}

2
kstars/kstars/tools/altvstimeui.ui
Unescape View File

@ -108,7 +108,7 @@
<property name="text">
<string>RA:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>

18
kstars/kstars/tools/argexportimage.ui
Unescape View File

@ -179,14 +179,14 @@
<slot access="public" specifier="">update()</slot>
<slot access="public" specifier="">update(int,int,int,int)</slot>
<slot access="public" specifier="">update(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint()</slot>
<slot access="public" specifier="">tqrepaint(bool)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">repaint()</slot>
<slot access="public" specifier="">repaint(bool)</slot>
<slot access="public" specifier="">repaint(int,int,int,int)</slot>
<slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">show()</slot>
<slot access="public" specifier="">hide()</slot>
<slot access="public" specifier="">setShown(bool)</slot>
@ -221,7 +221,7 @@
<slot access="private" specifier="">slotEmitRelativeValueChanged(int)</slot>
<property type="CString">name</property>
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property>
<property type="Size">minimumSize</property>
<property type="Size">maximumSize</property>

18
kstars/kstars/tools/argsetcolor.ui
Unescape View File

@ -139,14 +139,14 @@
<slot access="public" specifier="">update()</slot>
<slot access="public" specifier="">update(int,int,int,int)</slot>
<slot access="public" specifier="">update(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint()</slot>
<slot access="public" specifier="">tqrepaint(bool)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
<slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">repaint()</slot>
<slot access="public" specifier="">repaint(bool)</slot>
<slot access="public" specifier="">repaint(int,int,int,int)</slot>
<slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;)</slot>
<slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
<slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">show()</slot>
<slot access="public" specifier="">hide()</slot>
<slot access="public" specifier="">setShown(bool)</slot>
@ -180,7 +180,7 @@
<slot access="protected" specifier="">chooseColor()</slot>
<property type="CString">name</property>
<property type="Bool">enabled</property>
<property type="Rect">tqgeometry</property>
<property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property>
<property type="Size">minimumSize</property>
<property type="Size">maximumSize</property>

8
kstars/kstars/tools/kstarsplotwidget.cpp
Unescape View File

@ -358,7 +358,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
switch ( xAxisType() ) {
case DOUBLE :
{
TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 );
int idot = str.find( '.' );
if ( idot >= 0 )
str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );
@ -426,7 +426,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
switch ( yAxisType() ) {
case DOUBLE :
{
TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 );
int idot = str.find( '.' );
if ( idot >= 0 )
str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );
@ -492,7 +492,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
switch ( xAxisType() ) {
case DOUBLE :
{
TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 );
int idot = str.find( '.' );
if ( idot >= 0 )
str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );
@ -556,7 +556,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) {
switch ( yAxisType() ) {
case DOUBLE :
{
TQString str = TQString( "%1" ).tqarg( lab, 0, 'g', 2 );
TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 );
int idot = str.find( '.' );
if ( idot >= 0 )
str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() );

4
kstars/kstars/tools/modcalcangdist.cpp
Unescape View File

@ -98,7 +98,7 @@ void modCalcAngDist::slotRunBatch() {
if ( TQFile::exists(inputFileName) ) {
TQFile f( inputFileName );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1.").tqarg( f.name() );
TQString message = i18n( "Could not open file %1.").arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
inputFileName = "";
return;
@ -110,7 +110,7 @@ void modCalcAngDist::slotRunBatch() {
// readFile( istream );
f.close();
} else {
TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName );
TQString message = i18n( "Invalid file: %1" ).arg( inputFileName );
KMessageBox::sorry( 0, message, i18n( "Invalid file" ) );
inputFileName = "";
InputLineEditBatch->setText( inputFileName );

4
kstars/kstars/tools/modcalcapcoord.cpp
Unescape View File

@ -182,7 +182,7 @@ void modCalcApCoord::slotRunBatch() {
if ( TQFile::exists(inputFileName) ) {
TQFile f( inputFileName );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1.").tqarg( f.name() );
TQString message = i18n( "Could not open file %1.").arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
inputFileName = "";
return;
@ -194,7 +194,7 @@ void modCalcApCoord::slotRunBatch() {
// readFile( istream );
f.close();
} else {
TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName );
TQString message = i18n( "Invalid file: %1" ).arg( inputFileName );
KMessageBox::sorry( 0, message, i18n( "Invalid file" ) );
inputFileName = "";
InputLineEditBatch->setText( inputFileName );

4
kstars/kstars/tools/modcalcazel.cpp
Unescape View File

@ -328,7 +328,7 @@ void modCalcAzel::slotRunBatch() {
if ( TQFile::exists(inputFileName) ) {
TQFile f( inputFileName );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1.").tqarg( f.name() );
TQString message = i18n( "Could not open file %1.").arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
inputFileName = "";
return;
@ -340,7 +340,7 @@ void modCalcAzel::slotRunBatch() {
// readFile( istream );
f.close();
} else {
TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName );
TQString message = i18n( "Invalid file: %1" ).arg( inputFileName );
KMessageBox::sorry( 0, message, i18n( "Invalid file" ) );
inputFileName = "";
InputLineEditBatch->setText( inputFileName );

4
kstars/kstars/tools/modcalceclipticcoords.cpp
Unescape View File

@ -223,7 +223,7 @@ void modCalcEclCoords::slotRunBatch() {
if ( TQFile::exists(inputFileName) ) {
TQFile f( inputFileName );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1.").tqarg( f.name() );
TQString message = i18n( "Could not open file %1.").arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
inputFileName = "";
return;
@ -235,7 +235,7 @@ void modCalcEclCoords::slotRunBatch() {
// readFile( istream );
f.close();
} else {
TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName );
TQString message = i18n( "Invalid file: %1" ).arg( inputFileName );
KMessageBox::sorry( 0, message, i18n( "Invalid file" ) );
inputFileName = "";
InputLineEditBatch->setText( inputFileName );

8
kstars/kstars/tools/modcalcequinox.cpp
Unescape View File

@ -57,7 +57,7 @@ int modCalcEquinox::getYear (TQString eName)
void modCalcEquinox::showCurrentYear (void)
{
KStarsDateTime dt( KStarsDateTime::currentDateTime() );
yearEdit->setText( TQString( "%1").tqarg( dt.date().year() ) );
yearEdit->setText( TQString( "%1").arg( dt.date().year() ) );
}
void modCalcEquinox::slotComputeEquinoxesAndSolstices (void)
@ -104,7 +104,7 @@ void modCalcEquinox::showStartDateTime(long double jd)
void modCalcEquinox::showSeasonDuration(float deltaJd)
{
seasonDuration->setText( TQString( "%1").tqarg( deltaJd ) );
seasonDuration->setText( TQString( "%1").arg( deltaJd ) );
}
void modCalcEquinox::slotYearCheckedBatch(){
@ -138,7 +138,7 @@ void modCalcEquinox::slotRunBatch() {
if ( TQFile::exists(inputFileName) ) {
TQFile f( inputFileName );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1.").tqarg( f.name() );
TQString message = i18n( "Could not open file %1.").arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
inputFileName = "";
return;
@ -150,7 +150,7 @@ void modCalcEquinox::slotRunBatch() {
// readFile( istream );
f.close();
} else {
TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName );
TQString message = i18n( "Invalid file: %1" ).arg( inputFileName );
KMessageBox::sorry( 0, message, i18n( "Invalid file" ) );
inputFileName = "";
InputLineEditBatch->setText( inputFileName );

4
kstars/kstars/tools/modcalcgalcoord.cpp
Unescape View File

@ -225,7 +225,7 @@ void modCalcGalCoord::slotRunBatch() {
if ( TQFile::exists(inputFileName) ) {
TQFile f( inputFileName );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1.").tqarg( f.name() );
TQString message = i18n( "Could not open file %1.").arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
inputFileName = "";
return;
@ -237,7 +237,7 @@ void modCalcGalCoord::slotRunBatch() {
// readFile( istream );
f.close();
} else {
TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName );
TQString message = i18n( "Invalid file: %1" ).arg( inputFileName );
KMessageBox::sorry( 0, message, i18n( "Invalid file" ) );
inputFileName = "";
InputLineEditBatch->setText( inputFileName );

4
kstars/kstars/tools/modcalcgeodcoord.cpp
Unescape View File

@ -236,7 +236,7 @@ void modCalcGeodCoord::slotRunBatch(void) {
if ( TQFile::exists(inputFileName) ) {
TQFile f( inputFileName );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1.").tqarg( f.name() );
TQString message = i18n( "Could not open file %1.").arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
inputFileName = "";
return;
@ -248,7 +248,7 @@ void modCalcGeodCoord::slotRunBatch(void) {
// readFile( istream );
f.close();
} else {
TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName );
TQString message = i18n( "Invalid file: %1" ).arg( inputFileName );
KMessageBox::sorry( 0, message, i18n( "Invalid file" ) );
inputFileName = "";
InputLineEditBatch->setText( inputFileName );

16
kstars/kstars/tools/modcalcplanets.cpp
Unescape View File

@ -310,7 +310,7 @@ void modCalcPlanets::slotRunBatch() {
if ( TQFile::exists(inputFileName) ) {
TQFile f( inputFileName );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1.").tqarg( f.name() );
TQString message = i18n( "Could not open file %1.").arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
inputFileName = "";
return;
@ -320,7 +320,7 @@ void modCalcPlanets::slotRunBatch() {
processLines(istream);
f.close();
} else {
TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName );
TQString message = i18n( "Invalid file: %1" ).arg( inputFileName );
KMessageBox::sorry( 0, message, i18n( "Invalid file" ) );
inputFileName = "";
InputLineEditBatch->setText( inputFileName );
@ -397,9 +397,9 @@ void modCalcPlanets::processLines( TQTextStream &istream ) {
if (fields.count() != numberOfRequiredFields ) {
lineIsValid = false;
kdWarning() << i18n( "Incorrect number of fields in line %1: " ).tqarg(nline)
<< i18n( "Present fields %1. " ).tqarg(fields.count())
<< i18n( "Required fields %1. " ).tqarg(numberOfRequiredFields) << endl;
kdWarning() << i18n( "Incorrect number of fields in line %1: " ).arg(nline)
<< i18n( "Present fields %1. " ).arg(fields.count())
<< i18n( "Required fields %1. " ).arg(numberOfRequiredFields) << endl;
nline++;
continue;
}
@ -419,7 +419,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) {
if (j == 11) {
kdWarning() << i18n("Unknown planet ")
<< fields[i]
<< i18n(" in line %1: ").tqarg(nline) << endl;
<< i18n(" in line %1: ").arg(nline) << endl;
continue;
}
i++;
@ -441,7 +441,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) {
if(utCheckBatch->isChecked() ) {
utB = TQTime::fromString( fields[i] );
if ( !utB.isValid() ) {
kdWarning() << i18n( "Line %1 contains an invalid time" ).tqarg(nline) << endl;
kdWarning() << i18n( "Line %1 contains an invalid time" ).arg(nline) << endl;
lineIsValid=false;
nline++;
continue;
@ -461,7 +461,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) {
if(dateCheckBatch->isChecked() ) {
dtB = ExtDate::fromString( fields[i], Qt::ISODate );
if ( !dtB.isValid() ) {
kdWarning() << i18n( "Line %1 contains an invalid date: " ).tqarg(nline) <<
kdWarning() << i18n( "Line %1 contains an invalid date: " ).arg(nline) <<
fields[i] << endl ;
lineIsValid=false;
nline++;

6
kstars/kstars/tools/modcalcprec.cpp
Unescape View File

@ -57,7 +57,7 @@ SkyPoint modCalcPrec::getEquCoords (void) {
TQString modCalcPrec:: showCurrentEpoch () {
double epoch = setCurrentEpoch();
TQString eName = TQString("%1").tqarg(epoch,7,'f',2);
TQString eName = TQString("%1").arg(epoch,7,'f',2);
return eName;
}
@ -176,7 +176,7 @@ void modCalcPrec::slotRunBatch() {
if ( TQFile::exists(inputFileName) ) {
TQFile f( inputFileName );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1.").tqarg( f.name() );
TQString message = i18n( "Could not open file %1.").arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
inputFileName = "";
return;
@ -188,7 +188,7 @@ void modCalcPrec::slotRunBatch() {
// readFile( istream );
f.close();
} else {
TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName );
TQString message = i18n( "Invalid file: %1" ).arg( inputFileName );
KMessageBox::sorry( 0, message, i18n( "Invalid file" ) );
inputFileName = "";
InputLineEditBatch->setText( inputFileName );

4
kstars/kstars/tools/modcalcsidtime.cpp
Unescape View File

@ -192,7 +192,7 @@ void modCalcSidTime::slotRunBatch() {
if ( TQFile::exists(inputFileName) ) {
TQFile f( inputFileName );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1.").tqarg( f.name() );
TQString message = i18n( "Could not open file %1.").arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
inputFileName = "";
return;
@ -204,7 +204,7 @@ void modCalcSidTime::slotRunBatch() {
// readFile( istream );
f.close();
} else {
TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName );
TQString message = i18n( "Invalid file: %1" ).arg( inputFileName );
KMessageBox::sorry( 0, message, i18n( "Invalid file" ) );
inputFileName = "";
InputLineEditBatch->setText( inputFileName );

4
kstars/kstars/tools/modcalcvlsr.cpp
Unescape View File

@ -373,7 +373,7 @@ void modCalcVlsr::slotRunBatch() {
if ( TQFile::exists(inputFileName) ) {
TQFile f( inputFileName );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1.").tqarg( f.name() );
TQString message = i18n( "Could not open file %1.").arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
inputFileName = "";
return;
@ -385,7 +385,7 @@ void modCalcVlsr::slotRunBatch() {
// readFile( istream );
f.close();
} else {
TQString message = i18n( "Invalid file: %1" ).tqarg( inputFileName );
TQString message = i18n( "Invalid file: %1" ).arg( inputFileName );
KMessageBox::sorry( 0, message, i18n( "Invalid file" ) );
inputFileName = "";
InputLineEditBatch->setText( inputFileName );

30
kstars/kstars/tools/observinglist.cpp
Unescape View File

@ -144,7 +144,7 @@ void ObservingList::slotAddObject( SkyObject *obj ) {
for ( SkyObject *o = obsList.first(); o; o = obsList.next() ) {
if ( obj == o ) {
//FIXME STRINGS FREEZE
//ks->statusBar()->changeItem( i18n( "%1 is already in the observing list." ).tqarg( obj->name() ), 0 );
//ks->statusBar()->changeItem( i18n( "%1 is already in the observing list." ).arg( obj->name() ), 0 );
return;
}
}
@ -164,7 +164,7 @@ void ObservingList::slotAddObject( SkyObject *obj ) {
ui->TinyTable->insertItem( obj->translatedName() );
//Note addition in statusbar
ks->statusBar()->changeItem( i18n( "Added %1 to observing list." ).tqarg( obj->name() ), 0 );
ks->statusBar()->changeItem( i18n( "Added %1 to observing list." ).arg( obj->name() ), 0 );
}
void ObservingList::slotRemoveObject( SkyObject *o ) {
@ -200,7 +200,7 @@ void ObservingList::slotRemoveObject( SkyObject *o ) {
}
if ( ! objectFound ) {
kdDebug() << i18n( "Cannot remove Object %1; not found in table." ).tqarg(o->translatedName()) << endl;
kdDebug() << i18n( "Cannot remove Object %1; not found in table." ).arg(o->translatedName()) << endl;
} else {
//Remove object from TinyTable
for ( uint i=0; i < ui->TinyTable->count(); i++ ) {
@ -268,7 +268,7 @@ void ObservingList::slotNewSelection() {
}
if ( ! found ) {
kdDebug() << i18n( "Object %1 not found in obsList." ).tqarg( newName ) << endl;
kdDebug() << i18n( "Object %1 not found in obsList." ).arg( newName ) << endl;
} else if ( newName != i18n( "star" ) ) {
//Display the object's current user notes in the NotesEdit
//First, save the last object's user log to disk, if necessary
@ -280,9 +280,9 @@ void ObservingList::slotNewSelection() {
ui->NotesLabel->setEnabled( true );
ui->NotesEdit->setEnabled( true );
ui->NotesLabel->setText( i18n( "observing notes for %1:" ).tqarg( LogObject->translatedName() ) );
ui->NotesLabel->setText( i18n( "observing notes for %1:" ).arg( LogObject->translatedName() ) );
if ( LogObject->userLog.isEmpty() ) {
ui->NotesEdit->setText( i18n("Record here observation logs and/or data on %1.").tqarg( LogObject->translatedName() ) );
ui->NotesEdit->setText( i18n("Record here observation logs and/or data on %1.").arg( LogObject->translatedName() ) );
} else {
ui->NotesEdit->setText( LogObject->userLog );
}
@ -378,7 +378,7 @@ void ObservingList::slotSlewToObject()
if (ConnectEle->state == PS_OFF)
{
KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").tqarg(indidev->label));
KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").arg(indidev->label));
return;
}
@ -432,8 +432,8 @@ void ObservingList::slotSlewToObject()
if (useJ2000)
sp.apparentCoord(ks->data()->ut().djd(), (long double) J2000);
RAEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.ra()->hour()).tqarg(sp.ra()->minute()).tqarg(sp.ra()->second()));
DecEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.dec()->degree()).tqarg(sp.dec()->arcmin()).tqarg(sp.dec()->arcsec()));
RAEle->write_w->setText(TQString("%1:%2:%3").arg(sp.ra()->hour()).arg(sp.ra()->minute()).arg(sp.ra()->second()));
DecEle->write_w->setText(TQString("%1:%2:%3").arg(sp.dec()->degree()).arg(sp.dec()->arcmin()).arg(sp.dec()->arcsec()));
break;
@ -449,8 +449,8 @@ void ObservingList::slotSlewToObject()
sp.setAlt(*ks->map()->clickedPoint()->alt());
}
AzEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.az()->degree()).tqarg(sp.az()->arcmin()).tqarg(sp.az()->arcsec()));
AltEle->write_w->setText(TQString("%1:%2:%3").tqarg(sp.alt()->degree()).tqarg(sp.alt()->arcmin()).tqarg(sp.alt()->arcsec()));
AzEle->write_w->setText(TQString("%1:%2:%3").arg(sp.az()->degree()).arg(sp.az()->arcmin()).arg(sp.az()->arcsec()));
AltEle->write_w->setText(TQString("%1:%2:%3").arg(sp.alt()->degree()).arg(sp.alt()->arcmin()).arg(sp.alt()->arcsec()));
break;
}
@ -490,7 +490,7 @@ void ObservingList::slotAVT() {
void ObservingList::slotClose() {
//Save the current User log text
if ( oCurrent && ! ui->NotesEdit->text().isEmpty() && ui->NotesEdit->text()
!= i18n("Record here observation logs and/or data on %1.").tqarg( oCurrent->name()) ) {
!= i18n("Record here observation logs and/or data on %1.").arg( oCurrent->name()) ) {
oCurrent->saveUserLog( ui->NotesEdit->text() );
}
@ -500,7 +500,7 @@ void ObservingList::slotClose() {
void ObservingList::saveCurrentUserLog() {
if ( ! ui->NotesEdit->text().isEmpty() &&
ui->NotesEdit->text() !=
i18n("Record here observation logs and/or data on %1.").tqarg( LogObject->translatedName() ) ) {
i18n("Record here observation logs and/or data on %1.").arg( LogObject->translatedName() ) ) {
LogObject->saveUserLog( ui->NotesEdit->text() );
ui->NotesEdit->clear();
@ -528,7 +528,7 @@ void ObservingList::slotOpenList() {
}
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1" ).tqarg( f.name() );
TQString message = i18n( "Could not open file %1" ).arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
return;
}
@ -627,7 +627,7 @@ void ObservingList::slotSaveList() {
TQFile f( FileName );
if ( !f.open( IO_WriteOnly) ) {
TQString message = i18n( "Could not open file %1. Try a different filename?" ).tqarg( f.name() );
TQString message = i18n( "Could not open file %1. Try a different filename?" ).arg( f.name() );
if ( KMessageBox::warningYesNo( 0, message, i18n( "Could Not Open File" ), i18n("Try Different"), i18n("Do Not Try") ) == KMessageBox::Yes ) {
FileName == "";

2
kstars/kstars/tools/observinglistui.ui
Unescape View File

@ -518,7 +518,7 @@
<property name="text">
<string>observing notes for object:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter</set>
</property>
</widget>

2
kstars/kstars/tools/obslistwizard.cpp
Unescape View File

@ -411,7 +411,7 @@ void ObsListWizard::applyFilters( bool doBuildList )
//Update the object count label
if ( doBuildList ) ObjectCount = obsList().count();
olw->CountLabel->setText( i18n("Current selection: %1 objects").tqarg( ObjectCount ) );
olw->CountLabel->setText( i18n("Current selection: %1 objects").arg( ObjectCount ) );
}
void ObsListWizard::applyRegionFilter( SkyObject *o, bool doBuildList, bool doAdjustCount ) {

2
kstars/kstars/tools/obslistwizardui.ui
Unescape View File

@ -930,7 +930,7 @@ c. select objects in a circular region
Choose one of these sub-items to
select from a region on the sky.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>

200
kstars/kstars/tools/scriptbuilder.cpp
Unescape View File

@ -649,7 +649,7 @@ void ScriptBuilder::initViewOptions() {
new TQListViewItem( opsSkymap, "UseAltAz", i18n( "UseQt::Horizontal coordinates? (otherwise, use Equatorial)" ), i18n( "bool" ) );
new TQListViewItem( opsSkymap, "ZoomFactor", i18n( "Set the Zoom Factor" ), i18n( "double" ) );
new TQListViewItem( opsSkymap, "FOV Size", i18n( "Select angular size for the FOV symbol (in arcmin)" ), i18n( "double" ) );
new TQListViewItem( opsSkymap, "FOV Shape", i18n( "Select tqshape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, 4=Bullseye)" ), i18n( "int" ) );
new TQListViewItem( opsSkymap, "FOV Shape", i18n( "Select shape for the FOV symbol (0=Square, 1=Circle, 2=Crosshairs, 4=Bullseye)" ), i18n( "int" ) );
new TQListViewItem( opsSkymap, "FOV Color", i18n( "Select color for the FOV symbol" ), i18n( "string" ) );
new TQListViewItem( opsSkymap, "AnimateSlewing", i18n( "Use animated slewing? (otherwise, \"snap\" to new focus)" ), i18n( "bool" ) );
new TQListViewItem( opsSkymap, "UseRefraction", i18n( "Correct for atmospheric refraction?" ), i18n( "bool" ) );
@ -759,7 +759,7 @@ void ScriptBuilder::slotOpen() {
TQFile f( fname );
if ( !f.open( IO_ReadOnly) ) {
TQString message = i18n( "Could not open file %1." ).tqarg( f.name() );
TQString message = i18n( "Could not open file %1." ).arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
currentFileURL = "";
return;
@ -770,7 +770,7 @@ void ScriptBuilder::slotOpen() {
f.close();
} else if ( ! currentFileURL.url().isEmpty() ) {
TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() );
TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() );
KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) );
currentFileURL = "";
}
@ -805,7 +805,7 @@ void ScriptBuilder::slotSave() {
if (TQFile::exists(currentFileURL.path())) {
int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).tqarg(currentFileURL.fileName()),
"Overwrite it?" ).arg(currentFileURL.fileName()),
i18n( "Overwrite File?" ),
i18n( "&Overwrite" ) );
@ -819,7 +819,7 @@ void ScriptBuilder::slotSave() {
TQFile f( fname );
if ( !f.open( IO_WriteOnly) ) {
TQString message = i18n( "Could not open file %1." ).tqarg( f.name() );
TQString message = i18n( "Could not open file %1." ).arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
currentFileURL = "";
return;
@ -834,7 +834,7 @@ void ScriptBuilder::slotSave() {
if ( tmpfile.name() == fname ) { //need to upload to remote location
if ( ! KIO::NetAccess::upload( tmpfile.name(), currentFileURL, (TQWidget*) 0 ) ) {
TQString message = i18n( "Could not upload image to remote location: %1" ).tqarg( currentFileURL.prettyURL() );
TQString message = i18n( "Could not upload image to remote location: %1" ).arg( currentFileURL.prettyURL() );
KMessageBox::sorry( 0, message, i18n( "Could not upload file" ) );
}
}
@ -842,7 +842,7 @@ void ScriptBuilder::slotSave() {
setUnsavedChanges( false );
} else {
TQString message = i18n( "Invalid URL: %1" ).tqarg( currentFileURL.url() );
TQString message = i18n( "Invalid URL: %1" ).arg( currentFileURL.url() );
KMessageBox::sorry( 0, message, i18n( "Invalid URL" ) );
currentFileURL = "";
}
@ -885,7 +885,7 @@ void ScriptBuilder::slotRunScript() {
TQFile f( fname );
if ( f.exists() ) f.remove();
if ( !f.open( IO_WriteOnly) ) {
TQString message = i18n( "Could not open file %1." ).tqarg( f.name() );
TQString message = i18n( "Could not open file %1." ).arg( f.name() );
KMessageBox::sorry( 0, message, i18n( "Could Not Open File" ) );
currentFileURL = "";
return;
@ -990,7 +990,7 @@ void ScriptBuilder::readScript( TQTextStream &istream ) {
// Initially, any read script is valid!
ScriptList.current()->setValid(true);
}
else kdWarning() << i18n( "Could not parse script. Line was: %1" ).tqarg( line ) << endl;
else kdWarning() << i18n( "Could not parse script. Line was: %1" ).arg( line ) << endl;
} // end if left(4) == "dcop"
} // end while !eof()
@ -1820,7 +1820,7 @@ void ScriptBuilder::slotFindCity() {
sf->setArg( 1, ld.selectedProvinceName() );
sf->setArg( 2, ld.selectedCountryName() );
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl;
}
}
}
@ -1869,7 +1869,7 @@ void ScriptBuilder::slotLookToward() {
sf->setArg( 0, argLookToward->FocusEdit->currentText() );
sf->setValid(true);
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "lookTowards" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "lookTowards" ) << endl;
}
}
@ -1885,7 +1885,7 @@ void ScriptBuilder::slotRa() {
if ( ok ) {
setUnsavedChanges( true );
sf->setArg( 0, TQString( "%1" ).tqarg( ra.Hours() ) );
sf->setArg( 0, TQString( "%1" ).arg( ra.Hours() ) );
if ( ! sf->argVal(1).isEmpty() ) sf->setValid( true );
} else {
@ -1893,7 +1893,7 @@ void ScriptBuilder::slotRa() {
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setRaDec" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setRaDec" ) << endl;
}
}
@ -1909,7 +1909,7 @@ void ScriptBuilder::slotDec() {
if ( ok ) {
setUnsavedChanges( true );
sf->setArg( 1, TQString( "%1" ).tqarg( dec.Degrees() ) );
sf->setArg( 1, TQString( "%1" ).arg( dec.Degrees() ) );
if ( ! sf->argVal(0).isEmpty() ) sf->setValid( true );
} else {
@ -1917,7 +1917,7 @@ void ScriptBuilder::slotDec() {
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setRaDec" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setRaDec" ) << endl;
}
}
@ -1932,14 +1932,14 @@ void ScriptBuilder::slotAz() {
dms az = argSetAltAz->AzBox->createDms(true, &ok);
if ( ok ) {
setUnsavedChanges( true );
sf->setArg( 1, TQString( "%1" ).tqarg( az.Degrees() ) );
sf->setArg( 1, TQString( "%1" ).arg( az.Degrees() ) );
if ( ! sf->argVal(0).isEmpty() ) sf->setValid( true );
} else {
sf->setArg( 1, "" );
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setAltAz" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setAltAz" ) << endl;
}
}
@ -1955,14 +1955,14 @@ void ScriptBuilder::slotAlt() {
if ( ok ) {
setUnsavedChanges( true );
sf->setArg( 0, TQString( "%1" ).tqarg( alt.Degrees() ) );
sf->setArg( 0, TQString( "%1" ).arg( alt.Degrees() ) );
if ( ! sf->argVal(1).isEmpty() ) sf->setValid( true );
} else {
sf->setArg( 0, "" );
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setAltAz" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setAltAz" ) << endl;
}
}
@ -1974,12 +1974,12 @@ void ScriptBuilder::slotChangeDate() {
ExtDate date = argSetLocalTime->DateBox->date();
sf->setArg( 0, TQString( "%1" ).tqarg( date.year() ) );
sf->setArg( 1, TQString( "%1" ).tqarg( date.month() ) );
sf->setArg( 2, TQString( "%1" ).tqarg( date.day() ) );
sf->setArg( 0, TQString( "%1" ).arg( date.year() ) );
sf->setArg( 1, TQString( "%1" ).arg( date.month() ) );
sf->setArg( 2, TQString( "%1" ).arg( date.day() ) );
if ( ! sf->argVal(3).isEmpty() ) sf->setValid( true );
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setLocalTime" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setLocalTime" ) << endl;
}
}
@ -1991,12 +1991,12 @@ void ScriptBuilder::slotChangeTime() {
TQTime time = argSetLocalTime->TimeBox->time();
sf->setArg( 3, TQString( "%1" ).tqarg( time.hour() ) );
sf->setArg( 4, TQString( "%1" ).tqarg( time.minute() ) );
sf->setArg( 5, TQString( "%1" ).tqarg( time.second() ) );
sf->setArg( 3, TQString( "%1" ).arg( time.hour() ) );
sf->setArg( 4, TQString( "%1" ).arg( time.minute() ) );
sf->setArg( 5, TQString( "%1" ).arg( time.second() ) );
if ( ! sf->argVal(0).isEmpty() ) sf->setValid( true );
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setLocalTime" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setLocalTime" ) << endl;
}
}
@ -2010,13 +2010,13 @@ void ScriptBuilder::slotWaitFor() {
if ( ok ) {
setUnsavedChanges( true );
sf->setArg( 0, TQString( "%1" ).tqarg( delay ) );
sf->setArg( 0, TQString( "%1" ).arg( delay ) );
sf->setValid( true );
} else {
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitFor" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitFor" ) << endl;
}
}
@ -2037,7 +2037,7 @@ void ScriptBuilder::slotWaitForKey() {
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitForKey" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitForKey" ) << endl;
}
}
@ -2050,7 +2050,7 @@ void ScriptBuilder::slotTracking() {
sf->setArg( 0, ( argSetTracking->CheckTrack->isChecked() ? i18n( "true" ) : i18n( "false" ) ) );
sf->setValid( true );
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setTracking" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setTracking" ) << endl;
}
}
@ -2069,7 +2069,7 @@ void ScriptBuilder::slotViewOption() {
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "changeViewOption" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "changeViewOption" ) << endl;
}
}
@ -2089,7 +2089,7 @@ void ScriptBuilder::slotChangeCity() {
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl;
}
}
@ -2109,7 +2109,7 @@ void ScriptBuilder::slotChangeProvince() {
//might not be invalid
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl;
}
}
@ -2129,7 +2129,7 @@ void ScriptBuilder::slotChangeCountry() {
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setGeoLocation" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setGeoLocation" ) << endl;
}
}
@ -2139,10 +2139,10 @@ void ScriptBuilder::slotTimeScale() {
if ( sf->name() == "setClockScale" ) {
setUnsavedChanges( true );
sf->setArg( 0, TQString( "%1" ).tqarg( argTimeScale->TimeScale->tsbox()->timeScale() ) );
sf->setArg( 0, TQString( "%1" ).arg( argTimeScale->TimeScale->tsbox()->timeScale() ) );
sf->setValid( true );
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setClockScale" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setClockScale" ) << endl;
}
}
@ -2159,7 +2159,7 @@ void ScriptBuilder::slotZoom() {
sf->setValid( true );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "zoom" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "zoom" ) << endl;
}
}
@ -2170,11 +2170,11 @@ void ScriptBuilder::slotExportImage() {
setUnsavedChanges( true );
sf->setArg( 0, argExportImage->ExportFileName->url() );
sf->setArg( 1, TQString("%1").tqarg( argExportImage->ExportWidth->value() ) );
sf->setArg( 2, TQString("%1").tqarg( argExportImage->ExportHeight->value() ) );
sf->setArg( 1, TQString("%1").arg( argExportImage->ExportWidth->value() ) );
sf->setArg( 2, TQString("%1").arg( argExportImage->ExportHeight->value() ) );
sf->setValid( true );
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "exportImage" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "exportImage" ) << endl;
}
}
@ -2188,7 +2188,7 @@ void ScriptBuilder::slotPrintImage() {
sf->setArg( 1, ( argPrintImage->UseChartColors->isChecked() ? i18n( "true" ) : i18n( "false" ) ) );
sf->setValid( true );
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "exportImage" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "exportImage" ) << endl;
}
}
@ -2205,7 +2205,7 @@ void ScriptBuilder::slotChangeColorName() {
sf->setArg( 1, cname );
sf->setValid( true );
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setColor" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setColor" ) << endl;
}
}
@ -2221,7 +2221,7 @@ void ScriptBuilder::slotChangeColor() {
sf->setArg( 1, cname );
sf->setValid( true );
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setColor" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setColor" ) << endl;
}
}
@ -2234,7 +2234,7 @@ void ScriptBuilder::slotLoadColorScheme(TQListBoxItem */*i*/) {
sf->setArg( 0, "\"" + argLoadColorScheme->SchemeList->currentText() + "\"" );
sf->setValid( true );
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "loadColorScheme" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "loadColorScheme" ) << endl;
}
}
@ -2263,7 +2263,7 @@ void ScriptBuilder::slotINDIStartDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDI" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDI" ) << endl;
}
}
@ -2282,7 +2282,7 @@ void ScriptBuilder::slotINDIStartDeviceMode()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDI" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDI" ) << endl;
}
}
@ -2308,7 +2308,7 @@ void ScriptBuilder::slotINDIShutdown()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "shutdownINDI" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "shutdownINDI" ) << endl;
}
}
@ -2334,7 +2334,7 @@ void ScriptBuilder::slotINDISwitchDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "switchdownINDI" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "switchdownINDI" ) << endl;
}
}
@ -2356,7 +2356,7 @@ void ScriptBuilder::slotINDISwitchDeviceConnection()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "switchINDI" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "switchINDI" ) << endl;
}
}
@ -2384,7 +2384,7 @@ void ScriptBuilder::slotINDISetPortDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIPort" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIPort" ) << endl;
}
@ -2412,7 +2412,7 @@ void ScriptBuilder::slotINDISetPortDevicePort()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIPort" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIPort" ) << endl;
}
}
@ -2438,7 +2438,7 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetCoord" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetCoord" ) << endl;
}
}
@ -2459,10 +2459,10 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceRA()
dms ra = argSetTargetCoordINDI->RaBox->createDms(false, &ok);
if ( ok ) {
if (sf->argVal(1) != TQString( "%1" ).tqarg( ra.Hours() ))
if (sf->argVal(1) != TQString( "%1" ).arg( ra.Hours() ))
setUnsavedChanges( true );
sf->setArg( 1, TQString( "%1" ).tqarg( ra.Hours() ) );
sf->setArg( 1, TQString( "%1" ).arg( ra.Hours() ) );
if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(2).isEmpty() )) sf->setValid( true );
else sf->setValid(false);
@ -2471,7 +2471,7 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceRA()
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetCoord" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetCoord" ) << endl;
}
}
@ -2492,10 +2492,10 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceDEC()
dms dec = argSetTargetCoordINDI->DecBox->createDms(true, &ok);
if ( ok ) {
if (sf->argVal(2) != TQString( "%1" ).tqarg( dec.Degrees() ))
if (sf->argVal(2) != TQString( "%1" ).arg( dec.Degrees() ))
setUnsavedChanges( true );
sf->setArg( 2, TQString( "%1" ).tqarg( dec.Degrees() ) );
sf->setArg( 2, TQString( "%1" ).arg( dec.Degrees() ) );
if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(1).isEmpty() )) sf->setValid( true );
else sf->setValid(false);
@ -2504,7 +2504,7 @@ void ScriptBuilder::slotINDISetTargetCoordDeviceDEC()
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetCoord" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetCoord" ) << endl;
}
}
@ -2531,7 +2531,7 @@ void ScriptBuilder::slotINDISetTargetNameDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetName" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetName" ) << endl;
}
}
@ -2558,7 +2558,7 @@ void ScriptBuilder::slotINDISetTargetNameObjectName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDITargetName" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDITargetName" ) << endl;
}
}
@ -2585,7 +2585,7 @@ void ScriptBuilder::slotINDISetActionDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIAction") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIAction") << endl;
}
}
@ -2611,7 +2611,7 @@ void ScriptBuilder::slotINDISetActionName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIAction") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIAction") << endl;
}
}
@ -2638,7 +2638,7 @@ void ScriptBuilder::slotINDIWaitForActionDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitForINDIAction") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitForINDIAction") << endl;
}
}
@ -2664,7 +2664,7 @@ void ScriptBuilder::slotINDIWaitForActionName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "waitForINDIAction") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "waitForINDIAction") << endl;
}
}
@ -2685,12 +2685,12 @@ void ScriptBuilder::slotINDISetFocusSpeedDeviceName()
setUnsavedChanges( true );
sf->setArg(0, argSetFocusSpeedINDI->deviceName->text());
sf->setArg(1, TQString("%1").tqarg(argSetFocusSpeedINDI->speedIN->value()));
sf->setArg(1, TQString("%1").arg(argSetFocusSpeedINDI->speedIN->value()));
sf->setValid(true);
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusSpeed") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusSpeed") << endl;
}
}
@ -2705,13 +2705,13 @@ void ScriptBuilder::slotINDISetFocusSpeed()
if (sf->argVal(1).toInt() != argSetFocusSpeedINDI->speedIN->value())
setUnsavedChanges( true );
sf->setArg(1, TQString("%1").tqarg(argSetFocusSpeedINDI->speedIN->value()));
sf->setArg(1, TQString("%1").arg(argSetFocusSpeedINDI->speedIN->value()));
if ((! sf->argVal(0).isEmpty())) sf->setValid(true);
else sf->setValid(false);
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusSpeed") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusSpeed") << endl;
}
}
@ -2737,7 +2737,7 @@ void ScriptBuilder::slotINDIStartFocusDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "StartINDIFocus") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "StartINDIFocus") << endl;
}
}
@ -2758,7 +2758,7 @@ void ScriptBuilder::slotINDIStartFocusDirection()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDIFocus") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDIFocus") << endl;
}
}
@ -2779,12 +2779,12 @@ void ScriptBuilder::slotINDISetFocusTimeoutDeviceName()
setUnsavedChanges( true );
sf->setArg(0, argSetFocusTimeoutINDI->deviceName->text());
sf->setArg(1, TQString("%1").tqarg(argSetFocusTimeoutINDI->timeOut->value()));
sf->setArg(1, TQString("%1").arg(argSetFocusTimeoutINDI->timeOut->value()));
sf->setValid(true);
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusTimeout") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusTimeout") << endl;
}
}
@ -2798,13 +2798,13 @@ void ScriptBuilder::slotINDISetFocusTimeout()
if (sf->argVal(1).toInt() != argSetFocusTimeoutINDI->timeOut->value())
setUnsavedChanges( true );
sf->setArg(1, TQString("%1").tqarg(argSetFocusTimeoutINDI->timeOut->value()));
sf->setArg(1, TQString("%1").arg(argSetFocusTimeoutINDI->timeOut->value()));
if (! sf->argVal(0).isEmpty()) sf->setValid(true);
else sf->setValid(false);
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFocusTimeout") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFocusTimeout") << endl;
}
}
@ -2830,7 +2830,7 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIGeoLocation" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIGeoLocation" ) << endl;
}
}
@ -2851,10 +2851,10 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLong()
dms longitude = argSetGeoLocationINDI->longBox->createDms(true, &ok);
if ( ok ) {
if (sf->argVal(1) != TQString( "%1" ).tqarg( longitude.Degrees()))
if (sf->argVal(1) != TQString( "%1" ).arg( longitude.Degrees()))
setUnsavedChanges( true );
sf->setArg( 1, TQString( "%1" ).tqarg( longitude.Degrees() ) );
sf->setArg( 1, TQString( "%1" ).arg( longitude.Degrees() ) );
if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(2).isEmpty() )) sf->setValid( true );
else sf->setValid(false);
@ -2863,7 +2863,7 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLong()
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIGeoLocation" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIGeoLocation" ) << endl;
}
}
@ -2884,10 +2884,10 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLat()
dms latitude = argSetGeoLocationINDI->latBox->createDms(true, &ok);
if ( ok ) {
if (sf->argVal(2) != TQString( "%1" ).tqarg( latitude.Degrees()))
if (sf->argVal(2) != TQString( "%1" ).arg( latitude.Degrees()))
setUnsavedChanges( true );
sf->setArg( 2, TQString( "%1" ).tqarg( latitude.Degrees() ) );
sf->setArg( 2, TQString( "%1" ).arg( latitude.Degrees() ) );
if ( ( ! sf->argVal(0).isEmpty() ) && ( ! sf->argVal(1).isEmpty() )) sf->setValid( true );
else sf->setValid(false);
@ -2896,7 +2896,7 @@ void ScriptBuilder::slotINDISetGeoLocationDeviceLat()
sf->setValid( false );
}
} else {
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIGeoLocation" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIGeoLocation" ) << endl;
}
}
@ -2917,12 +2917,12 @@ void ScriptBuilder::slotINDIStartExposureDeviceName()
setUnsavedChanges( true );
sf->setArg(0, argStartExposureINDI->deviceName->text());
sf->setArg(1, TQString("%1").tqarg(argStartExposureINDI->timeOut->value()));
sf->setArg(1, TQString("%1").arg(argStartExposureINDI->timeOut->value()));
sf->setValid(true);
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDIExposure") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDIExposure") << endl;
}
}
@ -2937,13 +2937,13 @@ void ScriptBuilder::slotINDIStartExposureTimeout()
if (sf->argVal(1).toInt() != argStartExposureINDI->timeOut->value())
setUnsavedChanges( true );
sf->setArg(1, TQString("%1").tqarg(argStartExposureINDI->timeOut->value()));
sf->setArg(1, TQString("%1").arg(argStartExposureINDI->timeOut->value()));
if (! sf->argVal(0).isEmpty()) sf->setValid(true);
else sf->setValid(false);
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "startINDIExposure") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "startINDIExposure") << endl;
}
}
@ -2970,7 +2970,7 @@ void ScriptBuilder::slotINDISetUTCDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIUTC" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIUTC" ) << endl;
}
@ -2998,7 +2998,7 @@ void ScriptBuilder::slotINDISetUTC()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIUTC" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIUTC" ) << endl;
}
}
@ -3026,7 +3026,7 @@ void ScriptBuilder::slotINDISetScopeActionDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIScopeAction" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIScopeAction" ) << endl;
}
}
@ -3048,7 +3048,7 @@ void ScriptBuilder::slotINDISetScopeAction()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIScopeAction") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIScopeAction") << endl;
}
}
@ -3075,7 +3075,7 @@ void ScriptBuilder::slotINDISetFrameTypeDeviceName()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFrameType" ) << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFrameType" ) << endl;
}
}
@ -3096,7 +3096,7 @@ void ScriptBuilder::slotINDISetFrameType()
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFrameType") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFrameType") << endl;
}
}
@ -3117,12 +3117,12 @@ void ScriptBuilder::slotINDISetCCDTempDeviceName()
setUnsavedChanges( true );
sf->setArg(0, argSetCCDTempINDI->deviceName->text());
sf->setArg(1, TQString("%1").tqarg(argSetCCDTempINDI->temp->value()));
sf->setArg(1, TQString("%1").arg(argSetCCDTempINDI->temp->value()));
sf->setValid(true);
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDICCDTemp") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDICCDTemp") << endl;
}
}
@ -3137,13 +3137,13 @@ void ScriptBuilder::slotINDISetCCDTemp()
if (sf->argVal(1).toInt() != argSetCCDTempINDI->temp->value())
setUnsavedChanges( true );
sf->setArg(1, TQString("%1").tqarg(argSetCCDTempINDI->temp->value()));
sf->setArg(1, TQString("%1").arg(argSetCCDTempINDI->temp->value()));
if (! sf->argVal(0).isEmpty()) sf->setValid(true);
else sf->setValid(false);
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDICCDTemp") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDICCDTemp") << endl;
}
}
@ -3165,12 +3165,12 @@ void ScriptBuilder::slotINDISetFilterNumDeviceName()
setUnsavedChanges( true );
sf->setArg(0, argSetFilterNumINDI->deviceName->text());
sf->setArg(1, TQString("%1").tqarg(argSetFilterNumINDI->filter_num->value()));
sf->setArg(1, TQString("%1").arg(argSetFilterNumINDI->filter_num->value()));
sf->setValid(true);
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFilterNum") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFilterNum") << endl;
}
}
@ -3185,13 +3185,13 @@ void ScriptBuilder::slotINDISetFilterNum()
if (sf->argVal(1).toInt() != argSetFilterNumINDI->filter_num->value())
setUnsavedChanges( true );
sf->setArg(1, TQString("%1").tqarg(argSetFilterNumINDI->filter_num->value()));
sf->setArg(1, TQString("%1").arg(argSetFilterNumINDI->filter_num->value()));
if (! sf->argVal(0).isEmpty()) sf->setValid(true);
else sf->setValid(false);
}
else
{
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).tqarg( "setINDIFilterNum") << endl;
kdWarning() << i18n( "Mismatch between function and Arg widget (expected %1.)" ).arg( "setINDIFilterNum") << endl;
}

70
kstars/kstars/tools/scriptfunction.cpp
Unescape View File

@ -40,42 +40,42 @@ ScriptFunction::ScriptFunction( TQString name, TQString desc, bool clockfcn,
Description = "<html><head><meta name=\"qrichtext\" content=\"1\" /></head>";
Description += "<body style=\"font-size:11pt;font-family:sans\">";
Description += "<p>" + nameStyle.tqarg( Name + "(" );
Description += "<p>" + nameStyle.arg( Name + "(" );
NumArgs = 0;
if ( ! at1.isEmpty() && ! an1.isEmpty() ) {
Description += " " + typeStyle.tqarg( at1 );
Description += " " + paramStyle.tqarg( an1 );
Description += " " + typeStyle.arg( at1 );
Description += " " + paramStyle.arg( an1 );
NumArgs++;
}
if ( ! at2.isEmpty() && ! an2.isEmpty() ) {
Description += ", " + typeStyle.tqarg( at2 );
Description += " " + paramStyle.tqarg( an2 );
Description += ", " + typeStyle.arg( at2 );
Description += " " + paramStyle.arg( an2 );
NumArgs++;
}
if ( ! at3.isEmpty() && ! an3.isEmpty() ) {
Description += ", " + typeStyle.tqarg( at3 );
Description += " " + paramStyle.tqarg( an3 );
Description += ", " + typeStyle.arg( at3 );
Description += " " + paramStyle.arg( an3 );
NumArgs++;
}
if ( ! at4.isEmpty() && ! an4.isEmpty() ) {
Description += ", " + typeStyle.tqarg( at4 );
Description += " " + paramStyle.tqarg( an4 );
Description += ", " + typeStyle.arg( at4 );
Description += " " + paramStyle.arg( an4 );
NumArgs++;
}
if ( ! at5.isEmpty() && ! an5.isEmpty() ) {
Description += ", " + typeStyle.tqarg( at5 );
Description += " " + paramStyle.tqarg( an5 );
Description += ", " + typeStyle.arg( at5 );
Description += " " + paramStyle.arg( an5 );
NumArgs++;
}
if ( ! at6.isEmpty() && ! an6.isEmpty() ) {
Description += ", " + typeStyle.tqarg( at6 );
Description += " " + paramStyle.tqarg( an6 );
Description += ", " + typeStyle.arg( at6 );
Description += " " + paramStyle.arg( an6 );
NumArgs++;
}
@ -85,7 +85,7 @@ ScriptFunction::ScriptFunction( TQString name, TQString desc, bool clockfcn,
//Finish writing function prototype
if ( NumArgs ) Description += " ";
Description += nameStyle.tqarg( ")" ) + "</p><p>";
Description += nameStyle.arg( ")" ) + "</p><p>";
//before adding description, replace any '%n' instances with the corresponding
//argument name in color. For now, assume that the %n's occur in order, with no skips.
@ -93,42 +93,42 @@ ScriptFunction::ScriptFunction( TQString name, TQString desc, bool clockfcn,
int narg = desc.contains( '%' );
switch (narg ) {
case 1:
Description += desc.tqarg( paramStyle.tqarg( an1 ) );
Description += desc.arg( paramStyle.arg( an1 ) );
break;
case 2:
Description +=
desc.tqarg( paramStyle.tqarg( an1 ) )
.tqarg( paramStyle.tqarg( an2 ) );
desc.arg( paramStyle.arg( an1 ) )
.arg( paramStyle.arg( an2 ) );
break;
case 3:
Description +=
desc.tqarg( paramStyle.tqarg( an1 ) )
.tqarg( paramStyle.tqarg( an2 ) )
.tqarg( paramStyle.tqarg( an3 ) );
desc.arg( paramStyle.arg( an1 ) )
.arg( paramStyle.arg( an2 ) )
.arg( paramStyle.arg( an3 ) );
break;
case 4:
Description +=
desc.tqarg( paramStyle.tqarg( an1 ) )
.tqarg( paramStyle.tqarg( an2 ) )
.tqarg( paramStyle.tqarg( an3 ) )
.tqarg( paramStyle.tqarg( an4 ) );
desc.arg( paramStyle.arg( an1 ) )
.arg( paramStyle.arg( an2 ) )
.arg( paramStyle.arg( an3 ) )
.arg( paramStyle.arg( an4 ) );
break;
case 5:
Description +=
desc.tqarg( paramStyle.tqarg( an1 ) )
.tqarg( paramStyle.tqarg( an2 ) )
.tqarg( paramStyle.tqarg( an3 ) )
.tqarg( paramStyle.tqarg( an4 ) )
.tqarg( paramStyle.tqarg( an5 ) );
desc.arg( paramStyle.arg( an1 ) )
.arg( paramStyle.arg( an2 ) )
.arg( paramStyle.arg( an3 ) )
.arg( paramStyle.arg( an4 ) )
.arg( paramStyle.arg( an5 ) );
break;
case 6:
Description +=
desc.tqarg( paramStyle.tqarg( an1 ) )
.tqarg( paramStyle.tqarg( an2 ) )
.tqarg( paramStyle.tqarg( an3 ) )
.tqarg( paramStyle.tqarg( an4 ) )
.tqarg( paramStyle.tqarg( an5 ) )
.tqarg( paramStyle.tqarg( an6 ) );
desc.arg( paramStyle.arg( an1 ) )
.arg( paramStyle.arg( an2 ) )
.arg( paramStyle.arg( an3 ) )
.arg( paramStyle.arg( an4 ) )
.arg( paramStyle.arg( an5 ) )
.arg( paramStyle.arg( an6 ) );
break;
default:
Description += desc;

26
kstars/kstars/tools/wutdialog.cpp
Unescape View File

@ -81,8 +81,8 @@ WUTDialog::WUTDialog(KStars *ks) :
TQString sGeo = geo->translatedName();
if ( ! geo->translatedProvince().isEmpty() ) sGeo += ", " + geo->translatedProvince();
sGeo += ", " + geo->translatedCountry();
WUT->LocationLabel->setText( i18n( "at %1" ).tqarg( sGeo ) );
WUT->DateLabel->setText( i18n( "The night of %1" ).tqarg( Evening.date().toString( Qt::LocalDate ) ) );
WUT->LocationLabel->setText( i18n( "at %1" ).arg( sGeo ) );
WUT->DateLabel->setText( i18n( "The night of %1" ).arg( Evening.date().toString( Qt::LocalDate ) ) );
initCategories();
@ -164,9 +164,9 @@ void WUTDialog::init() {
sDuration = TQString().sprintf( "%02d:%02d", hDur, mDur );
}
WUT->SunSetLabel->setText( i18n( "Sunset: %1" ).tqarg(sSet) );
WUT->SunRiseLabel->setText( i18n( "Sunrise: %1" ).tqarg(sRise) );
WUT->NightDurationLabel->setText( i18n( "Night duration: %1 hours" ).tqarg( sDuration ) );
WUT->SunSetLabel->setText( i18n( "Sunset: %1" ).arg(sSet) );
WUT->SunRiseLabel->setText( i18n( "Sunrise: %1" ).arg(sRise) );
WUT->NightDurationLabel->setText( i18n( "Night duration: %1 hours" ).arg( sDuration ) );
// moon almanac information
KSMoon *oMoon = (KSMoon*) kstars->data()->Moon;
@ -189,10 +189,10 @@ void WUTDialog::init() {
sSet = moonSet.addSecs(30).toString("hh:mm");
}
WUT->MoonRiseLabel->setText( i18n( "Moon rises at: %1" ).tqarg( sRise ) );
WUT->MoonSetLabel->setText( i18n( "Moon sets at: %1" ).tqarg( sSet ) );
WUT->MoonRiseLabel->setText( i18n( "Moon rises at: %1" ).arg( sRise ) );
WUT->MoonSetLabel->setText( i18n( "Moon sets at: %1" ).arg( sSet ) );
oMoon->findPhase( oSun );
WUT->MoonIllumLabel->setText( oMoon->phaseName() + TQString( " (%1%)" ).tqarg(
WUT->MoonIllumLabel->setText( oMoon->phaseName() + TQString( " (%1%)" ).arg(
int(100.0*oMoon->illum() ) ) );
//Restore Sun's and Moon's coordinates, and recompute Moon's original Phase
@ -352,9 +352,9 @@ void WUTDialog::slotDisplayObject(TQListBoxItem *item) {
WUT->DetailButton->setEnabled( true );
}
WUT->ObjectRiseLabel->setText( i18n( "Rises at: %1" ).tqarg( sRise ) );
WUT->ObjectTransitLabel->setText( i18n( "Transits at: %1" ).tqarg( sTransit ) );
WUT->ObjectSetLabel->setText( i18n( "Sets at: %1" ).tqarg( sSet ) );
WUT->ObjectRiseLabel->setText( i18n( "Rises at: %1" ).arg( sRise ) );
WUT->ObjectTransitLabel->setText( i18n( "Transits at: %1" ).arg( sTransit ) );
WUT->ObjectSetLabel->setText( i18n( "Sets at: %1" ).arg( sSet ) );
}
void WUTDialog::slotCenter() {
@ -403,7 +403,7 @@ void WUTDialog::slotChangeDate() {
Evening = T0.addSecs( -6*3600 );
EveningUT = geo->LTtoUT( Evening );
WUT->DateLabel->setText( i18n( "The night of %1" ).tqarg( Evening.date().toString() ) );
WUT->DateLabel->setText( i18n( "The night of %1" ).arg( Evening.date().toString() ) );
int i = WUT->CategoryListBox->currentItem();
init();
@ -421,7 +421,7 @@ void WUTDialog::slotChangeLocation() {
TomorrowUT = geo->LTtoUT( Tomorrow );
EveningUT = geo->LTtoUT( Evening );
WUT->LocationLabel->setText( i18n( "at %1" ).tqarg( geo->fullName() ) );
WUT->LocationLabel->setText( i18n( "at %1" ).arg( geo->fullName() ) );
int i = WUT->CategoryListBox->currentItem();
init();

6
kstars/kstars/tools/wutdialogui.ui
Unescape View File

@ -433,7 +433,7 @@
<property name="text">
<string>Rises at: 22:12</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter</set>
</property>
<property name="whatsThis" stdset="0">
@ -447,7 +447,7 @@
<property name="text">
<string>Transits at: 03:45</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter</set>
</property>
<property name="whatsThis" stdset="0">
@ -461,7 +461,7 @@
<property name="text">
<string>Sets at: 08:22</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter</set>
</property>
<property name="whatsThis" stdset="0">

6
ktouch/src/ktouch.cpp
Unescape View File

@ -459,9 +459,9 @@ void KTouch::changeStatusbarStats(unsigned int level_correct, unsigned int level
unsigned int session_correct, unsigned int session_total, unsigned int session_words)
{
statusBar()->changeItem(i18n( "Level: Correct/Total chars: %1/%2 Words: %3")
.tqarg(level_correct).tqarg(level_total).tqarg(level_words), 1);
.arg(level_correct).arg(level_total).arg(level_words), 1);
statusBar()->changeItem(i18n( "Session: Correct/Total chars: %1/%2 Words: %3")
.tqarg(session_correct).tqarg(session_total).tqarg(session_words), 2);
.arg(session_correct).arg(session_total).arg(session_words), 2);
}
// ----------------------------------------------------------------------------
@ -489,7 +489,7 @@ void KTouch::changeLecture(int num) {
KTouchLecture l;
TQString fileName = m_lectureFiles[num];
if (!l.loadXML(this, KURL::fromPathOrURL(fileName))) {
KMessageBox::sorry(0, i18n("Could not find/open the lecture file '%1'.").tqarg(fileName) );
KMessageBox::sorry(0, i18n("Could not find/open the lecture file '%1'.").arg(fileName) );
m_defaultLectureAction->setCurrentItem(-1);
}
else {

4
ktouch/src/ktouchcolorscheme.cpp
Unescape View File

@ -81,7 +81,7 @@ bool KTouchColorScheme::read(const TQDomNode& node) {
TQDomNode c;
READ_COLOR("KeyFrame", m_frame);
for (unsigned int i=0; i<8; ++i) {
READ_COLOR(TQString("KeyBack_%1").tqarg(i), m_background[i]);
READ_COLOR(TQString("KeyBack_%1").arg(i), m_background[i]);
}
READ_COLOR("KeyText", m_text);
READ_COLOR("KeyBackHigh", m_backgroundH);
@ -125,7 +125,7 @@ void KTouchColorScheme::write(TQDomDocument& doc, TQDomElement& root) const {
WRITE_COLOR(key_colors, "KeyFrame", m_frame);
for (unsigned int i=0; i<8; ++i) {
WRITE_COLOR(key_colors, TQString("KeyBack_%1").tqarg(i), m_background[i]);
WRITE_COLOR(key_colors, TQString("KeyBack_%1").arg(i), m_background[i]);
}
WRITE_COLOR(key_colors, "KeyText", m_text);
WRITE_COLOR(key_colors, "KeyBackHigh", m_backgroundH);

8
ktouch/src/ktouchkeyboard.cpp
Unescape View File

@ -163,7 +163,7 @@ bool KTouchKeyboard::read(TQTextStream& in) {
m_connectors.push_back(keycon);
}
else {
//errorMsg = i18n("Missing key type in line '%1'.").tqarg(line);
//errorMsg = i18n("Missing key type in line '%1'.").arg(line);
return false;
}
// calculate the maximum extent of the keyboard on the fly...
@ -352,12 +352,12 @@ bool KTouchKeyboard::loadKeyboard(TQWidget * window, const KURL& url, TQString*
bool result = readKeyboard(target, msg);
KIO::NetAccess::removeTempFile(target);
if (!result && errorMsg!=NULL)
*errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").tqarg(url.url()) + msg;
*errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").arg(url.url()) + msg;
return result;
}
else {
if (errorMsg!=NULL)
*errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").tqarg(url.url());
*errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").arg(url.url());
return false;
}
}
@ -607,7 +607,7 @@ bool KTouchKeyboard::readKeyboard(const TQString& fileName, TQString& errorMsg)
m_connectorList.append( KTouchKeyConnector(keyAscII, targetChar, fingerChar, controlChar) );
}
else {
errorMsg = i18n("Missing key type in line '%1'.").tqarg(line);
errorMsg = i18n("Missing key type in line '%1'.").arg(line);
return false;
}
// calculate the maximum extent of the keyboard on the fly...

4
ktouch/src/ktouchkeyboardeditor.cpp
Unescape View File

@ -66,7 +66,7 @@ void KTouchKeyboardEditor::fontBtnClicked() {
titleEdit->setFont(f);
keyboardCommentEdit->setFont(f);
languageEdit->setFont(f);
update(); // trigger tqrepaint of the keyboard.
update(); // trigger repaint of the keyboard.
setModified();
}
}
@ -167,7 +167,7 @@ void KTouchKeyboardEditor::transfer_to_dialog() {
min_y = std::min<unsigned int>(min_y, it->m_y);
max_y = std::max<unsigned int>(max_y, it->m_y+it->m_h);
}
dimensionsLabel->setText( i18n("Keyboard dimensions: %1 x %2").tqarg(max_x - min_x).tqarg(max_y - min_y) );
dimensionsLabel->setText( i18n("Keyboard dimensions: %1 x %2").arg(max_x - min_x).arg(max_y - min_y) );
}
// -----------------------------------------------------------------------------

8
ktouch/src/ktouchkeyboardwidget.cpp
Unescape View File

@ -51,12 +51,12 @@ bool KTouchKeyboardWidget::loadKeyboard(TQWidget * window, const KURL& url, TQSt
bool result = readKeyboard(target, msg);
KIO::NetAccess::removeTempFile(target);
if (!result && errorMsg!=NULL)
*errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").tqarg(url.url()) + msg;
*errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").arg(url.url()) + msg;
return result;
}
else {
if (errorMsg!=NULL)
*errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").tqarg(url.url());
*errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").arg(url.url());
return false;
}
}
@ -309,7 +309,7 @@ void KTouchKeyboardWidget::createDefaultKeyboard() {
updateColours();
m_currentLayout="number.keyboard";
// create keyboard tqgeometry for new keyboard data
// create keyboard geometry for new keyboard data
int sp = 10;
int h = 50;
@ -421,7 +421,7 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro
}
else {
errorMsg = i18n("Missing key type in line '%1'.").tqarg(line);
errorMsg = i18n("Missing key type in line '%1'.").arg(line);
return false;
}
if (keys.find(keyAscII)!=keys.end()) {

4
ktouch/src/ktouchkeys.h
Unescape View File

@ -39,7 +39,7 @@ class KTouchBaseKey {
m_x(x), m_y(y), m_w(w), m_h(h), m_type(NORMAL_KEY) {}
/// Destructor.
virtual ~KTouchBaseKey() {}
/// Paints the basic key tqshape using the painter p.
/// Paints the basic key shape using the painter p.
virtual void paint(TQPainter& p) const;
/// Recalculates the scaled position and size properties of the key.
void resize(double scale);
@ -116,7 +116,7 @@ class KTouchFingerKey : public KTouchNormalKey {
/** This is a special or control key.
* This key acts as a modifier key to a normal key (for instance a shift key) and has a
* different tqshape and painting routine then the normal keys. Therefore it is directly
* different shape and painting routine then the normal keys. Therefore it is directly
* derived from KTouchKey.
*/
class KTouchControlKey : public KTouchBaseKey {

2
ktouch/src/ktouchlectureeditor.cpp
Unescape View File

@ -307,7 +307,7 @@ void KTouchLectureEditor::transfer_from_dialog() {
void KTouchLectureEditor::showCurrentLevel() {
if (m_level >= m_lecture.m_lectureData.size()) return; // should not happen, but why running a risk here...
levelLabel->setText(i18n("Data of Level %1").tqarg(m_level+1) );
levelLabel->setText(i18n("Data of Level %1").arg(m_level+1) );
levelCommentEdit->setText(m_lecture.m_lectureData[m_level].m_comment);
newCharsEdit->setText(m_lecture.m_lectureData[m_level].m_newChars);
TQString text;

10
ktouch/src/ktouchslideline.cpp
Unescape View File

@ -237,8 +237,8 @@ void KTouchSlideLine::resizeEvent ( TQResizeEvent * ) {
KD_DEBUG( "[KTouchSlideLine::resizeEvent]" << endl );
// required input member variables: none
// when the widget is resized, the whole tqgeometry is invalidated, so we do:
// 1. recalculate and store the tqgeometry of the sliding lines
// when the widget is resized, the whole geometry is invalidated, so we do:
// 1. recalculate and store the geometry of the sliding lines
// 2. resize the font
// 3. recreate the sliding lines (this is done from the resizeFont() function
@ -411,7 +411,7 @@ void KTouchSlideLine::updateSlidingLines() {
// draw the teacher pixmap text
TQPainter painter;
painter.tqbegin (TQT_TQPAINTDEVICE(m_teacherPixmap), this);
painter.begin (TQT_TQPAINTDEVICE(m_teacherPixmap), this);
painter.setFont( m_font );
TQColor col_tt = Prefs::commonTypingLineColors() ?
@ -443,7 +443,7 @@ void KTouchSlideLine::updateSlidingLines() {
KD_DEBUG( " m_studentPixmap = " << w+100 << " x " << h << endl );
// update (draw) student line and calculate coordinates needed for sliding
tqrepaint(true); // trigger a paint event to erase the background
repaint(true); // trigger a paint event to erase the background
updateStudentLine();
}
// ----------------------------------------------------------------------------
@ -532,7 +532,7 @@ void KTouchSlideLine::updateStudentLine() {
// now let's draw the students pixmap
TQPainter painter;
painter.tqbegin (TQT_TQPAINTDEVICE(m_studentPixmap), this);
painter.begin (TQT_TQPAINTDEVICE(m_studentPixmap), this);
if (Prefs::colorOnError()) {
// draw the student line depending on the colour settings
if (error) {

2
ktouch/src/ktouchslideline.h
Unescape View File

@ -83,7 +83,7 @@ class KTouchSlideLine : public TQWidget {
/// @see slide()
void paintEvent( TQPaintEvent * );
/// Will be called when the widget is resized.
/// This event will first recalculate the tqgeometry of the sliding lines.
/// This event will first recalculate the geometry of the sliding lines.
/// Then the font size will be updated and through that, the sliding lines will be
/// updated.
void resizeEvent ( TQResizeEvent * );

4
ktouch/src/ktouchstatistics.cpp
Unescape View File

@ -161,7 +161,7 @@ void KTouchStatistics::updateCurrentSessionTab() {
else levelnums += ",";
}
levels_count = 0;
levelnums += TQString("%1").tqarg(*it+1);
levelnums += TQString("%1").arg(*it+1);
}
else {
@ -233,7 +233,7 @@ void KTouchStatistics::updateCurrentSessionTab() {
void KTouchStatistics::updateCurrentLevelTab() {
// level info
levelLabel2->setText( TQString("%1").tqarg(m_currLevelStats.m_levelNum+1) );
levelLabel2->setText( TQString("%1").arg(m_currLevelStats.m_levelNum+1) );
// general stats group
elapsedTimeLCDLevel->display(static_cast<int>(m_currLevelStats.m_elapsedTime));
totalCharsLCDLevel->display(static_cast<int>(m_currLevelStats.m_totalChars) );

10
ktouch/src/ktouchstatisticsdata.cpp
Unescape View File

@ -137,8 +137,8 @@ void KTouchLevelStats::write(TQDomDocument& doc, TQDomElement& root) const {
TQString char_data;
// we append for each missed char the char-tqunicode and the counters
for (std::set<KTouchCharStats>::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it)
char_data += TQString(" %1 %2 %3").tqarg(it->m_char.tqunicode())
.tqarg(it->m_correctCount).tqarg(it->m_wrongCount);
char_data += TQString(" %1 %2 %3").arg(it->m_char.tqunicode())
.arg(it->m_correctCount).arg(it->m_wrongCount);
e = doc.createElement("CharStats");
tn = doc.createTextNode(char_data);
e.appendChild(tn);
@ -295,7 +295,7 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const {
// add levels
TQString level_nums;
for (std::set<unsigned int>::const_iterator it = m_levelNums.begin(); it != m_levelNums.end(); ++it)
level_nums += TQString( " %1").tqarg(*it);
level_nums += TQString( " %1").arg(*it);
e = doc.createElement("LevelNums");
tn = doc.createTextNode(level_nums);
e.appendChild(tn);
@ -304,8 +304,8 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const {
TQString char_data;
// we append for each missed char the char-tqunicode and the counters
for (std::set<KTouchCharStats>::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it)
char_data += TQString(" %1 %2 %3").tqarg(it->m_char.tqunicode())
.tqarg(it->m_correctCount).tqarg(it->m_wrongCount);
char_data += TQString(" %1 %2 %3").arg(it->m_char.tqunicode())
.arg(it->m_correctCount).arg(it->m_wrongCount);
e = doc.createElement("CharStats");
tn = doc.createTextNode(char_data);
e.appendChild(tn);

2
ktouch/src/ktouchstatuslayout.ui
Unescape View File

@ -321,7 +321,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">

2
ktouch/src/ktouchutils.cpp
Unescape View File

@ -21,7 +21,7 @@
TQString format_speed(double speed) {
unsigned int mins = static_cast<unsigned int>(speed);
unsigned int secs = static_cast<unsigned int>(speed*60) - mins*60;
return TQString("%1' %2''").tqarg(mins).tqarg(secs);
return TQString("%1' %2''").arg(mins).arg(secs);
}
void sort_lists(TQStringList& text, TQStringList& data) {

2
kturtle/TODO
Unescape View File

@ -293,7 +293,7 @@ Im tryered of this... I can fix it; too much for me. Sorry
in tdelibs/tdecore/kapp... :
url = QString("help:/%1?anchor=%2").tqarg(appname).tqarg(anchor);
url = QString("help:/%1?anchor=%2").arg(appname).arg(anchor);
and
DCOPRef( "khelpcenter", "KHelpCenterIface" ).send( "openUrl", url, startup_id );

4
kturtle/src/dialogs.cpp
Unescape View File

@ -228,7 +228,7 @@ void ColorPicker::updatePal()
valuePal->setSaturation(s);
valuePal->setValue(v);
valuePal->updateContents();
valuePal->tqrepaint(false);
valuePal->repaint(false);
}
void ColorPicker::updatePatch()
@ -239,7 +239,7 @@ void ColorPicker::updatePatch()
void ColorPicker::updateColorCode()
{
color.getRgb(&r, &g, &b);
colorcode->setText( TQString("%1, %2, %3").tqarg(r).tqarg(g).tqarg(b) );
colorcode->setText( TQString("%1, %2, %3").arg(r).arg(g).arg(b) );
colorcode->selectAll();
}

28
kturtle/src/executer.cpp
Unescape View File

@ -220,7 +220,7 @@ void Executer::execFunction(TreeNode* node)
functable::iterator p = functionTable.find(funcname);
if ( p == functionTable.end() )
{
emit ErrorMsg(node->getToken(), i18n("Call to undefined function: %1.").tqarg(funcname), 5010);
emit ErrorMsg(node->getToken(), i18n("Call to undefined function: %1.").arg(funcname), 5010);
return;
}
@ -231,7 +231,7 @@ void Executer::execFunction(TreeNode* node)
// check if number of parameters match
if ( callparams->size() != funcIds->size() )
{
emit ErrorMsg(node->getToken(), i18n("Call to function '%1' with wrong number of parameters.").tqarg(funcname), 5020);
emit ErrorMsg(node->getToken(), i18n("Call to function '%1' with wrong number of parameters.").arg(funcname), 5020);
return;
}
@ -274,7 +274,7 @@ void Executer::execRetFunction(TreeNode* node)
execFunction(node);
if (runStack.size() == 0)
{
emit ErrorMsg(node->getToken(), i18n("Function %1 did not return a value.").tqarg( node->getLook() ), 5030);
emit ErrorMsg(node->getToken(), i18n("Function %1 did not return a value.").arg( node->getLook() ), 5030);
return;
}
node->setValue( runStack.top() ); // set return val
@ -839,7 +839,7 @@ void Executer::execFontSize(TreeNode* node)
{
int x = ROUND2INT( param1->getValue().Number() ); // pull the number value & round it to int
if ( x < 0 || x > 350 )
emit ErrorMsg(node->getToken(), i18n("The parameters of function %1 must be within range: 0 to 350.").tqarg( node->getLook() ), 5065);
emit ErrorMsg(node->getToken(), i18n("The parameters of function %1 must be within range: 0 to 350.").arg( node->getLook() ), 5065);
else
emit FontSize(x);
}
@ -877,7 +877,7 @@ void Executer::execResizeCanvas(TreeNode* node)
int x = ROUND2INT( nodeX->getValue().Number() ); // converting & rounding to int
int y = ROUND2INT( nodeY->getValue().Number() );
if ( ( x < 1 || y < 1 ) || ( x > 10000 || y > 10000 ) )
emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 1 to 10000.").tqarg( node->getLook() ), 7030);
emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 1 to 10000.").arg( node->getLook() ), 7030);
else
emit ResizeCanvas(x, y);
}
@ -917,7 +917,7 @@ void Executer::execSetFgColor(TreeNode* node)
int g = ROUND2INT( nodeG->getValue().Number() );
int b = ROUND2INT( nodeB->getValue().Number() );
if ( ( r < 0 || g < 0 || b < 0 ) || ( r > 255 || g > 255 || b > 255 ) )
emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 0 to 255.").tqarg( node->getLook() ), 6090);
emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 0 to 255.").arg( node->getLook() ), 6090);
else
emit SetFgColor(r, g, b);
}
@ -938,7 +938,7 @@ void Executer::execSetBgColor(TreeNode* node)
int g = ROUND2INT( nodeG->getValue().Number() );
int b = ROUND2INT( nodeB->getValue().Number() );
if ( ( r < 0 || g < 0 || b < 0 ) || ( r > 255 || g > 255 || b > 255 ) )
emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 0 to 255.").tqarg( node->getLook() ), 6090);
emit ErrorMsg(node->getToken(), i18n("The parameters of the %1 command must be numbers in the range: 0 to 255.").arg( node->getLook() ), 6090);
else
emit SetBgColor(r, g, b);
}
@ -1056,7 +1056,7 @@ bool Executer::checkParameterQuantity(TreeNode* node, uint quantity, int errorCo
if (quantity == 0)
{
if (node->size() == 0) return true; // thats easy!
emit ErrorMsg(node->getToken(), i18n("The %1 command accepts no parameters.").tqarg( node->getLook() ), errorCode);
emit ErrorMsg(node->getToken(), i18n("The %1 command accepts no parameters.").arg( node->getLook() ), errorCode);
return false;
}
@ -1068,11 +1068,11 @@ bool Executer::checkParameterQuantity(TreeNode* node, uint quantity, int errorCo
{
if (nodeSize < quantity)
{
emit ErrorMsg(node->getToken(), i18n("The %1 command was called with %2 but needs 1 parameter.", "The %1 command was called with %2 but needs %n parameters.", quantity).tqarg( node->getLook() ).tqarg(nodeSize), errorCode);
emit ErrorMsg(node->getToken(), i18n("The %1 command was called with %2 but needs 1 parameter.", "The %1 command was called with %2 but needs %n parameters.", quantity).arg( node->getLook() ).arg(nodeSize), errorCode);
}
else
{
emit ErrorMsg(node->getToken(), i18n("The %1 command was called with %2 but only accepts 1 parameter.", "The %1 command was called with %2 but only accepts %n parameters.", quantity).tqarg( node->getLook() ).tqarg(nodeSize), errorCode);
emit ErrorMsg(node->getToken(), i18n("The %1 command was called with %2 but only accepts 1 parameter.", "The %1 command was called with %2 but only accepts %n parameters.", quantity).arg( node->getLook() ).arg(nodeSize), errorCode);
}
return false;
}
@ -1093,16 +1093,16 @@ bool Executer::checkParameterType(TreeNode* node, int valueType, int errorCode)
{
case stringValue:
if (quantity == 1)
emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts a string as its parameter.").tqarg( node->getLook() ), errorCode);
emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts a string as its parameter.").arg( node->getLook() ), errorCode);
else
emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts strings as its parameters.").tqarg( node->getLook() ), errorCode);
emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts strings as its parameters.").arg( node->getLook() ), errorCode);
break;
case numberValue:
if (quantity == 1)
emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts a number as its parameter.").tqarg( node->getLook() ), errorCode);
emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts a number as its parameter.").arg( node->getLook() ), errorCode);
else
emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts numbers as its parameters.").tqarg( node->getLook() ), errorCode);
emit ErrorMsg(node->getToken(), i18n("The %1 command only accepts numbers as its parameters.").arg( node->getLook() ), errorCode);
break;
}
return false;

36
kturtle/src/kturtle.cpp
Unescape View File

@ -221,7 +221,7 @@ void MainWindow::setupStatusBar()
// fill the statusbar
slotStatusBar(i18n("Welcome to KTurtle..."), IDS_STATUS); // the message part
slotStatusBar(i18n("Line: %1 Column: %2").tqarg(1).tqarg(1), IDS_LINECOLUMN);
slotStatusBar(i18n("Line: %1 Column: %2").arg(1).arg(1), IDS_LINECOLUMN);
slotStatusBar(i18n("INS"), IDS_INS);
}
@ -256,7 +256,7 @@ void MainWindow::slotCursorStatusBar()
uint cursorLine;
uint cursorCol;
dynamic_cast<KTextEditor::ViewCursorInterface*>(editor)->cursorPositionReal(&cursorLine, &cursorCol);
TQString linenumber = i18n(" Line: %1 Column: %2 ").tqarg(cursorLine + 1).tqarg(cursorCol + 1);
TQString linenumber = i18n(" Line: %1 Column: %2 ").arg(cursorLine + 1).arg(cursorCol + 1);
statusBar()->changeItem(linenumber, IDS_LINECOLUMN);
}
@ -330,7 +330,7 @@ void MainWindow::loadFile(const KURL &url)
file.close();
m_recentFiles->addURL(url);
setCaption( url.fileName() );
slotStatusBar(i18n("Opened file: %1").tqarg( url.fileName() ), IDS_STATUS);
slotStatusBar(i18n("Opened file: %1").arg( url.fileName() ), IDS_STATUS);
editor->document()->setModified(false);
CurrentFile = url;
return;
@ -338,7 +338,7 @@ void MainWindow::loadFile(const KURL &url)
else
{
KMessageBox::error( this,
i18n("KTurtle was unable to open: \n%1.").tqarg( url.prettyURL() ),
i18n("KTurtle was unable to open: \n%1.").arg( url.prettyURL() ),
i18n("Open Error") );
slotStatusBar(i18n("Opening aborted because of error."), IDS_STATUS);
return;
@ -367,7 +367,7 @@ void MainWindow::slotSaveAs()
{
int result = KMessageBox::warningContinueCancel ( this,
i18n("A program named \"%1\" already exists in this folder. "
"Do you want to overwrite it?").tqarg( url.fileName() ),
"Do you want to overwrite it?").arg( url.fileName() ),
i18n("Overwrite?"), i18n("&Overwrite") );
if (result != KMessageBox::Continue) return;
}
@ -384,7 +384,7 @@ void MainWindow::writeFile(const KURL &url)
editor->document()->saveAs(url); // use the KateParts method for saving
loadFile(url); // reload the file as utf8 otherwise display weird chars
setCaption( url.fileName() );
slotStatusBar(i18n("Saved to: %1").tqarg( url.fileName() ), IDS_STATUS);
slotStatusBar(i18n("Saved to: %1").arg( url.fileName() ), IDS_STATUS);
m_recentFiles->addURL(url);
editor->document()->setModified(false);
CurrentFile = url;
@ -405,7 +405,7 @@ void MainWindow::slotSaveCanvas()
{
int result = KMessageBox::warningContinueCancel( this,
i18n("A picture named \"%1\" already in this folder. "
"Do you want to overwrite it?").tqarg( url.fileName() ),
"Do you want to overwrite it?").arg( url.fileName() ),
i18n("Overwrite?"), i18n("&Overwrite") );
if (result != KMessageBox::Continue) return;
}
@ -428,12 +428,12 @@ void MainWindow::slotSaveCanvas()
{
kdWarning() << "KTurtle was unable to save the canvas drawing" << endl;
KMessageBox::error(this,
i18n("KTurtle was unable to save the image to: \n%1.").tqarg( url.prettyURL() ),
i18n("KTurtle was unable to save the image to: \n%1.").arg( url.prettyURL() ),
i18n("Unable to Save Image") );
slotStatusBar(i18n("Could not save image."), IDS_STATUS);
return;
}
slotStatusBar(i18n("Saved canvas to: %1").tqarg( url.fileName() ), IDS_STATUS);
slotStatusBar(i18n("Saved canvas to: %1").arg( url.fileName() ), IDS_STATUS);
}
@ -967,7 +967,7 @@ void MainWindow::slotUpdateSettings()
// TODO maybe this language name can be more pretty by not using ".left(2)", ie "American English" would than be possible... [if this is possible this should be fixed at more places.]
KConfig entry(locate("locale", "all_languages"));
entry.setGroup(Settings::logoLanguage().left(2));
slotStatusBar(i18n("Command language: %1").tqarg( entry.readEntry("Name") ), IDS_LANG);
slotStatusBar(i18n("Command language: %1").arg( entry.readEntry("Name") ), IDS_LANG);
delete translate; // to update the currently used language
translate = new Translate();
@ -979,7 +979,7 @@ void MainWindow::readConfig(KConfig *config)
m_recentFiles->loadEntries(config, "Recent Files");
KConfig entry(locate("locale", "all_languages"));
entry.setGroup(Settings::logoLanguage().left(2));
slotStatusBar(i18n("Command language: %1").tqarg( entry.readEntry("Name") ), IDS_LANG);
slotStatusBar(i18n("Command language: %1").arg( entry.readEntry("Name") ), IDS_LANG);
}
void MainWindow::slotSettingsHelp()
@ -1044,8 +1044,8 @@ void MainWindow::slotContextHelp()
TQString help2statusBar;
if ( helpKeyword.startsWith("<") ) help2statusBar = helpKeyword;
else help2statusBar = i18n("\"%1\"").tqarg(helpKeyword);
slotStatusBar(i18n("Displaying help on %1").tqarg(help2statusBar), IDS_STATUS);
else help2statusBar = i18n("\"%1\"").arg(helpKeyword);
slotStatusBar(i18n("Displaying help on %1").arg(help2statusBar), IDS_STATUS);
}
void MainWindow::slotContextHelpUpdate()
@ -1058,13 +1058,13 @@ void MainWindow::slotContextHelpUpdate()
if ( line.stripWhiteSpace().startsWith("#") )
{
helpKeyword = i18n("<comment>");
ContextHelp->setText( i18n("Help on: %1").tqarg(helpKeyword) );
ContextHelp->setText( i18n("Help on: %1").arg(helpKeyword) );
return;
}
if ( line.stripWhiteSpace().isEmpty() || line.mid(col-1,2).stripWhiteSpace().isEmpty() )
{
helpKeyword = i18n("<no keyword>");
ContextHelp->setText( i18n("Help on: %1").tqarg(helpKeyword) );
ContextHelp->setText( i18n("Help on: %1").arg(helpKeyword) );
return;
}
@ -1082,7 +1082,7 @@ void MainWindow::slotContextHelpUpdate()
if ( col >= (uint)start && col < (uint)(start+length) )
{
helpKeyword = i18n("<string>");
ContextHelp->setText( i18n("Help on: %1").tqarg(helpKeyword) );
ContextHelp->setText( i18n("Help on: %1").arg(helpKeyword) );
return;
}
pos += (length <= 0 ? 1 : length);
@ -1125,7 +1125,7 @@ void MainWindow::slotContextHelpUpdate()
else helpKeyword = i18n("<name>");
ContextHelp->setText( i18n("Help on: %1").tqarg(helpKeyword) );
ContextHelp->setText( i18n("Help on: %1").arg(helpKeyword) );
return;
}
pos += (length <= 0 ? 1 : length); // the pos had to be increased with at least one
@ -1133,7 +1133,7 @@ void MainWindow::slotContextHelpUpdate()
// we allready cached some in the beginning of this method; yet its still needed as fall-through
helpKeyword = i18n("<no keyword>");
ContextHelp->setText( i18n("Help on: %1").tqarg(helpKeyword) );
ContextHelp->setText( i18n("Help on: %1").arg(helpKeyword) );
}
// END

20
kturtle/src/parser.cpp
Unescape View File

@ -94,7 +94,7 @@ void Parser::matchToken(int expectedToken)
switch (expectedToken)
{
case tokEOL:
Error(currentToken, i18n("Unexpected intruction after the '%1' command, please use only one instruction per line").tqarg(preservedToken.look), 1010);
Error(currentToken, i18n("Unexpected intruction after the '%1' command, please use only one instruction per line").arg(preservedToken.look), 1010);
break;
case tokBegin:
@ -102,23 +102,23 @@ void Parser::matchToken(int expectedToken)
break;
case tokTo:
Error(currentToken, i18n("Expected 'to' after the '%1' command").tqarg(preservedToken.look), 1010);
Error(currentToken, i18n("Expected 'to' after the '%1' command").arg(preservedToken.look), 1010);
break;
case tokAssign:
Error(currentToken, i18n("Expected '=' after the '%1' command").tqarg(preservedToken.look), 1010);
Error(currentToken, i18n("Expected '=' after the '%1' command").arg(preservedToken.look), 1010);
break;
case tokEnd:
Error(currentToken, i18n("Expected ']' after the '%1' command").tqarg(preservedToken.look), 1010);
Error(currentToken, i18n("Expected ']' after the '%1' command").arg(preservedToken.look), 1010);
break;
case tokUnknown:
Error(preservedToken, i18n("Expected a name after the '%1' command").tqarg(preservedToken.look), 1010);
Error(preservedToken, i18n("Expected a name after the '%1' command").arg(preservedToken.look), 1010);
break;
default:
Error(currentToken, i18n("UNDEFINED ERROR NR %1: please send this Logo script to the KTurtle developers").tqarg(expectedToken), 1010);
Error(currentToken, i18n("UNDEFINED ERROR NR %1: please send this Logo script to the KTurtle developers").arg(expectedToken), 1010);
break;
}
}
@ -241,12 +241,12 @@ TreeNode* Parser::Factor()
TQString s = currentToken.look;
if ( s.isEmpty() || currentToken.type == tokEOF )
{
Error(currentToken, i18n("INTERNAL ERROR NR %1: please sent this Logo script to KTurtle developers").tqarg(1), 1020);
Error(currentToken, i18n("INTERNAL ERROR NR %1: please sent this Logo script to KTurtle developers").arg(1), 1020);
// if this error occurs the see the Parser::Repeat for the good solution using 'preservedToken'
}
else
{
Error(currentToken, i18n("Cannot understand '%1', expected an expression after the '%2' command").tqarg(s).tqarg(preservedToken.look), 1020);
Error(currentToken, i18n("Cannot understand '%1', expected an expression after the '%2' command").arg(s).arg(preservedToken.look), 1020);
}
node = new TreeNode(currentToken, Unknown);
getToken();
@ -538,7 +538,7 @@ TreeNode* Parser::Statement()
}
if (currentToken.type != tokEnd)
{
Error(currentToken, i18n("Cannot understand '%1'").tqarg(currentToken.look), 1060);
Error(currentToken, i18n("Cannot understand '%1'").arg(currentToken.look), 1060);
}
getToken();
@ -1065,7 +1065,7 @@ TreeNode* Parser::Other()
return node;
}
Error(rememberedToken, i18n("'%1' is neither a Logo command nor a learned command.").tqarg(rememberedToken.look), 1020);
Error(rememberedToken, i18n("'%1' is neither a Logo command nor a learned command.").arg(rememberedToken.look), 1020);
TreeNode* errNode = new TreeNode(rememberedToken, Unknown);
// skip the rest of the line

2
kturtle/src/translate.cpp
Unescape View File

@ -38,7 +38,7 @@ TQString Translate::name2fuzzy(const TQString &name)
{
if ( !aliasMap[name].isEmpty() ) // translate the alias if any
{
return TQString( i18n("'%1' (%2)").tqarg(keyMap[name]).tqarg(reverseAliasMap[name]) );
return TQString( i18n("'%1' (%2)").arg(keyMap[name]).arg(reverseAliasMap[name]) );
}
return TQString( "'" + keyMap[name] + "'");
}

2
kturtle/src/treenode.cpp
Unescape View File

@ -248,7 +248,7 @@ void TreeNode::destroy(TreeNode* node)
for ( TreeNode::iterator i = node->begin(); i != node->end(); ++i )
{
destroy(*i);
(*i)->clear(); //free tqchildren
(*i)->clear(); //free children
//delete ( *i ); //free mem
}
}

2
kverbos/kverbos/kverbos.h
Unescape View File

@ -79,7 +79,7 @@ class KVerbosApp : public KMainWindow
bool doitStrict() const { return correctStrict; }
protected:
/** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
/** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
* file
*/
void saveOptions();

2
kverbos/kverbos/kverbosdoc.cpp
Unescape View File

@ -92,7 +92,7 @@ void KVerbosDoc::slotUpdateAllViews(KVerbosView *sender)
if(pViewList)
for(w=pViewList->first(); w!=0; w=pViewList->next())
if(w!=sender)
w->tqrepaint();
w->repaint();
}
bool KVerbosDoc::saveModified()

2
kverbos/kverbos/kverbosdoc.h
Unescape View File

@ -141,7 +141,7 @@ class KVerbosDoc : public TQObject
public slots:
/**
* calls tqrepaint() on all views connected to the document object and is called by the view by which the document has been changed.
* calls repaint() on all views connected to the document object and is called by the view by which the document has been changed.
* As this view normally repaints itself, it is excluded from the paintEvent.
*/
void slotUpdateAllViews(KVerbosView *sender);

8
kverbos/kverbos/qerfassen.ui
Unescape View File

@ -65,7 +65,7 @@ und in die Liste aufgenommen wird.
<property name="text">
<string>Verb:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="hAlign" stdset="0">
@ -83,7 +83,7 @@ und in die Liste aufgenommen wird.
<property name="text">
<string>In the foreign language:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -240,7 +240,7 @@ und in die Liste aufgenommen wird.
<property name="text">
<string>gerundio:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -258,7 +258,7 @@ und in die Liste aufgenommen wird.
<property name="text">
<string>participio:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">

6
kverbos/kverbos/qlernen.ui
Unescape View File

@ -63,7 +63,7 @@ The user learns with this GUI.</comment>
<property name="text">
<string>Verb:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -98,7 +98,7 @@ The user learns with this GUI.</comment>
<property name="text">
<string>In the foreign language:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -650,7 +650,7 @@ The user learns with this GUI.</comment>
<property name="text">
<string>Result:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">

4
kverbos/kverbos/qresult.ui
Unescape View File

@ -92,7 +92,7 @@
<property name="text">
<string>User:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -129,7 +129,7 @@
<property name="text">
<string>Number of training sessions:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">

6
kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
Unescape View File

@ -251,7 +251,7 @@ void BlockOptions::checkValidity()
if (!found)
message.append(i18n("Illogical blocking times.\n"));
found = true;
message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").tqarg(i).tqarg(i + 1));
message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").arg(i).arg(i + 1));
}
}
}
@ -270,7 +270,7 @@ void BlockOptions::checkValidity()
if (!found)
message.append(i18n("\nIllogical expiration times.\n"));
found = true;
message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").tqarg(i).tqarg(i + 1));
message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").arg(i).arg(i + 1));
}
}
}
@ -290,7 +290,7 @@ void BlockOptions::checkValidity()
if (!found)
message.append(i18n("\nIllogical blocking vs. expiration times.\n"));
found = true;
message.append(i18n("The blocking time at level %1 should be lower than the expiration time.\n").tqarg(i + 1));
message.append(i18n("The blocking time at level %1 should be lower than the expiration time.\n").arg(i + 1));
}
}
}

2
kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
Unescape View File

@ -440,7 +440,7 @@
<property name="frameShadow">
<enum>Sunken</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop|AlignLeft</set>
</property>
<property name="vAlign" stdset="0">

8
kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
Unescape View File

@ -105,7 +105,7 @@ EntryDlg::EntryDlg(
topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
comm_page = new CommonEntryPage (this, doc, multi_sel, expr, lesson, lessonbox,
lang, type, pronunce, usagelabel,
i18n("Original &expression in %1:").tqarg(s), querymanager, active,
i18n("Original &expression in %1:").arg(s), querymanager, active,
ipafont, page, name);
topLayout->addWidget(comm_page);
@ -135,7 +135,7 @@ EntryDlg::EntryDlg(
topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
comm_page = new CommonEntryPage (this, doc, multi_sel, expr, lesson, lessonbox,
lang, type, pronunce, usagelabel,
i18n("Translated &expression in %1:").tqarg(s), querymanager, active,
i18n("Translated &expression in %1:").arg(s), querymanager, active,
ipafont, page, name);
topLayout->addWidget(comm_page);
@ -246,10 +246,10 @@ void EntryDlg::setData(
if (origin)
comm_page->setData(multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel,
i18n("Original &expression in %1:").tqarg(s), querymanager, active);
i18n("Original &expression in %1:").arg(s), querymanager, active);
else
comm_page->setData(multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel,
i18n("Translated &expression in %1:").tqarg(s), querymanager, active);
i18n("Translated &expression in %1:").arg(s), querymanager, active);
adj_page->setData(multi_sel, comp);
aux_page->setData(multi_sel, synonym, antonym, example, rem, paraphrase);

2
kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
Unescape View File

@ -48,7 +48,7 @@ TQString MySpinBox::mapValueToText( int value )
if (spin_names != 0)
return (*spin_names)[value];
else
return TQString("%1").tqarg(value);
return TQString("%1").arg(value);
}

26
kvoctrain/kvoctrain/kva_header.cpp
Unescape View File

@ -134,11 +134,11 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
if((j = langset.indexShortId(doc->getIdent(i))) >= 0
&& !langset.PixMapFile(j).isEmpty()
&& !langset.longId(j).isEmpty() ) {
query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(names[i-1]),
query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
(i << (16+8)) | IDH_START_TQUERY); // hack: IDs => header-ids + cmd
}
else {
query_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) | IDH_START_TQUERY);
query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_TQUERY);
}
}
header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
@ -150,11 +150,11 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
if((j = langset.indexShortId(doc->getIdent(i))) >= 0
&& !langset.PixMapFile(j).isEmpty()
&& !langset.longId(j).isEmpty() ) {
multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(names[i-1]),
multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
(i << (16+8)) | IDH_START_MULTIPLE); // hack: IDs => header-ids + cmd
}
else {
multiple_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) | IDH_START_MULTIPLE);
multiple_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_MULTIPLE);
}
}
header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), multiple_m, (4 << 16) | IDH_NULL);
@ -262,11 +262,11 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
TQString msg;
if (header1 == 0) {
TQString format = i18n("Sets %1 as language for original");
msg = format.tqarg(from);
msg = format.arg(from);
}
else {
TQString format = i18n("Sets %1 as language for translation %2");
msg = format.tqarg(from).tqarg(header1);
msg = format.arg(from).arg(header1);
}
slotStatusHelpMsg(msg);
}
@ -282,7 +282,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
else if (header1 < (int) langset.size() ) {
TQString from = langset.longId(header1);
TQString format = i18n("Appends %1 as new language");
msg = format.tqarg(from);
msg = format.arg(from);
slotStatusHelpMsg(msg);
}
}
@ -294,7 +294,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
from = langset.findLongId(from);
TQString msg;
TQString format = i18n("Removes %1 irrevocably from dictionary");
msg = format.tqarg(from);
msg = format.arg(from);
slotStatusHelpMsg(msg);
}
break;
@ -317,14 +317,14 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
format = i18n("Creates and starts query to %1");
else
format = i18n("Creates and starts multiple choice to %1");
msg = format.tqarg(to);
msg = format.arg(to);
}
else {
if (cmd == IDH_START_TQUERY)
format = i18n("Creates and starts query from %1 to %2");
else
format = i18n("Creates and starts multiple choice from %1 to %2");
msg = format.tqarg(from).tqarg(to);
msg = format.arg(from).arg(to);
}
slotStatusHelpMsg(msg);
@ -376,7 +376,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
if (!langset.findLongId(from).isEmpty())
from = langset.findLongId(from);
TQString format = i18n("Resets all properties for %1");
TQString msg = format.tqarg(from);
TQString msg = format.arg(from);
slotStatusHelpMsg(msg);
}
break;
@ -443,7 +443,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
TQString format = i18n("You are about to delete a language completely.\n"
"Do you really want to delete \"%1\"?");
msg = format.tqarg(name);
msg = format.arg(name);
int exit = KMessageBox::warningContinueCancel(this, msg,
kapp->makeStdCaption(""),KStdGuiItem::del());
@ -548,7 +548,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
"lesson.\n\nDo you really want to reset \"%1\"?");
}
msg = format.tqarg(name);
msg = format.arg(name);
int exit = KMessageBox::warningContinueCancel(this, msg,
kapp->makeStdCaption(""),i18n("Reset"));

16
kvoctrain/kvoctrain/kva_io.cpp
Unescape View File

@ -198,7 +198,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent)
doc = 0;
TQString format = i18n("Loading %1");
TQString msg = format.tqarg(url.path());
TQString msg = format.arg(url.path());
slotStatusMsg(msg);
prepareProgressBar();
@ -249,7 +249,7 @@ void kvoctrainApp::slotFileMerge()
if (!url.isEmpty() ) {
TQString format = i18n("Loading %1");
TQString msg = format.tqarg(url.path());
TQString msg = format.arg(url.path());
slotStatusMsg(msg);
prepareProgressBar();
@ -274,7 +274,7 @@ void kvoctrainApp::slotFileMerge()
vector<TQString> new_usages = new_doc->getUsageDescr();
format = i18n("Merging %1");
msg = format.tqarg(url.path());
msg = format.arg(url.path());
slotStatusMsg(msg);
TQApplication::setOverrideCursor( waitCursor );
@ -500,7 +500,7 @@ void kvoctrainApp::slotFileSave()
}
TQString format = i18n("Saving %1");
TQString msg = format.tqarg(doc->URL().path());
TQString msg = format.arg(doc->URL().path());
slotStatusMsg(msg);
// remove previous backup
@ -598,7 +598,7 @@ void kvoctrainApp::slotFileSaveAs()
TQFileInfo fileinfo(url.path());
if (fileinfo.exists() && KMessageBox::warningContinueCancel(0,
i18n("<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite it?</qt>")
.tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
.arg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
{
// do nothing
}
@ -606,7 +606,7 @@ void kvoctrainApp::slotFileSaveAs()
if (doc) {
TQString format = i18n("Saving %1");
TQString msg = format.tqarg(url.path());
TQString msg = format.arg(url.path());
slotStatusMsg(msg);
TQFile::remove(TQFile::encodeName(url.path()+"~")); // remove previous backup
@ -651,14 +651,14 @@ void kvoctrainApp::slotSaveSelection ()
TQFileInfo fileinfo(url.path());
if (fileinfo.exists() && KMessageBox::warningContinueCancel(0,
i18n("<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite it?</qt>")
.tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
.arg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
{
// do nothing
}
else
{
TQString format = i18n("Saving %1");
TQString msg = format.tqarg(url.path());
TQString msg = format.arg(url.path());
slotStatusMsg(msg);
TQFile::remove(url.path()+"~"); // remove previous backup

16
kvoctrain/kvoctrain/kvoctrain.cpp
Unescape View File

@ -96,13 +96,13 @@ void kvoctrainApp::slotCurrentCellChanged(int row, int col)
if (rem_label != 0)
rem_label->setText(i18n("Abbreviation for R)emark","R: %1")
.tqarg(noData ? TQString() : expr->getRemark(col)));
.arg(noData ? TQString() : expr->getRemark(col)));
if (pron_label != 0)
pron_label->setText(i18n("Abbreviation for P)ronouncation","P: %1")
.tqarg(noData ? TQString() : expr->getPronunce(col)));
.arg(noData ? TQString() : expr->getPronunce(col)));
if (type_label != 0)
type_label->setText(i18n("Abbreviation for T)ype of word", "T: %1")
.tqarg(noData ? TQString() : QueryManager::typeStr(expr->getType(col))));
.arg(noData ? TQString() : QueryManager::typeStr(expr->getType(col))));
if (entryDlg != 0) {
if (noData)
@ -1140,11 +1140,11 @@ void kvoctrainApp::aboutToShowLearn()
if((j = langset.indexShortId(doc->getIdent(i))) >= 0
&& !langset.PixMapFile(j).isEmpty()
&& !langset.longId(j).isEmpty() ) {
query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(main_names[i]),
query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]),
(i << (16+8)) | IDH_START_TQUERY); // hack: IDs => header-ids + cmd
}
else {
query_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) | IDH_START_TQUERY);
query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_TQUERY);
}
}
@ -1158,11 +1158,11 @@ void kvoctrainApp::aboutToShowLearn()
if((j = langset.indexShortId(doc->getIdent(i))) >= 0
&& !langset.PixMapFile(j).isEmpty()
&& !langset.longId(j).isEmpty() ) {
multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(main_names[i]),
multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]),
(i << (16+8)) | IDH_START_MULTIPLE); // hack: IDs => header-ids + cmd
}
else {
multiple_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) | IDH_START_MULTIPLE);
multiple_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) | IDH_START_MULTIPLE);
}
}
header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), multiple_m, (4 << 16) | IDH_NULL);
@ -1272,7 +1272,7 @@ void kvoctrainApp::aboutToShowVocabSetLanguage()
if (doc->numLangs() <= 2)
set_m->insertItem(i18n("&Translation"), langs_m, (2 << 16) | IDH_NULL);
else
set_m->insertItem(i18n("&%1. Translation").tqarg(header), langs_m, (2 << 16) | IDH_NULL);
set_m->insertItem(i18n("&%1. Translation").arg(header), langs_m, (2 << 16) | IDH_NULL);
}
}
}

2
kvoctrain/kvoctrain/kvoctrainview.cpp
Unescape View File

@ -369,7 +369,7 @@ void kvoctrainView::newPage(TQPainter & painter, int res, int startCol, int endC
TQRect w = painter.window();
painter.resetXForm();
painter.setFont(KGlobalSettings::generalFont());
painter.drawText(marg, marg - 20, i18n("KVocTrain - %1").tqarg(m_doc->getTitle()));
painter.drawText(marg, marg - 20, i18n("KVocTrain - %1").arg(m_doc->getTitle()));
painter.translate(marg, marg);
painter.drawLine(-1 , 0, -1, hh - 1);
for (int i = startCol; i <= endCol && i < m_table->numCols(); ++i)

8
kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
Unescape View File

@ -106,7 +106,7 @@ bool kvoctrainDoc::saveToCsv (TQTextStream& os, TQString &)
}
setModified (false);
return os.tqdevice()->status() == IO_Ok;
return os.device()->status() == IO_Ok;
}
@ -125,7 +125,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
is.setCodec(TQTextCodec::codecForName("ISO 8859-1"));
is.setEncoding(TQTextStream::Latin1);
int size = is.tqdevice()->size ();
int size = is.device()->size ();
int ln = size / 20 / 100; // assume each line about 20 chars
float f_ent_percent = size / 100.0;
emit progressChanged (this, 0);
@ -190,7 +190,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
ln--;
if (ln <= 0) {
ln = size / 20 / 100; // assume each line about 20 chars
emit progressChanged(this, is.tqdevice()->at() / (int) f_ent_percent);
emit progressChanged(this, is.device()->at() / (int) f_ent_percent);
}
// similar in kva_clip.cpp::slotEditPaste()
@ -228,7 +228,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
}
}
setModified (false);
return is.tqdevice()->status() == IO_Ok;
return is.device()->status() == IO_Ok;
}

12
kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
Unescape View File

@ -116,7 +116,7 @@ bool kvoctrainDoc::saveTypeNameLex (TQTextStream &os)
while (i++ < LEX_MAX_ATTR)
os << "|\n";
return os.tqdevice()->status() == IO_Ok;
return os.device()->status() == IO_Ok;
}
@ -139,7 +139,7 @@ bool kvoctrainDoc::loadTypeNameLex (TQTextStream &is)
type_descr.push_back (attr);
}
return is.tqdevice()->status() == IO_Ok;
return is.device()->status() == IO_Ok;
}
@ -152,7 +152,7 @@ bool kvoctrainDoc::saveLessonLex (TQTextStream &os)
while (i++ < LEX_MAX_LESSON)
os << "|\n";
return os.tqdevice()->status() == IO_Ok;
return os.device()->status() == IO_Ok;
}
@ -172,7 +172,7 @@ bool kvoctrainDoc::loadLessonLex (TQTextStream &is)
lesson_descr.push_back (lesson);
}
return is.tqdevice()->status() == IO_Ok;
return is.device()->status() == IO_Ok;
}
@ -234,7 +234,7 @@ bool kvoctrainDoc::saveToLex (TQTextStream& os, TQString & /*title*/)
}
setModified (false);
return os.tqdevice()->status() == IO_Ok;
return os.device()->status() == IO_Ok;
}
@ -380,7 +380,7 @@ bool kvoctrainDoc::loadFromLex (TQTextStream& is)
}
setModified (false);
return is.tqdevice()->status() == IO_Ok;
return is.device()->status() == IO_Ok;
}

62
kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
Unescape View File

@ -83,7 +83,7 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml)
if (elem.tag () == KV_TYPE_GRP) {
if (! elem.isEndTag ()) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_TYPE_GRP));
i18n("expected ending tag <%1>").arg(KV_TYPE_GRP));
return false;
}
else
@ -109,14 +109,14 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml)
}
else if (elem.tag() != KV_TYPE_DESC || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_TYPE_DESC));
i18n("expected ending tag <%1>").arg(KV_TYPE_DESC));
return false;
}
}
else {
if (elem.tag() != KV_TYPE_DESC || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_TYPE_DESC));
i18n("expected ending tag <%1>").arg(KV_TYPE_DESC));
return false;
}
@ -127,7 +127,7 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml)
else {
if (elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
return false;
}
else {
@ -157,7 +157,7 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml)
if (elem.tag () == KV_TENSE_GRP) {
if (! elem.isEndTag ()) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_TENSE_GRP));
i18n("expected ending tag <%1>").arg(KV_TENSE_GRP));
return false;
}
else
@ -183,14 +183,14 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml)
}
else if (elem.tag() != KV_TENSE_DESC || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_TENSE_DESC));
i18n("expected ending tag <%1>").arg(KV_TENSE_DESC));
return false;
}
}
else {
if (elem.tag() != KV_TENSE_DESC || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_TENSE_DESC));
i18n("expected ending tag <%1>").arg(KV_TENSE_DESC));
return false;
}
@ -201,7 +201,7 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml)
else {
if (elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
return false;
}
else {
@ -231,7 +231,7 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml)
if (elem.tag () == KV_USAGE_GRP) {
if (! elem.isEndTag ()) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_USAGE_GRP));
i18n("expected ending tag <%1>").arg(KV_USAGE_GRP));
return false;
}
else
@ -257,14 +257,14 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml)
}
else if (elem.tag() != KV_USAGE_DESC || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_USAGE_DESC));
i18n("expected ending tag <%1>").arg(KV_USAGE_DESC));
return false;
}
}
else {
if (elem.tag() != KV_USAGE_DESC || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_USAGE_DESC));
i18n("expected ending tag <%1>").arg(KV_USAGE_DESC));
return false;
}
@ -275,7 +275,7 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml)
else {
if (elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
return false;
}
else {
@ -553,7 +553,7 @@ bool kvoctrainDoc::loadComparison (Comparison &comp, XmlElement elem,
if (elem.tag () == KV_COMPARISON_GRP) {
if (! elem.isEndTag ()) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(elem.tag()));
i18n("expected ending tag <%1>").arg(elem.tag()));
return false;
}
else
@ -582,7 +582,7 @@ bool kvoctrainDoc::loadComparison (Comparison &comp, XmlElement elem,
else {
if (elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("unexpected ending tag <%1>").tqarg(elem.tag()));
i18n("unexpected ending tag <%1>").arg(elem.tag()));
return false;
}
else {
@ -620,7 +620,7 @@ bool kvoctrainDoc::loadMultipleChoice (MultipleChoice &mc, XmlElement elem,
if (elem.tag () == KV_MULTIPLECHOICE_GRP) {
if (! elem.isEndTag ()) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(elem.tag()));
i18n("expected ending tag <%1>").arg(elem.tag()));
return false;
}
else
@ -661,7 +661,7 @@ bool kvoctrainDoc::loadMultipleChoice (MultipleChoice &mc, XmlElement elem,
else {
if (elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("unexpected ending tag <%1>").tqarg(elem.tag()));
i18n("unexpected ending tag <%1>").arg(elem.tag()));
return false;
}
else {
@ -702,7 +702,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
if (elem.tag () == KV_DOCTYPE) {
if (! elem.isEndTag ()) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(elem.tag()));
i18n("expected ending tag <%1>").arg(elem.tag()));
return false;
}
else
@ -712,7 +712,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_LESS_GRP && !elem.isEndTag() ) {
if (lessgroup) {
errorKvtMl (xml.lineNumber(),
i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
return false;
}
lessgroup = true;
@ -723,7 +723,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_ARTICLE_GRP && !elem.isEndTag() ) {
if (articlegroup) {
errorKvtMl (xml.lineNumber(),
i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
return false;
}
articlegroup = true;
@ -734,7 +734,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_CONJUG_GRP && !elem.isEndTag() ) {
if (conjuggroup) {
errorKvtMl (xml.lineNumber(),
i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
return false;
}
conjuggroup = true;
@ -745,7 +745,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_OPTION_GRP && !elem.isEndTag() ) {
if (optgroup) {
errorKvtMl (xml.lineNumber(),
i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
return false;
}
optgroup = true;
@ -756,7 +756,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_TYPE_GRP && !elem.isEndTag() ) {
if (attrgroup) {
errorKvtMl (xml.lineNumber(),
i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
return false;
}
attrgroup = true;
@ -767,7 +767,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_TENSE_GRP && !elem.isEndTag() ) {
if (tensegroup) {
errorKvtMl (xml.lineNumber(),
i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
return false;
}
tensegroup = true;
@ -779,7 +779,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_USAGE_GRP && !elem.isEndTag() ) {
if (usagegroup) {
errorKvtMl (xml.lineNumber(),
i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
return false;
}
usagegroup = true;
@ -801,7 +801,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
else {
if (elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
return false;
}
else {
@ -824,7 +824,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name,
unknown_attr = true;
TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line);
TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
TQString format = i18n(
"Your document contains an unknown attribute <%1> " // keep trailing space
@ -834,7 +834,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name,
"If you proceed and save afterwards you are likely to lose data;\n"
"do you want to proceed anyway?\n"
);
TQString msg = format.tqarg(attr).tqarg(name);
TQString msg = format.arg(attr).arg(name);
TQApplication::setOverrideCursor( arrowCursor, true );
TQString s = kapp->makeStdCaption(i18n("Unknown attribute"));
@ -848,7 +848,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem )
{
unknown_elem = true;
TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line);
TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
TQString format = i18n(
"Your document contains an unknown tag <%1>. " // keep trailing space
@ -857,7 +857,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem )
"Loading is aborted because KVocTrain cannot "
"read documents with unknown elements.\n"
);
TQString msg = format.tqarg(elem);
TQString msg = format.arg(elem);
TQApplication::setOverrideCursor( arrowCursor, true );
TQString s = kapp->makeStdCaption(i18n("Unknown element"));
KMessageBox::sorry(0, ln+msg, s);
@ -869,7 +869,7 @@ void kvoctrainDoc::errorKvtMl (int line, const TQString &text )
{
TQApplication::setOverrideCursor( arrowCursor, true );
TQString s = kapp->makeStdCaption(i18n("Error"));
TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line);
TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
TQString msg = text;
KMessageBox::error(0, ln+msg, s);
@ -881,7 +881,7 @@ void kvoctrainDoc::warningKvtMl (int line, const TQString &text )
{
TQApplication::setOverrideCursor( arrowCursor, true );
TQString s = kapp->makeStdCaption(i18n("Warning"));
TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line);
TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
TQString msg = text;
KMessageBox::information(0, ln+msg, s);
TQApplication::restoreOverrideCursor();

18
kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
Unescape View File

@ -85,7 +85,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
if (elem.tag() == KV_EXPR && !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(elem.tag()));
i18n("disallowed occurrence of tag <%1>").arg(elem.tag()));
return false;
}
@ -100,7 +100,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
if (elem.tag() == KV_ORG && !elem.isEndTag() ) {
if (org_found) {
errorKvtMl (xml.lineNumber(),
i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
return false;
}
org_found = true;
@ -204,14 +204,14 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
if (elem.tag() != KV_ORG || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_ORG));
i18n("expected ending tag <%1>").arg(KV_ORG));
return false;
}
}
else {
if (elem.tag() != KV_ORG || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_ORG));
i18n("expected ending tag <%1>").arg(KV_ORG));
return false;
}
textstr = "";
@ -259,7 +259,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
else if (elem.tag() == KV_TRANS && !elem.isEndTag() ) {
if (!org_found) { // must be preceded by "original"
errorKvtMl (xml.lineNumber(),
i18n("starting tag <%1> is missing").tqarg(KV_ORG));
i18n("starting tag <%1> is missing").arg(KV_ORG));
return false;
}
@ -366,7 +366,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
if (elem.tag() != KV_TRANS || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_TRANS));
i18n("expected ending tag <%1>").arg(KV_TRANS));
return false;
}
// expr ...
@ -374,7 +374,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
else {
if (elem.tag() != KV_TRANS || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_TRANS));
i18n("expected ending tag <%1>").arg(KV_TRANS));
return false;
}
textstr = "";
@ -384,7 +384,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
if (!org_found) {
errorKvtMl (xml.lineNumber(),
i18n("starting tag <%1> is missing").tqarg(KV_ORG));
i18n("starting tag <%1> is missing").arg(KV_ORG));
return false;
}
/*
@ -440,7 +440,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
else {
if (elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
return false;
}
else {

68
kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
Unescape View File

@ -61,7 +61,7 @@ bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is)
if (elem.tag () != KV_DOCTYPE) {
errorKvtMl (xml.lineNumber(),
i18n("Tag <%1> was expected "
"but tag <%2> was read." ).tqarg(KV_DOCTYPE).tqarg(elem.tag()));
"but tag <%2> was read." ).arg(KV_DOCTYPE).arg(elem.tag()));
return false;
}
@ -84,7 +84,7 @@ bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is)
is.setEncoding(TQTextStream::Latin1);
TQString format = i18n("Unknown document encoding \"%1\" was encountered.\n\n"
"It will be ignored. Encoding is now \"%2\".");
TQString msg =format.tqarg((*first).stringValue ().upper()).tqarg("ISO 8859-1");
TQString msg =format.arg((*first).stringValue ().upper()).arg("ISO 8859-1");
warningKvtMl (xml.lineNumber(), msg);
}
@ -190,13 +190,13 @@ bool kvoctrainDoc::extract_simple_tag (TQString tag_name,
return false;
}
else if (elem.tag() != tag_name || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").tqarg(tag_name));
errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").arg(tag_name));
return false;
}
}
else {
if (elem.tag() != tag_name || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").tqarg(tag_name));
errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").arg(tag_name));
return false;
}
data = "";
@ -268,12 +268,12 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
if (elem.tag () == KV_ARTICLE_GRP) {
if (inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_ARTICLE_GRP));
i18n("disallowed occurrence of tag <%1>").arg(KV_ARTICLE_GRP));
return false;
}
if (! elem.isEndTag ()) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_ARTICLE_GRP));
i18n("expected ending tag <%1>").arg(KV_ARTICLE_GRP));
return false;
}
else
@ -283,7 +283,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
if (! elem.isEndTag ()) {
if (inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_ENTRY));
i18n("disallowed occurrence of tag <%1>").arg(KV_ART_ENTRY));
return false;
}
inEntry = true;
@ -321,7 +321,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_ART_FD && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_FD));
i18n("disallowed occurrence of tag <%1>").arg(KV_ART_FD));
return false;
}
if (!extract_simple_tag (KV_ART_FD, xml, elem, fem_def))
@ -330,7 +330,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_ART_FI && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_FI));
i18n("disallowed occurrence of tag <%1>").arg(KV_ART_FI));
return false;
}
if (!extract_simple_tag (KV_ART_FI, xml, elem, fem_indef))
@ -339,7 +339,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_ART_MD && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_MD));
i18n("disallowed occurrence of tag <%1>").arg(KV_ART_MD));
return false;
}
if (!extract_simple_tag (KV_ART_MD, xml, elem, mal_def))
@ -348,7 +348,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_ART_MI && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_MI));
i18n("disallowed occurrence of tag <%1>").arg(KV_ART_MI));
return false;
}
if (!extract_simple_tag (KV_ART_MI, xml, elem, mal_indef))
@ -357,7 +357,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_ART_ND && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_ND));
i18n("disallowed occurrence of tag <%1>").arg(KV_ART_ND));
return false;
}
if (!extract_simple_tag (KV_ART_ND, xml, elem, nat_def))
@ -366,7 +366,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
else if (elem.tag () == KV_ART_NI && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_NI));
i18n("disallowed occurrence of tag <%1>").arg(KV_ART_NI));
return false;
}
if (!extract_simple_tag (KV_ART_NI, xml, elem, nat_indef))
@ -375,7 +375,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
else {
if (elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
return false;
}
else {
@ -502,12 +502,12 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
if (elem.tag () == KV_CONJUG_GRP) {
if (inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_CONJUG_GRP));
i18n("disallowed occurrence of tag <%1>").arg(KV_CONJUG_GRP));
return false;
}
if (! elem.isEndTag ()) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(elem.tag()));
i18n("expected ending tag <%1>").arg(elem.tag()));
return false;
}
else
@ -517,7 +517,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
if (! elem.isEndTag ()) {
if (inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(entry_tag));
i18n("disallowed occurrence of tag <%1>").arg(entry_tag));
return false;
}
inEntry = true;
@ -595,7 +595,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
else if (elem.tag () == KV_CON_P1S && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P1S));
i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P1S));
return false;
}
if (!extract_simple_tag (KV_CON_P1S, xml, elem, pers1_sing) )
@ -604,7 +604,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
else if (elem.tag () == KV_CON_P2S && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P2S));
i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P2S));
return false;
}
if (!extract_simple_tag (KV_CON_P2S, xml, elem, pers2_sing))
@ -613,7 +613,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
else if (elem.tag () == KV_CON_P3SF && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3SF));
i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3SF));
return false;
}
@ -627,7 +627,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
else if (elem.tag () == KV_CON_P3SM && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3SM));
i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3SM));
return false;
}
if (!extract_simple_tag (KV_CON_P3SM, xml, elem, pers3_m_sing))
@ -636,7 +636,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
else if (elem.tag () == KV_CON_P3SN && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3SN));
i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3SN));
return false;
}
if (!extract_simple_tag (KV_CON_P3SN, xml, elem, pers3_n_sing))
@ -645,7 +645,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
else if (elem.tag () == KV_CON_P1P && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P1P));
i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P1P));
return false;
}
if (!extract_simple_tag (KV_CON_P1P, xml, elem, pers1_plur) )
@ -654,7 +654,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
else if (elem.tag () == KV_CON_P2P && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P2P));
i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P2P));
return false;
}
if (!extract_simple_tag (KV_CON_P2P, xml, elem, pers2_plur))
@ -663,7 +663,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
else if (elem.tag () == KV_CON_P3PF && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3PF));
i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3PF));
return false;
}
@ -677,7 +677,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
else if (elem.tag () == KV_CON_P3PM && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3PM));
i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3PM));
return false;
}
if (!extract_simple_tag (KV_CON_P3PM, xml, elem, pers3_m_plur))
@ -686,7 +686,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
else if (elem.tag () == KV_CON_P3PN && !elem.isEndTag() ) {
if (!inEntry) {
errorKvtMl (xml.lineNumber(),
i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3PN));
i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3PN));
return false;
}
if (!extract_simple_tag (KV_CON_P3PN, xml, elem, pers3_n_plur))
@ -695,7 +695,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
else {
if (elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
return false;
}
else {
@ -748,7 +748,7 @@ bool kvoctrainDoc::loadLessonKvtMl (XmlElement elem, XmlReader& xml)
if (elem.tag () == KV_LESS_GRP) {
if (! elem.isEndTag ()) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(elem.tag()));
i18n("expected ending tag <%1>").arg(elem.tag()));
return false;
}
else
@ -780,14 +780,14 @@ bool kvoctrainDoc::loadLessonKvtMl (XmlElement elem, XmlReader& xml)
if (elem.tag() != KV_LESS_DESC || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_LESS_DESC));
i18n("expected ending tag <%1>").arg(KV_LESS_DESC));
return false;
}
}
else {
if (elem.tag() != KV_LESS_DESC || !elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(KV_LESS_DESC));
i18n("expected ending tag <%1>").arg(KV_LESS_DESC));
return false;
}
s = "";
@ -797,7 +797,7 @@ bool kvoctrainDoc::loadLessonKvtMl (XmlElement elem, XmlReader& xml)
else {
if (elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
return false;
}
else {
@ -823,7 +823,7 @@ bool kvoctrainDoc::loadOptionsKvtMl (XmlElement elem, XmlReader& xml)
if (elem.tag () == KV_OPTION_GRP) {
if (! elem.isEndTag ()) {
errorKvtMl (xml.lineNumber(),
i18n("expected ending tag <%1>").tqarg(elem.tag()));
i18n("expected ending tag <%1>").arg(elem.tag()));
return false;
}
else
@ -841,7 +841,7 @@ bool kvoctrainDoc::loadOptionsKvtMl (XmlElement elem, XmlReader& xml)
else {
if (elem.isEndTag() ) {
errorKvtMl (xml.lineNumber(),
i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
return false;
}
else {

8
kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
Unescape View File

@ -91,7 +91,7 @@ bool kvoctrainDoc::saveToVcb (TQTextStream& os, TQString &/*title*/)
}
setModified (false);
return os.tqdevice()->status() == IO_Ok;
return os.device()->status() == IO_Ok;
}
@ -103,7 +103,7 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
loadTypeNameVcb (is);
loadLessonVcb (is);
int size = is.tqdevice()->size ();
int size = is.device()->size ();
int ln = size / 40 / 100; // assume each line about 40 chars
float f_ent_percent = size / 100.0;
emit progressChanged (this, 0);
@ -114,7 +114,7 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
ln--;
if (ln <= 0) {
ln = size / 40 / 100; // assume each line about 40 chars
emit progressChanged(this, int(is.tqdevice()->at() / f_ent_percent));
emit progressChanged(this, int(is.device()->at() / f_ent_percent));
}
if (!s.stripWhiteSpace().isEmpty()) {
@ -184,7 +184,7 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
langs.push_back("en");
setModified (false);
return is.tqdevice()->status() == IO_Ok;
return is.device()->status() == IO_Ok;
}

2
kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
Unescape View File

@ -137,5 +137,5 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
setModified(false);
doc_url.setFileName(i18n("Untitled"));
return is.tqdevice()->status() == IO_Ok;
return is.device()->status() == IO_Ok;
}

2
kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
Unescape View File

@ -956,5 +956,5 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
xml.endTag (KV_DOCTYPE, true);
setModified (false);
return os.tqdevice()->status() == IO_Ok;
return os.device()->status() == IO_Ok;
}

10
kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
Unescape View File

@ -105,7 +105,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
TQFile f(tmpfile);
if (!f.open(IO_ReadOnly))
{
KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").tqarg(url.path()));
KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").arg(url.path()));
return;
}
@ -166,7 +166,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
return;
}
TQString format = i18n("Could not load \"%1\"\nDo you want to try again?");
TQString msg = format.tqarg(url.path());
TQString msg = format.arg(url.path());
int result = KMessageBox::warningContinueCancel(0, msg,
kapp->makeStdCaption(i18n("I/O Failure")),
i18n("&Retry"));
@ -222,7 +222,7 @@ bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, F
if (!f.open(IO_WriteOnly))
{
KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").tqarg(tmp.path()));
KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").arg(tmp.path()));
return false;
}
@ -262,7 +262,7 @@ bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, F
if (!saved) {
TQString format = i18n("Could not save \"%1\"\nDo you want to try again?");
TQString msg = format.tqarg(tmp.path());
TQString msg = format.arg(tmp.path());
int result = KMessageBox::warningContinueCancel(0, msg,
kapp->makeStdCaption(i18n("I/O Failure")),
i18n("&Retry"));
@ -937,7 +937,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename)
line.insert (0, c1);
f.close();
bool stat = is.tqdevice()->status();
bool stat = is.device()->status();
if (stat != IO_Ok)
return kvd_none;
if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l')

2
kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
Unescape View File

@ -172,7 +172,7 @@ public:
/**
* Get the raw output stream.
*/
inline TQIODevice *stream () { return strm.tqdevice(); }
inline TQIODevice *stream () { return strm.device(); }
#endif
private:

4
kvoctrain/kvoctrain/kvtnewstuff.cpp
Unescape View File

@ -75,14 +75,14 @@ TQString KVTNewStuff::downloadDestination(KNS::Entry * entry)
{
int result = KMessageBox::warningContinueCancel(parentWidget(),
i18n("The file '%1' already exists. Do you want to overwrite it?")
.tqarg(file),
.arg(file),
TQString(), i18n("Overwrite") );
if (result == KMessageBox::Cancel)
return TQString();
}
KMessageBox::information(parentWidget(),
i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>")
.tqarg(file),
.arg(file),
TQString(),
"NewStuffDownloadLocation");
return file;

10
kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
Unescape View File

@ -137,7 +137,7 @@
<property name="text">
<string>-</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -156,7 +156,7 @@
<property name="text">
<string>-</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -175,7 +175,7 @@
<property name="text">
<string>-</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -194,7 +194,7 @@
<property name="text">
<string>-</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -213,7 +213,7 @@
<property name="text">
<string>-</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>

6
kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
Unescape View File

@ -305,19 +305,19 @@ void QueryDlgBase::resetButton(TQRadioButton *radio, TQWidget *widget2)
TQString QueryDlgBase::getOKComment(int percent_done)
{
return i18n("Well done, you knew the correct answer. %1% done.").tqarg(percent_done);
return i18n("Well done, you knew the correct answer. %1% done.").arg(percent_done);
}
TQString QueryDlgBase::getTimeoutComment(int percent_done)
{
return i18n("You waited too long to enter the correct answer. %1% done.").tqarg(percent_done);
return i18n("You waited too long to enter the correct answer. %1% done.").arg(percent_done);
}
TQString QueryDlgBase::getNOKComment(int percent_done)
{
return i18n("Your answer was wrong. %1% done.").tqarg(percent_done);
return i18n("Your answer was wrong. %1% done.").arg(percent_done);
}
void QueryDlgBase::closeEvent(TQCloseEvent * /*e*/)

2
kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
Unescape View File

@ -64,7 +64,7 @@
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>

2
kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
Unescape View File

@ -180,7 +180,7 @@ bool VerbQueryDlg::next()
type = conjugations.getType(current);
TQString format = i18n("Current tense is: %1.");
TQString msg = format.tqarg(conjugations.getName(type));
TQString msg = format.arg(conjugations.getName(type));
mw->instructionLabel->setText (msg);
mw->baseLabel->setText (s);

8
kvoctrain/kvoctrain/spotlight2kvtml.cpp
Unescape View File

@ -92,7 +92,7 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
spotty spot;
bool first_line = true;
while (!is.eof() && is.tqdevice()->status() == IO_Ok) {
while (!is.eof() && is.device()->status() == IO_Ok) {
line = is.readLine();
int pos;
@ -289,7 +289,7 @@ void writeToKvtml(TQTextStream &os, TQString month, TQString year)
writeSpotty (os, spottys[0], true);
int l = 1;
while (os.tqdevice()->status() == IO_Ok && l < (int) spottys.size() ) {
while (os.device()->status() == IO_Ok && l < (int) spottys.size() ) {
writeSpotty (os, spottys[l], false);
l++;
}
@ -327,7 +327,7 @@ int main(int argc, char **argv)
readToMem (is, argv[2], argv[3]);
fs.close();
if (is.tqdevice()->status() != IO_Ok ) {
if (is.device()->status() != IO_Ok ) {
cerr << i18n("Could not read ").local8Bit().data() << spot.local8Bit().data() << endl;
exit (1);
}
@ -338,7 +338,7 @@ int main(int argc, char **argv)
writeToKvtml(os, argv[2], argv[3]);
fk.close();
if (os.tqdevice()->status() != IO_Ok ) {
if (os.device()->status() != IO_Ok ) {
cerr << i18n("Could not write ").local8Bit().data() << kvtml.local8Bit().data() << endl;
exit (1);
}

4
kwordquiz/src/dlglanguagebase.ui
Unescape View File

@ -90,7 +90,7 @@
<property name="frameShadow">
<enum>Sunken</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignAuto</set>
</property>
<property name="toolTip" stdset="0">
@ -187,7 +187,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignAuto</set>
</property>
<property name="toolTip" stdset="0">

2
kwordquiz/src/dlgrcbase.ui
Unescape View File

@ -43,7 +43,7 @@
<property name="maxLength">
<number>5</number>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignAuto</set>
</property>
<property name="validChars">

12
kwordquiz/src/flashviewbase.ui
Unescape View File

@ -126,7 +126,7 @@
<property name="text">
<string>Language 1</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -203,7 +203,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
<property name="toolTip" stdset="0">
@ -292,7 +292,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@ -360,7 +360,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@ -459,7 +459,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@ -527,7 +527,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">

16
kwordquiz/src/kvtmlwriter.cpp
Unescape View File

@ -35,10 +35,10 @@ KVTMLWriter::KVTMLWriter(TQFile *file)
void KVTMLWriter::addHeader(const TQString &generator, int cols, int rows, const TQString &title)
{
TQString s = TQString("<kvtml\n generator=\"%1\"\n cols=\"%2\"\n lines=\"%3\"\n title=\"%4\">")
.tqarg(generator)
.tqarg(cols)
.tqarg(rows)
.tqarg(title);
.arg(generator)
.arg(cols)
.arg(rows)
.arg(title);
outputStream << s << endl << endl;
}
@ -50,12 +50,12 @@ void KVTMLWriter::addFirstItem(const TQString &ll, int lwidth, const TQString &l
{
outputStream << " <e>" << endl;
TQString s = TQString(" <o width=\"%1\" l=\"%2\">")
.tqarg(lwidth)
.tqarg(ll);
.arg(lwidth)
.arg(ll);
outputStream << s << escape(left) << "</o>" << endl;
s = TQString(" <t width=\"%1\" l=\"%2\">")
.tqarg(rwidth)
.tqarg(rl);
.arg(rwidth)
.arg(rl);
outputStream << s << escape(right) << "</t>" << endl;
outputStream << " </e>" << endl;
}

36
kwordquiz/src/kwordquiz.cpp
Unescape View File

@ -610,7 +610,7 @@ bool KWordQuizApp::saveAsFileName( )
TQFileInfo fileinfo(url.path());
if (fileinfo.exists() && KMessageBox::warningContinueCancel(0,
i18n("<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite it?</qt>")
.tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
.arg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
{
// do nothing
}
@ -1064,7 +1064,7 @@ void KWordQuizApp::slotApplyPreferences()
kdDebug() << "Prefs Update" << endl;
editMarkBlank->setEnabled(Prefs::enableBlanks());
editUnmarkBlank->setEnabled(Prefs::enableBlanks());
m_editView->viewport()->tqrepaint(true);
m_editView->viewport()->repaint(true);
updateSpecialCharIcons();
emit settingsChanged();
}
@ -1074,7 +1074,7 @@ void KWordQuizApp::updateSpecialCharIcons( )
for (int i = 0; i < 9; i++){
KAction * act = actionCollection()->action(TQString("char_" + TQString::number(i + 1)).latin1());
act->setIcon(charIcon(Prefs::specialCharacters()[i]));
act->setToolTip(i18n("Inserts the character %1").tqarg(Prefs::specialCharacters()[i]));
act->setToolTip(i18n("Inserts the character %1").arg(Prefs::specialCharacters()[i]));
}
}
@ -1145,11 +1145,11 @@ void KWordQuizApp::updateMode(int m)
TQString s1 = m_editView -> horizontalHeader()->label(0);
TQString s2 = m_editView -> horizontalHeader()->label(1);
mode1->setText(i18n("&1 %1 -> %2 In Order").tqarg(s1).tqarg(s2));
mode2->setText(i18n("&2 %1 -> %2 In Order").tqarg(s2).tqarg(s1));
mode3->setText(i18n("&3 %1 -> %2 Randomly").tqarg(s1).tqarg(s2));
mode4->setText(i18n("&4 %1 -> %2 Randomly").tqarg(s2).tqarg(s1));
mode5->setText(i18n("&5 %1 <-> %2 Randomly").tqarg(s1).tqarg(s2));
mode1->setText(i18n("&1 %1 -> %2 In Order").arg(s1).arg(s2));
mode2->setText(i18n("&2 %1 -> %2 In Order").arg(s2).arg(s1));
mode3->setText(i18n("&3 %1 -> %2 Randomly").arg(s1).arg(s2));
mode4->setText(i18n("&4 %1 -> %2 Randomly").arg(s2).arg(s1));
mode5->setText(i18n("&5 %1 <-> %2 Randomly").arg(s1).arg(s2));
mode1->setChecked(Prefs::mode() == 1);
mode2->setChecked(Prefs::mode() == 2);
@ -1164,30 +1164,30 @@ void KWordQuizApp::updateMode(int m)
popup->setItemChecked(3, Prefs::mode() == 4);
popup->setItemChecked(4, Prefs::mode() == 5);
popup->changeItem(0, i18n("&1 %1 -> %2 In Order").tqarg(s1).tqarg(s2));
popup->changeItem(1, i18n("&2 %1 -> %2 In Order").tqarg(s2).tqarg(s1));
popup->changeItem(2, i18n("&3 %1 -> %2 Randomly").tqarg(s1).tqarg(s2));
popup->changeItem(3, i18n("&4 %1 -> %2 Randomly").tqarg(s2).tqarg(s1));
popup->changeItem(4, i18n("&5 %1 <-> %2 Randomly").tqarg(s1).tqarg(s2));
popup->changeItem(0, i18n("&1 %1 -> %2 In Order").arg(s1).arg(s2));
popup->changeItem(1, i18n("&2 %1 -> %2 In Order").arg(s2).arg(s1));
popup->changeItem(2, i18n("&3 %1 -> %2 Randomly").arg(s1).arg(s2));
popup->changeItem(3, i18n("&4 %1 -> %2 Randomly").arg(s2).arg(s1));
popup->changeItem(4, i18n("&5 %1 <-> %2 Randomly").arg(s1).arg(s2));
TQString s;
mode->setIcon("mode" + s.setNum(Prefs::mode()));
switch( Prefs::mode() ){
case 1:
statusBar()->changeItem(i18n("%1 -> %2 In Order").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE);
statusBar()->changeItem(i18n("%1 -> %2 In Order").arg(s1).arg(s2), ID_STATUS_MSG_MODE);
break;
case 2:
statusBar()->changeItem(i18n("%1 -> %2 In Order").tqarg(s2).tqarg(s1), ID_STATUS_MSG_MODE);
statusBar()->changeItem(i18n("%1 -> %2 In Order").arg(s2).arg(s1), ID_STATUS_MSG_MODE);
break;
case 3:
statusBar()->changeItem(i18n("%1 -> %2 Randomly").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE);
statusBar()->changeItem(i18n("%1 -> %2 Randomly").arg(s1).arg(s2), ID_STATUS_MSG_MODE);
break;
case 4:
statusBar()->changeItem(i18n("%1 -> %2 Randomly").tqarg(s2).tqarg(s1), ID_STATUS_MSG_MODE);
statusBar()->changeItem(i18n("%1 -> %2 Randomly").arg(s2).arg(s1), ID_STATUS_MSG_MODE);
break;
case 5:
statusBar()->changeItem(i18n("%1 <-> %2 Randomly").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE);
statusBar()->changeItem(i18n("%1 <-> %2 Randomly").arg(s1).arg(s2), ID_STATUS_MSG_MODE);
break;
}

2
kwordquiz/src/kwordquiz.h
Unescape View File

@ -79,7 +79,7 @@ class KWordQuizApp : public KMainWindow
bool saveAsFileName();
protected:
/** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
/** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
* file
*/
void saveOptions();

12
kwordquiz/src/kwordquizdoc.cpp
Unescape View File

@ -73,14 +73,14 @@ const KURL& KWordQuizDoc::URL() const
void KWordQuizDoc::slotUpdateAllViews(KWordQuizView *sender)
{
//m_view->tqrepaint();
//m_view->repaint();
/*KWordQuizView *w;
if(pViewList)
{
for(w=pViewList->first(); w!=0; w=pViewList->next())
{
if(w!=sender)
w->tqrepaint();
w->repaint();
}
}*/
@ -162,7 +162,7 @@ bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index)
TQFile file(tmpfile);
if (!file.open(IO_ReadOnly))
{
KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").tqarg(url.path()));
KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").arg(url.path()));
return false;
}
@ -333,7 +333,7 @@ bool KWordQuizDoc::saveDocument(const KURL& url, const char *format /*=0*/)
if (!file.open(IO_WriteOnly))
{
KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>")
.tqarg(url.path()));
.arg(url.path()));
//if (filename == fname)
// filename = "";
return false;
@ -347,7 +347,7 @@ bool KWordQuizDoc::saveDocument(const KURL& url, const char *format /*=0*/)
{
file.close();
KVTMLWriter writer(&file);
writer.addHeader(TQString("kwordquiz %1").tqarg(KWTQ_VERSION), 2, g->numRows(), url.fileName());
writer.addHeader(TQString("kwordquiz %1").arg(KWTQ_VERSION), 2, g->numRows(), url.fileName());
writer.addFirstItem(g->horizontalHeader()->label(0), g->columnWidth(0), g->text(w, 0), g->horizontalHeader()->label(1), g->columnWidth(1), g->text(w, 1));
w++;
int r = g->numRows();
@ -479,7 +479,7 @@ void KWordQuizDoc::slotModifiedOnDisk( const TQString & path)
/*@todo this code doesn't work very well. Have to look in more detail on how Kate does it.
if (doc_url.path() == path)
{
TQString str = i18n("The file %1 was changed (modified) on disc by another program!\n\n").tqarg(doc_url.fileName());
TQString str = i18n("The file %1 was changed (modified) on disc by another program!\n\n").arg(doc_url.fileName());
int i = KMessageBox::warningYesNoCancel(0, str + i18n("Do you want to reload the modified file? Data loss may occur."),TQString(),i18n("Reload"),i18n("Do Not Reload"));
if ( i == KMessageBox::Yes)
openDocument(doc_url);

2
kwordquiz/src/kwordquizdoc.h
Unescape View File

@ -76,7 +76,7 @@ class KWordQuizDoc : public TQObject
void setURL(const KURL& url);
public slots:
/** calls tqrepaint() on all views connected to the document object and is called by the view by which the document has been changed.
/** calls repaint() on all views connected to the document object and is called by the view by which the document has been changed.
* As this view normally repaints itself, it is excluded from the paintEvent.
*/
void slotUpdateAllViews(KWordQuizView *sender);

6
kwordquiz/src/kwordquizview.cpp
Unescape View File

@ -42,7 +42,7 @@ TQValueList<WTQUndo> *KWordQuizView::m_undoList = 0L;
KWTQTableItem::KWTQTableItem(TQTable* table, EditType et, const TQString & text) : TQTableItem(table, et, text)
{}
int KWTQTableItem::tqalignment() const
int KWTQTableItem::alignment() const
{
bool num;
bool ok1 = false;
@ -211,12 +211,12 @@ void KWordQuizView::doNewPage( TQPainter & painter, int res, int type )
if (type == 2)
{
painter.drawText(card_marg, card_marg - 20, i18n("KWordQuiz - %1").tqarg(getDocument()->URL().fileName()));
painter.drawText(card_marg, card_marg - 20, i18n("KWordQuiz - %1").arg(getDocument()->URL().fileName()));
return;
}
painter.drawLine(marg, marg, marg + cw0 + cw1 + cw2 + cw3, marg);
painter.drawText(marg, marg - 20, i18n("KWordQuiz - %1").tqarg(getDocument()->URL().fileName()));
painter.drawText(marg, marg - 20, i18n("KWordQuiz - %1").arg(getDocument()->URL().fileName()));
if (type == 1)
{

2
kwordquiz/src/kwordquizview.h
Unescape View File

@ -45,7 +45,7 @@ class KWTQTableItem :public TQTableItem
{
public:
KWTQTableItem( TQTable* table, EditType et, const TQString & text );
virtual int tqalignment() const;
virtual int alignment() const;
};
class KWordQuizView : public TQTable

4
kwordquiz/src/kwqnewstuff.cpp
Unescape View File

@ -79,7 +79,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry)
{
int result = KMessageBox::questionYesNo(parentWidget(),
i18n("The file '%1' already exists. Do you want to overwrite it?")
.tqarg(file),
.arg(file),
TQString(),
i18n("Overwrite"),i18n("Do Not Overwrite"));
if (result == KMessageBox::No)
@ -87,7 +87,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry)
}
KMessageBox::information(parentWidget(),
i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>")
.tqarg(file),
.arg(file),
TQString(),
"NewStuffDownloadLocation");
return file;

26
kwordquiz/src/multipleviewbase.ui
Unescape View File

@ -64,7 +64,7 @@
<property name="text">
<string>Language 1</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -95,7 +95,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -197,7 +197,7 @@
<property name="text">
<string>Your Answer</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -228,7 +228,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -300,7 +300,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@ -368,7 +368,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@ -467,7 +467,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@ -535,7 +535,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@ -583,7 +583,7 @@
<property name="text">
<string>Correct Answer</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -614,7 +614,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -772,7 +772,7 @@
<property name="text">
<string>Language 2</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -846,7 +846,7 @@
<property name="text">
<string>Previous Question</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -877,7 +877,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="indent">

4
kwordquiz/src/prefcardappearancebase.ui
Unescape View File

@ -98,7 +98,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
<property name="toolTip" stdset="0">
@ -190,7 +190,7 @@
<property name="text">
<string>Front</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">

4
kwordquiz/src/prefcharacterbase.ui
Unescape View File

@ -52,7 +52,7 @@
<property name="text">
<string>Note: Select Settings -&gt; Configure Shortcuts... to change the shortcut associated with each action.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -382,7 +382,7 @@
<property name="text">
<string>A</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignBottom</set>
</property>
<property name="toolTip" stdset="0">

30
kwordquiz/src/qaviewbase.ui
Unescape View File

@ -88,7 +88,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@ -179,7 +179,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@ -208,7 +208,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@ -237,7 +237,7 @@
<property name="text">
<string>00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="toolTip" stdset="0">
@ -314,7 +314,7 @@
<property name="text">
<string>Previous Question</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -345,7 +345,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -419,7 +419,7 @@
<property name="text">
<string>Your Answer</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -450,7 +450,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -552,7 +552,7 @@
<property name="text">
<string>Correct Answer</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -583,7 +583,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -624,7 +624,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -646,7 +646,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignAuto</set>
</property>
<property name="toolTip" stdset="0">
@ -682,7 +682,7 @@
<property name="text">
<string>Language 2</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -770,7 +770,7 @@
<property name="text">
<string>Language 1</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
<property name="toolTip" stdset="0">
@ -829,7 +829,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
<property name="toolTip" stdset="0">

10
kwordquiz/src/wqlwriter.cpp
Unescape View File

@ -35,16 +35,16 @@ void WqlWriter::writeFont( const TQFont & font )
outputStream << "[Font Info]" << winendl;
outputStream << "FontName1=\"" << font.family() << "\"" << winendl;
outputStream << "FontSize1=" << TQString::number(font.pointSize()) << winendl;
outputStream << TQString("FontBold1=%1").tqarg(font.bold() ? "1" : "0") <<winendl;
outputStream << TQString("FontItalic1=%1").tqarg(font.italic() ? "1" : "0") <<winendl;
outputStream << TQString("FontBold1=%1").arg(font.bold() ? "1" : "0") <<winendl;
outputStream << TQString("FontItalic1=%1").arg(font.italic() ? "1" : "0") <<winendl;
outputStream << "FontColor1=0" << winendl;
outputStream << "CharSet1=0" << winendl;
outputStream << "Layout1=0" << winendl;
outputStream << "FontName2=\"" << font.family() << "\"" << winendl;
outputStream << "FontSize2=" << TQString::number(font.pointSize()) << winendl;
outputStream << TQString("FontBold2=%1").tqarg(font.bold() ? "1" : "0") <<winendl;
outputStream << TQString("FontItalic2=%1").tqarg(font.italic() ? "1" : "0") <<winendl;
outputStream << TQString("FontBold2=%1").arg(font.bold() ? "1" : "0") <<winendl;
outputStream << TQString("FontItalic2=%1").arg(font.italic() ? "1" : "0") <<winendl;
outputStream << "FontColor2=0" << winendl;
outputStream << "CharSet2=0" << winendl;
outputStream << "Layout2=0" << winendl << winendl;
@ -83,7 +83,7 @@ void WqlWriter::writeFirstItem( const TQString & ll, const TQString & rl )
void WqlWriter::writeItem( const TQString & left, const TQString & right, int rh )
{
outputStream << left << TQString( " [%1]").tqarg(rh * 15, 10, 10 ) << winendl ;
outputStream << left << TQString( " [%1]").arg(rh * 15, 10, 10 ) << winendl ;
outputStream << right << winendl;
}

2
libtdeedu/extdate/extdatepicker.cpp
Unescape View File

@ -77,7 +77,7 @@ void ExtDatePicker::fillWeeksCombo(const ExtDate &date)
for (; day <= lastDay; day = d->calendar->addDays(day, 7 /*calendar->daysOfWeek()*/) )
{
int year = 0;
TQString week = i18n("Week %1").tqarg(d->calendar->weekNumber(day, &year));
TQString week = i18n("Week %1").arg(d->calendar->weekNumber(day, &year));
if ( year != date.year() ) week += "*"; // show that this is a week from a different year
d->selectWeek->insertItem(week);
}

4
libtdeedu/extdate/extdatetbl.cpp
Unescape View File

@ -779,7 +779,7 @@ ExtDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e)
updateCell( row, col /*, false */ ); // mark the new active cell
}
}
if ( tmpRow > -1 ) // tqrepaint the former active cell
if ( tmpRow > -1 ) // repaint the former active cell
updateCell( tmpRow, tmpCol /*, true */ );
}
}
@ -947,7 +947,7 @@ int
KPopupFrame::exec(TQPoint pos)
{
popup(pos);
tqrepaint();
repaint();
tqApp->enter_loop();
hide();
return result;

36
libtdeedu/extdate/extdatetimeedit.cpp
Unescape View File

@ -295,7 +295,7 @@ public:
TQRect r( rect.x(), rect.y(), rect.width() - 2 * ( 2 + fw ), rect.height() );
parag->pseudoDocument()->docRect = r;
parag->tqinvalidate(0);
parag->invalidate(0);
parag->format();
int xoff = 2 + fw - offset;
@ -465,7 +465,7 @@ void ExtDateTimeEditor::mousePressEvent( TQMouseEvent *e )
int sec = sectionAt( p );
if ( sec != -1 ) {
cw->setFocusSection( sec );
tqrepaint( rect(), FALSE );
repaint( rect(), FALSE );
}
}
@ -481,13 +481,13 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e )
case Key_Right:
if ( d->focusSection() < (int)d->sectionCount()-1 ) {
if ( cw->setFocusSection( focusSection()+1 ) )
tqrepaint( rect(), FALSE );
repaint( rect(), FALSE );
}
return TRUE;
case Key_Left:
if ( d->focusSection() > 0 ) {
if ( cw->setFocusSection( focusSection()-1 ) )
tqrepaint( rect(), FALSE );
repaint( rect(), FALSE );
}
return TRUE;
case Key_Up:
@ -547,7 +547,7 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e )
// do the same thing as KEY_RIGHT when the user presses the separator key
if ( d->focusSection() < 2 ) {
if ( cw->setFocusSection( focusSection()+1 ) )
tqrepaint( rect(), FALSE );
repaint( rect(), FALSE );
}
return TRUE;
} else if ( !txt.isEmpty() && ::tqqt_cast<TQTimeEdit*>(cw) && focusSection() == (int) d->sectionCount()-1 ) {
@ -1133,7 +1133,7 @@ void ExtDateEdit::setOrder( ExtDateEdit::Order order )
}
if ( isVisible() )
d->ed->tqrepaint( d->ed->rect(), FALSE );
d->ed->repaint( d->ed->rect(), FALSE );
}
@ -1171,7 +1171,7 @@ void ExtDateEdit::stepUp()
emit valueChanged( date() );
}
d->ed->tqrepaint( d->ed->rect(), FALSE );
d->ed->repaint( d->ed->rect(), FALSE );
}
@ -1205,7 +1205,7 @@ void ExtDateEdit::stepDown()
emit valueChanged( date() );
}
d->ed->tqrepaint( d->ed->rect(), FALSE );
d->ed->repaint( d->ed->rect(), FALSE );
}
/*!
@ -1292,7 +1292,7 @@ void ExtDateEdit::setDate( const ExtDate& date )
emit valueChanged( date );
}
d->changed = FALSE;
d->ed->tqrepaint( d->ed->rect(), FALSE );
d->ed->repaint( d->ed->rect(), FALSE );
}
ExtDate ExtDateEdit::date() const
@ -1428,7 +1428,7 @@ void ExtDateEdit::addNumber( int sec, int num )
}
d->overwrite = overwrite;
d->timerId = startTimer( tqApp->doubleClickInterval()*4 );
d->ed->tqrepaint( d->ed->rect(), FALSE );
d->ed->repaint( d->ed->rect(), FALSE );
}
@ -1581,7 +1581,7 @@ void ExtDateEdit::removeFirstNumber( int sec )
d->d = txt.toInt();
d->dayCache = d->d;
}
d->ed->tqrepaint( d->ed->rect(), FALSE );
d->ed->repaint( d->ed->rect(), FALSE );
}
/*! \reimp
@ -1607,7 +1607,7 @@ void ExtDateEdit::removeLastNumber( int sec )
d->d = txt.toInt();
d->dayCache = d->d;
}
d->ed->tqrepaint( d->ed->rect(), FALSE );
d->ed->repaint( d->ed->rect(), FALSE );
}
/*!
@ -1882,7 +1882,7 @@ public:
// emit valueChanged( time );
// }
// d->changed = FALSE;
// d->ed->tqrepaint( d->ed->rect(), FALSE );
// d->ed->repaint( d->ed->rect(), FALSE );
// }
//
// TQTime TQTimeEdit::time() const
@ -2012,7 +2012,7 @@ public:
// d->changed = TRUE;
// emit valueChanged( time() );
// }
// d->ed->tqrepaint( d->ed->rect(), FALSE );
// d->ed->repaint( d->ed->rect(), FALSE );
// }
//
//
@ -2061,7 +2061,7 @@ public:
// d->changed = TRUE;
// emit valueChanged( time() );
// }
// d->ed->tqrepaint( d->ed->rect(), FALSE );
// d->ed->repaint( d->ed->rect(), FALSE );
// }
//
//
@ -2343,7 +2343,7 @@ public:
// emit valueChanged( time() );
// d->overwrite = overwrite;
// d->timerId = startTimer( tqApp->doubleClickInterval()*4 );
// d->ed->tqrepaint( d->ed->rect(), FALSE );
// d->ed->repaint( d->ed->rect(), FALSE );
// }
//
//
@ -2383,7 +2383,7 @@ public:
// d->s = txt.toInt();
// break;
// }
// d->ed->tqrepaint( d->ed->rect(), FALSE );
// d->ed->repaint( d->ed->rect(), FALSE );
// }
//
// /*! \reimp
@ -2418,7 +2418,7 @@ public:
// d->s = txt.toInt();
// break;
// }
// d->ed->tqrepaint( d->ed->rect(), FALSE );
// d->ed->repaint( d->ed->rect(), FALSE );
// }
//
// /*! \reimp

4
libtdeedu/tdeeduplot/kplotwidget.cpp
Unescape View File

@ -294,7 +294,7 @@ void KPlotWidget::drawBox( TQPainter *p ) {
double lab = x0 + ix*dXtick;
if ( fabs(lab)/dXtick < 0.00001 ) lab = 0.0; //fix occassional roundoff error with "0.0" label
TQString str = TQString( "%1" ).tqarg( lab, BottomAxis.labelFieldWidth(), BottomAxis.labelFmt(), BottomAxis.labelPrec() );
TQString str = TQString( "%1" ).arg( lab, BottomAxis.labelFieldWidth(), BottomAxis.labelFmt(), BottomAxis.labelPrec() );
if ( px > 0 && px < PixRect.width() ) {
TQRect r( px - BIGTICKSIZE, PixRect.height()+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE );
p->drawText( r, TQt::AlignCenter | TQt::DontClip, str );
@ -340,7 +340,7 @@ void KPlotWidget::drawBox( TQPainter *p ) {
double lab = y0 + iy*dYtick;
if ( fabs(lab)/dYtick < 0.00001 ) lab = 0.0; //fix occassional roundoff error with "0.0" label
TQString str = TQString( "%1" ).tqarg( lab, LeftAxis.labelFieldWidth(), LeftAxis.labelFmt(), LeftAxis.labelPrec() );
TQString str = TQString( "%1" ).arg( lab, LeftAxis.labelFieldWidth(), LeftAxis.labelFmt(), LeftAxis.labelPrec() );
if ( py > 0 && py < PixRect.height() ) {
TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE );
p->drawText( r, TQt::AlignCenter | TQt::DontClip, str );

2
libtdeedu/tdeeduplot/kplotwidget.h
Unescape View File

@ -213,7 +213,7 @@ public:
KPlotAxis LeftAxis;
protected:
/**@short the paint event handler, executed when update() or tqrepaint() is called.
/**@short the paint event handler, executed when update() or repaint() is called.
*/
virtual void paintEvent( TQPaintEvent* /* e */ );

2
libtdeedu/tdeeduui/tdeeduglossary.cpp
Unescape View File

@ -396,7 +396,7 @@ TQString GlossaryItem::parseReferences() const
htmlcode += "<br>";
else
first = false;
htmlcode += TQString( "<a href=\"item://%1\">%2</a>" ).tqarg( m_ref[i], m_ref[i] );
htmlcode += TQString( "<a href=\"item://%1\">%2</a>" ).arg( m_ref[i], m_ref[i] );
}
return htmlcode;

Write Preview
Loading…
Cancel
Save