diff options
646 files changed, 4677 insertions, 4677 deletions
diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp index 7e6bf230..202a9a99 100644 --- a/blinken/src/blinken.cpp +++ b/blinken/src/blinken.cpp @@ -209,7 +209,7 @@ void blinken::paintEvent(TQPaintEvent *) if (m_highlighted & blinkenGame::red) p.drawPixmap(322, 16, *m_buttons[2] -> pixmap()); if (m_highlighted & blinkenGame::green) p.drawPixmap(322, 225, *m_buttons[3] -> pixmap()); - drawtqStatusText(p); + drawStatusText(p); bitBlt(this, 0, 0, &buf); @@ -289,13 +289,13 @@ void blinken::mousePressEvent(TQMouseEvent *e) hsd->showLevel(1); m_updateButtonHighlighting = true; } - else if (m_showPreferences && m_fontRect.tqcontains(e -> pos()) && !m_alwaysUseNonCoolFont) + else if (m_showPreferences && m_fontRect.contains(e -> pos()) && !m_alwaysUseNonCoolFont) { blinkenSettings::setCustomFont(!blinkenSettings::customFont()); blinkenSettings::writeConfig(); update(); } - else if (m_showPreferences && m_soundRect.tqcontains(e -> pos())) + else if (m_showPreferences && m_soundRect.contains(e -> pos())) { blinkenSettings::setPlaySounds(!blinkenSettings::playSounds()); blinkenSettings::writeConfig(); @@ -316,9 +316,9 @@ void blinken::mousePressEvent(TQMouseEvent *e) else if (m_game.phase() == blinkenGame::choosingLevel) { int level = 0; - if (m_levelsRect[1].tqcontains(e -> pos())) level = 1; - else if (m_levelsRect[0].tqcontains(e -> pos())) level = 2; - else if (m_levelsRect[2].tqcontains(e -> pos())) level = 3; + if (m_levelsRect[1].contains(e -> pos())) level = 1; + else if (m_levelsRect[0].contains(e -> pos())) level = 2; + else if (m_levelsRect[2].contains(e -> pos())) level = 3; if (level) { for(int i = 0; i < 3; i++) m_overLevels[i] = false; @@ -544,7 +544,7 @@ void blinken::drawScoreAndCounter(TQPainter &p) p.translate(-268, -110); } -void blinken::drawtqStatusText(TQPainter &p) +void blinken::drawStatusText(TQPainter &p) { p.translate(25, 505); p.rotate(-3.29); @@ -665,7 +665,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) m_updateButtonHighlighting = false; haveToUpdate = false; - if (m_highscoreRect.tqcontains(p)) + if (m_highscoreRect.contains(p)) { if (!m_overHighscore) { @@ -679,7 +679,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if (m_menuRect.tqcontains(p)) + if (m_menuRect.contains(p)) { if (!m_overMenu) { @@ -699,7 +699,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) } else if (m_overMenu) { - if (m_aboutKDERect.tqcontains(p)) + if (m_aboutKDERect.contains(p)) { if (!m_overAboutKDE) { @@ -709,7 +709,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } } - else if (m_aboutBlinkenRect.tqcontains(p)) + else if (m_aboutBlinkenRect.contains(p)) { if (!m_overAboutBlinken) { @@ -719,7 +719,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } } - else if (m_manualRect.tqcontains(p)) + else if (m_manualRect.contains(p)) { if (!m_overManual) { @@ -739,7 +739,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) } } - if (!m_showPreferences && m_centralLettersRect.tqcontains(p)) + if (!m_showPreferences && m_centralLettersRect.contains(p)) { m_overCentralLetters = true; haveToUpdate = true; @@ -750,7 +750,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if (m_showPreferences && m_soundRect.tqcontains(p)) + if (m_showPreferences && m_soundRect.contains(p)) { m_overSound = true; haveToUpdate = true; @@ -761,7 +761,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if (m_showPreferences && m_fontRect.tqcontains(p) && !m_alwaysUseNonCoolFont) + if (m_showPreferences && m_fontRect.contains(p) && !m_alwaysUseNonCoolFont) { m_overFont = true; haveToUpdate = true; @@ -772,7 +772,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if (m_counterRect.tqcontains(p)) + if (m_counterRect.contains(p)) { m_overCounter = true; haveToUpdate = true; @@ -783,7 +783,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if (m_quitRect.tqcontains(p)) + if (m_quitRect.contains(p)) { if (!m_overQuit) { @@ -805,7 +805,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) case blinkenGame::waiting1: case blinkenGame::learningTheSequence: case blinkenGame::typingTheSequence: - if (m_centralTextRect.tqcontains(p)) + if (m_centralTextRect.contains(p)) { if (!m_overCentralText) { @@ -823,7 +823,7 @@ void blinken::updateButtonHighlighting(const TQPoint &p) case blinkenGame::choosingLevel: for (int i = 0; i < 3; i++) { - if (m_levelsRect[i].tqcontains(p)) + if (m_levelsRect[i].contains(p)) { if (!m_overLevels[i]) { diff --git a/blinken/src/blinken.h b/blinken/src/blinken.h index b5dc4c71..0c45c8a7 100644 --- a/blinken/src/blinken.h +++ b/blinken/src/blinken.h @@ -57,7 +57,7 @@ Q_OBJECT void drawMenuQuit(TQPainter &p); void drawScoreAndCounter(TQPainter &p); - void drawtqStatusText(TQPainter &p); + void drawStatusText(TQPainter &p); void drawLevel(TQPainter &p); void drawText(TQPainter &p, const TQString &text, const TQPoint ¢er, bool withMargin, int xMargin, int yMargin, TQRect *rect, bool highlight, bool bold); void updateButtonHighlighting(const TQPoint &p); @@ -73,7 +73,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/highscoredialog.cpp b/blinken/src/highscoredialog.cpp index 3cb0f5a3..9c5a5287 100644 --- a/blinken/src/highscoredialog.cpp +++ b/blinken/src/highscoredialog.cpp @@ -119,7 +119,7 @@ class myTabWidget : public QTabWidget TQSize tabBarSizeHint() const { - return tabBar() -> tqsizeHint(); + return tabBar() -> sizeHint(); } }; diff --git a/blinken/src/number.cpp b/blinken/src/number.cpp index 5316affa..2403f866 100644 --- a/blinken/src/number.cpp +++ b/blinken/src/number.cpp @@ -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, Qt::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/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp index 927de2dc..c4fc8899 100644 --- a/kalzium/src/detailinfodlg.cpp +++ b/kalzium/src/detailinfodlg.cpp @@ -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", frame ); - tqlayout->addWidget( w->view() ); + layout->addWidget( w->view() ); return w; } diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp index 2596e2f7..3fc7e493 100644 --- a/kalzium/src/element.cpp +++ b/kalzium/src/element.cpp @@ -68,8 +68,8 @@ TQString Element::parsedOrbits( bool canBeEmpty ) TQString orbits = m_orbits; TQRegExp rxs("([a-z])([0-9]+)"); TQRegExp rxb("([a-z]{2}) ",false); - orbits.tqreplace(rxs,"\\1<sup>\\2</sup>"); //superscript around electron number - orbits.tqreplace(rxb,"<b>\\1</b> "); //bold around element symbols + orbits.replace(rxs,"\\1<sup>\\2</sup>"); //superscript around electron number + orbits.replace(rxb,"<b>\\1</b> "); //bold around element symbols return orbits; } diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp index b31f51ce..108889cc 100644 --- a/kalzium/src/elementdataviewer.cpp +++ b/kalzium/src/elementdataviewer.cpp @@ -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(); @@ -294,7 +294,7 @@ void ElementDataViewer::drawPlot() /* * reserve the memory for the KPlotObjects */ - //TODO QT4 tqreplace TQMemArray with QVector + //TODO QT4 replace TQMemArray with QVector TQMemArray<KPlotObject*> dataPoint(num); TQMemArray<KPlotObject*> dataPointLabel(num); diff --git a/kalzium/src/elementdataviewer.h b/kalzium/src/elementdataviewer.h index 476ddaa1..76fea4b1 100644 --- a/kalzium/src/elementdataviewer.h +++ b/kalzium/src/elementdataviewer.h @@ -79,9 +79,9 @@ class AxisData private: /** - * the dataList tqcontains the values off all elements + * the dataList contains the values off all elements * but only of the currently selected data type. This - * means that it eg tqcontains all boiling points + * means that it eg contains all boiling points */ DoubleList dataList; diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp index aa73c40b..fee6e9c7 100644 --- a/kalzium/src/eqchemview.cpp +++ b/kalzium/src/eqchemview.cpp @@ -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); @@ -74,7 +74,7 @@ eqchemView::~eqchemView() void eqchemView::settingsChanged() { // i18n : internationalization - emit signalChangetqStatusbar( i18n("Settings changed") ); + emit signalChangeStatusbar( i18n("Settings changed") ); } @@ -89,8 +89,8 @@ void eqchemView::clear() void eqchemView::compute() { TQString equation( m_eqedit->text() ); - equation.tqreplace("+", "+"); - equation.tqreplace("->", " -> "); + equation.replace("+", "+"); + equation.replace("->", " -> "); equation.append(" "); equation.prepend(" "); diff --git a/kalzium/src/eqchemview.h b/kalzium/src/eqchemview.h index 6dbf5e8c..0e1ad686 100644 --- a/kalzium/src/eqchemview.h +++ b/kalzium/src/eqchemview.h @@ -58,7 +58,7 @@ signals: /** * Use this signal to change the content of the statusbar */ - void signalChangetqStatusbar(const TQString& text); + void signalChangeStatusbar(const TQString& text); /** * Use this signal to change the content of the caption diff --git a/kalzium/src/eqresult.cpp b/kalzium/src/eqresult.cpp index 2e0d9398..c128c93e 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/kalzium.cpp b/kalzium/src/kalzium.cpp index 3ec34a52..84c2c984 100644 --- a/kalzium/src/kalzium.cpp +++ b/kalzium/src/kalzium.cpp @@ -75,9 +75,9 @@ Kalzium::Kalzium() m_toolboxCurrent = 0; connect( m_PerodicTableView, TQT_SIGNAL( ElementClicked( int ) ), this, TQT_SLOT( openInformationDialog( int ) )); - connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), this, TQT_SLOT( slotqStatusbar( int ) )); + connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), this, TQT_SLOT( slotStatusbar( int ) )); - // tqlayouting + // layouting setCentralWidget( centralWidget ); centralWidget->show(); @@ -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 ) ), this, TQT_SLOT( slotSelectedNumber( int ) )); lay->addWidget( m_detailWidget ); lay->addItem( new TQSpacerItem( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding ) ); @@ -419,7 +419,7 @@ void Kalzium::setupStatusBar() statusBar()->show(); } -void Kalzium::slotqStatusbar( int num ) +void Kalzium::slotStatusbar( int num ) { Element *e = KalziumDataObject::instance()->element( num ); statusBar()->changeItem( i18n( "For example: \"Carbon (6), Mass: 12.0107 u\"", "%1 (%2), Mass: %3 u" ).arg( e->elname() ).arg(e->number() ).arg( KalziumUtils::localizedValue( e->mass(), 6 ) ) , IDS_ELEMENTINFO ); diff --git a/kalzium/src/kalzium.h b/kalzium/src/kalzium.h index 755af39d..1a726fed 100644 --- a/kalzium/src/kalzium.h +++ b/kalzium/src/kalzium.h @@ -105,7 +105,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; @@ -129,7 +129,7 @@ class Kalzium : public KMainWindow */ void openInformationDialog( int number ); - void slotqStatusbar( int num ); + void slotStatusbar( int num ); void setupStatusBar(); diff --git a/kalzium/src/kalziumdataobject.cpp b/kalzium/src/kalziumdataobject.cpp index f25cbfc4..a759fee2 100644 --- a/kalzium/src/kalziumdataobject.cpp +++ b/kalzium/src/kalziumdataobject.cpp @@ -46,29 +46,29 @@ KalziumDataObject::KalziumDataObject() KURL url; url.setPath( locate("data", "kalzium/data/")); url.setFileName( "data.xml" ); - TQFile tqlayoutFile( url.path() ); + TQFile layoutFile( url.path() ); - if (!tqlayoutFile.exists()) + if (!layoutFile.exists()) { kdDebug() << "data.xml not found, exiting" << endl; kapp->exit(0); return; } - if (!tqlayoutFile.open(IO_ReadOnly)) + if (!layoutFile.open(IO_ReadOnly)) { kdDebug() << "data.xml IO-error" << endl; return; } // Check if the document is well-formed - if (!doc.setContent(&tqlayoutFile)) + if (!doc.setContent(&layoutFile)) { kdDebug() << "wrong xml" << endl; - tqlayoutFile.close(); + layoutFile.close(); return; } - tqlayoutFile.close(); + layoutFile.close(); ElementList = readData( doc ); m_numOfElements = ElementList.count(); diff --git a/kalzium/src/kalziumdataobject.h b/kalzium/src/kalziumdataobject.h index f6365ef8..e8508276 100644 --- a/kalzium/src/kalziumdataobject.h +++ b/kalzium/src/kalziumdataobject.h @@ -23,7 +23,7 @@ #include "element.h" /** - * @short This class tqcontains all Element objects + * @short This class contains all Element objects * * This singleton class collects all the information about the elements of the * Periodic Table as list of Element (TQValueList<Element*>). diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp index c1b6299e..ba2a8252 100644 --- a/kalzium/src/kalziumtip.cpp +++ b/kalzium/src/kalziumtip.cpp @@ -82,8 +82,8 @@ void KalziumTip::showTip( TQPoint mouse, Element* element, int visibleWidth, int if( element == m_tippedElement ) { // Avoid moving out of the current screen - if (m_mousePointer.x()+width() > tqApp->desktop()->width()) - m_mousePointer.setX(tqApp->desktop()->width() - width()); + if (m_mousePointer.x()+width() > qApp->desktop()->width()) + m_mousePointer.setX(qApp->desktop()->width() - width()); move(m_mousePointer); //do not paint again if already painted } @@ -139,7 +139,7 @@ void KalziumTip::display() m_richText->setWidth(400); - m_tqmaskEffect = isVisible() ? Plain : Dissolve; + m_maskEffect = isVisible() ? Plain : Dissolve; m_dissolveSize = 24; m_dissolveDelta = -1; @@ -172,13 +172,13 @@ void KalziumTip::displayInternal() int width = textX + textRect.width() + margin; int textY = (height - textRect.height()) / 2; - //resize pixmap, tqmask and widget - m_tqmask.resize(width, height); + //resize pixmap, mask and widget + m_mask.resize(width, height); m_pixmap.resize(width, height); resize(width, height); - // create and set transparency tqmask - switch(m_tqmaskEffect) + // create and set transparency mask + switch(m_maskEffect) { case Plain: plainMask(); @@ -206,32 +206,32 @@ 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); } void KalziumTip::dissolveMask() { - TQPainter tqmaskPainter(&m_tqmask); + TQPainter maskPainter(&m_mask); - m_tqmask.fill(Qt::black); + m_mask.fill(Qt::black); - tqmaskPainter.setBrush(Qt::white); - tqmaskPainter.setPen(Qt::white); - tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), - 1600 / m_tqmask.rect().height()); + maskPainter.setBrush(Qt::white); + maskPainter.setPen(Qt::white); + maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), + 1600 / m_mask.rect().height()); m_dissolveSize += m_dissolveDelta; if (m_dissolveSize > 0) { - tqmaskPainter.setRasterOp(Qt::EraseROP); + maskPainter.setRasterOp(Qt::EraseROP); int x, y, s; const int size = 16; @@ -247,7 +247,7 @@ void KalziumTip::dissolveMask() { s = 0; } - tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); + maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); } } } @@ -257,7 +257,7 @@ void KalziumTip::dissolveMask() m_dissolveDelta = 1; } - setMask(m_tqmask); + setMask(m_mask); } void KalziumTip::hide() @@ -269,15 +269,15 @@ void KalziumTip::hide() void KalziumTip::plainMask() { - TQPainter tqmaskPainter(&m_tqmask); + TQPainter maskPainter(&m_mask); - m_tqmask.fill(Qt::black); + m_mask.fill(Qt::black); - tqmaskPainter.setBrush(Qt::white); - tqmaskPainter.setPen(Qt::white); - tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), - 1600 / m_tqmask.rect().height()); - setMask(m_tqmask); + maskPainter.setBrush(Qt::white); + maskPainter.setPen(Qt::white); + maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), + 1600 / m_mask.rect().height()); + setMask(m_mask); m_frameTimer.stop(); } diff --git a/kalzium/src/kalziumtip.h b/kalzium/src/kalziumtip.h index 5ef58a20..0186529f 100644 --- a/kalzium/src/kalziumtip.h +++ b/kalzium/src/kalziumtip.h @@ -66,20 +66,20 @@ class KalziumTip : public QWidget void internalUpdate(); private: - TQBitmap m_tqmask; + TQBitmap m_mask; TQPoint m_mousePointer; TQPixmap m_pixmap; TQPixmap m_icon; //icon shown on the tip TQPixmap m_noElemIcon; //icon for element wich have no image - MaskEffect m_tqmaskEffect; //inidicates to show tqmask effect or plain + MaskEffect m_maskEffect; //inidicates to show mask effect or plain TQSimpleRichText* m_richText; int m_dissolveSize; int m_dissolveDelta; TQTimer m_frameTimer; //timer for the dissolve effect - bool m_dirty; //indicates tqrepainting the tooltip internal + bool m_dirty; //indicates repainting the tooltip internal const Element* m_tippedElement; //the element the tip is about }; diff --git a/kalzium/src/kalziumutils.cpp b/kalzium/src/kalziumutils.cpp index d2b2baa8..1522e495 100644 --- a/kalzium/src/kalziumutils.cpp +++ b/kalzium/src/kalziumutils.cpp @@ -38,7 +38,7 @@ int KalziumUtils::maxSize( const TQString& string, const TQRect& rect, TQFont fo r = p->boundingRect( TQRect(), Qt::AlignAuto, string ); r.moveBy( rect.left(), rect.top() ); - if ( rect.tqcontains( r ) ) + if ( rect.contains( r ) ) goodSizeFound = true; else size--; @@ -69,7 +69,7 @@ double KalziumUtils::strippedValue( double num ) power *= 10; num = num / power * 10000; - num = tqRound( num ); + num = qRound( num ); return num * power / 10000; } diff --git a/kalzium/src/molcalcwidgetbase.ui b/kalzium/src/molcalcwidgetbase.ui index 2ab8c5f8..a330b773 100644 --- a/kalzium/src/molcalcwidgetbase.ui +++ b/kalzium/src/molcalcwidgetbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MolcalcWidgetBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -127,7 +127,7 @@ <slots> <slot access="protected">slotCalcButtonClicked()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kalzium/src/orbitswidget.cpp b/kalzium/src/orbitswidget.cpp index 2ab82731..06824c0f 100644 --- a/kalzium/src/orbitswidget.cpp +++ b/kalzium/src/orbitswidget.cpp @@ -162,7 +162,7 @@ void OrbitsWidget::getNumberOfOrbits() int cut = 0; bool cont = true; - if ( !o.tqcontains( rxb ) ) //only true for H and He + if ( !o.contains( rxb ) ) //only true for H and He numOfElectrons.append( o.toInt() ); else //every other element { @@ -175,7 +175,7 @@ void OrbitsWidget::getNumberOfOrbits() o = o.right( cut ); num++; - if ( !o.tqcontains( rxb ) ) + if ( !o.contains( rxb ) ) { numOfElectrons.append( o.toInt() ); cont = false; diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp index d58f03ab..a09dcf34 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(); @@ -339,8 +339,8 @@ void PerodicTableView::paintEvent( TQPaintEvent * /*e*/ ) TQPainter p; //JH: I have split the drawing into two pixmaps: table and table2. - //table tqcontains the "static" PerodicTableView table, and does not change very often. - //table2 tqcontains the tooltips and any other dynamic overlays. + //table contains the "static" PerodicTableView table, and does not change very often. + //table2 contains the tooltips and any other dynamic overlays. //Usually, we can skip the code which renders the table, and just use the //image stored in table...when doFullDraw==false, the rendering code is skipped. if ( doFullDraw ) @@ -393,7 +393,7 @@ void PerodicTableView::paintEvent( TQPaintEvent * /*e*/ ) doFullDraw = false; } - //JH: Ok, now table tqcontains the static PerodicTableView table, and we may need to draw + //JH: Ok, now table contains the static PerodicTableView table, and we may need to draw //a tooltip on it. However, we don't want to ruin the stored table pixmap, //so let's copy it to table2 and add the tooltip there. *table2 = *table; @@ -741,7 +741,7 @@ void PerodicTableView::mouseMoveEvent( TQMouseEvent * /*mouse*/ ) //JH: only update() if we were showing a tooltip if ( m_tooltipElementNumber || m_showLegendTooltip ) { - //this tqinvalidates the number. If the mouse + //this invalidates the number. If the mouse //is moved, the number is invalid. m_tooltipElementNumber = 0; m_showLegendTooltip = false; diff --git a/kalzium/src/plotsetupwidget.ui b/kalzium/src/plotsetupwidget.ui index 5fb65406..a395541d 100644 --- a/kalzium/src/plotsetupwidget.ui +++ b/kalzium/src/plotsetupwidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PlotSetupWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ </widget> <widget class="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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> @@ -248,7 +248,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kalzium/src/settings_colors.ui b/kalzium/src/settings_colors.ui index 1717968a..f32360d0 100644 --- a/kalzium/src/settings_colors.ui +++ b/kalzium/src/settings_colors.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>setColors</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -36,7 +36,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout28</cstring> + <cstring>layout28</cstring> </property> <hbox> <property name="name"> @@ -70,7 +70,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <hbox> <property name="name"> @@ -96,7 +96,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout30</cstring> + <cstring>layout30</cstring> </property> <hbox> <property name="name"> @@ -122,7 +122,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout31</cstring> + <cstring>layout31</cstring> </property> <hbox> <property name="name"> @@ -163,7 +163,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <hbox> <property name="name"> @@ -197,7 +197,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -223,7 +223,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -249,7 +249,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <hbox> <property name="name"> @@ -290,7 +290,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -324,7 +324,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -350,7 +350,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -376,7 +376,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -402,7 +402,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -428,7 +428,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -454,7 +454,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -480,7 +480,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -521,7 +521,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -558,7 +558,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -584,7 +584,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -625,7 +625,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout12_2</cstring> + <cstring>layout12_2</cstring> </property> <hbox> <property name="name"> @@ -659,7 +659,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout19_2</cstring> + <cstring>layout19_2</cstring> </property> <hbox> <property name="name"> @@ -685,7 +685,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout18_2</cstring> + <cstring>layout18_2</cstring> </property> <hbox> <property name="name"> @@ -711,7 +711,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout17_2</cstring> + <cstring>layout17_2</cstring> </property> <hbox> <property name="name"> @@ -737,7 +737,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout16_2</cstring> + <cstring>layout16_2</cstring> </property> <hbox> <property name="name"> @@ -763,7 +763,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout15_2</cstring> + <cstring>layout15_2</cstring> </property> <hbox> <property name="name"> @@ -789,7 +789,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout14_2</cstring> + <cstring>layout14_2</cstring> </property> <hbox> <property name="name"> @@ -815,7 +815,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout13_2</cstring> + <cstring>layout13_2</cstring> </property> <hbox> <property name="name"> @@ -841,7 +841,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -901,7 +901,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kalzium/src/settings_misc.ui b/kalzium/src/settings_misc.ui index e27858dc..a66693dd 100644 --- a/kalzium/src/settings_misc.ui +++ b/kalzium/src/settings_misc.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>setupMisc</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -67,5 +67,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kalzium/src/settings_units.ui b/kalzium/src/settings_units.ui index 4457e59f..e054021a 100644 --- a/kalzium/src/settings_units.ui +++ b/kalzium/src/settings_units.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>setupUnits</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -163,5 +163,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kalzium/src/somwidget.ui b/kalzium/src/somwidget.ui index b35bc8b6..83e19209 100644 --- a/kalzium/src/somwidget.ui +++ b/kalzium/src/somwidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SOMWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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="QLayoutWidget" 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> @@ -178,7 +178,7 @@ the state of matter</string> </customwidgets> <connections> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kalzium/src/somwidget_impl.cpp b/kalzium/src/somwidget_impl.cpp index fbb4420a..6e3f4b71 100644 --- a/kalzium/src/somwidget_impl.cpp +++ b/kalzium/src/somwidget_impl.cpp @@ -35,7 +35,7 @@ SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *parent, const char* name ) { m_list = KalziumDataObject::instance()->ElementList; - text->tqsetAlignment( text->tqalignment() | Qt::WordBreak ); + text->setAlignment( text->alignment() | Qt::WordBreak ); text->setTextFormat( Qt::RichText ); text->setReadOnly( true ); text->setPaletteBackgroundColor( paletteBackgroundColor() ); diff --git a/kalzium/src/spectrum.cpp b/kalzium/src/spectrum.cpp index 5fea3d8e..dc8abb01 100644 --- a/kalzium/src/spectrum.cpp +++ b/kalzium/src/spectrum.cpp @@ -97,7 +97,7 @@ void Spectrum::adjustIntensities() double curInt = ( ( double )( *it ).intensity ); double newInt = max*1000/curInt; - ( *it ).intensity = tqRound( newInt ); + ( *it ).intensity = qRound( newInt ); } } diff --git a/kalzium/src/spectrumview.ui b/kalzium/src/spectrumview.ui index f2460c59..2787ab66 100644 --- a/kalzium/src/spectrumview.ui +++ b/kalzium/src/spectrumview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SpectrumView</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -38,7 +38,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -110,7 +110,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -216,7 +216,7 @@ <slots> <slot access="protected">slotExportAsImage()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>spectrumwidget.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kalzium/src/spectrumviewimpl.cpp b/kalzium/src/spectrumviewimpl.cpp index b78e780e..89bc36ac 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 01b83e72..54f70972 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 ); } @@ -223,7 +223,7 @@ int SpectrumWidget::Adjust( double color, double factor ) if ( color == 0.0 ) return 0; else - return tqRound( IntensityMax * pow( color*factor, Gamma ) ); + return qRound( IntensityMax * pow( color*factor, Gamma ) ); } void SpectrumWidget::drawTickmarks( TQPainter* p ) diff --git a/kalzium/src/timewidget.ui b/kalzium/src/timewidget.ui index 55c0ff9f..fcb46391 100644 --- a/kalzium/src/timewidget.ui +++ b/kalzium/src/timewidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TimeWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -194,7 +194,7 @@ of the elements</string> <slot>setValue(int)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kalzium/src/timewidget_impl.cpp b/kalzium/src/timewidget_impl.cpp index b1e26337..a5f186bc 100644 --- a/kalzium/src/timewidget_impl.cpp +++ b/kalzium/src/timewidget_impl.cpp @@ -23,7 +23,7 @@ TimeWidgetIMPL::TimeWidgetIMPL( TQWidget *parent, const char* name ) : TimeWidget( parent, name ) { - text->tqsetAlignment( text->tqalignment() | Qt::WordBreak ); + text->setAlignment( text->alignment() | Qt::WordBreak ); text->setTextFormat( Qt::RichText ); text->setReadOnly( true ); text->setPaletteBackgroundColor( paletteBackgroundColor() ); diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index 3a03b6e8..42cb90f9 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); @@ -377,7 +377,7 @@ TQRect Kanagram::innerRect(const TQRect &rect, const int xMargin, const int yMar void Kanagram::mousePressEvent(TQMouseEvent *e) { - if (m_nextRect.tqcontains(e->pos())) + if (m_nextRect.contains(e->pos())) { hideHint(); m_game->nextAnagram(); @@ -386,51 +386,51 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) update(); } - if(m_configRect.tqcontains(e->pos())) + if(m_configRect.contains(e->pos())) { showSettings(); } - if(m_quitRect.tqcontains(e->pos())) + if(m_quitRect.contains(e->pos())) { kapp->quit(); } - if(m_revealRect.tqcontains(e->pos())) + if(m_revealRect.contains(e->pos())) { m_game->restoreWord(); update(); } - if(m_logoRect.tqcontains(e->pos())) + if(m_logoRect.contains(e->pos())) { m_helpMenu->aboutApplication(); } if(!m_showHint && m_overHelp) { - if(m_handbookRect.tqcontains(e->pos())) + if(m_handbookRect.contains(e->pos())) { m_helpMenu->appHelpActivated(); } - if(m_aboutKDERect.tqcontains(e->pos())) + if(m_aboutKDERect.contains(e->pos())) { m_helpMenu->aboutKDE(); } - if(m_aboutAppRect.tqcontains(e->pos())) + if(m_aboutAppRect.contains(e->pos())) { m_helpMenu->aboutApplication(); } } - if(m_hintBoxRect.tqcontains(e->pos())) + if(m_hintBoxRect.contains(e->pos())) { hideHint(); } - if(m_switcherRect.tqcontains(e->pos()) || m_arrowRect.tqcontains(e->pos())) + if(m_switcherRect.contains(e->pos()) || m_arrowRect.contains(e->pos())) { if(!(e->button() == RightButton)) m_game->nextVocab(); @@ -444,7 +444,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) update(); } - if(m_hintRect.tqcontains(e->pos())) + if(m_hintRect.contains(e->pos())) { if(m_showHint == true) m_showHint = false; else @@ -459,7 +459,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) update(); } - if(m_upRect.tqcontains(e->pos()) && m_inputBox->text() != "") + if(m_upRect.contains(e->pos()) && m_inputBox->text() != "") { if(m_inputBox->text().lower().stripWhiteSpace() == m_game->getWord()) { @@ -492,7 +492,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) bool haveToUpdate; haveToUpdate = false; - if (m_nextRect.tqcontains(p)) + if (m_nextRect.contains(p)) { if (!m_overNext) { @@ -506,7 +506,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_configRect.tqcontains(p)) + if(m_configRect.contains(p)) { if(!m_overConfig) { @@ -520,7 +520,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_helpRect.tqcontains(p)) + if(m_helpRect.contains(p)) { if(!m_overHelp) { @@ -534,7 +534,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_quitRect.tqcontains(p)) + if(m_quitRect.contains(p)) { if(!m_overQuit) { @@ -548,7 +548,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_hintRect.tqcontains(p)) + if(m_hintRect.contains(p)) { if(!m_overHint) { @@ -562,7 +562,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_hintBoxRect.tqcontains(p)) + if(m_hintBoxRect.contains(p)) { if(!m_overHintBox) { @@ -576,7 +576,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_revealRect.tqcontains(p)) + if(m_revealRect.contains(p)) { if(!m_overReveal) { @@ -590,7 +590,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_upRect.tqcontains(p)) + if(m_upRect.contains(p)) { if(!m_overUp) { @@ -604,7 +604,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_switcherRect.tqcontains(p) || m_arrowRect.tqcontains(p)) + if(m_switcherRect.contains(p) || m_arrowRect.contains(p)) { if(!m_overSwitcher) { @@ -618,7 +618,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_aboutAppRect.tqcontains(p)) + if(m_aboutAppRect.contains(p)) { if(!m_overAboutApp) { @@ -634,7 +634,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) if(!m_showHint) { - if(m_handbookRect.tqcontains(p)) + if(m_handbookRect.contains(p)) { if(!m_overHandbook) { @@ -648,7 +648,7 @@ void Kanagram::updateButtonHighlighting(const TQPoint &p) haveToUpdate = true; } - if(m_aboutKDERect.tqcontains(p)) + if(m_aboutKDERect.contains(p)) { if(!m_overAboutKDE) { diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp index 6d4eeaea..4bfe29fc 100644 --- a/kanagram/src/keduvocdocument.cpp +++ b/kanagram/src/keduvocdocument.cpp @@ -972,7 +972,7 @@ KEduVocDocument::FileType KEduVocDocument::detectFT(const TQString &filename) TQDataStream is( &f ); - TQ_INT8 c1, c2, c3, c4, c5; + Q_INT8 c1, c2, c3, c4, c5; is >> c1 >> c2 >> c3 diff --git a/kanagram/src/keduvocdocument.h b/kanagram/src/keduvocdocument.h index b2dc021c..ebc48010 100644 --- a/kanagram/src/keduvocdocument.h +++ b/kanagram/src/keduvocdocument.h @@ -226,7 +226,7 @@ #define KV_CON_P3PF "p3f" // 3. person plural female #define KV_CON_P3PM "p3m" // 3. person plural male #define KV_CON_P3PN "p3n" // 3. person plural natural -#define KV_CONJ_COMMON "common" // female tqcontains common for all three +#define KV_CONJ_COMMON "common" // female contains common for all three #define LEX_IDENT_50 "Vocabulary Trainer V5.0" @@ -246,7 +246,7 @@ class MultipleChoice; class LeitnerSystem; /************************************************************* - * This class tqcontains the expressions of your vocabulary + * This class contains the expressions of your vocabulary ************************************************************/ class KEduVocDocument : public QObject diff --git a/kanagram/src/keduvocexpression.h b/kanagram/src/keduvocexpression.h index e5022c8b..eb3ac4ec 100644 --- a/kanagram/src/keduvocexpression.h +++ b/kanagram/src/keduvocexpression.h @@ -58,7 +58,7 @@ typedef signed char grade_t; typedef unsigned short count_t; /*************************************************************** - * This class tqcontains one expression as original or in one + * This class contains one expression as original or in one * translations **************************************************************/ diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp index 38382560..fc1441f6 100644 --- a/kanagram/src/keduvockvtmlreader.cpp +++ b/kanagram/src/keduvockvtmlreader.cpp @@ -1670,7 +1670,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem) TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path()); TQString format = i18n( - "Your document tqcontains an unknown tag <%1>. " // keep trailing space + "Your document contains an unknown tag <%1>. " // keep trailing space "Maybe your version of KVocTrain is too old, " "or the document is damaged.\n" "Loading is aborted because KVocTrain cannot " diff --git a/kanagram/src/leitnersystem.cpp b/kanagram/src/leitnersystem.cpp index 3207d45a..0705c5c2 100644 --- a/kanagram/src/leitnersystem.cpp +++ b/kanagram/src/leitnersystem.cpp @@ -114,7 +114,7 @@ void LeitnerSystem::deleteBox( LeitnerBox* box ) bool LeitnerSystem::insertBox( const TQString& name, int correctWordBox, int wrongWordBox ) { - if( getBoxNameList().tqcontains( name ) != 0 ) + if( getBoxNameList().contains( name ) != 0 ) return false; LeitnerBox tmpBox; @@ -164,7 +164,7 @@ bool LeitnerSystem::setBoxName( LeitnerBox* box, const TQString& name ) bool LeitnerSystem::insertBox( const TQString& name ) { - if( getBoxNameList().tqcontains( name ) != 0 ) + if( getBoxNameList().contains( name ) != 0 ) return false; LeitnerBox tmpBox; 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/mainsettings.cpp b/kanagram/src/mainsettings.cpp index d9df6164..1e026758 100644 --- a/kanagram/src/mainsettings.cpp +++ b/kanagram/src/mainsettings.cpp @@ -109,7 +109,7 @@ void MainSettings::setupTranslations() temp_languages.remove(".."); for (TQStringList::const_iterator it2 = temp_languages.begin(); it2 != temp_languages.end(); ++it2 ) { - if (!languages.tqcontains(*it2)) languages.append(*it2); + if (!languages.contains(*it2)) languages.append(*it2); } } diff --git a/kanagram/src/mainsettingswidget.ui b/kanagram/src/mainsettingswidget.ui index f9b9d79e..ef9d017e 100644 --- a/kanagram/src/mainsettingswidget.ui +++ b/kanagram/src/mainsettingswidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MainSettingsWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -86,7 +86,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -114,7 +114,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -178,5 +178,5 @@ <tabstop>kcfg_hintHideTime</tabstop> <tabstop>kcfg_useSounds</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kanagram/src/newstuffwidget.ui b/kanagram/src/newstuffwidget.ui index 97a8896b..f1b1bb23 100644 --- a/kanagram/src/newstuffwidget.ui +++ b/kanagram/src/newstuffwidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>NewStuffWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -58,5 +58,5 @@ the button to get new vocabulary files.</string> </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp index d7b7872a..46a81450 100644 --- a/kanagram/src/vocabedit.cpp +++ b/kanagram/src/vocabedit.cpp @@ -94,7 +94,7 @@ void VocabEdit::slotSave() TQString fileName; if(m_fileName == "") { - fileName = KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().tqreplace(" ", "") + ".kvtml"; + fileName = KGlobal::dirs()->saveLocation("data", "kanagram/data/" + KanagramSettings::dataLanguage()) + txtVocabName->text().lower().replace(" ", "") + ".kvtml"; } else { @@ -102,7 +102,7 @@ void VocabEdit::slotSave() } doc->saveAs(this, KURL(fileName), KEduVocDocument::automatic, "kanagram"); - VocabSettings *settings = (VocabSettings*)this->tqparentWidget(); + VocabSettings *settings = (VocabSettings*)this->parentWidget(); settings->refreshView(); if(m_textChanged) diff --git a/kanagram/src/vocabeditwidget.ui b/kanagram/src/vocabeditwidget.ui index 00b471cd..d4d1229d 100644 --- a/kanagram/src/vocabeditwidget.ui +++ b/kanagram/src/vocabeditwidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>VocabEditWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -80,7 +80,7 @@ <cstring>txtDescription</cstring> </property> <property name="whatsThis" stdset="0"> - <string>The description of the vocabulary. If you're creating a new vocabulary, add a description so that users of your vocabulary will know what kinds of words it tqcontains.</string> + <string>The description of the vocabulary. If you're creating a new vocabulary, add a description so that users of your vocabulary will know what kinds of words it contains.</string> </property> </widget> <widget class="QLineEdit" row="0" column="1"> @@ -111,7 +111,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -119,7 +119,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -161,7 +161,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -224,5 +224,5 @@ <tabstop>btnClose</tabstop> <tabstop>lboxWords</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kanagram/src/vocabsettingswidget.ui b/kanagram/src/vocabsettingswidget.ui index 6bf9b26a..b329da4e 100644 --- a/kanagram/src/vocabsettingswidget.ui +++ b/kanagram/src/vocabsettingswidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>VocabSettingsWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -113,5 +113,5 @@ <slots> <slot>createNew()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp index 75be74a9..f6652e56 100644 --- a/kbruch/src/exercisecompare.cpp +++ b/kbruch/src/exercisecompare.cpp @@ -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 Qt4, you can set the direction - // of the tqlayout to LTR (instead of inherit), but on Qt3 + // of the layout to LTR (instead of inherit), but on Qt3 // 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 be94cb50..967c960d 100644 --- a/kbruch/src/exerciseconvert.cpp +++ b/kbruch/src/exerciseconvert.cpp @@ -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 Qt4, you can set the direction - // of the tqlayout to LTR (instead of inherit), but on Qt3 + // of the layout to LTR (instead of inherit), but on Qt3 // 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 d97b9482..3a2d64dd 100644 --- a/kbruch/src/exercisefactorize.cpp +++ b/kbruch/src/exercisefactorize.cpp @@ -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 ee5da192..41a89066 100644 --- a/kbruch/src/exercisefactorize.h +++ b/kbruch/src/exercisefactorize.h @@ -115,14 +115,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(); @@ -135,14 +135,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 a36ce43c..07f60c84 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/fractionbasewidget.h b/kbruch/src/fractionbasewidget.h index ed2cc8d1..21b2fdc8 100644 --- a/kbruch/src/fractionbasewidget.h +++ b/kbruch/src/fractionbasewidget.h @@ -44,7 +44,7 @@ public: /** destructor */ ~FractionBaseWidget(); - /** updates the widget by first getting the settings and then tqrepainting */ + /** updates the widget by first getting the settings and then repainting */ void updateAndRepaint(); protected: diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp index 2cc0cc29..3ac59d46 100644 --- a/kbruch/src/mainqtwidget.cpp +++ b/kbruch/src/mainqtwidget.cpp @@ -109,7 +109,7 @@ MainQtWidget::MainQtWidget() #if (KDE_VERSION_MINOR>=3) && (KDE_VERSION_MAJOR>=3) #else - resize(TQSize(QMAX(toolBar()->tqsizeHint().width(), tqsizeHint().width()), tqsizeHint().height())); + resize(TQSize(QMAX(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 (KDE_VERSION_MINOR>=3) && (KDE_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/statisticsview.cpp b/kbruch/src/statisticsview.cpp index a3984707..d6b8ff37 100644 --- a/kbruch/src/statisticsview.cpp +++ b/kbruch/src/statisticsview.cpp @@ -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 */ } diff --git a/kbruch/src/statisticsview.h b/kbruch/src/statisticsview.h index 91b54c22..b7948761 100644 --- a/kbruch/src/statisticsview.h +++ b/kbruch/src/statisticsview.h @@ -65,7 +65,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 79c70fa0..a15520a8 100644 --- a/kbruch/src/taskview.cpp +++ b/kbruch/src/taskview.cpp @@ -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 Qt4, you can set the direction - // of the tqlayout to LTR (instead of inherit), but on Qt3 + // of the layout to LTR (instead of inherit), but on Qt3 // 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 572872ac..97cba6ed 100644 --- a/kbruch/src/taskvieweroptionsbase.ui +++ b/kbruch/src/taskvieweroptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TaskViewerOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget" 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="QGroupBox"> <property name="name"> - <cstring>tqcolorGroupBox</cstring> + <cstring>colorGroupBox</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -57,9 +57,9 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>20</y> @@ -214,7 +214,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontdialog.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/keduca/keduca/configdialogbase.ui b/keduca/keduca/configdialogbase.ui index ab7da6e0..bb526841 100644 --- a/keduca/keduca/configdialogbase.ui +++ b/keduca/keduca/configdialogbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConfigDialogBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>51</height> @@ -96,5 +96,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp index 9f88971b..a75c8478 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 = style().tqpixelMetric(TQStyle::PM_IndicatorWidth, 0); + indicator_width = style().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 = style().tqitemRect( p, x, y, rw, rh+yo, +// TQRect br = style().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 ) ); - style().drawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup()); + style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); } } diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index 7dfe7c8e..2ab99ea0 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/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index 6af8ea03..bc9e5485 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -34,14 +34,14 @@ typedef KParts::GenericFactory<KEducaPart> KEducaPartFactory; K_EXPORT_COMPONENT_FACTORY( libkeducapart, KEducaPartFactory ) -KEducaPart::KEducaPart( TQWidget *tqparentWidget, const char *widgetName, +KEducaPart::KEducaPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &/*args*/ ) : KParts::ReadOnlyPart( parent, name ) { setInstance( KEducaPartFactory::instance() ); - m_view = new KEducaView( tqparentWidget, widgetName ); + m_view = new KEducaView( parentWidget, widgetName ); m_view->show(); setWidget( m_view ); diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h index 76298098..418209a8 100644 --- a/keduca/keduca/keduca_part.h +++ b/keduca/keduca/keduca_part.h @@ -40,7 +40,7 @@ class KEducaPart : public KParts::ReadOnlyPart /* * Constructor. */ - KEducaPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, + KEducaPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &args ); /* diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index 1b57d778..bdd07677 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -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( Qt::AlignTop ); + buttonGroup1->layout()->setSpacing( 0 ); + buttonGroup1->layout()->setMargin( 0 ); + TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() ); + buttonGroup1Layout->setAlignment( Qt::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( Qt::AlignTop ); + GroupBox1->layout()->setSpacing( 0 ); + GroupBox1->layout()->setMargin( 0 ); + TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); + GroupBox1Layout->setAlignment( Qt::AlignTop ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index 56348074..5c07c9c3 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -60,7 +60,7 @@ void KEducaView::init() // Intro Screen _introWidget = new TQLabel( this, "introScreen" ); _introWidget->setBackgroundColor( Qt::white ); - _introWidget->tqsetAlignment( AlignCenter ); + _introWidget->setAlignment( AlignCenter ); _introWidget->setPixmap( TQPixmap( locate("data","keduca/pics/keduca_init.png") ) ); addWidget( _introWidget, 0 ); @@ -129,7 +129,7 @@ void KEducaView::slotButtonNext() if( ( Settings::resultFinish()== Settings::EnumResultFinish::afterEachQuestion ) && _questionText->isVisible() ) { - showResults( _currentResults + "<HR>" + currentqStatusPoints() ); + showResults( _currentResults + "<HR>" + currentStatusPoints() ); } else { @@ -138,7 +138,7 @@ void KEducaView::slotButtonNext() else { configWrite(); - showResults( setFinalResult() + currentqStatusPoints() + "<HR><P>" + _results + "</HTML>" + showResults( setFinalResult() + currentStatusPoints() + "<HR><P>" + _results + "</HTML>" ); } } @@ -436,12 +436,12 @@ void KEducaView::configWrite() Settings::writeConfig(); } -/** current tqStatus Points */ -TQString KEducaView::currentqStatusPoints() +/** 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::currentqStatusPoints() 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 */ diff --git a/keduca/keduca/keducaview.h b/keduca/keduca/keducaview.h index fcbaab08..aa04df5e 100644 --- a/keduca/keduca/keducaview.h +++ b/keduca/keduca/keducaview.h @@ -68,7 +68,7 @@ private: /** Write settings */ void configWrite(); /** current results Points */ - TQString currentqStatusPoints(); + TQString currentStatusPoints(); /** Set HTML table view with correct and incorrect answers */ TQString getTableQuestion( bool isCorrect, const TQString &correct, const TQString &incorrect); /** Define the next questions (random, secuencial) */ 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 c379c146..69a90fdd 100644 --- a/keduca/keduca/kquestion.cpp +++ b/keduca/keduca/kquestion.cpp @@ -51,7 +51,7 @@ void KQuestion::initGUI() _picture->setPalette( TQPalette( Qt::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/kradioeduca.cpp b/keduca/keduca/kradioeduca.cpp index 3486b46d..89b3e830 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 = style().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0); + indicator_width = style().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 = style().tqitemRect( p, x, y, rw, rh+yo, +// TQRect br = style().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 ) ); - style().drawPrimitive( TQStyle::PE_FocusRect, p, br, tqcolorGroup()); + style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); } } diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui index b566cd9c..0292edf2 100644 --- a/keduca/keducabuilder/kcontroladdeditbase.ui +++ b/keduca/keducabuilder/kcontroladdeditbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KControlAddEditBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -510,7 +510,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -679,7 +679,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -860,7 +860,7 @@ <slot access="private" specifier="pure virtual">slotDataChanged()</slot> <slot access="private" specifier="pure virtual">slotAnswerSelected(QListViewItem *)</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index 344e1b32..e46bfdc4 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -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( Qt::AlignTop ); + GroupBox7->layout()->setSpacing( 0 ); + GroupBox7->layout()->setMargin( 0 ); + TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() ); + GroupBox7Layout->setAlignment( Qt::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( Qt::AlignTop ); + GroupBox8->layout()->setSpacing( 0 ); + GroupBox8->layout()->setMargin( 0 ); + TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() ); + GroupBox8Layout->setAlignment( Qt::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( Qt::AlignTop ); + GroupBox6->layout()->setSpacing( 0 ); + GroupBox6->layout()->setMargin( 0 ); + TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() ); + GroupBox6Layout->setAlignment( Qt::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 9041b6a2..04f2411b 100644 --- a/keduca/keducabuilder/kcontrolheaderbase.ui +++ b/keduca/keducabuilder/kcontrolheaderbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MyDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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> @@ -459,7 +459,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index b6b9332b..fa7da986 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -91,7 +91,7 @@ void KEducaBuilder::init() _split->setOrientation( TQSplitter::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 *) ), this, TQT_SLOT( slotPreview(TQListBoxItem *) ) ); connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), 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(); } @@ -289,18 +289,18 @@ bool KEducaBuilder::currentFileMayBeReplaced() switch (res) { case KMessageBox::Yes: - // If the saving was successful, then the file may be tqreplaced + // If the saving was successful, then the file may be replaced return fileSave(); break; case KMessageBox::Cancel: - // User cancels operation, do not tqreplace the file + // User cancels operation, do not replace the file return false; break; default: ; } } - // file was not changed, it may be tqreplaced + // file was not changed, it may be replaced return true; } diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h index 9171f58f..c3a736a7 100644 --- a/keduca/keducabuilder/keducabuilder.h +++ b/keduca/keducabuilder/keducabuilder.h @@ -67,7 +67,7 @@ private: bool fileSaveAs(); /** Ask the user if he wants to save the file if it has been changed. - Returns true if the file may be tqreplaced (that is when he successfully saved it or said "Discard") */ + Returns true if the file may be replaced (that is when he successfully saved it or said "Discard") */ bool currentFileMayBeReplaced(); // Private attributes diff --git a/keduca/keducabuilder/keducaeditorstartdialogbase.ui b/keduca/keducabuilder/keducaeditorstartdialogbase.ui index 4419fbcc..0cb69e39 100644 --- a/keduca/keducabuilder/keducaeditorstartdialogbase.ui +++ b/keduca/keducabuilder/keducaeditorstartdialogbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KEducaEditorStartDialogBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -312,7 +312,7 @@ <tabstop>openDocumentRB</tabstop> <tabstop>openRecentDocumentRB</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/keduca/keducabuilder/klangcombo.cpp b/keduca/keducabuilder/klangcombo.cpp index 310a9a23..1d86c09e 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 b91122f0..5a84574c 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 @@ -181,9 +181,9 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev) } } -bool KTagComboBox::tqcontainsTag( const TQString &str ) const +bool KTagComboBox::containsTag( const TQString &str ) const { - return _tags->tqcontains(str) > 0; + return _tags->contains(str) > 0; } TQString KTagComboBox::currentTag() const @@ -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/keducabuilder/ktagcombobox.h b/keduca/keducabuilder/ktagcombobox.h index 897156d2..ffeb2cda 100644 --- a/keduca/keducabuilder/ktagcombobox.h +++ b/keduca/keducabuilder/ktagcombobox.h @@ -58,7 +58,7 @@ public: */ TQString currentTag() const; TQString tag ( int i ) const; - bool tqcontainsTag (const TQString &str ) const; + bool containsTag (const TQString &str ) const; /* * Set the current item diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp index 6c8c5aec..7632b6fd 100644 --- a/keduca/libkeduca/fileread.cpp +++ b/keduca/libkeduca/fileread.cpp @@ -62,7 +62,7 @@ bool FileRead::loadFile(const TQString &filename) { TQDomDocument doc("document.xml"); - KMimeType::Ptr type = KMimeType::tqfindByFileContent(filename); + KMimeType::Ptr type = KMimeType::findByFileContent(filename); kdDebug() << "FileRead::loadFile(): MIME-Type is " << type->name() << endl; @@ -79,7 +79,7 @@ bool FileRead::loadFile(const TQString &filename) } else { - doc.setContent(tqUncompress(file.readAll())); + doc.setContent(qUncompress(file.readAll())); } TQDomElement docElem = doc.documentElement(); @@ -796,7 +796,7 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom doc.save( stream, 4); buffer.close(); if ( saveCompressed ) - file.writeBlock(tqCompress(data)); + file.writeBlock(qCompress(data)); else file.writeBlock(data); file.close(); @@ -905,7 +905,7 @@ void FileRead::setHeader( const TQString field, const TQString value) if( (_header[field]).isEmpty() ) _header.insert( field, value ); else - _header.tqreplace( field, value ); + _header.replace( field, value ); } /** is Multi Answer */ diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui index b98bfa91..ccd51e46 100644 --- a/keduca/libkeduca/kgallerydialogbase.ui +++ b/keduca/libkeduca/kgallerydialogbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KGalleryDialogBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -24,7 +24,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -32,7 +32,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -81,7 +81,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -366,5 +366,5 @@ <slot>slotButtonAdd()</slot> <slot>slotServerSelected(QListViewItem*)</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgeography/src/answer.cpp b/kgeography/src/answer.cpp index ddc00f91..f4931df3 100644 --- a/kgeography/src/answer.cpp +++ b/kgeography/src/answer.cpp @@ -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(Qt::AlignHCenter); + l -> setAlignment(Qt::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 eb8eb5da..c6d9d292 100644 --- a/kgeography/src/answersdialog.cpp +++ b/kgeography/src/answersdialog.cpp @@ -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(Qt::AlignCenter); + l1 -> setAlignment(Qt::AlignCenter); lay->addMultiCellWidget(l1, 0, 0, 0, 4); // Headers @@ -68,7 +68,7 @@ answersDialog::answersDialog(TQWidget *parent, const TQValueVector<userAnswer> & lay -> addItem(new TQSpacerItem(20, 20, TQSizePolicy::Fixed, TQSizePolicy::Fixed), totalAnswers + 3, 2); l1 = new TQLabel(i18n("You answered correctly %1 out of %2 questions.").arg(correctAnswers).arg(totalAnswers), p_container); - l1 -> tqsetAlignment(Qt::AlignCenter); + l1 -> setAlignment(Qt::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 c2cca166..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(); } diff --git a/kgeography/src/capitaldivisionasker.cpp b/kgeography/src/capitaldivisionasker.cpp index eb8db182..ffea1407 100644 --- a/kgeography/src/capitaldivisionasker.cpp +++ b/kgeography/src/capitaldivisionasker.cpp @@ -29,7 +29,7 @@ bool capitalDivisionAsker::nextBoxAskerQuestionHook(const TQString &division, in p_currentAnswer.setQuestion(i18n(p_map -> getFileName().utf8(), p_capital.utf8())); p_currentAnswer.setCorrectAnswer(i18n(p_map -> getFileName().utf8(), division.utf8())); - TQString sw = i18n("There are two ways of dealing with the translation of \"%1 is the capital of...\". The first option simply tqreplaces %1 with the translated name of the relevant city. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"%1 is the capital of...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); + TQString sw = i18n("There are two ways of dealing with the translation of \"%1 is the capital of...\". The first option simply replaces %1 with the translated name of the relevant city. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"%1 is the capital of...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); if (sw == "1") { TQString capitalName = i18n(p_map -> getFileName().utf8(), p_capital.utf8()); diff --git a/kgeography/src/division.cpp b/kgeography/src/division.cpp index 36eb9776..7ef70353 100644 --- a/kgeography/src/division.cpp +++ b/kgeography/src/division.cpp @@ -72,7 +72,7 @@ void division::setName(const TQString &name) void division::setRGB(int r, int g, int b) { - p_color = tqRgb(r, g, b); + p_color = qRgb(r, g, b); } bool division::setFlagFile(const TQString &path) diff --git a/kgeography/src/divisioncapitalasker.cpp b/kgeography/src/divisioncapitalasker.cpp index 96e76bed..b87437a2 100644 --- a/kgeography/src/divisioncapitalasker.cpp +++ b/kgeography/src/divisioncapitalasker.cpp @@ -25,7 +25,7 @@ bool divisionCapitalAsker::nextBoxAskerQuestionHook(const TQString &division, in bool b; if (isAnswer) { - TQString sw = i18n("There are two ways of dealing with the translation of \"The capital of %1 is...\". The first option simply tqreplaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"The capital of %1 is...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); + TQString sw = i18n("There are two ways of dealing with the translation of \"The capital of %1 is...\". The first option simply replaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"The capital of %1 is...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); if (sw == "1") { TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8()); diff --git a/kgeography/src/divisionflagasker.cpp b/kgeography/src/divisionflagasker.cpp index 5c3ab035..79641b25 100644 --- a/kgeography/src/divisionflagasker.cpp +++ b/kgeography/src/divisionflagasker.cpp @@ -28,7 +28,7 @@ bool divisionFlagAsker::nextBoxAskerQuestionHook(const TQString &division, int i p_rb[i] -> setPixmap(im); if (isAnswer) { - TQString sw = i18n("There are two ways of dealing with the translation of \"The flag of %1 is...\". The first option simply tqreplaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"The flag of %1 is...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); + TQString sw = i18n("There are two ways of dealing with the translation of \"The flag of %1 is...\". The first option simply replaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"The flag of %1 is...\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); if (sw == "1") { TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8()); diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp index 2ef691b5..33740e66 100644 --- a/kgeography/src/kgeography.cpp +++ b/kgeography/src/kgeography.cpp @@ -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); @@ -287,7 +287,7 @@ void kgeography::setMap(KGmap *m) delete p_map; p_map = m; - TQString sw = i18n("There are two ways of dealing with the translation of \"Current map: %1\". The first option simply tqreplaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"Current map: %1\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); + TQString sw = i18n("There are two ways of dealing with the translation of \"Current map: %1\". The first option simply replaces %1 with the translated name of the relevant region. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"Current map: %1\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); if (sw == "1") { TQString mapName = i18n(p_map -> getFileName().utf8(), p_map -> getName().utf8()); diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp index 3513a3e7..27c7c83d 100644 --- a/kgeography/src/mapasker.cpp +++ b/kgeography/src/mapasker.cpp @@ -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(QRgb 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.").arg(p_map -> getFile()).arg(tqRed(c)).arg(tqGreen(c)).arg(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(qRed(c)).arg(qGreen(c)).arg(qBlue(c))); else if (p_shouldClearPopup) { p_popupManager.clear(); @@ -170,7 +170,7 @@ void mapAsker::setScrollBarsMaximumSize(int w, int h) void mapAsker::nextQuestionHook(const TQString &division) { - TQString sw = i18n("There are two ways of dealing with the translation of \"Please click on: %1\". The first option simply tqreplaces %1 with the translated name of the relevant region/city. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"Please click on: %1\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); + TQString sw = i18n("There are two ways of dealing with the translation of \"Please click on: %1\". The first option simply replaces %1 with the translated name of the relevant region/city. If the grammar of your language allows this, choose this option by setting the translation of this message to 1, and leave untranslated the translations of \"Please click on: %1\" that have the placename embedded (or translate them as - if you wish to show the file as fully translated. The second option is to translate all messages in full - this is likely to be required in the case of highly-inflected languages like Russian. To choose this option, set the translation of this message to 0, and translate all the messages.", "0"); if (sw == "1") { TQString divisionName = i18n(p_map -> getFileName().utf8(), division.utf8()); diff --git a/kgeography/src/mapsdatatranslation.cpp b/kgeography/src/mapsdatatranslation.cpp index 081ca98c..23fb3418 100644 --- a/kgeography/src/mapsdatatranslation.cpp +++ b/kgeography/src/mapsdatatranslation.cpp @@ -64,10 +64,10 @@ i18n("africa.kgm", "The flag of Côte d'Ivoire is..."); i18n("africa.kgm", "Yamoussoukro"); i18n("africa.kgm", "Yamoussoukro is the capital of..."); i18n("africa.kgm", "Cyprus"); -i18n("africa.kgm", "Detqmocratic Republic of the Congo"); -i18n("africa.kgm", "The capital of Detqmocratic Republic of the Congo is..."); -i18n("africa.kgm", "Please click on:\nDetqmocratic Republic of the Congo"); -i18n("africa.kgm", "The flag of Detqmocratic Republic of the Congo is..."); +i18n("africa.kgm", "Democratic Republic of the Congo"); +i18n("africa.kgm", "The capital of Democratic Republic of the Congo is..."); +i18n("africa.kgm", "Please click on:\nDemocratic Republic of the Congo"); +i18n("africa.kgm", "The flag of Democratic Republic of the Congo is..."); i18n("africa.kgm", "Kinshasa"); i18n("africa.kgm", "Kinshasa is the capital of..."); i18n("africa.kgm", "Djibouti"); @@ -3417,10 +3417,10 @@ i18n("world.kgm", "Please click on:\nCôte d'Ivoire"); i18n("world.kgm", "The flag of Côte d'Ivoire is..."); i18n("world.kgm", "Yamoussoukro"); i18n("world.kgm", "Yamoussoukro is the capital of..."); -i18n("world.kgm", "Detqmocratic Republic of the Congo"); -i18n("world.kgm", "The capital of Detqmocratic Republic of the Congo is..."); -i18n("world.kgm", "Please click on:\nDetqmocratic Republic of the Congo"); -i18n("world.kgm", "The flag of Detqmocratic Republic of the Congo is..."); +i18n("world.kgm", "Democratic Republic of the Congo"); +i18n("world.kgm", "The capital of Democratic Republic of the Congo is..."); +i18n("world.kgm", "Please click on:\nDemocratic Republic of the Congo"); +i18n("world.kgm", "The flag of Democratic Republic of the Congo is..."); i18n("world.kgm", "Kinshasa"); i18n("world.kgm", "Kinshasa is the capital of..."); i18n("world.kgm", "Djibouti"); @@ -4384,10 +4384,10 @@ i18n("world.kgm", "Please click on:\nSingapore"); i18n("world.kgm", "The flag of Singapore is..."); i18n("world.kgm", "Singapore"); i18n("world.kgm", "Singapore is the capital of..."); -i18n("world.kgm", "Detqmocratic People's Republic of Korea"); -i18n("world.kgm", "The capital of Detqmocratic People's Republic of Korea is..."); -i18n("world.kgm", "Please click on:\nDetqmocratic People's Republic of Korea"); -i18n("world.kgm", "The flag of Detqmocratic People's Republic of Korea is..."); +i18n("world.kgm", "Democratic People's Republic of Korea"); +i18n("world.kgm", "The capital of Democratic People's Republic of Korea is..."); +i18n("world.kgm", "Please click on:\nDemocratic People's Republic of Korea"); +i18n("world.kgm", "The flag of Democratic People's Republic of Korea is..."); i18n("world.kgm", "Pyeongyang"); i18n("world.kgm", "Pyeongyang is the capital of..."); i18n("world.kgm", "Republic of Korea"); diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp index 94521903..f551940f 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 5005fba1..1bc37cb3 100644 --- a/kgeography/src/mapwidget.h +++ b/kgeography/src/mapwidget.h @@ -26,7 +26,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 e8d2d369..b9f1c78e 100644 --- a/kgeography/src/mypopup.cpp +++ b/kgeography/src/mypopup.cpp @@ -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(Qt::AlignCenter); + l2 -> setAlignment(Qt::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(Qt::AlignCenter); + flag -> setAlignment(Qt::AlignCenter); } - l -> tqsetAlignment(Qt::AlignCenter); + l -> setAlignment(Qt::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/khangman/advanced.ui b/khangman/khangman/advanced.ui index ef8e1b24..02845c1a 100644 --- a/khangman/khangman/advanced.ui +++ b/khangman/khangman/advanced.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>advanced</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -91,5 +91,5 @@ For example, in Catalan, if this is unchecked and you type "o", the o and ò wil </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 8cff801a..0b14829e 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -52,7 +52,7 @@ KHangMan::KHangMan() setCentralWidget(m_view); setLanguages(); - setuptqStatusbar(); + setupStatusbar(); setupActions(); // Toolbar for special characters @@ -109,7 +109,7 @@ void KHangMan::setupActions() } // Set up the status bar with 4 different fields. -void KHangMan::setuptqStatusbar() +void KHangMan::setupStatusbar() { // set up the status bar statusBar( )->insertItem(" ",IDS_LEVEL, 0); @@ -120,7 +120,7 @@ void KHangMan::setuptqStatusbar() // FIXME: Make this into a slot? -void KHangMan::changetqStatusbar(const TQString& text, int id) +void KHangMan::changeStatusbar(const TQString& text, int id) { statusBar()->changeItem(text, id); } @@ -141,16 +141,16 @@ void KHangMan::slotQuit() void KHangMan::slotChangeLevel(int index) { levelString = levels[index]; - changetqStatusbar(levelString, IDS_LEVEL); + changeStatusbar(levelString, IDS_LEVEL); #if 0 if (m_view->levelFile == "world_capitals.kvtml" || m_view->levelFile == "departements.kvtml") - changetqStatusbar(i18n("First letter upper case"), IDS_ACCENTS); + changeStatusbar(i18n("First letter upper case"), IDS_ACCENTS); else - changetqStatusbar("", IDS_ACCENTS); + changeStatusbar("", IDS_ACCENTS); #endif Prefs::setCurrentLevel(index); - levelString.tqreplace(0, 1, levelString.left(1).lower()); + levelString.replace(0, 1, levelString.left(1).lower()); Prefs::setLevelFile(levelString +".kvtml"); Prefs::writeConfig(); m_view->slotNewGame(); @@ -164,7 +164,7 @@ void KHangMan::slotChangeLanguage(int index) Prefs::writeConfig(); loadLevels(); loadLangToolBar(); - changetqStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG); + changeStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG); setAccent(); setMessages(); m_view->slotNewGame(); @@ -209,7 +209,7 @@ void KHangMan::setLanguages() TQStringList temp_languages; for (uint i=0; i<m_languages.count(); i++) { - if (m_languages.tqcontains(m_languages[i])>1) { + if (m_languages.contains(m_languages[i])>1) { temp_languages.append(m_languages[i]); m_languages.remove(m_languages[i]); } @@ -224,11 +224,11 @@ void KHangMan::setLanguages() // Write the present languages in config so they cannot be downloaded. KConfig *config=kapp->config(); - config->setGroup("KNewStufftqStatus"); + config->setGroup("KNewStuffStatus"); for (uint i=0; i<m_languages.count(); i++) { TQString tmp = m_languages[i]; if (!config->readEntry(tmp)) - config->writeEntry(tmp, TQDate::tqcurrentDate().toString(Qt::ISODate)); + config->writeEntry(tmp, TQDate::currentDate().toString(Qt::ISODate)); } // We look in $KDEDIR/share/locale/all_languages from @@ -261,7 +261,7 @@ void KHangMan::loadSettings() selectedLanguage = Prefs::selectedLanguage(); if (m_languages.grep(selectedLanguage).isEmpty()) selectedLanguage = "en"; - changetqStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG); + changeStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG); // Show/hide characters toolbar if (Prefs::showCharToolbar()) secondToolbar->show(); @@ -276,8 +276,8 @@ void KHangMan::setLevel() if (currentLevel > (uint) levels.count()) currentLevel= 0; levelString = levels[currentLevel]; - levelString.tqreplace(0, 1, levelString.left(1).lower()); - levelString = levels[currentLevel].tqreplace(0, 1, levels[currentLevel].left(1).lower()) ; + levelString.replace(0, 1, levelString.left(1).lower()); + levelString = levels[currentLevel].replace(0, 1, levels[currentLevel].left(1).lower()) ; } void KHangMan::loadLevels() @@ -299,7 +299,7 @@ void KHangMan::loadLevels() levelBool = true; mString = mString.left(mString.length()-6); //Put the first letter in Upper case - mString = mString.tqreplace(0, 1, mString.left(1).upper()); + mString = mString.replace(0, 1, mString.left(1).upper()); levels+=mString; } //TODO else tell no files had been found @@ -307,13 +307,13 @@ void KHangMan::loadLevels() // Sort easy, medium, hard at bottom, with the other categories at the top levels.sort(); - TQString tqreplace[3] = { "Easy", "Medium", "Hard" }; + TQString replace[3] = { "Easy", "Medium", "Hard" }; for ( int i = 0; i < 3; ++i ) { - if ( levels.findIndex( tqreplace[i] ) > -1 ) + if ( levels.findIndex( replace[i] ) > -1 ) { - levels.remove( tqreplace[i] ); - levels.append( tqreplace[i] ); + levels.remove( replace[i] ); + levels.append( replace[i] ); } } @@ -338,7 +338,7 @@ void KHangMan::loadLevels() if (levelBool == false) { - Prefs::setLevelFile(levels[0].tqreplace(0, 1, levels[0].left(1).lower())+".kvtml"); + Prefs::setLevelFile(levels[0].replace(0, 1, levels[0].left(1).lower())+".kvtml"); Prefs::setCurrentLevel(0); currentLevel =0; Prefs::writeConfig(); @@ -351,8 +351,8 @@ void KHangMan::loadLevels() setLevel(); TQString m_lstring = translatedLevels[currentLevel].utf8(); - m_lstring.tqreplace(0, 1, m_lstring.left(1).upper()); - changetqStatusbar(m_lstring, IDS_LEVEL); + m_lstring.replace(0, 1, m_lstring.left(1).upper()); + changeStatusbar(m_lstring, IDS_LEVEL); } @@ -448,7 +448,7 @@ void KHangMan::loadLangToolBar() TQTextStream readFileStr(&openFileStream); readFileStr.setEncoding(TQTextStream::UnicodeUTF8); - // m_allData tqcontains all the words from the file + // m_allData contains all the words from the file // FIXME: Better name m_allData = TQStringList::split("\n", readFileStr.read(), true); openFileStream.close(); @@ -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); @@ -498,7 +498,7 @@ TQString KHangMan::charIcon(const TQChar & c) p.setPen(Qt::black); p.drawText(r, Qt::AlignCenter, (TQString) c); - ///Create transparency tqmask + ///Create transparency mask TQBitmap bm(128, 128); bm.fill(Qt::color0); TQPainter b(&bm); @@ -531,17 +531,17 @@ void KHangMan::setMessages() { // Tell the user about if there is a hint. if (Prefs::hint() && m_view->hintExists()) - changetqStatusbar(i18n("Hint on right-click"), IDS_HINT); + changeStatusbar(i18n("Hint on right-click"), IDS_HINT); else if (m_view->hintExists() && !Prefs::hint() ) - changetqStatusbar(i18n("Hint available"), IDS_HINT); + changeStatusbar(i18n("Hint available"), IDS_HINT); else - changetqStatusbar("", IDS_HINT); + changeStatusbar("", IDS_HINT); // Tell the user about accented characters if (m_view->accentedLetters() && Prefs::accentedLetters()) - changetqStatusbar(i18n("Type accented letters"), IDS_ACCENTS); + changeStatusbar(i18n("Type accented letters"), IDS_ACCENTS); else - changetqStatusbar("", IDS_ACCENTS); + changeStatusbar("", IDS_ACCENTS); } #include "khangman.moc" diff --git a/khangman/khangman/khangman.h b/khangman/khangman/khangman.h index 35eddc33..7c47711a 100644 --- a/khangman/khangman/khangman.h +++ b/khangman/khangman/khangman.h @@ -63,16 +63,16 @@ public: virtual ~KHangMan(); /** - Update the text in the tqStatusbar + Update the text in the Statusbar @param text the text that will be written in the statusbar @param id the label in which the text will be written */ - void changetqStatusbar(const TQString& text, int id); + void changeStatusbar(const TQString& text, int id); ///Action that sets up the Language menu KSelectAction *m_languageAction; - ///Method to set the current language into the tqStatusbar and to pass it to KHangManView + ///Method to set the current language into the Statusbar and to pass it to KHangManView void setLanguages(); ///Translated names of languages @@ -86,8 +86,8 @@ public: private: ///Create the actions void setupActions(); - ///Create the tqStatusbar - void setuptqStatusbar(); + ///Create the Statusbar + void setupStatusbar(); ///Selected language TQString selectedLanguage; diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp index e5b7bcf7..8fc5bcc5 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() ) ); @@ -92,7 +92,7 @@ KHangManView::~KHangManView() // Handle a guess of the letter in sChar. // -void KHangManView::tqreplaceLetters(const TQString& sChar) +void KHangManView::replaceLetters(const TQString& sChar) { int index = 0; bool b_end = false; @@ -101,52 +101,52 @@ void KHangManView::tqreplaceLetters(const TQString& sChar) // Replace letter in the word if (Prefs::oneLetter()) { - // We just tqreplace the next instance. - for (int count=0; count < m_word.tqcontains(sChar, false); count++) { + // We just replace the next instance. + for (int count=0; count < m_word.contains(sChar, false); count++) { index = m_word.find(sChar, index, false); if (m_goodWord.at(2*index)=='_') { - m_goodWord.tqreplace((2*index), 1, m_word.at(index)); + m_goodWord.replace((2*index), 1, m_word.at(index)); kdDebug() << "m_goodword " << m_goodWord << endl; - if (count == m_word.tqcontains(sChar, false)-1) + if (count == m_word.contains(sChar, false)-1) b_end = true; break; } else index++; - if (count == m_word.tqcontains(sChar, false)-1) + if (count == m_word.contains(sChar, false)-1) b_end = true; } } else { - for (int count=0; count < m_word.tqcontains(sChar, false); count++) { + for (int count=0; count < m_word.contains(sChar, false); count++) { //searching for letter location index = m_word.find(sChar, index, false); - //we tqreplace it... - m_goodWord.tqreplace((2*index), 1,m_word.at(index)); + //we replace it... + m_goodWord.replace((2*index), 1,m_word.at(index)); index++; } } if (m_accentedLetters && !Prefs::accentedLetters()) { - if (sChar=="i") tqreplaceLetters(TQString::fromUtf8("Ã")); - if (sChar=="a") tqreplaceLetters(TQString::fromUtf8("à ")); - if (sChar=="a") tqreplaceLetters(TQString::fromUtf8("á")); - if (sChar=="a") tqreplaceLetters(TQString::fromUtf8("ã")); - if (sChar=="u") tqreplaceLetters(TQString::fromUtf8("ü")); - if (sChar=="o") tqreplaceLetters(TQString::fromUtf8("ò")); - if (sChar=="o") tqreplaceLetters(TQString::fromUtf8("ó")); - if (sChar=="o") tqreplaceLetters(TQString::fromUtf8("õ")); - if (sChar=="e") tqreplaceLetters(TQString::fromUtf8("è")); - if (sChar=="e") tqreplaceLetters(TQString::fromUtf8("é")); - if (sChar=="u") tqreplaceLetters(TQString::fromUtf8("ù")); + if (sChar=="i") replaceLetters(TQString::fromUtf8("Ã")); + if (sChar=="a") replaceLetters(TQString::fromUtf8("à ")); + if (sChar=="a") replaceLetters(TQString::fromUtf8("á")); + if (sChar=="a") replaceLetters(TQString::fromUtf8("ã")); + if (sChar=="u") replaceLetters(TQString::fromUtf8("ü")); + if (sChar=="o") replaceLetters(TQString::fromUtf8("ò")); + if (sChar=="o") replaceLetters(TQString::fromUtf8("ó")); + if (sChar=="o") replaceLetters(TQString::fromUtf8("õ")); + if (sChar=="e") replaceLetters(TQString::fromUtf8("è")); + if (sChar=="e") replaceLetters(TQString::fromUtf8("é")); + if (sChar=="u") replaceLetters(TQString::fromUtf8("ù")); } if (!Prefs::oneLetter()) m_guessedLetters << sChar; //appends the list only if not in One Letter only mode... - if (m_word.tqcontains(sChar, false) == 1) + if (m_word.contains(sChar, false) == 1) m_guessedLetters << sChar; //append if only one instance if (Prefs::oneLetter() && b_end) @@ -154,33 +154,33 @@ void KHangManView::tqreplaceLetters(const TQString& sChar) } -bool KHangManView::tqcontainsChar(const TQString &sChar) +bool KHangManView::containsChar(const TQString &sChar) { bool b = false; if (m_accentedLetters && !Prefs::accentedLetters()) { if (sChar=="i") - b = m_word.tqcontains(TQString::fromUtf8("Ã"), false); + b = m_word.contains(TQString::fromUtf8("Ã"), false); if (sChar=="a") - b = m_word.tqcontains(TQString::fromUtf8("à "), false) - || m_word.tqcontains(TQString::fromUtf8("á"), false) - || m_word.tqcontains(TQString::fromUtf8("ã"), false); + b = m_word.contains(TQString::fromUtf8("à "), false) + || m_word.contains(TQString::fromUtf8("á"), false) + || m_word.contains(TQString::fromUtf8("ã"), false); if (sChar=="u") - b = m_word.tqcontains(TQString::fromUtf8("ü"), false) - || m_word.tqcontains(TQString::fromUtf8("ù"), false); + b = m_word.contains(TQString::fromUtf8("ü"), false) + || m_word.contains(TQString::fromUtf8("ù"), false); if (sChar=="o") - b = m_word.tqcontains(TQString::fromUtf8("ò"), false) - || m_word.tqcontains(TQString::fromUtf8("ó"), false) - || m_word.tqcontains(TQString::fromUtf8("õ"), false); + b = m_word.contains(TQString::fromUtf8("ò"), false) + || m_word.contains(TQString::fromUtf8("ó"), false) + || m_word.contains(TQString::fromUtf8("õ"), false); if (sChar=="e") - b = m_word.tqcontains(TQString::fromUtf8("è"), false) - || m_word.tqcontains(TQString::fromUtf8("é"), false); + b = m_word.contains(TQString::fromUtf8("è"), false) + || m_word.contains(TQString::fromUtf8("é"), false); } - return (b || m_word.tqcontains(sChar, false)); + return (b || m_word.contains(sChar, false)); } @@ -234,7 +234,7 @@ void KHangManView::setTheme() void KHangManView::paintEvent( TQPaintEvent * ) { // This pixmap implements double buffering to remove all forms of - // flicker in the tqrepainting. + // flicker in the repainting. TQPixmap buf(width(), height()); // Repaint the contents of the khangman view into the pixmap. @@ -379,21 +379,21 @@ void KHangManView::slotTry() } // Handle the guess. - if (!m_guessedLetters.tqcontains(guess.lower())) { + if (!m_guessedLetters.contains(guess.lower())) { // The letter is not already guessed. - if (tqcontainsChar(guess)) { - tqreplaceLetters(guess); + if (containsChar(guess)) { + replaceLetters(guess); // This is needed because of the white spaces. TQString stripWord = m_goodWord; TQString sword = m_word; if (dd > 0) { - stripWord.tqreplace(2*c, 1, ""); - stripWord.tqreplace(2*c-1, 1, ""); + stripWord.replace(2*c, 1, ""); + stripWord.replace(2*c-1, 1, ""); - stripWord.tqreplace(2*(dd-1), 1, ""); - stripWord.tqreplace(2*(dd-1)-1, 1, ""); + stripWord.replace(2*(dd-1), 1, ""); + stripWord.replace(2*(dd-1)-1, 1, ""); } TQStringList rightChars = TQStringList::split(" ", stripWord, true); @@ -442,7 +442,7 @@ void KHangManView::slotTry() m_guessedLetters << guess.lower(); m_guessedLetters << guess.upper(); - m_missedLetters = m_missedLetters.tqreplace((2 * m_numMissedLetters), + m_missedLetters = m_missedLetters.replace((2 * m_numMissedLetters), 1, guess.lower()); m_numMissedLetters++; update(); @@ -496,7 +496,7 @@ void KHangManView::slotTry() int x = 0; int y = 0; - if (m_missedLetters.tqcontains(guess, false) > 0) { + if (m_missedLetters.contains(guess, false) > 0) { // FIXME: popup should be better placed. TQPoint abspos = popup->pos(); @@ -513,7 +513,7 @@ void KHangManView::slotTry() m_letterInput->setEnabled(false); } - if (m_goodWord.tqcontains(guess, false) > 0) { + if (m_goodWord.contains(guess, false) > 0) { TQPoint abspos = popup->pos(); if (Prefs::mode() == 0) { @@ -605,7 +605,7 @@ void KHangManView::game() TQTextStream readFileStr(&openFileStream); readFileStr.setEncoding(TQTextStream::UnicodeUTF8); - // Alldata tqcontains all the words from the file + // Alldata contains all the words from the file TQStringList allData = TQStringList::split("\n", readFileStr.read(), true); openFileStream.close(); @@ -633,11 +633,11 @@ void KHangManView::game() // 1. Find dashes. int f = m_word.find( "-" ); if (f>0) { - m_goodWord.tqreplace(2*f, 1, "-"); + m_goodWord.replace(2*f, 1, "-"); int g = m_word.find( "-", f+1); if (g>0) - m_goodWord.tqreplace(2*g, 3, "-"); + m_goodWord.replace(2*g, 3, "-"); if (g>1) m_goodWord.append("_"); } @@ -645,21 +645,21 @@ void KHangManView::game() // 2. Find white space. c = m_word.find( " " ); if (c > 0) { - m_goodWord.tqreplace(2*c, 1, " "); + m_goodWord.replace(2*c, 1, " "); dd = m_word.find( " ", c+1); if (dd > 0) - m_goodWord.tqreplace(2*dd, c+1, " "); + m_goodWord.replace(2*dd, c+1, " "); } // 3. Find · int e = m_word.find( TQString::fromUtf8("·") ); if (e>0) - m_goodWord.tqreplace(2*e, 1, TQString::fromUtf8("·") ); + m_goodWord.replace(2*e, 1, TQString::fromUtf8("·") ); // 4. Find ' int h = m_word.find( "'" ); if (h>0) - m_goodWord.tqreplace(2*h, 1, "'"); + m_goodWord.replace(2*h, 1, "'"); } @@ -693,7 +693,7 @@ void KHangManView::readFile() m_hintExists = false; // Hint does not exist. // FIXME: Make this a signal instead. - khangman->changetqStatusbar("", 103); + khangman->changeStatusbar("", 103); } else { m_hintExists = true; diff --git a/khangman/khangman/khangmanview.h b/khangman/khangman/khangmanview.h index e20dcf29..7ffffcf2 100644 --- a/khangman/khangman/khangmanview.h +++ b/khangman/khangman/khangmanview.h @@ -115,10 +115,10 @@ private: /// Set the background pixmap to the TQPixmap argument. void setBackground(TQPixmap& ); - /// Return true if the word tqcontains the char in the TQString. - bool tqcontainsChar(const TQString &); + /// Return true if the word contains the char in the TQString. + bool containsChar(const TQString &); - void tqreplaceLetters(const TQString &); + void replaceLetters(const TQString &); public slots: /// If you want to play with a new word @@ -173,7 +173,7 @@ private: bool m_hintExists; TQString m_hint; - /// true if the language tqcontains accented letters. + /// true if the language contains accented letters. /// This is true for, among others, es, ca, pt or pt_BR bool m_accentedLetters; diff --git a/khangman/khangman/normal.ui b/khangman/khangman/normal.ui index efdb6bad..f9673223 100644 --- a/khangman/khangman/normal.ui +++ b/khangman/khangman/normal.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>normal</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -35,7 +35,7 @@ <string>Check this if you do not want to display each instance of the same letter</string> </property> <property name="whatsThis" stdset="0"> - <string>If you check this box, only the first letter will be written if the letter is found in several places in the word. Then when you rechoose this letter, it will tqreplace the second instance in the word until there are no more instances of this letter. + <string>If you check this box, only the first letter will be written if the letter is found in several places in the word. Then when you rechoose this letter, it will replace the second instance in the word until there are no more instances of this letter. For example, the word to guess is "potato". If this option is unchecked, when you try "o", the 2 "o" in the word will be discovered at the same time. If this is checked, you will need to try "o" twice. Default is that for one letter typed, all instances of that letter in the word are displayed.</string> @@ -90,5 +90,5 @@ Default is no sound.</string> </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/khangman/khangman/timerdlg.ui b/khangman/khangman/timerdlg.ui index efe6f570..facfaaa1 100644 --- a/khangman/khangman/timerdlg.ui +++ b/khangman/khangman/timerdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>timerdlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -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> @@ -221,7 +221,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc index 1413d56a..3cadf522 100644 --- a/kig/filters/cabri-filter.cc +++ b/kig/filters/cabri-filter.cc @@ -548,7 +548,7 @@ KigDocument* KigFilterCabri::load( const TQString& file ) } else { - notSupported( file, i18n( "This Cabri file tqcontains a \"%1\" object, " + notSupported( file, i18n( "This Cabri file contains a \"%1\" object, " "which Kig does not currently support." ).arg( obj.type ) ); return 0; } diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui index c842721f..829d84cc 100644 --- a/kig/filters/drgeo-filter-chooserbase.ui +++ b/kig/filters/drgeo-filter-chooserbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KigFilterDrgeoChooserBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -30,10 +30,10 @@ <cstring>ExplanationTextLabel</cstring> </property> <property name="text"> - <string>The current Dr. Geo file tqcontains more than one figure. + <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> @@ -131,7 +131,7 @@ Please select which to import:</string> </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc index d43c4729..82438a57 100644 --- a/kig/filters/drgeo-filter.cc +++ b/kig/filters/drgeo-filter.cc @@ -105,7 +105,7 @@ 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 tqcontains no " + warning( i18n( "The Dr. Geo file \"%1\" is a macro file so it contains no " "figures." ).arg( file ) ); else warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).arg( file ) ); @@ -332,7 +332,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else { // oc = fact->constrainedPointCalcer( parents[0], value ); - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -369,7 +369,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co type = ArcLineIntersectionType::instance(); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains an intersection type, " + notSupported( file, i18n( "This Dr. Geo file contains an intersection type, " "which Kig does not currently support." ) ); return false; } @@ -386,7 +386,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co oc = new ObjectTypeCalcer( RotationType::instance(), parents ); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -418,7 +418,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co type = CircleBCPType::instance(); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -431,7 +431,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co type = ArcBTPType::instance(); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -452,7 +452,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -468,7 +468,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -489,7 +489,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co oc = new ObjectTypeCalcer( RotationType::instance(), parents ); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -617,7 +617,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -635,7 +635,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co } else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -676,7 +676,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co oc = fact->labelCalcer( text, Coordinate( x, y ), false, std::vector<ObjectCalcer*>(), *ret ); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -688,7 +688,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co oc = fact->locusCalcer( parents[0], parents[1] ); else { - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -708,7 +708,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co #ifdef DRGEO_DEBUG kdDebug() << ">>>>>>>>> UNKNOWN OBJECT" << endl; #endif - notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, " + notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, " "which Kig does not currently support." ).arg( domelem.tagName() ).arg( domelem.attribute( "type" ) ) ); return false; @@ -747,8 +747,8 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co TQString ps = domelem.attribute( "style" ); int pointstyle = ObjectDrawer::pointStyleFromString( ps ); // show this object? - bool show = ( ( domelem.attribute( "tqmasked" ) != "True" ) && - ( domelem.attribute( "tqmasked" ) != "Alway" ) ); + bool show = ( ( domelem.attribute( "masked" ) != "True" ) && + ( domelem.attribute( "masked" ) != "Alway" ) ); // costructing the ObjectDrawer* ObjectDrawer* d = new ObjectDrawer( co, w, show, s, pointstyle ); // reading object name @@ -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 = Qt::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/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/imageexporteroptionsbase.ui b/kig/filters/imageexporteroptionsbase.ui index ec126c96..03145dec 100644 --- a/kig/filters/imageexporteroptionsbase.ui +++ b/kig/filters/imageexporteroptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ImageExporterOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -144,7 +144,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc index 1ce9a27e..02c1efde 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 ); @@ -310,7 +310,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c } case ID_slope: { - // if parents tqcontains a segment, line, vector or whatever, we + // if parents contains a segment, line, vector or whatever, we // take its parents cause we want points.. if ( parents.size() == 1 ) parents = parents[0]->parents(); if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR; diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h index 0eb8d462..f8accd91 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 kdeedu. Kig is + * which was an interactive geometry program in kdeedu. 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/kgeo-resource.h b/kig/filters/kgeo-resource.h index ce149605..f7af0f64 100644 --- a/kig/filters/kgeo-resource.h +++ b/kig/filters/kgeo-resource.h @@ -51,7 +51,7 @@ #include <klocale.h> /////////////////////////////////////////////////////////////////// -// resource.h -- tqcontains macros used for commands +// resource.h -- contains macros used for commands /////////////////////////////////////////////////////////////////// diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc index 5ad746b7..fb96c25c 100644 --- a/kig/filters/kseg-filter.cc +++ b/kig/filters/kseg-filter.cc @@ -67,7 +67,7 @@ bool KigFilterKSeg::supportMime( const TQString& mime ) struct drawstyle { - TQ_INT8 pointstyle; + Q_INT8 pointstyle; TQFont font; TQPen pen; TQBrush brush; @@ -556,19 +556,19 @@ KigDocument* KigFilterKSeg::load( const TQString& file ) }; case G_CIRCLEINTERIOR: { - notSupported( file, i18n( "This KSeg file tqcontains a filled circle, " + notSupported( file, i18n( "This KSeg file contains a filled circle, " "which Kig does not currently support." ) ); return false; }; case G_ARCSECTOR: { - notSupported( file, i18n( "This KSeg file tqcontains an arc sector, " + notSupported( file, i18n( "This KSeg file contains an arc sector, " "which Kig does not currently support." ) ); return false; }; case G_ARCSEGMENT: { - notSupported( file, i18n( "This KSeg file tqcontains an arc segment, " + notSupported( file, i18n( "This KSeg file contains an arc segment, " "which Kig does not currently support." ) ); return false; }; @@ -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 ce713771..98d3fc2e 100644 --- a/kig/filters/latexexporter.cc +++ b/kig/filters/latexexporter.cc @@ -194,7 +194,7 @@ void LatexExportImpVisitor::mapColor( TQColor color ) ColorMap newcolor; newcolor.color = color; TQString tmpname = color.name(); - tmpname.tqreplace( "#", "" ); + tmpname.replace( "#", "" ); newcolor.name = tmpname; mcolors.push_back( newcolor ); mstream << "\\newrgbcolor{" << tmpname << "}{" diff --git a/kig/filters/latexexporteroptions.ui b/kig/filters/latexexporteroptions.ui index e60614cd..d2e60c5b 100644 --- a/kig/filters/latexexporteroptions.ui +++ b/kig/filters/latexexporteroptions.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>LatexExporterOptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -63,7 +63,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> </includehints> </UI> diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc index 2466d536..a5378263 100644 --- a/kig/filters/native-filter.cc +++ b/kig/filters/native-filter.cc @@ -140,7 +140,7 @@ KigDocument* KigFilterNative::load( const TQString& file ) TQStringList kigfiles = entries.grep( TQRegExp( "\\.kig$" ) ); if ( kigfiles.count() != 1 ) // I throw a generic parse error here, but I should warn the user that - // this kig archive file doesn't contain one kig file (it tqcontains no + // this kig archive file doesn't contain one kig file (it contains no // kig files or more than one). KIG_FILTER_PARSE_ERROR; const KArchiveEntry* kigz = dir->entry( kigfiles[0] ); @@ -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() ); diff --git a/kig/filters/svgexporteroptions.ui b/kig/filters/svgexporteroptions.ui index 7b346459..2de679cb 100644 --- a/kig/filters/svgexporteroptions.ui +++ b/kig/filters/svgexporteroptions.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SVGExporterOptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -55,7 +55,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> </includehints> </UI> diff --git a/kig/kfile/Makefile.am b/kig/kfile/Makefile.am index 2ca05840..b8de2d3d 100644 --- a/kig/kfile/Makefile.am +++ b/kig/kfile/Makefile.am @@ -10,11 +10,11 @@ kde_module_LTLIBRARIES = \ kfile_drgeo_la_SOURCES = kfile_drgeo.cpp kfile_drgeo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kfile_drgeo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) +kfile_drgeo_la_LIBADD = $(LIB_KIO) kfile_kig_la_SOURCES = kfile_kig.cpp kfile_kig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -kfile_kig_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) +kfile_kig_la_LIBADD = $(LIB_KIO) METASOURCES = AUTO diff --git a/kig/kfile/kfile_drgeo.cpp b/kig/kfile/kfile_drgeo.cpp index 3bd809db..b921131b 100644 --- a/kig/kfile/kfile_drgeo.cpp +++ b/kig/kfile/kfile_drgeo.cpp @@ -41,7 +41,7 @@ DrgeoPlugin::DrgeoPlugin( TQObject *parent, const char *name, const TQStringList item = addItemInfo( group, "NumOfMacros", i18n( "Macros" ), TQVariant::Int ); group_contents = addGroupInfo( info, "DrgeoContents", i18n( "Translators: what this drgeo " - "file tqcontains", "Contents" ) ); + "file contains", "Contents" ) ); } bool DrgeoPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ ) diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp index d54fe44e..ed954d26 100644 --- a/kig/kig/kig.cpp +++ b/kig/kig/kig.cpp @@ -111,7 +111,7 @@ void Kig::setupActions() #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showtqStatusbar(this, TQT_SLOT(optionsShowtqStatusbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); #else createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); @@ -272,7 +272,7 @@ void Kig::fileOpen() if (!file_name.isEmpty()) openURL(file_name); } -// ifdef's disabled, cause Qt tqmoc doesn't handle ifdef's.. +// ifdef's disabled, cause Qt moc doesn't handle ifdef's.. // #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES void Kig::optionsShowToolbar() { @@ -286,7 +286,7 @@ void Kig::optionsShowToolbar() #endif } -void Kig::optionsShowtqStatusbar() +void Kig::optionsShowStatusbar() { #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES if (m_statusbarAction->isChecked()) diff --git a/kig/kig/kig.h b/kig/kig/kig.h index 3db8da16..51c236f2 100644 --- a/kig/kig/kig.h +++ b/kig/kig/kig.h @@ -114,10 +114,10 @@ class Kig : public KParts::MainWindow private slots: void fileNew(); void fileOpen(); - // Qt tqmoc doesn't handle ifdef's, so i'm disabling it.. + // Qt moc doesn't handle ifdef's, so i'm disabling it.. // #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES void optionsShowToolbar(); - void optionsShowtqStatusbar(); + void optionsShowStatusbar(); // #endif // #if KDE_IS_VERSION( 3, 2, 90 ) void optionsConfigureKeys(); diff --git a/kig/kig/kig_document.cc b/kig/kig/kig_document.cc index 04f1e7fa..884b41c5 100644 --- a/kig/kig/kig_document.cc +++ b/kig/kig/kig_document.cc @@ -69,7 +69,7 @@ std::vector<ObjectHolder*> KigDocument::whatAmIOn( const Coordinate& p, const Ki for ( std::set<ObjectHolder*>::const_iterator i = mobjects.begin(); i != mobjects.end(); ++i ) { - if(!(*i)->tqcontains(p, w, mnightvision)) continue; + if(!(*i)->contains(p, w, mnightvision)) continue; if ( (*i)->imp()->inherits( PointImp::stype() ) ) ret.push_back( *i ); else if ( !(*i)->imp()->inherits( PolygonImp::stype() ) ) curves.push_back( *i ); diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index 86aed687..1f891bb9 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -167,7 +167,7 @@ bool KigPrintDialogPage::isValid( TQString& ) return true; } -KigPart::KigPart( TQWidget *tqparentWidget, const char *, +KigPart::KigPart( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const TQStringList& ) : KParts::ReadWritePart( parent, name ), @@ -179,7 +179,7 @@ KigPart::KigPart( TQWidget *tqparentWidget, const char *, mMode = new NormalMode( *this ); // we need a widget, to actually show the document - m_widget = new KigView(this, false, tqparentWidget, "kig_view"); + m_widget = new KigView(this, false, parentWidget, "kig_view"); // notify the part that this is our internal widget setWidget( m_widget ); @@ -378,7 +378,7 @@ bool KigPart::openFile() // m_file is always local, so we can use findByPath instead of // findByURL... - KMimeType::Ptr mimeType = KMimeType::tqfindByPath ( m_file ); + KMimeType::Ptr mimeType = KMimeType::findByPath ( m_file ); kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl; KigFilter* filter = KigFilters::instance()->find( mimeType->name() ); if ( !filter ) @@ -429,7 +429,7 @@ bool KigPart::saveFile() { if ( m_file.isEmpty() || m_bTemp ) return internalSaveAs(); // mimetype: - KMimeType::Ptr mimeType = KMimeType::tqfindByPath ( m_file ); + KMimeType::Ptr mimeType = KMimeType::findByPath ( m_file ); if ( mimeType->name() != "application/x-kig" ) { // we don't support this mime type... @@ -930,7 +930,7 @@ extern "C" int convertToNative( const KURL& url, const TQCString& outfile ) return -1; }; - KMimeType::Ptr mimeType = KMimeType::tqfindByPath ( file ); + KMimeType::Ptr mimeType = KMimeType::findByPath ( file ); kdDebug() << k_funcinfo << "mimetype: " << mimeType->name() << endl; KigFilter* filter = KigFilters::instance()->find( mimeType->name() ); if ( !filter ) diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h index 99ffdb97..3245f38b 100644 --- a/kig/kig/kig_part.h +++ b/kig/kig/kig_part.h @@ -65,7 +65,7 @@ public: /** * Default constructor */ - KigPart( TQWidget* tqparentWidget, const char* widgetName, + KigPart( TQWidget* parentWidget, const char* widgetName, TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp index a6c6495c..fbf16517 100644 --- a/kig/kig/kig_view.cpp +++ b/kig/kig/kig_view.cpp @@ -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( 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(); @@ -324,7 +324,7 @@ void KigView::updateScrollBars() { // we update the scrollbars to reflect the new "total size" of the // document... The total size is calced in entireDocumentRect(). - // ( it is calced as a rect that tqcontains all the points in the + // ( it is calced as a rect that contains all the points in the // document, and then enlarged a bit, and scaled to match the screen // width/height ratio... // What we do here is tell the scroll bars what they should show as @@ -336,7 +336,7 @@ void KigView::updateScrollBars() Rect er = mrealwidget->entireDocumentRect(); Rect sr = mrealwidget->screenInfo().shownRect(); - // we define the total rect to be the smallest rect that tqcontains + // we define the total rect to be the smallest rect that contains // both er and sr... er |= sr; @@ -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 fcd914a5..a60e3ee5 100644 --- a/kig/kig/kig_view.h +++ b/kig/kig/kig_view.h @@ -61,7 +61,7 @@ class KigWidget : public QWidget 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 @@ -228,7 +228,7 @@ class KigView { Q_OBJECT - TQGridLayout* mtqlayout; + TQGridLayout* mlayout; TQScrollBar* mrightscroll; TQScrollBar* mbottomscroll; diff --git a/kig/misc/argsparser.h b/kig/misc/argsparser.h index 2712cf40..001d9359 100644 --- a/kig/misc/argsparser.h +++ b/kig/misc/argsparser.h @@ -29,7 +29,7 @@ class ObjectImpType; * parents to ObjectCalcer's, and to put them in the correct order. * An ObjectType should construct an ArgsParser with a specification * of the arguments it wants. This specification is given as an array - * of ArgsParser::spec structs. This struct tqcontains a pointer to an + * of ArgsParser::spec structs. This struct contains a pointer to an * ObjectImpType ( which is the type you want the argument to have ), * a string ( which is an I18N_NOOP'd string describing what you will * be using the argument for ) and a boolean ( which says whether the diff --git a/kig/misc/builtin_stuff.cc b/kig/misc/builtin_stuff.cc index f02d89d7..e162e7ac 100644 --- a/kig/misc/builtin_stuff.cc +++ b/kig/misc/builtin_stuff.cc @@ -508,15 +508,15 @@ void setupBuiltinStuff() c = new TestConstructor( ContainsTestType::instance(), I18N_NOOP( "Contains Test" ), - I18N_NOOP( "Test whether a given curve tqcontains a given point" ), - "testqcontains" ); + I18N_NOOP( "Test whether a given curve contains a given point" ), + "testcontains" ); ctors->add( c ); - actions->add( new ConstructibleAction( c, "objects_new_tqcontainstest" ) ); + actions->add( new ConstructibleAction( c, "objects_new_containstest" ) ); c = new TestConstructor( InPolygonTestType::instance(), I18N_NOOP( "In Polygon Test" ), - I18N_NOOP( "Test whether a given polygon tqcontains a given point" ), + I18N_NOOP( "Test whether a given polygon contains a given point" ), "test" ); ctors->add( c ); actions->add( new ConstructibleAction( c, "objects_new_inpolygontest" ) ); diff --git a/kig/misc/calcpaths.cc b/kig/misc/calcpaths.cc index b2190303..1532715b 100644 --- a/kig/misc/calcpaths.cc +++ b/kig/misc/calcpaths.cc @@ -33,7 +33,7 @@ // I previously misunderstood the semantics of this function // and thought that the os vector had to be completed with all // the subtree generated by it. On the contrary, the os vector -// tqcontains *all* the objects that we want, we only have to +// contains *all* the objects that we want, we only have to // reorder them. Now it *should* work, however we postpone // activating this to a more proper moment @@ -105,7 +105,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& os ) std::vector<ObjectCalcer*> all = os; // tmp is the var containing the objects we're iterating over. The // first time around this is the os variable, the next time, this - // tqcontains the variables we added in the first round... + // contains the variables we added in the first round... std::vector<ObjectCalcer*> tmp = os; // tmp2 is a temporary var. During a round, it receives all the // variables we add ( to "all" ) in that round, and at the end of @@ -283,7 +283,7 @@ std::set<ObjectCalcer*> getAllChildren( const std::vector<ObjectCalcer*> objs ) std::set<ObjectCalcer*> cur( objs.begin(), objs.end() ); while( !cur.empty() ) { - // tqcontains the objects to iterate over the next time around... + // contains the objects to iterate over the next time around... std::set<ObjectCalcer*> next; for( std::set<ObjectCalcer*>::iterator i = cur.begin(); i != cur.end(); ++i ) diff --git a/kig/misc/common.cpp b/kig/misc/common.cpp index bc6f53d9..b41b9284 100644 --- a/kig/misc/common.cpp +++ b/kig/misc/common.cpp @@ -416,13 +416,13 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, //mp: the following test didn't work for vertical segments; // fortunately the ieee floating point standard allows us to avoid // the test altogether, since it would produce an infinity value that -// makes the final r.tqcontains to fail +// makes the final r.contains to fail // in any case the corresponding test for a.y - b.y was missing. // if ( fabs( a.x - b.x ) <= 1e-7 ) // { // // too small to be useful.. -// return r.tqcontains( Coordinate( a.x, r.center().y ), miss ); +// return r.contains( Coordinate( a.x, r.center().y ), miss ); // } // in case we have a segment we need also to check for the case when @@ -433,7 +433,7 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, // - if the midpoint is in the rect than returning true is safe (also // in the cases where we have a ray or a line) - if ( r.tqcontains( 0.5*( a + b ), miss ) ) return true; + if ( r.contains( 0.5*( a + b ), miss ) ) return true; Coordinate dir = b - a; double m = dir.y / dir.x; @@ -453,12 +453,12 @@ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, // For each intersection, we now check if we contain the // intersection ( this might not be the case for a segment, when the // intersection is not between the begin and end point.. ) and if - // the rect tqcontains the intersection.. If it does, we have a winner.. + // the rect contains the intersection.. If it does, we have a winner.. return - ( imp->tqcontains( leftint, width, w ) && r.tqcontains( leftint, miss ) ) || - ( imp->tqcontains( rightint, width, w ) && r.tqcontains( rightint, miss ) ) || - ( imp->tqcontains( bottomint, width, w ) && r.tqcontains( bottomint, miss ) ) || - ( imp->tqcontains( topint, width, w ) && r.tqcontains( topint, miss ) ); + ( imp->contains( leftint, width, w ) && r.contains( leftint, miss ) ) || + ( imp->contains( rightint, width, w ) && r.contains( rightint, miss ) ) || + ( imp->contains( bottomint, width, w ) && r.contains( bottomint, miss ) ) || + ( imp->contains( topint, width, w ) && r.contains( topint, miss ) ); } bool operator==( const LineData& l, const LineData& r ) diff --git a/kig/misc/common.h b/kig/misc/common.h index a2b259c4..d1969df3 100644 --- a/kig/misc/common.h +++ b/kig/misc/common.h @@ -188,7 +188,7 @@ void calcBorderPoints( Coordinate& p1, Coordinate& p2, const Rect& r ); */ void calcBorderPoints( double& xa, double& xb, double& ya, double& yb, const Rect& r); /** - * cleaner overload, intended to tqreplace the above two... + * cleaner overload, intended to replace the above two... */ const LineData calcBorderPoints( const LineData& l, const Rect& r ); @@ -257,7 +257,7 @@ Coordinate calcCircleRadicalStartPoint( const Coordinate& ca, /** * Is the line, segment, ray or vector inside r ? We need the imp to * distinguish between rays, lines, segments or whatever.. ( we use - * their tqcontains functions actually.. ) + * their contains functions actually.. ) */ bool lineInRect( const Rect& r, const Coordinate& a, const Coordinate& b, const int width, const ObjectImp* imp, const KigWidget& w ); diff --git a/kig/misc/coordinate.cpp b/kig/misc/coordinate.cpp index e34f69db..f2c272f2 100644 --- a/kig/misc/coordinate.cpp +++ b/kig/misc/coordinate.cpp @@ -159,7 +159,7 @@ const Coordinate Coordinate::normalize( double l ) const const Coordinate Coordinate::round() const { - return Coordinate( tqRound( x ), tqRound( y ) ); + return Coordinate( qRound( x ), qRound( y ) ); } TQPoint Coordinate::toQPoint() const diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp index 9b5ebd3a..859ed81d 100644 --- a/kig/misc/coordinate_system.cpp +++ b/kig/misc/coordinate_system.cpp @@ -101,7 +101,7 @@ TQValidator::State CoordinateValidator::validate( TQString & input, int & pos ) void CoordinateValidator::fixup( TQString & input ) const { - int nsc = input.tqcontains( ';' ); + int nsc = input.contains( ';' ); if ( nsc > 1 ) { // where is the second ';' @@ -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 )" ).arg( xs ).arg( 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° )").arg( rs ).arg( ts ); + return TQString::fromLatin1("( %1; %2° )").arg( rs ).arg( ts ); } TQString PolarCoords::coordinateFormatNotice() const @@ -608,8 +608,8 @@ Coordinate EuclideanCoords::snapToGrid( const Coordinate& c, const double hgraphmin = ceil( hmin / hd) * hd; const double vgraphmin = ceil( vmin / vd ) * vd; - const double nx = tqRound( ( c.x - hgraphmin ) / hd ) * hd + hgraphmin; - const double ny = tqRound( ( c.y - vgraphmin ) / vd ) * vd + vgraphmin; + const double nx = qRound( ( c.x - hgraphmin ) / hd ) * hd + hgraphmin; + const double ny = qRound( ( c.y - vgraphmin ) / vd ) * vd + vgraphmin; return Coordinate( nx, ny ); } @@ -643,7 +643,7 @@ Coordinate PolarCoords::snapToGrid( const Coordinate& c, double d = kigMin( hd, vd ); double dist = c.length(); - double ndist = tqRound( dist / d ) * d; + double ndist = qRound( dist / d ) * d; return c.normalize( ndist ); } diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc index 55d908bd..c9435d2b 100644 --- a/kig/misc/guiaction.cc +++ b/kig/misc/guiaction.cc @@ -93,7 +93,7 @@ KigGUIAction::KigGUIAction( GUIAction* act, { setWhatsThis( act->description() ); TQString tooltip = act->descriptiveName(); - tooltip.tqreplace( TQRegExp( "&&" ), "&" ); + tooltip.replace( TQRegExp( "&&" ), "&" ); setToolTip( tooltip ); } @@ -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/kiginputdialog.cc b/kig/misc/kiginputdialog.cc index 9f070813..ea0aeb66 100644 --- a/kig/misc/kiginputdialog.cc +++ b/kig/misc/kiginputdialog.cc @@ -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( NoFocus ); -// d->m_textEdit->tqsetAlignment( d->m_textEdit->tqalignment() | Qt::WordBreak ); +// d->m_textEdit->setAlignment( d->m_textEdit->alignment() | Qt::WordBreak ); d->m_textEdit->setFrameStyle( TQFrame::NoFrame ); mainlay->addWidget( d->m_textEdit ); diff --git a/kig/misc/kignumerics.cpp b/kig/misc/kignumerics.cpp index 6ff414c6..4711d058 100644 --- a/kig/misc/kignumerics.cpp +++ b/kig/misc/kignumerics.cpp @@ -331,7 +331,7 @@ bool GaussianElimination( double *matrix[], int numrows, /* * solve an undetermined homogeneous triangular system. the matrix is nonzero * on its diagonal. The last unknown(s) are chosen to be 1. The - * vector "exchange" tqcontains exchanges to be performed on the + * vector "exchange" contains exchanges to be performed on the * final solution components. */ diff --git a/kig/misc/kigpainter.cpp b/kig/misc/kigpainter.cpp index 57a1df06..98594ecb 100644 --- a/kig/misc/kigpainter.cpp +++ b/kig/misc/kigpainter.cpp @@ -374,7 +374,7 @@ void KigPainter::circleOverlayRecurse( const Coordinate& centre, // too near to the centre if (distmaxsq < radiussq) return; - // the rect tqcontains some of the circle + // the rect contains some of the circle // -> if it's small enough, we keep it if( currentRect.width() < overlayRectSize() ) { mOverlay.push_back( toScreenEnlarge( currentRect) ); @@ -735,10 +735,10 @@ void KigPainter::drawCurve( const CurveImp* curve ) TQPen pen = mP.pen(); - // this stack tqcontains pairs of Coordinates ( parameter intervals ) + // this stack contains pairs of Coordinates ( parameter intervals ) // that we still need to process: std::stack<workitem> workstack; - // mp: this stack tqcontains all the generated overlays: + // mp: this stack contains all the generated overlays: // the strategy for generating the overlay structure is the same // recursive-like used to draw the segments: a new rectangle is // generated whenever the length of a segment becomes lower than @@ -758,7 +758,7 @@ void KigPainter::drawCurve( const CurveImp* curve ) std::stack<Rect> overlaystack; // mp: the original version in which an initial set of 20 intervals - // were pushed onto the stack is tqreplaced by a single interval and + // were pushed onto the stack is replaced by a single interval and // by forcing subdivision till h < hmax (with more or less the same // final result). // First push the [0,1] interval into the stack: @@ -835,7 +835,7 @@ void KigPainter::drawCurve( const CurveImp* curve ) bool dooverlay = ! overlaypt && h < hmaxoverlay && valid0 && valid1 && fabs( p0.x - p1.x ) <= overlayRectSize() && fabs( p0.y - p1.y ) <= overlayRectSize(); - bool addn = sr.tqcontains( p2 ) || h >= hmax; + bool addn = sr.contains( p2 ) || h >= hmax; // estimated error between the curve and the segments double errsq = 1e21; if ( allvalid ) errsq = (0.5*p0 + 0.5*p1 - p2).squareLength(); @@ -870,10 +870,10 @@ void KigPainter::drawCurve( const CurveImp* curve ) else if ( h >= hmin ) // we do not continue to subdivide indefinitely! { // push into stack in order to process both subintervals - if ( addn || ( valid0 && sr.tqcontains( p0 ) ) ) + if ( addn || ( valid0 && sr.contains( p0 ) ) ) workstack.push( workitem( curitem.first, coordparampair( t2, p2 ), overlaypt ) ); - if ( addn || ( valid1 && sr.tqcontains( p1 ) ) ) + if ( addn || ( valid1 && sr.contains( p1 ) ) ) { curitem = workitem( coordparampair( t2, p2 ), curitem.second , overlaypt ); diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc index b7e89456..c2365aaa 100644 --- a/kig/misc/object_hierarchy.cc +++ b/kig/misc/object_hierarchy.cc @@ -44,14 +44,14 @@ public: virtual void apply( std::vector<ObjectCalcer*>& stack, int loc ) const = 0; // this function is used to check whether the final objects depend - // on the given objects. The dependsstack tqcontains a set of + // on the given objects. The dependsstack contains a set of // booleans telling which parts of the hierarchy certainly depend on // the given objects. In this function, the node should check // whether any of its parents have true set, and if so, set its own // value to true. virtual void checkDependsOnGiven( std::vector<bool>& dependsstack, int loc ) const = 0; // this function is used to check whether the given objects are all - // used by one or more of the final objects. The usedstack tqcontains + // used by one or more of the final objects. The usedstack contains // a set of booleans telling which parts of the hierarchy are // certainly ancestors of the final objects. In this function, the // node should set all of its parents' booleans to true. @@ -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; @@ -696,7 +696,7 @@ const ObjectImpType* lowermost( const ObjectImpType* a, const ObjectImpType* b ) // this function is part of the visit procedure really. It is // factored out, because it recurses for cache ObjectImp's. What this // does is, it makes sure that object o is calcable, by putting -// appropriate Node's in mnodes.. po is o->parents() and pl tqcontains +// appropriate Node's in mnodes.. po is o->parents() and pl contains // the location of objects that are already in mnodes and -1 // otherwise.. -1 means we have to store their ObjectImp, unless // they're cache ObjectImp's etc. diff --git a/kig/misc/rect.cc b/kig/misc/rect.cc index c3f56d1e..183f50f8 100644 --- a/kig/misc/rect.cc +++ b/kig/misc/rect.cc @@ -211,7 +211,7 @@ double Rect::height() const return mheight; } -bool Rect::tqcontains( const Coordinate& p, double allowed_miss ) const +bool Rect::contains( const Coordinate& p, double allowed_miss ) const { return p.x - left() >= - allowed_miss && p.y - bottom() >= - allowed_miss && @@ -219,7 +219,7 @@ bool Rect::tqcontains( const Coordinate& p, double allowed_miss ) const p.y - bottom() - height() <= allowed_miss; } -bool Rect::tqcontains( const Coordinate& p ) const +bool Rect::contains( const Coordinate& p ) const { return p.x >= left() && p.y >= bottom() && diff --git a/kig/misc/rect.h b/kig/misc/rect.h index 24edebdd..1fe0b071 100644 --- a/kig/misc/rect.h +++ b/kig/misc/rect.h @@ -28,8 +28,8 @@ #include <kdebug.h> /** - * like Coordinate is a TQPoint tqreplacement with doubles, this is a - * TQRect tqreplacement with doubles... + * like Coordinate is a TQPoint replacement with doubles, this is a + * TQRect replacement with doubles... */ class Rect { @@ -85,7 +85,7 @@ public: Rect& operator/=( const double r ) { scale(1/r); return *this; } /** - * This expands the rect so that it tqcontains r. It has friends + * This expands the rect so that it contains r. It has friends * '|=' and '|' below... */ void eat( const Rect& r ); @@ -115,8 +115,8 @@ public: double top() const; double width() const; double height() const; - bool tqcontains( const Coordinate& p ) const; - bool tqcontains( const Coordinate& p, double allowed_miss ) const; + bool contains( const Coordinate& p ) const; + bool contains( const Coordinate& p, double allowed_miss ) const; bool intersects( const Rect& p ) const; Rect normalized() const; friend kdbgstream& operator<<( kdbgstream& s, const Rect& t ); @@ -131,7 +131,7 @@ protected: bool operator==( const Rect& r, const Rect& s ); kdbgstream& operator<<( kdbgstream& s, const Rect& t ); /** - * this operator returns a Rect that tqcontains both the given + * this operator returns a Rect that contains both the given * rects.. */ Rect operator|( const Rect& lhs, const Rect& rhs ); diff --git a/kig/modes/base_mode.cc b/kig/modes/base_mode.cc index 86de684d..d968566b 100644 --- a/kig/modes/base_mode.cc +++ b/kig/modes/base_mode.cc @@ -46,9 +46,9 @@ void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) v->updateWidget(); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( v->fromScreen( mplc ), *v ); + moco = mdoc.document().whatAmIOn( v->fromScreen( mplc ), *v ); - if( tqmoco.empty() ) + if( moco.empty() ) { // clicked on an empty spot --> we show the rectangle for // selecting stuff... @@ -66,8 +66,8 @@ void BaseMode::leftClicked( TQMouseEvent* e, KigWidget* v ) void BaseMode::leftMouseMoved( TQMouseEvent* e, KigWidget* w ) { - if( !tqmoco.empty() && ( mplc - e->pos() ).manhattanLength() > 3 ) - dragObject( tqmoco, mplc, *w, + if( !moco.empty() && ( mplc - e->pos() ).manhattanLength() > 3 ) + dragObject( moco, mplc, *w, ( e->state() & (ShiftButton | ControlButton ) ) != 0 ); } @@ -79,16 +79,16 @@ void BaseMode::leftReleased( TQMouseEvent* e, KigWidget* v ) ObjectHolder* o = 0; bool keyCtrl = ( e->state() & ControlButton ) != 0; bool keyShift = ( e->state() & ShiftButton ) != 0; - if ( ! tqmoco.empty() ) + if ( ! moco.empty() ) { if ( keyShift ) { - int id = ObjectChooserPopup::getObjectFromList( e->pos(), v, tqmoco ); + int id = ObjectChooserPopup::getObjectFromList( e->pos(), v, moco ); if ( id >= 0 ) - o = tqmoco[id]; + o = moco[id]; } else - o = tqmoco.front(); + o = moco.front(); } leftClickedObject( o, e->pos(), *v, keyCtrl ); } @@ -100,7 +100,7 @@ void BaseMode::midClicked( TQMouseEvent* e, KigWidget* v ) v->updateWidget(); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( v->fromScreen( e->pos() ), *v ); + moco = mdoc.document().whatAmIOn( v->fromScreen( e->pos() ), *v ); } void BaseMode::midReleased( TQMouseEvent* e, KigWidget* v ) @@ -119,9 +119,9 @@ void BaseMode::rightClicked( TQMouseEvent* e, KigWidget* w ) w->setCursor( KCursor::arrowCursor() ); mplc = e->pos(); - tqmoco = mdoc.document().whatAmIOn( w->fromScreen( mplc ), *w ); + moco = mdoc.document().whatAmIOn( w->fromScreen( mplc ), *w ); - rightClicked( tqmoco, mplc, *w ); + rightClicked( moco, mplc, *w ); } void BaseMode::mouseMoved( TQMouseEvent* e, KigWidget* w ) @@ -151,7 +151,7 @@ void BaseMode::enableActions() std::vector<ObjectHolder*> BaseMode::oco() { - return tqmoco; + return moco; } TQPoint BaseMode::pointLocation() diff --git a/kig/modes/base_mode.h b/kig/modes/base_mode.h index 044b8b65..cb029abf 100644 --- a/kig/modes/base_mode.h +++ b/kig/modes/base_mode.h @@ -31,7 +31,7 @@ class BaseMode : public KigMode { TQPoint mplc; - std::vector<ObjectHolder*> tqmoco; + std::vector<ObjectHolder*> moco; void leftClicked( TQMouseEvent* e, KigWidget* v ); void leftMouseMoved( TQMouseEvent*, KigWidget* ); diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc index 71488c12..b535ee5c 100644 --- a/kig/modes/construct_mode.cc +++ b/kig/modes/construct_mode.cc @@ -69,15 +69,15 @@ void BaseConstructMode::leftReleased( TQMouseEvent* e, KigWidget* v ) ObjectHolder* o = 0; bool keyCtrlOrShift = ( e->state() & ( ControlButton | ShiftButton) ) != 0; - std::vector<ObjectHolder*> tqmoco = oco(); - if ( ! tqmoco.empty() ) + std::vector<ObjectHolder*> moco = oco(); + if ( ! moco.empty() ) { std::vector<ObjectHolder*> goodargs; - if ( !tqmoco.empty() ) + if ( !moco.empty() ) { std::vector<ObjectHolder*>::const_iterator it; std::vector<ObjectCalcer*> testargs = getCalcers( mparents ); - for ( std::vector<ObjectHolder*>::const_iterator i = tqmoco.begin(); i != tqmoco.end(); ++i ) + for ( std::vector<ObjectHolder*>::const_iterator i = moco.begin(); i != moco.end(); ++i ) { it = std::find( mparents.begin(), mparents.end(), *i ); bool newdup = @@ -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 5e85bfca..0dc8129d 100644 --- a/kig/modes/edittypebase.ui +++ b/kig/modes/edittypebase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>EditTypeBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -43,7 +43,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -51,7 +51,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -125,7 +125,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -275,7 +275,7 @@ <slot>okSlot()</slot> <slot>cancelSlot()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kig/modes/label.cc b/kig/modes/label.cc index 1bbc4ca9..578e15dd 100644 --- a/kig/modes/label.cc +++ b/kig/modes/label.cc @@ -391,7 +391,7 @@ void TextLabelModeBase::updateLinksLabel() d->wiz->myCustomWidget1->addText( s.mid( prevpos ), buf ); d->wiz->myCustomWidget1->applyEdit( buf ); - d->wiz->retqlayoutArgsPage(); + d->wiz->relayoutArgsPage(); d->wiz->resize( d->wiz->size() ); } diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp index eba5409c..96a73a8f 100644 --- a/kig/modes/linkslabel.cpp +++ b/kig/modes/linkslabel.cpp @@ -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 40d1dacb..d3929ad8 100644 --- a/kig/modes/macrowizardbase.ui +++ b/kig/modes/macrowizardbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MacroWizardBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>4</x> <y>0</y> @@ -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> @@ -180,7 +180,7 @@ </vbox> </widget> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc index 92d933ba..489b4985 100644 --- a/kig/modes/popup.cc +++ b/kig/modes/popup.cc @@ -198,7 +198,7 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, else if ( single ) { if ( !objs[0]->name().isNull() ) - title = TQString::tqfromLatin1( "%1 %2" ).arg( objs[0]->imp()->type()->translatedName() ).arg( 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(); } @@ -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" ).arg( mobjs[i]->imp()->type()->translatedName() ).arg( 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 2f7a10ab..d562bbf3 100644 --- a/kig/modes/textlabelwizard.cc +++ b/kig/modes/textlabelwizard.cc @@ -81,15 +81,15 @@ void TextLabelWizard::linkClicked( int which ) mmode->linkClicked( which ); } -void TextLabelWizard::retqlayoutArgsPage() +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/textlabelwizard.h b/kig/modes/textlabelwizard.h index 357e83e0..bd51c1e0 100644 --- a/kig/modes/textlabelwizard.h +++ b/kig/modes/textlabelwizard.h @@ -34,7 +34,7 @@ public: void reject(); void accept(); - void retqlayoutArgsPage(); + void relayoutArgsPage(); private slots: void textChanged(); void linkClicked( int which ); diff --git a/kig/modes/textlabelwizardbase.ui b/kig/modes/textlabelwizardbase.ui index 4676ecac..4e195b0d 100644 --- a/kig/modes/textlabelwizardbase.ui +++ b/kig/modes/textlabelwizardbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TextLabelWizardBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -106,7 +106,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac <data format="XPM.GZ" length="4462">789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>linkslabel.h</includehint> </includehints> diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp index 92755113..e14ceee8 100644 --- a/kig/modes/typesdialog.cpp +++ b/kig/modes/typesdialog.cpp @@ -106,8 +106,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() diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui index cab548a4..7cc7effb 100644 --- a/kig/modes/typesdialogbase.ui +++ b/kig/modes/typesdialogbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TypesDialogBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -30,7 +30,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -90,7 +90,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -98,7 +98,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -323,7 +323,7 @@ <slot access="protected">contextMenuRequested( QListViewItem* i, const QPoint& p, int c )</slot> <slot>cancelSlot()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cc index 8cedc89f..b7b8f41e 100644 --- a/kig/objects/bogus_imp.cc +++ b/kig/objects/bogus_imp.cc @@ -32,7 +32,7 @@ void BogusImp::draw( KigPainter& ) const { } -bool BogusImp::tqcontains( const Coordinate&, int, const KigWidget& ) const +bool BogusImp::contains( const Coordinate&, int, const KigWidget& ) const { return false; } diff --git a/kig/objects/bogus_imp.h b/kig/objects/bogus_imp.h index 3ab32809..c8f3ee2b 100644 --- a/kig/objects/bogus_imp.h +++ b/kig/objects/bogus_imp.h @@ -46,7 +46,7 @@ public: Coordinate attachPoint( ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& w ) const; + bool contains( const Coordinate& p, int width, const KigWidget& w ) const; bool inRect( const Rect& r, int width, const KigWidget& w ) const; Rect surroundingRect() const; diff --git a/kig/objects/centerofcurvature_type.cc b/kig/objects/centerofcurvature_type.cc index 628ed571..8111410f 100644 --- a/kig/objects/centerofcurvature_type.cc +++ b/kig/objects/centerofcurvature_type.cc @@ -66,7 +66,7 @@ ObjectImp* CocConicType::calc( const Args& args, const KigDocument& doc ) const const ConicImp* conic = static_cast<const ConicImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !conic->tqcontainsPoint( p, doc ) ) + if ( !conic->containsPoint( p, doc ) ) return new InvalidImp; double x = p.x; @@ -152,7 +152,7 @@ ObjectImp* CocCubicType::calc( const Args& args, const KigDocument& doc ) const const CubicImp* cubic = static_cast<const CubicImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !cubic->tqcontainsPoint( p, doc ) ) + if ( !cubic->containsPoint( p, doc ) ) return new InvalidImp; double x = p.x; @@ -234,7 +234,7 @@ ObjectImp* CocCurveType::calc( const Args& args, const KigDocument& doc ) const const CurveImp* curve = static_cast<const CurveImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !curve->tqcontainsPoint( p, doc ) ) + if ( !curve->containsPoint( p, doc ) ) return new InvalidImp; diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc index 86e6f978..38522c22 100644 --- a/kig/objects/circle_imp.cc +++ b/kig/objects/circle_imp.cc @@ -63,19 +63,19 @@ void CircleImp::draw( KigPainter& p ) const p.drawCircle( mcenter, mradius ); } -bool CircleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool CircleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return fabs((mcenter - p).length() - mradius) <= w.screenInfo().normalMiss( width ); } bool CircleImp::inRect( const Rect& r, int width, const KigWidget& w ) const { - // first we check if the rect tqcontains at least one of the + // first we check if the rect contains at least one of the // north/south/east/west points of the circle - if ( r.tqcontains( mcenter + Coordinate( 0, -mradius ) ) ) return true; - if ( r.tqcontains( mcenter + Coordinate( mradius, 0 ) ) ) return true; - if ( r.tqcontains( mcenter + Coordinate( 0, mradius ) ) ) return true; - if ( r.tqcontains( mcenter + Coordinate( -mradius, 0 ) ) ) return true; + if ( r.contains( mcenter + Coordinate( 0, -mradius ) ) ) return true; + if ( r.contains( mcenter + Coordinate( mradius, 0 ) ) ) return true; + if ( r.contains( mcenter + Coordinate( 0, mradius ) ) ) return true; + if ( r.contains( mcenter + Coordinate( -mradius, 0 ) ) ) return true; // we allow a miss of some pixels .. double miss = w.screenInfo().normalMiss( width ); diff --git a/kig/objects/circle_imp.h b/kig/objects/circle_imp.h index 98fa391d..1ccede6a 100644 --- a/kig/objects/circle_imp.h +++ b/kig/objects/circle_imp.h @@ -46,7 +46,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cc index c06f05f8..81331522 100644 --- a/kig/objects/conic_imp.cc +++ b/kig/objects/conic_imp.cc @@ -47,7 +47,7 @@ bool ConicImp::valid() const return true; } -bool ConicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const +bool ConicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -332,7 +332,7 @@ const ObjectImpType* ConicImp::type() const return ConicImp::stype(); } -bool ConicImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool ConicImp::containsPoint( const Coordinate& p, const KigDocument& ) const { const ConicPolarData d = polarData(); diff --git a/kig/objects/conic_imp.h b/kig/objects/conic_imp.h index 3562422f..29068a7b 100644 --- a/kig/objects/conic_imp.h +++ b/kig/objects/conic_imp.h @@ -51,7 +51,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; @@ -116,7 +116,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc index f5a86ef8..3879c5d9 100644 --- a/kig/objects/cubic_imp.cc +++ b/kig/objects/cubic_imp.cc @@ -50,7 +50,7 @@ void CubicImp::draw( KigPainter& p ) const p.drawCurve( this ); } -bool CubicImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const +bool CubicImp::contains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -363,7 +363,7 @@ const ObjectImpType* CubicImp::stype() return &t; } -bool CubicImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool CubicImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -431,7 +431,7 @@ TQString CubicImp::cartesianEquationString( const KigDocument& ) const ret = ret.arg( mdata.coeffs[0], 0, 'g', 3 ); // we should find a common place to do this... - ret.tqreplace( "+ -", "- " ); - ret.tqreplace( "+-", "-" ); + ret.replace( "+ -", "- " ); + ret.replace( "+-", "-" ); return ret; } diff --git a/kig/objects/cubic_imp.h b/kig/objects/cubic_imp.h index ab7434a2..5e9e6a2c 100644 --- a/kig/objects/cubic_imp.h +++ b/kig/objects/cubic_imp.h @@ -40,7 +40,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; TQString cartesianEquationString( const KigDocument& ) const; @@ -74,7 +74,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/curve_imp.h b/kig/objects/curve_imp.h index a0b130cc..3a33a722 100644 --- a/kig/objects/curve_imp.h +++ b/kig/objects/curve_imp.h @@ -51,12 +51,12 @@ public: virtual CurveImp* copy() const = 0; /** - * Return whether this Curve tqcontains the given point. This is + * Return whether this Curve contains the given point. This is * implemented as a numerical approximation. Implementations * can/should use the value test_threshold in common.h as a * threshold value. */ - virtual bool tqcontainsPoint( const Coordinate& p, const KigDocument& ) const = 0; + virtual bool containsPoint( const Coordinate& p, const KigDocument& ) const = 0; }; #endif diff --git a/kig/objects/intersection_types.cc b/kig/objects/intersection_types.cc index 7305ba3d..804d498d 100644 --- a/kig/objects/intersection_types.cc +++ b/kig/objects/intersection_types.cc @@ -172,8 +172,8 @@ ObjectImp* LineLineIntersectionType::calc( const Args& parents, const KigDocumen calcIntersectionPoint( static_cast<const AbstractLineImp*>( parents[0] )->data(), static_cast<const AbstractLineImp*>( parents[1] )->data() ); - if ( static_cast<const AbstractLineImp*>( parents[0] )->tqcontainsPoint( p, d ) && - static_cast<const AbstractLineImp*>( parents[1] )->tqcontainsPoint( p, d ) ) + if ( static_cast<const AbstractLineImp*>( parents[0] )->containsPoint( p, d ) && + static_cast<const AbstractLineImp*>( parents[1] )->containsPoint( p, d ) ) return new PointImp( p ); else return new InvalidImp(); } diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cc index 6f5b176f..a49078a1 100644 --- a/kig/objects/line_imp.cc +++ b/kig/objects/line_imp.cc @@ -197,7 +197,7 @@ void SegmentImp::draw( KigPainter& p ) const p.drawSegment( mdata ); } -bool SegmentImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool SegmentImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -207,7 +207,7 @@ void RayImp::draw( KigPainter& p ) const p.drawRay( mdata ); } -bool RayImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool RayImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -217,7 +217,7 @@ void LineImp::draw( KigPainter& p ) const p.drawLine( mdata ); } -bool LineImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool LineImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -507,7 +507,7 @@ const ObjectImpType* LineImp::type() const return LineImp::stype(); } -bool SegmentImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool SegmentImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -517,7 +517,7 @@ bool SegmentImp::internalContainsPoint( const Coordinate& p, double threshold ) return isOnSegment( p, mdata.a, mdata.b, threshold ); } -bool RayImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool RayImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -527,7 +527,7 @@ bool RayImp::internalContainsPoint( const Coordinate& p, double threshold ) cons return isOnRay( p, mdata.a, mdata.b, threshold ); } -bool LineImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool LineImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } diff --git a/kig/objects/line_imp.h b/kig/objects/line_imp.h index 4d2319e5..b12c045d 100644 --- a/kig/objects/line_imp.h +++ b/kig/objects/line_imp.h @@ -99,7 +99,7 @@ public: SegmentImp( const LineData& d ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; + bool contains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; @@ -124,7 +124,7 @@ public: const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; @@ -154,7 +154,7 @@ public: RayImp( const LineData& d ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; + bool contains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; @@ -167,7 +167,7 @@ public: const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; @@ -195,7 +195,7 @@ public: */ LineImp( const LineData& d ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& si ) const; + bool contains( const Coordinate& p, int width, const KigWidget& si ) const; Rect surroundingRect() const; ObjectImp* transform( const Transformation& ) const; @@ -208,7 +208,7 @@ public: const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/locus_imp.cc b/kig/objects/locus_imp.cc index a45159a7..edbdc88b 100644 --- a/kig/objects/locus_imp.cc +++ b/kig/objects/locus_imp.cc @@ -49,7 +49,7 @@ void LocusImp::draw( KigPainter& p ) const p.drawCurve( this ); } -bool LocusImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool LocusImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ), w.document() ); } @@ -372,7 +372,7 @@ const ObjectImpType* LocusImp::type() const return LocusImp::stype(); } -bool LocusImp::tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const +bool LocusImp::containsPoint( const Coordinate& p, const KigDocument& doc ) const { return internalContainsPoint( p, test_threshold, doc ); } diff --git a/kig/objects/locus_imp.h b/kig/objects/locus_imp.h index 19bd690f..568e0e7c 100644 --- a/kig/objects/locus_imp.h +++ b/kig/objects/locus_imp.h @@ -66,7 +66,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; Rect surroundingRect() const; bool inRect( const Rect& r, int width, const KigWidget& ) const; double getParam( const Coordinate& point, const KigDocument& ) const; @@ -89,7 +89,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& d ) const; + bool containsPoint( const Coordinate& p, const KigDocument& d ) const; bool internalContainsPoint( const Coordinate& p, double threshold, const KigDocument& doc ) const; }; diff --git a/kig/objects/object_drawer.cc b/kig/objects/object_drawer.cc index 89c2c976..f92fabe7 100644 --- a/kig/objects/object_drawer.cc +++ b/kig/objects/object_drawer.cc @@ -41,10 +41,10 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const } } -bool ObjectDrawer::tqcontains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const +bool ObjectDrawer::contains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv ) const { bool shownornv = mshown || nv; - return shownornv && imp.tqcontains( pt, mwidth, w ); + return shownornv && imp.contains( pt, mwidth, w ); } bool ObjectDrawer::shown( ) const diff --git a/kig/objects/object_drawer.h b/kig/objects/object_drawer.h index c9c962dd..6206522e 100644 --- a/kig/objects/object_drawer.h +++ b/kig/objects/object_drawer.h @@ -64,11 +64,11 @@ public: */ void draw( const ObjectImp& imp, KigPainter& p, bool selected ) const; /** - * returns whether the object \p imp tqcontains coordinate \p p . This is + * returns whether the object \p imp contains coordinate \p p . This is * dependent on whether it is shown ( when it will never contain * anything ), and on its width.. */ - bool tqcontains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv = false ) const; + bool contains( const ObjectImp& imp, const Coordinate& pt, const KigWidget& w, bool nv = false ) const; /** * returns whether the object \p imp is in the rectangle \p r . This is * dependent on whether it is shown and on its width.. diff --git a/kig/objects/object_holder.cc b/kig/objects/object_holder.cc index f3516eea..70e1100b 100644 --- a/kig/objects/object_holder.cc +++ b/kig/objects/object_holder.cc @@ -80,9 +80,9 @@ void ObjectHolder::draw( KigPainter& p, bool selected ) const mdrawer->draw( *imp(), p, selected ); } -bool ObjectHolder::tqcontains( const Coordinate& pt, const KigWidget& w, bool nv ) const +bool ObjectHolder::contains( const Coordinate& pt, const KigWidget& w, bool nv ) const { - return mdrawer->tqcontains( *imp(), pt, w, nv ); + return mdrawer->contains( *imp(), pt, w, nv ); } bool ObjectHolder::inRect( const Rect& r, const KigWidget& w ) const diff --git a/kig/objects/object_holder.h b/kig/objects/object_holder.h index 1d96e007..0afd3892 100644 --- a/kig/objects/object_holder.h +++ b/kig/objects/object_holder.h @@ -101,9 +101,9 @@ public: */ void draw( KigPainter& p, bool selected ) const; /** - * Returns whether this object tqcontains the point \p p . + * Returns whether this object contains the point \p p . */ - bool tqcontains( const Coordinate& p, const KigWidget& w, bool nv = false ) const; + bool contains( const Coordinate& p, const KigWidget& w, bool nv = false ) const; /** * Returns whether this object is in the rectangle \p r . */ diff --git a/kig/objects/object_imp.h b/kig/objects/object_imp.h index 8e12de26..eaf29328 100644 --- a/kig/objects/object_imp.h +++ b/kig/objects/object_imp.h @@ -268,7 +268,7 @@ public: virtual ObjectImp* transform( const Transformation& t ) const = 0; virtual void draw( KigPainter& p ) const = 0; - virtual bool tqcontains( const Coordinate& p, int width, + virtual bool contains( const Coordinate& p, int width, const KigWidget& si ) const = 0; virtual bool inRect( const Rect& r, int width, const KigWidget& si ) const = 0; @@ -327,7 +327,7 @@ public: virtual ObjectImp* copy() const = 0; // s is a string with at least one escape ( "%N" where N is a - // number ) somewhere. This function tqreplaces the first escape it + // number ) somewhere. This function replaces the first escape it // sees with the "value" of this imp ( using the TQString::arg // functions ). This is e.g. used by TextType to turn its variable // args into strings.. @@ -341,7 +341,7 @@ public: /** * Returns true if this ObjectImp is equal to rhs. * This function checks whether rhs is of the same ObjectImp type, - * and whether it tqcontains the same data as this ObjectImp. + * and whether it contains the same data as this ObjectImp. * \internal It is used e.g. by the KigCommand stuff to see what the * user has changed during a move.. */ diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc index b422ccf1..65cd9c94 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::null; diff --git a/kig/objects/other_imp.cc b/kig/objects/other_imp.cc index f094b487..137a3e93 100644 --- a/kig/objects/other_imp.cc +++ b/kig/objects/other_imp.cc @@ -56,7 +56,7 @@ AngleImp::AngleImp( const Coordinate& pt, double start_angle_in_radials, { } -bool AngleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool AngleImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { double radius = 50*w.screenInfo().pixelWidth(); @@ -73,7 +73,7 @@ bool AngleImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) bool AngleImp::inRect( const Rect& r, int width, const KigWidget& w ) const { // TODO ? - return r.tqcontains( mpoint, w.screenInfo().normalMiss( width ) ); + return r.contains( mpoint, w.screenInfo().normalMiss( width ) ); } Coordinate AngleImp::attachPoint() const @@ -179,7 +179,7 @@ void VectorImp::draw( KigPainter& p ) const p.drawVector( mdata.a, mdata.b ); } -bool VectorImp::tqcontains( const Coordinate& o, int width, const KigWidget& w ) const +bool VectorImp::contains( const Coordinate& o, int width, const KigWidget& w ) const { return internalContainsPoint( o, w.screenInfo().normalMiss( width ) ); } @@ -340,7 +340,7 @@ void ArcImp::draw( KigPainter& p ) const p.drawArc( mcenter, mradius, msa, ma ); } -bool ArcImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool ArcImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { return internalContainsPoint( p, w.screenInfo().normalMiss( width ) ); } @@ -614,7 +614,7 @@ const ObjectImpType* ArcImp::type() const return ArcImp::stype(); } -bool ArcImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool ArcImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } @@ -694,7 +694,7 @@ double VectorImp::getParam( const Coordinate& p, const KigDocument& ) const return ( ( pt - mdata.a ).length() ) / ( dir().length() ); } -bool VectorImp::tqcontainsPoint( const Coordinate& p, const KigDocument& ) const +bool VectorImp::containsPoint( const Coordinate& p, const KigDocument& ) const { return internalContainsPoint( p, test_threshold ); } diff --git a/kig/objects/other_imp.h b/kig/objects/other_imp.h index 204d63a1..8e716fa6 100644 --- a/kig/objects/other_imp.h +++ b/kig/objects/other_imp.h @@ -49,7 +49,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; @@ -113,7 +113,7 @@ public: double getParam( const Coordinate&, const KigDocument& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; @@ -153,7 +153,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; @@ -186,7 +186,7 @@ public: ObjectImp* transform( const Transformation& t ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& w ) const; + bool contains( const Coordinate& p, int width, const KigWidget& w ) const; bool inRect( const Rect& r, int width, const KigWidget& si ) const; Rect surroundingRect() const; bool valid() const; @@ -236,7 +236,7 @@ public: bool equals( const ObjectImp& rhs ) const; - bool tqcontainsPoint( const Coordinate& p, const KigDocument& doc ) const; + bool containsPoint( const Coordinate& p, const KigDocument& doc ) const; bool internalContainsPoint( const Coordinate& p, double threshold ) const; }; diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cc index 57f8fe4a..539f98b3 100644 --- a/kig/objects/point_imp.cc +++ b/kig/objects/point_imp.cc @@ -42,7 +42,7 @@ void PointImp::draw( KigPainter& p ) const p.drawFatPoint( mc ); } -bool PointImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool PointImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { int twidth = width == -1 ? 5 : width; return (p - mc).length() - twidth*w.screenInfo().pixelWidth() < 0; @@ -51,7 +51,7 @@ bool PointImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) bool PointImp::inRect( const Rect& r, int width, const KigWidget& w ) const { double am = w.screenInfo().normalMiss( width ); - return r.tqcontains( mc, am ); + return r.contains( mc, am ); } const uint PointImp::numberOfProperties() const diff --git a/kig/objects/point_imp.h b/kig/objects/point_imp.h index 6a2db06f..dac0576c 100644 --- a/kig/objects/point_imp.h +++ b/kig/objects/point_imp.h @@ -54,7 +54,7 @@ public: void setCoordinate( const Coordinate& c ); void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; const uint numberOfProperties() const; diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc index c443f099..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; @@ -514,7 +514,7 @@ ObjectImp* MeasureTransportType::calc( const Args& parents, const KigDocument& d { const LineImp* c = static_cast<const LineImp*>( parents[1] ); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; const LineData line = c->data(); @@ -526,7 +526,7 @@ ObjectImp* MeasureTransportType::calc( const Args& parents, const KigDocument& d } else if ( parents[1]->inherits (CircleImp::stype()) ) { const CircleImp* c = static_cast<const CircleImp*>( parents[1] ); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; double param = c->getParam( p, doc ); @@ -614,7 +614,7 @@ ObjectImp* MeasureTransportTypeOld::calc( const Args& parents, const KigDocument const CircleImp* c = static_cast<const CircleImp*>( parents[0] ); const Coordinate& p = static_cast<const PointImp*>( parents[1] )->coordinate(); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; const SegmentImp* s = static_cast<const SegmentImp*>( parents[2] ); diff --git a/kig/objects/polygon_imp.cc b/kig/objects/polygon_imp.cc index c9c8fb11..08215bfb 100644 --- a/kig/objects/polygon_imp.cc +++ b/kig/objects/polygon_imp.cc @@ -159,12 +159,12 @@ bool PolygonImp::isInPolygon( const Coordinate& p ) const } #define selectpolygonwithinside 1 #ifdef selectpolygonwithinside -bool PolygonImp::tqcontains( const Coordinate& p, int, const KigWidget& ) const +bool PolygonImp::contains( const Coordinate& p, int, const KigWidget& ) const { return isInPolygon( p ); } #else -bool PolygonImp::tqcontains( const Coordinate& p, int width, const KigWidget& w ) const +bool PolygonImp::contains( const Coordinate& p, int width, const KigWidget& w ) const { bool ret = false; uint reduceddim = mpoints.size() - 1; diff --git a/kig/objects/polygon_imp.h b/kig/objects/polygon_imp.h index 506ca245..9a25d516 100644 --- a/kig/objects/polygon_imp.h +++ b/kig/objects/polygon_imp.h @@ -53,7 +53,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/objects/tangent_type.cc b/kig/objects/tangent_type.cc index 15b78458..12ebda23 100644 --- a/kig/objects/tangent_type.cc +++ b/kig/objects/tangent_type.cc @@ -68,7 +68,7 @@ ObjectImp* TangentConicType::calc( const Args& args, const KigDocument& doc ) co const ConicImp* c = static_cast<const ConicImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !c->tqcontainsPoint( p, doc ) ) + if ( !c->containsPoint( p, doc ) ) return new InvalidImp; bool ok; @@ -118,7 +118,7 @@ ObjectImp* TangentArcType::calc( const Args& args, const KigDocument& doc ) cons const ArcImp* arc = static_cast<const ArcImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !arc->tqcontainsPoint( p, doc ) ) + if ( !arc->containsPoint( p, doc ) ) return new InvalidImp; Coordinate c = arc->center(); @@ -173,7 +173,7 @@ ObjectImp* TangentCubicType::calc( const Args& args, const KigDocument& doc ) co const CubicImp* cubic = static_cast<const CubicImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !cubic->tqcontainsPoint( p, doc ) ) + if ( !cubic->containsPoint( p, doc ) ) return new InvalidImp; double x = p.x; @@ -243,7 +243,7 @@ ObjectImp* TangentCurveType::calc( const Args& args, const KigDocument& doc ) co const CurveImp* curve = static_cast<const CurveImp*>( args[0] ); const Coordinate& p = static_cast<const PointImp*>( args[1] )->coordinate(); - if ( !curve->tqcontainsPoint( p, doc ) ) + if ( !curve->containsPoint( p, doc ) ) return new InvalidImp; const double t = curve->getParam( p, doc ); diff --git a/kig/objects/tests_type.cc b/kig/objects/tests_type.cc index a2c65808..e85c111e 100644 --- a/kig/objects/tests_type.cc +++ b/kig/objects/tests_type.cc @@ -159,7 +159,7 @@ const ObjectImpType* AreCollinearType::resultId() const return TestResultImp::stype(); } -static const ArgsParser::spec tqcontainsTestArgsSpec[] = +static const ArgsParser::spec containsTestArgsSpec[] = { { PointImp::stype(), I18N_NOOP( "Check whether this point is on a curve" ), I18N_NOOP( "Select the point you want to test..." ), false }, @@ -170,7 +170,7 @@ static const ArgsParser::spec tqcontainsTestArgsSpec[] = KIG_INSTANTIATE_OBJECT_TYPE_INSTANCE( ContainsTestType ) ContainsTestType::ContainsTestType() - : ArgsParserObjectType( "ContainsTest", tqcontainsTestArgsSpec, 2 ) + : ArgsParserObjectType( "ContainsTest", containsTestArgsSpec, 2 ) { } @@ -190,8 +190,8 @@ ObjectImp* ContainsTestType::calc( const Args& parents, const KigDocument& doc ) const Coordinate& p = static_cast<const PointImp*>( parents[0] )->coordinate(); const CurveImp* c = static_cast<const CurveImp*>( parents[1] ); - if ( c->tqcontainsPoint( p, doc ) ) - return new TestResultImp( i18n( "This curve tqcontains the point." ) ); + if ( c->containsPoint( p, doc ) ) + return new TestResultImp( i18n( "This curve contains the point." ) ); else return new TestResultImp( i18n( "This curve does not contain the point." ) ); } @@ -237,7 +237,7 @@ ObjectImp* InPolygonTestType::calc( const Args& parents, const KigDocument& ) co const PolygonImp* pol = static_cast<const PolygonImp*>( parents[1] ); if ( pol->isInPolygon( p ) ) - return new TestResultImp( i18n( "This polygon tqcontains the point." ) ); + return new TestResultImp( i18n( "This polygon contains the point." ) ); else return new TestResultImp( i18n( "This polygon does not contain the point." ) ); } diff --git a/kig/objects/text_imp.cc b/kig/objects/text_imp.cc index e8feb7f0..32591c16 100644 --- a/kig/objects/text_imp.cc +++ b/kig/objects/text_imp.cc @@ -51,9 +51,9 @@ void TextImp::draw( KigPainter& p ) const p.drawTextFrame( mboundrect, mtext, mframe ); } -bool TextImp::tqcontains( const Coordinate& p, int, const KigWidget& ) const +bool TextImp::contains( const Coordinate& p, int, const KigWidget& ) const { - return mboundrect.tqcontains( p ); + return mboundrect.contains( p ); } bool TextImp::inRect( const Rect& r, int, const KigWidget& ) const diff --git a/kig/objects/text_imp.h b/kig/objects/text_imp.h index 54eb7647..54e33f79 100644 --- a/kig/objects/text_imp.h +++ b/kig/objects/text_imp.h @@ -30,7 +30,7 @@ class TextImp Coordinate mloc; bool mframe; // with this var, we keep track of the place we drew in, for use in - // the tqcontains() function.. + // the contains() function.. mutable Rect mboundrect; public: typedef ObjectImp Parent; @@ -44,7 +44,7 @@ public: ObjectImp* transform( const Transformation& ) const; void draw( KigPainter& p ) const; - bool tqcontains( const Coordinate& p, int width, const KigWidget& ) const; + bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; bool valid() const; Rect surroundingRect() const; diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc index 28b6b337..de959ce2 100644 --- a/kig/scripting/newscriptwizard.cc +++ b/kig/scripting/newscriptwizard.cc @@ -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 90713813..30117961 100644 --- a/kig/scripting/newscriptwizardbase.ui +++ b/kig/scripting/newscriptwizardbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>NewScriptWizardBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -74,7 +74,7 @@ in the Kig window and press "Next".</string> </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/kig/scripting/script-common.cc b/kig/scripting/script-common.cc index 02364463..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 " diff --git a/kiten/configdictionariesbase.ui b/kiten/configdictionariesbase.ui index 7e247fe6..faf52680 100644 --- a/kiten/configdictionariesbase.ui +++ b/kiten/configdictionariesbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConfigDictionariesBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -36,7 +36,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout52_2</cstring> + <cstring>layout52_2</cstring> </property> <vbox> <property name="name"> @@ -47,7 +47,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout51_2</cstring> + <cstring>layout51_2</cstring> </property> <hbox> <property name="name"> @@ -117,7 +117,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout52</cstring> + <cstring>layout52</cstring> </property> <vbox> <property name="name"> @@ -185,7 +185,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout51</cstring> + <cstring>layout51</cstring> </property> <hbox> <property name="name"> @@ -255,7 +255,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -305,7 +305,7 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistview.h</includehint> diff --git a/kiten/configfont.ui b/kiten/configfont.ui index 522befb1..9ad6936c 100644 --- a/kiten/configfont.ui +++ b/kiten/configfont.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConfigFont</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontdialog.h</includehint> </includehints> diff --git a/kiten/configlearn.ui b/kiten/configlearn.ui index edc1a8b2..b101de38 100644 --- a/kiten/configlearn.ui +++ b/kiten/configlearn.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConfigLearn</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -157,5 +157,5 @@ <tabstop>kcfg_QuizOn</tabstop> <tabstop>kcfg_GuessOn</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kiten/configsearching.ui b/kiten/configsearching.ui index 9b9b9175..c11665c1 100644 --- a/kiten/configsearching.ui +++ b/kiten/configsearching.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConfigSearching</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -64,5 +64,5 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kiten/deinf.cpp b/kiten/deinf.cpp index 3f9585a9..52d1f8f2 100644 --- a/kiten/deinf.cpp +++ b/kiten/deinf.cpp @@ -74,7 +74,7 @@ void Deinf::Index::load() Conjugation conj; conj.ending = things.first(); - conj.tqreplace = (*things.at(1)); + conj.replace = (*things.at(1)); conj.num = things.last().toUInt(); list.append(conj); @@ -110,10 +110,10 @@ TQStringList Deinf::Index::deinflect(const TQString &text, TQStringList &name) { name.append(names[(*it).num]); - //kdDebug() << "match ending: " << (*it).ending << "; tqreplace: " << (*it).tqreplace << "; name: " << names[(*it).num] << endl; + //kdDebug() << "match ending: " << (*it).ending << "; replace: " << (*it).replace << "; name: " << names[(*it).num] << endl; TQString tmp(text); - tmp.tqreplace(TQRegExp((*it).ending + "*", false, true), (*it).tqreplace); + tmp.replace(TQRegExp((*it).ending + "*", false, true), (*it).replace); ret.append(tmp); } } diff --git a/kiten/deinf.h b/kiten/deinf.h index 28e18d1f..ca776289 100644 --- a/kiten/deinf.h +++ b/kiten/deinf.h @@ -30,7 +30,7 @@ namespace Deinf struct Conjugation { TQString ending; - TQString tqreplace; + TQString replace; unsigned int num; }; diff --git a/kiten/dict.cpp b/kiten/dict.cpp index c80158d6..23da1a9e 100644 --- a/kiten/dict.cpp +++ b/kiten/dict.cpp @@ -50,7 +50,7 @@ using namespace Dict; TextType Dict::textType(const TQString &text) { - ushort first = text.at(0).tqunicode(); + ushort first = text.at(0).unicode(); if (first < 0x3000) return Text_Latin; @@ -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/dict.h b/kiten/dict.h index ded50112..f510d0c1 100644 --- a/kiten/dict.h +++ b/kiten/dict.h @@ -89,7 +89,7 @@ public: int dictLength(void); int indexLength(void); - // tqreplacement for exceptions thrown in the constructor + // replacement for exceptions thrown in the constructor bool isValid(void); unsigned char lookup(unsigned i, int offset); diff --git a/kiten/edict_doc.html b/kiten/edict_doc.html index ad5aee8e..fc52d1e4 100644 --- a/kiten/edict_doc.html +++ b/kiten/edict_doc.html @@ -64,7 +64,7 @@ as up-to-date. The easy way to check if the version you have is the latest is from the size/date. </P> <P> -As of V96-001, the EDICT file no longer tqcontains proper names. These have +As of V96-001, the EDICT file no longer contains proper names. These have been moved to a separate file called "ENAMDICT". From V99-002, the EDICT file has been generated from an extended dictionary database which includes additional fields and information. See the later @@ -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> @@ -486,7 +486,7 @@ latest version, as others may have already made the same comments. </P> <P> The preferred format for submissions is a JIS, EUC or Shift-JIS file (uuencoded -for safety) containing tqreplacement/new entries. This can be emailed to me at +for safety) containing replacement/new entries. This can be emailed to me at the address at the end of this file. </P> <P> @@ -499,8 +499,8 @@ NEW: KANJI1 [kana1] /new entry #1/ NEW: KANJI2 [kana2] /new entry #2/ -old: KANJI3 [kana3] /old entry to be tqreplaced/ -new: KANJI3 [kana3] /tqreplacement entry/ +old: KANJI3 [kana3] /old entry to be replaced/ +new: KANJI3 [kana3] /replacement entry/ DEL: KANJI4 [kana4] /entry to be deleted/ </PRE> diff --git a/kiten/edict_kanjidic_licence.html b/kiten/edict_kanjidic_licence.html index ede3fa90..999357fe 100644 --- a/kiten/edict_kanjidic_licence.html +++ b/kiten/edict_kanjidic_licence.html @@ -37,7 +37,7 @@ electronic dictionaries. </P> <P ALIGN="JUSTIFY"> This document outlines the licence arrangement put in place by The -Group for usage of the files. It tqreplaces all previous copyright and +Group for usage of the files. It replaces all previous copyright and licence statements applying to the files. </P> <P ALIGN="JUSTIFY"> diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index 7dd11934..5e54a9af 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -257,7 +257,7 @@ void TopLevel::handleSearchResult(Dict::SearchResult results) addAction->setEnabled(true); - _ResultView->append(TQString("<p>%1</p>").arg(i18n("HTML Entity: %1").arg(TQString("&#x%1;").arg(TQString::number(toAddKanji.kanji().at(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(); @@ -396,7 +396,7 @@ void TopLevel::search(bool inResults) TQStringList::Iterator nit = names.begin(); for (TQStringList::Iterator it = res.begin(); it != res.end(); ++it, ++nit) { - if (done.tqcontains(*it) > 0) + if (done.contains(*it) > 0) continue; //kdDebug() << "currently on deinflection " << *it << endl; @@ -711,8 +711,8 @@ TQRegExp TopLevel::searchItems() if (text.isEmpty()) return TQRegExp(); //empty - unsigned int tqcontains = text.tqcontains(TQRegExp("[A-Za-z0-9_:]")); - if (Config::wholeWord() && tqcontains == text.length()) + unsigned int contains = text.contains(TQRegExp("[A-Za-z0-9_:]")); + if (Config::wholeWord() && contains == text.length()) regexp = "\\W%1\\W"; else regexp = "%1"; diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp index ff6f49fd..d58ff2e0 100644 --- a/kiten/kromajiedit.cpp +++ b/kiten/kromajiedit.cpp @@ -163,21 +163,21 @@ void KRomajiEdit::keyPressEvent(TQKeyEvent *e) ji = ji.lower(); //kdDebug() << "ji = " << ji << endl; - TQString tqreplace; + TQString replace; //kdDebug () << "kana is " << kana << endl; if (kana == "hiragana") - tqreplace = hiragana[ji]; + replace = hiragana[ji]; else if (kana == "katakana") - tqreplace = katakana[ji]; + replace = katakana[ji]; - //kdDebug() << "tqreplace = " << tqreplace << endl; + //kdDebug() << "replace = " << replace << endl; - if (!!tqreplace) // if (tqreplace has something in it) + if (!!replace) // if (replace has something in it) { - //kdDebug() << "tqreplace isn't empty\n"; + //kdDebug() << "replace isn't empty\n"; - setText(curKana + tqreplace); + setText(curKana + replace); if (kana == "katakana") kana = "hiragana"; @@ -185,7 +185,7 @@ void KRomajiEdit::keyPressEvent(TQKeyEvent *e) } else { - //kdDebug() << "tqreplace is empty\n"; + //kdDebug() << "replace is empty\n"; TQString farRight(ji.right(ji.length() - 1)); //kdDebug() << "ji = " << ji << endl; //kdDebug() << "farRight = " << farRight << endl; diff --git a/kiten/learn.cpp b/kiten/learn.cpp index 548f87d0..02b21618 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -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, Horizontal, quizTop); @@ -473,8 +473,8 @@ void Learn::add(Dict::Entry toAdd, bool noEmit) { // Remove peripheral readings: This is a study mode, not a reference mode TQRegExp inNames (",\\s*[A-Za-z ]+:.*"); - TQString readings = Dict::prettyKanjiReading(toAdd.readings()).tqreplace(inNames, ""); - TQString meanings = shortenString(Dict::prettyMeaning(toAdd.meanings()).tqreplace(inNames, "")); + TQString readings = Dict::prettyKanjiReading(toAdd.readings()).replace(inNames, ""); + TQString meanings = shortenString(Dict::prettyMeaning(toAdd.meanings()).replace(inNames, "")); TQString kanji = toAdd.kanji(); // here's a dirty rotten cheat (well, not really) @@ -730,7 +730,7 @@ TQString Learn::randomMeaning(TQStringList &oldMeanings) } //kdDebug() << "curMeaning: " << curItem->text(guessOn) << endl; } - while (oldMeanings.tqcontains(meaning) || meaning == curItem->text(guessOn)); + while (oldMeanings.contains(meaning) || meaning == curItem->text(guessOn)); oldMeanings.append(meaning); meaning = shortenString(meaning); diff --git a/kiten/main.cpp b/kiten/main.cpp index d55f46b6..8d013d15 100644 --- a/kiten/main.cpp +++ b/kiten/main.cpp @@ -39,7 +39,7 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - tqInstallMsgHandler(noMessageOutput); + qInstallMsgHandler(noMessageOutput); KAboutData aboutData( "kiten", I18N_NOOP("Kiten"), "1.2", I18N_NOOP("Japanese Reference Tool"), KAboutData::License_GPL, "(c) 2001-2004, Jason Katz-Brown", 0, "http://www.katzbrown.com/kiten"); diff --git a/kiten/rad.cpp b/kiten/rad.cpp index 2c8c7a48..f3c31132 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -174,11 +174,11 @@ TQStringList Rad::kanjiByRad(const TQStringList &list) for (TQValueList<TQStringList>::Iterator it = lists.begin(); it != lists.end(); ++it) { //kdDebug() << "looping through lists\n"; - outcomes.append((*it).tqcontains(*kit) > 0); + outcomes.append((*it).contains(*kit) > 0); } - const bool tqcontainsBool = false; - if ((outcomes.tqcontains(tqcontainsBool) < 1)) + const bool containsBool = false; + if ((outcomes.contains(containsBool) < 1)) { //kdDebug() << "appending " << *kit << endl; ret.append(*kit); @@ -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, 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); @@ -360,7 +360,7 @@ void RadWidget::addRadical(const TQString &radical) void RadWidget::addToSelected(const TQString &text) { - if (!text.isNull() && !selected.tqcontains(text)) + if (!text.isNull() && !selected.contains(text)) { selectedList->insertItem(text); selected.append(text); diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index d8f576d0..cfe4c18a 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -256,7 +256,7 @@ void ResultView::print(TQString title) TQRect view(body); int page = 1; - TQColorGroup goodColorGroup = TQColorGroup(tqcolorGroup()); + TQColorGroup goodColorGroup = TQColorGroup(colorGroup()); goodColorGroup.setColor(TQColorGroup::Link, Qt::black); do @@ -358,8 +358,8 @@ void eEdit::openFile(const TQString &file) Dict::Entry entry = Dict::parse(s); TQString meanings = Dict::prettyMeaning(entry.meanings()); bool common = meanings.find(TQString("(P)")) >= 0; - meanings.tqreplace(TQRegExp("; "), "/"); - meanings.tqreplace(TQRegExp("/\\(P\\)"), ""); + meanings.replace(TQRegExp("; "), "/"); + meanings.replace(TQRegExp("/\\(P\\)"), ""); new TQListViewItem(List, entry.kanji(), Dict::prettyKanjiReading(entry.readings()), meanings, common? i18n("yes") : i18n("no")); } } @@ -482,7 +482,7 @@ void EditAction::unplug( TQWidget *w ) KToolBar *toolBar = (KToolBar *)w; - int idx = tqfindContainer( w ); + int idx = findContainer( w ); toolBar->removeItem( itemId( idx ) ); diff --git a/klatin/klatin/klatinchoose.ui b/klatin/klatin/klatinchoose.ui index 29483e25..98115187 100644 --- a/klatin/klatin/klatinchoose.ui +++ b/klatin/klatin/klatinchoose.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KLatinChoose</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -256,7 +256,7 @@ verb and noun tables</string> </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/klatin/klatin/klatingrammarwidget.ui b/klatin/klatin/klatingrammarwidget.ui index 5b9d51a9..2e8046fb 100644 --- a/klatin/klatin/klatingrammarwidget.ui +++ b/klatin/klatin/klatingrammarwidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KLatinGrammarWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout39</cstring> + <cstring>layout39</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout37</cstring> + <cstring>layout37</cstring> </property> <hbox> <property name="name"> @@ -326,7 +326,7 @@ Line 4</string> </widget> <widget class="QLayoutWidget"> <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> @@ -375,7 +375,7 @@ Line 4</string> <tabstop>BackButton</tabstop> <tabstop>ChooseSection</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/klatin/klatin/klatinresultsdialog.ui b/klatin/klatin/klatinresultsdialog.ui index 5b2e9d76..f81f0bc2 100644 --- a/klatin/klatin/klatinresultsdialog.ui +++ b/klatin/klatin/klatinresultsdialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KLatinResultsDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -216,7 +216,7 @@ <slot>close()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/klatin/klatin/klatinsettings_vocabpage.ui b/klatin/klatin/klatinsettings_vocabpage.ui index 05ce88d3..7db9e38a 100644 --- a/klatin/klatin/klatinsettings_vocabpage.ui +++ b/klatin/klatin/klatinsettings_vocabpage.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>VocabPage</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -40,7 +40,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -96,7 +96,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget"> <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"> @@ -171,7 +171,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/klatin/klatin/klatinverbswidget.ui b/klatin/klatin/klatinverbswidget.ui index 9e2d3947..a00b72f0 100644 --- a/klatin/klatin/klatinverbswidget.ui +++ b/klatin/klatin/klatinverbswidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KLatinVerbsWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -367,7 +367,7 @@ Line 4</string> </widget> <widget class="QLayoutWidget"> <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> @@ -419,7 +419,7 @@ Line 4</string> <tabstop>ChooseMood</tabstop> <tabstop>ChangeButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/klatin/klatin/klatinvocabwidget.ui b/klatin/klatin/klatinvocabwidget.ui index 968fb961..db6ad834 100644 --- a/klatin/klatin/klatinvocabwidget.ui +++ b/klatin/klatin/klatinvocabwidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KLatinVocabWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -381,7 +381,7 @@ <tabstop>Answer4</tabstop> <tabstop>BackButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/klettres/klettres/fontsdlg.ui b/klettres/klettres/fontsdlg.ui index 8659fe93..34c72ad5 100644 --- a/klettres/klettres/fontsdlg.ui +++ b/klettres/klettres/fontsdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>fontsdlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -31,7 +31,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontdialog.h</includehint> </includehints> diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index 39394d4b..4d378ee6 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -66,7 +66,7 @@ KLettres::KLettres() Prefs::writeConfig(); //MainWindow GUI: menus, tolbars and statusbar setupActions(); - setuptqStatusbar(); + setupStatusbar(); setupToolbars(); //Load Settings loadSettings(); @@ -107,7 +107,7 @@ void KLettres::findLanguages() TQStringList temp_languages; for (uint i=0; i<m_languages.count(); i++) { - if (m_languages.tqcontains(m_languages[i])>1) { + if (m_languages.contains(m_languages[i])>1) { temp_languages.append(m_languages[i]); m_languages.remove(m_languages[i]); } @@ -122,12 +122,12 @@ void KLettres::findLanguages() m_languages.sort(); //write the present languages in config so they cannot be downloaded KConfig *config=kapp->config(); - config->setGroup("KNewStufftqStatus"); + config->setGroup("KNewStuffStatus"); for (uint i=0; i<m_languages.count(); i++) { TQString tmp = m_languages[i]; if (!config->readEntry(tmp)) - config->writeEntry(tmp, TQDate::tqcurrentDate().toString()); + config->writeEntry(tmp, TQDate::currentDate().toString()); } //we look in $KDEDIR/share/locale/all_languages from /kdelibs/kdecore/all_languages //to find the name of the country @@ -156,7 +156,7 @@ TQString Prefs::defaultLanguage() if (!defaultLanguages.isEmpty()) { //scan to see if defaultLanguages[0] belongs to m_languages. If not, en is default. int i = Prefs::self()->m_languages.findIndex(defaultLanguages[0]); - if (Prefs::self()->m_languages.tqcontains(Prefs::language())) + if (Prefs::self()->m_languages.contains(Prefs::language())) return Prefs::language(); //the last language played else if (i<1) return "en"; //if no other @@ -167,11 +167,11 @@ TQString Prefs::defaultLanguage() } -bool KLettres::loadLayout(TQDomDocument &tqlayoutDocument) +bool KLettres::loadLayout(TQDomDocument &layoutDocument) { - TQFile tqlayoutFile(locate("data", "klettres/"+Prefs::language()+"/sounds.xml")); + TQFile layoutFile(locate("data", "klettres/"+Prefs::language()+"/sounds.xml")); //if xml file is not found, program exits - if (!tqlayoutFile.exists()) + if (!layoutFile.exists()) { kdWarning() << "sounds.xml file not found in $KDEDIR/share/apps/klettres/"+Prefs::language() << endl; TQString mString=i18n("The file sounds.xml was not found in\n" @@ -180,15 +180,15 @@ bool KLettres::loadLayout(TQDomDocument &tqlayoutDocument) KMessageBox::information( this, mString,"KLettres - Error" ); kapp->quit();//exit(1); } - if (!tqlayoutFile.open(IO_ReadOnly)) + if (!layoutFile.open(IO_ReadOnly)) return false; //Check if document is well-formed - if (!tqlayoutDocument.setContent(&tqlayoutFile)) + if (!layoutDocument.setContent(&layoutFile)) { - tqlayoutFile.close(); + layoutFile.close(); return false; } - tqlayoutFile.close(); + layoutFile.close(); return true; } @@ -244,7 +244,7 @@ void KLettres::setupActions() setupGUI(); } -void KLettres::setuptqStatusbar() +void KLettres::setupStatusbar() { KStatusBar *st=statusBar(); m_langLabel = new TQLabel(st); @@ -284,7 +284,7 @@ void KLettres::loadSettings() //m_view->selectedLanguage = selectedLanguage; m_languageAction->setCurrentItem(Prefs::languageNumber()); TQString langString = m_languageNames[Prefs::languageNumber()]; - langString.tqreplace("&", TQString::null); + langString.replace("&", TQString::null); m_langLabel->setText(i18n("Current language is %1").arg(langString)); loadLangToolBar(); // load default level @@ -368,11 +368,11 @@ void KLettres::slotChangeLanguage(int newLanguage) Prefs::writeConfig(); // Update the StatusBar TQString langString = m_languageNames[newLanguage]; - langString.tqreplace("&", TQString::null); + langString.replace("&", TQString::null); m_langLabel->setText(i18n("Current language is %1").arg(langString)); loadLangToolBar(); // Change language effectively - bool ok = loadLayout(soundFactory->m_tqlayoutsDocument); + bool ok = loadLayout(soundFactory->m_layoutsDocument); if (ok) soundFactory->change(Prefs::language()); m_view->game(); @@ -470,7 +470,7 @@ void KLettres::loadLangToolBar() openFileStream.open(IO_ReadOnly); TQTextStream readFileStr(&openFileStream); readFileStr.setEncoding(TQTextStream::UnicodeUTF8); - //allData tqcontains all the words from the file + //allData contains all the words from the file allData = TQStringList::split("\n", readFileStr.read(), true); openFileStream.close(); for (int i=0; i<(int) allData.count(); i++) { @@ -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); @@ -507,7 +507,7 @@ TQString KLettres::charIcon(const TQChar & c) p.setPen(Qt::black); p.drawText(r, Qt::AlignCenter, (TQString) c); - ///Create transparency tqmask + ///Create transparency mask TQBitmap bm(128, 128); bm.fill(Qt::color0); TQPainter b(&bm); diff --git a/klettres/klettres/klettres.h b/klettres/klettres/klettres.h index d767e3e5..afed715c 100644 --- a/klettres/klettres/klettres.h +++ b/klettres/klettres/klettres.h @@ -61,10 +61,10 @@ public: TQStringList m_languageNames; /** *Load the xml file - *@param tqlayoutDocument the xml file + *@param layoutDocument the xml file *@return bool true if the xml document is found and well formed, false otherwise */ - bool loadLayout(TQDomDocument &tqlayoutDocument); + bool loadLayout(TQDomDocument &layoutDocument); ///Number corresponding to the selected language: 0 is Czech, 1 is Danish, 2 is English (default), 3 is French, 4 is Dutch, 5 is Slovak //uint selectedLanguage; ///Action that sets up the Language menu @@ -106,7 +106,7 @@ protected: ///Build the main window menus void setupActions(); ///Create and setup statusbar - void setuptqStatusbar(); + void setupStatusbar(); ///Create main and second toolbars void setupToolbars(); /**generates icons for the special characters toolbar diff --git a/klettres/klettres/soundfactory.cpp b/klettres/klettres/soundfactory.cpp index d210e4d7..e23bc501 100644 --- a/klettres/klettres/soundfactory.cpp +++ b/klettres/klettres/soundfactory.cpp @@ -41,7 +41,7 @@ SoundFactory::SoundFactory(KLettres *parent, const char *name) namesList = filesList = 0; sounds = 0; - bool ok = klettres->loadLayout(m_tqlayoutsDocument); + bool ok = klettres->loadLayout(m_layoutsDocument); if (ok) change(Prefs::language()); if (!ok) loadFailure(); } @@ -53,7 +53,7 @@ SoundFactory::~SoundFactory() void SoundFactory::change(TQString currentLanguage) { //go load the sounds for the current language - bool ok = loadLanguage(m_tqlayoutsDocument, currentLanguage); + bool ok = loadLanguage(m_layoutsDocument, currentLanguage); kdDebug() << "ok " << ok << endl; //tell the user if there are no sounds if (!ok) loadFailure(); @@ -78,7 +78,7 @@ void SoundFactory::loadFailure() KMessageBox::error(klettres, i18n("Error while loading the sound names.")); } -bool SoundFactory::loadLanguage(TQDomDocument &tqlayoutDocument, TQString currentLanguage) +bool SoundFactory::loadLanguage(TQDomDocument &layoutDocument, TQString currentLanguage) { TQDomNodeList languagesList, alphabetList, @@ -90,7 +90,7 @@ bool SoundFactory::loadLanguage(TQDomDocument &tqlayoutDocument, TQString curren soundNameElement; TQDomAttr nameAttribute, fileAttribute; - languagesList = tqlayoutDocument.elementsByTagName("language"); + languagesList = layoutDocument.elementsByTagName("language"); TQDomAttr codeAttribute; //check if the sound files match current language languageElement = (const TQDomElement &) languagesList.item(0).toElement(); diff --git a/klettres/klettres/soundfactory.h b/klettres/klettres/soundfactory.h index ace9e36d..2cc8a5de 100644 --- a/klettres/klettres/soundfactory.h +++ b/klettres/klettres/soundfactory.h @@ -64,9 +64,9 @@ public: * Call that when you read the language from Config and when the language changes * or when the level changes */ - bool loadLanguage(TQDomDocument &tqlayoutDocument, TQString currentLanguage); + bool loadLanguage(TQDomDocument &layoutDocument, TQString currentLanguage); ///The language document - TQDomDocument m_tqlayoutsDocument; + TQDomDocument m_layoutsDocument; private: ///Report a load failure diff --git a/klettres/klettres/timerdlg.ui b/klettres/klettres/timerdlg.ui index f9ed6798..91ab486f 100644 --- a/klettres/klettres/timerdlg.ui +++ b/klettres/klettres/timerdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>timerdlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -238,7 +238,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui index 7624f2de..9678e889 100644 --- a/kmplot/kmplot/FktDlgData.ui +++ b/kmplot/kmplot/FktDlgData.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>FktDlgData</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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> @@ -417,7 +417,7 @@ <slot access="protected">slotHelp()</slot> <slot>slotNewPrime()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index 83a09080..e8916f93 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -63,13 +63,13 @@ class KmPlotIO; bool MainDlg::oldfileversion; -MainDlg::MainDlg(TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name) : DCOPObject( "MainDlg" ), KParts::ReadOnlyPart( parent, name ), m_recentFiles( 0 ), m_modified(false), m_parent(tqparentWidget) +MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const char *name) : DCOPObject( "MainDlg" ), KParts::ReadOnlyPart( parent, name ), m_recentFiles( 0 ), m_modified(false), m_parent(parentWidget) { // we need an instance setInstance( KmPlotPartFactory::instance() ); - kdDebug() << "tqparentWidget->name():" << tqparentWidget->name() << endl; - if ( TQString(tqparentWidget->name()).startsWith("KmPlot") ) + kdDebug() << "parentWidget->name():" << parentWidget->name() << endl; + if ( TQString(parentWidget->name()).startsWith("KmPlot") ) { setXMLFile("kmplot_part.rc"); m_readonly = false; @@ -82,14 +82,14 @@ MainDlg::MainDlg(TQWidget *tqparentWidget, const char *, TQObject *parent, const } fdlg = 0; coordsDialog = 0; - m_popupmenu = new KPopupMenu(tqparentWidget); - view = new View( m_readonly, m_modified, m_popupmenu, tqparentWidget ); + m_popupmenu = new KPopupMenu(parentWidget); + view = new View( m_readonly, m_modified, m_popupmenu, parentWidget ); connect( view, TQT_SIGNAL( setStatusBarText(const TQString &)), this, TQT_SLOT( setReadOnlyStatusBarText(const TQString &) ) ); setWidget( view ); view->setFocusPolicy(TQWidget::ClickFocus); minmaxdlg = new KMinMax(view, m_parent); view->setMinMaxDlg(minmaxdlg); - m_quickEdit = new KLineEdit( tqparentWidget ); + m_quickEdit = new KLineEdit( parentWidget ); m_quickEdit->setFocus(); TQToolTip::add( m_quickEdit, i18n( "Enter a function equation, for example: f(x)=x^2" ) ); setupActions(); @@ -99,7 +99,7 @@ MainDlg::MainDlg(TQWidget *tqparentWidget, const char *, TQObject *parent, const m_recentFiles->loadEntries( m_config ); // Let's create a Configure Diloag - m_settingsDialog = new KConfigDialog( tqparentWidget, "settings", Settings::self() ); + m_settingsDialog = new KConfigDialog( parentWidget, "settings", Settings::self() ); m_settingsDialog->setHelp("general-config"); // create and add the page(s) @@ -538,7 +538,7 @@ void MainDlg::slotQuickEdit(const TQString& f_str_const ) KMessageBox::error( m_parent, i18n("Parametric functions must be definied in the \"New Parametric Plot\"-dialog which you can find in the menubar")); return; } - if ( f_str.tqcontains('y') != 0) + if ( f_str.contains('y') != 0) { KMessageBox::error( m_parent, i18n( "Recursive function is not allowed")); m_quickEdit->setFocus(); @@ -785,12 +785,12 @@ KmPlotPartFactory::~KmPlotPartFactory() s_instance = 0L; } -KParts::Part* KmPlotPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part* KmPlotPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *, const TQStringList & ) { // Create an instance of our Part - MainDlg* obj = new MainDlg( tqparentWidget, widgetName, parent, name ); + MainDlg* obj = new MainDlg( parentWidget, widgetName, parent, name ); emit objectCreated( obj ); return obj; } diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h index 69520f2a..7b4d83bf 100644 --- a/kmplot/kmplot/MainDlg.h +++ b/kmplot/kmplot/MainDlg.h @@ -64,7 +64,7 @@ class BrowserExtension; /** @short This is the main window of KmPlot. * - * Its central widget view tqcontains the parser, accessable via its parser() function. + * Its central widget view contains the parser, accessable via its parser() function. * @see View, View::m_parser, View::parser */ class MainDlg : public KParts::ReadOnlyPart, virtual public MainDlgIface @@ -73,11 +73,11 @@ class MainDlg : public KParts::ReadOnlyPart, virtual public MainDlgIface public: /** Constuctor. - * @param tqparentWidget parent widget for this part + * @param parentWidget parent widget for this part * @param parent parent object * @param name name of this dialog */ - MainDlg(TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name); + MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const char *name); /// Cleaning up a bit. virtual ~MainDlg(); /// This class needs access to private members, too. @@ -219,7 +219,7 @@ class KmPlotPartFactory : public KParts::Factory public: KmPlotPartFactory(); virtual ~KmPlotPartFactory(); - virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/kmplot/kmplot/Makefile.am b/kmplot/kmplot/Makefile.am index 27b903a4..f5158dc9 100644 --- a/kmplot/kmplot/Makefile.am +++ b/kmplot/kmplot/Makefile.am @@ -45,7 +45,7 @@ kde_module_LTLIBRARIES = libkmplotpart.la # the Part's source, library search path, and link libraries libkmplotpart_la_SOURCES = FktDlgData.ui parser.cpp xparser.cpp diagr.cpp View.cpp MainDlg.cpp FktDlg.cpp kprinterdlg.cpp settings.kcfgc settingspagecolor.ui kconstanteditor.cpp qparametereditor.ui kparametereditor.cpp settingspagecoords.ui settingspagefonts.ui settingspagescaling.ui settingspageprecision.ui qeditparametric.ui keditparametric.cpp qeditpolar.ui keditpolar.cpp editfunctionpage.ui editderivativespage.ui editintegralpage.ui editfunction.cpp qeditconstant.ui qminmax.ui kminmax.cpp qconstanteditor.ui keditconstant.cpp kmplotio.cpp sliderwindow.ui ksliderwindow.cpp MainDlgIface.skel parseriface.skel Viewiface.skel coordsconfigdialog.cpp libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -libkmplotpart_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_KDEPRINT) -lDCOP $(LIB_KPARTS) +libkmplotpart_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_KDEPRINT) # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp index e0b3ac5e..0d45fd2c 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 ); } @@ -531,7 +531,7 @@ void View::setpi(TQString *s) int i; TQChar c(960); - while((i=s->find('p')) != -1) s->tqreplace(i, 2, &c, 1); + while((i=s->find('p')) != -1) s->replace(i, 2, &c, 1); } @@ -639,7 +639,7 @@ void View::mouseMoveEvent(TQMouseEvent *e) csflg=0; } - if(area.tqcontains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpos<xmax)) + if(area.contains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpos<xmax)) { TQPoint ptd, ptl; TQPainter DC; @@ -887,10 +887,10 @@ void View::mousePressEvent(TQMouseEvent *e) it->setParameter( sw->slider->value() ); } - if ( function_type=='x' && fabs(csxpos-m_parser->fkt(it, csxpos))< g && it->fstr.tqcontains('t')==1) //parametric plot + if ( function_type=='x' && fabs(csxpos-m_parser->fkt(it, csxpos))< g && it->fstr.contains('t')==1) //parametric plot { TQValueVector<Ufkt>::iterator ufkt_y = it+1; - if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)<g) && ufkt_y->fstr.tqcontains('t')==1) + if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)<g) && ufkt_y->fstr.contains('t')==1) { if ( csmode == -1) { @@ -1681,7 +1681,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double else forward_direction = true; - int intervals = tqRound((dmax-dmin)/dx); + int intervals = qRound((dmax-dmin)/dx); int at = 0; while ((at<=intervals) || (p_mode == 3 && x>=dmin && !forward_direction) || (p_mode == 3 && x<=dmax && forward_direction)) diff --git a/kmplot/kmplot/View.h b/kmplot/kmplot/View.h index 63785656..a28aadbc 100644 --- a/kmplot/kmplot/View.h +++ b/kmplot/kmplot/View.h @@ -59,7 +59,7 @@ enum ZoomMode }; /** - * @short This class tqcontains the plots. + * @short This class contains the plots. * * It is the central widget of MainDlg. * @see MainDlg, MainDlg::view diff --git a/kmplot/kmplot/diagr.cpp b/kmplot/kmplot/diagr.cpp index 8f03961a..ba65fce8 100644 --- a/kmplot/kmplot/diagr.cpp +++ b/kmplot/kmplot/diagr.cpp @@ -45,9 +45,9 @@ int isinf(double x) CDiagr::CDiagr() { - frameColor=tqRgb(0, 0, 0); - axesColor=tqRgb(0, 0, 0); - gridColor=tqRgb(192, 192, 192); + frameColor=qRgb(0, 0, 0); + axesColor=qRgb(0, 0, 0); + gridColor=qRgb(192, 192, 192); borderThickness=2; axesLineWidth = Settings::axesLineWidth(); gridLineWidth = Settings::gridLineWidth(); diff --git a/kmplot/kmplot/editderivativespage.ui b/kmplot/kmplot/editderivativespage.ui index 7e257f93..a6a88b78 100644 --- a/kmplot/kmplot/editderivativespage.ui +++ b/kmplot/kmplot/editderivativespage.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>EditDerivativesPage</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> @@ -268,7 +268,7 @@ <tabstop>lineWidthDerivative2</tabstop> <tabstop>colorDerivative2</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp index 8100d742..2d75cc49 100644 --- a/kmplot/kmplot/editfunction.cpp +++ b/kmplot/kmplot/editfunction.cpp @@ -296,7 +296,7 @@ void EditFunction::accept() tmp_ufkt.f2_linewidth = editderivativespage->lineWidthDerivative2->value(); tmp_ufkt.f2_color = editderivativespage->colorDerivative2->color().rgb(); - if ( f_str.tqcontains('y') != 0 && ( tmp_ufkt.f_mode || tmp_ufkt.f1_mode || tmp_ufkt.f2_mode) ) + if ( f_str.contains('y') != 0 && ( tmp_ufkt.f_mode || tmp_ufkt.f1_mode || tmp_ufkt.f2_mode) ) { KMessageBox::error( this, i18n( "Recursive function is only allowed when drawing integral graphs") ); return; diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui index 6b8ff03f..31d9bd28 100644 --- a/kmplot/kmplot/editfunctionpage.ui +++ b/kmplot/kmplot/editfunctionpage.ui @@ -7,7 +7,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -897,7 +897,7 @@ Example: f(x)=x^2</string> <slot>slotHelp()</slot> <slot>customRange_toggled( bool )</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kmplot/kmplot/editintegralpage.ui b/kmplot/kmplot/editintegralpage.ui index 3a8be1cf..5180a8d2 100644 --- a/kmplot/kmplot/editintegralpage.ui +++ b/kmplot/kmplot/editintegralpage.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>EditIntegralPage</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>62</height> @@ -281,7 +281,7 @@ <tabstop>lineWidth</tabstop> <tabstop>color</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp index dbcd3c18..c2017c8a 100644 --- a/kmplot/kmplot/kconstanteditor.cpp +++ b/kmplot/kmplot/kconstanteditor.cpp @@ -199,7 +199,7 @@ void KConstantEditor::editConstantSlot() int index = 0; for( TQValueVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it) { - if( it->fstr.tqcontains(constant)!=0 ) + if( it->fstr.contains(constant)!=0 ) m_view->parser()->reparse(index); //reparsing the function ++index; } diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp index 4136a8f8..67ee0421 100644 --- a/kmplot/kmplot/keditparametric.cpp +++ b/kmplot/kmplot/keditparametric.cpp @@ -103,7 +103,7 @@ void KEditParametric::setWidgets() void KEditParametric::accept() { - if ( kLineEditXFunction->text().tqcontains('y') != 0 || kLineEditYFunction->text().tqcontains('y') != 0) + if ( kLineEditXFunction->text().contains('y') != 0 || kLineEditYFunction->text().contains('y') != 0) { KMessageBox::error( this, i18n( "Recursive function not allowed")); kLineEditXFunction->setFocus(); diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp index 659710d9..3f8db2c8 100644 --- a/kmplot/kmplot/kminmax.cpp +++ b/kmplot/kmplot/kminmax.cpp @@ -258,13 +258,13 @@ void KMinMax::cmdFind_clicked() TQString function( list->currentText() ); char p_mode = 0; - if ( function.tqcontains('\'') == 1) + if ( function.contains('\'') == 1) { p_mode = 1; int pos = function.find('\''); function.remove(pos,1); } - else if ( function.tqcontains('\'') == 2) + else if ( function.contains('\'') == 2) { p_mode = 2; int pos = function.find('\''); @@ -352,13 +352,13 @@ void KMinMax::list_highlighted(TQListBoxItem* item) } TQString function( list->currentText() ); char p_mode = 0; - if ( function.tqcontains('\'') == 1) + if ( function.contains('\'') == 1) { p_mode = 1; int pos = function.find('\''); function.remove(pos,1); } - else if ( function.tqcontains('\'') == 2) + else if ( function.contains('\'') == 2) { p_mode = 2; int pos = function.find('\''); @@ -390,13 +390,13 @@ void KMinMax::cmdParameter_clicked() { TQString function( list->currentText() ); char p_mode = 0; - if ( function.tqcontains('\'') == 1) + if ( function.contains('\'') == 1) { p_mode = 1; int pos = function.find('\''); function.remove(pos,1); } - else if ( function.tqcontains('\'') == 2) + else if ( function.contains('\'') == 2) { p_mode = 2; int pos = function.find('\''); diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index 8cc03beb..e6f71013 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/kprinterdlg.cpp b/kmplot/kmplot/kprinterdlg.cpp index 91036668..aa74a7b5 100644 --- a/kmplot/kmplot/kprinterdlg.cpp +++ b/kmplot/kmplot/kprinterdlg.cpp @@ -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/parser.cpp b/kmplot/kmplot/parser.cpp index efa391ac..ed064b85 100644 --- a/kmplot/kmplot/parser.cpp +++ b/kmplot/kmplot/parser.cpp @@ -190,7 +190,7 @@ double Parser::eval(TQString str) fix_expression(str,0); - if ( str.tqcontains('y')!=0) + if ( str.contains('y')!=0) { err=9; delete []stack; @@ -520,7 +520,7 @@ void Parser::fix_expression(TQString &str, int const pos) } } TQString str_end = str.mid(pos); - str_end = str_end.tqreplace(m_decimalsymbol, "."); //tqreplace the locale decimal symbol with a '.' + str_end = str_end.replace(m_decimalsymbol, "."); //replace the locale decimal symbol with a '.' str.truncate(pos); str.append(str_end); //kdDebug() << "str:" << str << endl; @@ -1006,7 +1006,7 @@ int Parser::parserError(bool showMessageBox) TQString Parser::number( double value ) { TQString str = TQString::number( value, 'g', 6 ); - str.tqreplace( 'e', "*10^" ); + str.replace( 'e', "*10^" ); // kDebug() << "returning str="<<str<<endl; return str; } diff --git a/kmplot/kmplot/parser.h b/kmplot/kmplot/parser.h index a07810bb..13098039 100644 --- a/kmplot/kmplot/parser.h +++ b/kmplot/kmplot/parser.h @@ -246,7 +246,7 @@ private: * \li 9 => recursive function call * \li 10 => didn't found the wanted constant * \li 11 => emtpy function - * \li 12 => function name tqcontains a capital letter + * \li 12 => function name contains a capital letter * \li 13 => function could not be found * \li 14 => evalation expression may not use user definded constants */ @@ -254,7 +254,7 @@ private: /// Position where the error occurred. int errpos; - void fix_expression(TQString &, int const); ///adding extra *-characters, remove spaces and tqreplace the locale .-character with '.' + void fix_expression(TQString &, int const); ///adding extra *-characters, remove spaces and replace the locale .-character with '.' void ps_init(), heir1(), diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui index a0139aa0..92baf7e5 100644 --- a/kmplot/kmplot/qconstanteditor.ui +++ b/kmplot/kmplot/qconstanteditor.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QConstantEditor</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>147</height> @@ -193,7 +193,7 @@ <slot>newNewConstantSlot()</slot> <slot>varlist_doubleClicked( QListViewItem * )</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kmplot/kmplot/qeditconstant.ui b/kmplot/kmplot/qeditconstant.ui index 301a1c46..1d9bdb0a 100644 --- a/kmplot/kmplot/qeditconstant.ui +++ b/kmplot/kmplot/qeditconstant.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QEditConstant</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </widget> <widget class="QLayoutWidget" 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> @@ -131,7 +131,7 @@ <slots> <slot>txtVariable_lostFocus()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui index d66f7c75..b41573ab 100644 --- a/kmplot/kmplot/qeditparametric.ui +++ b/kmplot/kmplot/qeditparametric.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QEditParametric</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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="QLayoutWidget" 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> @@ -531,7 +531,7 @@ Example: sin(t)</string> <slots> <slot>slotHelp()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kmplot/kmplot/qeditpolar.ui b/kmplot/kmplot/qeditpolar.ui index 9d3d5522..e61c5c6d 100644 --- a/kmplot/kmplot/qeditpolar.ui +++ b/kmplot/kmplot/qeditpolar.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QEditPolar</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -395,7 +395,7 @@ Example: loop(angle)=ln(angle)</string> <slots> <slot>slotHelp()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kmplot/kmplot/qminmax.ui b/kmplot/kmplot/qminmax.ui index 338d641a..d828cbd6 100644 --- a/kmplot/kmplot/qminmax.ui +++ b/kmplot/kmplot/qminmax.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QMinMax</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -138,5 +138,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmplot/kmplot/qparametereditor.ui b/kmplot/kmplot/qparametereditor.ui index 779d1393..619f4fd7 100644 --- a/kmplot/kmplot/qparametereditor.ui +++ b/kmplot/kmplot/qparametereditor.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QParameterEditor</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -181,5 +181,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmplot/kmplot/settingspagecolor.ui b/kmplot/kmplot/settingspagecolor.ui index a883f1ae..e8e85323 100644 --- a/kmplot/kmplot/settingspagecolor.ui +++ b/kmplot/kmplot/settingspagecolor.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SettingsPageColor</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -33,7 +33,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -131,7 +131,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -455,5 +455,5 @@ <tabstop>kcfg_Color8</tabstop> <tabstop>kcfg_Color9</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmplot/kmplot/settingspagecoords.ui b/kmplot/kmplot/settingspagecoords.ui index 7e2a8274..cf2826b3 100644 --- a/kmplot/kmplot/settingspagecoords.ui +++ b/kmplot/kmplot/settingspagecoords.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SettingsPageCoords</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -33,7 +33,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <hbox> <property name="name"> @@ -131,7 +131,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -277,7 +277,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout20_2</cstring> + <cstring>layout20_2</cstring> </property> <grid> <property name="name"> @@ -335,7 +335,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -375,7 +375,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -415,7 +415,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <hbox> <property name="name"> @@ -458,7 +458,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -751,7 +751,7 @@ <tabstop>radioButton14</tabstop> <tabstop>kcfg_GridLineWidth</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kmplot/kmplot/settingspagefonts.ui b/kmplot/kmplot/settingspagefonts.ui index 10c6b80a..e5f80ccd 100644 --- a/kmplot/kmplot/settingspagefonts.ui +++ b/kmplot/kmplot/settingspagefonts.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SettingsPageFonts</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> @@ -119,7 +119,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontcombo.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kmplot/kmplot/settingspageprecision.ui b/kmplot/kmplot/settingspageprecision.ui index a3711c76..25f732ce 100644 --- a/kmplot/kmplot/settingspageprecision.ui +++ b/kmplot/kmplot/settingspageprecision.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SettingsPagePrecision</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -268,7 +268,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kmplot/kmplot/settingspagescaling.ui b/kmplot/kmplot/settingspagescaling.ui index f004b5ac..222359ba 100644 --- a/kmplot/kmplot/settingspagescaling.ui +++ b/kmplot/kmplot/settingspagescaling.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SettingsPageScaling</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -411,5 +411,5 @@ <tabstop>kcfg_YScaling</tabstop> <tabstop>kcfg_YPrinting</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmplot/kmplot/sliderwindow.ui b/kmplot/kmplot/sliderwindow.ui index daf21345..deff716a 100644 --- a/kmplot/kmplot/sliderwindow.ui +++ b/kmplot/kmplot/sliderwindow.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SliderWindow</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -83,5 +83,5 @@ <slot>setNum(int)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp index 7d34e58f..18d9a3b3 100644 --- a/kmplot/kmplot/xparser.cpp +++ b/kmplot/kmplot/xparser.cpp @@ -648,7 +648,7 @@ int XParser::addFunction(const TQString &f_str) fixFunctionName(added_function); if ( added_function.at(0)== 'x' || added_function.at(0)== 'y') //TODO: Make it possible to define parametric functions return -1; - if ( added_function.tqcontains('y') != 0) + if ( added_function.contains('y') != 0) return -1; int const id = addfkt( added_function ); if (id==-1) diff --git a/kpercentage/kpercentage/kanimation.h b/kpercentage/kpercentage/kanimation.h index 19bdfc02..e4231f2a 100644 --- a/kpercentage/kpercentage/kanimation.h +++ b/kpercentage/kpercentage/kanimation.h @@ -7,7 +7,7 @@ class TQString; /** - * This class tqcontains information about one frame. + * This class contains information about one frame. */ class KFrame { diff --git a/kpercentage/kpercentage/kanswer.cpp b/kpercentage/kpercentage/kanswer.cpp index 1854ee9c..d723629b 100644 --- a/kpercentage/kpercentage/kanswer.cpp +++ b/kpercentage/kpercentage/kanswer.cpp @@ -68,7 +68,7 @@ KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE ) canvas_view->setBackgroundPixmap( bgp ); /////// - // begin tqlayouting + // begin layouting /////// mainLayout = new TQHBoxLayout( this ); mainLayout->setDirection(TQBoxLayout::LeftToRight); @@ -103,7 +103,7 @@ KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE ) rightLayout->addSpacing( 20 ); /////// - // end tqlayouting + // end layouting /////// connect( ButtonOK, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp index 34faca2b..f51f8364 100644 --- a/kpercentage/kpercentage/kpercentage.cpp +++ b/kpercentage/kpercentage/kpercentage.cpp @@ -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 */ @@ -108,44 +108,44 @@ KPercentage::KPercentage( const char *name ) : connect( button_close, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); //////// - // begin tqlayouting + // begin layouting //////// - TQVBoxLayout *main_tqlayout = new TQVBoxLayout( this, 20, 20, "main_tqlayout" ); - main_tqlayout->setResizeMode( TQLayout::FreeResize ); - - TQHBoxLayout *top_tqlayout = new TQHBoxLayout( main_tqlayout, -1, "top_tqlayout" ); - top_tqlayout->addWidget( label_number ); - top_tqlayout->addWidget( spin_box_number ); - top_tqlayout->addSpacing( 20 ); - top_tqlayout->addStretch(); - top_tqlayout->addWidget( label_level ); - top_tqlayout->addWidget( combo_box_level ); - - main_tqlayout->addSpacing( 40 ); - main_tqlayout->addStretch(); - - TQHBoxLayout *bottom_tqlayout = new TQHBoxLayout( main_tqlayout, -1, "bottom_tqlayout" ); - TQVBoxLayout *bLeftLayout = new TQVBoxLayout( bottom_tqlayout ); + TQVBoxLayout *main_layout = new TQVBoxLayout( this, 20, 20, "main_layout" ); + main_layout->setResizeMode( TQLayout::FreeResize ); + + TQHBoxLayout *top_layout = new TQHBoxLayout( main_layout, -1, "top_layout" ); + top_layout->addWidget( label_number ); + top_layout->addWidget( spin_box_number ); + top_layout->addSpacing( 20 ); + top_layout->addStretch(); + top_layout->addWidget( label_level ); + top_layout->addWidget( combo_box_level ); + + main_layout->addSpacing( 40 ); + main_layout->addStretch(); + + TQHBoxLayout *bottom_layout = new TQHBoxLayout( main_layout, -1, "bottom_layout" ); + TQVBoxLayout *bLeftLayout = new TQVBoxLayout( bottom_layout ); bLeftLayout->addWidget( label_choose ); bLeftLayout->addSpacing( 10 ); - TQGridLayout *grid_tqlayout = new TQGridLayout( bLeftLayout, 2, 2, 10 ); - grid_tqlayout->addWidget( button_basevalue, 0, 0 ); - grid_tqlayout->addWidget( button_percentvalue, 1, 0 ); - grid_tqlayout->addWidget( button_percentage, 0, 1 ); - grid_tqlayout->addWidget( button_random, 1, 1 ); + TQGridLayout *grid_layout = new TQGridLayout( bLeftLayout, 2, 2, 10 ); + grid_layout->addWidget( button_basevalue, 0, 0 ); + grid_layout->addWidget( button_percentvalue, 1, 0 ); + grid_layout->addWidget( button_percentage, 0, 1 ); + grid_layout->addWidget( button_random, 1, 1 ); - bottom_tqlayout->addStretch(); + bottom_layout->addStretch(); - TQVBoxLayout *b_right_tqlayout = new TQVBoxLayout( bottom_tqlayout ); - b_right_tqlayout->addStretch(); - b_right_tqlayout->addWidget( button_help ); - b_right_tqlayout->addSpacing( 10 ); - b_right_tqlayout->addWidget( button_close ); + TQVBoxLayout *b_right_layout = new TQVBoxLayout( bottom_layout ); + b_right_layout->addStretch(); + b_right_layout->addWidget( button_help ); + b_right_layout->addSpacing( 10 ); + b_right_layout->addWidget( button_close ); - main_tqlayout->addStretch(); + main_layout->addStretch(); //////// - // end tqlayouting + // end layouting //////// //////// diff --git a/kpercentage/kpercentage/kpercentmain.cpp b/kpercentage/kpercentage/kpercentmain.cpp index 93ed2cbc..67f4a687 100644 --- a/kpercentage/kpercentage/kpercentmain.cpp +++ b/kpercentage/kpercentage/kpercentmain.cpp @@ -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" ); @@ -119,51 +119,51 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : label_count->setBackgroundOrigin( TQDialog::ParentOrigin ); ////// - // begin tqlayouting + // begin layouting ////// - TQVBoxLayout *main_tqlayout = new TQVBoxLayout ( this, 0, -1, "main_tqlayout" ); - main_tqlayout->setMargin( 20 ); - main_tqlayout->setSpacing( 10 ); + TQVBoxLayout *main_layout = new TQVBoxLayout ( this, 0, -1, "main_layout" ); + main_layout->setMargin( 20 ); + main_layout->setSpacing( 10 ); - TQHBoxLayout *label_number_tqlayout = new TQHBoxLayout ( main_tqlayout, -1, "label_number_tqlayout" ); - label_number_tqlayout->addWidget( label_number ); - label_number_tqlayout->addStretch(); + TQHBoxLayout *label_number_layout = new TQHBoxLayout ( main_layout, -1, "label_number_layout" ); + label_number_layout->addWidget( label_number ); + label_number_layout->addStretch(); - TQHBoxLayout *line_edit_tqlayout = new TQHBoxLayout ( main_tqlayout, -1, "line_edit_tqlayout" ); + TQHBoxLayout *line_edit_layout = new TQHBoxLayout ( main_layout, -1, "line_edit_layout" ); - line_edit_tqlayout->addWidget( line_edit_percentage ); - line_edit_tqlayout->addWidget( label_1 ); - line_edit_tqlayout->addWidget( line_edit_basevalue ); - line_edit_tqlayout->addWidget( label_2 ); - line_edit_tqlayout->addWidget( line_edit_percentvalue ); - line_edit_tqlayout->addStretch(); + line_edit_layout->addWidget( line_edit_percentage ); + line_edit_layout->addWidget( label_1 ); + line_edit_layout->addWidget( line_edit_basevalue ); + line_edit_layout->addWidget( label_2 ); + line_edit_layout->addWidget( line_edit_percentvalue ); + line_edit_layout->addStretch(); - main_tqlayout->addStretch(); + main_layout->addStretch(); - TQHBoxLayout *bottom_tqlayout = new TQHBoxLayout( main_tqlayout, -1, "bottom_tqlayout" ); + TQHBoxLayout *bottom_layout = new TQHBoxLayout( main_layout, -1, "bottom_layout" ); - TQVBoxLayout *current_state_tqlayout = new TQVBoxLayout ( bottom_tqlayout, -1, "current_state_tqlayout" ); + TQVBoxLayout *current_state_layout = new TQVBoxLayout ( bottom_layout, -1, "current_state_layout" ); - TQHBoxLayout *label_count_tqlayout = new TQHBoxLayout ( current_state_tqlayout, -1, "label_count_tqlayout" ); - label_count_tqlayout->addWidget( label_count ); - label_count_tqlayout->addStretch(); + TQHBoxLayout *label_count_layout = new TQHBoxLayout ( current_state_layout, -1, "label_count_layout" ); + label_count_layout->addWidget( label_count ); + label_count_layout->addStretch(); - current_state_tqlayout->addSpacing( 10 ); - current_state_tqlayout->addWidget( progress_bar_count ); + current_state_layout->addSpacing( 10 ); + current_state_layout->addWidget( progress_bar_count ); - TQHBoxLayout *right_wrong_tqlayout = new TQHBoxLayout( current_state_tqlayout, -1, "right_wrong_tqlayout" ); + TQHBoxLayout *right_wrong_layout = new TQHBoxLayout( current_state_layout, -1, "right_wrong_layout" ); - right_wrong_tqlayout->addWidget( label_right ); - right_wrong_tqlayout->addWidget( progress_bar_right_wrong ); - right_wrong_tqlayout->addWidget( label_wrong ); + right_wrong_layout->addWidget( label_right ); + right_wrong_layout->addWidget( progress_bar_right_wrong ); + right_wrong_layout->addWidget( label_wrong ); - bottom_tqlayout->addSpacing( 40 ); + bottom_layout->addSpacing( 40 ); - TQVBoxLayout *button_tqlayout = new TQVBoxLayout ( bottom_tqlayout, -1, "button_tqlayout" ); + TQVBoxLayout *button_layout = new TQVBoxLayout ( bottom_layout, -1, "button_layout" ); - button_tqlayout->addWidget( push_button_apply ); - button_tqlayout->addSpacing( 10 ); - button_tqlayout->addWidget( push_button_cancel ); + button_layout->addWidget( push_button_apply ); + button_layout->addSpacing( 10 ); + button_layout->addWidget( push_button_cancel ); // END LAYOUT // -------------------------------------------------------- @@ -227,7 +227,7 @@ void KPercentMain::newTask() { selection = selected_type; // or take the preselected one } - // set the right line_edit_tqlayout for input + // set the right line_edit_layout for input switch ( selection ) { case SEL_PERCENTAGE: @@ -244,7 +244,7 @@ void KPercentMain::newTask() showNumbers(); // delete this one line_edit_input->clear(); - // make the line_edit_tqlayout accessable + // make the line_edit_layout accessable line_edit_input->setFocusPolicy( StrongFocus ); // set the focus on it line_edit_input->setFocus(); @@ -258,7 +258,7 @@ bool KPercentMain::validateTask() return ( getPercentage() * getBasevalue() == 100 * getPercentvalue() ); } -/** gets the numbers from the line_edit_tqlayouts */ +/** gets the numbers from the line_edit_layouts */ int KPercentMain::getPercentage() { return line_edit_percentage->text().toInt(); // check for valid input is omitted (slotApplyInput) @@ -310,7 +310,7 @@ void KPercentMain::slotApplyInput() } } -/** inserts the numbers of a new task in the line_edit_tqlayouts */ +/** inserts the numbers of a new task in the line_edit_layouts */ void KPercentMain::showNumbers() { line_edit_percentage->setText( TQString::number( percentage[ count ] ) ); diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp index 5f24caef..07af36ff 100644 --- a/kstars/kstars/addcatdialog.cpp +++ b/kstars/kstars/addcatdialog.cpp @@ -99,14 +99,14 @@ void AddCatDialog::slotHelp() { * Right Ascension: colon-delimited hh:mm:ss.s or floating-point value * Declination: colon-delimited dd:mm:ss.s or floating-point value * Object type: integer value, one of [ 0,1,2,3,4,5,6,7,8 ] - * Common name: string value (if it tqcontains a space, it *must* be enclosed in quotes!) + * Common name: string value (if it contains a space, it *must* be enclosed in quotes!) * Magnitude: floating-point value * Major axis: floating-point value (length of major axis in arcmin) * Minor axis: floating-point value (length of minor axis in arcmin) * 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(); @@ -201,8 +201,8 @@ void AddCatDialog::slotPreviewCatalog() { void AddCatDialog::slotCreateCatalog() { if ( validateDataFile() ) { - //CatalogContents now tqcontains the text for the catalog file, - //and objList tqcontains the parsed objects + //CatalogContents now contains the text for the catalog file, + //and objList contains the parsed objects //Warn user if file exists! if ( TQFile::exists( acd->CatalogURL->url() ) ) diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui index e76026a0..39488947 100644 --- a/kstars/kstars/addcatdialogui.ui +++ b/kstars/kstars/addcatdialogui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AddCatDialogUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -75,7 +75,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -109,7 +109,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -145,7 +145,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout27</cstring> + <cstring>layout27</cstring> </property> <grid> <property name="name"> @@ -177,7 +177,7 @@ </widget> <widget class="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget"> <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> @@ -350,7 +350,7 @@ <tabstop>CatalogName</tabstop> <tabstop>CatalogURL</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/addlinkdialogui.ui b/kstars/kstars/addlinkdialogui.ui index 9f1cb5e4..3e5bdf53 100644 --- a/kstars/kstars/addlinkdialogui.ui +++ b/kstars/kstars/addlinkdialogui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AddLinkDialogUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -47,7 +47,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -149,5 +149,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/ccdpreviewui.ui b/kstars/kstars/ccdpreviewui.ui index 98ca6509..93a4d804 100644 --- a/kstars/kstars/ccdpreviewui.ui +++ b/kstars/kstars/ccdpreviewui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>CCDPreviewForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -237,7 +237,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <vbox> <property name="name"> @@ -317,7 +317,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -325,7 +325,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -425,7 +425,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index 71f89b17..18ee3892 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -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); } @@ -204,7 +204,7 @@ void CCDPreviewWG::updateFWHM() 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() @@ -284,9 +284,9 @@ CCDVideoWG::CCDVideoWG(TQWidget * parent, const char * name) : TQFrame(parent, n displayBuffer = NULL; grayTable=new QRgb[256]; for (int i=0;i<256;i++) { - grayTable[i]=tqRgb(i,i,i); + grayTable[i]=qRgb(i,i,i); } - grayTable[255]=tqRgb(255,0,0); + grayTable[255]=qRgb(255,0,0); } CCDVideoWG::~CCDVideoWG() @@ -375,7 +375,7 @@ void CCDVideoWG::redrawVideoWG(void) if (val>255.0) { val=255.0; } - val=tqRound(val*(254.0/255.0)); + val=qRound(val*(254.0/255.0)); displayBuffer[Width*y+x]=(int) val; } else { diff --git a/kstars/kstars/colorscheme.cpp b/kstars/kstars/colorscheme.cpp index 308a875a..5449c48e 100644 --- a/kstars/kstars/colorscheme.cpp +++ b/kstars/kstars/colorscheme.cpp @@ -172,7 +172,7 @@ TQString ColorScheme::nameFromKey( const TQString &key ) const { } void ColorScheme::setColor( const TQString &key, const TQString &color ) { - //We can blindly insert() the new value; if the key exists, the old value is tqreplaced + //We can blindly insert() the new value; if the key exists, the old value is replaced Palette.insert( key, color ); } @@ -191,7 +191,7 @@ bool ColorScheme::load( const TQString &filename ) { bool ok(false); int newmode = line.left(1).toInt( &ok ); if ( ok ) setStarColorMode( newmode ); - if ( line.tqcontains(':') ) { + if ( line.contains(':') ) { int newintens = line.mid( line.find(':')+1, 2 ).toInt( &ok ); if ( ok ) setStarColorIntensity( newintens ); } @@ -201,7 +201,7 @@ bool ColorScheme::load( const TQString &filename ) { while ( !stream.eof() ) { line = stream.readLine(); - if ( line.tqcontains(':')==1 ) { //the new color preset format tqcontains a ":" in each line, followed by the name of the color + if ( line.contains(':')==1 ) { //the new color preset format contains a ":" in each line, followed by the name of the color ++inew; if ( iold ) return false; //we read at least one line without a colon...file is corrupted. @@ -209,11 +209,11 @@ bool ColorScheme::load( const TQString &filename ) { TQString tkey = line.mid( line.find(':')+1 ).stripWhiteSpace(); TQString tname = line.left( line.find(':')-1 ); - if ( KeyName.tqcontains( tkey ) ) { + if ( KeyName.contains( tkey ) ) { setColor( tkey, tname ); } else { //attempt to translate from old color ID TQString k( line.mid( 5 ).stripWhiteSpace() + "Color" ); - if ( KeyName.tqcontains( k ) ) { + if ( KeyName.contains( k ) ) { setColor( k, tname ); } else { kdWarning() << "Could not use the key \"" << tkey << @@ -243,12 +243,12 @@ bool ColorScheme::load( const TQString &filename ) { bool ColorScheme::save( const TQString &name ) { TQFile file; - //Construct a file name from the scheme name. Make lowercase, tqreplace spaces with "-", + //Construct a file name from the scheme name. Make lowercase, replace spaces with "-", //and append ".colors". TQString filename = name.lower().stripWhiteSpace(); if ( !filename.isEmpty() ) { for( unsigned int i=0; i<filename.length(); ++i) - if ( filename.at(i)==' ' ) filename.tqreplace( i, 1, "-" ); + if ( filename.at(i)==' ' ) filename.replace( i, 1, "-" ); filename = filename.append( ".colors" ); file.setName( locateLocal( "appdata", filename ) ); //determine filename in local user KDE directory tree. diff --git a/kstars/kstars/colorscheme.h b/kstars/kstars/colorscheme.h index 5c053434..e61c455b 100644 --- a/kstars/kstars/colorscheme.h +++ b/kstars/kstars/colorscheme.h @@ -53,7 +53,7 @@ class ColorScheme { */ ~ColorScheme(); - /**@return true if the Palette tqcontains the given key name + /**@return true if the Palette contains the given key name */ bool hasColorNamed( const TQString &name ) const { return ( ! Palette[ name ].isEmpty() ); } 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 25db7dac..62193855 100644 --- a/kstars/kstars/conbridlg.h +++ b/kstars/kstars/conbridlg.h @@ -33,7 +33,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/contrastbrightnessgui.ui b/kstars/kstars/contrastbrightnessgui.ui index 7d209a1c..b05db5b3 100644 --- a/kstars/kstars/contrastbrightnessgui.ui +++ b/kstars/kstars/contrastbrightnessgui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConBriForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -118,7 +118,7 @@ <slot>setValue(int)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/deepskyobject.cpp b/kstars/kstars/deepskyobject.cpp index 5e0597f5..280729e5 100644 --- a/kstars/kstars/deepskyobject.cpp +++ b/kstars/kstars/deepskyobject.cpp @@ -88,7 +88,7 @@ void DeepSkyObject::setCatalog( const TQString &cat ) { TQImage* DeepSkyObject::readImage( void ) { TQFile file; if ( Image==0 ) { //Image not currently set; try to load it from disk. - TQString fname = name().lower().tqreplace( TQRegExp(" "), "" ) + ".png"; + TQString fname = name().lower().replace( TQRegExp(" "), "" ) + ".png"; if ( KSUtils::openDataFile( file, fname ) ) { file.close(); diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index df452a4d..4bbb6a91 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -313,7 +313,7 @@ void DetailDialog::createPositionTab( const KStarsDateTime &ut, GeoLocation *geo //because we don't want a thousands-place separator! TQString sEpoch = TQString::number( ut.epoch(), 'f', 1 ); //Replace the decimal point with localized decimal symbol - sEpoch.tqreplace( ".", KGlobal::locale()->decimalSymbol() ); + sEpoch.replace( ".", KGlobal::locale()->decimalSymbol() ); Pos->RALabel->setText( i18n( "RA (%1):" ).arg( sEpoch ) ); Pos->DecLabel->setText( i18n( "Dec (%1):" ).arg( sEpoch ) ); @@ -556,7 +556,7 @@ void DetailDialog::editLinkDialog() editLinkField = new TQLineEdit(editFrame, "lineedit"); editLinkField->setMinimumWidth(300); editLinkField->home(false); - editLinkLayout = new TQHBoxLayout(editFrame, 6, 6, "editlinktqlayout"); + editLinkLayout = new TQHBoxLayout(editFrame, 6, 6, "editlinklayout"); editLinkLayout->addWidget(editLinkURL); editLinkLayout->addWidget(editLinkField); @@ -1040,7 +1040,7 @@ void DetailDialog::showThumbnail() { //If no image found, load "no image" image //If that isn't found, make it blank. TQFile file; - TQString fname = "thumb-" + selectedObject->name().lower().tqreplace( TQRegExp(" "), "" ) + ".png"; + TQString fname = "thumb-" + selectedObject->name().lower().replace( TQRegExp(" "), "" ) + ".png"; if ( KSUtils::openDataFile( file, fname ) ) { file.close(); Thumbnail->load( file.name(), "PNG" ); @@ -1060,7 +1060,7 @@ void DetailDialog::updateThumbnail() { if ( tp.exec() == TQDialog::Accepted ) { TQString fname = locateLocal( "appdata", "thumb-" - + selectedObject->name().lower().tqreplace( TQRegExp(" "), "" ) + ".png" ); + + selectedObject->name().lower().replace( TQRegExp(" "), "" ) + ".png" ); Data->Image->setPixmap( *(tp.image()) ); diff --git a/kstars/kstars/details_data.ui b/kstars/kstars/details_data.ui index 0abdf111..2f7893b0 100644 --- a/kstars/kstars/details_data.ui +++ b/kstars/kstars/details_data.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DetailsDataUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <vbox> <property name="name"> @@ -84,7 +84,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -92,7 +92,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <vbox> <property name="name"> @@ -256,7 +256,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -590,7 +590,7 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/details_database.ui b/kstars/kstars/details_database.ui index 6c6c5770..a32f4b30 100644 --- a/kstars/kstars/details_database.ui +++ b/kstars/kstars/details_database.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DetailsDatabaseUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -48,7 +48,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui index 172fb49b..dbe0b75e 100644 --- a/kstars/kstars/details_links.ui +++ b/kstars/kstars/details_links.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DetailsLinksUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout80</cstring> + <cstring>layout80</cstring> </property> <vbox> <property name="name"> @@ -115,7 +115,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -176,7 +176,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kstars/kstars/details_log.ui b/kstars/kstars/details_log.ui index af57230c..51d337f8 100644 --- a/kstars/kstars/details_log.ui +++ b/kstars/kstars/details_log.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DetailsLogUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -73,5 +73,5 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/details_position.ui b/kstars/kstars/details_position.ui index efe24f89..f2e96b9b 100644 --- a/kstars/kstars/details_position.ui +++ b/kstars/kstars/details_position.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DetailsPositionUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout56</cstring> + <cstring>layout56</cstring> </property> <vbox> <property name="name"> @@ -70,7 +70,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout54</cstring> + <cstring>layout54</cstring> </property> <hbox> <property name="name"> @@ -78,7 +78,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -338,7 +338,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout76</cstring> + <cstring>layout76</cstring> </property> <vbox> <property name="name"> @@ -545,7 +545,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout142</cstring> + <cstring>layout142</cstring> </property> <hbox> <property name="name"> @@ -553,7 +553,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -909,7 +909,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp index 80ea0947..0f95455c 100644 --- a/kstars/kstars/devicemanager.cpp +++ b/kstars/kstars/devicemanager.cpp @@ -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 c619aa4e..54dc4b3f 100644 --- a/kstars/kstars/devmanager.ui +++ b/kstars/kstars/devmanager.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>devManager</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -426,7 +426,7 @@ <slot>close()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/dms.cpp b/kstars/kstars/dms.cpp index 3f2f43b0..724f9af2 100644 --- a/kstars/kstars/dms.cpp +++ b/kstars/kstars/dms.cpp @@ -59,19 +59,19 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { //remove any instances of unit characters. //h, d, m, s, ', ", or the degree symbol (ASCII 176) - entry.tqreplace( TQRegExp("h"), "" ); - entry.tqreplace( TQRegExp("d"), "" ); - entry.tqreplace( TQRegExp("m"), "" ); - entry.tqreplace( TQRegExp("s"), "" ); + entry.replace( TQRegExp("h"), "" ); + entry.replace( TQRegExp("d"), "" ); + entry.replace( TQRegExp("m"), "" ); + entry.replace( TQRegExp("s"), "" ); TQString sdeg; sdeg.sprintf("%c", 176); - entry.tqreplace( TQRegExp(sdeg), "" ); - entry.tqreplace( TQRegExp("\'"), "" ); - entry.tqreplace( TQRegExp("\""), "" ); + entry.replace( TQRegExp(sdeg), "" ); + entry.replace( TQRegExp("\'"), "" ); + entry.replace( TQRegExp("\""), "" ); //Account for localized decimal-point settings //TQString::toDouble() requires that the decimal symbol is "." - entry.tqreplace( KGlobal::locale()->decimalSymbol(), "." ); + entry.replace( KGlobal::locale()->decimalSymbol(), "." ); //empty entry returns false if ( entry.isEmpty() ) { @@ -99,7 +99,7 @@ bool dms::setFromString( const TQString &str, bool isDeg ) { TQStringList fields; //check for colon-delimiters or space-delimiters - if ( entry.tqcontains(':') ) + if ( entry.contains(':') ) fields = TQStringList::split( ':', entry ); else fields = TQStringList::split( " ", entry ); diff --git a/kstars/kstars/dmsbox.h b/kstars/kstars/dmsbox.h index 63a5dcde..c98bc2c1 100644 --- a/kstars/kstars/dmsbox.h +++ b/kstars/kstars/dmsbox.h @@ -113,7 +113,7 @@ public: */ dms createDms(bool deg=TRUE, bool *ok=0); - /**@return a boolean indicating if object tqcontains degrees or hours + /**@return a boolean indicating if object contains degrees or hours */ bool degType(void) const {return deg;} diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp index 4afd0f7a..74cd169f 100644 --- a/kstars/kstars/draglistbox.cpp +++ b/kstars/kstars/draglistbox.cpp @@ -36,7 +36,7 @@ void DragListBox::dragEnterEvent( TQDragEnterEvent *evt ) evt->accept(); } -bool DragListBox::tqcontains( const TQString &s ) const { +bool DragListBox::contains( const TQString &s ) const { for ( uint i=0; i<count(); ++i ) if ( text(i) == s ) return true; diff --git a/kstars/kstars/draglistbox.h b/kstars/kstars/draglistbox.h index 33e4e7a0..7e4a31cb 100644 --- a/kstars/kstars/draglistbox.h +++ b/kstars/kstars/draglistbox.h @@ -42,7 +42,7 @@ public: ~DragListBox(); int ignoreIndex() const { return IgnoreIndex; } - bool tqcontains( const TQString &s ) const; + bool contains( const TQString &s ) const; void dragEnterEvent( TQDragEnterEvent *evt ); void dropEvent( TQDropEvent *evt ); diff --git a/kstars/kstars/filesource.cpp b/kstars/kstars/filesource.cpp index 8a1854a4..8e38d9a4 100644 --- a/kstars/kstars/filesource.cpp +++ b/kstars/kstars/filesource.cpp @@ -27,7 +27,7 @@ FileSource::FileSource(KStarsData *ksdata, float magnitude) // kdDebug() << "count()=" << data->starList.count() << endl; fileNumber = ksdata->starList.count() / 1000 + 1; lineNumber = ksdata->starList.count() % 1000; - // the first file tqcontains 12 comment lines at the beginning which must skipped + // the first file contains 12 comment lines at the beginning which must skipped if (fileNumber == 1) { lineNumber += 12; } // kdDebug() << "fileNumber=" << fileNumber << " lineNumber=" << lineNumber << endl; diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp index ace8c5ed..29dfa6cb 100644 --- a/kstars/kstars/finddialog.cpp +++ b/kstars/kstars/finddialog.cpp @@ -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 ); diff --git a/kstars/kstars/finddialog.h b/kstars/kstars/finddialog.h index cb6b3c70..71059da0 100644 --- a/kstars/kstars/finddialog.h +++ b/kstars/kstars/finddialog.h @@ -35,7 +35,7 @@ class TQListBoxItem; class SkyObjectNameListItem; /**@class FindDialog - *Dialog window for finding SkyObjects by name. The dialog tqcontains + *Dialog window for finding SkyObjects by name. The dialog contains *a TQListBox showing the list of named objects, a TQLineEdit for filtering *the list by name, and a QCombobox for filtering the list by object type. * diff --git a/kstars/kstars/fitsheaderdialog.ui b/kstars/kstars/fitsheaderdialog.ui index 5dd0ea20..2a071439 100644 --- a/kstars/kstars/fitsheaderdialog.ui +++ b/kstars/kstars/fitsheaderdialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>fitsHeaderDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>300</width> <height>20</height> @@ -113,5 +113,5 @@ <slot>close()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp index ee6d4a5e..d5d5ce3c 100644 --- a/kstars/kstars/fitsimage.cpp +++ b/kstars/kstars/fitsimage.cpp @@ -52,7 +52,7 @@ /* Load info */ typedef struct { - uint tqreplace; /* tqreplacement for blank/NaN-values */ + uint replace; /* replacement for blank/NaN-values */ uint use_datamin;/* Use DATAMIN/MAX-scaling if possible */ uint compose; /* compose images with naxis==3 */ } FITSLoadVals; @@ -76,7 +76,7 @@ FITSImage::FITSImage(TQWidget * parent, const char * name) : TQScrollView(parent currentZoom = 0.0; grayTable=new QRgb[256]; for (int i=0;i<256;i++) - grayTable[i]=tqRgb(i,i,i); + grayTable[i]=qRgb(i,i,i); viewport()->setMouseTracking(true); imgFrame->setMouseTracking(true); @@ -299,7 +299,7 @@ int FITSImage::loadFits (const char *filename) } trans.datamin = 0.0; trans.datamax = 255.0; - trans.tqreplacement = plvals.tqreplace; + trans.replacement = plvals.replace; trans.dsttyp = 'c'; //displayImage->create(width, height, 32); @@ -338,7 +338,7 @@ int FITSImage::loadFits (const char *filename) //for (j=0; j < width; j++) //{ //val = dest[j]; - //displayImage->setPixel(j, i, tqRgb(val, val, val)); + //displayImage->setPixel(j, i, qRgb(val, val, val)); //} for (j = 0 ; j < width; j++) displayImage->setPixel(j, i, dest[j]); diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp index 796c798d..2d0ca2ed 100644 --- a/kstars/kstars/fitsviewer.cpp +++ b/kstars/kstars/fitsviewer.cpp @@ -549,7 +549,7 @@ void FITSViewer::fileSave() currentURL = backupCurrent; return; } - if (currentURL.path().tqcontains('.') == 0) currentURL.setPath(currentURL.path() + ".fits"); + if (currentURL.path().contains('.') == 0) currentURL.setPath(currentURL.path() + ".fits"); if (TQFile::exists(currentURL.path())) { @@ -589,7 +589,7 @@ void FITSViewer::fileSave() recordList = record[j]; if ( (index = recordList.find("BITPIX")) != -1) - recordList.tqreplace(index, FITS_CARD_SIZE, bitpixRec); + recordList.replace(index, FITS_CARD_SIZE, bitpixRec); fwrite(recordList.ascii(), 1, FITS_RECORD_SIZE, ifp->fp); } @@ -918,7 +918,7 @@ void FITSViewer::fitsHeader() if (equal == -1) { - if (property.tqcontains(" ") != FITS_CARD_SIZE) + if (property.contains(" ") != FITS_CARD_SIZE) cards << property << "" << ""; recordList.remove(0, FITS_CARD_SIZE); if (property.find("END") != -1) diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index ff639bf1..4f243f0e 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -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 5b52d83c..6ca6858d 100644 --- a/kstars/kstars/focusdialog.h +++ b/kstars/kstars/focusdialog.h @@ -46,7 +46,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 19efb184..f1cc486c 100644 --- a/kstars/kstars/focusdialogdlg.ui +++ b/kstars/kstars/focusdialogdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>FocusDialogDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -204,7 +204,7 @@ <slots> <slot>checkLineEdits()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/fov.cpp b/kstars/kstars/fov.cpp index 2dc7f02e..2820221a 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 f0816a5a..03d2f5c7 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 580353ef..05080043 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -164,14 +164,14 @@ 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 ) { FOV *newfov = new FOV( newfdlg.ui->FOVName->text(), newfdlg.ui->FOVEdit->text().toDouble(), newfdlg.ui->ShapeBox->currentItem(), newfdlg.ui->ColorButton->color().name() ); fov->FOVListBox->changeItem( newfdlg.ui->FOVName->text(), fov->FOVListBox->currentItem() ); - FOVList.tqreplace( fov->FOVListBox->currentItem(), newfov ); + FOVList.replace( fov->FOVListBox->currentItem(), newfov ); } } diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui index e4dc18d5..66ae1f5a 100644 --- a/kstars/kstars/fovdialogui.ui +++ b/kstars/kstars/fovdialogui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>FOVDialogUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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> @@ -182,7 +182,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> <includehint>kpushbutton.h</includehint> 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 442adf20..38b268e6 100644 --- a/kstars/kstars/histdialog.ui +++ b/kstars/kstars/histdialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>histDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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> @@ -332,7 +332,7 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/imagereductionui.ui b/kstars/kstars/imagereductionui.ui index 488c48f3..218e9ec2 100644 --- a/kstars/kstars/imagereductionui.ui +++ b/kstars/kstars/imagereductionui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>imageReductionUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -79,7 +79,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -199,7 +199,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -257,7 +257,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout14_2</cstring> + <cstring>layout14_2</cstring> </property> <hbox> <property name="name"> @@ -425,7 +425,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -607,5 +607,5 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp index f43ab5e8..7ad344da 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; @@ -290,7 +290,7 @@ void imagesequence::stopSequence() if (stdDevCCD) { - stdDevCCD->setqCount = 0; + stdDevCCD->seqCount = 0; stdDevCCD->batchMode = false; stdDevCCD->ISOMode = false; diff --git a/kstars/kstars/imagesequence.h b/kstars/kstars/imagesequence.h index f935908b..8d467593 100644 --- a/kstars/kstars/imagesequence.h +++ b/kstars/kstars/imagesequence.h @@ -27,7 +27,7 @@ public: ~imagesequence(); -bool updatetqStatus(); +bool updateStatus(); private: KStars *ksw; diff --git a/kstars/kstars/imgsequencedlgui.ui b/kstars/kstars/imgsequencedlgui.ui index a9acfe7d..024493fe 100644 --- a/kstars/kstars/imgsequencedlgui.ui +++ b/kstars/kstars/imgsequencedlgui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>imgSequenceDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -38,7 +38,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <vbox> <property name="name"> @@ -46,7 +46,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <vbox> <property name="name"> @@ -328,7 +328,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout28</cstring> + <cstring>layout28</cstring> </property> <vbox> <property name="name"> @@ -404,7 +404,7 @@ </property> <widget class="QLayoutWidget" 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> @@ -483,7 +483,7 @@ <tabstop>stopB</tabstop> <tabstop>closeB</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/indi/apmount.cpp b/kstars/kstars/indi/apmount.cpp index 781e2a07..d1c05b66 100644 --- a/kstars/kstars/indi/apmount.cpp +++ b/kstars/kstars/indi/apmount.cpp @@ -728,9 +728,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 4ed8d8c6..4e8c1b00 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_tqStatus_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; @@ -576,65 +576,65 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus() DataHalted = false; RamError = false; - if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_IMAGING_ACTIVE) != 0 ) + if ( (m_pvtStatusReg & FPGA_BIT_STATUS_IMAGING_ACTIVE) != 0 ) Active = true; - if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_IMAGE_EXPOSING) != 0 ) + if ( (m_pvtStatusReg & FPGA_BIT_STATUS_IMAGE_EXPOSING) != 0 ) Exposing = true; - if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_IMAGE_DONE) != 0 ) + if ( (m_pvtStatusReg & FPGA_BIT_STATUS_IMAGE_DONE) != 0 ) Done = true; - if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_FLUSHING) != 0 ) + if ( (m_pvtStatusReg & FPGA_BIT_STATUS_FLUSHING) != 0 ) Flushing = true; - if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_WAITING_TRIGGER) != 0 ) + if ( (m_pvtStatusReg & FPGA_BIT_STATUS_WAITING_TRIGGER) != 0 ) WaitOnTrigger = true; - if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_DATA_HALTED) != 0 ) + if ( (m_pvtStatusReg & FPGA_BIT_STATUS_DATA_HALTED) != 0 ) DataHalted = true; - if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_PATTERN_ERROR) != 0 ) + if ( (m_pvtStatusReg & FPGA_BIT_STATUS_PATTERN_ERROR) != 0 ) RamError = true; if ( RamError ) { - m_pvtImagingtqStatus = Apn_tqStatus_PatternError; + m_pvtImagingStatus = Apn_Status_PatternError; } else { if ( DataHalted ) { - m_pvtImagingtqStatus = Apn_tqStatus_DataError; + m_pvtImagingStatus = Apn_Status_DataError; } else { if ( WaitOnTrigger ) { - m_pvtImagingtqStatus = Apn_tqStatus_WaitingOnTrigger; + m_pvtImagingStatus = Apn_Status_WaitingOnTrigger; } else { if ( Done && m_pvtImageInProgress ) { m_pvtImageReady = true; - m_pvtImagingtqStatus = Apn_tqStatus_ImageReady; + m_pvtImagingStatus = Apn_Status_ImageReady; } else { if ( Active ) { if ( Exposing ) - m_pvtImagingtqStatus = Apn_tqStatus_Exposing; + m_pvtImagingStatus = Apn_Status_Exposing; else - m_pvtImagingtqStatus = Apn_tqStatus_ImagingActive; + m_pvtImagingStatus = Apn_Status_ImagingActive; } else { if ( Flushing ) - m_pvtImagingtqStatus = Apn_tqStatus_Flushing; + m_pvtImagingStatus = Apn_Status_Flushing; else - m_pvtImagingtqStatus = Apn_tqStatus_Idle; + m_pvtImagingStatus = Apn_Status_Idle; } } } @@ -642,39 +642,39 @@ Apn_tqStatus CApnCamera::read_ImagingtqStatus() } /* - switch( m_pvtImagingtqStatus ) + switch( m_pvtImagingStatus ) { - case Apn_tqStatus_DataError: - OutputDebugString( "ImagingtqStatus: Apn_tqStatus_DataError" ); + case Apn_Status_DataError: + OutputDebugString( "ImagingStatus: Apn_Status_DataError" ); break; - case Apn_tqStatus_PatternError: - OutputDebugString( "ImagingtqStatus: Apn_tqStatus_PatternError" ); + case Apn_Status_PatternError: + OutputDebugString( "ImagingStatus: Apn_Status_PatternError" ); break; - case Apn_tqStatus_Idle: - OutputDebugString( "ImagingtqStatus: Apn_tqStatus_Idle" ); + case Apn_Status_Idle: + OutputDebugString( "ImagingStatus: Apn_Status_Idle" ); break; - case Apn_tqStatus_Exposing: - OutputDebugString( "ImagingtqStatus: Apn_tqStatus_Exposing" ); + case Apn_Status_Exposing: + OutputDebugString( "ImagingStatus: Apn_Status_Exposing" ); break; - case Apn_tqStatus_ImagingActive: - OutputDebugString( "ImagingtqStatus: Apn_tqStatus_ImagingActive" ); + case Apn_Status_ImagingActive: + OutputDebugString( "ImagingStatus: Apn_Status_ImagingActive" ); break; - case Apn_tqStatus_ImageReady: - OutputDebugString( "ImagingtqStatus: Apn_tqStatus_ImageReady" ); + case Apn_Status_ImageReady: + OutputDebugString( "ImagingStatus: Apn_Status_ImageReady" ); break; - case Apn_tqStatus_Flushing: - OutputDebugString( "ImagingtqStatus: Apn_tqStatus_Flushing" ); + case Apn_Status_Flushing: + OutputDebugString( "ImagingStatus: Apn_Status_Flushing" ); break; - case Apn_tqStatus_WaitingOnTrigger: - OutputDebugString( "ImagingtqStatus: Apn_tqStatus_WaitingOnTrigger" ); + case Apn_Status_WaitingOnTrigger: + OutputDebugString( "ImagingStatus: Apn_Status_WaitingOnTrigger" ); break; default: - OutputDebugString( "ImagingtqStatus: UNDEFINED!!" ); + OutputDebugString( "ImagingStatus: UNDEFINED!!" ); break; } */ - return m_pvtImagingtqStatus; + return m_pvtImagingStatus; } Apn_LedMode CApnCamera::read_LedMode() @@ -763,51 +763,51 @@ 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; - if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_TEMP_AT_TEMP) != 0 ) + if ( (m_pvtStatusReg & FPGA_BIT_STATUS_TEMP_AT_TEMP) != 0 ) CoolerAtTemp = true; - if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_TEMP_ACTIVE) != 0 ) + if ( (m_pvtStatusReg & FPGA_BIT_STATUS_TEMP_ACTIVE) != 0 ) CoolerActive = true; - if ( (m_pvtqStatusReg & FPGA_BIT_STATUS_TEMP_REVISION) != 0 ) + if ( (m_pvtStatusReg & FPGA_BIT_STATUS_TEMP_REVISION) != 0 ) CoolerTempRevised = true; // Now derive our cooler state if ( !CoolerActive ) { - m_pvtCoolertqStatus = Apn_CoolertqStatus_Off; + m_pvtCoolerStatus = Apn_CoolerStatus_Off; } else { if ( CoolerTempRevised ) { - m_pvtCoolertqStatus = Apn_CoolertqStatus_Revision; + m_pvtCoolerStatus = Apn_CoolerStatus_Revision; } else { if ( CoolerAtTemp ) - m_pvtCoolertqStatus = Apn_CoolertqStatus_AtSetPoint; + m_pvtCoolerStatus = Apn_CoolerStatus_AtSetPoint; else - m_pvtCoolertqStatus = Apn_CoolertqStatus_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_CoolertqStatus_Off ) + // also implicitly calls UpdateGeneralStatus() as part of read_CoolerStatus() + if ( read_CoolerStatus() == Apn_CoolerStatus_Off ) m_pvtCoolerEnable = false; else m_pvtCoolerEnable = true; @@ -1827,9 +1827,9 @@ long CApnCamera::WriteTwelveBitOffset() return 0; } -void CApnCamera::UpdateGeneraltqStatus() +void CApnCamera::UpdateGeneralStatus() { - unsigned short tqStatusReg; + unsigned short StatusReg; unsigned short HeatsinkTempReg; unsigned short CcdTempReg; unsigned short CoolerDriveReg; @@ -1840,7 +1840,7 @@ void CApnCamera::UpdateGeneraltqStatus() // Read the general status register of the device - QuerytqStatusRegs( tqStatusReg, + QueryStatusRegs( StatusReg, HeatsinkTempReg, CcdTempReg, CoolerDriveReg, @@ -1848,7 +1848,7 @@ void CApnCamera::UpdateGeneraltqStatus() TdiCounterReg, SequenceCounterReg ); - m_pvtqStatusReg = tqStatusReg; + m_pvtStatusReg = StatusReg; HeatsinkTempReg &= FPGA_MASK_TEMP_PARAMS; CcdTempReg &= FPGA_MASK_TEMP_PARAMS; @@ -1869,7 +1869,7 @@ void CApnCamera::UpdateGeneraltqStatus() m_pvtInputVoltage = VoltageReg * APN_VOLTAGE_RESOLUTION; // Update ShutterState - m_pvtShutterState = ( (m_pvtqStatusReg & FPGA_BIT_STATUS_SHUTTER_OPEN) != 0 ); + m_pvtShutterState = ( (m_pvtStatusReg & FPGA_BIT_STATUS_SHUTTER_OPEN) != 0 ); } diff --git a/kstars/kstars/indi/apogee/ApnCamera.h b/kstars/kstars/indi/apogee/ApnCamera.h index f1fbef49..b0e6af03 100644 --- a/kstars/kstars/indi/apogee/ApnCamera.h +++ b/kstars/kstars/indi/apogee/ApnCamera.h @@ -83,7 +83,7 @@ public: unsigned short val[], unsigned short count ); - long QuerytqStatusRegs( unsigned short& tqStatusReg, + long QueryStatusRegs( unsigned short& StatusReg, unsigned short& HeatsinkTempReg, unsigned short& CcdTempReg, unsigned short& CoolerDriveReg, @@ -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,13 +264,13 @@ 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; - unsigned short m_pvtqStatusReg; + unsigned short m_pvtStatusReg; double m_pvtCoolerDrive; double m_pvtCurrentHeatsinkTemp; 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 9a11d6c4..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; @@ -238,7 +238,7 @@ long CApnCamera::WriteMultiMRMD( unsigned short reg[], unsigned short val[], uns } -long CApnCamera::QuerytqStatusRegs( unsigned short& tqStatusReg, +long CApnCamera::QueryStatusRegs( unsigned short& StatusReg, unsigned short& HeatsinkTempReg, unsigned short& CcdTempReg, unsigned short& CoolerDriveReg, @@ -262,7 +262,7 @@ long CApnCamera::QuerytqStatusRegs( unsigned short& tqStatusReg, return 1; } - tqStatusReg = RegData[0]; + StatusReg = RegData[0]; HeatsinkTempReg = RegData[1]; CcdTempReg = RegData[2]; CoolerDriveReg = RegData[3]; diff --git a/kstars/kstars/indi/apogee/ApnCamera_NET.h b/kstars/kstars/indi/apogee/ApnCamera_NET.h index 210e8d29..e46d3846 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_NET.h +++ b/kstars/kstars/indi/apogee/ApnCamera_NET.h @@ -61,7 +61,7 @@ public: unsigned short val[], unsigned short count ); - long QuerytqStatusRegs( unsigned short& tqStatusReg, + long QueryStatusRegs( unsigned short& StatusReg, unsigned short& HeatsinkTempReg, unsigned short& CcdTempReg, unsigned short& CoolerDriveReg, diff --git a/kstars/kstars/indi/apogee/ApnCamera_USB.cpp b/kstars/kstars/indi/apogee/ApnCamera_USB.cpp index 090ac3c1..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]; @@ -228,7 +228,7 @@ long CApnCamera::WriteMultiMRMD( unsigned short reg[], unsigned short val[], uns } -long CApnCamera::QuerytqStatusRegs( unsigned short& tqStatusReg, +long CApnCamera::QueryStatusRegs( unsigned short& StatusReg, unsigned short& HeatsinkTempReg, unsigned short& CcdTempReg, unsigned short& CoolerDriveReg, @@ -238,7 +238,7 @@ long CApnCamera::QuerytqStatusRegs( unsigned short& tqStatusReg, { /*unsigned short stat,heat,ccdt,cool,volt,tdic,sequ;*/ - if ( ApnUsbReadtqStatusRegs( &tqStatusReg, + if ( ApnUsbReadStatusRegs( &StatusReg, &HeatsinkTempReg, &CcdTempReg, &CoolerDriveReg, diff --git a/kstars/kstars/indi/apogee/ApnCamera_USB.h b/kstars/kstars/indi/apogee/ApnCamera_USB.h index c8086c38..0d4a3d07 100644 --- a/kstars/kstars/indi/apogee/ApnCamera_USB.h +++ b/kstars/kstars/indi/apogee/ApnCamera_USB.h @@ -56,7 +56,7 @@ public: unsigned short val[], unsigned short count ); - long QuerytqStatusRegs( unsigned short& tqStatusReg, + long QueryStatusRegs( unsigned short& StatusReg, unsigned short& HeatsinkTempReg, unsigned short& CcdTempReg, unsigned short& CoolerDriveReg, diff --git a/kstars/kstars/indi/apogee/Apogee.h b/kstars/kstars/indi/apogee/Apogee.h index cee9b37c..d97740b2 100644 --- a/kstars/kstars/indi/apogee/Apogee.h +++ b/kstars/kstars/indi/apogee/Apogee.h @@ -29,15 +29,15 @@ #define Apn_CameraMode_ExternalTrigger 3 #define Apn_CameraMode_ExternalShutter 4 -#define Apn_tqStatus int -#define Apn_tqStatus_DataError -2 -#define Apn_tqStatus_PatternError -1 -#define Apn_tqStatus_Idle 0 -#define Apn_tqStatus_Exposing 1 -#define Apn_tqStatus_ImagingActive 2 -#define Apn_tqStatus_ImageReady 3 -#define Apn_tqStatus_Flushing 4 -#define Apn_tqStatus_WaitingOnTrigger 5 +#define Apn_Status int +#define Apn_Status_DataError -2 +#define Apn_Status_PatternError -1 +#define Apn_Status_Idle 0 +#define Apn_Status_Exposing 1 +#define Apn_Status_ImagingActive 2 +#define Apn_Status_ImageReady 3 +#define Apn_Status_Flushing 4 +#define Apn_Status_WaitingOnTrigger 5 #define Apn_LedMode int #define Apn_LedMode_DisableAll 0 @@ -54,11 +54,11 @@ #define Apn_LedState_ExtStartReadout 6 #define Apn_LedState_AtTemp 7 -#define Apn_CoolertqStatus int -#define Apn_CoolertqStatus_Off 0 -#define Apn_CoolertqStatus_RampingToSetPoint 1 -#define Apn_CoolertqStatus_AtSetPoint 2 -#define Apn_CoolertqStatus_Revision 3 +#define Apn_CoolerStatus int +#define Apn_CoolerStatus_Off 0 +#define Apn_CoolerStatus_RampingToSetPoint 1 +#define Apn_CoolerStatus_AtSetPoint 2 +#define Apn_CoolerStatus_Revision 3 #define Apn_FanMode int #define Apn_FanMode_Off 0 @@ -67,24 +67,24 @@ #define Apn_FanMode_High 3 -#define Camera_tqStatus int -#define Camera_tqStatus_Idle 0 -#define Camera_tqStatus_Waiting 1 -#define Camera_tqStatus_Exposing 2 -#define Camera_tqStatus_Downloading 3 -#define Camera_tqStatus_LineReady 4 -#define Camera_tqStatus_ImageReady 5 -#define Camera_tqStatus_Flushing 6 - -#define Camera_CoolertqStatus int -#define Camera_CoolertqStatus_Off 0 -#define Camera_CoolertqStatus_RampingToSetPoint 1 -#define Camera_CoolertqStatus_Correcting 2 -#define Camera_CoolertqStatus_RampingToAmbient 3 -#define Camera_CoolertqStatus_AtAmbient 4 -#define Camera_CoolertqStatus_AtMax 5 -#define Camera_CoolertqStatus_AtMin 6 -#define Camera_CoolertqStatus_AtSetPoint 7 +#define Camera_Status int +#define Camera_Status_Idle 0 +#define Camera_Status_Waiting 1 +#define Camera_Status_Exposing 2 +#define Camera_Status_Downloading 3 +#define Camera_Status_LineReady 4 +#define Camera_Status_ImageReady 5 +#define Camera_Status_Flushing 6 + +#define Camera_CoolerStatus int +#define Camera_CoolerStatus_Off 0 +#define Camera_CoolerStatus_RampingToSetPoint 1 +#define Camera_CoolerStatus_Correcting 2 +#define Camera_CoolerStatus_RampingToAmbient 3 +#define Camera_CoolerStatus_AtAmbient 4 +#define Camera_CoolerStatus_AtMax 5 +#define Camera_CoolerStatus_AtMin 6 +#define Camera_CoolerStatus_AtSetPoint 7 #define Camera_CoolerMode int #define Camera_CoolerMode_Off 0 diff --git a/kstars/kstars/indi/apogee/ApogeeIoctl.h b/kstars/kstars/indi/apogee/ApogeeIoctl.h index 42ac1d8f..ec0fc580 100644 --- a/kstars/kstars/indi/apogee/ApogeeIoctl.h +++ b/kstars/kstars/indi/apogee/ApogeeIoctl.h @@ -4,7 +4,7 @@ // //Portions Copyright (c) 2000 The Random Factory. // -// Define the IOCTL codes we will use. The IOCTL code tqcontains a command +// Define the IOCTL codes we will use. The IOCTL code contains a command // identifier, plus other information about the device, the type of access // with which the file must have been opened, and the type of buffering. // diff --git a/kstars/kstars/indi/apogee/ApogeeUsb.h b/kstars/kstars/indi/apogee/ApogeeUsb.h index 6924ffab..f242ea6a 100644 --- a/kstars/kstars/indi/apogee/ApogeeUsb.h +++ b/kstars/kstars/indi/apogee/ApogeeUsb.h @@ -61,7 +61,7 @@ APN_USB_TYPE ApnUsbWriteRegMultiMRMD( unsigned short FpgaReg[], unsigned short RegCount ); -APN_USB_TYPE ApnUsbReadtqStatusRegs( unsigned short *tqStatusReg, +APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, unsigned short *HeatsinkTempReg, unsigned short *CcdTempReg, unsigned short *CoolerDriveReg, diff --git a/kstars/kstars/indi/apogee/ApogeeUsbLinux.cpp b/kstars/kstars/indi/apogee/ApogeeUsbLinux.cpp index 2d51d147..fcedd1d9 100644 --- a/kstars/kstars/indi/apogee/ApogeeUsbLinux.cpp +++ b/kstars/kstars/indi/apogee/ApogeeUsbLinux.cpp @@ -192,7 +192,7 @@ APN_USB_TYPE ApnUsbWriteRegMultiMRMD( unsigned short FpgaReg[], } -APN_USB_TYPE ApnUsbReadtqStatusRegs( unsigned short *tqStatusReg, +APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, unsigned short *HeatsinkTempReg, unsigned short *CcdTempReg, unsigned short *CoolerDriveReg, @@ -203,15 +203,15 @@ APN_USB_TYPE ApnUsbReadtqStatusRegs( unsigned short *tqStatusReg, BOOLEAN Success; /*unsigned int BytesReceived;*/ unsigned short *Data; - unsigned char tqStatusData[21]; + unsigned char StatusData[21]; Success = usb_control_msg(g_hSysDriver, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, VND_APOGEE_STATUS, - 0, 0, (char *)&tqStatusData, 21, 3000); + 0, 0, (char *)&StatusData, 21, 3000); // if ( !Success ) // return APN_USB_ERR_STATUS; - Data = (unsigned short *)tqStatusData; + Data = (unsigned short *)StatusData; *HeatsinkTempReg = Data[0]; *CcdTempReg = Data[1]; @@ -219,11 +219,11 @@ APN_USB_TYPE ApnUsbReadtqStatusRegs( unsigned short *tqStatusReg, *VoltageReg = Data[3]; *TdiCounter = Data[4]; *SequenceCounter = Data[5]; - *tqStatusReg = Data[6]; + *StatusReg = Data[6]; - if ( (tqStatusData[20] & 0x01) != 0 ) + if ( (StatusData[20] & 0x01) != 0 ) { - *tqStatusReg |= 0x8; + *StatusReg |= 0x8; } return APN_USB_SUCCESS; diff --git a/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp b/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp index cae78e59..4cbb77b2 100644 --- a/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp +++ b/kstars/kstars/indi/apogee/ApogeeUsbLinuxForKernel.cpp @@ -213,7 +213,7 @@ APN_USB_TYPE ApnUsbWriteRegMultiMRMD( unsigned short FpgaReg[], } -APN_USB_TYPE ApnUsbReadtqStatusRegs( unsigned short *tqStatusReg, +APN_USB_TYPE ApnUsbReadStatusRegs( unsigned short *StatusReg, unsigned short *HeatsinkTempReg, unsigned short *CcdTempReg, unsigned short *CoolerDriveReg, @@ -226,15 +226,15 @@ APN_USB_TYPE ApnUsbReadtqStatusRegs( unsigned short *tqStatusReg, unsigned short RegNumber; struct apIOparam request; unsigned short *Data; - unsigned char tqStatusData[21]; + unsigned char StatusData[21]; request.reg = 0; //check this ******************* - request.param1=(unsigned long)&tqStatusData; + request.param1=(unsigned long)&StatusData; Success=ioctl(g_hSysDriver,APUSB_READ_STATUS,(unsigned long)&request); // if ( !Success ) // return APN_USB_ERR_STATUS; - Data = (unsigned short *)tqStatusData; + Data = (unsigned short *)StatusData; *HeatsinkTempReg = Data[0]; *CcdTempReg = Data[1]; @@ -242,11 +242,11 @@ APN_USB_TYPE ApnUsbReadtqStatusRegs( unsigned short *tqStatusReg, *VoltageReg = Data[3]; *TdiCounter = Data[4]; *SequenceCounter = Data[5]; - *tqStatusReg = Data[6]; + *StatusReg = Data[6]; - if ( (tqStatusData[20] & 0x01) != 0 ) + if ( (StatusData[20] & 0x01) != 0 ) { - *tqStatusReg |= 0x8; + *StatusReg |= 0x8; } return APN_USB_SUCCESS; diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp index fcfd9070..67d217ec 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_tqStatus_Idle; - m_CoolertqStatus = Camera_CoolertqStatus_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 ) @@ -611,7 +611,7 @@ bool CCameraIO::GetImage( unsigned short* pImageData, short& xSize, short& ySize if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UntqmaskIrqs(); +// UnmaskIrqs(); if ( ret ) { // We were successfull @@ -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 ) @@ -746,7 +746,7 @@ bool CCameraIO::GetLine( unsigned short* pLineData, short& xSize ) if ( m_HighPriority ) SetPriorityClass ( hProcess, Class ); } -// UntqmaskIrqs(); +// UnmaskIrqs(); return ret; } @@ -763,11 +763,11 @@ 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(); - if ( stat == Camera_tqStatus_Exposing ) break; + stat = read_Status(); + if ( stat == Camera_Status_Exposing ) break; Sleep( 220 ); // dont bog down the CPU while polling } m_WaitingforTrigger = false; @@ -778,8 +778,8 @@ 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(); - if ( stat == Camera_tqStatus_ImageReady ) break; + Camera_Status stat = read_Status(); + if ( stat == Camera_Status_ImageReady ) break; if ( clock() > StopTime ) return false; // Timed out, no image available Sleep( 220 ); // dont bog down the CPU while polling @@ -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_tqStatus_Exposing; + m_Status = Camera_Status_Exposing; } else if ( m_WaitingforTrigger ) - m_tqStatus = Camera_tqStatus_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_tqStatus_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_tqStatus_LineReady; + m_Status = Camera_Status_LineReady; } else if ( m_WaitingforImage || m_WaitingforLine ) { ATLTRACE( "Flushing\r\n" ); - m_tqStatus = Camera_tqStatus_Flushing; + m_Status = Camera_Status_Flushing; } else - m_tqStatus = Camera_tqStatus_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_CoolertqStatus_AtAmbient; + m_CoolerStatus = Camera_CoolerStatus_AtAmbient; else - m_CoolertqStatus = Camera_CoolertqStatus_RampingToAmbient; + m_CoolerStatus = Camera_CoolerStatus_RampingToAmbient; } else { if ( val2 & RegBit_TempAtMax ) //11.5 - m_CoolertqStatus = Camera_CoolertqStatus_AtMax; + m_CoolerStatus = Camera_CoolerStatus_AtMax; else if ( val2 & RegBit_TempAtMin ) //11.4 - m_CoolertqStatus = Camera_CoolertqStatus_AtMin; + m_CoolerStatus = Camera_CoolerStatus_AtMin; else if ( val2 & RegBit_TempAtSetPoint ) //11.7 - m_CoolertqStatus = Camera_CoolertqStatus_AtSetPoint; + m_CoolerStatus = Camera_CoolerStatus_AtSetPoint; // Check against last known cooler status - else if ( m_CoolertqStatus == Camera_CoolertqStatus_AtSetPoint ) - m_CoolertqStatus = Camera_CoolertqStatus_Correcting; + else if ( m_CoolerStatus == Camera_CoolerStatus_AtSetPoint ) + m_CoolerStatus = Camera_CoolerStatus_Correcting; else - m_CoolertqStatus = Camera_CoolertqStatus_RampingToSetPoint; + m_CoolerStatus = Camera_CoolerStatus_RampingToSetPoint; } } else - m_CoolertqStatus = Camera_CoolertqStatus_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 6edfe467..d6a61e1c 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 ); @@ -271,8 +271,8 @@ public: // Mask user requested set of IRQS // void MaskIrqs(); - // Restore default IRQ tqmask -// void UntqmaskIrqs(); + // Restore default IRQ mask +// void UnmaskIrqs(); // Starts flushing the camera (which should be the normal idle state) // If Rows is non-negative, only the specified number of rows are flushed, @@ -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,8 +356,8 @@ 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. - unsigned int m_IRQMask; // Set of IRQs tqmasked on user request // 0: Off + Camera_CoolerStatus m_CoolerStatus; // Last known cooler status. + unsigned int m_IRQMask; // Set of IRQs masked on user request // 0: Off // 1: Ramping to set point // 2: Correcting // 3: Ramping to ambient 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 52a95f43..f1f64121 100644 --- a/kstars/kstars/indi/apogee/Camera_Example.cpp +++ b/kstars/kstars/indi/apogee/Camera_Example.cpp @@ -295,9 +295,9 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) } ///////////////////////////////////////////////////////////////////////////////// - // Necessary tqgeometry settings + // Necessary geometry settings - if (CfgGet (inifp, "tqgeometry", "rows", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "geometry", "rows", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALROWS ) cam->m_Rows = val; @@ -310,7 +310,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) return CCD_OPEN_CFGDATA; // rows MUST be defined } - if (CfgGet (inifp, "tqgeometry", "columns", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "geometry", "columns", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALCOLUMNS ) cam->m_Columns = val; @@ -490,31 +490,31 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) ///////////////////////////////////////////////////////////////////////////////// // Geometry - if (CfgGet (inifp, "tqgeometry", "bic", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "geometry", "bic", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXCOLUMNS ) cam->m_BIC = val; } - if (CfgGet (inifp, "tqgeometry", "bir", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "geometry", "bir", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXROWS ) cam->m_BIR = val; } - if (CfgGet (inifp, "tqgeometry", "skipc", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "geometry", "skipc", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 0 && val <= MAXCOLUMNS ) cam->m_SkipC = val; } - if (CfgGet (inifp, "tqgeometry", "skipr", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "geometry", "skipr", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 0 && val <= MAXROWS ) cam->m_SkipR = val; } - if (CfgGet (inifp, "tqgeometry", "imgcols", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "geometry", "imgcols", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALCOLUMNS ) cam->m_ImgColumns = val; @@ -522,7 +522,7 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) else cam->m_ImgColumns = cam->m_Columns - cam->m_BIC - cam->m_SkipC; - if (CfgGet (inifp, "tqgeometry", "imgrows", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "geometry", "imgrows", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXTOTALROWS ) cam->m_ImgRows = val; @@ -530,13 +530,13 @@ long config_load( char* cfgname, short BaseAddress, short RegOffset ) else cam->m_ImgRows = cam->m_Rows - cam->m_BIR - cam->m_SkipR; - if (CfgGet (inifp, "tqgeometry", "hflush", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "geometry", "hflush", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXHBIN ) cam->m_HFlush = val; } - if (CfgGet (inifp, "tqgeometry", "vflush", retbuf, sizeof(retbuf), &plen)) + if (CfgGet (inifp, "geometry", "vflush", retbuf, sizeof(retbuf), &plen)) { short val = hextoi(retbuf); if ( val >= 1 && val <= MAXVBIN ) cam->m_VFlush = val; diff --git a/kstars/kstars/indi/apogee_ppi.cpp b/kstars/kstars/indi/apogee_ppi.cpp index 26efb4cc..9898018f 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_tqStatus_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/celestronprotocol.h b/kstars/kstars/indi/celestronprotocol.h index aae4f204..d7c956f7 100644 --- a/kstars/kstars/indi/celestronprotocol.h +++ b/kstars/kstars/indi/celestronprotocol.h @@ -2,7 +2,7 @@ * Header File for the Telescope Control protocols for the Meade LX200 * Author: John Kielkopf (kielkopf@louisville.edu) * -* This file tqcontains header information used in common with xmtel. +* This file contains header information used in common with xmtel. * * 15 May 2003 -- Version 2.00 * diff --git a/kstars/kstars/indi/fitsrw.c b/kstars/kstars/indi/fitsrw.c index ac2c0e39..b21622bf 100644 --- a/kstars/kstars/indi/fitsrw.c +++ b/kstars/kstars/indi/fitsrw.c @@ -1676,7 +1676,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, {double offs, scale; double datadiff, pixdiff; unsigned char pixbuffer[4096], *pix, *cdata; - unsigned char ctqreplace; + unsigned char creplace; int transcount = 0; long tdata, tmin, tmax; int maxelem; @@ -1706,7 +1706,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, if (tmax < 0) tmax = 0; else if (tmax > 255) tmax = 255; cdata = (unsigned char *)buf; - ctqreplace = (unsigned char)trans->tqreplacement; + creplace = (unsigned char)trans->replacement; switch (hdulist->bitpix) { @@ -1727,7 +1727,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { bp8 = (FITS_BITPIX8)*(pix++); if (bp8 == bp8blank) /* Is it a blank pixel ? */ - *(cdata++) = ctqreplace; + *(cdata++) = creplace; else /* Do transform */ { tdata = (long)(bp8 * scale + offs); @@ -1770,7 +1770,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { FITS_GETBITPIX16 (pix, bp16); if (bp16 == bp16blank) - *(cdata++) = ctqreplace; + *(cdata++) = creplace; else { tdata = (long)(bp16 * scale + offs); @@ -1815,7 +1815,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, { FITS_GETBITPIX32 (pix, bp32); if (bp32 == bp32blank) - *(cdata++) = ctqreplace; + *(cdata++) = creplace; else { tdata = (long)(bp32 * scale + offs); @@ -1856,7 +1856,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, while (maxelem--) { if (fits_nan_32 (pix)) /* An IEEE special value ? */ - *(cdata++) = ctqreplace; + *(cdata++) = creplace; else /* Do transform */ { FITS_GETBITPIXM32 (pix, bpm32); @@ -1884,7 +1884,7 @@ int fits_read_pixel (FITS_FILE *ff, FITS_HDU_LIST *hdulist, int npix, while (maxelem--) { if (fits_nan_64 (pix)) - *(cdata++) = ctqreplace; + *(cdata++) = creplace; else { FITS_GETBITPIXM64 (pix, bpm64); @@ -1953,7 +1953,7 @@ int fits_to_pgmraw (char *fitsfile, char *pgmfile) trans.pixmax = hdu->pixmax; trans.datamin = 0.0; trans.datamax = 255.0; - trans.tqreplacement = 0.0; /* Blank/NaN tqreplacement value */ + trans.replacement = 0.0; /* Blank/NaN replacement value */ trans.dsttyp = 'c'; /* Output type is character */ nbytes = hdu->naxisn[0]*hdu->naxisn[1]; diff --git a/kstars/kstars/indi/fitsrw.h b/kstars/kstars/indi/fitsrw.h index 37a80492..9a246930 100644 --- a/kstars/kstars/indi/fitsrw.h +++ b/kstars/kstars/indi/fitsrw.h @@ -82,7 +82,7 @@ typedef enum { typedef struct { double pixmin, pixmax; /** The pixel values [pixmin,pixmax] that should be mapped */ double datamin, datamax; /** The data values [datamin,datamax] that the pixel values should be mapped to*/ - double tqreplacement; /** datavalue to use for blank or NaN pixels */ + double replacement; /** datavalue to use for blank or NaN pixels */ char dsttyp; /** Destination typ ('c' = char) */ } FITS_PIX_TRANSFORM; @@ -110,7 +110,7 @@ typedef struct fits_record_list { /** \struct FITS_HDU_LIST \brief Header and Data Unit List. -* The structure hold header and data unit lists. The \p used struct tqcontains flags specifying if some cards are used. +* The structure hold header and data unit lists. The \p used struct contains flags specifying if some cards are used. */ typedef struct fits_hdu_list { long header_offset; /** Offset of header in the file */ diff --git a/kstars/kstars/indi/fli/libfli.c b/kstars/kstars/indi/fli/libfli.c index d3962a62..68df7945 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 2ce10786..4fa9a95a 100644 --- a/kstars/kstars/indi/fli_ccd.c +++ b/kstars/kstars/indi/fli_ccd.c @@ -610,13 +610,13 @@ 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; - IDSetNumber(&ExposeTimeNP, "FLIGetExposuretqStatus() failed. %s.", strerror((int)-err)); - IDLog("FLIGetExposuretqStatus() failed. %s.\n", strerror((int)-err)); + IDSetNumber(&ExposeTimeNP, "FLIGetExposureStatus() failed. %s.", strerror((int)-err)); + IDLog("FLIGetExposureStatus() failed. %s.\n", strerror((int)-err)); break; } diff --git a/kstars/kstars/indi/indiserver.c b/kstars/kstars/indi/indiserver.c index c412e883..ad4d2ffd 100644 --- a/kstars/kstars/indi/indiserver.c +++ b/kstars/kstars/indi/indiserver.c @@ -710,7 +710,7 @@ send2Clients (ClInfo *notme, XMLEle *root, char *dev) pthread_mutex_unlock (&client_m); } -/* free Msg mp and everything it tqcontains */ +/* free Msg mp and everything it contains */ static void freeMsg (Msg *mp) { diff --git a/kstars/kstars/indi/lilxml.c b/kstars/kstars/indi/lilxml.c index be9d6bac..c8344b5e 100644 --- a/kstars/kstars/indi/lilxml.c +++ b/kstars/kstars/indi/lilxml.c @@ -532,7 +532,7 @@ oneXMLchar (LilXML *lp, int c, char errmsg[]) case INCON: /* reading content */ if (c == '<') { - /* if text tqcontains a nl trim trailing blanks. + /* if text contains a nl trim trailing blanks. * chomp trailing nl if only one. */ char *nl = strpbrk (lp->ce->pcdata, "\n\r"); diff --git a/kstars/kstars/indi/lx200_16.cpp b/kstars/kstars/indi/lx200_16.cpp index 8b705728..fe37df18 100644 --- a/kstars/kstars/indi/lx200_16.cpp +++ b/kstars/kstars/indi/lx200_16.cpp @@ -54,7 +54,7 @@ extern int MaxReticleFlashRate; // bool setObjAz(int degrees, int minutes); -static ISwitch FantqStatusS[] = { {"On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_OFF, 0, 0}}; +static ISwitch FanStatusS[] = { {"On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_OFF, 0, 0}}; static ISwitch HomeSearchS[] = { {"Save home", "", ISS_OFF, 0, 0} , {"Set home", "", ISS_OFF, 0, 0}}; static ISwitch FieldDeRotatorS[] = { {"On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_OFF,0 ,0}}; //static ISwitch SlewAltAzS[] = { {"Slew To Alt/Az", ISS_ON}}; @@ -65,7 +65,7 @@ static ISwitch FieldDeRotatorS[] = { {"On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_ #define MAXINDIGROUP 32 #define MAXINDIFORMAT 32 -static ISwitchVectorProperty FantqStatusSw = { mydev, "Fan", "", LX16GROUP, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, FantqStatusS, NARRAY(FantqStatusS), "", 0}; +static ISwitchVectorProperty FanStatusSw = { mydev, "Fan", "", LX16GROUP, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, FanStatusS, NARRAY(FanStatusS), "", 0}; static ISwitchVectorProperty HomeSearchSw = { mydev, "Park", "", LX16GROUP, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, HomeSearchS, NARRAY(HomeSearchS), "", 0}; @@ -85,7 +85,7 @@ static INumberVectorProperty horNum = { void changeLX200_16DeviceName(const char * newName) { strcpy(horNum.device, newName); - strcpy(FantqStatusSw.device, newName); + strcpy(FanStatusSw.device, newName); strcpy(HomeSearchSw.device, newName); strcpy(FieldDeRotatorSw.device,newName); } @@ -106,7 +106,7 @@ if (dev && strcmp (thisDevice, dev)) IDDefNumber (&horNum, NULL); - IDDefSwitch (&FantqStatusSw, NULL); + IDDefSwitch (&FanStatusSw, NULL); IDDefSwitch (&HomeSearchSw, NULL); IDDefSwitch (&FieldDeRotatorSw, NULL); @@ -196,20 +196,20 @@ void LX200_16::ISNewSwitch (const char *dev, const char *name, ISState *states, if (strcmp (dev, thisDevice)) return; - if (!strcmp(name, FantqStatusSw.name)) + if (!strcmp(name, FanStatusSw.name)) { - if (checkPower(&FantqStatusSw)) + if (checkPower(&FanStatusSw)) return; - IUResetSwitches(&FantqStatusSw); - IUUpdateSwitches(&FantqStatusSw, states, names, n); - index = getOnSwitch(&FantqStatusSw); + IUResetSwitches(&FanStatusSw); + IUUpdateSwitches(&FanStatusSw, states, names, n); + index = getOnSwitch(&FanStatusSw); if (index == 0) { if ( (err = turnFanOn()) < 0) { - handleError(&FantqStatusSw, err, "Changing fan status"); + handleError(&FanStatusSw, err, "Changing fan status"); return; } } @@ -217,13 +217,13 @@ void LX200_16::ISNewSwitch (const char *dev, const char *name, ISState *states, { if ( (err = turnFanOff()) < 0) { - handleError(&FantqStatusSw, err, "Changing fan status"); + handleError(&FanStatusSw, err, "Changing fan status"); return; } } - FantqStatusSw.s = IPS_OK; - IDSetSwitch (&FantqStatusSw, index == 0 ? "Fan is ON" : "Fan is OFF"); + FanStatusSw.s = IPS_OK; + IDSetSwitch (&FanStatusSw, index == 0 ? "Fan is ON" : "Fan is OFF"); return; } @@ -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 311e4b68..b4f6d792 100644 --- a/kstars/kstars/indi/lx200generic.cpp +++ b/kstars/kstars/indi/lx200generic.cpp @@ -906,9 +906,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; } @@ -1789,7 +1789,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 0a02b32e..451a7269 100644 --- a/kstars/kstars/indi/lx200gps.cpp +++ b/kstars/kstars/indi/lx200gps.cpp @@ -32,7 +32,7 @@ extern LX200Generic *telescope; extern int MaxReticleFlashRate; static ISwitch GPSPowerS[] = {{ "On", "", ISS_OFF, 0, 0}, {"Off", "", ISS_ON, 0, 0}}; -static ISwitch GPStqStatusS[] = {{ "Sleep", "", ISS_OFF, 0, 0}, {"Wake up", "", ISS_OFF, 0 ,0}, {"Restart", "", ISS_OFF, 0, 0}}; +static ISwitch GPSStatusS[] = {{ "Sleep", "", ISS_OFF, 0, 0}, {"Wake up", "", ISS_OFF, 0 ,0}, {"Restart", "", ISS_OFF, 0, 0}}; static ISwitch GPSUpdateS[] = { {"Update", "", ISS_OFF, 0, 0}}; static ISwitch AltDecPecS[] = {{ "Enable", "", ISS_OFF, 0 ,0}, {"Disable", "", ISS_OFF, 0 ,0}}; static ISwitch AzRaPecS[] = {{ "Enable", "", ISS_OFF, 0, 0}, {"Disable", "", ISS_OFF, 0 ,0}}; @@ -42,7 +42,7 @@ static ISwitch AzRaBackSlashS[] = {{ "Activate", "", ISS_OFF, 0, 0}}; static ISwitch OTAUpdateS[] = {{ "Update", "", ISS_OFF, 0, 0}}; static ISwitchVectorProperty GPSPowerSw = { mydev, "GPS Power", "", GPSGroup, IP_RW, ISR_1OFMANY, 0 , IPS_IDLE, GPSPowerS, NARRAY(GPSPowerS), "", 0}; -static ISwitchVectorProperty GPStqStatusSw = { mydev, "GPS tqStatus", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPStqStatusS, NARRAY(GPStqStatusS), "", 0}; +static ISwitchVectorProperty GPSStatusSw = { mydev, "GPS Status", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSStatusS, NARRAY(GPSStatusS), "", 0}; static ISwitchVectorProperty GPSUpdateSw = { mydev, "GPS System", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, GPSUpdateS, NARRAY(GPSUpdateS), "", 0}; static ISwitchVectorProperty AltDecPecSw = { mydev, "Alt/Dec PEC", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, AltDecPecS, NARRAY(AltDecPecS), "", 0}; static ISwitchVectorProperty AzRaPecSw = { mydev, "Az/Ra PEC", "", GPSGroup, IP_RW, ISR_1OFMANY, 0, IPS_IDLE, AzRaPecS, NARRAY(AzRaPecS), "", 0}; @@ -59,7 +59,7 @@ void updateTemp(void * /*p*/); void changeLX200GPSDeviceName(const char *newName) { strcpy(GPSPowerSw.device, newName); - strcpy(GPStqStatusSw.device, newName ); + strcpy(GPSStatusSw.device, newName ); strcpy(GPSUpdateSw.device, newName ); strcpy(AltDecPecSw.device, newName ); strcpy(AzRaPecSw.device,newName ); @@ -87,7 +87,7 @@ if (dev && strcmp (thisDevice, dev)) LX200_16::ISGetProperties(dev); IDDefSwitch (&GPSPowerSw, NULL); -IDDefSwitch (&GPStqStatusSw, NULL); +IDDefSwitch (&GPSStatusSw, NULL); IDDefSwitch (&GPSUpdateSw, NULL); IDDefSwitch (&AltDecPecSw, NULL); IDDefSwitch (&AzRaPecSw, NULL); @@ -139,15 +139,15 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], return; } - /* GPS tqStatus Update */ - if (!strcmp(name,GPStqStatusSw.name)) + /* GPS Status Update */ + if (!strcmp(name,GPSStatusSw.name)) { - if (checkPower(&GPStqStatusSw)) + if (checkPower(&GPSStatusSw)) return; - IUResetSwitches(&GPStqStatusSw); - IUUpdateSwitches(&GPStqStatusSw, states, names, n); - index = getOnSwitch(&GPStqStatusSw); + IUResetSwitches(&GPSStatusSw); + IUUpdateSwitches(&GPSStatusSw, states, names, n); + index = getOnSwitch(&GPSStatusSw); if (index == 0) { @@ -167,8 +167,8 @@ void LX200GPS::ISNewNumber (const char *dev, const char *name, double values[], updateLocation(); } - GPStqStatusSw.s = IPS_OK; - IDSetSwitch (&GPStqStatusSw, "%s", msg); + GPSStatusSw.s = IPS_OK; + IDSetSwitch (&GPSStatusSw, "%s", msg); return; } diff --git a/kstars/kstars/indi/sbigccd.cpp b/kstars/kstars/indi/sbigccd.cpp index d5b03096..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_tqStatus_ImageReady) + else if (readStatus == Camera_Status_ImageReady) { ExposeTimeN[0].value = 0; ExposeTimeNP.s = IPS_OK; diff --git a/kstars/kstars/indi/webcam/ccvt.h b/kstars/kstars/indi/webcam/ccvt.h index f98a4bd2..c78f88a6 100644 --- a/kstars/kstars/indi/webcam/ccvt.h +++ b/kstars/kstars/indi/webcam/ccvt.h @@ -27,7 +27,7 @@ CCMAIL: kstars-devel@kde.org Revision 1.3 2004/06/26 23:12:03 mutlaqja - Hopefully this will fix compile issues on 64bit archs, and FreeBSD, among others. The assembly code is tqreplaced with a more portable, albeit slower C implementation. I imported the videodev.h header after cleaning it for user space. + Hopefully this will fix compile issues on 64bit archs, and FreeBSD, among others. The assembly code is replaced with a more portable, albeit slower C implementation. I imported the videodev.h header after cleaning it for user space. Anyone who has problems compiling this, please report the problem to kstars-devel@kde.org 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/indi/webcam/ccvt_misc.c b/kstars/kstars/indi/webcam/ccvt_misc.c index 0d907f8b..e774ca6d 100644 --- a/kstars/kstars/indi/webcam/ccvt_misc.c +++ b/kstars/kstars/indi/webcam/ccvt_misc.c @@ -19,7 +19,7 @@ reached at nemosoft@smcc.demon.nl. */ -/* This file tqcontains CCVT functions that aren't available in assembly yet +/* This file contains CCVT functions that aren't available in assembly yet (or are not worth programming) */ @@ -31,7 +31,7 @@ * CCMAIL: kstars-devel@kde.org * * Revision 1.1 2004/06/26 23:12:03 mutlaqja - * Hopefully this will fix compile issues on 64bit archs, and FreeBSD, among others. The assembly code is tqreplaced with a more portable, albeit slower C implementation. I imported the videodev.h header after cleaning it for user space. + * Hopefully this will fix compile issues on 64bit archs, and FreeBSD, among others. The assembly code is replaced with a more portable, albeit slower C implementation. I imported the videodev.h header after cleaning it for user space. * * Anyone who has problems compiling this, please report the problem to kstars-devel@kde.org * diff --git a/kstars/kstars/indi/webcam/pwc-ioctl.h b/kstars/kstars/indi/webcam/pwc-ioctl.h index d545eb76..9b650298 100644 --- a/kstars/kstars/indi/webcam/pwc-ioctl.h +++ b/kstars/kstars/indi/webcam/pwc-ioctl.h @@ -43,7 +43,7 @@ /* The frame rate is encoded in the video_window.flags parameter using the upper 16 bits, since some flags are defined nowadays. The following - defines provide a tqmask and shift to filter out this value. + defines provide a mask and shift to filter out this value. In 'Snapshot' mode the camera freezes its automatic exposure and colour balance controls. diff --git a/kstars/kstars/indi/webcam/videodev.h b/kstars/kstars/indi/webcam/videodev.h index eb0ac6cf..a5b0aec7 100644 --- a/kstars/kstars/indi/webcam/videodev.h +++ b/kstars/kstars/indi/webcam/videodev.h @@ -214,7 +214,7 @@ struct video_info unsigned int picture_type; /* current picture type */ unsigned int temporal_reference; /* current temporal reference */ unsigned char user_data[256]; /* user data last found in compressed stream */ - /* user_data[0] tqcontains user data flags, user_data[1] has count */ + /* user_data[0] contains user data flags, user_data[1] has count */ }; /* generic structure for setting playback modes */ diff --git a/kstars/kstars/indiconf.ui b/kstars/kstars/indiconf.ui index 6b1d448f..c5edd124 100644 --- a/kstars/kstars/indiconf.ui +++ b/kstars/kstars/indiconf.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>INDIConf</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -43,7 +43,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -328,7 +328,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -405,7 +405,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp index e0de3418..e7a36efc 100644 --- a/kstars/kstars/indidevice.cpp +++ b/kstars/kstars/indidevice.cpp @@ -605,7 +605,7 @@ INDI_P * INDI_D::addProperty (XMLEle *root, char errmsg[]) return NULL; } - /* Remove Vertical spacer from group tqlayout, this is done everytime + /* Remove 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 f9073f23..8c2e0db6 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -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(processHostqStatus(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() { - processHostqStatus(0); + processHostStatus(0); } void INDIDriver::activateHostDisconnection() { - processHostqStatus(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; @@ -301,7 +301,7 @@ void INDIDriver::processDevicetqStatus(int id) } } -void INDIDriver::processHostqStatus(int id) +void INDIDriver::processHostStatus(int id) { int mgrID; bool toConnect = (id == 0); @@ -829,7 +829,7 @@ void INDIDriver::modifyINDIHost() currentItem->setText(1, hostConf.nameIN->text()); currentItem->setText(2, hostConf.portnumber->text()); - ksw->data()->INDIHostsList.tqreplace(clientListView->itemIndex(currentItem), hostItem); + ksw->data()->INDIHostsList.replace(clientListView->itemIndex(currentItem), hostItem); saveHosts(); } diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h index 36586833..3511112e 100644 --- a/kstars/kstars/indidriver.h +++ b/kstars/kstars/indidriver.h @@ -130,8 +130,8 @@ public slots: void updateMenuActions(); void ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ); void LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ); - void processDevicetqStatus(int); - void processHostqStatus(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 310e0971..0ae460f7 100644 --- a/kstars/kstars/indielement.cpp +++ b/kstars/kstars/indielement.cpp @@ -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 6e5b7b29..d7c18e15 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 @@ -97,7 +97,7 @@ class INDI_E : public QObject PState state; /* control on/off t/f etc */ INDI_P *pp; /* parent property */ - TQHBoxLayout *EHBox; /* Horizontal tqlayout */ + TQHBoxLayout *EHBox; /* Horizontal layout */ /* GUI widgets, only malloced when needed */ KSqueezedTextLabel *label_w; // label diff --git a/kstars/kstars/indigroup.h b/kstars/kstars/indigroup.h index 28e8b5aa..097e6a10 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; /* 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 c0bdac80..f8b6c743 100644 --- a/kstars/kstars/indihostconf.ui +++ b/kstars/kstars/indihostconf.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>INDIHostConf</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -63,7 +63,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -186,5 +186,5 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp index 4742f28b..99181b0b 100644 --- a/kstars/kstars/indimenu.cpp +++ b/kstars/kstars/indimenu.cpp @@ -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(); diff --git a/kstars/kstars/indimenu.h b/kstars/kstars/indimenu.h index 14f8a36f..344d087e 100644 --- a/kstars/kstars/indimenu.h +++ b/kstars/kstars/indimenu.h @@ -66,7 +66,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 7499db2c..058e154c 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -47,7 +47,7 @@ #include <stdlib.h> /******************************************************************* -** INDI Property: tqcontains widgets, labels, and their status +** INDI Property: contains widgets, labels, and their status *******************************************************************/ INDI_P::INDI_P(INDI_G *parentGroup, TQString inName) { @@ -209,7 +209,7 @@ void INDI_P::convertSwitch(int id) if (assosiatedPopup == NULL) return; - mLabel = assosiatedPopup->text(id).tqreplace("&", ""); + mLabel = assosiatedPopup->text(id).replace("&", ""); //kdDebug() << "Name: " << name << " ID: " << id << endl; /* Special case is CCD_EXPOSE_DURATION, not a switch */ @@ -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 the Vertical tqlayout thay may contain several elements */ + /* #3 Add the 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 f7d71259..b21f46b5 100644 --- a/kstars/kstars/indistd.cpp +++ b/kstars/kstars/indistd.cpp @@ -63,7 +63,7 @@ dp = associatedDevice; ksw = kswPtr; initDevCounter = 0; - setqCount = 0; + seqCount = 0; batchMode = false; ISOMode = false; @@ -158,7 +158,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d strncpy(tempFileStr, filename, 256); if ( batchMode && !ISOMode) - snprintf(filename, sizeof(filename), "%s/%s_%02d.fits", tempFileStr, seqPrefix.ascii(), setqCount); + snprintf(filename, sizeof(filename), "%s/%s_%02d.fits", tempFileStr, seqPrefix.ascii(), seqCount); else if (!batchMode && !Options::indiFITSDisplay()) { strftime (ts, sizeof(ts), "%Y-%m-%dT%H:%M:%S", tp); @@ -167,10 +167,10 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d else { strftime (ts, sizeof(ts), "%Y-%m-%dT%H:%M:%S", tp); - snprintf(filename, sizeof(filename), "%s/%s_%02d_%s.fits", tempFileStr, seqPrefix.ascii(), setqCount, ts); + snprintf(filename, sizeof(filename), "%s/%s_%02d_%s.fits", tempFileStr, seqPrefix.ascii(), seqCount, ts); } - setqCount++; + seqCount++; } else { @@ -447,7 +447,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d seqLister->setNameFilter(TQString("%1_*.fits").arg(seqPrefix)); - setqCount = 0; + seqCount = 0; if (ISOMode) return; @@ -486,8 +486,8 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d newFileIndex = strtol(t, NULL, 10); - if (newFileIndex >= setqCount) - setqCount = newFileIndex + 1; + if (newFileIndex >= seqCount) + seqCount = newFileIndex + 1; } delete [] (tempPrefix); diff --git a/kstars/kstars/indistd.h b/kstars/kstars/indistd.h index 52a29e9b..407ac02b 100644 --- a/kstars/kstars/indistd.h +++ b/kstars/kstars/indistd.h @@ -74,7 +74,7 @@ LilXML *parser; QString seqPrefix; - int setqCount; + int seqCount; bool batchMode; bool ISOMode; KDirLister *seqLister; diff --git a/kstars/kstars/infobox.h b/kstars/kstars/infobox.h index b2cbfeca..e9953404 100644 --- a/kstars/kstars/infobox.h +++ b/kstars/kstars/infobox.h @@ -26,7 +26,7 @@ /**@class InfoBox *InfoBoxencapsulates a lightweight floating "window" to be drawn directly - *on a pixmap. The window tqcontains three lines of text, and it can + *on a pixmap. The window contains three lines of text, and it can *be "shaded" to show only the top line. The window resizes itself *automatically to contain the text within it. *@author Jason Harris @@ -39,7 +39,7 @@ class InfoBox : public TQObject { Q_OBJECT public: /**default constructor. Creates an infobox with empty text string - *and default tqgeometry + *and default geometry */ InfoBox(); @@ -169,7 +169,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*/ @@ -184,10 +184,10 @@ public: /**Set the box to be anchored to the bottom window edge*/ void setAnchorBottom( const bool ab ); - /**@return the box's anchor flag bitqmask.*/ + /**@return the box's anchor flag bitmask.*/ int anchorFlag() const { return AnchorFlag; } - /**Set the box's anchor flag bitqmask*/ + /**Set the box's anchor flag bitmask*/ void setAnchorFlag( const int af ) { AnchorFlag = af; } enum AnchorType { diff --git a/kstars/kstars/infoboxes.cpp b/kstars/kstars/infoboxes.cpp index fdd95517..dff865e4 100644 --- a/kstars/kstars/infoboxes.cpp +++ b/kstars/kstars/infoboxes.cpp @@ -126,17 +126,17 @@ void InfoBoxes::drawBoxes( TQPainter &p, TQColor FGColor, TQColor grabColor, } bool InfoBoxes::grabBox( TQMouseEvent *e ) { - if ( GeoBox->rect().tqcontains( e->pos() ) ) { + if ( GeoBox->rect().contains( e->pos() ) ) { GrabbedBox = 1; GrabPos.setX( e->x() - GeoBox->x() ); GrabPos.setY( e->y() - GeoBox->y() ); return true; - } else if ( TimeBox->rect().tqcontains( e->pos() ) ) { + } else if ( TimeBox->rect().contains( e->pos() ) ) { GrabbedBox = 2; GrabPos.setX( e->x() - TimeBox->x() ); GrabPos.setY( e->y() - TimeBox->y() ); return true; - } else if ( FocusBox->rect().tqcontains( e->pos() ) ) { + } else if ( FocusBox->rect().contains( e->pos() ) ) { GrabbedBox = 3; GrabPos.setX( e->x() - FocusBox->x() ); GrabPos.setY( e->y() - FocusBox->y() ); @@ -180,7 +180,7 @@ bool InfoBoxes::dragBox( TQMouseEvent *e ) { } bool InfoBoxes::shadeBox( TQMouseEvent *e ) { - if ( GeoBox->rect().tqcontains( e->pos() ) ) { + if ( GeoBox->rect().contains( e->pos() ) ) { GeoBox->toggleShade(); if ( GeoBox->rect().bottom() > height() ) GeoBox->move( GeoBox->x(), height() - GeoBox->height() ); if ( GeoBox->rect().right() > width() ) GeoBox->move( width() - GeoBox->width(), GeoBox->y() ); @@ -189,7 +189,7 @@ bool InfoBoxes::shadeBox( TQMouseEvent *e ) { fixCollisions( TimeBox ); fixCollisions( FocusBox ); return true; - } else if ( TimeBox->rect().tqcontains( e->pos() ) ) { + } else if ( TimeBox->rect().contains( e->pos() ) ) { TimeBox->toggleShade(); if ( TimeBox->rect().bottom() > height() ) TimeBox->move( TimeBox->x(), height() - TimeBox->height() ); if ( TimeBox->rect().right() > width() ) TimeBox->move( width() - TimeBox->width(), TimeBox->y() ); @@ -198,7 +198,7 @@ bool InfoBoxes::shadeBox( TQMouseEvent *e ) { fixCollisions( GeoBox ); fixCollisions( FocusBox ); return true; - } else if ( FocusBox->rect().tqcontains( e->pos() ) ) { + } else if ( FocusBox->rect().contains( e->pos() ) ) { FocusBox->toggleShade(); if ( FocusBox->rect().bottom() > height() ) FocusBox->move( FocusBox->x(), height() - FocusBox->height() ); if ( FocusBox->rect().right() > width() ) FocusBox->move( width() - FocusBox->width(), FocusBox->y() ); @@ -248,7 +248,7 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { if ( Box2.width() ) Box2.setCoords( Box2.left()+1, Box2.top()+1, Box2.right()-1, Box2.bottom()-1 ); //First, make sure target box is within area rect. - if ( ! area.tqcontains( t ) ) { + if ( ! area.contains( t ) ) { /* if ( t.x() < area.x() ) target->move( area.x(), t.y() ); if ( t.y() < area.y() ) target->move( t.x(), area.y() ); if ( t.right() > area.right() ){ target->move( area.right() - t.width(), t.y() ); } @@ -280,25 +280,25 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { leftRect.moveTopLeft( TQPoint( t.x() - dLeft, t.y() ) ); } //If leftRect is outside area, set dLeft to a nonsense large value - if ( !area.tqcontains( leftRect ) ) { dLeft = 100000; } + if ( !area.contains( leftRect ) ) { dLeft = 100000; } //repeat for right, up and down directions. while ( rightRect.intersects( Box1 ) || rightRect.intersects( Box2 ) ) { ++dRight; rightRect.moveTopLeft( TQPoint( t.x() + dRight, t.y() ) ); } - if ( !area.tqcontains( rightRect ) ) { dRight = 100000; } + if ( !area.contains( rightRect ) ) { dRight = 100000; } while ( upRect.intersects( Box1 ) || upRect.intersects( Box2 ) ) { ++dUp; upRect.moveTopLeft( TQPoint( t.x(), t.y() - dUp ) ); } - if ( !area.tqcontains( upRect ) ) { dUp = 100000; } + if ( !area.contains( upRect ) ) { dUp = 100000; } while ( downRect.intersects( Box1 ) || downRect.intersects( Box2 ) ) { ++dDown; downRect.moveTopLeft( TQPoint( t.x(), t.y() + dDown ) ); } - if ( !area.tqcontains( downRect ) ) { dDown = 100000; } + if ( !area.contains( downRect ) ) { dDown = 100000; } //find the smallest displacement, and move the target box there. @@ -331,7 +331,7 @@ bool InfoBoxes::fixCollisions( InfoBox *target ) { //Final check to see if we're still inside area (we may not be if target //is bigger than area) - if ( area.tqcontains( target->rect() ) ) return true; + if ( area.contains( target->rect() ) ) return true; else return false; } @@ -351,7 +351,7 @@ bool InfoBoxes::timeChanged( const KStarsDateTime &ut, const KStarsDateTime <, //Don't use KLocale::formatNumber() for Julian Day because we don't want //thousands-place separators TQString JDString = TQString::number( ut.djd(), 'f', 2 ); - JDString.tqreplace( ".", KGlobal::locale()->decimalSymbol() ); + JDString.replace( ".", KGlobal::locale()->decimalSymbol() ); TimeBox->setText3( i18n( "Sidereal Time", "ST: " ) + STString + i18n( "Julian Day", "JD: " ) + JDString ); diff --git a/kstars/kstars/infoboxes.h b/kstars/kstars/infoboxes.h index dc3799ff..25ec2d23 100644 --- a/kstars/kstars/infoboxes.h +++ b/kstars/kstars/infoboxes.h @@ -162,7 +162,7 @@ public: *to the box position equal to GrabPos. (this is called by SkyMap::mouseMoveEvent() ). *Once the box has been moved, we call fixCollisions() to make sure the boxes don't *overlap or exceed the SkyMap boundaries. - *@param e The mouse event which tqcontains the new mouse cursor position + *@param e The mouse event which contains the new mouse cursor position *@return false if no box is grabbed; otherwise, moves the grabbed box and returns true. */ bool dragBox( TQMouseEvent *e ); diff --git a/kstars/kstars/kscomet.cpp b/kstars/kstars/kscomet.cpp index af14444b..94ed1762 100644 --- a/kstars/kstars/kscomet.cpp +++ b/kstars/kstars/kscomet.cpp @@ -48,8 +48,8 @@ KSComet::KSComet( KStarsData *_kd, TQString _s, TQString imfile, //Compute the orbital Period from Kepler's 3rd law: P = 365.2568984 * pow(a, 1.5); //period in days - //If the name tqcontains a "/", make this name2 and make name a truncated version without the leading "P/" or "C/" - if ( name().tqcontains( "/" ) ) { + //If the name contains a "/", make this name2 and make name a truncated version without the leading "P/" or "C/" + if ( name().contains( "/" ) ) { setLongName( name() ); setName( name().mid( name().find("/") + 1 ) ); } diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index d353613b..e416388e 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -79,7 +79,7 @@ void KSNewStuff::updateData( const TQString &path ) { //Handle the Steinicke NGC/IC catalog - if ( !NGCUpdated && qd[0].tqcontains( "ngcic" ) ) { + if ( !NGCUpdated && qd[0].contains( "ngcic" ) ) { //Build a progress dialog to show during data installation. KProgressDialog prog( 0, "newstuffprogdialog", i18n( "Please Wait" ), i18n( "Installing Steinicke NGC/IC catalog..." ), false /*modal*/ ); diff --git a/kstars/kstars/ksplanet.h b/kstars/kstars/ksplanet.h index 5e66b879..c30e40e7 100644 --- a/kstars/kstars/ksplanet.h +++ b/kstars/kstars/ksplanet.h @@ -30,7 +30,7 @@ *(Earth and Pluto have their own specialized classes derived from KSPlanetBase). *@note The Sun is subclassed from KSPlanet. * - *KSPlanet tqcontains internal classes to manage the computations of a planet's position. + *KSPlanet contains internal classes to manage the computations of a planet's position. *The position is computed as a series of sinusoidal sums, similar to a Fourier *transform. See "Astronomical Algorithms" by Jean Meeus or the file README.planetmath *for details. @@ -83,7 +83,7 @@ protected: virtual bool findGeocentricPosition( const KSNumbers *num, const KSPlanetBase *Earth=NULL ); /**@class OrbitData - *This class tqcontains doubles A,B,C which represent a single term in a planet's + *This class contains doubles A,B,C which represent a single term in a planet's *positional expansion sums (each sum-term is A*COS(B+C*T)). *@author Mark Hollomon *@version 1.0 @@ -103,7 +103,7 @@ protected: typedef TQPtrVector<OrbitData> OBArray[6]; -/**OrbitDataColl tqcontains three groups of six QPtrVectors. Each TQPtrVector is a +/**OrbitDataColl contains three groups of six QPtrVectors. Each TQPtrVector is a *list of OrbitData objects, representing a single sum used in computing *the planet's position. A set of six of these vectors comprises the large *"meta-sum" which yields the planet's Longitude, Latitude, or Distance value. diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp index b767275a..5f1a7829 100644 --- a/kstars/kstars/kspopupmenu.cpp +++ b/kstars/kstars/kspopupmenu.cpp @@ -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(); @@ -320,7 +320,7 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr } if ( showObsList && obj ) { - if ( ksw->observingList()->tqcontains( obj ) ) + if ( ksw->observingList()->contains( obj ) ) insertItem( i18n("Remove From List"), ksw->observingList(), TQT_SLOT( slotRemoveObject() ) ); else insertItem( i18n("Add to List"), ksw->observingList(), TQT_SLOT( slotAddObject() ) ); diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp index c41a39f7..b18f65fe 100644 --- a/kstars/kstars/kstars.cpp +++ b/kstars/kstars/kstars.cpp @@ -14,7 +14,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -//JH 11.06.2002: tqreplaced infoPanel with infoBoxes +//JH 11.06.2002: replaced infoPanel with infoBoxes //JH 24.08.2001: reorganized infoPanel //JH 25.08.2001: added toolbar, converted menu items to KAction objects //JH 25.08.2001: main window now resizable, window size saved in config file @@ -103,7 +103,7 @@ KStars::~KStars() Options::setFocusRA( skymap->focus()->ra()->Hours() ); Options::setFocusDec( skymap->focus()->dec()->Degrees() ); - //Store Window tqgeometry in Options object + //Store Window geometry in Options object Options::setWindowWidth( width() ); Options::setWindowHeight( height() ); diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h index faeaf5c0..73c10127 100644 --- a/kstars/kstars/kstars.h +++ b/kstars/kstars/kstars.h @@ -58,8 +58,8 @@ class imagesequence; /** *@class KStars *@short This is the main window for KStars. - *In addition to the GUI elements, the class tqcontains the program clock, - *KStarsData, and SkyMap objects. It also tqcontains functions for the DCOP interface. + *In addition to the GUI elements, the class contains the program clock, + *KStarsData, and SkyMap objects. It also contains functions for the DCOP interface. *@author Jason Harris *@version 1.0 */ @@ -84,7 +84,7 @@ class KStars : public KMainWindow, virtual public KStarsInterface */ ~KStars(); - /**@return pointer to KStarsData object which tqcontains application data. + /**@return pointer to KStarsData object which contains application data. */ KStarsData* data(); @@ -381,7 +381,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 ); @@ -624,7 +624,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 7e071142..c370d55e 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -87,7 +87,7 @@ #endif // KDE >= 3.2.90 #include "imagesequence.h" -//This file tqcontains function definitions for Actions declared in kstars.h +//This file contains function definitions for Actions declared in kstars.h /** ViewToolBar Action. All of the viewToolBar buttons are connected to this slot. **/ @@ -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() { @@ -553,7 +553,7 @@ void KStars::slotRunScript() { if ( ! fileOK ) { int answer; - answer = KMessageBox::warningContinueCancel( 0, i18n( "The selected script tqcontains unrecognized elements," + answer = KMessageBox::warningContinueCancel( 0, i18n( "The selected script contains unrecognized elements," "indicating that it was not created using the KStars script builder. " "This script may not function properly, and it may even contain malicious code. " "Would you like to execute it anyway?" ), @@ -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() ); @@ -840,7 +840,7 @@ void KStars::slotTargetSymbol() { void KStars::slotFOVEdit() { FOVDialog fovdlg( this ); if ( fovdlg.exec() == TQDialog::Accepted ) { - //tqreplace existing fov.dat with data from the FOVDialog + //replace existing fov.dat with data from the FOVDialog TQFile f; f.setName( locateLocal( "appdata", "fov.dat" ) ); @@ -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").arg( fov->tqshape() ) << ":" << fov->color() << endl; + << ":" << TQString("%1").arg( fov->shape() ) << ":" << fov->color() << endl; f.close(); } @@ -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 465eca8e..4d5ff70a 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -236,7 +236,7 @@ bool KStarsData::readADVTreeData(void) subName = Name; interfaceIndex = Link.find("KSINTERFACE"); Link.remove(interfaceIndex, 11); - Link = Link.insert(interfaceIndex, subName.tqreplace( TQRegExp(" "), "+")); + Link = Link.insert(interfaceIndex, subName.replace( TQRegExp(" "), "+")); } @@ -390,7 +390,7 @@ bool KStarsData::readINDIHosts(void) } bool KStarsData::readCLineData( void ) { - //The constellation lines data file (clines.dat) tqcontains lists + //The constellation lines data file (clines.dat) contains lists //of abbreviated genetive star names in the same format as they //appear in the star data files (hipNNN.dat). // @@ -664,7 +664,7 @@ void KStarsData::processStar( TQString *line, bool reloadMode ) { //parse name(s) name = line->mid( 72 ).stripWhiteSpace(); //the rest of the line - if (name.tqcontains( ':' )) { //genetive form exists + if (name.contains( ':' )) { //genetive form exists gname = name.mid( name.find(':')+1 ).stripWhiteSpace(); name = name.mid( 0, name.find(':') ).stripWhiteSpace(); } @@ -964,15 +964,15 @@ bool KStarsData::openURLFile(TQString urlfile, TQFile & file) { TQString line = gStream.readLine(); //If global-file line begins with "XXX:" then this line should be removed from the local file. - if ( line.left( 4 ) == "XXX:" && urlData.tqcontains( line.mid( 4 ) ) ) { + if ( line.left( 4 ) == "XXX:" && urlData.contains( line.mid( 4 ) ) ) { urlData.remove( urlData.find( line.mid( 4 ) ) ); } else { //does local file contain the current global file line, up to second ':' ? bool linefound( false ); for ( unsigned int j=0; j< urlData.count(); ++j ) { - if ( urlData[j].tqcontains( line.left( line.find( ':', line.find( ':' ) + 1 ) ) ) ) { - //tqreplace line in urlData with its equivalent in the newer global file. + if ( urlData[j].contains( line.left( line.find( ':', line.find( ':' ) + 1 ) ) ) ) { + //replace line in urlData with its equivalent in the newer global file. urlData.remove( urlData.at(j) ); urlData.insert( urlData.at(j), line ); if ( !newDataFound ) newDataFound = true; @@ -1169,7 +1169,7 @@ CustomCatalog* KStarsData::createCustomCatalog( TQString filename, bool showerrs TQString CatalogName, CatalogPrefix, CatalogColor; float CatalogEpoch; - //If the filename begins with "~", tqreplace the "~" with the user's home directory + //If the filename begins with "~", replace the "~" with the user's home directory //(otherwise, the file will not successfully open) if ( filename.at(0)=='~' ) filename = TQDir::homeDirPath() + filename.mid( 1, filename.length() ); @@ -1393,7 +1393,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column int icolor = d.find( "# Color: " ); int iepoch = d.find( "# Epoch: " ); - if ( iname == 0 ) { //line tqcontains catalog name + if ( iname == 0 ) { //line contains catalog name iname = d.find(":")+2; if ( CatalogName.isEmpty() ) { CatalogName = d.mid( iname ); @@ -1402,7 +1402,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column errs.append( i18n( "Parsing header: " ) + i18n( "Extra Name field in header: %1. Will be ignored" ).arg( d.mid(iname) ) ); } - } else if ( iprefix == 0 ) { //line tqcontains catalog prefix + } else if ( iprefix == 0 ) { //line contains catalog prefix iprefix = d.find(":")+2; if ( CatalogPrefix.isEmpty() ) { CatalogPrefix = d.mid( iprefix ); @@ -1411,7 +1411,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column errs.append( i18n( "Parsing header: " ) + i18n( "Extra Prefix field in header: %1. Will be ignored" ).arg( d.mid(iprefix) ) ); } - } else if ( icolor == 0 ) { //line tqcontains catalog prefix + } else if ( icolor == 0 ) { //line contains catalog prefix icolor = d.find(":")+2; if ( CatalogColor.isEmpty() ) { CatalogColor = d.mid( icolor ); @@ -1420,7 +1420,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column errs.append( i18n( "Parsing header: " ) + i18n( "Extra Color field in header: %1. Will be ignored" ).arg( d.mid(icolor) ) ); } - } else if ( iepoch == 0 ) { //line tqcontains catalog epoch + } else if ( iepoch == 0 ) { //line contains catalog epoch iepoch = d.find(":")+2; if ( CatalogEpoch == 0. ) { bool ok( false ); @@ -1438,7 +1438,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column } } else if ( ! foundDataColumns ) { //don't try to parse data column descriptors if we already found them //Chomp off leading "#" character - d = d.tqreplace( TQRegExp( "#" ), "" ); + d = d.replace( TQRegExp( "#" ), "" ); TQStringList fields = TQStringList::split( " ", d ); //split on whitespace @@ -1452,7 +1452,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column for ( ; itf != itfEnd; itf++ ) { TQString s( *itf ); - if ( master.tqcontains( s ) ) { + if ( master.contains( s ) ) { //add the data field Columns.append( s ); @@ -1462,7 +1462,7 @@ bool KStarsData::parseCustomDataHeader( TQStringList lines, TQStringList &Column master.remove( master.find( s ) ); ncol++; } - } else if ( fields.tqcontains( s ) ) { //duplicate field + } else if ( fields.contains( s ) ) { //duplicate field fields.append( "Ig" ); //skip this column if ( showerrs ) errs.append( i18n( "Parsing header: " ) + diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h index b2968600..0a358a42 100644 --- a/kstars/kstars/kstarsdata.h +++ b/kstars/kstars/kstarsdata.h @@ -130,11 +130,11 @@ public: */ bool readCityData( void ); - /**Read the data file that tqcontains daylight savings time rules. + /**Read the data file that contains daylight savings time rules. */ bool readTimeZoneRulebook( void ); - /**Parse one line from a locations database file. The line tqcontains 10 or 11 fields + /**Parse one line from a locations database file. The line contains 10 or 11 fields *separated by colons (":"). The fields are: *@li City Name [string] *@li Province Name (optional) [string] @@ -351,7 +351,7 @@ public: /**Read in URLs to be attached to a named object's right-click popup menu. At this *point, there is no way to attach URLs to unnamed objects. There are two *kinds of URLs, each with its own data file: image links and webpage links. In addition, - *there may be user-specific versions with custom URLs. Each line tqcontains 3 fields + *there may be user-specific versions with custom URLs. Each line contains 3 fields *separated by colons (":"). Note that the last field is the URL, and as such it will *generally contain a colon itself. Only the first two colons encountered are treated *as field separators. The fields are: 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 f31d0955..a45e2495 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 751b0f19..b4a22ba9 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(); @@ -359,7 +359,7 @@ void KStars::loadColorScheme( const TQString _name ) { if ( ! ok ) { if ( !filename.isEmpty() ) { for( unsigned int i=0; i<filename.length(); ++i) - if ( filename.at(i)==' ' ) filename.tqreplace( i, 1, "-" ); + if ( filename.at(i)==' ' ) filename.replace( i, 1, "-" ); filename = filename.append( ".colors" ); ok = data()->colorScheme()->load( filename ); @@ -389,10 +389,10 @@ void KStars::loadColorScheme( const TQString _name ) { } void KStars::exportImage( const TQString url, int w, int h ) { - //If the filename string tqcontains no "/" separators, assume the + //If the filename string contains no "/" separators, assume the //user wanted to place a file in their home directory. KURL fileURL; - if ( ! url.tqcontains( "/" ) ) fileURL = TQDir::homeDirPath() + "/" + url; + if ( ! url.contains( "/" ) ) fileURL = TQDir::homeDirPath() + "/" + url; else fileURL = url; KTempFile tmpfile; @@ -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); } diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp index 9117e100..276e5c8a 100644 --- a/kstars/kstars/kstarsinit.cpp +++ b/kstars/kstars/kstarsinit.cpp @@ -43,7 +43,7 @@ #include "simclock.h" #include "timestepbox.h" -//This file tqcontains functions that kstars calls at startup (except constructors). +//This file contains functions that kstars calls at startup (except constructors). //These functions are declared in kstars.h void KStars::initActions() { @@ -149,8 +149,8 @@ void KStars::initActions() { 0, 0, 0, actionCollection(), "show_viewToolBar"); TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); -//tqStatusbar view options - a = new KToggleAction(i18n( "Show tqStatusbar" ), +//Statusbar view options + a = new KToggleAction(i18n( "Show Statusbar" ), 0, 0, 0, actionCollection(), "show_statusBar"); TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); @@ -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 5c3261a3..7e57364b 100644 --- a/kstars/kstars/kstarssplash.cpp +++ b/kstars/kstars/kstarssplash.cpp @@ -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 - textCurrentqStatus = new TQLabel( page, "label2" ); - textCurrentqStatus->setPalette( pal ); - textCurrentqStatus->tqsetAlignment( AlignHCenter ); - topLayout->addWidget( textCurrentqStatus ); + textCurrentStatus = new TQLabel( page, "label2" ); + textCurrentStatus->setPalette( pal ); + textCurrentStatus->setAlignment( AlignHCenter ); + topLayout->addWidget( textCurrentStatus ); topLayout->activate(); disableResize(); - setMessage(TQString::null); // force tqrepaint of widget with no text + setMessage(TQString::null); // 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 - textCurrentqStatus->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 ) { - textCurrentqStatus->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 00946b85..afe523a2 100644 --- a/kstars/kstars/kstarssplash.h +++ b/kstars/kstars/kstarssplash.h @@ -50,7 +50,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). */ @@ -65,7 +65,7 @@ class KStarsSplash : public KDialogBase void closeWindow(); private: - TQLabel *textCurrentqStatus, *label; + TQLabel *textCurrentStatus, *label; TQWidget *Banner; TQPixmap *splashImage; }; diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui index eb832835..398ac2fa 100644 --- a/kstars/kstars/kswizardui.ui +++ b/kstars/kstars/kswizardui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KSWizardUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -63,7 +63,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <vbox> <property name="name"> @@ -173,7 +173,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -181,7 +181,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <vbox> <property name="name"> @@ -456,7 +456,7 @@ country.</p> </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -843,7 +843,7 @@ button to proceed. </p> <data format="PNG" length="1110">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000041d49444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d09a6c508138cb8c13d647141163de49043bca9f1628eb9294810f24f88c15b728b07617358888785d980427290b4a8d00b19a8821da8228cf42316ac87eed9247ac95c9aeaeef9eaabdffb5ebf85f178ccfcf7f5b79fec07a7280a08a008f25ceb7c29e5da573716e65a0be3f198ef6f5ededff9b9e1b34faf90882092a1ea21428b9220ffbf46054055b19386ba6970ae6665b5e0d2c5eb0b066067bbe1f21757c88f5504eff0c192189081303a5582b16854fccce2fe041f00cdd0a8103b874556405476b62d972ec2c2b90ff3fd8df5cb946549d80b34aea15ccaa94625450e2d0e558b460b7371a734b5e027251a155545678ab62d7eea90b4c504078908c107acb354cb251b1f8f08b1c18631aabbb4d18211404804f22545863561d2f060fb34aa8a18d0086204e72c46a32292e1a796f278c1da7a859d8da9a737506db04d0a24103d8949480b214d3bbee952a05c1d536f9d2684160c744f048311543d459eb1b65ee1754cedae13a64abd5d6127053c9d0281f22d4f75c6a2118a5c09272d7ab740638bf4ef2dd2174032d0d8d04c6fe19c32bedd8bc65e342aa3f785e2784bfd6bc1bd9db24b05505616a4edd67d5a8c1801a03a9962754c504bf34b8986acfb9be91cac7d54315a15541b36b134f74bd2dc53940115a5381e087bc25c6f71be831a8baa234cc1ee3eeb74ed83116beb2b8849d108a3730e8ce27e2bfb82419a7b407ac7c222fd0e6280a8078ce64e47ef54ac9d5be9aaae0162e0de568a44a18d3df90845d919c4f01463406340a44f40efb43a99b371618488e2670d1a2d7ee6f1d3be39342104e937ed85fb86599c33e9ee0be9a004946259d8b858909880d59aa00daa0d3280b5f39e34074c4b3a5434029a76a9e9f5cc0163b5c80024158a1cfc4cb1d3061d5834066cb0a403c008599a70f6bc27b8d03106ea3ae91987278c5b143b015547224ab5e24185cd9b81665273e7b6e7cecd82ddbf8098002de94049737bc09828cf3036f31c3735c8b0e98eb704672f348c7f7c93cd1fb2ae905119ff54e0dff3542b0e9dd983dcea2cc5eea6cf303e74ec687af5c41b6fa38f5e203c7ec8e1238ef85831a214afef21060ea781ec68247b65c6916353cc8b73d1ae79354606af2a930709aa118da1636c274dd7e3774b884a79aa6b5711a538d33cf9c01c1c9b83bc6a1f55c91ccb23b05b1deb43a7decdaffefd2862f61366aa8449c69e33642f012f2bb208fa98eeda1f3346f076c8eeef19475e9be115423364f78f84105a8643d34d90cfbfdcd8cf872589a45dc7f54cf3134a36f4e495c23f9da8db15bccb708d4014f2ca512cb5d4f7c13e84300d5cff6eb39b202bab053bdb9674f0648609427d0f8402ddeac30f4fcd3ced3efc3b422d406c09b340bedc1571e1bfc3d44dc281634c5fe5e758e7395cfbe6d6c130fd17d92372d2cb00c6470000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index dfbb4796..8bbd34ac 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -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 ); @@ -122,7 +122,7 @@ LocationDialog::LocationDialog( TQWidget* parent ) AddCityButton = new TQPushButton( i18n ( "Add to List" ), CoordBox, "AddCityButton" ); -//Pack the widgets into the tqlayouts +//Pack the widgets into the layouts RootLay->addWidget( CityBox, 0, 0 ); RootLay->addWidget( CoordBox, 0, 0 ); @@ -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 db407884..23831361 100644 --- a/kstars/kstars/locationdialog.h +++ b/kstars/kstars/locationdialog.h @@ -23,7 +23,7 @@ *dialog is divided into two sections. * *The top section allows the location to be selected from a database - *of 2000 cities. It tqcontains a MapCanvas (showing map of the globe + *of 2000 cities. It contains a MapCanvas (showing map of the globe *with cities overlaid, with a handler for mouse clicks), a QListBox *containing the names of cities in the database, and three KLineEdit *widgets, which allow the user to filter the List by the name of the @@ -116,7 +116,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 7335bd39..a16acfbc 100644 --- a/kstars/kstars/main.cpp +++ b/kstars/kstars/main.cpp @@ -109,10 +109,10 @@ int main(int argc, char *argv[]) TQString datestring = args->getOption( "date" ); KStarsDateTime kdt; if ( ! datestring.isEmpty() ) { - if ( datestring.tqcontains( "-" ) ) { //assume ISODate format - if ( datestring.tqcontains( ":" ) ) { //also includes time + if ( datestring.contains( "-" ) ) { //assume ISODate format + if ( datestring.contains( ":" ) ) { //also includes time kdt = KStarsDateTime::fromString( datestring, Qt::ISODate ); - } else { //string probably tqcontains date only + } else { //string probably contains date only kdt.setDate( ExtDate::fromString( datestring, Qt::ISODate ) ); kdt.setTime( TQTime( 0, 0, 0 ) ); } @@ -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 ); 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 38ded5c8..b32098b2 100644 --- a/kstars/kstars/mapcanvas.h +++ b/kstars/kstars/mapcanvas.h @@ -49,7 +49,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. @@ -60,13 +60,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 d7ded82f..4abfc4ad 100644 --- a/kstars/kstars/newfovui.ui +++ b/kstars/kstars/newfovui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>NewFOVUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -74,7 +74,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -82,7 +82,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -116,7 +116,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <vbox> <property name="name"> @@ -124,7 +124,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget" 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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -921,7 +921,7 @@ Circle, Square, Crosshairs, Bullseye.</string> <tabstop>ShapeBox</tabstop> <tabstop>ColorButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/objectnamelist.cpp b/kstars/kstars/objectnamelist.cpp index 948f036c..b86fdac8 100644 --- a/kstars/kstars/objectnamelist.cpp +++ b/kstars/kstars/objectnamelist.cpp @@ -104,7 +104,7 @@ SkyObjectName* ObjectNameList::first( const TQString &name ) { if ( mode == allLists ) { currentIndex = 0; } else { - // start with list which tqcontains the first letter + // start with list which contains the first letter currentIndex = getIndex( name ); } diff --git a/kstars/kstars/objectnamelist.h b/kstars/kstars/objectnamelist.h index 4d8d045e..691311ee 100644 --- a/kstars/kstars/objectnamelist.h +++ b/kstars/kstars/objectnamelist.h @@ -21,8 +21,8 @@ /**@class ObjectNameList *This class provides an interface like a TQPtrList, but sorts objects internally - *in 27 lists. The objects are sorted alphabetically. List 0 tqcontains all objects - *beginning not with a letter. List 1 - 26 tqcontains objects beginning with a letter. + *in 27 lists. The objects are sorted alphabetically. List 0 contains all objects + *beginning not with a letter. List 1 - 26 contains objects beginning with a letter. *The number of the list is similar to positon of letter in alphabet. (A = 1 .. Z = 26 ) *@author Thomas Kabelmann *@version 1.0 @@ -61,7 +61,7 @@ class ObjectNameList { */ void append(SkyObject *object, bool useLongName=false); - /**Select the list which tqcontains objects whose names begin with the + /**Select the list which contains objects whose names begin with the *same letter as the argument. The selected list ID is recorded in *an internal variable, so it is persistent. *@note This function is case insensitive. @@ -123,7 +123,7 @@ class ObjectNameList { void sort(); - /**@return the list index which tqcontains the object whose name matches the argument. + /**@return the list index which contains the object whose name matches the argument. *@note this does not return the position within a list of names; it returns the ID *of the list itself. *@param name the name of the object whose index is to be found diff --git a/kstars/kstars/opsadvancedui.ui b/kstars/kstars/opsadvancedui.ui index 689dee17..13022545 100644 --- a/kstars/kstars/opsadvancedui.ui +++ b/kstars/kstars/opsadvancedui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OpsAdvancedUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -478,7 +478,7 @@ <tabstop>kcfg_HideCLines</tabstop> <tabstop>kcfg_HideGrid</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>timestepbox.h</includehint> <includehint>magnitudespinbox.h</includehint> diff --git a/kstars/kstars/opscatalogui.ui b/kstars/kstars/opscatalogui.ui index 6b792c3a..14db7c6a 100644 --- a/kstars/kstars/opscatalogui.ui +++ b/kstars/kstars/opscatalogui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OpsCatalogUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -593,7 +593,7 @@ Magnitude is a measure of brightness; the larger the number, the fainter the obj <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>magnitudespinbox.h</includehint> <includehint>magnitudespinbox.h</includehint> diff --git a/kstars/kstars/opscolorsui.ui b/kstars/kstars/opscolorsui.ui index 04626b1d..d2d22cab 100644 --- a/kstars/kstars/opscolorsui.ui +++ b/kstars/kstars/opscolorsui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OpsColorsUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -43,7 +43,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -81,7 +81,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -113,7 +113,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -169,7 +169,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -285,5 +285,5 @@ <tabstop>AddPreset</tabstop> <tabstop>RemovePreset</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/opsguidesui.ui b/kstars/kstars/opsguidesui.ui index 55750725..1f8c1dca 100644 --- a/kstars/kstars/opsguidesui.ui +++ b/kstars/kstars/opsguidesui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OpsGuidesUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -261,5 +261,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/opssolarsystemui.ui b/kstars/kstars/opssolarsystemui.ui index b5685ee0..15b58a47 100644 --- a/kstars/kstars/opssolarsystemui.ui +++ b/kstars/kstars/opssolarsystemui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OpsSolarSystemUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -569,7 +569,7 @@ <tabstop>kcfg_FadePlanetTrails</tabstop> <tabstop>ClearAllTrails</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>magnitudespinbox.h</includehint> diff --git a/kstars/kstars/planetcatalog.h b/kstars/kstars/planetcatalog.h index 4cdda9a4..99a7b65e 100644 --- a/kstars/kstars/planetcatalog.h +++ b/kstars/kstars/planetcatalog.h @@ -19,7 +19,7 @@ #define PLANETCATALOG_H /**@class PlanetCatalog - *This class tqcontains a TQPtrList of the eight major planets, as well as pointers + *This class contains a TQPtrList of the eight major planets, as well as pointers *to objects representing the Earth and Sun. Note that the Sun also exists *in the TQPtrList, the external pointer is just for convenience. *There are methods to search diff --git a/kstars/kstars/simclock.h b/kstars/kstars/simclock.h index 2fdfdb99..d4375bdb 100644 --- a/kstars/kstars/simclock.h +++ b/kstars/kstars/simclock.h @@ -39,7 +39,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 1b6ae5b8..13a5ab45 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( TQWidget::StrongFocus ); setMinimumSize( 380, 250 ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); setMouseTracking (true); //Generate MouseMove events! midMouseButtonDown = false; @@ -1179,7 +1179,7 @@ void SkyMap::forceUpdate( bool now ) } computeSkymap = true; - if ( now ) tqrepaint(); + if ( now ) repaint(); else update(); } @@ -1252,18 +1252,18 @@ void SkyMap::setZoomMouseCursor() p.drawLine( mx + 5, my + 5, mx + 11, my + 11 ); p.end(); -// create a tqmask to make parts of the pixmap invisible - TQBitmap tqmask (32, 32); - tqmask.fill (color0); // all is invisible +// create a mask to make parts of the pixmap invisible + TQBitmap mask (32, 32); + mask.fill (color0); // all is invisible - p.begin (&tqmask); + p.begin (&mask); // paint over the parts which should be visible p.setPen (TQPen (color1, 3)); p.drawEllipse( mx - 7, my - 7, 14, 14 ); p.drawLine( mx + 5, my + 5, mx + 12, my + 12 ); p.end(); - cursorPix.setMask (tqmask); // set the tqmask + cursorPix.setMask (mask); // set the mask TQCursor cursor (cursorPix); setCursor (cursor); } @@ -1289,11 +1289,11 @@ void SkyMap::setDefaultMouseCursor() p.drawLine (mx + 2, my - 2, mx + 8, mx - 8); p.end(); -// create a tqmask to make parts of the pixmap invisible - TQBitmap tqmask (32, 32); - tqmask.fill (color0); // all is invisible +// create a mask to make parts of the pixmap invisible + TQBitmap mask (32, 32); + mask.fill (color0); // all is invisible - p.begin (&tqmask); + p.begin (&mask); // paint over the parts which should be visible p.setPen (TQPen (color1, 3)); // 1. diagonal @@ -1304,7 +1304,7 @@ void SkyMap::setDefaultMouseCursor() p.drawLine (mx + 2, my - 2, mx + 8, mx - 8); p.end(); - cursorPix.setMask (tqmask); // set the tqmask + cursorPix.setMask (mask); // set the mask TQCursor cursor (cursorPix); setCursor (cursor); } @@ -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 86d83b55..b6badd3b 100644 --- a/kstars/kstars/skymap.h +++ b/kstars/kstars/skymap.h @@ -47,7 +47,7 @@ class DeepSkyObject; *Contains SkyPoint members for the map's Focus (current central position), Destination *(requested central position), FocusPoint (next queued position to be focused), *MousePoint (position of mouse cursor), and ClickedPoint (position of last mouse click). - *Also tqcontains the InfoBoxes for on-screen data display. + *Also contains the InfoBoxes for on-screen data display. * *SkyMap handles most user interaction events (both mouse and keyboard). * @@ -163,7 +163,7 @@ public: *@note setDestination() emits the destinationChanged() SIGNAL, *which triggers the TQT_SLOT function SkyMap::slewFocus(). This *function iteratively steps the Focus point toward Destination, - *tqrepainting the sky at each step (if Options::useAnimatedSlewing()==true). + *repainting the sky at each step (if Options::useAnimatedSlewing()==true). *@param f a pointer to the SkyPoint the map should slew to */ void setDestination( SkyPoint *f ); @@ -368,7 +368,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(); @@ -388,7 +388,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() @@ -406,7 +406,7 @@ public slots: */ virtual void setGeometry( const TQRect &r ); -/**Recalculates the positions of objects in the sky, and then tqrepaints the sky map. +/**Recalculates the positions of objects in the sky, and then repaints the sky map. *If the positions don't need to be recalculated, use update() instead of forceUpdate(). *This saves a lot of CPU time. *@param now if true, paintEvent() is run immediately. Otherwise, it is added to the event queue @@ -622,7 +622,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: @@ -776,7 +776,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). */ @@ -900,11 +900,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(); @@ -919,7 +919,7 @@ private: bool mouseButtonDown, midMouseButtonDown; bool mouseMoveCursor; // true if mouseMoveEvent; needed by setMouseMoveCursor bool slewing, clockSlewing; - bool computeSkymap; //if false only old pixmap will tqrepainted with bitBlt(), this saves a lot of cpu usage + bool computeSkymap; //if false only old pixmap will repainted with bitBlt(), this saves a lot of cpu usage bool angularDistanceMode; int idSolInfo, idMessHST, idMoonInfo, idMoonImages, idMessInfo, idNGCHST; int scrollCount; diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp index 0c76de4b..8b15c57a 100644 --- a/kstars/kstars/skymapdraw.cpp +++ b/kstars/kstars/skymapdraw.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -//This file tqcontains drawing functions SkyMap class. +//This file contains drawing functions SkyMap class. #include <stdlib.h> // abs #include <math.h> //log10() @@ -1578,7 +1578,7 @@ void SkyMap::drawPlanetTrail( TQPainter& psky, KSPlanetBase *ksp, double scale ) if ( ( o.x() >= -1000 && o.x() <= Width+1000 && o.y() >=-1000 && o.y() <= Height+1000 ) ) { //Want to disable line-drawing if this point and the last are both outside bounds of display. - if ( ! rect().tqcontains( o ) && ! rect().tqcontains( cur ) ) doDrawLine = false; + if ( ! rect().contains( o ) && ! rect().contains( cur ) ) doDrawLine = false; cur = o; if ( doDrawLine ) { diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp index f2634872..26b04a5f 100644 --- a/kstars/kstars/skymapevents.cpp +++ b/kstars/kstars/skymapevents.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -//This file tqcontains Event handlers for the SkyMap class. +//This file contains Event handlers for the SkyMap class. #include <stdlib.h> #include <math.h> //using fabs() @@ -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(); @@ -733,7 +733,7 @@ void SkyMap::paintEvent( TQPaintEvent * ) *sky2 = *sky; drawOverlays( sky2 ); bitBlt( this, 0, 0, sky2 ); - return ; // exit because the pixmap is tqrepainted and that's all what we want + return ; // exit because the pixmap is repainted and that's all what we want } TQPainter psky; diff --git a/kstars/kstars/skyobject.cpp b/kstars/kstars/skyobject.cpp index 612c951e..5ea5036d 100644 --- a/kstars/kstars/skyobject.cpp +++ b/kstars/kstars/skyobject.cpp @@ -342,11 +342,11 @@ TQString SkyObject::messageFromTitle( const TQString &imageTitle ) { TQString message = imageTitle; //HST Image - if ( imageTitle == i18n( "Show HST Image" ) || imageTitle.tqcontains("HST") ) { + if ( imageTitle == i18n( "Show HST Image" ) || imageTitle.contains("HST") ) { message = i18n( "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]" ).arg( longname() ); //Spitzer Image - } else if ( imageTitle.tqcontains( i18n( "Show Spitzer Image" ) ) ) { + } else if ( imageTitle.contains( i18n( "Show Spitzer Image" ) ) ) { message = i18n( "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]" ).arg( longname() ); //SEDS Image @@ -358,11 +358,11 @@ TQString SkyObject::messageFromTitle( const TQString &imageTitle ) { 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.tqcontains( i18n( "Show NOAO Image" ) ) ) { + } else if ( imageTitle.contains( i18n( "Show NOAO Image" ) ) ) { message = i18n( "%1: National Optical Astronomy Observatories and AURA [free for non-commercial use]" ).arg( longname() ); //VLT Image - } else if ( imageTitle.tqcontains( "VLT" ) ) { + } else if ( imageTitle.contains( "VLT" ) ) { message = i18n( "%1: Very Large Telescope, operated by the European Southern Observatory [free for non-commercial use; no reproductions]" ).arg( longname() ); //All others diff --git a/kstars/kstars/skyobjectname.h b/kstars/kstars/skyobjectname.h index cfa0a46a..580671c7 100644 --- a/kstars/kstars/skyobjectname.h +++ b/kstars/kstars/skyobjectname.h @@ -23,7 +23,7 @@ #include <klocale.h> /**@class SkyObjectName - *Convenience class which tqcontains a SkyObject's name and a pointer to the SkyObject + *Convenience class which contains a SkyObject's name and a pointer to the SkyObject *itself. This class is used to construct the List of named objects that may be *located with the FindDialog. *@short convenience class for indexing SkyObjects by name. diff --git a/kstars/kstars/skypoint.cpp b/kstars/kstars/skypoint.cpp index 4895485d..c5ea55a8 100644 --- a/kstars/kstars/skypoint.cpp +++ b/kstars/kstars/skypoint.cpp @@ -538,7 +538,7 @@ dms SkyPoint::angularDistanceTo(SkyPoint *sp) { } TQString SkyPoint::constellation( TQPtrList<CSegment> &csegmentList, TQPtrList<SkyObject> &cnameList ) const { - //Identify the constellation that tqcontains point p. + //Identify the constellation that contains point p. //First, find all CSegments that bracket the RA of p. //Then, identify the pair of these bracketing segments which bracket p in the Dec direction. //Each segment has two cnames, identifying the 2 constellations which the segment delineates. 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/starpixmap.cpp b/kstars/kstars/starpixmap.cpp index be0d413e..59e21fe5 100644 --- a/kstars/kstars/starpixmap.cpp +++ b/kstars/kstars/starpixmap.cpp @@ -69,7 +69,7 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { if (colorIntensity < 0) colorIntensity = 0; // min TQPixmap pix (STARSIZE, STARSIZE); - TQBitmap tqmask (STARSIZE, STARSIZE); + TQBitmap mask (STARSIZE, STARSIZE); TQImage image; TQPainter p; TQMemArray<TQColor> starColor; @@ -104,9 +104,9 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { p.end(); } - tqmask.fill (Qt::color0); + mask.fill (Qt::color0); - p.begin (&tqmask); + p.begin (&mask); p.setPen (TQPen ( Qt::color1, 1)); p.setBrush( TQBrush( Qt::color1 ) ); p.drawEllipse(0, 0, STARSIZE, STARSIZE); @@ -117,7 +117,7 @@ void StarPixmap::loadPixmaps (int newColorMode, int newColorIntensity) { TQImage tmp = pix.convertToImage(); pix.convertFromImage( KImageEffect::blur( tmp, 100.0 ) ); - pix.setMask (tqmask); // set the tqmask + pix.setMask (mask); // set the mask image = pix.convertToImage(); // create the image for smoothScale() for (int i = 0; i < 26; i++) diff --git a/kstars/kstars/statform.ui b/kstars/kstars/statform.ui index 1f7dce2c..8287a805 100644 --- a/kstars/kstars/statform.ui +++ b/kstars/kstars/statform.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>statForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -176,5 +176,5 @@ <tabstop>meanOUT</tabstop> <tabstop>stddevOUT</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/streamformui.ui b/kstars/kstars/streamformui.ui index edb08f37..90d4c1b8 100644 --- a/kstars/kstars/streamformui.ui +++ b/kstars/kstars/streamformui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>streamForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -119,7 +119,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index a4e6d6b2..80998c07 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -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()); } /* @@ -273,7 +273,7 @@ VideoWG::VideoWG(TQWidget * parent, const char * name) : TQFrame(parent, name, Q streamImage = NULL; grayTable=new QRgb[256]; for (int i=0;i<256;i++) - grayTable[i]=tqRgb(i,i,i); + grayTable[i]=qRgb(i,i,i); } VideoWG::~VideoWG() diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui index 97805cf0..cea9e20d 100644 --- a/kstars/kstars/telescopepropui.ui +++ b/kstars/kstars/telescopepropui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>scopeProp</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ </widget> <widget class="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -209,7 +209,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -251,7 +251,7 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/telescopewizard.ui b/kstars/kstars/telescopewizard.ui index d2d82809..8f055960 100644 --- a/kstars/kstars/telescopewizard.ui +++ b/kstars/kstars/telescopewizard.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>telescopeWizard</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>1</y> @@ -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="QLayoutWidget" 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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -617,7 +617,7 @@ Enter the port number your telescope is connected to. If you only have one seria </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="0"/> +<layoutdefaults spacing="6" margin="0"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp index 201abef5..664a4749 100644 --- a/kstars/kstars/telescopewizardprocess.cpp +++ b/kstars/kstars/telescopewizardprocess.cpp @@ -106,7 +106,7 @@ telescopeWizardProcess::~telescopeWizardProcess() { if (progressScan) if (progressScan->wasCancelled()) - indidriver->processDevicetqStatus(1); + indidriver->processDeviceStatus(1); Options::setIndiMessages( INDIMessageBar ); @@ -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 95d15212..5e2301eb 100644 --- a/kstars/kstars/thumbnaileditor.cpp +++ b/kstars/kstars/thumbnaileditor.cpp @@ -130,7 +130,7 @@ void ThumbImage::paintEvent( TQPaintEvent* ) { } void ThumbImage::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == LeftButton && CropRect->tqcontains( e->pos() ) ) { + if ( e->button() == LeftButton && CropRect->contains( e->pos() ) ) { bMouseButtonDown = true; //The Anchor tells how far from the CropRect corner we clicked diff --git a/kstars/kstars/thumbnaileditorui.ui b/kstars/kstars/thumbnaileditorui.ui index 2a6c64f9..81675a98 100644 --- a/kstars/kstars/thumbnaileditorui.ui +++ b/kstars/kstars/thumbnaileditorui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ThumbnailEditorUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -94,5 +94,5 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp index 017c9489..c9460480 100644 --- a/kstars/kstars/thumbnailpicker.cpp +++ b/kstars/kstars/thumbnailpicker.cpp @@ -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 ); diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui index d188d87d..b5ffd200 100644 --- a/kstars/kstars/thumbnailpickerui.ui +++ b/kstars/kstars/thumbnailpickerui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ThumbnailPickerUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -24,7 +24,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -32,7 +32,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -118,7 +118,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -302,7 +302,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kstars/kstars/timebox.cpp b/kstars/kstars/timebox.cpp index 66464b67..5040cf1f 100644 --- a/kstars/kstars/timebox.cpp +++ b/kstars/kstars/timebox.cpp @@ -91,7 +91,7 @@ TQTime timeBox::createTime ( bool *ok ) TQStringList fields; //check for colon-delimiters or space-delimiters - if ( entry.tqcontains(':') ) + if ( entry.contains(':') ) fields = TQStringList::split( ':', entry ); else fields = TQStringList::split( " ", entry ); @@ -113,9 +113,9 @@ TQTime timeBox::createTime ( bool *ok ) // ignore all after 3rd field if ( fields.count() >= 3 ) { - fields[0].tqreplace( TQRegExp("h"), "" ); - fields[1].tqreplace( TQRegExp("m"), "" ); - fields[2].tqreplace( TQRegExp("s"), "" ); + fields[0].replace( TQRegExp("h"), "" ); + fields[1].replace( TQRegExp("m"), "" ); + fields[2].replace( TQRegExp("s"), "" ); } //See if first two fields parse as integers. // @@ -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 b07b74b9..f4d1449f 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -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/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp index 0d24508f..458b467f 100644 --- a/kstars/kstars/tools/altvstime.cpp +++ b/kstars/kstars/tools/altvstime.cpp @@ -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) { @@ -400,13 +400,13 @@ void AltVsTime::slotUpdateDateLoc(void) { o->updateCoords( num ); //update pList entry - pList.tqreplace( i, (SkyPoint*)o ); + pList.replace( i, (SkyPoint*)o ); KPlotObject *po = new KPlotObject( "", "white", KPlotObject::CURVE, 1, KPlotObject::SOLID ); for ( double h=-12.0; h<=12.0; h+=0.5 ) { po->addPoint( new DPoint( h, findAltitude( o, h ) ) ); } - View->tqreplaceObject( i, po ); + View->replaceObject( i, po ); //restore original position if ( o->isSolarSystem() ) { @@ -428,7 +428,7 @@ void AltVsTime::slotUpdateDateLoc(void) { for ( double h=-12.0; h<=12.0; h+=0.5 ) { po->addPoint( new DPoint( h, findAltitude( pList.at(i), h ) ) ); } - View->tqreplaceObject( i, po ); + View->replaceObject( i, po ); } } @@ -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() ); } @@ -512,7 +512,7 @@ void AVTPlotWidget::mouseMoveEvent( TQMouseEvent *e ) { int Xcursor = e->x(); int Ycursor = e->y(); - if ( ! checkRect.tqcontains( e->x(), e->y() ) ) { + if ( ! checkRect.contains( e->x(), e->y() ) ) { if ( e->x() < checkRect.left() ) Xcursor = checkRect.left(); if ( e->x() > checkRect.right() ) Xcursor = checkRect.right(); if ( e->y() < checkRect.top() ) Ycursor = checkRect.top(); diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui index c22b8692..a4d1bb29 100644 --- a/kstars/kstars/tools/altvstimeui.ui +++ b/kstars/kstars/tools/altvstimeui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AltVsTimeUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -44,7 +44,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -526,7 +526,7 @@ <tabstop>latBox</tabstop> <tabstop>updateButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argchangeviewoption.ui b/kstars/kstars/tools/argchangeviewoption.ui index 8a475d9e..2445322a 100644 --- a/kstars/kstars/tools/argchangeviewoption.ui +++ b/kstars/kstars/tools/argchangeviewoption.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgChangeViewOption</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -133,7 +133,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argexportimage.ui b/kstars/kstars/tools/argexportimage.ui index db033c1e..f5e0d0fb 100644 --- a/kstars/kstars/tools/argexportimage.ui +++ b/kstars/kstars/tools/argexportimage.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgExportImage</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -255,7 +255,7 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argloadcolorscheme.ui b/kstars/kstars/tools/argloadcolorscheme.ui index 80c4022e..addc92eb 100644 --- a/kstars/kstars/tools/argloadcolorscheme.ui +++ b/kstars/kstars/tools/argloadcolorscheme.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgLoadColorScheme</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -23,5 +23,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/arglooktoward.ui b/kstars/kstars/tools/arglooktoward.ui index d8caa57a..5d28243b 100644 --- a/kstars/kstars/tools/arglooktoward.ui +++ b/kstars/kstars/tools/arglooktoward.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgLookToward</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -155,7 +155,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argprintimage.ui b/kstars/kstars/tools/argprintimage.ui index 8806e894..a8bc4a24 100644 --- a/kstars/kstars/tools/argprintimage.ui +++ b/kstars/kstars/tools/argprintimage.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgPrintImage</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> @@ -54,5 +54,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argsetactionindi.ui b/kstars/kstars/tools/argsetactionindi.ui index 1b9f593c..8446c010 100644 --- a/kstars/kstars/tools/argsetactionindi.ui +++ b/kstars/kstars/tools/argsetactionindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetActionINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout50</cstring> + <cstring>layout50</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout47</cstring> + <cstring>layout47</cstring> </property> <vbox> <property name="name"> @@ -55,7 +55,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -113,7 +113,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsetaltaz.ui b/kstars/kstars/tools/argsetaltaz.ui index d75810f5..5c40d16a 100644 --- a/kstars/kstars/tools/argsetaltaz.ui +++ b/kstars/kstars/tools/argsetaltaz.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetAltAz</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -136,7 +136,7 @@ The azimuth is one of the coordinates in the horizontal coordinate system. It i <tabstop>AzBox</tabstop> <tabstop>AltBox</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsetccdtempindi.ui b/kstars/kstars/tools/argsetccdtempindi.ui index bc6f2324..28822d8a 100644 --- a/kstars/kstars/tools/argsetccdtempindi.ui +++ b/kstars/kstars/tools/argsetccdtempindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetCCDTempINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout64</cstring> + <cstring>layout64</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout63</cstring> + <cstring>layout63</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -114,7 +114,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetcolor.ui b/kstars/kstars/tools/argsetcolor.ui index 3eaa2a01..662b1ebe 100644 --- a/kstars/kstars/tools/argsetcolor.ui +++ b/kstars/kstars/tools/argsetcolor.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetColor</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -42,7 +42,7 @@ </widget> <widget class="QLayoutWidget" 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> @@ -218,7 +218,7 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argsetfilternumindi.ui b/kstars/kstars/tools/argsetfilternumindi.ui index 7c8dce98..17e58302 100644 --- a/kstars/kstars/tools/argsetfilternumindi.ui +++ b/kstars/kstars/tools/argsetfilternumindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetFilterNumINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout64</cstring> + <cstring>layout64</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout63</cstring> + <cstring>layout63</cstring> </property> <vbox> <property name="name"> @@ -55,7 +55,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -117,7 +117,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetfocusspeedindi.ui b/kstars/kstars/tools/argsetfocusspeedindi.ui index d79fb88e..73023c28 100644 --- a/kstars/kstars/tools/argsetfocusspeedindi.ui +++ b/kstars/kstars/tools/argsetfocusspeedindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetFocusSpeedINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -84,7 +84,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetfocustimeoutindi.ui b/kstars/kstars/tools/argsetfocustimeoutindi.ui index 18f650b8..fd7a827c 100644 --- a/kstars/kstars/tools/argsetfocustimeoutindi.ui +++ b/kstars/kstars/tools/argsetfocustimeoutindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetFocusTimeoutINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout64</cstring> + <cstring>layout64</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout63</cstring> + <cstring>layout63</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -114,7 +114,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argsetframetypeindi.ui b/kstars/kstars/tools/argsetframetypeindi.ui index 53962f38..4400fe06 100644 --- a/kstars/kstars/tools/argsetframetypeindi.ui +++ b/kstars/kstars/tools/argsetframetypeindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetFrameTypeINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout47</cstring> + <cstring>layout47</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -108,7 +108,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui index 045bc5ed..00e0f7b0 100644 --- a/kstars/kstars/tools/argsetgeolocation.ui +++ b/kstars/kstars/tools/argsetgeolocation.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetGeoLocation</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <vbox> <property name="name"> @@ -34,7 +34,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout34</cstring> + <cstring>layout34</cstring> </property> <grid> <property name="name"> @@ -101,7 +101,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -191,7 +191,7 @@ <slots> <slot>slotFindCity()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsetgeolocationindi.ui b/kstars/kstars/tools/argsetgeolocationindi.ui index ac600dff..6dd5fbf8 100644 --- a/kstars/kstars/tools/argsetgeolocationindi.ui +++ b/kstars/kstars/tools/argsetgeolocationindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetGeoLocationINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout34</cstring> + <cstring>layout34</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <vbox> <property name="name"> @@ -60,7 +60,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -161,7 +161,7 @@ <data format="PNG" length="1114">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsetlocaltime.ui b/kstars/kstars/tools/argsetlocaltime.ui index 1e3ab951..03247473 100644 --- a/kstars/kstars/tools/argsetlocaltime.ui +++ b/kstars/kstars/tools/argsetlocaltime.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetLocalTime</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -23,7 +23,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -101,5 +101,5 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argsetportindi.ui b/kstars/kstars/tools/argsetportindi.ui index 12687b8f..2ca20aa4 100644 --- a/kstars/kstars/tools/argsetportindi.ui +++ b/kstars/kstars/tools/argsetportindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetPortINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -71,7 +71,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsetradec.ui b/kstars/kstars/tools/argsetradec.ui index f1830fb6..b78ac04a 100644 --- a/kstars/kstars/tools/argsetradec.ui +++ b/kstars/kstars/tools/argsetradec.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetRaDec</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -136,7 +136,7 @@ Right Ascension is one of the coordinates in the Equatorial coordinate system. <tabstop>RaBox</tabstop> <tabstop>DecBox</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsetscopeactionindi.ui b/kstars/kstars/tools/argsetscopeactionindi.ui index 3630c8f4..528e783e 100644 --- a/kstars/kstars/tools/argsetscopeactionindi.ui +++ b/kstars/kstars/tools/argsetscopeactionindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetScopeActionINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout47</cstring> + <cstring>layout47</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -108,7 +108,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argsettargetcoordindi.ui b/kstars/kstars/tools/argsettargetcoordindi.ui index b3b6849b..8973b24b 100644 --- a/kstars/kstars/tools/argsettargetcoordindi.ui +++ b/kstars/kstars/tools/argsettargetcoordindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetTargetCoordINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout34</cstring> + <cstring>layout34</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <vbox> <property name="name"> @@ -60,7 +60,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -161,7 +161,7 @@ <data format="PNG" length="1114">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042149444154789c8d95c18b1c4514c67fbb29e5b54ea05b26da1d36b08d096e8b11261871837bc8e282ac7ac82187e049a317e32d37110992bf42123c694eea414c0e0bf1b0ec6c402139485a54e8810c54c10e741146fa110bd643f74c12bd642e4d75f77cf5d5ef7dafdfc2ce7087d9eff32fdfdff74e5114104011e489d6e952cce5cfbe5998692dec0c77b87aedd3fddd9f2b3efce02291082209aa3504685022e4ffd7a000a82a765c515615ce95acae659c3f7765c100ec6e575cf8f822e991025f3b6a6f890c484f181ccfc1583428f5d4e2fe84da039aa04121b40eb32483a0ec6e5bce9f8385d36fa7fb9b1b17c8f31cbfe7a95c45be94520c72b2141a1caa160d1666e24ea94aa11ee7685054159d2ada34d41387c40dc63b8844f0b5c73a4bb19cb3f9de001f2aac1fa23aa209168c004224902e29d22ff1e38abbdb275055c4800610233867311a1491847a62c98f66ac6f14d8e99072f22daa15b68a8108424d6422e24c88e3966fbce4c9d786945b27f0be0103ed13c16004d59a2c4d58df28a87548e9aee2274ab95d60c7193c9a0281fc959ae2a4450364a9e2572c7a2b43438374ef2dd2154012d050514dbec7396578a3130d9d6850066f0ad9d186f2d78cdbbb799b0a202f2c48d3aebbb418310240b112637588574bf54b8efaa4fd9b691dacbf5b305813542bae63a9eee4c4694d967b5494eca8c7ef0933bdc5d90e6a2caa0e3f013b7adce9fa5b03d637561113a30106a71d18c5fd9677058338ad01e91c0b8b743b880182ce19cd9c0e5e2b583fbdda565d3d04cfedad180942133af201b2bc3588e111c680068f489780ce69b192b279768088524f2b3458ea694d3de99a4323bc976ed34eb86b98c51993f6be10f77240c99685cd731991f1582df15aa15a213d583f5313a7806988fb8a0640e336359d9e9933568bf44062214ba19e2a7652a13d8b068ff596b807182189234e9da9f1ceb78c81b28c3ac6fe21e306c58e41d5118952acd6a0c2f56b9e6a5c72f346cdcd6b19a3bf8010010d714f89533b674c90c7189b598eab12a45fb5c75b8253672b863fbcccf5af93b6904119fe9851bf5153ac3a746ae7b9d5698c1dc58f313e70e4707ce9d84bafa2f79fc23fb8c7c1438ef04031a2642fee21060ec69ee47020796ecaa12313ccd333d1b67935047acf2be3bb11aa010dbe656cc755dbe3b772084a7ebc6d5711253b593dfcc0cc8fcd3cafda455512c7f200ec56cbfac0f1d7d34b7fdf0f98fd88a92a7e9cb0e70cc933c0b38a2c823ea0bd76c70c016adb67f47bc2a117a6d40abeea33fa23c2fb867edfb413e4a34fded94ffb3991c46dc7754cd3634ad2af490b857f5a5137126a97e02a8120a485235b6a28ef80bd077ee2b9f2d54fed04595dcbd8ddb6c4bd87334c10cadb2064e856177e7864e669fbe1df154a0142839f7ad2e5b6880bff1da66eece78e315d959f609da670f98befe6c3f45fb42672c9acff7f660000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/argsettargetnameindi.ui b/kstars/kstars/tools/argsettargetnameindi.ui index c826f0c9..0f4b17f9 100644 --- a/kstars/kstars/tools/argsettargetnameindi.ui +++ b/kstars/kstars/tools/argsettargetnameindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetTargetNameINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout44</cstring> + <cstring>layout44</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout40</cstring> + <cstring>layout40</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <vbox> <property name="name"> @@ -72,7 +72,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -139,7 +139,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argsettrack.ui b/kstars/kstars/tools/argsettrack.ui index 27dc0ebf..bacb0597 100644 --- a/kstars/kstars/tools/argsettrack.ui +++ b/kstars/kstars/tools/argsettrack.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetTrack</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -78,5 +78,5 @@ If unchecked, then Tracking will be forced off, even if an object has been cente </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argsetutcindi.ui b/kstars/kstars/tools/argsetutcindi.ui index d3af06e3..9c0f1302 100644 --- a/kstars/kstars/tools/argsetutcindi.ui +++ b/kstars/kstars/tools/argsetutcindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSetUTCINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout88</cstring> + <cstring>layout88</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout86</cstring> + <cstring>layout86</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -110,7 +110,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/argshutdownindi.ui b/kstars/kstars/tools/argshutdownindi.ui index 03260458..ce7be2f4 100644 --- a/kstars/kstars/tools/argshutdownindi.ui +++ b/kstars/kstars/tools/argshutdownindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgShutdownINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget" 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> @@ -68,7 +68,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argstartexposureindi.ui b/kstars/kstars/tools/argstartexposureindi.ui index 68849411..47a631e6 100644 --- a/kstars/kstars/tools/argstartexposureindi.ui +++ b/kstars/kstars/tools/argstartexposureindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgStartExposureINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout64</cstring> + <cstring>layout64</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout63</cstring> + <cstring>layout63</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -116,7 +116,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kstars/kstars/tools/argstartfocusindi.ui b/kstars/kstars/tools/argstartfocusindi.ui index 407dd4b5..3bd5503c 100644 --- a/kstars/kstars/tools/argstartfocusindi.ui +++ b/kstars/kstars/tools/argstartfocusindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgStartFocusINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout47</cstring> + <cstring>layout47</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -110,7 +110,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argstartindi.ui b/kstars/kstars/tools/argstartindi.ui index 47f6c955..554ea363 100644 --- a/kstars/kstars/tools/argstartindi.ui +++ b/kstars/kstars/tools/argstartindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgStartINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget" 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> @@ -117,7 +117,7 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argswitchindi.ui b/kstars/kstars/tools/argswitchindi.ui index ea60237a..f4c85a1c 100644 --- a/kstars/kstars/tools/argswitchindi.ui +++ b/kstars/kstars/tools/argswitchindi.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgSwitchINDI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget" 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> @@ -122,7 +122,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argtimescale.ui b/kstars/kstars/tools/argtimescale.ui index 85b51337..f2b0eab3 100644 --- a/kstars/kstars/tools/argtimescale.ui +++ b/kstars/kstars/tools/argtimescale.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgTimeScale</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -90,7 +90,7 @@ <data format="XPM.GZ" length="2926">789c9d95594f32591086effd15c4ba3393fae895ee4ce6824540141011b7c95cf406a202caa6f065fefb549faaea0b24996fc623cb937aeb3d55754e871f67a587eb6ee9ecc7c96a1dada74929798e96a5b374339bedfefceb8f9f27a7b65da27fcb724bf6e96f27a783752929f516f32c070402289b3fc39d8203c3136157e276c1260eac0f0ade0907927f2d9c58261f929cad72be0cef8535ff5959e277c201ef0fa02cf1ae7022f9efca12ff301ca81e87c21a5f32db5acf95b0eebfcdd92e2be3a5b0fa7986435bfd6e981d99278c0ae6795c288b3e2b98e3036157d8f839961308af985df51b1b0e9dc0098ddf5a3811fd7dceaee52a370d475e28f9b7ca1c07539f67173c144e65be2fcae2d763f62d89df2acb7cc282393e57b6b9ff58d893fca632c7d1ccc78bbcd48b4c7cc2ec4bfdf0aa2cfbf50be6fa2c65d9af2aacfd2c94e53cccf9fa7645eb7794a59ebdb027fe5565895f09cb7e981a267f9febaf3117fab6702af599e7a5e2049e6dce1377c25affa6608e4786e34a58894dfc8b59f5f890731087e28f2de648fbdb16ccfd6c9465bf7365c732f12f61ed3f5016fd4a59f4e6790fddd00a5d137f638eb4bfa532df5ffc148ea4be5ac17c5ea9b2ecd72b98efff403893fa1accb12d5c5696fd4d7f6152c41f95c53f2a98f56b6597fbf3857da9b75e30fb5584b59fa78239de5596fd3e0be6fdccf311b99115f1fcdaccb12fe77927ac7e2365f1c382793e63e14cfccdf3132571e69b1f07e83327d23fbac2bee4d785d57f2a9c89de9c6fecaa1fce98135bf845b9e2189e2a07e6fee287b0cfcf3bce9525ff5d38927a1bcca9cc1b66ca528ff93d89d338e3f9e182b9c86f31a752ff609d2f847f5f83b5ea31c218137a4f8fac0cc738e10cd6d3b7189f718a2ff88a6f38c339ad05adfcf31d3f7089ab037d42ea356e708b9ff8853bdc6395de6b58c706ad736c1ee823f2de608b146dbcc08e8976f012afb04b3975ec1de853aa2457f749d5c16b1ce00d0ecdf75b1ce1dd11fd1b55d236cef7f8808ff88465b4d02676d03da29f51dd9e513fa28f150c3004246d07002288bfe9e7d45f0712f22635a490d15ef730361e3b389c67aedf2390ea3157e73dc333e9a6f042d13ebc7ed32f6882405d3ee1c678030ee10d6630a76f162c8ee8f37adeb14c0aaa0b3e68b725ac80a2b039a29f630db6e46bc127d5fd45de4b5226b0833d8ea07a445f871ae96dacc218ead08073c835136842eba8be016db830e77a419f21aca143f76c025b9ae7e5813ea35bd5a0731fd1c4877a7f614fde57d085deb7f31ad31dccf54fd087883ab7a88f6baabb45fdf760003707fa09ddd826f66048af1826f00a0bb3aa7009b73082bb03fd2faeffa7fff58cfffcbcfffdfbc93f7f7d62d7</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>timestepbox.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argwaitfor.ui b/kstars/kstars/tools/argwaitfor.ui index 89a62dbd..21478f29 100644 --- a/kstars/kstars/tools/argwaitfor.ui +++ b/kstars/kstars/tools/argwaitfor.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgWaitFor</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -81,5 +81,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kstars/kstars/tools/argwaitforkey.ui b/kstars/kstars/tools/argwaitforkey.ui index 805566ca..cb3f8610 100644 --- a/kstars/kstars/tools/argwaitforkey.ui +++ b/kstars/kstars/tools/argwaitforkey.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgWaitForKey</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -85,7 +85,7 @@ Only simple keys can currently be used; you cannot use modifier keys such as Ctr </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/argzoom.ui b/kstars/kstars/tools/argzoom.ui index 9a2fccfe..8b93e300 100644 --- a/kstars/kstars/tools/argzoom.ui +++ b/kstars/kstars/tools/argzoom.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArgZoom</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget"> <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> @@ -86,7 +86,7 @@ The Zoom level specifies the number of pixels which span one radian of arc. Rea </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp index 18b0d6fd..3b87826b 100644 --- a/kstars/kstars/tools/astrocalc.cpp +++ b/kstars/kstars/tools/astrocalc.cpp @@ -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 18870824..bbabcb24 100644 --- a/kstars/kstars/tools/astrocalc.h +++ b/kstars/kstars/tools/astrocalc.h @@ -120,7 +120,7 @@ Q_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..7d7add93 100644 --- a/kstars/kstars/tools/jmoontool.cpp +++ b/kstars/kstars/tools/jmoontool.cpp @@ -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 1ca4ab1a..dcbe36b7 100644 --- a/kstars/kstars/tools/kstarsplotwidget.cpp +++ b/kstars/kstars/tools/kstarsplotwidget.cpp @@ -283,7 +283,7 @@ void KStarsPlotWidget::updateTickmarks() { void KStarsPlotWidget::drawBox( TQPainter *p ) { int pW = PixRect.width(), pH = PixRect.height(); - //First, fill in padding region with bgColor() to tqmask out-of-bounds plot data + //First, fill in padding region with bgColor() to mask out-of-bounds plot data p->setPen( bgColor() ); p->setBrush( bgColor() ); @@ -361,7 +361,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, pH+BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); @@ -429,7 +429,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( -2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); @@ -495,7 +495,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( px > 0 && px < pW ) { TQRect r( px - BIGTICKSIZE, -2*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE ); @@ -559,7 +559,7 @@ void KStarsPlotWidget::drawBox( TQPainter *p ) { TQString str = TQString( "%1" ).arg( lab, 0, 'g', 2 ); int idot = str.find( '.' ); if ( idot >= 0 ) - str = str.tqreplace( idot, 1, KGlobal::locale()->decimalSymbol() ); + str = str.replace( idot, 1, KGlobal::locale()->decimalSymbol() ); if ( py > 0 && py < pH ) { TQRect r( pW + 2*BIGTICKSIZE, py-SMALLTICKSIZE, 2*BIGTICKSIZE, 2*SMALLTICKSIZE ); diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index a3812969..bc682bbb 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -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( Qt::AlignTop ); + StarInfoBox->layout()->setSpacing( 6 ); + StarInfoBox->layout()->setMargin( 11 ); + StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->layout() ); + StarInfoBoxLayout->setAlignment( Qt::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( Qt::AlignTop ); + DataSelectBox->layout()->setSpacing( 6 ); + DataSelectBox->layout()->setMargin( 11 ); + DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->layout() ); + DataSelectBoxLayout->setAlignment( Qt::AlignTop ); VisualCheck = new TQCheckBox( DataSelectBox, "VisualCheck" ); VisualCheck->setChecked( TRUE ); diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui index 481b2287..72290976 100644 --- a/kstars/kstars/tools/modcalcangdistdlg.ui +++ b/kstars/kstars/tools/modcalcangdistdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcAngDistDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -36,7 +36,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -667,7 +667,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index 9d721f0c..27f4bc0c 100644 --- a/kstars/kstars/tools/modcalcapcoord.cpp +++ b/kstars/kstars/tools/modcalcapcoord.cpp @@ -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)); } diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index 2d5e0aa6..5ddec248 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcApCoordDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -39,7 +39,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -855,7 +855,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index e276defc..a2dee393 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -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)); } diff --git a/kstars/kstars/tools/modcalcazel.h b/kstars/kstars/tools/modcalcazel.h index 65e09837..d7dae29a 100644 --- a/kstars/kstars/tools/modcalcazel.h +++ b/kstars/kstars/tools/modcalcazel.h @@ -83,12 +83,12 @@ private: double getEpoch (TQString eName); /**Fill the Az and El dmsBoxes with values of the SkyPoint argument. - * @param sp SkypPoint object which tqcontains the coordinates to + * @param sp SkypPoint object which contains the coordinates to * be displayed */ void showHorCoords ( SkyPoint sp ); /**Fill the Az and El dmsBoxes with values of the SkyPoint argument. - * @param sp SkypPoint object which tqcontains the coordinates to + * @param sp SkypPoint object which contains the coordinates to * be displayed * @param jd Julian day for which the conversion has been performed * The epoch is constructed for that day diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index a7721f6f..0e1bb9fc 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -7,7 +7,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -50,7 +50,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -1058,7 +1058,7 @@ <slot>slotElChecked()</slot> <slot>newSlot()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcdaylength.cpp b/kstars/kstars/tools/modcalcdaylength.cpp index 4f2579c8..dcfba7bd 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 027155ab..d5d5c1f8 100644 --- a/kstars/kstars/tools/modcalcdaylengthdlg.ui +++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcDayLengthDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -38,7 +38,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -639,7 +639,7 @@ <slot>slotComputePosTime()</slot> <slot>slotClearCoords()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui index 178408cc..1a164a9b 100644 --- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui +++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcEclCoordsDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -903,7 +903,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index 119c3fea..ba749698 100644 --- a/kstars/kstars/tools/modcalcequinox.cpp +++ b/kstars/kstars/tools/modcalcequinox.cpp @@ -56,7 +56,7 @@ int modCalcEquinox::getYear (TQString eName) void modCalcEquinox::showCurrentYear (void) { - KStarsDateTime dt( KStarsDateTime::tqcurrentDateTime() ); + KStarsDateTime dt( KStarsDateTime::currentDateTime() ); yearEdit->setText( TQString( "%1").arg( dt.date().year() ) ); } diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui index 2b8660fe..025802ba 100644 --- a/kstars/kstars/tools/modcalcequinoxdlg.ui +++ b/kstars/kstars/tools/modcalcequinoxdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcEquinoxDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -565,7 +565,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/modcalcgalcoorddlg.ui b/kstars/kstars/tools/modcalcgalcoorddlg.ui index ca231504..dfb59183 100644 --- a/kstars/kstars/tools/modcalcgalcoorddlg.ui +++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcGalCoordDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget" 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="QLayoutWidget"> <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> @@ -914,7 +914,7 @@ <slot>slotGalLongCheckedBatch()</slot> <slot>slotRunBatch()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui index ba00e3bc..890eb4c0 100644 --- a/kstars/kstars/tools/modcalcgeoddlg.ui +++ b/kstars/kstars/tools/modcalcgeoddlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcGeodCoordDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -39,7 +39,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout31</cstring> + <cstring>layout31</cstring> </property> <hbox> <property name="name"> @@ -58,7 +58,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -112,7 +112,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -800,7 +800,7 @@ <slot>slotYCheckedBatch()</slot> <slot>slotZCheckedBatch()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp index 068014f1..99271d34 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 062b61f0..6550c546 100644 --- a/kstars/kstars/tools/modcalcjddlg.ui +++ b/kstars/kstars/tools/modcalcjddlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcJdDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -100,7 +100,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -499,7 +499,7 @@ <slot>slotComputeTime()</slot> <slot>showCurrentTime()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index ae53f8e8..e9053bd5 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -51,7 +51,7 @@ modCalcPlanets::~modCalcPlanets(){ void modCalcPlanets::showCurrentDateTime (void) { KStars *ks = (KStars*) parent()->parent()->parent(); // QSplitter->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() ); @@ -441,7 +441,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { if(utCheckBatch->isChecked() ) { utB = TQTime::fromString( fields[i] ); if ( !utB.isValid() ) { - kdWarning() << i18n( "Line %1 tqcontains an invalid time" ).arg(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 tqcontains an invalid date: " ).arg(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 86179428..3788816f 100644 --- a/kstars/kstars/tools/modcalcplanetsdlg.ui +++ b/kstars/kstars/tools/modcalcplanetsdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcPlanetsDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -47,7 +47,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -167,7 +167,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -337,7 +337,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -1370,7 +1370,7 @@ <slot>slotRunBatch()</slot> <slot>slotPlanetsCheckedBatch()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp index bd489597..ddf71e2e 100644 --- a/kstars/kstars/tools/modcalcprec.cpp +++ b/kstars/kstars/tools/modcalcprec.cpp @@ -63,7 +63,7 @@ TQString modCalcPrec:: showCurrentEpoch () { } double modCalcPrec::setCurrentEpoch () { - return KStarsDateTime::tqcurrentDateTime().epoch(); + return KStarsDateTime::currentDateTime().epoch(); } double modCalcPrec::getEpoch (TQString eName) { diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui index 16619481..ae895f9d 100644 --- a/kstars/kstars/tools/modcalcprecdlg.ui +++ b/kstars/kstars/tools/modcalcprecdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcPrecDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -742,7 +742,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index cc7d1692..33cc03c9 100644 --- a/kstars/kstars/tools/modcalcsidtime.cpp +++ b/kstars/kstars/tools/modcalcsidtime.cpp @@ -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); diff --git a/kstars/kstars/tools/modcalcsidtimedlg.ui b/kstars/kstars/tools/modcalcsidtimedlg.ui index 98751c7f..eea8681c 100644 --- a/kstars/kstars/tools/modcalcsidtimedlg.ui +++ b/kstars/kstars/tools/modcalcsidtimedlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcSidTimeDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -39,7 +39,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -860,7 +860,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>dmsbox.h</includehint> diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index f015d405..412e1d72 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -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)); } diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui index 611b4d9a..80311fb8 100644 --- a/kstars/kstars/tools/modcalcvlsrdlg.ui +++ b/kstars/kstars/tools/modcalcvlsrdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>modCalcVlsrDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -47,7 +47,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -1187,7 +1187,7 @@ <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index 7a521bb9..fbd1702c 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -121,7 +121,7 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) ui->NotesEdit->setEnabled( false ); } -bool ObservingList::tqcontains( const SkyObject *q ) { +bool ObservingList::contains( const SkyObject *q ) { for ( SkyObject* o = obsList.first(); o; o = obsList.next() ) { if ( o == q ) return true; } diff --git a/kstars/kstars/tools/observinglist.h b/kstars/kstars/tools/observinglist.h index 528708fa..e2beaba6 100644 --- a/kstars/kstars/tools/observinglist.h +++ b/kstars/kstars/tools/observinglist.h @@ -70,7 +70,7 @@ public: /**@return true if the object is in the observing list *@p o pointer to the object to test. */ - bool tqcontains( const SkyObject *o ); + bool contains( const SkyObject *o ); SkyObject* first() { return obsList.first(); } SkyObject* next() { return obsList.next(); } diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui index 48cda78b..040f6970 100644 --- a/kstars/kstars/tools/observinglistui.ui +++ b/kstars/kstars/tools/observinglistui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ObservingListUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -554,7 +554,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp index 50e5b200..7dbbbc3d 100644 --- a/kstars/kstars/tools/obslistwizard.cpp +++ b/kstars/kstars/tools/obslistwizard.cpp @@ -195,13 +195,13 @@ void ObsListWizard::slotShowStackWidget( TQListViewItem *i ) if ( i ) { TQString t = i->text(0); - if ( t.tqcontains( i18n( "Object type(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ObjTypePage ); - if ( t.tqcontains( i18n( "Region" ) ) ) olw->FilterStack->raiseWidget( olw->RegionPage ); - if ( t.tqcontains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage ); - if ( t.tqcontains( i18n( "Circular" ) ) ) olw->FilterStack->raiseWidget( olw->CircRegionPage ); - if ( t.tqcontains( i18n( "Rectangular" ) ) ) olw->FilterStack->raiseWidget( olw->RectRegionPage ); -// if ( t.tqcontains( i18n( "Observable on date" ) ) ) olw->FilterStack->raiseWidget( olw->ObsDatePage ); - if ( t.tqcontains( i18n( "Magnitude limit" ) ) ) olw->FilterStack->raiseWidget( olw->MagLimitPage ); + if ( t.contains( i18n( "Object type(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ObjTypePage ); + if ( t.contains( i18n( "Region" ) ) ) olw->FilterStack->raiseWidget( olw->RegionPage ); + if ( t.contains( i18n( "In constellation(s)" ) ) ) olw->FilterStack->raiseWidget( olw->ConstellationPage ); + if ( t.contains( i18n( "Circular" ) ) ) olw->FilterStack->raiseWidget( olw->CircRegionPage ); + if ( t.contains( i18n( "Rectangular" ) ) ) olw->FilterStack->raiseWidget( olw->RectRegionPage ); +// if ( t.contains( i18n( "Observable on date" ) ) ) olw->FilterStack->raiseWidget( olw->ObsDatePage ); + if ( t.contains( i18n( "Magnitude limit" ) ) ) olw->FilterStack->raiseWidget( olw->MagLimitPage ); } } diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui index 7ea62d44..a501e152 100644 --- a/kstars/kstars/tools/obslistwizardui.ui +++ b/kstars/kstars/tools/obslistwizardui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ObsListWizardUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout79</cstring> + <cstring>layout79</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <vbox> <property name="name"> @@ -117,7 +117,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> @@ -164,7 +164,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -225,7 +225,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -736,7 +736,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -1012,7 +1012,7 @@ select from a region on the sky.</string> <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui index 5322c368..acae2c0d 100644 --- a/kstars/kstars/tools/optionstreeview.ui +++ b/kstars/kstars/tools/optionstreeview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>OptionsTreeView</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -62,7 +62,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -130,7 +130,7 @@ <slot>accept()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index eb149b6e..cd0aba3d 100644 --- a/kstars/kstars/tools/planetviewer.cpp +++ b/kstars/kstars/tools/planetviewer.cpp @@ -233,7 +233,7 @@ PVPlotWidget::PVPlotWidget( double x1, double x2, double y1, double y2, TQWidget mouseButtonDown(false), oldx(0), oldy(0) { setFocusPolicy( TQWidget::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( TQWidget::StrongFocus ); setMouseTracking (true); - pv = (PlanetViewer*)tqtopLevelWidget(); + pv = (PlanetViewer*)topLevelWidget(); } PVPlotWidget::~ PVPlotWidget() {} diff --git a/kstars/kstars/tools/planetviewerui.ui b/kstars/kstars/tools/planetviewerui.ui index 735f4e19..77f3e085 100644 --- a/kstars/kstars/tools/planetviewerui.ui +++ b/kstars/kstars/tools/planetviewerui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PlanetViewerUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -151,7 +151,7 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>timestepbox.h</includehint> diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index 96ef19d0..b7538432 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -649,7 +649,7 @@ void ScriptBuilder::initViewOptions() { new TQListViewItem( opsSkymap, "UseAltAz", i18n( "Use 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" ) ); @@ -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; @@ -946,7 +946,7 @@ void ScriptBuilder::writeScript( TQTextStream &ostream ) { sf->setINDIProperty("PARK"); } - if ( sf->argVal(0).tqcontains(" ")) + if ( sf->argVal(0).contains(" ")) ostream << mainpre << "waitForINDIAction " << "\"" << sf->argVal(0) << "\" " << sf->INDIProperty() << endl; else ostream << mainpre << "waitForINDIAction " << sf->argVal(0) << " " << sf->INDIProperty() << endl; @@ -965,11 +965,11 @@ void ScriptBuilder::readScript( TQTextStream &istream ) { line = istream.readLine(); //look for name of script - if ( line.tqcontains( "#KStars DCOP script: " ) ) + if ( line.contains( "#KStars DCOP script: " ) ) currentScriptName = line.mid( 21 ).stripWhiteSpace(); //look for author of scriptbuilder - if ( line.tqcontains( "#by " ) ) + if ( line.contains( "#by " ) ) currentAuthor = line.mid( 4 ).stripWhiteSpace(); //Actual script functions @@ -977,7 +977,7 @@ void ScriptBuilder::readScript( TQTextStream &istream ) { //is ClockFunction? bool clockfcn( false ); - if ( line.tqcontains( "$CLOCK" ) ) clockfcn = true; + if ( line.contains( "$CLOCK" ) ) clockfcn = true; //remove leading dcop prefix line = line.mid( 20 ); @@ -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; diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui index 2ba46eff..9de4797f 100644 --- a/kstars/kstars/tools/scriptbuilderui.ui +++ b/kstars/kstars/tools/scriptbuilderui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ScriptBuilderUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -267,7 +267,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget" 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="QLayoutWidget"> <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> @@ -627,7 +627,7 @@ <slot>slotRemoveFunction()</slot> <slot>slotRunScript()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="4"/> +<layoutdefaults spacing="6" margin="4"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kstars/kstars/tools/scriptfunction.cpp b/kstars/kstars/tools/scriptfunction.cpp index 1f99af3b..c95594f5 100644 --- a/kstars/kstars/tools/scriptfunction.cpp +++ b/kstars/kstars/tools/scriptfunction.cpp @@ -87,10 +87,10 @@ ScriptFunction::ScriptFunction( TQString name, TQString desc, bool clockfcn, if ( NumArgs ) Description += " "; Description += nameStyle.arg( ")" ) + "</p><p>"; - //before adding description, tqreplace any '%n' instances with the corresponding + //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. //Also assume that '%' is *only* used to indicate argument instances - int narg = desc.tqcontains( '%' ); + int narg = desc.contains( '%' ); switch (narg ) { case 1: Description += desc.arg( paramStyle.arg( an1 ) ); @@ -205,8 +205,8 @@ TQString ScriptFunction::scriptLine() const { TQString out( Name ); unsigned int i=0; while ( ! ArgName[i].isEmpty() && i < 6 ) { - // Wrap arg in quotes if it tqcontains a space - if ( ArgVal[i].tqcontains(" ") ) { + // Wrap arg in quotes if it contains a space + if ( ArgVal[i].contains(" ") ) { out += " \"" + ArgVal[i] + "\""; } else { out += " " + ArgVal[i]; diff --git a/kstars/kstars/tools/scriptnamedialog.ui b/kstars/kstars/tools/scriptnamedialog.ui index 0e95605c..bc493ad3 100644 --- a/kstars/kstars/tools/scriptnamedialog.ui +++ b/kstars/kstars/tools/scriptnamedialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ScriptNameDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -24,7 +24,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -75,7 +75,7 @@ </widget> <widget class="QLayoutWidget"> <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> @@ -149,7 +149,7 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui index 8bc01480..824ffe20 100644 --- a/kstars/kstars/tools/wutdialogui.ui +++ b/kstars/kstars/tools/wutdialogui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>WUTDialogUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <vbox> <property name="name"> @@ -37,7 +37,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -552,7 +552,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index 08f1d0db..632aabe1 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 = '" << keyEvent->text() << "'" << 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; @@ -428,7 +428,7 @@ void KTouch::optionsPreferences() { m_pageTraining = new KTouchPrefTrainingLayout(0, "Training"); dialog->addPage(m_pageTraining, i18n("Training Options"), "kalarm"); m_pageKeyboard = new KTouchPrefKeyboardLayout(0, "Keyboard"); - dialog->addPage(m_pageKeyboard, i18n("Keyboard Settings"), "keyboard_tqlayout"); + dialog->addPage(m_pageKeyboard, i18n("Keyboard Settings"), "keyboard_layout"); m_pageColors = new KTouchPrefColorsLayout(0, "Colors"); dialog->addPage(m_pageColors, i18n("Color Settings"), "package_graphics"); connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(applyPreferences())); @@ -450,12 +450,12 @@ void KTouch::optionsPreferences() { } // ---------------------------------------------------------------------------- -void KTouch::changetqStatusbarMessage(const TQString& text) { +void KTouch::changeStatusbarMessage(const TQString& text) { statusBar()->message(text); } // ---------------------------------------------------------------------------- -void KTouch::changetqStatusbarStats(unsigned int level_correct, unsigned int level_total, unsigned int level_words, +void KTouch::changeStatusbarStats(unsigned int level_correct, unsigned int level_total, unsigned int level_words, unsigned int session_correct, unsigned int session_total, unsigned int session_words) { statusBar()->changeItem(i18n( "Level: Correct/Total chars: %1/%2 Words: %3") @@ -468,9 +468,9 @@ void KTouch::changetqStatusbarStats(unsigned int level_correct, unsigned int lev 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); } // ---------------------------------------------------------------------------- @@ -528,7 +528,7 @@ bool KTouch::queryExit() { // ---------------------------------------------------------------------------- void KTouch::resizeEvent(TQResizeEvent * event) { - changetqStatusbarStats(m_trainer->m_levelStats.m_correctChars, m_trainer->m_levelStats.m_totalChars, m_trainer->m_levelStats.m_words, + changeStatusbarStats(m_trainer->m_levelStats.m_correctChars, m_trainer->m_levelStats.m_totalChars, m_trainer->m_levelStats.m_words, m_trainer->m_sessionStats.m_correctChars, m_trainer->m_sessionStats.m_totalChars, m_trainer->m_sessionStats.m_words); KMainWindow::resizeEvent(event); } @@ -561,7 +561,7 @@ void KTouch::readProperties(KConfig *config) { m_trainer->m_teacherText = m_lecture.level(m_trainer->m_level).line(m_trainer->m_line); m_trainer->m_studentText = config->readEntry("StudentText"); m_trainer->continueTraining(); - changetqStatusbarMessage( i18n("Restarting training session: Waiting for first keypress...") ); + changeStatusbarMessage( i18n("Restarting training session: Waiting for first keypress...") ); // update the slide line widget m_slideLineWidget->setNewText(m_trainer->m_teacherText, m_trainer->m_studentText); // update all the other widgets @@ -608,7 +608,7 @@ void KTouch::init() { //kdDebug() << "[KTouch::init] populating file lists..." << endl; updateFileLists(); // create lists with default lecture/keyboard/examination files/colour scheme files //kdDebug() << "[KTouch::init] " << m_lectureFiles.count() << " lectures available" << endl; - //kdDebug() << "[KTouch::init] " << m_keyboardFiles.count() << " keyboard tqlayouts available" << endl; + //kdDebug() << "[KTouch::init] " << m_keyboardFiles.count() << " keyboard layouts available" << endl; //kdDebug() << "[KTouch::init] " << m_examinationFiles.count() << " examination files available" << endl; if (Prefs::currentLectureFile() == "default") { @@ -620,9 +620,9 @@ 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 (m_keyboardFiles.tqcontains(Prefs::currentKeyboardFile() )==0) { + // 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 TQString lang = KGlobal::locale()->language(); @@ -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 tqlayouts and widgets for new training session..." << endl; + //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(); @@ -710,8 +710,8 @@ void KTouch::setupActions() { // *** Settings menu *** KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); - // Setup menu entries for keyboard tqlayouts - m_keyboardLayoutAction= new KSelectAction(i18n("&Keyboard Layouts"), 0, this, 0, actionCollection(), "keyboard_tqlayouts"); + // Setup menu entries for keyboard layouts + m_keyboardLayoutAction= new KSelectAction(i18n("&Keyboard Layouts"), 0, this, 0, actionCollection(), "keyboard_layouts"); m_keyboardLayoutAction->setMenuAccelsEnabled(false); m_keyboardLayoutAction->setItems(m_keyboardTitles); connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeKeyboard(int))); @@ -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 6b63b84e..ba5f8e56 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; @@ -71,9 +71,9 @@ class KTouch : public KMainWindow { /// Clears the statistics data. void clearStatistics(); /// Updates the status bar text. - void changetqStatusbarMessage(const TQString& text); + void changeStatusbarMessage(const TQString& text); /// Updates the status bar statistics. - void changetqStatusbarStats(unsigned int level_correct, unsigned int level_total, unsigned int level_words, + void changeStatusbarStats(unsigned int level_correct, unsigned int level_total, unsigned int level_words, unsigned int session_correct, unsigned int session_total, unsigned int session_words); public slots: @@ -100,7 +100,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); @@ -110,7 +110,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); @@ -127,7 +127,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(); @@ -153,7 +153,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). @@ -170,8 +170,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/ktouchchartwidget.h b/ktouch/src/ktouchchartwidget.h index 212cd0a4..799a5a38 100644 --- a/ktouch/src/ktouchchartwidget.h +++ b/ktouch/src/ktouchchartwidget.h @@ -21,7 +21,7 @@ class KTouchTrainer; -/// This is the chart widget and tqcontains all chart drawing code. +/// This is the chart widget and contains all chart drawing code. class KTouchChartWidget : public KPlotWidget { Q_OBJECT public: diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui index 1d82f278..d6c4a0a7 100644 --- a/ktouch/src/ktouchcoloreditor_dlg.ui +++ b/ktouch/src/ktouchcoloreditor_dlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KTouchColorEditorDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -179,7 +179,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout28</cstring> + <cstring>layout28</cstring> </property> <hbox> <property name="name"> @@ -792,7 +792,7 @@ <slot>updateClicked()</slot> <slot>colorSchemeChanged(QListBoxItem * item)</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> 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/ktouchkey.h b/ktouch/src/ktouchkey.h index f2090f24..011f4e4b 100644 --- a/ktouch/src/ktouchkey.h +++ b/ktouch/src/ktouchkey.h @@ -20,7 +20,7 @@ #include <tqpainter.h> #include <tqdom.h> -/// This class tqcontains information about one character on a key. +/// This class contains information about one character on a key. class KTouchKeyChar { public: /// Position of the character on the key. diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp index d654d542..1e7440a5 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 @@ -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::null; // 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"); @@ -232,10 +232,10 @@ bool KTouchKeyboard::read(const TQDomDocument& doc) { void KTouchKeyboard::write(TQDomDocument& doc) const { TQDomElement root = doc.createElement( "KTouchKeyboard" ); doc.appendChild(root); - // Store title and ensure that the file tqcontains a title! + // 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::null; // 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'. ").arg(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'.").arg(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(); } diff --git a/ktouch/src/ktouchkeyboard.h b/ktouch/src/ktouchkeyboard.h index fd2613fe..5334c49b 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. QString m_title; ///< Title of the keyboard (to appear in the menu). - QString m_comment; ///< Comments about the creator of the keyboard tqlayout. + QString m_comment; ///< Comments about the creator of the keyboard layout. QString m_language; ///< Language ID of keyboard QString m_fontSuggestions; ///< Suggestions of fonts to be used on the keys. diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp index af97725a..54f026bb 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 { @@ -173,7 +173,7 @@ void KTouchKeyboardEditor::transfer_to_dialog() { 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 21633766..f6aa1009 100644 --- a/ktouch/src/ktouchkeyboardeditor_dlg.ui +++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KTouchKeyboardEditorDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget"> <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> @@ -389,7 +389,7 @@ <slot>removeBtnClicked()</slot> <slot>keySelectionChanged(QListBoxItem*)</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp index b8f5174f..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'. ").arg(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'.").arg(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,12 +412,12 @@ 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 { @@ -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 8f9a1a13..047a7575 100644 --- a/ktouch/src/ktouchkeyboardwidget.h +++ b/ktouch/src/ktouchkeyboardwidget.h @@ -30,12 +30,12 @@ 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> * The state of keyboard and keys does not change while it is - * tqrepainted or resized. Only when a new character has been typed + * repainted or resized. Only when a new character has been typed * and the newKey() slot is called the state changes (and thus the * activated keys and finger key animations etc.) */ @@ -44,14 +44,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 tqcontains the error message. + /// 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); @@ -89,7 +89,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/ktouchkeyconnector.h b/ktouch/src/ktouchkeyconnector.h index be3d53e8..12793465 100644 --- a/ktouch/src/ktouchkeyconnector.h +++ b/ktouch/src/ktouchkeyconnector.h @@ -21,7 +21,7 @@ #include <tqvaluevector.h> #include "ktouchkey.h" - /// The KTouchKeyConnector class tqcontains the information about the character that has to + /// The KTouchKeyConnector class contains the information about the character that has to /// be pressed and the keys on the keyboard that should be highlighted. /// It associates a character with a target key and optionally a finger and/or control key. class KTouchKeyConnector { diff --git a/ktouch/src/ktouchkeys.h b/ktouch/src/ktouchkeys.h index 76232a2f..68ffa959 100644 --- a/ktouch/src/ktouchkeys.h +++ b/ktouch/src/ktouchkeys.h @@ -25,7 +25,7 @@ class KTouchControlKey; /** This is the base class for all keys (KTouchFingerKey, KTouchNormalKey and KTouchControlKey). * Do not create instances of KTouchKey itself or you will get only blank keys. Note that the - * KTouchKey class hierarchy tqcontains only the information for painting the keys. The connectivity + * KTouchKey class hierarchy contains only the information for painting the keys. The connectivity * is handled using the KTouchKeyConnector. */ class KTouchBaseKey { @@ -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 5f5dee7c..5f5d57de 100644 --- a/ktouch/src/ktouchlecture.cpp +++ b/ktouch/src/ktouchlecture.cpp @@ -210,7 +210,7 @@ bool KTouchLecture::readLecture(TQDomDocument& doc) { void KTouchLecture::writeLecture(TQDomDocument& doc) const { TQDomElement root = doc.createElement( "KTouchLecture" ); doc.appendChild(root); - // Store title and ensure that the file tqcontains a title! + // 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 lecture") ); diff --git a/ktouch/src/ktouchlecture.h b/ktouch/src/ktouchlecture.h index 15c23989..9cc4cc6e 100644 --- a/ktouch/src/ktouchlecture.h +++ b/ktouch/src/ktouchlecture.h @@ -26,8 +26,8 @@ class KURL; /// This class handles the lecture data and provides the lines to type. /// -/// It tqcontains the level data (see KTouchLevelData). A lecture object -/// tqcontains <b>ALWAYS</b> at least one lecture.<p> +/// It contains the level data (see KTouchLevelData). A lecture object +/// contains <b>ALWAYS</b> at least one lecture.<p> /// The lecture data can be read and written using the member functions /// readLecture() and writeLecture().<p> /// During a training session the program will occasionally need a new diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp index 36a340d1..e274732b 100644 --- a/ktouch/src/ktouchlectureeditor.cpp +++ b/ktouch/src/ktouchlectureeditor.cpp @@ -330,7 +330,7 @@ void KTouchLectureEditor::storeCurrentLevel() { TQString currentLine; for (unsigned int i=0; i<text.length(); ++i) { TQChar c = text[i]; - if (c=='\t') c=' '; // tqreplace tabs with spaces + if (c=='\t') c=' '; // replace tabs with spaces if (c=='\n') { lines.append(currentLine); currentLine = ""; diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui index b120c92e..a5008e97 100644 --- a/ktouch/src/ktouchlectureeditor_dlg.ui +++ b/ktouch/src/ktouchlectureeditor_dlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KTouchLectureEditorDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -144,7 +144,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -155,7 +155,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -334,7 +334,7 @@ </widget> <widget class="QLayoutWidget" 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="QLayoutWidget"> <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> @@ -664,7 +664,7 @@ <slot>setModified()</slot> <slot>fontBtnClicked()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klistview.h</includehint> diff --git a/ktouch/src/ktouchleveldata.h b/ktouch/src/ktouchleveldata.h index 16c6c0bf..a84743c2 100644 --- a/ktouch/src/ktouchleveldata.h +++ b/ktouch/src/ktouchleveldata.h @@ -25,11 +25,11 @@ class TQDomDocument; class TQDomElement; -/// This class tqcontains the data of one level in a lecture and provides +/// This class contains the data of one level in a lecture and provides /// access to the lines of that level. /// -/// A lecture (KTouchLecture) typically tqcontains multiple levels. Each -/// level tqcontains a level description, a string with the +/// A lecture (KTouchLecture) typically contains multiple levels. Each +/// level contains a level description, a string with the /// newly introduced characters and several lines of training text. /// There is ALWAYS at least one line of training text in the level!<p> /// During a training session you might want to retrieve a certain line of diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui index 0e22c9db..38ff057e 100644 --- a/ktouch/src/ktouchopenrequest_dlg.ui +++ b/ktouch/src/ktouchopenrequest_dlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KTouchOpenRequestDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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="QLayoutWidget"> <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> @@ -278,7 +278,7 @@ <slot>radioBtnChanged()</slot> <slot>browseBtnClicked()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui index 2712d427..5b475da0 100644 --- a/ktouch/src/ktouchprefcolorslayout.ui +++ b/ktouch/src/ktouchprefcolorslayout.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KTouchPrefColorsLayout</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -35,7 +35,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -504,7 +504,7 @@ <tabstop>kcfg_ErrorBackgroundColor</tabstop> <tabstop>kcfg_CurrentColorScheme</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui index 01b2afcb..b62a5e81 100644 --- a/ktouch/src/ktouchprefgenerallayout.ui +++ b/ktouch/src/ktouchprefgenerallayout.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KTouchPrefGeneralLayout</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -82,7 +82,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -334,7 +334,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontrequester.h</includehint> </includehints> diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui index 0691ef64..34851276 100644 --- a/ktouch/src/ktouchprefkeyboardlayout.ui +++ b/ktouch/src/ktouchprefkeyboardlayout.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KTouchPrefKeyboardLayout</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLabel"> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -135,7 +135,7 @@ <slots> <slot>fontChooseBtnClicked()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontrequester.h</includehint> </includehints> diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui index a2e85fad..19fe985c 100644 --- a/ktouch/src/ktouchpreftraininglayout.ui +++ b/ktouch/src/ktouchpreftraininglayout.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KTouchPrefTrainingLayout</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -321,7 +321,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp index fe65f2a9..3071cc52 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 tqinvalidated, 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 @@ -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(); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchslideline.h b/ktouch/src/ktouchslideline.h index c636338f..b1466b7e 100644 --- a/ktouch/src/ktouchslideline.h +++ b/ktouch/src/ktouchslideline.h @@ -82,7 +82,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 53d57315..dbd807a6 100644 --- a/ktouch/src/ktouchstatistics.cpp +++ b/ktouch/src/ktouchstatistics.cpp @@ -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 8220a0e3..761fd908 100644 --- a/ktouch/src/ktouchstatistics_dlg.ui +++ b/ktouch/src/ktouchstatistics_dlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KTouchStatisticsDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -69,7 +69,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -127,7 +127,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -573,7 +573,7 @@ </widget> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -1277,7 +1277,7 @@ <data format="PNG" length="1525">89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af4000005bc494441545885b596416823d719c77f0e0a8c0e0b12b860810533a0057bd88035642133908087e4a29ea2b087684fb1c9253db57b6b4ba125c9a15d07127613ca3a7bc93a812e524f514a4b9f601b3f85763d0e6d7676a1c623b0f00c8989442ca281085e0e23c9abeccab10dd1e5cfa7ff7fbef7f17fdffbde9b9152729a9ff3c7b2e249601e683f84df01518c7cab3e739a7c4f9c76f1e5175cd45f42767f2f27f0da1fae41ea34d9ce500003b86c97a10fc63963022b4f9560f053178046bd558734888e98c00f831aa0fdc4050cc0d61d36bedac0c81a63fcedfdd779bf179ec981999336a1f3ebb262a0b1fc2b93d75ffc0d624fd09d8d119f49c24c4cf77e4cfc5e07882106f94eed44cd78620734ad84fe4a96f8e90e6bff5b030dea77ebc4f3314431994517ede52cdacb39e8c5274d7bf2be8d6341743b4dfa1c68cf77a8b56a68058dce4e8ca643bc23a00df15f4378d03d7101277640bef9e18cf8ddfb33c1bb45d29fe4585d588528a654709385ff0ff1ed101e4448294f3c0b4e75726dc7517d60b53547358ac9bd92a3f185a0fb51cceaed80abbd98e6291687a103eb37d6d55cacaba59eadec595bf57b4ad9b3f651dcedabddc6be626e0ee4d75c7ee31a57e7aee0ffa98fd62873ed992b5cfdfb3ebcbd8efd9cab36ffe54d7eff50bea5595b6d363695e3382ab1564a565e7d4d6dca2da5be566aebdf09def3ee25f110d7ff7c4ba94b2b6acbdb52eacba16ef707fa7da5fe79a1a8befdeff0bb7d95e87f90ef5b5f29fb695b49298f7ac02958c82f2456c682cfc12c98f8918f55302102d77091c458058bfedd3eb9410eb123b0162c8812bd17f9b8291722b0e64daa8d2a967ec48ff3b58f36ff0948e697d7f6710a0e1f3ff818162088024cdd248802d041ec099c94461005a40b69bcae87bbe08ef9200ab0741381205d003ff271175dfcb63fe647f9d2058807c3a39a6cc18a52df28a57695524aa97b7e82a358ed2ab57f675fa94b9547fe9f405f29b564abcd3b5bc7ea36ef6ca92bcf5c39da020d0dbf1d8001e15e88b998e028c6001148483dfaff04164010e3e8d6b13a47b7900379b4053160160c082197cf3d16ddf30e92e97c2e9f4b7a85a4077e4cf7480f84510839e81ff61f8bb5ed3ace603adf3fec431e0402e67f44a71ff5402a712026d3cd50fdac8a356b210291747d20710c07bfe763e78ad0af430b36b63770f2ce981781a0b458421c087e0e543fade2165c6adbb5313fca572a96a8efd493d332728001d477ea94164af8b14fe562053ff6295f2ce3c73ece9c43fd7e1d7a1d444b502e9627f8cac50a5ed7c39977905188756821db72821fe9655b621d5ad4bb7560781dafdf5857cebc8377e0e1ea2ea225707407d99238f30ea22558fc6a91dcce4d4ab3650492d200825e17139b6ae63e2e207a5d8c94cbdaf990d24209d112b8ba8b6ccb713e5777b9d9b849fd6f75a4943353df03b73eb8a5aefff23a5ed7c39ab7f0da93281e48363ed8c05ab2f8c5a5d547f8116efca3caf5f7d6587b6bedb177c4d4dbb074e125e8825518262b587090c4fe818f7bc1219bc95259aee01ff85873c9c41bf123fd65fb25346dfa536d6a018d9648cef5e7024333f0a364a2f9918fa92763d5c646b69b98ba49f56e150a933c3ac8c89bbaf8b1052ceb2e7e04aeeea2451aa66e8e67fa089b3471f5e4dc97164af82d7f82274aee98e3de8ac73a6016202024fd429a200ae13c04ed214621a4a01949380f91d6c57cca3ce287e8b5bd635f1dc738604304869183bd2938887175673abf47721b9ecd8126e4210c3b9087ce101f8eedd432b22da7f2e4939e38bb0321e47259e84076880fc7cd4183e26c110e1fcf7308e69c79ac03536b6bb41a38070eb54f6ad8039bc6a0c1726a99e6a089abb9f83ff301a86dd7707b2eb5ffd4c6bc9d4af4e54c192f7dc61e28668a881d41e56285201fb0f2ec0a413ea0f26c053f978ce7ce4107e349032ff226f891de3be761680651144d2d60ea245cbfb1aea270fa870c407c2a282e15c966b25365e141c8f6ddeda94ff5ef018e80fecc25cb29330000000049454e44ae426082</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>ktouchchartwidget.h</includehint> diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index 25225bf3..08fdff35 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,9 +135,9 @@ 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").arg(it->m_char.tqunicode()) + 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); @@ -302,9 +302,9 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const { 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").arg(it->m_char.tqunicode()) + 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); @@ -464,7 +464,7 @@ bool KTouchStatisticsData::read(TQWidget * window, const KURL& url) { #ifdef COMPRESSED_XML_STATISTICS TQByteArray array; array = infile.readAll(); - array = tqUncompress(array); + array = qUncompress(array); doc.setContent( array ); #else doc.setContent( &infile ); @@ -503,7 +503,7 @@ bool KTouchStatisticsData::write(TQWidget * window, const KURL& url) const { TQByteArray array; TQTextStream out(array, IO_WriteOnly); out << doc.toString(); - array = tqCompress(array); + array = qCompress(array); outfile.writeBlock(array); #else TQTextStream out( &outfile ); diff --git a/ktouch/src/ktouchstatisticsdata.h b/ktouch/src/ktouchstatisticsdata.h index a0602c11..15ab2f82 100644 --- a/ktouch/src/ktouchstatisticsdata.h +++ b/ktouch/src/ktouchstatisticsdata.h @@ -30,7 +30,7 @@ class TQWidget; -// This file tqcontains all class declarations dealing with the statistics obtained in KTouch. +// This file contains all class declarations dealing with the statistics obtained in KTouch. // *** KTouchCharStats *** @@ -79,7 +79,7 @@ TQTextStream& operator<<(TQTextStream &out, const KTouchCharStats &ch); /// Contains the complete statistics obtained for a single level. /// -/// This class tqcontains the statistics for a single run through a single level. It tqcontains the +/// This class contains the statistics for a single run through a single level. It contains the /// statistics for all characters that have been mistyped in this level, the typing time, the word count, /// correct and total character count etc. class KTouchLevelStats { @@ -122,7 +122,7 @@ class KTouchLevelStats { /// Contains the complete statistics obtained for a single training session (spanning several levels). /// -/// This class tqcontains the statistics for a complete training session of a single lecture but may include several levels. +/// This class contains the statistics for a complete training session of a single lecture but may include several levels. class KTouchSessionStats { public: /// Default constructor @@ -156,7 +156,7 @@ class KTouchSessionStats { /// Contains the complete statistics obtained over time for a certain training lecture. /// -/// This class tqcontains the statistics for a complete training lecture including separate level statistics as well +/// This class contains the statistics for a complete training lecture including separate level statistics as well /// as session statistics. class KTouchLectureStats { public: diff --git a/ktouch/src/ktouchstatus.cpp b/ktouch/src/ktouchstatus.cpp index 442deba5..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) - : KTouchtqStatusLayout(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 a3135dc3..72bb6acc 100644 --- a/ktouch/src/ktouchstatus.h +++ b/ktouch/src/ktouchstatus.h @@ -22,20 +22,20 @@ /** 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 KTouchtqStatusLayout { +class KTouchStatus : public KTouchStatusLayout { Q_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 7d64ddf5..80b29f9f 100644 --- a/ktouch/src/ktouchstatuslayout.ui +++ b/ktouch/src/ktouchstatuslayout.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>KTouchtqStatusLayout</class> +<class>KTouchStatusLayout</class> <widget class="QWidget"> <property name="name"> - <cstring>KTouchtqStatusLayout</cstring> + <cstring>KTouchStatusLayout</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <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> @@ -356,5 +356,5 @@ <slot>startKTouch()</slot> <slot>stopKTouch()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp index 95df9e20..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 ); } } @@ -412,7 +412,7 @@ void KTouchTrainer::newLine() { // ---------------------------------------------------------------------------- void KTouchTrainer::updateStatusBar() const { - KTouchPtr->changetqStatusbarStats(m_levelStats.m_correctChars, m_levelStats.m_totalChars, + KTouchPtr->changeStatusbarStats(m_levelStats.m_correctChars, m_levelStats.m_totalChars, m_levelStats.m_words + m_wordsInCurrentLine, m_sessionStats.m_correctChars, m_sessionStats.m_totalChars, m_sessionStats.m_words + m_wordsInCurrentLine); @@ -420,7 +420,7 @@ void KTouchTrainer::updateStatusBar() const { // ---------------------------------------------------------------------------- void KTouchTrainer::updateStatusBarMessage(const TQString& message) const { - KTouchPtr->changetqStatusbarMessage(message); + KTouchPtr->changeStatusbarMessage(message); } // ---------------------------------------------------------------------------- @@ -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 1fd2fd1f..f625d67b 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; @@ -61,7 +61,7 @@ class KTouchTrainer : public TQObject { Q_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). @@ -148,7 +148,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/kturtle/src/canvas.cpp b/kturtle/src/canvas.cpp index b0133e82..38281956 100644 --- a/kturtle/src/canvas.cpp +++ b/kturtle/src/canvas.cpp @@ -18,7 +18,7 @@ // Note on this file: -// It tqcontains 200 lines of code just to make sure very long line are drawn correctly +// It contains 200 lines of code just to make sure very long line are drawn correctly // till a certain extent... Beyond that extent the code just cuts the crap, since use user // it then probably not doing anything usefull anymore; so he she will not notice the code // is cheating a bit in order to prevent CPU hogging. @@ -297,11 +297,11 @@ void Canvas::slotPrint(TQString text) void Canvas::slotFontType(TQString family, TQString extra) { font.setFamily(family); - font.setBold( extra.tqcontains("bold") > 0 ); - font.setItalic( extra.tqcontains("italic") > 0 ); - font.setUnderline( extra.tqcontains("underline") > 0 ); - font.setOverline( extra.tqcontains("overline") > 0 ); - font.setStrikeOut( extra.tqcontains("strikeout") > 0 ); + font.setBold( extra.contains("bold") > 0 ); + font.setItalic( extra.contains("italic") > 0 ); + font.setUnderline( extra.contains("underline") > 0 ); + font.setOverline( extra.contains("overline") > 0 ); + font.setStrikeOut( extra.contains("strikeout") > 0 ); } void Canvas::slotFontSize(int px) diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp index 23a3d6f0..fcc6322d 100644 --- a/kturtle/src/dialogs.cpp +++ b/kturtle/src/dialogs.cpp @@ -95,7 +95,7 @@ void ErrorMessage::slotAddError(Token& t, const TQString& s, uint c) } -bool ErrorMessage::tqcontainsErrors() +bool ErrorMessage::containsErrors() { if (errTable->numRows() != 0) return true; return false; @@ -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() diff --git a/kturtle/src/dialogs.h b/kturtle/src/dialogs.h index ac333b19..0a421d49 100644 --- a/kturtle/src/dialogs.h +++ b/kturtle/src/dialogs.h @@ -58,7 +58,7 @@ class ErrorMessage : public KDialogBase ErrorMessage(TQWidget *parent); ~ErrorMessage() {} - bool tqcontainsErrors(); + bool containsErrors(); void display(); @@ -117,9 +117,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 8998f185..e50c64a5 100644 --- a/kturtle/src/executer.cpp +++ b/kturtle/src/executer.cpp @@ -329,7 +329,7 @@ void Executer::execForEach(TreeNode* node) bBreak = false; - int i = expStr2.tqcontains(expStr1, false); + int i = expStr2.contains(expStr1, false); for ( ; i > 0; i-- ) { if (bAbort) return; diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp index 858f727f..d90228a6 100644 --- a/kturtle/src/kturtle.cpp +++ b/kturtle/src/kturtle.cpp @@ -153,9 +153,9 @@ void MainWindow::setupActions() KStdAction::deselect(this, TQT_SLOT(slotClearSelection()), ac); new KToggleAction(i18n("Toggle Insert"), Key_Insert, this, TQT_SLOT(slotToggleInsert()), ac, "set_insert"); KStdAction::find(this, TQT_SLOT(slotFind()), ac); - KStdAction::tqfindNext(this, TQT_SLOT(slotFindNext()), ac); - KStdAction::tqfindPrev(this, TQT_SLOT(slotFindPrevious()), ac); - KStdAction::tqreplace(this, TQT_SLOT(slotReplace()), ac); + KStdAction::findNext(this, TQT_SLOT(slotFindNext()), ac); + KStdAction::findPrev(this, TQT_SLOT(slotFindPrevious()), ac); + KStdAction::replace(this, TQT_SLOT(slotReplace()), ac); // View actions new KToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, this, TQT_SLOT(slotToggleLineNumbers()), ac, "line_numbers"); @@ -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); } @@ -586,7 +586,7 @@ void MainWindow::slotExecute() delete exe; // clean-up - if ( errMsg->tqcontainsErrors() ) errMsg->display(); // if errors show them + if ( errMsg->containsErrors() ) errMsg->display(); // if errors show them } void MainWindow::slotPauseExecution() @@ -650,7 +650,7 @@ void MainWindow::slotMessageDialog(TQString text) -// BEGIN editor connections (undo, redo, cut, copy, paste, cursor, selections, find, tqreplace, linenumbers etc.) +// BEGIN editor connections (undo, redo, cut, copy, paste, cursor, selections, find, replace, linenumbers etc.) void MainWindow::slotEditor() { @@ -734,7 +734,7 @@ void MainWindow::slotFindPrevious() void MainWindow::slotReplace() { - KAction* a = editor->actionCollection()->action("edit_tqreplace"); + KAction* a = editor->actionCollection()->action("edit_replace"); a->activate(); } @@ -830,7 +830,7 @@ void MainWindow::updateFullScreen() void MainWindow::slotFinishedFullScreenExecution() { restartOrBackDialog = new RestartOrBack(this); // we have to make some to delete some - if ( errMsg->tqcontainsErrors() ) slotBackToFullScreen(); // straight back to edit if there where errors + if ( errMsg->containsErrors() ) slotBackToFullScreen(); // straight back to edit if there where errors else { connect( restartOrBackDialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotRestartFullScreen() ) ); @@ -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( Qt::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( Qt::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( Qt::AlignTop ); + groupBox1->layout()->setSpacing( 6 ); + groupBox1->layout()->setMargin( 11 ); + TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->layout() ); + groupBox1Layout->setAlignment( Qt::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") ); @@ -1071,7 +1071,7 @@ void MainWindow::slotContextHelpUpdate() int start, length, pos; pos = 0; - if ( line.tqcontains('"') ) + if ( line.contains('"') ) { TQRegExp delimitedStrings("(\"[^\"\\\\\\r\\n]*(\\\\.[^\"\\\\\\r\\n]*)*\")"); while ( delimitedStrings.search(line, pos) != -1 ) diff --git a/kturtle/src/parser.cpp b/kturtle/src/parser.cpp index ed2573f9..07a33aea 100644 --- a/kturtle/src/parser.cpp +++ b/kturtle/src/parser.cpp @@ -188,7 +188,7 @@ TreeNode* Parser::Factor() case tokUnknown: node = getId(); - if (learnedFunctionList.tqcontains(rememberedToken.look) > 0) // is function call + if (learnedFunctionList.contains(rememberedToken.look) > 0) // is function call { delete node; node = FunctionCall(rememberedToken); @@ -1057,7 +1057,7 @@ TreeNode* Parser::Other() matchToken(tokUnknown); if (currentToken.type == tokAssign) return Assignment(rememberedToken); - else if (learnedFunctionList.tqcontains(rememberedToken.look) > 0) + else if (learnedFunctionList.contains(rememberedToken.look) > 0) { TreeNode* node; node = FunctionCall(rememberedToken); diff --git a/kverbos/kverbos/kerfassen.cpp b/kverbos/kverbos/kerfassen.cpp index 9bec422f..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("ú"); } @@ -395,7 +395,7 @@ void KErfassen::slotU() // A verb that is in the dialog should be addded to the list. // - if it is completely new verb then the verb should be added at its alphabetical position // - if there is a verb which is equal to the new verb then a dialog asks whether the -// verb should be added again or tqreplaced or if the operation shoul be canceled. +// verb should be added again or replaced or if the operation shoul be canceled. spanishVerbList::Iterator KErfassen::verbErfassen() { verbSpanish v = verbFromWidget(); @@ -420,10 +420,10 @@ spanishVerbList::Iterator KErfassen::verbErfassen() { // Das Verb wurde in der Liste gefunden. switch (KMessageBox::warningYesNoCancel(this, - i18n("The current verb is already in the list.\nDo you want to tqreplace it?\nIf you do not want to change the list press 'Cancel'."), + i18n("The current verb is already in the list.\nDo you want to replace it?\nIf you do not want to change the list press 'Cancel'."), i18n("Warning"), i18n("Replace"), i18n("Do Not Replace"))) { - case KMessageBox::Yes: // the verb at the position is tqreplaced by v. + case KMessageBox::Yes: // the verb at the position is replaced by v. *it = v; changed = true; break; diff --git a/kverbos/kverbos/kverbos.cpp b/kverbos/kverbos/kverbos.cpp index 87f30998..96d6930a 100644 --- a/kverbos/kverbos/kverbos.cpp +++ b/kverbos/kverbos/kverbos.cpp @@ -39,7 +39,7 @@ #include "kfeedercontrol.h" #include "prefs.h" -// ID Nummern für die tqStatuszeile +// ID Nummern für die Statuszeile #define ID_STATUS_MSG 1 #define ID_TRAINED_MSG 2 #define ID_CORRECT_MSG 3 @@ -182,8 +182,8 @@ void KVerbosApp::initDocument() { doc = new KVerbosDoc(this); doc->newDocument(); - connect(doc, TQT_SIGNAL(anzahlVerbenGeaendert(int)), this, TQT_SLOT(slotqStatusVerbMsg(int))); - connect(this, TQT_SIGNAL(testAnzahl(int)), this, TQT_SLOT(slotqStatusVerbMsg(int))); + connect(doc, TQT_SIGNAL(anzahlVerbenGeaendert(int)), this, TQT_SLOT(slotStatusVerbMsg(int))); + connect(this, TQT_SIGNAL(testAnzahl(int)), this, TQT_SLOT(slotStatusVerbMsg(int))); } void KVerbosApp::initView() @@ -197,18 +197,18 @@ void KVerbosApp::initView() setCentralWidget(view); setCaption(doc->URL().fileName(),false); // - connect(view, TQT_SIGNAL(numberTrainedChanged(int)), this, TQT_SLOT(slotqStatusTrainedMsg(int))); - connect(view, TQT_SIGNAL(numberCorrectChanged(int)), this, TQT_SLOT(slotqStatusCorrectMsg(int))); + connect(view, TQT_SIGNAL(numberTrainedChanged(int)), this, TQT_SLOT(slotStatusTrainedMsg(int))); + connect(view, TQT_SIGNAL(numberCorrectChanged(int)), this, TQT_SLOT(slotStatusCorrectMsg(int))); connect(view, TQT_SIGNAL(informKFeeder(int)), this, TQT_SLOT(slotFeedIt(int))); } void KVerbosApp::openDocumentFile(const KURL& url) { - slotqStatusMsg(i18n("Opening file...")); + slotStatusMsg(i18n("Opening file...")); doc->openDocument( url); fileOpenRecent->addURL( url ); - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } @@ -348,17 +348,17 @@ bool KVerbosApp::queryExit() void KVerbosApp::slotFileNewWindow() { - slotqStatusMsg(i18n("Opening a new application window...")); + slotStatusMsg(i18n("Opening a new application window...")); KVerbosApp *new_window= new KVerbosApp(); new_window->show(); - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotFileNew() { - slotqStatusMsg(i18n("Creating new document...")); + slotStatusMsg(i18n("Creating new document...")); if(!doc->saveModified()) { @@ -371,12 +371,12 @@ void KVerbosApp::slotFileNew() setCaption(doc->URL().fileName(), false); } - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotFileOpen() { - slotqStatusMsg(i18n("Opening file...")); + slotStatusMsg(i18n("Opening file...")); if(!doc->saveModified()) { @@ -396,12 +396,12 @@ void KVerbosApp::slotFileOpen() fileOpenRecent->addURL( url ); } } - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotFileOpenRecent(const KURL& url) { - slotqStatusMsg(i18n("Opening file...")); + slotStatusMsg(i18n("Opening file...")); if(!doc->saveModified()) { @@ -414,12 +414,12 @@ void KVerbosApp::slotFileOpenRecent(const KURL& url) setCaption(url.fileName(), false); } - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotFileOpenStandard() { - slotqStatusMsg(i18n("Opening file...")); + slotStatusMsg(i18n("Opening file...")); TQString userLanguage = Prefs::userLanguage(); if(!doc->saveModified()) { @@ -438,12 +438,12 @@ void KVerbosApp::slotFileOpenStandard() fileOpenRecent->addURL( url ); } } - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotFileSave() { - slotqStatusMsg(i18n("Saving file...")); + slotStatusMsg(i18n("Saving file...")); if (doc->URL().fileName() == i18n("Untitled")) { // Hier liegt ein Fall vor, der zu "Save as ... " gehört. @@ -453,12 +453,12 @@ void KVerbosApp::slotFileSave() { doc->saveDocument(doc->URL()); }; - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotFileSaveAs() { - slotqStatusMsg(i18n("Saving file with a new filename...")); + slotStatusMsg(i18n("Saving file with a new filename...")); KURL url=KFileDialog::getSaveURL(TQDir::currentDirPath(), i18n("*|All Files"), this, i18n("Save As")); @@ -469,21 +469,21 @@ void KVerbosApp::slotFileSaveAs() setCaption(url.fileName(),doc->isModified()); } - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotFileClose() { - slotqStatusMsg(i18n("Closing file...")); + slotStatusMsg(i18n("Closing file...")); close(); - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotFilePrint() { - slotqStatusMsg(i18n("Printing...")); + slotStatusMsg(i18n("Printing...")); TQPrinter printer; if (printer.setup(this)) @@ -491,12 +491,12 @@ void KVerbosApp::slotFilePrint() view->print(&printer); } - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotFileQuit() { - slotqStatusMsg(i18n("Exiting...")); + slotStatusMsg(i18n("Exiting...")); saveOptions(); // close the first window, the list makes the next one the first again. // This ensures that queryClose() is called on each window to ask for closing @@ -512,31 +512,31 @@ void KVerbosApp::slotFileQuit() break; } } - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotEditCut() { - slotqStatusMsg(i18n("Cutting selection...")); + slotStatusMsg(i18n("Cutting selection...")); - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotEditCopy() { - slotqStatusMsg(i18n("Copying selection to clipboard...")); + slotStatusMsg(i18n("Copying selection to clipboard...")); - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } void KVerbosApp::slotEditPaste() { - slotqStatusMsg(i18n("Inserting clipboard contents...")); + slotStatusMsg(i18n("Inserting clipboard contents...")); - slotqStatusMsg(i18n("Ready.")); + slotStatusMsg(i18n("Ready.")); } -void KVerbosApp::slotqStatusMsg(const TQString &text) +void KVerbosApp::slotStatusMsg(const TQString &text) { /////////////////////////////////////////////////////////////////// // change status message permanently @@ -544,8 +544,8 @@ void KVerbosApp::slotqStatusMsg(const TQString &text) statusBar()->changeItem(text, ID_STATUS_MSG); } -// Gibt die Anzahl der Verben in der tqStatuszeile aus -void KVerbosApp::slotqStatusVerbMsg(int n) +// Gibt die Anzahl der Verben in der Statuszeile aus +void KVerbosApp::slotStatusVerbMsg(int n) { TQString s; s.setNum(n,10); @@ -553,8 +553,8 @@ void KVerbosApp::slotqStatusVerbMsg(int n) statusBar()->changeItem(s, ID_VERBS_MSG); } -// Gibt die Anzahl der geübten Verben in der tqStatuszeile aus. -void KVerbosApp::slotqStatusTrainedMsg(int n) +// Gibt die Anzahl der geübten Verben in der Statuszeile aus. +void KVerbosApp::slotStatusTrainedMsg(int n) { TQString s; s.setNum(n,10); @@ -563,7 +563,7 @@ void KVerbosApp::slotqStatusTrainedMsg(int n) } // Gibt die Anzahl der richtig geübten Verben aus. -void KVerbosApp::slotqStatusCorrectMsg(int n) +void KVerbosApp::slotStatusCorrectMsg(int n) { TQString s; s.setNum(n,10); @@ -584,7 +584,7 @@ void KVerbosApp::slotEditErfassen() }; delete pDlgErfassen; pDlgErfassen = 0; - // Anzahl in der tqStatuszeile anpassen + // Anzahl in der Statuszeile anpassen emit testAnzahl(doc->getAnzahl()); } @@ -600,7 +600,7 @@ void KVerbosApp::slotEditBearbeiten() } delete pDlgEdit; pDlgEdit = 0; - // Anzahl in der tqStatuszeile anpassen + // Anzahl in der Statuszeile anpassen emit testAnzahl(doc->getAnzahl()); } diff --git a/kverbos/kverbos/kverbos.h b/kverbos/kverbos/kverbos.h index 8ab29fc7..982ee0c1 100644 --- a/kverbos/kverbos/kverbos.h +++ b/kverbos/kverbos/kverbos.h @@ -78,7 +78,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(); @@ -123,7 +123,7 @@ class KVerbosApp : public KMainWindow virtual void readProperties(KConfig *_cfg); signals: - /** Dieses Signal zeigt dem Dokument an, dass die tqStatuszeile mit der richtigen + /** Dieses Signal zeigt dem Dokument an, dass die Statuszeile mit der richtigen * Verbanzahl aktualisiert werden sollte. */ void testAnzahl(int); @@ -164,15 +164,15 @@ class KVerbosApp : public KMainWindow * current actions. * @param text the text that is displayed in the statusbar */ - void slotqStatusMsg(const TQString &text); - /** Gibt die Anzahl der Verben in der tqStatuszeile aus */ - void slotqStatusVerbMsg(int); - /** Gibt die Anzahl der geübten Verben in der tqStatuszeile aus. + void slotStatusMsg(const TQString &text); + /** Gibt die Anzahl der Verben in der Statuszeile aus */ + void slotStatusVerbMsg(int); + /** Gibt die Anzahl der geübten Verben in der Statuszeile aus. */ - void slotqStatusTrainedMsg(int); - /** Gibt die Anzahl der richtig eingegebenen Verben in der tqStatuszeile aus. + void slotStatusTrainedMsg(int); + /** Gibt die Anzahl der richtig eingegebenen Verben in der Statuszeile aus. */ - void slotqStatusCorrectMsg(int); + void slotStatusCorrectMsg(int); /** öffnet einen Dialog mit dem neue Verben erfasst werden können. */ void slotEditErfassen(); diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp index 0cb37703..632f10b3 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 emitqStatus /*= true*/) +void KVerbosDoc::appendVerb(const verbSpanish v, bool emitStatus /*= true*/) { verbList2.append(v); - if (emitqStatus) + if (emitStatus) emit anzahlVerbenGeaendert(getAnzahl()); } diff --git a/kverbos/kverbos/kverbosdoc.h b/kverbos/kverbos/kverbosdoc.h index d2c9f48c..efe5d98c 100644 --- a/kverbos/kverbos/kverbosdoc.h +++ b/kverbos/kverbos/kverbosdoc.h @@ -42,9 +42,9 @@ class KVerbosUser; * The KVerbosDoc class provides a document object that can be used in conjunction with * the classes KVerbosApp and KVerbosView to create a document-view model for standard KDE * applications based on KApplication and KMainWindow. Thereby, the document object - * is created by the KVerbosApp instance and tqcontains the document structure with the + * is created by the KVerbosApp instance and contains the document structure with the * according methods for manipulation of the document data by KVerbosView objects. Also, - * KVerbosDoc tqcontains the methods for serialization of the document data from and to files. + * KVerbosDoc contains the methods for serialization of the document data from and to files. * * Die Dokumentenklasse hält eine Liste der verfügbaren Verben vor. Aus dieser Liste wird * eines ausgewählt, das gelernt werden soll. Die View-Klasse kann dieses Verb abfragen und @@ -113,10 +113,10 @@ class KVerbosDoc : public QObject const KURL& URL() const; /** sets the URL of the document */ void setURL(const KURL& url); - /** es wird ein Verb der Liste hinzugefügt, ist emitqStatus = true, wird auch - * die tqStatuszeile entsprechend angepasst. + /** es wird ein Verb der Liste hinzugefügt, ist emitStatus = true, wird auch + * die Statuszeile entsprechend angepasst. */ - void appendVerb(const verbSpanish v, bool emitqStatus = 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 */ @@ -140,8 +140,8 @@ class KVerbosDoc : public QObject 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. - * As this view normally tqrepaints itself, it is excluded from the paintEvent. + * 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 2794b051..64d319af 100644 --- a/kverbos/kverbos/kverbosuser.cpp +++ b/kverbos/kverbos/kverbosuser.cpp @@ -35,7 +35,7 @@ KVerbosUser::KVerbosUser(spanishVerbList* pL, TQString n/*=DEFAULTUSER*/) // try to read the user-information if there is one. int pos; while ((pos = n.find(' ')) != -1) - n.tqreplace(pos, 1, "_"); + n.replace(pos, 1, "_"); TQFile file(locateLocal("data", "/kverbos/data/"+name+".kverbos")); if ( file.open(IO_ReadOnly) ) { @@ -210,7 +210,7 @@ bool KVerbosUser::saveUser(const int& res, const int& num) { int pos; while ((pos = name.find(' ')) != -1) - name.tqreplace(pos, 1, "_"); + name.replace(pos, 1, "_"); TQFile file(locateLocal("data", "/kverbos/data/"+name+".kverbos")); if ( file.open(IO_WriteOnly) ) { @@ -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 85cdde16..83f184df 100644 --- a/kverbos/kverbos/kverbosview.cpp +++ b/kverbos/kverbos/kverbosview.cpp @@ -78,7 +78,7 @@ KVerbosView::~KVerbosView() KVerbosDoc* KVerbosView::getDocument() const { - KVerbosApp *theApp=(KVerbosApp *) tqparentWidget(); + KVerbosApp *theApp=(KVerbosApp *) parentWidget(); return theApp->getDocument(); } @@ -102,12 +102,12 @@ TQString KVerbosView::deleteAccents(const TQString& s) const for (unsigned int i=0; i<s2.length(); i++) { TQString t = s2.mid(i, 1); - if (t == "á") s2.tqreplace(i, 1, "a"); - if (t == "é") s2.tqreplace(i, 1, "e"); - if (t == "í") s2.tqreplace(i, 1, "i"); - if (t == "ó") s2.tqreplace(i, 1, "o"); - if (t == "ú") s2.tqreplace(i, 1, "u"); - if (t == "ñ") s2.tqreplace(i, 1, "n"); + if (t == "á") s2.replace(i, 1, "a"); + if (t == "é") s2.replace(i, 1, "e"); + if (t == "í") s2.replace(i, 1, "i"); + if (t == "ó") s2.replace(i, 1, "o"); + if (t == "ú") s2.replace(i, 1, "u"); + if (t == "ñ") s2.replace(i, 1, "n"); }; }; return s2; @@ -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/kverbosview.h b/kverbos/kverbos/kverbosview.h index 4d3b3d2f..3690c72a 100644 --- a/kverbos/kverbos/kverbosview.h +++ b/kverbos/kverbos/kverbosview.h @@ -73,7 +73,7 @@ public: */ KVerbosDoc* getDocument() const; - /** tqcontains the implementation for printing functionality */ + /** contains the implementation for printing functionality */ void print(TQPrinter *pPrinter); /** This funktion erases all accents from the letters of a string */ @@ -103,7 +103,7 @@ public slots: */ virtual void slotFont(); /** if the time is a progressiv or a perfect form the input of the yo-Editbox - * which tqcontains the gerund or the partizip is copied into the others. + * which contains the gerund or the partizip is copied into the others. */ virtual void slotCopyText(); /** Die Ansicht wird aufgefordert sich das aktuelle Verb vom Dokument zu holen diff --git a/kverbos/kverbos/qerfassen.ui b/kverbos/kverbos/qerfassen.ui index cbc49a0a..90465a19 100644 --- a/kverbos/kverbos/qerfassen.ui +++ b/kverbos/kverbos/qerfassen.ui @@ -9,7 +9,7 @@ und in die Liste aufgenommen wird. <property name="name"> <cstring>QErfassen</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -2792,5 +2792,5 @@ und in die Liste aufgenommen wird. <slot>slotWeiter()</slot> <slot>slotZurueck()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qlernen.ui b/kverbos/kverbos/qlernen.ui index 25599794..9b4b1d33 100644 --- a/kverbos/kverbos/qlernen.ui +++ b/kverbos/kverbos/qlernen.ui @@ -7,7 +7,7 @@ The user learns with this GUI.</comment> <property name="name"> <cstring>QLernen</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -1017,5 +1017,5 @@ The user learns with this GUI.</comment> <slot>slotU()</slot> <slot>slotWeiter()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qresult.ui b/kverbos/kverbos/qresult.ui index d5e92e84..a8e93bb0 100644 --- a/kverbos/kverbos/qresult.ui +++ b/kverbos/kverbos/qresult.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QResult</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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"> @@ -271,5 +271,5 @@ <slots> <slot>slotDlgEnde()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qverbedit.ui b/kverbos/kverbos/qverbedit.ui index c99a2907..f16b76de 100644 --- a/kverbos/kverbos/qverbedit.ui +++ b/kverbos/kverbos/qverbedit.ui @@ -9,7 +9,7 @@ und können bearbeitet werden.</comment> <property name="name"> <cstring>QVerbEdit</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -192,5 +192,5 @@ und können bearbeitet werden.</comment> <slot>slotDelete()</slot> <slot>slotDlgEnde()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qverbosoptions.ui b/kverbos/kverbos/qverbosoptions.ui index e91ee37c..da432531 100644 --- a/kverbos/kverbos/qverbosoptions.ui +++ b/kverbos/kverbos/qverbosoptions.ui @@ -9,7 +9,7 @@ Zeiten geübt werden sollen und welche nicht.</comment> <property name="name"> <cstring>QVerbosOptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -1224,5 +1224,5 @@ Zeiten geübt werden sollen und welche nicht.</comment> <slot>slotDlgEnde()</slot> <slot>slotCancel()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/verbspanish.cpp b/kverbos/kverbos/verbspanish.cpp index 424a3d92..3fa76dc6 100644 --- a/kverbos/kverbos/verbspanish.cpp +++ b/kverbos/kverbos/verbspanish.cpp @@ -585,7 +585,7 @@ bool verbSpanish::conjugateAll() int pos = gerund.findRev("e"); if (pos>=0) { - gerund.tqreplace(pos, 1, "i"); + gerund.replace(pos, 1, "i"); }; } gerund += "iendo#"; @@ -677,7 +677,7 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/) { pos = s.findRev("e"); if (pos>=0) - s.tqreplace(pos, 1, "ie"); + s.replace(pos, 1, "ie"); }; }; break; @@ -692,7 +692,7 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/) { pos = s.findRev("o", -3); if (pos>=0) - s.tqreplace(pos, 1, "ue"); + s.replace(pos, 1, "ue"); }; }; break; @@ -707,7 +707,7 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/) { pos = s.findRev("u"); if (pos>=0) - s.tqreplace(pos, 1, "ue"); + s.replace(pos, 1, "ue"); }; }; break; @@ -722,7 +722,7 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/) pos = st.findRev("e"); if (pos>=0) { - st.tqreplace(pos, 1, "i"); + st.replace(pos, 1, "i"); s = st + verbEndings[time][getEnding(good)][person]; }; } @@ -733,7 +733,7 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/) pos = st.findRev("e"); if (pos>=0) { - st.tqreplace(pos, 1, "i"); + st.replace(pos, 1, "i"); s = st + verbEndings[time][getEnding(good)][person]; }; } @@ -747,89 +747,89 @@ bool verbSpanish::groupVerb(TQString &s, int time/*=-1*/, int person/*=-1*/) case 6: // <c -> qu> (vor e wird c zu qu) pos = s.findRev("ce"); if (pos>=0) - s.tqreplace(pos, 2, "que"); + s.replace(pos, 2, "que"); else { pos = s.findRev("cé"); if (pos>=0) - s.tqreplace(pos, 2, "qué"); + s.replace(pos, 2, "qué"); } break; case 7: // <g -> gu> (vor e wird g zu gu) pos = s.findRev("ge"); if (pos>=0) - s.tqreplace(pos, 2, "gue"); + s.replace(pos, 2, "gue"); else { pos = s.findRev("gé"); if (pos>=0) - s.tqreplace(pos, 2, "gué"); + s.replace(pos, 2, "gué"); } break; case 8: // <z -> c> (vor e wird z zu c) pos = s.findRev("ze"); if (pos>=0) - s.tqreplace(pos, 2, "ce"); + s.replace(pos, 2, "ce"); else { pos = s.findRev("zé"); if (pos>=0) - s.tqreplace(pos, 2, "cé"); + s.replace(pos, 2, "cé"); } break; case 9: // <gu -> gü> (vor e wird gu zu gü) pos = s.findRev("gue"); if (pos>=0) - s.tqreplace(pos, 3, "güe"); + s.replace(pos, 3, "güe"); else { pos = s.findRev("gué"); if (pos>=0) - s.tqreplace(pos, 3, "güé"); + s.replace(pos, 3, "güé"); } break; case 10: // <c -> z> (vor o und a wird c zu z) pos = s.findRev("co"); if (pos>=0) - s.tqreplace(pos, 2, "zo"); + s.replace(pos, 2, "zo"); else { pos = s.findRev("ca"); if (pos>=0) - s.tqreplace(pos, 2, "za"); + s.replace(pos, 2, "za"); }; break; case 11: // <g -> j> (vor o und a wird g zu j) pos = s.findRev("ga"); if (pos>=0) - s.tqreplace(pos, 2, "ja"); + s.replace(pos, 2, "ja"); else { pos = s.findRev("go"); if (pos>=0) - s.tqreplace(pos, 2, "jo"); + s.replace(pos, 2, "jo"); }; break; case 12: // <gu -> g> (vor o und a wird gu zu g) pos = s.findRev("guo"); if (pos>=0) - s.tqreplace(pos, 3, "go"); + s.replace(pos, 3, "go"); else { pos = s.findRev("gua"); if (pos>=0) - s.tqreplace(pos, 3, "ga"); + s.replace(pos, 3, "ga"); }; break; case 13: // <qu -> c> (vor o und a wird qu zu c) pos = s.findRev("quo"); if (pos>=0) - s.tqreplace(pos, 3, "co"); + s.replace(pos, 3, "co"); else { pos = s.findRev("qua"); if (pos>=0) - s.tqreplace(pos, 3, "ca"); + s.replace(pos, 3, "ca"); }; break; case 14: // <accent like 'enviar'> diff --git a/kverbos/kverbos/verbspanish.h b/kverbos/kverbos/verbspanish.h index 1f17567c..f621718d 100644 --- a/kverbos/kverbos/verbspanish.h +++ b/kverbos/kverbos/verbspanish.h @@ -44,13 +44,13 @@ enum persons {yo, tu, el, nosotros, vosotros, ellos}; typedef TQString formArray[MAX_TIEMPOS][PERSONEN]; typedef TQString endingsArray[MAX_TIEMPOS][VERBMUSTER][PERSONEN]; -/** This class tqcontains all the information belonging to one verb: +/** This class contains all the information belonging to one verb: * * - the foreign and the spanish meaning * - the form of the gerund and the participle * - the different time forms of the verb * - if it is irregular or to which group the verb belongs - * - if the object already tqcontains all the possible forms + * - if the object already contains all the possible forms * * Some information belongs to all verbs. It is stored in static variables. * - a lists of the regular endings @@ -278,10 +278,10 @@ public: /** The forms of the verb haber. They are needed for perfect forms */ static TQString haber[MAX_TIEMPOS][PERSONEN]; - /** This array tqcontains the names of the time forms as strings + /** This array contains the names of the time forms as strings */ static TQString timeNames[MAX_TIEMPOS*MAX_SUBTYPES]; - /** This array tqcontains the names of the different verb groups + /** This array contains the names of the different verb groups */ static TQString groupNames[MAX_GRUPPEN]; static int maxTiempos; diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui index 33e090c9..2c5d44cb 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -138,5 +138,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui index 6909eae0..2bd5c449 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>BlockOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -268,5 +268,5 @@ <tabstop>block1</tabstop> <tabstop>expire1</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui index ce13b10c..3e8b5425 100644 --- a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>GeneralOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -122,7 +122,7 @@ <string>KVocTrain determines the resizing of the columns</string> </property> <property name="whatsThis" stdset="0"> - <string>KVocTrain makes each column the same width except the leftmost with the lesson names, which is half the size of the others. The second column, which tqcontains the picture that describes the state of the row, has a fixed width.</string> + <string>KVocTrain makes each column the same width except the leftmost with the lesson names, which is half the size of the others. The second column, which contains the picture that describes the state of the row, has a fixed width.</string> </property> </widget> <widget class="QRadioButton"> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>123</height> @@ -182,7 +182,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui index cc4b4f27..ee90fe3a 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>GroupOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ </widget> <widget class="QLayoutWidget" 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> @@ -143,5 +143,5 @@ <tabstop>ps_new</tabstop> <tabstop>ps_del</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index d92a9423..5da383b0 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; } @@ -814,20 +814,20 @@ void LanguageOptions::enableLangWidgets() { if (replyType == "TQStringList") { - TQStringList tqlayouts; + TQStringList layouts; TQDataStream stream(replyData, IO_ReadOnly); - stream >> tqlayouts; - tqlayouts.prepend(TQString::null); - d_kbtqlayout->clear(); - d_kbtqlayout->insertStringList(tqlayouts); + stream >> layouts; + layouts.prepend(TQString::null); + 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; @@ -1070,7 +1070,7 @@ void LanguageOptions::loadCountryData() for (TQStringList::Iterator it = all_langs.begin(); it != all_langs.end(); ++it) { // Treat ie "en_GB" and "en_USE" as "en" because the language list - // only tqcontains the first letters + // only contains the first letters if ((*it).find("_")) *it = (*it).left((*it).find("_")); @@ -1126,7 +1126,7 @@ void LanguageOptions::loadCountryData() void LanguageOptions::slotLangFromGlobalActivated(int i) { - if (countryIdMap.tqcontains(i)) + if (countryIdMap.contains(i)) { Country c = countryIdMap[i]; bool first = true; @@ -1134,7 +1134,7 @@ void LanguageOptions::slotLangFromGlobalActivated(int i) { TQString s = global_langset.shortId(*it); - if (d_shortName->tqcontains(s.stripWhiteSpace())) + if (d_shortName->contains(s.stripWhiteSpace())) { if (first) { @@ -1223,7 +1223,7 @@ void LanguageOptions::slotLangFromISO6391Activated(int id) { TQString shortid = global_langset.shortId(id); - if (d_shortName->tqcontains(shortid.stripWhiteSpace())) + if (d_shortName->contains(shortid.stripWhiteSpace())) { d_shortName->setCurrentItem(shortid); slotShortActivated(shortid); diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui index b240d850..84698be7 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>LanguageOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLabel" 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> @@ -258,7 +258,7 @@ <string>Obtains the language choices from the KDE database</string> </property> <property name="whatsThis" stdset="0"> - <string>Pressing this button opens a menu that tqcontains all the countries that are known in your KDE installation. Ordered by country you can add your desired language properties to your personal list.</string> + <string>Pressing this button opens a menu that contains all the countries that are known in your KDE installation. Ordered by country you can add your desired language properties to your personal list.</string> </property> </widget> <widget class="QPushButton" row="2" column="0" rowspan="1" colspan="2"> @@ -275,7 +275,7 @@ <string>List of languages covered by ISO639-1</string> </property> <property name="whatsThis" stdset="0"> - <string>Pressing this button opens a menu that tqcontains all the language codes that are covered by "ISO639-1"</string> + <string>Pressing this button opens a menu that contains all the language codes that are covered by "ISO639-1"</string> </property> </widget> <widget class="QPushButton" row="0" column="1"> @@ -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,14 +337,14 @@ <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> <tabstop>b_lang_kde</tabstop> <tabstop>b_lang_iso1</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp index 32efc138..ca79f2d5 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp @@ -248,7 +248,7 @@ void PasteOptions::slotSyncPasteOrderList() } } - // order_list tqcontains elements unknown in language set? remove them + // order_list contains elements unknown in language set? remove them for (int i = (int) OrderList->count()-1; i >=0; i--) { if (!OrderList->text(i).isEmpty()) @@ -260,7 +260,7 @@ void PasteOptions::slotSyncPasteOrderList() } } - // language set tqcontains new elements? append them + // language set contains new elements? append them for (int i = 0; i < (int) m_langSet.size(); i++) { bool found = false; diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui index be30bac8..3ee107fc 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PasteOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -207,7 +207,7 @@ <tabstop>SkipButton</tabstop> <tabstop>DownButton</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui index 3f3d14ed..24e70c58 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QueryOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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> @@ -563,7 +563,7 @@ <tabstop>kcfg_ShowMore</tabstop> <tabstop>kcfg_IKnow</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui index 05df9d74..4cf771c2 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ThresholdOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -145,7 +145,7 @@ </widget> <widget class="QLayoutWidget" 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> @@ -294,5 +294,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui index 2dec0a3e..3bb2af24 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ViewOptionsBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -448,7 +448,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -520,7 +520,7 @@ <includes> <include location="global" impldecl="in declaration">kcolorbutton.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontrequester.h</includehint> <includehint>kfontrequester.h</includehint> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui index 63afd416..137d3df5 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Document_options</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -54,5 +54,5 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui index 27fe6d39..cce69a3f 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>LangPropPage</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -588,5 +588,5 @@ <tabstop>thirdM_plural</tabstop> <tabstop>thirdN_plural</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp index c7c14584..d7015435 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp @@ -226,7 +226,7 @@ void LessOptPage::cleanUnused (kvoctrainDoc *doc, vector<int> translate_index; ///////////////////////////////////////////////////// - // translate_index tqcontains new index number for each + // translate_index contains new index number for each // old index for (int i = 0; i <= QMAX (old_lessons, (int) lessonIndex.size()); i++) translate_index.push_back(0); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h index 0025b54c..b5a54e06 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h @@ -70,7 +70,7 @@ protected slots: private: kvoctrainDoc *doc; int act_lesson; - vector<int> lessonIndex; // tqcontains indices of lesson on exec() + vector<int> lessonIndex; // contains indices of lesson on exec() // negative values are new lessons }; #endif // LessOptPage_included diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui index d0d8ba08..311ab3bc 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Lesson_Descriptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp index aae596bb..00325b7b 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp @@ -237,7 +237,7 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &tenseIndex, vector<TQString> new_tenseStr; ///////////////////////////////////////////////////// - // translate_index tqcontains new index number for each + // translate_index contains new index number for each // old index for (int i = 0; i <= QMAX (old_tenses, (int) tenseIndex.size()); i++) translate_index.push_back(0); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h index 53c08bc7..1cc3913b 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h @@ -68,7 +68,7 @@ protected slots: private: kvoctrainDoc *doc; int act_tense; - vector<int> tenseIndex; // tqcontains indices of tenses on exec() + vector<int> tenseIndex; // contains indices of tenses on exec() // negative values are new tenses }; #endif // TenseOptPage_included diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui index 3db0be2d..b0471df8 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Tense_Descriptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui index a355da67..b2a49e51 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TitlePage</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -182,5 +182,5 @@ <tabstop>e_license</tabstop> <tabstop>e_remark</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp index b500bf2a..c89129b8 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp @@ -228,7 +228,7 @@ void TypeOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &typeIndex, i vector<TQString> new_typeStr; ///////////////////////////////////////////////////// - // translate_index tqcontains new index number for each + // translate_index contains new index number for each // old index for (int i = 0; i <= QMAX (old_types, (int) typeIndex.size()); i++) translate_index.push_back(0); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h index f59fc37b..68e50b26 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h @@ -66,7 +66,7 @@ protected slots: private: kvoctrainDoc *doc; int act_type; - vector<int> typeIndex; // tqcontains indices of types on exec() + vector<int> typeIndex; // contains indices of types on exec() // negative values are new lessons }; #endif // TypeOptPage_included diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui index 1b27973a..f1735015 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Type_Descriptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp index c28e6d55..96c4a093 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp @@ -251,7 +251,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc, vector<TQString> new_usageStr; ///////////////////////////////////////////////////// - // translate_index tqcontains new index number for each + // translate_index contains new index number for each // old index for (int i = 0; i <= QMAX (old_usages, (int) usageIndex.size()); i++) translate_index.push_back(0); diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h index d8db70ff..8d669571 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h @@ -68,7 +68,7 @@ protected slots: private: kvoctrainDoc *doc; int act_usage; - vector<int> usageIndex; // tqcontains indices of usages on exec() + vector<int> usageIndex; // contains indices of usages on exec() // negative values are new lessons }; #endif // UsageOptPage_included diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui index 73571c94..dbdf58fe 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Usage_Labels</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -139,5 +139,5 @@ <tabstop>b_delete</tabstop> <tabstop>b_cleanup</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui index e599d674..a2213edb 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AdjEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -142,5 +142,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui index 6e550b11..632973bc 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AuxInfoEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -225,5 +225,5 @@ <tabstop>remark_line</tabstop> <tabstop>para_line</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp index daaed082..9a7d44fb 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp @@ -208,7 +208,7 @@ void CommonEntryPage::setUsageBox(const TQString & act_usage) usage_box->clear(); for (int i = 0; i < (int) usages.size(); i++) { usage_box->insertItem (usages[i].longStr()); - if (UsageManager::tqcontains(TQString(usages[i].identStr()), act_usage)) { + if (UsageManager::contains(TQString(usages[i].identStr()), act_usage)) { usage_box->setSelected (i, true); } } diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui index cf8394ad..5e67f8a4 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>CommonEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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"> @@ -475,5 +475,5 @@ <tabstop>b_usageDlg</tabstop> <tabstop>c_active</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h index d9d22c67..9850e107 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h @@ -135,7 +135,7 @@ public: bool fromDateDirty () const { return from_page ? from_page->dateDirty() : false; } bool fromGradeDirty () const { return from_page ? from_page->gradeDirty() : false; } bool fromBCountDirty () const { return from_page ? from_page->bCountDirty() : false; } - bool fromQCountDirty () const { return from_page ? from_page->tqCountDirty() : false; } + bool fromQCountDirty () const { return from_page ? from_page->qCountDirty() : false; } TQString getFromFauxAmi () const { return from_page ? from_page->getFauxAmi() : TQString(""); } time_t getFromDate () const { return from_page ? from_page->getDate() : 0; } @@ -146,7 +146,7 @@ public: bool toDateDirty () const { return to_page ? to_page->dateDirty() : false; } bool toGradeDirty () const { return to_page ? to_page->gradeDirty() : false; } bool toBCountDirty () const { return to_page ? to_page->bCountDirty() : false; } - bool toQCountDirty () const { return to_page ? to_page->tqCountDirty() : false; } + bool toQCountDirty () const { return to_page ? to_page->qCountDirty() : false; } TQString getToFauxAmi () const { return to_page ? to_page->getFauxAmi() : TQString(""); } time_t getToDate () const { return to_page ? to_page->getDate() : 0; } diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h index 8162ee3b..238f4462 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h @@ -66,7 +66,7 @@ public: time_t dateDirty () const { return date_dirty; } grade_t gradeDirty () const { return grade_dirty; } - count_t tqCountDirty () const { return qcount_dirty; } + count_t qCountDirty () const { return qcount_dirty; } count_t bCountDirty () const { return bcount_dirty; } time_t getDate () const; diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui index d4a1faa7..9fea8f70 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>FromToEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -316,5 +316,5 @@ <tabstop>qcount_line</tabstop> <tabstop>bcount_line</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui index 488f5234..b03b2de6 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MCEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -213,5 +213,5 @@ <tabstop>mc4Field</tabstop> <tabstop>mc5Field</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index 11865aee..47487624 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp @@ -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 = QMAX(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 882884f1..1c3c4ee5 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TenseEntryPageForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -44,7 +44,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -383,5 +383,5 @@ <tabstop>thirdM_plural</tabstop> <tabstop>thirdN_plural</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/kv_resource.h b/kvoctrain/kvoctrain/kv_resource.h index 76ddc776..6f704913 100644 --- a/kvoctrain/kvoctrain/kv_resource.h +++ b/kvoctrain/kvoctrain/kv_resource.h @@ -35,7 +35,7 @@ #include <klocale.h> /////////////////////////////////////////////////////////////////// -// kv_resource.h -- tqcontains macros used for commands +// kv_resource.h -- contains macros used for commands #define KV_EXTRA_COLS 2 // add col for lesson number #define KV_COL_LESS 0 // col: lesson number diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp index 9a1d5c72..d441cc2e 100644 --- a/kvoctrain/kvoctrain/kva_clip.cpp +++ b/kvoctrain/kvoctrain/kva_clip.cpp @@ -112,7 +112,7 @@ vector<int> kvoctrainApp::getCsvOrder(kvoctrainDoc *doc) void kvoctrainApp::slotEditCopy() { - slotqStatusMsg(i18n("Copying selection to clipboard...")); + slotStatusMsg(i18n("Copying selection to clipboard...")); TQApplication::setOverrideCursor( waitCursor ); TQString exp; @@ -157,13 +157,13 @@ void kvoctrainApp::slotEditCopy() } TQApplication::restoreOverrideCursor(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotEditPaste() { - slotqStatusMsg(i18n("Inserting clipboard contents...")); + slotStatusMsg(i18n("Inserting clipboard contents...")); TQApplication::setOverrideCursor( waitCursor ); TQString s; @@ -228,7 +228,7 @@ void kvoctrainApp::slotEditPaste() } TQApplication::restoreOverrideCursor(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp index 4ce0f6c5..d1572659 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(); @@ -143,7 +143,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ } 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; @@ -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)); } @@ -222,11 +222,11 @@ void kvoctrainApp::slotSetHeaderProp (int header_and_id) /*FOLD00*/ } */ doc->setModified(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } -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); @@ -239,19 +239,19 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ break; case ID_RESUME_QUERY: - slotqStatusHelpMsg(i18n("Resumes random query with existing selection")); + slotStatusHelpMsg(i18n("Resumes random query with existing selection")); break; case ID_RESUME_MULTIPLE: - slotqStatusHelpMsg(i18n("Resumes multiple choice with existing selection")); + slotStatusHelpMsg(i18n("Resumes multiple choice with existing selection")); break; case IDH_SORT_COL_ALPHA: - slotqStatusHelpMsg(i18n("Sorts column alphabetically up/down")); + slotStatusHelpMsg(i18n("Sorts column alphabetically up/down")); break; case IDH_SORT_COL_NUM: - slotqStatusHelpMsg(i18n("Sorts column by lesson index up/down")); + slotStatusHelpMsg(i18n("Sorts column by lesson index up/down")); break; case IDH_SET_LANG: { @@ -268,7 +268,7 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ TQString format = i18n("Sets %1 as language for translation %2"); msg = format.arg(from).arg(header1); } - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } break; @@ -277,13 +277,13 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ TQString msg; if (header1 == 0xFF) { msg = i18n("Appends a new language"); - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } else if (header1 < (int) langset.size() ) { TQString from = langset.longId(header1); TQString format = i18n("Appends %1 as new language"); msg = format.arg(from); - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } } break; @@ -295,7 +295,7 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ TQString msg; TQString format = i18n("Removes %1 irrevocably from dictionary"); msg = format.arg(from); - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } break; @@ -327,47 +327,47 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ msg = format.arg(from).arg(to); } - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } break; case IDH_START_VERB: { - slotqStatusHelpMsg(i18n("Starts training with verbs")); + slotStatusHelpMsg(i18n("Starts training with verbs")); } break; case IDH_START_ARTICLE: { - slotqStatusHelpMsg(i18n("Starts training with articles")); + slotStatusHelpMsg(i18n("Starts training with articles")); } break; case IDH_START_ADJECTIVE: { - slotqStatusHelpMsg(i18n("Starts training with adjectives")); + slotStatusHelpMsg(i18n("Starts training with adjectives")); } break; case IDH_START_SYNONYM: { - slotqStatusHelpMsg(i18n("Starts training with synonyms")); + slotStatusHelpMsg(i18n("Starts training with synonyms")); } break; case IDH_START_ANTONYM: { - slotqStatusHelpMsg(i18n("Starts training with antonyms")); + slotStatusHelpMsg(i18n("Starts training with antonyms")); } break; case IDH_START_EXAMPLE: { - slotqStatusHelpMsg(i18n("Starts training with examples")); + slotStatusHelpMsg(i18n("Starts training with examples")); } break; case IDH_START_PARAPHRASE: { - slotqStatusHelpMsg(i18n("Starts training with paraphrases")); + slotStatusHelpMsg(i18n("Starts training with paraphrases")); } break; case IDH_CREATE_LESSON: { - slotqStatusHelpMsg(i18n("Creates lesson")); + slotStatusHelpMsg(i18n("Creates lesson")); } break; @@ -377,12 +377,12 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/ from = langset.findLongId(from); TQString format = i18n("Resets all properties for %1"); TQString msg = format.arg(from); - slotqStatusHelpMsg(msg); + slotStatusHelpMsg(msg); } break; default: - kdError() << "kvoctrainApp::slotHeadertqStatus: got unknown command :" << cmd << endl; + kdError() << "kvoctrainApp::slotHeaderStatus: got unknown command :" << cmd << endl; } } @@ -564,7 +564,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ kdError() << "kvoctrainApp::slotHeaderCallBack: got unknown command\n"; } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index c1f1cb49..c1b3ebe8 100644 --- a/kvoctrain/kvoctrain/kva_init.cpp +++ b/kvoctrain/kvoctrain/kva_init.cpp @@ -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()), this, TQT_SLOT(aboutToShowVocabAppendLanguage())); connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAppendLang(int))); - connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); vocabSetLanguage = new KSelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language"); connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), 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()), this, TQT_SLOT(aboutToShowVocabRemoveLanguage())); connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int))); + connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, this, TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); vocabDocumentProperties->setWhatsThis(i18n("Edit document properties")); @@ -241,11 +241,11 @@ void kvoctrainApp::initActions() configQueryOptions->setToolTip(configQueryOptions->whatsThis());*/ actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actiontqStatusText(const TQString &)), this, TQT_SLOT(slotqStatusHelpMsg(const TQString &))); + connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusHelpMsg(const TQString &))); //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())); } @@ -296,5 +296,5 @@ void kvoctrainApp::initView() { view = new kvoctrainView(doc, langset, this); setCentralWidget(view); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index 9b282c9e..c809cc3a 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -61,12 +61,12 @@ static const char *PATTERN_VCB = I18N_NOOP("*.vocab|Vocabbox (*.vocab)\n"); void kvoctrainApp::slotTimeOutBackup() { if (Prefs::autoBackup() && doc && doc->isModified() ) { - slotqStatusMsg(i18n("Autobackup in progress")); + slotStatusMsg(i18n("Autobackup in progress")); slotFileSave(); } if (Prefs::backupTime() > 0) btimer->start(Prefs::backupTime() * 60 * 1000, TRUE); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -126,7 +126,7 @@ void kvoctrainApp::slotFileQuit() kapp->quit(); } else - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -142,19 +142,19 @@ void kvoctrainApp::slotProgress(kvoctrainDoc *curr_doc, int percent) void kvoctrainApp::slotFileOpenRecent(const KURL& url) { - slotqStatusMsg(i18n("Opening file...")); + slotStatusMsg(i18n("Opening file...")); if (queryExit() && fileOpenRecent->items().count() > 0) { fileOpenRecent->setCurrentItem(-1); loadfileFromPath(url); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotFileNew() { - slotqStatusMsg(i18n("Creating new file...")); + slotStatusMsg(i18n("Creating new file...")); if (queryExit() ) { view->setView (0, langset); @@ -172,20 +172,20 @@ void kvoctrainApp::slotFileNew() connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); doc->setModified(false); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotFileOpen() { - slotqStatusMsg(i18n("Opening file...")); + slotStatusMsg(i18n("Opening file...")); if (queryExit() ) { TQString s; - KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, tqparentWidget(), i18n("Open Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Open Vocabulary File")); loadfileFromPath(url, true); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -200,7 +200,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent) TQString format = i18n("Loading %1"); TQString msg = format.arg(url.path()); - slotqStatusMsg(msg); + slotStatusMsg(msg); prepareProgressBar(); doc = new kvoctrainDoc (this, url); removeProgressBar(); @@ -217,17 +217,17 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent) void kvoctrainApp::slotFileOpenExample() { - slotqStatusMsg(i18n("Opening example file...")); + slotStatusMsg(i18n("Opening example file...")); if (queryExit() ) { TQString s; s = locate("data", "kvoctrain/examples/"); - KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, tqparentWidget(), i18n("Open Example Vocabulary File")); + KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, parentWidget(), i18n("Open Example Vocabulary File")); loadfileFromPath(url, false); if (doc) doc->URL().setFileName(TQString::null); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -241,17 +241,17 @@ void kvoctrainApp::slotGHNS() void kvoctrainApp::slotFileMerge() { - slotqStatusMsg(i18n("Merging file...")); + slotStatusMsg(i18n("Merging file...")); TQString s; - KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, tqparentWidget(), i18n("Merge Vocabulary File")); + KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Merge Vocabulary File")); if (!url.isEmpty() ) { TQString format = i18n("Loading %1"); TQString msg = format.arg(url.path()); - slotqStatusMsg(msg); + slotStatusMsg(msg); prepareProgressBar(); kvoctrainDoc *new_doc = new kvoctrainDoc (this, url); connect (new_doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); @@ -275,7 +275,7 @@ void kvoctrainApp::slotFileMerge() format = i18n("Merging %1"); msg = format.arg(url.path()); - slotqStatusMsg(msg); + slotStatusMsg(msg); TQApplication::setOverrideCursor( waitCursor ); @@ -485,7 +485,7 @@ void kvoctrainApp::slotFileMerge() view->getTable()->setFont(Prefs::tableFont()); view->adjustContent(); TQApplication::restoreOverrideCursor(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -501,7 +501,7 @@ void kvoctrainApp::slotFileSave() TQString format = i18n("Saving %1"); TQString msg = format.arg(doc->URL().path()); - slotqStatusMsg(msg); + slotStatusMsg(msg); // remove previous backup TQFile::remove(TQFile::encodeName(doc->URL().path()+"~")); @@ -514,7 +514,7 @@ void kvoctrainApp::slotFileSave() fileOpenRecent->addURL(doc->URL()); removeProgressBar(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -587,12 +587,12 @@ void kvoctrainApp::saveDocProps(kvoctrainDoc *the_doc) void kvoctrainApp::slotFileSaveAs() { - slotqStatusMsg(i18n("Saving file under new filename...")); + slotStatusMsg(i18n("Saving file under new filename...")); if (entryDlg != 0) commitEntryDlg(false); - KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As")); if (!url.isEmpty() ) { TQFileInfo fileinfo(url.path()); @@ -607,7 +607,7 @@ void kvoctrainApp::slotFileSaveAs() if (doc) { TQString format = i18n("Saving %1"); TQString msg = format.arg(url.path()); - slotqStatusMsg(msg); + slotStatusMsg(msg); TQFile::remove(TQFile::encodeName(url.path()+"~")); // remove previous backup ::rename (TQFile::encodeName(url.path()), TQFile::encodeName(TQString(url.path()+"~"))); @@ -619,7 +619,7 @@ void kvoctrainApp::slotFileSaveAs() removeProgressBar(); } } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -628,7 +628,7 @@ void kvoctrainApp::slotSaveSelection () if (entryDlg != 0) commitEntryDlg(false); - slotqStatusMsg(i18n("Saving selected area under new filename...")); + slotStatusMsg(i18n("Saving selected area under new filename...")); TQString save_separator = Prefs::separator(); Prefs::setSeparator("\t"); kvoctrainDoc seldoc(this, ""); @@ -644,7 +644,7 @@ void kvoctrainApp::slotSaveSelection () if (doc->getEntry(i)->isInQuery() ) seldoc.appendEntry(doc->getEntry(i)); - KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As")); + KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As")); if (!url.isEmpty() ) { @@ -659,7 +659,7 @@ void kvoctrainApp::slotSaveSelection () { TQString format = i18n("Saving %1"); TQString msg = format.arg(url.path()); - slotqStatusMsg(msg); + slotStatusMsg(msg); TQFile::remove(url.path()+"~"); // remove previous backup // FIXME: check error @@ -672,7 +672,7 @@ void kvoctrainApp::slotSaveSelection () } } Prefs::setSeparator(save_separator); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp index 3a90f66e..0f2ca08d 100644 --- a/kvoctrain/kvoctrain/kva_query.cpp +++ b/kvoctrain/kvoctrain/kva_query.cpp @@ -115,7 +115,7 @@ void kvoctrainApp::slotQueryOptions(int pageindex) querymanager.setLessonItems(qodlg.getQueryManager().lessonItems() ); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } } @@ -123,7 +123,7 @@ void kvoctrainApp::slotQueryOptions(int pageindex) void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property) { removeEntryDlg(); - slotqStatusMsg(i18n("Starting property query...")); + slotStatusMsg(i18n("Starting property query...")); queryType = property; querymode = false; num_queryTimeout = 0; @@ -187,7 +187,7 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property) simpleQueryDlg->initFocus(); simpleQueryDlg->show(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -288,14 +288,14 @@ void kvoctrainApp::slotTimeOutProperty(QueryDlgBase::Result res) doc); simpleQueryDlg->initFocus(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) { removeEntryDlg(); - slotqStatusMsg(i18n("Starting special query...")); + slotStatusMsg(i18n("Starting special query...")); querymode = false; num_queryTimeout = 0; act_query_col = col; @@ -399,7 +399,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) slotStopQuery(true); return; } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -544,7 +544,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res) slotStopQuery(true); return; } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -561,7 +561,7 @@ void kvoctrainApp::slotRestartQuery() void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & orglang, bool create_new) { removeEntryDlg(); - slotqStatusMsg(i18n("Starting random query...")); + slotStatusMsg(i18n("Starting random query...")); querymode = false; num_queryTimeout = 0; @@ -672,7 +672,7 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o slotStopQuery(true); return; } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -993,7 +993,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res) doc); mcQueryDlg->initFocus(); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp index 989b967e..62d2e901 100644 --- a/kvoctrain/kvoctrain/kvoctrain.cpp +++ b/kvoctrain/kvoctrain/kvoctrain.cpp @@ -178,7 +178,7 @@ void kvoctrainApp::commitEntryDlg(bool force) if (!force && entryDlg->isModified() && !Prefs::autoEntryApply()) { if( KMessageBox::No == KMessageBox::warningYesNo(this, - i18n("The entry dialog tqcontains unsaved changes.\n" + i18n("The entry dialog contains unsaved changes.\n" "Do you want to apply or discard your changes?"), kapp->makeStdCaption(i18n("Unsaved Changes")), KStdGuiItem::apply(), KStdGuiItem::discard())) { @@ -615,7 +615,7 @@ void kvoctrainApp::slotDocProps () doc->setLicense(ddlg.getLicense() ); doc->setDocRemark(ddlg.getDocRemark() ); - slotqStatusMsg(i18n("Updating lesson indices...")); + slotStatusMsg(i18n("Updating lesson indices...")); TQApplication::setOverrideCursor( waitCursor ); ddlg.getLesson(lessons, lessonIndex); @@ -628,15 +628,15 @@ void kvoctrainApp::slotDocProps () for (int i = 1; i < lessons->count(); i++) new_lessonStr.push_back(lessons->text(i)); - slotqStatusMsg(i18n("Updating type indices...")); + slotStatusMsg(i18n("Updating type indices...")); TypeOptPage::cleanUnused(doc, typeIndex, old_types); QueryManager::setTypeNames (new_typeStr); - slotqStatusMsg(i18n("Updating tense indices...")); + slotStatusMsg(i18n("Updating tense indices...")); TenseOptPage::cleanUnused(doc, tenseIndex, old_tenses); Conjugation::setTenseNames (new_tenseStr); - slotqStatusMsg(i18n("usage (area) of an expression", + slotStatusMsg(i18n("usage (area) of an expression", "Updating usage label indices...")); UsageOptPage::cleanUnused(doc, usageIndex, old_usages); UsageManager::setUsageNames (new_usageStr); @@ -654,7 +654,7 @@ void kvoctrainApp::slotDocProps () setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); TQApplication::restoreOverrideCursor(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } } @@ -674,7 +674,7 @@ void kvoctrainApp::slotDocPropsLang () view->getTable()->updateContents(); setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } } @@ -682,7 +682,7 @@ void kvoctrainApp::slotDocPropsLang () void kvoctrainApp::slotModifiedDoc(bool mod) { setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -831,7 +831,7 @@ void kvoctrainApp::keyPressEvent( TQKeyEvent *e ) if (!found) e->ignore(); } - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -885,7 +885,7 @@ void kvoctrainApp::slotCleanVocabulary () TQApplication::restoreOverrideCursor(); removeProgressBar(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); if (num != 0) { view->setView(doc, langset); @@ -910,7 +910,7 @@ void kvoctrainApp::slotCreateRandom() Prefs::setEntriesPerLesson(res); - slotqStatusMsg(i18n("Creating random lessons...")); + slotStatusMsg(i18n("Creating random lessons...")); TQApplication::setOverrideCursor( waitCursor ); vector<kvoctrainExpr*> randomList; @@ -948,7 +948,7 @@ void kvoctrainApp::slotCreateRandom() doc->setModified (); } TQApplication::restoreOverrideCursor(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } @@ -1047,7 +1047,7 @@ void kvoctrainApp::slotResumeSearch(const TQString& s) return; } - slotqStatusMsg(i18n("Searching expression...")); + slotStatusMsg(i18n("Searching expression...")); TQApplication::setOverrideCursor( waitCursor ); // new word or shortend word @@ -1076,11 +1076,11 @@ void kvoctrainApp::slotResumeSearch(const TQString& s) searchstr = s; TQApplication::restoreOverrideCursor(); - slotqStatusMsg(IDS_DEFAULT); + slotStatusMsg(IDS_DEFAULT); } -void kvoctrainApp::slotqStatusMsg(const TQString &/*text*/) +void kvoctrainApp::slotStatusMsg(const TQString &/*text*/) { // } @@ -1150,7 +1150,7 @@ void kvoctrainApp::aboutToShowLearn() 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 @@ -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); @@ -1311,7 +1311,7 @@ void kvoctrainApp::aboutToShowVocabRemoveLanguage() } -void kvoctrainApp::slotqStatusHelpMsg(const TQString &text) +void kvoctrainApp::slotStatusHelpMsg(const TQString &text) { /////////////////////////////////////////////////////////////////// // change status message of whole statusbar temporary (text, msec) @@ -1321,7 +1321,7 @@ void kvoctrainApp::slotqStatusHelpMsg(const TQString &text) void kvoctrainApp::slotFilePrint() { - slotqStatusMsg(i18n("Printing...")); + slotStatusMsg(i18n("Printing...")); KPrinter printer; printer.setFullPage(true); if (printer.setup(this)) @@ -1329,7 +1329,7 @@ void kvoctrainApp::slotFilePrint() view->print(&printer); } - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } #include "kvoctrain.moc" diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h index b19b0d0a..a1be3c54 100644 --- a/kvoctrain/kvoctrain/kvoctrain.h +++ b/kvoctrain/kvoctrain/kvoctrain.h @@ -145,7 +145,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); @@ -215,9 +215,9 @@ public: void slotEditPaste(); /** change the status message to text */ - void slotqStatusMsg(const TQString &text); + void slotStatusMsg(const TQString &text); /** change the status message of the whole statusbar temporary */ - void slotqStatusHelpMsg(const TQString &text); + void slotStatusHelpMsg(const TQString &text); public: void removeProgressBar(); diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp index bb40512a..7dc54b45 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.cpp +++ b/kvoctrain/kvoctrain/kvoctraintable.cpp @@ -76,7 +76,7 @@ void KVocTrainTable::setCurrentItem(int row) setCurrentRow(row, currentColumn()); } /* -TQWidget* KVocTrainTable::beginEdit(int row, int col, bool tqreplace) +TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace) { if (KApplication::dcopClient()->isApplicationRegistered("kxkb")) { @@ -103,12 +103,12 @@ TQWidget* KVocTrainTable::beginEdit(int row, int col, bool tqreplace) } } } - return TQTable::beginEdit(row, col, tqreplace); + return TQTable::beginEdit(row, col, replace); } -void KVocTrainTable::endEdit(int row, int col, bool accept, bool tqreplace) +void KVocTrainTable::endEdit(int row, int col, bool accept, bool replace) { - TQTable::endEdit(row, col, accept, tqreplace); + TQTable::endEdit(row, col, accept, replace); } */ void KVocTrainTable::sortByColumn(int header, bool alpha) { @@ -141,7 +141,7 @@ void KVocTrainTable::sortByColumn(int header, bool alpha) { sortdir = m_doc->sortByLesson_index(); } horizontalHeader()->setSortIndicator(header, sortdir); - tqrepaintContents(); + repaintContents(); m_doc->setModified(); emit currentChanged(currentRow(), currentColumn()); TQApplication::restoreOverrideCursor(); @@ -424,10 +424,10 @@ void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & c } TQPen pen( p->pen() ); - int gridColor = style().tqstyleHint( TQStyle::SH_Table_GridLineColor, this ); + int gridColor = style().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/kvoctraintable.h b/kvoctrain/kvoctrain/kvoctraintable.h index 9d2cc779..77fffa77 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.h +++ b/kvoctrain/kvoctrain/kvoctraintable.h @@ -80,8 +80,8 @@ public: protected: int current; - //TQWidget* beginEdit(int row, int col, bool tqreplace); - //void endEdit(int row, int col, bool accept, bool tqreplace); + //TQWidget* beginEdit(int row, int col, bool replace); + //void endEdit(int row, int col, bool accept, bool replace); void paintCell(TQPainter *p, int row, int col, const TQRect &cr, bool selected, const TQColorGroup &cg); void setItem(int row, int col, TQTableItem * item); TQTableItem* item (int row, int col) const; diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp index 89bcdf52..f4aefca8 100644 --- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp +++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp @@ -36,7 +36,7 @@ KVocTrainTableItem::KVocTrainTableItem( TQTable *t, EditType et, kvoctrainDoc *d : TQTableItem( t, et, TQString::null ) { m_doc = doc; - // we do not want that this item can be tqreplaced + // we do not want that this item can be replaced setReplaceable(false); } @@ -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 e7d9ad56..ebad99ee 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.cpp +++ b/kvoctrain/kvoctrain/kvoctrainview.cpp @@ -67,10 +67,10 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp connect(m_table, TQT_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQT_SLOT(keyPressEvent(TQKeyEvent *))); connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *))); - list_tqlayout = new TQGridLayout( this, 2, 1/*, 4 */); - list_tqlayout->addWidget(m_table, 1, 0); - list_tqlayout->setRowStretch(1, 1); - list_tqlayout->activate(); + list_layout = new TQGridLayout( this, 2, 1/*, 4 */); + list_layout->addWidget(m_table, 1, 0); + list_layout->setRowStretch(1, 1); + list_layout->activate(); setView(m_doc, ls); } @@ -243,21 +243,21 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString int h = pix.height(); TQPixmap arrow(w + 14, h); - TQBitmap tqmask(arrow.width(), arrow.height()); + TQBitmap mask(arrow.width(), arrow.height()); arrow.fill(Qt::white); - tqmask.fill(Qt::black); + mask.fill(Qt::black); bitBlt(&arrow, 0, 0, &pix, 0, 0); - if (pix.tqmask() != 0) - bitBlt(&tqmask, 0, 0, pix.tqmask(), 0, 0); + if (pix.mask() != 0) + bitBlt(&mask, 0, 0, pix.mask(), 0, 0); else { TQBitmap bmp(pix.createHeuristicMask()); - bitBlt(&tqmask, 0, 0, &bmp, 0, 0); + bitBlt(&mask, 0, 0, &bmp, 0, 0); } TQPainter p, pm; p.begin(&arrow); - pm.begin(&tqmask); + pm.begin(&mask); p.setPen(TQColor(0, 0, 0)); p.drawLine(w + 5, h - 2, w + 5 + 1, h - 2); @@ -275,7 +275,7 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString pm.end(); p.end(); - arrow.setMask(tqmask); + arrow.setMask(mask); TQIconSet set(arrow, TQIconSet::Small); header->setLabel(id, set, name); diff --git a/kvoctrain/kvoctrain/kvoctrainview.h b/kvoctrain/kvoctrain/kvoctrainview.h index c5d46f10..f76e240e 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.h +++ b/kvoctrain/kvoctrain/kvoctrainview.h @@ -76,7 +76,7 @@ protected: KVocTrainTable * m_table; bool autoResize; kvoctrainDoc * m_doc; - TQGridLayout * list_tqlayout; + TQGridLayout * list_layout; kvoctrainApp * parent; /** resizes table when frame is resized */ diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp index f1161025..9180d6e4 100644 --- a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp +++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp @@ -135,7 +135,7 @@ vector<UsageRelation> UsageManager::getRelation () } -bool UsageManager::tqcontains (const TQString& label, const TQString& collection) +bool UsageManager::contains (const TQString& label, const TQString& collection) { TQString s = collection; int pos; diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h index dcbb2ae5..647de685 100644 --- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h +++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h @@ -114,7 +114,7 @@ class UsageManager UsageManager (); - static bool tqcontains (const TQString& label, const TQString& collection); + static bool contains (const TQString& label, const TQString& collection); static vector<UsageRelation> getRelation (); static void setUsageNames (vector<TQString> names); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp index 8d72ee87..e4906935 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp @@ -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; } } diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp index 3d635cfe..f07e906d 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp @@ -827,7 +827,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name, TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); TQString format = i18n( - "Your document tqcontains an unknown attribute <%1> " // keep trailing space + "Your document contains an unknown attribute <%1> " // keep trailing space "in tag <%2>.\n" "Maybe your version of KVocTrain is too old, " "or the document is damaged.\n" @@ -851,7 +851,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem ) TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); TQString format = i18n( - "Your document tqcontains an unknown tag <%1>. " // keep trailing space + "Your document contains an unknown tag <%1>. " // keep trailing space "Maybe your version of KVocTrain is too old, " "or the document is damaged.\n" "Loading is aborted because KVocTrain cannot " diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp index 5b8e229f..7cce072b 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp @@ -96,7 +96,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is) while (c < 2) { temp = is.readLine(); - c+= temp.tqcontains("\","); + c+= temp.contains("\","); expression.append(temp); if (c < 2) expression.append(" "); diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h index c0c48055..365882c6 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h @@ -45,7 +45,7 @@ #define CFG_FFAMILY "FontFamily" #define CFG_FCHARSET "FontCharSet" #define CFG_SHOW_TOOLBAR "ShowToolbar" -#define CFG_SHOW_STATUSBAR "ShowtqStatusbar" +#define CFG_SHOW_STATUSBAR "ShowStatusbar" #define CFG_TOOLBAR_POS "ToolBar_Pos" #define CFG_GENERAL "General" diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp index 8a03fa96..a10aa28a 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp @@ -920,7 +920,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename) TQDataStream is( &f ); - TQ_INT8 c1, c2, c3, c4, c5; + Q_INT8 c1, c2, c3, c4, c5; is >> c1 >> c2 >> c3 @@ -949,7 +949,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename) if (line == LEX_IDENT_50) return vt_lex; - if (c1 == '"' && (line.tqcontains('"') == 1 || line.tqcontains(TQRegExp("\",[0-9]")))) + if (c1 == '"' && (line.contains('"') == 1 || line.contains(TQRegExp("\",[0-9]")))) return vt_voc; return csv; diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h index c44abf72..c331aac0 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h @@ -237,7 +237,7 @@ #define KV_CON_P3PF "p3f" // 3. person plural female #define KV_CON_P3PM "p3m" // 3. person plural male #define KV_CON_P3PN "p3n" // 3. person plural natural -#define KV_CONJ_COMMON "common" // female tqcontains common for all three +#define KV_CONJ_COMMON "common" // female contains common for all three #define LEX_IDENT_50 "Vocabulary Trainer V5.0" @@ -247,7 +247,7 @@ class TQStringList; class MultipleChoice; /************************************************************* - * This class tqcontains the expressions of your vocabulary + * This class contains the expressions of your vocabulary ************************************************************/ class kvoctrainDoc : public QObject diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h index 490a498b..f31cd1e9 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h @@ -67,7 +67,7 @@ typedef signed char grade_t; typedef unsigned short count_t; /*************************************************************** - * This class tqcontains one expression as original or in one + * This class contains one expression as original or in one * translations **************************************************************/ diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h index c9664f2c..2c95a515 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h +++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h @@ -23,7 +23,7 @@ using namespace std; class KOXML_OSTREAM; /** * The XMLWriter class provides support for writing XML streams. - * It tqcontains methods for output XML elements with attributes. + * It contains methods for output XML elements with attributes. * * Sample code: * <pre> @@ -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); diff --git a/kvoctrain/kvoctrain/kvt-core/langset.cpp b/kvoctrain/kvoctrain/kvt-core/langset.cpp index 19f6108a..633e6f59 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 39886b15..526f330d 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.h +++ b/kvoctrain/kvoctrain/kvt-core/langset.h @@ -64,13 +64,13 @@ class LangSet int indexShortId (TQString shortId) const; int indexLongId (TQString longId) const; int indexPixMapFile (TQString PixMapFile) const; - // doesn't make sense for keyboard tqlayouts since there is no 1-to-1 relation to languages + // doesn't make sense for keyboard layouts since there is no 1-to-1 relation to languages void setShortId (const TQString & shortId, int index); 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 c9e86e02..2714cf76 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.cpp +++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp @@ -73,14 +73,14 @@ TQString KVTNewStuff::downloadDestination(KNS::Entry * entry) if (KStandardDirs::exists(file)) { - int result = KMessageBox::warningContinueCancel(tqparentWidget(), + int result = KMessageBox::warningContinueCancel(parentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") .arg(file), TQString::null, i18n("Overwrite") ); if (result == KMessageBox::Cancel) return TQString::null; } - KMessageBox::information(tqparentWidget(), + KMessageBox::information(parentWidget(), i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>") .arg(file), TQString::null, diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui index 0746f18a..b8218978 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AdjQueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -336,7 +336,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui index 64243f9e..7792ca92 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ArtQueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -80,7 +80,7 @@ <property name="title"> <string></string> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -120,7 +120,7 @@ </widget> <widget class="QLayoutWidget" 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="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -339,7 +339,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui index 7c930bcf..098bf7fa 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MCQueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <grid> <property name="name"> @@ -436,7 +436,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp index 76346ef4..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()); @@ -85,7 +85,7 @@ bool QueryDlgBase::verifyField(TQLineEdit *field, const TQString &really) ret = true; if ( known_pal.inactive() != k_normal || known_pal.active() != k_normal) { - // tqreplace text colors + // replace text colors known_pal.setActive(k_normal); known_pal.setInactive(k_normal); field->setPalette( known_pal ); @@ -94,7 +94,7 @@ bool QueryDlgBase::verifyField(TQLineEdit *field, const TQString &really) else if ( unknown_pal.inactive() != u_normal || unknown_pal.active() != u_normal) { - // tqreplace text colors + // replace text colors unknown_pal.setActive(u_normal); unknown_pal.setInactive(u_normal); field->setPalette( unknown_pal ); @@ -107,11 +107,11 @@ 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()); - // tqreplace text colors + // replace text colors if ( pal.inactive() != normal || pal.active() != normal) { @@ -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()); @@ -173,7 +173,7 @@ bool QueryDlgBase::verifyField(TQMultiLineEdit *field, const TQString &really, b ret = true; if (known_pal.inactive() != k_normal || known_pal.active() != k_normal) { - // tqreplace text colors + // replace text colors known_pal.setActive(k_normal); known_pal.setInactive(k_normal); field->setPalette( known_pal ); @@ -182,7 +182,7 @@ bool QueryDlgBase::verifyField(TQMultiLineEdit *field, const TQString &really, b else if ( unknown_pal.inactive() != u_normal || unknown_pal.active() != u_normal) { - // tqreplace text colors + // replace text colors unknown_pal.setActive(u_normal); unknown_pal.setInactive(u_normal); field->setPalette( unknown_pal ); @@ -195,11 +195,11 @@ 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()); - // tqreplace text colors + // replace text colors if ( pal.inactive() != normal || pal.active() != normal) { @@ -221,15 +221,15 @@ 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()); TQPalette unknown_pal( radio->palette()); - // tqreplace text colors + // replace text colors TQFont ft = radio->font(); if (ft.weight() != TQFont::Bold) { @@ -273,11 +273,11 @@ 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()); - // tqreplace text colors, avoid flickering + // replace text colors, avoid flickering if ( pal.inactive() != normal || pal.active() != normal) { pal.setActive(normal); diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp index 520b908c..8f1e315f 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp @@ -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(); } @@ -651,7 +651,7 @@ void RandomQueryDlg::keyPressEvent( TQKeyEvent *e ) { TQString trans (vocabulary[i]); if ( (e -> key() == Key_F5 && trans.startsWith (curText, false) - || e -> key() == Key_F6 && trans.tqcontains (curText, false)) ) + || e -> key() == Key_F6 && trans.contains (curText, false)) ) combo -> insertItem (trans); } combo -> setEditText (curText); diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui index a52ec42e..fc573bf6 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -410,7 +410,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp index 865a7f9e..1c6f8469 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(Qt::AlignVCenter); + mw->queryField->setAlignment(Qt::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(Qt::AlignVCenter | Qt::WordBreak); + mw->queryField->setAlignment(Qt::AlignVCenter | Qt::WordBreak); else - mw->queryField->tqsetAlignment(Qt::AlignVCenter); + mw->queryField->setAlignment(Qt::AlignVCenter); } diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui index 90822491..3ff31b5f 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SimpleQueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget"> <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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> @@ -240,7 +240,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <grid> <property name="name"> @@ -340,7 +340,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui index 4d4ad6f5..0c7a5cb7 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>VerbQueryDlgForm</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <grid> <property name="name"> @@ -163,7 +163,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout27</cstring> + <cstring>layout27</cstring> </property> <grid> <property name="name"> @@ -269,7 +269,7 @@ </widget> <widget class="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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> @@ -541,7 +541,7 @@ <tabstop>know_it</tabstop> <tabstop>dont_know</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kprogress.h</includehint> diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui index cba2407b..669ec746 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -214,5 +214,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui index 46a49a9e..7964f7e0 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -70,7 +70,7 @@ <property name="name"> <cstring>StatListView</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>500</width> <height>0</height> @@ -82,5 +82,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/tools/extractlang.cpp b/kvoctrain/kvoctrain/tools/extractlang.cpp index c56308e9..a775274e 100644 --- a/kvoctrain/kvoctrain/tools/extractlang.cpp +++ b/kvoctrain/kvoctrain/tools/extractlang.cpp @@ -31,7 +31,7 @@ void parseLanguage(TQString name, TQString three, TQString two) three_1.insert(slash, ", "); } - if (!two.tqcontains(" ")) { + if (!two.contains(" ")) { twoLangs.append("\t{{\""); twoLangs.append(two); twoLangs.append("\"}, {\""); @@ -96,7 +96,7 @@ bool parseTR(TQString& line, TQTextIStream& in) uint count = 0; - while (line.tqcontains("<td")) + while (line.contains("<td")) { if (count > 3) return true; @@ -111,7 +111,7 @@ bool parseTR(TQString& line, TQTextIStream& in) parseLanguage(text[0], text[2], text[3]); } - if (line.tqcontains("/tr")) + if (line.contains("/tr")) return true; return false; @@ -130,7 +130,7 @@ int main() if (readNext) line = in.readLine(); - if (line.tqcontains("<tr")) + if (line.contains("<tr")) { readNext = parseTR(line, in); } diff --git a/kwordquiz/src/dlglanguagebase.ui b/kwordquiz/src/dlglanguagebase.ui index 3e67260d..0db87f5e 100644 --- a/kwordquiz/src/dlglanguagebase.ui +++ b/kwordquiz/src/dlglanguagebase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DlgLanguageBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>1</y> @@ -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="QLayoutWidget" 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="QLayoutWidget" 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> @@ -240,5 +240,5 @@ <data format="XPM.GZ" length="29827">789cdd9c5b532bb992a8dff7afe8d87adb31a1c1601b3b4e9c0783c10603b6b9c3c43ce85a36b631e03b13e7bf9f943253948d59cdea5e3dd3319b702f3eaa4a522a2fca94cafbdffff5db7de7fcb77ffdfb3f265335ed9bdf4c4fbdfdf62f3b1b8d56fff19ffff7bffef1cfc2cece6fe153aa947fdbfde7bffde39f62f99bf94decc4ff45ae26ae045653e6025e5f1017f17e2513e3fd1366ba7f4e5ca1fb8f13e3fd7bcc78bf3d4f8cd7793c069ff72f89e3754dfd1768fcb64e4ce3d327912b69bcb3c4d8fe1133f6efde1363fba7c43c7e9118afdf31d3f31789f1fa0b318ddf5e24c6fee7cc345f156496c71d24c6f60e99b17db12226f904c957a0f1ea2131f56f7460688dfa736d64ee2f1b33e3753320e6f6f97e6a5f7488a97d5547de657bf2c4f47ccf12d3f32e8ebf50e1fbd53d31ddef9b89515e47ccfa50c4d47f16e77b37f5a70bc43c1f2362ba5f64c87b3cde77627ade548859defdc855be3f9b27467d5e11b3bd9d1373ff07c4d4bff3c8456acfc4fbf70a7cbf1a10b3feee13637fd7c8fcbce825c6eb6fc4341e3b4a1caffb2366d2f79298fab7515f7b697cba45ccf36312a37e2e98c99ea7c43c7fddc438be0531ebc3248ed73394af5a2ad17862fc2816f8793721e6f9dc4f8cf25d30e378b4412eb1bd9d258ef79b17661a7f8d98fa77d5c4f1fe9e24aed2f89f12c7eb5621972dcd6f8c7745552ad1785e89e97eb360a6eb15e4728138f65fda2d59f47f7fc2bc5b8de39b22970bd4de09333dbf434cfd672a31de7fc7bc8bf26a6292cff3f396e6b71859b1bd0b4b4cface9e91cb85bd42ec7f9798e64f1d3253fcaf11d37c8832335ef77bc4dcff03333d7f9818e3e58019e551288fdaa7f9300789f1fe1a33de9f758959ffa3c4d87f8f199fb7515fe55df61777835caeeea17e14318dcf1d33d37c779871befc5be2f87cd640e6f1ab62626c6fc68cedd923621a9fdf65c6eb3d474cfa7565665a5f1433dd6f8869fc59d4775925ffed27c6f11499c9fece90d378de99d17e7d8d19e5b737c4341ef7c88cf78b0362d2bf1689f1fe2133cdc77d62ec6f8a5ca1f95337cca4ffa89ffd3d66bb4c1c9f57cc349ffe3e315e7f20a6f1660b66942f8bf6baafd99e8c424ef79f3193ff3c13b33dbf26c6fbb17f5d2579b23b661a9f4b1cefd77d66b2b7d87e656f9ffc4f3d31533cd4c434dfaa815c617faa12933cba8e9cfa7b63c6fec49098e64bbf33e375d727a6f9502d661aaf4f8cf2e378358fcfe278358fcf0f89697c599999aedf25467dec13737c6e3293bf4f99c95e70fcba4afa106fcc38be9e42566c3f17cc64efcdc4689fa7c4ec1f7566b29f7ee278dd9602c3f24ae3f30b66b2df4962ec7f9798fd859fa7f1eb5be6928aedcd98cbb17e702fc86c6fb6cd8cfde93d6496372b31d3784f88491ef39018fb77cc45b4ff15b1a2e787ccc538be8cef77d89fb965c6fb8564c6f60ccd87dea5f86798c95fca89317e3f3393fd92fcba4cf9c93c31fa0fc9a715b57f9f18f573c94cf617e349d5b07ff7047295ecd7b59869bd386426fd30737ef1c48cf78b0131d9835789513f381f86e7d78c8969fecc9c19e74ff591613e707ecf98f17a56481cc76769fc3c5f3d9f18ed6fc14cf9c90d338e57de31637fca30537f9ab984f5ed0931cdbfda498cfa7966c6fee469e2785d72ff8afcf32171ec5fce881db62f6b89f1f91533b57f9018fb7f6746f9cc5562948fe435649f729c18db1f3053fbf3c4389f9298e65b1c27c6f5fd9199e2fb1131cd8f8dd75591d73b3121a678944d99697eae89d99e9ac464cfe21c19127ab4873133c6137d8fac77517fbe414cfab667cca86f9bae937d09667c3e5b12933e759199fc87db637d3e3053fb6f89b1fd7d666cdfec1093be6d8199fc799c18d78f1633f56f13637ce931e37ccaabc4e87f65661c9f4bedd3f8d2f3383ebb8b9cece73d31da4fc64cf6534f8cd74f98c9ffda89713c7d668a87cf89713e69bc6c7fd226c6f60533f5af13e3f523665a4f1689713d34cc940f5412e37a4bf361c8ffe579626c7fc24cfda7fb495f5d66ea8fc74bf1c0f37cb0ff9f25c6e76f98c91fe37aa80ce7431ee73f748ff1e09298fcc10c89693c42103bbc6eabc86c1fee9c19edc39f25c6f511c76b589ffa8331de8c9929be1698c9de4462b4b73e33f903c9c3fad4978951be3233c583d3c4b8de3798c9febb89713ce97e5abfd3fd349e0e33d9ff1d31e9dbb03cacef97c4980f5e3053bef49e18ed798f99f2f171628c8f57cc383eb99318c73763c6f1a97d62b21fbb9718ede59a99e2f35d62b4df0a33e98fe79fe287b9488cf118e3b9b1e4ffd63393bd1f31537e10f5ab8b9c6f9b4b64b657fb424cf3632c33cd4f62ca176b89d11e9969bc593531fac73e32afff2e2366fdbc22b33d6434bee4af57cc643f3566b29fb7c4713cbacc4cebcf3c318ef78198e65f6b66f2a7476692ff3a31f63f62a6f16689b17d816cd91f3bccb4be7613a37ccce43f16e5b59c8f659298c73f60c6f9d73d621a9fbd64a6eb536443eb89bf41b6ec6f31df3625cecffd71e2785d1c22737cc9f69929bf4f4ccf3f3163ff66454cf2a92133f9db8819edcb1788d91f7789c9bffc6d62ccbf2533e98bc66f69bd543e31fa478798f3d54b66f2cf2233ce574f13933d8958ff18cbf2bb2633d9e36b629cdf6762b26fcdf797717ed401f3fe5e9cdf2231fb9f4f8cfd9d32533c7f60a6e75f13eb383fe7c41c8fee9829bf1925c67874cb4cf1fb3e31eabfc74cfe963163ffa281ccf32f0a89b1fd4366da6f9089717c27cc141fca89317e5f33d3fec25162bc3e25e67ca59918fb5f32d3fab1488cf6f1ce4cf9fc1333daa7dc27e67c649418dbe7fb697d12b789b1fd1e33c5e7c7c4387eb22f4bf62e1e1263feb0c34ced937e1ccd6f16d7275b4af1f09c19f5638ac49c5f4c12a3bf5f32a3fde80e72d24f8399f6af1e99291e9e3053fede62a6fe0f13c7f6cd1931e947779929ff2825c6f5ea8099e2f52c31c623c54cf6719518e3c92b338d779719f5ab6e1363bc3d67a6f14e8959ffcf8951ff4366b22f9718aff37c90fef53c31ea9fe79bfc5fb513a37c4b668a37c7ccb83ee807669287e793f35b93388ea7cbf2707dab12e378b97dae6fdb89315fe0f9a778e15e1363bce2f975b4bf41f23bae671a89b13fcf4ce3e927c6eb4566ca27687e1dd7c737cc145fea89d13fd01e1cdb83b7cc149f2789e378dd8019edd9d599d19e5d2171b48f2c5dafe0f52762ae577712a33e2f98297f3a488cf6f0c84cfb352f89713eaf99697de7f152fc7715661c8ff1c4a4efec28319e8765cca45fee9fd783cbc4986f707f144f6c9119f56d4acc688fd92a31daeb0d338d17edd5b13d985d66b287d7c4680f17cc148f2a89d1dfaf9969fca93dd27f6a8ffc69c48ce3975566f2a766628c0f7bccb4fef1755e5fde1263fde498a97e1a3393ff2c1363be6499c93eaf98291f3c25e6fac733533e19e3992b27fdec2446fd08661cbf5d25467bee30933da7f6aa268ebf85ccf3e7e689b17dc74cfabf4d8cf94f8f19fb57a5c4680f6fccd8bfa813f37ed21333d56b85c4987f9d32533d9e98e4ab3063fbbe9a385eb78698d7ef6766b2af3d66aaafae13e3f832665a6f3b89717c9299f235969feb8d1533d517717d71ce703cc5eb8ef5e10f985531de3f4276bb2a5ecf7688393f3862a67a7bc14cf3a113e37cbd1173fd639829bec4facc97395e76a752fc551fa9d67ed7e193d8484b9f5fd257b4adbf4c92dff9b024f6d7b4f70bf46273f3fb33a3b37f3fbd6c93647394e1df5f35e2bf542fbf2bdd97f705ff711ffef33faf976f48f3f57dead749f2d7e8a5fb850ffdc80affbe7af949e9fe667a913efe9bc1a727fbc04f72107c81d694644d72087ff7f019c5fb07c0bdbf975ee4b31cc3e8b2f8fb531ca100895ee42b48865264f0f70c7eefc1dff0f77e9422fb75baff157a916f7202a31bc3ef93a01f906a1cad27483895b3a40f9426e8692e17f059ca157c7e9934bfcc5fde499249f7c337de41aaf06f2de88c22f0813c9475f8f7481e477db1b5fd3df462e3881b2049187553d672d7344950877fc3e84f401fa7b205bc8cf786e7cefe56ebfe398ce83c5ad710467e01236ec9b6ecc8aebc9457f25adec85b7927efe5837c943bb2007fdf957bb208f77a78aef4b7cac71ab22cf741925759915518e9a390420825b430c20a277cfc7122133dd1174f62208662249ec518ee1f8a975f23c937f5f2d53af0b1468cc08b5bb22b5ec59b9888298c7a26e662113f0bb14c3f8bf8b7b9588977511307e2109ea9831ec10a49c77f62bdf9865ea07571049fe3d81bd5201051df055896688a13b914a7a225cec4b9b810ed385efe597ef1b320a93aa20bfabb1457e21ae25a13dabb81d817e21c4407710b3ef524ee7e9d5ec25c897b71241ec4a3d841494401e2d29bac895d99893d5114255116fba212475fa59fed52d0552595883c176da594564659880e4d39863e7ac1974012ad9c14caff6abd8034c71b7fafc985ca544ff5d5931a901c4b58e27f24c987a4511efa5bb4399067a846b2aa9e21c6853c2244795869d5f3aff517d0c9b178483e029605bd2dd458bda857f5066321bb49a3fbd14f554dd4544d493b3325d43c3ebd520bb594776aa5de6155653f8cbaf9657a818f785cf3f67dd0494bd5d4813a54f5a00f18ddd1b7e4d8ae1f904c1d470feaa806b864531e515f13ca80be55b77e6f7d011b6649cad2a81379a14e554b9db187f03c7fe1f15bac2ed922cb328d770469ced5856aab0e4497719466f4dddcfa67d697d08aea424b2d90e4525dc551a3657df6908d79cf4704b02a815a041b93f1e9656a01a29bba5637ea569c82df8c5557dd7d773fe1a7d67d6cc9c92ef4754f92a007e0983ecbb1ce7949513b22d74a2e5eab2bf5a01ec529f41956e15fa897b89e044d3fab1dd04941edc21abe483d2f29ba92ad241d6cae26acc563b5b7666dc71bfac4c8d65145555265d150fb30f231c74e5805c49fd24b584f2cc4ae9aaa8075dda024a489bc7682241335c9594b55556141aa5316d3d1f2432a904992ce3017f8b056fc4ba685565ac38a8c33fa8c151fac6b7f228ec1a0438d31910ea2f0255817dbcd5a9ccd6963a1aa30af57daa862783b437b657426ce744ff7f5931e88773d8c630ff391a233fb4fa2851ee967d5830c47c55a35dbac41377de75b7aa9c15c8ce5428fc5103d3ecdfd7a4c8a72e81798d157fda6277a2a5a6aac67b2ade77a0159ca1ee4cd5dbdd42bfdae6bfa4085f95feac3a0d10d6f8a57c45c1fe8ba3e8af91a57dba1a25bf75ff3337ad1c790393addd04d6d3806873ef5893e4149a09b53d4876ee9337d2eaff4856eeb8e7ad65d7d09f973a8d0c6a1b681d834d057fa5adf80be6e216f9e518b47fa2e274fb23b68ef5e3f40bd730855dc7194e6e58feb25aef3bbfa51bde81d584f72512748425a89feaa0b7a57c3dceba22e41ef43b08a67a82d3f624f19227aa875ac5cc2dabeabcb7a5f5770b54dfeb74c5eb8040d2fc3571e20da54e4819190af85aaee625d920f69be938f858cc508a362af148df2b1c7e8208931c6aa82713233dea44f9468147339aaa031af83d5f7c0f44cdf3c09a95b66c0313145c565eaa76d8672cf8c623d7a0075a9a6b3834f113ae9656bcca63b67e6d98cd535e5e9eb768d51b96a5eccab7933d24ce2fd50ff834e50922154070f297f08f57d2d4a86fff6cccccccd4261ce508dfa11498ee839666956fadabc83242e561b5f783fe96573059a446f1fc949b00add3535f5847d7dac886a167a0a3ad1d21c9843358679d39b3d40ef022439377588454f513763f8d4a22787dda7913932c7a6619a20cd32facc7a061167cb9c9853d33267716f67b231d60d7fd996190449a4870ce2192aad92395f8b5e791bab286d56e6c2b421428ce28e44b2006aeb1cd6ee71c8504d07ee299aaeb93457e65a1e74a7e606fe36d073736bee82377eca50638fe6de3c9847b363a6a600d270dbb88bf8298e6d6606618fcbec823453b952a1d2aa444baef2eaf8517b983d53d4637d15ade7431f79ddf8e073308aa6ac87b7ebccbea998aa7c901df08166ccec07166eb14accc5664683b20cac5605d071668dd94927216add23d6fc85e7318b1174640ae15fd386ea773f579d2c28178c2b80b5d68967b0ae41da59f29f62ff4436ac87bf1fd8ccf620b10c7b011d5db37dfb04d2bc8963b8766207766847719d5d7efa59887dfbac1b20cd4b58ff7fbceeaf9dfc3c7de43c52e9b11d07ade00a927c3efaaa1ed917fb0a92d450276091bc139bcf041b7206f3af55d3bed90948829e3db3533b338f760ecf9c419e756a17ba4f99dea78c4e55edd2ae62eefc65ccddaa97b07b3dc18ccebe8b5763a25672d105d76968bf665fed01659e0d90e4637f381f3143ae7b20eaa08743a88617316fdb130b5bb747f2c1cce44a3cc0b34dfb2e1fe18e799226c902f3b8b0c7b62177ed1c2c3fe688bfab17d4c5906a39a8ef4cc93643f457722d8b3c8a73756d4feca96dc50861d0c369377c4d2f100b05e8e40c74d20e966acfd554dfd90bf8fddeb66d07fc26cc1ef467bbf6529d7f96255a77c75ea99a3c8c96ffc957d6d7fd9c957155ba5215f16cafd76331b40cd970885ff6c6deca4c75ed5dac311a3133ef51be142428f3ec80ee1eec7dc85762865f4d2b53b0b44358ffe7200db4a19c7db08f49331b3e0356b6630b1cc368cc5fe4c9492f7df2e42164758f621abd3d9f2be1ef993e8798efedee9a4e794d6ed8bd58837aa96d112429814e3eea938fea07565fd33465b10795f7be9cd8b2dd17595a29f39a99db8a69e86e5c63dee32a9c93ea533e96f40277865a5be89990b1e5cd1a31645fafb6aa4b90a97c3ea77f97fb4eca1246023d77c229d189f9c1346a784135d931c9e39d7606f22c68432fd4a37e8558365fd74ab48b4c7bc8c74cca29e2783fac6dab5e9e409a303a50b9103193cd6985f2f30e64f517b05ef82d156cc349e7c07f208ad8a229839f743e2a2dca1de72926423eecbccb541667f3c2f520afab6fca12fb9cb9be7b42bde4c7fba55ec2d503b0b2f0bb961da152afec2bd3188ff7dd40b7e5d0649f6b71bb07d612f6fd57622cafdc3066d74bf0f50ffb9ca79dc11043ea6ee49ec1a7c2e8408ff60daaa46d7a9943a5d98816f6bc9ebd6cd74bd45a5891a25e6457e8f5ac38ca125a357aaa3b21275ecbeae913a3f3ca94dcd8bd400db9998d522e4cffadea27fbe05e61d584100715f1917b7393cd5c1c23a79bca4b5b60bd7c1dc7727ad1f235daba06cf375bf402fdbb999bbb45981ff0c6cdf5246425076ee9c610a3861fa3a21c283fd30bb7720a3cff5a2fe4b1087dcee4b1aa294d7a495eeadea306175055c85817fd60dd5fd34ba8afa771f7e84ad88df989b2e8175783eab71be209ccd370a352e863de65db411277c092e42a131a254872e884aa88c7986bf8b827aaa19a7b43bbdcf0d2853a7775d0dff067f4029f19fc5e7747b9dd2392258ea20215ae82ea37647ac34fad9ec88e29839fcca224dbcf2e62d5e38e21c635e4aa8b15b48d35e7d0f45d33643a1f15265927e44cf2c19d44bd64f1acfad3fa928f075137c3384763092b97f01bd10433b18e3b956d58e38335854aeb3c663d0d5ce365d509885d2bc13b636bbb983196cd43eeeb5aee2cf85cdc91005b804a6d126b9b96bc83c8b74c5979925fdd9ba26975b12eaa6fadf7795d0927a4fcbb8d91f97e8b2c31f228036b35546ae2184660696f71164efaec813b57c53816cea6f33b97f05f0711cdb55dc7ee9b47f9eebae2d15dca41771a33d449b05077055139e9efe3c7ad20133aa0b1ba6dfb30b91a10d7151f77d6b2303fb41bb66ee7b0bae90cbc15b246f28fb168baebb85f5385de4a6ef5a90ac9af5093e87137ee56d5dc5d8c83e3a893a6bb8f33d8326592654333e05f0fb2dd455faeaf4bb2a9972e9f1484753f6430f7e02f9f6559424f67e23aec5cc75385b00317768dea02f4e51ee339df3cae279feb449446461b9b99a2b3f210ea977dd0ef4d9046d6c46d58fbb7cb02337be676a22724bd7c11c738bfc57727825e1ec4fb3659445bf7e41ef45c0ef956acdb9b908936210a4fd06b697f683d766db6b252455780356c27ae47e1ac32ccc891dbd5ab64a36bb2e811d4b0a817f53beb3ee7c7b1b604b94fd48be86d89420b2d755f5eca5af0f4601d50b3d76d16d69390ad802413cc56482b1ff6f5b1d66056d67133f562baf1c415779b2012e886dbd3bcd7bc66db6a60dff42cc52ffb398e7dd2cb285acd4a2ecc9b2b26efcdc7d3857e925db8ef1cee1bc0480650e7f45d89b2faf5dde5f52a31c5d890f902b5ddb1bc852aac089e3fc57c415eba72ccd8d253bc0feff65d45174356f9bbf918eb2554541aaad1035970d5cf356b388fd303bd04cb6a80ad8fe0031924f8498724c99fc66ca97863b54d11117e9faba5975e885b9a49a50a7a27d6b19bb2406e0eb37b22b3cd68fcb55e50d3d1bbba1ef746aa187d30878a678b99b935a3b8f73596debe9bfde8271388b7391b671bd377318bcbd72e6ba702f6c86b6f42cd08ba29bbba1ead9db655e933b74b6f21220db79f8d7dd4fb1bfe12f69e56e6d13b5bc7fa85f6c379077be6bd1e530d39f099a9048bc12c3a9e76e54e95e339f152cdd662dac78a13ac69e67b50b7847d9615d43b7d5a29391395342b2bdf975d5dfaeafd8c5cbdcfefded9f8864ef834f5c23f855a8c4f2592ed40ffbae607a615f622bb5373e587d1c226246bb49de417b032c67deefc89eb5a2c09b5b2d27ea0c67ea44efd33dbc2872c61f7024672664a7ebc916d6de865631f70104f6efa216715cfa2966c378dc1bfc0680fb4f3afe05323f0fc6b37d6b5b0c742abcab1205d60ecf56ffe2dd6c81f275f6b9131ec63e82158da4497e1334a15f2878d85385113ad6861298649b7a99794a97fbc13d983cf24be7bb4eba77882951f43d47ad5cffcdcf4c23b2bea59766cc72fe219de9cf69f78c7bee29756f8957f0fb26edb95e04a135aacf9038821959caf7d686eee0ff5b53cc4f31789a7c0f54f7ae1bc46939cc1f333e9a16637f6ddd771d721d999e0f5c11ff9636f82bfc0e7d46676668fe2f972ae6684ace3d837e4a57983357e462be0b695339c1c2d7dd39fc43dd28d739110f9dcca9faa8adaa1fd314b39d9d77ac9cb697d0ba459aa82e8867ed0ced28a1ea2da4c57cc13e8700455d4523d9b47a8235b71f6298aaa7b77e8432efceecfc3d7c4409af6b60a2044f2584fe457a0b56c1fb472211f3d6456f62ef9f78ff4b2fe0d8f916f439ef4e23b601ded0f59282e4f54b0e00e7863db7721ab1ccb377f691e4dc31eaa2a595aac4f689d9ec9437fe5afddf1a777cad8cec239f4514e53496bd1eb2a6ee66ffc2dccda738a63fa4bbd6c56541c2b4ecc61f046f04f8acbd1226847595d9bb90e6f633dc0fd2559d373f09bbbb88fe2f5933b5395304350379a503b7aa1bdbfcfedc17cb6b5ed36b8506f1a72f0b882e77712d7dea2ffc679a5b3affe219e594c5916b0df2a67bb66cf09ff28e790659e8134e12ca5ec779cf73bf2ce2d630419407d3296fb90a1f4e59e2ff8dd8fda19e3dec6cfa6dec0977c3883ae4306cb3bbce1ec33bfbb28be755e5917d7e2cc435e06abdd3445fc2aed2a877876a75756ca23b10b2a6fcacc977cd9efbb67a8db17e17dd798b3ed40a61376dd8bbee2abf6d0d653cdf9f5cf8225d30799cc449c0dbfbe37f1653eb65d2f433f162da762cd9bab0ef3eb76a6326d0771ad811a53edc8a2ca4c3b9e9486dddc90c94f20030dbb7f509f78235ecd01f8dafcd38ede7689c2be585821cbbe15ebaab59344f9e95cec87d23475db3e4334db7c03b19ade355c596587194470d9c45a24beb33f044f7d0b6fd1a9b07b0ed2844c14da3b947bfac61e85d528bc79f1a53e88322827322f67be05d1a8b97ebef3937a31f64e77b3cc2e537db45157847c0b6257176a9a4758cd2e624f633a459ac47797f7d549ace54d3cdd10ba64fa59cfd7a096c6e8bee527bdc3d4cefa100b75f0f650c7e623d3d7f5cb171febba66c738dfc89ed25efdc6592faddcce1e660379073d9f440f1d8993a8a3463a01b771dfed5966ee241b66a3ec3937ff9fb413a4c9c6d94bf62adb21fac6d1f7ff9c5e606d78b685ec2d9bc4b76116b9d17ff82f9ed0cfd57936b50df908955a2beeebe8f8b6bb8ff56788412ba84fca7aae4eb399af65f3ad922cd6fedbce16e05f7d23e1799fde87d9f256dc77fcc578f9220ad9325b65ef6a90ab3ff23d7f44d3b9b0e624abf9335552b5ecc0f4e3feceb15ed8a2dc93bb90070ff47b16d6ac4a3a0d597c9221af9faaae6575d9056942b634e62c78d3d2bef59e523d3b0afbc6309f2a3ba67713319be1774af27e1462a854f7ea5c9baca1dfac537d796f1fe4bdaf674da5cd0948d149d5da3427cb57710cf20b3dc84ed408e2e2383ba59d3eb76969df8a63ad78cef22e87fa316b6567319a2e37eae0cdea2afe80ddad445bd5e1e71eb2ce4ed4447edc5fbfc79cff09963803dd9c9b0be814cf5edcdafbb1df5e5f401f257ce7283bd20df5e8665861c4ba3d9f9b6fd6599b59227b7435f72ee3276fdf9aab85b7af86aeacdad945fefb327f607d71591bdfa0323bbaa31b59c70d7521b6ff92deb85aef7b9d271be3de26f12249b34533f1cc0f32bc2cf8cc4bfe74e4e7e258770a95d685be0ce72c419aec28bbccaef4339d5d2fb6d589e84ff9357543675f672f5ffc3d444955cdaeb39bdcfefecfaf2f229ee4b910014c16562cd1d03abbcdee742bd8ffefbcc10f95bf12f49ee88fa58857b3f117511a2481787f0fb1307eef89e3d8cfea257b100dc8b1c27adeb4bbaa9b3dca10db76b282ae6eafad7e67a6d7bd9f779a16712d79a16f9dacc92166a097cc7b5980f885ebcba7b7bbbea9974fe791615e4c2bdb356533343f8ea8db24d894a58adffb81bcab9fbd668bfc9bbf51b332aec1fd6c2fec5ca4efc37cfd5edf0fb3984f92f4219e1ccb1331565956d43be6dee01abae9bb5bb29d8d484eebab3ed022737ae66cc8a1437d0355e941bcba024916ea02f2f093f056fcb631fd09bd34e33996867cf7d4ed42942e65a5ac0cb1a0c2bb16f86eac3a72ef9b6febe2fe6c7c6f96bf9b54516f7e2f937a9c85330367faaea207f1ad82397a7cf8b642667443dce2fbb49bb3fc33feb22e114683f87dbd2358870f8c5465f3a8c6d9be7b145dc87cd7ab926d5181f759e6c2f90b7b08d5ef6516fa9885730350fb557612a599c71385916dda816e403416a2f9a331fe91eff1c9b7b8af99c5ef4c424e200ae13d7f7f9555ec5b56758fb692befbb6593ba6efbea9ab9eec899e928f3d0d757c1dea9b5069851abe674047e2b5677a36e8047237f093b0731e74124ebabe1ad71ffa7e2546c566fc06ee0a2276219c27c3fa7302faa9b9b96968effa5ab829d8f9b91ea97bb7722b750fbf0ddcbe7eb54bdfb7676eaeaf55c58fc15275a8e042a5456f0365d0ee9e6af75c4f66f7fe35fa89a0b759c59f5bf7373ffa38be27abe3bb62606de6cc14ac811a72d8f3fe5cae40aaba7bd20d79a94e5d5d3e98228cfc419c99a23f035f284bb048736c5aba84ef06c0487bf1dcba194f5e076657865df7233fca6ecc28eeba0e3667f20fc7b1cf5616f69b47f13bdf427ad44bd8b732bba6907a809a076cfcd49d98963dd0ed5ea6db7a6e5aaee1c7f45e398f084f4b86b1ca0adf210fb9f038ec208691cb66fc17bfb91ddeb3ed7f8e487f5c2f5f44eb8fbfe1db37e96debb559c0b7afb7b5f5e9adc32d7b765bfbff53fef22349c2e73d274d7aa76833b26fb779948af623d7fefefbffdf187f462f5b4686dfec58d7454695537dcb7bf8fc3e26ee41e6f6b5a9d212b93d6e9ddf21def6f9febaff03bd6cfe7dcd8ae0f73ad781db6680f720d7f20aaab4481fbf4e2f5b6b85fca836e6ec2b2bfafc779450ffc8fabe691bdfd4cb57954fbea5b5f381ef49a293e56dd1d79a8e7e20d14fc7b1af3cfc47d6f7831eb75c5faf45c2bde5dcfddbfa4dedfa56aff74bf5f2390ead7be997a3c9dfbf16d5736dfe6016e09e5e0f329f3f9027ffde7dbfeaf3ddfe7ecdbafff7fcfcd5ffbf70ff9d9fff557af97fffe71fff1f2192a73f</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/dlgrcbase.ui b/kwordquiz/src/dlgrcbase.ui index cf439f9a..1ee9a6f4 100644 --- a/kwordquiz/src/dlgrcbase.ui +++ b/kwordquiz/src/dlgrcbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DlgRCBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -173,7 +173,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>krestrictedline.h</includehint> <includehint>krestrictedline.h</includehint> diff --git a/kwordquiz/src/dlgsortbase.ui b/kwordquiz/src/dlgsortbase.ui index 38c2b9e2..e2e7e3f6 100644 --- a/kwordquiz/src/dlgsortbase.ui +++ b/kwordquiz/src/dlgsortbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DlgSortBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -139,5 +139,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp index af521fd1..79dd2da0 100644 --- a/kwordquiz/src/dlgspecchar.cpp +++ b/kwordquiz/src/dlgspecchar.cpp @@ -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 b412e612..d1cf9e1f 100644 --- a/kwordquiz/src/flashviewbase.ui +++ b/kwordquiz/src/flashviewbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>FlashViewBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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="QLayoutWidget" 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"> @@ -548,5 +548,5 @@ <data format="XPM.GZ" length="29635">789cdd9c59536349b2a0dffb579475bcb58dc5456841b2b17910082476891daedd87588f401202b4736dfefb7884bb878e1632c9aaec99b2694c957c9c25c2c3f73847fd1ffffae3a17dfec7bffee31fa3b11a3f9b3f4c577dfcf12f3b190c16fff95fffebbffff1cfc2cece1fe153de2bfdb1fbcffff18f7f8af91fe60fb113ff17b996b81a588d990b787c465cc2f3954c8ce78f98e9fc297195ce3f4a8ce71799f17c7b92188ff37c0c5eef7b89e3714de31768feb64e4cf3d3c791ab69be93c478ff43661cdfa5e338be3e21e6f98bc478fc9e99ae3f4e8cc7df8869fef634318e3f65a6f5aa22b33c6e9618ef77c08cf7170b62924fd0fc0b345fdd27a6f18d0e0c77a3f1dc09328f9765cc78dcbc10f3fd2f89e9fea24d4cf7570de45db6274f4cd7674562bade45fb2a54f97cf5404ce7fb7a6294d711b33e14318d9f7503efa6f1748198d763404ce78b0cb9c8f3fd24a6ebcd1e31cb8b5ce3f3b3d7c4a8cf6b62b6b773621e7f9f98c6771ab944f73367818b053e5ff588597ff78971bc1b64be5e7413e3f10f629a8fed258ec7fd9c99f43d23a6f1ad899ce6a74f89797d4c62d4cf0533d9f39898d7af9318e73723667d98c4f17846e395cb349f68ffa5025fef86c4bc9ebb8951be2633ce471be432dbdb59e278be1932d3fcebc434be2b25c6f93d12d768fe2f89e3712b90f72cad2fce4f95cb349f77623adf4c99e97815b952208ef1b0bc5bb6e8ff7e9f79b716e7f7865c29d0fd5acc74fd0e318defcb89f1fc3be65d5c6f1aaf42f2f91b624bf247ff2ec3fc8a8578ff5d625a1f75c04cf17d4e4cf28a0a33cde79e98eeefaf98e9facfc4180f7bcc385fa591f7485e534f8ce727c6f3b31631ebf739318e6f98f17a17e35d05d6a318d7db5689693eaece8cf777a7ccb83ebe9f385e9f2d9079beaa9418eff7ce4cfad827a6f9f83b669287af277db90233e50bc54ce7ef12f37a467fa82479fd8819edcb8f99511e7b454cf777b7cc78bed82726fd699118cfef32937c378971bc57e42aad87ba65a6f9477bda2b32db69e278bde2e3b43ebe93188f3f12d37cb32133e92be6a33dcdf15c58628a674621a7eb0f98c91f5e89d93edf13e3f917c835922f3b67a6f98ac4f17cfdcc4ceb1ff55d2da6f8dc404ee77f30e3f9a24f4cf2eb4f663cee1c31c9a34e99693d5462d44fb4ffaa4ef1fb3931eaf78919f59fe17c748de41789c91f769015ebef8299e43d4c8ce31f10b37dce98f1fc4c25467963fd512bf1fdb31b66f2e72362bade3c24c6eb1d7309f5bb205674fd0b7349c5f9d4881d8e676e99f17c2199f17ee60359ef92ff4a66b287a7c418ef5f9849bf6fc415ca97e3c4e83fc7c48aee7f9d18fdfd9499f415ebc99aa972beeb21b3bce69598e431136694473d23c3fc50de33663c9e7512c7f5b22d629a7f564e8cf63462a6f9f1fd2ab83ef29e19c7538619c7f315e632f63fc7c4b41e6a2731aed72b338e274f12c7e3f29699ec73c9717c49eba11dde5fd613e3f50b66baff7e621cff9319e5335789513e92d790bdc86162bc7f8f99ee3f4d8cf509ad87a1f5164789315f3c31533d7448ccf612f5ab4a55cae7ea8599ced7c414ff5513b9c6f9b94a4cf6a51f90f52eeac77f12933eed3133ead33612a3fd4866bc3e7b23267de91233e5e72633e9eb9199ee9faea7fb1799f1fee68998f46979fea44fff9218ebab13661a5f24467fb6cc684ff23a31fa579919e7e77a89717e1933cecf923cc93e3e13a37d64cc641f8dc478fc9899fceb3231cea7cb4cf1e73531ae678598ec4bdac4787fc14ce3ebc478fc9019c7d7b3c4b85e3566ca4f85c418dff788c9bfe57962bcff8899c6ef26467db599693c9687fcddb788d9bfcf12e3f537cc94df513ec3fe601532fb83cf8839dede32d3f17662bc7f8598fb872633f9f70733d547683f86edc9b598293e1e268ef6941d21b3fef565628c3f43668ab70566f29fbdc4689f5d66f21f4f4cfad75789319e5498717c719218f3719399fca59318e793cea7fc7a9418e773ce4cfe724d4cf6617698c93ede12a37e0e99697d6789d1fe8bcc540f0e13633e4ce3e1fc641a8fe63762c6f9295e4fb237fb9418f323eb87e28fb84f8cf65e6526fd65cc54ef9c2746ff217bb3142fac6326fb6b3093fc51ffbac4f6e7df99e9f89271fc5d62ee07769849bf77cc7b3ade6fc85c2dc6f3fbc88aea677bc64ce3d1f9acffec9898f4e3cf98c95eeacc642fef89a33e748599f2d35b62f4974b625a6fad99c97f9e98c91e6e12e3f803669aaf4c8cf56409d9b2ffb599a9feb8488cf29d1093bff8180fb4ad513f92e17caca2f8e38e98293fcd9969fda7c4bc7ff1c24cfed923e6fcba9718f5394636949f3cced75af6c7a86f53e6fe4d8c88a9becffacc246f8798fbaf4f62924f9c23ab32cedf0e98d17e4409d972bd502026fdba983f8de57eca6b6445fb2bea0a5957f07ea6474cf141086287c77dcc7fb6ccfd94e920f3fdec2bb2a6f5329699ec2531d9ff3471942f1b11937d650f8971fe3bc81c4f9d21e6f815edc93a8ee7be48ac70fd32c38ce3e92e31dddf5e32e3711be7eb2adc2ff945e2a86f7180ccf69cdd3153bfb5c74cd73b66bcbf9913937dab3e33c5d70133adff2d31c7df5d628aa7fe3231c6a33233adff11b2a37a4af9c4180fe97ac7fdca3933c563bc9f63f9dc0133c59bb7c4e80f7d628a5fbac58cf2ab7de65a29aedf3531db8b4f8ce31d3253fd78c34cd73f2736713d8e88793dae98a91ee926c6fc72c74cf9f82131ea5730533ccd98717cd144e6f51585c478ff0366ea1f64629c5f8399ec793731e6e31b66daeff84c8cc7c7c45cafb612e3f87366aa07668951ff0b66ead79e99d1fee41e31d7a383c478ff1766b297bbc478ff8c99f603ae13e3fcc9be1cd9b3784c8cf1688799ee4ffaf1b4be599c8f07ff20fd9c33a37e4c9198ebc54162f4e72b66b41fdd464efad967a6fdb02766ca7775668ac7e97c1a7fc9f1fee69498f4a33bcc949fca8931be2e98291f4f1263bc51cc641f1789315ebc33d37caf9851bfea2e31c6cb0633cd7744ccfa7f4d8cfaef33937db9c4789ce525fdeb6962d43faf37f9bfba4c8cf2cd9929de1c32637cd78fcc240faf27f73726719c4f67cc4cf3558971be47cce40f178931bfa5eb69bd0789315e3d3053fd41ebe9b99f6d26c6f13c33cde739311e2f3153fea3f97adeffb865a6f8729018fd23e633efa17e89f66e3e9153fd7082ccf6e22533c5ef51e278bdcb98a9de5830a3bdbbfbc4d17eb229b3c2e39e98ebadbbc4a8ef0b66aa07c689d15e9e9869bfee2d31d69be7cc54afa5f1703eaec88cf3318e98ec219b25c6f5ab3093fe1f99295f5c25c67ae29999fac9fbc4981f7798d13e4c8919ed377b4f8cc70533aeafbe4d8cebdb64a6f5ed306b1be59f309b723c7e86ccf6670acc647fef89d1fe2e9829fe5513637cb961a6f5d84d8cc74f99297f7f24467bec33e37ac81a33f9732b31d60f5d665c0f554e8cfa7d65c6f5c81cb389eb21f87e9c0f3f12637dcce773ff3e64a6fda24662acdf2c33f5c385c4988fae99a99e6f3253fd7dcc4cfabc67c6f9fbddc4f1b8d5c49c5f07cca48f2233d5ebd789d13e3d33e5c3e3c438df4366daef607d90ffd80933d95b3531d65fe41fde53fdf4c24cfeba488cfebac78cf7eb8ca5f8777da45af95d874f62232d7d7ecb58d116fe6d92fce4c392d8df73bfdfa0179b5bdf5f999dfdfbe9659b24ebb30cfffeae19ff5bf5f253e9be3c2ff88f5bfacfff7bbd7c439aafcf53bf4f927f8f5e3a5ff8d08facf0efab975f94ee6fa617e9e3bf197cbaf219f845f6822f504e49d624fbf0770f9f413cbf07dcfd7be945beca21cc2e8bbfbfc4190a90e84dbe83642845067fcfe0f72efc0d7f7f8e5264bf4ff7bf432ff2438e607643f87d14f403520da3f50409c77292f481d2043d4de50c3e73b980cf6f93e6b7f9cb274932ea2c7de313a40affd683ce2802efcb03d9807f0fe551d4175bdbdf432f36ceb809928459b7643d774c93040df837ccfe18f471224f81e7f1dc70ddd9df2aef9fc38ccea375f561e61730e3537929dbb223afe4b5bc91b7f24edecb07f9289fe48e2cc0df77655196e05c0fd795ff56f5585356e41e48f22eabb206337d125208a184164658e1848f3f4e64a22b9ec58be889be1888573184f3fbe2edf748f24dbd7c9507963962005e7c2a3be25d7c889118c3ac27622a66f13313f3f4338b7f9b8a85f81475b12f0ee09a06e811ac9074fc17f2cd37f402771787f0398aa3510f0211f5538065899638967371224ec599381717e232ce977fe65ffccc48aab6e880feaec4b5b881b8d682fbdd42ec0b710ea283b8039f7a11f7bf4f2f61adc48338148fe249eca024a20071e943d6c5aecc445194445954c49ea8c6d9d7e867bb1474544925224fc5a5524a2ba32c4487961cc218dde04b2089564e0ae57fb75e409aa3b5bfd7e54c65aaab9ed58bea911c7348f13f926429699487fe166d0ee4e9ab81aca9578871a18e08511e32ad7afdbdfe023a39128fc947c0b260b4991aaa37f5ae3e602e643769763ffaa9a9911aab316967a2849ac6ab176aa6e6f25e2dd4276455f6c3a89bdfa617f888a7156fdf039d9caabada5707aa11f401b33bfc961cdbf50392a9a3e8416dd504976cc9431a6b4415d0b7fad6efe517b06196a4228d3a9617ea449daa33f6105ee72f3c7e8bd5255b6459c6f18c20cdb9ba5097aa0dd16518a5197cb7b6fe95fc12eea23a70a75390e44a5dc759a3656d7ac8dabae723025895402d828dc978f53cdd01a29bba51b7ea4e9c80df0c5547dd7f773fe197f23edec9c90e8cf54092a007e09c36e558e5bca4a81d91bb4b2e5eab6bf5a89ec4098c19b2f06fd44bcc2741d3af6a07745250bb90c36769e4394557b295a483f56cc25a3c52c5156b3b5ad32746b6b62aa9b2aa88a6da83990f39764216107f492f219f58885d755505ebba4549481379ed0449466a94b3969aaa41426a5015d3d6722915c8244967580b2cad15ff9269a195d6909171455fb1e383bcf617e2184c3af41823e9200a5f8175b1ddacc4d99c3666aa06eb7aad8d2a69ab9df6cae84c9ce9ae7ed62fba273e753fce3dac478aceec3f89667aa05f55172a1c157bd56cbd075df79d6fe9a50e6b3194333d147df4f8b4f6ab3129caa1df6045dff5871ee9b13855433d91977aaa6750a514a16eeee8b95ee84f5dd7fb2aacff5c1f048dae79533c22a67a5f37f461acd7b8db0e1dddaaff9a5fd18b3e82cad1e9a66e69c331388ca98ff5314a02c39ca03ef4a93ed3e7f25a5fe84bdd56afbaa3afa07e0e1dda30f436109b7afa5adfe85bd0d71dd4cd13bae3a1becfc993ec0eeef7a01fa1df39802eee284af3f6e7f512f3fcae7e526f7a07f2492eea0449482bd15f7541ef6a587b5dd26518bd0f56f10abde532f65420a2875ec7ca39e4f65d5dd17bba8ad936f9df3c79e11c343c0f5f8980685395fb4642bd16baba8b554996d27ca71e0b158b1146c551291ae5638fd1411263c29b4dd0bf64c619cf9f28d120d672d441635d07d977df64a66b9e85d4a7e68563628a8af334cea5e9c9a2e9c77e741ffa524dcf0e362274d2cbd6984d674eccc0bcaa1baad357ed1aa372cd0ccd9b7937d27cc4f347a08fd7e8ade1f349b55c9020f4f7f52819fedb35633331538535432dea472439a2e7989999eb1bb300495cec36bef07ed2cb7a061a456f1fc851b00add319fea05c75a6644350923059d6869ea665f0d61ddf4fa0830ba0049cecd01c4a297a89b217cead193c3eed3c034cca139324d90661e7d66b58288ab655ae6d89c98d3b8b7335a9beb9abf6cab0c8224d24305f10a9d56d99cad44afbc8d55953673736e2e20420ce28e44b200bad739e4ee61a850cd259c53326dd33157e65aee77c6e606fed6d353736bee82376e54a87144736f1ecca3793223b303d2f0bd711771238ead5706618fcb14409ab15ca8d06955a325d7383b2e7b0fb36b8a7aa8afa3f52cf591d78d0f3e07b368c9862999b2a9983d53958fb20d3ed08a957dcfd42c9c24a662bda241595eac025f7432b3da3ca527216ad52356fc85d7318b11746076c2bfe602badfbd5c7732a35a3066006bac15af605dbdb4b3e43762ff4836ad83bfef5b6f33282cc35e405bd76d177ac913f9218ee0d8b17db62fb617f3ec7ce36726f66c5f37419ab790ff7f9cf7579efcbc2c6b1ea9f4d00e82563083249f8fbeaa07f6d5063fa9a34ec0227927365f0936e504d65fab967db3ef20097af6c47ed89179b463b8e60ceaac133bd1cf54e96d5474aa66a7fa36d6ce5fc6dcad7a09bbd723ace8ec4cbc1b13b5928b2e98a7e1fe733bb40baa3c9b20c9727f381f3143adbb2f1ab66b3fa11b9ec5baad2866b66ef7e5a3012b168f706dcbcee4139c314dd22459601d67f6c036e4ae1d83e5c71af1a77a415df4a99783fece94ec6188fe4aae54918771ad6eec916dda568c10063d9c76c357f402b150804e8e412797c152ed891aeb7b7b0abf3fd8337b0e7e13560fc6b317f6529d6fca12adbb6ddbaa2e0fa2e56ff8ca6adecf591977a50b5515afb6b31a8be1ce500d87f865af2c547caa63af638fd18c957997eaa5204185570774f7686f42bd122bfc5aca4cc1d23e21ff4f411ab88772f6d6de25cdacf98c9dda7bfbc0318ce6fc459d9cf4f24c9edc87aaee498ca3b7e76b25fc3dd3e710f39d7d5cd129e7e4a67d8a3da897daee802405d0c9b23f59763f907d4dd39445113aef3d39b2bbb628b29429f39a99da9239d29d98633e6316ce49b5518f25bdc099a1d7167a2264bcf37a8f18aaaf775bd665a854461b9deba7dcb31559c648a0a776cf56453bd607e3a8e119f56447248fb73527a1ce827be8997ad2ef10cba6ab5a897691690ff5984935459cefd2dab6eae505a409b3534ec0ff261485b953c1fabc0d55fd05e40bb7a5836dda8a53e03f1045ec8e29839fb4979d16d58ed31413a11e76da1995c5d5bc7010e6a1f25b93258e3971ce79d44b7ebe5fea251cdd072b0bbf6bd9866c3015b9ec45bd13c47b97e94bd987ea71a317b74f602d61df7f2186f2da7563753d075f5fdae734ed0c8618d270cfee057c2acc2ee8f10dbaa46d7a9942a7d98c16f6ba5abd6cd74bd45ac848512fb223f46a551c650977357aacdba1265ea9eae913a3f3c2945ccff5a1875caf46a916a6ffd6f48bbd7503c89a10e2a0233e74af6eb85e8b63e4746ff20abc9ff4f2751ccbe945cbf768eb1a3cdf6cd10b8cefdedd871b85f5016f5ccf27a12a817ce27a3674c369565403e5577ae6c6b60a9e7fa367f248843127f248d59526bd242f7531c3aa992a401f936dcffd5bf512faeb71dc3dba16766d7da22cfacd4da1fbed847802ebd45feb149eb1eeb26741129724c97526344b377673bba7aae229d61a3eee896ae8e63ed02ed7bc74a6cedd02f4d7ff15bdc06702bf37dc676ef7886489b3a84287aba0fb3550e9f537ee7a2cdba6ec62ffebbe7a7611bb1e57b77b6e5f2e3ad841dbd873f64dd71d844a67d961927542cd241f5d23ea258bcfaa37f24b3e1e44ddf4e31a0d25642ee1d7a20956626d77282f21c7076b0a9dd679ac7a9a98e3650da2f03b542bbc33b6b28b1963d934d4beeec83583cfc51d09b005e8d446b1b73995f710f9e6a92a4ff2ab075334271dec8b1a5bfb7dce2be10929ff6e63647ed8224b8c3cca40ae864e4d1cc10c2ced2d4ec2933ebb702d558a73e16a3abf7309ff75c7605d27eed416cda3fc7467e2c99dcb5e671c2bd451b05077015139e96ff903de751ce25d9ceb321b6cd14bec404dccd5226a11d68776c356ed1cb29bcec05ba16a24ff188a96bb8cfb353518ade0c61b5d483e438da2c7b55d47d5dd558c83c3a89396bb8e2b786aca24cb9a66c0bf6ee465077db9b12ac9ba5e3afca420e4fd50c13c80bf6cca328791cec44dd8b98e4f15c20e5cd8356a08d097bb8dcff9a6319f6cf689288d8c36f66e8a4ec803e85ff640bfb7411a59177721f76f970556f6ccdd454f487af9228e717d8bef4e04bd3c8acf6db2884bdd954518b912eaadd8b7b7a0126d41147e47afa5fda1d5d8b57e97852ab97bc8613b311f85679561450edd835e241b5d91450fa08745bda89fe47dae8f636f09721fab37d1dd1285665aea677925ebc1d3837540cfdeb03ee49350ad802423ac56482b4bfb5ae61aaccadaee5dbd99767ce28abb4d100974d33d6ade6b5eb16dd5b36f7a92e297dd8c631b7a1944ab59c89979774fc97bf3f174a65f6407ce3b87f37a30931ef4395db74355fdeaeef26a9798626ca87c812e5d5dde41175602cf1f63bd20af5c21566ce92ade8777bbaea84ba1aafc693dc67a091d95866e745f165c69b3670dcfe3744fcfc1b29a60eb03f84066043f699324f9a7315b3aded86d534484dfa76aeecaae22ee6825952ae89dd8c7aecb02b539ac6e03abfd7549b6eb05351dbdabe3f6623551c3e88335547cb698995bd38f7b5f43e9edcc54a29f8c20dee66c9c6d4cdfc72a2edfbbac3c15b0fbaeea6aa16704dd54dc420f569eb6d5e833b5532f2122f5b73f1b5bf6fb6bfe12f69e16e6d10b5bc7fe85f6c379077be2951e520fd9f3da0499675845c7a75db9a7caf139f15c4d5662da32e3046b9a78037d4bd86759e8a9739429b91295b42a0b6f654797bf7a3f23d7eff3bb7736bea1133e2d3df3e12d96f48c27d90e8cafebde9b93b017d9199b2b9f450b1b91acd176925f40668cfbdcf927ae2bb124f4ca4a7baf86beab4efc33dbc25296b07b0133393325ffb2566dade9656d1fb0179fdc3c879a55bc8a7ab2dd3407df83d9ee6b27c26e75d8a9bb763d5d0f7b2c94558e04e90263afeffb7eec91974fbe562263d8c7d07dbbef07ba029f41ea90973616e2441dc63ba6fa8fbb932df518f52bfc4e64173ea3f8eed1ae7fc52758f93944add7fcd0bf992cbcb3a25e65db9efbf7f80c6f4afb4fbc635ff51f90a63b7e1464ddb62bc19d26dc71ec271043aa395f5b6a6eeaa7fa461ee0f317894f811b1b7ae1ba46939cc1f333f0e80af488333fc35d87646782f3839ffb85ab057f81cf89f57664f7e3f3e55ccf085547dd7fca2b1372fc3b65c06d99333c399afbbadf8f7ba46bcf4542e473637fa0aa6a87f6c72cd5645feb252fa7f50d9066ae0aa213c6413b4b193d44b589ae9a67d0e100baa8b97a358fd0471ec5d5a728aa1edcdc1f422dfce98f9c70f72eee906d4a132279ec27f21968a5da07ad34e5937f817ee93af9f78ff4b2fa0d8f816f419df4e68fc13a2e97b2505c1ea960c16df0c60b7f0255e5507ef853f3688eeca7aa91a5c5fe84f2f4441ef8337feeea1bef94b19d85e7d087394d25ad45afabba777fe12f61d55e531cd35fea65bda3e258716cf68337827f525c8e16413bcaeac64c74781beb11ce2fcbba9e82dfb4e33e8ad72faea9aa6185a06f34a177741508569ddc1ecca6ad6db7c199fad05083c70c9edf495c798bfe1bcf2b9d1dfaabf8cc62ccb280fdd6b8da35bb76cf5fcb29549967204d789652f6374efb1be8a81a3182f4a03f19ca3da8509e65d1dffabb65ef8c716fed675d6fe04bfe1eeabf0654b0bcc31b9e7de67717c5b79e5736c48d38f3e0d390edc629e2d7685739c4b3b65e989a3c14bbb6225a32f38ffec9efb817e8db67e17dd758b3ed40a51376dd4bbee077ed67ccc03f7af36fe931a1fadbf7455f8aabe157f726beacc7b6eba5ef5fc4a9adc69e37d71de6f3b62ffb8a7d8eb9067a4cb5234b2a3317f14969d8cd0d95fc082ad0b0fb07fd89ab897753075f9b6eece86d9728ec8b85bdea8a6fc4be6ae549a2dc782ef643695afad2f64567a573a708434f4a1756d817bf07f56e0b7b91f8ce7e1f3cf523bc45077fdb0bd2844a14ee77208bfad6ee876c14debcf8521f44beea6b662027be01d1a8b5fa7ce717f562ecb5ee64d24e537fb4d657847a0b6257077a9a27c8661771a4213d451ac57797f7d471ece54d7cba2174d97433e1c76e4cd17dcb4f7a87e93253100b75f0f6d0c7e623d3d7fdcb171febcecc93acf9cf4ca7bdfab567bd94b99dfdcc8cbc87918fa3870ec471d451333d01b771dfed5566ae91d9cc653eb7fe1bda09d26459d6cd9ee56588be71f6cf7f4d2f901b5eed43f692f5e2db30b3dcec97fe3bc3aca2ceb3be6dc827e8d44ee3be8e8e6fbbfbd87f8618b480fea4a2a7ea241bf871f6fad5de59eebf97d910fcab6b245cefd3fb305bde8afb8ebf1827df44217bcbdeb30fd5cbf51ff99197d1742aac6965237fa8caaa9e8d4d37eeef1ce999dd9145b90b75b0d79fd9440fe21b8ee97d870d3f59eaa7a6ebd95476409a502d0db90a5eb7b46fbda7d4c86661df18d65365737a3711ab197ea724ef4721864af5a0ceb5c916fac35af52c1fecad7cf0b3ec5369d30229daa95b1be764f92a8e417da17b595d0d202e0eada69d3eb76e69df8a63a7f139cba7eceba76c3f3b88d174bed607af7757f107ec6e212e55037e1ea0ea6c474de4e7fdf57bccf99f50274c40370d730e83e2b317b7f27eecb7f30be8a38cef1c6533dd544fee1d3b8cd8b7e76bf3f53e6bbd4a648faee5de65dcf0f6adb55a78fbaaef0aea323bcc7f5fe64fe417971de11b54e649b775336bbaae2ec4fbbfa537ae56c75ee5d1dabcb7493c4bd26cd14c7ce607155ed6029f79cb3f1df9b538d61943a775a1afc27396204d36cb8eb313fd4acfae67dbfa44f4a77c4e5dd3d9d7d5cb177f0f5152d5b2d3ec2cb7bfffebf945c427792e4400e343c6124dad552b3bd7a7c1fe7ff2063f74fe4ad07ba23f96221ecdb22fa2344802f1fe026261fcde13c7b15fd54b76299a5063857cdeb28faa93b521e335fc71d6d1b5edbdd54f567ad5fb79a76916734997be75b2228798805e32af6401e217e6978db7bbbea9978de791615dcc497665caa6677e56ed6e4ab02e4b0dbff7e3ab99ca9eb361fecddfa8591973b08aefc4f6d3f761be7eafef8755cc8624cf59fc269b18aa2cbbd63be6debce0b86bbebba5da598be4945ff5be16bea6274e841a3af437d095a2340b9064a62ea00e3f0e6fc56f9bd35fd04b2b3ec7d250ef9eb80788d2e5ec26bb855850e55d0b7c37561dbac9fadbbab83f1bdf9be5ef2655d587bff7453d34e169af335d57d4bdf856c1143d3e7c5bc1efe9a6b8c3f769d757f957fc6555228c06f1fb7a879087f78d5415f3a886d99dbb151da87c57bb926d5181f759a6c2f9a6fd84eef7ca97e0be93f0dc00d47e9dd5a334d3f84461600fedb36e423416a2f5a339fe99eff1c98fb8af99c5ef4c424d200ae13d7f7f96dddbb7ecc1ddda52faeedb7aef98befba6aeb3c7ec29db914f597877b601fd4de8b4420f0f55a4866a32dbcd8a4127fa33f849d8390f3a094fbabe9ad79ffa7e2546c556fc06ee0222f64e789e0cf9e718f453771fe64887ff1f1be1dec0cecff5403d38e854d403fcd673bbfadd4ebdb5c7ee43dfa8aa7f014bd5a1830b9d16bd0d94c17d8b90e34b20ef45dcab9cc7151cc64eee2fe5fdf58f3e8aefc9eaf8ae18589b39353b56430fd9cfcafe482e40aa86f3ba29afd4895bc847538499df883353f487e00b15f9a486e6d09ce832be1b0033edc6e7d6adf8e4b5670a32ecba1ffa6e7666fa71d7b5b7be927f3a8e6d5a59d86f1ec4ef7c0be9512f61dfca14c2ef3402f43c60e327ae614eec425f66157da9a7e6c4edfb177aaf9c67844f4bfab1cb0adf210fb5f030ec208699cb56fc17bfb91ddeb37dde8c487f5e2f5f44ebe5dff0ed9bf4b6f5ca2ae0dbd7dbeeb5f1d6e1963dbbade3ff257ff99124e1f3999326bd53b41ed9b7db3c4a45fb912b7ffff9ff37c65fd1cb9699e1373b56759151e7d4d8f21e3ebf8f897b90b97d6deab4446e8f5be77788b77dbe9ff77fa097f5bfaf5811fcdee03e70db0af01ee44a5d419d16e9e3f7e9656baf909fd5da9a7d65459b7f4709f58facef9bb6f14dbd7cd5f9e4efb4f27ce07b92e864795bf4b5a2a31f48f4cb71ec2b0fff91f5fd60c42dc7577b91706e2577feb671d37d7d23dbfbad7ad98c43ab5efae56cf2e7af44f5dc3d7fb00a704eb60795cf9fa8937f76deeffa7c77bcdf93f7ff9e9f7ff7ff2fdcffcdcfff577af9dffff31fff075dc58bf2</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/kvtmlwriter.cpp b/kwordquiz/src/kvtmlwriter.cpp index 94dce65f..787cabab 100644 --- a/kwordquiz/src/kvtmlwriter.cpp +++ b/kwordquiz/src/kvtmlwriter.cpp @@ -81,9 +81,9 @@ KVTMLWriter::~KVTMLWriter() TQString KVTMLWriter::escape( const TQString & s) { TQString result = s; - result.tqreplace(TQChar('&'), "&"); //must be done first - result.tqreplace(TQChar('<'), "<"); - result.tqreplace(TQChar('>'), ">"); + result.replace(TQChar('&'), "&"); //must be done first + result.replace(TQChar('<'), "<"); + result.replace(TQChar('>'), ">"); return result; } diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index 3c3ae5eb..9dde6a0c 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -299,12 +299,12 @@ void KWordQuizApp::initActions() charMapper->setMapping(specialChar9, 9); actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actiontqStatusText(const TQString &)), this, TQT_SLOT(slotqStatusMsg(const TQString &))); + connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusMsg(const TQString &))); connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), this, TQT_SLOT(slotActionHighlighted(KAction *, bool))); updateSpecialCharIcons(); if (!initialGeometrySet()) - resize( TQSize(650, 500).expandedTo(tqminimumSizeHint())); + resize( TQSize(650, 500).expandedTo(minimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); @@ -340,7 +340,7 @@ void KWordQuizApp::initView() void KWordQuizApp::openURL(const KURL& url) { if(!url.isEmpty()) { - if (m_dirWatch->tqcontains(url.path())) + if (m_dirWatch->contains(url.path())) { KMainWindow* w; if(memberList) @@ -377,7 +377,7 @@ void KWordQuizApp::openURL(const KURL& url) void KWordQuizApp::openDocumentFile(const KURL& url) { - slotqStatusMsg(i18n("Opening file...")); + slotStatusMsg(i18n("Opening file...")); if (!url.isEmpty()) { doc->openDocument( url); m_dirWatch->addFile(url.path()); @@ -385,7 +385,7 @@ void KWordQuizApp::openDocumentFile(const KURL& url) fileOpenRecent->addURL( url ); updateMode(Prefs::mode()); } - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } @@ -460,7 +460,7 @@ bool KWordQuizApp::queryClose() { bool f = doc->saveModified(); if (f) - if (m_dirWatch->tqcontains(doc->URL().path())) + if (m_dirWatch->contains(doc->URL().path())) m_dirWatch->removeFile(doc->URL().path()); return f; } @@ -477,7 +477,7 @@ bool KWordQuizApp::queryExit() void KWordQuizApp::slotFileNew() { - slotqStatusMsg(i18n("Opening a new document window...")); + slotStatusMsg(i18n("Opening a new document window...")); if (doc->URL().fileName() == i18n("Untitled") && m_editView->gridIsEmpty()){ // neither saved nor has content, as good as new } @@ -486,12 +486,12 @@ void KWordQuizApp::slotFileNew() KWordQuizApp *new_window= new KWordQuizApp(); new_window->show(); } - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotFileOpen() { - slotqStatusMsg(i18n("Opening file...")); + slotStatusMsg(i18n("Opening file...")); TQCheckBox * cb = new TQCheckBox(i18n("&Join selected files into one list"), 0, 0); cb -> setChecked(false); @@ -540,20 +540,20 @@ void KWordQuizApp::slotFileOpen() delete (fd); //deletes cb also - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotFileOpenRecent(const KURL& url) { - slotqStatusMsg(i18n("Opening file...")); + slotStatusMsg(i18n("Opening file...")); fileOpenRecent->setCurrentItem(-1); openURL(url); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotFileSave() { - slotqStatusMsg(i18n("Saving file...")); + slotStatusMsg(i18n("Saving file...")); if (doc->URL().fileName() == i18n("Untitled") ) { slotFileSaveAs(); @@ -562,7 +562,7 @@ void KWordQuizApp::slotFileSave() { doc->saveDocument(doc->URL()); } - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotFileGHNS() @@ -574,9 +574,9 @@ void KWordQuizApp::slotFileGHNS() void KWordQuizApp::slotFileSaveAs() { - slotqStatusMsg(i18n("Saving file with a new filename...")); + slotStatusMsg(i18n("Saving file with a new filename...")); saveAsFileName(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } bool KWordQuizApp::saveAsFileName( ) @@ -595,7 +595,7 @@ bool KWordQuizApp::saveAsFileName( ) if(!url.isEmpty()){ //@todo check that a valid extension was really given - if (!url.fileName().tqcontains('.')) + if (!url.fileName().contains('.')) { if (fd->currentFilter() == "*.wql") url = KURL(url.path() + ".wql"); @@ -616,7 +616,7 @@ bool KWordQuizApp::saveAsFileName( ) } else { - if (m_dirWatch ->tqcontains(doc->URL().path())) + if (m_dirWatch ->contains(doc->URL().path())) m_dirWatch ->removeFile(doc->URL().path()); doc->saveDocument(url); m_dirWatch->addFile(url.path()); @@ -632,7 +632,7 @@ bool KWordQuizApp::saveAsFileName( ) void KWordQuizApp::slotFileClose() { - slotqStatusMsg(i18n("Closing file...")); + slotStatusMsg(i18n("Closing file...")); if (memberList->count() > 1) close(); @@ -654,12 +654,12 @@ void KWordQuizApp::slotFileClose() m_editView ->setFocus(); } - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotFilePrint() { - slotqStatusMsg(i18n("Printing...")); + slotStatusMsg(i18n("Printing...")); WQPrintDialogPage * p = new WQPrintDialogPage(this); KPrinter printer; printer.addDialogPage(p); @@ -669,12 +669,12 @@ void KWordQuizApp::slotFilePrint() m_editView->print(&printer); } - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotFileQuit() { - slotqStatusMsg(i18n("Exiting...")); + slotStatusMsg(i18n("Exiting...")); saveOptions(); // close the first window, the list makes the next one the first again. // This ensures that queryClose() is called on each window to ask for closing @@ -699,77 +699,77 @@ void KWordQuizApp::slotUndoChange( const TQString & text, bool enabled ) void KWordQuizApp::slotEditUndo() { - slotqStatusMsg(i18n("Undoing previous command...")); + slotStatusMsg(i18n("Undoing previous command...")); m_editView->doEditUndo(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotEditCut() { - slotqStatusMsg(i18n("Cutting selection...")); + slotStatusMsg(i18n("Cutting selection...")); m_editView->doEditCut(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotEditCopy() { - slotqStatusMsg(i18n("Copying selection to clipboard...")); + slotStatusMsg(i18n("Copying selection to clipboard...")); m_editView->doEditCopy(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotEditPaste() { - slotqStatusMsg(i18n("Inserting clipboard contents...")); + slotStatusMsg(i18n("Inserting clipboard contents...")); m_editView->doEditPaste(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotEditClear() { - slotqStatusMsg(i18n("Clearing the selected cells...")); + slotStatusMsg(i18n("Clearing the selected cells...")); m_editView->doEditClear(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotEditInsert() { - slotqStatusMsg(i18n("Inserting rows...")); + slotStatusMsg(i18n("Inserting rows...")); m_editView->doEditInsert(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotEditDelete() { - slotqStatusMsg(i18n("Deleting selected rows...")); + slotStatusMsg(i18n("Deleting selected rows...")); m_editView->doEditDelete(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotEditMarkBlank() { - slotqStatusMsg(i18n("Marking selected text as a blank...")); + slotStatusMsg(i18n("Marking selected text as a blank...")); m_editView->doEditMarkBlank(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotEditUnmarkBlank() { - slotqStatusMsg(i18n("Removing blank markings...")); + slotStatusMsg(i18n("Removing blank markings...")); m_editView->doEditUnmarkBlank(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotEditFind() { - slotqStatusMsg(i18n("Searching for indicated text...")); + slotStatusMsg(i18n("Searching for indicated text...")); KMessageBox::sorry(0, i18n("Not implemented yet")); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotVocabLanguages() { - slotqStatusMsg(i18n("Setting the column titles of the vocabulary...")); + slotStatusMsg(i18n("Setting the column titles of the vocabulary...")); DlgLanguage* dlg; dlg = new DlgLanguage(this, "dlg_lang", true); dlg->setLanguage(1, m_editView -> horizontalHeader()->label(0)); @@ -781,12 +781,12 @@ void KWordQuizApp::slotVocabLanguages() m_editView -> horizontalHeader()->setLabel(1, dlg->Language(2)); updateMode(Prefs::mode()); } - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotVocabFont() { - slotqStatusMsg(i18n("Setting the font of the vocabulary...")); + slotStatusMsg(i18n("Setting the font of the vocabulary...")); KFontDialog* dlg; dlg = new KFontDialog(this, "dlg_font", false, true); dlg->setFont(m_editView -> font()); @@ -796,47 +796,47 @@ void KWordQuizApp::slotVocabFont() Prefs::setEditorFont(dlg->font()); doc->setModified(true); } - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotVocabKeyboard() { - slotqStatusMsg(i18n("Changing the keyboard tqlayout...")); + slotStatusMsg(i18n("Changing the keyboard layout...")); KMessageBox::sorry(0, i18n("Not implemented yet")); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotVocabChar() { - slotqStatusMsg(i18n("Inserting special character...")); + slotStatusMsg(i18n("Inserting special character...")); m_editView->doVocabSpecChar(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotVocabRC() { - slotqStatusMsg(i18n("Changing row and column properties...")); + slotStatusMsg(i18n("Changing row and column properties...")); m_editView->doVocabRC(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotVocabSort() { - slotqStatusMsg(i18n("Sorting the vocabulary...")); + slotStatusMsg(i18n("Sorting the vocabulary...")); m_editView->doVocabSort(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotVocabShuffle() { - slotqStatusMsg(i18n("Randomizing the vocabulary...")); + slotStatusMsg(i18n("Randomizing the vocabulary...")); m_editView->doVocabShuffle(); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotMode0() { - slotqStatusMsg(i18n("Updating mode...")); + slotStatusMsg(i18n("Updating mode...")); if (Prefs::mode() < 5) { updateMode(Prefs::mode() + 1); } @@ -844,70 +844,70 @@ void KWordQuizApp::slotMode0() { updateMode(1); } - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotMode1() { - slotqStatusMsg(i18n("Updating mode...")); + slotStatusMsg(i18n("Updating mode...")); updateMode(1); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotMode2() { - slotqStatusMsg(i18n("Updating mode...")); + slotStatusMsg(i18n("Updating mode...")); updateMode(2); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotMode3() { - slotqStatusMsg(i18n("Updating mode...")); + slotStatusMsg(i18n("Updating mode...")); updateMode(3); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotMode4() { - slotqStatusMsg(i18n("Updating mode...")); + slotStatusMsg(i18n("Updating mode...")); updateMode(4); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotMode5() { - slotqStatusMsg(i18n("Updating mode...")); + slotStatusMsg(i18n("Updating mode...")); updateMode(5); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizEditor() { - slotqStatusMsg(i18n("Starting editor session...")); + slotStatusMsg(i18n("Starting editor session...")); updateSession(WQQuiz::qtEditor); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizFlash() { - slotqStatusMsg(i18n("Starting flashcard session...")); + slotStatusMsg(i18n("Starting flashcard session...")); updateSession(WQQuiz::qtFlash); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizMultiple() { - slotqStatusMsg(i18n("Starting multiple choice session...")); + slotStatusMsg(i18n("Starting multiple choice session...")); updateSession(WQQuiz::qtMultiple); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotQuizQA() { - slotqStatusMsg(i18n("Starting question & answer session...")); + slotStatusMsg(i18n("Starting question & answer session...")); updateSession(WQQuiz::qtQA); - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::updateSession(WQQuiz::QuizType qt) @@ -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(); } @@ -1081,7 +1081,7 @@ void KWordQuizApp::updateSpecialCharIcons( ) 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)) @@ -1102,7 +1102,7 @@ TQString KWordQuizApp::charIcon(const TQChar & c) p.setPen(Qt::blue); p.drawText(r, Qt::AlignCenter, (TQString) c); - ///Create transparency tqmask + ///Create transparency mask TQBitmap bm(128, 128); bm.fill(Qt::color0); TQPainter b(&bm); @@ -1119,7 +1119,7 @@ TQString KWordQuizApp::charIcon(const TQChar & c) return s; } -void KWordQuizApp::slotqStatusMsg(const TQString &text) +void KWordQuizApp::slotStatusMsg(const TQString &text) { statusBar()->clear(); statusBar()->message(text); @@ -1207,7 +1207,7 @@ void KWordQuizApp::slotInsertChar( int i ) void KWordQuizApp::slotActionHighlighted( KAction * action, bool hl) { if (!hl) - slotqStatusMsg(i18n("Ready")); + slotStatusMsg(i18n("Ready")); } void KWordQuizApp::slotContextMenuRequested(int row, int col, const TQPoint & pos) diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index d0cfaaf2..66e7b440 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -78,7 +78,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(); @@ -165,14 +165,14 @@ class KWordQuizApp : public KMainWindow void slotEditMarkBlank(); /** unmark word as blank */ void slotEditUnmarkBlank(); - /** find and tqreplace text */ + /** find and replace text */ void slotEditFind(); /** define vocabulary languages */ void slotVocabLanguages(); /** define vocabulary fonts */ void slotVocabFont(); - /** define keyboard tqlayouts */ + /** define keyboard layouts */ void slotVocabKeyboard(); /** define special characters */ void slotVocabChar(); @@ -212,7 +212,7 @@ class KWordQuizApp : public KMainWindow /** changes the statusbar contents for the standard label permanently, used to indicate current actions. * @param text the text that is displayed in the statusbar */ - void slotqStatusMsg(const TQString &text); + void slotStatusMsg(const TQString &text); /** applies changes from the preferences dialog */ void slotApplyPreferences(); diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp index b8e3a230..f5309636 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(); } }*/ @@ -317,7 +317,7 @@ bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index) } g->setUpdatesEnabled(true); - g->tqrepaintContents(); + g->repaintContents(); } modified=false; if (append) diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h index 80b5e4f4..b79879fc 100644 --- a/kwordquiz/src/kwordquizdoc.h +++ b/kwordquiz/src/kwordquizdoc.h @@ -34,8 +34,8 @@ class KWordQuizView; * * The KWordQuizDoc class provides a document object that can be used in conjunction with the classes KWordQuizApp and KWordQuizView * to create a document-view model for standard KDE applications based on KApplication and KMainWindow. Thereby, the document object - * is created by the KWordQuizApp instance and tqcontains the document structure with the according methods for manipulation of the document - * data by KWordQuizView objects. Also, KWordQuizDoc tqcontains the methods for serialization of the document data from and to files. + * is created by the KWordQuizApp instance and contains the document structure with the according methods for manipulation of the document + * data by KWordQuizView objects. Also, KWordQuizDoc contains the methods for serialization of the document data from and to files. * * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. * @version KDevelop version 1.2 code generation @@ -75,8 +75,8 @@ class KWordQuizDoc : public QObject 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. - * As this view normally tqrepaints itself, it is excluded from the paintEvent. + /** 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); void slotModifiedOnDisk(const TQString &); diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index 67c64d34..0096f591 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -42,7 +42,7 @@ TQValueList<WQUndo> *KWordQuizView::m_undoList = 0L; KWQTableItem::KWQTableItem(TQTable* table, EditType et, const TQString & text) : TQTableItem(table, et, text) {} -int KWQTableItem::tqalignment() const +int KWQTableItem::alignment() const { bool num; bool ok1 = false; @@ -77,7 +77,7 @@ KWordQuizView::~KWordQuizView() KWordQuizDoc *KWordQuizView::getDocument() const { - KWordQuizApp *theApp=(KWordQuizApp *) tqparentWidget(); + KWordQuizApp *theApp=(KWordQuizApp *) parentWidget(); return theApp->getDocument(); } @@ -284,16 +284,16 @@ bool KWordQuizView::gridIsEmpty() return true; } -TQWidget * KWordQuizView::beginEdit( int row, int col, bool tqreplace ) +TQWidget * KWordQuizView::beginEdit( int row, int col, bool replace ) { m_currentText = text(row, col); - cellEditor = TQTable::beginEdit(row, col, tqreplace); + cellEditor = TQTable::beginEdit(row, col, replace); if (cellEditor) cellEditor->installEventFilter(this); return cellEditor; } -void KWordQuizView::endEdit( int row, int col, bool accept, bool tqreplace ) +void KWordQuizView::endEdit( int row, int col, bool accept, bool replace ) { // this code gets called after enter and arrow keys, now we // only process if editing really has been done @@ -302,7 +302,7 @@ void KWordQuizView::endEdit( int row, int col, bool accept, bool tqreplace ) { if (((TQLineEdit *) cellWidget(row, col))->text() != m_currentText) addUndo(i18n("&Undo Entry")); - TQTable::endEdit(row, col, accept, tqreplace); //this will destroy the cellWidget + TQTable::endEdit(row, col, accept, replace); //this will destroy the cellWidget if (!text(row, col).isEmpty()) { TQTableItem* itm; @@ -555,7 +555,7 @@ void KWordQuizView::doEditInsert( ) addSelection(TQTableSelection(m_currentSel.topRow(), m_currentSel.leftCol(), m_currentSel.bottomRow(), m_currentSel.rightCol())); setCurrentCell(m_currentRow, m_currentCol); setUpdatesEnabled(true); - tqrepaintContents(); + repaintContents(); getDocument()->setModified(true); } @@ -666,7 +666,7 @@ void KWordQuizView::doEditMarkBlank( ) st = st.prepend(delim_start); st = st.append(delim_end); int ss = l->selectionStart(); - s = s.tqreplace(ss, len, st); + s = s.replace(ss, len, st); l->setText(s); l->setSelection(ss, st.length()); } @@ -691,7 +691,7 @@ void KWordQuizView::doEditUnmarkBlank( ) s.remove(delim_start); s.remove(delim_end); int ss = l->selectionStart(); - ls = ls.tqreplace(ss, len, s); + ls = ls.replace(ss, len, s); l->setText(ls); l->setSelection(ss, s.length()); } @@ -705,12 +705,12 @@ void KWordQuizView::doEditUnmarkBlank( ) int fr = s.findRev(delim_start, cs); if (fr > 0) { - s = s.tqreplace(fr, 1, ""); + s = s.replace(fr, 1, ""); cs--; } int ff = s.find(delim_end, cs); if (ff > 0) - s = s.tqreplace(ff, 1, ""); + s = s.replace(ff, 1, ""); l->setText(s); l->setCursorPosition(cs); @@ -805,7 +805,7 @@ void KWordQuizView::doVocabShuffle( ) addSelection(TQTableSelection(m_currentSel.topRow(), m_currentSel.leftCol(), m_currentSel.bottomRow(), m_currentSel.rightCol())); setCurrentCell(m_currentRow, m_currentCol); setUpdatesEnabled(true); - tqrepaintContents(); + repaintContents(); getDocument()->setModified(true); } @@ -870,7 +870,7 @@ void KWordQuizView::slotSpecChar(const TQChar & c) TQString s = l->selectedText(); int len = s.length(); int ss = l->selectionStart(); - ls = ls.tqreplace(ss, len, c); + ls = ls.replace(ss, len, c); l->setText(ls); l->setSelection(ss, 1); } diff --git a/kwordquiz/src/kwordquizview.h b/kwordquiz/src/kwordquizview.h index f045e841..00289925 100644 --- a/kwordquiz/src/kwordquizview.h +++ b/kwordquiz/src/kwordquizview.h @@ -45,7 +45,7 @@ class KWQTableItem :public QTableItem { public: KWQTableItem( TQTable* table, EditType et, const TQString & text ); - virtual int tqalignment() const; + virtual int alignment() const; }; class KWordQuizView : public QTable @@ -69,7 +69,7 @@ class KWordQuizView : public QTable void setFont( const TQFont &); void setText( int row, int col, const TQString &text ); - /** tqcontains the implementation for printing functionality */ + /** contains the implementation for printing functionality */ void print(KPrinter *pPrinter); bool gridIsEmpty(); void addUndo(const TQString & caption); @@ -89,8 +89,8 @@ class KWordQuizView : public QTable bool checkSyntax(bool all, bool blanks); void saveCurrentSelection(bool clear); protected: - TQWidget * beginEdit(int row, int col, bool tqreplace); - void endEdit ( int row, int col, bool accept, bool tqreplace ); + TQWidget * beginEdit(int row, int col, bool replace); + void endEdit ( int row, int col, bool accept, bool replace ); void activateNextCell(); void keyPressEvent( TQKeyEvent* ); bool eventFilter( TQObject*, TQEvent* ); diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp index 77debfe2..05da32af 100644 --- a/kwordquiz/src/kwqnewstuff.cpp +++ b/kwordquiz/src/kwqnewstuff.cpp @@ -77,7 +77,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry) if (KStandardDirs::exists(file)) { - int result = KMessageBox::questionYesNo(tqparentWidget(), + int result = KMessageBox::questionYesNo(parentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") .arg(file), TQString::null, @@ -85,7 +85,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry) if (result == KMessageBox::No) return TQString::null; } - KMessageBox::information(tqparentWidget(), + KMessageBox::information(parentWidget(), i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>") .arg(file), TQString::null, diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui index 8a4cea5c..5d85e7af 100644 --- a/kwordquiz/src/multipleviewbase.ui +++ b/kwordquiz/src/multipleviewbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MultipleViewBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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> @@ -972,5 +972,5 @@ <slot>slotOpt2Clicked()</slot> <slot>slotOpt3Clicked()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui index 5b688c72..46762ed3 100644 --- a/kwordquiz/src/prefcardappearancebase.ui +++ b/kwordquiz/src/prefcardappearancebase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PrefCardAppearanceBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -66,7 +66,7 @@ <property name="name"> <cstring>textLabel</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>11</x> <y>42</y> @@ -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"> @@ -112,7 +112,7 @@ <property name="name"> <cstring>line</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>11</x> <y>33</y> @@ -159,7 +159,7 @@ <property name="name"> <cstring>titleLabel</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>11</x> <y>11</y> @@ -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> @@ -542,7 +542,7 @@ <slot>slotFrameColorChanged(const QColor &)</slot> <slot>slotCardColorChanged(const QColor &)</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kfontrequester.h</includehint> diff --git a/kwordquiz/src/prefcharacterbase.ui b/kwordquiz/src/prefcharacterbase.ui index 4e198b7d..7202c6d9 100644 --- a/kwordquiz/src/prefcharacterbase.ui +++ b/kwordquiz/src/prefcharacterbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PrefCharacterBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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="QLayoutWidget" 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"> @@ -402,7 +402,7 @@ <tabstop>lstCharacters</tabstop> <tabstop>btnCharacter</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kwordquiz/src/prefeditorbase.ui b/kwordquiz/src/prefeditorbase.ui index 7dc824a6..71ef99ed 100644 --- a/kwordquiz/src/prefeditorbase.ui +++ b/kwordquiz/src/prefeditorbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PrefEditorBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -122,5 +122,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/prefquizbase.ui b/kwordquiz/src/prefquizbase.ui index 69edfb52..82cdf626 100644 --- a/kwordquiz/src/prefquizbase.ui +++ b/kwordquiz/src/prefquizbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PrefQuizBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -287,7 +287,7 @@ <slots> <slot>slotAutoFlipClicked()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kwordquiz/src/qaview.cpp b/kwordquiz/src/qaview.cpp index 50bd740d..4660df9f 100644 --- a/kwordquiz/src/qaview.cpp +++ b/kwordquiz/src/qaview.cpp @@ -292,7 +292,7 @@ void QAView::showQuestion(int i) picAnswer->setPixmap(KGlobal::iconLoader()->loadIcon(m_quiz->quizIcon(i, WQQuiz::qiRightCol), KIcon::Panel)); - //@todo handle keyboard tqlayouts + //@todo handle keyboard layouts } void QAView::slotApplySettings( ) @@ -311,7 +311,7 @@ void QAView::slotSpecChar( const TQChar & c) TQString s = txtAnswer->selectedText(); int len = s.length(); int ss = txtAnswer->selectionStart(); - ls = ls.tqreplace(ss, len, c); + ls = ls.replace(ss, len, c); txtAnswer->setText(ls); txtAnswer->setSelection(ss, 1); } diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui index 43b1e89a..96baa0cc 100644 --- a/kwordquiz/src/qaviewbase.ui +++ b/kwordquiz/src/qaviewbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>QAViewBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ </widget> <widget class="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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="QLayoutWidget" 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"> @@ -865,5 +865,5 @@ <slots> <slot access="private">slotCheck()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp index d73e5086..e9baebcc 100644 --- a/kwordquiz/src/wqprintdialogpage.cpp +++ b/kwordquiz/src/wqprintdialogpage.cpp @@ -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( Qt::AlignTop ); + g->layout()->setSpacing( 6 ); + g->layout()->setMargin( 11 ); + TQGridLayout * v = new TQGridLayout( g->layout() ); + v->setAlignment( Qt::AlignTop ); rb0 = new TQRadioButton(i18n("Vocabulary &list"), g ); v->addWidget( rb0, 0, 0 ); diff --git a/kwordquiz/src/wqquiz.cpp b/kwordquiz/src/wqquiz.cpp index f6ac2f1e..23600567 100644 --- a/kwordquiz/src/wqquiz.cpp +++ b/kwordquiz/src/wqquiz.cpp @@ -382,7 +382,7 @@ TQString WQQuiz::yourAnswer(int i, const TQString & s) else ls.append(s); - result = m_answerBlank.tqreplace("..........", "<u></u>"); + result = m_answerBlank.replace("..........", "<u></u>"); int offset = 0, counter = 0; while (offset >= 0) @@ -474,7 +474,7 @@ TQString WQQuiz::blankAnswer(int i) rx.setMinimal(true); rx.setPattern("\\[.*\\]"); - r.tqreplace(rx, ".........."); + r.replace(rx, ".........."); if (r != tTemp) { @@ -517,8 +517,8 @@ TQString WQQuiz::answer(int i) s = m_table->text(li.oneOp(), j); if (Prefs::enableBlanks()) { - s.tqreplace("[", "<u>"); - s.tqreplace("]", "</u>"); + s.replace("[", "<u>"); + s.replace("]", "</u>"); s.prepend("<qt>"); s.append("</qt>"); } @@ -564,11 +564,11 @@ int WQQuiz::kbAnswer(int i) /* WQListItem *li = m_list->at(i); if (li->question() == 0) { - //@todo return m_table ->tqlayoutLeft(); + //@todo return m_table ->layoutLeft(); } else { - //@todo return m_table -> tqlayoutRight(); + //@todo return m_table -> layoutRight(); }*/ return 0; } diff --git a/libkdeedu/extdate/extcalendarsystem.cpp b/libkdeedu/extdate/extcalendarsystem.cpp index 976301a8..f453bb6f 100644 --- a/libkdeedu/extdate/extcalendarsystem.cpp +++ b/libkdeedu/extdate/extcalendarsystem.cpp @@ -4,7 +4,7 @@ Copyright (c) 2004 Jason Harris <jharris@30doradus.org> This class has been derived from ExtCalendarSystem; - the changesd made just tqreplace TQDate objects with ExtDate objects. + the changesd made just replace TQDate objects with ExtDate objects. These changes by Jason Harris <jharris@30doradus.org> This library is free software; you can redistribute it and/or diff --git a/libkdeedu/extdate/extcalendarsystem.h b/libkdeedu/extdate/extcalendarsystem.h index 1ec6cb94..be7ba336 100644 --- a/libkdeedu/extdate/extcalendarsystem.h +++ b/libkdeedu/extdate/extcalendarsystem.h @@ -4,7 +4,7 @@ Copyright (c) 2004 Jason Harris <jharris@30doradus.org> This class has been derived from KCalendarSystem; - the changesd made just tqreplace TQDate objects with ExtDate objects. + the changesd made just replace TQDate objects with ExtDate objects. These changes by Jason Harris <jharris@30doradus.org> This library is free software; you can redistribute it and/or diff --git a/libkdeedu/extdate/extcalendarsystemgregorian.cpp b/libkdeedu/extdate/extcalendarsystemgregorian.cpp index d19c86de..47338f4b 100644 --- a/libkdeedu/extdate/extcalendarsystemgregorian.cpp +++ b/libkdeedu/extdate/extcalendarsystemgregorian.cpp @@ -4,7 +4,7 @@ Copyright (c) 2004 Jason Harris <jharris@30doradus.org> This class has been derived from KCalendarSystemGregorian; - the changesd made just tqreplace TQDate objects with ExtDate objects. + the changesd made just replace TQDate objects with ExtDate objects. These changes by Jason Harris <jharris@30doradus.org> This library is free software; you can redistribute it and/or @@ -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/libkdeedu/extdate/extcalendarsystemgregorian.h b/libkdeedu/extdate/extcalendarsystemgregorian.h index fd13e04b..6d1035c9 100644 --- a/libkdeedu/extdate/extcalendarsystemgregorian.h +++ b/libkdeedu/extdate/extcalendarsystemgregorian.h @@ -4,7 +4,7 @@ Copyright (c) 2004 Jason Harris <jharris@30doradus.org> This class has been derived from KCalendarSystemGregorian; - the changesd made just tqreplace TQDate objects with ExtDate objects. + the changesd made just replace TQDate objects with ExtDate objects. These changes by Jason Harris <jharris@30doradus.org> This library is free software; you can redistribute it and/or diff --git a/libkdeedu/extdate/extdatepicker.cpp b/libkdeedu/extdate/extdatepicker.cpp index 87e56881..ad524863 100644 --- a/libkdeedu/extdate/extdatepicker.cpp +++ b/libkdeedu/extdate/extdatepicker.cpp @@ -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()); } QSize -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/libkdeedu/extdate/extdatepicker.h b/libkdeedu/extdate/extdatepicker.h index 216df369..8c745b52 100644 --- a/libkdeedu/extdate/extdatepicker.h +++ b/libkdeedu/extdate/extdatepicker.h @@ -61,7 +61,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 @@ -91,7 +91,7 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * Sets the date. @@ -137,7 +137,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/libkdeedu/extdate/extdatetbl.cpp b/libkdeedu/extdate/extdatetbl.cpp index 213ee277..ca403a68 100644 --- a/libkdeedu/extdate/extdatetbl.cpp +++ b/libkdeedu/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( TQWidget::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=tqcolorGroup().highlightedText(); + painter->setPen(colorGroup().highlight()); + painter->setBrush(colorGroup().highlight()); + pen=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(QMAX(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(QMAX(maxCell.width()+2, rect.width())); maxCell.setHeight(QMAX(maxCell.height()+4, rect.height())); } @@ -494,7 +494,7 @@ ExtDateTable::setDate(const ExtDate& date_) numDaysPrevMonth=d->calendar->daysInMonth(temp); if(changed) { - tqrepaintContents(false); + repaintContents(false); } return true; } @@ -505,28 +505,28 @@ ExtDateTable::getDate() const return date; } -// what are those tqrepaintContents() good for? (pfeiffer) +// what are those repaintContents() good for? (pfeiffer) void ExtDateTable::focusInEvent( TQFocusEvent *e ) { -// tqrepaintContents(false); +// repaintContents(false); TQGridView::focusInEvent( e ); } void ExtDateTable::focusOutEvent( TQFocusEvent *e ) { -// tqrepaintContents(false); +// repaintContents(false); TQGridView::focusOutEvent( e ); } QSize -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); } } @@ -554,7 +554,7 @@ void ExtDateTable::setCustomDatePainting(const ExtDate &date, const TQColor &fgC mode->fgColor=fgColor; mode->bgColor=bgColor; - d->customPaintingModes.tqreplace( date.toString(), mode ); + d->customPaintingModes.replace( date.toString(), mode ); d->useCustomColors=true; update(); } @@ -617,7 +617,7 @@ ExtDateInternalWeekSelector::setMaxWeek(int max) } // ### CFM To avoid binary incompatibility. -// In future releases, remove this and tqreplace by a ExtDate +// In future releases, remove this and replace by a ExtDate // private member, needed in ExtDateInternalMonthPicker::paintCell class ExtDateInternalMonthPicker::ExtDateInternalMonthPrivate { public: @@ -677,7 +677,7 @@ ExtDateInternalMonthPicker::ExtDateInternalMonthPicker } QSize -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 */ ); } } @@ -888,7 +888,7 @@ KPopupFrame::keyPressEvent(TQKeyEvent* e) if(e->key()==Key_Escape) { result=0; // rejected - tqApp->exit_loop(); + qApp->exit_loop(); } } @@ -896,7 +896,7 @@ void KPopupFrame::close(int r) { result=r; - tqApp->exit_loop(); + qApp->exit_loop(); } void @@ -947,8 +947,8 @@ int KPopupFrame::exec(TQPoint pos) { popup(pos); - tqrepaint(); - tqApp->enter_loop(); + repaint(); + qApp->enter_loop(); hide(); return result; } diff --git a/libkdeedu/extdate/extdatetbl.h b/libkdeedu/extdate/extdatetbl.h index cf768e37..8aa3281a 100644 --- a/libkdeedu/extdate/extdatetbl.h +++ b/libkdeedu/extdate/extdatetbl.h @@ -99,7 +99,7 @@ public: /** * The size hint. */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * Return the result. 0 means no selection (reject()), 1..12 are the * months. @@ -273,7 +273,7 @@ public: * The constructor. */ ExtDateTable(TQWidget *parent=0, - ExtDate date=ExtDate::tqcurrentDate(), + ExtDate date=ExtDate::currentDate(), const char* name=0, WFlags f=0); /** @@ -286,9 +286,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/libkdeedu/extdate/extdatetime.cpp b/libkdeedu/extdate/extdatetime.cpp index 97d8a4bd..fe32cf91 100644 --- a/libkdeedu/extdate/extdatetime.cpp +++ b/libkdeedu/extdate/extdatetime.cpp @@ -212,7 +212,7 @@ int ExtDate::weekNumber( int *yearNum ) const if ( day1.daysTo( *this ) < 0 ) { if ( yearNum ) *yearNum = year() - 1; - //The last week of the year always tqcontains Dec 28th (ISO 8601) + //The last week of the year always contains Dec 28th (ISO 8601) ExtDate lastDec28( year()-1, 12, 28 ); return lastDec28.weekNumber(); } @@ -293,16 +293,16 @@ TQString ExtDate::toString( const TQString& format ) const TQString result( format ); - result.tqreplace( "%Y", TQString().sprintf( "%d", year() ) ); - result.tqreplace( "%y", TQString().sprintf( "%02d", (year() % 100) ) ); - result.tqreplace( "%n", TQString().sprintf( "%d", month() ) ); - result.tqreplace( "%m", TQString().sprintf( "%02d", month() ) ); - result.tqreplace( "%e", TQString().sprintf( "%d", day() ) ); - result.tqreplace( "%d", TQString().sprintf( "%02d", day() ) ); - result.tqreplace( "%b", shortMonthName( month() ) ); - result.tqreplace( "%B", longMonthName( month() ) ); - result.tqreplace( "%a", shortDayName( dayOfWeek() ) ); - result.tqreplace( "%A", longDayName( dayOfWeek() ) ); + result.replace( "%Y", TQString().sprintf( "%d", year() ) ); + result.replace( "%y", TQString().sprintf( "%02d", (year() % 100) ) ); + result.replace( "%n", TQString().sprintf( "%d", month() ) ); + result.replace( "%m", TQString().sprintf( "%02d", month() ) ); + result.replace( "%e", TQString().sprintf( "%d", day() ) ); + result.replace( "%d", TQString().sprintf( "%02d", day() ) ); + result.replace( "%b", shortMonthName( month() ) ); + result.replace( "%B", longMonthName( month() ) ); + result.replace( "%a", shortDayName( dayOfWeek() ) ); + result.replace( "%A", longDayName( dayOfWeek() ) ); return result; } @@ -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; @@ -551,7 +551,7 @@ int ExtDate::dayOfYear(int y, int m, int d) \ingroup time - A ExtDateTime object tqcontains a calendar date and a clock time (a + A ExtDateTime object contains a calendar date and a clock time (a "datetime"). It is a combination of the ExtDate and TQTime classes. It can read the current datetime from the system clock. It provides functions for comparing datetimes and for manipulating a @@ -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 @@ -833,13 +833,13 @@ TQString ExtDateTime::toString( const TQString& format ) const int h = time().hour(); - result.tqreplace( "%H", TQString().sprintf( "%02d", h ) ); - result.tqreplace( "%k", TQString().sprintf( "%d", h ) ); - result.tqreplace( "%I", TQString().sprintf( "%02d", ( h > 12 ) ? h-12 : h ) ); - result.tqreplace( "%l", TQString().sprintf( "%d", ( h > 12 ) ? h-12 : h ) ); - result.tqreplace( "%M", TQString().sprintf( "%02d", time().minute() ) ); - result.tqreplace( "%S", TQString().sprintf( "%02d", time().second() ) ); - result.tqreplace( "%p", TQString().sprintf( "%s", ( h > 12 ) ? "pm" : "am" ) ); + result.replace( "%H", TQString().sprintf( "%02d", h ) ); + result.replace( "%k", TQString().sprintf( "%d", h ) ); + result.replace( "%I", TQString().sprintf( "%02d", ( h > 12 ) ? h-12 : h ) ); + result.replace( "%l", TQString().sprintf( "%d", ( h > 12 ) ? h-12 : h ) ); + result.replace( "%M", TQString().sprintf( "%02d", time().minute() ) ); + result.replace( "%S", TQString().sprintf( "%02d", time().second() ) ); + result.replace( "%p", TQString().sprintf( "%s", ( h > 12 ) ? "pm" : "am" ) ); return result; } @@ -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; } @@ -1084,7 +1084,7 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) } if ( f == Qt::ISODate ) { - if ( s.length() <= 10 || ! s.tqcontains( ':' ) ) { //no time specified + if ( s.length() <= 10 || ! s.contains( ':' ) ) { //no time specified TQTime t = TQTime(0,0,0); return ExtDateTime( ExtDate::fromString( s.mid(0,10), Qt::ISODate ) ); } else { @@ -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(); @@ -1123,12 +1123,12 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) #ifndef QT_NO_DATASTREAM KDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDate & date) { - return ostream << (TQ_UINT32)(date.jd()); + return ostream << (Q_UINT32)(date.jd()); } KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDate & date) { - TQ_UINT32 julday; + Q_UINT32 julday; ostream >> julday; date.setJD( julday ); return ostream; diff --git a/libkdeedu/extdate/extdatetime.h b/libkdeedu/extdate/extdatetime.h index c398b7c5..0830af83 100644 --- a/libkdeedu/extdate/extdatetime.h +++ b/libkdeedu/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 QT_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 QT_NO_DATESTRING static ExtDateTime fromString( const TQString &s ); static ExtDateTime fromString( const TQString &s, Qt::DateFormat f ); diff --git a/libkdeedu/extdate/extdatetimeedit.cpp b/libkdeedu/extdate/extdatetimeedit.cpp index f2db94fb..203f1dbb 100644 --- a/libkdeedu/extdate/extdatetimeedit.cpp +++ b/libkdeedu/extdate/extdatetimeedit.cpp @@ -135,7 +135,7 @@ static void readLocaleSettings() #ifndef Q_WS_WIN TQString sep = d.mid( QMIN( dpos, mpos ) + 2, QABS( dpos - mpos ) - 2 ); - if ( d.tqcontains( sep ) == 2 ) { + if ( d.contains( sep ) == 2 ) { *lDateSep = sep; } #endif @@ -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; @@ -411,7 +411,7 @@ bool ExtDateTimeEditor::event( TQEvent *e ) { if ( e->type() == TQEvent::FocusIn || e->type() == TQEvent::FocusOut ) { if ( e->type() == TQEvent::FocusOut ) - tqApp->sendEvent( cw, e ); + qApp->sendEvent( cw, e ); update( rect() ); } else if ( e->type() == TQEvent::AccelOverride ) { TQKeyEvent* ke = (TQKeyEvent*) e; @@ -460,9 +460,9 @@ void ExtDateTimeEditor::paintEvent( TQPaintEvent * ) QSharedDoubleBuffer 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(), style() ); buffer.end(); } @@ -492,7 +492,7 @@ void ExtDateTimeEditor::mousePressEvent( TQMouseEvent *e ) int sec = sectionAt( p ); if ( sec != -1 ) { cw->setFocusSection( sec ); - tqrepaint( rect(), FALSE ); + repaint( rect(), FALSE ); } } @@ -508,13 +508,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: @@ -544,12 +544,12 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) ::qt_cast<ExtDateTimeEdit*>(w) ) break; hadDateEdit = hadDateEdit || ::qt_cast<ExtDateEdit*>(w); - w = w->tqparentWidget(); + w = w->parentWidget(); } if ( w ) { if ( !::qt_cast<ExtDateTimeEdit*>(w) ) { - w = w->tqparentWidget(); + w = w->parentWidget(); } else { ExtDateTimeEdit *ed = (ExtDateTimeEdit*)w; if ( hadDateEdit && ke->key() == Key_Tab ) { @@ -560,11 +560,11 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) return TRUE; } else { while ( w && !::qt_cast<ExtDateTimeEdit*>(w) ) - w = w->tqparentWidget(); + w = w->parentWidget(); } } - tqApp->sendEvent( w, e ); + qApp->sendEvent( w, e ); return TRUE; } } break; @@ -574,7 +574,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() && ::qt_cast<QTimeEdit*>(cw) && focusSection() == (int) d->sectionCount()-1 ) { @@ -767,9 +767,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 @@ -883,7 +883,7 @@ void ExtDateEdit::init() d->max = ExtDate( 50000, 12, 31 ); d->changed = FALSE; - tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); + setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); refcount++; } @@ -997,11 +997,11 @@ void ExtDateEdit::resizeEvent( TQResizeEvent * ) /*! \reimp */ -TQSize ExtDateEdit::tqsizeHint() const +TQSize ExtDateEdit::sizeHint() const { constPolish(); TQFontMetrics fm( font() ); - int fw = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ); + int fw = style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ); int h = QMAX( fm.lineSpacing(), 14 ) + 2; int w = 2 + fm.width( '9' ) * 8 + fm.width( d->ed->separator() ) * 2 + d->controls->upRect().width() + fw * 4; @@ -1012,9 +1012,9 @@ TQSize ExtDateEdit::tqsizeHint() const /*! \reimp */ -TQSize ExtDateEdit::tqminimumSizeHint() const +TQSize ExtDateEdit::minimumSizeHint() const { - return tqsizeHint(); + return sizeHint(); } @@ -1160,7 +1160,7 @@ void ExtDateEdit::setOrder( ExtDateEdit::Order order ) } if ( isVisible() ) - d->ed->tqrepaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), FALSE ); } @@ -1198,7 +1198,7 @@ void ExtDateEdit::stepUp() emit valueChanged( date() ); } - d->ed->tqrepaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), FALSE ); } @@ -1232,7 +1232,7 @@ void ExtDateEdit::stepDown() emit valueChanged( date() ); } - d->ed->tqrepaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), FALSE ); } /*! @@ -1295,7 +1295,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 @@ -1319,7 +1319,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 @@ -1341,8 +1341,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; } @@ -1454,8 +1454,8 @@ void ExtDateEdit::addNumber( int sec, int num ) emit valueChanged( date() ); } d->overwrite = overwrite; - d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); - d->ed->tqrepaint( d->ed->rect(), FALSE ); + d->timerId = startTimer( qApp->doubleClickInterval()*4 ); + d->ed->repaint( d->ed->rect(), FALSE ); } @@ -1502,7 +1502,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 ) { @@ -1608,7 +1608,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 @@ -1634,7 +1634,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 ); } /*! @@ -1791,7 +1791,7 @@ public: // d->max = TQTime( 23, 59, 59 ); // d->changed = FALSE; // -// tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); +// setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); // // refcount++; // } @@ -1909,7 +1909,7 @@ public: // emit valueChanged( time ); // } // d->changed = FALSE; -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // TQTime QTimeEdit::time() const @@ -2039,7 +2039,7 @@ public: // d->changed = TRUE; // emit valueChanged( time() ); // } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // @@ -2088,7 +2088,7 @@ public: // d->changed = TRUE; // emit valueChanged( time() ); // } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // @@ -2214,12 +2214,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: @@ -2369,8 +2369,8 @@ public: // if ( accepted ) // emit valueChanged( time() ); // d->overwrite = overwrite; -// d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->timerId = startTimer( qApp->doubleClickInterval()*4 ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // @@ -2410,7 +2410,7 @@ public: // d->s = txt.toInt(); // break; // } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // /*! \reimp @@ -2445,7 +2445,7 @@ public: // d->s = txt.toInt(); // break; // } -// d->ed->tqrepaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), FALSE ); // } // // /*! \reimp @@ -2457,11 +2457,11 @@ public: // // /*! \reimp // */ -// TQSize QTimeEdit::tqsizeHint() const +// TQSize QTimeEdit::sizeHint() const // { // constPolish(); // TQFontMetrics fm( font() ); -// int fw = style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ); +// int fw = style().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; @@ -2469,7 +2469,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, QMAX(h + fw * 2,20) ).expandedTo( TQApplication::globalStrut() ); @@ -2477,9 +2477,9 @@ public: // // /*! \reimp // */ -// TQSize QTimeEdit::tqminimumSizeHint() const +// TQSize QTimeEdit::minimumSizeHint() const // { -// return tqsizeHint(); +// return sizeHint(); // } // // /*! @@ -2534,9 +2534,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 @@ -2600,8 +2600,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 ); @@ -2620,10 +2620,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(), QMAX( dsh.height(), tsh.height() ) ); } @@ -2642,17 +2642,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(), QMAX( dsh.height(), tsh.height() ) ); } diff --git a/libkdeedu/extdate/extdatetimeedit.h b/libkdeedu/extdate/extdatetimeedit.h index d0998362..4bcf78c8 100644 --- a/libkdeedu/extdate/extdatetimeedit.h +++ b/libkdeedu/extdate/extdatetimeedit.h @@ -81,8 +81,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 ); @@ -167,8 +167,8 @@ private: // QTimeEdit( const TQTime& time, TQWidget* parent=0, const char* name=0 ); // ~QTimeEdit(); // -// TQSize tqsizeHint() const; -// TQSize tqminimumSizeHint() const; +// TQSize sizeHint() const; +// TQSize minimumSizeHint() const; // // public slots: // virtual void setTime( const TQTime& time ); @@ -239,8 +239,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/libkdeedu/extdate/extdatewidget.cpp b/libkdeedu/extdate/extdatewidget.cpp index 93947dbc..5f5d19d6 100644 --- a/libkdeedu/extdate/extdatewidget.cpp +++ b/libkdeedu/extdate/extdatewidget.cpp @@ -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/libkdeedu/extdate/test_extdate.cc b/libkdeedu/extdate/test_extdate.cc index 0cb212d9..d63d1558 100644 --- a/libkdeedu/extdate/test_extdate.cc +++ b/libkdeedu/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(Qt::LocalTime); - ExtDate e = ExtDate::tqcurrentDate(Qt::TimeSpec(Qt::LocalTime)); + TQDate q = TQDate::currentDate(Qt::LocalTime); + ExtDate e = ExtDate::currentDate(Qt::TimeSpec(Qt::LocalTime)); std::cout << "Qt::LocalTime :: ExtDate : " << e.toString().local8Bit() << " TQDate : " << q.toString().local8Bit() << std::endl; - q = TQDate::tqcurrentDate(Qt::UTC); - e = ExtDate::tqcurrentDate(Qt::UTC); + q = TQDate::currentDate(Qt::UTC); + e = ExtDate::currentDate(Qt::UTC); std::cout << "Qt::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/libkdeedu/extdate/testwidget.cpp b/libkdeedu/extdate/testwidget.cpp index a6489cce..0267ddeb 100644 --- a/libkdeedu/extdate/testwidget.cpp +++ b/libkdeedu/extdate/testwidget.cpp @@ -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/libkdeedu/kdeeduplot/kplotwidget.cpp b/libkdeedu/kdeeduplot/kplotwidget.cpp index 321dd444..99e9b321 100644 --- a/libkdeedu/kdeeduplot/kplotwidget.cpp +++ b/libkdeedu/kdeeduplot/kplotwidget.cpp @@ -223,7 +223,7 @@ void KPlotWidget::drawObjects( TQPainter *p ) { double KPlotWidget::dmod( double a, double b ) { return ( b * ( ( a / b ) - int( a / b ) ) ); } void KPlotWidget::drawBox( TQPainter *p ) { - //First, fill in padding region with bgColor() to tqmask out-of-bounds plot data + //First, fill in padding region with bgColor() to mask out-of-bounds plot data p->setPen( bgColor() ); p->setBrush( bgColor() ); diff --git a/libkdeedu/kdeeduplot/kplotwidget.h b/libkdeedu/kdeeduplot/kplotwidget.h index 212c5234..5ed550ec 100644 --- a/libkdeedu/kdeeduplot/kplotwidget.h +++ b/libkdeedu/kdeeduplot/kplotwidget.h @@ -95,11 +95,11 @@ public: */ virtual void clearObjectList() { ObjectList.clear(); update(); } - /**@short tqreplace an item in the KPlotObject list. - *@param i the index of th item to be tqreplaced - *@param o pointer to the tqreplacement KPlotObject + /**@short replace an item in the KPlotObject list. + *@param i the index of th item to be replaced + *@param o pointer to the replacement KPlotObject */ - virtual void tqreplaceObject( int i, KPlotObject *o ) { ObjectList.tqreplace( i, o ); } + virtual void replaceObject( int i, KPlotObject *o ) { ObjectList.replace( i, o ); } /**@return the number of KPlotObjects in the list */ @@ -212,7 +212,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/libkdeedu/kdeeduui/kdeeduglossary.cpp b/libkdeedu/kdeeduui/kdeeduglossary.cpp index 2b6dab8f..1b0902b1 100644 --- a/libkdeedu/kdeeduui/kdeeduglossary.cpp +++ b/libkdeedu/kdeeduui/kdeeduglossary.cpp @@ -41,25 +41,25 @@ Glossary::~Glossary() bool Glossary::loadLayout( TQDomDocument &Document, const KURL& url ) { - TQFile tqlayoutFile( url.path() ); + TQFile layoutFile( url.path() ); - if (!tqlayoutFile.exists()) + if (!layoutFile.exists()) { - kdDebug() << "no such file: " << tqlayoutFile.name() << endl; + kdDebug() << "no such file: " << layoutFile.name() << endl; return false; } - if (!tqlayoutFile.open(IO_ReadOnly)) + if (!layoutFile.open(IO_ReadOnly)) return false; ///Check if document is well-formed - if (!Document.setContent(&tqlayoutFile)) + if (!Document.setContent(&layoutFile)) { kdDebug() << "wrong xml" << endl; - tqlayoutFile.close(); + layoutFile.close(); return false; } - tqlayoutFile.close(); + layoutFile.close(); return true; } @@ -100,8 +100,8 @@ void Glossary::fixImagePath() for ( ; it != itEnd ; ++it ) { - ( *it )->setDesc( ( *it )->desc().tqreplace("[img]", firstpart ) ); - ( *it )->setDesc( ( *it )->desc().tqreplace("[/img]", "\" />" ) ); + ( *it )->setDesc( ( *it )->desc().replace("[img]", firstpart ) ); + ( *it )->setDesc( ( *it )->desc().replace("[/img]", "\" />" ) ); } } @@ -136,15 +136,15 @@ TQValueList<GlossaryItem*> Glossary::readItems( TQDomDocument &itemDocument ) item->setName( i18n( nameNode.toElement( ).text().utf8() ) ); - item->setDesc( desc.tqreplace("[b]", "<b>" ) ); - item->setDesc( item->desc().tqreplace("[/b]", "</b>" ) ); - item->setDesc( item->desc().tqreplace("[i]", "<i>" ) ); - item->setDesc( item->desc().tqreplace("[/i]", "</i>" ) ); - item->setDesc( item->desc().tqreplace("[sub]", "<sub>" ) ); - item->setDesc( item->desc().tqreplace("[/sub]", "</sub>" ) ); - item->setDesc( item->desc().tqreplace("[sup]", "<sup>" ) ); - item->setDesc( item->desc().tqreplace("[/sup]", "</sup>" ) ); - item->setDesc( item->desc().tqreplace("[br]", "<br />" ) ); + item->setDesc( desc.replace("[b]", "<b>" ) ); + item->setDesc( item->desc().replace("[/b]", "</b>" ) ); + item->setDesc( item->desc().replace("[i]", "<i>" ) ); + item->setDesc( item->desc().replace("[/i]", "</i>" ) ); + item->setDesc( item->desc().replace("[sub]", "<sub>" ) ); + item->setDesc( item->desc().replace("[/sub]", "</sub>" ) ); + item->setDesc( item->desc().replace("[sup]", "<sup>" ) ); + item->setDesc( item->desc().replace("[/sup]", "</sup>" ) ); + item->setDesc( item->desc().replace("[br]", "<br />" ) ); refNodeList = refNode.elementsByTagName( "refitem" ); for ( uint it = 0; it < refNodeList.count(); it++ ) diff --git a/libkdeedu/kdeeduui/kdeeduglossary.h b/libkdeedu/kdeeduui/kdeeduglossary.h index bc9113cc..44b0cf85 100644 --- a/libkdeedu/kdeeduui/kdeeduglossary.h +++ b/libkdeedu/kdeeduui/kdeeduglossary.h @@ -137,7 +137,7 @@ class Glossary TQString m_backgroundpicture; /** - * tqreplaces the [img]-pseudocode with valid html. The path where + * replaces the [img]-pseudocode with valid html. The path where * the pictures are stored will be used for pictures */ void fixImagePath(); @@ -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. diff --git a/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui b/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui index da44ab8c..32fa6b68 100644 --- a/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui +++ b/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Simple_entry_dialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>e_original</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>40</x> <y>80</y> @@ -32,7 +32,7 @@ <property name="name"> <cstring>e_translation</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>40</x> <y>180</y> @@ -45,7 +45,7 @@ <property name="name"> <cstring>PushButton1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>50</x> <y>360</y> @@ -61,7 +61,7 @@ <property name="name"> <cstring>PushButton1_2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>460</x> <y>360</y> @@ -77,7 +77,7 @@ <property name="name"> <cstring>TextLabel1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>40</x> <y>50</y> @@ -93,7 +93,7 @@ <property name="name"> <cstring>TextLabel1_2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>40</x> <y>150</y> @@ -106,5 +106,5 @@ </property> </widget> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> |