From 746abe84406ed1ec1a8dc68f29ce0ab8322ccc80 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:55:10 -0600 Subject: Remove additional unneeded tq method conversions --- kwordquiz/src/dlglanguagebase.ui | 4 ++-- kwordquiz/src/dlgrcbase.ui | 2 +- kwordquiz/src/flashviewbase.ui | 12 +++++------ kwordquiz/src/kvtmlwriter.cpp | 16 +++++++-------- kwordquiz/src/kwordquiz.cpp | 36 ++++++++++++++++----------------- kwordquiz/src/kwordquiz.h | 2 +- kwordquiz/src/kwordquizdoc.cpp | 12 +++++------ kwordquiz/src/kwordquizdoc.h | 2 +- kwordquiz/src/kwordquizview.cpp | 6 +++--- kwordquiz/src/kwordquizview.h | 2 +- kwordquiz/src/kwqnewstuff.cpp | 4 ++-- kwordquiz/src/multipleviewbase.ui | 26 ++++++++++++------------ kwordquiz/src/prefcardappearancebase.ui | 4 ++-- kwordquiz/src/prefcharacterbase.ui | 4 ++-- kwordquiz/src/qaviewbase.ui | 30 +++++++++++++-------------- kwordquiz/src/wqlwriter.cpp | 10 ++++----- 16 files changed, 86 insertions(+), 86 deletions(-) (limited to 'kwordquiz') diff --git a/kwordquiz/src/dlglanguagebase.ui b/kwordquiz/src/dlglanguagebase.ui index 3a1fdeee..04682cce 100644 --- a/kwordquiz/src/dlglanguagebase.ui +++ b/kwordquiz/src/dlglanguagebase.ui @@ -90,7 +90,7 @@ Sunken - + AlignAuto @@ -187,7 +187,7 @@ 0 - + AlignAuto diff --git a/kwordquiz/src/dlgrcbase.ui b/kwordquiz/src/dlgrcbase.ui index 459265e7..f16c8e56 100644 --- a/kwordquiz/src/dlgrcbase.ui +++ b/kwordquiz/src/dlgrcbase.ui @@ -43,7 +43,7 @@ 5 - + AlignAuto diff --git a/kwordquiz/src/flashviewbase.ui b/kwordquiz/src/flashviewbase.ui index 71e9ff6f..11a499e4 100644 --- a/kwordquiz/src/flashviewbase.ui +++ b/kwordquiz/src/flashviewbase.ui @@ -126,7 +126,7 @@ Language 1 - + AlignTop @@ -203,7 +203,7 @@ false - + WordBreak|AlignCenter @@ -292,7 +292,7 @@ 00 - + AlignVCenter|AlignLeft @@ -360,7 +360,7 @@ 00 - + AlignVCenter|AlignLeft @@ -459,7 +459,7 @@ 00 - + AlignVCenter|AlignLeft @@ -527,7 +527,7 @@ 00 - + AlignVCenter|AlignLeft diff --git a/kwordquiz/src/kvtmlwriter.cpp b/kwordquiz/src/kvtmlwriter.cpp index dc123113..4855dbf2 100644 --- a/kwordquiz/src/kvtmlwriter.cpp +++ b/kwordquiz/src/kvtmlwriter.cpp @@ -35,10 +35,10 @@ KVTMLWriter::KVTMLWriter(TQFile *file) void KVTMLWriter::addHeader(const TQString &generator, int cols, int rows, const TQString &title) { TQString s = TQString("") - .tqarg(generator) - .tqarg(cols) - .tqarg(rows) - .tqarg(title); + .arg(generator) + .arg(cols) + .arg(rows) + .arg(title); outputStream << s << endl << endl; } @@ -50,12 +50,12 @@ void KVTMLWriter::addFirstItem(const TQString &ll, int lwidth, const TQString &l { outputStream << " " << endl; TQString s = TQString(" ") - .tqarg(lwidth) - .tqarg(ll); + .arg(lwidth) + .arg(ll); outputStream << s << escape(left) << "" << endl; s = TQString(" ") - .tqarg(rwidth) - .tqarg(rl); + .arg(rwidth) + .arg(rl); outputStream << s << escape(right) << "" << endl; outputStream << " " << endl; } diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index 1d058e36..fd7328de 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -610,7 +610,7 @@ bool KWordQuizApp::saveAsFileName( ) TQFileInfo fileinfo(url.path()); if (fileinfo.exists() && KMessageBox::warningContinueCancel(0, i18n("The file
%1
already exists. Do you want to overwrite it?") - .tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel) + .arg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel) { // do nothing } @@ -1064,7 +1064,7 @@ void KWordQuizApp::slotApplyPreferences() kdDebug() << "Prefs Update" << endl; editMarkBlank->setEnabled(Prefs::enableBlanks()); editUnmarkBlank->setEnabled(Prefs::enableBlanks()); - m_editView->viewport()->tqrepaint(true); + m_editView->viewport()->repaint(true); updateSpecialCharIcons(); emit settingsChanged(); } @@ -1074,7 +1074,7 @@ void KWordQuizApp::updateSpecialCharIcons( ) for (int i = 0; i < 9; i++){ KAction * act = actionCollection()->action(TQString("char_" + TQString::number(i + 1)).latin1()); act->setIcon(charIcon(Prefs::specialCharacters()[i])); - act->setToolTip(i18n("Inserts the character %1").tqarg(Prefs::specialCharacters()[i])); + act->setToolTip(i18n("Inserts the character %1").arg(Prefs::specialCharacters()[i])); } } @@ -1145,11 +1145,11 @@ void KWordQuizApp::updateMode(int m) TQString s1 = m_editView -> horizontalHeader()->label(0); TQString s2 = m_editView -> horizontalHeader()->label(1); - mode1->setText(i18n("&1 %1 -> %2 In Order").tqarg(s1).tqarg(s2)); - mode2->setText(i18n("&2 %1 -> %2 In Order").tqarg(s2).tqarg(s1)); - mode3->setText(i18n("&3 %1 -> %2 Randomly").tqarg(s1).tqarg(s2)); - mode4->setText(i18n("&4 %1 -> %2 Randomly").tqarg(s2).tqarg(s1)); - mode5->setText(i18n("&5 %1 <-> %2 Randomly").tqarg(s1).tqarg(s2)); + mode1->setText(i18n("&1 %1 -> %2 In Order").arg(s1).arg(s2)); + mode2->setText(i18n("&2 %1 -> %2 In Order").arg(s2).arg(s1)); + mode3->setText(i18n("&3 %1 -> %2 Randomly").arg(s1).arg(s2)); + mode4->setText(i18n("&4 %1 -> %2 Randomly").arg(s2).arg(s1)); + mode5->setText(i18n("&5 %1 <-> %2 Randomly").arg(s1).arg(s2)); mode1->setChecked(Prefs::mode() == 1); mode2->setChecked(Prefs::mode() == 2); @@ -1164,30 +1164,30 @@ void KWordQuizApp::updateMode(int m) popup->setItemChecked(3, Prefs::mode() == 4); popup->setItemChecked(4, Prefs::mode() == 5); - popup->changeItem(0, i18n("&1 %1 -> %2 In Order").tqarg(s1).tqarg(s2)); - popup->changeItem(1, i18n("&2 %1 -> %2 In Order").tqarg(s2).tqarg(s1)); - popup->changeItem(2, i18n("&3 %1 -> %2 Randomly").tqarg(s1).tqarg(s2)); - popup->changeItem(3, i18n("&4 %1 -> %2 Randomly").tqarg(s2).tqarg(s1)); - popup->changeItem(4, i18n("&5 %1 <-> %2 Randomly").tqarg(s1).tqarg(s2)); + popup->changeItem(0, i18n("&1 %1 -> %2 In Order").arg(s1).arg(s2)); + popup->changeItem(1, i18n("&2 %1 -> %2 In Order").arg(s2).arg(s1)); + popup->changeItem(2, i18n("&3 %1 -> %2 Randomly").arg(s1).arg(s2)); + popup->changeItem(3, i18n("&4 %1 -> %2 Randomly").arg(s2).arg(s1)); + popup->changeItem(4, i18n("&5 %1 <-> %2 Randomly").arg(s1).arg(s2)); TQString s; mode->setIcon("mode" + s.setNum(Prefs::mode())); switch( Prefs::mode() ){ case 1: - statusBar()->changeItem(i18n("%1 -> %2 In Order").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 In Order").arg(s1).arg(s2), ID_STATUS_MSG_MODE); break; case 2: - statusBar()->changeItem(i18n("%1 -> %2 In Order").tqarg(s2).tqarg(s1), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 In Order").arg(s2).arg(s1), ID_STATUS_MSG_MODE); break; case 3: - statusBar()->changeItem(i18n("%1 -> %2 Randomly").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 Randomly").arg(s1).arg(s2), ID_STATUS_MSG_MODE); break; case 4: - statusBar()->changeItem(i18n("%1 -> %2 Randomly").tqarg(s2).tqarg(s1), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 -> %2 Randomly").arg(s2).arg(s1), ID_STATUS_MSG_MODE); break; case 5: - statusBar()->changeItem(i18n("%1 <-> %2 Randomly").tqarg(s1).tqarg(s2), ID_STATUS_MSG_MODE); + statusBar()->changeItem(i18n("%1 <-> %2 Randomly").arg(s1).arg(s2), ID_STATUS_MSG_MODE); break; } diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index 59dc10a1..db923f56 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -79,7 +79,7 @@ class KWordQuizApp : public KMainWindow bool saveAsFileName(); protected: - /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration + /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration * file */ void saveOptions(); diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp index c1e3dacc..333f7713 100644 --- a/kwordquiz/src/kwordquizdoc.cpp +++ b/kwordquiz/src/kwordquizdoc.cpp @@ -73,14 +73,14 @@ const KURL& KWordQuizDoc::URL() const void KWordQuizDoc::slotUpdateAllViews(KWordQuizView *sender) { - //m_view->tqrepaint(); + //m_view->repaint(); /*KWordQuizView *w; if(pViewList) { for(w=pViewList->first(); w!=0; w=pViewList->next()) { if(w!=sender) - w->tqrepaint(); + w->repaint(); } }*/ @@ -162,7 +162,7 @@ bool KWordQuizDoc::openDocument(const KURL& url, bool append, int index) TQFile file(tmpfile); if (!file.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("Cannot open file
%1").tqarg(url.path())); + KMessageBox::error(0, i18n("Cannot open file
%1").arg(url.path())); return false; } @@ -333,7 +333,7 @@ bool KWordQuizDoc::saveDocument(const KURL& url, const char *format /*=0*/) if (!file.open(IO_WriteOnly)) { KMessageBox::error(0, i18n("Cannot write to file
%1") - .tqarg(url.path())); + .arg(url.path())); //if (filename == fname) // filename = ""; return false; @@ -347,7 +347,7 @@ bool KWordQuizDoc::saveDocument(const KURL& url, const char *format /*=0*/) { file.close(); KVTMLWriter writer(&file); - writer.addHeader(TQString("kwordquiz %1").tqarg(KWTQ_VERSION), 2, g->numRows(), url.fileName()); + writer.addHeader(TQString("kwordquiz %1").arg(KWTQ_VERSION), 2, g->numRows(), url.fileName()); writer.addFirstItem(g->horizontalHeader()->label(0), g->columnWidth(0), g->text(w, 0), g->horizontalHeader()->label(1), g->columnWidth(1), g->text(w, 1)); w++; int r = g->numRows(); @@ -479,7 +479,7 @@ void KWordQuizDoc::slotModifiedOnDisk( const TQString & path) /*@todo this code doesn't work very well. Have to look in more detail on how Kate does it. if (doc_url.path() == path) { - TQString str = i18n("The file %1 was changed (modified) on disc by another program!\n\n").tqarg(doc_url.fileName()); + TQString str = i18n("The file %1 was changed (modified) on disc by another program!\n\n").arg(doc_url.fileName()); int i = KMessageBox::warningYesNoCancel(0, str + i18n("Do you want to reload the modified file? Data loss may occur."),TQString(),i18n("Reload"),i18n("Do Not Reload")); if ( i == KMessageBox::Yes) openDocument(doc_url); diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h index a84bc119..e5bbc4e6 100644 --- a/kwordquiz/src/kwordquizdoc.h +++ b/kwordquiz/src/kwordquizdoc.h @@ -76,7 +76,7 @@ class KWordQuizDoc : public TQObject void setURL(const KURL& url); public slots: - /** calls tqrepaint() on all views connected to the document object and is called by the view by which the document has been changed. + /** calls repaint() on all views connected to the document object and is called by the view by which the document has been changed. * As this view normally repaints itself, it is excluded from the paintEvent. */ void slotUpdateAllViews(KWordQuizView *sender); diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index 021601bd..bc66055c 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -42,7 +42,7 @@ TQValueList *KWordQuizView::m_undoList = 0L; KWTQTableItem::KWTQTableItem(TQTable* table, EditType et, const TQString & text) : TQTableItem(table, et, text) {} -int KWTQTableItem::tqalignment() const +int KWTQTableItem::alignment() const { bool num; bool ok1 = false; @@ -211,12 +211,12 @@ void KWordQuizView::doNewPage( TQPainter & painter, int res, int type ) if (type == 2) { - painter.drawText(card_marg, card_marg - 20, i18n("KWordQuiz - %1").tqarg(getDocument()->URL().fileName())); + painter.drawText(card_marg, card_marg - 20, i18n("KWordQuiz - %1").arg(getDocument()->URL().fileName())); return; } painter.drawLine(marg, marg, marg + cw0 + cw1 + cw2 + cw3, marg); - painter.drawText(marg, marg - 20, i18n("KWordQuiz - %1").tqarg(getDocument()->URL().fileName())); + painter.drawText(marg, marg - 20, i18n("KWordQuiz - %1").arg(getDocument()->URL().fileName())); if (type == 1) { diff --git a/kwordquiz/src/kwordquizview.h b/kwordquiz/src/kwordquizview.h index b49ea65c..d0cf7466 100644 --- a/kwordquiz/src/kwordquizview.h +++ b/kwordquiz/src/kwordquizview.h @@ -45,7 +45,7 @@ class KWTQTableItem :public TQTableItem { public: KWTQTableItem( TQTable* table, EditType et, const TQString & text ); - virtual int tqalignment() const; + virtual int alignment() const; }; class KWordQuizView : public TQTable diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp index d4868889..64d620cd 100644 --- a/kwordquiz/src/kwqnewstuff.cpp +++ b/kwordquiz/src/kwqnewstuff.cpp @@ -79,7 +79,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry) { int result = KMessageBox::questionYesNo(parentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") - .tqarg(file), + .arg(file), TQString(), i18n("Overwrite"),i18n("Do Not Overwrite")); if (result == KMessageBox::No) @@ -87,7 +87,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry) } KMessageBox::information(parentWidget(), i18n("The selected file will now be downloaded and saved as\n'%1'.") - .tqarg(file), + .arg(file), TQString(), "NewStuffDownloadLocation"); return file; diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui index 89974e50..045d2137 100644 --- a/kwordquiz/src/multipleviewbase.ui +++ b/kwordquiz/src/multipleviewbase.ui @@ -64,7 +64,7 @@ Language 1 - + AlignTop @@ -95,7 +95,7 @@ false - + WordBreak|AlignTop @@ -197,7 +197,7 @@ Your Answer - + AlignTop @@ -228,7 +228,7 @@ false - + WordBreak|AlignTop @@ -300,7 +300,7 @@ 00 - + AlignVCenter|AlignLeft @@ -368,7 +368,7 @@ 00 - + AlignVCenter|AlignLeft @@ -467,7 +467,7 @@ 00 - + AlignVCenter|AlignLeft @@ -535,7 +535,7 @@ 00 - + AlignVCenter|AlignLeft @@ -583,7 +583,7 @@ Correct Answer - + AlignTop @@ -614,7 +614,7 @@ false - + WordBreak|AlignTop @@ -772,7 +772,7 @@ Language 2 - + AlignTop @@ -846,7 +846,7 @@ Previous Question - + AlignTop @@ -877,7 +877,7 @@ false - + WordBreak|AlignTop diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui index 44f61ecf..a051b9de 100644 --- a/kwordquiz/src/prefcardappearancebase.ui +++ b/kwordquiz/src/prefcardappearancebase.ui @@ -98,7 +98,7 @@ false - + WordBreak|AlignCenter @@ -190,7 +190,7 @@ Front - + AlignTop diff --git a/kwordquiz/src/prefcharacterbase.ui b/kwordquiz/src/prefcharacterbase.ui index d3d92f0d..8301e2b7 100644 --- a/kwordquiz/src/prefcharacterbase.ui +++ b/kwordquiz/src/prefcharacterbase.ui @@ -52,7 +52,7 @@ Note: Select Settings -> Configure Shortcuts... to change the shortcut associated with each action. - + WordBreak|AlignVCenter @@ -382,7 +382,7 @@ A - + AlignBottom diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui index c13262da..fd8b7b5b 100644 --- a/kwordquiz/src/qaviewbase.ui +++ b/kwordquiz/src/qaviewbase.ui @@ -88,7 +88,7 @@ 00 - + AlignVCenter|AlignLeft @@ -179,7 +179,7 @@ 00 - + AlignVCenter|AlignLeft @@ -208,7 +208,7 @@ 00 - + AlignVCenter|AlignLeft @@ -237,7 +237,7 @@ 00 - + AlignVCenter|AlignLeft @@ -314,7 +314,7 @@ Previous Question - + AlignTop @@ -345,7 +345,7 @@ false - + WordBreak|AlignTop @@ -419,7 +419,7 @@ Your Answer - + AlignTop @@ -450,7 +450,7 @@ false - + WordBreak|AlignTop @@ -552,7 +552,7 @@ Correct Answer - + AlignTop @@ -583,7 +583,7 @@ false - + WordBreak|AlignTop @@ -624,7 +624,7 @@ false - + WordBreak|AlignTop @@ -646,7 +646,7 @@ 0 - + AlignAuto @@ -682,7 +682,7 @@ Language 2 - + AlignTop @@ -770,7 +770,7 @@ Language 1 - + AlignTop @@ -829,7 +829,7 @@ false - + WordBreak|AlignTop diff --git a/kwordquiz/src/wqlwriter.cpp b/kwordquiz/src/wqlwriter.cpp index 579561ff..2052c079 100644 --- a/kwordquiz/src/wqlwriter.cpp +++ b/kwordquiz/src/wqlwriter.cpp @@ -35,16 +35,16 @@ void WqlWriter::writeFont( const TQFont & font ) outputStream << "[Font Info]" << winendl; outputStream << "FontName1=\"" << font.family() << "\"" << winendl; outputStream << "FontSize1=" << TQString::number(font.pointSize()) << winendl; - outputStream << TQString("FontBold1=%1").tqarg(font.bold() ? "1" : "0") <