From 92994ee2036ac7c4c68747f67dbc0ecbaf4c250c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:52:23 -0600 Subject: Remove additional unneeded tq method conversions --- kmag/kmag.cpp | 4 +- kmag/kmag.h | 2 +- kmag/kmagselrect.cpp | 16 ++++---- kmag/kmagzoomview.cpp | 46 +++++++++++----------- kmousetool/kmousetool/kmousetoolui.ui | 2 +- kmouth/kmouth.h | 2 +- kmouth/phrasebook/phrasebook.cpp | 12 +++--- kmouth/phrasebook/phrasebookdialog.cpp | 8 ++-- kmouth/phrasebook/phrasetree.cpp | 6 +-- kmouth/phraselist.cpp | 4 +- kmouth/wordcompletion/dictionarycreationwizard.cpp | 2 +- kmouth/wordcompletion/wordcompletionwidget.cpp | 6 +-- ksayit/Freeverb_plugin/freeverb_setup.ui | 10 ++--- ksayit/src/docbookparser.cpp | 32 +++++++-------- ksayit/src/doctreeviewimpl.cpp | 38 +++++++++--------- ksayit/src/ksayit.cpp | 4 +- ksayit/src/ksayit.h | 2 +- ksayit/src/saxhandler.cpp | 4 +- kttsd/debian/man/kttsd.1 | 4 +- kttsd/debian/man/kttsmgr.1 | 4 +- kttsd/filters/sbd/sbdconfwidget.ui | 10 ++--- kttsd/filters/sbd/sbdproc.cpp | 4 +- kttsd/filters/sbd/sbdproc.h | 2 +- .../stringreplacer/editreplacementwidget.ui | 4 +- .../stringreplacer/stringreplacerconfwidget.ui | 6 +-- .../talkerchooser/talkerchooserconfwidget.ui | 6 +-- .../xmltransformer/xmltransformerconfwidget.ui | 12 +++--- kttsd/kcmkttsmgr/addtalkerwidget.ui | 6 +-- kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 8 ++-- kttsd/kcmkttsmgr/selectevent.cpp | 2 +- kttsd/kttsd/filtermgr.cpp | 2 +- kttsd/kttsd/speaker.cpp | 4 +- kttsd/kttsd/talkermgr.cpp | 2 +- kttsd/kttsmgr/kttsmgr.cpp | 4 +- kttsd/libkttsd/selecttalkerwidget.ui | 2 +- kttsd/libkttsd/stretcher.cpp | 2 +- kttsd/libkttsd/talkercode.cpp | 2 +- kttsd/libkttsd/testplayer.cpp | 2 +- kttsd/players/alsaplayer/alsaplayer.cpp | 6 +-- kttsd/players/gstplayer/gstreamerplayer.cpp | 6 +-- kttsd/plugins/command/commandconf.cpp | 12 +++--- kttsd/plugins/epos/eposconf.cpp | 12 +++--- kttsd/plugins/epos/eposconfwidget.ui | 8 ++-- kttsd/plugins/epos/eposproc.cpp | 6 +-- kttsd/plugins/festivalint/festivalintconf.cpp | 12 +++--- kttsd/plugins/festivalint/festivalintconfwidget.ui | 4 +- kttsd/plugins/festivalint/festivalintproc.cpp | 6 +-- kttsd/plugins/flite/fliteconf.cpp | 12 +++--- kttsd/plugins/flite/fliteconfwidget.ui | 2 +- kttsd/plugins/freetts/freettsconf.cpp | 12 +++--- kttsd/plugins/freetts/freettsconfigwidget.ui | 2 +- kttsd/plugins/hadifix/hadifixconf.cpp | 22 +++++------ kttsd/plugins/hadifix/hadifixproc.cpp | 6 +-- kttsd/plugins/hadifix/voicefileui.ui.h | 4 +- 54 files changed, 210 insertions(+), 210 deletions(-) diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index 2ee430c..8a58ac4 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -571,7 +571,7 @@ void KmagApp::saveZoomPixmap() KMessageBox::error(0, i18n("Unable to upload file over the network."), i18n("Error Writing File")); } else { - KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").tqarg(url.prettyURL()), + KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").arg(url.prettyURL()), i18n("Information"), "save_confirm"); } } @@ -583,7 +583,7 @@ void KmagApp::saveZoomPixmap() KMessageBox::error(0, i18n("Unable to save file. Please check if you have permission to write to the directory."), i18n("Error Writing File")); } else { - KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").tqarg(url.prettyURL()), + KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").arg(url.prettyURL()), i18n("Information"), "save_confirm"); } } diff --git a/kmag/kmag.h b/kmag/kmag.h index aeee22b..445d51e 100644 --- a/kmag/kmag.h +++ b/kmag/kmag.h @@ -71,7 +71,7 @@ class KmagApp : public KMainWindow 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/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp index 236bddf..73caf5a 100644 --- a/kmag/kmagselrect.cpp +++ b/kmag/kmagselrect.cpp @@ -184,19 +184,19 @@ void KMagSelRect::hide() void KMagSelRect::update() { // make sure the selection window does not go outside of the display - if (height() > TQApplication::desktop()->tqgeometry().height()) - setHeight (TQApplication::desktop()->tqgeometry().height()); - if (width() > TQApplication::desktop()->tqgeometry().width()) - setWidth (TQApplication::desktop()->tqgeometry().width()); + if (height() > TQApplication::desktop()->geometry().height()) + setHeight (TQApplication::desktop()->geometry().height()); + if (width() > TQApplication::desktop()->geometry().width()) + setWidth (TQApplication::desktop()->geometry().width()); if (top() < 0) moveTop (0); if (left() < 0) moveLeft (0); - if (bottom() > TQApplication::desktop()->tqgeometry().bottom()) - moveBottom (TQApplication::desktop()->tqgeometry().bottom()); - if (right() > TQApplication::desktop()->tqgeometry().right()) - moveRight (TQApplication::desktop()->tqgeometry().right()); + if (bottom() > TQApplication::desktop()->geometry().bottom()) + moveBottom (TQApplication::desktop()->geometry().bottom()); + if (right() > TQApplication::desktop()->geometry().right()) + moveRight (TQApplication::desktop()->geometry().right()); if (selectionwindow != 0) selectionwindow->setSelRect (TQRect (topLeft(), bottomRight())); diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp index 4dd9a12..47f6a46 100644 --- a/kmag/kmagzoomview.cpp +++ b/kmag/kmagzoomview.cpp @@ -80,22 +80,22 @@ static uchar phand_bits[] = { static bool obscuredRegion (TQRegion ®ion, Window winId, Window ignoreId, Window start = 0, int level = -1) { - Window root, parent, *tqchildren; uint ntqchildren; + Window root, parent, *children; uint nchildren; if (0 == start) start = qt_xrootwin(); bool winIdFound = false; - if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &tqchildren, &ntqchildren)) { - for (uint i=0; i < ntqchildren; ++i) { + if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &children, &nchildren)) { + for (uint i=0; i < nchildren; ++i) { if (winIdFound) { - if (ignoreId != tqchildren [i]) { + if (ignoreId != children [i]) { XWindowAttributes atts; - XGetWindowAttributes (qt_xdisplay(), tqchildren [i], &atts); + XGetWindowAttributes (qt_xdisplay(), children [i], &atts); if (atts.map_state == IsViewable) region -= TQRegion (atts.x, atts.y, atts.width, atts.height, TQRegion::Rectangle); } } - else if (winId == tqchildren [i]) + else if (winId == children [i]) winIdFound = true; // According to tests, my own window ID is either on toplevel or two levels below. @@ -103,15 +103,15 @@ static bool obscuredRegion (TQRegion ®ion, Window winId, Window ignoreId, Win // then to five recursion levels, and make a full recursive search only if that // was unsuccessful. else if (level > 1) - winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], level-1); + winIdFound = obscuredRegion (region, winId, ignoreId, children [i], level-1); else if (level == -1) - if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 0))) - if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 1))) - winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], -1); + if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 0))) + if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 1))) + winIdFound = obscuredRegion (region, winId, ignoreId, children [i], -1); } - if (tqchildren != NULL) - XFree (tqchildren); + if (children != NULL) + XFree (children); } return winIdFound; @@ -493,7 +493,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e) // set the mouse mode to normal m_mouseMode = Normal; - // restore the cursor tqshape + // restore the cursor shape setCursor(arrowCursor); // restore the cursor position @@ -504,7 +504,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e) // set the mouse mode to normal m_mouseMode = Normal; - // restore the cursor tqshape + // restore the cursor shape setCursor(arrowCursor); // restore the cursor position @@ -516,7 +516,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e) // set the mouse mode to normal m_mouseMode = Normal; - // restore the cursor tqshape + // restore the cursor shape setCursor(arrowCursor); } break; @@ -706,7 +706,7 @@ void KMagZoomView::fitToWindow() m_selRect.moveCenter(currCenter); m_selRect.update(); - viewport()->tqrepaint(false); + viewport()->repaint(false); } void KMagZoomView::setFitToWindow(bool fit) @@ -755,14 +755,14 @@ void KMagZoomView::grabFrame() intersection.translate (-selRect.x(), -selRect.y()); TQPainter painter (&m_grabbedPixmap, true); - TQMemArray rects (intersection.tqrects()); + TQMemArray rects (intersection.rects()); for (uint i = 0; i < rects.size(); i++) painter.fillRect (rects[i], TQBrush (TQColor (128, 128, 128))); - // call tqrepaint to display the newly grabbed image + // call repaint to display the newly grabbed image TQRect newSize = m_zoomMatrix.mapRect (m_grabbedPixmap.rect()); resizeContents (newSize.width(), newSize.height()); - viewport()->tqrepaint(false); + viewport()->repaint(false); } @@ -775,7 +775,7 @@ void KMagZoomView::updateMouseView() if(m_selRect.left() <= pos.x() && pos.x() <= m_selRect.right() && m_selRect.top() <= pos.y() && pos.y() <= m_selRect.bottom() && m_refreshSwitch) - viewport()->tqrepaint(false); + viewport()->repaint(false); } /** @@ -801,7 +801,7 @@ void KMagZoomView::setZoom(float zoom) { m_zoom = zoom; updateMatrix(); - viewport()->tqrepaint(); + viewport()->repaint(); } /** @@ -811,7 +811,7 @@ void KMagZoomView::setRotation(int rotation) { m_rotation = rotation; updateMatrix(); - viewport()->tqrepaint(); + viewport()->repaint(); } /** @@ -820,7 +820,7 @@ void KMagZoomView::setRotation(int rotation) void KMagZoomView::setInvertation(bool invert) { m_invert = invert; - viewport()->tqrepaint(); + viewport()->repaint(); } /** diff --git a/kmousetool/kmousetool/kmousetoolui.ui b/kmousetool/kmousetool/kmousetoolui.ui index 2e95f73..5df32f9 100644 --- a/kmousetool/kmousetool/kmousetoolui.ui +++ b/kmousetool/kmousetool/kmousetoolui.ui @@ -300,7 +300,7 @@ false - + WordBreak|AlignJustify|AlignVCenter diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h index fe610a6..b8d791d 100644 --- a/kmouth/kmouth.h +++ b/kmouth/kmouth.h @@ -79,7 +79,7 @@ class KMouthApp : public KMainWindow void enableMenuEntries(bool existSelectedEntries, bool existDeselectedEntries); 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/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp index 6aa2668..6188a8a 100644 --- a/kmouth/phrasebook/phrasebook.cpp +++ b/kmouth/phrasebook/phrasebook.cpp @@ -274,8 +274,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p } if (KIO::NetAccess::exists(url)) { - if (KMessageBox::warningContinueCancel(0,TQString("%1").tqarg(i18n("The file %1 already exists. " - "Do you want to overwrite it?").tqarg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) { + if (KMessageBox::warningContinueCancel(0,TQString("%1").arg(i18n("The file %1 already exists. " + "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) { return 0; } } @@ -286,8 +286,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p url.setFileName (url.fileName(false) + ".phrasebook"); } else if (url.fileName (false).right (11).contains (".phrasebook", false) == 0) { - int filetype = KMessageBox::questionYesNoCancel (0,TQString("%1").tqarg(i18n("Your chosen filename %1 has a different extension than .phrasebook. " - "Do you wish to add .phrasebook to the filename?").tqarg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add")); + int filetype = KMessageBox::questionYesNoCancel (0,TQString("%1").arg(i18n("Your chosen filename %1 has a different extension than .phrasebook. " + "Do you wish to add .phrasebook to the filename?").arg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add")); if (filetype == KMessageBox::Cancel) { return 0; } @@ -302,8 +302,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p result = save (url, false); } else { - int filetype = KMessageBox::questionYesNoCancel (0,TQString("%1").tqarg(i18n("Your chosen filename %1 has the extension .phrasebook. " - "Do you wish to save in phrasebook format?").tqarg(url.filename())),i18n("File Extension"),i18n("As Phrasebook"),i18n("As Plain Text")); + int filetype = KMessageBox::questionYesNoCancel (0,TQString("%1").arg(i18n("Your chosen filename %1 has the extension .phrasebook. " + "Do you wish to save in phrasebook format?").arg(url.filename())),i18n("File Extension"),i18n("As Phrasebook"),i18n("As Plain Text")); if (filetype == KMessageBox::Cancel) { return 0; } diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp index 3cfe25b..838d5ec 100644 --- a/kmouth/phrasebook/phrasebookdialog.cpp +++ b/kmouth/phrasebook/phrasebookdialog.cpp @@ -132,7 +132,7 @@ void CheckBookItem::childChange (int numberDiff, int selDiff) { ((CheckBookItem*)parent)->childChange (numberDiff, selDiff); TQString text = i18n(" (%1 of %2 books selected)"); - text = text.tqarg(selectedBooks).tqarg(numberOfBooks); + text = text.arg(selectedBooks).arg(numberOfBooks); setText(0, this->text(PhraseBookPrivate::name)+text); } @@ -597,7 +597,7 @@ void PhraseBookDialog::setShortcut( const KShortcut& cut ) { { TQString s = i18n("In order to use the '%1' key as a shortcut, " "it must be combined with the " - "Win, Alt, Ctrl, and/or Shift keys.").tqarg(TQChar(key.sym())); + "Win, Alt, Ctrl, and/or Shift keys.").arg(TQChar(key.sym())); KMessageBox::sorry( this, s, i18n("Invalid Shortcut Key") ); return; } @@ -731,7 +731,7 @@ void PhraseBookDialog::slotImportPhrasebook (const KURL &url) { if (book.open (url)) addBook(treeView->currentItem(), &book); else - KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() )); + KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() )); } } @@ -741,7 +741,7 @@ void PhraseBookDialog::slotExportPhrasebook () { KURL url; if (book.save (this, i18n("Export Phrase Book"), url) == -1) - KMessageBox::sorry(this,i18n("There was an error saving file\n%1").tqarg( url.url() )); + KMessageBox::sorry(this,i18n("There was an error saving file\n%1").arg( url.url() )); } void PhraseBookDialog::slotPrint() diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp index e4adde1..27735c5 100644 --- a/kmouth/phrasebook/phrasetree.cpp +++ b/kmouth/phrasebook/phrasetree.cpp @@ -470,7 +470,7 @@ void PhraseTree::_warning (const KKeySequence& cut, TQString sAction, TQString s i18n("The '%1' key combination has already been allocated " "to %2.\n" "Please choose a unique key combination."). - tqarg(cut.toString()).tqarg(sAction); + arg(cut.toString()).arg(sAction); KMessageBox::sorry( this, s, sTitle ); } @@ -485,7 +485,7 @@ bool PhraseTree::isStdAccelPresent (const KShortcut& cut, bool warnUser) { { if (warnUser) _warning (cut.seq(iSeq), - i18n("the standard \"%1\" action").tqarg(KStdAccel::label(id)), + i18n("the standard \"%1\" action").arg(KStdAccel::label(id)), i18n("Conflict with Standard Application Shortcut")); return true; } @@ -501,7 +501,7 @@ bool PhraseTree::isGlobalKeyPresent (const KShortcut& cut, bool warnUser) { if (iSeq > -1) { if (warnUser) _warning (cut.seq(iSeq), - i18n("the global \"%1\" action").tqarg(it.key()), + i18n("the global \"%1\" action").arg(it.key()), i18n("Conflict with Global Shortcuts")); return true; } diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp index 3cbd9d4..ef4557e 100644 --- a/kmouth/phraselist.cpp +++ b/kmouth/phraselist.cpp @@ -446,7 +446,7 @@ void PhraseList::save () { KURL url; if (book.save (this, i18n("Save As"), url, false) == -1) - KMessageBox::sorry(this,i18n("There was an error saving file\n%1").tqarg( url.url() )); + KMessageBox::sorry(this,i18n("There was an error saving file\n%1").arg( url.url() )); } void PhraseList::open () { @@ -472,7 +472,7 @@ void PhraseList::open (KURL url) { insertIntoPhraseList (*it, false); } else - KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() )); + KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() )); } #include "phraselist.moc" diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp index 5108845..6f777a0 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.cpp +++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp @@ -221,7 +221,7 @@ TQString DictionaryCreationWizard::createDictionary() { TQString dictionaryFile; do { dictnumber++; - filename = TQString("wordcompletion%1.dict").tqarg(dictnumber); + filename = TQString("wordcompletion%1.dict").arg(dictnumber); dictionaryFile = KApplication::kApplication()->dirs()->findResource("appdata", filename); } while (KStandardDirs::exists(dictionaryFile)); diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp index a2068f2..7e54fe4 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.cpp +++ b/kmouth/wordcompletion/wordcompletionwidget.cpp @@ -159,7 +159,7 @@ void WordCompletionWidget::save() { while (it.current()) { DictionaryListItem *item = dynamic_cast(it.current()); if (item != 0) { - config->setGroup(TQString("Dictionary %1").tqarg(number)); + config->setGroup(TQString("Dictionary %1").arg(number)); config->writeEntry ("Filename", item->filename()); config->writeEntry ("Name", item->text (0)); config->writeEntry ("Language", item->languageCode()); @@ -251,8 +251,8 @@ void WordCompletionWidget::exportDictionary() { return; if (KIO::NetAccess::exists(url, false, this)) { - if (KMessageBox::warningContinueCancel(0,TQString("%1").tqarg(i18n("The file %1 already exists. " - "Do you want to overwrite it?").tqarg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) { + if (KMessageBox::warningContinueCancel(0,TQString("%1").arg(i18n("The file %1 already exists. " + "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) { return; } } diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui index 44e6e87..7e3c0d0 100644 --- a/ksayit/Freeverb_plugin/freeverb_setup.ui +++ b/ksayit/Freeverb_plugin/freeverb_setup.ui @@ -79,7 +79,7 @@ <b>Room</b> - + WordBreak|AlignCenter @@ -184,7 +184,7 @@ <b>Damp</b> - + WordBreak|AlignCenter @@ -283,7 +283,7 @@ <b>Wet</b> - + WordBreak|AlignCenter @@ -382,7 +382,7 @@ <b>Dry</b> - + WordBreak|AlignCenter @@ -481,7 +481,7 @@ <b>Width</b> - + WordBreak|AlignCenter diff --git a/ksayit/src/docbookparser.cpp b/ksayit/src/docbookparser.cpp index 8a5baa1..4cdad6a 100644 --- a/ksayit/src/docbookparser.cpp +++ b/ksayit/src/docbookparser.cpp @@ -58,7 +58,7 @@ TQString DocbookParser::node2raw(TQDomNode node) const void DocbookParser::parseBook(const TQDomElement &element, ListViewInterface *item) { kdDebug(100200) << "+++ entering parseBook()" << endl; - item->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + item->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( item ); @@ -89,7 +89,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface kdDebug(100200) << "+++ entering parseBookInfo()" << endl; Overview *overview = new Overview(item, NULL, i18n("Overview")); - overview->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + overview->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( overview ); @@ -122,7 +122,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface data = node.firstChild().toText(); if( !data.isNull() ){ Date *date = new Date(overview, NULL, i18n("Date")); - date->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + date->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); date->setText( 1, data.nodeValue() ); date->setValue(KSayItGlobal::RTFDATA, data.nodeValue()); date->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue()); @@ -140,7 +140,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface data = node.firstChild().toText(); if( !data.isNull() ){ ReleaseInfo *relinfo = new ReleaseInfo(overview, NULL, i18n("Release")); - relinfo->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + relinfo->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); relinfo->setText( 1, data.nodeValue() ); relinfo->setValue(KSayItGlobal::RTFDATA, data.nodeValue()); relinfo->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue()); @@ -176,7 +176,7 @@ void DocbookParser::parseAuthorGroup(const TQDomElement &element, ListViewInterf // item = overview AuthorGroup *authorgroup = new AuthorGroup(item, NULL, i18n("Author(s)")); - authorgroup->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + authorgroup->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( authorgroup ); @@ -203,7 +203,7 @@ void DocbookParser::parseAuthor(const TQDomElement &element, ListViewInterface * TQString s_surname = TQString(); Author *author = new Author(item); - author->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + author->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); TQDomNode node = element.firstChild(); while( !node.isNull() ){ @@ -241,7 +241,7 @@ void DocbookParser::parseKeywordSet(const TQDomElement &element, ListViewInterfa // item = overview KeywordSet *keywordset = new KeywordSet(item, NULL, i18n("Keywords")); - keywordset->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + keywordset->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( keywordset ); @@ -252,7 +252,7 @@ void DocbookParser::parseKeywordSet(const TQDomElement &element, ListViewInterfa data = node.firstChild().toText(); if( !data.isNull() ){ Keyword *keyword = new Keyword(keywordset); - keyword->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + keyword->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); keyword->setText(0, data.nodeValue() ); keyword->setValue(KSayItGlobal::RTFDATA, data.nodeValue() ); keyword->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue() ); @@ -275,7 +275,7 @@ void DocbookParser::parseAbstract(const TQDomElement &element, ListViewInterface // item = overview TQDomText data; Abstract *abstract = new Abstract(item, NULL, i18n("Abstract")); - abstract->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + abstract->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( abstract ); @@ -296,7 +296,7 @@ void DocbookParser::parseChapter(const TQDomElement &element, ListViewInterface TQDomText data; Chapter *chapter = new Chapter(item, NULL, i18n("Chapter")); - chapter->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + chapter->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( chapter ); @@ -326,7 +326,7 @@ void DocbookParser::parseSect1(const TQDomElement &element, ListViewInterface *i TQDomText data; Sect1 *sect1 = new Sect1(item, NULL, i18n("Section Level 1")); - sect1->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + sect1->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( sect1 ); @@ -356,7 +356,7 @@ void DocbookParser::parseSect2(const TQDomElement &element, ListViewInterface *i TQDomText data; Sect2 *sect2 = new Sect2(item, NULL, i18n("Section Level 2")); - sect2->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + sect2->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( sect2 ); @@ -386,7 +386,7 @@ void DocbookParser::parseSect3(const TQDomElement &element, ListViewInterface *i TQDomText data; Sect3 *sect3 = new Sect3(item, NULL, i18n("Section Level 3")); - sect3->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + sect3->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( sect3 ); @@ -416,7 +416,7 @@ void DocbookParser::parseSect4(const TQDomElement &element, ListViewInterface *i TQDomText data; Sect4 *sect4 = new Sect4(item, NULL, i18n("Section Level 4")); - sect4->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + sect4->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( sect4 ); @@ -446,7 +446,7 @@ void DocbookParser::parseSect5(const TQDomElement &element, ListViewInterface *i TQDomText data; Sect5 *sect5 = new Sect5(item, NULL, i18n("Section Level 4")); - sect5->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + sect5->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( sect5 ); @@ -473,7 +473,7 @@ void DocbookParser::parsePara(const TQDomElement &element, ListViewInterface *it kdDebug(100200) << "+++ entering parsePara()" << endl; Para *para = new Para(item, NULL, i18n("Paragraph")); - para->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + para->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( para ); diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp index 8eb34ab..5fd76c3 100644 --- a/ksayit/src/doctreeviewimpl.cpp +++ b/ksayit/src/doctreeviewimpl.cpp @@ -261,7 +261,7 @@ void DocTreeViewImpl::openFile(const KURL &url) docbookparser.parseBook(root , m_rootItem); m_idCounter = docbookparser.getIdCounter(); } else { - err = i18n("The file is of type %1, 'book' expected.").tqarg(root.tagName() ); + err = i18n("The file is of type %1, 'book' expected.").arg(root.tagName() ); throw(err); } @@ -779,7 +779,7 @@ void DocTreeViewImpl::slotDeleteItem() TQListViewItemIterator itr( m_rootItem ); while ( itr.current() ) { item = static_cast(itr.current()); - item->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); + item->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); ++itr; } @@ -797,7 +797,7 @@ void DocTreeViewImpl::slotNewBookInfo() if ( whoAmI == "RobDocument" ){ int newIndex = newIndexFirstChild(); Overview *overview = new Overview( m_currentItem, NULL, i18n("Overview") ); - overview->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + overview->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); m_contextmenuhandler->registerPopupMenu( overview ); } @@ -810,7 +810,7 @@ void DocTreeViewImpl::slotNewChapter() if ( whoAmI == "RobDocument" ){ int newIndex = newIndexLastChild(); Chapter *chapter = new Chapter( m_currentItem, NULL, i18n("Chapter") ); - chapter->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + chapter->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Chapter Title"); chapter->setText(0, newTitle ); @@ -829,7 +829,7 @@ void DocTreeViewImpl::slotNewKeywordSet() // New TreeView item int newIndex = newIndexFirstChild(); KeywordSet *keywordset = new KeywordSet(m_currentItem, NULL, i18n("Keywords")); - keywordset->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + keywordset->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); m_contextmenuhandler->registerPopupMenu( keywordset ); } @@ -843,7 +843,7 @@ void DocTreeViewImpl::slotNewKeyword() // New TreeView item int newIndex = newIndexLastChild(); Keyword *keyword = new Keyword(m_currentItem, NULL, i18n("Keyword")); - keyword->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + keyword->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); TQString newKeyword = i18n("New Keyword"); keyword->setText(0, newKeyword ); @@ -863,7 +863,7 @@ void DocTreeViewImpl::slotNewAbstract() // New TreeView item int newIndex = newIndexLastChild(); Abstract *abstract = new Abstract(m_currentItem, NULL, i18n("Abstract")); - abstract->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + abstract->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); m_contextmenuhandler->registerPopupMenu( abstract ); @@ -883,7 +883,7 @@ void DocTreeViewImpl::slotNewAuthorGroup() // New TreeView item int newIndex = newIndexFirstChild(); AuthorGroup *authorgroup = new AuthorGroup(m_currentItem, NULL, i18n("Author(s)")); - authorgroup->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + authorgroup->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); m_contextmenuhandler->registerPopupMenu( authorgroup ); @@ -903,7 +903,7 @@ void DocTreeViewImpl::slotNewAuthor() // New TreeView item int newIndex = newIndexLastChild(); Author *author = new Author(m_currentItem); - author->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + author->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); author->setText(0, i18n("Author") ); TQString newAuthor = i18n("Firstname Surname"); @@ -924,7 +924,7 @@ void DocTreeViewImpl::slotNewDate() // New TreeView item int newIndex = newIndexLastChild(); Date *date = new Date(m_currentItem, NULL, i18n("Date")); - date->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + date->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); // get current date TQString today; today = KGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true); @@ -945,7 +945,7 @@ void DocTreeViewImpl::slotNewReleaseInfo() // New TreeView item int newIndex = newIndexLastChild(); ReleaseInfo *relinfo = new ReleaseInfo(m_currentItem, NULL, i18n("Release")); - relinfo->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + relinfo->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); TQString newRelease = "0.0.0"; relinfo->setText( 1, newRelease ); @@ -979,7 +979,7 @@ void DocTreeViewImpl::slotNewParagraph() // New TreeView item int newIndex = newIndexLastChild(); Para *para = new Para(m_currentItem, NULL, i18n("Paragraph")); - para->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + para->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); m_contextmenuhandler->registerPopupMenu( para ); @@ -992,7 +992,7 @@ void DocTreeViewImpl::slotNewSection_1() if ( whoAmI == "Chapter" ){ int newIndex = newIndexLastChild(); Sect1 *sect1 = new Sect1(m_currentItem, NULL, i18n("Section Level 1")); - sect1->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + sect1->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Section Title"); sect1->setValue( KSayItGlobal::RTFHEADER, newTitle ); @@ -1009,7 +1009,7 @@ void DocTreeViewImpl::slotNewSection_2() if ( whoAmI == "Sect1" ){ int newIndex = newIndexLastChild(); Sect2 *sect2 = new Sect2(m_currentItem, NULL, i18n("Section Level 2")); - sect2->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + sect2->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Section Title"); sect2->setValue( KSayItGlobal::RTFHEADER, newTitle ); @@ -1026,7 +1026,7 @@ void DocTreeViewImpl::slotNewSection_3() if ( whoAmI == "Sect2" ){ int newIndex = newIndexLastChild(); Sect3 *sect3 = new Sect3(m_currentItem, NULL, i18n("Section Level 3")); - sect3->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + sect3->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Section Title"); sect3->setValue( KSayItGlobal::RTFHEADER, newTitle ); @@ -1043,7 +1043,7 @@ void DocTreeViewImpl::slotNewSection_4() if ( whoAmI == "Sect3" ){ int newIndex = newIndexLastChild(); Sect4 *sect4 = new Sect4(m_currentItem, NULL, i18n("Section Level 4")); - sect4->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + sect4->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Section Title"); sect4->setValue( KSayItGlobal::RTFHEADER, newTitle ); @@ -1060,7 +1060,7 @@ void DocTreeViewImpl::slotNewSection_5() if ( whoAmI == "Sect4" ){ int newIndex = newIndexLastChild(); Sect5 *sect5 = new Sect5(m_currentItem, NULL, i18n("Section Level 5")); - sect5->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); + sect5->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Section Title"); sect5->setValue( KSayItGlobal::RTFHEADER, newTitle ); @@ -1086,7 +1086,7 @@ int DocTreeViewImpl::newIndexFirstChild() item = static_cast(it.current()); itemIndex = (item->text(3)).toInt(); if ( itemIndex > currentIndex ){ - item->setText(3, TQString("%1").tqarg(itemIndex+1).rightJustify(8,'0') );; + item->setText(3, TQString("%1").arg(itemIndex+1).rightJustify(8,'0') );; } ++it; } @@ -1116,7 +1116,7 @@ int DocTreeViewImpl::newIndexLastChild() item = static_cast(it.current()); itemIndex = (item->text(3)).toInt(); if ( itemIndex > lastIndex ){ - item->setText(3, TQString("%1").tqarg(itemIndex+1).rightJustify(8,'0') ); + item->setText(3, TQString("%1").arg(itemIndex+1).rightJustify(8,'0') ); } ++it; } diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp index 25db48a..6cfb056 100644 --- a/ksayit/src/ksayit.cpp +++ b/ksayit/src/ksayit.cpp @@ -293,7 +293,7 @@ void KSayItApp::slotChangeBookmarkFilename(const TQString &newname) // copy old bookmarkfile to new file if ( m_currentBookmarkFile != newbkFile ){ if ( TQFile::exists(m_currentBookmarkFile) ){ - TQString command = TQString("cp %1 %2").tqarg(m_currentBookmarkFile).tqarg(newbkFile); + TQString command = TQString("cp %1 %2").arg(m_currentBookmarkFile).arg(newbkFile); system( command.ascii() ); } // install new BookmarkHandler based on the new file @@ -813,7 +813,7 @@ void KSayItApp::setActions(int actions) // Get the mask of supported actions from the plugin. int mask = m_kttslib->getActions(); - kdDebug(100200) << TQString("KSayItApp:PSA: %1").tqarg(mask, 0, 2) << endl; + kdDebug(100200) << TQString("KSayItApp:PSA: %1").arg(mask, 0, 2) << endl; // disable actions not supported by the plugin int ma = actions & mask; diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h index 97d2c95..4f9ed01 100644 --- a/ksayit/src/ksayit.h +++ b/ksayit/src/ksayit.h @@ -115,7 +115,7 @@ private slots: */ void slotTreeViewChanged(const TQString &str); - /** save general Options like all bar positions and status as well as the tqgeometry to + /** save general Options like all bar positions and status as well as the geometry to * the configuration file. */ void slotSaveOptions(); diff --git a/ksayit/src/saxhandler.cpp b/ksayit/src/saxhandler.cpp index 7e2d6aa..e8035dc 100644 --- a/ksayit/src/saxhandler.cpp +++ b/ksayit/src/saxhandler.cpp @@ -127,7 +127,7 @@ bool SaxHandler::characters(const TQString & ch) bool SaxHandler::fatalError(const TQXmlParseException &exc) { TQString err = i18n("Fatal error while parsing XML-Paragraph:\n"); - err += i18n("%1, Line: %2").tqarg(exc.message()).tqarg(exc.lineNumber()); + err += i18n("%1, Line: %2").arg(exc.message()).arg(exc.lineNumber()); KMessageBox::error(0, err, i18n("Fatal error") ); return false; } @@ -160,7 +160,7 @@ bool SaxHandler::internalEntityDecl(const TQString & name, bool SaxHandler::skippedEntity(const TQString &name) { - TQString warn = i18n("Unresolved entity found: %1.\n").tqarg(name); + TQString warn = i18n("Unresolved entity found: %1.\n").arg(name); warn += i18n("KSayIt does not support DocBook files with external entities. "); warn += i18n("Parsing can continue, but the resulting text will contain gaps."); diff --git a/kttsd/debian/man/kttsd.1 b/kttsd/debian/man/kttsd.1 index 4b8743b..7482fd8 100644 --- a/kttsd/debian/man/kttsd.1 +++ b/kttsd/debian/man/kttsd.1 @@ -62,8 +62,8 @@ Waits for a WM_NET compatible windowmanager .B --style