diff options
628 files changed, 4566 insertions, 4566 deletions
diff --git a/blinken/src/blinken.h b/blinken/src/blinken.h index 6994de20..a266b934 100644 --- a/blinken/src/blinken.h +++ b/blinken/src/blinken.h @@ -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? diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp index 052ef6ed..b8eef48a 100644 --- a/blinken/src/button.cpp +++ b/blinken/src/button.cpp @@ -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) { diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp index 4fb63e93..46588f5f 100644 --- a/blinken/src/highscoredialog.cpp +++ b/blinken/src/highscoredialog.cpp @@ -119,7 +119,7 @@ class myTabWidget : public TQTabWidget TQSize tabBarSizeHint() const { - return tabBar() -> tqsizeHint(); + return tabBar() -> sizeHint(); } }; @@ -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(); } diff --git a/blinken/src/number.cpp b/blinken/src/number.cpp index 27621ee8..d5fbd539 100644 --- a/blinken/src/number.cpp +++ b/blinken/src/number.cpp @@ -7,7 +7,7 @@ * (at your option) any later version. * ***************************************************************************/ -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpainter.h> @@ -100,7 +100,7 @@ void number::paintDigit(TQPainter &p, int number) const { // make gcc happy const int *n = m_number0; - int 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)); diff --git a/kalzium/ChangeLog b/kalzium/ChangeLog index ce67fc51..61d29e3a 100644 --- a/kalzium/ChangeLog +++ b/kalzium/ChangeLog @@ -19,7 +19,7 @@ Add: - The menustructure is now more consistent - One icon has been added - Make the mainwidget a QScrollView. This make sizehandling easier - - Improved tqlayout of the detailed information dialog + - Improved layout of the detailed information dialog - Added a widget which shows you a table of the isotopes - Added EqChem, a chemical equation solver - Added several glossary-items diff --git a/kalzium/RELEASE-PLAN b/kalzium/RELEASE-PLAN index b9ddf5d5..83580931 100644 --- a/kalzium/RELEASE-PLAN +++ b/kalzium/RELEASE-PLAN @@ -1,7 +1,7 @@ Release plan ============ -tqStatus: Under discussion +Status: Under discussion Overview diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp index d925ac7a..cf0a9bef 100644 --- a/kalzium/src/detailinfodlg.cpp +++ b/kalzium/src/detailinfodlg.cpp @@ -32,7 +32,7 @@ #include <tqlabel.h> #include <tqimage.h> #include <tqwhatsthis.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqwidgetstack.h> @@ -94,10 +94,10 @@ void DetailedInfoDlg::setElement(Element *element) KHTMLPart* DetailedInfoDlg::addHTMLTab( const TQString& title, const TQString& icontext, const TQString& iconname ) { TQFrame *frame = addPage(title, icontext, BarIcon(iconname)); - TQVBoxLayout *tqlayout = new TQVBoxLayout( frame ); - tqlayout->setMargin( 0 ); + TQVBoxLayout *layout = new TQVBoxLayout( frame ); + layout->setMargin( 0 ); KHTMLPart *w = new KHTMLPart( frame, "html-part", TQT_TQOBJECT(frame) ); - tqlayout->addWidget( w->view() ); + layout->addWidget( w->view() ); return w; } @@ -122,43 +122,43 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type) html.append( "<div><table summary=\"header\"><tr><td>" ); html.append( m_element->symbol() ); html.append( "<td><td>" ); - html.append( i18n( "Block: %1" ).tqarg( m_element->block() ) ); + html.append( i18n( "Block: %1" ).arg( m_element->block() ) ); html.append( "</td></tr></table></div>" ); html.append( "<table summary=\"characteristics\" class=\"characterstics\">"); switch ( type ) { case CHEMICAL: html.append( "<tr><td><img src=\"structure.png\" alt=\"icon\"/></td><td>" ); - html.append( "<b>" + i18n( "Electronic configuration: %1" ).tqarg( m_element->parsedOrbits() ) + "</b>" ); + html.append( "<b>" + i18n( "Electronic configuration: %1" ).arg( m_element->parsedOrbits() ) + "</b>" ); html.append( "</td></tr>" ); html.append( "<tr><td><img src=\"density.png\" alt=\"icon\"/></td><td>" ); - html.append( "<b>" + i18n( "Density: %1" ).tqarg( m_element->adjustUnits( Element::DENSITY ) ) + "</b>" ); + html.append( "<b>" + i18n( "Density: %1" ).arg( m_element->adjustUnits( Element::DENSITY ) ) + "</b>" ); html.append( "</td></tr>" ); html.append( "<tr><td><img src=\"radius.png\" alt=\"icon\"/></td><td><b>" ); - html.append( "<b>" + i18n( "Covalent Radius: %1" ).tqarg( m_element->adjustRadius( Element::COVALENT ) ) + "</b>" ); + html.append( "<b>" + i18n( "Covalent Radius: %1" ).arg( m_element->adjustRadius( Element::COVALENT ) ) + "</b>" ); html.append( "</td></tr>" ); if ( m_element->radius(Element::IONIC) > 0.0 ) { html.append( "<tr><td><img src=\"radius.png\" alt=\"icon\"/></td><td>" ); - html.append( i18n( "<b>Ionic Radius (Charge): %1</b> (%2)" ).tqarg( m_element->adjustRadius(Element::IONIC) ).tqarg( m_element->ioncharge() ) ); + html.append( i18n( "<b>Ionic Radius (Charge): %1</b> (%2)" ).arg( m_element->adjustRadius(Element::IONIC) ).arg( m_element->ioncharge() ) ); html.append( "</td></tr>" ); } if ( m_element->radius(Element::VDW) > 0.0 ) { html.append( "<tr><td><img src=\"radius.png\" alt=\"icon\"/></td><td>" ); - html.append( "<b>" + i18n( "van der Waals Radius: %1" ).tqarg( m_element->adjustRadius(Element::VDW) ) + "</b>" ); + html.append( "<b>" + i18n( "van der Waals Radius: %1" ).arg( m_element->adjustRadius(Element::VDW) ) + "</b>" ); html.append( "</td></tr>" ); } if ( m_element->radius(Element::ATOMIC) > 0.0 ) { html.append( "<tr><td><img src=\"radius.png\" alt=\"icon\"/></td><td><b>" ); - html.append( "<b>" + i18n( "Atomic Radius: %1" ).tqarg( m_element->adjustRadius(Element::ATOMIC) ) + "</b>" ); + html.append( "<b>" + i18n( "Atomic Radius: %1" ).arg( m_element->adjustRadius(Element::ATOMIC) ) + "</b>" ); html.append( "</td></tr>" ); } html.append( "<tr><td stype=\"text-align:center\"><img src=\"mass.png\" alt=\"icon\"/></td><td>" ); - html.append( "<b>" + i18n( "Mass: %1" ).tqarg( m_element->adjustUnits( Element::MASS ) ) + "</b>" ); + html.append( "<b>" + i18n( "Mass: %1" ).arg( m_element->adjustUnits( Element::MASS ) ) + "</b>" ); html.append( "</td></tr>" ); if ( !m_element->isotopes().isEmpty() ) { @@ -171,22 +171,22 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type) html.append( "<tr><td><img src=\"discovery.png\" alt=\"icon\"/></td><td>" ); html.append( m_element->adjustUnits( Element::DATE ) ); if ( !m_element->scientist( ).isEmpty() ) - html += "<br />" + i18n("It was discovered by %1").tqarg(m_element->scientist() ); + html += "<br />" + i18n("It was discovered by %1").arg(m_element->scientist() ); html.append( "</td></tr>" ); if ( m_element->abundance() > 0 ){ html.append( "<tr><td><img src=\"abundance.png\" alt=\"icon\"/></td><td>" ); - html.append( i18n( "Abundance in crustal rocks: %1 ppm" ).tqarg( KGlobal::locale()->formatLong( m_element->abundance() ) ) ); + html.append( i18n( "Abundance in crustal rocks: %1 ppm" ).arg( KGlobal::locale()->formatLong( m_element->abundance() ) ) ); html.append( "</td></tr>" ); } html.append( "<tr><td><img src=\"mass.png\" alt=\"icon\"/></td><td>" ); - html.append( i18n( "Mean mass: %1 u" ).tqarg( KalziumUtils::localizedValue( m_element->meanmass(), 6 ) ) ); + html.append( i18n( "Mean mass: %1 u" ).arg( KalziumUtils::localizedValue( m_element->meanmass(), 6 ) ) ); html.append( "</td></tr>" ); if ( !m_element->nameOrigin().isEmpty() ) { html.append( "<tr><td><img src=\"book.png\" alt=\"icon\"/></td><td>" ); - html.append( i18n( "Origin of the name: %1" ).tqarg( m_element->nameOrigin() ) ); + html.append( i18n( "Origin of the name: %1" ).arg( m_element->nameOrigin() ) ); html.append( "</td></tr>" ); } if ( m_element->artificial() || m_element->radioactive() ) @@ -203,16 +203,16 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type) break; case ENERGY: html.append( "<tr><td><img src=\"meltingpoint.png\" alt=\"icon\"/></td><td>" ); - html.append( i18n( "Melting Point: %1" ).tqarg( m_element->adjustUnits( Element::MELTINGPOINT ) ) ); + html.append( i18n( "Melting Point: %1" ).arg( m_element->adjustUnits( Element::MELTINGPOINT ) ) ); html.append( "</td></tr>" ); html.append( "<tr><td><img src=\"boilingpoint.png\" alt=\"icon\"/></td><td>" ); - html.append( i18n( "Boiling Point: %1" ).tqarg( m_element->adjustUnits( Element::BOILINGPOINT ) ) ); + html.append( i18n( "Boiling Point: %1" ).arg( m_element->adjustUnits( Element::BOILINGPOINT ) ) ); html.append( "</td></tr>" ); html.append( "<tr><td><img src=\"structure.png\" alt=\"icon\"/></td><td>" ); - html.append( i18n( "Electronegativity: %1" ).tqarg( m_element->adjustUnits( Element::EN ) ) ); + html.append( i18n( "Electronegativity: %1" ).arg( m_element->adjustUnits( Element::EN ) ) ); html.append( "</td></tr>" ); html.append( "<tr><td><img src=\"electronaffinity.png\" alt=\"icon\"/></td><td>" ); - html.append( i18n( "Electron affinity: %1 " ).tqarg( m_element->adjustUnits(Element::EA) ) ); + html.append( i18n( "Electron affinity: %1 " ).arg( m_element->adjustUnits(Element::EA) ) ); html.append( "</td></tr>" ); @@ -221,7 +221,7 @@ TQString DetailedInfoDlg::getHtml(DATATYPE type) { html.append( "<tr><td><img src=\"ionisation.png\" alt=\"icon\"/></td><td>" ); html.append( i18n("the first variable is a number. The result is for example '1.' or '5.', the second is the value of the ionisation energy", - "%1. Ionization energy: %2" ).tqarg( TQString::number( i+1 ), m_element->adjustUnits( Element::IE, ionlist[i] ) ) ); + "%1. Ionization energy: %2" ).arg( TQString::number( i+1 ), m_element->adjustUnits( Element::IE, ionlist[i] ) ) ); html.append( "</td></tr>" ); } break; @@ -264,13 +264,13 @@ TQString DetailedInfoDlg::isotopeTable() { html.append( "<tr><td align=\"right\">" ); if ( ( *it )->weight() > 0.0 ) - html.append( i18n( "%1 u" ).tqarg( KalziumUtils::localizedValue( ( *it )->weight(), 6 ) ) ); - // html.append( i18n( "%1 u" ).tqarg( TQString::number( ( *it )->weight() ) )); + html.append( i18n( "%1 u" ).arg( KalziumUtils::localizedValue( ( *it )->weight(), 6 ) ) ); + // html.append( i18n( "%1 u" ).arg( TQString::number( ( *it )->weight() ) )); html.append( "</td><td>" ); html.append( TQString::number( ( *it )->neutrons() ) ); html.append( "</td><td>" ); if ( ( *it )->percentage() > 0.0 ) - html.append( i18n( "this can for example be '24%'", "%1%" ).tqarg( KalziumUtils::localizedValue( ( *it )->percentage(), 6 ) ) ); + html.append( i18n( "this can for example be '24%'", "%1%" ).arg( KalziumUtils::localizedValue( ( *it )->percentage(), 6 ) ) ); html.append( "</td><td>" ); if ( ( *it )->halflife() > 0.0 ) { html.append( ( *it )->halflifeAsString() ); @@ -278,49 +278,49 @@ TQString DetailedInfoDlg::isotopeTable() html.append( "</td><td>" ); if ( ( *it )->alphapercentage() > 0.0 ){ if ( ( *it )->alphadecay() > 0.0 ) - html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->alphadecay(), 6 ) ) ); - html.append( i18n( " %1" ).tqarg( TQChar( 945 ) ) ); + html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->alphadecay(), 6 ) ) ); + html.append( i18n( " %1" ).arg( TQChar( 945 ) ) ); if ( ( *it )->alphapercentage() < 100.0) - html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( (*it )->alphapercentage(), 6 ) ) ); + html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( (*it )->alphapercentage(), 6 ) ) ); if ( ( *it )->betaminuspercentage() > 0.0 || ( *it )->betapluspercentage() > 0.0 || ( *it )->ecpercentage() > 0.0) html.append( i18n( ", " ) ); } if ( ( *it )->betaminuspercentage() > 0.0 ){ if ( ( *it )->betaminusdecay() > 0.0 ) - html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->betaminusdecay(), 6 ) ) ); - html.append( i18n( " %1<sup>-</sup>" ).tqarg( TQChar( 946 ) ) ); + html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->betaminusdecay(), 6 ) ) ); + html.append( i18n( " %1<sup>-</sup>" ).arg( TQChar( 946 ) ) ); if ( ( *it )->betaminuspercentage() < 100.0) - html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( ( *it )->betaminuspercentage(), 6 ) )); + html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->betaminuspercentage(), 6 ) )); if ( ( *it )->betapluspercentage() > 0.0 || ( *it )->ecpercentage() > 0.0 ) html.append( i18n( ", " ) ); } if ( ( *it )->betapluspercentage() > 0.0 ){ if ( ( *it )->betaplusdecay() > 0.0 ) - html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->betaplusdecay(), 6 ) ) ); - html.append( i18n( " %1<sup>+</sup>" ).tqarg(TQChar( 946 ) ) ); + html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->betaplusdecay(), 6 ) ) ); + html.append( i18n( " %1<sup>+</sup>" ).arg(TQChar( 946 ) ) ); if ( ( *it )->betapluspercentage() == ( *it )->ecpercentage() ) { if ( ( *it )->ecdecay() > 0.0 ) { - html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) ); + html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) ); } html.append( i18n( "Acronym of Electron Capture"," EC" ) ); } if ( ( *it )->betapluspercentage() < 100.0) - html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( ( *it )->betapluspercentage(), 6 ) ) ); + html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->betapluspercentage(), 6 ) ) ); html += " "; } if ( ( *it )->ecpercentage() > 0.0 && ( *it )->ecpercentage()!=( *it )->betapluspercentage()){ if ( ( *it )->ecdecay() > 0.0 ) - html.append( i18n( "%1 MeV" ).tqarg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) ); + html.append( i18n( "%1 MeV" ).arg( KalziumUtils::localizedValue( ( *it )->ecdecay(), 6 ) ) ); html.append( i18n( "Acronym of Electron Capture"," EC" ) ); if ( ( *it )->ecpercentage() < 100.0 ) - html.append( i18n( "(%1%)" ).tqarg( KalziumUtils::localizedValue( ( *it )->ecpercentage(), 6 ) ) ); + html.append( i18n( "(%1%)" ).arg( KalziumUtils::localizedValue( ( *it )->ecpercentage(), 6 ) ) ); } html.append( "</td><td>" ); html.append( ( *it )->spin() ); html.append( "</td><td>" ); if ( !( *it )->magmoment().isEmpty() ) { TQString v = KGlobal::locale()->formatNumber( ( *it )->magmoment(), false, 6 ); - html.append( i18n( "%1 %2<sub>n</sub>" ).tqarg( v ).tqarg( TQChar( 956 ) ) ); + html.append( i18n( "%1 %2<sub>n</sub>" ).arg( v ).arg( TQChar( 956 ) ) ); } html.append( "</td></tr>" ); @@ -379,7 +379,7 @@ void DetailedInfoDlg::reloadContent() const TQString element_symbol = m_element->symbol(); // updating caption - setCaption( i18n( "For example Carbon (6)" , "%1 (%2)" ).tqarg( element_name ).tqarg( m_elementNumber ) ); + setCaption( i18n( "For example Carbon (6)" , "%1 (%2)" ).arg( element_name ).arg( m_elementNumber ) ); // updating overview tab dTab->setElement( m_element ); @@ -395,15 +395,15 @@ void DetailedInfoDlg::reloadContent() piclabel->setPixmap( pic ); } else - piclabel->setText( i18n( "No picture of %1 found." ).tqarg( element_name ) ); + piclabel->setText( i18n( "No picture of %1 found." ).arg( element_name ) ); // updating atomic model tab wOrbits->setElementNumber( m_elementNumber ); TQWhatsThis::add( wOrbits, i18n( "Here you can see the atomic hull of %1. %2 has the configuration %3." ) - .tqarg( m_element->elname() ) - .tqarg( m_element->elname() ) - .tqarg( m_element->parsedOrbits() ) ); + .arg( m_element->elname() ) + .arg( m_element->elname() ) + .arg( m_element->parsedOrbits() ) ); // updating html tabs fillHTMLTab( m_htmlpages["chemical"], getHtml( CHEMICAL ) ); @@ -422,7 +422,7 @@ void DetailedInfoDlg::reloadContent() } else { - m_spectrumLabel->setText( i18n( "No spectrum of %1 found." ).tqarg( element_name ) ); + m_spectrumLabel->setText( i18n( "No spectrum of %1 found." ).arg( element_name ) ); m_spectrumStack->raiseWidget( m_spectrumLabel ); } } diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp index f85023c0..b5342952 100644 --- a/kalzium/src/element.cpp +++ b/kalzium/src/element.cpp @@ -106,7 +106,7 @@ const TQString Element::adjustRadius( RADIUSTYPE rtype ) if ( val <= 0 ) v = i18n( "Value unknown" ); else - v = i18n( "%1 is a length, eg: 12.3 pm", "%1 pm" ).tqarg( KalziumUtils::localizedValue( val, 6 ) ); + v = i18n( "%1 is a length, eg: 12.3 pm", "%1 pm" ).arg( KalziumUtils::localizedValue( val, 6 ) ); return v; } @@ -151,19 +151,19 @@ const TQString Element::adjustUnits( const int type ) TQString strVal = KalziumUtils::localizedValue( newvalue, 6 ); switch (Prefs::temperature()) { case 0: //Kelvin - v = i18n( "%1 is the temperature in Kelvin", "%1 K" ).tqarg( strVal ); + v = i18n( "%1 is the temperature in Kelvin", "%1 K" ).arg( strVal ); break; case 1://Kelvin to Celsius - v = i18n( "%1 is the temperature in Celsius", "%1 %2C" ).tqarg( strVal ).tqarg( TQChar(0xB0) ); + v = i18n( "%1 is the temperature in Celsius", "%1 %2C" ).arg( strVal ).arg( TQChar(0xB0) ); break; case 2: // Kelvin to Fahrenheit - v = i18n( "%1 is the temperature in Fahrenheit", "%1 %2F" ).tqarg( strVal ).tqarg( TQChar(0xB0) ); + v = i18n( "%1 is the temperature in Fahrenheit", "%1 %2F" ).arg( strVal ).arg( TQChar(0xB0) ); break; case 3: // Kelvin to Rankine - v = i18n( "%1 is the temperature in Rankine", "%1 %2Ra" ).tqarg( strVal ).tqarg( TQChar(0xB0) ); + v = i18n( "%1 is the temperature in Rankine", "%1 %2Ra" ).arg( strVal ).arg( TQChar(0xB0) ); break; case 4: // Kelvin to Reaumur - v = i18n( "%1 is the temperature in Reaumur", "%1 %2R" ).tqarg( strVal ).tqarg( TQChar(0xB0) ); + v = i18n( "%1 is the temperature in Reaumur", "%1 %2R" ).arg( strVal ).arg( TQChar(0xB0) ); break; } } @@ -186,12 +186,12 @@ const TQString Element::adjustUnits( const int type ) { if ( Prefs::energies() == 0 ) { - v = i18n( "%1 kJ/mol" ).tqarg( KalziumUtils::localizedValue( val, 6 ) ); + v = i18n( "%1 kJ/mol" ).arg( KalziumUtils::localizedValue( val, 6 ) ); } else // use electronvolt { val/=96.6; - v = i18n( "%1 eV" ).tqarg( KalziumUtils::localizedValue( val, 6 ) ); + v = i18n( "%1 eV" ).arg( KalziumUtils::localizedValue( val, 6 ) ); } } } @@ -201,7 +201,7 @@ const TQString Element::adjustUnits( const int type ) if ( val <= 0 ) v = i18n( "Value unknown" ); else - v = i18n( "%1 u" ).tqarg( KalziumUtils::localizedValue( val, 6 ) ); + v = i18n( "%1 u" ).arg( KalziumUtils::localizedValue( val, 6 ) ); } else if ( type == DENSITY ) // its a density { @@ -213,11 +213,11 @@ const TQString Element::adjustUnits( const int type ) { if ( boiling() < 295.0 && melting() < 295.0)//gasoline { - v = i18n( "%1 g/L" ).tqarg( KalziumUtils::localizedValue( val, 6 ) ); + v = i18n( "%1 g/L" ).arg( KalziumUtils::localizedValue( val, 6 ) ); } else//liquid or solid { - v = i18n( "%1 g/cm<sup>3</sup>" ).tqarg( KalziumUtils::localizedValue( val, 6 )); + v = i18n( "%1 g/cm<sup>3</sup>" ).arg( KalziumUtils::localizedValue( val, 6 )); } } } @@ -230,7 +230,7 @@ const TQString Element::adjustUnits( const int type ) } else { - v = i18n( "This element was discovered in the year %1" ).tqarg( TQString::number( val ) ); + v = i18n( "This element was discovered in the year %1" ).arg( TQString::number( val ) ); } } diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp index bf717d42..ad03b451 100644 --- a/kalzium/src/elementdataviewer.cpp +++ b/kalzium/src/elementdataviewer.cpp @@ -26,7 +26,7 @@ #include <kapplication.h> //QT-Includes -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlabel.h> @@ -41,7 +41,7 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name ) yData = new AxisData(); - TQHBoxLayout *tqlayout = new TQHBoxLayout(plainPage(), 0, KDialog::spacingHint() ); + TQHBoxLayout *layout = new TQHBoxLayout(plainPage(), 0, KDialog::spacingHint() ); m_pPlotSetupWidget = new PlotSetupWidget( plainPage(), "plotsetup" ); m_pPlotSetupWidget->from->setMaxValue( d->numberOfElements() - 1 ); @@ -51,10 +51,10 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name ) m_pPlotWidget->setMinimumWidth( 200 ); m_pPlotWidget->resize( 400, m_pPlotWidget->height() ); - tqlayout->addWidget( m_pPlotSetupWidget ); - tqlayout->addWidget( m_pPlotWidget ); - tqlayout->setStretchFactor( m_pPlotSetupWidget, 0 ); - tqlayout->setStretchFactor( m_pPlotWidget, 1 ); + layout->addWidget( m_pPlotSetupWidget ); + layout->addWidget( m_pPlotWidget ); + layout->setStretchFactor( m_pPlotSetupWidget, 0 ); + layout->setStretchFactor( m_pPlotWidget, 1 ); // setup the list of names EList::iterator it = d->ElementList.begin(); diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp index 918b9ac6..d5cafffc 100644 --- a/kalzium/src/eqchemview.cpp +++ b/kalzium/src/eqchemview.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqstring.h> @@ -50,7 +50,7 @@ eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent) { settingsChanged(); - TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView tqlayout"); + TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView layout"); m_eqResult = new EqResult(this); m_eqedit = new KLineEdit(this); diff --git a/kalzium/src/eqresult.cpp b/kalzium/src/eqresult.cpp index 742c3ad1..1f3f44bf 100644 --- a/kalzium/src/eqresult.cpp +++ b/kalzium/src/eqresult.cpp @@ -61,7 +61,7 @@ void AnswerItem::paint( TQPainter* painter ) TQRect r ( 0, 0, listBox()->contentsWidth(), height( listBox() ) ); painter->fillRect( r, m_bgcolor ); - TQColorGroup cg = listBox()->tqcolorGroup(); + TQColorGroup cg = listBox()->colorGroup(); cg.setColor( TQColorGroup::Background, m_bgcolor ); m_richtext->draw(painter, 0, 0, r, cg ); @@ -101,7 +101,7 @@ EqResult::~EqResult() void EqResult::add(const TQString & question, const TQString & answer) { - TQColor bgcolor = tqcolorGroup().base(); + TQColor bgcolor = colorGroup().base(); if ( m_alternate_color ) bgcolor = bgcolor.dark( 120 ); diff --git a/kalzium/src/isotope.cpp b/kalzium/src/isotope.cpp index 3b2dbe63..268e99d4 100644 --- a/kalzium/src/isotope.cpp +++ b/kalzium/src/isotope.cpp @@ -52,24 +52,24 @@ TQString Isotope::halflifeAsString() if ( !seconds() )//years { if ( m_halflife > 1000000 ) - halflife = i18n("%1 million years").tqarg( KalziumUtils::localizedValue( m_halflife/1000000.0, 2 ) ); + halflife = i18n("%1 million years").arg( KalziumUtils::localizedValue( m_halflife/1000000.0, 2 ) ); if ( m_halflife > 1000000000 ) - halflife = i18n("%1 billion years").tqarg( KalziumUtils::localizedValue( m_halflife/1000000000.0, 2 ) ); + halflife = i18n("%1 billion years").arg( KalziumUtils::localizedValue( m_halflife/1000000000.0, 2 ) ); else - halflife = i18n("%1 years").tqarg( KalziumUtils::localizedValue( m_halflife, 2 ) ); + halflife = i18n("%1 years").arg( KalziumUtils::localizedValue( m_halflife, 2 ) ); } else { if ( m_halflife < 120 ) - halflife = i18n("%1 seconds").tqarg( KalziumUtils::localizedValue( m_halflife, 2 ) ); + halflife = i18n("%1 seconds").arg( KalziumUtils::localizedValue( m_halflife, 2 ) ); else if ( m_halflife > 1000 ) - halflife = i18n("%1 minutes").tqarg( KalziumUtils::localizedValue( m_halflife/60.0, 2 ) ); + halflife = i18n("%1 minutes").arg( KalziumUtils::localizedValue( m_halflife/60.0, 2 ) ); else if ( m_halflife > 3600 ) - halflife = i18n("%1 hours").tqarg( KalziumUtils::localizedValue( m_halflife/( 60*60 ), 2 ) ); + halflife = i18n("%1 hours").arg( KalziumUtils::localizedValue( m_halflife/( 60*60 ), 2 ) ); if ( m_halflife > 86400 ) //one day - halflife = i18n("%1 days").tqarg( KalziumUtils::localizedValue( m_halflife/( 60*60*24 ), 2 ) ); + halflife = i18n("%1 days").arg( KalziumUtils::localizedValue( m_halflife/( 60*60*24 ), 2 ) ); if ( m_halflife > ( 31536000 * 2 ) ) //two year - halflife = i18n("%1 years").tqarg( KalziumUtils::localizedValue( m_halflife/( 3600.0*365 ), 2 ) ); + halflife = i18n("%1 years").arg( KalziumUtils::localizedValue( m_halflife/( 3600.0*365 ), 2 ) ); } return halflife; diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp index 2046825b..375c2f2f 100644 --- a/kalzium/src/kalzium.cpp +++ b/kalzium/src/kalzium.cpp @@ -33,7 +33,7 @@ #include "config.h" #include <tqdockwindow.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbox.h> #include <tqslider.h> #include <tqscrollview.h> @@ -212,7 +212,7 @@ void Kalzium::setupSidebars() TQVBoxLayout *lay = new TQVBoxLayout( fake, 5 ); lay->activate(); m_detailWidget = new DetailedGraphicalOverview( fake, "DetailedGraphicalOverview" ); - m_detailWidget->setMinimumSize( 200, m_detailWidget->tqminimumSize().height() ); + m_detailWidget->setMinimumSize( 200, m_detailWidget->minimumSize().height() ); connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectedNumber( int ) )); lay->addWidget( m_detailWidget ); lay->addItem( new TQSpacerItem( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding ) ); @@ -422,7 +422,7 @@ void Kalzium::setupStatusBar() void Kalzium::slotStatusbar( int num ) { Element *e = KalziumDataObject::instance()->element( num ); - statusBar()->changeItem( i18n( "For example: \"Carbon (6), Mass: 12.0107 u\"", "%1 (%2), Mass: %3 u" ).tqarg( e->elname() ).tqarg(e->number() ).tqarg( KalziumUtils::localizedValue( e->mass(), 6 ) ) , IDS_ELEMENTINFO ); + statusBar()->changeItem( i18n( "For example: \"Carbon (6), Mass: 12.0107 u\"", "%1 (%2), Mass: %3 u" ).arg( e->elname() ).arg(e->number() ).arg( KalziumUtils::localizedValue( e->mass(), 6 ) ) , IDS_ELEMENTINFO ); } void Kalzium::openInformationDialog( int number ) diff --git a/kalzium/src/kalzium.h b/kalzium/src/kalzium.h index 7994fd76..e83ccf4a 100644 --- a/kalzium/src/kalzium.h +++ b/kalzium/src/kalzium.h @@ -106,7 +106,7 @@ class Kalzium : public KMainWindow KToggleAction *m_actionCrystal; /** - * the tqlayout of the central Widget ( CentralWidget ) + * the layout of the central Widget ( CentralWidget ) */ TQVBoxLayout *m_pCentralLayout; diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp index 671b1759..462d76f8 100644 --- a/kalzium/src/kalziumtip.cpp +++ b/kalzium/src/kalziumtip.cpp @@ -128,10 +128,10 @@ void KalziumTip::display() TQString elementname = m_tippedElement->elname(); TQString number = i18n( "Number: %1" ) - .tqarg( TQString::number(m_tippedElement->number()) ); + .arg( TQString::number(m_tippedElement->number()) ); TQString mass = i18n( "Mass: %1" ) - .tqarg( KalziumUtils::localizedValue(m_tippedElement->mass(), 6) ); + .arg( KalziumUtils::localizedValue(m_tippedElement->mass(), 6) ); m_richText = new TQSimpleRichText("<qt><h1>" + elementname + "</h1><p>" + number + "</p><p>" @@ -206,13 +206,13 @@ void KalziumTip::displayInternal() } // draw text shadow - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = tqcolorGroup(); + cg = colorGroup(); m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg); } diff --git a/kalzium/src/molcalcwidget.cpp b/kalzium/src/molcalcwidget.cpp index f9fd90ce..10ad8246 100644 --- a/kalzium/src/molcalcwidget.cpp +++ b/kalzium/src/molcalcwidget.cpp @@ -37,7 +37,7 @@ #include <ktoolbar.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> @@ -82,16 +82,16 @@ void MolcalcWidget::updateUI() for ( ; it != itEnd; ++it ) { // Update the resultLabel str += i18n( "For example: \"1 Carbon\" or \"3 Oxygen\"", "%1 %2\n" ) - .tqarg( (*it)->count() ) - .tqarg( (*it)->element()->elname() ); + .arg( (*it)->count() ) + .arg( (*it)->element()->elname() ); complexString += i18n( "For example: 1 Seaborgium. Cumulative Mass: 263.119 u (39.25%)", "%1 %2. Cumulative Mass: %3 u (%4%)\n" ) - .tqarg( (*it)->count() ) - .tqarg( (*it)->element()->elname() ) - .tqarg( (*it)->count() * (*it)->element()->mass() ) - .tqarg( KalziumUtils::strippedValue( (( (*it)->count() * (*it)->element()->mass() ) + .arg( (*it)->count() ) + .arg( (*it)->element()->elname() ) + .arg( (*it)->count() * (*it)->element()->mass() ) + .arg( KalziumUtils::strippedValue( (( (*it)->count() * (*it)->element()->mass() ) / m_mass ) * 100 ) ); } resultLabel->setText( str ); @@ -100,7 +100,7 @@ void MolcalcWidget::updateUI() resultComposition->setText( compositionString(m_elementMap) ); // The mass - resultMass->setText( i18n( "Molecular mass: %1 u" ).tqarg( m_mass ) ); + resultMass->setText( i18n( "Molecular mass: %1 u" ).arg( m_mass ) ); TQToolTip::add( resultMass, complexString ); TQToolTip::add( resultComposition, complexString ); @@ -126,8 +126,8 @@ TQString MolcalcWidget::compositionString( ElementCountMap &_map ) ElementCountMap::Iterator itEnd = _map.end(); for (; it != itEnd; ++it) { str += i18n( "%1<sub>%2</sub> " ) - .tqarg( (*it)->element()->symbol() ) - .tqarg( (*it)->count() ); + .arg( (*it)->element()->symbol() ) + .arg( (*it)->count() ); } return str; diff --git a/kalzium/src/molcalcwidgetbase.ui b/kalzium/src/molcalcwidgetbase.ui index 04760f0d..d09964e3 100644 --- a/kalzium/src/molcalcwidgetbase.ui +++ b/kalzium/src/molcalcwidgetbase.ui @@ -69,7 +69,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>10</height> diff --git a/kalzium/src/parser.cpp b/kalzium/src/parser.cpp index 9edd9f1f..a23b1078 100644 --- a/kalzium/src/parser.cpp +++ b/kalzium/src/parser.cpp @@ -48,7 +48,7 @@ Parser::start(const TQString& _str) } else { m_index = 0; - m_nextChar = m_str.tqat(0).latin1(); + m_nextChar = m_str.at(0).latin1(); getNextToken(); } } @@ -148,7 +148,7 @@ Parser::getNextChar() m_nextChar = -1; } else - m_nextChar = m_str.tqat(++m_index).latin1(); + m_nextChar = m_str.at(++m_index).latin1(); // Take care of null-terminated strings. if (m_nextChar == 0) { diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp index 950f232e..1f4ed64d 100644 --- a/kalzium/src/periodictableview.cpp +++ b/kalzium/src/periodictableview.cpp @@ -328,7 +328,7 @@ void PerodicTableView::resizeEvent( TQResizeEvent * /*e*/ ) table->resize( width(), height() ); table2->resize( width(), height() ); // XXX: I know it isn't the best way, but otherwise the table won't be redrawn - // on tqrepaint... Feel *free* to remove these two lines if you foind a better + // on repaint... Feel *free* to remove these two lines if you foind a better // solution... doFullDraw = true; update(); diff --git a/kalzium/src/plotsetupwidget.ui b/kalzium/src/plotsetupwidget.ui index 06ef3fa5..b777713c 100644 --- a/kalzium/src/plotsetupwidget.ui +++ b/kalzium/src/plotsetupwidget.ui @@ -26,7 +26,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -114,7 +114,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/kalzium/src/settings_colors.ui b/kalzium/src/settings_colors.ui index 1e025f4f..cd9316cb 100644 --- a/kalzium/src/settings_colors.ui +++ b/kalzium/src/settings_colors.ui @@ -36,7 +36,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <vbox> <property name="name"> @@ -44,7 +44,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout28</cstring> + <cstring>layout28</cstring> </property> <hbox> <property name="name"> @@ -70,7 +70,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <hbox> <property name="name"> @@ -96,7 +96,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout30</cstring> + <cstring>layout30</cstring> </property> <hbox> <property name="name"> @@ -122,7 +122,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout31</cstring> + <cstring>layout31</cstring> </property> <hbox> <property name="name"> @@ -163,7 +163,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <vbox> <property name="name"> @@ -171,7 +171,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <hbox> <property name="name"> @@ -197,7 +197,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -223,7 +223,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -249,7 +249,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <hbox> <property name="name"> @@ -290,7 +290,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <vbox> <property name="name"> @@ -298,7 +298,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -324,7 +324,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -350,7 +350,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -376,7 +376,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -402,7 +402,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -428,7 +428,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -454,7 +454,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -480,7 +480,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -521,7 +521,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> @@ -529,7 +529,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -558,7 +558,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -584,7 +584,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -625,7 +625,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <vbox> <property name="name"> @@ -633,7 +633,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12_2</cstring> + <cstring>layout12_2</cstring> </property> <hbox> <property name="name"> @@ -659,7 +659,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19_2</cstring> + <cstring>layout19_2</cstring> </property> <hbox> <property name="name"> @@ -685,7 +685,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18_2</cstring> + <cstring>layout18_2</cstring> </property> <hbox> <property name="name"> @@ -711,7 +711,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17_2</cstring> + <cstring>layout17_2</cstring> </property> <hbox> <property name="name"> @@ -737,7 +737,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16_2</cstring> + <cstring>layout16_2</cstring> </property> <hbox> <property name="name"> @@ -763,7 +763,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15_2</cstring> + <cstring>layout15_2</cstring> </property> <hbox> <property name="name"> @@ -789,7 +789,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14_2</cstring> + <cstring>layout14_2</cstring> </property> <hbox> <property name="name"> @@ -815,7 +815,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13_2</cstring> + <cstring>layout13_2</cstring> </property> <hbox> <property name="name"> @@ -841,7 +841,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> diff --git a/kalzium/src/settings_misc.ui b/kalzium/src/settings_misc.ui index 0e88167d..85751dbd 100644 --- a/kalzium/src/settings_misc.ui +++ b/kalzium/src/settings_misc.ui @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kalzium/src/somwidget.ui b/kalzium/src/somwidget.ui index 057dc235..1494a1fe 100644 --- a/kalzium/src/somwidget.ui +++ b/kalzium/src/somwidget.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>10</height> @@ -58,7 +58,7 @@ the state of matter</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>10</height> @@ -67,7 +67,7 @@ the state of matter</string> </spacer> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -91,7 +91,7 @@ the state of matter</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -102,7 +102,7 @@ the state of matter</string> </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ the state of matter</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>5</width> <height>20</height> diff --git a/kalzium/src/somwidget_impl.cpp b/kalzium/src/somwidget_impl.cpp index 54d078a8..c51eecbf 100644 --- a/kalzium/src/somwidget_impl.cpp +++ b/kalzium/src/somwidget_impl.cpp @@ -16,7 +16,7 @@ #include <tqlabel.h> #include <tqpair.h> #include <tqslider.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqvaluelist.h> #include <kdebug.h> @@ -35,7 +35,7 @@ SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *parent, const char* name ) { m_list = KalziumDataObject::instance()->ElementList; - text->tqsetAlignment( 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 += " <b>·</b> " + i18n( "For example: Carbon (300K)", "%1 (%2)" ).tqarg( listMeltingPoint[i] ).tqarg( listMeltingPointValue[i] ) + "<br>"; + htmlcode += " <b>·</b> " + 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 += " <b>·</b> " + i18n( "For example: Carbon (300K)", "%1 (%2)" ).tqarg( listBoilingPoint[i] ).tqarg( listBoilingPointValue[i] ) + "<br>"; + htmlcode += " <b>·</b> " + i18n( "For example: Carbon (300K)", "%1 (%2)" ).arg( listBoilingPoint[i] ).arg( listBoilingPointValue[i] ) + "<br>"; } htmlcode += "<br>"; } diff --git a/kalzium/src/spectrum.cpp b/kalzium/src/spectrum.cpp index 45c62180..5fea3d8e 100644 --- a/kalzium/src/spectrum.cpp +++ b/kalzium/src/spectrum.cpp @@ -130,17 +130,17 @@ TQString Spectrum::bandsAsHtml() for (;it!=itEnd;++it) { html += TQString( "<tr>" ) - + "<td>" + i18n( "Wavelength: %1 nm" ).tqarg( ( *it ).wavelength ) + "</td>" - + "<td>" + i18n( "Intensity: %1" ).tqarg( ( *it ).intensity ) + "</td>" - + "<td>" + i18n( "Probability: %1 10<sup>8</sup>s<sup>-1</sup>" ).tqarg( ( *it ).aki ) + "</td>" - + "<td>" + i18n( "Energy 1: %1" ).tqarg( ( *it ).energy1 ) + "</td>" - + "<td>" + i18n( "Energy 2: %1" ).tqarg( ( *it ).energy2 ) + "</td>" - + "<td>" + i18n( "Electron Configuration 1: %1" ).tqarg( ( *it ).electronconfig1 ) + "</td>" - + "<td>" + i18n( "Electron Configuration 2: %1" ).tqarg( ( *it ).electronconfig2 ) + "</td>" - + "<td>" + i18n( "Term 1: %1" ).tqarg( ( *it ).term1 ) + "</td>" - + "<td>" + i18n( "Term 2: %1" ).tqarg( ( *it ).term2 ) + "</td>" - + "<td>" + i18n( "J 1: %1" ).tqarg( ( *it ).J1 ) + "</td>" - + "<td>" + i18n( "J 2: %1" ).tqarg( ( *it ).J2 ) + "</td>" + + "<td>" + i18n( "Wavelength: %1 nm" ).arg( ( *it ).wavelength ) + "</td>" + + "<td>" + i18n( "Intensity: %1" ).arg( ( *it ).intensity ) + "</td>" + + "<td>" + i18n( "Probability: %1 10<sup>8</sup>s<sup>-1</sup>" ).arg( ( *it ).aki ) + "</td>" + + "<td>" + i18n( "Energy 1: %1" ).arg( ( *it ).energy1 ) + "</td>" + + "<td>" + i18n( "Energy 2: %1" ).arg( ( *it ).energy2 ) + "</td>" + + "<td>" + i18n( "Electron Configuration 1: %1" ).arg( ( *it ).electronconfig1 ) + "</td>" + + "<td>" + i18n( "Electron Configuration 2: %1" ).arg( ( *it ).electronconfig2 ) + "</td>" + + "<td>" + i18n( "Term 1: %1" ).arg( ( *it ).term1 ) + "</td>" + + "<td>" + i18n( "Term 2: %1" ).arg( ( *it ).term2 ) + "</td>" + + "<td>" + i18n( "J 1: %1" ).arg( ( *it ).J1 ) + "</td>" + + "<td>" + i18n( "J 2: %1" ).arg( ( *it ).J2 ) + "</td>" + "</tr>\n"; } diff --git a/kalzium/src/spectrumview.ui b/kalzium/src/spectrumview.ui index 89204944..785d21af 100644 --- a/kalzium/src/spectrumview.ui +++ b/kalzium/src/spectrumview.ui @@ -38,7 +38,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -110,7 +110,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>211</width> <height>21</height> @@ -159,7 +159,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>1</height> diff --git a/kalzium/src/spectrumviewimpl.cpp b/kalzium/src/spectrumviewimpl.cpp index 826c008b..f360b485 100644 --- a/kalzium/src/spectrumviewimpl.cpp +++ b/kalzium/src/spectrumviewimpl.cpp @@ -25,7 +25,7 @@ SpectrumViewImpl::SpectrumViewImpl( TQWidget *parent, const char* name ) : SpectrumView( parent, name ) { - resize( tqminimumSizeHint() ); + resize( minimumSizeHint() ); // simulating an update m_spectrumWidget->setRightBorder( maximumValue->value() ); exportButton->setGuiItem( KGuiItem( i18n( "&Export Spectrum as Image" ), "fileexport" ) ); diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp index 8dff10e3..bc0d2af1 100644 --- a/kalzium/src/spectrumwidget.cpp +++ b/kalzium/src/spectrumwidget.cpp @@ -57,7 +57,7 @@ SpectrumWidget::SpectrumWidget( TQWidget *parent, const char* name ) : TQWidget( setType( EmissionSpectrum ); setMinimumSize( 400, 230 ); - tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); setBackgroundMode( NoBackground ); } @@ -70,7 +70,7 @@ void SpectrumWidget::paintEvent( TQPaintEvent * /*e*/ ) m_pixmap.fill( this, width(), height() ); TQPainter p; - p.tqbegin( &m_pixmap, this ); + p.begin( &m_pixmap, this ); p.fillRect( 0, 0, width(), m_realHeight, TQt::black ); paintBands( &p ); @@ -378,15 +378,15 @@ void SpectrumWidget::drawTooltip( TQPainter *p ) { p->setPen( TQt::white ); TQPoint pt = mapFromGlobal( TQCursor::pos() ); - p->drawText( pt, i18n("Wavelength: %1").tqarg(m_band.wavelength) ); + p->drawText( pt, i18n("Wavelength: %1").arg(m_band.wavelength) ); pt.setY( pt.y() + 15 ); - p->drawText( pt, i18n("Intensity: %1").tqarg(m_band.intensity) ); + p->drawText( pt, i18n("Intensity: %1").arg(m_band.intensity) ); pt.setY( pt.y() + 15 ); - p->drawText( pt, i18n("Energy 1, Energy 2: %1, %2").tqarg(m_band.energy1).tqarg( m_band.energy2 )); + p->drawText( pt, i18n("Energy 1, Energy 2: %1, %2").arg(m_band.energy1).arg( m_band.energy2 )); pt.setY( pt.y() + 15 ); - p->drawText( pt, i18n("Term 1, Term 2: %1, %2").tqarg(m_band.term1).tqarg( m_band.term2 )); + p->drawText( pt, i18n("Term 1, Term 2: %1, %2").arg(m_band.term1).arg( m_band.term2 )); pt.setY( pt.y() + 15 ); - p->drawText( pt, i18n("J 1, J 2: %1, %2").tqarg(m_band.J1).tqarg( m_band.J2 )); + p->drawText( pt, i18n("J 1, J 2: %1, %2").arg(m_band.J1).arg( m_band.J2 )); } void SpectrumWidget::mouseReleaseEvent( TQMouseEvent *e ) @@ -415,9 +415,9 @@ TQPixmap SpectrumWidget::pixmap() TQString text; if( m_type == EmissionSpectrum ) - text = i18n( "Emission spectrum of %1" ).tqarg( m_spectrum->parentElement()->elname() ); + text = i18n( "Emission spectrum of %1" ).arg( m_spectrum->parentElement()->elname() ); else - text = i18n( "Absorption spectrum of %1" ).tqarg( m_spectrum->parentElement()->elname() ); + text = i18n( "Absorption spectrum of %1" ).arg( m_spectrum->parentElement()->elname() ); TQPainter p( &tmp ); p.setPen( TQt::black ); diff --git a/kalzium/src/timewidget.ui b/kalzium/src/timewidget.ui index 28ddf7a5..a684726f 100644 --- a/kalzium/src/timewidget.ui +++ b/kalzium/src/timewidget.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -35,7 +35,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -78,7 +78,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>5</width> <height>21</height> @@ -150,7 +150,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kalzium/src/timewidget_impl.cpp b/kalzium/src/timewidget_impl.cpp index a08dbe9e..5f530899 100644 --- a/kalzium/src/timewidget_impl.cpp +++ b/kalzium/src/timewidget_impl.cpp @@ -13,17 +13,17 @@ ***************************************************************************/ #include "timewidget_impl.h" -#include <tqlayout.h> +#include <layout.h> #include <tqsizepolicy.h> #include <tqslider.h> -#include <tqtextedit.h> +#include <textedit.h> #include <knuminput.h> TimeWidgetIMPL::TimeWidgetIMPL( TQWidget *parent, const char* name ) : TimeWidget( parent, name ) { - text->tqsetAlignment( text->tqalignment() | TQt::WordBreak ); + text->setAlignment( text->alignment() | TQt::WordBreak ); text->setTextFormat( TQt::RichText ); text->setReadOnly( true ); text->setPaletteBackgroundColor( paletteBackgroundColor() ); diff --git a/kanagram/data/fruits.kvtml b/kanagram/data/fruits.kvtml index 22c838a8..60a8881a 100644 --- a/kanagram/data/fruits.kvtml +++ b/kanagram/data/fruits.kvtml @@ -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> diff --git a/kanagram/data/space.kvtml b/kanagram/data/space.kvtml index 8c86acf9..97f6b813 100644 --- a/kanagram/data/space.kvtml +++ b/kanagram/data/space.kvtml @@ -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> diff --git a/kanagram/data/vegetables.kvtml b/kanagram/data/vegetables.kvtml index 4c2bdb9f..b3356f3f 100644 --- a/kanagram/data/vegetables.kvtml +++ b/kanagram/data/vegetables.kvtml @@ -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> diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index 4a6f8787..bc3c8f21 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -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); diff --git a/kanagram/src/kanagramgame.cpp b/kanagram/src/kanagramgame.cpp index 207e607b..67212168 100644 --- a/kanagram/src/kanagramgame.cpp +++ b/kanagram/src/kanagramgame.cpp @@ -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); } diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp index 0354b522..6d4eeaea 100644 --- a/kanagram/src/keduvocdocument.cpp +++ b/kanagram/src/keduvocdocument.cpp @@ -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') diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp index 44a4772d..c1abc6b6 100644 --- a/kanagram/src/keduvockvtmlreader.cpp +++ b/kanagram/src/keduvockvtmlreader.cpp @@ -22,7 +22,7 @@ #include <kmessagebox.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include "keduvockvtmlreader.h" #include "keduvocdocument.h" @@ -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(); diff --git a/kanagram/src/keduvockvtmlwriter.cpp b/kanagram/src/keduvockvtmlwriter.cpp index 91f3e81e..760e68fa 100644 --- a/kanagram/src/keduvockvtmlwriter.cpp +++ b/kanagram/src/keduvockvtmlwriter.cpp @@ -18,7 +18,7 @@ #include <kdebug.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include "keduvockvtmlwriter.h" #include "keduvocdocument.h" diff --git a/kanagram/src/leitnersystemview.cpp b/kanagram/src/leitnersystemview.cpp index 1b8fc961..cbbb0400 100644 --- a/kanagram/src/leitnersystemview.cpp +++ b/kanagram/src/leitnersystemview.cpp @@ -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 ); diff --git a/kanagram/src/mainsettingswidget.ui b/kanagram/src/mainsettingswidget.ui index b8d29ccb..285d6d64 100644 --- a/kanagram/src/mainsettingswidget.ui +++ b/kanagram/src/mainsettingswidget.ui @@ -86,7 +86,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -114,7 +114,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> diff --git a/kanagram/src/newstuffwidget.ui b/kanagram/src/newstuffwidget.ui index 55163cdd..1b45c449 100644 --- a/kanagram/src/newstuffwidget.ui +++ b/kanagram/src/newstuffwidget.ui @@ -41,7 +41,7 @@ the button to get new vocabulary files.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kanagram/src/vocabeditwidget.ui b/kanagram/src/vocabeditwidget.ui index 370c7120..32104c5f 100644 --- a/kanagram/src/vocabeditwidget.ui +++ b/kanagram/src/vocabeditwidget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -63,7 +63,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -111,7 +111,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -119,7 +119,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -161,7 +161,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> diff --git a/kanagram/src/vocabsettingswidget.ui b/kanagram/src/vocabsettingswidget.ui index 71d754d8..6ef70fd1 100644 --- a/kanagram/src/vocabsettingswidget.ui +++ b/kanagram/src/vocabsettingswidget.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/kbruch/ChangeLog b/kbruch/ChangeLog index be301b7b..688ef69f 100644 --- a/kbruch/ChangeLog +++ b/kbruch/ChangeLog @@ -1,6 +1,6 @@ 2003-04-28 Sebastian Stein <seb.kde@hpfsc.de> - * fixed tqlayout problem with help of Dominique Devries + * fixed layout problem with help of Dominique Devries * compiler warnings (<iosteam>) removed by Dominique Devries @@ -10,7 +10,7 @@ 2003-04-24 Sebastian Stein <seb.kde@hpfsc.de> - * experiments with the tqlayout problem, but found no solution + * experiments with the layout problem, but found no solution * removed #define TRUE, used type bool instead diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp index c00c6dd0..f74bd0a9 100644 --- a/kbruch/src/exercisecompare.cpp +++ b/kbruch/src/exercisecompare.cpp @@ -24,7 +24,7 @@ /* these includes are needed for TQt support */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -129,7 +129,7 @@ ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name): // that the user can start typing without moving the focus m_signButton->setFocus(); - // show the whole tqlayout + // show the whole layout baseWidget->show(); // add tooltip and qwhatsthis help to the widget @@ -301,9 +301,9 @@ void ExerciseCompare::slotSignButtonClicked() { // in RTL desktops, we still need to allign the // execise to the left. On TQt4, you can set the direction - // of the tqlayout to LTR (instead of inherit), but on TQt3 + // of the layout to LTR (instead of inherit), but on TQt3 // the only way of fixing it is inserting the widgets in reversed - // order to the tqlayout. + // order to the layout. // // But... as an ugly hack, we can also display the "other" operation // thats damm ugly, but will work as well :) diff --git a/kbruch/src/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp index 0c97688a..3535eeae 100644 --- a/kbruch/src/exerciseconvert.cpp +++ b/kbruch/src/exerciseconvert.cpp @@ -26,7 +26,7 @@ /* these includes are needed for TQt support */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtooltip.h> @@ -120,9 +120,9 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name): // in RTL desktops, we still need to allign the // execise to the left. On TQt4, you can set the direction - // of the tqlayout to LTR (instead of inherit), but on TQt3 + // of the layout to LTR (instead of inherit), but on TQt3 // the only way of fixing it is inserting the widgets in reversed - // order to the tqlayout. + // order to the layout. // // if you need help with this feel free to contact me - Diego <elcuco@kde.org> ) // This should fix parts of bug #116831 @@ -163,7 +163,7 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name): // that the user can start typing without moving the focus numer_edit->setFocus(); - // show the whole tqlayout + // show the whole layout baseWidget->show(); // add tooltip and qwhatsthis help to the widget diff --git a/kbruch/src/exercisefactorize.cpp b/kbruch/src/exercisefactorize.cpp index aa12a766..d9b5f9d3 100644 --- a/kbruch/src/exercisefactorize.cpp +++ b/kbruch/src/exercisefactorize.cpp @@ -26,7 +26,7 @@ /* these includes are needed for TQt support */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtooltip.h> @@ -64,40 +64,40 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name): Form1Layout = new TQVBoxLayout( this, 11, 6, "Form1Layout"); - tqlayout9 = new TQVBoxLayout( 0, 0, 6, "tqlayout9"); + layout9 = new TQVBoxLayout( 0, 0, 6, "layout9"); // The following method fix the problem in // bug #116831, reverse order in RTL desktops. // Amit Ramon amit.ramon@kdemail.net - tqlayout4 = createFactorsLayout(); - tqlayout9->addLayout(tqlayout4); + layout4 = createFactorsLayout(); + layout9->addLayout(layout4); spacer2 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout9->addItem( spacer2 ); + layout9->addItem( spacer2 ); - tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); + layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); // The following method fix the problem in // bug #116831, reverse order in RTL desktops. // Amit Ramon amit.ramon@kdemail.net - tqlayout1 = createButtonsLayout(); - tqlayout2->addLayout(tqlayout1); + layout1 = createButtonsLayout(); + layout2->addLayout(layout1); m_removeLastFactorButton = new TQPushButton( this, "m_removeLastFactorButton" ); - tqlayout2->addWidget( m_removeLastFactorButton ); - tqlayout9->addLayout( tqlayout2 ); + layout2->addWidget( m_removeLastFactorButton ); + layout9->addLayout( layout2 ); spacer4 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout9->addItem( spacer4 ); + layout9->addItem( spacer4 ); - tqlayout7 = new TQHBoxLayout( 0, 0, 6, "tqlayout7"); + layout7 = new TQHBoxLayout( 0, 0, 6, "layout7"); spacer3 = new TQSpacerItem( 361, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout7->addItem( spacer3 ); + layout7->addItem( spacer3 ); m_checkButton = new TQPushButton( this, "m_checkButton" ); - tqlayout7->addWidget( m_checkButton ); - tqlayout9->addLayout( tqlayout7 ); - Form1Layout->addLayout( tqlayout9 ); + layout7->addWidget( m_checkButton ); + layout9->addLayout( layout7 ); + Form1Layout->addLayout( layout9 ); // the current task TQString tmp_str; @@ -228,16 +228,16 @@ void ExerciseFactorize::update() // // The following method was added to fix -// bug #116831 (reverse tqlayout in RTL desktops) +// bug #116831 (reverse layout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // -/** Create the tqlayout that hold the exercise widgets +/** Create the layout that hold the exercise widgets */ TQHBoxLayout* ExerciseFactorize::createFactorsLayout() { // first create all widgets - TQHBoxLayout* tqlayout = new TQHBoxLayout( 0, 0, 6, "tqlayout4"); + TQHBoxLayout* layout = new TQHBoxLayout( 0, 0, 6, "layout4"); m_taskLabel = new TQLabel( this, "m_taskLabel" ); @@ -258,46 +258,46 @@ TQHBoxLayout* ExerciseFactorize::createFactorsLayout() spacer1 = new TQSpacerItem( 25, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - // now add the widgets to the tqlayout. + // now add the widgets to the layout. // if we are in a RTL desktop, add them // in a reverse order if (TQApplication::reverseLayout()) { - tqlayout->addItem( spacer1 ); - tqlayout->addWidget( result_label ); - tqlayout->addWidget( m_factorsWidget ); - tqlayout->addWidget( m_factorsEnteredEdit ); - tqlayout->addWidget( m_equalSignLabel ); - tqlayout->addWidget( m_taskLabel ); + layout->addItem( spacer1 ); + layout->addWidget( result_label ); + layout->addWidget( m_factorsWidget ); + layout->addWidget( m_factorsEnteredEdit ); + layout->addWidget( m_equalSignLabel ); + layout->addWidget( m_taskLabel ); } else { - tqlayout->addWidget( m_taskLabel ); - tqlayout->addWidget( m_equalSignLabel ); - tqlayout->addWidget( m_factorsEnteredEdit ); - tqlayout->addWidget( m_factorsWidget ); - tqlayout->addWidget( result_label ); - tqlayout->addItem( spacer1 ); + layout->addWidget( m_taskLabel ); + layout->addWidget( m_equalSignLabel ); + layout->addWidget( m_factorsEnteredEdit ); + layout->addWidget( m_factorsWidget ); + layout->addWidget( result_label ); + layout->addItem( spacer1 ); } - return tqlayout; + return layout; } // // The following method was added to fix -// bug #116831 (reverse tqlayout in RTL desktops) +// bug #116831 (reverse layout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // -/** Create the tqlayout that hold the exercise widgets +/** Create the layout that hold the exercise widgets */ TQGridLayout* ExerciseFactorize::createButtonsLayout() { const int _COLS = 4; // number of buttons in each row const int _ROWS = 2; // number of rows - TQGridLayout* tqlayout = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout1"); + TQGridLayout* layout = new TQGridLayout( 0, 1, 1, 0, 6, "layout1"); // first row buttons m_factor2Button = new TQPushButton( this, "m_factor2Button" ); @@ -348,12 +348,12 @@ TQGridLayout* ExerciseFactorize::createButtonsLayout() for (int col = 0; col < _COLS; col++) { - tqlayout->addWidget(buttons[row][buttonIdx], row, col ); + layout->addWidget(buttons[row][buttonIdx], row, col ); buttonIdx += step; } } - return tqlayout; + return layout; } diff --git a/kbruch/src/exercisefactorize.h b/kbruch/src/exercisefactorize.h index 8a6f5c2c..c5ded345 100644 --- a/kbruch/src/exercisefactorize.h +++ b/kbruch/src/exercisefactorize.h @@ -116,14 +116,14 @@ private: // // the following two methods were added to fix - // bug #116831 (reverse tqlayout in RTL desktops) + // bug #116831 (reverse layout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // - /** create the factor widgets tqlayout */ + /** create the factor widgets layout */ TQHBoxLayout* createFactorsLayout(); - /** create the (answer) buttons tqlayout */ + /** create the (answer) buttons layout */ TQGridLayout* createButtonsLayout(); @@ -136,14 +136,14 @@ private: protected: TQVBoxLayout* Form1Layout; - TQVBoxLayout* tqlayout9; + TQVBoxLayout* layout9; TQSpacerItem* spacer4; - TQHBoxLayout* tqlayout4; + TQHBoxLayout* layout4; TQSpacerItem* spacer1; TQSpacerItem* spacer2; - TQVBoxLayout* tqlayout2; - TQGridLayout* tqlayout1; - TQHBoxLayout* tqlayout7; + TQVBoxLayout* layout2; + TQGridLayout* layout1; + TQHBoxLayout* layout7; TQSpacerItem* spacer3; private slots: diff --git a/kbruch/src/fractionbasewidget.cpp b/kbruch/src/fractionbasewidget.cpp index b8dbfacd..c1fec755 100644 --- a/kbruch/src/fractionbasewidget.cpp +++ b/kbruch/src/fractionbasewidget.cpp @@ -161,7 +161,7 @@ void FractionBaseWidget::setColorAndFont() /* set font */ m_font = SettingsClass::taskFont(); - // tqrepaint + // repaint update(); return; diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp index ed0836c8..f04fc17a 100644 --- a/kbruch/src/mainqtwidget.cpp +++ b/kbruch/src/mainqtwidget.cpp @@ -109,7 +109,7 @@ MainQtWidget::MainQtWidget() #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3) #else - resize(TQSize(TQMAX(toolBar()->tqsizeHint().width(), tqsizeHint().width()), tqsizeHint().height())); + resize(TQSize(TQMAX(toolBar()->sizeHint().width(), sizeHint().width()), sizeHint().height())); #endif // now show the last exercise m_exercises->showPage(SettingsClass::activeExercise()); @@ -243,7 +243,7 @@ void MainQtWidget::setupActions() #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3) if (!initialGeometrySet()) - resize( TQSize(725, 330).expandedTo(tqminimumSizeHint())); + resize( TQSize(725, 330).expandedTo(minimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); #endif diff --git a/kbruch/src/ratio.h b/kbruch/src/ratio.h index c9ee687a..f0b69d92 100644 --- a/kbruch/src/ratio.h +++ b/kbruch/src/ratio.h @@ -18,7 +18,7 @@ #ifndef RATIO_H #define RATIO_H -#include <tqtextstream.h> +#include <textstream.h> /** Represents a ratio * This class represents 1 ratio. There are several functions provided to diff --git a/kbruch/src/statisticsview.cpp b/kbruch/src/statisticsview.cpp index 6c73b2b8..8e6db5d6 100644 --- a/kbruch/src/statisticsview.cpp +++ b/kbruch/src/statisticsview.cpp @@ -20,7 +20,7 @@ /* the includes are needed for TQt support */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -48,17 +48,17 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name): /* set the caption of the window */ // setCaption(i18n("Statistics")); - /* add a tqlayout as a base */ - tqlayout1 = new TQVBoxLayout(this); - tqlayout1->setSpacing(6); - tqlayout1->setMargin(6); + /* add a layout as a base */ + layout1 = new TQVBoxLayout(this); + layout1->setSpacing(6); + layout1->setMargin(6); /* now add a v-spacer */ TQSpacerItem * v_spacer = new TQSpacerItem(1, 1); - tqlayout1->addItem(v_spacer); + layout1->addItem(v_spacer); /* create a grid to show the labels */ - labelGrid = new TQGridLayout(tqlayout1, 3, 2); + labelGrid = new TQGridLayout(layout1, 3, 2); /* add 6 labels to the grid */ info1Label = new TQLabel(this); @@ -112,10 +112,10 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name): /* now add a v-spacer */ v_spacer = new TQSpacerItem(1, 1); - tqlayout1->addItem(v_spacer); + layout1->addItem(v_spacer); /* the Reset button */ - buttonLayout = new TQHBoxLayout(tqlayout1); + buttonLayout = new TQHBoxLayout(layout1); resetBtn = new TQPushButton(i18n("&Reset"), this); TQObject::connect(resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetStatistics())); buttonLayout->addWidget(resetBtn); @@ -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); } } diff --git a/kbruch/src/statisticsview.h b/kbruch/src/statisticsview.h index 9b2821b8..c95eec0e 100644 --- a/kbruch/src/statisticsview.h +++ b/kbruch/src/statisticsview.h @@ -66,7 +66,7 @@ private: TQPushButton * resetBtn; TQHBoxLayout * buttonLayout; - TQVBoxLayout * tqlayout1; + TQVBoxLayout * layout1; TQGridLayout * labelGrid; TQLabel * result1Label; TQLabel * result2Label; diff --git a/kbruch/src/taskview.cpp b/kbruch/src/taskview.cpp index 2cb4f8ec..9c1b1ace 100644 --- a/kbruch/src/taskview.cpp +++ b/kbruch/src/taskview.cpp @@ -26,7 +26,7 @@ /* these includes are needed for TQt support */ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtooltip.h> @@ -114,9 +114,9 @@ TaskView::TaskView(TQWidget * parent, const char * name, bool padd_sub, // --- that is the end of the horizontal line --- // in RTL desktops, we still need to allign the // execise to the left. On TQt4, you can set the direction - // of the tqlayout to LTR (instead of inherit), but on TQt3 + // of the layout to LTR (instead of inherit), but on TQt3 // the only way of fixing it is inserting the widgets in reversed - // order to the tqlayout. + // order to the layout. // // if you need help with this feel free to contact me - Diego <elcuco@kde.org> ) // This should fix parts of bug #116831 @@ -158,10 +158,10 @@ TaskView::TaskView(TQWidget * parent, const char * name, bool padd_sub, // that the user can start typing without moving the focus numer_edit->setFocus(); - // show the whole tqlayout + // show the whole layout baseWidget->show(); - // show the whole tqlayout + // show the whole layout m_taskWidget->show(); m_resultWidget->hide(); diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui index 8938ac96..66f45d15 100644 --- a/kbruch/src/taskvieweroptionsbase.ui +++ b/kbruch/src/taskvieweroptionsbase.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -42,7 +42,7 @@ </widget> <widget class="TQGroupBox"> <property name="name"> - <cstring>tqcolorGroupBox</cstring> + <cstring>colorGroupBox</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -57,7 +57,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <property name="geometry"> <rect> diff --git a/keduca/keduca/configdialogbase.ui b/keduca/keduca/configdialogbase.ui index 7eff82a8..a5926ad1 100644 --- a/keduca/keduca/configdialogbase.ui +++ b/keduca/keduca/configdialogbase.ui @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>51</height> diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp index 1fd7465e..edeb42fd 100644 --- a/keduca/keduca/kcheckeduca.cpp +++ b/keduca/keduca/kcheckeduca.cpp @@ -38,7 +38,7 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ int extra_width, indicator_width; extra_width = 8; - indicator_width = tqstyle().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0); + indicator_width = tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0); y = 0; x = indicator_width + extra_width; //### @@ -61,14 +61,14 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ yo = (cr.height()-rh)/2; if ( !isEnabled() ) { - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor( TQColorGroup::Text, cg.light() ); _doc->draw(p, cr.x()+xo+1, cr.y()+yo+1, cr, cg, 0); } - _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0); + _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0); if ( hasFocus() ) { -// TQRect br = tqstyle().tqitemRect( p, x, y, rw, rh+yo, +// TQRect br = tqstyle().itemRect( p, x, y, rw, rh+yo, // AlignLeft|AlignVCenter|ShowPrefix, // isEnabled(), // pixmap(), text().visual() ); @@ -80,6 +80,6 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ br.setBottom( br.bottom()+2); br = br.intersect( TQRect(0,0,rw, rh+yo ) ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup()); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); } } diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index 5c39c0ed..508a137a 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -53,7 +53,7 @@ Keduca::Keduca( TQWidget* parent, const char *name, WFlags f ) kdFatal() << "The library \"libkeducapart\" could not be found. Aborting." << endl; } if (!initialGeometrySet()) - resize( TQSize(550, 450).expandedTo(tqminimumSizeHint())); + resize( TQSize(550, 450).expandedTo(minimumSizeHint())); } Keduca::~Keduca() diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index f118f3ad..a3252210 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -22,7 +22,7 @@ #include <kiconloader.h> #include <kconfig.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqbuttongroup.h> @@ -45,10 +45,10 @@ void KEducaPrefs::setPageGeneral() TQButtonGroup *buttonGroup1 = new TQButtonGroup( mainFrame, "ButtonGroup1" ); buttonGroup1->setTitle( i18n( "General" ) ); buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->tqlayout()->setSpacing( 0 ); - buttonGroup1->tqlayout()->setMargin( 0 ); - TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() ); - buttonGroup1Layout->tqsetAlignment( TQt::AlignTop ); + buttonGroup1->layout()->setSpacing( 0 ); + buttonGroup1->layout()->setMargin( 0 ); + TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() ); + buttonGroup1Layout->setAlignment( TQt::AlignTop ); buttonGroup1Layout->setSpacing( 6 ); buttonGroup1Layout->setMargin( 11 ); @@ -63,10 +63,10 @@ void KEducaPrefs::setPageGeneral() TQGroupBox *GroupBox1 = new TQGroupBox( mainFrame, "GroupBox7" ); GroupBox1->setTitle( i18n( "Order" ) ); GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->tqlayout()->setSpacing( 0 ); - GroupBox1->tqlayout()->setMargin( 0 ); - TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() ); - GroupBox1Layout->tqsetAlignment( TQt::AlignTop ); + GroupBox1->layout()->setSpacing( 0 ); + GroupBox1->layout()->setMargin( 0 ); + TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); + GroupBox1Layout->setAlignment( TQt::AlignTop ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index f7871e5c..a369c112 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -33,9 +33,9 @@ #include <kio/netaccess.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> KEducaView::KEducaView( TQWidget *parent, const char *name ) : TQWidgetStack( parent, name ), _keducaFile( 0 ), _timeoutTimer( 0 ) @@ -60,7 +60,7 @@ void KEducaView::init() // Intro Screen _introWidget = new TQLabel( this, "introScreen" ); _introWidget->setBackgroundColor( TQt::white ); - _introWidget->tqsetAlignment( AlignCenter ); + _introWidget->setAlignment( AlignCenter ); _introWidget->setPixmap( TQPixmap( locate("data","keduca/pics/keduca_init.png") ) ); addWidget( _introWidget, 0 ); @@ -121,7 +121,7 @@ void KEducaView::slotButtonNext() _questionText->countdown(0); } - if( ( visibleWidget() == _questionWidget ) && !_isInittqStatus ) + if( ( visibleWidget() == _questionWidget ) && !_isInitStatus ) setResults(); _buttonGroup->clearAnswers(); @@ -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); @@ -404,7 +404,7 @@ bool KEducaView::openURL( const KURL &url) if ( !_keducaFile->openFile( url ) ) return false; - _isInittqStatus = true; + _isInitStatus = true; _results = "<HTML>"; _correctAnswer = 0; _correctPoints = 0; @@ -436,12 +436,12 @@ void KEducaView::configWrite() Settings::writeConfig(); } -/** current tqStatus Points */ +/** current Status Points */ TQString KEducaView::currentStatusPoints() { - TQString temptqStatus; + TQString tempStatus; - temptqStatus = insertTable() + tempStatus = insertTable() + insertRow( i18n("Statistics"), true, 4) + insertRow( i18n("Correct questions"), TQString().setNum( _correctAnswer ), @@ -449,20 +449,20 @@ TQString KEducaView::currentStatusPoints() TQString().setNum( _incorrectAnswer ), true); if( _keducaFile->getTotalPoints() > 0 ) - temptqStatus += insertRow( i18n("Total points"), true, 4 ) + tempStatus += insertRow( i18n("Total points"), true, 4 ) + insertRow( i18n("Correct points"), TQString().setNum( _correctPoints ), i18n("Incorrect points"), TQString().setNum( _incorrectPoints ), true ); if( _keducaFile->getTotalTime() > 0 ) - temptqStatus += insertRow( i18n("Time"), true, 4 ) + tempStatus += insertRow( i18n("Time"), true, 4 ) + insertRow( i18n("Total time"), TQString().setNum( _keducaFile->getTotalTime() ), i18n("Time in tests"), TQString().setNum( _currentTime ), true ); - temptqStatus += insertTableClose(); - return temptqStatus; + tempStatus += insertTableClose(); + return tempStatus; } /** Set HTML table view with correct and incorrect answers */ @@ -503,15 +503,15 @@ TQString KEducaView::getTableQuestion( bool isCorrect, const TQString &correct, /** Define the next questions (random, secuencial) */ bool KEducaView::questionNext() { - if( !Settings::randomQuestions() && !_isInittqStatus ) + if( !Settings::randomQuestions() && !_isInitStatus ) { _keducaFile->recordNext(); return _keducaFile->recordEOF() ? false : true; } - if( _isInittqStatus ) + if( _isInitStatus ) { - _isInittqStatus = false; + _isInitStatus = false; if( !Settings::randomQuestions() ) return true; } diff --git a/keduca/keduca/keducaview.h b/keduca/keduca/keducaview.h index 45387f0f..fd91dea3 100644 --- a/keduca/keduca/keducaview.h +++ b/keduca/keduca/keducaview.h @@ -20,7 +20,7 @@ #include <kurl.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsplitter.h> #include <tqwidgetstack.h> @@ -115,7 +115,7 @@ private: /** Current results */ TQString _currentResults; /** If is init window */ - bool _isInittqStatus; + bool _isInitStatus; TQTimer *_timeoutTimer; /** Num of correct answers */ int _correctAnswer; diff --git a/keduca/keduca/kgroupeduca.cpp b/keduca/keduca/kgroupeduca.cpp index 747b65da..9f7a2413 100644 --- a/keduca/keduca/kgroupeduca.cpp +++ b/keduca/keduca/kgroupeduca.cpp @@ -54,7 +54,7 @@ void KGroupEduca::insertAnswer( const TQString& text) answer = new KCheckEduca( _vbox2 ); break; } - answer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) ); + answer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0 ) ); answer->setText( text ); answer->show(); insert(answer); diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp index fee2abc7..6caea7f2 100644 --- a/keduca/keduca/kquestion.cpp +++ b/keduca/keduca/kquestion.cpp @@ -19,7 +19,7 @@ #include "kquestion.h" #include "kquestion.moc" -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqvbox.h> #include <tqtimer.h> @@ -51,7 +51,7 @@ void KQuestion::initGUI() _picture->setPalette( TQPalette( TQt::white ) ); _countdownWidget = new KProgress( picBox ); - _countdownWidget->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, + _countdownWidget->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); _countdownWidget->setFormat( i18n( "%v seconds left" ) ); @@ -60,7 +60,7 @@ void KQuestion::initGUI() _view->setFrameShape( TQTextEdit::NoFrame ); _view->setHScrollBarMode( TQTextEdit::AlwaysOff ); _view->setTextFormat( TQTextEdit::RichText ); - _view->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) ); + _view->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, true ) ); } /** Set text */ diff --git a/keduca/keduca/kquestion.h b/keduca/keduca/kquestion.h index 23998da9..5364e800 100644 --- a/keduca/keduca/kquestion.h +++ b/keduca/keduca/kquestion.h @@ -20,7 +20,7 @@ #define KQUESTION_H #include <tqhbox.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlabel.h> class TQTimer; diff --git a/keduca/keduca/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp index 9b8ffe4f..4cf0185f 100644 --- a/keduca/keduca/kradioeduca.cpp +++ b/keduca/keduca/kradioeduca.cpp @@ -37,7 +37,7 @@ void KRadioEduca::drawButtonLabel( TQPainter *p) int x, y, w, h; int extra_width, indicator_width; extra_width = 8; - indicator_width = tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0); + indicator_width = tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0); y = 0; x = indicator_width + extra_width; //### @@ -60,14 +60,14 @@ void KRadioEduca::drawButtonLabel( TQPainter *p) yo = (cr.height()-rh)/2; if (!isEnabled() ) { - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor( TQColorGroup::Text, cg.light() ); _doc->draw(p, cr.x()+xo+1, cr.y()+yo+1, cr, cg, 0); } - _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, tqcolorGroup(), 0); + _doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0); if ( hasFocus() ) { -// TQRect br = tqstyle().tqitemRect( p, x, y, rw, rh+yo, +// TQRect br = tqstyle().itemRect( p, x, y, rw, rh+yo, // AlignLeft|AlignVCenter|ShowPrefix, // isEnabled(), // pixmap(), text().visual() ); @@ -78,6 +78,6 @@ void KRadioEduca::drawButtonLabel( TQPainter *p) br.setTop( br.top()-2 ); br.setBottom( br.bottom()+2); br = br.intersect( TQRect(0,0,rw, rh+yo ) ); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup()); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); } } diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp index eb023a79..6462f67d 100644 --- a/keduca/keducabuilder/kcontroladdedit.cpp +++ b/keduca/keducabuilder/kcontroladdedit.cpp @@ -29,7 +29,7 @@ // TQt includes #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> KControlAddEdit::KControlAddEdit(TQWidget *parent, const char *name, bool modal, WFlags f) : KControlAddEditBase(parent, name, modal, f), diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui index b7e042b4..c5736e3d 100644 --- a/keduca/keducabuilder/kcontroladdeditbase.ui +++ b/keduca/keducabuilder/kcontroladdeditbase.ui @@ -30,13 +30,13 @@ <property name="name"> <cstring>frame3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>125</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>125</width> <height>32767</height> @@ -59,13 +59,13 @@ <property name="name"> <cstring>_questionPreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>100</height> @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -130,7 +130,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -160,7 +160,7 @@ <property name="text"> <string>&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>&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>&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&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&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&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>&Explain:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -293,7 +293,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -314,7 +314,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -325,7 +325,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -346,7 +346,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>20</height> @@ -377,13 +377,13 @@ <property name="name"> <cstring>frame3_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>125</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>125</width> <height>32767</height> @@ -406,13 +406,13 @@ <property name="name"> <cstring>_answerPreview</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>100</height> @@ -448,7 +448,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -477,7 +477,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -502,7 +502,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -510,7 +510,7 @@ </property> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -531,7 +531,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -552,7 +552,7 @@ <property name="text"> <string>&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>&Value:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -575,7 +575,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -605,7 +605,7 @@ <property name="text"> <string>&Points:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -630,7 +630,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -679,7 +679,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <vbox> <property name="name"> @@ -717,7 +717,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>10</height> @@ -756,7 +756,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index 49075f59..98167c3c 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -24,7 +24,7 @@ #include <klineedit.h> #include <kcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> KControlHeader::KControlHeader(FileRead *keducaFile, TQWidget *parent, const char *name ) : KDialogBase(Swallow, i18n("Document Information"), Ok|Cancel, Ok, parent, name, true, true) @@ -82,10 +82,10 @@ void KControlHeader::init() TQGroupBox *GroupBox7 = new TQGroupBox( mainView, "GroupBox7" ); GroupBox7->setTitle( i18n( "Description" ) ); GroupBox7->setColumnLayout(0, Qt::Vertical ); - GroupBox7->tqlayout()->setSpacing( 0 ); - GroupBox7->tqlayout()->setMargin( 0 ); - TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->tqlayout() ); - GroupBox7Layout->tqsetAlignment( TQt::AlignTop ); + GroupBox7->layout()->setSpacing( 0 ); + GroupBox7->layout()->setMargin( 0 ); + TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() ); + GroupBox7Layout->setAlignment( TQt::AlignTop ); GroupBox7Layout->setSpacing( 6 ); GroupBox7Layout->setMargin( 11 ); @@ -95,7 +95,7 @@ void KControlHeader::init() TQLabel *TextLabel10 = new TQLabel( GroupBox7, "TextLabel10" ); TextLabel10->setText( i18n( "Type:" )); - TextLabel10->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel10->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout13->addWidget( TextLabel10, 2, 0 ); @@ -108,7 +108,7 @@ void KControlHeader::init() TQLabel *TextLabel11 = new TQLabel( GroupBox7, "TextLabel11" ); TextLabel11->setText( i18n( "Level:" )); - TextLabel11->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel11->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout12->addWidget( TextLabel11 ); _headerLevel = new KComboBox( FALSE, GroupBox7, "_headerLevel" ); @@ -117,7 +117,7 @@ void KControlHeader::init() TQLabel *TextLabel12 = new TQLabel( GroupBox7, "TextLabel12" ); TextLabel12->setText( i18n( "Language:" )); - TextLabel12->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel12->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout13->addWidget( TextLabel12, 3, 0 ); _headerLang = new KLanguageCombo( GroupBox7, "_headerLang" ); @@ -126,7 +126,7 @@ void KControlHeader::init() TQLabel *TextLabel9 = new TQLabel( GroupBox7, "TextLabel9" ); TextLabel9->setText( i18n( "Category:" )); - TextLabel9->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel9->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout13->addWidget( TextLabel9, 1, 0 ); @@ -138,7 +138,7 @@ void KControlHeader::init() TQLabel *TextLabel8 = new TQLabel( GroupBox7, "TextLabel8" ); TextLabel8->setText( i18n( "Title:" )); - TextLabel8->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel8->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout13->addWidget( TextLabel8, 0, 0 ); GroupBox7Layout->addLayout( Layout13 ); @@ -147,10 +147,10 @@ void KControlHeader::init() TQGroupBox *GroupBox8 = new TQGroupBox( mainView, "GroupBox8" ); GroupBox8->setTitle( i18n( "Picture" ) ); GroupBox8->setColumnLayout(0, Qt::Vertical ); - GroupBox8->tqlayout()->setSpacing( 0 ); - GroupBox8->tqlayout()->setMargin( 0 ); - TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->tqlayout() ); - GroupBox8Layout->tqsetAlignment( TQt::AlignTop ); + GroupBox8->layout()->setSpacing( 0 ); + GroupBox8->layout()->setMargin( 0 ); + TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() ); + GroupBox8Layout->setAlignment( TQt::AlignTop ); GroupBox8Layout->setSpacing( 6 ); GroupBox8Layout->setMargin( 11 ); @@ -165,10 +165,10 @@ void KControlHeader::init() TQGroupBox *GroupBox6 = new TQGroupBox( mainView, "GroupBox6" ); GroupBox6->setTitle( i18n( "Author" ) ); GroupBox6->setColumnLayout(0, Qt::Vertical ); - GroupBox6->tqlayout()->setSpacing( 0 ); - GroupBox6->tqlayout()->setMargin( 0 ); - TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->tqlayout() ); - GroupBox6Layout->tqsetAlignment( TQt::AlignTop ); + GroupBox6->layout()->setSpacing( 0 ); + GroupBox6->layout()->setMargin( 0 ); + TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() ); + GroupBox6Layout->setAlignment( TQt::AlignTop ); GroupBox6Layout->setSpacing( 6 ); GroupBox6Layout->setMargin( 11 ); @@ -182,19 +182,19 @@ void KControlHeader::init() TQLabel *TextLabel7 = new TQLabel( GroupBox6, "TextLabel7" ); TextLabel7->setText( i18n( "Web page:" )); - TextLabel7->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel7->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); GroupBox6Layout->addWidget( TextLabel7, 2, 0 ); TQLabel *TextLabel6 = new TQLabel( GroupBox6, "TextLabel6" ); TextLabel6->setText( i18n( "Email:" )); - TextLabel6->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel6->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); GroupBox6Layout->addWidget( TextLabel6, 1, 0 ); TQLabel *TextLabel5 = new TQLabel( GroupBox6, "TextLabel5" ); TextLabel5->setText( i18n( "Name:" )); - TextLabel5->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + TextLabel5->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); GroupBox6Layout->addWidget( TextLabel5, 0, 0 ); @@ -246,12 +246,12 @@ void KControlHeader::insertHeader() /** Load country list */ void KControlHeader::loadCountryList(KLanguageCombo *combo) { - TQString sub = TQString::tqfromLatin1("l10n/"); + TQString sub = TQString::fromLatin1("l10n/"); // clear the list combo->clear(); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop")); + TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); regionlist.sort(); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -268,23 +268,23 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) if (index != -1) tag.truncate(index); KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name")); combo->insertSubmenu( name, '-' + tag, sub ); } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop")); + TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); countrylist.sort(); for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name")); - TQString submenu = '-' + entry.readEntry(TQString::tqfromLatin1("Region")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name")); + TQString submenu = '-' + entry.readEntry(TQString::fromLatin1("Region")); TQString tag = *it; int index = tag.findRev('/'); diff --git a/keduca/keducabuilder/kcontrolheaderbase.ui b/keduca/keducabuilder/kcontrolheaderbase.ui index 24dbbf09..1c94005d 100644 --- a/keduca/keducabuilder/kcontrolheaderbase.ui +++ b/keduca/keducabuilder/kcontrolheaderbase.ui @@ -23,13 +23,13 @@ <property name="name"> <cstring>frame3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>50</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>50</height> @@ -59,13 +59,13 @@ <property name="name"> <cstring>frame4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>125</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>125</width> <height>32767</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>21</height> @@ -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> @@ -188,7 +188,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -209,7 +209,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -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> @@ -344,7 +344,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>40</height> @@ -389,7 +389,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index 6af778b8..d0832d29 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -32,7 +32,7 @@ #include <kmessagebox.h> #include <kprinter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqpaintdevicemetrics.h> #include <tqpainter.h> @@ -91,7 +91,7 @@ void KEducaBuilder::init() _split->setOrientation( Qt::Vertical ); _listAnswer = new KListBox( _split, "_listAnswer" ); - _listAnswer->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) ); + _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) ); connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotPreview(TQListBoxItem *) ) ); connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotEditbyList(TQListBoxItem *) ) ); @@ -103,7 +103,7 @@ void KEducaBuilder::init() setCentralWidget( mainView ); if (!initialGeometrySet()) - resize( TQSize(500, 400).expandedTo(tqminimumSizeHint())); + resize( TQSize(500, 400).expandedTo(minimumSizeHint())); setupGUI( ToolBar | Keys | StatusBar | Create, "keducabuilderui.rc" ); setAutoSaveSettings(); } @@ -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; diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h index feb9ec8c..f69e5019 100644 --- a/keduca/keducabuilder/keducabuilder.h +++ b/keduca/keducabuilder/keducabuilder.h @@ -25,7 +25,7 @@ #include <klistbox.h> #include <kaction.h> -#include <tqtextview.h> +#include <textview.h> #include <tqsplitter.h> /**Main control documents diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp index 01bbc260..22e196e7 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.cpp +++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp @@ -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()) diff --git a/keduca/keducabuilder/keducaeditorstartdialogbase.ui b/keduca/keducabuilder/keducaeditorstartdialogbase.ui index c873a844..e7686ff9 100644 --- a/keduca/keducabuilder/keducaeditorstartdialogbase.ui +++ b/keduca/keducabuilder/keducaeditorstartdialogbase.ui @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -154,7 +154,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/keduca/keducabuilder/klangcombo.cpp b/keduca/keducabuilder/klangcombo.cpp index 66f77e45..05a36669 100644 --- a/keduca/keducabuilder/klangcombo.cpp +++ b/keduca/keducabuilder/klangcombo.cpp @@ -38,14 +38,14 @@ KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name) void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu) { - TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")"); - TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png"))); + TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")"); + TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png"))); insertItem(TQIconSet(flag), output, path, submenu); } void KLanguageCombo::changeLanguage(const TQString& name, int i) { if (i < 0 || i >= count()) return; - TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")"); + TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")"); changeItem(output, i); } diff --git a/keduca/keducabuilder/ktagcombobox.cpp b/keduca/keducabuilder/ktagcombobox.cpp index e6d0e617..081d4254 100644 --- a/keduca/keducabuilder/ktagcombobox.cpp +++ b/keduca/keducabuilder/ktagcombobox.cpp @@ -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) @@ -170,7 +170,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev) // Text TQRect clip(2, 2, width() - 4, height() - 4); if ( hasFocus()) - p.setPen( tqcolorGroup().highlightedText() ); + p.setPen( colorGroup().highlightedText() ); p.drawText(clip, AlignCenter | SingleLine, _popup->text( _current )); // Icon @@ -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) diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui index 9a11d8b4..5150ee42 100644 --- a/keduca/libkeduca/kgallerydialogbase.ui +++ b/keduca/libkeduca/kgallerydialogbase.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="text"> <string>Name:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -58,7 +58,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -81,7 +81,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>10</height> @@ -108,7 +108,7 @@ <property name="name"> <cstring>buttonAdd</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -264,7 +264,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -274,7 +274,7 @@ <property name="name"> <cstring>buttonHelp</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -294,7 +294,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -305,7 +305,7 @@ <property name="name"> <cstring>buttonOpen</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -322,7 +322,7 @@ <property name="name"> <cstring>buttonCancel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> diff --git a/kgeography/src/answer.cpp b/kgeography/src/answer.cpp index 428ceb20..30afa989 100644 --- a/kgeography/src/answer.cpp +++ b/kgeography/src/answer.cpp @@ -10,7 +10,7 @@ #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kdialog.h> @@ -93,7 +93,7 @@ void userAnswer::putWidgets(TQWidget *w, TQGridLayout *lay, int row) const TQLabel *l; l = new TQLabel(w); l -> setPixmap(v -> toImage()); - l -> tqsetAlignment(TQt::AlignHCenter); + l -> setAlignment(TQt::AlignHCenter); l -> setMargin(KDialog::marginHint() / 2); widgets[i] = l; } @@ -104,8 +104,8 @@ void userAnswer::putWidgets(TQWidget *w, TQGridLayout *lay, int row) const if (!p_correct) { TQColor back, fore; - back = widgets[0] -> tqcolorGroup().highlight(); - fore = widgets[0] -> tqcolorGroup().highlightedText(); + back = widgets[0] -> colorGroup().highlight(); + fore = widgets[0] -> colorGroup().highlightedText(); for (int i = 0; i < 3; i++) { widgets[i] -> setPaletteBackgroundColor(back); diff --git a/kgeography/src/answersdialog.cpp b/kgeography/src/answersdialog.cpp index 7ff19bde..ce7de036 100644 --- a/kgeography/src/answersdialog.cpp +++ b/kgeography/src/answersdialog.cpp @@ -11,7 +11,7 @@ #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqscrollview.h> #include "answer.h" @@ -40,7 +40,7 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector<userAnswer> & bigFont.setPointSize(24); l1 = new TQLabel(question, p_container); l1 -> setFont(bigFont); - l1 -> tqsetAlignment(TQt::AlignCenter); + l1 -> setAlignment(TQt::AlignCenter); lay->addMultiCellWidget(l1, 0, 0, 0, 4); // Headers @@ -67,8 +67,8 @@ 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 -> tqsetAlignment(TQt::AlignCenter); + 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); p_sv -> addChild(p_container); diff --git a/kgeography/src/askwidget.cpp b/kgeography/src/askwidget.cpp index 95ca4fcd..87d1d09a 100644 --- a/kgeography/src/askwidget.cpp +++ b/kgeography/src/askwidget.cpp @@ -21,7 +21,7 @@ askWidget::askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool s if (showLabel) { p_answers = new TQLabel(w); - p_answers -> tqsetAlignment(AlignTop | AlignHCenter); + p_answers -> setAlignment(AlignTop | AlignHCenter); resetAnswers(); p_answers -> show(); } @@ -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" diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp index 9fb0c90b..1d8b784d 100644 --- a/kgeography/src/boxasker.cpp +++ b/kgeography/src/boxasker.cpp @@ -16,7 +16,7 @@ #include <kpushbutton.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqvbuttongroup.h> diff --git a/kgeography/src/capitaldivisionasker.cpp b/kgeography/src/capitaldivisionasker.cpp index c2698eb0..ffea1407 100644 --- a/kgeography/src/capitaldivisionasker.cpp +++ b/kgeography/src/capitaldivisionasker.cpp @@ -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())); diff --git a/kgeography/src/divisioncapitalasker.cpp b/kgeography/src/divisioncapitalasker.cpp index 2b136a58..b87437a2 100644 --- a/kgeography/src/divisioncapitalasker.cpp +++ b/kgeography/src/divisioncapitalasker.cpp @@ -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())); diff --git a/kgeography/src/divisionflagasker.cpp b/kgeography/src/divisionflagasker.cpp index 0b5d72be..79641b25 100644 --- a/kgeography/src/divisionflagasker.cpp +++ b/kgeography/src/divisionflagasker.cpp @@ -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); diff --git a/kgeography/src/flagdivisionasker.cpp b/kgeography/src/flagdivisionasker.cpp index 125fc64d..4dc7aa23 100644 --- a/kgeography/src/flagdivisionasker.cpp +++ b/kgeography/src/flagdivisionasker.cpp @@ -11,7 +11,7 @@ #include <klocale.h> #include <tqimage.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include "flagdivisionasker.h" diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp index de850afb..6636b8de 100644 --- a/kgeography/src/kgeography.cpp +++ b/kgeography/src/kgeography.cpp @@ -18,7 +18,7 @@ #include <kmenubar.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqsize.h> #include <tqtimer.h> @@ -45,7 +45,7 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi TQVBox *p_leftWidget = new TQVBox(p_bigWidget); p_currentMap = new TQLabel(p_leftWidget); - p_currentMap -> tqsetAlignment(AlignCenter); + p_currentMap -> setAlignment(AlignCenter); p_consult = new KPushButton(i18n("&Browse Map"), p_leftWidget); TQWhatsThis::add(p_consult, i18n("In this section left click on any part of the map to learn about the divisions" )); p_askMap = new KPushButton(i18n("&Click Division in Map..."), p_leftWidget); @@ -59,8 +59,8 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi p_askDivisionFlags = new KPushButton(i18n("G&uess Flag of Division..."), p_leftWidget); TQWhatsThis::add(p_askDivisionFlags, i18n("In this quiz you have to guess the flag of a division given its name")); p_underLeftWidget = new TQVBox(p_leftWidget); - p_underLeftWidget -> tqlayout() -> setSpacing(KDialog::spacingHint()); - p_underLeftWidget -> tqlayout() -> setMargin(KDialog::marginHint()); + p_underLeftWidget -> layout() -> setSpacing(KDialog::spacingHint()); + p_underLeftWidget -> layout() -> setMargin(KDialog::marginHint()); p_leftWidget -> setStretchFactor(p_underLeftWidget, 1); setCentralWidget(p_bigWidget); @@ -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); diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp index 47de1dff..9942ad70 100644 --- a/kgeography/src/mapasker.cpp +++ b/kgeography/src/mapasker.cpp @@ -12,7 +12,7 @@ #include <kmessagebox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqscrollbar.h> #include <tqstring.h> @@ -51,9 +51,9 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou if (asker) { - TQBoxLayout *vbl = dynamic_cast<TQBoxLayout*>(w -> tqlayout()); + TQBoxLayout *vbl = dynamic_cast<TQBoxLayout*>(w -> layout()); p_next = new TQLabel(w); - p_next -> tqsetAlignment(AlignTop | AlignHCenter); + p_next -> setAlignment(AlignTop | AlignHCenter); p_fill = new TQWidget(w); p_fill -> show(); vbl -> setStretchFactor(p_fill, 1); @@ -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())); diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp index d1945e2d..8c6e6d48 100644 --- a/kgeography/src/mapchooser.cpp +++ b/kgeography/src/mapchooser.cpp @@ -15,7 +15,7 @@ #include <tqhbox.h> #include <tqimage.h> -#include <tqlayout.h> +#include <layout.h> #include "mapchooser.h" @@ -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 diff --git a/kgeography/src/mapparser.cpp b/kgeography/src/mapparser.cpp index 40a1c59e..f50e1b5d 100644 --- a/kgeography/src/mapparser.cpp +++ b/kgeography/src/mapparser.cpp @@ -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; } diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp index e039952c..c40a6dbd 100644 --- a/kgeography/src/mapwidget.cpp +++ b/kgeography/src/mapwidget.cpp @@ -61,9 +61,9 @@ void mapWidget::setMapZoom(bool b) } } -TQSize mapWidget::tqsizeHint() const +TQSize mapWidget::sizeHint() const { - return tqmaximumSize(); + return maximumSize(); } void mapWidget::updateHPosition(int value) diff --git a/kgeography/src/mapwidget.h b/kgeography/src/mapwidget.h index a54463b1..5b024bb0 100644 --- a/kgeography/src/mapwidget.h +++ b/kgeography/src/mapwidget.h @@ -27,7 +27,7 @@ Q_OBJECT void setMapMove(bool b); void setMapZoom(bool b); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize mapSize() const; public slots: diff --git a/kgeography/src/mypopup.cpp b/kgeography/src/mypopup.cpp index b37264df..49d99327 100644 --- a/kgeography/src/mypopup.cpp +++ b/kgeography/src/mypopup.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqimage.h> #include <tqpixmap.h> @@ -33,7 +33,7 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2, if (!text2.isNull()) { TQLabel *l2 = new TQLabel(text2, vbox); - l2 -> tqsetAlignment(TQt::AlignCenter); + l2 -> setAlignment(TQt::AlignCenter); vboxLayout -> addWidget(l2); } @@ -43,10 +43,10 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2, lay -> addWidget(flag); TQImage flagImg(flagFile); flag -> setPixmap(flagImg.smoothScale(flagImg.width() / 5, flagImg. height() / 5)); - flag -> tqsetAlignment(TQt::AlignCenter); + flag -> setAlignment(TQt::AlignCenter); } - l -> tqsetAlignment(TQt::AlignCenter); + l -> setAlignment(TQt::AlignCenter); TQFont f = l -> font(); f.setBold(true); l -> setFont(f); @@ -55,7 +55,7 @@ myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2, setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(2); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); } void myPopup::mousePressEvent(TQMouseEvent *) diff --git a/khangman/ChangeLog b/khangman/ChangeLog index 93419a47..337a55d6 100644 --- a/khangman/ChangeLog +++ b/khangman/ChangeLog @@ -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) diff --git a/khangman/khangman/advanced.ui b/khangman/khangman/advanced.ui index 7910fab7..6290dd7c 100644 --- a/khangman/khangman/advanced.ui +++ b/khangman/khangman/advanced.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> diff --git a/khangman/khangman/data/en/easy.kvtml b/khangman/khangman/data/en/easy.kvtml index 58338d21..8e2521aa 100644 --- a/khangman/khangman/data/en/easy.kvtml +++ b/khangman/khangman/data/en/easy.kvtml @@ -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> diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 116d880b..9c3e54b4 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -228,7 +228,7 @@ void KHangMan::setLanguages() for (uint i=0; i<m_languages.count(); i++) { TQString tmp = m_languages[i]; if (!config->readEntry(tmp)) - config->writeEntry(tmp, TQString(TQDate::tqcurrentDate().toString(Qt::ISODate))); + config->writeEntry(tmp, TQString(TQDate::currentDate().toString(Qt::ISODate))); } // We look in $TDEDIR/share/locale/all_languages from @@ -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()) @@ -480,7 +480,7 @@ void KHangMan::slotPasteChar() TQString KHangMan::charIcon(const TQChar & c) { ///Create a name and path for the icon - TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png"); + TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); TQRect r(4, 4, 120, 120); diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp index e3a646cf..3cf188e2 100644 --- a/khangman/khangman/khangmanview.cpp +++ b/khangman/khangman/khangmanview.cpp @@ -48,16 +48,16 @@ KHangManView::KHangManView(KHangMan*parent, const char *name) // The widget for entering letters. m_letterInput = new KLineEdit( this, "charWrite" ); - m_letterInput->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, + m_letterInput->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, (TQSizePolicy::SizeType) 0, 0, 0, m_letterInput->sizePolicy().hasHeightForWidth() ) ); m_letterInput->setMaxLength( 1 ); - m_letterInput->tqsetAlignment( int( TQLineEdit::AlignHCenter ) ); + m_letterInput->setAlignment( int( TQLineEdit::AlignHCenter ) ); // Press this button to enter a letter (or press enter) m_guessButton = new KPushButton( this, "guessButton" ); - m_guessButton->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, + m_guessButton->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType) 1, (TQSizePolicy::SizeType) 0, 0, 0, m_guessButton->sizePolicy().hasHeightForWidth() ) ); @@ -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) )); } } diff --git a/khangman/khangman/normal.ui b/khangman/khangman/normal.ui index b7d3df2e..99b31c4e 100644 --- a/khangman/khangman/normal.ui +++ b/khangman/khangman/normal.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> diff --git a/khangman/khangman/timerdlg.ui b/khangman/khangman/timerdlg.ui index dbd09dd7..fcea8d8b 100644 --- a/khangman/khangman/timerdlg.ui +++ b/khangman/khangman/timerdlg.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -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"> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>295</width> <height>20</height> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>16</height> @@ -124,7 +124,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -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"> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>16</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>295</width> <height>20</height> diff --git a/kig/ChangeLog b/kig/ChangeLog index af35b577..ec8d6042 100644 --- a/kig/ChangeLog +++ b/kig/ChangeLog @@ -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> @@ -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 @@ -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 diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc index 7d7369a1..b1bf83dd 100644 --- a/kig/filters/cabri-filter.cc +++ b/kig/filters/cabri-filter.cc @@ -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; } diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui index 1a9589b2..2473fd12 100644 --- a/kig/filters/drgeo-filter-chooserbase.ui +++ b/kig/filters/drgeo-filter-chooserbase.ui @@ -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> @@ -96,7 +96,7 @@ Please select which to import:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc index 6596bf44..13a3ca0f 100644 --- a/kig/filters/drgeo-filter.cc +++ b/kig/filters/drgeo-filter.cc @@ -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; } @@ -770,7 +770,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co { std::vector<ObjectCalcer*> args2; args2.push_back( o->nameCalcer() ); - oc2 = fact->attachedLabelCalcer( TQString::tqfromLatin1( "%1" ), oc, + oc2 = fact->attachedLabelCalcer( TQString::fromLatin1( "%1" ), oc, static_cast<const PointImp*>( oc->imp() )->coordinate(), false, args2, *ret ); co = TQt::black; diff --git a/kig/filters/drgeo-filter.h b/kig/filters/drgeo-filter.h index ddd2359e..9b0ef369 100644 --- a/kig/filters/drgeo-filter.h +++ b/kig/filters/drgeo-filter.h @@ -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 diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc index 8dfeffda..53e14139 100644 --- a/kig/filters/exporter.cc +++ b/kig/filters/exporter.cc @@ -40,7 +40,7 @@ #include <tqcolor.h> #include <tqfile.h> #include <tqiconset.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kaction.h> #include <kiconloader.h> @@ -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 ); diff --git a/kig/filters/filter.cc b/kig/filters/filter.cc index ff380bec..81cd1ef4 100644 --- a/kig/filters/filter.cc +++ b/kig/filters/filter.cc @@ -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" ) ); } diff --git a/kig/filters/filter.h b/kig/filters/filter.h index 8904b52d..9680d114 100644 --- a/kig/filters/filter.h +++ b/kig/filters/filter.h @@ -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; \ } diff --git a/kig/filters/filters-common.cc b/kig/filters/filters-common.cc index 6ae6cef9..4ba24e9f 100644 --- a/kig/filters/filters-common.cc +++ b/kig/filters/filters-common.cc @@ -34,6 +34,6 @@ ObjectTypeCalcer* filtersConstructTextObject( propo->calc( doc ); std::vector<ObjectCalcer*> args; args.push_back( propo ); - return fact->labelCalcer( TQString::tqfromLatin1( "%1" ), c, needframe, + return fact->labelCalcer( TQString::fromLatin1( "%1" ), c, needframe, args, doc ); } diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc index 8d37a871..8849256b 100644 --- a/kig/filters/kgeo-filter.cc +++ b/kig/filters/kgeo-filter.cc @@ -130,7 +130,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c elems.push_back( elem ); for ( const char* parent = parents.first(); parent; parent = parents.next() ) { - int parentIndex = TQString::tqfromLatin1( parent ).toInt( &ok ); + int parentIndex = TQString::fromLatin1( parent ).toInt( &ok ); if ( ! ok ) KIG_FILTER_PARSE_ERROR; if ( parentIndex != 0 ) elems[i].parents.push_back( parentIndex - 1 ); diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h index e2317d1b..9bac9085 100644 --- a/kig/filters/kgeo-filter.h +++ b/kig/filters/kgeo-filter.h @@ -25,11 +25,11 @@ 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 :) * - * tqStatus: a significant part of KGeo's format is supported, not all + * Status: a significant part of KGeo's format is supported, not all * yet, though.. */ class KigFilterKGeo diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc index 7ddfcde4..2873242a 100644 --- a/kig/filters/kseg-filter.cc +++ b/kig/filters/kseg-filter.cc @@ -45,7 +45,7 @@ #include <tqfont.h> #include <tqpen.h> -#include <tqbrush.h> +#include <brush.h> #include <tqfile.h> #include <tqdatastream.h> #include <tqbuffer.h> @@ -636,7 +636,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) std::vector<ObjectCalcer*> args2; args2.push_back( object->nameCalcer() ); ObjectCalcer* oc2 = fact->attachedLabelCalcer( - TQString::tqfromLatin1( "%1" ), object->calcer(), + TQString::fromLatin1( "%1" ), object->calcer(), static_cast<const PointImp*>( object->imp() )->coordinate(), false, args2, *retdoc ); oc2->calc( *retdoc ); diff --git a/kig/filters/latexexporter.cc b/kig/filters/latexexporter.cc index a1be1f5f..cca305c4 100644 --- a/kig/filters/latexexporter.cc +++ b/kig/filters/latexexporter.cc @@ -47,7 +47,7 @@ #include <tqcheckbox.h> #include <tqcolor.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> #include <kmessagebox.h> @@ -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; }; diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc index d3323778..a9bcc241 100644 --- a/kig/filters/native-filter.cc +++ b/kig/filters/native-filter.cc @@ -114,7 +114,7 @@ KigDocument* KigFilterNative::load( const TQString& file ) TQFile kigdoc( file ); #ifndef KIG_NO_COMPRESSED_FILES bool iscompressed = false; - if ( !file.tqendsWith( ".kig", false ) ) + if ( !file.endsWith( ".kig", false ) ) { // the file is compressed, so we have to decompress it and fetch the // kig file inside it... @@ -125,7 +125,7 @@ KigDocument* KigFilterNative::load( const TQString& file ) KIG_FILTER_PARSE_ERROR; TQString tempname = file.section( '/', -1 ); - if ( file.tqendsWith( ".kigz", false ) ) + if ( file.endsWith( ".kigz", false ) ) { tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) ); } @@ -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; } @@ -642,7 +642,7 @@ bool KigFilterNative::save07( const KigDocument& kdoc, TQTextStream& stream ) TQDomElement drawelem = doc.createElement( "Draw" ); drawelem.setAttribute( "object", id ); drawelem.setAttribute( "color", d->color().name() ); - drawelem.setAttribute( "shown", TQString::tqfromLatin1( d->shown() ? "true" : "false" ) ); + drawelem.setAttribute( "shown", TQString::fromLatin1( d->shown() ? "true" : "false" ) ); drawelem.setAttribute( "width", TQString::number( d->width() ) ); drawelem.setAttribute( "style", d->styleToString() ); drawelem.setAttribute( "point-style", d->pointStyleToString() ); @@ -683,7 +683,7 @@ bool KigFilterNative::save07( const KigDocument& data, const TQString& outfile ) return save07( data, stdoutstream ); } #ifndef KIG_NO_COMPRESSED_FILES - if ( !outfile.tqendsWith( ".kig", false ) ) + if ( !outfile.endsWith( ".kig", false ) ) { // the user wants to save a compressed file, so we have to save our kig // file to a temp file and then compress it... @@ -693,7 +693,7 @@ bool KigFilterNative::save07( const KigDocument& data, const TQString& outfile ) return false; TQString tempname = outfile.section( '/', -1 ); - if ( outfile.tqendsWith( ".kigz", false ) ) + if ( outfile.endsWith( ".kigz", false ) ) tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) ); else return false; diff --git a/kig/filters/svgexporter.cc b/kig/filters/svgexporter.cc index 93801b3b..e2cc41bd 100644 --- a/kig/filters/svgexporter.cc +++ b/kig/filters/svgexporter.cc @@ -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 ) ); } } diff --git a/kig/kfile/kfile_kig.cpp b/kig/kfile/kfile_kig.cpp index 496a851f..bd54a036 100644 --- a/kig/kfile/kfile_kig.cpp +++ b/kig/kfile/kfile_kig.cpp @@ -58,7 +58,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ ) TQString sfile = metainfo.path(); bool iscompressed = false; TQFile f( sfile ); - if ( !sfile.tqendsWith( ".kig", false ) ) + if ( !sfile.endsWith( ".kig", false ) ) { iscompressed = true; @@ -67,7 +67,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ ) return false; TQString tempname = sfile.section( '/', -1 ); - if ( sfile.tqendsWith( ".kigz", false ) ) + if ( sfile.endsWith( ".kigz", false ) ) { tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) ); } @@ -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... diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp index dc63b2dc..8d60a796 100644 --- a/kig/kig/kig.cpp +++ b/kig/kig/kig.cpp @@ -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() )) { diff --git a/kig/kig/kig_commands.cpp b/kig/kig/kig_commands.cpp index bcf26969..d4668f55 100644 --- a/kig/kig/kig_commands.cpp +++ b/kig/kig/kig_commands.cpp @@ -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() ); } diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index 089865f0..75927682 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -63,7 +63,7 @@ #include <tqcheckbox.h> #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpaintdevicemetrics.h> #include <tqsizepolicy.h> #include <tqtimer.h> @@ -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; diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp index fe2da6e1..00a50692 100644 --- a/kig/kig/kig_view.cpp +++ b/kig/kig/kig_view.cpp @@ -33,7 +33,7 @@ #include <tqdialog.h> #include <tqevent.h> #include <tqwhatsthis.h> -#include <tqlayout.h> +#include <layout.h> #include <tqscrollbar.h> #include <kdebug.h> @@ -290,13 +290,13 @@ KigView::KigView( KigPart* part, TQWidget* parent, const char* name ) : TQWidget( parent, name ), - mtqlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ), + mlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ), mupdatingscrollbars( false ), mrealwidget( 0 ), mpart( part ) { connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) ); - mtqlayout = new TQGridLayout( this, 2, 2 ); + mlayout = new TQGridLayout( this, 2, 2 ); mrightscroll = new TQScrollBar(Qt::Vertical, this, "Right Scrollbar" ); // TODO: make this configurable... mrightscroll->setTracking( true ); @@ -310,11 +310,11 @@ KigView::KigView( KigPart* part, connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ), this, TQT_SLOT( updateScrollBars() ) ); mrealwidget = new KigWidget( part, this, this, "Kig Widget", fullscreen ); - mtqlayout->addWidget( mbottomscroll, 1, 0 ); - mtqlayout->addWidget( mrealwidget, 0, 0 ); - mtqlayout->addWidget( mrightscroll, 0, 1 ); + mlayout->addWidget( mbottomscroll, 1, 0 ); + mlayout->addWidget( mrealwidget, 0, 0 ); + mlayout->addWidget( mrightscroll, 0, 1 ); - resize( tqsizeHint() ); + resize( sizeHint() ); mrealwidget->recenterScreen(); part->redrawScreen( mrealwidget ); updateScrollBars(); @@ -443,7 +443,7 @@ const KigDocument& KigWidget::document() const return mpart->document(); } -TQSize KigWidget::tqsizeHint() const +TQSize KigWidget::sizeHint() const { return TQSize( 630, 450 ); } @@ -508,9 +508,9 @@ void KigView::toggleFullScreen() { mrealwidget->setFullScreen( ! mrealwidget->isFullScreen() ); if ( mrealwidget->isFullScreen() ) - tqtopLevelWidget()->showFullScreen(); + topLevelWidget()->showFullScreen(); else - tqtopLevelWidget()->showNormal(); + topLevelWidget()->showNormal(); } void KigWidget::setFullScreen( bool f ) @@ -568,7 +568,7 @@ void KigWidget::zoomArea() KigInputDialog::getTwoCoordinates( i18n( "Select Zoom Area" ), i18n( "Select the zoom area by entering the coordinates of " "the upper left corner and the lower right corner." ) + - TQString::tqfromLatin1("<br>") + + TQString::fromLatin1("<br>") + mpart->document().coordinateSystem().coordinateFormatNoticeMarkup(), this, &ok, mpart->document(), &tl, &br ); if ( ok ) diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h index 6cda690b..28cc9947 100644 --- a/kig/kig/kig_view.h +++ b/kig/kig/kig_view.h @@ -62,7 +62,7 @@ class KigWidget : public TQWidget void paintEvent( TQPaintEvent* e ); void wheelEvent( TQWheelEvent* e ); void resizeEvent( TQResizeEvent* ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * this is called to match a rect's dimensions to the dimensions of @@ -230,7 +230,7 @@ class KigView Q_OBJECT TQ_OBJECT - TQGridLayout* mtqlayout; + TQGridLayout* mlayout; TQScrollBar* mrightscroll; TQScrollBar* mbottomscroll; diff --git a/kig/misc/calcpaths.cc b/kig/misc/calcpaths.cc index 3e947789..1532715b 100644 --- a/kig/misc/calcpaths.cc +++ b/kig/misc/calcpaths.cc @@ -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; }; diff --git a/kig/misc/calcpaths.h b/kig/misc/calcpaths.h index f81ddc09..620558a3 100644 --- a/kig/misc/calcpaths.h +++ b/kig/misc/calcpaths.h @@ -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 ); diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp index 10bd96ce..36cfef0b 100644 --- a/kig/misc/coordinate_system.cpp +++ b/kig/misc/coordinate_system.cpp @@ -116,19 +116,19 @@ void CoordinateValidator::fixup( TQString & input ) const sc = input.length(); KLocale* l = KGlobal::locale(); if ( mpolar ) - input.append( TQString::tqfromLatin1( ";" ) + l->positiveSign() + - TQString::tqfromLatin1( "0°" ) ); + input.append( TQString::fromLatin1( ";" ) + l->positiveSign() + + TQString::fromLatin1( "0°" ) ); else - input.append( TQString::tqfromLatin1( ";" ) + l->positiveSign() + - TQString::tqfromLatin1( "0" ) + l->decimalSymbol() + - TQString::tqfromLatin1( "0" ) ); + input.append( TQString::fromLatin1( ";" ) + l->positiveSign() + + TQString::fromLatin1( "0" ) + l->decimalSymbol() + + TQString::fromLatin1( "0" ) ); }; mre.exactMatch( input ); TQString ds1 = mre.cap( 1 ); mdv.fixup( ds1 ); TQString ds2 = mre.cap( 2 ); mdv.fixup( ds2 ); - input = ds1 + TQString::tqfromLatin1( "; " ) + ds2; + input = ds1 + TQString::fromLatin1( "; " ) + ds2; } EuclideanCoords::EuclideanCoords() @@ -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::tqfromLatin1( "( %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::tqfromLatin1("( %1; %2° )").tqarg( rs ).tqarg( ts ); + return TQString::fromLatin1("( %1; %2° )").arg( rs ).arg( ts ); } TQString PolarCoords::coordinateFormatNotice() const diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc index f19f2d82..d42b7ca4 100644 --- a/kig/misc/guiaction.cc +++ b/kig/misc/guiaction.cc @@ -223,7 +223,7 @@ void AddFixedPointAction::act( KigPart& doc ) KigInputDialog::getCoordinate( i18n( "Fixed Point" ), i18n( "Enter the coordinates for the new point." ) + - TQString::tqfromLatin1( "<br>" ) + + TQString::fromLatin1( "<br>" ) + doc.document().coordinateSystem().coordinateFormatNoticeMarkup(), doc.widget(), &ok, doc.document(), &c ); if ( ! ok ) return; @@ -272,7 +272,7 @@ TestAction::~TestAction() TQString TestAction::description() const { - return TQString::tqfromLatin1( "Test stuff !!!" ); + return TQString::fromLatin1( "Test stuff !!!" ); } TQCString TestAction::iconFileName() const @@ -282,7 +282,7 @@ TQCString TestAction::iconFileName() const TQString TestAction::descriptiveName() const { - return TQString::tqfromLatin1( "Test stuff !!!" ); + return TQString::fromLatin1( "Test stuff !!!" ); } const char* TestAction::actionName() const @@ -297,7 +297,7 @@ void TestAction::act( KigPart& doc ) Object* constantpoint = ObjectFactory::instance()->fixedPoint( Coordinate( -1, -1 ) ); constantpoint->calc( doc ); - Object* codeobject = new DataObject( new StringImp( TQString::tqfromLatin1( script ) ) ); + Object* codeobject = new DataObject( new StringImp( TQString::fromLatin1( script ) ) ); Object* compiledcode = new RealObject( PythonCompileType::instance(), Objects( codeobject ) ); compiledcode->calc( doc ); diff --git a/kig/misc/kigfiledialog.cc b/kig/misc/kigfiledialog.cc index 2c211690..2d7ea08f 100644 --- a/kig/misc/kigfiledialog.cc +++ b/kig/misc/kigfiledialog.cc @@ -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(); diff --git a/kig/misc/kiginputdialog.cc b/kig/misc/kiginputdialog.cc index 99e635b2..61d89883 100644 --- a/kig/misc/kiginputdialog.cc +++ b/kig/misc/kiginputdialog.cc @@ -28,7 +28,7 @@ #include "../kig/kig_document.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqvalidator.h> #include <tqwhatsthis.h> @@ -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->tqsetAlignment( 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 ); diff --git a/kig/misc/kigpainter.cpp b/kig/misc/kigpainter.cpp index 81ae6574..4b3ede2e 100644 --- a/kig/misc/kigpainter.cpp +++ b/kig/misc/kigpainter.cpp @@ -300,7 +300,7 @@ void KigPainter::drawPolygon( const std::vector<TQPoint>& pts, { t.putPoints( c++, 1, i->x(), i->y() ); }; - mP.tqdrawPolygon( t, winding, index, npoints ); + mP.drawPolygon( t, winding, index, npoints ); setPen( oldpen ); setBrush( oldbrush ); if( mNeedOverlay ) mOverlay.push_back( t.boundingRect() ); @@ -645,7 +645,7 @@ void KigPainter::drawAngle( const Coordinate& cpoint, const double dstartangle, setBrushStyle( Qt::SolidPattern ); // drawPolygon( arrow ); - mP.tqdrawPolygon( arrow, false, 0, -1 ); + mP.drawPolygon( arrow, false, 0, -1 ); // if ( mNeedOverlay ) mOverlay.push_back( toScreen( r ) ); setWholeWinOverlay(); //mp: ugly! why not compute a correct overlay? @@ -859,7 +859,7 @@ void KigPainter::drawCurve( const CurveImp* curve ) if ( curpolylinenextfree > 0 && curpolyline[curpolylinenextfree - 1] != tp1 ) { // flush the current part of the curve - mP.tqdrawPolyline( curpolyline, 0, curpolylinenextfree ); + mP.drawPolyline( curpolyline, 0, curpolylinenextfree ); curpolylinenextfree = 0; } if ( curpolylinenextfree == 0 ) @@ -883,7 +883,7 @@ void KigPainter::drawCurve( const CurveImp* curve ) } } // flush the rest of the curve - mP.tqdrawPolyline( curpolyline, 0, curpolylinenextfree ); + mP.drawPolyline( curpolyline, 0, curpolylinenextfree ); curpolylinenextfree = 0; if ( ! workstack.empty () ) diff --git a/kig/misc/lists.cc b/kig/misc/lists.cc index 7d2bee62..a294105e 100644 --- a/kig/misc/lists.cc +++ b/kig/misc/lists.cc @@ -27,7 +27,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <tqregexp.h> #include <algorithm> @@ -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; diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc index e72a3c19..da89b66c 100644 --- a/kig/misc/object_hierarchy.cc +++ b/kig/misc/object_hierarchy.cc @@ -419,10 +419,10 @@ void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) cons // we don't save these atm, since the user can't define them. // we only load them from builtin macro's. // TQDomElement ut = doc.createElement( "UseText" ); -// ut.appendChild( doc.createTextNode( TQString::tqfromLatin1(musetexts[i].c_str() ) ) ); +// ut.appendChild( doc.createTextNode( TQString::fromLatin1(musetexts[i].c_str() ) ) ); // e.appendChild( ut ); // TQDomElement ss = doc.createElement( "SelectStatement" ); -// ss.appendChild( doc.createTextNode( TQString::tqfromLatin1(mselectstatements[i].c_str() ) ) ); +// ss.appendChild( doc.createTextNode( TQString::fromLatin1(mselectstatements[i].c_str() ) ) ); // e.appendChild( ss ); parent.appendChild( e ); } @@ -437,7 +437,7 @@ void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) cons { const ApplyTypeNode* node = static_cast<const ApplyTypeNode*>( mnodes[i] ); e.setAttribute( "action", "calc" ); - e.setAttribute( "type", TQString::tqfromLatin1( node->type()->fullName() ) ); + e.setAttribute( "type", TQString::fromLatin1( node->type()->fullName() ) ); for ( uint i = 0; i < node->parents().size(); ++i ) { int parent = node->parents()[i] + 1; @@ -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; } diff --git a/kig/misc/object_hierarchy.h b/kig/misc/object_hierarchy.h index 5997015c..60df8a59 100644 --- a/kig/misc/object_hierarchy.h +++ b/kig/misc/object_hierarchy.h @@ -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; /** diff --git a/kig/misc/special_constructors.cc b/kig/misc/special_constructors.cc index edc54b42..51ac346e 100644 --- a/kig/misc/special_constructors.cc +++ b/kig/misc/special_constructors.cc @@ -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; diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc index e9e2e5ad..f2d5f2ed 100644 --- a/kig/modes/construct_mode.cc +++ b/kig/modes/construct_mode.cc @@ -485,7 +485,7 @@ void TestConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p, std::vector<ObjectCalcer*> parents; parents.push_back( new ObjectConstCalcer( new IntImp( test_has_frame_dflt ) ) ); parents.push_back( new ObjectConstCalcer( new PointImp( loc ) ) ); - parents.push_back( new ObjectConstCalcer( new StringImp( TQString::tqfromLatin1( "%1" ) ) ) ); + parents.push_back( new ObjectConstCalcer( new StringImp( TQString::fromLatin1( "%1" ) ) ) ); assert( mresult->imp()->inherits( TestResultImp::stype() ) ); parents.push_back( new ObjectPropertyCalcer( diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc index d2f25a47..f4ed323e 100644 --- a/kig/modes/edittype.cc +++ b/kig/modes/edittype.cc @@ -50,8 +50,8 @@ EditType::~EditType() void EditType::helpSlot() { - kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ), - TQString::tqfromLatin1( "kig" ) ); + kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ), + TQString::fromLatin1( "kig" ) ); } void EditType::okSlot() diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui index e69d9f13..e0af9850 100644 --- a/kig/modes/edittypebase.ui +++ b/kig/modes/edittypebase.ui @@ -43,7 +43,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -51,7 +51,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -125,7 +125,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <vbox> <property name="name"> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -179,7 +179,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kig/modes/label.cc b/kig/modes/label.cc index 48f729bf..a6399b3d 100644 --- a/kig/modes/label.cc +++ b/kig/modes/label.cc @@ -38,7 +38,7 @@ #include <kmessagebox.h> #include <kaction.h> #include <klocale.h> -#include <tqtextedit.h> +#include <textedit.h> #include <kdebug.h> #include <kiconloader.h> #include <tqregexp.h> @@ -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 ) diff --git a/kig/modes/label.h b/kig/modes/label.h index b016d691..828c2e29 100644 --- a/kig/modes/label.h +++ b/kig/modes/label.h @@ -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 ); diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp index 693c165a..7472dec6 100644 --- a/kig/modes/linkslabel.cpp +++ b/kig/modes/linkslabel.cpp @@ -21,7 +21,7 @@ #include <tqlabel.h> #include <kurllabel.h> -#include <tqlayout.h> +#include <layout.h> #include <vector> #include <algorithm> @@ -33,7 +33,7 @@ using namespace std; class LinksLabel::Private { public: - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; std::vector<TQLabel*> labels; std::vector<KURLLabel*> urllabels; }; @@ -42,22 +42,22 @@ LinksLabel::LinksLabel( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { p = new Private; - p->tqlayout = new TQHBoxLayout( this ); + p->layout = new TQHBoxLayout( this ); TQLabel* l = new TQLabel( TQString::fromUtf8( "Dit is een " ), this ); p->labels.push_back( l ); - p->tqlayout->addWidget( l ); + p->layout->addWidget( l ); KURLLabel* u = new KURLLabel( TQString::fromUtf8( "http://www.kde.org/" ), TQString::fromUtf8( "url"), this ); p->urllabels.push_back( u ); - p->tqlayout->addWidget( u ); + p->layout->addWidget( u ); l = new TQLabel( TQString::fromUtf8( " !" ), this ); p->labels.push_back( l ); - p->tqlayout->addWidget(l ); + p->layout->addWidget(l ); - p->tqlayout->activate(); + p->layout->activate(); } LinksLabel::~LinksLabel() @@ -99,8 +99,8 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) p->urllabels.clear(); p->labels.clear(); - delete p->tqlayout; - p->tqlayout = new TQHBoxLayout( this ); + delete p->layout; + p->layout = new TQHBoxLayout( this ); for ( LinksLabelEditBuf::vec::iterator i = buf.data.begin(); i != buf.data.end(); ++i ) { @@ -111,7 +111,7 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) KURLLabel* l = new KURLLabel( TQString::fromUtf8( "http://edu.kde.org/kig" ), i->second, this ); p->urllabels.push_back( l ); - p->tqlayout->addWidget( l ); + p->layout->addWidget( l ); connect( l, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( urlClicked() ) ); } else @@ -119,15 +119,15 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) // we need a normal label... TQLabel* l = new TQLabel( i->second, this ); p->labels.push_back( l ); - p->tqlayout->addWidget( l ); + p->layout->addWidget( l ); }; }; TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - p->tqlayout->addItem( spacer ); + p->layout->addItem( spacer ); - p->tqlayout->activate(); + p->layout->activate(); std::for_each( p->urllabels.begin(), p->urllabels.end(), mem_fun( &TQWidget::show ) ); std::for_each( p->labels.begin(), p->labels.end(), mem_fun( &TQWidget::show ) ); diff --git a/kig/modes/macrowizard.cc b/kig/modes/macrowizard.cc index 1b25c803..662e3a0d 100644 --- a/kig/modes/macrowizard.cc +++ b/kig/modes/macrowizard.cc @@ -85,6 +85,6 @@ void MacroWizard::accept() void MacroWizard::slotHelpClicked() { - kapp->invokeHelp( TQString::tqfromLatin1( "defining-macros"), - TQString::tqfromLatin1( "kig" ) ); + kapp->invokeHelp( TQString::fromLatin1( "defining-macros"), + TQString::fromLatin1( "kig" ) ); } diff --git a/kig/modes/macrowizardbase.ui b/kig/modes/macrowizardbase.ui index fefd5c6f..ea20ead7 100644 --- a/kig/modes/macrowizardbase.ui +++ b/kig/modes/macrowizardbase.ui @@ -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> diff --git a/kig/modes/moving.cc b/kig/modes/moving.cc index 7c3148da..593c7077 100644 --- a/kig/modes/moving.cc +++ b/kig/modes/moving.cc @@ -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 ); } diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc index 32280d62..ba778f43 100644 --- a/kig/modes/popup.cc +++ b/kig/modes/popup.cc @@ -198,12 +198,12 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, else if ( single ) { if ( !objs[0]->name().isNull() ) - title = TQString::tqfromLatin1( "%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 ) @@ -518,7 +518,7 @@ static void addNameLabel( ObjectCalcer* object, ObjectCalcer* namecalcer, const object->imp()->inherits( CurveImp::stype() ) ) attachto = object; ObjectHolder* label = ObjectFactory::instance()->attachedLabel( - TQString::tqfromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() ); + TQString::fromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() ); doc.addObject( label ); } @@ -924,7 +924,7 @@ bool PropertiesActionsProvider::executeAction( // /////// Coordinate c = Coordinate::invalidCoord(); Coordinate c = w.fromScreen( popup.plc() ); ObjectHolder* label = ObjectFactory::instance()->attachedLabel( - TQString::tqfromLatin1( "%1" ), parent->calcer(), c, + TQString::fromLatin1( "%1" ), parent->calcer(), c, false, args, doc.document() ); doc.addObject( label ); } @@ -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::tqfromLatin1( "%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 ); } diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc index e35e707a..3853ab18 100644 --- a/kig/modes/textlabelwizard.cc +++ b/kig/modes/textlabelwizard.cc @@ -21,10 +21,10 @@ #include "label.h" #include "linkslabel.h" -#include <tqtextedit.h> +#include <textedit.h> #include <kapplication.h> -#include <tqlayout.h> +#include <layout.h> TextLabelWizard::TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode ) : TextLabelWizardBase( parent, "TextLabelWizard", false ), mmode( mode ) @@ -84,12 +84,12 @@ void TextLabelWizard::linkClicked( int which ) void TextLabelWizard::relayoutArgsPage() { select_arguments_pageLayout->activate(); - tqrepaint(); + repaint(); } void TextLabelWizard::slotHelpClicked() { - kapp->invokeHelp( TQString::tqfromLatin1( "text-labels" ), - TQString::tqfromLatin1( "kig" ) ); + kapp->invokeHelp( TQString::fromLatin1( "text-labels" ), + TQString::fromLatin1( "kig" ) ); } diff --git a/kig/modes/textlabelwizardbase.ui b/kig/modes/textlabelwizardbase.ui index 8f12ca3c..06e3db8f 100644 --- a/kig/modes/textlabelwizardbase.ui +++ b/kig/modes/textlabelwizardbase.ui @@ -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> diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp index df061888..f023d288 100644 --- a/kig/modes/typesdialog.cpp +++ b/kig/modes/typesdialog.cpp @@ -40,7 +40,7 @@ #include <tqfile.h> #include <tqpixmap.h> #include <tqstringlist.h> -#include <tqtextstream.h> +#include <textstream.h> #include <algorithm> #include <vector> @@ -108,8 +108,8 @@ TypesDialog::~TypesDialog() void TypesDialog::helpSlot() { - kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ), - TQString::tqfromLatin1( "kig" ) ); + kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ), + TQString::fromLatin1( "kig" ) ); } void TypesDialog::okSlot() @@ -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 ); diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui index 89f00986..90216532 100644 --- a/kig/modes/typesdialogbase.ui +++ b/kig/modes/typesdialogbase.ui @@ -30,7 +30,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -90,7 +90,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -98,7 +98,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -147,7 +147,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cc index 5c68c30c..b7b8f41e 100644 --- a/kig/objects/bogus_imp.cc +++ b/kig/objects/bogus_imp.cc @@ -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 ) diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc index 4b6c1123..38522c22 100644 --- a/kig/objects/circle_imp.cc +++ b/kig/objects/circle_imp.cc @@ -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; } diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cc index 5828fc98..81331522 100644 --- a/kig/objects/conic_imp.cc +++ b/kig/objects/conic_imp.cc @@ -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; } diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc index b4a85b8e..9fc8c53c 100644 --- a/kig/objects/cubic_imp.cc +++ b/kig/objects/cubic_imp.cc @@ -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( "+ -", "- " ); diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cc index 7583dc71..a49078a1 100644 --- a/kig/objects/line_imp.cc +++ b/kig/objects/line_imp.cc @@ -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; } diff --git a/kig/objects/object_calcer.cc b/kig/objects/object_calcer.cc index 0bf4e774..40545ed1 100644 --- a/kig/objects/object_calcer.cc +++ b/kig/objects/object_calcer.cc @@ -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( diff --git a/kig/objects/object_calcer.h b/kig/objects/object_calcer.h index 98262e5e..6df94fe8 100644 --- a/kig/objects/object_calcer.h +++ b/kig/objects/object_calcer.h @@ -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(); /** diff --git a/kig/objects/object_factory.cc b/kig/objects/object_factory.cc index 942139f4..f2957a7e 100644 --- a/kig/objects/object_factory.cc +++ b/kig/objects/object_factory.cc @@ -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; diff --git a/kig/objects/object_holder.cc b/kig/objects/object_holder.cc index b6c5f09e..cdf06396 100644 --- a/kig/objects/object_holder.cc +++ b/kig/objects/object_holder.cc @@ -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 ); } diff --git a/kig/objects/object_imp.h b/kig/objects/object_imp.h index ddf0eb46..eaf29328 100644 --- a/kig/objects/object_imp.h +++ b/kig/objects/object_imp.h @@ -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; diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc index a29cf5e8..d095c238 100644 --- a/kig/objects/object_imp_factory.cc +++ b/kig/objects/object_imp_factory.cc @@ -84,33 +84,33 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, parent.appendChild( doc.createTextNode( TQString::number( static_cast<const IntImp&>( d ).data() ) ) ); - return TQString::tqfromLatin1( "int" ); + return TQString::fromLatin1( "int" ); } else if ( d.inherits( DoubleImp::stype() ) ) { parent.appendChild( doc.createTextNode( TQString::number( static_cast<const DoubleImp&>( d ).data() ) ) ); - return TQString::tqfromLatin1( "double" ); + return TQString::fromLatin1( "double" ); } else if( d.inherits( StringImp::stype() ) ) { parent.appendChild( doc.createTextNode( static_cast<const StringImp&>( d ).data() ) ); - return TQString::tqfromLatin1( "string" ); + return TQString::fromLatin1( "string" ); } else if ( d.inherits( TestResultImp::stype() ) ) { parent.appendChild( doc.createTextNode( static_cast<const TestResultImp&>( d ).data() ) ); - return TQString::tqfromLatin1( "testresult" ); + return TQString::fromLatin1( "testresult" ); } else if( d.inherits( HierarchyImp::stype() ) ) { static_cast<const HierarchyImp&>( d ).data().serialize( parent, doc ); - return TQString::tqfromLatin1( "hierarchy" ); + return TQString::fromLatin1( "hierarchy" ); } else if ( d.inherits( TransformationImp::stype() ) ) { @@ -135,7 +135,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, homothetye.appendChild( doc.createTextNode( ishomothety ) ); parent.appendChild( homothetye ); - return TQString::tqfromLatin1( "transformation" ); + return TQString::fromLatin1( "transformation" ); } else if( d.inherits( AbstractLineImp::stype() ) ) { @@ -143,28 +143,28 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, addCoordinateElement( "a", l.a, parent, doc ); addCoordinateElement( "b", l.b, parent, doc ); if( d.inherits( SegmentImp::stype() ) ) - return TQString::tqfromLatin1( "segment" ); + return TQString::fromLatin1( "segment" ); else if( d.inherits( RayImp::stype() ) ) - return TQString::tqfromLatin1( "ray" ); - else return TQString::tqfromLatin1( "line" ); + return TQString::fromLatin1( "ray" ); + else return TQString::fromLatin1( "line" ); } else if( d.inherits( PointImp::stype() ) ) { addXYElements( static_cast<const PointImp&>( d ).coordinate(), parent, doc ); - return TQString::tqfromLatin1( "point" ); + return TQString::fromLatin1( "point" ); } else if( d.inherits( TextImp::stype() ) ) { TQString text = static_cast<const TextImp&>( d ).text(); parent.appendChild( doc.createTextNode( text ) ); - return TQString::tqfromLatin1( "text" ); + return TQString::fromLatin1( "text" ); } else if( d.inherits( AngleImp::stype() ) ) { addDoubleElement( "size", static_cast<const AngleImp&>( d ).size(), parent, doc ); - return TQString::tqfromLatin1( "angle" ); + return TQString::fromLatin1( "angle" ); } else if ( d.inherits( ArcImp::stype() ) ) { @@ -173,13 +173,13 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, addDoubleElement( "radius", a.radius(), parent, doc ); addDoubleElement( "startangle", a.startAngle(), parent, doc ); addDoubleElement( "angle", a.angle(), parent, doc ); - return TQString::tqfromLatin1( "arc" ); + return TQString::fromLatin1( "arc" ); } else if( d.inherits( VectorImp::stype() ) ) { Coordinate dir = static_cast<const VectorImp&>( d ).dir(); addXYElements( dir, parent, doc ); - return TQString::tqfromLatin1( "vector" ); + return TQString::fromLatin1( "vector" ); } else if( d.inherits( LocusImp::stype() ) ) { @@ -197,14 +197,14 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, locus.hierarchy().serialize( hier, doc ); parent.appendChild( hier ); - return TQString::tqfromLatin1( "locus" ); + return TQString::fromLatin1( "locus" ); } else if( d.inherits( CircleImp::stype() ) ) { const CircleImp& c = static_cast<const CircleImp&>( d ); addCoordinateElement( "center", c.center(), parent, doc ); addDoubleElement( "radius", c.radius(), parent, doc ); - return TQString::tqfromLatin1( "circle" ); + return TQString::fromLatin1( "circle" ); } else if( d.inherits( ConicImp::stype() ) ) { @@ -213,7 +213,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, addDoubleElement( "pdimen", data.pdimen, parent, doc ); addDoubleElement( "ecostheta0", data.ecostheta0, parent, doc ); addDoubleElement( "esintheta0", data.esintheta0, parent, doc ); - return TQString::tqfromLatin1( "conic" ); + return TQString::fromLatin1( "conic" ); } else if( d.inherits( CubicImp::stype() ) ) { @@ -230,7 +230,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, addDoubleElement( "a122", data.coeffs[8], coeffs, doc ); addDoubleElement( "a222", data.coeffs[9], coeffs, doc ); parent.appendChild( coeffs ); - return TQString::tqfromLatin1( "cubic" ); + return TQString::fromLatin1( "cubic" ); } assert( false ); return TQString(); @@ -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; } diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cc index 1e5b8766..539f98b3 100644 --- a/kig/objects/point_imp.cc +++ b/kig/objects/point_imp.cc @@ -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 diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc index f1c59ac4..2acd8479 100644 --- a/kig/objects/point_type.cc +++ b/kig/objects/point_type.cc @@ -395,7 +395,7 @@ void FixedPointType::executeAction( Coordinate oldc = static_cast<const PointImp*>( o.imp() )->coordinate(); KigInputDialog::getCoordinate( i18n( "Set Coordinate" ), - i18n( "Enter the new coordinate." ) + TQString::tqfromLatin1( "<br>" ) + + i18n( "Enter the new coordinate." ) + TQString::fromLatin1( "<br>" ) + d.document().coordinateSystem().coordinateFormatNoticeMarkup(), &w, &ok, d.document(), &oldc ); if ( ! ok ) break; diff --git a/kig/objects/text_type.cc b/kig/objects/text_type.cc index 09e84c30..0b5832cd 100644 --- a/kig/objects/text_type.cc +++ b/kig/objects/text_type.cc @@ -30,7 +30,7 @@ #include <algorithm> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqstringlist.h> #include <kapplication.h> @@ -144,7 +144,7 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c, if ( i == 0 ) { - TQClipboard* cb = kapp->tqclipboard(); + TQClipboard* cb = kapp->clipboard(); // copy the text into the clipboard const TextImp* ti = static_cast<const TextImp*>( c.imp() ); diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc index 255a6073..c0fc08ec 100644 --- a/kig/scripting/newscriptwizard.cc +++ b/kig/scripting/newscriptwizard.cc @@ -21,7 +21,7 @@ #include "script_mode.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> //#include <kactionclasses.h> //#include <kactioncollection.h> @@ -159,8 +159,8 @@ void NewScriptWizard::accept() void NewScriptWizard::slotHelpClicked() { - kapp->invokeHelp( TQString::tqfromLatin1( "scripting" ), - TQString::tqfromLatin1( "kig" ) ); + kapp->invokeHelp( TQString::fromLatin1( "scripting" ), + TQString::fromLatin1( "kig" ) ); } void NewScriptWizard::setText( const TQString& text ) diff --git a/kig/scripting/newscriptwizardbase.ui b/kig/scripting/newscriptwizardbase.ui index 8c58bd2e..a26dda29 100644 --- a/kig/scripting/newscriptwizardbase.ui +++ b/kig/scripting/newscriptwizardbase.ui @@ -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> diff --git a/kig/scripting/script-common.cc b/kig/scripting/script-common.cc index 1f5d8c4a..2eb2da81 100644 --- a/kig/scripting/script-common.cc +++ b/kig/scripting/script-common.cc @@ -44,7 +44,7 @@ TQString ScriptType::templateCode( ScriptType::Type type, std::list<ObjectHolder { if ( type == Python ) { - TQString tempcode = TQString::tqfromLatin1( "def calc( " ); + TQString tempcode = TQString::fromLatin1( "def calc( " ); bool firstarg = true; TQString temparg = i18n( "Note to translators: this should be a default " "name for an argument in a Python function. The " @@ -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 += diff --git a/kig/scripting/script_mode.cc b/kig/scripting/script_mode.cc index 945ad62f..d22fa40c 100644 --- a/kig/scripting/script_mode.cc +++ b/kig/scripting/script_mode.cc @@ -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 { diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui index 8695a10a..3ad28605 100644 --- a/kiten/configdictionariesbase.ui +++ b/kiten/configdictionariesbase.ui @@ -36,7 +36,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout52_2</cstring> + <cstring>layout52_2</cstring> </property> <vbox> <property name="name"> @@ -47,7 +47,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout43_2</cstring> + <cstring>layout43_2</cstring> </property> <hbox> <property name="name"> @@ -71,7 +71,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -82,7 +82,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout51_2</cstring> + <cstring>layout51_2</cstring> </property> <hbox> <property name="name"> @@ -117,7 +117,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout50_2</cstring> + <cstring>layout50_2</cstring> </property> <vbox> <property name="name"> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -177,7 +177,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout52</cstring> + <cstring>layout52</cstring> </property> <vbox> <property name="name"> @@ -185,7 +185,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout43</cstring> + <cstring>layout43</cstring> </property> <hbox> <property name="name"> @@ -209,7 +209,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -220,7 +220,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout51</cstring> + <cstring>layout51</cstring> </property> <hbox> <property name="name"> @@ -255,7 +255,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout50</cstring> + <cstring>layout50</cstring> </property> <vbox> <property name="name"> @@ -287,7 +287,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> diff --git a/kiten/configlearn.ui b/kiten/configlearn.ui index 00baf74e..03ae9d0d 100644 --- a/kiten/configlearn.ui +++ b/kiten/configlearn.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -65,7 +65,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <vbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kiten/configsearching.ui b/kiten/configsearching.ui index b183b1e3..82895d3c 100644 --- a/kiten/configsearching.ui +++ b/kiten/configsearching.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kiten/deinf.cpp b/kiten/deinf.cpp index 52d1f8f2..dcd9c644 100644 --- a/kiten/deinf.cpp +++ b/kiten/deinf.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <tqfile.h> #include <tqregexp.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include "deinf.h" Deinf::Index::Index() diff --git a/kiten/dict.cpp b/kiten/dict.cpp index 90af2878..723e4c13 100644 --- a/kiten/dict.cpp +++ b/kiten/dict.cpp @@ -26,7 +26,7 @@ #include <tqfileinfo.h> #include <tqregexp.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include "dict.h" @@ -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).unicode(); 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) @@ -769,8 +769,8 @@ TQString Dict::firstEntryText(Dict::SearchResult result) /////////////////////////////////////////////////////////////// Entry::Entry(const TQString & kanji, const TQString & reading, const TQStringList &meanings) - : DictName(TQString::tqfromLatin1("__NOTSET")) - , Header(TQString::tqfromLatin1("__NOTSET")) + : DictName(TQString::fromLatin1("__NOTSET")) + , Header(TQString::fromLatin1("__NOTSET")) , Meanings(meanings) , Kanji(kanji) , KanaOnly(reading.isEmpty()) @@ -784,8 +784,8 @@ Entry::Entry(const TQString & kanji, const TQString & reading, const TQStringLis } Entry::Entry(const TQString &kanji, TQStringList &readings, TQStringList &meanings, unsigned int grade, unsigned int freq, unsigned int strokes, unsigned int miscount) - : DictName(TQString::tqfromLatin1("__NOTSET")) - , Header(TQString::tqfromLatin1("__NOTSET")) + : DictName(TQString::fromLatin1("__NOTSET")) + , Header(TQString::fromLatin1("__NOTSET")) , Meanings(meanings) , Kanji(kanji) , KanaOnly(false) @@ -806,7 +806,7 @@ Entry::Entry(const TQString &dictname) } Entry::Entry(const TQString &headername, bool) - : DictName(TQString::tqfromLatin1("__NOTSET")) + : DictName(TQString::fromLatin1("__NOTSET")) , Header(headername) , KanaOnly(true) , ExtendedKanjiInfo(false) diff --git a/kiten/edict b/kiten/edict index b97f749e..2a5ae421 100644 --- a/kiten/edict +++ b/kiten/edict @@ -115,7 +115,7 @@ ¤¢¤ó¤Ê¤Ë /(exp) to that extent/to that degree/ ¤¢¤ó¤ÊÉ÷¤Ë [¤¢¤ó¤Ê¤Õ¤¦¤Ë] /(exp) (uk) in that way/like that/that way/ ¤¤¤¤²Ã¸º [¤¤¤¤¤«¤²¤ó] /(adj-na,adv,exp,n) moderate/right/random/not thorough/vague/irresponsible/halfhearted/(P)/ -¤¤¤¤²Ã¸º¤Ë¤·¤Ê¤µ¤¤ [¤¤¤¤¤«¤²¤ó¤Ë¤·¤Ê¤µ¤¤] /tqshape up!/act properly!/ +¤¤¤¤²Ã¸º¤Ë¤·¤Ê¤µ¤¤ [¤¤¤¤¤«¤²¤ó¤Ë¤·¤Ê¤µ¤¤] /shape up!/act properly!/ ¤¤¤¤²Ã¸º¤Ë¤¹¤ë [¤¤¤¤¤«¤²¤ó¤Ë¤¹¤ë] /(exp) to put an end to something/to get something over with/to quit something one has been engaged in too long or to an excessive degree/ ¤¤¤¤Ç¯¤ò¤·¤Æ [¤¤¤¤¤È¤·¤ò¤·¤Æ] /(in spite of) being old enough to know better/ ¤¤¤«¤¹ /(v5s) smart/cool/sharp/stylish/ @@ -1086,7 +1086,7 @@ ¤¹¤¤¤Þ¤»¤ó /(exp) excuse me (coll. form of sumimasen)/ ¤¹¤¤±ê [¤¹¤¤¤¨¤ó] /(n) pancreatitis/ ¤¹¤¦¤Ã¤È /(vs,adv) refreshed/relieved/ -¤¹¤«¤Ã¤È /(adv,n,vs) (1) refreshed/clear/(2) tqshapely/neat/ +¤¹¤«¤Ã¤È /(adv,n,vs) (1) refreshed/clear/(2) shapely/neat/ ¤¹¤¾Æ [¤¹¤¤ä¤] /(n) Japanese beef meal/sukiyaki/(P)/ ¤¹¤¾Æ¤ [¤¹¤¤ä¤] /(n) Japanese beef meal/sukiyaki/(P)/ ¤¹¤¯¤¹¤¯ /(adv) quickly/fast/rapidly/ @@ -1098,8 +1098,8 @@ ¤¹¤¿¤¹¤¿ /(adv) briskly/ ¤¹¤Ã¤«¤é¤«¤ó /(adj-na,n) penniless/broke/ ¤¹¤Ã¤«¤ê /(adv) all/completely/thoroughly/(P)/ -¤¹¤Ã¤¤ê /(adv,n,vs) (1) refreshed/clear/(2) tqshapely/neat/(P)/ -¤¹¤Ã¤¤ê¤È /(adv,n,vs) (1) refreshed/clear/(2) tqshapely/neat/ +¤¹¤Ã¤¤ê /(adv,n,vs) (1) refreshed/clear/(2) shapely/neat/(P)/ +¤¹¤Ã¤¤ê¤È /(adv,n,vs) (1) refreshed/clear/(2) shapely/neat/ ¤¹¤Ã¤¯¤È /(adv) straight/upright/erect/ ¤¹¤Ã¤Æ¤ó¤Æ¤ó /(adj-na) flat broke/cleaned outless/penniless/ ¤¹¤Ã¤È /(adv,n,vs) straight/quickly/directly/all of a sudden/quietly/gently/softly/(P)/ @@ -1427,7 +1427,7 @@ ¤È¤¹¤ë¤È /(conj) if we make ../if we take ../if we assume ../ ¤È¤Ã¤È¤È /(adv) quickly/hurriedly/ ¤È¤Ã¤×¤ê /(adv) completely/fully/entirely/ -¤È¤È /(n) (tqchildren's term for) fish/ +¤È¤È /(n) (children's term for) fish/ ¤È¤Ê¤ê¤Î¼ÇÀ¸¤ÏÀĤ¤ [¤È¤Ê¤ê¤Î¤·¤Ð¤Õ¤Ï¤¢¤ª¤¤] /(exp) the grass is always greener on the other side/ ¤È¤Ê¤ë¤È /where .. is concerned/ ¤È¤Ó /construction worker/scaffold erector/ @@ -2283,7 +2283,7 @@ ¥¢¥¤¥Ó¡¼¥ë¥Ã¥¯ /ivy look/ ¥¢¥¤¥Ö¥é¥¦ /eyebrow/ ¥¢¥¤¥Ö¥í¡¼ /eyebrow/ -¥¢¥¤¥Ö¥í¡¼¥·¥§¡¼¥× /eyebrow tqshape/ +¥¢¥¤¥Ö¥í¡¼¥·¥§¡¼¥× /eyebrow shape/ ¥¢¥¤¥Ö¥í¡¼¥Ú¥ó¥·¥ë /(n) eyebrow pencil/ ¥¢¥¤¥Ö¥í¥¦ /eyebrow/ ¥¢¥¤¥Ü¥ê /(n) ivory/ @@ -2900,7 +2900,7 @@ ¥¢¥é¡¼¥È /(adj-no,n) alert/ ¥¢¥é¡¼¥à /alarm/ ¥¢¥é¥¤¥¢¥ó¥¹ /alliance/ -¥¢¥é¥¤¥ó¥á¥ó¥È /(n) tqalignment/ +¥¢¥é¥¤¥ó¥á¥ó¥È /(n) alignment/ ¥¢¥é¥¦¥ó¥É /(n) around/(P)/ ¥¢¥é¥«¥ë¥È /(fr:) (n) a la carte/(P)/ ¥¢¥é¥¥É¥ó»À [¥¢¥é¥¥É¥ó¤µ¤ó] /(n) arachidonic acid/ @@ -6845,7 +6845,7 @@ ¥³¥Ä¥³¥Ä /(adv) (1) unflaggingly/steadily/untiringly/laboriously/(2) clicking/drumming/ ¥³¥Æ¡¼¥¸ /cottage/(P)/ ¥³¥Æ¡¼¥¸¥Á¡¼¥º /cottage cheese/ -¥³¥Ë¡¼¥Ç /(de:) Fujiyama-tqshaped volcano (de: Konide)/(P)/ +¥³¥Ë¡¼¥Ç /(de:) Fujiyama-shaped volcano (de: Konide)/(P)/ ¥³¥Ë¥ã¥Ã¥¯ /(n) cognac/(P)/ ¥³¥Í /(n) (abbr) connection/pull/(P)/ ¥³¥Í¥¯¥·¥ç¥Ë¥¹¥È /(n) connectionist/ @@ -6892,7 +6892,7 @@ ¥³¥Þ¥½¥ó /(abbr) commercial song/commercial jingle/ ¥³¥Þ¥ó¥É /(n) (1) (computer) command/(2) commando/(P)/ ¥³¥Þ¥ó¥É¥â¥¸¥å¡¼¥ë /command module/ -¥³¥Þ³ä¤ê [¥³¥Þ¤ï¤ê] /panel tqlayout/ +¥³¥Þ³ä¤ê [¥³¥Þ¤ï¤ê] /panel layout/ ¥³¥ß¥«¥ë /(adj-na,n) comical/(P)/ ¥³¥ß¥±¥Ã¥È /(abbr) comic market/convention where amateur manga artists sell their work/ ¥³¥ß¥Ã¥¯ /(adj-na,n) comic books/comics/(P)/ @@ -7599,7 +7599,7 @@ ¥µ¥Ð¥È /(pt:) Saturday (pt: sabado)/ ¥µ¥Ð¥Ê /savanna/ ¥µ¥Ð¥Ò¡¼ /(n) milkfish (Chanos chanos)/ -¥µ¥Ð¥é¥ó /(fr:) savarin (crown-tqshaped cake served with liqueur-laced syrup)/ +¥µ¥Ð¥é¥ó /(fr:) savarin (crown-shaped cake served with liqueur-laced syrup)/ ¥µ¥Ð¥ó¥Ê /(n) savanna/sahel/(P)/ ¥µ¥Ñ¡¼ /supper/(P)/ ¥µ¥Ñ¡¼¥¯¥é¥Ö /supper club/ @@ -7929,7 +7929,7 @@ ¥·¥§¡¼¥Ó¥ó¥°¥¯¥ê¡¼¥à /shaving cream/ ¥·¥§¡¼¥Ó¥ó¥°¥Õ¥©¡¼¥à /shaving foam/ ¥·¥§¡¼¥Ó¥ó¥°¥í¡¼¥·¥ç¥ó /shaving lotion/ -¥·¥§¡¼¥×¥¢¥Ã¥× /tqshape-up/ +¥·¥§¡¼¥×¥¢¥Ã¥× /shape-up/ ¥·¥§¡¼¥Þ /(n) scheme/schema/ ¥·¥§¡¼¥ë¥ª¥¤¥ë /shale oil/ ¥·¥§¥¢ /(n) (market) share/(P)/ @@ -7938,7 +7938,7 @@ ¥·¥§¥¢¥ê¥ó¥° /(n) sharing/(P)/ ¥·¥§¥¤¥¯ /shake/(P)/ ¥·¥§¥¤¥É /(n) shade/ -¥·¥§¥¤¥×¥¢¥Ã¥× /(n,vs) tqshape-up/(P)/ +¥·¥§¥¤¥×¥¢¥Ã¥× /(n,vs) shape-up/(P)/ ¥·¥§¥Ë¡¼¥ë»å [¥·¥§¥Ë¡¼¥ë¤¤¤È] /(n) chenille/chenille yarn/ ¥·¥§¥Ñ¡¼¥É /(n) shepherd/(P)/ ¥·¥§¥Ñ¡¼¥É¥Á¥§¥Ã¥¯ /shepherd's check/ @@ -8460,7 +8460,7 @@ ¥¸¥ª¥°¥é¥Õ¥£¡¼ /geography/ ¥¸¥ª¥È¥Ô¥¢ /Geotopia/ ¥¸¥ª¥×¥È¥ê¡¼ /(de:) (n) diopter (optical unit of refraction in lenses) (de: Dioptrie)/ -¥¸¥ª¥á¥È¥ê¡¼ /tqgeometry/ +¥¸¥ª¥á¥È¥ê¡¼ /geometry/ ¥¸¥ª¥á¥È¥ê¥Ã¥¯ /(adj-na) geometric/ ¥¸¥ª¥í¥¸¡¼ /geology/ ¥¸¥«¥ë¥Ü¥ó»À [¥¸¥«¥ë¥Ü¥ó¤µ¤ó] /(n) dicarboxylic acid/ @@ -9643,7 +9643,7 @@ ¥»¥«¥ó¥À¥ê¡¼ /(n,adj) secondary/ ¥»¥«¥ó¥É /(n) (1) second/(2) second base/(P)/ ¥»¥«¥ó¥É¥ª¥Ô¥Ë¥ª¥ó /(n) second opinion/ -¥»¥«¥ó¥É¥¹¥¯¡¼¥ë /outdoor environmental educational program for city tqchildren (trans: second school)/ +¥»¥«¥ó¥É¥¹¥¯¡¼¥ë /outdoor environmental educational program for city children (trans: second school)/ ¥»¥«¥ó¥É¥Ð¥Ã¥° /second bag/zippered carrying case/ ¥»¥¥å¥ê¥Æ¥£ /(n) security/(P)/ ¥»¥¥å¥ê¥Æ¥£¡¼ /(n) security/(P)/ @@ -10223,7 +10223,7 @@ ¥Á¥ê /(n) Chile/(P)/ ¥Á¥ê¾ËÀÐ [¥Á¥ê¤·¤ç¤¦¤»¤] /(n) Chile saltpeter/ ¥Á¥ë¥À /tilda/(P)/ -¥Á¥ë¥É¥ì¥ó /(n) tqchildren/ +¥Á¥ë¥É¥ì¥ó /(n) children/ ¥Á¥í¥¥·¥ó /thyroxine/ ¥Á¥í¥ë /Tyrol/(P)/ ¥Á¥ó /(n) chin/(P)/ @@ -14625,7 +14625,7 @@ ¥×¥é¥ó¥Æ¡¼¥·¥ç¥ó /plantation/ ¥×¥é¥ó¥È /(n) plant/(P)/ ¥×¥é¥ó¥È¥ê¥Î¥Ù¡¼¥·¥ç¥ó /plant renovation/ -¥×¥é¥ó¥È¥ì¥¤¥¢¥¦¥È /plant tqlayout/ +¥×¥é¥ó¥È¥ì¥¤¥¢¥¦¥È /plant layout/ ¥×¥é¥ó¥ÈÍ¢½Ð [¥×¥é¥ó¥È¤æ¤·¤å¤Ä] /(n) export of manufacturing plant/ ¥×¥é¥ó¥Ê¡¼ /(n) planner/(P)/ ¥×¥é¥ó¥Ë¥ó¥° /(n) planning/(P)/ @@ -17047,7 +17047,7 @@ ¥æ¡¼¥«¥ê /(n) eucalyptus/(P)/ ¥æ¡¼¥«¥êÌý [¥æ¡¼¥«¥ê¤æ] /(n) eucalyptus oil/ ¥æ¡¼¥¯¥ê¥Ã¥É /Euclid/ -¥æ¡¼¥¯¥ê¥Ã¥É´ö²¿³Ø [¥æ¡¼¥¯¥ê¥Ã¥É¤¤«¤¬¤¯] /(n) Euclidean tqgeometry/ +¥æ¡¼¥¯¥ê¥Ã¥É´ö²¿³Ø [¥æ¡¼¥¯¥ê¥Ã¥É¤¤«¤¬¤¯] /(n) Euclidean geometry/ ¥æ¡¼¥¯¥ê¥Ã¥É¶õ´Ö [¥æ¡¼¥¯¥ê¥Ã¥É¤¯¤¦¤«¤ó] /(n) Euclidean space/ ¥æ¡¼¥²¥Ë¥º¥à /yugenism/ ¥æ¡¼¥³¥ó½Ú½£ [¥æ¡¼¥³¥ó¤¸¤å¤ó¤·¤å¤¦] /Yukon Territory/ @@ -17558,7 +17558,7 @@ ¥ê¡¼¥Ü¥Ã¥¯ /Reebok (sneakers)/ ¥ê¡¼¥Þ¡¼ /reamer/ ¥ê¡¼¥Þ¥ó /Riemann/(P)/ -¥ê¡¼¥Þ¥ó´ö²¿³Ø [¥ê¡¼¥Þ¥ó¤¤«¤¬¤¯] /(n) Riemannian tqgeometry/ +¥ê¡¼¥Þ¥ó´ö²¿³Ø [¥ê¡¼¥Þ¥ó¤¤«¤¬¤¯] /(n) Riemannian geometry/ ¥ê¡¼¥ë /(n) reel/(P)/ ¥ê¥¢ /(n) rear/(P)/ ¥ê¥¢¥¦¥¤¥ó¥É¡¼ /rear window/ @@ -17996,8 +17996,8 @@ ¥ì¥¢ /rare/(P)/ ¥ì¥¢¥á¥¿¥ë /rare metal/ ¥ì¥¤ /(n) (1) lei/(2) ray/(P)/ -¥ì¥¤¥¢¥¦¥È /(n) tqlayout/(P)/ -¥ì¥¤¥¢¥¦¥È¥·¥¹¥Æ¥à /tqlayout-system/ +¥ì¥¤¥¢¥¦¥È /(n) layout/(P)/ +¥ì¥¤¥¢¥¦¥È¥·¥¹¥Æ¥à /layout-system/ ¥ì¥¤¥¢¥Ã¥× /(n,vs) lay-up/ ¥ì¥¤¥ª¥Õ /(n) layoff/(P)/ ¥ì¥¤¥·¥º¥à /racism/ @@ -18407,7 +18407,7 @@ ¥í¥à /(n) ROM/read-only memory/(P)/ ¥í¥â¡¼¥È¥»¥ó¥·¥ó¥° /remote sensing/ ¥í¥ê¡¼¥¿¥³¥ó¥×¥ì¥Ã¥¯¥¹ /Lolita complex (read Vladimir Nabokov)/ -¥í¥ê¥³¥ó /(n) Lolita complex/sexual attraction to tqchildren/paedophile/ +¥í¥ê¥³¥ó /(n) Lolita complex/sexual attraction to children/paedophile/ ¥í¥ì¥¯¥¹ /Rolex/ ¥í¥ó¥° /(adj-na,n) long/(P)/ ¥í¥ó¥°¥¢¥¤¥é¥ó¥É /Long Island/ @@ -18425,7 +18425,7 @@ ¥í¥ó¥É·Á¼° [¥í¥ó¥É¤±¤¤¤·¤] /(n) rondo form/ ¥í¥ó¥Ð¡¼¥É¥ì¡¼¥È /(n) Lombard rate/ ¥í¥ó¥Ñ¡¼¥¹ /(n) rompers/ -¥í¥ó¥Ñ¡¼¥ë¡¼¥à /romper room/tqchildren's play room/ +¥í¥ó¥Ñ¡¼¥ë¡¼¥à /romper room/children's play room/ ¥í¥ó¥ê¥Í¥¹ /loneliness/ ¥í¥óÌÓ [¥í¥ó¤²] /long hair/ ¥íûĴ [¥í¤¿¤ó¤Á¤ç¤¦] /B minor/ @@ -18775,7 +18775,7 @@ °¦¤Ç¤¿¤· [¤á¤Ç¤¿¤·] /wonderful/ °¦¤Ç¤ë [¤á¤Ç¤ë] /(v1) to love/to admire/ °¦¤Ëµ²¤¨¤ë [¤¢¤¤¤Ë¤¦¤¨¤ë] /(v1) to hunger (starve) for love/ -°¦¤Î·ë¾½ [¤¢¤¤¤Î¤±¤Ã¤·¤ç¤¦] /fruit of love/tqchildren/ +°¦¤Î·ë¾½ [¤¢¤¤¤Î¤±¤Ã¤·¤ç¤¦] /fruit of love/children/ °¦¤Î¿À [¤¢¤¤¤Î¤«¤ß] /(n) Amor/Eros/Venus/god of love/ °¦¤ÎÁã [¤¢¤¤¤Î¤¹] /(n) love nest/ °¦¤Ö [¤¢¤¤¤Ö] /(n,vs) caress/loving dearly/ @@ -19276,7 +19276,7 @@ °¸½ê [¤¢¤Æ¤·¤ç] /address/ °¸Àè [¤¢¤Æ¤µ¤] /(n) address/destination/(P)/ °¸Á³ [¤¨¤ó¤¼¤ó] /(adj-na,n) as if/ -°¸Å¾¤¿¤ë [¤¨¤ó¤Æ¤ó¤¿¤ë] /(adj-t) moving smoothly/(of eyebrows) tqshapely/ +°¸Å¾¤¿¤ë [¤¨¤ó¤Æ¤ó¤¿¤ë] /(adj-t) moving smoothly/(of eyebrows) shapely/ °¸Ì¾ [¤¢¤Æ¤Ê] /(n) address/direction/(P)/ °¹ [¤¢¤Í] /(n) maidservant/elder sister/ °¹¸æ [¤¢¤Í¤´] /(n) (hum) elder sister/ @@ -19693,7 +19693,7 @@ °ÌÃÖ¤òÊѤ¨¤ë [¤¤¤Á¤ò¤«¤¨¤ë] /(exp) to change the position of/ °ÌÃÖ¥¨¥Í¥ë¥®¡¼ [¤¤¤Á¥¨¥Í¥ë¥®¡¼] /(n) potential energy/ °ÌÃÖ¥Ù¥¯¥È¥ë [¤¤¤Á¥Ù¥¯¥È¥ë] /(n) position vector/ -°ÌÃÖ¹ç¤ï¤» [¤¤¤Á¤¢¤ï¤»] /(vs) tqalignment/justification/ +°ÌÃÖ¹ç¤ï¤» [¤¤¤Á¤¢¤ï¤»] /(vs) alignment/justification/ °ÌÃÖ·¤¨ [¤¤¤Á¤½¤í¤¨] /(vs) justification/ °ÌÃÖŷʸ³Ø [¤¤¤Á¤Æ¤ó¤â¤ó¤¬¤¯] /(n) position astronomy/ °ÌÃÖÉÕ¤± [¤¤¤Á¤Ä¤±] /(n) placement/fixed position/(P)/ @@ -22701,7 +22701,7 @@ ±²´¬ [¤¦¤º¤Þ¤] /(n) whirlpool/eddy/coil/ ±²´¬¤ [¤¦¤º¤Þ¤] /(n) whirlpool/eddy/coil/(P)/ ±²´¬¤¥Ý¥ó¥× [¤¦¤º¤Þ¤¥Ý¥ó¥×] /(n) centrifugal pump/ -±²´¬¤·Á [¤¦¤º¤Þ¤¤¬¤¿] /spiral-tqshaped/ +±²´¬¤·Á [¤¦¤º¤Þ¤¤¬¤¿] /spiral-shaped/ ±²´¬¤ÌÏÍÍ [¤¦¤º¤Þ¤¤â¤è¤¦] /whirling or spiral pattern/ ±²´¬¤¯ [¤¦¤º¤Þ¤¯] /(v5k) to whirl/to eddy/to swirl/to curl (smoke)/ ±²´¬À±±À [¤¦¤º¤Þ¤¤»¤¤¤¦¤ó] /(n) spiral nebula/ @@ -22895,7 +22895,7 @@ ±À¤Î¾å [¤¯¤â¤Î¤¦¤¨] /(n) above the clouds/the Imperial Court/ ±À°æ [¤¯¤â¤¤] /(n) sky/court circles or palace/ ±À±£¤ì [¤¯¤â¤¬¤¯¤ì] /(n) disappearance/ -±À±Æ [¤¦¤ó¤¨¤¤] /(n) cloud tqshape/ +±À±Æ [¤¦¤ó¤¨¤¤] /(n) cloud shape/ ±À±ì [¤¦¤ó¤¨¤ó] /(n) clouds and smoke/landscape/ ±À²â [¤¦¤ó¤«] /(n) clouds and haze (fog)/disappearing/fleeing/ ±À²â [¤¯¤â¤«¤¹¤ß] /(n) clouds and haze (fog)/disappearing/fleeing/ @@ -22907,8 +22907,8 @@ ±ÀµÓ [¤¦¤ó¤¤ã¤¯] /(n) cloud movements/overhanging clouds/ ±ÀµÓ [¤¯¤â¤¢¤·] /(n) cloud movements/overhanging clouds/ ±Àµï [¤¯¤â¤¤] /(n) sky/the Imperial Court/ -±À·Á [¤¦¤ó¤±¤¤] /(n) cloud formations/cloud-tqshaped/ -±À·Á [¤¯¤â¤¬¤¿] /(n) cloud formations/cloud-tqshaped/ +±À·Á [¤¦¤ó¤±¤¤] /(n) cloud formations/cloud-shaped/ +±À·Á [¤¯¤â¤¬¤¿] /(n) cloud formations/cloud-shaped/ ±À·ÁÄ구 [¤¯¤â¤¬¤¿¤¸¤ç¤¦¤®] /French curve/ ±À·Ê [¤¦¤ó¤±¤¤] /cloudscape/ ±À¹Ô¤ [¤¯¤â¤æ¤] /(n) weather/look of the sky/situation/turn of affairs/signs/(P)/ @@ -23219,7 +23219,7 @@ ±Ñ¹ṉ̃ [¤¨¤¤¤³¤¯¤ß¤ó] /(n) British person/British citizen/Briton/ ±Ñº² [¤¨¤¤¤³¤ó] /(n) departed spirit/ ±ÑºÍ [¤¨¤¤¤µ¤¤] /(n) unusual talent/ -±ÑºÍ¶µ°é [¤¨¤¤¤µ¤¤¤¤ç¤¦¤¤¤¯] /special education for gifted tqchildren/ +±ÑºÍ¶µ°é [¤¨¤¤¤µ¤¤¤¤ç¤¦¤¤¤¯] /special education for gifted children/ ±Ñºîʸ [¤¨¤¤¤µ¤¯¤Ö¤ó] /(n) English composition/ ±Ñ»Ñ [¤¨¤¤¤·] /(n) noble figure/ ±Ñ»í [¤¨¤¤¤·] /(n) English poetry/ @@ -23361,7 +23361,7 @@ ±ÖÉ [¤ä¤¯¤Ó¤ç¤¦] /(n) infectious disease/plague/epidemic/ ±ÖÉ¿À [¤¨¤¤Ó¤ç¤¦¤¬¤ß] /(n) jinx/hoodoo/pest/plague/angel of death/ ±ÖÉ¿À [¤ä¤¯¤Ó¤ç¤¦¤¬¤ß] /(n) jinx/hoodoo/pest/plague/angel of death/ -±ÖΡ [¤¨¤¤ê] /(n) tqchildren's dysentery/ +±ÖΡ [¤¨¤¤ê] /(n) children's dysentery/ ±Öáö [¤¨¤¤ì¤¤] /(n) epidemic/plague/pestilence/ ±× [¤¨¤] /(n,n-suf,vs) gain/benefit/profit/use/advantage/being beneficial (useful, profitable, valuable)/(P)/ ±× [¤ä¤¯] /(n,n-suf,vs) gain/benefit/profit/use/advantage/being beneficial (useful, profitable, valuable)/ @@ -23436,7 +23436,7 @@ ±ÜÎò [¤¨¤Ä¤ì¤] /(n) career/ ±ÝÂû [¤¨¤Î¤¤¿¤±] /(n) (uk) long thin white "enokitake" mushroom/ ±Þ [¤¤¤ä] /(adj-na,n) disagreeable/detestable/unpleasant/reluctant/ -±Þ¡¹ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ +±Þ¡¹ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ ±Þ¤¦ [¤¤¤È¤¦] /(v5u) to dislike/to hate/to grudge (doing)/to spare (oneself)/to be weary of/to take (good) care of/ ±Þ¤«¤¹ [¤¢¤«¤¹] /(v5s) to glut/to satiate/to weary/to tire/to bore/to weary/ ±Þ¤¬¤é¤» [¤¤¤ä¤¬¤é¤»] /(n) harassment/ @@ -23450,7 +23450,7 @@ ±Þ¤ä¤é¤·¤¤ [¤¤¤ä¤é¤·¤¤] /(adj) unpleasant/disgusting/repulsive/detestable/disagreeable/indecent/lewd/dirty/lascivious/(P)/ ±Þ¤ï¤·¤¤ [¤¤¤È¤ï¤·¤¤] /(adj) detestable/disagreeable/ ±Þ° [¤¨¤ó¤ª] /(n,vs) dislike/detestation/ -±Þ±Þ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ +±Þ±Þ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ ±Þ¿Í [¤¨¤ó¤¸¤ó] /(n) misanthropy/ ±Þ¿Í¼Ô [¤¨¤ó¤¸¤ó¤·¤ã] /misanthrope/ ±ÞÀ¤ [¤¨¤ó¤»¤¤] /(n) pessimism/weariness with life/ @@ -23500,9 +23500,9 @@ ±ß¶À [¤¨¤ó¤¤ç¤¦] /(n) round mirror/ ±ß¶À [¤Þ¤ë¤«¤¬¤ß] /(n) round mirror/ ±ß¶Ê [¤¨¤ó¤¤ç¤¯] /roundabout way (of speaking or working)/ -±ß·¿ [¤Þ¤ë¤¬¤¿] /(n) (1) round tqshape/circle/(2) circular form/ -±ß·Á [¤¨¤ó¤±¤¤] /(n) (1) round tqshape/circle/(2) circular form/(P)/ -±ß·Á [¤Þ¤ë¤¬¤¿] /(n) (1) round tqshape/circle/(2) circular form/ +±ß·¿ [¤Þ¤ë¤¬¤¿] /(n) (1) round shape/circle/(2) circular form/ +±ß·Á [¤¨¤ó¤±¤¤] /(n) (1) round shape/circle/(2) circular form/(P)/ +±ß·Á [¤Þ¤ë¤¬¤¿] /(n) (1) round shape/circle/(2) circular form/ ±ß·Á·à¾ì [¤¨¤ó¤±¤¤¤²¤¤¸¤ç¤¦] /amphitheater/ ±ß·ÁæÌÓ¾É [¤¨¤ó¤±¤¤¤À¤Ä¤â¤¦¤·¤ç¤¦] /(n) alopecia areata/ ±ß·ú¤Æ [¤¨¤ó¤À¤Æ] /(n) yen base/(P)/ @@ -23545,7 +23545,7 @@ ±ßÅû¿ÞË¡ [¤¨¤ó¤È¤¦¤º¤Û¤¦] /(n) cylindrical projection/ ±ßÆâ [¤¨¤ó¤Ê¤¤] /(n) within the circle/ ±ßÈ× [¤¨¤ó¤Ð¤ó] /(n) disk/discus/(P)/ -±ßÈ×¾õ [¤¨¤ó¤Ð¤ó¤¸¤ç¤¦] /disk-tqshaped/ +±ßÈ×¾õ [¤¨¤ó¤Ð¤ó¤¸¤ç¤¦] /disk-shaped/ ±ßÈ×Åꤲ [¤¨¤ó¤Ð¤ó¤Ê¤²] /(n) discus throw/ ±ßÉñ [¤¨¤ó¤Ö] /(n) waltz/ ±ßÉñ¶Ê [¤¨¤ó¤Ö¤¤ç¤¯] /(n) waltz (composition)/ @@ -24070,7 +24070,7 @@ ±ö½Ð¤· [¤·¤ª¤À¤·] /(n) desalinating with water/ ±ö¾Æ [¤·¤ª¤ä¤] /(n) fish broiled with salt/boiling seawater to get salt/ ±ö¾Æ¤ [¤·¤ª¤ä¤] /(n) grilled or broiled with salt/boiling sea water to obtain salt/ -±ö¿¬ [¤·¤ª¤¸¤ê] /(n) cone-tqshaped/ +±ö¿¬ [¤·¤ª¤¸¤ê] /(n) cone-shaped/ ±ö¿É [¤·¤ª¤«¤é] /(n) salted fish (entrails)/ ±ö¿É¤¤ [¤·¤ª¤«¤é¤¤] /(adj) salty (taste)/(P)/ ±ö¿ÉÀ¼ [¤·¤ª¤«¤é¤´¤¨] /(n) hoarse voice/ @@ -24464,7 +24464,7 @@ ²£Ãú [¤è¤³¤Á¤ç¤¦] /(n) lane/alley/small street intersecting a main or side street/ ²£Ä® [¤è¤³¤Á¤ç¤¦] /(n) lane/alley/small street intersecting a main or side street/ ²£Ä¹ [¤è¤³¤Ê¤¬] /(adj-na,n) oblong/ -²£ÄÖ¤¸ [¤è¤³¤È¤¸] /(n) binding a book in an oblong tqshape/ +²£ÄÖ¤¸ [¤è¤³¤È¤¸] /(n) binding a book in an oblong shape/ ²£Å« [¤è¤³¤Ö¤¨] /(n) flute/fife/ ²£Å¾ [¤ª¤¦¤Æ¤ó] /(n,vs) turning sideways/barrel roll/(P)/ ²£Åݤ· [¤è¤³¤À¤ª¤·] /(n) falling over/toppling sideways/ @@ -26960,7 +26960,7 @@ ²ÖÇä¤ê̼ [¤Ï¤Ê¤¦¤ê¤à¤¹¤á] /flower girl/ ²ÖȪ [¤Ï¤Ê¤Ð¤¿¤±] /(n) flower garden/flower bed/ ²ÖÈï [¤«¤Ò] /(n) perianth/floral envelope/ -²ÖÉ© [¤Ï¤Ê¤Ó¤·] /(n) flower-tqshaped family crest/ +²ÖÉ© [¤Ï¤Ê¤Ó¤·] /(n) flower-shaped family crest/ ²ÖÉ©Áð [¤Ï¤Ê¤Ó¤·¤½¤¦] /(n) California poppy/ ²Öɹ [¤Ï¤Ê¤´¤ª¤ê] /(n) flowers surrounded by ice/ ²ÖÉÓ [¤«¤Ó¤ó] /(n) (flower) vase/(P)/ @@ -27489,7 +27489,7 @@ ²èÉý [¤¬¤Õ¤¯] /(n) picture scroll/ ²èÊó [¤¬¤Û¤¦] /(n) illustrated news magazine/pictorial/ ²èË¡ [¤¬¤Û¤¦] /(n) art of drawing and painting/ -²èË¡´ö²¿³Ø [¤¬¤Û¤¦¤¤«¤¬¤¯] /(n) descriptive tqgeometry/ +²èË¡´ö²¿³Ø [¤¬¤Û¤¦¤¤«¤¬¤¯] /(n) descriptive geometry/ ²èËÜ [¤¬¤Û¤ó] /picture copybook/ ²èÌÌ [¤¬¤á¤ó] /(n) terminal screen/scene/picture/the field (in TV)/photo/(P)/ ²èÌß [¤¬¤Ø¤¤] /(n) failure/fiasco/rice-cake painting/collapse/something of little value/ @@ -27559,7 +27559,7 @@ ²î¤¨»à¤Ë [¤«¤Ä¤¨¤¸¤Ë] /(n) (death from) starvation/ ²îµ´ [¤¬¤] /(n) (uk) brat/kids/ghoul/ ²îµ´¶¦ [¤¬¤¤É¤â] /those damn kids/ -²îµ´Âç¾ [¤¬¤¤À¤¤¤·¤ç¤¦] /(n) boss of the tqchildren (in the neighbourhood)/bully/ +²îµ´Âç¾ [¤¬¤¤À¤¤¤·¤ç¤¦] /(n) boss of the children (in the neighbourhood)/bully/ ²îµ´Æ» [¤¬¤¤É¤¦] /(n) hungry ghost/hungry devil/ ²î»à [¤¦¤¨¤¸¤Ë] /(n) (death from) starvation/(P)/ ²î»à [¤¬¤·] /(n) (death from) starvation/(P)/ @@ -27741,7 +27741,7 @@ ²ò¿¦ [¤«¤¤¤·¤ç¤¯] /(n) discharge/dismissal/ ²òÀÏ [¤«¤¤¤»¤] /(n,vs) analysis/(P)/ ²òÀÏ³Ø [¤«¤¤¤»¤¤¬¤¯] /(n) analysis/ -²òÀÏ´ö²¿³Ø [¤«¤¤¤»¤¤¤«¤¬¤¯] /analytical tqgeometry/ +²òÀÏ´ö²¿³Ø [¤«¤¤¤»¤¤¤«¤¬¤¯] /analytical geometry/ ²òÀÏÀ [¤«¤¤¤»¤¤»¤¤] /analyticity (physics)/ ²òÀâ [¤«¤¤¤»¤Ä] /(n,vs) explanation/commentary/(P)/ ²òÀâ¼Ô [¤«¤¤¤»¤Ä¤·¤ã] /(n) commentator/ @@ -28031,7 +28031,7 @@ ²ø½Ã±Ç²è [¤«¤¤¤¸¤å¤¦¤¨¤¤¤¬] /monster film/ ²ø¿Í [¤«¤¤¤¸¤ó] /(n) mysterious person/ ²ø¿Íʪ [¤«¤¤¤¸¤ó¤Ö¤Ä] /mysterious person/ -²øÀÐ [¤«¤¤¤»¤] /(n) oddly tqshaped stone or rock/ +²øÀÐ [¤«¤¤¤»¤] /(n) oddly shaped stone or rock/ ²øÃÌ [¤«¤¤¤À¤ó] /(n) ghost story/(P)/ ²øÃæ¤Î²ø [¤«¤¤¤Á¤å¤¦¤Î¤«¤¤] /mystery of mysteries/ ²øÅð [¤«¤¤¤È¤¦] /(n) mysterious (phantom) thief/ @@ -29111,10 +29111,10 @@ ³¿¤Î»Ò¤Ï³¿ [¤«¤¨¤ë¤Î¤³¤Ï¤«¤¨¤ë] /(exp) Like father, like son/ ³¿¤ÎÌ̤˿å [¤«¤¨¤ë¤Î¤Ä¤é¤Ë¤ß¤º] /(exp) like water off a duck's back/ ³¿±Ë¤® [¤«¤¨¤ë¤ª¤è¤®] /(n) the breaststroke/ -³¿¸Ô [¤«¤¨¤ë¤Þ¤¿] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (tqshape evocates an open-legged frog)/ +³¿¸Ô [¤«¤¨¤ë¤Þ¤¿] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (shape evocates an open-legged frog)/ ³¿Ä· [¤«¤¨¤ë¤È¤Ó] /(game of) leapfrog/ ³¿Ä·¤Ó [¤«¤¨¤ë¤È¤Ó] /(n) leapfrog/ -³¿Ëô [¤«¤¨¤ë¤Þ¤¿] /(iK) (n) curved wooden support on top of the main beam of a house, now mainly/decorative (tqshape evocates an open-legged frog)/ +³¿Ëô [¤«¤¨¤ë¤Þ¤¿] /(iK) (n) curved wooden support on top of the main beam of a house, now mainly/decorative (shape evocates an open-legged frog)/ ³¿óæ [¤¢¤Ü¤¦] /(arch) tree frog (toad)/ ³À [¤«¤] /(n) fence/(P)/ ³À´Ö¸«¤ë [¤«¤¤¤Þ¤ß¤ë] /(v1) to take a peep at/to catch a glimpse of/(P)/ @@ -29234,7 +29234,7 @@ ³Ê²¼¤² [¤«¤¯¤µ¤²] /(n) demotion/downgrading/ ³Ê³° [¤«¤¯¤¬¤¤] /(adj-na,adj-no,n) nonstandard/extraordinary/special/ ³Ê¸À [¤«¤¯¤²¤ó] /(n) aphorism/ -³Ê¹¥ [¤«¤Ã¤³¤¦] /(adj-no,adj-na,n) tqshape/form/posture/suitability/moderateness (in price)/appearance/manner/(P)/ +³Ê¹¥ [¤«¤Ã¤³¤¦] /(adj-no,adj-na,n) shape/form/posture/suitability/moderateness (in price)/appearance/manner/(P)/ ³Ê¹¥¤¤¤¤ [¤«¤Ã¤³¤¤¤¤] /(adj-na) attractive/good-looking/stylish/"cool"/ ³Ê¹¥¤¤¤¤ [¤«¤Ã¤³¤¦¤¤¤¤] /(ik) (adj-na) attractive/good-looking/stylish/"cool"/ ³Ê¹¥¤Î¤¤¤¤ [¤«¤Ã¤³¤¦¤Î¤¤¤¤] /(adj-na) attractive/good-looking/stylish/"cool"/ @@ -29690,7 +29690,7 @@ ³ØŤËǼ¤Þ¤ë [¤¬¤¯¤Á¤ç¤¦¤Ë¤ª¤µ¤Þ¤ë] /(exp) to take one's position as rector/ ³ØÅÌ [¤¬¤¯¤È] /(n) student/follower/students and pupils/(P)/ ³ØƸ [¤¬¤¯¤É¤¦] /(n) school child/pupil/(P)/ -³ØƸÊÝ°é [¤¬¤¯¤É¤¦¤Û¤¤¤¯] /care of schooltqchildren outside of school time/ +³ØƸÊÝ°é [¤¬¤¯¤É¤¦¤Û¤¤¤¯] /care of schoolchildren outside of school time/ ³ØÆÁ [¤¬¤¯¤È¤¯] /(n) learning and virtue/ ³ØÆâ [¤¬¤¯¤Ê¤¤] /(n) within the school/(P)/ ³Øǯ [¤¬¤¯¤Í¤ó] /(n) year in school/grade in school/(P)/ @@ -29722,7 +29722,7 @@ ³ØÎÀ [¤¬¤¯¤ê¤ç¤¦] /(n) student hostel/dormitory (e.g. for factory workers)/ ³ØÎÏ [¤¬¤¯¤ê¤ç¤¯] /(n) scholarship/knowledge/literary ability/(P)/ ³ØÎð [¤¬¤¯¤ì¤¤] /(n) school age/(P)/ -³ØÎð»ùƸ [¤¬¤¯¤ì¤¤¤¸¤É¤¦] /tqchildren of school age/ +³ØÎð»ùƸ [¤¬¤¯¤ì¤¤¤¸¤É¤¦] /children of school age/ ³ØÎò [¤¬¤¯¤ì¤] /(n) academic background/(P)/ ³ØÎò¼Ò²ñ [¤¬¤¯¤ì¤¤·¤ã¤«¤¤] /society emphasizing education/ ³Ù [¤¿¤±] /(n,suf) (1) peak/(2) mountain/(P)/ @@ -29798,7 +29798,7 @@ ³Û±ï [¤¬¤¯¤Ö¤Á] /(n) picture frame/(P)/ ³ÛºÝ [¤Ò¤¿¤¤¤®¤ï] /(n) the hairline/ ³ÛÆͤ¯ [¤Ì¤«¤º¤¯] /(v5k) to make a deep bow/ -³ÛÉÕ¤ [¤Ò¤¿¤¤¤Ä¤] /(n) tqshape of one's brow or forehead/ +³ÛÉÕ¤ [¤Ò¤¿¤¤¤Ä¤] /(n) shape of one's brow or forehead/ ³ÛÌÌ [¤¬¤¯¤á¤ó] /(n) face value/par/(P)/ ³ÛÌ̳ä¤ì [¤¬¤¯¤á¤ó¤ï¤ì] /(n) drop below par/ ³ÛÌ̳ô [¤¬¤¯¤á¤ó¤«¤Ö] /(n) par value stock/ @@ -29946,7 +29946,7 @@ ³ä¤êÇþ [¤ï¤ê¤à¤®] /(n) ground barley/ ³ä¤êȤ [¤ï¤ê¤Ð¤·] /(n) splittable (wood) chopsticks/(P)/ ³ä¤êȽ [¤ï¤ê¤Ð¤ó] /(n) seal over the edges of adjacent sheets/ -³ä¤êÉÕ¤± [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/tqlayout/editing/ +³ä¤êÉÕ¤± [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/layout/editing/ ³ä¤êÉÕ¤±¤ë [¤ï¤ê¤Ä¤±¤ë] /(v1) to allot/to distribute/to lay out/to divide among/to assign/ ³ä¤êÉáÀÁ [¤ï¤ê¤Ö¤·¤ó] /dividing work among several contractors/ ³ä¤êÉä [¤ï¤ê¤Õ] /(n) tally/score/check/ @@ -30014,8 +30014,8 @@ ³äÇþ [¤ï¤ê¤à¤®] /(n) ground barley/ ³äȤ [¤ï¤ê¤Ð¤·] /(n) splittable (wood) chopsticks/ ³äȽ [¤ï¤ê¤Ï¤ó] /(n) tally impression/ -³äÉÕ [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/tqlayout/editing/ -³äÉÕ¤± [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/tqlayout/editing/ +³äÉÕ [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/layout/editing/ +³äÉÕ¤± [¤ï¤ê¤Ä¤±] /(n) allotment/assignment/allocation/distribution/layout/editing/ ³äÉÕ¤±¤ë [¤ï¤ê¤Ä¤±¤ë] /(v1) to allot/to distribute/to lay out/to divide among/to assign/ ³äÉÕ¤ë [¤ï¤ê¤Ä¤±¤ë] /(v1) to allot/to distribute/to lay out/to divide among/to assign/ ³äÉä [¤ï¤ê¤Õ] /(n) tally/score/check/ @@ -30037,7 +30037,7 @@ ³åÇË [¤«¤Ã¤Ñ] /(n) proclamation/(P)/ ³æ¤â [¤¢¤¿¤«¤â] /(adv) as if/as it were/(P)/ ³æ¤â¹¥¤· [¤¢¤¿¤«¤â¤è¤·] /(adv) luckily/fortunately/ -³æ¹¥ [¤«¤Ã¤³¤¦] /(adj-no,adj-na,n) tqshape/form/posture/suitability/moderateness (in price)/appearance/manner/ +³æ¹¥ [¤«¤Ã¤³¤¦] /(adj-no,adj-na,n) shape/form/posture/suitability/moderateness (in price)/appearance/manner/ ³æ¹¥ÉÕ¤±¤ë [¤«¤Ã¤³¤Ä¤±¤ë] /(v1) to affect a stylish air/ ³æÅÙ [¤Á¤ç¤¦¤É] /(oK) (adj-na,adv,n) just/right/exactly/ ³æÉý [¤«¤Ã¤×¤¯] /(n) physique/bodily build/ @@ -30263,7 +30263,7 @@ ³õ [¤«¤Ö¤È] /(n) helmet (of armor)/headpiece/(P)/ ³õ³ª [¤«¤Ö¤È¤¬¤Ë] /(n) horseshoe crab/ ³õÃî [¤«¤Ö¤È¤à¤·] /(n) beetle/ -³õƬ¶Ò [¤«¤Ö¤È¤º¤¤ó] /(n) helmet-tqshaped hood/ +³õƬ¶Ò [¤«¤Ö¤È¤º¤¤ó] /(n) helmet-shaped hood/ ³÷ [¤«¤Ð] /(n) bulrush/cattail/ ³÷ [¤¬¤Þ] /(n) bulrush/cattail/ ³÷µû [¤«¤Þ¤È¤È] /(n) a kind of woman who pretends to be all sweet and innocent and naive/ @@ -30285,7 +30285,7 @@ ³øè§¤Ç [¤«¤Þ¤æ¤Ç] /(n) boiling in an iron pot/ ³ù [¤«¤Þ] /(n) (1) sickle/(2) part of a fish around the gills/(P)/ ³ù¤ò³Ý¤±¤ë [¤«¤Þ¤ò¤«¤±¤ë] /(exp) to trick someone into telling the truth/ -³ù·Á [¤«¤Þ¤¬¤¿] /(adj-no,n) sickle-tqshaped/falciform/ +³ù·Á [¤«¤Þ¤¬¤¿] /(adj-no,n) sickle-shaped/falciform/ ³ù»ß¤á [¤«¤Þ¤É¤á] /(n) cutting grass and trees is prohibited/ ³ù¼ó [¤«¤Þ¤¯¤Ó] /(n) gooseneck/ ³ùÁÒ»þÂå [¤«¤Þ¤¯¤é¤¸¤À¤¤] /(n) Kamakura period (1185-1333 CE)/ @@ -30364,7 +30364,7 @@ ´¤²È [¤«¤ï¤é¤ä] /tile-roofed house/ ´¤²ò [¤¬¤«¤¤] /(n) fatal flaw/ ´¤»Û [¤¬¤¹] /(n) (uk) gas/ -´¤ÀùÌß [¤«¤ï¤é¤»¤ó¤Ù¤¤] /(n) tile-tqshaped rice-cracker/ +´¤ÀùÌß [¤«¤ï¤é¤»¤ó¤Ù¤¤] /(n) tile-shaped rice-cracker/ ´¤Á´ [¤¬¤¼¤ó] /(n) meaningless existence/ ´¤ÈÇ [¤«¤ï¤é¤Ð¤ó] /(n) tile block print (newspaper in Tokugawa period)/ ´¤Éø [¤«¤ï¤é¤Ö¤] /(n) tile-roofing/ @@ -31384,7 +31384,7 @@ ´É¸¹³ÚÃÄ [¤«¤ó¤²¤ó¤¬¤¯¤À¤ó] /orchestra/(P)/ ´É¸¹³ÚË¡ [¤«¤ó¤²¤ó¤¬¤¯¤Û¤¦] /(n) orchestration/ ´É¸¾³Ú [¤«¤ó¤²¤ó¤¬¤¯] /(n) orchestral music/ -´Éºâ [¤«¤ó¤¶¤¤] /(n) administration of property/custodianship/tqreceivership/(P)/ +´Éºâ [¤«¤ó¤¶¤¤] /(n) administration of property/custodianship/receivership/(P)/ ´Éºâ¿Í [¤«¤ó¤¶¤¤¤Ë¤ó] /(n) trustee/receiver/administrator/ ´É»¹¸ê [¤¯¤À¤µ¤ó¤´] /(n) organ-pipe coral/ ´É¾¸ [¤«¤ó¤·¤ç¤¦] /(n) taking charge/management/ @@ -31888,8 +31888,8 @@ ´Ý´Ý¤ÈÂÀ¤Ã¤¿ [¤Þ¤ë¤Þ¤ë¤È¤Õ¤È¤Ã¤¿] /rotund/plump/chubby/ ´Ý´é [¤Þ¤ë¤¬¤ª] /(n) round face/moon face/ ´Ýµø [¤Þ¤ë¤Î¤³] /(n) circular saw/buzz saw/ -´Ý·¿ [¤Þ¤ë¤¬¤¿] /(n) (1) round tqshape/circle/(2) circular form/ -´Ý·Á [¤Þ¤ë¤¬¤¿] /(n) (1) round tqshape/circle/(2) circular form/ +´Ý·¿ [¤Þ¤ë¤¬¤¿] /(n) (1) round shape/circle/(2) circular form/ +´Ý·Á [¤Þ¤ë¤¬¤¿] /(n) (1) round shape/circle/(2) circular form/ ´Ý¸«¤¨ [¤Þ¤ë¤ß¤¨] /(n) completely visible/ ´Ý¸ø [¤Þ¤ë¤³¤¦] /(n) official price/ ´Ý¹Ý [¤Þ¤ë¤³¤¦] /round steel bar/ @@ -32153,7 +32153,7 @@ ´é¹ç¤» [¤«¤ª¤¢¤ï¤»] /(n,vs) meeting together/introduction/ ´é¹ç¤ï¤» [¤«¤ª¤¢¤ï¤»] /(n,vs) meeting together/introduction/(P)/ ´é¹õ [¤¬¤ó¤°¤í] /(n,vs) blackening the body/ -´éºî¤ê [¤«¤ª¤Å¤¯¤ê] /(n) tqshape of the head/using make-up/ +´éºî¤ê [¤«¤ª¤Å¤¯¤ê] /(n) shape of the head/using make-up/ ´é¼Ì¿¿ [¤«¤ª¤¸¤ã¤·¤ó] /(n) photographic portrait/ ´é½Ð¤· [¤«¤ª¤À¤·] /(n) putting in an appearance/showing one's face/ ´é¿§ [¤«¤ª¤¤¤í] /(n) complexion/countenance/expression/(P)/ @@ -32415,9 +32415,9 @@ ´ñ²ø [¤¤«¤¤] /(adj-na,n) strange/wonderful/weird/outrageous/mysterious/(P)/ ´ñ²ø [¤¤Ã¤«¤¤] /(adj-na,n) strange/wonderful/weird/outrageous/mysterious/ ´ñ´Ñ [¤¤«¤ó] /(n) wonderful sight/ -´ñ´à [¤¤¬¤ó] /(n) massive rock of unusual tqshape/ -´ñ´ä [¤¤¬¤ó] /(n) strangely tqshaped rocks/ -´ñ´ä²øÀÐ [¤¤¬¤ó¤«¤¤¤»¤] /strangely tqshaped rocks and bizarre stones/ +´ñ´à [¤¤¬¤ó] /(n) massive rock of unusual shape/ +´ñ´ä [¤¤¬¤ó] /(n) strangely shaped rocks/ +´ñ´ä²øÀÐ [¤¤¬¤ó¤«¤¤¤»¤] /strangely shaped rocks and bizarre stones/ ´ñ´ñ²ø²ø [¤¤¤«¤¤¤«¤¤] /(adj-na,n) very strange/bizarre/ ´ñ¶º [¤¤¤ç¤¦] /(adj-na,n) eccentric/ ´ñ¶º¤ÊÊÊ [¤¤¤ç¤¦¤Ê¤Ø¤] /eccentric habit/ @@ -32607,9 +32607,9 @@ ´ö¤é·çÅÀ¤¬Í¤Ã¤Æ¤â [¤¤¤¯¤é¤±¤Ã¤Æ¤ó¤¬¤¢¤Ã¤Æ¤â] /with all one's faults/ ´ö¤éÊÙ¶¯¤·¤Æ¤â [¤¤¤¯¤é¤Ù¤ó¤¤ç¤¦¤·¤Æ¤â] /however hard one may work/ ´ö²¿ [¤¤¤¯¤Ð¤¯] /(adv,n-t) how many/how much/ -´ö²¿ [¤¤«] /(n) tqgeometry/(P)/ +´ö²¿ [¤¤«] /(n) geometry/(P)/ ´ö²¿¤â̵¤¯ [¤¤¤¯¤Ð¤¯¤â¤Ê¤¯] /(adv) not long after/before long/ -´ö²¿³Ø [¤¤«¤¬¤¯] /(n) tqgeometry/(P)/ +´ö²¿³Ø [¤¤«¤¬¤¯] /(n) geometry/(P)/ ´ö²¿µé¿ô [¤¤«¤¤å¤¦¤¹¤¦] /(n) geometric series or progression/ ´ö²¿Ê¿¶Ñ [¤¤«¤Ø¤¤¤¤ó] /geometric average or mean/ ´öµ×¤·¤¯ [¤¤¤¯¤Ò¤µ¤·¤¯] /(adv) forever/ @@ -33531,7 +33531,7 @@ µ´·º»ö [¤ª¤Ë¤±¤¤¤¸] /crack detective/ µ´ºÍ [¤¤µ¤¤] /(n) wizard/genius/great talent/(P)/ µ´»Ò [¤ª¤Ë¤´] /(n) child born with teeth/child which does not resemble its parents/ -µ´»ÒÊì¿À [¤¤·¤â¤¸¤ó] /(n) goddess of childbirth and tqchildren/ +µ´»ÒÊì¿À [¤¤·¤â¤¸¤ó] /(n) goddess of childbirth and children/ µ´»õ [¤ª¤Ë¤Ð] /(n) protruding tooth (like a fang)/ µ´½÷ [¤¤¸¤ç] /(n) demoness/witch/ogress/she-devil/ µ´¿À [¤ª¤Ë¤¬¤ß] /(n) fierce god/ @@ -33910,7 +33910,7 @@ µÆ²Ö [¤¤Ã¤«] /(n) chrysanthemum/ µÆ·î [¤¤¯¤Å¤] /(n) the ninth month in the lunar calendar/ µÆºî¤ê [¤¤¯¤Å¤¯¤ê] /(n) chrysanthemum growing/ -µÆ¿Í·Á [¤¤¯¤Ë¤ó¤®¤ç¤¦] /(n) chrysanthemum-tqshaped puppet/ +µÆ¿Í·Á [¤¤¯¤Ë¤ó¤®¤ç¤¦] /(n) chrysanthemum-shaped puppet/ µÆÀÐ [¤¤¯¤¤¤·] /(n) ammonite (traditional name)/ µÆȽ [¤¤¯¤Ð¤ó] /(n) A5/medium octavo/small octavo/ µÇ [¤Þ¤ê] /(n) ball/ @@ -34355,21 +34355,21 @@ µÝ [¤æ¤ß] /(n) bow (and arrow)/(P)/ µÝ¤ò°ú¤¯ [¤æ¤ß¤ò¤Ò¤¯] /(exp) to draw a bow/ µÝ¶ñ [¤¤å¤¦¤°] /things used in archery/ -µÝ·Á [¤¤å¤¦¤±¤¤] /(adj-no,n) arched/crescent-tqshaped/bow-tqshaped/segment/ -µÝ·Á [¤æ¤ß¤¬¤¿] /(adj-no,n) arched/crescent-tqshaped/bow-tqshaped/segment/ -µÝ·Á [¤æ¤ß¤Ê¤ê] /(adj-no,n) arched/crescent-tqshaped/bow-tqshaped/segment/ -µÝ·Á¤Ë¤Ê¤ë [¤æ¤ß¤Ê¤ê¤Ë¤Ê¤ë] /(exp) to bend backward/to become bow-tqshaped/ +µÝ·Á [¤¤å¤¦¤±¤¤] /(adj-no,n) arched/crescent-shaped/bow-shaped/segment/ +µÝ·Á [¤æ¤ß¤¬¤¿] /(adj-no,n) arched/crescent-shaped/bow-shaped/segment/ +µÝ·Á [¤æ¤ß¤Ê¤ê] /(adj-no,n) arched/crescent-shaped/bow-shaped/segment/ +µÝ·Á¤Ë¤Ê¤ë [¤æ¤ß¤Ê¤ê¤Ë¤Ê¤ë] /(exp) to bend backward/to become bow-shaped/ µÝ¸¹ [¤æ¤ß¤Å¤ë] /(n) bowstring/ µÝ»Õ [¤æ¤ß¤·] /(n) bow maker/ µÝ¼è¤ê¼° [¤æ¤ß¤È¤ê¤·¤] /(n) bow-twirling ceremony in sumo/ µÝ¼ê [¤æ¤ó¤Ç] /(n) one's left hand/ µÝ½Ñ [¤¤å¤¦¤¸¤å¤Ä] /(n) (Japanese) archery/ -µÝ¾õ [¤¤å¤¦¤¸¤ç¤¦] /(adj-no,n) bow-tqshaped/arched/ +µÝ¾õ [¤¤å¤¦¤¸¤ç¤¦] /(adj-no,n) bow-shaped/arched/ µÝÀª [¤æ¤ó¤¼¤¤] /(n) strength needed to pull back a bow/ µÝÀý [¤¤å¤¦¤»¤ó] /(n) bows and arrows/war/ -µÝÄ¥¤ê [¤æ¤ß¤Ï¤ê] /(n) paper lantern with bow-tqshaped handle/ +µÝÄ¥¤ê [¤æ¤ß¤Ï¤ê] /(n) paper lantern with bow-shaped handle/ µÝÄ¥¤ê·î [¤æ¤ß¤Ï¤ê¤Å¤] /(n) crescent moon/ -µÝÄ¥¤êÄóÅô [¤æ¤ß¤Ï¤ê¤Â¤ç¤¦¤Á¤ó] /paper lantern with bow-tqshaped handle/ +µÝÄ¥¤êÄóÅô [¤æ¤ß¤Ï¤ê¤Â¤ç¤¦¤Á¤ó] /paper lantern with bow-shaped handle/ µÝÆ» [¤¤å¤¦¤É¤¦] /(n) (Japanese) archery/(P)/ µÝÇÏ [¤¤å¤¦¤Ð] /(n) archery and horsemanship/ µÝÌð [¤¤å¤¦¤·] /(n) bow and arrow/ @@ -34624,7 +34624,7 @@ µåµº [¤¤å¤¦¤®] /(n) billiards/ µåµ» [¤¤å¤¦¤®] /(n) any ball game/(P)/ µå¶Ý [¤¤å¤¦¤¤ó] /(n) coccus/(P)/ -µå·Á [¤¤å¤¦¤±¤¤] /(adj-no,n) globular or spherical tqshape/ +µå·Á [¤¤å¤¦¤±¤¤] /(adj-no,n) globular or spherical shape/ µå·Ô [¤¤å¤¦¤±¤¤] /(n) (plant) bulb/onion/ µåº¬ [¤¤å¤¦¤³¤ó] /(n) (plant) bulb/ µåºÂɸ [¤¤å¤¦¤¶¤Ò¤ç¤¦] /(n) spherical coordinates/ @@ -34638,7 +34638,7 @@ µåÃÄ [¤¤å¤¦¤À¤ó] /(n) baseball team/(P)/ µåÅÅ [¤¤å¤¦¤Ç¤ó] /(n) ball lightning/ µåÌÌ [¤¤å¤¦¤á¤ó] /(n) spherical surface/ -µåÌÌ´ö²¿³Ø [¤¤å¤¦¤á¤ó¤¤«¤¬¤¯] /(n) spherical tqgeometry/ +µåÌÌ´ö²¿³Ø [¤¤å¤¦¤á¤ó¤¤«¤¬¤¯] /(n) spherical geometry/ µåÌ̶À [¤¤å¤¦¤á¤ó¤¤ç¤¦] /(n) spherical mirror/ µåÌÌ»°³ÑË¡ [¤¤å¤¦¤á¤ó¤µ¤ó¤«¤¯¤Û¤¦] /spherical trigonometry/ µæ¤á¤ë [¤¤ï¤á¤ë] /(v1) to master/to investigate thoroughly/ @@ -35209,7 +35209,7 @@ µûÅô [¤®¤ç¤È¤¦] /(n) lights to lure fish/ µûÆ» [¤®¤ç¤É¤¦] /(n) path taken by school of fish/fish ladder/ µûÆù [¤®¤ç¤Ë¤¯] /(n) fish meat/(P)/ -µûÈÄ [¤®¤ç¤Ð¤ó] /(n) wooden gong tqshaped like a fish/ +µûÈÄ [¤®¤ç¤Ð¤ó] /(n) wooden gong shaped like a fish/ µûÈî [¤®¤ç¤Ò] /(n) fertilizer made from fish parts/ µûÊ¢ [¤®¤ç¤Õ¤¯] /(n) fish entrails/ µûÊ´ [¤®¤ç¤Õ¤ó] /(n) fish meal/ @@ -35633,7 +35633,7 @@ ¶³¦ [¤¤ç¤¦¤«¤¤] /(n) boundary/(P)/ ¶³¦Àþ [¤¤ç¤¦¤«¤¤¤»¤ó] /(n) boundary line/ ¶³¦ÃÍÌäÂê [¤¤ç¤¦¤«¤¤¤Á¤â¤ó¤À¤¤] /boundary value problem/ -¶³¦Ä´À° [¤¤ç¤¦¤«¤¤¤Á¤ç¤¦¤»¤¤] /tqalignment/ +¶³¦Ä´À° [¤¤ç¤¦¤«¤¤¤Á¤ç¤¦¤»¤¤] /alignment/ ¶³¦É¸ [¤¤ç¤¦¤«¤¤¤Ò¤ç¤¦] /landmark/ ¶³¦ÍýÏÀ [¤¤ç¤¦¤«¤¤¤ê¤í¤ó] /bounding theory/ ¶³¶ [¤¤ç¤¦¤¬¤¤] /(n) circumstances/one's situation or lot in life/ @@ -36387,7 +36387,7 @@ ¶Êµ» [¤¤ç¤¯¤®] /(n) acrobatic feats/ ¶Êµå [¤¤ç¤Ã¤¤å¤¦] /(n) curve ball/ ¶Ê¶Ê [¤¯¤Þ¤°¤Þ] /nooks/corners/ -¶Ê¶Ì [¤Þ¤¬¤¿¤Þ] /(n) (ancient) comma-tqshaped jewels/ +¶Ê¶Ì [¤Þ¤¬¤¿¤Þ] /(n) (ancient) comma-shaped jewels/ ¶Ê·Ý [¤¤ç¤¯¤²¤¤] /(n) acrobatics/ ¶Ê·Ý»Õ [¤¤ç¤¯¤²¤¤¤·] /acrobat/tumbler/ ¶Ê»ö [¤¤ç¤¯¤¸] /(n) wickedness/injustice/ @@ -37928,7 +37928,7 @@ ¶þ¤á¤ë [¤«¤¬¤á¤ë] /(v1) (uk) to stoop/to bend/ ¶þ¶¯ [¤¯¤Ã¤¤ç¤¦] /(adj-na,n) robust (health)/obstinate/sturdy/muscular/ ¶þ¶Ê [¤¯¤Ã¤¤ç¤¯] /(n) be crooked/bent/indented/ -¶þ¶ÊÉô [¤¯¤Ã¤¤ç¤¯¤Ö] /(n) elbow/elbow-tqshaped bend/ +¶þ¶ÊÉô [¤¯¤Ã¤¤ç¤¯¤Ö] /(n) elbow/elbow-shaped bend/ ¶þ¶Ú [¤¯¤Ã¤¤ó] /(n) flexor muscle/ ¶þ¸÷À [¤¯¤Ã¤³¤¦¤»¤¤] /(n) phototropism/ ¶þ»Ø [¤¯¤Ã¤·] /(adj-no,n) leading/foremost/preeminent/outstanding/one of the best/(P)/ @@ -38532,7 +38532,7 @@ ·¾ÁÇ [¤±¤¤¤½] /(n) silicon (Si)/ ·¾Áô [¤±¤¤¤½¤¦] /(n) diatom/ ·¾ÁôÅÚ [¤±¤¤¤½¤¦¤É] /(n) diatomaceous soil/ -·¿ [¤«¤¿] /(n) mold/model/style/tqshape/data type/(P)/ +·¿ [¤«¤¿] /(n) mold/model/style/shape/data type/(P)/ ·¿¤ËÖȤá¤ë [¤«¤¿¤Ë¤Ï¤á¤ë] /(v1) to stereotype/to squeeze into a pattern/to regiment/ ·¿»æ [¤«¤¿¤¬¤ß] /(n) pattern paper (for dressmaking)/ ·¿¼° [¤±¤¤¤·¤] /(n) model/(P)/ @@ -38542,7 +38542,7 @@ ·¿Çˤê [¤«¤¿¤ä¤Ö¤ê] /(adj-na,adj-no,n) unusual/unconventional/ ·¿ÈÖ [¤«¤¿¤Ð¤ó] /(n) pattern number/ ·¿ÊÑ´¹ [¤«¤¿¤Ø¤ó¤«¤ó] /type conversion/ -·¿Êø¤ì [¤«¤¿¤¯¤º¤ì] /(n,vs) losing tqshape/getting out of tqshape/ +·¿Êø¤ì [¤«¤¿¤¯¤º¤ì] /(n,vs) losing shape/getting out of shape/ ·¿ÏÈ [¤«¤¿¤ï¤¯] /(n) mold/ ·À¤ê [¤Á¤®¤ê] /(n) pledge/vow/promise/destiny/share bed and board/ ·À¤ë [¤Á¤®¤ë] /(v5r) to pledge/to promise/to swear/ @@ -38559,19 +38559,19 @@ ·ÀÌó½ñ [¤±¤¤¤ä¤¯¤·¤ç] /(n) (written) contract/ ·ÀÌóÉÔÍú¹Ô [¤±¤¤¤ä¤¯¤Õ¤ê¤³¤¦] /(n) breach of contract/ ·ÀÌóÌäÂê [¤±¤¤¤ä¤¯¤â¤ó¤À¤¤] /(n) contract dispute/ -·Á [¤«¤¿¤Á] /(n) form/tqshape/figure/type/(P)/ -·Á¤¬Êø¤ì¤ë [¤«¤¿¤¬¤¯¤º¤ì¤ë] /(exp) to get out of tqshape/to lose tqshape/ -·Á¤Å¤¯¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to tqshape/to make/to mold/to build up/(P)/ -·Á¤È¿§¤òÊѤ¨¤ë [¤«¤¿¤Á¤È¤¤¤í¤ò¤«¤¨¤ë] /(exp) to change the tqshape and color of/ -·Á¤É¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the tqshape of/to represent/to pattern after/to symbolise/to imitate/ -·Á°Õ·ý [¤±¤¤¤¤¤±¤ó] /(n) (MA) tqshape-of-the-mind fist/Hsing I Chuan/ +·Á [¤«¤¿¤Á] /(n) form/shape/figure/type/(P)/ +·Á¤¬Êø¤ì¤ë [¤«¤¿¤¬¤¯¤º¤ì¤ë] /(exp) to get out of shape/to lose shape/ +·Á¤Å¤¯¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to shape/to make/to mold/to build up/(P)/ +·Á¤È¿§¤òÊѤ¨¤ë [¤«¤¿¤Á¤È¤¤¤í¤ò¤«¤¨¤ë] /(exp) to change the shape and color of/ +·Á¤É¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the shape of/to represent/to pattern after/to symbolise/to imitate/ +·Á°Õ·ý [¤±¤¤¤¤¤±¤ó] /(n) (MA) shape-of-the-mind fist/Hsing I Chuan/ ·Á±Æ [¤±¤¤¤¨¤¤] /(n) the form and its shadow/things inseparable/ ·Á³¼ [¤±¤¤¤¬¤¤] /(n) ruin/wreck/mere skeleton/framework/ ·Á³¼²½ [¤±¤¤¤¬¤¤¤«] /(n) becoming a mere shell or dead letter/ ·Áµö [¤«¤¿¤Ð¤«¤ê] /for form's sake/ ·Á¸« [¤«¤¿¤ß] /(n) memento/souvenir/(P)/ ·Á¸«Ê¬¤± [¤«¤¿¤ß¤ï¤±] /(n) distribution of mementos/ -·Áºî¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to tqshape/to make/to mold/to build up/ +·Áºî¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to shape/to make/to mold/to build up/ ·Á¼©²¼ [¤±¤¤¤¸¤«] /(adj-no,n) physical/material/ ·Á¼©²¼³Ø [¤±¤¤¤¸¤«¤¬¤¯] /(n) physical sciences/ ·Á¼©¾å [¤±¤¤¤¸¤¸¤ç¤¦] /(n) metaphysical/ @@ -38587,12 +38587,12 @@ ·Á¼Á [¤±¤¤¤·¤Ä] /(n) form and nature/ ·Á¼Áž´¹ [¤±¤¤¤·¤Ä¤Æ¤ó¤«¤ó] /transformation/ ·Á¼ÁƳÆþ [¤±¤¤¤·¤Ä¤É¤¦¤Ë¤å¤¦] /transduction/ -·Á¼è¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the tqshape of/to represent/to pattern after/to symbolise/to imitate/ +·Á¼è¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the shape of/to represent/to pattern after/to symbolise/to imitate/ ·Á¾¡ [¤±¤¤¤·¤ç¤¦] /(n) scenic beauty/ -·Á¾Ý [¤±¤¤¤·¤ç¤¦] /(n) tqshape/figure/image/ -·Á¾Ý²½ [¤±¤¤¤·¤ç¤¦¤«] /(n) giving tqshape to/ -·Á¾õ [¤±¤¤¤¸¤ç¤¦] /(n) tqshape/form/(P)/ -·Á¾õµ²±¹ç¶â [¤±¤¤¤¸¤ç¤¦¤¤ª¤¯¤´¤¦¤¤ó] /tqshape memory alloy/ +·Á¾Ý [¤±¤¤¤·¤ç¤¦] /(n) shape/figure/image/ +·Á¾Ý²½ [¤±¤¤¤·¤ç¤¦¤«] /(n) giving shape to/ +·Á¾õ [¤±¤¤¤¸¤ç¤¦] /(n) shape/form/(P)/ +·Á¾õµ²±¹ç¶â [¤±¤¤¤¸¤ç¤¦¤¤ª¤¯¤´¤¦¤¤ó] /shape memory alloy/ ·Á¿¶¤ê [¤Ê¤ê¤Õ¤ê] /(n) one's appearance/ ·ÁÀª [¤±¤¤¤»¤¤] /(n) condition/situation/prospects/(P)/ ·ÁÀ® [¤±¤¤¤»¤¤] /(n,vs) formation/(P)/ @@ -38604,10 +38604,10 @@ ·ÁÀ× [¤±¤¤¤»¤] /(n) traces/evidence/(P)/ ·ÁÁê [¤®¤ç¤¦¤½¤¦] /(n) features/look/aspect/phase/form/ ·ÁÁê [¤±¤¤¤½¤¦] /(n) features/look/aspect/phase/form/ -·Á¤¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to tqshape/to make/to mold/to build up/ -·ÁÂÎ [¤±¤¤¤¿¤¤] /(n) form/tqshape/figure/ +·Á¤¤ë [¤«¤¿¤Á¤Å¤¯¤ë] /(v5r) to form/to shape/to make/to mold/to build up/ +·ÁÂÎ [¤±¤¤¤¿¤¤] /(n) form/shape/figure/ ·ÁÂÎ [¤Ê¤ê¤«¤¿¤Á] /one's appearance/ -·ÁÂÖ [¤±¤¤¤¿¤¤] /(n) form/tqshape/figure/(P)/ +·ÁÂÖ [¤±¤¤¤¿¤¤] /(n) form/shape/figure/(P)/ ·ÁÂÖ³Ø [¤±¤¤¤¿¤¤¤¬¤¯] /(n) morphology/ ·ÁÂÖÁÇ [¤±¤¤¤¿¤¤¤½] /(n) morpheme/ ·ÁÂÖÏÀ [¤±¤¤¤¿¤¤¤í¤ó] /(n) morphology/ @@ -39778,7 +39778,7 @@ ·î¶Ë¤á [¤Ä¤¤®¤á] /(adj-na,n) monthly/ ·î¶Ë¤áÃó¼Ö¾ì [¤Ä¤¤®¤á¤Á¤å¤¦¤·¤ã¤¸¤ç¤¦] /parking lot rented on a monthly basis/ ·î¶â [¤²¤Ä¤¤ó] /Mondays and Fridays/ -·î·Á [¤Ä¤¤¬¤¿] /(n) crescent tqshape/ +·î·Á [¤Ä¤¤¬¤¿] /(n) crescent shape/ ·î·Ë [¤²¤Ã¤±¤¤] /(n) laurel/the moon/ ·î·Ë´§ [¤²¤Ã¤±¤¤¤«¤ó] /(n) laurel wreath/ ·î·Ë¼ù [¤²¤Ã¤±¤¤¤¸¤å] /(n) laurel tree/bay tree/ @@ -39972,7 +39972,7 @@ ·õµÒ [¤±¤ó¤«¤¯] /(n) fencer/swordsman/ ·õµÒ [¤±¤ó¤¤ã¤¯] /(n) fencer/swordsman/ ·õ¶Ì [¤±¤ó¤À¤Þ] /(n) cup-and-ball game/ -·õ·Á [¤±¤ó¤¬¤¿] /sword tqshape/ +·õ·Á [¤±¤ó¤¬¤¿] /sword shape/ ·õ·à [¤±¤ó¤²¤] /(n) sword play/samurai drama/(P)/ ·õ·á [¤±¤ó¤²¤] /(n) weapons/arms/ ·õ¹ë [¤±¤ó¤´¤¦] /(n) master fencer/ @@ -39980,7 +39980,7 @@ ·õ»Î [¤±¤ó¤·] /(n) fencer/(P)/ ·õ¼¥ [¤±¤ó¤¸] /sacred sword and jewels/ ·õ½Ñ [¤±¤ó¤¸¤å¤Ä] /(n) fencing/ -·õ¾õ [¤±¤ó¤¸¤ç¤¦] /sword-tqshaped/ +·õ¾õ [¤±¤ó¤¸¤ç¤¦] /sword-shaped/ ·õÀè [¤±¤ó¤µ¤] /(n) point of a sword/ ·õÂÓ [¤±¤ó¤¿¤¤] /sword belt/ ·õÆ» [¤±¤ó¤É¤¦] /(n) kendo/swordmanship/fencing/(P)/ @@ -40046,7 +40046,7 @@ ·øÎÝ [¤±¤ó¤ë¤¤] /(n) stronghold/ ·øÏ´ [¤±¤ó¤í¤¦] /(adj-na,n) solid/ ·ù [¤¤¤ä] /(adj-na,n) disagreeable/detestable/unpleasant/reluctant/(P)/ -·ù¡¹ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ +·ù¡¹ [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ ·ù¤¤ [¤¤é¤¤] /(adj-na,n) dislike/hate/(P)/ ·ù¤¤¤À [¤¤é¤¤¤À] /do not like/dislike/ ·ù¤¦ [¤¤é¤¦] /(v5u) to hate/to dislike/to loathe/(P)/ @@ -40068,7 +40068,7 @@ ·ùµ¤À¸Êª [¤±¤ó¤¤»¤¤¤Ö¤Ä] /(adj-na) anaerobe/ ·ùµ¿ [¤±¤ó¤®] /(n) suspicion/(P)/ ·ùµ¿¼Ô [¤±¤ó¤®¤·¤ã] /(n) suspect/ -·ù·ù [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to tqchildren)/ +·ù·ù [¤¤¤ä¤¤¤ä] /(adv,n) (uk) unwillingly/grudgingly/shaking head in refusal (to children)/ ·ùÌ£ [¤¤¤ä¤ß] /(adj-na,n) disagreeableness/gaudiness/sarcasm/ ·ú¤Ä [¤¿¤Ä] /(v5t) to erect/to be erected/to be built/(P)/ ·ú¤Æ¤ë [¤¿¤Æ¤ë] /(v1) to build/to construct/(P)/ @@ -42599,7 +42599,7 @@ ¸å¹à [¤³¤¦¤³¤¦] /(n) following or later or last clause or article, etc./ ¸å¹ï [¤´¤³¤¯] /(n-adv,n-t) afterwards/ ¸å¹þ¤ß [¤·¤ê¤´¤ß] /(n,vs) recoil/hesitation/flinching/shrinking back/ -¸åº« [¤³¤¦¤³¤ó] /(n) grandtqchildren/posterity/ +¸åº« [¤³¤¦¤³¤ó] /(n) grandchildren/posterity/ ¸åºÊ [¤´¤µ¤¤] /(n) second wife/(P)/ ¸åºî [¤¢¤È¤µ¤¯] /(n) second crop/ ¸å»º [¤¢¤È¤¶¤ó] /(n) placenta/afterbirth/secundina/ @@ -43633,7 +43633,7 @@ ¸øÁÊ [¤³¤¦¤½] /(n) accusation/prosecution/(P)/ ¸øÁò [¤³¤¦¤½¤¦] /(n) public funeral/ ¸ø¹¼ù [¤¤¤Á¤ç¤¦] /(n) ginkgo/maidenhair tree/ -¸øã [¤¤ó¤À¤Á] /(n) kings/tqchildren of nobles/young nobleman/ +¸øã [¤¤ó¤À¤Á] /(n) kings/children of nobles/young nobleman/ ¸øã [¤³¤¦¤¿¤Ä] /(n) official announcement/ ¸øÃÄ [¤³¤¦¤À¤ó] /(n) public corporation/(P)/ ¸øÃĽ»Âð [¤³¤¦¤À¤ó¤¸¤å¤¦¤¿¤¯] /public housing/ @@ -43786,7 +43786,7 @@ ¸û°ú¤· [¤«¤É¤ï¤«¤·] /(n) kidnapper/ ¸û°ú¤¹ [¤«¤É¤ï¤«¤¹] /(v5s) to kidnap/ ¸û°ú¾õ [¤³¤¦¤¤¤ó¤¸¤ç¤¦] /(n) summons/warrant of arrest/ -¸û¶Ì [¤Þ¤¬¤¿¤Þ] /(n) (ancient) comma-tqshaped jewels/ +¸û¶Ì [¤Þ¤¬¤¿¤Þ] /(n) (ancient) comma-shaped jewels/ ¸ûÇÛ [¤³¤¦¤Ð¤¤] /(n) slope/incline/gradient/grade/pitch/(P)/ ¸ûα [¤³¤¦¤ê¤å¤¦] /(n) detention/confinement/ ¸ü¤¤ [¤¢¤Ä¤¤] /(adj) cordial/kind/warm(hearted)/thick/deep/(P)/ @@ -43895,7 +43895,7 @@ ¸ý´ñÎï [¤¯¤Á¤®¤ì¤¤] /(adj-na,n) speaking elegantly/speaking clearly/not coveting food/speaking like an innocent person/ ¸ý´ó¤» [¤¯¤Á¤è¤»] /(n) spiritualism/necromancy/ ¸ýµ¤ [¤³¤¦¤] /(n) bad breath/intimation/ -¸ýµö [¤¯¤Á¤â¤È] /(n) the mouth/tqshape of the mouth/near an entrance/ +¸ýµö [¤¯¤Á¤â¤È] /(n) the mouth/shape of the mouth/near an entrance/ ¸ý¶¡ [¤³¤¦¤¤ç¤¦] /(n) affidavit/deposition/ ¸ý¶¡½ñ [¤³¤¦¤¤ç¤¦¤·¤ç] /affidavit/deposition/ ¸ý¶Ò¤Ã¤¿¤¤ [¤¯¤Á¤Ï¤Ð¤Ã¤¿¤¤] /acting smart/bragging/ @@ -43908,7 +43908,7 @@ ¸ý·ö²Þ [¤¯¤Á¤±¤ó¤«] /(n,vs) quarrel/dispute/ ¸ý·ö²Þ [¤¯¤Á¤²¤ó¤«] /(n,vs) quarrel/dispute/ ¸ý·ø¤¤ [¤¯¤Á¤¬¤¿¤¤] /(adj) discreet/tight-lipped/ -¸ý¸µ [¤¯¤Á¤â¤È] /(n) the mouth/tqshape of the mouth/near an entrance/ +¸ý¸µ [¤¯¤Á¤â¤È] /(n) the mouth/shape of the mouth/near an entrance/ ¸ý¸º¤é¤· [¤¯¤Á¤Ù¤é¤·] /(n) reducing the mouths to feed/ ¸ý¸ÀÍÕ [¤¯¤Á¤³¤È¤Ð] /(n) words in common use/ ¸ý¸Ç¤á [¤¯¤Á¤¬¤¿¤á] /(n) verbal promise/ @@ -44033,8 +44033,8 @@ ¸ýÈê [¤³¤¦¤Ò] /(n) oral tradition/legend/folklore/ ¸ýɦ [¤¯¤Á¤Ò¤²] /(n) moustache/ ¸ýÉÔÄ´Ë¡ [¤¯¤Á¤Ö¤Á¤ç¤¦¤Û¤¦] /(adj-na,n) poor talker/ -¸ýÉÕ¤ [¤¯¤Á¤Ä¤] /(n) (1) (in the tqshape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ -¸ýÉÕ¤ [¤¯¤Á¤Å¤] /(n) (1) (in the tqshape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ +¸ýÉÕ¤ [¤¯¤Á¤Ä¤] /(n) (1) (in the shape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ +¸ýÉÕ¤ [¤¯¤Á¤Å¤] /(n) (1) (in the shape of a) mouth/(2) mouthpiece (of a cigarette)/(3) manner of speech/ ¸ýÉÕ¤±ìÁð [¤¯¤Á¤Å¤¤¿¤Ð¤³] /cigarette with a mouthpiece/ ¸ýÉÕ¤± [¤¯¤Á¤Å¤±] /(n) kiss/ ¸ýÉÕ¤±¤ë [¤¯¤Á¤Å¤±¤ë] /(v1) to kiss/ @@ -44247,7 +44247,7 @@ ¹¥ÂÇ [¤³¤¦¤À] /(n) (baseball) good hit/ ¹¥ÂÇ¼Ô [¤³¤¦¤À¤·¤ã] /good batter/ ¹¥ÃË»Ò [¤³¤¦¤À¤ó¤·] /(n) handsome man/ -¹¥Ä´ [¤³¤¦¤Á¤ç¤¦] /(adj-na,n) favourable/promising/satisfactory/in good tqshape/(P)/ +¹¥Ä´ [¤³¤¦¤Á¤ç¤¦] /(adj-na,n) favourable/promising/satisfactory/in good shape/(P)/ ¹¥Å¨¼ê [¤³¤¦¤Æ¤¤·¤å] /(n) worthy rival or opponent/ ¹¥Å¬ [¤³¤¦¤Æ¤] /(adj-na,n) ideal/fit/fitted/fitting/suitable/ ¹¥Å· [¤³¤¦¤Æ¤ó] /(n) fine weather/(P)/ @@ -47765,7 +47765,7 @@ ºÆÃò [¤µ¤¤¤Á¤å¤¦] /recasting/ ºÆÄ´ [¤µ¤¤¤Á¤ç¤¦] /(n,vs) reexamination/reinvestigation/ ºÆÄ´ºº [¤µ¤¤¤Á¤ç¤¦¤µ] /re-examination/reinvestigation/ -ºÆÄ´À° [¤µ¤¤¤Á¤ç¤¦¤»¤¤] /readjustment/retqalignment/ +ºÆÄ´À° [¤µ¤¤¤Á¤ç¤¦¤»¤¤] /readjustment/realignment/ ºÆľÀÜ¿ÒÌä [¤µ¤¤¤Á¤ç¤¯¤»¤Ä¤¸¤ó¤â¤ó] /(n) redirect examination/ ºÆÄêµÁ [¤µ¤¤¤Æ¤¤¤®] /(n) (math) redefinition/ ºÆÄó°Æ [¤µ¤¤¤Æ¤¤¤¢¤ó] /proposing again/ @@ -47790,7 +47790,7 @@ ºÆdz [¤µ¤¤¤Í¤ó] /(n) recurrence/revival/resuscitation/(P)/ ºÆÇÒ [¤µ¤¤¤Ï¤¤] /(int,n) worshipping again/bowing twice/epistolary clothing/ ºÆÇÔ [¤µ¤¤¤Ï¤¤] /(n) second defeat/ -ºÆÇÛÃÖ [¤µ¤¤¤Ï¤¤¤Á] /(n) rearrangement/reallocation/retqalignment/ +ºÆÇÛÃÖ [¤µ¤¤¤Ï¤¤¤Á] /(n) rearrangement/reallocation/realignment/ ºÆÇÛÉÛ [¤µ¤¤¤Ï¤¤¤Õ] /redistribution/ ºÆÇÛʬ [¤µ¤¤¤Ï¤¤¤Ö¤ó] /redistribution/ ºÆȯ [¤µ¤¤¤Ï¤Ä] /(n) return/relapse/reoccurrence/(P)/ @@ -47961,7 +47961,7 @@ ºÊ [¤Ä¤Þ] /(n) (hum) wife/(P)/ ºÊ¤ÎºÂ [¤Ä¤Þ¤Î¤¶] /status of wifehood/ ºÊ¸Í [¤Ä¤Þ¤É] /(n) (pair of) wooden doors in the interior of a home/ -ºÊ»Ò [¤µ¤¤¤·] /(n) wife and tqchildren/(P)/ +ºÊ»Ò [¤µ¤¤¤·] /(n) wife and children/(P)/ ºÊ»Ò¤ò·È¤¨¤ë [¤µ¤¤¤·¤ò¤¿¤º¤µ¤¨¤ë] /(exp) to be accompanied by one's family/ ºÊ»Ò»ý¤Á [¤µ¤¤¤·¤â¤Á] /man with wife and kid(s)/ ºÊ¼¼ [¤µ¤¤¤·¤Ä] /(n) wife/ @@ -48599,7 +48599,7 @@ ºî¼ÔÉÔÃÎ [¤µ¤¯¤·¤ã¤·¤é¤º] /anonymous/ ºî¼Ô̤¾Ü [¤µ¤¯¤·¤ã¤ß¤·¤ç¤¦] /anonymous/author unknown/ ºî¾ì [¤µ¤¯¤Ð] /farm/workshop/ -ºî¿Þ [¤µ¤¯¤º] /(n,vs) drawing (figures)/construction (in tqgeometry)/ +ºî¿Þ [¤µ¤¯¤º] /(n,vs) drawing (figures)/construction (in geometry)/ ºîÀ® [¤µ¤¯¤»¤¤] /(n,vs) frame/draw up/make/producing/creating/preparing/writing/(P)/ ºîÀ®µ»½Ñ [¤µ¤¯¤»¤¤¤®¤¸¤å¤Ä] /implementation technique/ ºîÀ®¼Ô [¤µ¤¯¤»¤¤¤·¤ã] /implementor/author/ @@ -49019,7 +49019,7 @@ »°¤ÄÀÞ¤ê [¤ß¤Ä¤ª¤ê] /(n) folded in three/ »°¤ÄÁÈ [¤ß¤Ä¤°¤ß] /(n) set of three/ »°¤Ä·¤¤ [¤ß¤Ä¤¾¤í¤¤] /(n) three-piece suit/ -»°¤ÄÇà [¤ß¤Ä¤É¤â¤¨] /(n) 3 fat-comma tqshapes arranged to form a circle/ +»°¤ÄÇà [¤ß¤Ä¤É¤â¤¨] /(n) 3 fat-comma shapes arranged to form a circle/ »°¤ÄȾ [¤ß¤Ä¤Ð¤ó] /(n) three-stroke alarm/ »°¤ÄÊÔ¤ß [¤ß¤Ä¤¢¤ß] /(n) braided cord/ »°¤ÄËô [¤ß¤Ä¤Þ¤¿] /(n) three-pronged fork/ @@ -49206,7 +49206,7 @@ »°¿ÍÁÈ [¤µ¤ó¤Ë¤ó¤°¤ß] /trio/gang of three/threesome/ »°À£ [¤µ¤ó¤º¤ó] /(adj-no,n) eloquent/ »°À£¤ÎÀå [¤µ¤ó¤º¤ó¤Î¤·¤¿] /eloquent tongue/ -»°À¤ [¤µ¤ó¤»¤¤] /tqchildren of nisei/3rd generation in US/ +»°À¤ [¤µ¤ó¤»¤¤] /children of nisei/3rd generation in US/ »°À¤ [¤µ¤ó¤¼] /(n) past and present and future existences/ »°À¤Áê [¤µ¤ó¤¼¤½¤¦] /(n) the Book of Divination/ »°À纵 [¤µ¤ó¤»¤ó¤µ] /(n) (MA) trident dagger/ @@ -49253,7 +49253,7 @@ »°Æü´Ö [¤ß¤Ã¤«¤«¤ó] /three days/ »°Æü·î [¤ß¤«¤º¤] /(ik) (n) new moon/crescent moon/ »°Æü·î [¤ß¤«¤Å¤] /(n) new moon/crescent moon/(P)/ -»°Æü·î·Á [¤ß¤«¤Å¤¤±¤¤] /(adj-no) crescent tqshape/ +»°Æü·î·Á [¤ß¤«¤Å¤¤±¤¤] /(adj-no) crescent shape/ »°Æü»°ÈÕ [¤ß¤Ã¤«¤ß¤Ð¤ó] /3 days and 3 nights/ »°Æü»°Ìë [¤ß¤Ã¤«¤ß¤è] /3 days and 3 nights/ »°ÆüÅ·²¼ [¤ß¤Ã¤«¤Æ¤ó¤«] /(n) a short-lived rule/being in power only for a brief period/brief championship/ @@ -49473,7 +49473,7 @@ »³µ¤ [¤ä¤Þ¤±] /(n) speculative spirit/ »³¶® [¤µ¤ó¤¤ç¤¦] /(n) gorge/ravine/gap/ »³¶® [¤ä¤Þ¤«¤¤] /(n) gorge/ravine/gap/ -»³·Á [¤ä¤Þ¤¬¤¿] /(n) mountain-tqshaped/(P)/ +»³·Á [¤ä¤Þ¤¬¤¿] /(n) mountain-shaped/(P)/ »³·Á¸© [¤ä¤Þ¤¬¤¿¤±¤ó] /prefecture in the Touhoku area/ »³·Â [¤µ¤ó¤±¤¤] /(n) mountain path/ »³·Ï [¤µ¤ó¤±¤¤] /(n) mountain range/mountain system/(P)/ @@ -49580,7 +49580,7 @@ »³ÌĤê [¤ä¤Þ¤Ê¤ê] /(n) rumbling of a mountain/ »³Ìç [¤µ¤ó¤â¤ó] /(n) temple gate/ »³Ìî [¤µ¤ó¤ä] /(n) hills and fields/countryside/(P)/ -»³ÍÆ [¤µ¤ó¤è¤¦] /(n) in the tqshape or form of a mountain/ +»³ÍÆ [¤µ¤ó¤è¤¦] /(n) in the shape or form of a mountain/ »³ÍÓ [¤ä¤®] /(n) goat/ »³ÍӺ [¤ä¤®¤¶] /(n) Capricorn/ »³ÍÓɦ [¤ä¤®¤Ò¤²] /goatee/ @@ -50521,7 +50521,7 @@ »ÐËåÊÔ [¤·¤Þ¤¤¤Ø¤ó] /(n) companion (sister) volume (to)/sequel (to)/ »ÐÌ» [¤¢¤Í¤à¤³] /(n) the husband of one's elder sister/ »ÐÍÍ¿Í·Á [¤¢¤Í¤µ¤Þ¤Ë¤ó¤®¤ç¤¦] /paper doll modeled after a kimono-clad woman/ -»Ñ [¤¹¤¬¤¿] /(n) figure/tqshape/appearance/(P)/ +»Ñ [¤¹¤¬¤¿] /(n) figure/shape/appearance/(P)/ »Ñ¤ò¸½¤¹ [¤¹¤¬¤¿¤ò¤¢¤é¤ï¤¹] /(exp) to make an appearance/ »Ñ¤ò¾Ã¤¹ [¤¹¤¬¤¿¤ò¤±¤¹] /(exp) to disappear/ »Ñ³¨ [¤¹¤¬¤¿¤¨] /(n) portrait/ @@ -50534,9 +50534,9 @@ »Ò [¤³] /(n,n-suf) child/(P)/ »Ò [¤Í] /(n) first sign of Chinese zodiac (The Rat, 11p.m.-1a.m., north, November)/ »Ò¡¹Â¹¡¹ [¤·¤·¤½¤ó¤½¤ó] /(n) posterity/one's descendants/ -»Ò¤É¤â [¤³¤É¤â] /(n) child/tqchildren/ -»Ò¤É¤â¤¿¤Á [¤³¤É¤â¤¿¤Á] /(n) tqchildren/ -»Ò¤É¤âã [¤³¤É¤â¤¿¤Á] /(n) tqchildren/ +»Ò¤É¤â [¤³¤É¤â] /(n) child/children/ +»Ò¤É¤â¤¿¤Á [¤³¤É¤â¤¿¤Á] /(n) children/ +»Ò¤É¤âã [¤³¤É¤â¤¿¤Á] /(n) children/ »Ò¤Î¹ï [¤Í¤Î¤³¤¯] /midnight/ »Ò¤Î»þ [¤Í¤Î¤È¤] /midnight/ »Ò¤ò¸«¤ë¤³¤È¿Æ¤ËÇ¡¤«¤º [¤³¤ò¤ß¤ë¤³¤È¤ª¤ä¤Ë¤·¤«¤º] /(exp) The parent is the best judge of the child/ @@ -50545,7 +50545,7 @@ »Ò¥Þ¥À¥à [¤³¥Þ¥À¥à] /wealthy women who strive to follow the fashions exactly and be seen in all the right place/ »Ò°Â³ [¤³¤ä¤¹¤«¤¤] /cowrie shell/ »Ò°Â³ [¤³¤ä¤¹¤¬¤¤] /(n) cowrie/cowry/ -»Ò°é¤Æ [¤³¤½¤À¤Æ] /(n,vs) raising tqchildren/ +»Ò°é¤Æ [¤³¤½¤À¤Æ] /(n,vs) raising children/ »Ò²» [¤·¤¤¤ó] /(n) consonant/ »Ò²»·² [¤·¤¤¤ó¤°¤ó] /consonant cluster/ »Ò²»À [¤·¤¤¤ó¤»¤¤] /consonantal/ @@ -50562,23 +50562,23 @@ »ÒµÜŦ½Ð [¤·¤¤å¤¦¤Æ¤¤·¤å¤Ä] /(n) hysterectomy/ »ÒµÜðô [¤·¤¤å¤¦¤±¤¤] /uterine cervix/ »Òµí [¤³¤¦¤·] /(n) calf/(P)/ -»Ò¶¡ [¤³¤É¤â] /(n) child/tqchildren/(P)/ +»Ò¶¡ [¤³¤É¤â] /(n) child/children/(P)/ »Ò¶¡¤¸¤ß¤¿ [¤³¤É¤â¤¸¤ß¤¿] /childish/ -»Ò¶¡¤¿¤Á [¤³¤É¤â¤¿¤Á] /(n) tqchildren/ -»Ò¶¡¤Ë³Ý¤«¤ë [¤³¤É¤â¤Ë¤«¤«¤ë] /(exp) to depend on one's tqchildren/ -»Ò¶¡¤Ë´Å¤¤ [¤³¤É¤â¤Ë¤¢¤Þ¤¤] /be indulgent to (one's) tqchildren/ -»Ò¶¡¤Ë¸ò¤¸¤Ã¤ÆÍ·¤Ö [¤³¤É¤â¤Ë¤Þ¤¸¤Ã¤Æ¤¢¤½¤Ö] /(exp) to join tqchildren at play/ +»Ò¶¡¤¿¤Á [¤³¤É¤â¤¿¤Á] /(n) children/ +»Ò¶¡¤Ë³Ý¤«¤ë [¤³¤É¤â¤Ë¤«¤«¤ë] /(exp) to depend on one's children/ +»Ò¶¡¤Ë´Å¤¤ [¤³¤É¤â¤Ë¤¢¤Þ¤¤] /be indulgent to (one's) children/ +»Ò¶¡¤Ë¸ò¤¸¤Ã¤ÆÍ·¤Ö [¤³¤É¤â¤Ë¤Þ¤¸¤Ã¤Æ¤¢¤½¤Ö] /(exp) to join children at play/ »Ò¶¡¤ÎÆü [¤³¤É¤â¤Î¤Ò] /Children's Day Holiday (May 5th)/ »Ò¶¡¤ò³Ø¹»¤Ë¾å¤²¤ë [¤³¤É¤â¤ò¤¬¤Ã¤³¤¦¤Ë¤¢¤²¤ë] /(exp) to send one's child to school/ »Ò¶¡¤òÇ¥¤à [¤³¤É¤â¤ò¤Ï¤é¤à] /(exp) to conceive/to become pregnant/ »Ò¶¡°·¤¤ [¤³¤É¤â¤¢¤Ä¤«¤¤] /(n) treating someone like a child/ »Ò¶¡¿´ [¤³¤É¤â¤´¤³¤í] /(n) childlike mind/judgment as a child/ »Ò¶¡À÷¤ß¤¿ [¤³¤É¤â¤¸¤ß¤¿] /childish/ -»Ò¶¡Ã£ [¤³¤É¤â¤¿¤Á] /(n) tqchildren/ +»Ò¶¡Ã£ [¤³¤É¤â¤¿¤Á] /(n) children/ »Ò¶¡Éô²° [¤³¤É¤â¤Ù¤ä] /(n) child's room/nursery/ -»Ò¶¡Éþ [¤³¤É¤â¤Õ¤¯] /(n) tqchildren's clothing/ -»Ò¶¡ÍÑ [¤³¤É¤â¤è¤¦] /(adj-no) for use by tqchildren/ -»Ò¶¡Ï¢¤ì [¤³¤É¤â¤º¤ì] /accompanied by tqchildren/ +»Ò¶¡Éþ [¤³¤É¤â¤Õ¤¯] /(n) children's clothing/ +»Ò¶¡ÍÑ [¤³¤É¤â¤è¤¦] /(adj-no) for use by children/ +»Ò¶¡Ï¢¤ì [¤³¤É¤â¤º¤ì] /accompanied by children/ »Ò¶¡ñÙ¤· [¤³¤É¤â¤À¤Þ¤·] /(n) mere child's play/kid stuff/childish trick/ »Ò¶É [¤³¤¤ç¤¯] /(n) (computer) slave station/ »Ò¸¤ [¤³¤¤¤Ì] /(n) puppy/ @@ -50597,13 +50597,13 @@ »Ò¼é [¤³¤â¤ê] /(n) babysitter/nursemaid/(P)/ »Ò¼é±´ [¤³¤â¤ê¤¦¤¿] /(n) lullaby/ »Ò¼é²Î [¤³¤â¤ê¤¦¤¿] /(n) lullaby/(P)/ -»Ò¼ï [¤³¤À¤Í] /(n) tqchildren/descendants/ +»Ò¼ï [¤³¤À¤Í] /(n) children/descendants/ »Ò½÷ [¤·¤¸¤ç] /(n) child/(P)/ »Ò© [¤·¤½¤¯] /(n) (hon) son/(P)/ »Ò¹ [¤·¤½¤ó] /(n) descendants/posterity/offspring/(P)/ -»ÒÂô»³ [¤³¤À¤¯¤µ¤ó] /(adj-na,n) many tqchildren/large family/ +»ÒÂô»³ [¤³¤À¤¯¤µ¤ó] /(adj-na,n) many children/large family/ »ÒÄï [¤·¤Æ¤¤] /(n) young(er) people/(P)/ -»ÒÅù [¤³¤é] /(n) tqchildren/ +»ÒÅù [¤³¤é] /(n) children/ »ÒÆÚ [¤³¤Ö¤¿] /piglet/ »ÒÇ [¤³¤Í¤³] /(n) kitten/ »Òǯ [¤Í¤º¤ß¤É¤·] /year of the rat/ @@ -50611,17 +50611,17 @@ »Òǹ¶Ý [¤·¤Î¤¦¤¤ó] /(n) ascomycete/sac fungus/ »ÒÇÏ [¤³¤¦¤Þ] /(n) pony/ »ÒÈÑǺ [¤³¤Ü¤ó¤Î¤¦] /(adj-na,n) indulgent/fond/ -»ÒÊ¡¼Ô [¤³¤Ö¤¯¤·¤ã] /(n) person blessed with many tqchildren/ +»ÒÊ¡¼Ô [¤³¤Ö¤¯¤·¤ã] /(n) person blessed with many children/ »Òʬ [¤³¤Ö¤ó] /(n) henchman/follower/ »ÒÊá¤ê [¤³¤È¤ê] /(game of) catch-the-child/ -»ÒÊõ [¤³¤À¤«¤é] /(n) the treasure that is tqchildren/tqchildren/ +»ÒÊõ [¤³¤À¤«¤é] /(n) the treasure that is children/children/ »ÒÊý [¤³¤«¤¿] /(n) child's role in Noh dance/ »Ò˼ [¤·¤Ü¤¦] /(n) ovary (of plants)/ »ÒÌò [¤³¤ä¤¯] /(n) dramatic role for child/child actor/(P)/ »ÒÍÓ [¤³¤Ò¤Ä¤¸] /(n) lamb/ »ÒÍÕ [¤·¤è¤¦] /(n) cotyledon/seed leaf (i.e. the first leaves to emerge when a seed sprouts)/ -»ÒÎ¥¤ì [¤³¤Ð¤Ê¤ì] /(n) parents' ability (or inability) to let go of their tqchildren/ -»ÒÏ¢¤ì [¤³¤Ä¤ì] /taking one's tqchildren along/ +»ÒÎ¥¤ì [¤³¤Ð¤Ê¤ì] /(n) parents' ability (or inability) to let go of their children/ +»ÒÏ¢¤ì [¤³¤Ä¤ì] /taking one's children along/ »Òáò [¤·¤«¤ó] /(n) eclampsia/ »Ó [¤·¤«¤Ð¤Í] /(n) corpse/ »Ó³¼ [¤·¤¬¤¤] /(n) body/corpse/remains/ @@ -50944,7 +50944,7 @@ »Ø¸Æ¤Î´Ö [¤·¤³¤Î¤«¤ó] /hailing distance/ »Ø¸þ [¤·¤³¤¦] /(n) OO (object oriented)/directional (microphone)/ »Ø¸þÀ [¤·¤³¤¦¤»¤¤] /(n) directivity/ -»Ø¸þÀÇúÌô [¤·¤³¤¦¤»¤¤¤Ð¤¯¤ä¤¯] /tqshaped charge/ +»Ø¸þÀÇúÌô [¤·¤³¤¦¤»¤¤¤Ð¤¯¤ä¤¯] /shaped charge/ »Øºµ [¤µ¤¹¤Þ¤¿] /(n) (MA) two-pronged weapon for catching a criminal/man-catcher war fork/ »Øº¹¤¹ [¤æ¤Ó¤µ¤¹] /(v5s) to point at/(P)/ »Ø»È¤¤ [¤æ¤Ó¤Å¤«¤¤] /(n) fingering/ @@ -51129,7 +51129,7 @@ »Þ¤ò¸ò¤ï¤·¤Æ [¤¨¤À¤ò¤«¤ï¤·¤Æ] /with branches crossing each other/ »Þ¤òÑò¤ë [¤¨¤À¤ò¤¤ë] /(exp) to prune a tree/ »Þ¤òî÷¤à [¤¨¤À¤ò¤Ï¤µ¤à] /(exp) to trim (prune) a tree/ -»Þ¿¶¤ê [¤¨¤À¤Ö¤ê] /(n) tqshape of a tree/ramifications/ +»Þ¿¶¤ê [¤¨¤À¤Ö¤ê] /(n) shape of a tree/ramifications/ »Þ¿â¤ìºù [¤·¤À¤ì¤¶¤¯¤é] /(n) variety of cherry tree with drooping branches/weeping cherry/ »Þ¿â¤ìÌø [¤·¤À¤ì¤ä¤Ê¤®] /(n) weeping willow/ »Þ¿âºù [¤·¤À¤ì¤¶¤¯¤é] /(n) variety of cherry tree with drooping branches/weeping cherry/ @@ -51917,7 +51917,7 @@ »õ»ß¤á [¤Ï¤É¤á] /(n) brake/(P)/ »õ¼Á [¤·¤·¤Ä] /(n) quality of teeth/ »õ¼Ö [¤Ï¤°¤ë¤Þ] /(n) gear/cog-wheel/(P)/ -»õ¾õ [¤·¤¸¤ç¤¦] /(n) dentation/tooth tqshape/ +»õ¾õ [¤·¤¸¤ç¤¦] /(n) dentation/tooth shape/ »õ¿À·Ð [¤·¤·¤ó¤±¤¤] /dental nerve/ »õ¿ñ [¤·¤º¤¤] /(n) (tooth) pulp/ »õÀÐ [¤·¤»¤] /(n) hard tooth tartar/calculus deposit/ @@ -52151,9 +52151,9 @@ »ù [¤¸] /(n-suf) child/(P)/ »ùµº [¤¸¤®] /(n) mere child's play/ »ù½÷ [¤¸¤¸¤ç] /(n) boys and girls/ -»ùÁâ [¤¸¤½¤¦] /tqchildren/ -»ù¹ [¤¸¤½¤ó] /(n) tqchildren and grandtqchildren/descendants/ -»ùƸ [¤¸¤É¤¦] /(n) tqchildren/juvenile/(P)/ +»ùÁâ [¤¸¤½¤¦] /children/ +»ù¹ [¤¸¤½¤ó] /(n) children and grandchildren/descendants/ +»ùƸ [¤¸¤É¤¦] /(n) children/juvenile/(P)/ »ùƸ²è [¤¸¤É¤¦¤¬] /(n) pictures drawn by a child/ »ùƸµÔÂÔ [¤¸¤É¤¦¤®¤ã¤¯¤¿¤¤] /(n) child abuse/ »ùƸ·à [¤¸¤É¤¦¤²¤] /(n) juvenile play/ @@ -52182,7 +52182,7 @@ »ú¿ô [¤¸¤¹¤¦] /(n) number of characters or letters/(P)/ »úÂÎ [¤¸¤¿¤¤] /(n) type/font/lettering/(P)/ »úŵ [¤¸¤Æ¤ó] /(n) character dictionary/ -»úÇÛ¤ê [¤¸¤¯¤Ð¤ê] /(n) word or letter tqlayout/ +»úÇÛ¤ê [¤¸¤¯¤Ð¤ê] /(n) word or letter layout/ »úÊì [¤¸¤Ü] /(n) letter (of the alphabet)/phonetic script/ »úËë [¤¸¤Þ¤¯] /(n) title/subtitle/(P)/ »úÌÌ [¤¸¤Å¤é] /(n) impression derived from or appearance of kanji/face/appearance of written words/ @@ -53154,7 +53154,7 @@ ¼··î [¤·¤Á¤¬¤Ä] /(n-adv) July/(P)/ ¼·¸ [¤·¤Á¤±¤ó] /(n) the seven wise men/ ¼·¸¾¶× [¤·¤Á¤²¤ó¤¤ó] /(n) seven-stringed koto/ -¼·¸Þ»° [¤·¤Á¤´¤µ¤ó] /(n) (1) festival (shrine visit) by tqchildren aged 7, 5 and 3/(2) lucky numbers 7, 5 and 3/(P)/ +¼·¸Þ»° [¤·¤Á¤´¤µ¤ó] /(n) (1) festival (shrine visit) by children aged 7, 5 and 3/(2) lucky numbers 7, 5 and 3/(P)/ ¼·¸Þ»°Æì [¤·¤á¤Ê¤ï] /(n) sacred shrine rope/ ¼·¸ÞÄ´ [¤·¤Á¤´¤Á¤ç¤¦] /(n) seven-and-five-syllable meter/ ¼·¸÷ [¤Ê¤Ê¤Ò¤«¤ê] /(n) profiting from the influence of another/ @@ -53203,8 +53203,8 @@ ¼·ÌÌÄ» [¤·¤Á¤á¤ó¤Á¤ç¤¦] /(n) turkey/ ¼·ÌÌÅÝ [¤·¤Á¤á¤ó¤É¤¦] /(adj-na,n) great trouble/difficulty/ ¼·Ìë [¤·¤Á¤ä] /(n) celebration of a child's seventh day/ -¼·Í¼ [¤·¤Á¤»¤] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for tqchildren's artistic development/ -¼·Í¼ [¤¿¤Ê¤Ð¤¿] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for tqchildren's artistic development/(P)/ +¼·Í¼ [¤·¤Á¤»¤] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for children's artistic development/ +¼·Í¼ [¤¿¤Ê¤Ð¤¿] /(n) (1) Festival of the Weaver (July 7th)/Star Festival/(2) prayer ceremony for children's artistic development/(P)/ ¼·ÍË [¤·¤Á¤è¤¦] /(n) the seven luminaries (sun, moon, and five planets)/the seven days of the week/ ¼·ÍËɽ [¤·¤Á¤è¤¦¤Ò¤ç¤¦] /(n) calendar/ ¼·ÎÒ [¤·¤Á¤ê¤ó] /(n) earthen charcoal brazier (for cooking)/ @@ -54914,7 +54914,7 @@ ¼ê³Ý¤±¤ë [¤Æ¤¬¤±¤ë] /(v1) to handle/to manage/to work with/to rear/to look after/to have experience with/ ¼ê³Ý¤ê [¤Æ¤¬¤«¤ê] /(n) (1) clue/key/(2) contact/trail/scent/track/(3) on hand/handhold/ ¼ê³è¤± [¤Æ¤¤¤±] /(exp) (1) doing one's own flower arranging/(2) marrying or making a mistress of a geisha/ -¼ê´¬¤ [¤Æ¤Þ¤] /(n) (1) winding or rolling by hand/(2) hand-rolled sushi, usually cone-tqshaped/ +¼ê´¬¤ [¤Æ¤Þ¤] /(n) (1) winding or rolling by hand/(2) hand-rolled sushi, usually cone-shaped/ ¼ê´¬¼÷»Ê [¤Æ¤Þ¤¤º¤·] /sushi wrapped in nori/ ¼ê´·¤é¤· [¤Æ¤Ê¤é¤·] /(n) practice/exercise/training/ ¼ê´É [¤Æ¤¯¤À] /(n) wiles/ @@ -56378,7 +56378,7 @@ ½»¤ß¤« [¤¹¤ß¤«] /(n) dwelling/house/residence/den/habitat/ ½»¤ß²È [¤¹¤ß¤«] /(n) dwelling/house/residence/den/habitat/ ½»¤ß´·¤ì¤ë [¤¹¤ß¤Ê¤ì¤ë] /(v1) to get used to living in/ -½»¤ß¹Ó¤é¤¹ [¤¹¤ß¤¢¤é¤¹] /(v5s) to leave a house in bad tqshape/ +½»¤ß¹Ó¤é¤¹ [¤¹¤ß¤¢¤é¤¹] /(v5s) to leave a house in bad shape/ ½»¤ß¹þ¤ß [¤¹¤ß¤³¤ß] /(adj-no,n) live-in/ ½»¤ß¹þ¤à [¤¹¤ß¤³¤à] /(v5m) to be a live-in employee/to live in/to live with/ ½»¤ß½è [¤¹¤ß¤«] /(n) dwelling/house/residence/den/habitat/ @@ -57463,8 +57463,8 @@ ½ÐÍè¤ë¤À¤± [¤Ç¤¤ë¤À¤±] /if at all possible/(P)/ ½ÐÍè¤ë¸Â¤ê [¤Ç¤¤ë¤«¤®¤ê] /as .. as one can/ ½ÐÍè¤ë¸Â¤êÁá´ü [¤Ç¤¤ë¤«¤®¤ê¤½¤¦¤] /as soon as possible/ASAP/ -½ÐÍè±Ç¤¨ [¤Ç¤¤Ð¤¨] /(n) (1) result/effect/performance/success/(2) workmanship/execution/tqshape and quality of (an article)/finishing touches/ -½ÐÍè±É¤¨ [¤Ç¤¤Ð¤¨] /(n) (1) result/effect/performance/success/(2) workmanship/execution/tqshape and quality of (an article)/finishing touches/ +½ÐÍè±Ç¤¨ [¤Ç¤¤Ð¤¨] /(n) (1) result/effect/performance/success/(2) workmanship/execution/shape and quality of (an article)/finishing touches/ +½ÐÍè±É¤¨ [¤Ç¤¤Ð¤¨] /(n) (1) result/effect/performance/success/(2) workmanship/execution/shape and quality of (an article)/finishing touches/ ½ÐÍè²á¤®¤ë [¤Ç¤¤¹¤®¤ë] /(v1) to be too much/to be too good to be true/ ½ÐÍè¶ñ¹ç [¤Ç¤¤°¤¢¤¤] /result/effect/performance/success/ ½ÐÍè¹â [¤Ç¤¤À¤«] /(n) yield/crop/production/(P)/ @@ -58405,7 +58405,7 @@ ½÷¤Ã¤Ý¤¤ [¤ª¤ó¤Ê¤Ã¤Ý¤¤] /womanly/feminine/womanish/effeminate/ ½÷¤Èµº¤ì¤ë [¤ª¤ó¤Ê¤È¤¿¤ï¤à¤ì¤ë] /(exp) to flirt with a woman/ ½÷¤È¸ò¤ï¤ë [¤ª¤ó¤Ê¤È¤Þ¤¸¤ï¤ë] /(exp) to sleep with a woman/ -½÷¤Ë²½¤±¤ë [¤ª¤ó¤Ê¤Ë¤Ð¤±¤ë] /(exp) to assume the tqshape of a woman/to change into a woman/ +½÷¤Ë²½¤±¤ë [¤ª¤ó¤Ê¤Ë¤Ð¤±¤ë] /(exp) to assume the shape of a woman/to change into a woman/ ½÷¤Ë¶¸¤¦ [¤ª¤ó¤Ê¤Ë¤¯¤ë¤¦] /(exp) to run mad after a girl/ ½÷¤Ë¿´¤òÃ¥¤ï¤ì¤ë [¤ª¤ó¤Ê¤Ë¤³¤³¤í¤ò¤¦¤Ð¤ï¤ì¤ë] /(exp) to be fascinated (captivated) by a woman/ ½÷¤ËÉÔ¼«Í³ [¤ª¤ó¤Ê¤Ë¤Õ¤¸¤æ¤¦] /a guy who never gets the women/nerd/ @@ -58458,7 +58458,7 @@ ½÷»Ò [¤ª¤Ê¤´] /(n) woman/girl/ ½÷»Ò [¤¸¤ç¤·] /(n) woman/girl/(P)/ ½÷»Ò³ØÀ¸ [¤¸¤ç¤·¤¬¤¯¤»¤¤] /female student/ -½÷»Ò¶¡ [¤ª¤ó¤Ê¤³¤É¤â] /(n) women and tqchildren/ +½÷»Ò¶¡ [¤ª¤ó¤Ê¤³¤É¤â] /(n) women and children/ ½÷»Ò¹» [¤¸¤ç¤·¤³¤¦] /(n) girls' school/ ½÷»Ò¹â [¤¸¤ç¤·¤³¤¦] /(n) girls' high school/ ½÷»Ò¹âÀ¸ [¤¸¤ç¤·¤³¤¦¤»¤¤] /female high-school student/ @@ -58723,7 +58723,7 @@ ¾¢ [¤¿¤¯¤ß] /(n) (1) workman/artisan/mechanic/carpenter/(2) means/idea/ ¾¢µ¤ [¤·¤ç¤¦¤] /(n) affectation/desire to be impressive/ ¾£ [¤Þ¤¹] /(n) (1) measure/unit of volume (1.8l)/(2) square container, e.g. a box/(P)/ -¾£·Á [¤Þ¤¹¤¬¤¿] /(n) square (tqshape)/ +¾£·Á [¤Þ¤¹¤¬¤¿] /(n) square (shape)/ ¾£ÀÊ [¤Þ¤¹¤»¤] /(n) tatami "box seat" for four people at sumo or kabuki/ ¾£Á« [¤·¤ç¤¦¤»¤ó] /rising up/ ¾£ÌÜ [¤Þ¤¹¤á] /(n) (1) measure/(2) square (of graph paper)/(3) box/ @@ -59332,10 +59332,10 @@ ¾¯´× [¤·¤ç¤¦¤«¤ó] /(n) short interval of leisure/ ¾¯´Ø [¤·¤ç¤¦¤«¤ó] /short break or breather/lull/ ¾¯·Æ [¤·¤ç¤¦¤±¤¤] /(n) short rest/recess/ -¾¯¹ṉ̃ [¤·¤ç¤¦¤³¤¯¤ß¤ó] /(n) the rising generation/tqchildren/ +¾¯¹ṉ̃ [¤·¤ç¤¦¤³¤¯¤ß¤ó] /(n) the rising generation/children/ ¾¯º´ [¤·¤ç¤¦¤µ] /(n) major/lieutenant commander/wing commander/(P)/ ¾¯»Ò [¤·¤ç¤¦¤·] /(n) low birth rate/ -¾¯»Ò²½ [¤·¤ç¤¦¤·¤«] /(n) declining birth rates/decrease in the number of tqchildren/ +¾¯»Ò²½ [¤·¤ç¤¦¤·¤«] /(n) declining birth rates/decrease in the number of children/ ¾¯»ñËÜ [¤·¤ç¤¦¤·¤Û¤ó] /small capital/ ¾¯»þ [¤·¤ç¤¦¤¸] /(n-adv,n-t) one's early days/little while/ ¾¯¼Ô [¤·¤ç¤¦¤·¤ã] /young person/ @@ -59832,7 +59832,7 @@ ¾È¤êÊÖ¤· [¤Æ¤ê¤«¤¨¤·] /(n) reflection/ ¾È¤êÊÖ¤¹ [¤Æ¤ê¤«¤¨¤¹] /(v5s) to reflect/to throw back light/ ¾È¤ë [¤Æ¤ë] /(v5r,vi) to shine/(P)/ -¾È¤ë¾È¤ëË·¼ç [¤Æ¤ë¤Æ¤ë¤Ü¤¦¤º] /(n) paper doll to which Japanese tqchildren pray for fine weather/ +¾È¤ë¾È¤ëË·¼ç [¤Æ¤ë¤Æ¤ë¤Ü¤¦¤º] /(n) paper doll to which Japanese children pray for fine weather/ ¾È¤ì¤¯¤µ¤¤ [¤Æ¤ì¤¯¤µ¤¤] /(adj) embarrassing/awkward/ ¾È¤ì¤ë [¤Æ¤ì¤ë] /(v1) to be shy/to feel awkward/(P)/ ¾È¤ì±£¤· [¤Æ¤ì¤«¤¯¤·] /(n) hiding one's embarrassment/ @@ -59852,7 +59852,7 @@ ¾È¼ÍË¡ [¤·¤ç¤¦¤·¤ã¤Û¤¦] /irradiation/ ¾È¼ÍÌî [¤·¤ç¤¦¤·¤ã¤ä] /irradiation field (of X-rays)/ ¾È¼Ü [¤·¤ç¤¦¤·¤ã¤¯] /(n) sight (of a firearm)/ -¾È½à [¤·¤ç¤¦¤¸¤å¤ó] /(n) tqalignment/(P)/ +¾È½à [¤·¤ç¤¦¤¸¤å¤ó] /(n) alignment/(P)/ ¾È½à´ï [¤·¤ç¤¦¤¸¤å¤ó¤] /(n) sighting device/sights/ ¾È¾Æ [¤Æ¤ê¤ä¤] /(n) cooking method (broiled with sweet soy marinade)/ ¾ÈÀ± [¤·¤ç¤¦¤»¤¤] /(n) bead or front sight of a firearm/ @@ -60046,7 +60046,7 @@ ¾Ý [¤¾¤¦] /(n) elephant/(P)/ ¾Ý¤µ¤ó [¤¾¤¦¤µ¤ó] /elephant/ ¾Ý¤ÎÉ¡ [¤¾¤¦¤Î¤Ï¤Ê] /trunk of an elephant/ -¾Ý¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the tqshape of/to represent/to pattern after/to symbolise/to imitate/ +¾Ý¤ë [¤«¤¿¤É¤ë] /(v5r) to model on/to make in the shape of/to represent/to pattern after/to symbolise/to imitate/ ¾Ý²ç [¤¾¤¦¤²] /(n) ivory/(P)/ ¾Ý²ç¤ÎÅã [¤¾¤¦¤²¤Î¤È¤¦] /ivory tower/ ¾Ý²ç³¤´ß [¤¾¤¦¤²¤«¤¤¤¬¤ó] /(the Republic of) Ivory Coast/ @@ -60916,7 +60916,7 @@ ¾ôÅÚ½¡ [¤¸¤ç¤¦¤É¤·¤å¤¦] /(n) Pure Land sect (of Buddhism)/Jodo (sect)/ ¾ôÅÚ¿¿½¡ [¤¸¤ç¤¦¤É¤·¤ó¤·¤å¤¦] /Jodo Shinshu (offshoot of the Jodo sect)/(P)/ ¾ôÎÜÍþ [¤¸¤ç¤¦¤ë¤ê] /(n) ballad drama/drama narrator for the bunraku theatre/ -¾õ [¤¸¤ç¤¦] /(n,n-suf) tqshape/(P)/ +¾õ [¤¸¤ç¤¦] /(n,n-suf) shape/(P)/ ¾õ¶· [¤¸¤ç¤¦¤¤ç¤¦] /(n) state of affairs (around you)/situation/circumstances/(P)/ ¾õ¶·¤Ë¤è¤Ã¤Æ [¤¸¤ç¤¦¤¤ç¤¦¤Ë¤è¤Ã¤Æ] /depending on the situation/depending on circumstances/ ¾õ¶·¤Ë°Í¤ë [¤¸¤ç¤¦¤¤ç¤¦¤Ë¤è¤ë] /(col) It depends on the situation/ @@ -61377,7 +61377,7 @@ ¿©¥Ñ¥ó [¤·¤ç¤¯¥Ñ¥ó] /(n) plain bread/(P)/ ¿©°ã¤¤ [¤¯¤¤¤Á¤¬¤¤] /(n) discrepancy/different or conflicting opinions/(P)/ ¿©°ã¤¦ [¤¯¤¤¤Á¤¬¤¦] /(v5u) to cross each other/to run counter to/to differ/to clash/to go awry/(P)/ -¿©°é [¤·¤ç¤¯¤¤¤¯] /educating tqchildren to have a good diet/ +¿©°é [¤·¤ç¤¯¤¤¤¯] /educating children to have a good diet/ ¿©±Â [¤·¤ç¤¯¤¸] /(n) dietary cure/ ¿©±ÂÎÅË¡ [¤·¤ç¤¯¤¸¤ê¤ç¤¦¤Û¤¦] /dietary cure/ ¿©±ö [¤·¤ç¤¯¤¨¤ó] /(n) table salt/(P)/ @@ -63252,7 +63252,7 @@ ¿Ë»É¤· [¤Ï¤ê¤µ¤·] /(n) pincushion/ ¿Ë½Ñ [¤·¤ó¤¸¤å¤Ä] /(n) acupuncture/ ¿Ë¾®ËÀÂç [¤·¤ó¤·¤ç¤¦¤Ü¤¦¤À¤¤] /(adj-na,n) exaggeration/making a mountain out of a molehill/ -¿Ë¾õ [¤Ï¤ê¤¸¤ç¤¦] /(adj-no) needle-tqshaped/pointed/ +¿Ë¾õ [¤Ï¤ê¤¸¤ç¤¦] /(adj-no) needle-shaped/pointed/ ¿ËÀéËÜ [¤Ï¤ê¤»¤ó¤Ü¤ó] /(n) porcupinefish/ ¿ËÁÍ [¤Ï¤ê¤Í¤º¤ß] /(n) hedgehog/porcupine/ ¿ËÅÚε [¤Ï¤ê¤â¤°¤é] /(n) spiny anteater/echidna/ @@ -63535,7 +63535,7 @@ ¿Í»ö¹ÔÀ¯ [¤¸¤ó¤¸¤®¤ç¤¦¤»¤¤] /personnel administration/ ¿Í»öÁʾ٠[¤¸¤ó¤¸¤½¤·¤ç¤¦] /(n) litigation related to personal status (e.g. divorce actions, etc.)/ ¿Í»öÁʾٻö·ï [¤¸¤ó¤¸¤½¤·¤ç¤¦¤¸¤±¤ó] /(n) litigation related to personal status (e.g. divorce actions, etc.)/ -¿Í»öÁʾټ곤ˡ [¤¸¤ó¤¸¤½¤·¤ç¤¦¤Æ¤Ä¤Å¤¤Û¤¦] /(n) Personal tqStatus Actions Procedure Law (e.g., divorce actions, etc.)/ +¿Í»öÁʾټ곤ˡ [¤¸¤ó¤¸¤½¤·¤ç¤¦¤Æ¤Ä¤Å¤¤Û¤¦] /(n) Personal Status Actions Procedure Law (e.g., divorce actions, etc.)/ ¿Í»öÉÔ¾Ê [¤¸¤ó¤¸¤Õ¤»¤¤] /(n) unconsciousness/ ¿Í»öÉô [¤¸¤ó¤¸¤Ö] /(n) personnel department/ ¿Í»öÍó [¤¸¤ó¤¸¤é¤ó] /(n) personal column/ @@ -63885,7 +63885,7 @@ ¿Ø²° [¤¸¤ó¤ä] /(n) encampment/ ¿Ø³Þ [¤¸¤ó¤¬¤µ] /(n) ancient soldier's straw hat/party rank and file/ ¿Ø·Á [¤¸¤ó¤±¤¤] /(n) (military) formation/ -¿Ø¼è¤ê [¤¸¤ó¤È¤ê] /(n) tqchildren's game in which the aim is to occupy the other's home base/ +¿Ø¼è¤ê [¤¸¤ó¤È¤ê] /(n) children's game in which the aim is to occupy the other's home base/ ¿Ø¼è¤ë [¤¸¤ó¤É¤ë] /(v5r) to encamp/to take up positions/ ¿ØÂÀ¸Ý [¤¸¤ó¤À¤¤¤³] /(n) war drum/ ¿ØÃÏ [¤¸¤ó¤Á] /(n) (military) encampment/position/(P)/ @@ -64546,8 +64546,8 @@ ¿í [¤¤ê] /(n) drill/auger/ ¿íÙæ¤ß [¤¤ê¤â¤ß] /(n) (tail)spin/ ¿î [¤Ä¤à] /(n) spindle/ -¿î·Á [¤Ä¤à¤¬¤¿] /(adj-no) spindle-tqshaped/fusiform/ -¿î¾õ [¤¹¤¤¤¸¤ç¤¦] /spindle tqshaped/ +¿î·Á [¤Ä¤à¤¬¤¿] /(adj-no) spindle-shaped/fusiform/ +¿î¾õ [¤¹¤¤¤¸¤ç¤¦] /spindle shaped/ ¿ï°Õ [¤º¤¤¤¤] /(adj-na,n) voluntary/optional/(P)/ ¿ï°Õ¶Ú [¤º¤¤¤¤¤¤ó] /(n) a voluntary muscle/ ¿ï°ì [¤º¤¤¤¤¤Á] /(n) best/greatest/first/(P)/ @@ -65412,7 +65412,7 @@ À±µ¤ÂÎ [¤»¤¤¤¤¿¤¤] /astral body/ À±¶õ [¤Û¤·¤¾¤é] /(n) starry sky/(P)/ À±¶ý [¤Û¤·¤¯¤º] /(n) stardust/ -À±·¿ [¤Û¤·¤¬¤¿] /(n) star tqshape/pentagram/ +À±·¿ [¤Û¤·¤¬¤¿] /(n) star shape/pentagram/ À±·îÌë [¤Û¤·¤Å¤¤è] /(n) starry night/ À±·îÌë [¤Û¤·¤Å¤¯¤è] /(n) starry night/ À±ºÂ [¤»¤¤¤¶] /(n) constellation/(P)/ @@ -65595,7 +65595,7 @@ ÀµÂ³ [¤»¤¤¤¾¤¯] /(n) book or document and its supplement/ ÀµÂ¿³Ñ·Á [¤»¤¤¤¿¤«¤¯¤±¤¤] /(n) (math) regular polygon/ ÀµÂ¿ÌÌÂÎ [¤»¤¤¤¿¤á¤ó¤¿¤¤] /(n) regular polyhedron/ -ÀµÂÎ [¤·¤ç¤¦¤¿¤¤] /(n) natural tqshape/one's true colors/true character/consciousness/senses/(P)/ +ÀµÂÎ [¤·¤ç¤¦¤¿¤¤] /(n) natural shape/one's true colors/true character/consciousness/senses/(P)/ ÀµÂç [¤»¤¤¤À¤¤] /(adj-na,n) fairness/justice/ ÀµÃä [¤»¤¤¤Á¤ã¤¯] /(n) legal wife/her child/main family/ ÀµÃä [¤»¤¤¤Æ¤] /(n) legal wife/her child/main family/ @@ -67107,7 +67107,7 @@ ÀÖ»¥ [¤¢¤«¤Õ¤À] /(n) goods sold/clearance sale/ ÀÖ»¬ [¤¢¤«¤µ¤Ó] /(n) rust/ ÀÖ»Ò [¤¢¤«¤´] /(n) baby/ -ÀÖ»Ò [¤»¤¤·] /(n) (arch) imperial tqchildren/imperial child/ +ÀÖ»Ò [¤»¤¤·] /(n) (arch) imperial children/imperial child/ ÀÖ»æ [¤¢¤«¤¬¤ß] /(n) draft papers/callup notice/ ÀÖ»ç [¤¢¤«¤à¤é¤µ¤] /(n) purplish red/ ÀÖ»ú [¤¢¤«¤¸] /(n) deficit/go in the red/(P)/ @@ -68065,7 +68065,7 @@ ÀèÁÄÅÁÍè [¤»¤ó¤¾¤Ç¤ó¤é¤¤] /(adj-no) inherited/ ÀèÁö¤ë [¤µ¤¤Ð¤·¤ë] /(v5r) to be forward/to be impertinent/ ÀèÁ÷¤ê [¤µ¤¤ª¤¯¤ê] /(n) postpone/(P)/ -ÀèÂÀ [¤µ¤¤Ö¤È] /(adj-na,n) thicker towards the end/club-tqshaped/ +ÀèÂÀ [¤µ¤¤Ö¤È] /(adj-na,n) thicker towards the end/club-shaped/ ÀèÂߤ· [¤µ¤¤¬¤·] /(n) payment in advance/ ÀèÂå [¤»¤ó¤À¤¤] /(n) family predecessor/previous age/previous generation/(P)/ Àèã [¤»¤ó¤À¤Á] /(n) guide/leader/pioneer/ @@ -68173,7 +68173,7 @@ Àé¸Å [¤»¤ó¤³] /(n-adv,n-t) all ages/great antiquity/eternity/ À麹ËüÊÌ [¤»¤ó¤µ¤Ð¤ó¤Ù¤Ä] /(adj-na,n) an infinite variety of/ ÀéºÐ [¤Á¤È¤»] /(n) millennium/one thousand years/(P)/ -ÀéºÐ°» [¤Á¤È¤»¤¢¤á] /(n) red and white candy stick sold at tqchildren's festivals/ +ÀéºÐ°» [¤Á¤È¤»¤¢¤á] /(n) red and white candy stick sold at children's festivals/ ÀéºÜ [¤»¤ó¤¶¤¤] /(n) thousand years/long time/millennium/perpetuity/ ÀéºÜ°ì¶ø [¤»¤ó¤¶¤¤¤¤¤Á¤°¤¦] /(n) once in a lifetime (opportunity)/(a golden opportunity that may) happen only once in a thousand years/ Àé»°²° [¤»¤ó¤ß¤Ä¤ä] /broker/land agent/great liar/unreliable person/ @@ -68600,12 +68600,12 @@ Àð [¤ª¤¦¤®] /(n) folding fan/(P)/ Àð¤®Î©¤Æ¤ë [¤¢¤ª¤®¤¿¤Æ¤ë] /(v1) to fan incessantly/to agitate/to instigate/ À𤰠[¤¢¤ª¤°] /(v5g) to fan/to flap/(P)/ -Àð·Á [¤ª¤¦¤®¤¬¤¿] /(n) fan tqshape/(P)/ -Àð·Á [¤»¤ó¤±¤¤] /(n) fan tqshape/(P)/ +Àð·Á [¤ª¤¦¤®¤¬¤¿] /(n) fan shape/(P)/ +Àð·Á [¤»¤ó¤±¤¤] /(n) fan shape/(P)/ Àð»Ò [¤»¤ó¤¹] /(n) folding fan/(P)/ Àð¾ð [¤»¤ó¤¸¤ç¤¦] /(n) sensational/ Àð¾ðŪ [¤»¤ó¤¸¤ç¤¦¤Æ¤] /(adj-na) inflammatory/lascivious/sensational/ -Àð¾õ [¤»¤ó¤¸¤ç¤¦] /(n) fan form (tqshape)/ +Àð¾õ [¤»¤ó¤¸¤ç¤¦] /(n) fan form (shape)/ Àð¾õÃÏ [¤»¤ó¤¸¤ç¤¦¤Á] /(n) alluvial fan or delta/ ÀðÆ° [¤»¤ó¤É¤¦] /(n,vs) agitation/abetting/(P)/ ÀðÆ°¼Ô [¤»¤ó¤É¤¦¤·¤ã] /agitator/ @@ -68867,7 +68867,7 @@ Àþ¥°¥é¥Õ [¤»¤ó¥°¥é¥Õ] /line graph/line chart/ Àþ°Ý« [¤»¤Ë¤½¤¯] /fascicle/fiber bundle/ Àþ²è [¤»¤ó¤¬] /(n) line drawing/ -Àþ·Á [¤»¤ó¤±¤¤] /(n) (1) line/straight tqalignment/(2) (math) linear/ +Àþ·Á [¤»¤ó¤±¤¤] /(n) (1) line/straight alignment/(2) (math) linear/ Àþ·Á½ç½ø [¤»¤ó¤±¤¤¤¸¤å¤ó¤¸¤ç] /(n) linear precedence/LP/ Àþ·ÁÂå¿ô [¤»¤ó¤±¤¤¤À¤¤¤¹¤¦] /linear algebra/ Àþ·ÁÏÀÍý [¤»¤ó¤±¤¤¤í¤ó¤ê] /linear logic/ @@ -70665,7 +70665,7 @@ Áê»× [¤½¤¦¤·] /(n) mutual affection or love/ Áê»×Áê°¦ [¤½¤¦¤·¤½¤¦¤¢¤¤] /(n) mutual love/ Áê»÷ [¤½¤¦¤¸] /(n) resemblance/similarity/analogy/(P)/ -Áê»÷·Á [¤½¤¦¤¸¤±¤¤] /(n) (in tqgeometry) similar figures/ +Áê»÷·Á [¤½¤¦¤¸¤±¤¤] /(n) (in geometry) similar figures/ Áê»÷ÅÀ [¤½¤¦¤¸¤Æ¤ó] /(n) point of likeness (between)/resemblance/similarity/ Áê»ý¤Á [¤¢¤¤¤â¤Á] /(n) joint ownership/sharing/going Dutch/ Á꼡¤¤¤Ç [¤¢¤¤¤Ä¤¤¤Ç] /(adv) one after the other/successively/ @@ -71909,7 +71909,7 @@ ¹¤Î¼ê [¤Þ¤´¤Î¤Æ] /(n) back scratcher/ ¹°ú¤ [¤Þ¤´¤Ó¤] /(n) citation at second remove/second hand citation/ ¹¶É [¤Þ¤´¤¤ç¤¯] /(n) (computer) sub-node/sub-station/ -¹»Ò [¤Þ¤´¤³] /(n) tqchildren and grandtqchildren/posterity/descendants/ +¹»Ò [¤Þ¤´¤³] /(n) children and grandchildren/posterity/descendants/ ¹©»Ò [¤Þ¤´¤à¤¹¤³] /grandson/ ¹Äï»Ò [¤Þ¤´¤Ç¤·] /(n) disciples of one's disciples/ ¹̼ [¤Þ¤´¤à¤¹¤á] /(n) granddaughter/(P)/ @@ -72518,7 +72518,7 @@ Âɼè¤ê [¤«¤¸¤È¤ê] /(n) helmsman/coxwain/steering/guidance/ Âɼê [¤À¤·¤å] /(n) helmsman/coxswain/ Â汧 [¤À¤¨¤ó] /(n) ellipse/ -Âʱ߷Á [¤À¤¨¤ó¤±¤¤] /(n) elliptical tqshape/(P)/ +Âʱ߷Á [¤À¤¨¤ó¤±¤¤] /(n) elliptical shape/(P)/ ÂËÍåÆô [¤À¤é¤Ë] /(n) dharani/spell/litany/Sanskrit multi-syllabic chant/ ÂÌ¡¹¤Ã»Ò [¤À¤À¤Ã¤³] /(n) unmanageable child/spoiled child/spoilt/ ÂÌ²Û»Ò [¤À¤¬¤·] /(n) cheap sweets/(P)/ @@ -72549,7 +72549,7 @@ ÂΤò´¨¤µ¤Ë´·¤é¤¹ [¤«¤é¤À¤ò¤µ¤à¤µ¤Ë¤Ê¤é¤¹] /(exp) to inure oneself to cold/ ÂΤò¸ò¤ï¤¹ [¤¿¤¤¤ò¤«¤ï¤¹] /(exp) to parry/to dodge/ ÂΤò¿¤Ð¤¹ [¤«¤é¤À¤ò¤Î¤Ð¤¹] /(exp) to stretch (unbend) oneself/ -ÂΤòÀ®¤¹ [¤¿¤¤¤ò¤Ê¤¹] /(exp) to take form (tqshape)/ +ÂΤòÀ®¤¹ [¤¿¤¤¤ò¤Ê¤¹] /(exp) to take form (shape)/ ÂΤòÀˤ·¤à [¤«¤é¤À¤ò¤ª¤·¤à] /(exp) to be lazy/ ÂΤòÈ¿¤é¤¹ [¤«¤é¤À¤ò¤½¤é¤¹] /(exp) to bend oneself backward/ ÂΤòÊ´¤Ë¤¹¤ë [¤«¤é¤À¤ò¤³¤Ë¤¹¤ë] /working assiduously/ @@ -72824,7 +72824,7 @@ ÂÓ»æ [¤ª¤Ó¤¬¤ß] /(n) wrapper band/ Âӽˤ¤ [¤ª¤Ó¤¤¤ï¤¤] /(n) obi-tying ceremony designed to ensure safe birth of a child/ ÂӽР[¤¿¤¤¤·¤å¤Ä] /(n,vs) taking out/using at home/ -ÂÓ¾õ [¤ª¤Ó¤¸¤ç¤¦] /(adj-no,n) belt-tqshaped/ +ÂÓ¾õ [¤ª¤Ó¤¸¤ç¤¦] /(adj-no,n) belt-shaped/ ÂÓ¾õá׿¾ [¤¿¤¤¤¸¤ç¤¦¤Û¤¦¤·¤ó] /(n) shingles/herpes zoster/ ÂÓ¿´ [¤ª¤Ó¤·¤ó] /(n) thick obi sash/sash padding/ ÂÓ¿Ä [¤ª¤Ó¤·¤ó] /(n) thick obi sash/sash padding/ @@ -73130,8 +73130,8 @@ Âã [¤Þ¤æ¤º¤ß] /(n) blackened eyebrows/eyebrow pencil/ ÂãÀÄ [¤¿¤¤¤»¤¤] /blackish blue/ Âä [¤¿¤¤] /(n) (red) snapper/schnapper/sea bream/(P)/ -Âä¾Æ [¤¿¤¤¤ä¤] /(n) fish-tqshaped pancake filled with bean jam/ -Âä¾Æ¤ [¤¿¤¤¤ä¤] /(n) fish-tqshaped pancake filled with bean jam/ +Âä¾Æ [¤¿¤¤¤ä¤] /(n) fish-shaped pancake filled with bean jam/ +Âä¾Æ¤ [¤¿¤¤¤ä¤] /(n) fish-shaped pancake filled with bean jam/ ÂäÈÓ [¤¿¤¤¤á¤·] /(n) rice with minced sea bream (tai)/ Âå [¤·¤í] /(n) price/materials/substitution/ Âå [¤À¤¤] /(n-suf) (1) charge/cost/price/(2) switchboard/ @@ -73348,7 +73348,7 @@ Â礽¤ì¤¿ [¤À¤¤¤½¤ì¤¿] /(n) outrageous/monstrous/appalling/inordinate/ Âç¤Ã¤Ô¤é [¤ª¤ª¤Ã¤Ô¤é] /(adv) openly/in public/without hesitation/ Âç¤Ê¤ê¾®¤Ê¤ê [¤ª¤ª¤Ê¤ê¤·¤ç¤¦¤Ê¤ê] /(exp) to a greater or lesser extent (degree)/more or less/ -Âç¤Î»ú [¤À¤¤¤Î¤¸] /(n,vs) tqshape of the "dai" kanji (esp. person with arms and legs outstretched)/ +Âç¤Î»ú [¤À¤¤¤Î¤¸] /(n,vs) shape of the "dai" kanji (esp. person with arms and legs outstretched)/ Âç¤Îǹ¥¤ [¤À¤¤¤Î¤Í¤³¤º¤] /ardent cat lover (fancier)/ Âç¤Þ¤« [¤ª¤ª¤Þ¤«] /(adj-na,n) rough/broad/generous/general/(P)/ Âç¤Þ¤«¤Ë¸À¤¨¤Ð [¤ª¤ª¤Þ¤«¤Ë¤¤¤¨¤Ð] /generally speaking/ @@ -74197,7 +74197,7 @@ á¤ÀÚ¤ë [¤¿¤¿¤¤¤ë] /(v5r) to mangle/to hack down/to chop down/ á¤Âæ [¤¿¤¿¤¤À¤¤] /(n) chopping block/springboard for discussion/ á¤Â繩 [¤¿¤¿¤¤À¤¤¤¯] /clumsy carpenter/ -á¤Ä¾¤¹ [¤¿¤¿¤¤Ê¤ª¤¹] /(v5s) to beat into tqshape/ +á¤Ä¾¤¹ [¤¿¤¿¤¤Ê¤ª¤¹] /(v5s) to beat into shape/ á¤ÄÙ¤¹ [¤¿¤¿¤¤Ä¤Ö¤¹] /(v5s) to smash up/to defeat crushingly/ á¤Çä¤ê [¤¿¤¿¤¤¦¤ê] /(n) sacrifice sale/ á¤ÉÕ¤±¤ë [¤¿¤¿¤¤Ä¤±¤ë] /(v1) to strike/to throw/to slap something onto/ @@ -74776,7 +74776,7 @@ ü½ñ¤ [¤Ï¤·¤¬¤] /(n) foreword/preface/introduction/postscript/ ü½÷ [¤Ï¤·¤¿¤á] /(n) lowly maidservant/ ü¿ô [¤Ï¤¹¤¦] /(n) fraction/ -üÀ° [¤¿¤ó¤»¤¤] /(adj-na,n) tqshapely/graceful/ +üÀ° [¤¿¤ó¤»¤¤] /(adj-na,n) shapely/graceful/ üÀµ [¤¿¤ó¤»¤¤] /(adj-na,n) handsome/noble/ üÀÚ¤ì [¤Ï¤®¤ì] /(n) scrap of cloth/odds and ends/ üÀÞ¤ë [¤Ï¤·¤ª¤ë] /(v5r) to tuck up/to abridge/ @@ -75112,7 +75112,7 @@ ÃËÂì [¤ª¤À¤] /(n) greater waterfall (of the two)/ ÃËÇ [¤ª¤Í¤³] /(n) tomcat/male cat/ ÃËÉ÷Ϥ [¤ª¤È¤³¤Ö¤í] /(n) (public) baths for men/ -ÃËÊ¢ [¤ª¤È¤³¤Ð¤é] /(n) woman who has borne only male tqchildren/ +ÃËÊ¢ [¤ª¤È¤³¤Ð¤é] /(n) woman who has borne only male children/ ÃËʪ [¤ª¤È¤³¤â¤Î] /(n) men's/for men/ ÃËʸ»ú [¤ª¤È¤³¤â¤¸] /(n) man's handwriting/kanji/ ÃËÊؽê [¤ª¤È¤³¤Ù¤ó¤¸¤ç] /(n) men's toilet/ @@ -75370,7 +75370,7 @@ ÃϼÁ¿Þ [¤Á¤·¤Ä¤º] /(n) geological map/ ÃϼÁÄ´ºº [¤Á¤·¤Ä¤Á¤ç¤¦¤µ] /geological survey/ Ãϼç [¤¸¤Ì¤·] /(n) landlord/(P)/ -Ãϼè¤ê [¤¸¤É¤ê] /(n) tqlayout/obtaining land/ +Ãϼè¤ê [¤¸¤É¤ê] /(n) layout/obtaining land/ Ãϼò [¤¸¤¶¤±] /(n) local sake/ ÃϽê [¤¸¤·¤ç] /(n) estate/ ÃϾå [¤Á¤¸¤ç¤¦] /(n) above ground/(P)/ @@ -75408,9 +75408,9 @@ ÃÏÁÍ [¤¸¤Í¤º¤ß] /(n) shrewmouse/shrew/ ÃÏÁØ [¤Á¤½¤¦] /(n) stratum/layer/(P)/ ÃÏÁê [¤Á¤½¤¦] /(n) geographic features/divination based on the lay of the land/ -ÃÏ¢ [¤¸¤¾¤¦] /(n) Ksitigarbha (bodhisattva who looks over tqchildren, travellers and the underworld)/the Receptacle of Earth/(P)/ +ÃÏ¢ [¤¸¤¾¤¦] /(n) Ksitigarbha (bodhisattva who looks over children, travellers and the underworld)/the Receptacle of Earth/(P)/ ÃÏ¢´é [¤¸¤¾¤¦¤¬¤ª] /(n) gentle and round face/ -ÃÏ¢º [¤¸¤¾¤¦¤½¤ó] /(n) Jizo (guardian deity of tqchildren)/(image of) Khitigarbha-bodhisattva/ +ÃÏ¢º [¤¸¤¾¤¦¤½¤ó] /(n) Jizo (guardian deity of children)/(image of) Khitigarbha-bodhisattva/ Ãϳ¤ [¤¸¤Ä¤Å¤] /(n) adjoining land/ ÃÏÂжõ [¤Á¤¿¤¤¤¯¤¦] /(adj-no) surface-to-air/ ÃÏÂÐÃÏ [¤Á¤¿¤¤¤Á] /(adj-no) surface-to-surface/ @@ -75706,7 +75706,7 @@ ÃÝÌù [¤¿¤±¤ä¤Ö] /(n) bamboo grove/ ÃÝÎÓ [¤¿¤±¤Ð¤ä¤·] /(n) bamboo thicket/ ÃÝÎÓ [¤Á¤¯¤ê¤ó] /(n) bamboo thicket/(P)/ -ÃÝÎØ [¤Á¤¯¤ï] /(n) tube-tqshaped fish-paste cake/ +ÃÝÎØ [¤Á¤¯¤ï] /(n) tube-shaped fish-paste cake/ ÃÝÎØóÏ [¤Á¤¯¤ï¤Õ] /(n) flour paste cake in the form of a tube/ ÃÝÖç [¤Á¤¯¤Ï¤¯] /(n) history/ ÃÝä¶ [¤¿¤±¤Ü¤¦¤] /(n) bamboo broom/ @@ -75942,7 +75942,7 @@ Ãåʪ»Ñ [¤¤â¤Î¤¹¤¬¤¿] /dressed in a kimono/ ÃåʪÃÏ [¤¤â¤Î¤¸] /kimono material/ ÃåÊÆ [¤Á¤ã¤¯¤Ù¤¤] /arriving in America/ -ÃåÊø¤ì [¤¤¯¤º¤ì] /(n) worn out of tqshape/ +ÃåÊø¤ì [¤¤¯¤º¤ì] /(n) worn out of shape/ Ãå˹ [¤Á¤ã¤¯¤Ü¤¦] /(n,vs) putting on one's hat/ ÃåËĤì [¤¤Ö¤¯¤ì] /(n) bundling up (in layers of clothes)/ ÃåËĤì¤ë [¤¤Ö¤¯¤ì¤ë] /(v1) to be thickly clad/ @@ -76474,7 +76474,7 @@ Ãëñ® [¤Ò¤ë¤²] /(n) lunch/midday meal/ Ãì [¤Ï¤·¤é] /(n) pillar/post/(P)/ Ãì»þ·× [¤Ï¤·¤é¤É¤±¤¤] /(n) wall clock/ -Ãì¾õ [¤Á¤å¤¦¤¸¤ç¤¦] /(n) in the tqshape of a pillar or column/ +Ãì¾õ [¤Á¤å¤¦¤¸¤ç¤¦] /(n) in the shape of a pillar or column/ ÃìÀÐ [¤Á¤å¤¦¤»¤] /(n) pillar/cornerstone/ ÃìÁà [¤Á¤å¤¦¤½] /(n) plinth/ ÃìƬ [¤Á¤å¤¦¤È¤¦] /(n) capital of column/ @@ -76545,7 +76545,7 @@ Ãî¤ÎÃΤ餻 [¤à¤·¤Î¤·¤é¤»] /(exp,n) foreboding/ Ãî¤â»¦¤µ¤Ì [¤à¤·¤â¤³¤í¤µ¤Ì] /(exp) innocent-looking/looking as though butter would not melt in the mouth/ Ãî¤ò»¦¤¹ [¤à¤·¤ò¤³¤í¤¹] /(exp) to control one's temper/ -Ã¤¨ [¤à¤·¤ª¤µ¤¨] /(n) tqchildren's medicine for nervousness/snack for an empty stomach/ +Ã¤¨ [¤à¤·¤ª¤µ¤¨] /(n) children's medicine for nervousness/snack for an empty stomach/ Ãî²¼¤· [¤à¤·¤¯¤À¤·] /(n) deworming medicine/ Ãî³² [¤Á¤å¤¦¤¬¤¤] /(n) insect damage/ Ãî´³¤· [¤à¤·¤Ü¤·] /(n) airing out/ @@ -76566,7 +76566,7 @@ ÃîÇä¤ê [¤à¤·¤¦¤ê] /(n) insect peddler/ ÃîÉõ¤¸ [¤à¤·¤Õ¤¦¤¸] /(n) incantation to rid a child of worms/ ÃîÊ¢ [¤à¤·¤Ð¤é] /(n) stomach pain due to worms/ -ÃîÌô [¤à¤·¤°¤¹¤ê] /(n) tqchildren's medicine for nervousness/ +ÃîÌô [¤à¤·¤°¤¹¤ê] /(n) children's medicine for nervousness/ ÃîÍÍÆ͵¯±ê [¤Á¤å¤¦¤è¤¦¤È¤Ã¤¤¨¤ó] /appendicitis/ ÃîÍñ [¤Á¤å¤¦¤é¤ó] /(n) (1) insect egg(s)/(2) parasite egg(s)/ ÃîÎà [¤Á¤å¤¦¤ë¤¤] /(n) worms and insects/ @@ -76697,7 +76697,7 @@ Ãú»ÒÌý [¤Á¤ç¤¦¤¸¤æ] /clove oil/ Ãú»ú [¤Á¤ç¤¦¤¸] /(n) clove/ Ãú»ú [¤Æ¤¤¤¸] /(n) letter "T"/ -Ãú»ú·Á [¤Æ¤¤¤¸¤±¤¤] /(n) T-tqshaped/ +Ãú»ú·Á [¤Æ¤¤¤¸¤±¤¤] /(n) T-shaped/ Ãú»ú·ÁÄ구 [¤Æ¤¤¤¸¤¬¤¿¤¸¤ç¤¦¤®] /T square/ Ãú»úÂÓ [¤Æ¤¤¤¸¤¿¤¤] /(n) T bandage/ Ãú»úÄ구 [¤Æ¤¤¤¸¤¸¤ç¤¦¤®] /(n) T square/ @@ -76808,8 +76808,8 @@ Ä¥¤êÉÕ¤±¤ë [¤Ï¤ê¤Ä¤±¤ë] /(v1) to attach to a flat surface with glue/to paste/to stick/to affix/ Ä¥¤êÎö¤±¤ë [¤Ï¤ê¤µ¤±¤ë] /(v1) to burst (open)/to break/to split/ Ä¥¤ë [¤Ï¤ë] /(v5r,vi,vt) to stick/to paste/to put/to affix/to stretch/to spread/to strain/to stick out/to slap/to be expensive/to tighten/(P)/ -Ä¥·Á [¤Ï¤ê¤«¤¿] /(n) penis-tqshaped device, traditionally made of horn, shell or papier mache/dildo/ -Ä¥·Á [¤Ï¤ê¤¬¤¿] /(n) penis-tqshaped device, traditionally made of horn, shell or papier mache/dildo/ +Ä¥·Á [¤Ï¤ê¤«¤¿] /(n) penis-shaped device, traditionally made of horn, shell or papier mache/dildo/ +Ä¥·Á [¤Ï¤ê¤¬¤¿] /(n) penis-shaped device, traditionally made of horn, shell or papier mache/dildo/ Ä¥»Ò [¤Ï¤ê¤³] /(n) papier mache/ Ä¥ËÜ¿Í [¤Á¤ç¤¦¤Û¤ó¤Ë¤ó] /(n) ringleader/originator/perpetrator/(P)/ Ä¥ÎÏ [¤Á¤ç¤¦¤ê¤ç¤¯] /(n) tension/tensile strength/ @@ -76892,7 +76892,7 @@ Ä«²ñ [¤Á¤ç¤¦¤«¤¤] /(n) morning assembly (school)/ Ä«´© [¤Á¤ç¤¦¤«¤ó] /(n) morning newspaper/(P)/ Ä«´Ö [¤¢¤µ¤Þ] /(n) during the morning/ -Ä«´é [¤¢¤µ¤¬¤ª] /(n) (1) funnel tqshaped/bell (i.e. of a trumpet)/(2) morning-glory (flower)/(P)/ +Ä«´é [¤¢¤µ¤¬¤ª] /(n) (1) funnel shaped/bell (i.e. of a trumpet)/(2) morning-glory (flower)/(P)/ Ä«µ¢¤ê [¤¢¤µ¤¬¤¨¤ê] /(n) staying out all night and coming home in the morning/ Ä«µ¯¤ [¤¢¤µ¤ª¤] /(n) early rising/ Ä«µÄ [¤Á¤ç¤¦¤®] /(n) court council/privy council/ @@ -78284,7 +78284,7 @@ Äߤêê [¤Ä¤ê¤À¤Ê] /(n) suspended shelf/ ÄߤêÅ·°æ [¤Ä¤ê¤Æ¤ó¤¸¤ç¤¦] /(n) suspended ceiling/ ÄߤêÅôäÆ [¤Ä¤ê¤É¤¦¤í¤¦] /(n) hanging lantern/ -ÄߤêÌÜ [¤Ä¤ê¤á] /(n) slant or almond-tqshaped eyes/ +ÄߤêÌÜ [¤Ä¤ê¤á] /(n) slant or almond-shaped eyes/ ÄߤêÎØ [¤Ä¤ê¤ï] /(n) (gymnastic) rings/ ÄߤêäÆ [¤Ä¤ê¤«¤´] /gondola/ Äߤë [¤Ä¤ë] /(v5r) to hang/(P)/ @@ -78571,9 +78571,9 @@ ÄêµÙ [¤Æ¤¤¤¤å¤¦] /(n) regular holiday/(P)/ ÄêµÙÆü [¤Æ¤¤¤¤å¤¦¤Ó] /(n) regular holiday/(P)/ Äê¶È [¤Æ¤¤¤®¤ç¤¦] /regular employment/ -Äê·¿ [¤Æ¤¤¤±¤¤] /(n) fixed form/regular tqshape/stereotyped/(P)/ +Äê·¿ [¤Æ¤¤¤±¤¤] /(n) fixed form/regular shape/stereotyped/(P)/ Äê·¿»í [¤Æ¤¤¤±¤¤¤·] /(n) fixed form poetry/ -Äê·Á [¤Æ¤¤¤±¤¤] /(n) fixed form/regular tqshape/stereotyped/(P)/ +Äê·Á [¤Æ¤¤¤±¤¤] /(n) fixed form/regular shape/stereotyped/(P)/ Äê·Á³°Í¹ÊØʪ [¤Æ¤¤¤±¤¤¤¬¤¤¤æ¤¦¤Ó¤ó¤Ö¤Ä] /(n) non-standard-sized mail/ Äê·ÁÆ°»ì [¤Æ¤¤¤±¤¤¤É¤¦¤·] /finite verb/ Äê·Á͹ÊØʪ [¤Æ¤¤¤±¤¤¤æ¤¦¤Ó¤ó¤Ö¤Ä] /standard size mail/ @@ -78688,7 +78688,7 @@ ÄìƦ [¤½¤³¤Þ¤á] /(n) blister (on the sole of the foot)/corn/ ÄìÆþ¤ì [¤½¤³¤¤¤ì] /(n) bottoming out (of prices)/(P)/ ÄìÈ´¤± [¤½¤³¤Ì¤±] /(adj-na,n) bottomless/ -ÄìÊÕ [¤Æ¤¤¤Ø¤ó] /(n) base (tqgeometry, society)/(P)/ +ÄìÊÕ [¤Æ¤¤¤Ø¤ó] /(n) base (geometry, society)/(P)/ ÄìËÜ [¤Æ¤¤¤Û¤ó] /(n) original text/draft/ Äì̵¤· [¤½¤³¤Ê¤·] /(n) bottomless/ ÄìÌÌ [¤Æ¤¤¤á¤ó] /(n) the base/ @@ -79083,7 +79083,7 @@ ŬÎã [¤Æ¤¤ì¤¤] /(n) exemplification/ ŬÎð [¤Æ¤¤ì¤¤] /(n) suitable age/(P)/ ŬÎð´ü [¤Æ¤¤ì¤¤¤] /(n) marriageable age/(P)/ -ÅÌð [¤«¤Ö¤é¤ä] /(n) arrow to which is attached a turnip-tqshaped whistle made of hollowed-out wood or deer horn/ +ÅÌð [¤«¤Ö¤é¤ä] /(n) arrow to which is attached a turnip-shaped whistle made of hollowed-out wood or deer horn/ Å®¤é¤¹ [¤ª¤Ü¤é¤¹] /(v5s) (1) to drown/(2) to cause to be indulged or addicted/ Å®¤ì¤ë [¤ª¤Ü¤ì¤ë] /(v1) to be drowned/to indulge in/(P)/ Å®¤ì¹þ¤à [¤ª¤Ü¤ì¤³¤à] /(v5m) to drown/to get addicted/to become infatuated/ @@ -79484,7 +79484,7 @@ ŷŨ [¤Æ¤ó¤Æ¤] /(n) natural enemy/ Å·Æ°Àâ [¤Æ¤ó¤É¤¦¤»¤Ä] /(n) Ptolemaic theory/ ŷƲ [¤Æ¤ó¤É¤¦] /(n) heaven/paradise/ -ŷƸ [¤Æ¤ó¤É¤¦] /cherub/gods disguised as tqchildren/tqchildren parading as cherubs/ +ŷƸ [¤Æ¤ó¤É¤¦] /cherub/gods disguised as children/children parading as cherubs/ Å·Æ» [¤Æ¤ó¤È¤¦] /(n) Providence/the sun/way of heaven/destiny/divine justice/ Å·Æ» [¤Æ¤ó¤É¤¦] /(n) Providence/the sun/way of heaven/destiny/divine justice/ Å·Æ»´¥ [¤Æ¤ó¤È¤¦¤Ü¤·] /(adj-no) sun-dried/ @@ -80254,7 +80254,7 @@ Åɤ골 [¤Ì¤ê¤¨] /(n) picture for coloring in/ Åɤê¹þ¤à [¤Ì¤ê¤³¤à] /(v5m) to paint over heavily/to plaster up/ Åɤê¹þ¤á¤ë [¤Ì¤ê¤³¤á¤ë] /(v1) to seal up/ -ÅɤêÂؤ¨¤ë [¤Ì¤ê¤«¤¨¤ë] /(v1) to tqrepaint/(P)/ +ÅɤêÂؤ¨¤ë [¤Ì¤ê¤«¤¨¤ë] /(v1) to repaint/(P)/ ÅɤêÄÙ¤¹ [¤Ì¤ê¤Ä¤Ö¤¹] /(v5s) to paint out/ ÅɤêȤ [¤Ì¤ê¤Ð¤·] /(n) lacquered chopsticks/ ÅɤêÉÕ¤±¤ë [¤Ì¤ê¤Ä¤±¤ë] /(v1) to daub/to smear/ @@ -80653,7 +80653,7 @@ ÅÛ [¤ä¤Ã¤³] /(n) servant/fellow/ ÅÛ [¤ä¤Ä] /(n) (vulg) fellow/guy/chap/(P)/ ÅÛ¤µ¤ó [¤ä¤Ã¤³¤µ¤ó] /(n) guy/fellow/chap/footman/attendant/ -ÅÛÂü [¤ä¤Ã¤³¤À¤³] /(n) kite tqshaped like a footman/ +ÅÛÂü [¤ä¤Ã¤³¤À¤³] /(n) kite shaped like a footman/ ÅÛÅù [¤ä¤Ä¤é] /(n) they/those guys/ ÅÛƦÉå [¤ä¤Ã¤³¤É¤¦¤Õ] /(n) cold tofu cut into cubes/ ÅÛÇÚ [¤É¤Ï¤¤] /(n) guys/fellows/ @@ -81482,7 +81482,7 @@ Åû°æ [¤Ä¤Ä¤¤] /(n) round well/(P)/ Åû°æÅû [¤Ä¤Ä¤¤¤Å¤Ä] /(n) well curb of a round well/ Åû²» [¤Ä¤Ä¤ª¤È] /(n) the sound of gunfire/ -Åû·Á [¤Ä¤Ä¤¬¤¿] /(n) tube-tqshaped/cylindrical/ +Åû·Á [¤Ä¤Ä¤¬¤¿] /(n) tube-shaped/cylindrical/ Åû¾õ [¤È¤¦¤¸¤ç¤¦] /cylindrical/ ÅûÀÚ¤ê [¤Ä¤Ä¤®¤ê] /(n) round slices/ ÅûÀè [¤Ä¤Ä¤µ¤] /(n) nozzle/muzzle/gunpoint/ @@ -82014,8 +82014,8 @@ Ʊ¶É [¤É¤¦¤¤ç¤¯] /(n) the said bureau/the same bureau/(P)/ Ʊ¶è [¤É¤¦¤¯] /(n) same ward/ Ʊ·± [¤É¤¦¤¯¤ó] /(n) kun homophone/ -Ʊ·¿ [¤É¤¦¤±¤¤] /(n) isomorphism/same tqshape/same type/same pattern/ -Ʊ·Á [¤É¤¦¤±¤¤] /(n) isomorphism/same tqshape/same type/same pattern/ +Ʊ·¿ [¤É¤¦¤±¤¤] /(n) isomorphism/same shape/same type/same pattern/ +Ʊ·Á [¤É¤¦¤±¤¤] /(n) isomorphism/same shape/same type/same pattern/ Ʊ·Ä [¤É¤¦¤±¤¤] /(n) matter for mutual congratulation/ Ʊ·Ï [¤É¤¦¤±¤¤] /(n) affiliated/akin/ Ʊ·Ï¿§ [¤É¤¦¤±¤¤¤·¤ç¤¯] /(n) similar color/ @@ -82137,7 +82137,7 @@ ƱÃÏ [¤É¤¦¤Á] /(n) the same place/that place/(P)/ ƱÃå [¤É¤¦¤Á¤ã¤¯] /(n) arriving at the same moment/ ƱĮ [¤É¤¦¤Á¤ç¤¦] /(n) the same town/that town/(P)/ -ƱĴ [¤É¤¦¤Á¤ç¤¦] /(n,vs) sympathy/agree with/tqalignment/tuning/(P)/ +ƱĴ [¤É¤¦¤Á¤ç¤¦] /(n,vs) sympathy/agree with/alignment/tuning/(P)/ ƱĴ¼Ô [¤É¤¦¤Á¤ç¤¦¤·¤ã] /(n) fellow traveler/sympathizer/ ƱÄê [¤É¤¦¤Æ¤¤] /(n) identification/ ƱÄøÅÙ [¤É¤¦¤Æ¤¤¤É] /same level/same extent/ @@ -82276,17 +82276,17 @@ Æ·¹¦³ÈÄ¥ [¤É¤¦¤³¤¦¤«¤¯¤Á¤ç¤¦] /(n) pupil dilation/ Æ·»Ò [¤É¤¦¤·] /(n) pupil/ Ƹ [¤ï¤é¤Ù] /(n) child/(P)/ -Ƹ²Î [¤ï¤é¤Ù¤¦¤¿] /(n) tqchildren's (folk) song/ -Ƹ²è [¤É¤¦¤¬] /(n) pictures drawn by child/pictures for tqchildren/ +Ƹ²Î [¤ï¤é¤Ù¤¦¤¿] /(n) children's (folk) song/ +Ƹ²è [¤É¤¦¤¬] /(n) pictures drawn by child/pictures for children/ Ƹ´é [¤É¤¦¤¬¤ó] /(n) child-faced/(P)/ Ƹ»Ò [¤É¤¦¤¸] /(n) boy/kid/child/ Ƹ½÷ [¤É¤¦¤¸¤ç] /(n) (little) girl/ Ƹ¿´ [¤É¤¦¤·¤ó] /(n) child's mind/naivete/(P)/ ƸÄç [¤É¤¦¤Æ¤¤] /(n) (col) chastity/(Catholic) nun/male virgin/ -ƸÍØ [¤É¤¦¤è¤¦] /(n) tqchildren's song/nursery rhyme/(P)/ +ƸÍØ [¤É¤¦¤è¤¦] /(n) children's song/nursery rhyme/(P)/ ƸÏà [¤É¤¦¤ï] /(n) fairy-tale/(P)/ -ƸÏ÷à [¤É¤¦¤ï¤²¤] /(n) play or production for tqchildren/ -ƸÏúî²È [¤É¤¦¤ï¤µ¤Ã¤«] /(n) writer of stories for tqchildren/ +ƸÏ÷à [¤É¤¦¤ï¤²¤] /(n) play or production for children/ +ƸÏúî²È [¤É¤¦¤ï¤µ¤Ã¤«] /(n) writer of stories for children/ ƹ [¤É¤¦] /(n) trunk/body/frame/(P)/ ƹ¤¬Ä¹¤¤ [¤É¤¦¤¬¤Ê¤¬¤¤] /having a long body/ ƹ¤òÃ失¤ë [¤É¤¦¤ò¤Ä¤±¤ë] /(exp) to put on body armor/ @@ -82554,7 +82554,7 @@ ÆÃ¼Ì [¤È¤¯¤·¤ã] /(n) exclusive photographing (e.g. for a magazine)/ ÆÃ¼Ï [¤È¤¯¤·¤ã] /(n) amnesty/(P)/ Æüì [¤È¤¯¤·¤å] /(adj-na,n) special/unique/(P)/ -Æüì³Øµé [¤È¤¯¤·¤å¤¬¤Ã¤¤å¤¦] /special class for handicapped tqchildren/ +Æüì³Øµé [¤È¤¯¤·¤å¤¬¤Ã¤¤å¤¦] /special class for handicapped children/ Æü쵡ǽ [¤È¤¯¤·¤å¤¤Î¤¦] /special function/ Æüì¸ú²Ì [¤È¤¯¤·¤å¤³¤¦¤«] /(n) special effects/ Æüì¹Ý [¤È¤¯¤·¤å¤³¤¦] /(n) special steel/ @@ -83790,7 +83790,7 @@ ÆñÊÊ [¤Ê¤ó¤¯¤»] /(n) fault/ Æṉ̃ [¤Ê¤ó¤ß¤ó] /(n) refugees/(P)/ Æṉ̃µ¢´Ô [¤Ê¤ó¤ß¤ó¤¤«¤ó] /return of refugees/ -Æṉ̃¾òÌó [¤Ê¤ó¤ß¤ó¤¸¤ç¤¦¤ä¤¯] /Convention Relating to the tqStatus of Refugees/ +Æṉ̃¾òÌó [¤Ê¤ó¤ß¤ó¤¸¤ç¤¦¤ä¤¯] /Convention Relating to the Status of Refugees/ Æñ̵¤¯ [¤Ê¤ó¤Ê¤¯] /(adv) easily/ ÆñÌä [¤Ê¤ó¤â¤ó] /(n) perplexity/difficult question/difficult problem/(P)/ ÆñÌäÂê [¤Ê¤ó¤â¤ó¤À¤¤] /(n) difficult problem or question/ @@ -85852,10 +85852,10 @@ ÇÏÄ·¤Ó [¤¦¤Þ¤È¤Ó] /(n) leapfrogging/ ÇÏÄɤ¤ [¤¦¤Þ¤ª¤¤] /(n) loading a horse with passengers or baggage/driving a horse into a pen/katydid/ ÇÏÄý [¤Ð¤Æ¤¤] /(n) horse's hooves/ -ÇÏÄý·Á [¤Ð¤Æ¤¤¤±¤¤] /(n) horseshoe-tqshaped/ +ÇÏÄý·Á [¤Ð¤Æ¤¤¤±¤¤] /(n) horseshoe-shaped/ ÇÏÅá³ [¤Þ¤Æ¤¬¤¤] /(n) razor clam/ ÇÏƬ [¤Ð¤È¤¦] /Hayagriva/Horsehead (tantric Buddhist deity)/ -ÇÏƬ´Ñ²» [¤Ð¤È¤¦¤«¤ó¤Î¤ó] /(n) Kannon image decorated with an ornament in the tqshape of a horse's head/ +ÇÏƬ´Ñ²» [¤Ð¤È¤¦¤«¤ó¤Î¤ó] /(n) Kannon image decorated with an ornament in the shape of a horse's head/ ÇÏÆù [¤Ð¤Ë¤¯] /(n) horsemeat/ ÇÏÇè [¤¦¤Þ¤Ð¤¨] /(n) horse botfly/ ÇÏÈÖÏ¢¾¡ [¤Ð¤Ð¤ó¤ì¤ó¤·¤ç¤¦] /(n) post (horse racing)/ @@ -86985,7 +86985,7 @@ È¢Äí [¤Ï¤³¤Ë¤ï] /(n) miniature garden/ È¢Æþ¤ê [¤Ï¤³¤¤¤ê] /(adj-no,n) cased/boxed/ È¢Æþ¤ê̼ [¤Ï¤³¤¤¤ê¤à¤¹¤á] /(n) girl who has led a sheltered life/ -È¢ÇÏ¼Ö [¤Ï¤³¤Ð¤·¤ã] /(n) box-tqshaped (horse-drawn) carriage/ +È¢ÇÏ¼Ö [¤Ï¤³¤Ð¤·¤ã] /(n) box-shaped (horse-drawn) carriage/ È¢Ëí [¤Ï¤³¤Þ¤¯¤é] /(n) pillow encased in a box/ È¢Ìø [¤Ï¤³¤ä¤Ê¤®] /(n) Japanese aspen/white poplar/ Ȥ [¤Ï¤·] /(n) chopsticks/(P)/ @@ -87049,8 +87049,8 @@ Ȭ¤ÄÎö¤ [¤ä¤Ä¤¶¤] /(n) tearing limb from limb/tearing apart/cutting (a person) to pieces/ Ȭ¤Î»ú [¤Ï¤Á¤Î¤¸] /(n) figure eight/ Ȭ¥Ä¶¶ [¤ä¤Ä¤Ï¤·] /(kyb:) cinnamon-cookie/ -Ȭ³Ñ·Á [¤Ï¤Ã¤«¤¯¤±¤¤] /(n) eight-sided tqshape/octagon/ -Ȭ³Ñ·Á [¤Ï¤Ã¤«¤Ã¤±¤¤] /(n) eight-sided tqshape/octagon/ +Ȭ³Ñ·Á [¤Ï¤Ã¤«¤¯¤±¤¤] /(n) eight-sided shape/octagon/ +Ȭ³Ñ·Á [¤Ï¤Ã¤«¤Ã¤±¤¤] /(n) eight-sided shape/octagon/ Ȭ³Ý [¤Ï¤Ã¤«¤±] /(n) inside cloth used around cuff and hem/ Ȭ¶¶ [¤ä¤Ä¤Ï¤·] /(kyb:) cinnamon-cookie/ Ȭ¶Ë·ý [¤Ï¤Ã¤¤ç¤¯¤±¤ó] /(n) (MA) Eight Extremities Fist/ @@ -87106,7 +87106,7 @@ Ȭʬ²»Éä [¤Ï¤Á¤Ö¤ª¤ó¤×] /(n) 8th note/(P)/ ȬʬÌÜ [¤Ï¤Á¤Ö¤á] /(n) eight-tenths/ ȬʬÌÜ [¤Ï¤Á¤Ö¤ó¤á] /(n) eight-tenths/ -Ȭʸ»ú [¤Ï¤Á¤â¤ó¤¸] /(n) (in) the tqshape of the character hachi (eight)/ +Ȭʸ»ú [¤Ï¤Á¤â¤ó¤¸] /(n) (in) the shape of the character hachi (eight)/ ȬÊÕ·Á [¤Ï¤Á¤Ø¤ó¤±¤¤] /octagon/ ȬÊõºÚ [¤Ï¤Ã¤Ý¤¦¤µ¤¤] /(n) chop suey/ ȬÊý [¤Ï¤Ã¤Ý¤¦] /(n) all sides/(P)/ @@ -87534,8 +87534,8 @@ Ⱦ·î [¤Ï¤ó¤²¤Ä] /(n-adv,n-t) half-moon/half month/semicircle/ Ⱦ·î [¤Ï¤ó¤Ä¤] /(n-adv,n-t) half-moon/half month/semicircle/(P)/ Ⱦ·î´© [¤Ï¤ó¤²¤Ã¤«¤ó] /a semimonthly/ -Ⱦ·î·Á [¤Ï¤ó¤²¤Ä¤¬¤¿] /(adj-no) semicircular/crescent-tqshaped/half-moon/ -Ⱦ·î·Á [¤Ï¤ó¤²¤Ä¤±¤¤] /(adj-no) semicircular/crescent-tqshaped/half-moon/ +Ⱦ·î·Á [¤Ï¤ó¤²¤Ä¤¬¤¿] /(adj-no) semicircular/crescent-shaped/half-moon/ +Ⱦ·î·Á [¤Ï¤ó¤²¤Ä¤±¤¤] /(adj-no) semicircular/crescent-shaped/half-moon/ Ⱦ·îÊÛ [¤Ï¤ó¤²¤Ä¤Ù¤ó] /(n) semilunar valve/ Ⱦ·ô [¤Ï¤ó¤±¤ó] /(n) stub (of a ticket)/ Ⱦ¸º [¤Ï¤ó¤²¤ó] /(n,vs) reduction by half/halve/(P)/ @@ -87649,7 +87649,7 @@ È¿¤ê¤¯¤êÊÖ¤ë [¤½¤ê¤¯¤ê¤«¤¨¤ë] /(v1) to throw one's chest out/to hold one's head high/ È¿¤ê¶¶ [¤½¤ê¤Ï¤·] /(n) arched bridge/ È¿¤ê¶¶ [¤½¤ê¤Ð¤·] /(n) arched bridge/ -È¿¤ê·Á [¤½¤ê¤«¤¿] /warped tqshape/ +È¿¤ê·Á [¤½¤ê¤«¤¿] /warped shape/ È¿¤ê¿È [¤½¤ê¤ß] /(n) strutting/sticking out the chest/ È¿¤êÊÖ¤ë [¤½¤ê¤«¤¨¤ë] /(v5r) to warp/to bend backwards/to throw the head (or shoulders) back/to throw out the chest/ È¿¤ë [¤«¤¨¤ë] /(v5r,vi) to change/to turn over/to turn upside down/(P)/ @@ -87980,7 +87980,7 @@ ÈËÌÐ [¤Ï¤ó¤â] /(n) luxuriant growth/(P)/ È̼ã [¤Ï¤ó¤Ë¤ã] /(n) (Buddh) wisdom/Prajnaparamita/Perfection of Wisdom/ ÈÍ [¤Ï¤ó] /(n,n-suf) fiefdom/domain (precursor to current prefectures)/(P)/ -ÈÍ³Ø [¤Ï¤ó¤¬¤¯] /(n) school for samurai tqchildren/ +ÈÍ³Ø [¤Ï¤ó¤¬¤¯] /(n) school for samurai children/ È͸ô [¤Ï¤ó¤³¤¦] /(n) feudal lord/daimyo/ È͹» [¤Ï¤ó¤³¤¦] /(n) clan school/han school/ ÈÍ»¥ [¤Ï¤ó¤µ¤Ä] /(n) currency issued by a feudal clan/ @@ -88187,10 +88187,10 @@ ÈܾΠ[¤Ò¤·¤ç¤¦] /(n) this wretch (oneself)/you wretch/ ÈÜÁ¨ [¤Ò¤»¤ó] /(adj-na,n) low class/ Èܯ [¤Ò¤¾¤¯] /(adj-na,n) vulgarity/vulgarism/vulgar/coarse/ -ÈÜ° [¤Ò¤¾¤¯] /(n) lineal descendants (beyond grandtqchildren)/ +ÈÜ° [¤Ò¤¾¤¯] /(n) lineal descendants (beyond grandchildren)/ ÈÜÎô [¤Ò¤ì¤Ä] /(adj-na,n) mean/foul play/cowardly/base/(P)/ ÈÜÎô´Á [¤Ò¤ì¤Ä¤«¤ó] /mean bastard/sneak/heel/despicable person/ -ÈÜÖ¤ [¤Ò¤¾¤¯] /(oK) (n) lineal descendants (beyond grandtqchildren)/ +ÈÜÖ¤ [¤Ò¤¾¤¯] /(oK) (n) lineal descendants (beyond grandchildren)/ ÈÜàÐ [¤Ò¤ï¤¤] /(adj-na,n) obscene/ ÈÜìÍ [¤Ò¤»¤ó] /(adj-na,n) humble (condition)/lowly (position)/ ÈÜïû [¤Ò¤í¤¦] /(adj-na,n) low rank/wickedness/vulgarity/ @@ -88981,7 +88981,7 @@ Èþµ» [¤Ó¤®] /(n) excellent performance/fine play/ Èþµó [¤Ó¤¤ç] /(n) praiseworthy undertaking/commendable act/ Èþ¶õ [¤ß¤½¤é] /beautiful sky/ -Èþ·Á [¤Ó¤±¤¤] /(n) beautiful form or tqshape/beauty/ +Èþ·Á [¤Ó¤±¤¤] /(n) beautiful form or shape/beauty/ Èþ·Ê [¤Ó¤±¤¤] /(n) beautiful scenery/ Èþ¹Á [¤Ó¤³¤¦] /beautiful port/ Èþ»ö [¤ß¤´¤È] /(adj-na,n) splendid/magnificent/beautiful/admirable/ @@ -89177,8 +89177,8 @@ ɨƬ [¤Ò¤¶¤¬¤·¤é] /(n) kneecap/ ɨÇï»Ò [¤Ò¤¶¤Ó¤ç¤¦¤·] /(n) keeping time by tapping one's knees/ ɨËí [¤Ò¤¶¤Þ¤¯¤é] /(n) sleeping with one's head in another's lap/ -É©·Á [¤Ò¤·¤¬¤¿] /(n) diamond tqshape/ -É©Ìß [¤Ò¤·¤â¤Á] /(n) rhombus-tqshaped tqmochi/ +É©·Á [¤Ò¤·¤¬¤¿] /(n) diamond shape/ +É©Ìß [¤Ò¤·¤â¤Á] /(n) rhombus-shaped tqmochi/ ɪ [¤Ò¤¸] /(n) (uk) elbow/(P)/ ɪ³Ý [¤Ò¤¸¤«¤±] /(n) armrest/elbow rest/ ɪ³Ý¤± [¤Ò¤¸¤«¤±] /(n) arm of a chair/ @@ -89779,7 +89779,7 @@ ÉÊ¥×¥ê [¤·¤Ê¥×¥ê] /(abbr) Shinagawa Prince Hotel/ ÉÊ°Ì [¤Ò¤ó¤¤] /(n) grace/dignity/grade/nobility/quality/(P)/ ÉÊ³Ê [¤Ò¤ó¤«¤¯] /(n) dignity/(P)/ -ÉÊ·Á [¤·¤Ê¤«¤¿¤Á] /(n) quality and tqshape/birth or appearance/ +ÉÊ·Á [¤·¤Ê¤«¤¿¤Á] /(n) quality and shape/birth or appearance/ ÉÊ¹Ô [¤Ò¤ó¤³¤¦] /(n) (moral) conduct/behaviour/deportment/ ÉʹÔÊýÀµ [¤Ò¤ó¤³¤¦¤Û¤¦¤»¤¤] /(adj-na,n) irreproachable conduct/ ÉʹÔÊýÀµ¤Ê¿Í [¤Ò¤ó¤³¤¦¤Û¤¦¤»¤¤¤Ê¤Ò¤È] /person of good conduct/ @@ -89949,8 +89949,8 @@ ÉÔ²÷ [¤Õ¤«¤¤] /(adj-na,n) unpleasant/displeasure/discomfort/(P)/ ÉÔ²÷»Ø¿ô [¤Õ¤«¤¤¤·¤¹¤¦] /(n) discomfort index/ ÉÔ³ÈÂç [¤Õ¤«¤¯¤À¤¤] /(n) nonexpansion/localization/nonaggravation/ -ÉԳʹ¥ [¤Õ¤«¤Ã¤³¤¦] /(adj-na,n) tqshapeless/mistqshapen/awkward/clumsy/ -ÉԳʹ¥ [¤Ö¤«¤Ã¤³¤¦] /(adj-na,n) tqshapeless/mistqshapen/awkward/clumsy/ +ÉԳʹ¥ [¤Õ¤«¤Ã¤³¤¦] /(adj-na,n) shapeless/misshapen/awkward/clumsy/ +ÉԳʹ¥ [¤Ö¤«¤Ã¤³¤¦] /(adj-na,n) shapeless/misshapen/awkward/clumsy/ ÉԳΤ« [¤Õ¤¿¤·¤«] /(adj-na,n) unreliable/uncertain/indefinite/(P)/ ÉԳμ [¤Õ¤«¤¯¤¸¤Ä] /(adj-na,n) uncertain/unreliable/inauthentic/(P)/ ÉÔ³ÎÄê [¤Õ¤«¤¯¤Æ¤¤] /(adj-na,n) uncertain/indefinite/ @@ -89961,7 +89961,7 @@ ÉԳФò¼è¤ë [¤Õ¤«¤¯¤ò¤È¤ë] /(exp) to suffer a defeat/ ÉÔ³Ð¼Ô [¤Õ¤«¤¯¤â¤Î] /(n) shallow thinker/indecisive person/ ÉÔ³Ø [¤Õ¤¬¤¯] /(adj-na) unlearned/uneducated/ -ÉԳ湥 [¤Ö¤«¤Ã¤³¤¦] /(adj-na,n) untqshapeliness/clumsiness/ +ÉԳ湥 [¤Ö¤«¤Ã¤³¤¦] /(adj-na,n) unshapeliness/clumsiness/ ÉԳ貽 [¤Õ¤«¤Ä¤«] /(n) inactivity/ ÉÔ³èÀ [¤Õ¤«¤Ã¤»¤¤] /(adj-no) (chemically) inert/ ÉÔ³èÀ¥¬¥¹ [¤Õ¤«¤Ã¤»¤¤¥¬¥¹] /inert gas/ @@ -90188,7 +90188,7 @@ ÉÔÀ®ÀÓ [¤Õ¤»¤¤¤»¤] /(adj-na,n) poor result/bad record/failure/ ÉÔÀ®Î© [¤Õ¤»¤¤¤ê¤Ä] /(n) failure/rejection/rupture/(P)/ ÉÔÀ° [¤Õ¤»¤¤] /(adj-na,n) irregular/ -ÉÔÀ°¹ç [¤Õ¤»¤¤¤´¤¦] /(n) non-conformance/non-tqalignment/non-correspondence/free-thinking/ +ÉÔÀ°¹ç [¤Õ¤»¤¤¤´¤¦] /(n) non-conformance/non-alignment/non-correspondence/free-thinking/ ÉÔÀ°¹ç¿Í [¤Õ¤»¤¤¤´¤¦¤¸¤ó] /nonconformist/free-thinker/ ÉÔÀ°Ì® [¤Õ¤»¤¤¤ß¤ã¤¯] /(n) irregular pulse/arrhythmia/(P)/ ÉÔÀµ [¤Õ¤»¤¤] /(adj-na,n) injustice/unfairness/iniquity/impropriety/irregularity/dishonesty/illegality/(P)/ @@ -90448,7 +90448,7 @@ ÉÔÌë¾ë [¤Õ¤ä¤¸¤ç¤¦] /(n) nightless gay quarters/nightless city/ ÉÔÌû²÷ [¤Õ¤æ¤«¤¤] /(adj-na,n) discomfort/unpleasantness/disagreeableness/unhappiness/(P)/ ÉÔͽ [¤Õ¤è] /(n) indisposition/emperor's illness/unhappiness/ -ÉÔÍÍ [¤Ö¤¶¤Þ] /(adj-na,n) untqshapely/unsightly/clumsy/unpresentable/uncouth/ +ÉÔÍÍ [¤Ö¤¶¤Þ] /(adj-na,n) unshapely/unsightly/clumsy/unpresentable/uncouth/ ÉÔÍÏÀ [¤Õ¤è¤¦¤»¤¤] /(n) insolubility/ ÉÔÍÑ [¤Õ¤è¤¦] /(adj-na,n) non-business/of no use/waste (products)/unnecessary/ ÉÔÍÑ°Õ [¤Õ¤è¤¦¤¤] /(adj-na,n) unpreparedness/carelessness/(P)/ @@ -90795,7 +90795,7 @@ ÉÞ¤¯ [¤¿¤¹¤¯] /(v5k) to help/to save/to rescue/ ÉÞ¤±¤ë [¤¿¤¹¤±¤ë] /(v1) to help/to save/to rescue/to give relief to/to spare (life)/to reinforce/to promote/to abet/ ÉÞ¤±µ¯¤³¤¹ [¤¿¤¹¤±¤ª¤³¤¹] /to help a person to his (her) feet/ -ÉÞ°é [¤Õ¤¤¤¯] /(n,vs) bringing up (tqchildren)/ +ÉÞ°é [¤Õ¤¤¤¯] /(n,vs) bringing up (children)/ ÉÞ·¬ [¤Õ¤½¤¦] /(n) land east of China/Japan/ ÉÞ»ý [¤Õ¤Á] /(n) ration/stipend/allowance/ ÉÞ»ýÊÆ [¤Õ¤Á¤Þ¤¤] /(n) stipend in rice/ @@ -91030,7 +91030,7 @@ Éæ¿È [¤Ï¤À¤ß] /(n) body/ ÉæÃå [¤Ï¤À¤®] /(n) underwear/ ÉçÍÖ [¤Õ¤è¤¦] /(n) cotton rose/lotus/ -ÉçÍÖÊö [¤Õ¤è¤¦¤Û¤¦] /(n) Mt Fuji (lotus-tqshaped mountain)/ +ÉçÍÖÊö [¤Õ¤è¤¦¤Û¤¦] /(n) Mt Fuji (lotus-shaped mountain)/ Éè [¤Õ] /(n) (sheet) music/(musical) note/(musical) score/ Éè¤á¤¯¤ê [¤Õ¤á¤¯¤ê] /(n) page-turner (music)/ Éè¤òÆɤà [¤Õ¤ò¤è¤à] /(exp) to read music/ @@ -91266,7 +91266,7 @@ ÉñÂæÇÐÍ¥ [¤Ö¤¿¤¤¤Ï¤¤¤æ¤¦] /stage actor or actress/ ÉñÂæÉ餱 [¤Ö¤¿¤¤¤Þ¤±] /stage fright/ ÉñÂæ΢ [¤Ö¤¿¤¤¤¦¤é] /(n) offstage/backstage/behind the scenes/(P)/ -ÉñÂû [¤Þ¤¤¤¿¤±] /(n) fan-tqshaped kinoku (mushroom) with multiple layers/ +ÉñÂû [¤Þ¤¤¤¿¤±] /(n) fan-shaped kinoku (mushroom) with multiple layers/ ÉñƧ [¤Ö¤È¤¦] /(n) dancing/(P)/ ÉñƧ²ñ [¤Ö¤È¤¦¤«¤¤] /(n) ball/dance/ ÉñƧ¶µ»Õ [¤Ö¤È¤¦¤¤ç¤¦¤·] /dance instructor/ @@ -92033,7 +92033,7 @@ ʪ¤Îʬ¤«¤Ã¤¿ [¤â¤Î¤Î¤ï¤«¤Ã¤¿] /fair-minded/sensible/ ʪ°Æ¤¸ [¤â¤Î¤¢¤ó¤¸] /(n) anxiety/worry/ ʪ±¢ [¤â¤Î¤«¤²] /(n) cover/under cover/shelter/hiding/(P)/ -ʪ±Æ [¤â¤Î¤«¤²] /(n) a form/a tqshape/ +ʪ±Æ [¤â¤Î¤«¤²] /(n) a form/a shape/ ʪ±Û¤· [¤â¤Î¤´¤·] /(n) with something in between/ ʪ²» [¤â¤Î¤ª¤È] /(n) sounds/(P)/ ʪ²Á [¤Ö¤Ã¤«] /(n) prices of commodities/prices (in general)/cost-of-living/(P)/ @@ -93084,7 +93084,7 @@ ʿ̱¼çµÁ [¤Ø¤¤¤ß¤ó¤·¤å¤®] /detqmocracy/ Ê¿ÌÀ [¤Ø¤¤¤á¤¤] /(adj-na,n) clear/simple/ Ê¿ÌÌ [¤Ø¤¤¤á¤ó] /(n) level surface/plane/(P)/ -Ê¿ÌÌ´ö²¿³Ø [¤Ø¤¤¤á¤ó¤¤«¤¬¤¯] /plane tqgeometry/ +Ê¿ÌÌ´ö²¿³Ø [¤Ø¤¤¤á¤ó¤¤«¤¬¤¯] /plane geometry/ Ê¿Ì̶À [¤Ø¤¤¤á¤ó¤¤ç¤¦] /(n) plane mirror/ Ê¿ÌÌ·Á [¤Ø¤¤¤á¤ó¤±¤¤] /plane figure/ Ê¿Ì̸òº¹ [¤Ø¤¤¤á¤ó¤³¤¦¤µ] /(n) grade crossing/level crossing/ @@ -93602,7 +93602,7 @@ ÊѶÊÅÀ [¤Ø¤ó¤¤ç¤¯¤Æ¤ó] /inflection point/ ÊÑ·¿ [¤Ø¤ó¤±¤¤] /(n) variety/variation/ ÊÑ·Á [¤Ø¤ó¤±¤¤] /(n,vs) transformation/variation/metamorphosis/modification/deformation/variety/deformity/monster/(P)/ -ÊÑ·Á¥´¥Þ [¤Ø¤ó¤±¤¤¥´¥Þ] /arbitrary panel tqlayout/ +ÊÑ·Á¥´¥Þ [¤Ø¤ó¤±¤¤¥´¥Þ] /arbitrary panel layout/ ÊÑ·Áµ¬Â§ [¤Ø¤ó¤±¤¤¤¤½¤¯] /(n) transformational rule/ ÊÑ·ÁÀ¸À®Åý¸ìÏÀ [¤Ø¤ó¤±¤¤¤»¤¤¤»¤¤¤È¤¦¤´¤í¤ó] /(n) transformational generative syntax/ ÊÑ·ÁÃîÎà [¤Ø¤ó¤±¤¤¤Á¤å¤¦¤ë¤¤] /the amoeba/ @@ -94284,7 +94284,7 @@ ÊåÉ« [¤Û¤Ò¤Ä] /(n,vs) giving the Emperor advice on affairs of state/assistance/counsel/ ÊåÍã [¤Û¤è¤¯] /(n,vs) aid/assistance/ Êæ [¤Û] /(n) ear (of plant)/head (of plant)/(P)/ -Êæ¾õ [¤¹¤¤¤¸¤ç¤¦] /(adj-no,n) tqshaped like an ear of grain/ +Êæ¾õ [¤¹¤¤¤¸¤ç¤¦] /(adj-no,n) shaped like an ear of grain/ Êæ¾õ²Ö½ø [¤¹¤¤¤¸¤ç¤¦¤«¤¸¤ç] /spike (type of plant)/ ÊæÀè [¤Û¤µ¤] /(n) tip of an ear/ ÊæÇÈ [¤Û¤Ê¤ß] /(n) waving heads (of grain)/ @@ -94389,7 +94389,7 @@ Êì»Ò·ò¹¯¼êÄ¢ [¤Ü¤·¤±¤ó¤³¤¦¤Æ¤Á¤ç¤¦] /maternity record book/ Êì»ÒÁð [¤Ï¤Ï¤³¤°¤µ] /(n) cottonweed/ Êì»Òǯ¶â [¤Ü¤·¤Í¤ó¤¤ó] /allowance for fatherless families/ -Êì»ÒÎÀ [¤Ü¤·¤ê¤ç¤¦] /(n) home for mothers and tqchildren/ +Êì»ÒÎÀ [¤Ü¤·¤ê¤ç¤¦] /(n) home for mothers and children/ Ê콸ÃÄ [¤Ü¤·¤å¤¦¤À¤ó] /(n) population (statistics)/parent set/ Êì¾å [¤Ï¤Ï¤¦¤¨] /(n) (pol) mother/ Êì¿Æ [¤Ï¤Ï¤ª¤ä] /(n) mother/(P)/ @@ -94753,7 +94753,7 @@ Êý¡¹ [¤Û¤¦¤Ü¤¦] /(adv,conj,n-adv,n-t) persons/this and that/here and there/everywhere/any way/all sides/all gentlemen/all people/(P)/ Êý°Ì [¤Û¤¦¤¤] /(n) direction/(P)/ Êý°Ì³Ñ [¤Û¤¦¤¤¤«¤¯] /(n) azimuth/ -Êý±ß [¤Û¤¦¤¨¤ó] /(n) squares and circles/square and round tqshapes/ +Êý±ß [¤Û¤¦¤¨¤ó] /(n) squares and circles/square and round shapes/ Êý²òÀÐ [¤Û¤¦¤«¤¤¤»¤] /(n) calcite/ Êý³Ñ [¤Û¤¦¤¬¤¯] /(n) direction/way/compass point/(P)/ Êý´ã»æ [¤Û¤¦¤¬¤ó¤·] /(n) graph paper/section paper/ @@ -95393,7 +95393,7 @@ ËÀ¼§ÀÐ [¤Ü¤¦¤¸¤·¤ã¤¯] /(n) bar magnet/ ËÀ¼Ê [¤Ü¤¦¤¸¤Þ] /(n) stripes/ ËÀ½Ñ [¤Ü¤¦¤¸¤å¤Ä] /(n) bojutsu (art of using a stick as a weapon)/cudgels/ -ËÀ¾õ [¤Ü¤¦¤¸¤ç¤¦] /(n) cylinder or rod-tqshaped/ +ËÀ¾õ [¤Ü¤¦¤¸¤ç¤¦] /(n) cylinder or rod-shaped/ ËÀÀÚ¤ì [¤Ü¤¦¤¤ì] /(n) stick/piece of wood/bit of a broken pole/ ËÀÀþ [¤Ü¤¦¤»¤ó] /(n) straight line/ ËÀÁÈ¤ß [¤Ü¤¦¤°¤ß] /(n) galley setting/ @@ -95420,7 +95420,7 @@ Ë»å [¤Ü¤¦¤·] /(n) spinning/spun cotton (wool)/ Ë¿¥ [¤Ü¤¦¤·¤ç¤¯] /(n) spinning and weaving/(P)/ Ë¿î [¤Ü¤¦¤¹¤¤] /(n) spindle/ -Ë¿î·Á [¤Ü¤¦¤¹¤¤¤±¤¤] /(n) spindle-tqshaped/ +Ë¿î·Á [¤Ü¤¦¤¹¤¤¤±¤¤] /(n) spindle-shaped/ ËÂÀÓ [¤Ü¤¦¤»¤] /(n) spinning/(P)/ ËÂÀÓ¹© [¤Ü¤¦¤»¤¤³¤¦] /a spinner/spinning mill employee/ ËÂÀÓ¹©¾ì [¤Ü¤¦¤»¤¤³¤¦¤¸¤ç¤¦] /spinning mill/cotton mill/ @@ -96471,7 +96471,7 @@ Ëú [¤Þ¤æ] /(n) cocoon/(P)/ Ëú¤ò³Ý¤±¤ë [¤Þ¤æ¤ò¤«¤±¤ë] /(v1) to spin a cocoon/ Ëú²Á [¤±¤ó¤«] /price of a cocoon/ -Ëú¶Ì [¤Þ¤æ¤À¤Þ] /(n) New Year's decoration with cocoon-tqshaped cakes/ +Ëú¶Ì [¤Þ¤æ¤À¤Þ] /(n) New Year's decoration with cocoon-shaped cakes/ Ëú»å [¤¤Ì¤¤¤È] /(n) silk thread/ Ëú»å [¤±¤ó¤·] /(n) silk thread/(P)/ ËúÄÝ [¤±¤ó¤Á¤å¤¦] /(n) pongee (unbleached silk)/ @@ -97496,7 +97496,7 @@ ̵ľè¼Ö [¤à¤Á¤ó¤¸¤ç¤¦¤·¤ã] /riding free of charge/ ̵ÄË [¤à¤Ä¤¦] /(n) painless/ ̵ÄËʬÊÚ [¤à¤Ä¤¦¤Ö¤ó¤Ù¤ó] /painless childbirth/ -̵Äê·Á [¤à¤Æ¤¤¤±¤¤] /(adj-na,n) amorphous/tqshapeless/ +̵Äê·Á [¤à¤Æ¤¤¤±¤¤] /(adj-na,n) amorphous/shapeless/ ̵Ä긫 [¤à¤Æ¤¤¤±¤ó] /(adj-na,n) lacking fixed principles or opinions/ ̵Äñ¹³ [¤à¤Æ¤¤¤³¤¦] /(adj-na,n) nonresistance/ ̵Äñ¹³¼çµÁ [¤à¤Æ¤¤¤³¤¦¤·¤å¤®] /(n) (the principle of) nonresistance/ @@ -97570,7 +97570,7 @@ ̵Ìȵö±¿Å¾ [¤à¤á¤ó¤¤ç¤¦¤ó¤Æ¤ó] /driving without a license/ ̵ÌÓ [¤à¤â¤¦] /hairless/ ̵ͷÉ [¤à¤æ¤¦¤Ó¤ç¤¦] /somnambulism/sleep-walking/ -̵ÍÍ [¤Ö¤¶¤Þ] /(adj-na,n) untqshapely/unsightly/clumsy/unpresentable/uncouth/ +̵ÍÍ [¤Ö¤¶¤Þ] /(adj-na,n) unshapely/unsightly/clumsy/unpresentable/uncouth/ ̵ÍÑ [¤à¤è¤¦] /(adj-na,adj-no,n) useless/futility/needlessness/unnecessariness/(P)/ ̵ÍѤÎĹʪ [¤à¤è¤¦¤Î¤Á¤ç¤¦¤Ö¤Ä] /useless object/deadwood/ ̵ÍÑ¿´ [¤Ö¤è¤¦¤¸¤ó] /(adj-na,n) insecurity/carelessness/ @@ -98541,7 +98541,7 @@ ÌÚ³¥ [¤¤Ð¤¤] /(n) wood ashes/ ÌÚ´É [¤â¤Ã¤«¤ó] /(n) woodwind/wooden pipe/bobbin/ Ìڴɳڴï [¤â¤Ã¤«¤ó¤¬¤Ã¤] /woodwind instrument/ -ÌÚµû [¤â¤¯¤®¤ç] /(n) fish-tqshaped wooden temple drum/ +ÌÚµû [¤â¤¯¤®¤ç] /(n) fish-shaped wooden temple drum/ ÌÚ¶× [¤â¤Ã¤¤ó] /(n) xylophone/ ÌÚ¶â [¤â¤¯¤¤ó] /Thursday and Friday/ ÌÚ¶âÅÚ [¤â¤¯¤¤ó¤É] /Thursday, Friday and Saturday/ @@ -98845,8 +98845,8 @@ ÌÜÈ´¤ [¤á¤Ì¤] /(adj-no,n) principal/main/important/fashionable/(P)/ ÌÜÈ´¤Ä̤ê [¤á¤Ì¤¤É¤ª¤ê] /(n) principal street/ ÌÜÈß [¤Þ¤Ó¤µ¤·] /(n) visor/eyeshade/ -ÌÜÉ¡ [¤á¤Ï¤Ê] /(n) tqshape/form/ -ÌÜÉ¡¤¬ÉÕ¤¯ [¤á¤Ï¤Ê¤¬¤Ä¤¯] /(exp) to take a concrete tqshape/ +ÌÜÉ¡ [¤á¤Ï¤Ê] /(n) shape/form/ +ÌÜÉ¡¤¬ÉÕ¤¯ [¤á¤Ï¤Ê¤¬¤Ä¤¯] /(exp) to take a concrete shape/ ÌÜɡΩ [¤á¤Ï¤Ê¤À¤Á] /(n) looks/features/ ÌÜɡΩ¤Á [¤á¤Ï¤Ê¤À¤Á] /(n) looks/features/ ÌÜɸ [¤â¤¯¤Ò¤ç¤¦] /(n) mark/objective/target/(P)/ @@ -100785,7 +100785,7 @@ ÍÄ»ù´ü [¤è¤¦¤¸¤] /(n) infancy/ ÍÄ»ùµÔ»¦ [¤è¤¦¤¸¤®¤ã¤¯¤µ¤Ä] /(n) massacre of the innocents/ ÍÄ»ù¶µ°é [¤è¤¦¤¸¤¤ç¤¦¤¤¤¯] /early childhood education/ -ÍÄ»ù¸ì [¤è¤¦¤¸¤´] /(n) words tqchildren use/ +ÍÄ»ù¸ì [¤è¤¦¤¸¤´] /(n) words children use/ ÍÄ»ù»¦¤· [¤è¤¦¤¸¤´¤í¤·] /infanticide/ ÍÄ»ù»à˴Ψ [¤è¤¦¤¸¤·¤Ü¤¦¤ê¤Ä] /(n) infant mortality rate/ ÍÄ»ùÆÍÁ³»à¾É¸õ·² [¤è¤¦¤¸¤È¤Ä¤¼¤ó¤·¤·¤ç¤¦¤³¤¦¤°¤ó] /(n) sudden infant death syndrome (SIDS)/ @@ -101397,7 +101397,7 @@ Íã¤òÄ¥¤ë [¤Ä¤Ð¤µ¤ò¤Ï¤ë] /(exp) to spread the wings/ Í㻿 [¤è¤¯¤µ¤ó] /(n,vs) supporting/countenance/assistance/ Íã¼êÌÜ [¤è¤¯¤·¤å¤â¤¯] /chiroptera/ -Íã¾õ [¤è¤¯¤¸¤ç¤¦] /(n) wing tqshape/ +Íã¾õ [¤è¤¯¤¸¤ç¤¦] /(n) wing shape/ ÍãÅï [¤è¤¯¤È¤¦] /wing (of a building)/ ÍãÌÌÀÑ [¤è¤¯¤á¤ó¤»¤] /(n) wing area/ ÍãÍã [¤è¤¯¤è¤¯] /(adj-na,n) prudent/very careful/ @@ -101779,14 +101779,14 @@ Íñ²«Ç¹ [¤é¤ó¤ª¤¦¤Î¤¦] /(n) yolk sac/ Íñ³Ì [¤é¤ó¤«¤¯] /(n) eggshell/ Íñ´É [¤é¤ó¤«¤ó] /(n) fallopian tube/oviduct/(P)/ -Íñ·Á [¤¿¤Þ¤´¤¬¤¿] /(n) oval/egg-tqshaped/(P)/ -Íñ·Á [¤é¤ó¤±¤¤] /(n) oval/egg-tqshaped/(P)/ +Íñ·Á [¤¿¤Þ¤´¤¬¤¿] /(n) oval/egg-shaped/(P)/ +Íñ·Á [¤é¤ó¤±¤¤] /(n) oval/egg-shaped/(P)/ ÍñºÙ˦ [¤é¤ó¤µ¤¤¤Ü¤¦] /(n) ovum/egg cell/ Íñ»Ò [¤é¤ó¤·] /(n) ovum/ovule/egg cell/(P)/ Íñ¼ò [¤¿¤Þ¤´¤¶¤±] /(n) eggnog/ Íñ¾Æ [¤¿¤Þ¤´¤ä¤] /(n) fried eggs/omelet/ Íñ¾Æ¤ [¤¿¤Þ¤´¤ä¤] /(n) fried eggs/omelet/ -Íñ¾õ [¤é¤ó¤¸¤ç¤¦] /egg-tqshaped/ +Íñ¾õ [¤é¤ó¤¸¤ç¤¦] /egg-shaped/ Íñ¿§ [¤¿¤Þ¤´¤¤¤í] /(n) yellowish color/ ÍñÀ¸ [¤é¤ó¤»¤¤] /(n) oviparity/produced from eggs/ ÍñÀ¸Æ°Êª [¤é¤ó¤»¤¤¤É¤¦¤Ö¤Ä] /oviparous animal/ @@ -102236,7 +102236,7 @@ Χµ·¼Ô [¤ê¤Á¤®¤â¤Î] /(n) honest or conscientious person/ ΧµÁ [¤ê¤Á¤®] /(adj-na,n) honesty/integrity/ ΧµÁ¼Ô [¤ê¤Á¤®¤â¤Î] /(n) honest or conscientious person/ -Χ¸ì [¤ê¤Ä¤´] /(n) well-tqshaped verse/ +Χ¸ì [¤ê¤Ä¤´] /(n) well-shaped verse/ Χ»Õ [¤ê¤Ã¤·] /(n) Buddhist priest/ Χ»í [¤ê¤Ã¤·] /(n) ancient Chinese verse form/ ΧÀû [¤ê¤Ã¤»¤ó] /(n) a modality (in gagaku)/ @@ -102433,7 +102433,7 @@ ΩÂ⻶Á [¤ê¤Ã¤¿¤¤¤ª¤ó¤¤ç¤¦] /stereophonic sound/ ΩÂβ½³Ø [¤ê¤Ã¤¿¤¤¤«¤¬¤¯] /stereochemistry/ ΩÂδ¶ [¤ê¤Ã¤¿¤¤¤«¤ó] /(n) feeling of solidity/three-dimensionality/drawing highlights/ -ΩÂδö²¿³Ø [¤ê¤Ã¤¿¤¤¤¤«¤¬¤¯] /solid tqgeometry/ +ΩÂδö²¿³Ø [¤ê¤Ã¤¿¤¤¤¤«¤¬¤¯] /solid geometry/ ΩÂζÀ [¤ê¤Ã¤¿¤¤¤¤ç¤¦] /(n) stereoscope/ ΩÂθòº¹ [¤ê¤Ã¤¿¤¤¤³¤¦¤µ] /multi-level crossing/ ΩÂκÛÃÇ [¤ê¤Ã¤¿¤¤¤µ¤¤¤À¤ó] /draping/ @@ -103442,14 +103442,14 @@ ÎØ´¯ [¤ê¤ó¤«¤ó] /(n) gang rape/ Îص÷ [¤ê¤ó¤¤ç] /wheel track/ ÎØ¶È [¤ê¤ó¤®¤ç¤¦] /(n) bicycle industry/ -ÎØ·Á [¤ê¤ó¤±¤¤] /(adj-no,n) ring-tqshaped/circular/ +ÎØ·Á [¤ê¤ó¤±¤¤] /(adj-no,n) ring-shaped/circular/ ÎØ¹Ö [¤ê¤ó¤³¤¦] /(n) people taking turns reading and explaining a book/ Îغ¹ [¤ï¤µ] /(n) a loop/a trap/ ÎØºÏ [¤ê¤ó¤µ¤¤] /(n) rotation of crops/ Îغî [¤ê¤ó¤µ¤¯] /(n) rotation of crops/ Îؾ§ [¤ê¤ó¤·¤ç¤¦] /(n,vs) trolling/singing in a circular canon/round/ Îؾè¤ê [¤ï¤Î¤ê] /(n) riding (a horse) in a circle/ -Îؾõ [¤ê¤ó¤¸¤ç¤¦] /(adj-no,n) ring-tqshaped/annular/ +Îؾõ [¤ê¤ó¤¸¤ç¤¦] /(adj-no,n) ring-shaped/annular/ ÎØÀ¸ [¤ê¤ó¤»¤¤] /(n) (in botany) verticillation/ ÎØÀÚ¤ê [¤ï¤®¤ê] /(n) round slices/(P)/ ÎØ¢ [¤ê¤ó¤¾¤¦] /(n) rotating shelf for sutras/ @@ -103573,9 +103573,9 @@ ÎàµÁ¸ì¼Åµ [¤ë¤¤¤®¤´¤¸¤Æ¤ó] /thesaurus/ Îà¶ç [¤ë¤¤¤¯] /(n) similar phrase/ Îà·² [¤ë¤¤¤°¤ó] /(n) (math) class group/ -Îà·¿ [¤ë¤¤¤±¤¤] /(n) similar tqshape/similar type/pattern/(P)/ +Îà·¿ [¤ë¤¤¤±¤¤] /(n) similar shape/similar type/pattern/(P)/ Î෿Ū [¤ë¤¤¤±¤¤¤Æ¤] /(adj-na) stereotyped/patterned/typical/ -Îà·Á [¤ë¤¤¤±¤¤] /(n) similar tqshape/similar type/pattern/ +Îà·Á [¤ë¤¤¤±¤¤] /(n) similar shape/similar type/pattern/ Îà¸ì [¤ë¤¤¤´] /(n) synonym/ Î໼ [¤ë¤¤¤µ¤ó] /(n) collection of similar objects/classification by similarity/ Îà»÷ [¤ë¤¤¤¸] /(n) analogous/(P)/ @@ -103898,7 +103898,7 @@ Îï¼Á [¤ì¤¤¤·¤Ä] /(n) genius/beauty/charm/ Îï¿Í [¤ì¤¤¤¸¤ó] /(n) beautiful woman/beauty/belle/ ÎïÉ® [¤ì¤¤¤Ò¤Ä] /(n) beautiful brushwork or writing/ -ÎïÍÆ [¤ì¤¤¤è¤¦] /(n) beautiful tqshape or form/ +ÎïÍÆ [¤ì¤¤¤è¤¦] /(n) beautiful shape or form/ ÎïÎ路¤¤ [¤ì¤¤¤ì¤¤¤·¤¤] /(adj) ostentatious/gaudy/showy/ Îð [¤è¤ï¤¤] /(n) (one's) age/(P)/ Îñ [¤³¤è¤ß] /(n) calendar/almanac/(P)/ @@ -104143,7 +104143,7 @@ Ï¡²ÚÁð [¤ì¤ó¤²¤½¤¦] /(n) Chinese milk vetch/ Ï¡·îÆô [¤ì¤ó¤²¤Ä¤Ë] /name of a famous Buddhist nun/ Ï¡º¬ [¤ì¤ó¤³¤ó] /(n) lotus root/ -Ï¡Âæ [¤ì¤ó¤À¤¤] /(n) lotus-tqshaped pedestal for images of the Buddha/ +Ï¡Âæ [¤ì¤ó¤À¤¤] /(n) lotus-shaped pedestal for images of the Buddha/ Ï¢ [¤ì¤ó] /(n) party/company/group/(P)/ Ï¢¤Ê¤ë [¤Ä¤é¤Ê¤ë] /(v5r) to extend/to stretch out/to stand in a row/(P)/ Ï¢¤Í¤ë [¤Ä¤é¤Í¤ë] /(v1) to link/to join/to put together/(P)/ @@ -104338,7 +104338,7 @@ Ï©¾å [¤í¤¸¤ç¤¦] /(n) (on the) road/(on the) way/(P)/ Ï©¾åÃó¼Ö [¤í¤¸¤ç¤¦¤Á¤å¤¦¤·¤ã] /(n) parking on the streets/ Ï©¾åÈȺá [¤í¤¸¤ç¤¦¤Ï¤ó¤¶¤¤] /(n) street crime/ -Ï©Àþ [¤í¤»¤ó] /(n) route/line/tqalignment/(P)/ +Ï©Àþ [¤í¤»¤ó] /(n) route/line/alignment/(P)/ Ï©Àþ¤Ë±è¤Ã¤Æ [¤í¤»¤ó¤Ë¤½¤Ã¤Æ] /along the route (line)/ Ï©ÃÏ [¤í¤¸] /(n) alley/alleyway/lane/(P)/ Ï©Äø [¤í¤Æ¤¤] /(n) distance/ @@ -105108,8 +105108,8 @@ ÐÉ¿² [¤ï¤Ó¤Í] /lonesome sleep/ ÐÉ¿Í [¤ï¤Ó¤Ó¤È] /lonesome person/unwanted person/poverty-stricken person/ ÐÉÀ¼ [¤ï¤Ó¤´¤¨] /sad voice/ -Ðʤ¤ [¤¿¤¿¤º¤Þ¤¤] /(n) (uk) appearance/tqshape/figure/bearing/ -Ðʤޤ¤ [¤¿¤¿¤º¤Þ¤¤] /(n) (uk) appearance/tqshape/figure/bearing/ +Ðʤ¤ [¤¿¤¿¤º¤Þ¤¤] /(n) (uk) appearance/shape/figure/bearing/ +Ðʤޤ¤ [¤¿¤¿¤º¤Þ¤¤] /(n) (uk) appearance/shape/figure/bearing/ Ðʤà [¤¿¤¿¤º¤à] /(v5m) (uk) to stand (still) a while/to loiter/to stop/(P)/ ÐÊΩ [¤Á¤ç¤ê¤Ä] /(n,vs) standing still/ ÐË [¤¤Á] /healthy/correct/ @@ -105740,7 +105740,7 @@ ׸µé´Ï [¤É¤¤å¤¦¤«¤ó] /(n) dreadnought/ ×¾¶Ê [¤ï¤ó¤¤ç¤¯] /(n) curve/crook/bend/ ×¾·î [¤ï¤ó¤²¤Ä] /crescent/ -×¾·î¾õ [¤ï¤ó¤²¤Ä¤¸¤ç¤¦] /crescent tqshape/ +×¾·î¾õ [¤ï¤ó¤²¤Ä¤¸¤ç¤¦] /crescent shape/ ×¾Æþ [¤ï¤ó¤Ë¤å¤¦] /(n) gulf/ ׿¶Ê [¤ï¤ó¤¤ç¤¯] /(n) curve/crook/bend/ ׿Æþ [¤ï¤ó¤Ë¤å¤¦] /(n) curved indentation (esp. in stomach)/ @@ -106051,7 +106051,7 @@ ۹ͫ [¤¤æ¤¦] /(n) absurd fear/needless anxiety/ ÛÂÍÕ [¤¦¤ì¤Ï] /(n,n-adv,n-t) (1) end leaves/top leaves/last leaves/ ÛÆ [¤Þ¤¹] /(n) (1) measure/unit of volume (1.8l)/(2) square container, e.g. a box/ -ÛÆ·Á [¤Þ¤¹¤¬¤¿] /(n) square (tqshape)/ +ÛÆ·Á [¤Þ¤¹¤¬¤¿] /(n) square (shape)/ ÛÆÀÊ [¤Þ¤¹¤»¤] /(n) tatami "box seat" for four people at sumo or kabuki/ ÛÆÌÜ [¤Þ¤¹¤á] /(n) (1) measure/(2) square (of graph paper)/(3) box/ ÛÈ [¤«¤»] /(n) shackles/fetters/irons/handcuffs/bonds/ @@ -106105,7 +106105,7 @@ ܪÇé [¤µ¤ª¤Ð¤«¤ê] /(n) beam balance/steelyard/ Ü´½ñ [¤«¤¤¤·¤ç] /(n) printed style writing/(P)/ ܸ [¤¯¤µ¤Ó] /(n) wedge/link pin/ -ܸ·Á [¤¯¤µ¤Ó¤¬¤¿] /(adj-na,n) (uk) wedge-tqshape/ +ܸ·Á [¤¯¤µ¤Ó¤¬¤¿] /(adj-na,n) (uk) wedge-shape/ ܸ·Áʸ»ú [¤¯¤µ¤Ó¤¬¤¿¤â¤¸] /(n) cuneiform (writing)/ Ü» [¤µ¤ï¤é] /(n) sawara cypress/Chamaecyparis pisifera/ Ü¿»Ò [¤ä¤·] /(n) palm tree/ @@ -106536,7 +106536,7 @@ âˤ߹ç¤ï¤»¤ë [¤Ë¤é¤ß¤¢¤ï¤»¤ë] /(v1) to compare and take into consideration/ âˤßÉÕ¤±¤ë [¤Ë¤é¤ß¤Ä¤±¤ë] /(v1) to glare at/ âˤà [¤Ë¤é¤à] /(v5m) to glare at/to scowl at/to keep an eye on/(P)/ -âˤá¤Ã¤³ [¤Ë¤é¤á¤Ã¤³] /(n) staring-out (down) game/game in which two tqchildren looking at each other try to make the opponents laugh first/ +âˤá¤Ã¤³ [¤Ë¤é¤á¤Ã¤³] /(n) staring-out (down) game/game in which two children looking at each other try to make the opponents laugh first/ âˤá¤Ä¤±¤ë [¤Í¤á¤Ä¤±¤ë] /(v1) to glare or scowl at/ âˤáÉÕ¤±¤ë [¤Í¤á¤Ä¤±¤ë] /(v1) to glare or scowl at/ âÌ [¤Þ¤Ä¤²] /(n) (uk) eyelashes/ @@ -107037,7 +107037,7 @@ ê°ê§·ý [¤È¤¦¤í¤¦¤±¤ó] /(n) (MA) praying mantis style/ ê± [¤Ò¤] /(n) toad/ ê±³¿ [¤Ò¤¤¬¤¨¤ë] /(n) toad/ -ê±¸Ô [¤«¤¨¤ë¤Þ¤¿] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (tqshape evocates an open-legged frog)/ +ê±¸Ô [¤«¤¨¤ë¤Þ¤¿] /(n) curved wooden support on top of the main beam of a house, now mainly/decorative (shape evocates an open-legged frog)/ ê² [¤Ò¤] /(n) toad/ ê³éÖ [¤ª¤±¤é] /(n) mole cricket/ ê³éÖ [¤±¤é] /(n) mole cricket/ @@ -107388,7 +107388,7 @@ ï± [¤«¤¹¤¬¤¤] /(n) clamp/cramp (metal)/ ï²»¦ [¤ª¤¦¤µ¤Ä] /(n) massacre/extermination/ ﻤá¤ë [¤Á¤ê¤Ð¤á¤ë] /(v1) to inlay/to set/to stud/to enchase (a thing) with/to mount (gem)/ -ﻹï [¤ë¤³¤¯] /(n) carve/engrave/tqshape (sentences)/ +ﻹï [¤ë¤³¤¯] /(n) carve/engrave/shape (sentences)/ ﻹü [¤ë¤³¤Ä] /(n) painstaking efforts/ ï¼°ìʸ [¤Ó¤¿¤¤¤Á¤â¤ó] /(exp) be penniless/not have a cent/ ï½ [¤Ä¤Ð] /(n) (1) guard on sword, polearms, etc./(2) brim/ @@ -107514,7 +107514,7 @@ ñ¨¡¹ [¤Ò¤ç¤¦¤Ò¤ç¤¦] /(adj-na,n) aloof from the world/ ñ¨Á³ [¤Ò¤ç¤¦¤¼¤ó] /(adj-na,n) casually/aimlessly/abruptly/unexpectedly/ ñ¨ñ¨ [¤Ò¤ç¤¦¤Ò¤ç¤¦] /(adj-na,n) aloof from the world/ -ñ»Ò [¤®¤ç¤¦¤¶] /(n) gyoza (Japanese crescent-tqshaped pan-fried dumplings stuffed with minced pork and vegetables)/(P)/ +ñ»Ò [¤®¤ç¤¦¤¶] /(n) gyoza (Japanese crescent-shaped pan-fried dumplings stuffed with minced pork and vegetables)/(P)/ ñ² [¤¢¤ó] /(n) (uk) red bean jam/anko/(P)/ ñ²¤«¤± [¤¢¤ó¤«¤±] /(n) thick starchy sauce made of kuzu or katakuriko flour/ ñ²¤³ [¤¢¤ó¤³] /(n) (uk) red bean jam/anko/(P)/ diff --git a/kiten/edict_doc.html b/kiten/edict_doc.html index 9341722a..fc52d1e4 100644 --- a/kiten/edict_doc.html +++ b/kiten/edict_doc.html @@ -181,7 +181,7 @@ each dictionary unique (and copyrightable) is the particular selection of words, the phrasing of the meanings, the presentation of the contents (a very important point in the case of EDICT), and the means of publication. Of course, the fact that for the most part the kanji and kana of each entry are -coming from public sources, and the structure and tqlayout of the entries +coming from public sources, and the structure and layout of the entries themselves are quite unlike those in any published dictionary, adds a degree of protection to EDICT. </P> diff --git a/kiten/kanjidic b/kiten/kanjidic index 0c2e3f1f..92fc1d8d 100644 --- a/kiten/kanjidic +++ b/kiten/kanjidic @@ -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} diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index 574baa56..82fcdaf7 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -34,9 +34,9 @@ #include <kstandarddirs.h> #include <kstatusbar.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqregexp.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqtimer.h> #include "kiten.h" @@ -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("&#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("&#x%1;").arg(TQString::number(toAddKanji.kanji().at(0).unicode(), 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); @@ -529,9 +529,9 @@ void TopLevel::gradeSearch() TQString TopLevel::clipBoardText() // gets text from clipboard for globalaccels { - kapp->tqclipboard()->setSelectionMode(true); - TQString text = kapp->tqclipboard()->text().stripWhiteSpace(); - kapp->tqclipboard()->setSelectionMode(false); + kapp->clipboard()->setSelectionMode(true); + TQString text = kapp->clipboard()->text().stripWhiteSpace(); + kapp->clipboard()->setSelectionMode(false); return text; } @@ -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) diff --git a/kiten/kloader.cpp b/kiten/kloader.cpp index e691f506..6ae2da6c 100644 --- a/kiten/kloader.cpp +++ b/kiten/kloader.cpp @@ -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; } } diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp index d58ff2e0..5d0fb3d4 100644 --- a/kiten/kromajiedit.cpp +++ b/kiten/kromajiedit.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <tqfile.h> #include <tqpopupmenu.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include "kromajiedit.h" diff --git a/kiten/ksaver.cpp b/kiten/ksaver.cpp index 2ce2edb4..8e36f6d1 100644 --- a/kiten/ksaver.cpp +++ b/kiten/ksaver.cpp @@ -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; } } diff --git a/kiten/learn.cpp b/kiten/learn.cpp index 2b4aa2d3..3faa9c25 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -31,10 +31,10 @@ #include <kstringhandler.h> #include <tqbuttongroup.h> #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqtimer.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <stdlib.h> // RAND_MAX #include <cassert> @@ -138,12 +138,12 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) TQVBoxLayout *quizLayout = new TQVBoxLayout(quizTop, KDialog::marginHint(), KDialog::spacingHint()); quizLayout->addStretch(); - TQHBoxLayout *htqlayout = new TQHBoxLayout(quizLayout); + TQHBoxLayout *hlayout = new TQHBoxLayout(quizLayout); qKanji = new TQPushButton(quizTop); connect(qKanji, TQT_SIGNAL(clicked()), this, TQT_SLOT(qKanjiClicked())); - htqlayout->addStretch(); - htqlayout->addWidget(qKanji); - htqlayout->addStretch(); + hlayout->addStretch(); + hlayout->addWidget(qKanji); + hlayout->addStretch(); quizLayout->addStretch(); answers = new TQButtonGroup(1,Qt::Horizontal, quizTop); @@ -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); diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp index 35c48b6e..6ade1499 100644 --- a/kiten/optiondialog.cpp +++ b/kiten/optiondialog.cpp @@ -23,7 +23,7 @@ #include <kapplication.h> #include <tqvgroupbox.h> #include <kfontdialog.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <klocale.h> #include <tqcombobox.h> #include <kfiledialog.h> @@ -31,7 +31,7 @@ #include <kurllabel.h> #include <krun.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqpushbutton.h> diff --git a/kiten/rad.cpp b/kiten/rad.cpp index 0d28c907..09e2fcd8 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -33,9 +33,9 @@ #include <tqcheckbox.h> #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqtooltip.h> #include "kitenconfig.h" @@ -223,12 +223,12 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p hotlistNum = 3; rad = _rad; - TQHBoxLayout *htqlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); hotlistGroup = new TQButtonGroup(1,Qt::Horizontal, i18n("Hotlist"), this); //hotlistGroup->setRadioButtonExclusive(true); - vtqlayout->addWidget(hotlistGroup); + vlayout->addWidget(hotlistGroup); Config* config = Config::self(); @@ -246,13 +246,13 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p } connect(hotlistGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(hotlistClicked(int))); - TQVBoxLayout *tqlayout = new TQVBoxLayout(vtqlayout, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(vlayout, KDialog::spacingHint()); totalStrokes = new TQCheckBox(i18n("Search by total strokes"), this); connect(totalStrokes, TQT_SIGNAL(clicked()), this, TQT_SLOT(totalClicked())); - tqlayout->addWidget(totalStrokes); + layout->addWidget(totalStrokes); - TQHBoxLayout *strokesLayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQHBoxLayout *strokesLayout = new TQHBoxLayout(layout, KDialog::spacingHint()); totalSpin = new TQSpinBox(1, 30, 1, this); strokesLayout->addWidget(totalSpin); strokesLayout->addStretch(); @@ -264,13 +264,13 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p ok = new KPushButton(i18n("&Look Up"), this); ok->setEnabled(false); connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(apply())); - tqlayout->addWidget(ok); + layout->addWidget(ok); cancel = new KPushButton( KStdGuiItem::cancel(), this ); connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(close())); - tqlayout->addWidget(cancel); + layout->addWidget(cancel); - TQVBoxLayout *middlevLayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); + TQVBoxLayout *middlevLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); strokesSpin = new TQSpinBox(1, 17, 1, this); TQToolTip::add(strokesSpin, i18n("Show radicals having this number of strokes")); @@ -281,18 +281,18 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p connect(List, TQT_SIGNAL(executed(TQListBoxItem *)), this, TQT_SLOT(executed(TQListBoxItem *))); connect(strokesSpin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateList(int))); - TQVBoxLayout *rightvtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint()); + TQVBoxLayout *rightvlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); selectedList = new KListBox(this); - rightvtqlayout->addWidget(selectedList); + rightvlayout->addWidget(selectedList); connect(selectedList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); remove = new KPushButton(i18n("&Remove"), this); - rightvtqlayout->addWidget(remove); + rightvlayout->addWidget(remove); connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelected())); remove->setEnabled(false); clear = new KPushButton(KStdGuiItem::clear(), this); - rightvtqlayout->addWidget(clear); + rightvlayout->addWidget(clear); connect(clear, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearSelected())); clear->setEnabled(false); diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index 284e0618..3c683a1c 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -34,7 +34,7 @@ #include <tqpainter.h> #include <tqregexp.h> #include <tqsimplerichtext.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <cassert> @@ -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,12 +251,12 @@ 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; - TQColorGroup goodColorGroup = TQColorGroup(tqcolorGroup()); + TQColorGroup goodColorGroup = TQColorGroup(colorGroup()); goodColorGroup.setColor(TQColorGroup::Link, TQt::black); do @@ -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) diff --git a/klatin/klatin/data/vocab/en/I2L.kvtml b/klatin/klatin/data/vocab/en/I2L.kvtml index 99b30a78..367475ba 100644 --- a/klatin/klatin/data/vocab/en/I2L.kvtml +++ b/klatin/klatin/data/vocab/en/I2L.kvtml @@ -151,7 +151,7 @@ </e> <e> <o>liberi (2)</o> - <t>tqchildren</t> + <t>children</t> </e> <e> <o>libero (1)</o> diff --git a/klatin/klatin/klatinchoose.ui b/klatin/klatin/klatinchoose.ui index 684ebc5a..36f0a6da 100644 --- a/klatin/klatin/klatinchoose.ui +++ b/klatin/klatin/klatinchoose.ui @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout81</cstring> + <cstring>layout81</cstring> </property> <vbox> <property name="name"> @@ -46,13 +46,13 @@ <string>Welcome to KLatin Please Choose Section of Revision</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout80</cstring> + <cstring>layout80</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ Please Choose Section of Revision</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -167,7 +167,7 @@ verb and noun tables</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -178,7 +178,7 @@ verb and noun tables</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout79</cstring> + <cstring>layout79</cstring> </property> <vbox> <property name="name"> @@ -194,7 +194,7 @@ verb and noun tables</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>34</height> @@ -239,7 +239,7 @@ verb and noun tables</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>33</height> diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp index 8e666cab..0598547f 100644 --- a/klatin/klatin/klatingrammar.cpp +++ b/klatin/klatin/klatingrammar.cpp @@ -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 diff --git a/klatin/klatin/klatingrammarwidget.ui b/klatin/klatin/klatingrammarwidget.ui index 850945ed..04dc1ca9 100644 --- a/klatin/klatin/klatingrammarwidget.ui +++ b/klatin/klatin/klatingrammarwidget.ui @@ -12,7 +12,7 @@ <height>320</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -29,7 +29,7 @@ <property name="name"> <cstring>TitleGrammar</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -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"> @@ -51,7 +51,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout39</cstring> + <cstring>layout39</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout40</cstring> + <cstring>layout40</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -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"> @@ -133,13 +133,13 @@ Line 4</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -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"> @@ -280,7 +280,7 @@ Line 4</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout37</cstring> + <cstring>layout37</cstring> </property> <hbox> <property name="name"> @@ -326,7 +326,7 @@ Line 4</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <hbox> <property name="name"> @@ -342,7 +342,7 @@ Line 4</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>294</width> <height>20</height> diff --git a/klatin/klatin/klatinresultsdialog.ui b/klatin/klatin/klatinresultsdialog.ui index 84d15eec..4de14db7 100644 --- a/klatin/klatin/klatinresultsdialog.ui +++ b/klatin/klatin/klatinresultsdialog.ui @@ -31,7 +31,7 @@ <property name="text"> <string><b>Your Results</b></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -92,7 +92,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout83</cstring> + <cstring>layout83</cstring> </property> <hbox> <property name="name"> @@ -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"> @@ -164,7 +164,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout70</cstring> + <cstring>layout70</cstring> </property> <hbox> <property name="name"> @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>291</width> <height>20</height> diff --git a/klatin/klatin/klatinsettings_vocabpage.ui b/klatin/klatin/klatinsettings_vocabpage.ui index d659140d..45642614 100644 --- a/klatin/klatin/klatinsettings_vocabpage.ui +++ b/klatin/klatin/klatinsettings_vocabpage.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -96,7 +96,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -115,7 +115,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -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"> diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp index 3c0b6d52..70d42ed8 100644 --- a/klatin/klatin/klatinverbs.cpp +++ b/klatin/klatin/klatinverbs.cpp @@ -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 { diff --git a/klatin/klatin/klatinverbswidget.ui b/klatin/klatin/klatinverbswidget.ui index 46492b5d..4cfd546e 100644 --- a/klatin/klatin/klatinverbswidget.ui +++ b/klatin/klatin/klatinverbswidget.ui @@ -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"> @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ tested on</string> <property name="name"> <cstring>ChooseVoice</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -99,7 +99,7 @@ tested on</string> <property name="name"> <cstring>ChangeButton</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>25</width> <height>32767</height> @@ -119,7 +119,7 @@ tested on</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -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"> @@ -177,13 +177,13 @@ Line 4</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -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"> @@ -324,7 +324,7 @@ Line 4</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -367,7 +367,7 @@ Line 4</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <hbox> <property name="name"> @@ -383,7 +383,7 @@ Line 4</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>297</width> <height>20</height> diff --git a/klatin/klatin/klatinvocabwidget.ui b/klatin/klatin/klatinvocabwidget.ui index 6b1840f5..6fd39ff2 100644 --- a/klatin/klatin/klatinvocabwidget.ui +++ b/klatin/klatin/klatinvocabwidget.ui @@ -23,7 +23,7 @@ <property name="name"> <cstring>TitleLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>0</height> @@ -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"> @@ -45,7 +45,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout52</cstring> + <cstring>layout52</cstring> </property> <hbox> <property name="name"> @@ -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"> @@ -98,7 +98,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -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"> @@ -245,7 +245,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout53</cstring> + <cstring>layout53</cstring> </property> <hbox> <property name="name"> @@ -255,7 +255,7 @@ <property name="name"> <cstring>Answer1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>40</height> @@ -272,7 +272,7 @@ <property name="name"> <cstring>Answer2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>40</height> @@ -289,7 +289,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout64</cstring> + <cstring>layout64</cstring> </property> <hbox> <property name="name"> @@ -299,7 +299,7 @@ <property name="name"> <cstring>Answer3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>40</height> @@ -316,7 +316,7 @@ <property name="name"> <cstring>Answer4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>40</height> @@ -333,7 +333,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -349,7 +349,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>326</width> <height>20</height> diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index d1d5e550..c777f2b0 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -127,7 +127,7 @@ void KLettres::findLanguages() { TQString tmp = m_languages[i]; if (!config->readEntry(tmp)) - config->writeEntry(tmp, TQString(TQDate::tqcurrentDate().toString())); + config->writeEntry(tmp, TQString(TQDate::currentDate().toString())); } //we look in $TDEDIR/share/locale/all_languages from /tdelibs/tdecore/all_languages //to find the name of the country @@ -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 ); } } } @@ -489,7 +489,7 @@ void KLettres::slotPasteChar() TQString KLettres::charIcon(const TQChar & c) { ///Create a name and path for the icon - TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png"); + TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); TQRect r(4, 4, 120, 120); diff --git a/klettres/klettres/klettresview.h b/klettres/klettres/klettresview.h index a5c1d9e6..43db289e 100644 --- a/klettres/klettres/klettresview.h +++ b/klettres/klettres/klettresview.h @@ -22,7 +22,7 @@ #define KLETTRESVIEW_H #include <tqwidget.h> -#include <tqpalette.h> +#include <palette.h> #include <klineedit.h> class TQLabel; diff --git a/klettres/klettres/timerdlg.ui b/klettres/klettres/timerdlg.ui index 089399a8..82637661 100644 --- a/klettres/klettres/timerdlg.ui +++ b/klettres/klettres/timerdlg.ui @@ -12,7 +12,7 @@ <height>260</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>0</height> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>264</width> <height>20</height> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>16</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>270</width> <height>20</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>228</width> <height>20</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>226</width> <height>20</height> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>25</width> <height>16</height> diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp index cd30abfa..eae23ab5 100644 --- a/kmplot/kmplot/FktDlg.cpp +++ b/kmplot/kmplot/FktDlg.cpp @@ -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 ); diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui index c2d8b98a..705e2c09 100644 --- a/kmplot/kmplot/FktDlgData.ui +++ b/kmplot/kmplot/FktDlgData.ui @@ -12,7 +12,7 @@ <height>355</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>250</height> @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -329,7 +329,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index 9c0fac37..5a736097 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -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'; diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp index a88d364e..d9d88613 100644 --- a/kmplot/kmplot/View.cpp +++ b/kmplot/kmplot/View.cpp @@ -140,7 +140,7 @@ void View::draw(TQPaintDevice *dev, int form) DC.resetXForm(); DC.scale((float)w/(float)(lx+2*ref.x()), (float)w/(float)(lx+2*ref.x())); } - wm=DC.tqworldMatrix(); + wm=DC.worldMatrix(); s=DC.xForm(TQPoint(1000, 0)).x()/1000.; dgr.Create( ref, lx, ly, xmin, xmax, ymin, ymax ); } diff --git a/kmplot/kmplot/editderivativespage.ui b/kmplot/kmplot/editderivativespage.ui index f8693ecc..235721f2 100644 --- a/kmplot/kmplot/editderivativespage.ui +++ b/kmplot/kmplot/editderivativespage.ui @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp index a503884f..7e0277f0 100644 --- a/kmplot/kmplot/editfunction.cpp +++ b/kmplot/kmplot/editfunction.cpp @@ -29,7 +29,7 @@ #include <tqdialog.h> #include <tqframe.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqstringlist.h> #include <tqvbox.h> @@ -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++; diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui index e7ecf01d..439c3970 100644 --- a/kmplot/kmplot/editfunctionpage.ui +++ b/kmplot/kmplot/editfunctionpage.ui @@ -366,7 +366,7 @@ Example: f(x)=x^2</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -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&)</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&)</slot> - <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&,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&)</slot> + <slot access="public" specifier="">repaint(const QRect&,bool)</slot> + <slot access="public" specifier="">repaint(const QRegion&)</slot> + <slot access="public" specifier="">repaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -466,7 +466,7 @@ Example: f(x)=x^2</string> <slot access="public" specifier="">setPalette(const QPalette&)</slot> <slot access="public" specifier="">setSelection(int,int)</slot> <slot access="public" specifier="">setCursorPosition(int)</slot> - <slot access="public" specifier="">tqsetAlignment(int)</slot> + <slot access="public" specifier="">setAlignment(int)</slot> <slot access="public" specifier="">cut()</slot> <slot access="public" specifier="">copy()</slot> <slot access="public" specifier="">paste()</slot> @@ -490,10 +490,10 @@ Example: f(x)=x^2</string> <slot access="private" specifier="">setTextWorkaround(const QString&)</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">tqminimumSize</property> - <property type="Size">tqmaximumSize</property> + <property type="Size">minimumSize</property> + <property type="Size">maximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</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&)</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&)</slot> - <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&,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&)</slot> + <slot access="public" specifier="">repaint(const QRect&,bool)</slot> + <slot access="public" specifier="">repaint(const QRegion&)</slot> + <slot access="public" specifier="">repaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -606,10 +606,10 @@ 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">tqminimumSize</property> - <property type="Size">tqmaximumSize</property> + <property type="Size">minimumSize</property> + <property type="Size">maximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</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&)</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&)</slot> - <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&,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&)</slot> + <slot access="public" specifier="">repaint(const QRect&,bool)</slot> + <slot access="public" specifier="">repaint(const QRegion&)</slot> + <slot access="public" specifier="">repaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -713,10 +713,10 @@ 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">tqminimumSize</property> - <property type="Size">tqmaximumSize</property> + <property type="Size">minimumSize</property> + <property type="Size">maximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</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&)</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&)</slot> - <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&,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&)</slot> + <slot access="public" specifier="">repaint(const QRect&,bool)</slot> + <slot access="public" specifier="">repaint(const QRegion&)</slot> + <slot access="public" specifier="">repaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -818,10 +818,10 @@ 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">tqminimumSize</property> - <property type="Size">tqmaximumSize</property> + <property type="Size">minimumSize</property> + <property type="Size">maximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</property> diff --git a/kmplot/kmplot/editintegralpage.ui b/kmplot/kmplot/editintegralpage.ui index 694edf46..70c63f6a 100644 --- a/kmplot/kmplot/editintegralpage.ui +++ b/kmplot/kmplot/editintegralpage.ui @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>62</height> diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp index 6318e124..c2017c8a 100644 --- a/kmplot/kmplot/kconstanteditor.cpp +++ b/kmplot/kmplot/kconstanteditor.cpp @@ -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(); } diff --git a/kmplot/kmplot/keditconstant.cpp b/kmplot/kmplot/keditconstant.cpp index 6fa8a0b1..e32bfcd5 100644 --- a/kmplot/kmplot/keditconstant.cpp +++ b/kmplot/kmplot/keditconstant.cpp @@ -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') { diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp index ce013373..2a6b3df1 100644 --- a/kmplot/kmplot/kminmax.cpp +++ b/kmplot/kmplot/kminmax.cpp @@ -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); diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index f9d84256..5eb17971 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -82,7 +82,7 @@ KmPlot::KmPlot( KCmdLineArgs* args) } if (!initialGeometrySet()) - resize( TQSize(450, 520).expandedTo(tqminimumSizeHint())); + resize( TQSize(450, 520).expandedTo(minimumSizeHint())); // apply the saved mainwindow settings, if any, and ask the mainwindow // to automatically save settings if changed: window size, toolbar diff --git a/kmplot/kmplot/kmplotio.cpp b/kmplot/kmplot/kmplotio.cpp index 1b195a42..0beb551a 100644 --- a/kmplot/kmplot/kmplotio.cpp +++ b/kmplot/kmplot/kmplotio.cpp @@ -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; } } diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp index 17586610..32ca2573 100644 --- a/kmplot/kmplot/kparametereditor.cpp +++ b/kmplot/kmplot/kparametereditor.cpp @@ -35,7 +35,7 @@ #include <ktempfile.h> #include <kurl.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqvaluelist.h> #include "kparametereditor.h" @@ -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; diff --git a/kmplot/kmplot/kprinterdlg.cpp b/kmplot/kmplot/kprinterdlg.cpp index 4ddc63f4..504aaa64 100644 --- a/kmplot/kmplot/kprinterdlg.cpp +++ b/kmplot/kmplot/kprinterdlg.cpp @@ -24,7 +24,7 @@ */ // TQt includes -#include <tqlayout.h> +#include <layout.h> // KDE includes #include <kdialog.h> @@ -37,16 +37,16 @@ KPrinterDlg::KPrinterDlg( TQWidget *parent, const char *name ) : KPrintDialogPage( parent, name ) { setTitle( i18n( "KmPlot Options" ) ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setMargin( KDialog::marginHint() ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->setMargin( KDialog::marginHint() ); + layout->setSpacing( KDialog::spacingHint() ); printHeaderTable = new TQCheckBox( i18n( "Print header table" ), this ); transparent_background = new TQCheckBox( i18n( "Transparent background" ), this ); - tqlayout->addWidget( printHeaderTable ); - tqlayout->addWidget( transparent_background ); - tqlayout->addStretch( 1 ); + layout->addWidget( printHeaderTable ); + layout->addWidget( transparent_background ); + layout->addStretch( 1 ); } void KPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool include_def ) diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp index 491e3889..0b3e4193 100644 --- a/kmplot/kmplot/ksliderwindow.cpp +++ b/kmplot/kmplot/ksliderwindow.cpp @@ -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 diff --git a/kmplot/kmplot/parser.cpp b/kmplot/kmplot/parser.cpp index e47feaa8..ed064b85 100644 --- a/kmplot/kmplot/parser.cpp +++ b/kmplot/kmplot/parser.cpp @@ -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"); diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui index a367d809..215b4d65 100644 --- a/kmplot/kmplot/qconstanteditor.ui +++ b/kmplot/kmplot/qconstanteditor.ui @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>147</height> diff --git a/kmplot/kmplot/qeditconstant.ui b/kmplot/kmplot/qeditconstant.ui index 85e9236d..02d3273f 100644 --- a/kmplot/kmplot/qeditconstant.ui +++ b/kmplot/kmplot/qeditconstant.ui @@ -40,7 +40,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui index 41fa84c4..46a36465 100644 --- a/kmplot/kmplot/qeditparametric.ui +++ b/kmplot/kmplot/qeditparametric.ui @@ -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"> @@ -93,7 +93,7 @@ The name of a function must be unique. If you leave this line empty KmPlot will </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -156,7 +156,7 @@ Example: sin(t)</string> </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -340,7 +340,7 @@ Example: sin(t)</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmplot/kmplot/qeditpolar.ui b/kmplot/kmplot/qeditpolar.ui index e582734b..61624136 100644 --- a/kmplot/kmplot/qeditpolar.ui +++ b/kmplot/kmplot/qeditpolar.ui @@ -218,7 +218,7 @@ Example: loop(angle)=ln(angle)</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmplot/kmplot/qminmax.ui b/kmplot/kmplot/qminmax.ui index 98996444..6309a390 100644 --- a/kmplot/kmplot/qminmax.ui +++ b/kmplot/kmplot/qminmax.ui @@ -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> diff --git a/kmplot/kmplot/qparametereditor.ui b/kmplot/kmplot/qparametereditor.ui index 18d7dce4..d87d1784 100644 --- a/kmplot/kmplot/qparametereditor.ui +++ b/kmplot/kmplot/qparametereditor.ui @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kmplot/kmplot/settingspagecolor.ui b/kmplot/kmplot/settingspagecolor.ui index ba35f0c5..5b938c04 100644 --- a/kmplot/kmplot/settingspagecolor.ui +++ b/kmplot/kmplot/settingspagecolor.ui @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -123,7 +123,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -131,7 +131,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <grid> <property name="name"> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -283,7 +283,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> @@ -428,7 +428,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kmplot/kmplot/settingspagecoords.ui b/kmplot/kmplot/settingspagecoords.ui index 65d78d92..6293d0cd 100644 --- a/kmplot/kmplot/settingspagecoords.ui +++ b/kmplot/kmplot/settingspagecoords.ui @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <hbox> <property name="name"> @@ -131,7 +131,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -277,7 +277,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20_2</cstring> + <cstring>layout20_2</cstring> </property> <grid> <property name="name"> @@ -335,7 +335,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -375,7 +375,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -415,7 +415,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <hbox> <property name="name"> @@ -458,7 +458,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <grid> <property name="name"> @@ -544,7 +544,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -626,7 +626,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -677,7 +677,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kmplot/kmplot/settingspagefonts.ui b/kmplot/kmplot/settingspagefonts.ui index 7564d04a..3ed93a8f 100644 --- a/kmplot/kmplot/settingspagefonts.ui +++ b/kmplot/kmplot/settingspagefonts.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> diff --git a/kmplot/kmplot/settingspageprecision.ui b/kmplot/kmplot/settingspageprecision.ui index 3ad5d990..cafc3365 100644 --- a/kmplot/kmplot/settingspageprecision.ui +++ b/kmplot/kmplot/settingspageprecision.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>29</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -212,7 +212,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/kmplot/kmplot/settingspagescaling.ui b/kmplot/kmplot/settingspagescaling.ui index 3b0cd872..eaaf0690 100644 --- a/kmplot/kmplot/settingspagescaling.ui +++ b/kmplot/kmplot/settingspagescaling.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -396,7 +396,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>91</height> diff --git a/kmplot/kmplot/sliderwindow.ui b/kmplot/kmplot/sliderwindow.ui index c54384a2..8c87cb40 100644 --- a/kmplot/kmplot/sliderwindow.ui +++ b/kmplot/kmplot/sliderwindow.ui @@ -23,7 +23,7 @@ <property name="name"> <cstring>slider</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -60,7 +60,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>45</width> <height>0</height> @@ -69,7 +69,7 @@ <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp index b5d03918..e7b84fb8 100644 --- a/kmplot/kmplot/xparser.cpp +++ b/kmplot/kmplot/xparser.cpp @@ -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': { diff --git a/kpercentage/kpercentage/kanswer.cpp b/kpercentage/kpercentage/kanswer.cpp index 51d5c8d5..df04bfa6 100644 --- a/kpercentage/kpercentage/kanswer.cpp +++ b/kpercentage/kpercentage/kanswer.cpp @@ -26,7 +26,7 @@ // TQt includes #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> // KDE includes #include <kdebug.h> @@ -63,7 +63,7 @@ KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE ) TextLabelAnswer->setBackgroundOrigin( TQLabel::ParentOrigin ); TextLabelAnswer->setBackgroundPixmap( bgp ); - canvas->tqsetBackgroundPixmap( bgp ); + canvas->setBackgroundPixmap( bgp ); canvas_view->setBackgroundOrigin( TQCanvasView::ParentOrigin ); canvas_view->setBackgroundPixmap( bgp ); diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp index f9608601..e3523675 100644 --- a/kpercentage/kpercentage/kpercentage.cpp +++ b/kpercentage/kpercentage/kpercentage.cpp @@ -24,7 +24,7 @@ // TQt includes #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -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 */ diff --git a/kpercentage/kpercentage/kpercentage.docbook b/kpercentage/kpercentage/kpercentage.docbook index 58742c91..809ccb85 100644 --- a/kpercentage/kpercentage/kpercentage.docbook +++ b/kpercentage/kpercentage/kpercentage.docbook @@ -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 “Algorithm” 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> diff --git a/kpercentage/kpercentage/kpercentmain.cpp b/kpercentage/kpercentage/kpercentmain.cpp index d02b57fd..12d359fb 100644 --- a/kpercentage/kpercentage/kpercentmain.cpp +++ b/kpercentage/kpercentage/kpercentmain.cpp @@ -24,7 +24,7 @@ #include <time.h> // TQt includes -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqprogressbar.h> #include <tqpushbutton.h> @@ -55,15 +55,15 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : KIntValidator *validLine = new KIntValidator( this ); line_edit_percentage = new TQLineEdit( this, "line_edit_percentage" ); - line_edit_percentage->tqsetAlignment( int( TQLineEdit::AlignHCenter ) ); + line_edit_percentage->setAlignment( int( TQLineEdit::AlignHCenter ) ); line_edit_percentage->setValidator( validLine ); line_edit_basevalue = new TQLineEdit( this, "line_edit_basevalue" ); - line_edit_basevalue->tqsetAlignment( int( TQLineEdit::AlignHCenter ) ); + line_edit_basevalue->setAlignment( int( TQLineEdit::AlignHCenter ) ); line_edit_basevalue->setValidator( validLine ); line_edit_percentvalue = new TQLineEdit( this, "line_edit_percentvalue" ); - line_edit_percentvalue->tqsetAlignment( int( TQLineEdit::AlignHCenter ) ); + line_edit_percentvalue->setAlignment( int( TQLineEdit::AlignHCenter ) ); line_edit_percentvalue->setValidator( validLine ); progress_bar_count = new TQProgressBar( this, "progress_bar_count" ); @@ -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 ) ); } } } diff --git a/kpercentage/kpercentage/ksplashscreen.cpp b/kpercentage/kpercentage/ksplashscreen.cpp index 226fa881..07c5b0d7 100644 --- a/kpercentage/kpercentage/ksplashscreen.cpp +++ b/kpercentage/kpercentage/ksplashscreen.cpp @@ -42,7 +42,7 @@ KSplashScreen::KSplashScreen( KPercentage *percentage, const char *name ) : TQCanvas *canvas = new TQCanvas( TQT_TQOBJECT(this) ); canvas->resize( 400, 300 ); /* set the background pixmap */ - canvas->tqsetBackgroundPixmap( bgp ); + canvas->setBackgroundPixmap( bgp ); //remove version number from splash annma 14/02/2005 //TQCanvasText *t = new TQCanvasText( KPERCENTAGE_VERSION, canvas ); //t->move( 330.0, 260.0 ); diff --git a/kstars/ChangeLog b/kstars/ChangeLog index fe69e108..5c2b696a 100644 --- a/kstars/ChangeLog +++ b/kstars/ChangeLog @@ -259,7 +259,7 @@ Added Milky Way countour. Added spectral type of stars to popup menu. Automated object tracking when an object is centered. Display name and coordinates of centered object in the infoPanel. -Fixed "extra tqlayout" error messages. +Fixed "extra layout" error messages. Improved efficiency of KSPlanet::findPosition(). Initial startup parameters make more sense. If focus point is below horizon when KStars restarts, a warning message diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp index 86c2b6dd..23a80482 100644 --- a/kstars/kstars/addcatdialog.cpp +++ b/kstars/kstars/addcatdialog.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <kcolorbutton.h> #include <kdebug.h> #include <kmessagebox.h> @@ -106,7 +106,7 @@ void AddCatDialog::slotHelp() { * Position angle: floating-point value (position angle, in degrees) */ bool AddCatDialog::validateDataFile() { - KStars *ksw = (KStars*) tqtopLevelWidget()->parent(); + KStars *ksw = (KStars*) topLevelWidget()->parent(); //Create the catalog file contents: first the header CatalogContents = writeCatalogHeader(); @@ -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 ); diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui index 30abaeb3..266cbefb 100644 --- a/kstars/kstars/addcatdialogui.ui +++ b/kstars/kstars/addcatdialogui.ui @@ -75,7 +75,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -109,7 +109,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -145,7 +145,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout27</cstring> + <cstring>layout27</cstring> </property> <grid> <property name="name"> @@ -177,7 +177,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -218,7 +218,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="2"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -234,7 +234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -258,7 +258,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -308,7 +308,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kstars/kstars/addlinkdialog.cpp b/kstars/kstars/addlinkdialog.cpp index c03cc0c4..0a435fdc 100644 --- a/kstars/kstars/addlinkdialog.cpp +++ b/kstars/kstars/addlinkdialog.cpp @@ -20,13 +20,13 @@ #include <kmessagebox.h> #include <kpushbutton.h> #include <tqbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include "addlinkdialog.h" #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); diff --git a/kstars/kstars/addlinkdialogui.ui b/kstars/kstars/addlinkdialogui.ui index 89092759..e6310813 100644 --- a/kstars/kstars/addlinkdialogui.ui +++ b/kstars/kstars/addlinkdialogui.ui @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -86,7 +86,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>450</width> <height>0</height> @@ -97,7 +97,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/ccdpreviewui.ui b/kstars/kstars/ccdpreviewui.ui index 4f4399f9..1ea53d03 100644 --- a/kstars/kstars/ccdpreviewui.ui +++ b/kstars/kstars/ccdpreviewui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -31,13 +31,13 @@ <property name="name"> <cstring>playB</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -57,13 +57,13 @@ <property name="name"> <cstring>captureB</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>300</width> <height>21</height> @@ -118,7 +118,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>120</height> @@ -133,7 +133,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -237,7 +237,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <vbox> <property name="name"> @@ -317,7 +317,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -325,7 +325,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -351,7 +351,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -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"> @@ -374,7 +374,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index 26370cad..670b399c 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -33,7 +33,7 @@ #include <tqpainter.h> #include <tqstringlist.h> #include <tqdir.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> @@ -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; @@ -168,8 +168,8 @@ void CCDPreviewWG::setCtrl(int wd, int ht,int po, int bpp,unsigned long mgd) for (i=0;i<streamFrame->totalBaseCount;i++) { streamFrame->streamBuffer[i]=0; } - resize(wd + tqlayout()->margin() * 2 , ht + playB->height() + brightnessLabel->height() - + contrastLabel->height() + gammaLabel->height() + focalEdit->height() + FWHMLabel->height() + tqlayout()->margin() * 2 + tqlayout()->spacing()*6); + resize(wd + layout()->margin() * 2 , ht + playB->height() + brightnessLabel->height() + + contrastLabel->height() + gammaLabel->height() + focalEdit->height() + FWHMLabel->height() + layout()->margin() * 2 + layout()->spacing()*6); streamFrame->resize(wd, ht); } @@ -197,14 +197,14 @@ 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)); } void CCDPreviewWG::resizeEvent(TQResizeEvent *ev) { - streamFrame->resize(ev->size().width() - tqlayout()->margin() * 2, ev->size().height() - playB->height() - tqlayout()->margin() * 2 - tqlayout()->spacing()); + streamFrame->resize(ev->size().width() - layout()->margin() * 2, ev->size().height() - playB->height() - layout()->margin() * 2 - layout()->spacing()); } void CCDPreviewWG::playPressed() @@ -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" ) ); } diff --git a/kstars/kstars/colorscheme.cpp b/kstars/kstars/colorscheme.cpp index 7c53a2e0..5449c48e 100644 --- a/kstars/kstars/colorscheme.cpp +++ b/kstars/kstars/colorscheme.cpp @@ -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"; } diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp index 4b57b431..ec9aa240 100644 --- a/kstars/kstars/conbridlg.cpp +++ b/kstars/kstars/conbridlg.cpp @@ -231,7 +231,7 @@ void ContrastBrightnessDlg::setBrightness(int brightnessValue) } -TQSize ContrastBrightnessDlg::tqsizeHint() const +TQSize ContrastBrightnessDlg::sizeHint() const { return TQSize(400,130); } diff --git a/kstars/kstars/conbridlg.h b/kstars/kstars/conbridlg.h index 1f9ce088..fb914b16 100644 --- a/kstars/kstars/conbridlg.h +++ b/kstars/kstars/conbridlg.h @@ -34,7 +34,7 @@ class ContrastBrightnessDlg : public KDialogBase { ContrastBrightnessDlg(TQWidget *parent=0); ~ContrastBrightnessDlg(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void range(int min, int max, int & num); void range(float min, float max, float & num); diff --git a/kstars/kstars/data/tips b/kstars/kstars/data/tips index 1cbcc989..8e97baa7 100644 --- a/kstars/kstars/data/tips +++ b/kstars/kstars/data/tips @@ -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> diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index 07bcd87c..064fa17b 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tqstring.h> -#include <tqlayout.h> //still needed for secondary dialogs +#include <layout.h> //still needed for secondary dialogs #include <tqlineedit.h> #include <tqimage.h> #include <tqregexp.h> @@ -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; } diff --git a/kstars/kstars/details_data.ui b/kstars/kstars/details_data.ui index e665d099..aa555525 100644 --- a/kstars/kstars/details_data.ui +++ b/kstars/kstars/details_data.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout67</cstring> + <cstring>layout67</cstring> </property> <vbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="text"> <string><p align="center">Primary Name, Other Names</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -76,7 +76,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <vbox> <property name="name"> @@ -84,7 +84,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -92,7 +92,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout60_2</cstring> + <cstring>layout60_2</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="text"> <string>in</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -208,7 +208,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>77</width> <height>20</height> @@ -248,7 +248,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <vbox> <property name="name"> @@ -256,7 +256,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <grid> <property name="name"> @@ -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> @@ -449,7 +449,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>8</height> @@ -458,7 +458,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout36_2</cstring> + <cstring>layout36_2</cstring> </property> <property name="paletteForegroundColor"> <color> @@ -481,7 +481,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -490,7 +490,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout35_2</cstring> + <cstring>layout35_2</cstring> </property> <vbox> <property name="name"> @@ -532,7 +532,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -557,7 +557,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>8</height> diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui index 352d4b5b..3b2a7bb2 100644 --- a/kstars/kstars/details_links.ui +++ b/kstars/kstars/details_links.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout79</cstring> + <cstring>layout79</cstring> </property> <vbox> <property name="name"> @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -75,7 +75,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout80</cstring> + <cstring>layout80</cstring> </property> <vbox> <property name="name"> @@ -115,7 +115,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout91</cstring> + <cstring>layout91</cstring> </property> <hbox> <property name="name"> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kstars/kstars/details_position.ui b/kstars/kstars/details_position.ui index 940b16a2..f09c720e 100644 --- a/kstars/kstars/details_position.ui +++ b/kstars/kstars/details_position.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout56</cstring> + <cstring>layout56</cstring> </property> <vbox> <property name="name"> @@ -70,7 +70,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout54</cstring> + <cstring>layout54</cstring> </property> <hbox> <property name="name"> @@ -78,7 +78,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout50</cstring> + <cstring>layout50</cstring> </property> <grid> <property name="name"> @@ -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> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>16</height> @@ -203,7 +203,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout50_2</cstring> + <cstring>layout50_2</cstring> </property> <grid> <property name="name"> @@ -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> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -330,7 +330,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -338,7 +338,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout53</cstring> + <cstring>layout53</cstring> </property> <hbox> <property name="name"> @@ -364,7 +364,7 @@ <property name="text"> <string>Hour angle:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -405,7 +405,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>170</width> <height>20</height> @@ -414,7 +414,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout52</cstring> + <cstring>layout52</cstring> </property> <hbox> <property name="name"> @@ -440,7 +440,7 @@ <property name="text"> <string>Airmass:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -487,7 +487,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -496,7 +496,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout76</cstring> + <cstring>layout76</cstring> </property> <vbox> <property name="name"> @@ -545,7 +545,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout142</cstring> + <cstring>layout142</cstring> </property> <hbox> <property name="name"> @@ -553,7 +553,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout141</cstring> + <cstring>layout141</cstring> </property> <grid> <property name="name"> @@ -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> @@ -718,7 +718,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>83</width> <height>20</height> @@ -727,7 +727,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout140</cstring> + <cstring>layout140</cstring> </property> <grid> <property name="name"> @@ -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> @@ -894,7 +894,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp index a83cd5cc..544cbc9b 100644 --- a/kstars/kstars/devicemanager.cpp +++ b/kstars/kstars/devicemanager.cpp @@ -22,7 +22,7 @@ #include "kstarsdatetime.h" #include <tqsocketnotifier.h> -#include <tqtextedit.h> +#include <textedit.h> #include <klocale.h> #include <kdebug.h> @@ -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; @@ -155,7 +155,7 @@ void DeviceManager::dataReceived() sNotifier->disconnect(); close(serverFD); parent->removeDeviceMgr(mgrID); - KMessageBox::error(0, TQString::tqfromLatin1(errmsg)); + KMessageBox::error(0, TQString::fromLatin1(errmsg)); return; } @@ -397,7 +397,7 @@ void DeviceManager::doMsg (XMLEle *msg, INDI_D *dp) if (timestamp) txt_w->insert(TQString(valuXMLAtt(timestamp)) + TQString(" ")); else - txt_w->insert( KStarsDateTime::tqcurrentDateTime().toString("yyyy/mm/dd - h:m:s ap ")); + txt_w->insert( KStarsDateTime::currentDateTime().toString("yyyy/mm/dd - h:m:s ap ")); /* finally! the msg */ message = findXMLAtt(msg, "message"); diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui index 4a7b5be8..3755d1da 100644 --- a/kstars/kstars/devmanager.ui +++ b/kstars/kstars/devmanager.ui @@ -51,7 +51,7 @@ </column> <column> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="clickable"> <bool>true</bool> @@ -104,7 +104,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>125</height> @@ -126,7 +126,7 @@ <property name="name"> <cstring>serverLogText</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>90</height> @@ -178,7 +178,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -241,7 +241,7 @@ <widget class="KListView"> <column> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="clickable"> <bool>true</bool> @@ -278,7 +278,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5_2</cstring> + <cstring>layout5_2</cstring> </property> <vbox> <property name="name"> @@ -366,7 +366,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -380,7 +380,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -396,7 +396,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>289</width> <height>20</height> diff --git a/kstars/kstars/dms.cpp b/kstars/kstars/dms.cpp index 3619a578..724f9af2 100644 --- a/kstars/kstars/dms.cpp +++ b/kstars/kstars/dms.cpp @@ -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; diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp index c1aa5321..cd60df21 100644 --- a/kstars/kstars/finddialog.cpp +++ b/kstars/kstars/finddialog.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqlabel.h> #include <tqcombobox.h> @@ -48,7 +48,7 @@ FindDialog::FindDialog( TQWidget* parent ) : SearchBox = new TQLineEdit( page, "SearchBox" ); filterTypeLabel = new TQLabel( page, "filterTypeLabel" ); - filterTypeLabel->tqsetAlignment( AlignRight ); + filterTypeLabel->setAlignment( AlignRight ); filterTypeLabel->setText( i18n( "Filter by type: " ) ); filterType = new TQComboBox( page, "filterType" ); @@ -73,7 +73,7 @@ FindDialog::FindDialog( TQWidget* parent ) : SearchList->setVScrollBarMode( TQListBox::AlwaysOn ); SearchList->setHScrollBarMode( TQListBox::AlwaysOff ); -//Pack Widgets into tqlayout manager +//Pack Widgets into layout manager hlay->addWidget( filterTypeLabel, 0, 0 ); hlay->addWidget( filterType, 0, 0 ); @@ -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(); diff --git a/kstars/kstars/fitsheaderdialog.ui b/kstars/kstars/fitsheaderdialog.ui index d00c90ee..7903b000 100644 --- a/kstars/kstars/fitsheaderdialog.ui +++ b/kstars/kstars/fitsheaderdialog.ui @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>300</width> <height>20</height> diff --git a/kstars/kstars/fitshistogram.cpp b/kstars/kstars/fitshistogram.cpp index 29938ed1..73010cea 100644 --- a/kstars/kstars/fitshistogram.cpp +++ b/kstars/kstars/fitshistogram.cpp @@ -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])); } diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp index 8e3b6e70..1a42a1a7 100644 --- a/kstars/kstars/fitsimage.cpp +++ b/kstars/kstars/fitsimage.cpp @@ -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); } diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp index dc8385f9..ea4b1cb0 100644 --- a/kstars/kstars/fitsviewer.cpp +++ b/kstars/kstars/fitsviewer.cpp @@ -42,7 +42,7 @@ #include <tqstringlist.h> #include <tqlistview.h> #include <tqradiobutton.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqimage.h> #include <math.h> @@ -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(); diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index 7b182225..09ab5897 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tqtabwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <klocale.h> @@ -152,7 +152,7 @@ long double FocusDialog::epochToJd (double epoch) { } -TQSize FocusDialog::tqsizeHint() const +TQSize FocusDialog::sizeHint() const { return TQSize(240,210); } diff --git a/kstars/kstars/focusdialog.h b/kstars/kstars/focusdialog.h index 20bf2428..e6707028 100644 --- a/kstars/kstars/focusdialog.h +++ b/kstars/kstars/focusdialog.h @@ -47,7 +47,7 @@ public: SkyPoint* point() const { return Point; } /**@return suggested size of focus window. */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /**@return whether user set the AltAz coords */ bool usedAltAz() const { return UsedAltAz; } diff --git a/kstars/kstars/focusdialogdlg.ui b/kstars/kstars/focusdialogdlg.ui index 4484e1be..12149e0c 100644 --- a/kstars/kstars/focusdialogdlg.ui +++ b/kstars/kstars/focusdialogdlg.ui @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -155,7 +155,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kstars/kstars/fov.cpp b/kstars/kstars/fov.cpp index 572bca0f..7b01959f 100644 --- a/kstars/kstars/fov.cpp +++ b/kstars/kstars/fov.cpp @@ -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 ); diff --git a/kstars/kstars/fov.h b/kstars/kstars/fov.h index f37512ab..b04e9099 100644 --- a/kstars/kstars/fov.h +++ b/kstars/kstars/fov.h @@ -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; } diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp index ff3c9bb5..b6637207 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqfile.h> #include <tqframe.h> #include <tqpainter.h> @@ -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(); } diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui index 31df9717..77f10219 100644 --- a/kstars/kstars/fovdialogui.ui +++ b/kstars/kstars/fovdialogui.ui @@ -23,7 +23,7 @@ <property name="name"> <cstring>FOVListBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>0</height> @@ -38,7 +38,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -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> @@ -68,7 +68,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -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"> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -132,7 +132,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>80</height> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/kstars/kstars/geolocation.h b/kstars/kstars/geolocation.h index b1fa7e37..c3b6524e 100644 --- a/kstars/kstars/geolocation.h +++ b/kstars/kstars/geolocation.h @@ -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. * diff --git a/kstars/kstars/histdialog.ui b/kstars/kstars/histdialog.ui index 2711b215..aeda0098 100644 --- a/kstars/kstars/histdialog.ui +++ b/kstars/kstars/histdialog.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>640</width> <height>325</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>640</width> <height>325</height> @@ -44,7 +44,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <vbox> <property name="name"> @@ -70,13 +70,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>500</width> <height>150</height> @@ -101,7 +101,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>20</height> @@ -224,7 +224,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -240,7 +240,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>270</width> <height>20</height> diff --git a/kstars/kstars/imagereductionui.ui b/kstars/kstars/imagereductionui.ui index 6fd1a362..7a2f75a2 100644 --- a/kstars/kstars/imagereductionui.ui +++ b/kstars/kstars/imagereductionui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -79,7 +79,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -189,7 +189,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -199,7 +199,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -257,7 +257,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> @@ -354,7 +354,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -367,7 +367,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14_2</cstring> + <cstring>layout14_2</cstring> </property> <hbox> <property name="name"> @@ -425,7 +425,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7_2</cstring> + <cstring>layout7_2</cstring> </property> <hbox> <property name="name"> @@ -441,7 +441,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> @@ -522,7 +522,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -535,7 +535,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -551,7 +551,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>210</width> <height>20</height> diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp index 73026e99..d6f6f9cb 100644 --- a/kstars/kstars/imagesequence.cpp +++ b/kstars/kstars/imagesequence.cpp @@ -79,7 +79,7 @@ imagesequence::~imagesequence() { } -bool imagesequence::updatetqStatus() +bool imagesequence::updateStatus() { bool result; @@ -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(); diff --git a/kstars/kstars/imagesequence.h b/kstars/kstars/imagesequence.h index 304b9ad3..d04bf0a0 100644 --- a/kstars/kstars/imagesequence.h +++ b/kstars/kstars/imagesequence.h @@ -28,7 +28,7 @@ public: ~imagesequence(); -bool updatetqStatus(); +bool updateStatus(); private: KStars *ksw; diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp index 747ae796..9d07fc64 100644 --- a/kstars/kstars/imageviewer.cpp +++ b/kstars/kstars/imageviewer.cpp @@ -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; diff --git a/kstars/kstars/imgsequencedlgui.ui b/kstars/kstars/imgsequencedlgui.ui index 14bb6a94..45b4dd60 100644 --- a/kstars/kstars/imgsequencedlgui.ui +++ b/kstars/kstars/imgsequencedlgui.ui @@ -38,7 +38,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <vbox> <property name="name"> @@ -46,7 +46,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -64,7 +64,7 @@ <property name="name"> <cstring>currentImgCountOUT</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -89,7 +89,7 @@ <property name="name"> <cstring>fullImgCountOUT</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -152,7 +152,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>270</width> <height>20</height> @@ -221,7 +221,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -240,7 +240,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout30</cstring> + <cstring>layout30</cstring> </property> <hbox> <property name="name"> @@ -248,7 +248,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <vbox> <property name="name"> @@ -328,7 +328,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout28</cstring> + <cstring>layout28</cstring> </property> <vbox> <property name="name"> @@ -404,7 +404,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> - <cstring>tqlayout29_2</cstring> + <cstring>layout29_2</cstring> </property> <vbox> <property name="name"> @@ -460,7 +460,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>81</height> diff --git a/kstars/kstars/indi/apmount.cpp b/kstars/kstars/indi/apmount.cpp index a9857df3..273a7b16 100644 --- a/kstars/kstars/indi/apmount.cpp +++ b/kstars/kstars/indi/apmount.cpp @@ -729,9 +729,9 @@ void APMount::ISNewSwitch (const char *dev, const char *name, ISState *states, c IUUpdateSwitches(&AlignmentSP, states, names, n); index = getOnSwitch(&AlignmentSP); - if ( ( err = tqsetAlignmentMode(index) < 0) ) + if ( ( err = setAlignmentMode(index) < 0) ) { - handleError(&AlignmentSP, err, "Setting tqalignment"); + handleError(&AlignmentSP, err, "Setting alignment"); return; } diff --git a/kstars/kstars/indi/apogee/ApnCamera.cpp b/kstars/kstars/indi/apogee/ApnCamera.cpp index 431fe392..457722b5 100644 --- a/kstars/kstars/indi/apogee/ApnCamera.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera.cpp @@ -45,7 +45,7 @@ bool CApnCamera::Expose( double Duration, bool Light ) unsigned short TotalVPixels; - while ( read_ImagingtqStatus() != Apn_Status_Flushing ) + while ( read_ImagingStatus() != Apn_Status_Flushing ) { Sleep( 20 ); } @@ -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; @@ -296,7 +296,7 @@ unsigned short CApnCamera::GetExposurePixelsV() double CApnCamera::read_InputVoltage() { - UpdateGeneraltqStatus(); + UpdateGeneralStatus(); return m_pvtInputVoltage; } @@ -329,7 +329,7 @@ unsigned short CApnCamera::read_FirmwareVersion() bool CApnCamera::read_ShutterState() { - UpdateGeneraltqStatus(); + UpdateGeneralStatus(); return m_pvtShutterState; } @@ -559,15 +559,15 @@ void CApnCamera::write_DataBits( Apn_Resolution BitResolution ) } } -Apn_tqStatus CApnCamera::read_ImagingtqStatus() +Apn_Status CApnCamera::read_ImagingStatus() { bool Exposing, Active, Done, Flushing, WaitOnTrigger; bool DataHalted, RamError; - UpdateGeneraltqStatus(); + UpdateGeneralStatus(); - // Update the ImagingtqStatus + // Update the ImagingStatus Exposing = false; Active = false; Done = false; @@ -599,42 +599,42 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus() if ( RamError ) { - m_pvtImagingtqStatus = Apn_Status_PatternError; + m_pvtImagingStatus = Apn_Status_PatternError; } else { if ( DataHalted ) { - m_pvtImagingtqStatus = Apn_Status_DataError; + m_pvtImagingStatus = Apn_Status_DataError; } else { if ( WaitOnTrigger ) { - m_pvtImagingtqStatus = Apn_Status_WaitingOnTrigger; + m_pvtImagingStatus = Apn_Status_WaitingOnTrigger; } else { if ( Done && m_pvtImageInProgress ) { m_pvtImageReady = true; - m_pvtImagingtqStatus = Apn_Status_ImageReady; + m_pvtImagingStatus = Apn_Status_ImageReady; } else { if ( Active ) { if ( Exposing ) - m_pvtImagingtqStatus = Apn_Status_Exposing; + m_pvtImagingStatus = Apn_Status_Exposing; else - m_pvtImagingtqStatus = Apn_Status_ImagingActive; + m_pvtImagingStatus = Apn_Status_ImagingActive; } else { if ( Flushing ) - m_pvtImagingtqStatus = Apn_Status_Flushing; + m_pvtImagingStatus = Apn_Status_Flushing; else - m_pvtImagingtqStatus = Apn_Status_Idle; + m_pvtImagingStatus = Apn_Status_Idle; } } } @@ -642,7 +642,7 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus() } /* - switch( m_pvtImagingtqStatus ) + switch( m_pvtImagingStatus ) { case Apn_Status_DataError: OutputDebugString( "ImagingStatus: Apn_Status_DataError" ); @@ -674,7 +674,7 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus() } */ - return m_pvtImagingtqStatus; + return m_pvtImagingStatus; } Apn_LedMode CApnCamera::read_LedMode() @@ -763,16 +763,16 @@ void CApnCamera::write_CoolerEnable( bool CoolerEnable ) m_pvtCoolerEnable = CoolerEnable; } -Apn_CoolertqStatus CApnCamera::read_CoolertqStatus() +Apn_CoolerStatus CApnCamera::read_CoolerStatus() { bool CoolerAtTemp; bool CoolerActive; bool CoolerTempRevised; - UpdateGeneraltqStatus(); + UpdateGeneralStatus(); - // Update CoolertqStatus + // Update CoolerStatus CoolerActive = false; CoolerAtTemp = false; CoolerTempRevised = false; @@ -789,25 +789,25 @@ Apn_CoolertqStatus CApnCamera::read_CoolertqStatus() // Now derive our cooler state if ( !CoolerActive ) { - m_pvtCoolertqStatus = Apn_CoolerStatus_Off; + m_pvtCoolerStatus = Apn_CoolerStatus_Off; } else { if ( CoolerTempRevised ) { - m_pvtCoolertqStatus = Apn_CoolerStatus_Revision; + m_pvtCoolerStatus = Apn_CoolerStatus_Revision; } else { if ( CoolerAtTemp ) - m_pvtCoolertqStatus = Apn_CoolerStatus_AtSetPoint; + m_pvtCoolerStatus = Apn_CoolerStatus_AtSetPoint; else - m_pvtCoolertqStatus = Apn_CoolerStatus_RampingToSetPoint; + m_pvtCoolerStatus = Apn_CoolerStatus_RampingToSetPoint; } } - return m_pvtCoolertqStatus; + return m_pvtCoolerStatus; } double CApnCamera::read_CoolerSetPoint() @@ -874,14 +874,14 @@ void CApnCamera::write_CoolerBackoffPoint( double BackoffPoint ) double CApnCamera::read_CoolerDrive() { - UpdateGeneraltqStatus(); + UpdateGeneralStatus(); return m_pvtCoolerDrive; } double CApnCamera::read_TempCCD() { - // UpdateGeneraltqStatus(); + // UpdateGeneralStatus(); unsigned short TempReg; unsigned short TempAvg; @@ -910,7 +910,7 @@ double CApnCamera::read_TempCCD() double CApnCamera::read_TempHeatsink() { - // UpdateGeneraltqStatus(); + // UpdateGeneralStatus(); unsigned short TempReg; unsigned short TempAvg; @@ -1782,8 +1782,8 @@ long CApnCamera::InitDefaults() Write( FPGA_REG_TEMP_RAMP_DOWN_A, m_ApnSensorInfo->m_TempRampRateOne ); Write( FPGA_REG_TEMP_RAMP_DOWN_B, m_ApnSensorInfo->m_TempRampRateTwo ); // the collor code not only determines the m_pvtCoolerEnable state, but - // also implicitly calls UpdateGeneraltqStatus() as part of read_CoolertqStatus() - if ( read_CoolertqStatus() == Apn_CoolerStatus_Off ) + // also implicitly calls UpdateGeneralStatus() as part of read_CoolerStatus() + if ( read_CoolerStatus() == Apn_CoolerStatus_Off ) m_pvtCoolerEnable = false; else m_pvtCoolerEnable = true; @@ -1827,7 +1827,7 @@ long CApnCamera::WriteTwelveBitOffset() return 0; } -void CApnCamera::UpdateGeneraltqStatus() +void CApnCamera::UpdateGeneralStatus() { unsigned short StatusReg; unsigned short HeatsinkTempReg; diff --git a/kstars/kstars/indi/apogee/ApnCamera.h b/kstars/kstars/indi/apogee/ApnCamera.h index 90f49ff2..b0e6af03 100644 --- a/kstars/kstars/indi/apogee/ApnCamera.h +++ b/kstars/kstars/indi/apogee/ApnCamera.h @@ -129,7 +129,7 @@ public: void write_DataBits( Apn_Resolution BitResolution ); - Apn_tqStatus read_ImagingtqStatus(); + Apn_Status read_ImagingStatus(); Apn_LedMode read_LedMode(); void write_LedMode( Apn_LedMode LedMode ); @@ -138,7 +138,7 @@ public: bool read_CoolerEnable(); void write_CoolerEnable( bool CoolerEnable ); - Apn_CoolertqStatus read_CoolertqStatus(); + Apn_CoolerStatus read_CoolerStatus(); double read_CoolerSetPoint(); void write_CoolerSetPoint( double SetPoint ); double read_CoolerBackoffPoint(); @@ -231,7 +231,7 @@ public: long InitTwelveBitAD(); long WriteTwelveBitOffset(); - void UpdateGeneraltqStatus(); + void UpdateGeneralStatus(); // Internal private variables bool m_ResetVerticalArrays; @@ -264,8 +264,8 @@ public: double m_pvtCoolerBackoffPoint; - Apn_CoolertqStatus m_pvtCoolertqStatus; - Apn_tqStatus m_pvtImagingtqStatus; + Apn_CoolerStatus m_pvtCoolerStatus; + Apn_Status m_pvtImagingStatus; bool m_pvtShutterState; bool m_pvtImageInProgress; bool m_pvtImageReady; diff --git a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp index 095dcf0a..cce9ba37 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_Linux.cpp @@ -16,14 +16,14 @@ bool CApnCamera::read_Present() { // OutputDebugString( "read_Present()" ); - USHORT AptqStatus; + USHORT ApStatus; USHORT DatumA; USHORT DatumB; char szMsg[80]; DatumA = 0x0; DatumB = 0x0; - AptqStatus = 0; + ApStatus = 0; Write( FPGA_REG_SCRATCH, 0x8086 ); Read( FPGA_REG_SCRATCH, DatumA ); diff --git a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp index 9113ae8f..0f739121 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_NET.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_NET.cpp @@ -92,7 +92,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer, while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingtqStatus(); + read_ImagingStatus(); } Width = m_pvtWidth; diff --git a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp index 1661d028..a6bbad42 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp +++ b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp @@ -76,7 +76,7 @@ bool CApnCamera::GetImageData( unsigned short *pImageBuffer, while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingtqStatus(); + read_ImagingStatus(); } Width = m_pvtWidth; @@ -161,7 +161,7 @@ long CApnCamera::PostStopExposure( bool DigitizeData ) while ( !ImageReady() ) { Sleep( 50 ); - read_ImagingtqStatus(); + read_ImagingStatus(); } pRequestData = new USHORT[m_pvtWidth*m_pvtHeight]; diff --git a/kstars/kstars/indi/apogee/Apogee.h b/kstars/kstars/indi/apogee/Apogee.h index 70c1c359..d97740b2 100644 --- a/kstars/kstars/indi/apogee/Apogee.h +++ b/kstars/kstars/indi/apogee/Apogee.h @@ -29,7 +29,7 @@ #define Apn_CameraMode_ExternalTrigger 3 #define Apn_CameraMode_ExternalShutter 4 -#define Apn_tqStatus int +#define Apn_Status int #define Apn_Status_DataError -2 #define Apn_Status_PatternError -1 #define Apn_Status_Idle 0 @@ -54,7 +54,7 @@ #define Apn_LedState_ExtStartReadout 6 #define Apn_LedState_AtTemp 7 -#define Apn_CoolertqStatus int +#define Apn_CoolerStatus int #define Apn_CoolerStatus_Off 0 #define Apn_CoolerStatus_RampingToSetPoint 1 #define Apn_CoolerStatus_AtSetPoint 2 @@ -67,7 +67,7 @@ #define Apn_FanMode_High 3 -#define Camera_tqStatus int +#define Camera_Status int #define Camera_Status_Idle 0 #define Camera_Status_Waiting 1 #define Camera_Status_Exposing 2 @@ -76,7 +76,7 @@ #define Camera_Status_ImageReady 5 #define Camera_Status_Flushing 6 -#define Camera_CoolertqStatus int +#define Camera_CoolerStatus int #define Camera_CoolerStatus_Off 0 #define Camera_CoolerStatus_RampingToSetPoint 1 #define Camera_CoolerStatus_Correcting 2 diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp index 0481ecfc..45c16e13 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp @@ -56,8 +56,8 @@ CCameraIO::CCameraIO() m_WaitingforLine = false; m_WaitingforTrigger = false; - m_tqStatus = Camera_Status_Idle; - m_CoolertqStatus = Camera_CoolerStatus_Off; + m_Status = Camera_Status_Idle; + m_CoolerStatus = Camera_CoolerStatus_Off; m_ExposureBinX = 0; m_ExposureBinY = 0; @@ -240,7 +240,7 @@ bool CCameraIO::FilterHome() // Check for strobe unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( val & RegBit_GotTrigger ) { // Cycle all the way around if it's on the first time @@ -268,13 +268,13 @@ bool CCameraIO::FilterHome() Sleep ( STEP_DELAY ); val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( val & RegBit_GotTrigger ) { Sleep ( 10 ); val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( val & RegBit_GotTrigger ) { // Restore normal priority @@ -502,12 +502,12 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize int i; unsigned short BIC = m_ExposureBIC + m_ExposureStartX; - // Update internal variables in case application did not poll read_tqStatus + // Update internal variables in case application did not poll read_Status m_WaitingforTrigger = false; m_WaitingforLine = false; if ( m_WaitingforImage ) - { // In case application did not poll read_tqStatus + { // In case application did not poll read_Status m_WaitingforImage = false; ///////////////////////////////////// @@ -516,7 +516,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_FrameDone ) != 0 ) break; if ( clock() > StopTime ) return false; // Timed out @@ -553,7 +553,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -679,7 +679,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) int i; if ( m_WaitingforLine ) - { // In case application did not poll read_tqStatus + { // In case application did not poll read_Status m_WaitingforLine = false; ///////////////////////////////////// @@ -688,7 +688,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break; // Line done if ( clock() > StopTime ) @@ -763,10 +763,10 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s if ( m_WaitingforTrigger ) { - Camera_tqStatus stat; + Camera_Status stat; while ( true ) { // This will wait forever if no trigger happens - stat = read_tqStatus(); + stat = read_Status(); if ( stat == Camera_Status_Exposing ) break; Sleep( 220 ); // dont bog down the CPU while polling } @@ -778,7 +778,7 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s clock_t StopTime = clock() + long( ( 1.2 * Duration + m_Timeout ) * CLOCKS_PER_SEC ); while ( true ) { - Camera_tqStatus stat = read_tqStatus(); + Camera_Status stat = read_Status(); if ( stat == Camera_Status_ImageReady ) break; if ( clock() > StopTime ) return false; // Timed out, no image available @@ -791,43 +791,43 @@ bool CCameraIO::Snap( double Duration, bool Light, unsigned short* pImageData, s //////////////////////////////////////////////////////////// // Camera Settings -Camera_tqStatus CCameraIO::read_tqStatus() +Camera_Status CCameraIO::read_Status() { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( val & RegBit_Exposing ) //11.0 { ATLTRACE( "Exposing\r\n" ); m_WaitingforTrigger = false; - m_tqStatus = Camera_Status_Exposing; + m_Status = Camera_Status_Exposing; } else if ( m_WaitingforTrigger ) - m_tqStatus = Camera_Status_Waiting; + m_Status = Camera_Status_Waiting; else if ( m_WaitingforImage && ( val & RegBit_FrameDone ) ) //11.11 { ATLTRACE( "ImageReady\r\n" ); m_WaitingforImage = false; - m_tqStatus = Camera_Status_ImageReady; + m_Status = Camera_Status_ImageReady; } else if ( m_WaitingforLine && ( val & RegBit_LineDone ) ) //11.1 { ATLTRACE( "LineReady\r\n" ); m_WaitingforLine = false; - m_tqStatus = Camera_Status_LineReady; + m_Status = Camera_Status_LineReady; } else if ( m_WaitingforImage || m_WaitingforLine ) { ATLTRACE( "Flushing\r\n" ); - m_tqStatus = Camera_Status_Flushing; + m_Status = Camera_Status_Flushing; } else - m_tqStatus = Camera_Status_Idle; + m_Status = Camera_Status_Idle; - return m_tqStatus; + return m_Status; } bool CCameraIO::read_Present() @@ -839,13 +839,13 @@ bool CCameraIO::read_Present() bool FailedLoopback = false; unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( !( val & RegBit_LoopbackTest ) ) FailedLoopback = true; m_RegShadow[ Reg_BICCounter ] &= ~RegBit_LoopbackTest; // clear bit to 0 Write( Reg_BICCounter, m_RegShadow[ Reg_BICCounter ] ); - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( val & RegBit_LoopbackTest ) FailedLoopback = true; */ @@ -884,7 +884,7 @@ bool CCameraIO::read_Present() bool CCameraIO::read_Shutter() { unsigned short regval = 0; - Read( Reg_tqStatus, regval ); + Read( Reg_Status, regval ); if ( !( regval & RegBit_Exposing ) ) { // We are not exposing, but might have finnshed an exposure // and have not called GetImage yet, so update our internal variable @@ -917,7 +917,7 @@ void CCameraIO::write_ForceShutterOpen( bool val ) m_RegShadow[ Reg_Command ] &= ~RegBit_ShutterOverride; // clear bit to 0 unsigned short regval = 0; - Read( Reg_tqStatus, regval ); + Read( Reg_Status, regval ); if ( ( regval & RegBit_Exposing ) ) { // Shutter will remain open if a Light frame is being taken @@ -1076,7 +1076,7 @@ void CCameraIO::write_CoolerSetPoint( double val ) Write( Reg_TempSetPoint, m_RegShadow[ Reg_TempSetPoint ] ); } -Camera_CoolertqStatus CCameraIO::read_CoolertqStatus() +Camera_CoolerStatus CCameraIO::read_CoolerStatus() { unsigned short val = 0; Read( Reg_CommandReadback, val ); @@ -1084,34 +1084,34 @@ Camera_CoolertqStatus CCameraIO::read_CoolertqStatus() if ( val & RegBit_CoolerEnable ) //12.15 { unsigned short val2 = 0; - Read( Reg_tqStatus, val2 ); + Read( Reg_Status, val2 ); if ( val & RegBit_CoolerShutdown ) //12.8 { if ( val2 & RegBit_ShutdownComplete ) //11.6 - m_CoolertqStatus = Camera_CoolerStatus_AtAmbient; + m_CoolerStatus = Camera_CoolerStatus_AtAmbient; else - m_CoolertqStatus = Camera_CoolerStatus_RampingToAmbient; + m_CoolerStatus = Camera_CoolerStatus_RampingToAmbient; } else { if ( val2 & RegBit_TempAtMax ) //11.5 - m_CoolertqStatus = Camera_CoolerStatus_AtMax; + m_CoolerStatus = Camera_CoolerStatus_AtMax; else if ( val2 & RegBit_TempAtMin ) //11.4 - m_CoolertqStatus = Camera_CoolerStatus_AtMin; + m_CoolerStatus = Camera_CoolerStatus_AtMin; else if ( val2 & RegBit_TempAtSetPoint ) //11.7 - m_CoolertqStatus = Camera_CoolerStatus_AtSetPoint; + m_CoolerStatus = Camera_CoolerStatus_AtSetPoint; // Check against last known cooler status - else if ( m_CoolertqStatus == Camera_CoolerStatus_AtSetPoint ) - m_CoolertqStatus = Camera_CoolerStatus_Correcting; + else if ( m_CoolerStatus == Camera_CoolerStatus_AtSetPoint ) + m_CoolerStatus = Camera_CoolerStatus_Correcting; else - m_CoolertqStatus = Camera_CoolerStatus_RampingToSetPoint; + m_CoolerStatus = Camera_CoolerStatus_RampingToSetPoint; } } else - m_CoolertqStatus = Camera_CoolerStatus_Off; + m_CoolerStatus = Camera_CoolerStatus_Off; - return m_CoolertqStatus; + return m_CoolerStatus; } Camera_CoolerMode CCameraIO::read_CoolerMode() @@ -1319,7 +1319,7 @@ void CCameraIO::Flush( short Rows ) while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_FrameDone ) != 0 ) break; if ( clock() > StopTime ) break; // Timed out diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.h b/kstars/kstars/indi/apogee/CameraIO_Linux.h index e614aee1..e61ad838 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.h +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.h @@ -104,8 +104,8 @@ const long Reg_TempData = 9; // Register 10 const unsigned short RegBitShift_TempData = 0; // Bit 0 const unsigned short RegBitMask_TempData = 0xFF; // 8 bits -const long RegISA_tqStatus = 0x006; // Register 11 in firmware -const long Reg_tqStatus = 10; // Register 11 +const long RegISA_Status = 0x006; // Register 11 in firmware +const long Reg_Status = 10; // Register 11 const unsigned short RegBit_Exposing = 0x1; // Bit 0 const unsigned short RegBit_LineDone = 0x2; // Bit 1 const unsigned short RegBit_CacheReadOK = 0x4; // Bit 2 @@ -139,7 +139,7 @@ const long RegPCI_BICCounter = 0x01C; // Register 8 in PCI fir const long RegPCI_BICCounterRead = 0x03C; const long RegPCI_ImageData = 0x000; // Register 9 in PCI firmware const long RegPCI_TempData = 0x004; // Register 10 in PCI firmware -const long RegPCI_tqStatus = 0x00C; // Register 11 in firmware +const long RegPCI_Status = 0x00C; // Register 11 in firmware const long RegPCI_CommandReadback = 0x010; // Register 12 in PCI firmware @@ -161,7 +161,7 @@ public: //////////////////////////////////////////////////////////// // Camera Settings - Camera_tqStatus read_tqStatus(); // Current camera state + Camera_Status read_Status(); // Current camera state // <0: error codes // 0: idle // 1: flushing @@ -223,7 +223,7 @@ public: double read_CoolerSetPoint(); // Returns/sets setpoint temperature in degrees void write_CoolerSetPoint( double val ); // Celcius. - Camera_CoolertqStatus read_CoolertqStatus(); // Returns current cooler status + Camera_CoolerStatus read_CoolerStatus(); // Returns current cooler status Camera_CoolerMode read_CoolerMode(); // Returns/sets current cooler operation mode. void write_CoolerMode( Camera_CoolerMode val ); @@ -300,7 +300,7 @@ public: // The Duration parameter is the exposure time in seconds. The Light parameter controls // the status of the shutter during the exposure, Light = True opens the shutter, Light - // = False closes the shutter. Returns immediately after invocation, poll the CameratqStatus + // = False closes the shutter. Returns immediately after invocation, poll the CameraStatus // property to determine the start time of a triggered exposure and the end of an exposure. bool Expose( double Duration, bool Light ); @@ -314,7 +314,7 @@ public: // Drift scan methods // Begins clocking and digitization of a single line of data begining with a vertical clock - // sequence and ending with a buffer full of line data. Poll the CameratqStatus property to + // sequence and ending with a buffer full of line data. Poll the CameraStatus property to // determine when the data is ready for download. bool DigitizeLine(); @@ -346,7 +346,7 @@ public: short m_FilterStepPos; // Current filter position in our internal array bool m_Shutter; // Last known shutter state - Camera_tqStatus m_tqStatus; // Last known camera status + Camera_Status m_Status; // Last known camera status Camera_Interface m_Interface; // String acronyms may be used in INI file. // 0 or ISA: Industry Standard Architecture bus @@ -356,7 +356,7 @@ public: Camera_SensorType m_SensorType; // 0 or CCD: Charge Coupled Device // 1 or CMOS: Complementary Metal-Oxide-Silicon - Camera_CoolertqStatus m_CoolertqStatus; // Last known cooler status. + Camera_CoolerStatus m_CoolerStatus; // Last known cooler status. unsigned int m_IRTQMask; // Set of IRQs masked on user request // 0: Off // 1: Ramping to set point // 2: Correcting diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp index bbff2080..16a6bb72 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp @@ -145,8 +145,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: realreg = RegISA_TempData; break; - case Reg_tqStatus: - realreg = RegISA_tqStatus; + case Reg_Status: + realreg = RegISA_Status; break; case Reg_CommandReadback: realreg = RegISA_CommandReadback; @@ -212,7 +212,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -301,7 +301,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp index 15c139dd..a83a594e 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp @@ -199,8 +199,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: RegNumber = RegPCI_TempData; break; - case Reg_tqStatus: - RegNumber = RegPCI_tqStatus; + case Reg_Status: + RegNumber = RegPCI_Status; break; case Reg_CommandReadback: RegNumber = RegPCI_CommandReadback; @@ -266,7 +266,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -355,7 +355,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp index bb143e55..7025d9ce 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp @@ -147,8 +147,8 @@ long CCameraIO::Read( unsigned short reg, unsigned short& val ) case Reg_TempData: realreg = RegISA_TempData; break; - case Reg_tqStatus: - realreg = RegISA_tqStatus; + case Reg_Status: + realreg = RegISA_Status; break; case Reg_CommandReadback: realreg = RegISA_CommandReadback; @@ -216,7 +216,7 @@ long CCameraIO::ReadLine( long SkipPixels, long Pixels,unsigned short* pLineBuff while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out @@ -307,7 +307,7 @@ long CCameraIO::InternalReadLine( bool KeepData, long SkipC, long XEnd, unsigned while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done clock_t CurrentTime = clock(); diff --git a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp index ba9ce96d..3e6cc43e 100644 --- a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp @@ -65,8 +65,8 @@ long CCameraIO_PCI::Read(unsigned short reg, unsigned short& val) case Reg_TempData: RegNumber = RegPCI_TempData; break; - case Reg_tqStatus: - RegNumber = RegPCI_tqStatus; + case Reg_Status: + RegNumber = RegPCI_Status; break; case Reg_CommandReadback: RegNumber = RegPCI_CommandReadback; @@ -268,7 +268,7 @@ long CCameraIO_PCI::ReadLine( long SkipPixels, long Pixels, unsigned short* pLin while ( true ) { unsigned short val = 0; - Read( Reg_tqStatus, val ); + Read( Reg_Status, val ); if ( ( val & RegBit_LineDone ) != 0 ) break;// Line done if ( clock() > StopTime ) return 1; // Timed out diff --git a/kstars/kstars/indi/apogee/Camera_Example.cpp b/kstars/kstars/indi/apogee/Camera_Example.cpp index 51831ecc..f1f64121 100644 --- a/kstars/kstars/indi/apogee/Camera_Example.cpp +++ b/kstars/kstars/indi/apogee/Camera_Example.cpp @@ -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)) { diff --git a/kstars/kstars/indi/apogee_ppi.cpp b/kstars/kstars/indi/apogee_ppi.cpp index e6edfbbb..adcc34c9 100644 --- a/kstars/kstars/indi/apogee_ppi.cpp +++ b/kstars/kstars/indi/apogee_ppi.cpp @@ -393,7 +393,7 @@ void ApogeeCam::ISNewNumber (const char */*dev*/, const char *name, double value void ApogeeCam::ISPoll() { static int mtc=5; - int readtqStatus=0; + int readStatus=0; double ccdTemp; if (!isCCDConnected()) @@ -407,16 +407,16 @@ void ApogeeCam::ISPoll() case IPS_BUSY: - readtqStatus = cam->read_tqStatus(); - if (readtqStatus < 0) + readStatus = cam->read_Status(); + if (readStatus < 0) { - IDLog("Error in exposure! Read status: %d\n", readtqStatus); + IDLog("Error in exposure! Read status: %d\n", readStatus); ExposeTimeNP.s = IPS_ALERT; ExposeTimeN[0].value = 0; - IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readtqStatus); + IDSetNumber(&ExposeTimeNP, "Error in exposure procedure. Read states: %d", readStatus); return; } - else if (readtqStatus == Camera_Status_ImageReady) + else if (readStatus == Camera_Status_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; @@ -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)); diff --git a/kstars/kstars/indi/fli/libfli.c b/kstars/kstars/indi/fli/libfli.c index f089403c..701115b2 100644 --- a/kstars/kstars/indi/fli/libfli.c +++ b/kstars/kstars/indi/fli/libfli.c @@ -489,7 +489,7 @@ LIBFLIAPI FLIGetVisibleArea(flidev_t dev, long* ul_x, long* ul_y, @see FLIExposeFrame @see FLICancelExposure - @see FLIGetExposuretqStatus + @see FLIGetExposureStatus */ LIBFLIAPI FLISetExposureTime(flidev_t dev, long exptime) { @@ -626,7 +626,7 @@ LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype) @return Non-zero on failure. @see FLIExposeFrame - @see FLIGetExposuretqStatus + @see FLIGetExposureStatus @see FLISetExposureTime */ LIBFLIAPI FLICancelExposure(flidev_t dev) @@ -652,7 +652,7 @@ LIBFLIAPI FLICancelExposure(flidev_t dev) @see FLICancelExposure @see FLISetExposureTime */ -LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft) +LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft) { CHKDEVICE(dev); @@ -752,7 +752,7 @@ LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width) @see FLISetBitDepth @see FLIGrabFrame @see FLICancelExposure - @see FLIGetExposuretqStatus + @see FLIGetExposureStatus */ LIBFLIAPI FLIExposeFrame(flidev_t dev) { diff --git a/kstars/kstars/indi/fli/libfli.h b/kstars/kstars/indi/fli/libfli.h index ca6a7200..351a9e8e 100644 --- a/kstars/kstars/indi/fli/libfli.h +++ b/kstars/kstars/indi/fli/libfli.h @@ -176,7 +176,7 @@ LIBFLIAPI FLISetHBin(flidev_t dev, long hbin); LIBFLIAPI FLISetVBin(flidev_t dev, long vbin); LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype); LIBFLIAPI FLICancelExposure(flidev_t dev); -LIBFLIAPI FLIGetExposuretqStatus(flidev_t dev, long *timeleft); +LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long *timeleft); LIBFLIAPI FLISetTemperature(flidev_t dev, double temperature); LIBFLIAPI FLIGetTemperature(flidev_t dev, double *temperature); LIBFLIAPI FLIGrabRow(flidev_t dev, void *buff, size_t width); diff --git a/kstars/kstars/indi/fli_ccd.c b/kstars/kstars/indi/fli_ccd.c index eaa356a1..70a1aceb 100644 --- a/kstars/kstars/indi/fli_ccd.c +++ b/kstars/kstars/indi/fli_ccd.c @@ -610,7 +610,7 @@ void ISPoll(void *p) break; case IPS_BUSY: - if ( (err = FLIGetExposuretqStatus(fli_dev, &timeleft))) + if ( (err = FLIGetExposureStatus(fli_dev, &timeleft))) { ExposeTimeNP.s = IPS_IDLE; ExposeTimeN[0].value = 0; diff --git a/kstars/kstars/indi/lilxml.c b/kstars/kstars/indi/lilxml.c index 2a687bd4..c8344b5e 100644 --- a/kstars/kstars/indi/lilxml.c +++ b/kstars/kstars/indi/lilxml.c @@ -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) { diff --git a/kstars/kstars/indi/lx200_16.cpp b/kstars/kstars/indi/lx200_16.cpp index a376b0d9..fe37df18 100644 --- a/kstars/kstars/indi/lx200_16.cpp +++ b/kstars/kstars/indi/lx200_16.cpp @@ -304,7 +304,7 @@ void LX200_16::handleAltAzSlew() case IPS_BUSY: - if ( (err = getHomeSearchtqStatus(&searchResult)) < 0) + if ( (err = getHomeSearchStatus(&searchResult)) < 0) { handleError(&HomeSearchSw, err, "Home search"); return; diff --git a/kstars/kstars/indi/lx200driver.c b/kstars/kstars/indi/lx200driver.c index bd85ba88..9c521cfe 100644 --- a/kstars/kstars/indi/lx200driver.c +++ b/kstars/kstars/indi/lx200driver.c @@ -78,8 +78,8 @@ int getCalenderDate(char *date); int getSiteName(char *siteName, int siteNum); /* Get Number of Bars */ int getNumberOfBars(int *value); -/* Get Home Search tqStatus */ -int getHomeSearchtqStatus(int *status); +/* Get Home Search Status */ +int getHomeSearchStatus(int *status); /* Get OTA Temperature */ int getOTATemp(double * value); /* Get time format: 12 or 24 */ @@ -99,7 +99,7 @@ int setStandardProcedure(char * writeData); /* Set Slew Mode */ int setSlewMode(int slewMode); /* Set Alignment mode */ -int tqsetAlignmentMode(unsigned int alignMode); +int setAlignmentMode(unsigned int alignMode); /* Set Object RA */ int setObjectRA(double ra); /* set Object DEC */ @@ -203,7 +203,7 @@ int testTelescope() int testAP() { int i=0; - char tqcurrentDate[64]; + char currentDate[64]; fprintf(stderr, "Testing telescope's connection...\n"); @@ -211,7 +211,7 @@ int testAP() / We're going to request the calander date */ for (i=0; i < 2; i++) { - if (!getCalenderDate(tqcurrentDate)) + if (!getCalenderDate(currentDate)) return 0; usleep(50000); @@ -534,7 +534,7 @@ int getNumberOfBars(int *value) return 0; } -int getHomeSearchtqStatus(int *status) +int getHomeSearchStatus(int *status) { char tempString[16]; @@ -726,9 +726,9 @@ int setCommandXYZ(int x, int y, int z, const char *cmd) return (setStandardProcedure(tempString)); } -int tqsetAlignmentMode(unsigned int alignMode) +int setAlignmentMode(unsigned int alignMode) { - fprintf(stderr , "Set tqalignment mode %d\n", alignMode); + fprintf(stderr , "Set alignment mode %d\n", alignMode); switch (alignMode) { diff --git a/kstars/kstars/indi/lx200driver.h b/kstars/kstars/indi/lx200driver.h index 529dfa02..06b8017f 100644 --- a/kstars/kstars/indi/lx200driver.h +++ b/kstars/kstars/indi/lx200driver.h @@ -157,8 +157,8 @@ int getCalenderDate(char *date); int getSiteName(char *siteName, int siteNum); /* Get Number of Bars */ int getNumberOfBars(int *value); -/* Get Home Search tqStatus */ -int getHomeSearchtqStatus(int *status); +/* Get Home Search Status */ +int getHomeSearchStatus(int *status); /* Get OTA Temperature */ int getOTATemp(double * value); /* Get time format: 12 or 24 */ @@ -178,7 +178,7 @@ int setStandardProcedure(char * writeData); /* Set Slew Mode */ int setSlewMode(int slewMode); /* Set Alignment mode */ -int tqsetAlignmentMode(unsigned int alignMode); +int setAlignmentMode(unsigned int alignMode); /* Set Object RA */ int setObjectRA(double ra); /* set Object DEC */ diff --git a/kstars/kstars/indi/lx200generic.cpp b/kstars/kstars/indi/lx200generic.cpp index 3e6e398a..8915b612 100644 --- a/kstars/kstars/indi/lx200generic.cpp +++ b/kstars/kstars/indi/lx200generic.cpp @@ -907,9 +907,9 @@ void LX200Generic::ISNewSwitch (const char *dev, const char *name, ISState *stat IUUpdateSwitches(&AlignmentSw, states, names, n); index = getOnSwitch(&AlignmentSw); - if ( ( err = tqsetAlignmentMode(index) < 0) ) + 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; } diff --git a/kstars/kstars/indi/lx200gps.cpp b/kstars/kstars/indi/lx200gps.cpp index 0bdb2efc..451a7269 100644 --- a/kstars/kstars/indi/lx200gps.cpp +++ b/kstars/kstars/indi/lx200gps.cpp @@ -139,7 +139,7 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], return; } - /* GPS tqStatus Update */ + /* GPS Status Update */ if (!strcmp(name,GPSStatusSw.name)) { if (checkPower(&GPSStatusSw)) diff --git a/kstars/kstars/indi/sbigccd.cpp b/kstars/kstars/indi/sbigccd.cpp index 9eef1a42..fb35cf59 100644 --- a/kstars/kstars/indi/sbigccd.cpp +++ b/kstars/kstars/indi/sbigccd.cpp @@ -326,7 +326,7 @@ void SBIGCam::ISStaticPoll(void *p) void SBIGCam::ISPoll() { static int mtc=5; - int readtqStatus=0; + int readStatus=0; double ccdTemp (0); switch (ExposeTimeNP.s) @@ -340,8 +340,8 @@ void SBIGCam::ISPoll() // JM: Here we check the status of the camera (whether it's still capturing an image or has finished that) // ISPoll is called once per second. e.g. below for how we do this for Apogee Cameras /* - readtqStatus = cam->read_tqStatus(); - if (readtqStatus < 0) + readStatus = cam->read_Status(); + if (readStatus < 0) { IDLog("Error in exposure!\n"); ExposeTimeNP.s = IPS_IDLE; @@ -349,7 +349,7 @@ void SBIGCam::ISPoll() IDSetNumber(&ExposeTimeNP, "Error in exposure procedure."); return; } - else if (readtqStatus == Camera_Status_ImageReady) + else if (readStatus == Camera_Status_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; diff --git a/kstars/kstars/indi/webcam/ccvt_c2.c b/kstars/kstars/indi/webcam/ccvt_c2.c index 1fb7bcbf..52ed276d 100644 --- a/kstars/kstars/indi/webcam/ccvt_c2.c +++ b/kstars/kstars/indi/webcam/ccvt_c2.c @@ -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. */ diff --git a/kstars/kstars/indiconf.ui b/kstars/kstars/indiconf.ui index cd8917e4..cf4c297e 100644 --- a/kstars/kstars/indiconf.ui +++ b/kstars/kstars/indiconf.ui @@ -43,7 +43,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -66,13 +66,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>28</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>28</width> <height>28</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>21</height> @@ -302,7 +302,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -328,7 +328,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -372,7 +372,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp index a276eff4..64070018 100644 --- a/kstars/kstars/indidevice.cpp +++ b/kstars/kstars/indidevice.cpp @@ -45,13 +45,13 @@ #include <zlib.h> #include <tqlineedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqframe.h> #include <tqtabwidget.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqbuttongroup.h> @@ -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[]) @@ -605,7 +605,7 @@ INDI_P * INDI_D::addProperty (XMLEle *root, char errmsg[]) return NULL; } - /* RemoveQt::Vertical spacer from group tqlayout, this is done everytime + /* RemoveQt::Vertical spacer from group layout, this is done everytime * a new property arrives. The spacer is then appended to the end of the * properties */ pg->propertyLayout->removeItem(pg->VerticalSpacer); @@ -775,7 +775,7 @@ int INDI_D::buildTextGUI(XMLEle *root, char errmsg[]) if (pp == NULL) return (-1); - /* get the permission, it will determine tqlayout issues */ + /* get the permission, it will determine layout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); @@ -811,7 +811,7 @@ int INDI_D::buildNumberGUI (XMLEle *root, char *errmsg) if (pp == NULL) return (-1); - /* get the permission, it will determine tqlayout issues */ + /* get the permission, it will determine layout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); @@ -879,7 +879,7 @@ int INDI_D::buildSwitchesGUI (XMLEle *root, char errmsg[]) return (err); } - /* otherwise, build 1-4 button tqlayout */ + /* otherwise, build 1-4 button layout */ pp->guitype = PG_BUTTONS; err = pp->buildSwitchesGUI(root, errmsg); @@ -896,7 +896,7 @@ int INDI_D::buildSwitchesGUI (XMLEle *root, char errmsg[]) } else if (!strcmp (valuXMLAtt(ap), "AnyOfMany")) { - /* 1-4 checkboxes tqlayout */ + /* 1-4 checkboxes layout */ pp->guitype = PG_RADIO; err = pp->buildSwitchesGUI(root, errmsg); @@ -955,7 +955,7 @@ int INDI_D::buildBLOBGUI (XMLEle *root, char errmsg[]) if (!pp) return (-1); - /* get the permission, it will determine tqlayout issues */ + /* get the permission, it will determine layout issues */ if (findPerm (pp, root, &p, errmsg)) { delete(pp); diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index 5814989b..ed46f81c 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -29,7 +29,7 @@ #include <tqvaluelist.h> #include <tqcstring.h> #include <tqradiobutton.h> -#include <tqtextedit.h> +#include <textedit.h> #include <kiconloader.h> #include <klistview.h> @@ -102,11 +102,11 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) TQObject::connect(clientListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHosttqStatus(int))); +TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHostStatus(int))); TQObject::connect(localListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDevicetqStatus(int))); +TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDeviceStatus(int))); TQObject::connect(ksw->getINDIMenu(), TQT_SIGNAL(driverDisconnected(int)), this, TQT_SLOT(shutdownHost(int))); @@ -183,22 +183,22 @@ void INDIDriver::LocalprocessRightButton( TQListViewItem *item, const TQPoint &p void INDIDriver::activateRunService() { - processDevicetqStatus(0); + processDeviceStatus(0); } void INDIDriver::activateStopService() { - processDevicetqStatus(1); + processDeviceStatus(1); } void INDIDriver::activateHostConnection() { - processHosttqStatus(0); + processHostStatus(0); } void INDIDriver::activateHostDisconnection() { - processHosttqStatus(1); + processHostStatus(1); } void INDIDriver::updateLocalButtons() @@ -244,7 +244,7 @@ for (uint i=0; i < ksw->data()->INDIHostsList.count(); i++) } -void INDIDriver::processDevicetqStatus(int id) +void INDIDriver::processDeviceStatus(int id) { if (localListView->selectedItem() == NULL) return; @@ -280,7 +280,7 @@ void INDIDriver::processDevicetqStatus(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); @@ -301,7 +301,7 @@ void INDIDriver::processDevicetqStatus(int id) } } -void INDIDriver::processHosttqStatus(int id) +void INDIDriver::processHostStatus(int id) { int mgrID; bool toConnect = (id == 0); @@ -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); diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h index 9cddeb99..6994b775 100644 --- a/kstars/kstars/indidriver.h +++ b/kstars/kstars/indidriver.h @@ -132,8 +132,8 @@ public slots: void updateMenuActions(); void ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ); void LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ); - void processDevicetqStatus(int); - void processHosttqStatus(int); + void processDeviceStatus(int); + void processHostStatus(int); void addINDIHost(); void modifyINDIHost(); void removeINDIHost(); diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp index ed1834c0..3e06de78 100644 --- a/kstars/kstars/indielement.cpp +++ b/kstars/kstars/indielement.cpp @@ -18,7 +18,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <tqptrlist.h> #include <tqslider.h> @@ -110,7 +110,7 @@ label_w->setMaximumWidth(ELEMENT_LABEL_WIDTH); label_w->setFrameShape( KSqueezedTextLabel::Box ); label_w->setPaletteBackgroundColor( TQColor( 224, 232, 238 ) ); label_w->setTextFormat( TQLabel::RichText ); -label_w->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); +label_w->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignCenter ) ); if (label.length() > MAX_LABEL_LENGTH) { @@ -295,9 +295,9 @@ connect(slider_w, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderChanged(int //kdDebug() << "For element " << label << " we have step of " << step << endl; if (length == ELEMENT_FULL_WIDTH) - spin_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); + spin_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); else - spin_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); + spin_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, spin_w->sizePolicy().hasHeightForWidth() ) ); spin_w->setMinimumWidth( (int) (length * 0.45) ); slider_w->setMinimumWidth( (int) (length * 0.55) ); @@ -359,7 +359,7 @@ void INDI_E::setMax (double inMax) void INDI_E::setupElementWrite(int length) { write_w = new KLineEdit( pp->pg->propertyContainer); - write_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, write_w->sizePolicy().hasHeightForWidth() )); + write_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, write_w->sizePolicy().hasHeightForWidth() )); write_w->setMinimumWidth( length ); write_w->setMaximumWidth( length); @@ -377,7 +377,7 @@ void INDI_E::setupElementRead(int length) read_w->setFrameShape( KLineEdit::GroupBoxPanel ); read_w->setFrameShadow( KLineEdit::Plain ); read_w->setCursorPosition( 0 ); - read_w->tqsetAlignment( int( KLineEdit::AlignHCenter ) ); + read_w->setAlignment( int( KLineEdit::AlignHCenter ) ); read_w->setReadOnly( TRUE ); read_w->setText(text); @@ -388,7 +388,7 @@ void INDI_E::setupElementRead(int length) void INDI_E::setupBrowseButton() { browse_w = new KPushButton("...", pp->pg->propertyContainer); - browse_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, browse_w->sizePolicy().hasHeightForWidth() ) ); + browse_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, browse_w->sizePolicy().hasHeightForWidth() ) ); browse_w->setMinimumWidth( MIN_SET_WIDTH ); browse_w->setMaximumWidth( MAX_SET_WIDTH ); diff --git a/kstars/kstars/indielement.h b/kstars/kstars/indielement.h index 8ef4d542..2e84d326 100644 --- a/kstars/kstars/indielement.h +++ b/kstars/kstars/indielement.h @@ -21,7 +21,7 @@ #define INDIVERSION 1.5 /* we support this or less */ -/* GUI tqlayout */ +/* GUI layout */ #define PROPERTY_LABEL_WIDTH 80 #define ELEMENT_LABEL_WIDTH 175 #define ELEMENT_READ_WIDTH 175 @@ -98,7 +98,7 @@ class INDI_E : public TQObject PState state; /* control on/off t/f etc */ INDI_P *pp; /* parent property */ - TQHBoxLayout *EHBox; /*Qt::Horizontal tqlayout */ + TQHBoxLayout *EHBox; /*Qt::Horizontal layout */ /* GUI widgets, only malloced when needed */ KSqueezedTextLabel *label_w; // label diff --git a/kstars/kstars/indigroup.cpp b/kstars/kstars/indigroup.cpp index a4a0d47e..4439da7c 100644 --- a/kstars/kstars/indigroup.cpp +++ b/kstars/kstars/indigroup.cpp @@ -18,7 +18,7 @@ #include <klocale.h> - #include <tqlayout.h> + #include <layout.h> #include <tqframe.h> #include <tqtimer.h> #include <tqtabwidget.h> @@ -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() ); diff --git a/kstars/kstars/indigroup.h b/kstars/kstars/indigroup.h index 0b7651d5..b68a976d 100644 --- a/kstars/kstars/indigroup.h +++ b/kstars/kstars/indigroup.h @@ -34,7 +34,7 @@ class INDI_G TQString name; /* Group name */ INDI_D *dp; /* Parent device */ TQFrame *propertyContainer; /* Properties container */ - TQVBoxLayout *propertyLayout; /* Properties tqlayout */ + TQVBoxLayout *propertyLayout; /* Properties layout */ TQSpacerItem *VerticalSpacer; /*Qt::Vertical spacer */ TQPtrList<INDI_P> pl; /* malloced list of pointers to properties */ diff --git a/kstars/kstars/indihostconf.ui b/kstars/kstars/indihostconf.ui index e91f64bf..2e332481 100644 --- a/kstars/kstars/indihostconf.ui +++ b/kstars/kstars/indihostconf.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -63,7 +63,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>35</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp index fb5b4c73..fa96accb 100644 --- a/kstars/kstars/indimenu.cpp +++ b/kstars/kstars/indimenu.cpp @@ -27,13 +27,13 @@ #include <stdlib.h> #include <tqlineedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqframe.h> #include <tqtabwidget.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsocketnotifier.h> #include <tqdatetime.h> #include <tqvbox.h> @@ -82,7 +82,7 @@ INDIMenu::~INDIMenu() ** Traverse the drivers list, check for updated drivers and take ** appropriate action *********************************************************************/ -void INDIMenu::updatetqStatus() +void INDIMenu::updateStatus() { INDIDriver *drivers = ksw->getINDIDriver(); @@ -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; diff --git a/kstars/kstars/indimenu.h b/kstars/kstars/indimenu.h index 7ed8986d..abb2cfe9 100644 --- a/kstars/kstars/indimenu.h +++ b/kstars/kstars/indimenu.h @@ -67,7 +67,7 @@ class INDIMenu : public KDialogBase TQPtrList<DeviceManager> mgr; - void updatetqStatus(); + void updateStatus(); //bool removeDevice(TQString devName); void removeDeviceMgr(int mgrID); void setCustomLabel(TQString deviceName); diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp index 9c2fd658..23138ebd 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -37,7 +37,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqlabel.h> - #include <tqlayout.h> + #include <layout.h> #include <tqtimer.h> #include <tqfile.h> #include <tqdatastream.h> @@ -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; @@ -438,19 +438,19 @@ void INDI_P::addGUI (XMLEle *root) else label_w = new TQLabel(label, pg->propertyContainer); - label_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, label_w->sizePolicy().hasHeightForWidth() ) ); + label_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, label_w->sizePolicy().hasHeightForWidth() ) ); label_w->setFrameShape( TQLabel::GroupBoxPanel ); label_w->setMinimumWidth(PROPERTY_LABEL_WIDTH); label_w->setMaximumWidth(PROPERTY_LABEL_WIDTH); label_w->setTextFormat( TQLabel::RichText ); - label_w->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) ); + label_w->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignHCenter) ); PHBox->addWidget(label_w); light->show(); label_w->show(); - /* #3 Add theQt::Vertical tqlayout thay may contain several elements */ + /* #3 Add theQt::Vertical layout thay may contain several elements */ PHBox->addLayout(PVBox); } @@ -600,7 +600,7 @@ int INDI_P::buildNumberGUI (XMLEle *root, char errmsg[]) void INDI_P::setupSetButton(TQString caption) { set_w = new TQPushButton(caption, pg->propertyContainer); - set_w->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, set_w->sizePolicy().hasHeightForWidth() ) ); + set_w->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, set_w->sizePolicy().hasHeightForWidth() ) ); set_w->setMinimumWidth( MIN_SET_WIDTH ); set_w->setMaximumWidth( MAX_SET_WIDTH ); diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp index 93610907..c79b90eb 100644 --- a/kstars/kstars/indistd.cpp +++ b/kstars/kstars/indistd.cpp @@ -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; diff --git a/kstars/kstars/infobox.h b/kstars/kstars/infobox.h index c6c0e895..6ce33dfa 100644 --- a/kstars/kstars/infobox.h +++ b/kstars/kstars/infobox.h @@ -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*/ diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index 7539ddc4..3c14c73f 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -62,7 +62,7 @@ bool KSNewStuff::install( const TQString &fileName ) archiveDir->copyTo(destDir); archive.close(); - kapp->tqprocessEvents(10000); + kapp->processEvents(10000); //read the new data into the program //this return might be the result of checking if everything is installed ok @@ -87,7 +87,7 @@ void KSNewStuff::updateData( const TQString &path ) { prog.setMinimumDuration( 0 /*millisec*/ ); prog.progressBar()->setTotalSteps( 0 ); //show generic progress activity prog.show(); - kapp->tqprocessEvents(1000); + kapp->processEvents(1000); //First, remove the existing NGC/IC objects from the ObjectNameList. for ( DeepSkyObject *o = ks->data()->deepSkyList.first(); o; o = ks->data()->deepSkyList.next() ) { @@ -166,7 +166,7 @@ void KSNewStuff::updateData( const TQString &path ) { ks->setCursor(TQCursor(TQt::ArrowCursor)); } -void KSNewStuff::slotProcessEvents() { kapp->tqprocessEvents( 500 ); } +void KSNewStuff::slotProcessEvents() { kapp->processEvents( 500 ); } #include "ksnewstuff.moc" diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp index 33282ab0..b8049e00 100644 --- a/kstars/kstars/kspopupmenu.cpp +++ b/kstars/kstars/kspopupmenu.cpp @@ -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 @@ -237,7 +237,7 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr if ( s1 == i18n( "star" ) || s1 == i18n( "Empty sky" ) ) showLabel = false; pmTitle = new TQLabel( s1, this ); - pmTitle->tqsetAlignment( AlignCenter ); + pmTitle->setAlignment( AlignCenter ); TQPalette pal( pmTitle->palette() ); pal.setColor( TQPalette::Normal, TQColorGroup::Background, pal.color( TQPalette::Normal, TQColorGroup::Base ) ); pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, pal.color( TQPalette::Normal, TQColorGroup::Text ) ); @@ -246,38 +246,38 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr if ( ! s2.isEmpty() ) { pmTitle2 = new TQLabel( s2, this ); - pmTitle2->tqsetAlignment( AlignCenter ); + pmTitle2->setAlignment( AlignCenter ); pmTitle2->setPalette( pal ); insertItem( pmTitle2 ); } if ( ! s3.isEmpty() ) { pmType = new TQLabel( s3, this ); - pmType->tqsetAlignment( AlignCenter ); + pmType->setAlignment( AlignCenter ); pmType->setPalette( pal ); insertItem( pmType ); } TQString c = obj->constellation( ksw->data()->csegmentList, ksw->data()->cnameList ); pmConstellation = new TQLabel( c, this ); - pmConstellation->tqsetAlignment( AlignCenter ); + pmConstellation->setAlignment( AlignCenter ); pmConstellation->setPalette( pal ); insertItem( pmConstellation ); //Insert Rise/Set/Transit labels if ( showRiseSet && obj ) { pmRiseTime = new TQLabel( i18n( "Rise time: 00:00" ), this ); - pmRiseTime->tqsetAlignment( AlignCenter ); + pmRiseTime->setAlignment( AlignCenter ); pmRiseTime->setPalette( pal ); TQFont rsFont = pmRiseTime->font(); rsFont.setPointSize( rsFont.pointSize() - 2 ); pmRiseTime->setFont( rsFont ); pmSetTime = new TQLabel( i18n( "the time at which an object falls below the horizon", "Set time:" ) + " 00:00", this ); - pmSetTime->tqsetAlignment( AlignCenter ); + pmSetTime->setAlignment( AlignCenter ); pmSetTime->setPalette( pal ); pmSetTime->setFont( rsFont ); pmTransitTime = new TQLabel( i18n( "Transit time: 00:00" ), this ); - pmTransitTime->tqsetAlignment( AlignCenter ); + pmTransitTime->setAlignment( AlignCenter ); pmTransitTime->setPalette( pal ); pmTransitTime->setFont( rsFont ); insertSeparator(); @@ -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 = "--:--"; } diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp index 6cde713d..92018a81 100644 --- a/kstars/kstars/kstars.cpp +++ b/kstars/kstars/kstars.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kactioncollection.h> #include <kiconloader.h> -#include <tqpalette.h> +#include <palette.h> #include <kstatusbar.h> #include "Options.h" @@ -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() ); @@ -184,9 +184,9 @@ void KStars::applyConfig() { //color scheme pd->kstarsData->colorScheme()->loadFromConfig( kapp->config() ); if ( Options::darkAppColors() ) { - TQApplication::tqsetPalette( DarkPalette, true ); + TQApplication::setPalette( DarkPalette, true ); } else { - TQApplication::tqsetPalette( OriginalPalette, true ); + TQApplication::setPalette( OriginalPalette, true ); } //Infoboxes, toolbars, statusbars diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h index 569c70f7..bea6af9f 100644 --- a/kstars/kstars/kstars.h +++ b/kstars/kstars/kstars.h @@ -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 ); @@ -625,7 +625,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface void initFOV(); /** - *Initialize tqStatus bar. + *Initialize Status bar. */ void initStatusBar(); diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index 4768f703..ccee1904 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -227,7 +227,7 @@ void KStars::slotImageSequence() if (indiseq == NULL) indiseq = new imagesequence(this); - if (indiseq->updatetqStatus()) + if (indiseq->updateStatus()) indiseq->show(); } @@ -248,7 +248,7 @@ void KStars::slotINDIPanel() { if (indimenu == NULL) indimenu = new INDIMenu(this); - indimenu->updatetqStatus(); + indimenu->updateStatus(); } void KStars::slotINDIDriver() { @@ -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,13 +563,13 @@ 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(); p.start( KProcess::DontCare ); - while ( p.isRunning() ) kapp->tqprocessEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. } } @@ -595,7 +595,7 @@ void KStars::slotPrint() { //Set Time to CPU clock void KStars::slotSetTimeToNow() { - data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ) ); + data()->changeDateTime( geo()->LTtoUT( KStarsDateTime::currentDateTime() ) ); if ( Options::useAltAz() ) { map()->focus()->HorizontalToEquatorial( LST(), geo()->lat() ); @@ -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(); @@ -914,11 +914,11 @@ void KStars::slotTipOfDay() { // Toggle to and from full screen mode void KStars::slotFullScreen() { - if ( tqtopLevelWidget()->isFullScreen() ) { - tqtopLevelWidget()->showNormal(); + if ( topLevelWidget()->isFullScreen() ) { + topLevelWidget()->showNormal(); } else { - tqtopLevelWidget()->showFullScreen(); + topLevelWidget()->showFullScreen(); } } diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index 15f5178c..f5d847db 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -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 diff --git a/kstars/kstars/kstarsdatetime.cpp b/kstars/kstars/kstarsdatetime.cpp index 25c3be0b..6b406f44 100644 --- a/kstars/kstars/kstarsdatetime.cpp +++ b/kstars/kstars/kstarsdatetime.cpp @@ -55,10 +55,10 @@ KStarsDateTime::KStarsDateTime( long double _jd ) : ExtDateTime() { setDJD( _jd ); } -KStarsDateTime KStarsDateTime::tqcurrentDateTime() { - KStarsDateTime dt( ExtDate::tqcurrentDate(), TQTime::currentTime() ); +KStarsDateTime KStarsDateTime::currentDateTime() { + KStarsDateTime dt( ExtDate::currentDate(), TQTime::currentTime() ); if ( dt.time().hour()==0 && dt.time().minute()==0 ) // midnight or right after? - dt.setDate( ExtDate::tqcurrentDate() ); // fetch date again + dt.setDate( ExtDate::currentDate() ); // fetch date again return dt; } diff --git a/kstars/kstars/kstarsdatetime.h b/kstars/kstars/kstarsdatetime.h index dec5daa0..c7ada867 100644 --- a/kstars/kstars/kstarsdatetime.h +++ b/kstars/kstars/kstarsdatetime.h @@ -134,7 +134,7 @@ public: *@return the date and time according to the CPU clock (note that this is not *necessarily UT) */ - static KStarsDateTime tqcurrentDateTime(); + static KStarsDateTime currentDateTime(); /** *@return the julian day as a long double, including the time as the fractional portion. diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp index 8649ccba..11f71f17 100644 --- a/kstars/kstars/kstarsdcop.cpp +++ b/kstars/kstars/kstarsdcop.cpp @@ -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 ) { @@ -376,12 +376,12 @@ void KStars::loadColorScheme( const TQString _name ) { if ( Options::darkAppColors() == false && filename == "night.colors" ) { Options::setDarkAppColors( true ); OriginalPalette = TQApplication::palette(); - TQApplication::tqsetPalette( DarkPalette, true ); + TQApplication::setPalette( DarkPalette, true ); } if ( Options::darkAppColors() && filename != "night.colors" ) { Options::setDarkAppColors( false ); - TQApplication::tqsetPalette( OriginalPalette, true ); + TQApplication::setPalette( OriginalPalette, true ); } map()->forceUpdate(); @@ -418,10 +418,10 @@ 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->tqprocessEvents(10000); + kapp->processEvents(10000); //skyImage is the size of the sky map. The requested image size is w x h. //If w x h is smaller than the skymap, then we simply crop the image. @@ -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" ) ); } } @@ -523,7 +523,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) if (indidriver->isDeviceRunning(deviceName)) { indidriver->localListView->setSelected(driverItem, true); - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); } // Set custome label for device @@ -538,7 +538,7 @@ void KStars::startINDI (TQString deviceName, bool useLocal) indidriver->serverR->setChecked(true); // Run it - indidriver->processDevicetqStatus(0); + indidriver->processDeviceStatus(0); } @@ -558,7 +558,7 @@ void KStars::shutdownINDI (TQString deviceName) return; } - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); } @@ -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); diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp index d780eb24..0a99f423 100644 --- a/kstars/kstars/kstarsinit.cpp +++ b/kstars/kstars/kstarsinit.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqfile.h> #include <tqdir.h> #include <dcopclient.h> @@ -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(); @@ -467,7 +467,7 @@ void KStars::privatedata::buildGUI() { ks->initStatusBar(); ks->initActions(); - // create the tqlayout of the central widget + // create the layout of the central widget ks->topLayout = new TQVBoxLayout( ks->centralWidget ); ks->topLayout->addWidget( ks->skymap ); diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp index 29198caa..1e704929 100644 --- a/kstars/kstars/kstarssplash.cpp +++ b/kstars/kstars/kstarssplash.cpp @@ -17,7 +17,7 @@ #include <tqfile.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kapplication.h> @@ -59,19 +59,19 @@ KStarsSplash::KStarsSplash( TQWidget *parent, const char* name ) pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, TQColor( "White" ) ); pal.setColor( TQPalette::Inactive, TQColorGroup::Foreground, TQColor( "White" ) ); label->setPalette( pal ); - label->tqsetAlignment( AlignHCenter ); + label->setAlignment( AlignHCenter ); label->setText( i18n( "Welcome to KStars. Please stand by while loading..." ) ); topLayout->addWidget( label ); //initialize the progress message label - textCurrenttqStatus = new TQLabel( page, "label2" ); - textCurrenttqStatus->setPalette( pal ); - textCurrenttqStatus->tqsetAlignment( AlignHCenter ); - topLayout->addWidget( textCurrenttqStatus ); + textCurrentStatus = new TQLabel( page, "label2" ); + textCurrentStatus->setPalette( pal ); + textCurrentStatus->setAlignment( AlignHCenter ); + topLayout->addWidget( textCurrentStatus ); 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 - textCurrenttqStatus->tqrepaint(); // status text label + label->repaint(); // standard text label + textCurrentStatus->repaint(); // status text label } void KStarsSplash::closeEvent( TQCloseEvent *e ) { @@ -90,11 +90,11 @@ void KStarsSplash::closeEvent( TQCloseEvent *e ) { } void KStarsSplash::setMessage( TQString s ) { - textCurrenttqStatus->setText( s ); - tqrepaint(); // tqrepaint splash screen + textCurrentStatus->setText( s ); + 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(); diff --git a/kstars/kstars/kstarssplash.h b/kstars/kstars/kstarssplash.h index 8d9b2236..ff5e676b 100644 --- a/kstars/kstars/kstarssplash.h +++ b/kstars/kstars/kstarssplash.h @@ -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). */ @@ -66,7 +66,7 @@ class KStarsSplash : public KDialogBase void closeWindow(); private: - TQLabel *textCurrenttqStatus, *label; + TQLabel *textCurrentStatus, *label; TQWidget *Banner; TQPixmap *splashImage; }; diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui index 53d6871f..2a612e2e 100644 --- a/kstars/kstars/kswizardui.ui +++ b/kstars/kstars/kswizardui.ui @@ -35,7 +35,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>360</height> @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -63,7 +63,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -95,7 +95,7 @@ <p>To get started, press the <b>Next</b> button.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>189</height> @@ -145,7 +145,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>360</height> @@ -157,7 +157,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <vbox> <property name="name"> @@ -173,7 +173,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -181,7 +181,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -206,7 +206,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> @@ -225,7 +225,7 @@ country.</p> <p>Once you have selected a City, press <b>Next</b>.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -239,7 +239,7 @@ country.</p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -248,7 +248,7 @@ country.</p> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -314,7 +314,7 @@ country.</p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -323,7 +323,7 @@ country.</p> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <grid> <property name="name"> @@ -333,7 +333,7 @@ country.</p> <property name="name"> <cstring>LatBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -358,7 +358,7 @@ country.</p> <property name="text"> <string>Latitude:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -366,7 +366,7 @@ country.</p> <property name="name"> <cstring>LongBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -386,7 +386,7 @@ country.</p> <property name="name"> <cstring>CityListBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>180</width> <height>0</height> @@ -428,7 +428,7 @@ country.</p> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>360</height> @@ -440,7 +440,7 @@ country.</p> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <vbox> <property name="name"> @@ -456,7 +456,7 @@ country.</p> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -472,7 +472,7 @@ country.</p> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -481,7 +481,7 @@ country.</p> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <vbox> <property name="name"> @@ -507,7 +507,7 @@ can also control telescopes remotely over the Internet.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -535,7 +535,7 @@ You can always set up devices later using the <b>Devices</b> menu.</ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -544,7 +544,7 @@ You can always set up devices later using the <b>Devices</b> menu.</ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -560,7 +560,7 @@ You can always set up devices later using the <b>Devices</b> menu.</ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -592,7 +592,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -611,7 +611,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>117</height> @@ -649,7 +649,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>360</height> @@ -661,7 +661,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <vbox> <property name="name"> @@ -677,7 +677,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -693,7 +693,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -702,7 +702,7 @@ and other astronomical devices such as CCD cameras and focusers.</string> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <vbox> <property name="name"> @@ -721,7 +721,7 @@ button to proceed. </p> <p>You can also use this tool later, by selecting <b>Download data</b> from the <b>File</b> menu.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -735,7 +735,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -744,7 +744,7 @@ button to proceed. </p> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -760,7 +760,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -785,7 +785,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -804,7 +804,7 @@ button to proceed. </p> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index 57287329..2fe242f4 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -22,7 +22,7 @@ #include <kstandarddirs.h> #include <klineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqgroupbox.h> #include <tqlabel.h> @@ -52,18 +52,18 @@ LocationDialog::LocationDialog( TQWidget* parent ) CityLay = new TQVBoxLayout( CityBox, 6, 4 ); //root mgr for CityBox CityLay->setSpacing( 6 ); CityLay->setMargin( 6 ); - hlay = new TQHBoxLayout( 2 ); //this tqlayout will be added to CityLay - vlay = new TQVBoxLayout( 2 ); //this tqlayout will be added to hlay - glay = new TQGridLayout( 3, 2, 6 ); //this tqlayout will be added to vlay + hlay = new TQHBoxLayout( 2 ); //this layout will be added to CityLay + vlay = new TQVBoxLayout( 2 ); //this layout will be added to hlay + glay = new TQGridLayout( 3, 2, 6 ); //this layout will be added to vlay CoordLay = new TQVBoxLayout( CoordBox, 6, 4 ); //root mgr for coordbox CoordLay->setSpacing( 6 ); CoordLay->setMargin( 6 ); - glay2 = new TQGridLayout( 3, 4, 4 ); //this tqlayout will be added to CoordLay - hlayCoord = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 - hlayTZ = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 - hlayButtons = new TQHBoxLayout( 2 ); //this tqlayout will be added to glay2 - hlay3 = new TQHBoxLayout( 2 ); //this tqlayout will be added to CoordLay + glay2 = new TQGridLayout( 3, 4, 4 ); //this layout will be added to CoordLay + hlayCoord = new TQHBoxLayout( 2 ); //this layout will be added to glay2 + hlayTZ = new TQHBoxLayout( 2 ); //this layout will be added to glay2 + hlayButtons = new TQHBoxLayout( 2 ); //this layout will be added to glay2 + hlay3 = new TQHBoxLayout( 2 ); //this layout will be added to CoordLay //Create widgets CityFiltLabel = new TQLabel( CityBox ); @@ -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 ) { diff --git a/kstars/kstars/locationdialog.h b/kstars/kstars/locationdialog.h index e40c43a4..1de15c84 100644 --- a/kstars/kstars/locationdialog.h +++ b/kstars/kstars/locationdialog.h @@ -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 ); diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp index b96756c4..b76c5f0c 100644 --- a/kstars/kstars/main.cpp +++ b/kstars/kstars/main.cpp @@ -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); @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) KStarsData *dat = new KStarsData(); TQObject::connect( dat, TQT_SIGNAL( progressText(TQString) ), dat, TQT_SLOT( slotConsoleMessage(TQString) ) ); dat->initialize(); - while (!dat->startupComplete) { kapp->tqprocessEvents(50); } + while (!dat->startupComplete) { kapp->processEvents(50); } //Set Geographic Location dat->setLocationFromOptions(); @@ -128,10 +128,10 @@ int main(int argc, char *argv[]) kdWarning() << " 25 Feb 1950 ; 25 Feb 1950 05:30:00" << endl; kdWarning() << i18n( "Using CPU date/time instead." ) << endl; - kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); } } else { - kdt = dat->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); } dat->clock()->setUTC( kdt ); @@ -160,13 +160,13 @@ int main(int argc, char *argv[]) dat->setFullTimeUpdate(); dat->updateTime(dat->geo(), map ); - kapp->tqprocessEvents(100000); + kapp->processEvents(100000); map->setMapGeometry(); map->exportSkyImage( TQT_TQPAINTDEVICE(&sky) ); - kapp->tqprocessEvents(100000); + 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 = ""; } diff --git a/kstars/kstars/mapcanvas.cpp b/kstars/kstars/mapcanvas.cpp index 928623f8..85dbd1ca 100644 --- a/kstars/kstars/mapcanvas.cpp +++ b/kstars/kstars/mapcanvas.cpp @@ -31,7 +31,7 @@ MapCanvas::MapCanvas(TQWidget *parent, const char *name ) : TQWidget(parent,name setBackgroundMode( TQWidget::NoBackground ); Canvas = new TQPixmap(); bgImage = new TQPixmap(); - LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); + LocationDialog *ld = (LocationDialog *)topLevelWidget(); KStars *ks = (KStars *)ld->parent(); TQString bgFile = ks->data()->stdDirs->findResource( "data", "kstars/geomap.png" ); bgImage->load( bgFile, "PNG" ); @@ -57,7 +57,7 @@ void MapCanvas::setGeometry( const TQRect &r ) { } void MapCanvas::mousePressEvent( TQMouseEvent *e ) { - LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); + LocationDialog *ld = (LocationDialog *)topLevelWidget(); //Determine Lat/Long corresponding to event press int lng = ( e->x() - origin.x() ); @@ -68,7 +68,7 @@ void MapCanvas::mousePressEvent( TQMouseEvent *e ) { void MapCanvas::paintEvent( TQPaintEvent * ) { TQPainter pcanvas; - LocationDialog *ld = (LocationDialog *)tqtopLevelWidget(); + LocationDialog *ld = (LocationDialog *)topLevelWidget(); KStars *ks = (KStars *)ld->parent(); //prepare the canvas diff --git a/kstars/kstars/mapcanvas.h b/kstars/kstars/mapcanvas.h index fd5432c4..e7580475 100644 --- a/kstars/kstars/mapcanvas.h +++ b/kstars/kstars/mapcanvas.h @@ -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 ); diff --git a/kstars/kstars/newfovui.ui b/kstars/kstars/newfovui.ui index 649c04e9..73cc811b 100644 --- a/kstars/kstars/newfovui.ui +++ b/kstars/kstars/newfovui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -74,7 +74,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -82,7 +82,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -116,7 +116,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <vbox> <property name="name"> @@ -124,7 +124,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -160,7 +160,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -196,7 +196,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -244,7 +244,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -253,7 +253,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -269,7 +269,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>152</width> <height>20</height> @@ -333,7 +333,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>20</height> @@ -350,7 +350,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>22</height> @@ -367,7 +367,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>22</height> @@ -376,7 +376,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" </spacer> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <hbox> <property name="name"> @@ -384,7 +384,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <vbox> <property name="name"> @@ -410,7 +410,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <vbox> <property name="name"> @@ -418,7 +418,7 @@ The computed FOV angle (in arcminutes) will be displayed in the "Field of view" </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -441,7 +441,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="name"> <cstring>textLabel6_2_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> @@ -460,7 +460,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -513,7 +513,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout26_3</cstring> + <cstring>layout26_3</cstring> </property> <hbox> <property name="name"> @@ -521,7 +521,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25_3</cstring> + <cstring>layout25_3</cstring> </property> <vbox> <property name="name"> @@ -547,7 +547,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24_3</cstring> + <cstring>layout24_3</cstring> </property> <vbox> <property name="name"> @@ -555,7 +555,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15_4</cstring> + <cstring>layout15_4</cstring> </property> <hbox> <property name="name"> @@ -578,7 +578,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="name"> <cstring>textLabel6_2_3_4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> @@ -597,7 +597,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16_4</cstring> + <cstring>layout16_4</cstring> </property> <hbox> <property name="name"> @@ -645,7 +645,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>51</height> @@ -654,7 +654,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <hbox> <property name="name"> @@ -670,7 +670,7 @@ This is one of the data fields required for defining a field-of-view (FOV) symbo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>281</width> <height>21</height> @@ -703,7 +703,7 @@ The computed HPBW angle (in arcminutes) will be displayed in the "Field of view" </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -742,7 +742,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>298</width> <height>20</height> @@ -751,7 +751,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -759,7 +759,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -767,7 +767,7 @@ You can either enter a value directly, or use the "Eyepiece" or "Camera" Tabs to </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -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> @@ -854,7 +854,7 @@ Circle, Square, Crosshairs, Bullseye.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -872,7 +872,7 @@ Circle, Square, Crosshairs, Bullseye.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>80</height> diff --git a/kstars/kstars/opsadvancedui.ui b/kstars/kstars/opsadvancedui.ui index 86527bf2..54b01920 100644 --- a/kstars/kstars/opsadvancedui.ui +++ b/kstars/kstars/opsadvancedui.ui @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -140,7 +140,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -200,7 +200,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <hbox> <property name="name"> @@ -224,7 +224,7 @@ <property name="name"> <cstring>kcfg_MagLimitHideStar</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -258,7 +258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>240</width> <height>20</height> @@ -269,7 +269,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -409,7 +409,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kstars/kstars/opscatalogui.ui b/kstars/kstars/opscatalogui.ui index 28866b7a..1aa33488 100644 --- a/kstars/kstars/opscatalogui.ui +++ b/kstars/kstars/opscatalogui.ui @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -132,7 +132,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -149,7 +149,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -168,7 +168,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -177,7 +177,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -223,7 +223,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -234,7 +234,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -250,7 +250,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -275,7 +275,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -291,7 +291,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -329,7 +329,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -362,7 +362,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> @@ -423,7 +423,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>68</height> @@ -436,7 +436,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8_2</cstring> + <cstring>layout8_2</cstring> </property> <grid> <property name="name"> @@ -522,7 +522,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -539,7 +539,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>65</width> <height>20</height> @@ -560,7 +560,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kstars/kstars/opscolors.cpp b/kstars/kstars/opscolors.cpp index 66358f25..a1c8363e 100644 --- a/kstars/kstars/opscolors.cpp +++ b/kstars/kstars/opscolors.cpp @@ -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(); diff --git a/kstars/kstars/opscolorsui.ui b/kstars/kstars/opscolorsui.ui index 94cc9e70..fc70d791 100644 --- a/kstars/kstars/opscolorsui.ui +++ b/kstars/kstars/opscolorsui.ui @@ -43,7 +43,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -81,7 +81,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -113,7 +113,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -169,7 +169,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -250,7 +250,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kstars/kstars/opsguidesui.ui b/kstars/kstars/opsguidesui.ui index 40075880..8294be8b 100644 --- a/kstars/kstars/opsguidesui.ui +++ b/kstars/kstars/opsguidesui.ui @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/kstars/kstars/opssolarsystemui.ui b/kstars/kstars/opssolarsystemui.ui index dc872a3b..3373e409 100644 --- a/kstars/kstars/opssolarsystemui.ui +++ b/kstars/kstars/opssolarsystemui.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -230,7 +230,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> @@ -263,7 +263,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -307,7 +307,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -462,7 +462,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -492,7 +492,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kstars/kstars/simclock.cpp b/kstars/kstars/simclock.cpp index 41d8c71e..0e7c467a 100644 --- a/kstars/kstars/simclock.cpp +++ b/kstars/kstars/simclock.cpp @@ -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(); diff --git a/kstars/kstars/simclock.h b/kstars/kstars/simclock.h index a4b16787..d652c304 100644 --- a/kstars/kstars/simclock.h +++ b/kstars/kstars/simclock.h @@ -40,7 +40,7 @@ class SimClock : public TQObject, public SimClockInterface { * @param parent parent object for the clock * @param when the date/time to which the SimClock should be initialized in UTC */ - SimClock(TQObject *parent = 0, const KStarsDateTime &when = KStarsDateTime::tqcurrentDateTime() ); + SimClock(TQObject *parent = 0, const KStarsDateTime &when = KStarsDateTime::currentDateTime() ); /** * Constructor * @param old a SimClock to initialize from. diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp index 4dab3cee..39ab92e2 100644 --- a/kstars/kstars/skymap.cpp +++ b/kstars/kstars/skymap.cpp @@ -74,7 +74,7 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) setBackgroundMode( TQWidget::NoBackground ); setFocusPolicy( TQ_StrongFocus ); setMinimumSize( 380, 250 ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); setMouseTracking (true); //Generate MouseMove events! midMouseButtonDown = false; @@ -925,7 +925,7 @@ void SkyMap::slewFocus( void ) { fadeTransientLabel(); forceUpdate(); - kapp->tqprocessEvents(10); //keep up with other stuff + kapp->processEvents(10); //keep up with other stuff if ( Options::useAltAz() ) { dX = destination()->az()->Degrees() - focus()->az()->Degrees(); @@ -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; } } diff --git a/kstars/kstars/skymap.h b/kstars/kstars/skymap.h index d407bd78..6cbb2831 100644 --- a/kstars/kstars/skymap.h +++ b/kstars/kstars/skymap.h @@ -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(); diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp index 77f17268..3723ff08 100644 --- a/kstars/kstars/skymapdraw.cpp +++ b/kstars/kstars/skymapdraw.cpp @@ -299,7 +299,7 @@ void SkyMap::drawMilkyWay( TQPainter& psky, double scale ) } if ( ptsCount && partVisible ) { - psky.tqdrawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); + psky.drawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); } } else { TQPoint o = getXY( data->MilkyWay[j].at(0), Options::useAltAz(), Options::useRefraction(), scale ); @@ -905,7 +905,7 @@ void SkyMap::drawHorizon( TQPainter& psky, double scale ) } //Draw the Horizon polygon - psky.tqdrawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); + psky.drawPolygon( ( const TQPointArray ) *pts, false, 0, ptsCount ); //remove all items in points list for ( register unsigned int i=0; i<points.count(); ++i ) { @@ -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 diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp index b1ff92b9..d5f26b17 100644 --- a/kstars/kstars/skymapevents.cpp +++ b/kstars/kstars/skymapevents.cpp @@ -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(); diff --git a/kstars/kstars/skyobject.cpp b/kstars/kstars/skyobject.cpp index 29c6f7e5..db409e14 100644 --- a/kstars/kstars/skyobject.cpp +++ b/kstars/kstars/skyobject.cpp @@ -22,7 +22,7 @@ #include <tqpoint.h> #include <tqregexp.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include "skyobject.h" #include "starobject.h" //needed in saveUserLog() @@ -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 diff --git a/kstars/kstars/skypoint.cpp b/kstars/kstars/skypoint.cpp index ea3f7093..c5ea55a8 100644 --- a/kstars/kstars/skypoint.cpp +++ b/kstars/kstars/skypoint.cpp @@ -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"); } diff --git a/kstars/kstars/starobject.cpp b/kstars/kstars/starobject.cpp index 12fb5652..8e46b0db 100644 --- a/kstars/kstars/starobject.cpp +++ b/kstars/kstars/starobject.cpp @@ -112,7 +112,7 @@ TQString StarObject::greekLetter( bool gchar ) const { if ( code == "omi" ) gchar ? letter = TQString( TQChar(alpha +14) ) : letter = i18n("omicron"); if ( code == "pi " ) gchar ? letter = TQString( TQChar(alpha +15) ) : letter = i18n("pi"); if ( code == "rho" ) gchar ? letter = TQString( TQChar(alpha +16) ) : letter = i18n("rho"); - //there are two tqunicode symbols for sigma; + //there are two unicode symbols for sigma; //skip the first one, the second is more widely used if ( code == "sig" ) gchar ? letter = TQString( TQChar(alpha +18) ) : letter = i18n("sigma"); if ( code == "tau" ) gchar ? letter = TQString( TQChar(alpha +19) ) : letter = i18n("tau"); diff --git a/kstars/kstars/streamformui.ui b/kstars/kstars/streamformui.ui index 5e222427..a4e34507 100644 --- a/kstars/kstars/streamformui.ui +++ b/kstars/kstars/streamformui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -31,13 +31,13 @@ <property name="name"> <cstring>playB</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -57,13 +57,13 @@ <property name="name"> <cstring>captureB</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>300</width> <height>21</height> diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index b4d29e29..f9267438 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -29,7 +29,7 @@ #include <tqpainter.h> #include <tqstringlist.h> #include <tqdir.h> -#include <tqlayout.h> +#include <layout.h> #include <stdlib.h> @@ -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; @@ -138,14 +138,14 @@ void StreamWG::setSize(int wd, int ht) streamFrame->totalBaseCount = wd * ht; - resize(wd + tqlayout()->margin() * 2 , ht + playB->height() + tqlayout()->margin() * 2 + tqlayout()->spacing()); + resize(wd + layout()->margin() * 2 , ht + playB->height() + layout()->margin() * 2 + layout()->spacing()); streamFrame->resize(wd, ht); } void StreamWG::resizeEvent(TQResizeEvent *ev) { - streamFrame->resize(ev->size().width() - tqlayout()->margin() * 2, ev->size().height() - playB->height() - tqlayout()->margin() * 2 - tqlayout()->spacing()); + streamFrame->resize(ev->size().width() - layout()->margin() * 2, ev->size().height() - playB->height() - layout()->margin() * 2 - layout()->spacing()); } /* @@ -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" ) ); } diff --git a/kstars/kstars/telescopeprop.cpp b/kstars/kstars/telescopeprop.cpp index 572c51d1..b2f17009 100644 --- a/kstars/kstars/telescopeprop.cpp +++ b/kstars/kstars/telescopeprop.cpp @@ -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); diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui index bcff2bd6..91b3aefc 100644 --- a/kstars/kstars/telescopepropui.ui +++ b/kstars/kstars/telescopepropui.ui @@ -32,7 +32,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>236</width> <height>20</height> @@ -101,7 +101,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>130</width> <height>0</height> @@ -110,7 +110,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -160,7 +160,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="2"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -186,7 +186,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -209,7 +209,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -242,7 +242,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>190</height> diff --git a/kstars/kstars/telescopewizard.ui b/kstars/kstars/telescopewizard.ui index fa67eea5..715219c4 100644 --- a/kstars/kstars/telescopewizard.ui +++ b/kstars/kstars/telescopewizard.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>300</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>800</width> <height>300</height> @@ -44,7 +44,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>56</width> <height>11</height> @@ -141,7 +141,7 @@ This Wizard will help you to connect to your telescope and control it from KStar <br><br> 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> @@ -181,7 +181,7 @@ Please select your telescope model from the list below. Click next after selecti <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>25</height> @@ -190,7 +190,7 @@ Please select your telescope model from the list below. Click next after selecti </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -211,7 +211,7 @@ Please select your telescope model from the list below. Click next after selecti <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>196</width> <height>16</height> @@ -230,7 +230,7 @@ Please select your telescope model from the list below. Click next after selecti <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>25</height> @@ -274,12 +274,12 @@ Please select your telescope model from the list below. Click next after selecti <property name="text"> <string><h3>2. Align Your Telescope</h3> -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. <br><br> -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. <br><br><br>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 <tt>Set time</tt> and <tt>Set Location</tt> buttons. </string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -320,7 +320,7 @@ Verify if the following time, date, and location settings are correct. If any of <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -329,7 +329,7 @@ Verify if the following time, date, and location settings are correct. If any of </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -337,7 +337,7 @@ Verify if the following time, date, and location settings are correct. If any of </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <vbox> <property name="name"> @@ -345,7 +345,7 @@ Verify if the following time, date, and location settings are correct. If any of </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -353,7 +353,7 @@ Verify if the following time, date, and location settings are correct. If any of </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -384,7 +384,7 @@ Verify if the following time, date, and location settings are correct. If any of </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -417,7 +417,7 @@ Verify if the following time, date, and location settings are correct. If any of </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -450,7 +450,7 @@ Verify if the following time, date, and location settings are correct. If any of </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -486,7 +486,7 @@ Verify if the following time, date, and location settings are correct. If any of <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -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 <tt>/dev/ttyS0</tt> <br><br>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> @@ -538,7 +538,7 @@ Enter the port number your telescope is connected to. If you only have one seria <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>25</height> @@ -547,7 +547,7 @@ Enter the port number your telescope is connected to. If you only have one seria </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -576,7 +576,7 @@ Enter the port number your telescope is connected to. If you only have one seria <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>141</width> <height>16</height> @@ -595,7 +595,7 @@ Enter the port number your telescope is connected to. If you only have one seria <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>25</height> diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp index d29c6ba2..3864f5d6 100644 --- a/kstars/kstars/telescopewizardprocess.cpp +++ b/kstars/kstars/telescopewizardprocess.cpp @@ -15,7 +15,7 @@ #include <tqstring.h> #include <tqtimer.h> #include <tqtable.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqradiobutton.h> #include <klistview.h> @@ -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++) @@ -106,7 +106,7 @@ telescopeWizardProcess::~telescopeWizardProcess() { if (progressScan) if (progressScan->wasCancelled()) - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); Options::setIndiMessages( INDIMessageBar ); @@ -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(), @@ -237,7 +237,7 @@ int telescopeWizardProcess::establishLink() if (indidriver->isDeviceRunning(telescopeCombo->currentText())) { indidriver->localListView->setSelected(driverItem, true); - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); } // Set custome label for device @@ -248,7 +248,7 @@ int telescopeWizardProcess::establishLink() // Make sure we start is locally indidriver->localR->setChecked(true); // Run it - indidriver->processDevicetqStatus(0); + indidriver->processDeviceStatus(0); if (!indidriver->isDeviceRunning(telescopeCombo->currentText())) return (3); @@ -274,7 +274,7 @@ void telescopeWizardProcess::processPort() if (timeOutCount >= TIMEOUT_THRESHHOLD) { - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); Reset(); KMessageBox::error(0, i18n("Error: connection timeout. Unable to communicate with an INDI server")); close(); @@ -335,7 +335,7 @@ void telescopeWizardProcess::scanPorts() { KMessageBox::sorry(0, i18n("Sorry. KStars failed to detect any attached telescopes, please check your settings and try again.")); linkRejected = true; - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); Reset(); return; } diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp index 24c00ca0..02dea8a3 100644 --- a/kstars/kstars/thumbnaileditor.cpp +++ b/kstars/kstars/thumbnaileditor.cpp @@ -17,7 +17,7 @@ #include <tqframe.h> #include <tqimage.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpoint.h> @@ -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() { diff --git a/kstars/kstars/thumbnaileditorui.ui b/kstars/kstars/thumbnaileditorui.ui index d9ac4452..5a132f41 100644 --- a/kstars/kstars/thumbnaileditorui.ui +++ b/kstars/kstars/thumbnaileditorui.ui @@ -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> diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp index 5a4887a9..e3e381d2 100644 --- a/kstars/kstars/thumbnailpicker.cpp +++ b/kstars/kstars/thumbnailpicker.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqimage.h> #include <tqpixmap.h> @@ -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 @@ -176,7 +176,7 @@ void ThumbnailPicker::downloadReady(KIO::Job *job) { //Add image to list //If image is taller than desktop, rescale it. - //I tried to use kapp->style().tqpixelMetric( TQStyle::PM_TitleBarHeight ) + //I tried to use kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) //for the titlebar height, but this returned zero. //Hard-coding 25 instead :( if ( tmp.exists() ) { @@ -195,7 +195,7 @@ void ThumbnailPicker::downloadReady(KIO::Job *job) { // this returns zero... // //DEBUG -// kdDebug() << "Title bar height: " << kapp->style().tqpixelMetric( TQStyle::PM_TitleBarHeight ) << endl; +// kdDebug() << "Title bar height: " << kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl; if ( h > hDesk ) im = im.smoothScale( w*hDesk/h, hDesk ); @@ -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; } diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui index 591f7cdc..c3232750 100644 --- a/kstars/kstars/thumbnailpickerui.ui +++ b/kstars/kstars/thumbnailpickerui.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -80,7 +80,7 @@ <property name="name"> <cstring>ImageList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -110,7 +110,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -118,7 +118,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>53</width> <height>20</height> @@ -143,7 +143,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -169,13 +169,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>200</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>200</height> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>53</width> <height>20</height> @@ -211,7 +211,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -236,7 +236,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -289,7 +289,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>233</height> diff --git a/kstars/kstars/timebox.cpp b/kstars/kstars/timebox.cpp index b3dabc31..1ceee2d7 100644 --- a/kstars/kstars/timebox.cpp +++ b/kstars/kstars/timebox.cpp @@ -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; @@ -159,9 +159,9 @@ ExtDate timeBox::createDate (bool */*ok*/) if ( !date.isValid() ) { kdDebug() << k_funcinfo << "Invalid date" << endl; - showDate(ExtDate::tqcurrentDate()); + showDate(ExtDate::currentDate()); entry = text().stripWhiteSpace(); - return ExtDate::tqcurrentDate(); + return ExtDate::currentDate(); } else { return date; } diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp index d3ff7ecb..7f1c7446 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -21,7 +21,7 @@ #include <tqlabel.h> #include <tqpushbutton.h> #include <tqspinbox.h> -#include <tqlayout.h> +#include <layout.h> #include "timedialog.h" #include "kstars.h" @@ -36,7 +36,7 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) TQFrame *page = plainPage(); vlay = new TQVBoxLayout( page, 2, 2 ); - hlay = new TQHBoxLayout( 2 ); //this tqlayout will be added to the VLayout + hlay = new TQHBoxLayout( 2 ); //this layout will be added to the VLayout dPicker = new ExtDatePicker( page ); dPicker->setDate( now.date() ); @@ -112,7 +112,7 @@ void TimeDialog::keyReleaseEvent( TQKeyEvent *kev ) { void TimeDialog::setNow( void ) { - KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt( KStarsDateTime::currentDateTime() ); dPicker->setDate( dt.date() ); TQTime t = dt.time(); diff --git a/kstars/kstars/timestepbox.h b/kstars/kstars/timestepbox.h index 6be45ead..1d934d96 100644 --- a/kstars/kstars/timestepbox.h +++ b/kstars/kstars/timestepbox.h @@ -19,7 +19,7 @@ #define TIMESTEPBOX_H #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include "timespinbox.h" #include "timeunitbox.h" diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp index c271319d..f59fcad3 100644 --- a/kstars/kstars/tools/altvstime.cpp +++ b/kstars/kstars/tools/altvstime.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <klocale.h> #include <klineedit.h> @@ -53,7 +53,7 @@ AltVsTime::AltVsTime( TQWidget* parent) : View = new AVTPlotWidget( -12.0, 12.0, -90.0, 90.0, page ); View->setMinimumSize( 400, 400 ); - View->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); + View->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding ); View->setXAxisType( KStarsPlotWidget::TIME ); View->setYAxisType( KStarsPlotWidget::ANGLE ); View->setShowGrid( false ); @@ -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; } @@ -468,7 +468,7 @@ void AltVsTime::setLSTLimits(void) { void AltVsTime::showCurrentDate (void) { - KStarsDateTime dt = KStarsDateTime::tqcurrentDateTime(); + KStarsDateTime dt = KStarsDateTime::currentDateTime(); if ( dt.time() > TQTime( 12, 0, 0 ) ) dt = dt.addDays( 1 ); avtUI->dateBox->setDate( dt.date() ); } diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui index 323c9fd7..629dc8d9 100644 --- a/kstars/kstars/tools/altvstimeui.ui +++ b/kstars/kstars/tools/altvstimeui.ui @@ -44,7 +44,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout30</cstring> + <cstring>layout30</cstring> </property> <grid> <property name="name"> @@ -108,7 +108,7 @@ <property name="text"> <string>RA:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -150,13 +150,13 @@ <property name="name"> <cstring>epochName</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>80</width> <height>32767</height> @@ -175,7 +175,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -228,7 +228,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -260,7 +260,7 @@ <property name="name"> <cstring>PlotList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -285,7 +285,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout57</cstring> + <cstring>layout57</cstring> </property> <hbox> <property name="name"> @@ -303,7 +303,7 @@ <property name="name"> <cstring>dateBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -320,7 +320,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>257</width> <height>20</height> @@ -331,7 +331,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -421,7 +421,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -430,7 +430,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <hbox> <property name="name"> @@ -446,7 +446,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kstars/kstars/tools/argchangeviewoption.ui b/kstars/kstars/tools/argchangeviewoption.ui index 1da77198..77629c58 100644 --- a/kstars/kstars/tools/argchangeviewoption.ui +++ b/kstars/kstars/tools/argchangeviewoption.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>160</width> <height>20</height> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kstars/kstars/tools/argexportimage.ui b/kstars/kstars/tools/argexportimage.ui index 9228373b..b218bcda 100644 --- a/kstars/kstars/tools/argexportimage.ui +++ b/kstars/kstars/tools/argexportimage.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -36,7 +36,7 @@ <property name="name"> <cstring>ExportFileName</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>0</height> @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -72,7 +72,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -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&)</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&)</slot> - <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&,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&)</slot> + <slot access="public" specifier="">repaint(const QRect&,bool)</slot> + <slot access="public" specifier="">repaint(const QRegion&)</slot> + <slot access="public" specifier="">repaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -221,10 +221,10 @@ <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">tqminimumSize</property> - <property type="Size">tqmaximumSize</property> + <property type="Size">minimumSize</property> + <property type="Size">maximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</property> diff --git a/kstars/kstars/tools/arglooktoward.ui b/kstars/kstars/tools/arglooktoward.ui index ea505d2c..a4e3f206 100644 --- a/kstars/kstars/tools/arglooktoward.ui +++ b/kstars/kstars/tools/arglooktoward.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -125,7 +125,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argprintimage.ui b/kstars/kstars/tools/argprintimage.ui index 362e8289..dc50ac07 100644 --- a/kstars/kstars/tools/argprintimage.ui +++ b/kstars/kstars/tools/argprintimage.ui @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> diff --git a/kstars/kstars/tools/argsetactionindi.ui b/kstars/kstars/tools/argsetactionindi.ui index 9e8465ad..f1268bba 100644 --- a/kstars/kstars/tools/argsetactionindi.ui +++ b/kstars/kstars/tools/argsetactionindi.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout50</cstring> + <cstring>layout50</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout47</cstring> + <cstring>layout47</cstring> </property> <vbox> <property name="name"> @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout48</cstring> + <cstring>layout48</cstring> </property> <vbox> <property name="name"> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetaltaz.ui b/kstars/kstars/tools/argsetaltaz.ui index 1c373ebb..7c22bea4 100644 --- a/kstars/kstars/tools/argsetaltaz.ui +++ b/kstars/kstars/tools/argsetaltaz.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <grid> <property name="name"> @@ -100,7 +100,7 @@ The azimuth is one of the coordinates in the horizontal coordinate system. It i <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argsetccdtempindi.ui b/kstars/kstars/tools/argsetccdtempindi.ui index ba6eed5a..dc4cd195 100644 --- a/kstars/kstars/tools/argsetccdtempindi.ui +++ b/kstars/kstars/tools/argsetccdtempindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout64</cstring> + <cstring>layout64</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout63</cstring> + <cstring>layout63</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout62</cstring> + <cstring>layout62</cstring> </property> <vbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>27</width> <height>21</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetcolor.ui b/kstars/kstars/tools/argsetcolor.ui index e2e2f2e2..ac096c45 100644 --- a/kstars/kstars/tools/argsetcolor.ui +++ b/kstars/kstars/tools/argsetcolor.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -42,7 +42,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -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&)</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&)</slot> - <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&,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&)</slot> + <slot access="public" specifier="">repaint(const QRect&,bool)</slot> + <slot access="public" specifier="">repaint(const QRegion&)</slot> + <slot access="public" specifier="">repaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -180,10 +180,10 @@ <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">tqminimumSize</property> - <property type="Size">tqmaximumSize</property> + <property type="Size">minimumSize</property> + <property type="Size">maximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</property> diff --git a/kstars/kstars/tools/argsetfilternumindi.ui b/kstars/kstars/tools/argsetfilternumindi.ui index dbb9aff4..83d79f09 100644 --- a/kstars/kstars/tools/argsetfilternumindi.ui +++ b/kstars/kstars/tools/argsetfilternumindi.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout64</cstring> + <cstring>layout64</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout63</cstring> + <cstring>layout63</cstring> </property> <vbox> <property name="name"> @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout62</cstring> + <cstring>layout62</cstring> </property> <vbox> <property name="name"> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>27</width> <height>21</height> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetfocusspeedindi.ui b/kstars/kstars/tools/argsetfocusspeedindi.ui index 07c37429..012ca14f 100644 --- a/kstars/kstars/tools/argsetfocusspeedindi.ui +++ b/kstars/kstars/tools/argsetfocusspeedindi.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>45</width> <height>21</height> diff --git a/kstars/kstars/tools/argsetfocustimeoutindi.ui b/kstars/kstars/tools/argsetfocustimeoutindi.ui index 63d2e9c3..a736d577 100644 --- a/kstars/kstars/tools/argsetfocustimeoutindi.ui +++ b/kstars/kstars/tools/argsetfocustimeoutindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout64</cstring> + <cstring>layout64</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout63</cstring> + <cstring>layout63</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout62</cstring> + <cstring>layout62</cstring> </property> <vbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>27</width> <height>21</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetframetypeindi.ui b/kstars/kstars/tools/argsetframetypeindi.ui index 31e7cf34..0a82d908 100644 --- a/kstars/kstars/tools/argsetframetypeindi.ui +++ b/kstars/kstars/tools/argsetframetypeindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout47</cstring> + <cstring>layout47</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout54</cstring> + <cstring>layout54</cstring> </property> <vbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>56</width> <height>21</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui index 5318e530..ee80245d 100644 --- a/kstars/kstars/tools/argsetgeolocation.ui +++ b/kstars/kstars/tools/argsetgeolocation.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <vbox> <property name="name"> @@ -34,7 +34,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout34</cstring> + <cstring>layout34</cstring> </property> <grid> <property name="name"> @@ -101,7 +101,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <hbox> <property name="name"> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>49</width> <height>20</height> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>49</width> <height>20</height> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argsetgeolocationindi.ui b/kstars/kstars/tools/argsetgeolocationindi.ui index 127d7b8f..febc5a16 100644 --- a/kstars/kstars/tools/argsetgeolocationindi.ui +++ b/kstars/kstars/tools/argsetgeolocationindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout34</cstring> + <cstring>layout34</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <vbox> <property name="name"> @@ -60,7 +60,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <vbox> <property name="name"> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>23</height> diff --git a/kstars/kstars/tools/argsetlocaltime.ui b/kstars/kstars/tools/argsetlocaltime.ui index 623d263d..a1c4ea04 100644 --- a/kstars/kstars/tools/argsetlocaltime.ui +++ b/kstars/kstars/tools/argsetlocaltime.ui @@ -23,7 +23,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout43</cstring> + <cstring>layout43</cstring> </property> <hbox> <property name="name"> @@ -39,7 +39,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kstars/kstars/tools/argsetportindi.ui b/kstars/kstars/tools/argsetportindi.ui index 8472c2d0..43b9e538 100644 --- a/kstars/kstars/tools/argsetportindi.ui +++ b/kstars/kstars/tools/argsetportindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <grid> <property name="name"> @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsetradec.ui b/kstars/kstars/tools/argsetradec.ui index e47fd936..5ad32a80 100644 --- a/kstars/kstars/tools/argsetradec.ui +++ b/kstars/kstars/tools/argsetradec.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <grid> <property name="name"> @@ -100,7 +100,7 @@ Right Ascension is one of the coordinates in the Equatorial coordinate system. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argsetscopeactionindi.ui b/kstars/kstars/tools/argsetscopeactionindi.ui index 3aea9afe..3c69cb6c 100644 --- a/kstars/kstars/tools/argsetscopeactionindi.ui +++ b/kstars/kstars/tools/argsetscopeactionindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout47</cstring> + <cstring>layout47</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout54</cstring> + <cstring>layout54</cstring> </property> <vbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>56</width> <height>21</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argsettargetcoordindi.ui b/kstars/kstars/tools/argsettargetcoordindi.ui index a047a74b..d40cf07c 100644 --- a/kstars/kstars/tools/argsettargetcoordindi.ui +++ b/kstars/kstars/tools/argsettargetcoordindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout34</cstring> + <cstring>layout34</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <vbox> <property name="name"> @@ -60,7 +60,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <vbox> <property name="name"> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>24</height> diff --git a/kstars/kstars/tools/argsettargetnameindi.ui b/kstars/kstars/tools/argsettargetnameindi.ui index 344ebd59..844df2f6 100644 --- a/kstars/kstars/tools/argsettargetnameindi.ui +++ b/kstars/kstars/tools/argsettargetnameindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout44</cstring> + <cstring>layout44</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout40</cstring> + <cstring>layout40</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <vbox> <property name="name"> @@ -72,7 +72,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout42</cstring> + <cstring>layout42</cstring> </property> <vbox> <property name="name"> @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>52</width> <height>20</height> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>8</height> diff --git a/kstars/kstars/tools/argsettrack.ui b/kstars/kstars/tools/argsettrack.ui index b6467496..c8abd448 100644 --- a/kstars/kstars/tools/argsettrack.ui +++ b/kstars/kstars/tools/argsettrack.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -50,7 +50,7 @@ If unchecked, then Tracking will be forced off, even if an object has been cente <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -69,7 +69,7 @@ If unchecked, then Tracking will be forced off, even if an object has been cente <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argsetutcindi.ui b/kstars/kstars/tools/argsetutcindi.ui index 7a9d5f6a..09fa447b 100644 --- a/kstars/kstars/tools/argsetutcindi.ui +++ b/kstars/kstars/tools/argsetutcindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout88</cstring> + <cstring>layout88</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout86</cstring> + <cstring>layout86</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout87</cstring> + <cstring>layout87</cstring> </property> <vbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argshutdownindi.ui b/kstars/kstars/tools/argshutdownindi.ui index d09a9ce5..126b5777 100644 --- a/kstars/kstars/tools/argshutdownindi.ui +++ b/kstars/kstars/tools/argshutdownindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>33</height> diff --git a/kstars/kstars/tools/argstartexposureindi.ui b/kstars/kstars/tools/argstartexposureindi.ui index 7b6d0a78..efc59043 100644 --- a/kstars/kstars/tools/argstartexposureindi.ui +++ b/kstars/kstars/tools/argstartexposureindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout64</cstring> + <cstring>layout64</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout63</cstring> + <cstring>layout63</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout62</cstring> + <cstring>layout62</cstring> </property> <vbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>27</width> <height>21</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argstartfocusindi.ui b/kstars/kstars/tools/argstartfocusindi.ui index 8f014162..2c52cab0 100644 --- a/kstars/kstars/tools/argstartfocusindi.ui +++ b/kstars/kstars/tools/argstartfocusindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout47</cstring> + <cstring>layout47</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout54</cstring> + <cstring>layout54</cstring> </property> <vbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>56</width> <height>21</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> diff --git a/kstars/kstars/tools/argstartindi.ui b/kstars/kstars/tools/argstartindi.ui index 540441b0..166fd7d4 100644 --- a/kstars/kstars/tools/argstartindi.ui +++ b/kstars/kstars/tools/argstartindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argswitchindi.ui b/kstars/kstars/tools/argswitchindi.ui index f998c4be..efba3fa9 100644 --- a/kstars/kstars/tools/argswitchindi.ui +++ b/kstars/kstars/tools/argswitchindi.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>33</height> diff --git a/kstars/kstars/tools/argtimescale.ui b/kstars/kstars/tools/argtimescale.ui index cd55da63..1039f9fd 100644 --- a/kstars/kstars/tools/argtimescale.ui +++ b/kstars/kstars/tools/argtimescale.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -39,7 +39,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>20</height> @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argwaitfor.ui b/kstars/kstars/tools/argwaitfor.ui index 77ea5077..24733f4c 100644 --- a/kstars/kstars/tools/argwaitfor.ui +++ b/kstars/kstars/tools/argwaitfor.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argwaitforkey.ui b/kstars/kstars/tools/argwaitforkey.ui index 82876087..0fa2e564 100644 --- a/kstars/kstars/tools/argwaitforkey.ui +++ b/kstars/kstars/tools/argwaitforkey.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -55,7 +55,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -74,7 +74,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/argzoom.ui b/kstars/kstars/tools/argzoom.ui index 5d1ea8e8..9eff8db5 100644 --- a/kstars/kstars/tools/argzoom.ui +++ b/kstars/kstars/tools/argzoom.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -56,7 +56,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -75,7 +75,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp index bf477300..ea35ed88 100644 --- a/kstars/kstars/tools/astrocalc.cpp +++ b/kstars/kstars/tools/astrocalc.cpp @@ -35,7 +35,7 @@ #include <klocale.h> #include <tqlistview.h> -#include <tqtextview.h> +#include <textview.h> AstroCalc::AstroCalc( TQWidget* parent ) : @@ -374,7 +374,7 @@ void AstroCalc::genVlsrFrame(void) rightPanel = Vlsr; } -TQSize AstroCalc::tqsizeHint() const +TQSize AstroCalc::sizeHint() const { return TQSize(640,430); } diff --git a/kstars/kstars/tools/astrocalc.h b/kstars/kstars/tools/astrocalc.h index fe8b5f49..44daeeb5 100644 --- a/kstars/kstars/tools/astrocalc.h +++ b/kstars/kstars/tools/astrocalc.h @@ -120,7 +120,7 @@ TQ_OBJECT void delRightPanel(void); /**@returns suggested size of calculator window. */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: /**Determine which item is selected in the function menu TQListBox. diff --git a/kstars/kstars/tools/jmoontool.cpp b/kstars/kstars/tools/jmoontool.cpp index 90303b38..e88e934d 100644 --- a/kstars/kstars/tools/jmoontool.cpp +++ b/kstars/kstars/tools/jmoontool.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kdebug.h> @@ -49,14 +49,14 @@ JMoonTool::JMoonTool(TQWidget *parent, const char *name) TQLabel *labGn = new TQLabel( "Ganymede", page ); TQLabel *labCa = new TQLabel( "Callisto", page ); - labIo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labEu->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labGn->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labCa->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - labIo->tqsetAlignment( AlignHCenter ); - labEu->tqsetAlignment( AlignHCenter ); - labGn->tqsetAlignment( AlignHCenter ); - labCa->tqsetAlignment( AlignHCenter ); + labIo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labEu->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labGn->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labCa->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + labIo->setAlignment( AlignHCenter ); + labEu->setAlignment( AlignHCenter ); + labGn->setAlignment( AlignHCenter ); + labCa->setAlignment( AlignHCenter ); labIo->setPaletteForegroundColor( colIo ); labEu->setPaletteForegroundColor( colEu ); diff --git a/kstars/kstars/tools/kstarsplotwidget.cpp b/kstars/kstars/tools/kstarsplotwidget.cpp index edb62980..750eb85a 100644 --- a/kstars/kstars/tools/kstarsplotwidget.cpp +++ b/kstars/kstars/tools/kstarsplotwidget.cpp @@ -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() ); diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index 3b5e4524..34003c91 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -23,7 +23,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqfile.h> @@ -69,10 +69,10 @@ void LCGenerator::createGUI() StarInfoBox = new TQGroupBox( page, "StarInfoBox" ); StarInfoBox->setColumnLayout(0, Qt::Vertical ); - StarInfoBox->tqlayout()->setSpacing( 6 ); - StarInfoBox->tqlayout()->setMargin( 11 ); - StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->tqlayout() ); - StarInfoBoxLayout->tqsetAlignment( TQt::AlignTop ); + StarInfoBox->layout()->setSpacing( 6 ); + StarInfoBox->layout()->setMargin( 11 ); + StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->layout() ); + StarInfoBoxLayout->setAlignment( TQt::AlignTop ); DesignHLayout = new TQHBoxLayout( 0, 0, 6, "DesignHLayout"); @@ -125,10 +125,10 @@ void LCGenerator::createGUI() DataSelectBox = new TQGroupBox( page, "DataSelectBox" ); DataSelectBox->setColumnLayout(0, Qt::Vertical ); - DataSelectBox->tqlayout()->setSpacing( 6 ); - DataSelectBox->tqlayout()->setMargin( 11 ); - DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->tqlayout() ); - DataSelectBoxLayout->tqsetAlignment( TQt::AlignTop ); + DataSelectBox->layout()->setSpacing( 6 ); + DataSelectBox->layout()->setMargin( 11 ); + DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->layout() ); + DataSelectBoxLayout->setAlignment( TQt::AlignTop ); VisualCheck = new TQCheckBox( DataSelectBox, "VisualCheck" ); VisualCheck->setChecked( TRUE ); diff --git a/kstars/kstars/tools/modcalcangdist.cpp b/kstars/kstars/tools/modcalcangdist.cpp index be58f46d..694b2895 100644 --- a/kstars/kstars/tools/modcalcangdist.cpp +++ b/kstars/kstars/tools/modcalcangdist.cpp @@ -23,7 +23,7 @@ #include <tqcheckbox.h> #include <tqradiobutton.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> #include <kfiledialog.h> #include <kmessagebox.h> @@ -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 ); diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui index 77b92b4b..3f4659a5 100644 --- a/kstars/kstars/tools/modcalcangdistdlg.ui +++ b/kstars/kstars/tools/modcalcangdistdlg.ui @@ -36,7 +36,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -57,7 +57,7 @@ <property name="name"> <cstring>ra0Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -71,7 +71,7 @@ <property name="name"> <cstring>dec0Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -114,7 +114,7 @@ <property name="name"> <cstring>ra1Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -128,7 +128,7 @@ <property name="name"> <cstring>dec1Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -160,7 +160,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>145</width> <height>20</height> @@ -201,7 +201,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>146</width> <height>20</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>145</width> <height>20</height> @@ -256,7 +256,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>102</width> <height>20</height> @@ -275,7 +275,7 @@ <property name="name"> <cstring>distBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -314,7 +314,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>171</height> @@ -525,7 +525,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -541,7 +541,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -574,7 +574,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -593,7 +593,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index 17dfb81f..b4ee5454 100644 --- a/kstars/kstars/tools/modcalcapcoord.cpp +++ b/kstars/kstars/tools/modcalcapcoord.cpp @@ -30,7 +30,7 @@ #include <tqradiobutton.h> #include <tqdatetimeedit.h> //needed for TQTimeEdit #include <klineedit.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> #include <kfiledialog.h> #include <kmessagebox.h> @@ -64,7 +64,7 @@ void modCalcApCoord::showCurrentTime (void) { KStars *ks = (KStars*) parent()->parent()->parent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); } @@ -98,7 +98,7 @@ void modCalcApCoord::slotClearCoords(){ rafBox->clearFields(); decfBox->clearFields(); epoch0Name->setText(""); - datBox->setDate(ExtDate::tqcurrentDate()); + datBox->setDate(ExtDate::currentDate()); timBox->setTime(TQTime(0,0,0)); } @@ -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 ); diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index 9953b588..5a59fa1d 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -98,7 +98,7 @@ <property name="name"> <cstring>datBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -125,7 +125,7 @@ <property name="name"> <cstring>ra0Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -139,7 +139,7 @@ <property name="name"> <cstring>dec0Box</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -192,7 +192,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -258,7 +258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> @@ -288,7 +288,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>102</width> <height>20</height> @@ -297,7 +297,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <grid> <property name="name"> @@ -323,7 +323,7 @@ <property name="name"> <cstring>rafBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -337,7 +337,7 @@ <property name="name"> <cstring>decfBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -378,7 +378,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> @@ -440,7 +440,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -457,7 +457,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -526,7 +526,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -625,7 +625,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -641,7 +641,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -674,7 +674,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -693,7 +693,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index 818488f5..65c3f0e5 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -31,7 +31,7 @@ #include <tqcheckbox.h> #include <tqradiobutton.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kfiledialog.h> #include <kmessagebox.h> @@ -81,7 +81,7 @@ void modCalcAzel::showCurrentDateTime (void) { KStars *ks = (KStars*) parent()->parent()->parent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); @@ -179,7 +179,7 @@ void modCalcAzel::slotClearCoords() elBox->clearFields(); epochName->setText(""); - datBox->setDate(ExtDate::tqcurrentDate()); + datBox->setDate(ExtDate::currentDate()); timBox->setTime(TQTime(0,0,0)); } @@ -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 ); diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index 1b4b9d2d..ad8e076a 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -50,7 +50,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -114,7 +114,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -132,7 +132,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -154,7 +154,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -218,13 +218,13 @@ <property name="name"> <cstring>Compute</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>32767</height> @@ -238,13 +238,13 @@ <property name="name"> <cstring>Clear</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>32767</height> @@ -258,7 +258,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <hbox> <property name="name"> @@ -290,7 +290,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -312,7 +312,7 @@ <property name="name"> <cstring>decBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -334,7 +334,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -361,7 +361,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -383,7 +383,7 @@ <property name="name"> <cstring>azBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -413,7 +413,7 @@ <property name="name"> <cstring>elBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -437,7 +437,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>77</height> @@ -557,7 +557,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -574,7 +574,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -615,7 +615,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -632,7 +632,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -649,7 +649,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -677,7 +677,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -713,7 +713,7 @@ <property name="name"> <cstring>dateBoxBatch</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -801,7 +801,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -817,7 +817,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -850,7 +850,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -869,7 +869,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/kstars/kstars/tools/modcalcdaylength.cpp b/kstars/kstars/tools/modcalcdaylength.cpp index 08f836d2..97346c94 100644 --- a/kstars/kstars/tools/modcalcdaylength.cpp +++ b/kstars/kstars/tools/modcalcdaylength.cpp @@ -40,7 +40,7 @@ modCalcDayLength::~modCalcDayLength() {} void modCalcDayLength::showCurrentDate (void) { - KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt( KStarsDateTime::currentDateTime() ); datBox->setDate( dt.date() ); } @@ -71,7 +71,7 @@ void modCalcDayLength::slotClearCoords(){ elTransitBox->clearFields(); // reset to current date - datBox->setDate(ExtDate::tqcurrentDate()); + datBox->setDate(ExtDate::currentDate()); // reset times to 00:00:00 setTimeBox->clearFields(); diff --git a/kstars/kstars/tools/modcalcdaylengthdlg.ui b/kstars/kstars/tools/modcalcdaylengthdlg.ui index 458c7442..82aa6c12 100644 --- a/kstars/kstars/tools/modcalcdaylengthdlg.ui +++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui @@ -38,7 +38,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout37</cstring> + <cstring>layout37</cstring> </property> <grid> <property name="name"> @@ -56,7 +56,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>16</height> @@ -78,7 +78,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>16</height> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> @@ -127,7 +127,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -158,7 +158,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -174,7 +174,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>21</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -246,7 +246,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -264,7 +264,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>20</height> @@ -294,7 +294,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>20</height> @@ -332,7 +332,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>20</height> @@ -354,7 +354,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>20</height> @@ -384,7 +384,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -393,7 +393,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -427,7 +427,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -457,7 +457,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -479,7 +479,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -499,7 +499,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -518,7 +518,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -537,7 +537,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> diff --git a/kstars/kstars/tools/modcalceclipticcoords.cpp b/kstars/kstars/tools/modcalceclipticcoords.cpp index 0d8271ab..82132bc5 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.cpp +++ b/kstars/kstars/tools/modcalceclipticcoords.cpp @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqcheckbox.h> #include <tqradiobutton.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> #include <klineedit.h> #include <kapplication.h> @@ -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 ); diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui index 3430d683..98830fb3 100644 --- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui +++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>97</width> <height>21</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>96</width> <height>21</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>97</width> <height>21</height> @@ -125,7 +125,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>21</height> @@ -202,7 +202,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -261,7 +261,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -338,7 +338,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -372,7 +372,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -394,7 +394,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -416,7 +416,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>20</height> @@ -437,7 +437,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> @@ -486,7 +486,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -503,7 +503,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -548,7 +548,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -565,7 +565,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -726,7 +726,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22_3</cstring> + <cstring>layout22_3</cstring> </property> <hbox> <property name="name"> @@ -742,7 +742,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -775,7 +775,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -794,7 +794,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>16</height> diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index 45f66940..4b5d4eb1 100644 --- a/kstars/kstars/tools/modcalcequinox.cpp +++ b/kstars/kstars/tools/modcalcequinox.cpp @@ -27,7 +27,7 @@ #include <tqcombobox.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kfiledialog.h> #include <kmessagebox.h> #include <tqcheckbox.h> @@ -56,8 +56,8 @@ int modCalcEquinox::getYear (TQString eName) void modCalcEquinox::showCurrentYear (void) { - KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); - yearEdit->setText( TQString( "%1").tqarg( dt.date().year() ) ); + KStarsDateTime dt( KStarsDateTime::currentDateTime() ); + 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 ); diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui index 2c459b93..b62875ee 100644 --- a/kstars/kstars/tools/modcalcequinoxdlg.ui +++ b/kstars/kstars/tools/modcalcequinoxdlg.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>21</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>31</height> @@ -144,7 +144,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -210,7 +210,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>21</height> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>237</height> @@ -334,7 +334,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>21</height> @@ -430,7 +430,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <hbox> <property name="name"> @@ -446,7 +446,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -479,7 +479,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -498,7 +498,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>71</height> diff --git a/kstars/kstars/tools/modcalcgalcoord.cpp b/kstars/kstars/tools/modcalcgalcoord.cpp index 07344fbd..34206145 100644 --- a/kstars/kstars/tools/modcalcgalcoord.cpp +++ b/kstars/kstars/tools/modcalcgalcoord.cpp @@ -26,7 +26,7 @@ #include <tqstring.h> #include <tqcheckbox.h> #include <tqradiobutton.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> #include <klineedit.h> #include <kapplication.h> @@ -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 ); diff --git a/kstars/kstars/tools/modcalcgalcoorddlg.ui b/kstars/kstars/tools/modcalcgalcoorddlg.ui index e1741cb4..3b296fe0 100644 --- a/kstars/kstars/tools/modcalcgalcoorddlg.ui +++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>97</width> <height>21</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>96</width> <height>21</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>97</width> <height>21</height> @@ -125,7 +125,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>21</height> @@ -202,7 +202,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -261,7 +261,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>15</width> <height>20</height> @@ -338,7 +338,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -372,7 +372,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -394,7 +394,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -420,7 +420,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>160</height> @@ -469,7 +469,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -486,7 +486,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -601,7 +601,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -618,7 +618,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -709,7 +709,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22_3</cstring> + <cstring>layout22_3</cstring> </property> <hbox> <property name="name"> @@ -725,7 +725,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -758,7 +758,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -777,7 +777,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>71</height> diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp index 2f750758..29fc47e3 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.cpp +++ b/kstars/kstars/tools/modcalcgeodcoord.cpp @@ -25,7 +25,7 @@ #include <tqradiobutton.h> #include <tqstring.h> #include <tqcheckbox.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kcombobox.h> #include <klineedit.h> @@ -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 ); diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui index bb74be14..03b9aeff 100644 --- a/kstars/kstars/tools/modcalcgeoddlg.ui +++ b/kstars/kstars/tools/modcalcgeoddlg.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout31</cstring> + <cstring>layout31</cstring> </property> <hbox> <property name="name"> @@ -58,7 +58,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -112,7 +112,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>21</height> @@ -189,7 +189,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <hbox> <property name="name"> @@ -262,7 +262,7 @@ <property name="name"> <cstring>lonGeoBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -276,7 +276,7 @@ <property name="name"> <cstring>latGeoBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -584,7 +584,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <hbox> <property name="name"> @@ -600,7 +600,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -633,7 +633,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -652,7 +652,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp index 7fb71c4c..8b87b998 100644 --- a/kstars/kstars/tools/modcalcjd.cpp +++ b/kstars/kstars/tools/modcalcjd.cpp @@ -95,7 +95,7 @@ void modCalcJD::slotClearTime (void) { JdName->setText (""); MjdName->setText (""); - datBox->setDate( ExtDate::tqcurrentDate() ); + datBox->setDate( ExtDate::currentDate() ); timBox->setTime(TQTime(0,0,0)); } @@ -103,7 +103,7 @@ void modCalcJD::showCurrentTime (void) { KStars *ks = (KStars*) parent()->parent()->parent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); computeFromCalendar(); diff --git a/kstars/kstars/tools/modcalcjddlg.ui b/kstars/kstars/tools/modcalcjddlg.ui index c94441cc..b5c1c5b8 100644 --- a/kstars/kstars/tools/modcalcjddlg.ui +++ b/kstars/kstars/tools/modcalcjddlg.ui @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -100,7 +100,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout37</cstring> + <cstring>layout37</cstring> </property> <hbox> <property name="name"> @@ -129,7 +129,7 @@ <property name="name"> <cstring>JdName</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>130</width> <height>0</height> @@ -161,7 +161,7 @@ <property name="name"> <cstring>MjdName</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>130</width> <height>0</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -212,7 +212,7 @@ <property name="name"> <cstring>timBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -256,7 +256,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -284,7 +284,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -300,7 +300,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>23</width> <height>20</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>39</width> <height>21</height> @@ -352,13 +352,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>30</height> @@ -378,7 +378,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>37</width> <height>20</height> @@ -397,13 +397,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>30</height> @@ -423,7 +423,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>38</width> <height>20</height> @@ -442,7 +442,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index 8273f6be..a930033b 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -31,7 +31,7 @@ #include <tqcombobox.h> #include <tqdatetimeedit.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kfiledialog.h> #include <kmessagebox.h> #include <tqcheckbox.h> @@ -51,7 +51,7 @@ modCalcPlanets::~modCalcPlanets(){ void modCalcPlanets::showCurrentDateTime (void) { KStars *ks = (KStars*) parent()->parent()->parent(); // TQSplitter->AstroCalc->KStars - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); dateBox->setDate( dt.date() ); timeBox->setTime( dt.time() ); @@ -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++; diff --git a/kstars/kstars/tools/modcalcplanetsdlg.ui b/kstars/kstars/tools/modcalcplanetsdlg.ui index 2f25aa40..638a1fbd 100644 --- a/kstars/kstars/tools/modcalcplanetsdlg.ui +++ b/kstars/kstars/tools/modcalcplanetsdlg.ui @@ -47,7 +47,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>21</height> @@ -148,7 +148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -159,7 +159,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -167,7 +167,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -177,7 +177,7 @@ <property name="name"> <cstring>dateBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>0</height> @@ -199,7 +199,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -234,7 +234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -243,7 +243,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -261,7 +261,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -283,7 +283,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -305,7 +305,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -318,7 +318,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -337,7 +337,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -347,7 +347,7 @@ <property name="name"> <cstring>raBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -374,7 +374,7 @@ <property name="name"> <cstring>decBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -393,7 +393,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -415,7 +415,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <grid> <property name="name"> @@ -433,7 +433,7 @@ <property name="name"> <cstring>altBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -452,7 +452,7 @@ <property name="name"> <cstring>azBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -471,7 +471,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -495,7 +495,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -513,7 +513,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -535,7 +535,7 @@ <property name="name"> <cstring>helLongBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -554,7 +554,7 @@ <property name="name"> <cstring>helLatBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -581,7 +581,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -590,7 +590,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -616,7 +616,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -638,7 +638,7 @@ <property name="name"> <cstring>geoLongBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -649,7 +649,7 @@ <property name="name"> <cstring>geoLatBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -676,7 +676,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -687,7 +687,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -703,7 +703,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>20</height> @@ -728,7 +728,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -753,7 +753,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> @@ -772,7 +772,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>60</height> @@ -829,7 +829,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -857,7 +857,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -882,7 +882,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -1143,7 +1143,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14_2</cstring> + <cstring>layout14_2</cstring> </property> <hbox> <property name="name"> @@ -1159,7 +1159,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -1192,7 +1192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -1211,7 +1211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp index 05ef4718..10087590 100644 --- a/kstars/kstars/tools/modcalcprec.cpp +++ b/kstars/kstars/tools/modcalcprec.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <tqradiobutton.h> -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> #include <klineedit.h> #include <kapplication.h> @@ -57,13 +57,13 @@ 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; } double modCalcPrec::setCurrentEpoch () { - return KStarsDateTime::tqcurrentDateTime().epoch(); + return KStarsDateTime::currentDateTime().epoch(); } double modCalcPrec::getEpoch (TQString 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 ); diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui index 3811922b..d0f7af15 100644 --- a/kstars/kstars/tools/modcalcprecdlg.ui +++ b/kstars/kstars/tools/modcalcprecdlg.ui @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>98</width> <height>20</height> @@ -64,7 +64,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <grid> <property name="name"> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>98</width> <height>20</height> @@ -151,7 +151,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> @@ -192,7 +192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>21</height> @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -273,7 +273,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <grid> <property name="name"> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -342,7 +342,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> @@ -551,7 +551,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14_2</cstring> + <cstring>layout14_2</cstring> </property> <hbox> <property name="name"> @@ -567,7 +567,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -600,7 +600,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -619,7 +619,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>30</height> diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index d973d902..62c53fb4 100644 --- a/kstars/kstars/tools/modcalcsidtime.cpp +++ b/kstars/kstars/tools/modcalcsidtime.cpp @@ -19,7 +19,7 @@ #include <tqradiobutton.h> #include <tqcheckbox.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kfiledialog.h> #include <kmessagebox.h> @@ -99,7 +99,7 @@ dms modCalcSidTime::getLongitude( void ) } void modCalcSidTime::slotClearFields(){ - datBox->setDate(ExtDate::tqcurrentDate()); + datBox->setDate(ExtDate::currentDate()); TQTime time(0,0,0); UtBox->setTime(time); StBox->setTime(time); @@ -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 ); diff --git a/kstars/kstars/tools/modcalcsidtimedlg.ui b/kstars/kstars/tools/modcalcsidtimedlg.ui index 055446fd..e7203887 100644 --- a/kstars/kstars/tools/modcalcsidtimedlg.ui +++ b/kstars/kstars/tools/modcalcsidtimedlg.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout47</cstring> + <cstring>layout47</cstring> </property> <hbox> <property name="name"> @@ -111,7 +111,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -125,7 +125,7 @@ <property name="name"> <cstring>datBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -141,7 +141,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>21</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>21</height> @@ -207,7 +207,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -218,7 +218,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout47</cstring> + <cstring>layout47</cstring> </property> <hbox> <property name="name"> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -275,7 +275,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -305,7 +305,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -335,7 +335,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -356,7 +356,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>204</height> @@ -391,7 +391,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -406,7 +406,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout30</cstring> + <cstring>layout30</cstring> </property> <grid> <property name="name"> @@ -452,7 +452,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -474,7 +474,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -483,7 +483,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <grid> <property name="name"> @@ -501,7 +501,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -559,7 +559,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -647,7 +647,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22_3</cstring> + <cstring>layout22_3</cstring> </property> <hbox> <property name="name"> @@ -663,7 +663,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -696,7 +696,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -715,7 +715,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>16</height> diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index 5a499c5c..580d8324 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -32,7 +32,7 @@ #include <tqcheckbox.h> #include <tqradiobutton.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kfiledialog.h> #include <kmessagebox.h> @@ -143,7 +143,7 @@ void modCalcVlsr::showCurrentDateTime (void) { KStars *ks = (KStars*) parent()->parent()->parent(); - KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt = ks->data()->geo()->LTtoUT( KStarsDateTime::currentDateTime() ); datBox->setDate( dt.date() ); timBox->setTime( dt.time() ); @@ -212,7 +212,7 @@ void modCalcVlsr::slotClearCoords() vGeoBox->setText(""); vTopoBox->setText(""); - datBox->setDate(ExtDate::tqcurrentDate()); + datBox->setDate(ExtDate::currentDate()); timBox->setTime(TQTime(0,0,0)); } @@ -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 ); diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui index e096407d..0c177d99 100644 --- a/kstars/kstars/tools/modcalcvlsrdlg.ui +++ b/kstars/kstars/tools/modcalcvlsrdlg.ui @@ -47,7 +47,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -93,7 +93,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -145,7 +145,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -155,7 +155,7 @@ <property name="name"> <cstring>heightBox</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>1000</width> <height>32767</height> @@ -169,7 +169,7 @@ <property name="name"> <cstring>longBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -207,7 +207,7 @@ <property name="name"> <cstring>latBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -223,7 +223,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -239,7 +239,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>31</height> @@ -272,7 +272,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -294,7 +294,7 @@ <property name="name"> <cstring>decBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -316,7 +316,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -343,7 +343,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> @@ -354,7 +354,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -435,7 +435,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>21</height> @@ -510,13 +510,13 @@ <property name="name"> <cstring>Compute</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>32767</height> @@ -530,13 +530,13 @@ <property name="name"> <cstring>Clear</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>120</width> <height>32767</height> @@ -558,7 +558,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -675,7 +675,7 @@ <property name="name"> <cstring>dateBoxBatch</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -689,7 +689,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -706,7 +706,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -736,7 +736,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -764,7 +764,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -937,7 +937,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -953,7 +953,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -986,7 +986,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>21</height> @@ -1005,7 +1005,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index 3e73048f..64c031f8 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -19,7 +19,7 @@ #include <tqfile.h> #include <tqdir.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqstringlist.h> #include <tqwidgetstack.h> #include <klistview.h> @@ -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 == ""; diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui index 57a1403b..4a664c0c 100644 --- a/kstars/kstars/tools/observinglistui.ui +++ b/kstars/kstars/tools/observinglistui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout68</cstring> + <cstring>layout68</cstring> </property> <hbox> <property name="name"> @@ -39,13 +39,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -73,13 +73,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -107,13 +107,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -141,13 +141,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>350</width> <height>20</height> @@ -192,13 +192,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -218,7 +218,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -350,7 +350,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -488,7 +488,7 @@ <verstretch>4</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>100</height> @@ -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> @@ -534,13 +534,13 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>100</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>160</height> diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp index cf585325..314b4066 100644 --- a/kstars/kstars/tools/obslistwizard.cpp +++ b/kstars/kstars/tools/obslistwizard.cpp @@ -16,7 +16,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidgetstack.h> #include <knuminput.h> #include <klistbox.h> @@ -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 ) { diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui index b5bb1eaf..e7891bed 100644 --- a/kstars/kstars/tools/obslistwizardui.ui +++ b/kstars/kstars/tools/obslistwizardui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout79</cstring> + <cstring>layout79</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <vbox> <property name="name"> @@ -117,7 +117,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> @@ -164,7 +164,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -225,7 +225,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -342,7 +342,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout48</cstring> + <cstring>layout48</cstring> </property> <grid> <property name="name"> @@ -371,7 +371,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -393,7 +393,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -455,7 +455,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -477,7 +477,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -496,7 +496,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>215</height> @@ -529,7 +529,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -574,7 +574,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -596,7 +596,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -629,7 +629,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>170</height> @@ -659,7 +659,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -669,7 +669,7 @@ <property name="name"> <cstring>Date</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>160</width> <height>0</height> @@ -686,7 +686,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -697,7 +697,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -736,7 +736,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5_2</cstring> + <cstring>layout5_2</cstring> </property> <hbox> <property name="name"> @@ -752,7 +752,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -780,7 +780,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -799,7 +799,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>176</height> @@ -829,7 +829,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <hbox> <property name="name"> @@ -861,7 +861,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>295</width> <height>20</height> @@ -895,7 +895,7 @@ have &no magnitude</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>179</height> @@ -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> diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui index 4a9e11e3..775b2270 100644 --- a/kstars/kstars/tools/optionstreeview.ui +++ b/kstars/kstars/tools/optionstreeview.ui @@ -62,7 +62,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index d036b925..429b1f7b 100644 --- a/kstars/kstars/tools/planetviewer.cpp +++ b/kstars/kstars/tools/planetviewer.cpp @@ -17,7 +17,7 @@ #include <stdlib.h> //needed for abs() on some platforms #include <tqfile.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <klocale.h> #include <kglobal.h> @@ -233,7 +233,7 @@ PVPlotWidget::PVPlotWidget( double x1, double x2, double y1, double y2, TQWidget mouseButtonDown(false), oldx(0), oldy(0) { setFocusPolicy( TQ_StrongFocus ); setMouseTracking (true); - pv = (PlanetViewer*)tqtopLevelWidget(); + pv = (PlanetViewer*)topLevelWidget(); } PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) : @@ -241,7 +241,7 @@ PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) : mouseButtonDown(false), oldx(0), oldy(0) { setFocusPolicy( TQ_StrongFocus ); setMouseTracking (true); - pv = (PlanetViewer*)tqtopLevelWidget(); + pv = (PlanetViewer*)topLevelWidget(); } PVPlotWidget::~ PVPlotWidget() {} @@ -416,7 +416,7 @@ void PVPlotWidget::mouseMoveEvent( TQMouseEvent *e ) { setLimits( xc - 0.5*dataWidth(), xc + 0.5*dataWidth(), yc - 0.5*dataHeight(), yc + 0.5*dataHeight() ); update(); - kapp->tqprocessEvents(20); + kapp->processEvents(20); } oldx = e->x(); diff --git a/kstars/kstars/tools/planetviewerui.ui b/kstars/kstars/tools/planetviewerui.ui index d2ac73a7..77b8db5a 100644 --- a/kstars/kstars/tools/planetviewerui.ui +++ b/kstars/kstars/tools/planetviewerui.ui @@ -26,7 +26,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -44,7 +44,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>34</width> <height>34</height> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>20</height> diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index 183b22d4..745a52ef 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -45,7 +45,7 @@ #include <tqwidgetstack.h> #include <tqwidget.h> #include <tqptrlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqdatetimeedit.h> #include <tqradiobutton.h> #include <tqbuttongroup.h> @@ -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; @@ -903,7 +903,7 @@ void ScriptBuilder::slotRunScript() { if ( ! p.start( KProcess::DontCare ) ) kdDebug() << "Process did not start." << endl; - while ( p.isRunning() ) kapp->tqprocessEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. //delete temp file if ( f.exists() ) f.remove(); @@ -920,7 +920,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) { ostream << "#!/bin/bash" << endl; ostream << "#KStars DCOP script: " << currentScriptName << endl; ostream << "#by " << currentAuthor << endl; - ostream << "#last modified: " << KStarsDateTime::tqcurrentDateTime().toString() << endl; + ostream << "#last modified: " << KStarsDateTime::currentDateTime().toString() << endl; ostream << "#" << endl; ostream << "KSTARS=`dcopfind -a 'kstars*'`" << endl; ostream << "MAIN=KStarsInterface" << endl; @@ -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() @@ -1322,7 +1322,7 @@ void ScriptBuilder::slotArgWidget() { if (ok) month = sf->argVal(1).toInt(&ok); if (ok) day = sf->argVal(2).toInt(&ok); if (ok) argSetLocalTime->DateBox->setDate( ExtDate( year, month, day ) ); - else argSetLocalTime->DateBox->setDate( ExtDate::tqcurrentDate() ); + else argSetLocalTime->DateBox->setDate( ExtDate::currentDate() ); hour = sf->argVal(3).toInt(&ok); if ( sf->argVal(3).isEmpty() ) ok = false; @@ -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; } diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui index 7b6d8feb..e34e6dcb 100644 --- a/kstars/kstars/tools/scriptbuilderui.ui +++ b/kstars/kstars/tools/scriptbuilderui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -39,13 +39,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -73,13 +73,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -107,13 +107,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -141,13 +141,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -167,13 +167,13 @@ <property name="name"> <cstring>RunButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>490</width> <height>20</height> @@ -240,7 +240,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -267,7 +267,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -277,13 +277,13 @@ <property name="name"> <cstring>AddButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -304,13 +304,13 @@ <property name="name"> <cstring>RemoveButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -330,13 +330,13 @@ <property name="name"> <cstring>CopyButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -356,13 +356,13 @@ <property name="name"> <cstring>UpButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -382,13 +382,13 @@ <property name="name"> <cstring>DownButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -414,7 +414,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>118</height> @@ -437,7 +437,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>140</height> @@ -554,7 +554,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -562,7 +562,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -602,7 +602,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> diff --git a/kstars/kstars/tools/scriptfunction.cpp b/kstars/kstars/tools/scriptfunction.cpp index 8b74ab61..c95594f5 100644 --- a/kstars/kstars/tools/scriptfunction.cpp +++ b/kstars/kstars/tools/scriptfunction.cpp @@ -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; diff --git a/kstars/kstars/tools/scriptnamedialog.ui b/kstars/kstars/tools/scriptnamedialog.ui index fb176c14..108a8b95 100644 --- a/kstars/kstars/tools/scriptnamedialog.ui +++ b/kstars/kstars/tools/scriptnamedialog.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -75,7 +75,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>330</width> <height>20</height> diff --git a/kstars/kstars/tools/wutdialog.cpp b/kstars/kstars/tools/wutdialog.cpp index 73d3d8a1..3095e306 100644 --- a/kstars/kstars/tools/wutdialog.cpp +++ b/kstars/kstars/tools/wutdialog.cpp @@ -38,7 +38,7 @@ #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> #include <tqtabbar.h> #include <tqtimer.h> @@ -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(); diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui index 2bdeb50e..b80697da 100644 --- a/kstars/kstars/tools/wutdialogui.ui +++ b/kstars/kstars/tools/wutdialogui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <vbox> <property name="name"> @@ -37,7 +37,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <grid> <property name="name"> @@ -47,7 +47,7 @@ <property name="name"> <cstring>LocationLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -106,7 +106,7 @@ <property name="name"> <cstring>DateLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -125,7 +125,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>108</width> <height>20</height> @@ -162,7 +162,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -241,7 +241,7 @@ <property name="name"> <cstring>SunRiseLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -261,7 +261,7 @@ <property name="name"> <cstring>MoonRiseLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -281,7 +281,7 @@ <property name="name"> <cstring>MoonSetLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -301,7 +301,7 @@ <property name="name"> <cstring>SunSetLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -321,7 +321,7 @@ <property name="name"> <cstring>NightDurationLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -341,7 +341,7 @@ <property name="name"> <cstring>MoonIllumLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -361,7 +361,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -377,7 +377,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>164</width> <height>12</height> @@ -402,7 +402,7 @@ <property name="name"> <cstring>ObjectListBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -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"> @@ -478,7 +478,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -519,7 +519,7 @@ <property name="name"> <cstring>CategoryListBox</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> diff --git a/ktouch/ChangeLog b/ktouch/ChangeLog index 58ac84b8..2a918ddc 100644 --- a/ktouch/ChangeLog +++ b/ktouch/ChangeLog @@ -81,7 +81,7 @@ * Bugfixes: sliding line typing limit, removed mid-level advance (due to popular request) reset session stats in every new level - * Added: new keyboard tqlayout for switzerland-german keyboards + * Added: new keyboard layout for switzerland-german keyboards 2004-11-02 Andreas Nicolai <andreas.nicolai@gmx.net> * Added: checks in the quick-select menues diff --git a/ktouch/keyboards/be.keyboard b/ktouch/keyboards/be.keyboard index 6de3fa0c..3995e5fd 100644 --- a/ktouch/keyboards/be.keyboard +++ b/ktouch/keyboards/be.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. #################################################### @@ -38,7 +38,7 @@ ControlKey 8 BackSpace 130 0 20 10 # # NormalKey: These keys are the keys that are visible on the keyboard. To # get the character (unicod) you don't have to press anything else -# but the key. The FingerKey tqunicode number tells the program +# but the key. The FingerKey unicode number tells the program # which finger has to be moved to press this key. # # Unicode KeyText x y FingerKey @@ -90,8 +90,8 @@ NormalKey 61 = 113 30 109 # # HiddenKey: These are actually not "hidden" keys as such, but the characters # that are obtained by pressing a key and a certain modifier key. -# Define the character via its tqunicode and then also -# the tqunicode for the base character on the key to be pressed. +# Define the character via its unicode and then also +# the unicode for the base character on the key to be pressed. # Also define the character/key of the finger that needs to # press the key and the modifier key that needs to be highlighted. # diff --git a/ktouch/keyboards/bg.keyboard b/ktouch/keyboards/bg.keyboard index 57c0f657..87a71a62 100644 --- a/ktouch/keyboards/bg.keyboard +++ b/ktouch/keyboards/bg.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/de.keyboard b/ktouch/keyboards/de.keyboard index 10d7ac7e..170fe821 100644 --- a/ktouch/keyboards/de.keyboard +++ b/ktouch/keyboards/de.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for german keybord tqlayout +# Keybord layout file for german keybord layout # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/de.neo.keyboard b/ktouch/keyboards/de.neo.keyboard index 6fce086a..9f2c883e 100644 --- a/ktouch/keyboards/de.neo.keyboard +++ b/ktouch/keyboards/de.neo.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/de.swiss.keyboard b/ktouch/keyboards/de.swiss.keyboard index d02d2826..95c494db 100644 --- a/ktouch/keyboards/de.swiss.keyboard +++ b/ktouch/keyboards/de.swiss.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for german kaybord tqlayout +# Keybord layout file for german kaybord layout # Adaptiert für schweizedeutsche Tastatur 17.9.04 Hansueli Eggimann # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. diff --git a/ktouch/keyboards/dk.keyboard b/ktouch/keyboards/dk.keyboard index 23f7128e..7b781aa8 100644 --- a/ktouch/keyboards/dk.keyboard +++ b/ktouch/keyboards/dk.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Danish kaybord +# Keybord layout file for Danish kaybord # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/dvorak_fr.keyboard b/ktouch/keyboards/dvorak_fr.keyboard index f80bdffe..6b90ed3e 100644 --- a/ktouch/keyboards/dvorak_fr.keyboard +++ b/ktouch/keyboards/dvorak_fr.keyboard @@ -1,7 +1,7 @@ # -*- coding: utf-8; -*- #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # Matthieu MOY, December 7th 2004 diff --git a/ktouch/keyboards/ee.keyboard b/ktouch/keyboards/ee.keyboard index 7e79a353..bd2a880e 100644 --- a/ktouch/keyboards/ee.keyboard +++ b/ktouch/keyboards/ee.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/en.dvorak.keyboard b/ktouch/keyboards/en.dvorak.keyboard index 295d4f43..d191f544 100644 --- a/ktouch/keyboards/en.dvorak.keyboard +++ b/ktouch/keyboards/en.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/en.keyboard b/ktouch/keyboards/en.keyboard index 84a3f31b..c0e9f2d1 100644 --- a/ktouch/keyboards/en.keyboard +++ b/ktouch/keyboards/en.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. #################################################### @@ -38,7 +38,7 @@ ControlKey 8 BackSpace 140 0 10 10 # # NormalKey: These keys are the keys that are visible on the keyboard. To # get the character (unicod) you don't have to press anything else -# but the key. The FingerKey tqunicode number tells the program +# but the key. The FingerKey unicode number tells the program # which finger has to be moved to press this key. # # Unicode KeyText x y FingerKey @@ -89,8 +89,8 @@ NormalKey 47 / 113 30 59 # # HiddenKey: These are actually not "hidden" keys as such, but the characters # that are obtained by pressing a key and a certain modifier key. -# Define the character via its tqunicode and then also -# the tqunicode for the base character on the key to be pressed. +# Define the character via its unicode and then also +# the unicode for the base character on the key to be pressed. # Also define the character/key of the finger that needs to # press the key and the modifier key that needs to be highlighted. # diff --git a/ktouch/keyboards/es.dvorak.keyboard b/ktouch/keyboards/es.dvorak.keyboard index 56da935b..2dd84046 100644 --- a/ktouch/keyboards/es.dvorak.keyboard +++ b/ktouch/keyboards/es.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/es.keyboard b/ktouch/keyboards/es.keyboard index cae885f8..5211488e 100644 --- a/ktouch/keyboards/es.keyboard +++ b/ktouch/keyboards/es.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fi.keyboard b/ktouch/keyboards/fi.keyboard index 10775703..9edcd996 100644 --- a/ktouch/keyboards/fi.keyboard +++ b/ktouch/keyboards/fi.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fr.a.keyboard b/ktouch/keyboards/fr.a.keyboard index 0916da15..d18e4cfb 100644 --- a/ktouch/keyboards/fr.a.keyboard +++ b/ktouch/keyboards/fr.a.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fr.keyboard b/ktouch/keyboards/fr.keyboard index 81f54847..edfcf537 100644 --- a/ktouch/keyboards/fr.keyboard +++ b/ktouch/keyboards/fr.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/fr.swiss.keyboard b/ktouch/keyboards/fr.swiss.keyboard index e56f6bf6..ba89c072 100644 --- a/ktouch/keyboards/fr.swiss.keyboard +++ b/ktouch/keyboards/fr.swiss.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for swiss french keybord tqlayout +# Keybord layout file for swiss french keybord layout #################################################### # # Assci KeyText x y diff --git a/ktouch/keyboards/he.keyboard b/ktouch/keyboards/he.keyboard index f09db772..e03f5bd1 100644 --- a/ktouch/keyboards/he.keyboard +++ b/ktouch/keyboards/he.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Hebrew +# Keybord layout file for Hebrew #################################################### # # diff --git a/ktouch/keyboards/hu.keyboard b/ktouch/keyboards/hu.keyboard index bdf90711..afd77ef1 100644 --- a/ktouch/keyboards/hu.keyboard +++ b/ktouch/keyboards/hu.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Hungarian keybord tqlayout file +# Hungarian keybord layout file # Code=UTF-8 #################################################### # diff --git a/ktouch/keyboards/it.keyboard b/ktouch/keyboards/it.keyboard index 1d99b944..3f9c5828 100644 --- a/ktouch/keyboards/it.keyboard +++ b/ktouch/keyboards/it.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/la.keyboard b/ktouch/keyboards/la.keyboard index 0094f924..55d6c6cd 100644 --- a/ktouch/keyboards/la.keyboard +++ b/ktouch/keyboards/la.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Latin keyboard +# Keybord layout file for Latin keyboard #################################################### # # diff --git a/ktouch/keyboards/nb.keyboard b/ktouch/keyboards/nb.keyboard index 13448d50..ca4f503d 100644 --- a/ktouch/keyboards/nb.keyboard +++ b/ktouch/keyboards/nb.keyboard @@ -1,11 +1,11 @@ #################################################### # KTouch -# Keybord tqlayout file for Norwegian keyboard +# Keybord layout file for Norwegian keyboard # Encoding: UTF-8 (save as UTF-8 from editor) # Made by Axel Bojer by manipulating the danish file # Edit this file with tabs set to 8 characters. # The Unicode characters are found in an extensive list -# over html codes -- see http://www.fileformat.info/info/tqunicode/ +# over html codes -- see http://www.fileformat.info/info/unicode/ # # Refer to file en.keyboard for details. #################################################### diff --git a/ktouch/keyboards/nn.keyboard b/ktouch/keyboards/nn.keyboard index c6592195..79e9675b 100644 --- a/ktouch/keyboards/nn.keyboard +++ b/ktouch/keyboards/nn.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Norwegian kaybord +# Keybord layout file for Norwegian kaybord #################################################### # # Assci KeyText x y diff --git a/ktouch/keyboards/pl.keyboard b/ktouch/keyboards/pl.keyboard index fbb3961a..8c5c3590 100644 --- a/ktouch/keyboards/pl.keyboard +++ b/ktouch/keyboards/pl.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Polish (utf-8) +# Keybord layout file for Polish (utf-8) # Mikolaj Machowski # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. diff --git a/ktouch/keyboards/pt.br.keyboard b/ktouch/keyboards/pt.br.keyboard index fe0e7bd9..be9af86f 100644 --- a/ktouch/keyboards/pt.br.keyboard +++ b/ktouch/keyboards/pt.br.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for brazilian keyboard +# Keybord layout file for brazilian keyboard #################################################### # # diff --git a/ktouch/keyboards/pt.keyboard b/ktouch/keyboards/pt.keyboard index 0309d97f..287c431d 100644 --- a/ktouch/keyboards/pt.keyboard +++ b/ktouch/keyboards/pt.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for portuguese keyboard +# Keybord layout file for portuguese keyboard #################################################### # # diff --git a/ktouch/keyboards/ru.2.keyboard b/ktouch/keyboards/ru.2.keyboard index c2645a1a..a3cf2039 100644 --- a/ktouch/keyboards/ru.2.keyboard +++ b/ktouch/keyboards/ru.2.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/ru.3.keyboard b/ktouch/keyboards/ru.3.keyboard index af32a33a..24d925a1 100644 --- a/ktouch/keyboards/ru.3.keyboard +++ b/ktouch/keyboards/ru.3.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for Russian +# Keybord layout file for Russian # Miha Ulanov (mulanov@mail.ru) # Code=UTF-8 #################################################### diff --git a/ktouch/keyboards/ru.basic.keyboard b/ktouch/keyboards/ru.basic.keyboard index 15fa4ce8..df3cfb77 100644 --- a/ktouch/keyboards/ru.basic.keyboard +++ b/ktouch/keyboards/ru.basic.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian basic keyboard tqlayout file for KTouch. +# Russian basic keyboard layout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/ru.keyboard b/ktouch/keyboards/ru.keyboard index f249ad83..651addf8 100644 --- a/ktouch/keyboards/ru.keyboard +++ b/ktouch/keyboards/ru.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian Windows keyboard tqlayout file for KTouch. +# Russian Windows keyboard layout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/ru.typewriter.keyboard b/ktouch/keyboards/ru.typewriter.keyboard index c57e17ac..67f16032 100644 --- a/ktouch/keyboards/ru.typewriter.keyboard +++ b/ktouch/keyboards/ru.typewriter.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian typewriter keyboard tqlayout file for KTouch. +# Russian typewriter keyboard layout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/ru.winkeys.keyboard b/ktouch/keyboards/ru.winkeys.keyboard index 024d1c2c..5d412f99 100644 --- a/ktouch/keyboards/ru.winkeys.keyboard +++ b/ktouch/keyboards/ru.winkeys.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Russian winkeys keyboard tqlayout file for KTouch. +# Russian winkeys keyboard layout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/sl.keyboard b/ktouch/keyboards/sl.keyboard index 6918a8ae..2f482f39 100644 --- a/ktouch/keyboards/sl.keyboard +++ b/ktouch/keyboards/sl.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for slovenian keybord tqlayout +# Keybord layout file for slovenian keybord layout # Code=UTF-8 #################################################### # diff --git a/ktouch/keyboards/sv.dvorak.keyboard b/ktouch/keyboards/sv.dvorak.keyboard index e81e1c0b..acb0acab 100644 --- a/ktouch/keyboards/sv.dvorak.keyboard +++ b/ktouch/keyboards/sv.dvorak.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Swedish Dvorak Keybord tqlayout file +# Swedish Dvorak Keybord layout file #################################################### # # Ascii KeyText x y diff --git a/ktouch/keyboards/sv.keyboard b/ktouch/keyboards/sv.keyboard index 9e9ba96c..597a315d 100644 --- a/ktouch/keyboards/sv.keyboard +++ b/ktouch/keyboards/sv.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file for swedish keybord tqlayout +# Keybord layout file for swedish keybord layout # Encoding: UTF-8 (save as UTF-8 from editor) # Edit this file with tabs set to 8 characters. # diff --git a/ktouch/keyboards/tr.f.keyboard b/ktouch/keyboards/tr.f.keyboard index 1953e9d4..92c08944 100644 --- a/ktouch/keyboards/tr.f.keyboard +++ b/ktouch/keyboards/tr.f.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Turkish F Keybord tqlayout file +# Turkish F Keybord layout file #################################################### # This file distributed without any expressed or implied warranty # Written by Nilgün Belma Bugüner <nilgun at belgeler dot org>, 2005 diff --git a/ktouch/keyboards/tr.q.keyboard b/ktouch/keyboards/tr.q.keyboard index cfdac334..2fb7e1c2 100644 --- a/ktouch/keyboards/tr.q.keyboard +++ b/ktouch/keyboards/tr.q.keyboard @@ -1,6 +1,6 @@ #################################################### # KTouch -# Keybord tqlayout file +# Keybord layout file #################################################### # # diff --git a/ktouch/keyboards/uk.basic.keyboard b/ktouch/keyboards/uk.basic.keyboard index c1807e27..6ea507c4 100644 --- a/ktouch/keyboards/uk.basic.keyboard +++ b/ktouch/keyboards/uk.basic.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian basic keyboard tqlayout file for KTouch. +# Ukrainian basic keyboard layout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/uk.typewriter.keyboard b/ktouch/keyboards/uk.typewriter.keyboard index 08c88015..129ac807 100644 --- a/ktouch/keyboards/uk.typewriter.keyboard +++ b/ktouch/keyboards/uk.typewriter.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian typewriter keyboard tqlayout file for KTouch. +# Ukrainian typewriter keyboard layout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/keyboards/uk.winkeys.keyboard b/ktouch/keyboards/uk.winkeys.keyboard index 47d09711..d378df30 100644 --- a/ktouch/keyboards/uk.winkeys.keyboard +++ b/ktouch/keyboards/uk.winkeys.keyboard @@ -1,6 +1,6 @@ #################################################### # -# Ukrainian winkeys keyboard tqlayout file for KTouch. +# Ukrainian winkeys keyboard layout file for KTouch. # # Created by Alexander Pravdin <aledin@mail.ru>. # diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index cf6bd2e3..6c9a78c8 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -75,7 +75,7 @@ KTouch::KTouch() setupActions(); // create the GUI reading the ui.rc file if (!initialGeometrySet()) - resize( TQSize(700, 510).expandedTo(tqminimumSizeHint())); + resize( TQSize(700, 510).expandedTo(minimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); // Read user statistics @@ -179,10 +179,10 @@ void KTouch::keyPressEvent(TQKeyEvent *keyEvent) { if (keyEvent->text().length() > 1) { kdDebug() << "[KTouch::keyPressEvent] text = '" << TQString(keyEvent->text()).ascii() << "'" << endl; } - TQChar key = keyEvent->text().at(0); // get first tqunicode character + TQChar key = keyEvent->text().at(0); // get first unicode character // HACK : manually filter out known dead keys // bool has_dead_key = true; - switch (key.tqunicode()) { + switch (key.unicode()) { case 94 : m_lastDeadKey = TQChar(uint(94)); break; case 176 : m_lastDeadKey = TQChar(uint(176)); break; case 180 : m_lastDeadKey = TQChar(uint(180)); break; @@ -459,18 +459,18 @@ 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); } // ---------------------------------------------------------------------------- void KTouch::changeKeyboard(int num) { if (static_cast<unsigned int>(num)>=m_keyboardFiles.count()) return; Prefs::setCurrentKeyboardFile( m_keyboardFiles[num] ); -// kdDebug() << "[KTouch::changeKeyboard] new keyboard tqlayout = " << Prefs::currentKeyboardFile() << endl; +// kdDebug() << "[KTouch::changeKeyboard] new keyboard layout = " << Prefs::currentKeyboardFile() << endl; m_keyboardLayoutAction->setCurrentItem(num); - // call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen tqlayout file is corrupt + // call Apply-Preferenzes in "noisy"-mode, pop up an error if the chosen layout file is corrupt m_keyboardWidget->applyPreferences(this, false); } // ---------------------------------------------------------------------------- @@ -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 { @@ -620,8 +620,8 @@ void KTouch::init() { */ } - // if keyboard tqlayout (loaded by Prefs is not available (e.g. the - // tqlayout file has been deleted) switch to default keyboard + // if keyboard layout (loaded by Prefs is not available (e.g. the + // layout file has been deleted) switch to default keyboard if (m_keyboardFiles.contains(Prefs::currentKeyboardFile() )==0) { TQString default_keyboard; // determine locale @@ -652,18 +652,18 @@ void KTouch::init() { } // ---------------------------------------------------------------------------- -// Creates the tqlayout and GUI setup for a practice session +// Creates the layout and GUI setup for a practice session void KTouch::initTrainingSession() { //kdDebug() << "[KTouch::initTrainingSession] setting up layouts and widgets for new training session..." << endl; // Build the training area. The status widget has a fixed vertical size, the slide line and the // keyboard grow according to their vertical stretch factors (see last argument in the constructors // of TQSizePolicy) TQVBox * mainLayout = new TQVBox( this ); - m_statusWidget = new KTouchtqStatus( mainLayout ); + m_statusWidget = new KTouchStatus( mainLayout ); m_slideLineWidget = new KTouchSlideLine( mainLayout ); - m_slideLineWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 1) ); + m_slideLineWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 1) ); m_keyboardWidget = new KTouchKeyboardWidget( mainLayout ); - m_keyboardWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 3) ); + m_keyboardWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding, 0, 3) ); setCentralWidget(mainLayout); // apply the settings to the widgets m_slideLineWidget->applyPreferences(); @@ -753,7 +753,7 @@ void KTouch::updateFileLists() { // TODO : search in i18n() directories m_keyboardFiles = dirs->findAllResources("data","ktouch/*.keyboard"); - // remove the number tqlayout, since this is the necessary default tqlayout and will be + // remove the number layout, since this is the necessary default layout and will be // added anyway TQStringList::iterator it = m_keyboardFiles.find("number.keyboard"); if (it!=m_keyboardFiles.end()) m_keyboardFiles.remove(it); diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h index 4703fd92..ceec8abc 100644 --- a/ktouch/src/ktouch.h +++ b/ktouch/src/ktouch.h @@ -30,7 +30,7 @@ class KToggleAction; class KActionMenu; class KSelectAction; -class KTouchtqStatus; +class KTouchStatus; class KTouchSlideLine; class KTouchKeyboardWidget; class KTouchTrainer; @@ -101,7 +101,7 @@ class KTouch : public KMainWindow { void trainingStatistics(); ///< The action Training->Show training statistics... void optionsPreferences(); ///< The action Settings->Configure KTouch... - /// Quick-changes the keyboard tqlayout (called from menu). + /// Quick-changes the keyboard layout (called from menu). void changeKeyboard(int num); /// Quick-changes the colour scheme used on the keyboard (called from menu). void changeColor(int num); @@ -111,7 +111,7 @@ class KTouch : public KMainWindow { protected: /// Reimplementated to save preferences and bool queryExit(); - /// Some tqlayout fixes here... + /// Some layout fixes here... void resizeEvent(TQResizeEvent *); /// Accepts a typed char. void keyPressEvent(TQKeyEvent *keyEvent); @@ -128,7 +128,7 @@ class KTouch : public KMainWindow { /// Initialises the program during a normal startup void init(); - /// Creates the tqlayout and GUI setup for a practice session + /// Creates the layout and GUI setup for a practice session void initTrainingSession(); /// Creates the (standard) actions and entries in the menu. void setupActions(); @@ -154,7 +154,7 @@ class KTouch : public KMainWindow { KSelectAction *m_keyboardColorAction; KSelectAction *m_defaultLectureAction; - KTouchtqStatus *m_statusWidget; ///< Pointer to the status widget on top of the main widget. + KTouchStatus *m_statusWidget; ///< Pointer to the status widget on top of the main widget. KTouchSlideLine *m_slideLineWidget; ///< Pointer to the sliding line widget. KTouchKeyboardWidget *m_keyboardWidget; ///< Pointer to the keyboard widget. KTouchTrainer *m_trainer; ///< The training 'master' (runs the training). @@ -171,8 +171,8 @@ class KTouch : public KMainWindow { TQStringList m_examinationFiles; ///< A list of all default examination files. TQStringList m_examinationTitles; ///< A list of the titles of all default examination files. - TQStringList m_keyboardFiles; ///< A list of all default keyboard tqlayout files. - TQStringList m_keyboardTitles; ///< A list of the titles of all default keyboard tqlayout files. + TQStringList m_keyboardFiles; ///< A list of all default keyboard layout files. + TQStringList m_keyboardTitles; ///< A list of the titles of all default keyboard layout files. KTouchStatisticsData m_stats; ///< All user statistics are kept here. diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui index 0be9d5f2..38245a56 100644 --- a/ktouch/src/ktouchcoloreditor_dlg.ui +++ b/ktouch/src/ktouchcoloreditor_dlg.ui @@ -31,7 +31,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -129,7 +129,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -179,7 +179,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -211,7 +211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -246,7 +246,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -255,7 +255,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -337,7 +337,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -367,7 +367,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <grid> <property name="name"> @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -400,7 +400,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -417,7 +417,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -426,7 +426,7 @@ </spacer> <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <grid> <property name="name"> @@ -514,7 +514,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -525,7 +525,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -617,7 +617,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout28</cstring> + <cstring>layout28</cstring> </property> <hbox> <property name="name"> diff --git a/ktouch/src/ktouchcolorscheme.cpp b/ktouch/src/ktouchcolorscheme.cpp index 3e36f458..e447d0b8 100644 --- a/ktouch/src/ktouchcolorscheme.cpp +++ b/ktouch/src/ktouchcolorscheme.cpp @@ -12,7 +12,7 @@ #include "ktouchcolorscheme.h" #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdom.h> #include <kdebug.h> @@ -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); diff --git a/ktouch/src/ktouchdefaults.h b/ktouch/src/ktouchdefaults.h index 8f6631db..d66a1663 100644 --- a/ktouch/src/ktouchdefaults.h +++ b/ktouch/src/ktouchdefaults.h @@ -21,7 +21,7 @@ extern const unsigned int BEGINNER_SPEED; ///< Speed for rating in characters p extern const unsigned int ADVANCED_SPEED; ///< Speed for rating in characters per minute. extern const unsigned int PROFESSIONAL_SPEED; ///< Speed for rating in characters per minute. -extern const int KEYBOARD_MARGIN; ///< The margin around the keybaord tqlayout. +extern const int KEYBOARD_MARGIN; ///< The margin around the keybaord layout. extern const int LCD_UPDATE_INTERVAL; ///< Update interval for LCD display and statistics. diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp index f4ecf178..476a8502 100644 --- a/ktouch/src/ktouchkeyboard.cpp +++ b/ktouch/src/ktouchkeyboard.cpp @@ -34,7 +34,7 @@ void KTouchKeyboard::clear() { } // ---------------------------------------------------------------------------- -// Loads a keyboard tqlayout (old format) from file (returns true if successful). +// Loads a keyboard layout (old format) from file (returns true if successful). bool KTouchKeyboard::load(TQWidget * window, const KURL& url) { // Ok, first download the contents as usual using the KIO lib // File is only downloaded if not local, otherwise it's just opened @@ -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... @@ -176,14 +176,14 @@ bool KTouchKeyboard::read(TQTextStream& in) { // Loads keyboard data from file into an XML document bool KTouchKeyboard::read(const TQDomDocument& doc) { // clean current data - kdDebug() << "Reading new keyboard tqlayout" << endl; + kdDebug() << "Reading new keyboard layout" << endl; m_keys.clear(); m_connectors.clear(); m_title = TQString(); // retrieve the title TQDomNodeList entries = doc.elementsByTagName("Title"); if (entries.count() >= 1) m_title = entries.item(0).firstChild().nodeValue(); - else m_title = i18n("untitled keyboard tqlayout"); + else m_title = i18n("untitled keyboard layout"); kdDebug() << "Title: " << m_title << endl; // retrieve the comment entries = doc.elementsByTagName("Comment"); @@ -235,7 +235,7 @@ void KTouchKeyboard::write(TQDomDocument& doc) const { // Store title and ensure that the file contains a title! TQDomElement title = doc.createElement("Title"); TQDomText titleText; - if (m_title.isEmpty()) titleText = doc.createTextNode( i18n("untitled keyboard tqlayout") ); + if (m_title.isEmpty()) titleText = doc.createTextNode( i18n("untitled keyboard layout") ); else titleText = doc.createTextNode(m_title); title.appendChild(titleText); root.appendChild(title); @@ -281,7 +281,7 @@ void KTouchKeyboard::createDefault() { const int keyWidth = 20; const int col = keyWidth+keySpacing; const int row = keyHeight+keySpacing; - // First let's create the visible tqlayout. + // First let's create the visible layout. // This means we have to create all keys that will be displayed. // Note: purely decorative keys get a key character code of 0! m_keys.clear(); @@ -327,7 +327,7 @@ void KTouchKeyboard::createDefault() { m_connectors.push_back( KTouchKeyConnector('.', '.', '6', 0) ); m_title = "Number keypad"; - m_comment = "Predefined keyboard tqlayout"; + m_comment = "Predefined keyboard layout"; m_language = TQString(); // language does not apply to numbers... that's one of the nice things with math :-) m_fontSuggestions = "Monospace"; @@ -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 layout 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 layout file from '%1'.").arg(url.url()); return false; } } @@ -382,7 +382,7 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) { TQTextStream out( &outfile ); out << "########################################## \n"; out << "# # \n"; - out << "# Keyboard tqlayout file for KTouch # \n"; + out << "# Keyboard layout file for KTouch # \n"; out << "# # \n"; out << "########################################## \n"; out << "#\n"; @@ -396,7 +396,7 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) { default : out << "NormalKey "; break; } TQRect rect=key->frame(); - out << key->m_keyChar.tqunicode() << '\t' << key->m_keyText << '\t' + out << key->m_keyChar.unicode() << '\t' << key->m_keyText << '\t' << rect.left() << '\t' << rect.top() << '\t' << rect.width() << '\t' << rect.height() << endl; } @@ -408,15 +408,15 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) { } void KTouchKeyboard::applyPreferences(TQWidget * window, bool silent) { - // let's check whether the keyboard tqlayout has changed + // let's check whether the keyboard layout has changed if (KTouchConfig().m_currentKeyboardFile!=m_currentLayout) { - // if the tqlayout is the number tqlayout just create it and we're done + // if the layout is the number layout just create it and we're done if (KTouchConfig().m_currentKeyboardFile=="number.keyboard") { createDefaultKeyboard(); resizeEvent(NULL); return; } - // ok, let's load this tqlayout + // ok, let's load this layout if (silent) { // during initialisation we don't want to have a message box, that's why this is silent if (!loadKeyboard(window, KURL::fromPathOrURL( KTouchConfig().m_currentKeyboardFile ))) @@ -427,8 +427,8 @@ void KTouchKeyboard::applyPreferences(TQWidget * window, bool silent) { else { TQString errorMsg; if (!loadKeyboard(window, KURL::fromPathOrURL( KTouchConfig().m_currentKeyboardFile ), &errorMsg)) { - KMessageBox::error( 0, i18n("Error reading the keyboard tqlayout; the default number keypad will " - "be created instead. You can choose another keyboard tqlayout in the preferences dialog."), + KMessageBox::error( 0, i18n("Error reading the keyboard layout; the default number keypad will " + "be created instead. You can choose another keyboard layout in the preferences dialog."), errorMsg); createDefaultKeyboard(); } @@ -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... diff --git a/ktouch/src/ktouchkeyboard.h b/ktouch/src/ktouchkeyboard.h index 0e2ebfd6..fa88bed5 100644 --- a/ktouch/src/ktouchkeyboard.h +++ b/ktouch/src/ktouchkeyboard.h @@ -24,7 +24,7 @@ class KURL; -/// This class stores the keyboard tqlayout and the connectivity between characters +/// This class stores the keyboard layout and the connectivity between characters /// and the actual keys. class KTouchKeyboard { public: @@ -32,7 +32,7 @@ class KTouchKeyboard { KTouchKeyboard() { createDefault(); } /// Clears the keyboard (resets all data) void clear(); - /// Loads a keyboard tqlayout (old format) from file (returns true if successful). + /// Loads a keyboard layout (old format) from file (returns true if successful). bool load(TQWidget * window, const KURL& url); /// Loads a lecture (in XML format) from file (returns true if successful). bool loadXML(TQWidget * window, const KURL& url); @@ -47,7 +47,7 @@ class KTouchKeyboard { TQValueVector<KTouchKeyConnector> m_connectors; ///< Vector with connectivity data. TQString m_title; ///< Title of the keyboard (to appear in the menu). - TQString m_comment; ///< Comments about the creator of the keyboard tqlayout. + TQString m_comment; ///< Comments about the creator of the keyboard layout. TQString m_language; ///< Language ID of keyboard TQString m_fontSuggestions; ///< Suggestions of fonts to be used on the keys. diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp index dd7b0a79..40944155 100644 --- a/ktouch/src/ktouchkeyboardeditor.cpp +++ b/ktouch/src/ktouchkeyboardeditor.cpp @@ -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(); } } @@ -133,7 +133,7 @@ void KTouchKeyboardEditor::paintEvent(TQPaintEvent *) { void KTouchKeyboardEditor::transfer_to_dialog() { if (m_currentURL.isEmpty()) { - titleEdit->setText( i18n("untitled keyboard tqlayout") ); + titleEdit->setText( i18n("untitled keyboard layout") ); keyboardCommentEdit->setText(""); } else { @@ -167,13 +167,13 @@ 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) ); } // ----------------------------------------------------------------------------- void KTouchKeyboardEditor::transfer_from_dialog() { m_keyboard.m_title = titleEdit->text(); - if (m_keyboard.m_title.isEmpty()) m_keyboard.m_title = i18n("untitled keyboard tqlayout"); + if (m_keyboard.m_title.isEmpty()) m_keyboard.m_title = i18n("untitled keyboard layout"); m_keyboard.m_comment = keyboardCommentEdit->text(); m_keyboard.m_language = languageEdit->text(); } diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui index 14c1c6bb..6f945dd2 100644 --- a/ktouch/src/ktouchkeyboardeditor_dlg.ui +++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -128,7 +128,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>100</height> @@ -169,7 +169,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -290,7 +290,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>70</height> diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp index e5974acd..99cc63cc 100644 --- a/ktouch/src/ktouchkeyboardwidget.cpp +++ b/ktouch/src/ktouchkeyboardwidget.cpp @@ -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 layout 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 layout file from '%1'.").arg(url.url()); return false; } } @@ -81,7 +81,7 @@ void KTouchKeyboardWidget::saveKeyboard(TQWidget * window, const KURL& url) { TQTextStream out( &outfile ); out << "########################################## \n"; out << "# # \n"; - out << "# Keyboard tqlayout file for KTouch # \n"; + out << "# Keyboard layout file for KTouch # \n"; out << "# # \n"; out << "########################################## \n"; out << "#\n"; @@ -95,7 +95,7 @@ void KTouchKeyboardWidget::saveKeyboard(TQWidget * window, const KURL& url) { default : out << "NormalKey "; break; } TQRect rect=key->frame(); - out << key->m_keyChar.tqunicode() << '\t' << key->m_keyText << '\t' + out << key->m_keyChar.unicode() << '\t' << key->m_keyText << '\t' << rect.left() << '\t' << rect.top() << '\t' << rect.width() << '\t' << rect.height() << endl; } @@ -112,16 +112,16 @@ void KTouchKeyboardWidget::applyPreferences(TQWidget * window, bool silent) { setMaximumHeight(100); else setMaximumHeight(10000); - // let's check whether the keyboard tqlayout has changed + // let's check whether the keyboard layout has changed if (Prefs::currentKeyboardFile() != m_currentLayout) { - // if the tqlayout is the number tqlayout just create it and we're done + // if the layout is the number layout just create it and we're done //kdDebug() << "[KTouchKeyboardWidget::applyPreferences] keyboard = " << Prefs::currentKeyboardFile() << endl; if (Prefs::currentKeyboardFile()=="number.keyboard") { createDefaultKeyboard(); resizeEvent(NULL); return; } - // ok, let's load this tqlayout + // ok, let's load this layout if (silent) { // during initialisation we don't want to have a message box, that's why this is silent if (!loadKeyboard(window, KURL::fromPathOrURL( Prefs::currentKeyboardFile() ))) @@ -132,8 +132,8 @@ void KTouchKeyboardWidget::applyPreferences(TQWidget * window, bool silent) { else { TQString errorMsg; if (!loadKeyboard(window, KURL::fromPathOrURL( Prefs::currentKeyboardFile() ), &errorMsg)) { - KMessageBox::error( 0, i18n("Error reading the keyboard tqlayout; the default number keypad will " - "be created instead. You can choose another keyboard tqlayout in the preferences dialog."), + KMessageBox::error( 0, i18n("Error reading the keyboard layout; the default number keypad will " + "be created instead. You can choose another keyboard layout in the preferences dialog."), errorMsg); createDefaultKeyboard(); } @@ -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; @@ -397,13 +397,13 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro w=h=8; // default values for old keyboard files m_keyList.append( new KTouchFingerKey(keyAscII, keyText, x+1, y+1, w, h) ); m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, 0, 0) ); -// kdDebug() << "read : F : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; +// kdDebug() << "read : F : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; } else if (keyType=="ControlKey") { lineStream >> keyText >> x >> y >> w >> h; m_keyList.append( new KTouchControlKey(keyAscII, keyText, x+1, y+1, w-2, h-2) ); m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, 0, 0) ); -// kdDebug() << "read : C : tqunicode = " << keyAscII << " char = " << keyText << endl; +// kdDebug() << "read : C : unicode = " << keyAscII << " char = " << keyText << endl; } else if (keyType=="NormalKey") { int fingerCharCode; @@ -412,16 +412,16 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro // retrieve the finger key with the matching char m_keyList.append( new KTouchNormalKey(keyAscII, keyText, x+1, y+1, w, h) ); m_connectorList.append( KTouchKeyConnection(keyAscII, keyAscII, fingerCharCode, 0) ); -// kdDebug() << "read : N : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; +// kdDebug() << "read : N : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << endl; } else if (keyType=="HiddenKey") { int targetChar, fingerChar, controlChar; lineStream >> targetChar >> fingerChar >> controlChar; m_connectorList.append( KTouchKeyConnection(keyAscII, targetChar, fingerChar, controlChar) ); -// kdDebug() << "read : H : tqunicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl; +// kdDebug() << "read : H : unicode = " << keyAscII << " char = " << TQChar(keyAscII) << " target = " << targetChar << " finger = " << fingerChar << " control = " << controlChar << endl; } 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()) { @@ -437,7 +437,7 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro m_keyboardWidth = std::max(m_keyboardWidth, x+w); m_keyboardHeight = std::max(m_keyboardHeight, y+h); } while (!in.atEnd() && !line.isNull()); -// kdDebug() << "showing all tqunicode numbers in this file" << endl; +// kdDebug() << "showing all unicode numbers in this file" << endl; /* for (std::set<TQChar>::iterator it = keys.begin(); it != keys.end(); ++it) kdDebug() << *it << endl; */ @@ -460,9 +460,9 @@ void KTouchKeyboardWidget::updateColours() { TQChar targetChar = (*it).m_targetKeyChar; // this is the _base_ character of the key that needs to be highlighted TQChar ch = (*it).m_keyChar; -/* kdDebug() << "Key #"<<++counter<<": " << ch << "(" << ch.tqunicode() << ") " - << "target = " << targetChar << "(" << targetChar.tqunicode() << ") " - << "finger = " << fingerChar << "(" << fingerChar.tqunicode() << ")" << endl; +/* kdDebug() << "Key #"<<++counter<<": " << ch << "(" << ch.unicode() << ") " + << "target = " << targetChar << "(" << targetChar.unicode() << ") " + << "finger = " << fingerChar << "(" << fingerChar.unicode() << ")" << endl; */ m_keyCharMap[ch] = -1; diff --git a/ktouch/src/ktouchkeyboardwidget.h b/ktouch/src/ktouchkeyboardwidget.h index d49d58e6..dfada1fa 100644 --- a/ktouch/src/ktouchkeyboardwidget.h +++ b/ktouch/src/ktouchkeyboardwidget.h @@ -30,7 +30,7 @@ class KURL; /** This is the keyboard widget at the bottom of the training screen. * In addition to the painting functions this class has the member * functions loadKeyboard() and saveKeyboard() which can read and write - * a keyboard tqlayout from/into a file.<p> + * a keyboard layout from/into a file.<p> * The keyboard is drawn in the paintEvent() member function. The * resizing, that means the recalculation of m_shift is * done in the resizeEvent() member function.<p> @@ -45,14 +45,14 @@ class KTouchKeyboardWidget : public TQWidget { public: /// Constructor KTouchKeyboardWidget(TQWidget *parent); - /// Reads a keyboard tqlayout from the given URL. + /// Reads a keyboard layout from the given URL. /// The function returns 'true' when the reading was successful or 'false' if not. In this /// case the optional parameter errorMsg contains the error message. bool loadKeyboard(TQWidget * window, const KURL& url, TQString* errorMsg=NULL); - /// Saves the keyboard tqlayout to the URL. + /// Saves the keyboard layout to the URL. void saveKeyboard(TQWidget * window, const KURL& url); - /// Applies preferences to the keyboard tqlayout and the keys. - /// This means that the tqlayout is basically recreated and if the tqlayout type/language + /// Applies preferences to the keyboard layout and the keys. + /// This means that the layout is basically recreated and if the layout type/language /// changed it will be reloaded. void applyPreferences(TQWidget * window, bool silent); @@ -90,7 +90,7 @@ class KTouchKeyboardWidget : public TQWidget { int m_keyboardWidth; ///< The width of the keyboard (maximum of the sums of all keywidths in each line). int m_keyboardHeight; ///< The height of the keyboard (sum of all key row heights). double m_shift; ///< The horizontal shift for the keyboard. - TQString m_currentLayout; ///< The name of the currently used tqlayout. + TQString m_currentLayout; ///< The name of the currently used layout. TQChar m_nextKey; ///< The next to be pressed character. bool m_hideKeyboard; ///< If true, the keyboard won't be shown. diff --git a/ktouch/src/ktouchkeys.h b/ktouch/src/ktouchkeys.h index df19b56d..68ffa959 100644 --- a/ktouch/src/ktouchkeys.h +++ b/ktouch/src/ktouchkeys.h @@ -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); @@ -66,7 +66,7 @@ class KTouchBaseKey { int m_wS; ///< The scaled width of the key. int m_hS; ///< The scaled height of the key. - KeyType m_type; ///< Stores the type of the key (convenience for saving of the keyboard tqlayout). + KeyType m_type; ///< Stores the type of the key (convenience for saving of the keyboard layout). }; // --------------------------------------------------------------------------------------- @@ -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 { diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp index 610c583a..c20c237d 100644 --- a/ktouch/src/ktouchlecture.cpp +++ b/ktouch/src/ktouchlecture.cpp @@ -13,7 +13,7 @@ #include "ktouchlecture.h" #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> #include <tqdom.h> diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp index 2539a204..301b70b2 100644 --- a/ktouch/src/ktouchlectureeditor.cpp +++ b/ktouch/src/ktouchlectureeditor.cpp @@ -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; diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui index a4e8f989..e12e3158 100644 --- a/ktouch/src/ktouchlectureeditor_dlg.ui +++ b/ktouch/src/ktouchlectureeditor_dlg.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>70</height> @@ -109,7 +109,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -144,7 +144,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -155,7 +155,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -165,13 +165,13 @@ <property name="name"> <cstring>upBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -188,13 +188,13 @@ <property name="name"> <cstring>downBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -211,13 +211,13 @@ <property name="name"> <cstring>newBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -242,13 +242,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>35</width> <height>28</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>32767</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -286,7 +286,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -334,7 +334,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -358,7 +358,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -486,7 +486,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -510,7 +510,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>248</width> <height>20</height> diff --git a/ktouch/src/ktouchleveldata.h b/ktouch/src/ktouchleveldata.h index a84743c2..444c4365 100644 --- a/ktouch/src/ktouchleveldata.h +++ b/ktouch/src/ktouchleveldata.h @@ -18,7 +18,7 @@ #endif #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqvaluevector.h> #include <tqdom.h> diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui index f878335f..4da33c33 100644 --- a/ktouch/src/ktouchopenrequest_dlg.ui +++ b/ktouch/src/ktouchopenrequest_dlg.ui @@ -42,7 +42,7 @@ <property name="name"> <cstring>currentRadioBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -56,7 +56,7 @@ <property name="name"> <cstring>presetRadioBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -115,7 +115,7 @@ </spacer> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -151,7 +151,7 @@ <property name="name"> <cstring>openFileRadioBtn</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -165,7 +165,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -181,7 +181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui index 53c87079..6fd8eeea 100644 --- a/ktouch/src/ktouchprefcolorslayout.ui +++ b/ktouch/src/ktouchprefcolorslayout.ui @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -120,7 +120,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -130,7 +130,7 @@ <property name="name"> <cstring>kcfg_TeacherBackgroundColor</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -166,7 +166,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -217,7 +217,7 @@ <property name="name"> <cstring>kcfg_StudentTextColor</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -245,7 +245,7 @@ <property name="name"> <cstring>kcfg_StudentBackgroundColor</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -306,7 +306,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>34</width> <height>20</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -353,7 +353,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -369,7 +369,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -391,7 +391,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -424,7 +424,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -446,7 +446,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -485,7 +485,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui index 95c44ed6..f205c1ab 100644 --- a/ktouch/src/ktouchprefgenerallayout.ui +++ b/ktouch/src/ktouchprefgenerallayout.ui @@ -82,7 +82,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>227</width> <height>20</height> @@ -117,7 +117,7 @@ <property name="name"> <cstring>kcfg_SlidingSpeed</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>20</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -193,7 +193,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -247,7 +247,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>114</width> <height>20</height> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>30</height> diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui index 1c25d804..3105d19c 100644 --- a/ktouch/src/ktouchprefkeyboardlayout.ui +++ b/ktouch/src/ktouchprefkeyboardlayout.ui @@ -65,7 +65,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -74,7 +74,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -88,10 +88,10 @@ <string>Override keyboard fonts</string> </property> <property name="toolTip" stdset="0"> - <string>If checked you can specify your own keyboard font instead of the predefined one of the keyboard tqlayout.</string> + <string>If checked you can specify your own keyboard font instead of the predefined one of the keyboard layout.</string> </property> <property name="whatsThis" stdset="0"> - <string>Every keyboard tqlayout may specify its own font. If the predefined font of a certain keyboard tqlayout does not work or you would like to have your own, check this button. You may then choose your own font that will be used to draw the characters on the keys.</string> + <string>Every keyboard layout may specify its own font. If the predefined font of a certain keyboard layout does not work or you would like to have your own, check this button. You may then choose your own font that will be used to draw the characters on the keys.</string> </property> </widget> <widget class="TQLabel"> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui index c2928dc0..3c6a1c8d 100644 --- a/ktouch/src/ktouchpreftraininglayout.ui +++ b/ktouch/src/ktouchpreftraininglayout.ui @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -60,7 +60,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -174,7 +174,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -310,7 +310,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp index 07078978..d7eff3fd 100644 --- a/ktouch/src/ktouchslideline.cpp +++ b/ktouch/src/ktouchslideline.cpp @@ -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) { diff --git a/ktouch/src/ktouchslideline.h b/ktouch/src/ktouchslideline.h index 8afc7b54..5abc6c2a 100644 --- a/ktouch/src/ktouchslideline.h +++ b/ktouch/src/ktouchslideline.h @@ -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 * ); diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp index c8483096..563485c3 100644 --- a/ktouch/src/ktouchstatistics.cpp +++ b/ktouch/src/ktouchstatistics.cpp @@ -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) ); @@ -328,7 +328,7 @@ void KTouchStatistics::updateChartTab() { { double t = m_currSessionStats.m_elapsedTime; double wpm = m_currSessionStats.m_words/t*60.0; - double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24); data.push_back(std::make_pair(tp, wpm) ); } chartWidget->LeftAxis.setLabel( i18n("Words per minute") ); @@ -352,7 +352,7 @@ void KTouchStatistics::updateChartTab() { { double t = m_currSessionStats.m_elapsedTime; double cpm = m_currSessionStats.m_correctChars/t*60.0; - double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24); data.push_back(std::make_pair(tp, cpm) ); } chartWidget->LeftAxis.setLabel( i18n("Characters per minute") ); @@ -376,7 +376,7 @@ void KTouchStatistics::updateChartTab() { { double tc = m_currSessionStats.m_totalChars; double corr = m_currSessionStats.m_correctChars/tc; - double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24); data.push_back(std::make_pair(tp, corr) ); } chartWidget->LeftAxis.setLabel( i18n("Correctness") ); @@ -407,7 +407,7 @@ void KTouchStatistics::updateChartTab() { double t = m_currSessionStats.m_elapsedTime; double cpm = m_currSessionStats.m_correctChars/t*60.0; double skill = corr*cpm; - double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24); + double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24); data.push_back(std::make_pair(tp, skill) ); } chartWidget->LeftAxis.setLabel( i18n("Skill") ); diff --git a/ktouch/src/ktouchstatistics_dlg.ui b/ktouch/src/ktouchstatistics_dlg.ui index 568ed7ef..a254c9af 100644 --- a/ktouch/src/ktouchstatistics_dlg.ui +++ b/ktouch/src/ktouchstatistics_dlg.ui @@ -69,7 +69,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -127,7 +127,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout28</cstring> + <cstring>layout28</cstring> </property> <grid> <property name="name"> @@ -172,7 +172,7 @@ <property name="name"> <cstring>elapsedTimeLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -189,7 +189,7 @@ <property name="name"> <cstring>totalCharsLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -206,7 +206,7 @@ <property name="name"> <cstring>wrongCharsLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -223,7 +223,7 @@ <property name="name"> <cstring>wordsLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -264,7 +264,7 @@ <property name="name"> <cstring>frame4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -414,7 +414,7 @@ <property name="name"> <cstring>charSpeedLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -431,7 +431,7 @@ <property name="name"> <cstring>wordSpeedLCD</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -479,7 +479,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -515,7 +515,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -573,7 +573,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout28_2</cstring> + <cstring>layout28_2</cstring> </property> <grid> <property name="name"> @@ -618,7 +618,7 @@ <property name="name"> <cstring>elapsedTimeLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -632,7 +632,7 @@ <property name="name"> <cstring>totalCharsLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -646,7 +646,7 @@ <property name="name"> <cstring>wrongCharsLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -660,7 +660,7 @@ <property name="name"> <cstring>wordsLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -698,7 +698,7 @@ <property name="name"> <cstring>frame4_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -848,7 +848,7 @@ <property name="name"> <cstring>charSpeedLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -862,7 +862,7 @@ <property name="name"> <cstring>wordSpeedLCDLevel</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -904,7 +904,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>89</height> @@ -940,7 +940,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -1060,7 +1060,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -1189,7 +1189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1205,7 +1205,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -1232,7 +1232,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index f1b60dd0..80c92bef 100644 --- a/ktouch/src/ktouchstatisticsdata.cpp +++ b/ktouch/src/ktouchstatisticsdata.cpp @@ -41,7 +41,7 @@ int KTouchCharStats::missHitRatio() const { // ---------------------------------------------------------------------------- TQTextStream& operator<<(TQTextStream &out, const KTouchCharStats &ch) { - return (out << ch.m_char.tqunicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount); + return (out << ch.m_char.unicode() << " " << ch.m_correctCount << " " << ch.m_wrongCount); } // ---------------------------------------------------------------------------- @@ -135,10 +135,10 @@ void KTouchLevelStats::write(TQDomDocument& doc, TQDomElement& root) const { level.appendChild(e); // add char stats TQString char_data; - // we append for each missed char the char-tqunicode and the counters + // we append for each missed char the char-unicode 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.unicode()) + .arg(it->m_correctCount).arg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); e.appendChild(tn); @@ -295,17 +295,17 @@ 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); session.appendChild(e); // add char data TQString char_data; - // we append for each missed char the char-tqunicode and the counters + // we append for each missed char the char-unicode 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.unicode()) + .arg(it->m_correctCount).arg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); e.appendChild(tn); diff --git a/ktouch/src/ktouchstatus.cpp b/ktouch/src/ktouchstatus.cpp index bfbac46c..94d11894 100644 --- a/ktouch/src/ktouchstatus.cpp +++ b/ktouch/src/ktouchstatus.cpp @@ -20,13 +20,13 @@ #include <kpushbutton.h> #include "prefs.h" -KTouchtqStatus::KTouchtqStatus(TQWidget *parent) +KTouchStatus::KTouchStatus(TQWidget *parent) : KTouchStatusLayout(parent) { applyPreferences(); } -void KTouchtqStatus::applyPreferences() { +void KTouchStatus::applyPreferences() { if (Prefs::autoLevelChange()) { levelUpBtn->setEnabled( !Prefs::disableManualLevelChange() ); levelDownBtn->setEnabled( !Prefs::disableManualLevelChange() ); @@ -37,11 +37,11 @@ void KTouchtqStatus::applyPreferences() { } } -void KTouchtqStatus::setNewChars(const TQString& newChars) { +void KTouchStatus::setNewChars(const TQString& newChars) { newCharsLabel->setText(newChars); } -void KTouchtqStatus::updatetqStatus(unsigned int level, double correctness) { +void KTouchStatus::updateStatus(unsigned int level, double correctness) { levelLCD->display(static_cast<int>(level)+1); // +1 because our level variable ranges from 0...n-1 correctnessBar->setProgress(static_cast<int>(correctness*100) ); } diff --git a/ktouch/src/ktouchstatus.h b/ktouch/src/ktouchstatus.h index 229ed903..f4be66f4 100644 --- a/ktouch/src/ktouchstatus.h +++ b/ktouch/src/ktouchstatus.h @@ -22,21 +22,21 @@ /** This is the implementation of the status widget (at the top of the main view). * It simply displays the status but does not have a functionality of its own. * Everythings is calculated in the trainer (see KTouchTrainer)and then displayed - * using the updatetqStatus() member function. + * using the updateStatus() member function. * The "new characters" string is set using the member function setNewChars(). */ -class KTouchtqStatus : public KTouchStatusLayout { +class KTouchStatus : public KTouchStatusLayout { Q_OBJECT TQ_OBJECT public: /// Constructor - KTouchtqStatus(TQWidget *parent); + KTouchStatus(TQWidget *parent); /// Called when the preferences have changed in the configuration dialog. void applyPreferences(); /// Sets the new characters text. void setNewChars(const TQString& newChars); /// Updates the level LCD and the correctness progress bar - void updatetqStatus(unsigned int level, double correctness); + void updateStatus(unsigned int level, double correctness); }; #endif // KTOUCHSTATUS_H diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui index 3721f578..b2625d23 100644 --- a/ktouch/src/ktouchstatuslayout.ui +++ b/ktouch/src/ktouchstatuslayout.ui @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -58,7 +58,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>30</height> @@ -85,7 +85,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -95,7 +95,7 @@ <property name="name"> <cstring>levelUpBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>20</height> @@ -112,7 +112,7 @@ <property name="name"> <cstring>levelDownBtn</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>20</width> <height>20</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -171,7 +171,7 @@ <property name="name"> <cstring>speedLCD</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>30</height> @@ -203,7 +203,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -261,7 +261,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -291,7 +291,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -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"> @@ -337,7 +337,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp index b2e48277..7ed140ca 100644 --- a/ktouch/src/ktouchtrainer.cpp +++ b/ktouch/src/ktouchtrainer.cpp @@ -31,7 +31,7 @@ #include "ktouchdefaults.h" #include "prefs.h" -KTouchTrainer::KTouchTrainer(KTouchtqStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture) +KTouchTrainer::KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture) : TQObject(), m_trainingTimer(new TQTimer), m_statusWidget(status), @@ -233,7 +233,7 @@ void KTouchTrainer::enterPressed() { void KTouchTrainer::updateWidgets() { // update status widget - m_statusWidget->updatetqStatus(m_level, m_levelStats.correctness()); + m_statusWidget->updateStatus(m_level, m_levelStats.correctness()); // update slide line widget m_slideLineWidget->setStudentText(m_studentText); // update keyboard widget -> show next to be pressed char. @@ -270,7 +270,7 @@ void KTouchTrainer::startTraining(bool keepLevel) { gotoFirstLine(); updateStatusBarMessage(i18n("Starting training session: Waiting for first keypress...") ); updateStatusBar(); - m_statusWidget->updatetqStatus(m_level, 1); + m_statusWidget->updateStatus(m_level, 1); m_statusWidget->speedLCD->display( 0 ); m_trainingPaused=true; // Go into "Pause" mode m_trainingTimer->stop(); // Training timer will be started on first keypress. @@ -285,7 +285,7 @@ void KTouchTrainer::pauseTraining() { m_trainingPaused=true; m_trainingTimer->stop(); m_slideLineWidget->setCursorTimerEnabled(false); - m_statusWidget->updatetqStatus(m_level, m_levelStats.correctness()); + m_statusWidget->updateStatus(m_level, m_levelStats.correctness()); m_statusWidget->speedLCD->display( m_levelStats.charSpeed() ); updateStatusBarMessage(i18n("Training session paused. Training continues on next keypress...") ); updateStatusBar(); @@ -298,7 +298,7 @@ void KTouchTrainer::pauseTraining() { void KTouchTrainer::continueTraining() { m_trainingPaused=false; m_slideLineWidget->setCursorTimerEnabled(true); - m_statusWidget->updatetqStatus(m_level, m_levelStats.correctness() ); + m_statusWidget->updateStatus(m_level, m_levelStats.correctness() ); m_statusWidget->speedLCD->display( m_levelStats.charSpeed() ); updateStatusBarMessage(i18n("Training session! The time is running...") ); updateStatusBar(); @@ -317,12 +317,12 @@ void KTouchTrainer::storeTrainingStatistics() { // are there level stats to be stored? if (m_levelStats.m_elapsedTime != 0) { //kdDebug() << "[KTouchTrainer::storeTrainingStatistics] Storing level statistics!" << endl; - m_levelStats.m_timeRecorded = TQDateTime::tqcurrentDateTime(); + m_levelStats.m_timeRecorded = TQDateTime::currentDateTime(); data.m_levelStats.push_back( m_levelStats ); } if (m_sessionStats.m_elapsedTime != 0) { //kdDebug() << "[KTouchTrainer::storeTrainingStatistics] Storing session statistics!" << endl; - m_sessionStats.m_timeRecorded = TQDateTime::tqcurrentDateTime(); + m_sessionStats.m_timeRecorded = TQDateTime::currentDateTime(); data.m_sessionStats.push_back( m_sessionStats ); } } @@ -487,7 +487,7 @@ void KTouchTrainer::statsChangeLevel() { // are there level stats to be stored? if (m_levelStats.m_elapsedTime != 0) { //kdDebug() << "[KTouchTrainer::storeTrainingStatistics] Storing level statistics!" << endl; - m_levelStats.m_timeRecorded = TQDateTime::tqcurrentDateTime(); + m_levelStats.m_timeRecorded = TQDateTime::currentDateTime(); data.m_levelStats.push_back( m_levelStats ); } // clear level stats @@ -497,6 +497,6 @@ void KTouchTrainer::statsChangeLevel() { // remember level in session stats m_sessionStats.m_levelNums.insert(m_level); // show new level (in status widet) and 100% correctness - m_statusWidget->updatetqStatus(m_level, 1); + m_statusWidget->updateStatus(m_level, 1); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchtrainer.h b/ktouch/src/ktouchtrainer.h index 4dba8ebc..2a766a64 100644 --- a/ktouch/src/ktouchtrainer.h +++ b/ktouch/src/ktouchtrainer.h @@ -23,7 +23,7 @@ class TQTimer; -class KTouchtqStatus; +class KTouchStatus; class KTouchSlideLine; class KTouchKeyboardWidget; class KTouchLecture; @@ -62,7 +62,7 @@ class KTouchTrainer : public TQObject { TQ_OBJECT public: /// Constructor. - KTouchTrainer(KTouchtqStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture); + KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, KTouchKeyboardWidget *keyboard, KTouchLecture *lecture); /// Destructor virtual ~KTouchTrainer(); /// Jumps to the first line in the current level (m_level) (Note: has no effect on the training statistics). @@ -149,7 +149,7 @@ class KTouchTrainer : public TQObject { /// right before a new level and new line is started). void statsChangeLevel(); - KTouchtqStatus *m_statusWidget; ///< Pointer to the status widget on top of the main window. + KTouchStatus *m_statusWidget; ///< Pointer to the status widget on top of the main window. KTouchSlideLine *m_slideLineWidget; ///< Pointer to the sliding line widget. KTouchKeyboardWidget *m_keyboardWidget; ///< Pointer to the keyboard widget. KTouchLecture *m_lecture; ///< Pointer to the lecture data. diff --git a/ktouch/src/ktouchutils.cpp b/ktouch/src/ktouchutils.cpp index 26686a09..79c3ace4 100644 --- a/ktouch/src/ktouchutils.cpp +++ b/ktouch/src/ktouchutils.cpp @@ -10,7 +10,7 @@ * (at your option) any later version. * ***************************************************************************/ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> #include <tqmap.h> @@ -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) { diff --git a/kturtle/TODO b/kturtle/TODO index ed20a391..8f280acd 100644 --- a/kturtle/TODO +++ b/kturtle/TODO @@ -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 ); diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp index 315c1f84..fcc6322d 100644 --- a/kturtle/src/dialogs.cpp +++ b/kturtle/src/dialogs.cpp @@ -149,7 +149,7 @@ ColorPicker::ColorPicker(TQWidget *parent) // for toggling convenience connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( slotEmitVisibility() ) ); - // Create the top level page and its tqlayout + // Create the top level page and its layout BaseWidget = new TQWidget(this); setMainWidget(BaseWidget); @@ -157,57 +157,57 @@ ColorPicker::ColorPicker(TQWidget *parent) setButtonText( KDialogBase::User1, i18n("Insert Color Code at Cursor") ); connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotEmitColorCode() ) ); - TQVBoxLayout *vtqlayout = new TQVBoxLayout(BaseWidget); + TQVBoxLayout *vlayout = new TQVBoxLayout(BaseWidget); - vtqlayout->addSpacing(5); // spacing on top + vlayout->addSpacing(5); // spacing on top // the palette and value selector go into a H-box - TQHBoxLayout *h1tqlayout = new TQHBoxLayout(BaseWidget); - vtqlayout->addLayout(h1tqlayout); + TQHBoxLayout *h1layout = new TQHBoxLayout(BaseWidget); + vlayout->addLayout(h1layout); - h1tqlayout->addSpacing(10); // space on the left border + h1layout->addSpacing(10); // space on the left border hsSelector = new KHSSelector(BaseWidget); // the color (SH) selector hsSelector->setMinimumSize(300, 150); - h1tqlayout->addWidget(hsSelector); + h1layout->addWidget(hsSelector); connect( hsSelector, TQT_SIGNAL( valueChanged(int, int) ), TQT_SLOT( slotSelectorChanged(int, int) ) ); - h1tqlayout->addSpacing(5); // space in between + h1layout->addSpacing(5); // space in between valuePal = new KValueSelector(BaseWidget); // the darkness (V) pal valuePal->setFixedWidth(30); - h1tqlayout->addWidget(valuePal); + h1layout->addWidget(valuePal); connect( valuePal, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotPalChanged(int) ) ); - vtqlayout->addSpacing(15); // space in between the top and the bottom widgets + vlayout->addSpacing(15); // space in between the top and the bottom widgets // the patch and the codegenerator also go into a H-box - TQHBoxLayout *h2tqlayout = new TQHBoxLayout(BaseWidget); - vtqlayout->addLayout(h2tqlayout); + TQHBoxLayout *h2layout = new TQHBoxLayout(BaseWidget); + vlayout->addLayout(h2layout); - h2tqlayout->addSpacing(10); // space on the left border + h2layout->addSpacing(10); // space on the left border patch = new KColorPatch(BaseWidget); // the patch (color previewer) patch->setFixedSize(50, 50); - h2tqlayout->addWidget(patch); + h2layout->addWidget(patch); - h2tqlayout->addSpacing(10); // space in between + h2layout->addSpacing(10); // space in between // the label and the codegenerator go in a V-box - TQVBoxLayout *v2tqlayout = new TQVBoxLayout(BaseWidget); - h2tqlayout->addLayout(v2tqlayout); + TQVBoxLayout *v2layout = new TQVBoxLayout(BaseWidget); + h2layout->addLayout(v2layout); copyable = new TQLabel(i18n("Color code:"), BaseWidget); // tha label - v2tqlayout->addWidget(copyable); + v2layout->addWidget(copyable); colorcode = new TQLineEdit(BaseWidget); // the code generator colorcode->setReadOnly(true); - v2tqlayout->addWidget(colorcode); + v2layout->addWidget(colorcode); connect( colorcode, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotReselect() ) ); - h2tqlayout->addSpacing(5); // spacing on the right border + h2layout->addSpacing(5); // spacing on the right border - vtqlayout->addSpacing(10); // spacing on the bottom + vlayout->addSpacing(10); // spacing on the bottom h = g = b = 0; // start with red s = v = r = 255; @@ -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(); } diff --git a/kturtle/src/dialogs.h b/kturtle/src/dialogs.h index 4cd69d1a..f55342c7 100644 --- a/kturtle/src/dialogs.h +++ b/kturtle/src/dialogs.h @@ -27,7 +27,7 @@ #define _DIALOGS_H_ -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqstring.h> @@ -119,9 +119,9 @@ class ColorPicker : public KDialogBase TQWidget *BaseWidget; KHSSelector *hsSelector; KValueSelector *valuePal; - TQVBoxLayout *vtqlayout; - TQHBoxLayout *h1tqlayout; - TQHBoxLayout *h2tqlayout; + TQVBoxLayout *vlayout; + TQHBoxLayout *h1layout; + TQHBoxLayout *h2layout; KColorPatch *patch; TQLabel *copyable; TQLineEdit *colorcode; diff --git a/kturtle/src/executer.cpp b/kturtle/src/executer.cpp index 9f88cc40..e50c64a5 100644 --- a/kturtle/src/executer.cpp +++ b/kturtle/src/executer.cpp @@ -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; diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp index ffa528f3..da6a9a28 100644 --- a/kturtle/src/kturtle.cpp +++ b/kturtle/src/kturtle.cpp @@ -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); } @@ -247,7 +247,7 @@ void MainWindow::setupCanvas() void MainWindow::slotStatusBar(TQString text, int id) { - text = " " + text + " "; // help the tqlayout + text = " " + text + " "; // help the layout statusBar()->changeItem(text, id); } @@ -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); } @@ -877,39 +877,39 @@ void MainWindow::slotSettings() TQGridLayout *generalLayout = new TQGridLayout( general, 1, 1, 11, 6, "generalLayout"); WidthHeightBox = new TQGroupBox( i18n("Initial Canvas Size"), general ); WidthHeightBox->setColumnLayout(0, Qt::Vertical ); - WidthHeightBox->tqlayout()->setSpacing( 6 ); - WidthHeightBox->tqlayout()->setMargin( 11 ); - TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->tqlayout() ); - WidthHeightBoxLayout->tqsetAlignment( TQt::AlignTop ); - TQHBoxLayout *tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); - TQVBoxLayout *tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); + WidthHeightBox->layout()->setSpacing( 6 ); + WidthHeightBox->layout()->setMargin( 11 ); + TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->layout() ); + WidthHeightBoxLayout->setAlignment( TQt::AlignTop ); + TQHBoxLayout *layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); + TQVBoxLayout *layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); - TQVBoxLayout *tqlayout1 = new TQVBoxLayout( 0, 0, 6, "tqlayout1"); + TQVBoxLayout *layout1 = new TQVBoxLayout( 0, 0, 6, "layout1"); kcfg_CanvasWidth = new KIntNumInput( WidthHeightBox, "kcfg_CanvasWidth" ); kcfg_CanvasWidth->setValue( 400 ); kcfg_CanvasWidth->setMinValue( 1 ); kcfg_CanvasWidth->setReferencePoint( 1 ); - tqlayout1->addWidget( kcfg_CanvasWidth ); + layout1->addWidget( kcfg_CanvasWidth ); kcfg_CanvasHeight = new KIntNumInput( WidthHeightBox, "kcfg_CanvasHeight" ); kcfg_CanvasHeight->setValue( 300 ); kcfg_CanvasHeight->setMinValue( 1 ); kcfg_CanvasHeight->setReferencePoint( 1 ); - tqlayout1->addWidget( kcfg_CanvasHeight ); + layout1->addWidget( kcfg_CanvasHeight ); WidthLabel = new TQLabel( kcfg_CanvasWidth, i18n("Canvas &width:"), WidthHeightBox ); - tqlayout2->addWidget( WidthLabel ); + layout2->addWidget( WidthLabel ); HeightLabel = new TQLabel( kcfg_CanvasHeight, i18n("Ca&nvas height:"), WidthHeightBox ); - tqlayout2->addWidget( HeightLabel ); - tqlayout3->addLayout( tqlayout2 ); + layout2->addWidget( HeightLabel ); + layout3->addLayout( layout2 ); - tqlayout3->addLayout( tqlayout1 ); - WidthHeightBoxLayout->addLayout( tqlayout3 ); + layout3->addLayout( layout1 ); + WidthHeightBoxLayout->addLayout( layout3 ); TQLabel* WidthHeightLabel = new TQLabel(i18n("You need to restart before these settings have effect"), WidthHeightBox); WidthHeightBoxLayout->addWidget( WidthHeightLabel ); generalLayout->addWidget( WidthHeightBox, 0, 0 ); - general->resize( TQSize(234, 109).expandedTo(tqminimumSizeHint()) ); + general->resize( TQSize(234, 109).expandedTo(minimumSizeHint()) ); dialog->addPage( general, i18n("General"), "package_settings", i18n("General Settings") ); @@ -918,12 +918,12 @@ void MainWindow::slotSettings() TQGridLayout *languageLayout = new TQGridLayout( language, 1, 1, 11, 6, "Form1Layout"); TQGroupBox *groupBox1 = new TQGroupBox( language, "groupBox1" ); groupBox1->setColumnLayout(0, Qt::Vertical ); - groupBox1->tqlayout()->setSpacing( 6 ); - groupBox1->tqlayout()->setMargin( 11 ); - TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->tqlayout() ); - groupBox1Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1->layout()->setSpacing( 6 ); + groupBox1->layout()->setMargin( 11 ); + TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->layout() ); + groupBox1Layout->setAlignment( TQt::AlignTop ); - TQVBoxLayout *tqlayout4 = new TQVBoxLayout( 0, 0, 6, "tqlayout4"); + TQVBoxLayout *layout4 = new TQVBoxLayout( 0, 0, 6, "layout4"); kcfg_LanguageComboBox = new KComboBox(groupBox1, "kcfg_LanguageComboBox"); kcfg_LanguageComboBox->setEditable(false); @@ -935,13 +935,13 @@ void MainWindow::slotSettings() kcfg_LanguageComboBox->insertStringList(LogoLanguageList); LanguageLabel = new TQLabel(kcfg_LanguageComboBox, i18n("&Select the language for the Logo commands:"), groupBox1); - tqlayout4->addWidget( LanguageLabel ); - tqlayout4->addWidget( kcfg_LanguageComboBox ); + layout4->addWidget( LanguageLabel ); + layout4->addWidget( kcfg_LanguageComboBox ); LanguageLabel->setBuddy( kcfg_LanguageComboBox ); - groupBox1Layout->addLayout( tqlayout4, 0, 0 ); + groupBox1Layout->addLayout( layout4, 0, 0 ); languageLayout->addWidget( groupBox1, 0, 0 ); - language->resize( TQSize(373, 80).expandedTo(tqminimumSizeHint()) ); + language->resize( TQSize(373, 80).expandedTo(minimumSizeHint()) ); dialog->addPage( language, i18n("Language"), "locale", i18n("Language Settings") ); @@ -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 diff --git a/kturtle/src/lexer.h b/kturtle/src/lexer.h index 37dccf08..c6afe078 100644 --- a/kturtle/src/lexer.h +++ b/kturtle/src/lexer.h @@ -22,7 +22,7 @@ #include <tqmap.h> #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> #include "token.h" #include "translate.h" diff --git a/kturtle/src/parser.cpp b/kturtle/src/parser.cpp index 1d8fc5c4..07a33aea 100644 --- a/kturtle/src/parser.cpp +++ b/kturtle/src/parser.cpp @@ -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 diff --git a/kturtle/src/translate.cpp b/kturtle/src/translate.cpp index 06e874a5..10ad2b07 100644 --- a/kturtle/src/translate.cpp +++ b/kturtle/src/translate.cpp @@ -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] + "'"); } diff --git a/kturtle/src/treenode.cpp b/kturtle/src/treenode.cpp index 0579af7e..0b5619a5 100644 --- a/kturtle/src/treenode.cpp +++ b/kturtle/src/treenode.cpp @@ -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 } } diff --git a/kturtle/src/value.h b/kturtle/src/value.h index 0027d8e9..a03e4840 100644 --- a/kturtle/src/value.h +++ b/kturtle/src/value.h @@ -21,7 +21,7 @@ #define _VALUE_H_ #include <tqstring.h> -#include <tqtextstream.h> +#include <textstream.h> enum valueType diff --git a/kverbos/kverbos/kerfassen.cpp b/kverbos/kverbos/kerfassen.cpp index 0fbc20c4..9ae8c2b7 100644 --- a/kverbos/kverbos/kerfassen.cpp +++ b/kverbos/kverbos/kerfassen.cpp @@ -352,42 +352,42 @@ void KErfassen::slotNewVerb() void KErfassen::slotN() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) pl->insert("ñ"); } void KErfassen::slotA() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) pl->insert("á"); } void KErfassen::slotE() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) pl->insert("é"); } void KErfassen::slotI() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) pl->insert("í"); } void KErfassen::slotO() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) pl->insert("ó"); } void KErfassen::slotU() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) pl->insert("ú"); } diff --git a/kverbos/kverbos/kverbos.h b/kverbos/kverbos/kverbos.h index 505e28f9..39635496 100644 --- a/kverbos/kverbos/kverbos.h +++ b/kverbos/kverbos/kverbos.h @@ -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(); diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp index 1abb6774..5856ea55 100644 --- a/kverbos/kverbos/kverbosdoc.cpp +++ b/kverbos/kverbos/kverbosdoc.cpp @@ -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() @@ -658,10 +658,10 @@ void KVerbosDoc::deleteContents() } // Ein Verb wird der Liste hinzugefügt. -void KVerbosDoc::appendVerb(const verbSpanish v, bool emittqStatus /*= true*/) +void KVerbosDoc::appendVerb(const verbSpanish v, bool emitStatus /*= true*/) { verbList2.append(v); - if (emittqStatus) + if (emitStatus) emit anzahlVerbenGeaendert(getAnzahl()); } diff --git a/kverbos/kverbos/kverbosdoc.h b/kverbos/kverbos/kverbosdoc.h index 41dbc2c4..b80eb15b 100644 --- a/kverbos/kverbos/kverbosdoc.h +++ b/kverbos/kverbos/kverbosdoc.h @@ -114,10 +114,10 @@ class KVerbosDoc : public TQObject const KURL& URL() const; /** sets the URL of the document */ void setURL(const KURL& url); - /** es wird ein Verb der Liste hinzugefügt, ist emittqStatus = true, wird auch + /** es wird ein Verb der Liste hinzugefügt, ist emitStatus = true, wird auch * die Statuszeile entsprechend angepasst. */ - void appendVerb(const verbSpanish v, bool emittqStatus = true); + void appendVerb(const verbSpanish v, bool emitStatus = true); /** prüft, ob die Liste des Dokumentes leer ist */ bool isEmpty() const; /** Gibt einen Zeiger auf die Verbliste des Dokumentes zurück */ @@ -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); diff --git a/kverbos/kverbos/kverbosuser.cpp b/kverbos/kverbos/kverbosuser.cpp index 90896a3b..6088e90b 100644 --- a/kverbos/kverbos/kverbosuser.cpp +++ b/kverbos/kverbos/kverbosuser.cpp @@ -227,7 +227,7 @@ bool KVerbosUser::saveUser(const int& res, const int& num) }; if (j == 1) { - TQDate d = TQDate::tqcurrentDate(); + TQDate d = TQDate::currentDate(); t << d.toString() << endl; t << res << endl; t << num << endl; diff --git a/kverbos/kverbos/kverbosview.cpp b/kverbos/kverbos/kverbosview.cpp index bb62cba5..d79c690a 100644 --- a/kverbos/kverbos/kverbosview.cpp +++ b/kverbos/kverbos/kverbosview.cpp @@ -115,7 +115,7 @@ TQString KVerbosView::deleteAccents(const TQString& s) const void KVerbosView::slotN() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) { pl->insert("ñ"); @@ -124,7 +124,7 @@ void KVerbosView::slotN() void KVerbosView::slotA() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) { pl->insert("á"); @@ -133,7 +133,7 @@ void KVerbosView::slotA() void KVerbosView::slotE() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) { pl->insert("é"); @@ -142,7 +142,7 @@ void KVerbosView::slotE() void KVerbosView::slotI() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) { pl->insert("í"); @@ -151,7 +151,7 @@ void KVerbosView::slotI() void KVerbosView::slotO() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) { pl->insert("ó"); @@ -160,7 +160,7 @@ void KVerbosView::slotO() void KVerbosView::slotU() { - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (pl) { pl->insert("ú"); @@ -332,7 +332,7 @@ void KVerbosView::slotFont() if (corrected) { TQFont fontNormal = EditVerbo->font(); - TQLineEdit* pl = dynamic_cast<TQLineEdit*>(tqfocusWidget()); + TQLineEdit* pl = dynamic_cast<TQLineEdit*>(focusWidget()); if (0 != pl) { pl->setFont(fontNormal); diff --git a/kverbos/kverbos/qerfassen.ui b/kverbos/kverbos/qerfassen.ui index 42489cfe..3b6b770b 100644 --- a/kverbos/kverbos/qerfassen.ui +++ b/kverbos/kverbos/qerfassen.ui @@ -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"> @@ -341,7 +341,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextYo1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -355,7 +355,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextTu1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -369,7 +369,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEl1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -383,7 +383,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextNosotros1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -397,7 +397,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextVosotros1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -411,7 +411,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEllos1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -441,7 +441,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditYo2_1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -452,7 +452,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditTu2_1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -463,7 +463,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEl2_1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -474,7 +474,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditNosotros2_1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -485,7 +485,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditVosotros2_1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -496,7 +496,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEllos2_1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -609,7 +609,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextYo2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -623,7 +623,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextTu2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -637,7 +637,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEl2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -651,7 +651,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextNosotros2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -665,7 +665,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextVosotros2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -679,7 +679,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEllos2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -709,7 +709,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditYo2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -720,7 +720,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditTu2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -731,7 +731,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEl2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -742,7 +742,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditNosotros2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -753,7 +753,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditVosotros2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -764,7 +764,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEllos2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -877,7 +877,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextYo3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -891,7 +891,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextTu3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -905,7 +905,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEl3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -919,7 +919,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextNosotros3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -933,7 +933,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextVosotros3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -947,7 +947,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEllos3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -977,7 +977,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditYo2_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -988,7 +988,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditTu2_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -999,7 +999,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEl2_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1010,7 +1010,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditNosotros2_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1021,7 +1021,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditVosotros2_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1032,7 +1032,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEllos2_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1145,7 +1145,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextYo4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1159,7 +1159,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextTu4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1173,7 +1173,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEl4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1187,7 +1187,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextNosotros4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1201,7 +1201,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextVosotros4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1215,7 +1215,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEllos4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1245,7 +1245,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditYo2_4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1256,7 +1256,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditTu2_4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1267,7 +1267,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEl2_4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1278,7 +1278,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditNosotros2_4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1289,7 +1289,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditVosotros2_4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1300,7 +1300,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEllos2_4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1413,7 +1413,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextYo5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1427,7 +1427,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextTu5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1441,7 +1441,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEl5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1455,7 +1455,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextNosotros5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1469,7 +1469,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextVosotros5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1483,7 +1483,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEllos5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1513,7 +1513,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditYo2_5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1524,7 +1524,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditTu2_5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1535,7 +1535,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEl2_5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1546,7 +1546,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditNosotros2_5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1557,7 +1557,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditVosotros2_5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1568,7 +1568,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEllos2_5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1681,7 +1681,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextYo6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1695,7 +1695,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextTu6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1709,7 +1709,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEl6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1723,7 +1723,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextNosotros6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1737,7 +1737,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextVosotros6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1751,7 +1751,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEllos6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1781,7 +1781,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditYo2_6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1792,7 +1792,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditTu2_6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1803,7 +1803,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEl2_6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1814,7 +1814,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditNosotros2_6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1825,7 +1825,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditVosotros2_6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1836,7 +1836,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEllos2_6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -1949,7 +1949,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextYo7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1963,7 +1963,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextTu7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1977,7 +1977,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEl7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -1991,7 +1991,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextNosotros7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -2005,7 +2005,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextVosotros7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -2019,7 +2019,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEllos7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -2049,7 +2049,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditYo2_7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2060,7 +2060,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditTu2_7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2071,7 +2071,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEl2_7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2082,7 +2082,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditNosotros2_7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2093,7 +2093,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditVosotros2_7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2104,7 +2104,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEllos2_7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2231,7 +2231,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextYo8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -2245,7 +2245,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextTu8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -2259,7 +2259,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextEl8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -2273,7 +2273,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextNosotros8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -2287,7 +2287,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>TextVosotros8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -2327,7 +2327,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditYo2_8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2338,7 +2338,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditTu2_8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2349,7 +2349,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEl2_8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2360,7 +2360,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditNosotros2_8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2371,7 +2371,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditVosotros2_8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2382,7 +2382,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>EditEllos2_8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -2462,7 +2462,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>ButtonN</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -2476,7 +2476,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>ButtonA</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -2490,7 +2490,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>ButtonE</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -2504,7 +2504,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>ButtonI</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -2518,7 +2518,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>ButtonO</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -2532,7 +2532,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>ButtonU</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -2562,7 +2562,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>ButtonLoeschen</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -2587,7 +2587,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>PushZurueck</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -2601,7 +2601,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>PushWeiter</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -2615,7 +2615,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>PushNewVerb</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -2629,7 +2629,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>PushBeenden</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> diff --git a/kverbos/kverbos/qlernen.ui b/kverbos/kverbos/qlernen.ui index 42efac62..2b638d50 100644 --- a/kverbos/kverbos/qlernen.ui +++ b/kverbos/kverbos/qlernen.ui @@ -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"> @@ -81,7 +81,7 @@ The user learns with this GUI.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -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"> @@ -108,7 +108,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditAleman</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -138,7 +138,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>TextTiempo2</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>70</width> <height>32767</height> @@ -190,7 +190,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>TextYo</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -204,7 +204,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>TextTu</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -218,7 +218,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>TextEl</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -232,7 +232,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>TextNosotros</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -246,7 +246,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>TextVosotros</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -260,7 +260,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>TextEllos</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -290,7 +290,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditYo1</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -301,7 +301,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditTu1</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -312,7 +312,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditEl1</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -323,7 +323,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditNosotros1</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -334,7 +334,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditVosotros1</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -345,7 +345,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditEllos1</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -372,7 +372,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditYo2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -383,7 +383,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditTu2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -394,7 +394,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditEl2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -405,7 +405,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditNosotros2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -416,7 +416,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditVosotros2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -427,7 +427,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditEllos2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -459,7 +459,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditTu3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -470,7 +470,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditEl3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -481,7 +481,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditNosotros3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -492,7 +492,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditVosotros3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -503,7 +503,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>EditEllos3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -543,7 +543,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>ButtonN</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -557,7 +557,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>ButtonA</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -571,7 +571,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>ButtonE</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -585,7 +585,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>ButtonI</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -599,7 +599,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>ButtonO</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -613,7 +613,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>ButtonU</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>32767</height> @@ -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"> @@ -721,7 +721,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>ButtonLoeschen</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -746,7 +746,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>ButtonKorrektur</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -768,7 +768,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>ButtonWeiter</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> diff --git a/kverbos/kverbos/qresult.ui b/kverbos/kverbos/qresult.ui index 48b9b087..83aed35d 100644 --- a/kverbos/kverbos/qresult.ui +++ b/kverbos/kverbos/qresult.ui @@ -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"> diff --git a/kverbos/kverbos/qverbedit.ui b/kverbos/kverbos/qverbedit.ui index 76f4f411..60913993 100644 --- a/kverbos/kverbos/qverbedit.ui +++ b/kverbos/kverbos/qverbedit.ui @@ -76,7 +76,7 @@ und können bearbeitet werden.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kverbos/kverbos/qverbosoptions.ui b/kverbos/kverbos/qverbosoptions.ui index 6f0344b5..455f292c 100644 --- a/kverbos/kverbos/qverbosoptions.ui +++ b/kverbos/kverbos/qverbosoptions.ui @@ -93,7 +93,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="name"> <cstring>LabelTiempos</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -107,7 +107,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="name"> <cstring>LabelPresente</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -121,7 +121,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="name"> <cstring>LabelImperfecto</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -135,7 +135,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="name"> <cstring>LabelIndefinido</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -149,7 +149,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="name"> <cstring>LabelFuturo</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -163,7 +163,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="name"> <cstring>LabelCondicional</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -180,7 +180,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -197,7 +197,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -214,7 +214,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -231,7 +231,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="enabled"> <bool>true</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -251,7 +251,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -278,7 +278,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="name"> <cstring>LabelNormal</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -300,7 +300,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -322,7 +322,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -344,7 +344,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -366,7 +366,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -388,7 +388,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -413,7 +413,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -438,7 +438,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -463,7 +463,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -488,7 +488,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -508,7 +508,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -535,7 +535,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="name"> <cstring>LabelProgresivo</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -557,7 +557,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -579,7 +579,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -601,7 +601,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -623,7 +623,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -645,7 +645,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -670,7 +670,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -695,7 +695,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -720,7 +720,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -740,7 +740,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -757,7 +757,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -784,7 +784,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="name"> <cstring>LabelPerfecto</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -806,7 +806,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -828,7 +828,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -842,7 +842,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="name"> <cstring>TextLabel1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -864,7 +864,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -886,7 +886,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -911,7 +911,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -936,7 +936,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -961,7 +961,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>28</height> @@ -981,7 +981,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -998,7 +998,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1106,7 +1106,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1165,7 +1165,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui index 6fe8b52a..76550b4a 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui @@ -12,7 +12,7 @@ <height>127</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>120</height> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -129,7 +129,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>340</width> <height>22</height> diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp index 88df5b53..26834bea 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp @@ -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)); } } } diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui index e64f19a2..2c8112e5 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui @@ -190,7 +190,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -241,7 +241,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>380</width> <height>30</height> diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui index d64fb69a..48897be5 100644 --- a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>123</height> diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui index 937e8a75..e19951b2 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui @@ -32,7 +32,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>16</height> diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp index 73db49ce..69f2d3bc 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp @@ -17,7 +17,7 @@ ***************************************************************************/ #include <tqwidgetstack.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqcheckbox.h> #include <tqlistview.h> diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index d0715a1d..f3568543 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -689,7 +689,7 @@ LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char connect(d_shortName, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotShortActivated(const TQString&))); connect(e_langLong, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLangChanged(const TQString&))); connect(e_shortName2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotShort2Changed(const TQString&))); - connect(d_kbtqlayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&))); + connect(d_kblayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&))); // Load the languages first, then the countries and create the // menus for the languages last, so they will have flags @@ -768,13 +768,13 @@ void LanguageOptions::slotDeleteClicked() enableLangWidgets(); // doesn't work yet - if (d_shortName->count() != 0 && d_kbtqlayout->isEnabled()) + if (d_shortName->count() != 0 && d_kblayout->isEnabled()) { - for (int i = 0; i < d_kbtqlayout->count(); i++) + for (int i = 0; i < d_kblayout->count(); i++) { - if (d_kbtqlayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem())) + if (d_kblayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem())) { - d_kbtqlayout->setCurrentItem(i); + d_kblayout->setCurrentItem(i); break; } } @@ -782,9 +782,9 @@ void LanguageOptions::slotDeleteClicked() } -void LanguageOptions::slotKeyboardLayoutChanged(const TQString& tqlayout) +void LanguageOptions::slotKeyboardLayoutChanged(const TQString& layout) { - m_langSet.setKeyboardLayout(tqlayout, d_shortName->currentItem()); + m_langSet.setKeyboardLayout(layout, d_shortName->currentItem()); emit widgetModified(); m_hasChanged = true; } @@ -818,16 +818,16 @@ void LanguageOptions::enableLangWidgets() TQDataStream stream(replyData, IO_ReadOnly); stream >> layouts; layouts.prepend(TQString()); - d_kbtqlayout->clear(); - d_kbtqlayout->insertStringList(layouts); + d_kblayout->clear(); + d_kblayout->insertStringList(layouts); } } } else { //kdDebug() << "kxkb not enabled" << endl; - d_kbtqlayout->clear(); - d_kbtqlayout->setEnabled(false); + d_kblayout->clear(); + d_kblayout->setEnabled(false); } } @@ -898,22 +898,22 @@ void LanguageOptions::slotShortActivated(const TQString& _id) else b_langPixmap->setText (i18n("No Picture Selected")); - TQString tqlayout = m_langSet.keyboardLayout(d_shortName->currentItem()); + TQString layout = m_langSet.keyboardLayout(d_shortName->currentItem()); - //kdDebug() << "tqlayout to select " << tqlayout << endl; + //kdDebug() << "layout to select " << layout << endl; - for (int i = 0; i < d_kbtqlayout->count(); i++) + for (int i = 0; i < d_kblayout->count(); i++) { - if (d_kbtqlayout->text(i) == tqlayout) + if (d_kblayout->text(i) == layout) { - d_kbtqlayout->setCurrentItem(i); + d_kblayout->setCurrentItem(i); break; } } // not found - if (d_kbtqlayout->currentText() != tqlayout) + if (d_kblayout->currentText() != layout) { - d_kbtqlayout->setCurrentItem(0); + d_kblayout->setCurrentItem(0); } } } @@ -1015,8 +1015,8 @@ void LanguageOptions::loadCountryData() locale.setLanguage(curr_lang); KGlobal::_locale = &locale; - TQString sub = TQString::tqfromLatin1("l10n/"); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop")); + TQString sub = TQString::fromLatin1("l10n/"); + TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); regionlist.sort(); TQMap<TQString, Region> regions; @@ -1033,22 +1033,22 @@ void LanguageOptions::loadCountryData() if (index != -1) tag.truncate(index); KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); regions.insert(tag, Region(name)); } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop")); + TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); int idx = 0; for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit) { KSimpleConfig entry(*sit); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); - TQString submenu = entry.readEntry(TQString::tqfromLatin1("Region")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + TQString submenu = entry.readEntry(TQString::fromLatin1("Region")); TQString tag = *sit; int index = tag.findRev('/'); @@ -1059,7 +1059,7 @@ void LanguageOptions::loadCountryData() if (tag == "C") continue; - TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::tqfromLatin1("Languages"))); + TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::fromLatin1("Languages"))); TQValueList<int> langs; TQString pixmap = *sit; diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui index 12b3b98e..23057407 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui @@ -93,7 +93,7 @@ </widget> <widget class="KComboBox" row="4" column="1"> <property name="name"> - <cstring>d_kbtqlayout</cstring> + <cstring>d_kblayout</cstring> </property> <property name="toolTip" stdset="0"> <string>Select a language or use the Add New Language Code to add one.</string> @@ -205,7 +205,7 @@ </widget> <widget class="TQLabel" row="4" column="0"> <property name="name"> - <cstring>label_kbtqlayout</cstring> + <cstring>label_kblayout</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -216,10 +216,10 @@ </sizepolicy> </property> <property name="text"> - <string>Keyboard tqlayout:</string> + <string>Keyboard layout:</string> </property> <property name="buddy" stdset="0"> - <cstring>d_kbtqlayout</cstring> + <cstring>d_kblayout</cstring> </property> <property name="toolTip" stdset="0"> <string>You can assign a language to each column</string> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>390</width> <height>20</height> @@ -337,7 +337,7 @@ <tabstop>e_shortName2</tabstop> <tabstop>e_langLong</tabstop> <tabstop>b_langPixmap</tabstop> - <tabstop>d_kbtqlayout</tabstop> + <tabstop>d_kblayout</tabstop> <tabstop>b_langDel</tabstop> <tabstop>e_newName</tabstop> <tabstop>b_langNew</tabstop> diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui index 142ee7f5..2524dc71 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui @@ -37,7 +37,7 @@ <property name="name"> <cstring>SeparatorCombo</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>310</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -164,7 +164,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>31</height> diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui index 3250b83e..73da961e 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui @@ -242,7 +242,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>48</height> @@ -261,7 +261,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -290,7 +290,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>20</height> @@ -309,7 +309,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -390,7 +390,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -439,7 +439,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>83</width> <height>20</height> @@ -475,7 +475,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>16</height> diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui index 788ff271..f653d9e1 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui @@ -145,7 +145,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -209,7 +209,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -285,7 +285,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>16</height> diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui index 9c6b18e6..1729c84f 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui @@ -448,7 +448,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp index a49fd65e..a7bf8442 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp @@ -23,7 +23,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp index 76013ebf..c7b58c9b 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp @@ -28,7 +28,7 @@ #include "LangPropPage.h" #include <tqstringlist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvaluelist.h> #include <tqtabwidget.h> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui index cd5b426b..eef4d0d4 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui @@ -70,7 +70,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -93,7 +93,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -225,7 +225,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -464,7 +464,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp index 3143007e..62012ea8 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp @@ -32,7 +32,7 @@ #include <tqcombobox.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <kvoctraindoc.h> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui index e189b5bc..dbd8e918 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui index 7ee368cc..910056d3 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui index 7a4aff84..fb07ebca 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui index d5207579..2a9126d0 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui index bca2b89d..14ef81ce 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui index b5cea508..131df53c 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui @@ -70,7 +70,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -89,7 +89,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -108,7 +108,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -182,7 +182,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -207,7 +207,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui index 428e902f..6676ea29 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui @@ -165,13 +165,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>30</height> @@ -196,13 +196,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>30</height> @@ -257,7 +257,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -300,13 +300,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>30</height> @@ -358,13 +358,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>30</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>24</height> @@ -387,7 +387,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -406,7 +406,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>90</height> @@ -428,7 +428,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>80</height> @@ -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"> diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp index 82a8f945..6d619b79 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp @@ -26,7 +26,7 @@ #include "EntryDlg.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <kmainwindow.h> @@ -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); diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui index d01d74bf..20d5e373 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -150,7 +150,7 @@ <property name="name"> <cstring>year_spin</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> @@ -161,7 +161,7 @@ <property name="name"> <cstring>month_spin</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>110</width> <height>0</height> @@ -172,7 +172,7 @@ <property name="name"> <cstring>day_spin</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp index 5bfe2343..9e7c7450 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp @@ -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); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index 9669719c..e212c87c 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp @@ -26,7 +26,7 @@ #include "PhoneticEntryPage.h" -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> #include <tqgroupbox.h> #include <tqtooltip.h> @@ -43,11 +43,11 @@ struct KV_Unicode_Ref { wchar_t code; - const char *tqunicodename; + const char *unicodename; const char *audible; }; -KV_Unicode_Ref kv_tqunicode_ref[] = { +KV_Unicode_Ref kv_unicode_ref[] = { {0x00E6, "LATIN SMALL LETTER AE", I18N_NOOP_maybe("")}, {0x00E7, "LATIN SMALL LETTER C WITH CEDILLA", I18N_NOOP_maybe("")}, @@ -171,18 +171,18 @@ KV_Unicode_Ref kv_tqunicode_ref[] = { void PhoneticButton::slotClicked() { if (text().length() != 0) - emit page->charSelected(text()[0].tqunicode()); + emit page->charSelected(text()[0].unicode()); } PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, const char *name, bool modal) : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, parent, name, modal) { - int num = sizeof(kv_tqunicode_ref) / sizeof(kv_tqunicode_ref[0]); + int num = sizeof(kv_unicode_ref) / sizeof(kv_unicode_ref[0]); TQFrame * phoneticbox = plainPage(); TQGridLayout *gbox = new TQGridLayout(phoneticbox, KV_MAX_HORIZ, (num+KV_MAX_HORIZ-1)/KV_MAX_HORIZ, 1); - KV_Unicode_Ref *uni_ref = kv_tqunicode_ref; + KV_Unicode_Ref *uni_ref = kv_unicode_ref; int vert = 0; int horiz = 0; while (uni_ref->code != 0) { @@ -191,12 +191,12 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this); connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) ); TQString tip = i18n("Unicode name: "); - tip += TQString::tqfromLatin1(uni_ref->tqunicodename); + tip += TQString::fromLatin1(uni_ref->unicodename); tip += "\n"; tip += i18n("Describing the sound of the character", "Sound: "); tip += i18n(uni_ref->audible); butt->setFont(ipafont); - butt->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + butt->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed)); int sz = TQMAX(14, int(1.7*ipafont.pointSize())); butt->setMaximumSize(TQSize (sz, sz)); gbox->addWidget( butt, vert, horiz, AlignCenter ); @@ -208,7 +208,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co } ++uni_ref; } - resize(tqsizeHint()); + resize(sizeHint()); } @@ -217,7 +217,7 @@ void PhoneticEntryPage::keyPressEvent( TQKeyEvent *e ) if ((e->state() & (ControlButton | AltButton)) == 0) { TQString s = e->text(); for (unsigned i = 0; i < s.length(); ++i) { - emit charSelected(s[i].tqunicode()); + emit charSelected(s[i].unicode()); } e->accept(); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui index 8c1e580b..c3ea92a6 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui @@ -44,7 +44,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -307,7 +307,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp index 9d272a4e..3e13aaa6 100644 --- a/kvoctrain/kvoctrain/kva_clip.cpp +++ b/kvoctrain/kvoctrain/kva_clip.cpp @@ -26,7 +26,7 @@ #include "kvoctrain.h" -#include <tqclipboard.h> +#include <clipboard.h> #include <klineedit.h> #include <klocale.h> @@ -38,7 +38,7 @@ using namespace std; void kvoctrainApp::slotSmartSearchClip() { TQString s; - TQString entries = TQApplication::tqclipboard()->text(); + TQString entries = TQApplication::clipboard()->text(); if (!entries.isEmpty()) { int pos = entries.find ('\n'); // search for a line end @@ -148,11 +148,11 @@ void kvoctrainApp::slotEditCopy() } if (!exp.isEmpty()) { #if defined(_WS_X11_) -// disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),this,0); +// disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),this,0); #endif - TQApplication::tqclipboard()->setText(exp); + TQApplication::clipboard()->setText(exp); #if defined(_WS_X11_) -// connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); +// connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); #endif } @@ -167,7 +167,7 @@ void kvoctrainApp::slotEditPaste() TQApplication::setOverrideCursor( waitCursor ); TQString s; - TQString entries = TQApplication::tqclipboard()->text(); + TQString entries = TQApplication::clipboard()->text(); vector <int> csv_order = getCsvOrder(doc); diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp index eee43d99..54f7a7ee 100644 --- a/kvoctrain/kvoctrain/kva_header.cpp +++ b/kvoctrain/kvoctrain/kva_header.cpp @@ -53,7 +53,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ header_m->insertItem(SmallIconSet("sort_num"), i18n(SORT_NUM), (header << 16) | IDH_SORT_COL_NUM); connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); header_m->exec(TQPoint (x, y)); return; @@ -90,7 +90,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ (header << 16) | (i << (16+8)) | IDH_SET_LANG); } connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int))); - connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); header_m = new TQPopupMenu(); @@ -134,27 +134,27 @@ 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); connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available int j; 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); @@ -168,7 +168,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE); header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE); connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); header_m->insertSeparator(); header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA); @@ -176,7 +176,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ } connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); header_m->exec(TQPoint(x, y)); } @@ -226,7 +226,7 @@ void kvoctrainApp::slotSetHeaderProp (int header_and_id) /*FOLD00*/ } -void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ +void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/ { int header1 = (header_and_cmd >> 16) & 0xFF; int header2 = header_and_cmd >> (16+8); @@ -262,11 +262,11 @@ void kvoctrainApp::slotHeadertqStatus (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::slotHeadertqStatus (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::slotHeadertqStatus (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::slotHeadertqStatus (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::slotHeadertqStatus (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")); diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index 9bef423d..6af8c57b 100644 --- a/kvoctrain/kvoctrain/kva_init.cpp +++ b/kvoctrain/kvoctrain/kva_init.cpp @@ -27,7 +27,7 @@ #include "common-dialogs/ProgressDlg.h" -#include <tqclipboard.h> +#include <clipboard.h> #include <tqtimer.h> #include <klineedit.h> @@ -187,7 +187,7 @@ void kvoctrainApp::initActions() vocabAppendLanguage = new KSelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language"); connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabAppendLanguage())); connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotAppendLang(int))); - connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeadertqStatus(int))); + connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int))); vocabSetLanguage = new KSelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language"); connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabSetLanguage())); @@ -195,7 +195,7 @@ void kvoctrainApp::initActions() vocabRemoveLanguage = new KSelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language"); connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabRemoveLanguage())); connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderCallBack(int))); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeadertqStatus(int))); + connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int))); vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); vocabDocumentProperties->setWhatsThis(i18n("Edit document properties")); @@ -245,7 +245,7 @@ void kvoctrainApp::initActions() //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), this, TQT_SLOT(slotActionHighlighted(KAction *, bool))); if (!initialGeometrySet()) - resize( TQSize(550, 400).expandedTo(tqminimumSizeHint())); + resize( TQSize(550, 400).expandedTo(minimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); @@ -255,7 +255,7 @@ void kvoctrainApp::initActions() learn_menu = (TQPopupMenu*) child( "learning", "KPopupMenu" ); connect(learn_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn())); } diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index 5f0c52bc..7d4c338c 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -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 diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp index 1469c354..c9be7784 100644 --- a/kvoctrain/kvoctrain/kvoctrain.cpp +++ b/kvoctrain/kvoctrain/kvoctrain.cpp @@ -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,17 +1140,17 @@ 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); } } header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL); connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available @@ -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); @@ -1178,11 +1178,11 @@ void kvoctrainApp::aboutToShowLearn() header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE); connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); } connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); TQString id = header == 0 ? doc->getOriginalIdent() : doc->getIdent(header); @@ -1264,7 +1264,7 @@ void kvoctrainApp::aboutToShowVocabSetLanguage() } connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int))); - connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); if (header == 0) set_m->insertItem(i18n("&Original"), langs_m, (2 << 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); } } } diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h index bf1ea6ea..7fa8203d 100644 --- a/kvoctrain/kvoctrain/kvoctrain.h +++ b/kvoctrain/kvoctrain/kvoctrain.h @@ -146,7 +146,7 @@ public: // void slotSearchClip(); void slotSetHeaderProp (int header_and_id); void slotHeaderCallBack (int cmd_and_id); - void slotHeadertqStatus (int cmd_and_id); + void slotHeaderStatus (int cmd_and_id); void slotHeaderMenu(int header, int x, int y); /** append language to table */ void slotAppendLang(int header); diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp index c41de57b..e5259f31 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.cpp +++ b/kvoctrain/kvoctrain/kvoctraintable.cpp @@ -424,10 +424,10 @@ void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & c } TQPen pen( p->pen() ); - int gridColor = tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, this ); + int gridColor = tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, this ); if (gridColor != -1) { const TQPalette &pal = palette(); - if (cg != tqcolorGroup() + if (cg != colorGroup() && cg != pal.disabled() && cg != pal.inactive()) p->setPen(cg.mid()); diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp index d4bc0343..34b00912 100644 --- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp +++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp @@ -75,7 +75,7 @@ TQWidget *KVocTrainTableItem::createEditor() const statebox->insertItem (i18n("state of a row", "Active, Not in Query")); statebox->insertItem (i18n("state of a row", "In Query")); statebox->insertItem (i18n("state of a row", "Inactive")); - TQSize sz = statebox->tqsizeHint(); + TQSize sz = statebox->sizeHint(); sz.setHeight(table()->rowHeight(row())); statebox->setMinimumSize(sz); if (!m_doc->getEntry(row())->isActive() ) diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp index 61cc55bb..17515e5e 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.cpp +++ b/kvoctrain/kvoctrain/kvoctrainview.cpp @@ -38,7 +38,7 @@ #include <kapplication.h> #include <kprinter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbitmap.h> #include <tqfile.h> @@ -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) diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp index f177fa14..06f8f972 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp @@ -27,7 +27,7 @@ #include "kvoctrain.h" -#include <tqtextcodec.h> +#include <textcodec.h> #include <vector> using namespace std; @@ -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); @@ -138,42 +138,42 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is) // autodetect utf8 if (!utf8_mode) { for (int i = 0; !utf8_mode && i < (int) s.length(); ++i) { - ushort trigger = s[i].tqunicode(); + ushort trigger = s[i].unicode(); if (trigger >= 0x80) { int remain = s.length() - i; if ((trigger & 0xE0) == 0xC0){ // 110x xxxx if ( (remain > 1) - && (s[i+1].tqunicode() & 0xC0) == 0x80) + && (s[i+1].unicode() & 0xC0) == 0x80) utf8_mode = true; } else if ((trigger & 0xF0) == 0xE0) { // 1110 xxxx if ( remain > 2 - && s[i+1].tqunicode() & 0xC0 == 0x80 - && s[i+2].tqunicode() & 0xC0 == 0x80) + && s[i+1].unicode() & 0xC0 == 0x80 + && s[i+2].unicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xF8) == 0xF0) { // 1111 0xxx if ( remain > 3 - && s[i+1].tqunicode() & 0xC0 == 0x80 - && s[i+2].tqunicode() & 0xC0 == 0x80 - && s[i+3].tqunicode() & 0xC0 == 0x80) + && s[i+1].unicode() & 0xC0 == 0x80 + && s[i+2].unicode() & 0xC0 == 0x80 + && s[i+3].unicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFC) == 0xF8) { // 1111 10xx if ( remain > 4 - && s[i+1].tqunicode() & 0xC0 == 0x80 - && s[i+2].tqunicode() & 0xC0 == 0x80 - && s[i+3].tqunicode() & 0xC0 == 0x80 - && s[i+4].tqunicode() & 0xC0 == 0x80) + && s[i+1].unicode() & 0xC0 == 0x80 + && s[i+2].unicode() & 0xC0 == 0x80 + && s[i+3].unicode() & 0xC0 == 0x80 + && s[i+4].unicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFE) == 0xFC) { // 1111 110x if ( remain > 5 - && s[i+1].tqunicode() & 0xC0 == 0x80 - && s[i+2].tqunicode() & 0xC0 == 0x80 - && s[i+3].tqunicode() & 0xC0 == 0x80 - && s[i+4].tqunicode() & 0xC0 == 0x80 - && s[i+5].tqunicode() & 0xC0 == 0x80) + && s[i+1].unicode() & 0xC0 == 0x80 + && s[i+2].unicode() & 0xC0 == 0x80 + && s[i+3].unicode() & 0xC0 == 0x80 + && s[i+4].unicode() & 0xC0 == 0x80 + && s[i+5].unicode() & 0xC0 == 0x80) utf8_mode = true; } } @@ -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; } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp index 0bd03361..649825d4 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp @@ -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; } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp index 1bb67f28..f1c4bbc3 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp @@ -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(); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp index de7cbd19..f4443ca5 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp @@ -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 { diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp index 5bc10f3f..7bef3ff7 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp @@ -27,7 +27,7 @@ #include <klocale.h> -#include <tqtextcodec.h> +#include <textcodec.h> bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is) { @@ -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 { diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp index 748fe81d..72020b94 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp @@ -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; } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp index c280d6ed..7cce072b 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp @@ -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; } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp index c01c82c9..39a4bf8a 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> -#include <tqtextcodec.h> +#include <textcodec.h> bool kvoctrainDoc::saveTypeNameKvtMl (XmlWriter &xml) { @@ -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; } diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp index ba21da07..24beec1f 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp @@ -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') diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h index 866e7822..d5ab8f91 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h +++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h @@ -32,8 +32,8 @@ class KOXML_OSTREAM; * * xml.startTag ("head"); // writes <head> * - * // write <tqlayout format="a4" orientation="landscape"> - * xml.startTag ("tqlayout", false); + * // write <layout format="a4" orientation="landscape"> + * xml.startTag ("layout", false); * xml.addAttribute ("format", "a4"); * xml.addAttribute ("orientation", "landscape"); * xml.closeTag (true); @@ -172,7 +172,7 @@ public: /** * Get the raw output stream. */ - inline TQIODevice *stream () { return strm.tqdevice(); } + inline TQIODevice *stream () { return strm.device(); } #endif private: diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h index 3e031331..fd411e23 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h +++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h @@ -8,7 +8,7 @@ #ifndef KOXML_USE_STL -# include <tqtextstream.h> +# include <textstream.h> # define KOXML_ISTREAM TQTextStream # define KOXML_OSTREAM TQTextStream diff --git a/kvoctrain/kvoctrain/kvt-core/langset.cpp b/kvoctrain/kvoctrain/kvt-core/langset.cpp index a9ed5dcb..77d03fb0 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.cpp +++ b/kvoctrain/kvoctrain/kvt-core/langset.cpp @@ -212,9 +212,9 @@ void LangSet::setPixMapFile (const TQString & s, int index) langs[index].PixMapFile = s; } -void LangSet::setKeyboardLayout(const TQString& tqlayout, int index) +void LangSet::setKeyboardLayout(const TQString& layout, int index) { if (index < (int) langs.size()) { - langs[index].keyboardLayout = tqlayout; + langs[index].keyboardLayout = layout; } } diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h index cfcc7f3b..ac4e8ace 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.h +++ b/kvoctrain/kvoctrain/kvt-core/langset.h @@ -70,7 +70,7 @@ class LangSet void setShortId2 (const TQString & shortId2, int index); void setLongId (const TQString & longId, int index); void setPixMapFile (const TQString & PixMapFile, int index); - void setKeyboardLayout(const TQString & tqlayout, int index); + void setKeyboardLayout(const TQString & layout, int index); TQString findShortId (const TQString & longId) const; TQString findLongId (const TQString & shortId) const; diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp index 659c6f82..792ca63c 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.cpp +++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp @@ -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; diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui index 6aaf00a9..d6197ea0 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>390</width> <height>60</height> @@ -131,7 +131,7 @@ </spacer> <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -158,7 +158,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui index 42653ef9..def5f384 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui @@ -120,7 +120,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -229,7 +229,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui index edcb7c2e..4a46ac77 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui @@ -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> @@ -221,7 +221,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -229,7 +229,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <grid> <property name="name"> diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp index 3b108143..d70b92ed 100644 --- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp @@ -66,9 +66,9 @@ bool QueryDlgBase::verifyField(TQLineEdit *field, const TQString &really) if (!field->isEnabled() ) return true; - TQColorGroup u_normal = field->tqcolorGroup(); + TQColorGroup u_normal = field->colorGroup(); u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00)); - TQColorGroup k_normal = field->tqcolorGroup(); + TQColorGroup k_normal = field->colorGroup(); k_normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x80, 0x00)); TQPalette known_pal( field->palette()); @@ -107,7 +107,7 @@ void QueryDlgBase::resetField(TQLineEdit *field) { if (!field->isEnabled() ) return; - TQColorGroup normal = field->tqcolorGroup(); + TQColorGroup normal = field->colorGroup(); normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00)); TQPalette pal( field->palette()); @@ -132,9 +132,9 @@ bool QueryDlgBase::verifyField(TQMultiLineEdit *field, const TQString &really, b { if (!field->isEnabled()) return true; - TQColorGroup u_normal = field->tqcolorGroup(); + TQColorGroup u_normal = field->colorGroup(); u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00)); - TQColorGroup k_normal = field->tqcolorGroup(); + TQColorGroup k_normal = field->colorGroup(); k_normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x80, 0x00)); TQPalette known_pal( field->palette()); @@ -195,7 +195,7 @@ void QueryDlgBase::resetField(TQMultiLineEdit *field) { if (!field->isEnabled() ) return; - TQColorGroup normal = field->tqcolorGroup(); + TQColorGroup normal = field->colorGroup(); normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00)); TQPalette pal( field->palette()); @@ -221,9 +221,9 @@ void QueryDlgBase::verifyButton(TQRadioButton *radio, bool is_ok, TQWidget *widg if (!radio->isEnabled() ) return; - TQColorGroup u_normal = radio->tqcolorGroup(); + TQColorGroup u_normal = radio->colorGroup(); u_normal.setColor(TQColorGroup::Foreground, TQColor(0xff, 0x00, 0x00)); - TQColorGroup k_normal = radio->tqcolorGroup(); + TQColorGroup k_normal = radio->colorGroup(); k_normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x80, 0x00)); TQPalette known_pal( radio->palette()); @@ -273,7 +273,7 @@ void QueryDlgBase::resetButton(TQRadioButton *radio, TQWidget *widget2) { if (!radio->isEnabled() ) return; - TQColorGroup normal = radio->tqcolorGroup(); + TQColorGroup normal = radio->colorGroup(); normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x00, 0x00)); TQPalette pal(radio->palette()); @@ -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*/) diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp index e767775c..57c5b802 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp @@ -36,7 +36,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqregexp.h> @@ -60,7 +60,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans) TQRegExp regex (regexp); if ( regex.search (trans) >= 0 ) { - translations = regex.tqcapturedTexts(); + translations = regex.capturedTexts(); translations.remove (translations.at (0)); break; } @@ -77,7 +77,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans) TQRegExp regex (regexp); if ( regex.search (trans) >= 0 ) { - translations = regex.tqcapturedTexts(); + translations = regex.capturedTexts(); translations.remove (translations.at (0)); break; } @@ -95,7 +95,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans) TQRegExp regex (regexp); if ( regex.search (trans) >= 0 ) { - translations = regex.tqcapturedTexts(); + translations = regex.capturedTexts(); translations.remove (translations.at (0)); break; } @@ -113,7 +113,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans) TQRegExp regex (regexp); if ( regex.search (trans) >= 0 ) { - translations = regex.tqcapturedTexts(); + translations = regex.capturedTexts(); translations.remove (translations.at (0)); break; } @@ -168,7 +168,7 @@ RandomQueryDlg::RandomQueryDlg( for ( i = 0; i < fields; i ++ ) { transCombos.append (new TQComboBox (false, mw->TranslationFrame, TQCString ("transCombo") + TQCString().setNum (i))); - transCombos.at(i) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth())); + transCombos.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth())); transCombos.at(i) -> setEditable (true); transCombos.at(i) -> setInsertionPolicy (TQComboBox::NoInsertion); transCombos.at(i) -> setDuplicatesEnabled (false); @@ -182,7 +182,7 @@ RandomQueryDlg::RandomQueryDlg( for ( i = 0; i < fields; i ++ ) { transFields.append (new TQLineEdit (mw->TranslationFrame, TQCString ("transField") + TQCString().setNum (i))); - transFields.at(i) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth())); + transFields.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth())); vb->addWidget(transFields.at(i)); connect (transFields.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&))); connect (transFields.at(i), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus())); @@ -202,7 +202,7 @@ RandomQueryDlg::RandomQueryDlg( if ( split && kv_doc -> numEntries() >= 500 ) { pdlg = new ProgressDlg (TQString(), TQString(), kapp -> makeStdCaption (i18n("Loading Random Query"))); - pdlg -> resize (pdlg -> width(), pdlg -> tqminimumSize().height()); + pdlg -> resize (pdlg -> width(), pdlg -> minimumSize().height()); pdlg -> show(); kapp -> processEvents(); } @@ -650,7 +650,7 @@ void RandomQueryDlg::keyPressEvent( TQKeyEvent *e ) for ( uint i = 0; i < vocabulary.count(); i ++ ) { TQString trans (vocabulary[i]); - if ( (e -> key() == Key_F5 && trans.tqstartsWith (curText, false) + if ( (e -> key() == Key_F5 && trans.startsWith (curText, false) || e -> key() == Key_F6 && trans.contains (curText, false)) ) combo -> insertItem (trans); } diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui index 8b84c852..7b35a6c2 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui @@ -190,7 +190,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>450</width> <height>40</height> @@ -199,7 +199,7 @@ </spacer> <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -229,7 +229,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp index eb88a5f2..d23be59d 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp @@ -109,7 +109,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype, mw->instructionLabel->setText(i18n("Enter the synonym:")); setCaption (i18n("Synonym Training")); answerstring = exp->getSynonym(column); - mw->queryField->tqsetAlignment(TQt::AlignVCenter); + mw->queryField->setAlignment(TQt::AlignVCenter); mw->queryField->setText(column == 0 ? exp->getOriginal() : exp->getTranslation(column)); setQueryFieldWordwrap(); } @@ -327,9 +327,9 @@ void SimpleQueryDlg::setQueryFieldWordwrap() int w = fm.width(mw->queryField->text()); int w2 = mw->width(); if (w > w2) - mw->queryField->tqsetAlignment(TQt::AlignVCenter | TQt::WordBreak); + mw->queryField->setAlignment(TQt::AlignVCenter | TQt::WordBreak); else - mw->queryField->tqsetAlignment(TQt::AlignVCenter); + mw->queryField->setAlignment(TQt::AlignVCenter); } diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui index c39377c7..c20cd142 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -64,7 +64,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>300</width> <height>16</height> @@ -115,7 +115,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> @@ -240,7 +240,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <grid> <property name="name"> diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp index 644c60bf..72d749a2 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp @@ -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); diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui index 0ca0d685..7e28115d 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <hbox> <property name="name"> @@ -65,7 +65,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout30</cstring> + <cstring>layout30</cstring> </property> <hbox> <property name="name"> @@ -73,7 +73,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <grid> <property name="name"> @@ -163,7 +163,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout27</cstring> + <cstring>layout27</cstring> </property> <grid> <property name="name"> @@ -269,7 +269,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -309,7 +309,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <grid> <property name="name"> @@ -317,7 +317,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout31</cstring> + <cstring>layout31</cstring> </property> <grid> <property name="name"> @@ -516,7 +516,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>390</width> <height>16</height> diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp index fa407605..1f722230 100644 --- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp +++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp @@ -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); } diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui index db44fed9..8e797879 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp index 7fd6bbb0..10cc4a45 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp @@ -23,7 +23,7 @@ * * ***************************************************************************/ -#include <tqlayout.h> +#include <layout.h> #include "StatistikDlg.h" #include "StatistikPage.h" diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui index e1fcff46..a9e4130e 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui @@ -70,7 +70,7 @@ <property name="name"> <cstring>StatListView</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>0</height> diff --git a/kvoctrain/kvoctrain/tools/extractlang.cpp b/kvoctrain/kvoctrain/tools/extractlang.cpp index a775274e..3d968bc6 100644 --- a/kvoctrain/kvoctrain/tools/extractlang.cpp +++ b/kvoctrain/kvoctrain/tools/extractlang.cpp @@ -1,4 +1,4 @@ -#include <tqtextstream.h> +#include <textstream.h> #include <tqstring.h> /////////////////////////////////////////////////////////// diff --git a/kwordquiz/src/dlglanguagebase.ui b/kwordquiz/src/dlglanguagebase.ui index 10d6c095..38edf095 100644 --- a/kwordquiz/src/dlglanguagebase.ui +++ b/kwordquiz/src/dlglanguagebase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>120</height> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -53,7 +53,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -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"> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -138,7 +138,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout2_2</cstring> + <cstring>layout2_2</cstring> </property> <grid> <property name="name"> @@ -156,7 +156,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -187,7 +187,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto</set> </property> <property name="toolTip" stdset="0"> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kwordquiz/src/dlgrcbase.ui b/kwordquiz/src/dlgrcbase.ui index 6a06876b..3fec70fd 100644 --- a/kwordquiz/src/dlgrcbase.ui +++ b/kwordquiz/src/dlgrcbase.ui @@ -12,7 +12,7 @@ <height>156</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>150</height> @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -43,7 +43,7 @@ <property name="maxLength"> <number>5</number> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto</set> </property> <property name="validChars"> @@ -77,7 +77,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -124,7 +124,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> diff --git a/kwordquiz/src/dlgsortbase.ui b/kwordquiz/src/dlgsortbase.ui index c9c4ed7b..59342257 100644 --- a/kwordquiz/src/dlgsortbase.ui +++ b/kwordquiz/src/dlgsortbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>170</height> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp index af521fd1..e44cb403 100644 --- a/kwordquiz/src/dlgspecchar.cpp +++ b/kwordquiz/src/dlgspecchar.cpp @@ -16,7 +16,7 @@ #include "dlgspecchar.h" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kcharselect.h> @@ -38,11 +38,11 @@ void DlgSpecChar::initDialog(const TQChar &_chr, const TQString &_font, bool /*_ grid = new TQGridLayout( page, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); - int t = (_chr.tqunicode()/256); + int t = (_chr.unicode()/256); charSelect = new KCharSelect( page, "", _font, _chr, t); connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); - charSelect->resize( charSelect->tqsizeHint() ); + charSelect->resize( charSelect->sizeHint() ); charSelect->enableFontCombo( false ); grid->addWidget( charSelect, 0, 0 ); diff --git a/kwordquiz/src/flashviewbase.ui b/kwordquiz/src/flashviewbase.ui index a6eca621..c0ce8e61 100644 --- a/kwordquiz/src/flashviewbase.ui +++ b/kwordquiz/src/flashviewbase.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>30</height> @@ -43,7 +43,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -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"> @@ -225,7 +225,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>30</height> @@ -234,7 +234,7 @@ </spacer> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <grid> <property name="name"> @@ -259,7 +259,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <grid> <property name="name"> @@ -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"> @@ -314,7 +314,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -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"> @@ -382,7 +382,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -413,7 +413,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -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"> @@ -481,7 +481,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -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"> diff --git a/kwordquiz/src/kvtmlwriter.cpp b/kwordquiz/src/kvtmlwriter.cpp index dc123113..4855dbf2 100644 --- a/kwordquiz/src/kvtmlwriter.cpp +++ b/kwordquiz/src/kvtmlwriter.cpp @@ -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; } diff --git a/kwordquiz/src/kvtmlwriter.h b/kwordquiz/src/kvtmlwriter.h index ccf18071..3e1c4876 100644 --- a/kwordquiz/src/kvtmlwriter.h +++ b/kwordquiz/src/kvtmlwriter.h @@ -18,7 +18,7 @@ #define KVTMLWRITER_H #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> /** @author Peter Hedlund diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index b370f36c..654c21e0 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -304,7 +304,7 @@ void KWordQuizApp::initActions() updateSpecialCharIcons(); if (!initialGeometrySet()) - resize( TQSize(650, 500).expandedTo(tqminimumSizeHint())); + resize( TQSize(650, 500).expandedTo(minimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); @@ -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 } @@ -801,7 +801,7 @@ void KWordQuizApp::slotVocabFont() void KWordQuizApp::slotVocabKeyboard() { - slotStatusMsg(i18n("Changing the keyboard tqlayout...")); + slotStatusMsg(i18n("Changing the keyboard layout...")); KMessageBox::sorry(0, i18n("Not implemented yet")); slotStatusMsg(i18n("Ready")); } @@ -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,14 +1074,14 @@ 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])); } } TQString KWordQuizApp::charIcon(const TQChar & c) { ///Create a name and path for the icon - TQString s = locateLocal("icon", "char" + TQString::number(c.tqunicode()) + ".png"); + TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png"); ///No need to redraw if it already exists if (KStandardDirs::exists(s)) @@ -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; } diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index 59dc10a1..db923f56 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -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(); diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp index c1e3dacc..333f7713 100644 --- a/kwordquiz/src/kwordquizdoc.cpp +++ b/kwordquiz/src/kwordquizdoc.cpp @@ -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); diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h index a84bc119..e5bbc4e6 100644 --- a/kwordquiz/src/kwordquizdoc.h +++ b/kwordquiz/src/kwordquizdoc.h @@ -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); diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp index 61380e68..fe33d78a 100644 --- a/kwordquiz/src/kwordquizprefs.cpp +++ b/kwordquiz/src/kwordquizprefs.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tqwidgetstack.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqcheckbox.h> #include <tqlistview.h> diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index 021601bd..8868fd95 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -18,7 +18,7 @@ // include files for TQt #include <tqpainter.h> #include <tqtable.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqlineedit.h> // include files for KDE @@ -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) { diff --git a/kwordquiz/src/kwordquizview.h b/kwordquiz/src/kwordquizview.h index b49ea65c..d0cf7466 100644 --- a/kwordquiz/src/kwordquizview.h +++ b/kwordquiz/src/kwordquizview.h @@ -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 diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp index d4868889..64d620cd 100644 --- a/kwordquiz/src/kwqnewstuff.cpp +++ b/kwordquiz/src/kwqnewstuff.cpp @@ -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; diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui index 4e25f0c3..3d848b83 100644 --- a/kwordquiz/src/multipleviewbase.ui +++ b/kwordquiz/src/multipleviewbase.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout58</cstring> + <cstring>layout58</cstring> </property> <grid> <property name="name"> @@ -50,7 +50,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>32</height> @@ -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"> @@ -117,7 +117,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -137,7 +137,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>tqlayout60</cstring> + <cstring>layout60</cstring> </property> <grid> <property name="name"> @@ -155,7 +155,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -183,7 +183,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>32</height> @@ -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"> @@ -242,7 +242,7 @@ </widget> <widget class="TQLayoutWidget" row="6" column="0"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <grid> <property name="name"> @@ -267,7 +267,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <grid> <property name="name"> @@ -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"> @@ -322,7 +322,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -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"> @@ -390,7 +390,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -421,7 +421,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -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"> @@ -489,7 +489,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -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"> @@ -551,7 +551,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="0"> <property name="name"> - <cstring>tqlayout61</cstring> + <cstring>layout61</cstring> </property> <grid> <property name="name"> @@ -569,7 +569,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>32</height> @@ -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"> @@ -636,7 +636,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -656,7 +656,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout63</cstring> + <cstring>layout63</cstring> </property> <grid> <property name="name"> @@ -674,7 +674,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -702,7 +702,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -730,7 +730,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -758,7 +758,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>32</height> @@ -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"> @@ -794,7 +794,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -814,7 +814,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout59</cstring> + <cstring>layout59</cstring> </property> <grid> <property name="name"> @@ -832,7 +832,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>32</height> @@ -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"> @@ -902,7 +902,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui index 3ac9e381..a051b9de 100644 --- a/kwordquiz/src/prefcardappearancebase.ui +++ b/kwordquiz/src/prefcardappearancebase.ui @@ -34,13 +34,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>175</width> <height>100</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>175</width> <height>100</height> @@ -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"> @@ -480,7 +480,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>400</width> <height>20</height> diff --git a/kwordquiz/src/prefcharacterbase.ui b/kwordquiz/src/prefcharacterbase.ui index a9c63062..da54220a 100644 --- a/kwordquiz/src/prefcharacterbase.ui +++ b/kwordquiz/src/prefcharacterbase.ui @@ -12,7 +12,7 @@ <height>356</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>350</height> @@ -52,7 +52,7 @@ <property name="text"> <string>Note: Select Settings -> Configure Shortcuts... to change the shortcut associated with each action.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>30</height> @@ -308,7 +308,7 @@ </spacer> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -324,7 +324,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>50</height> @@ -355,7 +355,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>31</height> @@ -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"> diff --git a/kwordquiz/src/prefeditorbase.ui b/kwordquiz/src/prefeditorbase.ui index 67b096a4..dc2de3ba 100644 --- a/kwordquiz/src/prefeditorbase.ui +++ b/kwordquiz/src/prefeditorbase.ui @@ -12,7 +12,7 @@ <height>256</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>250</height> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>81</height> diff --git a/kwordquiz/src/prefquizbase.ui b/kwordquiz/src/prefquizbase.ui index 79f570db..2f7f333c 100644 --- a/kwordquiz/src/prefquizbase.ui +++ b/kwordquiz/src/prefquizbase.ui @@ -12,7 +12,7 @@ <height>356</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>350</height> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>31</height> @@ -162,7 +162,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui index 9be1bee1..fcb743a4 100644 --- a/kwordquiz/src/qaviewbase.ui +++ b/kwordquiz/src/qaviewbase.ui @@ -32,7 +32,7 @@ </widget> <widget class="TQLayoutWidget" row="7" column="0"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <grid> <property name="name"> @@ -50,7 +50,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -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"> @@ -110,7 +110,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -141,7 +141,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -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"> @@ -259,7 +259,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -282,7 +282,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout51</cstring> + <cstring>layout51</cstring> </property> <grid> <property name="name"> @@ -300,7 +300,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>32</height> @@ -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"> @@ -367,7 +367,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -387,7 +387,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>tqlayout52</cstring> + <cstring>layout52</cstring> </property> <grid> <property name="name"> @@ -405,7 +405,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>32</height> @@ -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"> @@ -472,7 +472,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -492,7 +492,7 @@ </widget> <widget class="TQLayoutWidget" row="5" column="0"> <property name="name"> - <cstring>tqlayout53</cstring> + <cstring>layout53</cstring> </property> <grid> <property name="name"> @@ -510,7 +510,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -538,7 +538,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>32</height> @@ -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"> @@ -597,7 +597,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout54</cstring> + <cstring>layout54</cstring> </property> <grid> <property name="name"> @@ -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"> @@ -668,7 +668,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>32</height> @@ -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"> @@ -704,7 +704,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -738,7 +738,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout57</cstring> + <cstring>layout57</cstring> </property> <grid> <property name="name"> @@ -756,7 +756,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -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"> @@ -792,7 +792,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -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"> diff --git a/kwordquiz/src/wqlreader.cpp b/kwordquiz/src/wqlreader.cpp index 7eef97c7..5d87e56f 100644 --- a/kwordquiz/src/wqlreader.cpp +++ b/kwordquiz/src/wqlreader.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -#include <tqtextstream.h> +#include <textstream.h> #include <tqfile.h> #include <kmessagebox.h> diff --git a/kwordquiz/src/wqlwriter.cpp b/kwordquiz/src/wqlwriter.cpp index 579561ff..2052c079 100644 --- a/kwordquiz/src/wqlwriter.cpp +++ b/kwordquiz/src/wqlwriter.cpp @@ -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; } diff --git a/kwordquiz/src/wqlwriter.h b/kwordquiz/src/wqlwriter.h index 460483cb..d6b4ce06 100644 --- a/kwordquiz/src/wqlwriter.h +++ b/kwordquiz/src/wqlwriter.h @@ -17,7 +17,7 @@ #define WTQLWRITER_H #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqfont.h> /** diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp index 25d5b79b..8a261131 100644 --- a/kwordquiz/src/wqprintdialogpage.cpp +++ b/kwordquiz/src/wqprintdialogpage.cpp @@ -18,7 +18,7 @@ #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwhatsthis.h> #include <klocale.h> @@ -34,10 +34,10 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name ) g = new TQButtonGroup(i18n("Select Type of Printout"), this ); g->setColumnLayout(0, Qt::Vertical ); - g->tqlayout()->setSpacing( 6 ); - g->tqlayout()->setMargin( 11 ); - TQGridLayout * v = new TQGridLayout( g->tqlayout() ); - v->tqsetAlignment( TQt::AlignTop ); + g->layout()->setSpacing( 6 ); + g->layout()->setMargin( 11 ); + TQGridLayout * v = new TQGridLayout( g->layout() ); + v->setAlignment( TQt::AlignTop ); rb0 = new TQRadioButton(i18n("Vocabulary &list"), g ); v->addWidget( rb0, 0, 0 ); diff --git a/libtdeedu/extdate/extcalendarsystemgregorian.cpp b/libtdeedu/extdate/extcalendarsystemgregorian.cpp index 0b167ce9..fc3fe51a 100644 --- a/libtdeedu/extdate/extcalendarsystemgregorian.cpp +++ b/libtdeedu/extdate/extcalendarsystemgregorian.cpp @@ -294,7 +294,7 @@ int ExtCalendarSystemGregorian::weekDayOfPray() const TQString ExtCalendarSystemGregorian::calendarName() const { - return TQString::tqfromLatin1("gregorian"); + return TQString::fromLatin1("gregorian"); } bool ExtCalendarSystemGregorian::isLunar() const diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp index 2b267d8e..8d927a21 100644 --- a/libtdeedu/extdate/extdatepicker.cpp +++ b/libtdeedu/extdate/extdatepicker.cpp @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -#include <tqlayout.h> +#include <layout.h> #include <tqstyle.h> #include <tqtoolbutton.h> #include <tqtooltip.h> @@ -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); } @@ -98,7 +98,7 @@ ExtDatePicker::ExtDatePicker(TQWidget *parent, ExtDate dt, const char *name, WFl ExtDatePicker::ExtDatePicker( TQWidget *parent, const char *name ) : TQFrame(parent,name) { - init( ExtDate::tqcurrentDate() ); + init( ExtDate::currentDate() ); } void ExtDatePicker::init( const ExtDate &dt ) @@ -166,17 +166,17 @@ void ExtDatePicker::init( const ExtDate &dt ) if ( TQApplication::reverseLayout() ) { - yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); - monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); + yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow"))); + yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow"))); + monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); + monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); } else { - yearForward->setIconSet(BarIconSet(TQString::tqfromLatin1("2rightarrow"))); - yearBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("2leftarrow"))); - monthForward->setIconSet(BarIconSet(TQString::tqfromLatin1("1rightarrow"))); - monthBackward->setIconSet(BarIconSet(TQString::tqfromLatin1("1leftarrow"))); + yearForward->setIconSet(BarIconSet(TQString::fromLatin1("2rightarrow"))); + yearBackward->setIconSet(BarIconSet(TQString::fromLatin1("2leftarrow"))); + monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); + monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); } connect(table, TQT_SIGNAL(dateChanged(const ExtDate&)), TQT_SLOT(dateChangedSlot(const ExtDate&))); connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); @@ -386,7 +386,7 @@ ExtDatePicker::selectYearClicked() KPopupFrame* popup = new KPopupFrame(this); ExtDateInternalYearSelector* picker = new ExtDateInternalYearSelector(popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -446,13 +446,13 @@ ExtDatePicker::lineEnterPressed() void ExtDatePicker::todayButtonClicked() { - setDate(ExtDate::tqcurrentDate()); + setDate(ExtDate::currentDate()); } TQSize -ExtDatePicker::tqsizeHint() const +ExtDatePicker::sizeHint() const { - return TQWidget::tqsizeHint(); + return TQWidget::sizeHint(); } void @@ -512,7 +512,7 @@ ExtDatePicker::setCloseButton( bool enable ) TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); connect( d->closeButton, TQT_SIGNAL( clicked() ), - tqtopLevelWidget(), TQT_SLOT( close() ) ); + topLevelWidget(), TQT_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/libtdeedu/extdate/extdatepicker.h b/libtdeedu/extdate/extdatepicker.h index 794ccea6..f8295dfe 100644 --- a/libtdeedu/extdate/extdatepicker.h +++ b/libtdeedu/extdate/extdatepicker.h @@ -62,7 +62,7 @@ public: * initially. **/ ExtDatePicker(TQWidget *parent=0, - ExtDate=ExtDate::tqcurrentDate(), + ExtDate=ExtDate::currentDate(), const char *name=0); /** The usual constructor. The given date will be displayed @@ -92,7 +92,7 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * Sets the date. @@ -138,7 +138,7 @@ public: /** * By calling this method with @p enable = true, ExtDatePicker will show * a little close-button in the upper button-row. Clicking the - * close-button will cause the ExtDatePicker's tqtopLevelWidget()'s close() + * close-button will cause the ExtDatePicker's topLevelWidget()'s close() * method being called. This is mostly useful for toplevel datepickers * without a window manager decoration. * @see hasCloseButton diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp index 55458417..78c7c9a8 100644 --- a/libtdeedu/extdate/extdatetbl.cpp +++ b/libtdeedu/extdate/extdatetbl.cpp @@ -124,7 +124,7 @@ ExtDateTable::ExtDateTable(TQWidget *parent, ExtDate date_, const char* name, WF if(!date_.isValid()) { kdDebug() << "ExtDateTable ctor: WARNING: Given date is invalid, using current date." << endl; - date_=ExtDate::tqcurrentDate(); + date_=ExtDate::currentDate(); } setFocusPolicy( TQ_StrongFocus ); setNumRows(7); // 6 weeks max + headline @@ -204,7 +204,7 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col) normalday=false; TQBrush brushTitle(); - TQBrush brushInvertTitle(tqcolorGroup().base()); + TQBrush brushInvertTitle(colorGroup().base()); TQColor titleColor(isEnabled()?( KGlobalSettings::activeTitleColor() ):( KGlobalSettings::inactiveTitleColor() ) ); TQColor textColor(isEnabled()?( KGlobalSettings::activeTextColor() ):( KGlobalSettings::inactiveTextColor() ) ); if (!normalday) @@ -221,7 +221,7 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col) } painter->drawText(0, 0, w, h-1, AlignCenter, d->calendar->weekDayName(daynum, true), -1, &rect); - painter->setPen(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); painter->moveTo(0, h-1); painter->lineTo(w-1, h-1); // ----- draw the weekday: @@ -238,7 +238,7 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col) // � painting a day of the previous month or // � painting a day of the following month // TODO: don't hardcode gray here! Use a color with less contrast to the background than normal text. - painter->setPen( tqcolorGroup().mid() ); + painter->setPen( colorGroup().mid() ); // painter->setPen(gray); } else { // paint a day of the current month if ( d->useCustomColors ) @@ -263,9 +263,9 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col) } painter->setPen( mode->fgColor ); } else - painter->setPen(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); } else //if ( firstWeekDay < 4 ) // <- this doesn' make sense at all! - painter->setPen(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); } pen=painter->pen(); @@ -276,19 +276,19 @@ ExtDateTable::paintCell(TQPainter *painter, int row, int col) if( ((offset+dy) == (pos+1)) && hasFocus()) { // draw the currently selected date - painter->setPen(tqcolorGroup().highlight()); - painter->setBrush(tqcolorGroup().highlight()); - pen=TQPen(tqcolorGroup().highlightedText()); + painter->setPen(colorGroup().highlight()); + painter->setBrush(colorGroup().highlight()); + pen=TQPen(colorGroup().highlightedText()); } else { painter->setBrush(paletteBackgroundColor()); painter->setPen(paletteBackgroundColor()); -// painter->setBrush(tqcolorGroup().base()); -// painter->setPen(tqcolorGroup().base()); +// painter->setBrush(colorGroup().base()); +// painter->setPen(colorGroup().base()); } - if ( pCellDate == ExtDate::tqcurrentDate() ) + if ( pCellDate == ExtDate::currentDate() ) { - painter->setPen(tqcolorGroup().text()); + painter->setPen(colorGroup().text()); } if ( paintRect ) painter->drawRect(0, 0, w, h); @@ -347,7 +347,7 @@ ExtDateTable::keyPressEvent( TQKeyEvent *e ) setDate(date.addDays(1)); return; case Key_N: - setDate(ExtDate::tqcurrentDate()); + setDate(ExtDate::currentDate()); return; case Key_Return: case Key_Enter: @@ -390,7 +390,7 @@ ExtDateTable::setFontSize(int size) maxCell.setHeight(TQMAX(maxCell.height(), rect.height())); } // ----- compare with a real wide number and add some space: - rect=metrics.boundingRect(TQString::tqfromLatin1("88")); + rect=metrics.boundingRect(TQString::fromLatin1("88")); maxCell.setWidth(TQMAX(maxCell.width()+2, rect.width())); maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height())); } @@ -519,14 +519,14 @@ void ExtDateTable::focusOutEvent( TQFocusEvent *e ) } TQSize -ExtDateTable::tqsizeHint() const +ExtDateTable::sizeHint() const { if(maxCell.height()>0 && maxCell.width()>0) { return TQSize(maxCell.width()*numCols()+2*frameWidth(), (maxCell.height()+2)*numRows()+2*frameWidth()); } else { - kdDebug() << "ExtDateTable::tqsizeHint: obscure failure - " << endl; + kdDebug() << "ExtDateTable::sizeHint: obscure failure - " << endl; return TQSize(-1, -1); } } @@ -677,7 +677,7 @@ ExtDateInternalMonthPicker::ExtDateInternalMonthPicker } TQSize -ExtDateInternalMonthPicker::tqsizeHint() const +ExtDateInternalMonthPicker::sizeHint() const { return TQSize((max.width()+6)*numCols()+2*frameWidth(), (max.height()+6)*numRows()+2*frameWidth()); @@ -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; diff --git a/libtdeedu/extdate/extdatetbl.h b/libtdeedu/extdate/extdatetbl.h index fbbc880b..de55408c 100644 --- a/libtdeedu/extdate/extdatetbl.h +++ b/libtdeedu/extdate/extdatetbl.h @@ -101,7 +101,7 @@ public: /** * The size hint. */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * Return the result. 0 means no selection (reject()), 1..12 are the * months. @@ -278,7 +278,7 @@ public: * The constructor. */ ExtDateTable(TQWidget *parent=0, - ExtDate date=ExtDate::tqcurrentDate(), + ExtDate date=ExtDate::currentDate(), const char* name=0, WFlags f=0); /** @@ -291,9 +291,9 @@ public: * To save some time, the size of the largest used cell content is * calculated in each paintCell() call, since all calculations have * to be done there anyway. The size is stored in maxCell. The - * tqsizeHint() simply returns a multiple of maxCell. + * sizeHint() simply returns a multiple of maxCell. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Set the font size of the date table. */ diff --git a/libtdeedu/extdate/extdatetime.cpp b/libtdeedu/extdate/extdatetime.cpp index d8984eee..fa87a85f 100644 --- a/libtdeedu/extdate/extdatetime.cpp +++ b/libtdeedu/extdate/extdatetime.cpp @@ -377,7 +377,7 @@ int ExtDate::daysTo( const ExtDate & a_date) const return a_date.jd() - jd(); } -ExtDate ExtDate::tqcurrentDate(Qt::TimeSpec ts) +ExtDate ExtDate::currentDate(Qt::TimeSpec ts) { time_t a_current_time; struct tm a_current_time_tm; @@ -559,7 +559,7 @@ int ExtDate::dayOfYear(int y, int m, int d) A ExtDateTime object is typically created either by giving a date and time explicitly in the constructor, or by using the static - function tqcurrentDateTime(), which returns a ExtDateTime object set + function currentDateTime(), which returns a ExtDateTime object set to the system clock's time. The date and time can be changed with setDate() and setTime(). A datetime can also be set using the setTime_t() function, which takes a POSIX-standard "number of @@ -933,7 +933,7 @@ int ExtDateTime::daysTo( const ExtDateTime &dt ) const Example: \code - ExtDateTime dt = ExtDateTime::tqcurrentDateTime(); + ExtDateTime dt = ExtDateTime::currentDateTime(); ExtDateTime xmas( ExtDate(dt.date().year(),12,24), TQTime(17,00) ); kdDebug( ) << "There are " << dt.secsTo(xmas) << " seconds to Christmas" << endl; \endcode @@ -1023,28 +1023,28 @@ bool ExtDateTime::operator>=( const ExtDateTime &dt ) const Returns the current datetime, as reported by the system clock. - \sa ExtDate::tqcurrentDate(), TQTime::currentTime() + \sa ExtDate::currentDate(), TQTime::currentTime() */ -ExtDateTime ExtDateTime::tqcurrentDateTime() +ExtDateTime ExtDateTime::currentDateTime() { - return tqcurrentDateTime( Qt::LocalTime ); + return currentDateTime( Qt::LocalTime ); } /*! Returns the current datetime, as reported by the system clock, for the TimeSpec \a ts. The default TimeSpec is LocalTime. - \sa ExtDate::tqcurrentDate(), TQTime::currentTime(), Qt::TimeSpec + \sa ExtDate::currentDate(), TQTime::currentTime(), Qt::TimeSpec */ -ExtDateTime ExtDateTime::tqcurrentDateTime( Qt::TimeSpec ts ) +ExtDateTime ExtDateTime::currentDateTime( Qt::TimeSpec ts ) { ExtDateTime dt; - dt.setDate( ExtDate::tqcurrentDate(ts) ); + dt.setDate( ExtDate::currentDate(ts) ); TQTime t = t.currentTime(ts); if ( t.hour()==0 && t.minute()==0 ) // midnight or right after? - dt.setDate( ExtDate::tqcurrentDate(ts) ); // fetch date again + dt.setDate( ExtDate::currentDate(ts) ); // fetch date again dt.setTime( t ); return dt; } @@ -1099,7 +1099,7 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) TQTime time; TQString sd = s; int hour, minute, second; - int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) ); + int pivot = s.find( TQRegExp(TQString::fromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) ); if ( pivot != -1 ) { hour = s.mid( pivot, 2 ).toInt(); minute = s.mid( pivot+3, 2 ).toInt(); diff --git a/libtdeedu/extdate/extdatetime.h b/libtdeedu/extdate/extdatetime.h index 0ebe324f..479d1fae 100644 --- a/libtdeedu/extdate/extdatetime.h +++ b/libtdeedu/extdate/extdatetime.h @@ -88,7 +88,7 @@ public: bool operator>( const ExtDate &d ) const { return m_jd > d.jd(); } bool operator>=( const ExtDate &d ) const { return m_jd >= d.jd(); } - static ExtDate tqcurrentDate( Qt::TimeSpec ts = Qt::LocalTime ); + static ExtDate currentDate( Qt::TimeSpec ts = Qt::LocalTime ); #ifndef TQT_NO_DATESTRING static ExtDate fromString( const TQString &s ); static ExtDate fromString( const TQString &s, Qt::DateFormat f ); @@ -162,8 +162,8 @@ public: bool operator>( const ExtDateTime &dt ) const; bool operator>=( const ExtDateTime &dt ) const; - static ExtDateTime tqcurrentDateTime(); - static ExtDateTime tqcurrentDateTime( Qt::TimeSpec ); + static ExtDateTime currentDateTime(); + static ExtDateTime currentDateTime( Qt::TimeSpec ); #ifndef TQT_NO_DATESTRING static ExtDateTime fromString( const TQString &s ); static ExtDateTime fromString( const TQString &s, Qt::DateFormat f ); diff --git a/libtdeedu/extdate/extdatetimeedit.cpp b/libtdeedu/extdate/extdatetimeedit.cpp index 796bd858..b2468107 100644 --- a/libtdeedu/extdate/extdatetimeedit.cpp +++ b/libtdeedu/extdate/extdatetimeedit.cpp @@ -266,7 +266,7 @@ public: { int fw = 0; if ( frm ) - fw = style.tqpixelMetric(TQStyle::PM_DefaultFrameWidth); + fw = style.pixelMetric(TQStyle::PM_DefaultFrameWidth); parag->truncate( 0 ); parag->append( txt ); @@ -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; @@ -433,9 +433,9 @@ void ExtDateTimeEditor::paintEvent( TQPaintEvent * ) TQSharedDoubleBuffer buffer( this ); const TQBrush &bg = - tqcolorGroup().brush( isEnabled() ? TQColorGroup::Base : TQColorGroup::Background ); + colorGroup().brush( isEnabled() ? TQColorGroup::Base : TQColorGroup::Background ); buffer.painter()->fillRect( 0, 0, width(), height(), bg ); - d->paint( txt, hasFocus(), *buffer.painter(), tqcolorGroup(), rect(), + d->paint( txt, hasFocus(), *buffer.painter(), colorGroup(), rect(), tqstyle() ); buffer.end(); } @@ -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 ) { @@ -740,9 +740,9 @@ public: with a date, e.g. \code - ExtDateEdit *dateEdit = new ExtDateEdit( ExtDate::tqcurrentDate(), this ); - dateEdit->setRange( ExtDate::tqcurrentDate().addDays( -365 ), - ExtDate::tqcurrentDate().addDays( 365 ) ); + ExtDateEdit *dateEdit = new ExtDateEdit( ExtDate::currentDate(), this ); + dateEdit->setRange( ExtDate::currentDate().addDays( -365 ), + ExtDate::currentDate().addDays( 365 ) ); dateEdit->setOrder( ExtDateEdit::MDY ); dateEdit->setAutoAdvance( TRUE ); \endcode @@ -856,7 +856,7 @@ void ExtDateEdit::init() d->max = ExtDate( 50000, 12, 31 ); d->changed = FALSE; - tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); + setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); refcount++; } @@ -970,11 +970,11 @@ void ExtDateEdit::resizeEvent( TQResizeEvent * ) /*! \reimp */ -TQSize ExtDateEdit::tqsizeHint() const +TQSize ExtDateEdit::sizeHint() const { constPolish(); TQFontMetrics fm( font() ); - int fw = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ); + int fw = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); int h = TQMAX( fm.lineSpacing(), 14 ) + 2; int w = 2 + fm.width( '9' ) * 8 + fm.width( d->ed->separator() ) * 2 + d->controls->upRect().width() + fw * 4; @@ -985,9 +985,9 @@ TQSize ExtDateEdit::tqsizeHint() const /*! \reimp */ -TQSize ExtDateEdit::tqminimumSizeHint() const +TQSize ExtDateEdit::minimumSizeHint() const { - return tqsizeHint(); + return sizeHint(); } @@ -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 ); } /*! @@ -1268,7 +1268,7 @@ void ExtDateEdit::setDay( int day ) If the date property is not valid, the editor displays all zeroes and ExtDateEdit::date() will return an invalid date. It is strongly recommended that the editor is given a default date value (e.g. - tqcurrentDate()). That way, attempts to set the date property to an + currentDate()). That way, attempts to set the date property to an invalid date will fail. When changing the date property, if the date is less than @@ -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 @@ -1314,8 +1314,8 @@ ExtDate ExtDateEdit::date() const bool ExtDateEdit::outOfRange( int y, int m, int d ) const { if ( ExtDate::isValid( y, m, d ) ) { - ExtDate tqcurrentDate( y, m, d ); - if ( tqcurrentDate > maxValue() || tqcurrentDate < minValue() ) { + ExtDate currentDate( y, m, d ); + if ( currentDate > maxValue() || currentDate < minValue() ) { //## outOfRange should set overwrite? return TRUE; } @@ -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 ); } @@ -1475,7 +1475,7 @@ void ExtDateEdit::fix() changed = TRUE; } - int currentYear = ExtDate::tqcurrentDate().year(); + int currentYear = ExtDate::currentDate().year(); int year = d->y; /* No longer valid for extended dates if ( year < 100 ) { @@ -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 ); } /*! @@ -1764,7 +1764,7 @@ public: // d->max = TQTime( 23, 59, 59 ); // d->changed = FALSE; // -// tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); +// setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); // // refcount++; // } @@ -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 ); // } // // @@ -2187,12 +2187,12 @@ public: // if ( lAM ) // txt = *lAM; // else -// txt = TQString::tqfromLatin1( "AM" ); +// txt = TQString::fromLatin1( "AM" ); // } else { // if ( lPM ) // txt = *lPM; // else -// txt = TQString::tqfromLatin1( "PM" ); +// txt = TQString::fromLatin1( "PM" ); // } // break; // default: @@ -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 @@ -2430,11 +2430,11 @@ public: // // /*! \reimp // */ -// TQSize TQTimeEdit::tqsizeHint() const +// TQSize TQTimeEdit::sizeHint() const // { // constPolish(); // TQFontMetrics fm( font() ); -// int fw = tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ); +// int fw = tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); // int h = fm.lineSpacing() + 2; // int w = 2 + fm.width( '9' ) * 6 + fm.width( d->ed->separator() ) * 2 + // d->controls->upRect().width() + fw * 4; @@ -2442,7 +2442,7 @@ public: // if ( lAM ) // w += fm.width( *lAM ) + 4; // else -// w += fm.width( TQString::tqfromLatin1( "AM" ) ) + 4; +// w += fm.width( TQString::fromLatin1( "AM" ) ) + 4; // } // // return TQSize( w, TQMAX(h + fw * 2,20) ).expandedTo( TQApplication::globalStrut() ); @@ -2450,9 +2450,9 @@ public: // // /*! \reimp // */ -// TQSize TQTimeEdit::tqminimumSizeHint() const +// TQSize TQTimeEdit::minimumSizeHint() const // { -// return tqsizeHint(); +// return sizeHint(); // } // // /*! @@ -2507,9 +2507,9 @@ public: It is recommended that the ExtDateTimeEdit is initialised with a datetime, e.g. \code - ExtDateTimeEdit *dateTimeEdit = new ExtDateTimeEdit( ExtDateTime::tqcurrentDateTime(), this ); - dateTimeEdit->dateEdit()->setRange( ExtDateTime::tqcurrentDate(), - ExtDateTime::tqcurrentDate().addDays( 7 ) ); + ExtDateTimeEdit *dateTimeEdit = new ExtDateTimeEdit( ExtDateTime::currentDateTime(), this ); + dateTimeEdit->dateEdit()->setRange( ExtDateTime::currentDate(), + ExtDateTime::currentDate().addDays( 7 ) ); \endcode Here we've created a new ExtDateTimeEdit set to the current date and time, and set the date to have a minimum date of now and a maximum @@ -2573,8 +2573,8 @@ ExtDateTimeEdit::~ExtDateTimeEdit() void ExtDateTimeEdit::resizeEvent( TQResizeEvent * ) { - int dw = de->tqsizeHint().width(); - int tw = te->tqsizeHint().width(); + int dw = de->sizeHint().width(); + int tw = te->sizeHint().width(); int w = width(); int h = height(); int extra = w - ( dw + tw ); @@ -2593,10 +2593,10 @@ void ExtDateTimeEdit::resizeEvent( TQResizeEvent * ) /*! \reimp */ -TQSize ExtDateTimeEdit::tqminimumSizeHint() const +TQSize ExtDateTimeEdit::minimumSizeHint() const { - TQSize dsh = de->tqminimumSizeHint(); - TQSize tsh = te->tqminimumSizeHint(); + TQSize dsh = de->minimumSizeHint(); + TQSize tsh = te->minimumSizeHint(); return TQSize( dsh.width() + tsh.width(), TQMAX( dsh.height(), tsh.height() ) ); } @@ -2615,17 +2615,17 @@ void ExtDateTimeEdit::init() connect( te, TQT_SIGNAL( valueChanged( const TQTime& ) ), this, TQT_SLOT( newValue( const TQTime& ) ) ); setFocusProxy( de ); - tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); + setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } /*! \reimp */ -TQSize ExtDateTimeEdit::tqsizeHint() const +TQSize ExtDateTimeEdit::sizeHint() const { constPolish(); - TQSize dsh = de->tqsizeHint(); - TQSize tsh = te->tqsizeHint(); + TQSize dsh = de->sizeHint(); + TQSize tsh = te->sizeHint(); return TQSize( dsh.width() + tsh.width(), TQMAX( dsh.height(), tsh.height() ) ); } diff --git a/libtdeedu/extdate/extdatetimeedit.h b/libtdeedu/extdate/extdatetimeedit.h index 4a2aaa16..13520923 100644 --- a/libtdeedu/extdate/extdatetimeedit.h +++ b/libtdeedu/extdate/extdatetimeedit.h @@ -82,8 +82,8 @@ public: YMD /**< Year-Month-Day, also the default */, YDM /**< Year-Day-Month @deprecated Included for completeness. */ }; - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; public slots: virtual void setDate( const ExtDate& date ); @@ -169,8 +169,8 @@ private: // TQTimeEdit( const TQTime& time, TQWidget* parent=0, const char* name=0 ); // ~TQTimeEdit(); // -// TQSize tqsizeHint() const; -// TQSize tqminimumSizeHint() const; +// TQSize sizeHint() const; +// TQSize minimumSizeHint() const; // // public slots: // virtual void setTime( const TQTime& time ); @@ -242,8 +242,8 @@ public: const char* name=0 ); ~ExtDateTimeEdit(); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; public slots: virtual void setDateTime( const ExtDateTime & dt ); diff --git a/libtdeedu/extdate/extdatewidget.cpp b/libtdeedu/extdate/extdatewidget.cpp index f1c7269b..4eaf858e 100644 --- a/libtdeedu/extdate/extdatewidget.cpp +++ b/libtdeedu/extdate/extdatewidget.cpp @@ -21,7 +21,7 @@ #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <knuminput.h> @@ -36,7 +36,7 @@ public: ExtDateWidgetSpinBox(int min, int max, TQWidget *parent) : TQSpinBox(min, max, 1, parent) { - editor()->tqsetAlignment(AlignRight); + editor()->setAlignment(AlignRight); } }; @@ -56,7 +56,7 @@ public: ExtDateWidget::ExtDateWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - init(ExtDate::tqcurrentDate()); + init(ExtDate::currentDate()); setDate(ExtDate()); } @@ -74,8 +74,8 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent, // { // d = new ExtDateWidgetPrivate; // KLocale *locale = KGlobal::locale(); -// TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); -// tqlayout->setAutoAdd(true); +// TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); +// layout->setAutoAdd(true); // d->m_day = new ExtDateWidgetSpinBox(1, 1, this); // d->m_month = new TQComboBox(false, this); // for (int i = 1; ; ++i) @@ -98,8 +98,8 @@ void ExtDateWidget::init(const ExtDate& date) { d = new ExtDateWidgetPrivate; //KLocale *locale = KGlobal::locale(); - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + layout->setAutoAdd(true); d->m_day = new ExtDateWidgetSpinBox(1, 1, this); d->m_month = new TQComboBox(false, this); for (int i = 1; ; ++i) diff --git a/libtdeedu/extdate/test_extdate.cc b/libtdeedu/extdate/test_extdate.cc index 63b2120b..d70d3e94 100644 --- a/libtdeedu/extdate/test_extdate.cc +++ b/libtdeedu/extdate/test_extdate.cc @@ -277,16 +277,16 @@ void test6() void test7() { std::cout << "Express the current date:\n" << std::endl; - TQDate q = TQDate::tqcurrentDate(TQt::LocalTime); - ExtDate e = ExtDate::tqcurrentDate(TQt::TimeSpec(TQt::LocalTime)); + TQDate q = TQDate::currentDate(TQt::LocalTime); + ExtDate e = ExtDate::currentDate(TQt::TimeSpec(TQt::LocalTime)); std::cout << "TQt::LocalTime :: ExtDate : " << e.toString().local8Bit() << " TQDate : " << q.toString().local8Bit() << std::endl; - q = TQDate::tqcurrentDate(TQt::UTC); - e = ExtDate::tqcurrentDate(TQt::UTC); + q = TQDate::currentDate(TQt::UTC); + e = ExtDate::currentDate(TQt::UTC); std::cout << "TQt::UTC :: ExtDate : " << e.toString().local8Bit() << " TQDate : " << q.toString().local8Bit() << std::endl; - q = TQDate::tqcurrentDate(); - e = ExtDate::tqcurrentDate(); + q = TQDate::currentDate(); + e = ExtDate::currentDate(); std::cout << "<default> :: ExtDate : " << e.toString().local8Bit() << " TQDate : " << q.toString().local8Bit() << std::endl; std::cout << "--------------------" << std::endl; @@ -311,8 +311,8 @@ void test8() { void test9() { std::cout << "TQDateTime : ExtDateTime: \n" << std::endl; - TQDateTime q = TQDateTime::tqcurrentDateTime(); - ExtDateTime e = ExtDateTime::tqcurrentDateTime(); + TQDateTime q = TQDateTime::currentDateTime(); + ExtDateTime e = ExtDateTime::currentDateTime(); std::cout << q.toString().local8Bit() << " : " << e.toString().local8Bit() << std::endl; std::cout << "--------------------" << std::endl; diff --git a/libtdeedu/extdate/testwidget.cpp b/libtdeedu/extdate/testwidget.cpp index a6489cce..3a88946c 100644 --- a/libtdeedu/extdate/testwidget.cpp +++ b/libtdeedu/extdate/testwidget.cpp @@ -18,7 +18,7 @@ #include <kdatepicker.h> #include <kdatewidget.h> #include <klineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include "extdatepicker.h" @@ -39,8 +39,8 @@ TestWidget::TestWidget( TQWidget *p=0, const char *name=0 ) : KMainWindow( p, na edpEdit = new KLineEdit(w); edpEdit->setReadOnly( TRUE ); - kdw = new KDateWidget( TQDate::tqcurrentDate(), w ); - edw = new ExtDateWidget( ExtDate::tqcurrentDate(), w ); + kdw = new KDateWidget( TQDate::currentDate(), w ); + edw = new ExtDateWidget( ExtDate::currentDate(), w ); glay->addWidget( kdpLabel, 0, 0 ); glay->addWidget( edpLabel, 0, 1 ); diff --git a/libtdeedu/tdeeduplot/kplotwidget.cpp b/libtdeedu/tdeeduplot/kplotwidget.cpp index 5f13de6e..3170b0a8 100644 --- a/libtdeedu/tdeeduplot/kplotwidget.cpp +++ b/libtdeedu/tdeeduplot/kplotwidget.cpp @@ -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 ); diff --git a/libtdeedu/tdeeduplot/kplotwidget.h b/libtdeedu/tdeeduplot/kplotwidget.h index c886bbaf..7dd3f1f4 100644 --- a/libtdeedu/tdeeduplot/kplotwidget.h +++ b/libtdeedu/tdeeduplot/kplotwidget.h @@ -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 */ ); diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp index 1e405abf..8642c9a1 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.cpp +++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqlabel.h> #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqsplitter.h> #include <tqstringlist.h> @@ -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; diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h index e5d29ba0..629466d4 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.h +++ b/libtdeedu/tdeeduui/tdeeduglossary.h @@ -148,7 +148,7 @@ class Glossary TQString m_picturepath; /** - * Load the tqlayout from an XML file. + * Load the layout from an XML file. * * @param doc The TQDomDocument which will contain the read XML * contents. |