diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:55:10 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:55:10 -0600 |
commit | 746abe84406ed1ec1a8dc68f29ce0ab8322ccc80 (patch) | |
tree | 34a73ef7b8771de54099eeffb941117e49a8865e /ktouch | |
parent | 999f961ff5278b84c8ffd8a91addb9343e589cf0 (diff) | |
download | tdeedu-746abe84406ed1ec1a8dc68f29ce0ab8322ccc80.tar.gz tdeedu-746abe84406ed1ec1a8dc68f29ce0ab8322ccc80.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'ktouch')
-rw-r--r-- | ktouch/src/ktouch.cpp | 6 | ||||
-rw-r--r-- | ktouch/src/ktouchcolorscheme.cpp | 4 | ||||
-rw-r--r-- | ktouch/src/ktouchkeyboard.cpp | 8 | ||||
-rw-r--r-- | ktouch/src/ktouchkeyboardeditor.cpp | 4 | ||||
-rw-r--r-- | ktouch/src/ktouchkeyboardwidget.cpp | 8 | ||||
-rw-r--r-- | ktouch/src/ktouchkeys.h | 4 | ||||
-rw-r--r-- | ktouch/src/ktouchlectureeditor.cpp | 2 | ||||
-rw-r--r-- | ktouch/src/ktouchslideline.cpp | 10 | ||||
-rw-r--r-- | ktouch/src/ktouchslideline.h | 2 | ||||
-rw-r--r-- | ktouch/src/ktouchstatistics.cpp | 4 | ||||
-rw-r--r-- | ktouch/src/ktouchstatisticsdata.cpp | 10 | ||||
-rw-r--r-- | ktouch/src/ktouchstatuslayout.ui | 2 | ||||
-rw-r--r-- | ktouch/src/ktouchutils.cpp | 2 |
13 files changed, 33 insertions, 33 deletions
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index 432fa386..85900c15 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -459,9 +459,9 @@ void KTouch::changeStatusbarStats(unsigned int level_correct, unsigned int level unsigned int session_correct, unsigned int session_total, unsigned int session_words) { statusBar()->changeItem(i18n( "Level: Correct/Total chars: %1/%2 Words: %3") - .tqarg(level_correct).tqarg(level_total).tqarg(level_words), 1); + .arg(level_correct).arg(level_total).arg(level_words), 1); statusBar()->changeItem(i18n( "Session: Correct/Total chars: %1/%2 Words: %3") - .tqarg(session_correct).tqarg(session_total).tqarg(session_words), 2); + .arg(session_correct).arg(session_total).arg(session_words), 2); } // ---------------------------------------------------------------------------- @@ -489,7 +489,7 @@ void KTouch::changeLecture(int num) { KTouchLecture l; TQString fileName = m_lectureFiles[num]; if (!l.loadXML(this, KURL::fromPathOrURL(fileName))) { - KMessageBox::sorry(0, i18n("Could not find/open the lecture file '%1'.").tqarg(fileName) ); + KMessageBox::sorry(0, i18n("Could not find/open the lecture file '%1'.").arg(fileName) ); m_defaultLectureAction->setCurrentItem(-1); } else { diff --git a/ktouch/src/ktouchcolorscheme.cpp b/ktouch/src/ktouchcolorscheme.cpp index 3e36f458..4104fe14 100644 --- a/ktouch/src/ktouchcolorscheme.cpp +++ b/ktouch/src/ktouchcolorscheme.cpp @@ -81,7 +81,7 @@ bool KTouchColorScheme::read(const TQDomNode& node) { TQDomNode c; READ_COLOR("KeyFrame", m_frame); for (unsigned int i=0; i<8; ++i) { - READ_COLOR(TQString("KeyBack_%1").tqarg(i), m_background[i]); + READ_COLOR(TQString("KeyBack_%1").arg(i), m_background[i]); } READ_COLOR("KeyText", m_text); READ_COLOR("KeyBackHigh", m_backgroundH); @@ -125,7 +125,7 @@ void KTouchColorScheme::write(TQDomDocument& doc, TQDomElement& root) const { WRITE_COLOR(key_colors, "KeyFrame", m_frame); for (unsigned int i=0; i<8; ++i) { - WRITE_COLOR(key_colors, TQString("KeyBack_%1").tqarg(i), m_background[i]); + WRITE_COLOR(key_colors, TQString("KeyBack_%1").arg(i), m_background[i]); } WRITE_COLOR(key_colors, "KeyText", m_text); WRITE_COLOR(key_colors, "KeyBackHigh", m_backgroundH); diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp index f4ecf178..a8c6d83a 100644 --- a/ktouch/src/ktouchkeyboard.cpp +++ b/ktouch/src/ktouchkeyboard.cpp @@ -163,7 +163,7 @@ bool KTouchKeyboard::read(TQTextStream& in) { m_connectors.push_back(keycon); } else { - //errorMsg = i18n("Missing key type in line '%1'.").tqarg(line); + //errorMsg = i18n("Missing key type in line '%1'.").arg(line); return false; } // calculate the maximum extent of the keyboard on the fly... @@ -352,12 +352,12 @@ bool KTouchKeyboard::loadKeyboard(TQWidget * window, const KURL& url, TQString* bool result = readKeyboard(target, msg); KIO::NetAccess::removeTempFile(target); if (!result && errorMsg!=NULL) - *errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").tqarg(url.url()) + msg; + *errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").arg(url.url()) + msg; return result; } else { if (errorMsg!=NULL) - *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").tqarg(url.url()); + *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").arg(url.url()); return false; } } @@ -607,7 +607,7 @@ bool KTouchKeyboard::readKeyboard(const TQString& fileName, TQString& errorMsg) m_connectorList.append( KTouchKeyConnector(keyAscII, targetChar, fingerChar, controlChar) ); } else { - errorMsg = i18n("Missing key type in line '%1'.").tqarg(line); + errorMsg = i18n("Missing key type in line '%1'.").arg(line); return false; } // calculate the maximum extent of the keyboard on the fly... diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp index dd7b0a79..3e3abf62 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(); } } @@ -167,7 +167,7 @@ void KTouchKeyboardEditor::transfer_to_dialog() { min_y = std::min<unsigned int>(min_y, it->m_y); max_y = std::max<unsigned int>(max_y, it->m_y+it->m_h); } - dimensionsLabel->setText( i18n("Keyboard dimensions: %1 x %2").tqarg(max_x - min_x).tqarg(max_y - min_y) ); + dimensionsLabel->setText( i18n("Keyboard dimensions: %1 x %2").arg(max_x - min_x).arg(max_y - min_y) ); } // ----------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp index e5974acd..3e476f65 100644 --- a/ktouch/src/ktouchkeyboardwidget.cpp +++ b/ktouch/src/ktouchkeyboardwidget.cpp @@ -51,12 +51,12 @@ bool KTouchKeyboardWidget::loadKeyboard(TQWidget * window, const KURL& url, TQSt bool result = readKeyboard(target, msg); KIO::NetAccess::removeTempFile(target); if (!result && errorMsg!=NULL) - *errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").tqarg(url.url()) + msg; + *errorMsg = i18n("Could not read the keyboard tqlayout file '%1'. ").arg(url.url()) + msg; return result; } else { if (errorMsg!=NULL) - *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").tqarg(url.url()); + *errorMsg = i18n("Could not download/open keyboard tqlayout file from '%1'.").arg(url.url()); return false; } } @@ -309,7 +309,7 @@ void KTouchKeyboardWidget::createDefaultKeyboard() { updateColours(); m_currentLayout="number.keyboard"; - // create keyboard tqgeometry for new keyboard data + // create keyboard geometry for new keyboard data int sp = 10; int h = 50; @@ -421,7 +421,7 @@ bool KTouchKeyboardWidget::readKeyboard(const TQString& fileName, TQString& erro } else { - errorMsg = i18n("Missing key type in line '%1'.").tqarg(line); + errorMsg = i18n("Missing key type in line '%1'.").arg(line); return false; } if (keys.find(keyAscII)!=keys.end()) { diff --git a/ktouch/src/ktouchkeys.h b/ktouch/src/ktouchkeys.h index df19b56d..d0e97d60 100644 --- a/ktouch/src/ktouchkeys.h +++ b/ktouch/src/ktouchkeys.h @@ -39,7 +39,7 @@ class KTouchBaseKey { m_x(x), m_y(y), m_w(w), m_h(h), m_type(NORMAL_KEY) {} /// Destructor. virtual ~KTouchBaseKey() {} - /// Paints the basic key tqshape using the painter p. + /// Paints the basic key shape using the painter p. virtual void paint(TQPainter& p) const; /// Recalculates the scaled position and size properties of the key. void resize(double scale); @@ -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/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp index 2539a204..301b70b2 100644 --- a/ktouch/src/ktouchlectureeditor.cpp +++ b/ktouch/src/ktouchlectureeditor.cpp @@ -307,7 +307,7 @@ void KTouchLectureEditor::transfer_from_dialog() { void KTouchLectureEditor::showCurrentLevel() { if (m_level >= m_lecture.m_lectureData.size()) return; // should not happen, but why running a risk here... - levelLabel->setText(i18n("Data of Level %1").tqarg(m_level+1) ); + levelLabel->setText(i18n("Data of Level %1").arg(m_level+1) ); levelCommentEdit->setText(m_lecture.m_lectureData[m_level].m_comment); newCharsEdit->setText(m_lecture.m_lectureData[m_level].m_newChars); TQString text; diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp index 07078978..d7eff3fd 100644 --- a/ktouch/src/ktouchslideline.cpp +++ b/ktouch/src/ktouchslideline.cpp @@ -237,8 +237,8 @@ void KTouchSlideLine::resizeEvent ( TQResizeEvent * ) { KD_DEBUG( "[KTouchSlideLine::resizeEvent]" << endl ); // required input member variables: none - // when the widget is resized, the whole tqgeometry is invalidated, so we do: - // 1. recalculate and store the tqgeometry of the sliding lines + // when the widget is resized, the whole geometry is invalidated, so we do: + // 1. recalculate and store the geometry of the sliding lines // 2. resize the font // 3. recreate the sliding lines (this is done from the resizeFont() function @@ -411,7 +411,7 @@ void KTouchSlideLine::updateSlidingLines() { // draw the teacher pixmap text TQPainter painter; - painter.tqbegin (TQT_TQPAINTDEVICE(m_teacherPixmap), this); + painter.begin (TQT_TQPAINTDEVICE(m_teacherPixmap), this); painter.setFont( m_font ); TQColor col_tt = Prefs::commonTypingLineColors() ? @@ -443,7 +443,7 @@ void KTouchSlideLine::updateSlidingLines() { KD_DEBUG( " m_studentPixmap = " << w+100 << " x " << h << endl ); // update (draw) student line and calculate coordinates needed for sliding - tqrepaint(true); // trigger a paint event to erase the background + repaint(true); // trigger a paint event to erase the background updateStudentLine(); } // ---------------------------------------------------------------------------- @@ -532,7 +532,7 @@ void KTouchSlideLine::updateStudentLine() { // now let's draw the students pixmap TQPainter painter; - painter.tqbegin (TQT_TQPAINTDEVICE(m_studentPixmap), this); + painter.begin (TQT_TQPAINTDEVICE(m_studentPixmap), this); if (Prefs::colorOnError()) { // draw the student line depending on the colour settings if (error) { diff --git a/ktouch/src/ktouchslideline.h b/ktouch/src/ktouchslideline.h index 8afc7b54..5abc6c2a 100644 --- a/ktouch/src/ktouchslideline.h +++ b/ktouch/src/ktouchslideline.h @@ -83,7 +83,7 @@ class KTouchSlideLine : public TQWidget { /// @see slide() void paintEvent( TQPaintEvent * ); /// Will be called when the widget is resized. - /// This event will first recalculate the tqgeometry of the sliding lines. + /// This event will first recalculate the geometry of the sliding lines. /// Then the font size will be updated and through that, the sliding lines will be /// updated. void resizeEvent ( TQResizeEvent * ); diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp index 8ae335d0..563485c3 100644 --- a/ktouch/src/ktouchstatistics.cpp +++ b/ktouch/src/ktouchstatistics.cpp @@ -161,7 +161,7 @@ void KTouchStatistics::updateCurrentSessionTab() { else levelnums += ","; } levels_count = 0; - levelnums += TQString("%1").tqarg(*it+1); + levelnums += TQString("%1").arg(*it+1); } else { @@ -233,7 +233,7 @@ void KTouchStatistics::updateCurrentSessionTab() { void KTouchStatistics::updateCurrentLevelTab() { // level info - levelLabel2->setText( TQString("%1").tqarg(m_currLevelStats.m_levelNum+1) ); + levelLabel2->setText( TQString("%1").arg(m_currLevelStats.m_levelNum+1) ); // general stats group elapsedTimeLCDLevel->display(static_cast<int>(m_currLevelStats.m_elapsedTime)); totalCharsLCDLevel->display(static_cast<int>(m_currLevelStats.m_totalChars) ); diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index f1b60dd0..17e095da 100644 --- a/ktouch/src/ktouchstatisticsdata.cpp +++ b/ktouch/src/ktouchstatisticsdata.cpp @@ -137,8 +137,8 @@ void KTouchLevelStats::write(TQDomDocument& doc, TQDomElement& root) const { TQString char_data; // we append for each missed char the char-tqunicode and the counters for (std::set<KTouchCharStats>::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it) - char_data += TQString(" %1 %2 %3").tqarg(it->m_char.tqunicode()) - .tqarg(it->m_correctCount).tqarg(it->m_wrongCount); + char_data += TQString(" %1 %2 %3").arg(it->m_char.tqunicode()) + .arg(it->m_correctCount).arg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); e.appendChild(tn); @@ -295,7 +295,7 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const { // add levels TQString level_nums; for (std::set<unsigned int>::const_iterator it = m_levelNums.begin(); it != m_levelNums.end(); ++it) - level_nums += TQString( " %1").tqarg(*it); + level_nums += TQString( " %1").arg(*it); e = doc.createElement("LevelNums"); tn = doc.createTextNode(level_nums); e.appendChild(tn); @@ -304,8 +304,8 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const { TQString char_data; // we append for each missed char the char-tqunicode and the counters for (std::set<KTouchCharStats>::const_iterator it=m_charStats.begin(); it!=m_charStats.end(); ++it) - char_data += TQString(" %1 %2 %3").tqarg(it->m_char.tqunicode()) - .tqarg(it->m_correctCount).tqarg(it->m_wrongCount); + char_data += TQString(" %1 %2 %3").arg(it->m_char.tqunicode()) + .arg(it->m_correctCount).arg(it->m_wrongCount); e = doc.createElement("CharStats"); tn = doc.createTextNode(char_data); e.appendChild(tn); diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui index 29fda5be..7d93f545 100644 --- a/ktouch/src/ktouchstatuslayout.ui +++ b/ktouch/src/ktouchstatuslayout.ui @@ -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"> diff --git a/ktouch/src/ktouchutils.cpp b/ktouch/src/ktouchutils.cpp index 26686a09..a59dbfd9 100644 --- a/ktouch/src/ktouchutils.cpp +++ b/ktouch/src/ktouchutils.cpp @@ -21,7 +21,7 @@ TQString format_speed(double speed) { unsigned int mins = static_cast<unsigned int>(speed); unsigned int secs = static_cast<unsigned int>(speed*60) - mins*60; - return TQString("%1' %2''").tqarg(mins).tqarg(secs); + return TQString("%1' %2''").arg(mins).arg(secs); } void sort_lists(TQStringList& text, TQStringList& data) { |