From c4c0cb5e7986051628a5e91f5d093c71ec98a33e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:36:40 -0600 Subject: Remove additional unneeded tq method conversions --- src/kile/configcheckerdlg.cpp | 8 ++--- src/kile/configcodecompletion.cpp | 2 +- src/kile/configstructure.cpp | 2 +- src/kile/configstructure.h | 2 +- src/kile/configtester.cpp | 2 +- src/kile/editorkeysequencemanager.cpp | 2 +- src/kile/includegraphicsdialog.cpp | 10 +++--- src/kile/kile.cpp | 18 +++++----- src/kile/kileabbrevview.cpp | 2 +- src/kile/kileconfigdialog.cpp | 2 +- src/kile/kiledocmanager.cpp | 18 +++++----- src/kile/kiledocumentinfo.cpp | 8 ++--- src/kile/kileedit.cpp | 2 +- src/kile/kileerrorhandler.cpp | 2 +- src/kile/kilegrepdialog.cpp | 2 +- src/kile/kilehelp.cpp | 2 +- src/kile/kileinfo.cpp | 12 +++---- src/kile/kilejscript.cpp | 8 ++--- src/kile/kilelauncher.cpp | 10 +++--- src/kile/kilemultitabbar.cpp | 16 ++++----- src/kile/kileproject.cpp | 2 +- src/kile/kileprojectdlgs.cpp | 2 +- src/kile/kileprojectview.cpp | 2 +- src/kile/kilestatsdlg.cpp | 10 +++--- src/kile/kilestdactions.cpp | 10 +++--- src/kile/kilestdtools.cpp | 2 +- src/kile/kilestructurewidget.cpp | 6 ++-- src/kile/kiletool.cpp | 18 +++++----- src/kile/kiletoolconfigwidget.cpp | 4 +-- src/kile/kiletoolmanager.cpp | 4 +-- src/kile/latexcmd.cpp | 2 +- src/kile/latexcmddialog.cpp | 6 ++-- src/kile/latexoutputfilter.cpp | 2 +- src/kile/managetemplatesdialog.cpp | 12 +++---- src/kile/mathenvdialog.cpp | 14 ++++---- src/kile/postscriptdialog.cpp | 2 +- src/kile/previewconfigwidget.cpp | 2 +- src/kile/previewwidget.cpp | 4 +-- src/kile/quickdocumentdialog.cpp | 20 +++++------ src/kile/quickpreview.cpp | 8 ++--- src/kile/scriptsmanagementwidget.cpp | 6 ++-- src/kile/tabulardialog.cpp | 62 +++++++++++++++++------------------ src/kile/tabulardialog.h | 2 +- src/kile/templates.cpp | 2 +- src/kile/texdocdialog.cpp | 6 ++-- src/kile/userhelp.cpp | 10 +++--- src/kile/userhelpdialog.cpp | 4 +-- src/kile/usermenudialog.cpp | 4 +-- 48 files changed, 179 insertions(+), 179 deletions(-) (limited to 'src') diff --git a/src/kile/configcheckerdlg.cpp b/src/kile/configcheckerdlg.cpp index 484d21f..af6d285 100644 --- a/src/kile/configcheckerdlg.cpp +++ b/src/kile/configcheckerdlg.cpp @@ -42,7 +42,7 @@ ResultItem::ResultItem(KListBox *lb, const TQString &tool, int status, const TQV TQString itemcolor = "black"; if ( tests[i].status() == ConfigTest::Failure ) itemcolor = "#FFA201"; else if ( tests[i].status() == ConfigTest::Critical ) itemcolor = "#AA0000"; - rt += TQString("
  • %2:  %3
    • ").tqarg(itemcolor).tqarg(tests[i].name()).tqarg(tests[i].resultText()); + rt += TQString("
  • %2:  %3
    • ").arg(itemcolor).arg(tests[i].name()).arg(tests[i].resultText()); } rt += ""; @@ -58,7 +58,7 @@ ResultItem::ResultItem(KListBox *lb, const TQString &tool, int status, const TQV statustr = i18n("Critical failure, Kile will not function properly"); } - m_richText = new TQSimpleRichText(rt.tqarg(color).tqarg(tool).tqarg(statustr), listBox()->font()); + m_richText = new TQSimpleRichText(rt.arg(color).arg(tool).arg(statustr), listBox()->font()); m_richText->setWidth(listBox()->width()); //this is for sorting only @@ -157,9 +157,9 @@ void ConfigChecker::finished(bool ok) TQString cap = i18n("Test Results"); if ( critical.count() > 0 ) - KMessageBox::error(this, i18n("The following tools did not pass all critical tests:
    %1
    Your system is not ready to use. Please consult the results to find out what to fix.    ").tqarg(critical.join(", ")), cap); + KMessageBox::error(this, i18n("The following tools did not pass all critical tests:
    %1
    Your system is not ready to use. Please consult the results to find out what to fix.    ").arg(critical.join(", ")), cap); else if ( failure.count() > 0 ) - KMessageBox::information(this, i18n("The following tools did not pass all tests:\n %1\nYou will still be able to use Kile; however, not all features are guaranteed to work.").tqarg(failure.join(", ")), cap); + KMessageBox::information(this, i18n("The following tools did not pass all tests:\n %1\nYou will still be able to use Kile; however, not all features are guaranteed to work.").arg(failure.join(", ")), cap); else KMessageBox::information(this, i18n("No problems detected, your system is ready to use."), cap); } diff --git a/src/kile/configcodecompletion.cpp b/src/kile/configcodecompletion.cpp index 758b3ff..9bd7abf 100644 --- a/src/kile/configcodecompletion.cpp +++ b/src/kile/configcodecompletion.cpp @@ -474,7 +474,7 @@ void ConfigCodeCompletion::addClicked() // check if this entry already exists if ( isListviewEntry(listview,basename) ) { - m_logwidget->printMsg(KileTool::Info,i18n("Wordlist '%1' is already used.").tqarg(basename),i18n("Complete")); + m_logwidget->printMsg(KileTool::Info,i18n("Wordlist '%1' is already used.").arg(basename),i18n("Complete")); continue; } diff --git a/src/kile/configstructure.cpp b/src/kile/configstructure.cpp index d7bc94d..39efcf4 100644 --- a/src/kile/configstructure.cpp +++ b/src/kile/configstructure.cpp @@ -271,7 +271,7 @@ void ConfigStructure::showSectioning(const TQStringList *list) TQString label1,label2,label3; for (uint i=0; i<5; ++i) { if ( i < list->count() ) { - label1 = TQString("%1").tqarg(i+1); + label1 = TQString("%1").arg(i+1); label2 = (*list)[i]; label3 = ( i < (uint)m_structurelevel->value() ) ? "open" : "close"; } else { diff --git a/src/kile/configstructure.h b/src/kile/configstructure.h index 4531afd..5c1ad58 100644 --- a/src/kile/configstructure.h +++ b/src/kile/configstructure.h @@ -45,7 +45,7 @@ class KileCenteredTableItem : public TQTableItem public: KileCenteredTableItem(TQTable *table,EditType et,const TQString& text) : TQTableItem(table,et,text) {} void paint(TQPainter* p,const TQColorGroup& cg,const TQRect& cr,bool selected); - int tqalignment() const { return TQt::AlignHCenter; } + int alignment() const { return TQt::AlignHCenter; } }; class KileTable : public TQTable diff --git a/src/kile/configtester.cpp b/src/kile/configtester.cpp index fa5d6c5..6319964 100644 --- a/src/kile/configtester.cpp +++ b/src/kile/configtester.cpp @@ -77,7 +77,7 @@ TQString ConfigTest::resultText() const { str += " (" + m_altArg + " => " + m_arg + ')'; if ( status()==Failure && s_msgFailure.contains(m_altArg) ) - str += TQString("
    (%1)").tqarg( s_msgFailure[m_altArg] ); + str += TQString("
    (%1)").arg( s_msgFailure[m_altArg] ); return str; } else if ( m_name == "version" ) diff --git a/src/kile/editorkeysequencemanager.cpp b/src/kile/editorkeysequencemanager.cpp index 10005b4..7d5340e 100644 --- a/src/kile/editorkeysequencemanager.cpp +++ b/src/kile/editorkeysequencemanager.cpp @@ -222,7 +222,7 @@ bool Recorder::eventFilter(TQObject* /* o */, TQEvent *e) { } TQString ExecuteJScriptAction::getDescription() const { - return i18n("Script execution of %1").tqarg(m_jScript->getFileName()); + return i18n("Script execution of %1").arg(m_jScript->getFileName()); } diff --git a/src/kile/includegraphicsdialog.cpp b/src/kile/includegraphicsdialog.cpp index 8b25947..a6df496 100644 --- a/src/kile/includegraphicsdialog.cpp +++ b/src/kile/includegraphicsdialog.cpp @@ -313,7 +313,7 @@ TQString IncludeGraphics::getInfo() TQFileInfo fi( edit_file->text() ); return "% " + fi.baseName() + '.' + fi.extension(true) - + TQString(": %1x%2 pixel").tqarg(wpx).tqarg(hpx) + + TQString(": %1x%2 pixel").arg(wpx).arg(hpx) + ", " + dpi + "dpi" + ", " + wcm + 'x' + hcm + " cm" + ", bb=" + edit_bb->text(); @@ -328,7 +328,7 @@ void IncludeGraphics::setInfo() if ( !edit_file->text().isEmpty() && getPictureSize(wpx,hpx,dpi,wcm,hcm) ) { - text = TQString("%1x%2 pixel").tqarg(wpx).tqarg(hpx) + text = TQString("%1x%2 pixel").arg(wpx).arg(hpx) + " / " + wcm + 'x' + hcm + " cm" + " (" + dpi + "dpi)"; } @@ -344,7 +344,7 @@ bool IncludeGraphics::getPictureSize(int &wpx, int &hpx, TQString &dpi, TQString wpx = m_width; hpx = m_height; - dpi = TQString("%1").tqarg((int)(m_resolution+0.5)); + dpi = TQString("%1").arg((int)(m_resolution+0.5)); // convert from inch to cm float w = (float)m_width / m_resolution * 2.54; @@ -484,9 +484,9 @@ void IncludeGraphics::slotProcessExited(KProcess* proc) int bbh = (int)( (float)m_height*72.0/m_resolution + 0.5 ); // take width and height as parameters for the bounding box - edit_bb->setText( TQString("0 0 ") + TQString("%1").tqarg(bbw) + edit_bb->setText( TQString("0 0 ") + TQString("%1").arg(bbw) + ' ' - + TQString("%1").tqarg(bbh) + + TQString("%1").arg(bbh) ); // show information diff --git a/src/kile/kile.cpp b/src/kile/kile.cpp index efaa208..27db743 100644 --- a/src/kile/kile.cpp +++ b/src/kile/kile.cpp @@ -918,16 +918,16 @@ void Kile::updateModeStatus() if (project) { if (m_singlemode) - statusBar()->changeItem(i18n("Project: %1").tqarg(project->name()), ID_HINTTEXT); + statusBar()->changeItem(i18n("Project: %1").arg(project->name()), ID_HINTTEXT); else - statusBar()->changeItem(i18n("Project: %1 (Master document: %2)").tqarg(project->name()).tqarg(shortName), ID_HINTTEXT); + statusBar()->changeItem(i18n("Project: %1 (Master document: %2)").arg(project->name()).arg(shortName), ID_HINTTEXT); } else { if (m_singlemode) statusBar()->changeItem(i18n("Normal mode"), ID_HINTTEXT); else - statusBar()->changeItem(i18n("Master document: %1").tqarg(shortName), ID_HINTTEXT); + statusBar()->changeItem(i18n("Master document: %1").arg(shortName), ID_HINTTEXT); } if (m_singlemode) @@ -937,7 +937,7 @@ void Kile::updateModeStatus() } else { - ModeAction->setText(i18n("Normal mode (current master document: %1)").tqarg(shortName)); + ModeAction->setText(i18n("Normal mode (current master document: %1)").arg(shortName)); ModeAction->setChecked(true); } @@ -1453,8 +1453,8 @@ void Kile::initMenu() << "tag_textit" << "tag_textsl" << "tag_textbf" << "tag_underline" << "tag_texttt" << "tag_textsc" << "tag_emph" << "tag_strong" << "tag_rmfamily" << "tag_sffamily" << "tag_ttfamily" - << "tag_mdseries" << "tag_bfseries" << "tag_uptqshape" - << "tag_ittqshape" << "tag_sltqshape" << "tag_sctqshape" + << "tag_mdseries" << "tag_bfseries" << "tag_upshape" + << "tag_itshape" << "tag_slshape" << "tag_scshape" << "tag_newline" << "tag_newpage" << "tag_linebreak" << "tag_pagebreak" << "tag_bigskip" << "tag_medskip" << "tag_smallskip" << "tag_hspace" << "tag_hspace*" << "tag_vspace" << "tag_vspace*" @@ -1654,10 +1654,10 @@ void Kile::insertTag(const KileAction::TagData& data,const TQStringList &pkgs) if( warnPkgs.count() > 0 ) { if( warnPkgs.count() == 1 ) - m_logWidget->printMsg(KileTool::Error, i18n("You have to include the package %1.").tqarg(warnPkgs.join(",")), + m_logWidget->printMsg(KileTool::Error, i18n("You have to include the package %1.").arg(warnPkgs.join(",")), i18n("Insert text")); else - m_logWidget->printMsg(KileTool::Error, i18n("You have to include the packages %1.").tqarg(warnPkgs.join(",")), + m_logWidget->printMsg(KileTool::Error, i18n("You have to include the packages %1.").arg(warnPkgs.join(",")), i18n("Insert text")); } } @@ -2026,7 +2026,7 @@ void Kile::toggleMode() while ( (pos = (int)shortName.find('/')) != -1 ) shortName.remove(0,pos+1); - ModeAction->setText(i18n("Normal mode (current master document: %1)").tqarg(shortName)); + ModeAction->setText(i18n("Normal mode (current master document: %1)").arg(shortName)); ModeAction->setChecked(true); m_singlemode=false; } diff --git a/src/kile/kileabbrevview.cpp b/src/kile/kileabbrevview.cpp index 49880a6..0886b08 100644 --- a/src/kile/kileabbrevview.cpp +++ b/src/kile/kileabbrevview.cpp @@ -193,7 +193,7 @@ void KileAbbrevView::changeAbbreviation(KListViewItem *item, const TQString &abb void KileAbbrevView::deleteAbbreviation(KListViewItem *item) { TQString abbrev = item->text(ALVabbrev); - TQString message = i18n("Delete the abbreviation '%1'?").tqarg(abbrev); + TQString message = i18n("Delete the abbreviation '%1'?").arg(abbrev); if ( KMessageBox::questionYesNo( this, "
    " + message + "
    ", i18n("Delete Abbreviation") ) == KMessageBox::Yes ) diff --git a/src/kile/kileconfigdialog.cpp b/src/kile/kileconfigdialog.cpp index 207d6f2..adae9a4 100644 --- a/src/kile/kileconfigdialog.cpp +++ b/src/kile/kileconfigdialog.cpp @@ -20,7 +20,7 @@ // - items are shown as a tree list // - encoding config page and spelling page are removed, // because settings are also avaiblable with Kate -// - tqgeometry of the dialog are saved and restored, because +// - geometry of the dialog are saved and restored, because // the initial values may be bad in some languages // 2007-03-17 dani diff --git a/src/kile/kiledocmanager.cpp b/src/kile/kiledocmanager.cpp index 642e8e9..6fe3e38 100644 --- a/src/kile/kiledocmanager.cpp +++ b/src/kile/kiledocmanager.cpp @@ -569,7 +569,7 @@ Kate::View* Manager::loadTemplate(TemplateItem *sel) if (!tempdoc->openURL(KURL(sel->path()))) { - KMessageBox::error(m_ki->parentWidget(), i18n("Could not find template: %1").tqarg(sel->name()),i18n("File Not Found")); + KMessageBox::error(m_ki->parentWidget(), i18n("Could not find template: %1").arg(sel->name()),i18n("File Not Found")); } else { @@ -818,7 +818,7 @@ void Manager::fileSaveAll(bool amAutoSaving, bool disUntitled ) else { KILE_DEBUG()<<"backing up failed ("< "<mainWidget())) // check for writing possibility { - int r = KMessageBox::warningContinueCancel(m_ki->parentWidget(), i18n("A file with the name \"%1\" exists already. Do you want to overwrite it ?").tqarg(saveURL.fileName()), i18n("Overwrite File ?"), KGuiItem(i18n("&Overwrite")), TQString()); + int r = KMessageBox::warningContinueCancel(m_ki->parentWidget(), i18n("A file with the name \"%1\" exists already. Do you want to overwrite it ?").arg(saveURL.fileName()), i18n("Overwrite File ?"), KGuiItem(i18n("&Overwrite")), TQString()); if(r != KMessageBox::Continue) { continue; @@ -1224,12 +1224,12 @@ void Manager::addToProject(KileProject* project, const KURL & url) if (project->contains(realurl)) { - emit printMsg(KileTool::Info,i18n("The file %1 is already member of the project %2").tqarg(realurl.filename()).tqarg(project->name()),i18n("Add to Project")); + emit printMsg(KileTool::Info,i18n("The file %1 is already member of the project %2").arg(realurl.filename()).arg(project->name()),i18n("Add to Project")); return; } else if(!fi.exists() || !fi.isReadable()) { - emit printMsg( KileTool::Info,i18n("The file %1 can not be added because it does not exist or is not readable").tqarg(realurl.filename()),i18n("Add to Project")); + emit printMsg( KileTool::Info,i18n("The file %1 can not be added because it does not exist or is not readable").arg(realurl.filename()),i18n("Add to Project")); return; } @@ -1713,7 +1713,7 @@ void Manager::cleanUpTempFiles(const KURL &url, bool silent) } if ( extlist.count() == 0 ) - emit printMsg(KileTool::Warning, i18n("Nothing to clean for %1").tqarg(fileName), i18n("Clean")); + emit printMsg(KileTool::Warning, i18n("Nothing to clean for %1").arg(fileName), i18n("Clean")); else { for ( uint i = 0 ; i < extlist.count() ; ++i ) @@ -1722,7 +1722,7 @@ void Manager::cleanUpTempFiles(const KURL &url, bool silent) KILE_DEBUG() << "About to remove file = " << file.name() << endl; file.remove(); } - emit printMsg(KileTool::Info, i18n("Cleaning %1 : %2").tqarg(fileName).tqarg(extlist.join(" ")), i18n("Clean")); + emit printMsg(KileTool::Info, i18n("Cleaning %1 : %2").arg(fileName).arg(extlist.join(" ")), i18n("Clean")); } } @@ -1895,7 +1895,7 @@ TQStringList Manager::getProjectFiles() void Manager::dontOpenWarning(KileProjectItem *item, const TQString &action, const TQString &filetype) { - emit printMsg(KileTool::Info, i18n("not opened: %1 (%2)").tqarg(item->url().path()).tqarg(filetype), action); + emit printMsg(KileTool::Info, i18n("not opened: %1 (%2)").arg(item->url().path()).arg(filetype), action); } KileProjectItem* Manager::selectProjectFileItem(const TQString &label) diff --git a/src/kile/kiledocumentinfo.cpp b/src/kile/kiledocumentinfo.cpp index d3e2e71..8318fe5 100644 --- a/src/kile/kiledocumentinfo.cpp +++ b/src/kile/kiledocumentinfo.cpp @@ -118,7 +118,7 @@ KURL Info::renameIfExist(const KURL& url) TQString newURL = KInputDialog::getText( i18n("File Already Exists"), i18n("A file with filename '%1' already exists.
    Please provide \ - another one, or click \"Cancel\" to overwrite it.").tqarg(ret.fileName()), + another one, or click \"Cancel\" to overwrite it.").arg(ret.fileName()), ret.filename(), &isOK); if(!isOK) @@ -1158,7 +1158,7 @@ void LaTeXInfo::updateStruct() { if( (*it).type == KileStruct::NewEnvironment) { - m_newCommands.append(TQString("\\begin{%1}%2%3").tqarg(m).tqarg(optArg).tqarg(mandArgs)); + m_newCommands.append(TQString("\\begin{%1}%2%3").arg(m).arg(optArg).arg(mandArgs)); } else m_newCommands.append(m + optArg + mandArgs); @@ -1166,8 +1166,8 @@ void LaTeXInfo::updateStruct() } if( (*it).type == KileStruct::NewEnvironment) { - m_newCommands.append(TQString("\\begin{%1}%3").tqarg(m).tqarg(mandArgs)); - m_newCommands.append(TQString("\\end{%1}").tqarg(m)); + m_newCommands.append(TQString("\\begin{%1}%3").arg(m).arg(mandArgs)); + m_newCommands.append(TQString("\\end{%1}").arg(m)); } else m_newCommands.append(m + mandArgs); diff --git a/src/kile/kileedit.cpp b/src/kile/kileedit.cpp index a9203d3..85f4ae1 100644 --- a/src/kile/kileedit.cpp +++ b/src/kile/kileedit.cpp @@ -1025,7 +1025,7 @@ TQStringList EditorExtension::findOpenedEnvironmentList(Kate::View *view, bool p col = env.col; if ( position ) - envlist << env.name + TQString(",%1,%2").tqarg(row).tqarg(col); + envlist << env.name + TQString(",%1,%2").arg(row).arg(col); else envlist << env.name; diff --git a/src/kile/kileerrorhandler.cpp b/src/kile/kileerrorhandler.cpp index f1dde52..c435f05 100644 --- a/src/kile/kileerrorhandler.cpp +++ b/src/kile/kileerrorhandler.cpp @@ -117,7 +117,7 @@ void KileErrorHandler::showLogResults(const TQString &src) m_ki->outputFilter()->setSource(src); TQFileInfo fi(src); TQString lf = fi.dirPath(true) + '/' + fi.baseName(true) + ".log"; - m_ki->logWidget()->printMsg(KileTool::Info, i18n("Detecting errors (%1), please wait ...").tqarg(lf), i18n("Log") ); + m_ki->logWidget()->printMsg(KileTool::Info, i18n("Detecting errors (%1), please wait ...").arg(lf), i18n("Log") ); if ( ! m_ki->outputFilter()->Run( lf ) ) { diff --git a/src/kile/kilegrepdialog.cpp b/src/kile/kilegrepdialog.cpp index 9eec12f..39c91a3 100644 --- a/src/kile/kilegrepdialog.cpp +++ b/src/kile/kilegrepdialog.cpp @@ -684,7 +684,7 @@ void KileGrepDialog::slotSearch() TQRegExp re( getPattern() ); if ( ! re.isValid() ) { - KMessageBox::error( 0, i18n("Invalid regular expression: %1").tqarg(re.errorString()), i18n("Grep Tool Error") ); + KMessageBox::error( 0, i18n("Invalid regular expression: %1").arg(re.errorString()), i18n("Grep Tool Error") ); return; } diff --git a/src/kile/kilehelp.cpp b/src/kile/kilehelp.cpp index 127fbff..b659c49 100644 --- a/src/kile/kilehelp.cpp +++ b/src/kile/kilehelp.cpp @@ -298,7 +298,7 @@ namespace KileHelp void Help::noHelpAvailableFor(const TQString &word) { - m_manager->info()->logWidget()->printMsg(KileTool::Error, i18n("Sorry, no help available for %1.").tqarg(word), i18n("Help")); + m_manager->info()->logWidget()->printMsg(KileTool::Error, i18n("Sorry, no help available for %1.").arg(word), i18n("Help")); } TQString Help::getKeyword(Kate::View *view) diff --git a/src/kile/kileinfo.cpp b/src/kile/kileinfo.cpp index c2da7e2..bb0c7a2 100644 --- a/src/kile/kileinfo.cpp +++ b/src/kile/kileinfo.cpp @@ -198,16 +198,16 @@ const TQStringList* KileInfo::retrieveList(const TQStringList* (KileDocument::In { KILE_DEBUG() << "\tusing root item " << root->url().fileName() << endl; - TQPtrList tqchildren; - tqchildren.append(root); - root->allChildren(&tqchildren); + TQPtrList children; + children.append(root); + root->allChildren(&children); const TQStringList *list; - for (uint i=0; i < tqchildren.count(); ++i) + for (uint i=0; i < children.count(); ++i) { - KILE_DEBUG() << "\t" << tqchildren.at(i)->url().fileName() << endl; - list = (tqchildren.at(i)->getInfo()->*getit)(); + KILE_DEBUG() << "\t" << children.at(i)->url().fileName() << endl; + list = (children.at(i)->getInfo()->*getit)(); if (list) { for (uint i=0; i < list->count(); ++i) diff --git a/src/kile/kilejscript.cpp b/src/kile/kilejscript.cpp index 70dafa2..76b0e98 100644 --- a/src/kile/kilejscript.cpp +++ b/src/kile/kilejscript.cpp @@ -497,12 +497,12 @@ namespace KileJScript { if(o.isValid()) { Value lineValue = o.get(m_interpreter->globalExec(), "line"); if(lineValue.type() == NumberType) { - KMessageBox::sorry(0L, i18n("The following exception has occurred at line %1 during execution of the script:\n%2").tqarg(lineValue.toInt32(m_interpreter->globalExec())).tqarg(value.toString(m_interpreter->globalExec()).qstring()), i18n("Exception")); + KMessageBox::sorry(0L, i18n("The following exception has occurred at line %1 during execution of the script:\n%2").arg(lineValue.toInt32(m_interpreter->globalExec())).arg(value.toString(m_interpreter->globalExec()).qstring()), i18n("Exception")); return; } } } - KMessageBox::sorry(0L, i18n("The following exception has occurred during execution of the script:\n%1").tqarg(value.toString(m_interpreter->globalExec()).qstring()), i18n("Exception")); + KMessageBox::sorry(0L, i18n("The following exception has occurred during execution of the script:\n%1").arg(value.toString(m_interpreter->globalExec()).qstring()), i18n("Exception")); } } @@ -544,7 +544,7 @@ m_kileInfo->viewManager()->currentView()->down();*/ if(requiredVersionTagExp.search(firstLine) != -1) { TQString requiredKileVersion = requiredVersionTagExp.cap(2); if(compareVersionStrings(requiredKileVersion, kileFullVersion) > 0) { - KMessageBox::sorry(0L, i18n("Version %1 of Kile is at least required to execute the script \"%2\". The execution has been aborted.").tqarg(requiredKileVersion).tqarg(script->getName()), i18n("Version Error")); + KMessageBox::sorry(0L, i18n("Version %1 of Kile is at least required to execute the script \"%2\". The execution has been aborted.").arg(requiredKileVersion).arg(script->getName()), i18n("Version Error")); return; } } @@ -779,7 +779,7 @@ m_kileInfo->viewManager()->currentView()->down();*/ ScriptExecutionAction::ScriptExecutionAction(unsigned int id, KileJScript::Manager *manager, KActionCollection* parent) : KAction(TQString(), KShortcut(), NULL, NULL, parent, TQString("script_execution_" + TQString::number(id)).ascii()), m_manager(manager), m_id(id) { const KileJScript::JScript *script = m_manager->getScript(m_id); Q_ASSERT(script); - setText(i18n("Execution of %1").tqarg(script->getName())); + setText(i18n("Execution of %1").arg(script->getName())); connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(executeScript())); } diff --git a/src/kile/kilelauncher.cpp b/src/kile/kilelauncher.cpp index 507ee70..1899e06 100644 --- a/src/kile/kilelauncher.cpp +++ b/src/kile/kilelauncher.cpp @@ -172,7 +172,7 @@ if ( path.isNull() ) { - emit(message(Error, i18n("There is no executable named \"%1\" in your path.").tqarg(exe))); + emit(message(Error, i18n("There is no executable named \"%1\" in your path.").arg(exe))); return false; } else @@ -180,7 +180,7 @@ TQFileInfo fi(path); if ( ! fi.isExecutable() ) { - emit(message(Error, i18n("You do not have permission to run %1.").tqarg(path))); + emit(message(Error, i18n("You do not have permission to run %1.").arg(path))); return false; } } @@ -208,7 +208,7 @@ if (m_proc->exitStatus() != 0) { type = Error; - emit(message(type,i18n("finished with exit status %1").tqarg(m_proc->exitStatus()))); + emit(message(type,i18n("finished with exit status %1").arg(m_proc->exitStatus()))); } if (type == Info) @@ -282,7 +282,7 @@ KLibFactory *factory = KLibLoader::self()->factory(m_libName); if (factory == 0) { - emit(message(Error, i18n("Could not find the %1 library.").tqarg(m_libName))); + emit(message(Error, i18n("Could not find the %1 library.").arg(m_libName))); return false; } @@ -293,7 +293,7 @@ if (m_part == 0) { - emit(message(Error, i18n("Could not create component %1 from the library %2.").tqarg(m_className).tqarg(m_libName))); + emit(message(Error, i18n("Could not create component %1 from the library %2.").arg(m_className).arg(m_libName))); emit(done(Failed)); return false; } diff --git a/src/kile/kilemultitabbar.cpp b/src/kile/kilemultitabbar.cpp index 3a40d3c..1e21d34 100644 --- a/src/kile/kilemultitabbar.cpp +++ b/src/kile/kilemultitabbar.cpp @@ -115,7 +115,7 @@ void KileMultiTabBarInternal::setStyle(enum KileMultiTabBar::KileMultiTabBarStyl mainLayout->setAutoAdd(true); } - viewport()->tqrepaint(); + viewport()->repaint(); } void KileMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) @@ -193,8 +193,8 @@ void KileMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev) void KileMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) { /* KILE_DEBUG()<<"KileMultiTabBarInternal::resizeEvent"<tqgeometry()<geometry()< visibleTabList; for(KileMultiTabBarTab *tab = m_tabs.first(); tab; tab = m_tabs.next()) { @@ -392,7 +392,7 @@ void KileMultiTabBarInternal::setPosition(enum KileMultiTabBar::KileMultiTabBarP m_position=pos; for (uint i=0;isetTabsPosition(m_position); - viewport()->tqrepaint(); + viewport()->repaint(); } KileMultiTabBarButton::KileMultiTabBarButton(const TQPixmap& pic,const TQString& text, TQPopupMenu *popup, @@ -453,13 +453,13 @@ void KileMultiTabBarButton::slotClicked() void KileMultiTabBarButton::setPosition(KileMultiTabBar::KileMultiTabBarPosition pos) { m_position=pos; - tqrepaint(); + repaint(); } void KileMultiTabBarButton::setStyle(KileMultiTabBar::KileMultiTabBarStyle style) { m_style=style; - tqrepaint(); + repaint(); } void KileMultiTabBarButton::hideEvent( TQHideEvent* he) { @@ -544,7 +544,7 @@ void KileMultiTabBarTab::setTabsPosition(KileMultiTabBar::KileMultiTabBarPositio } setPosition(pos); -// tqrepaint(); +// repaint(); } void KileMultiTabBarTab::setIcon(const TQString& icon) @@ -1011,7 +1011,7 @@ void KileMultiTabBar::fontChange(const TQFont& /* oldFont */) { for (uint i=0;icount();i++) tabs()->at(i)->resize(); - tqrepaint(); + repaint(); } TQPtrList* KileMultiTabBar::tabs() {return m_internal->tabs();} diff --git a/src/kile/kileproject.cpp b/src/kile/kileproject.cpp index 64b864e..f4bbd26 100644 --- a/src/kile/kileproject.cpp +++ b/src/kile/kileproject.cpp @@ -368,7 +368,7 @@ bool KileProject::load() { if(KMessageBox::warningYesNo(0L,i18n("The project file of %1 was created by a newer version of kile.\ Opening it can lead to unexpected results.\n\ - Do you really want to continue (not recommended)?").tqarg(m_name), + Do you really want to continue (not recommended)?").arg(m_name), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(),TQString(),KMessageBox::Dangerous) == KMessageBox::No) { m_invalid=true; diff --git a/src/kile/kileprojectdlgs.cpp b/src/kile/kileprojectdlgs.cpp index dbc5446..8ac9b59 100644 --- a/src/kile/kileprojectdlgs.cpp +++ b/src/kile/kileprojectdlgs.cpp @@ -435,7 +435,7 @@ void KileNewProjectDlg::slotOk() if ( TQFileInfo( TQDir(fi.dirPath()) , file().stripWhiteSpace()).exists() ) { - if (KMessageBox::warningYesNo(this, i18n("The file \"%1\" already exists, overwrite it?").tqarg(file()), + if (KMessageBox::warningYesNo(this, i18n("The file \"%1\" already exists, overwrite it?").arg(file()), i18n("File Already Exists")) == KMessageBox::No) return; } diff --git a/src/kile/kileprojectview.cpp b/src/kile/kileprojectview.cpp index 0bae84b..0e9c7fe 100644 --- a/src/kile/kileprojectview.cpp +++ b/src/kile/kileprojectview.cpp @@ -370,7 +370,7 @@ KileProjectViewItem* KileProjectView::folder(const KileProjectItem *pi, KileProj if ( parent->type() == KileType::Folder ) return parent; - // we are looking at the tqchildren, if there is an existing folder for this type + // we are looking at the children, if there is an existing folder for this type KileProjectViewItem *folder; // determine the foldername for this type diff --git a/src/kile/kilestatsdlg.cpp b/src/kile/kilestatsdlg.cpp index 2585b59..0be7c72 100644 --- a/src/kile/kilestatsdlg.cpp +++ b/src/kile/kilestatsdlg.cpp @@ -51,13 +51,13 @@ KileStatsDlg::KileStatsDlg(KileProject *project, KileDocument::TextInfo* docinfo if(!m_project) // the active doc doesn't belong to a project { - setCaption(i18n("Statistics for %1").tqarg(m_docinfo->getDoc()->url().fileName())); + setCaption(i18n("Statistics for %1").arg(m_docinfo->getDoc()->url().fileName())); stats = m_docinfo->getStatistics(); fillWidget(stats,summary); } else // active doc belongs to a project { - setCaption(i18n("Statistics for the Project %1").tqarg(m_project->name())); + setCaption(i18n("Statistics for the Project %1").arg(m_project->name())); KILE_DEBUG() << "Project file is " << project->baseURL() << endl; KileProjectItemList *items = project->items(); @@ -169,11 +169,11 @@ void KileStatsDlg::convertText(TQString* text, bool forLaTeX) // the bool determ text->append("\\begin{tabular}{ll}\n"); if(m_project && activePageIndex()) - text->append(i18n("Statistics for project %1, file %2").tqarg(m_project->name()).tqarg(name)); + text->append(i18n("Statistics for project %1, file %2").arg(m_project->name()).arg(name)); else if(m_project) - text->append(i18n("Statistics for project %1").tqarg(m_project->name())); + text->append(i18n("Statistics for project %1").arg(m_project->name())); else if(m_docinfo->getDoc()->url().isValid()) - text->append(i18n("Statistics for %1").tqarg(m_docinfo->getDoc()->url().fileName())); + text->append(i18n("Statistics for %1").arg(m_docinfo->getDoc()->url().fileName())); else text->append(i18n("Statistics for Untitled")); diff --git a/src/kile/kilestdactions.cpp b/src/kile/kilestdactions.cpp index 6fb837e..d13ec32 100644 --- a/src/kile/kilestdactions.cpp +++ b/src/kile/kilestdactions.cpp @@ -82,7 +82,7 @@ void setupStdTags(KileInfo *ki, KMainWindow *parent) new KileAction::Tag("\\item","item",TQt::ALT+TQt::SHIFT+TQt::Key_H, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_item","\\item ",TQString(),6,0, i18n("\\item[label] Hello!")); (void) new KileAction::Tag(i18n("Tabbing - \\begin{tabbing}"),"tabbing",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_env_tabbing" ,"\\begin{tabbing}\n","%E\n\\end{tabbing} ",0,1,i18n("The tabbing environment provides a way to align text in columns.\n\\begin{tabbing}\ntext \\= more text \\= still more text \\= last text \\\\\nsecond row \\> \\> more \\\\\n\\end{tabbing}\nCommands :\n\\= Sets a tab stop at the current position.\n\\> Advances to the next tab stop.\n\\< Allows you to put something to the left of the local margin without changing the margin. Can only be used at the start of the line.\n\\+ Moves the left margin of the next and all the following commands one tab stop to the right\n\\- Moves the left margin of the next and all the following commands one tab stop to the left\n\\' Moves everything that you have typed so far in the current column to the right of the previous column, flush against the current column's tab stop. \n\\` Allows you to put text flush right against any tab stop, including tab stop 0\n\\kill Sets tab stops without producing text.\n\\a In a tabbing environment, the commands \\=, \\' and \\` do not produce accents as normal. Instead, the commands \\a=, \\a' and \\a` are used.")); - (void) new KileAction::Tag("Tabular - \\begin{tabular}","tabular",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_env_tabular" ,"\\begin{tabular}{","}\n%E\n\\end{tabular} ",16,0,i18n("\\begin{tabular}[pos]{cols}\ncolumn 1 entry & column 2 entry ... & column n entry \\\\\n...\n\\end{tabular}\npos : Specifies the vertical position; default is tqalignment on the center of the environment.\n t - align on top row\n b - align on bottom row\ncols : Specifies the column formatting.\n l - A column of left-aligned items.\n r - A column of right-aligned items.\n c - A column of centered items.\n | - A vertical line the full height and depth of the environment.\n @{text} - this inserts text in every row.\nThe \\hline command draws a horizontal line the width of the table.\nThe \\cline{i-j} command draws horizontal lines across the columns specified, beginning in column i and ending in column j,\nThe \\vline command draws a vertical line extending the full height and depth of its row.")); + (void) new KileAction::Tag("Tabular - \\begin{tabular}","tabular",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_env_tabular" ,"\\begin{tabular}{","}\n%E\n\\end{tabular} ",16,0,i18n("\\begin{tabular}[pos]{cols}\ncolumn 1 entry & column 2 entry ... & column n entry \\\\\n...\n\\end{tabular}\npos : Specifies the vertical position; default is alignment on the center of the environment.\n t - align on top row\n b - align on bottom row\ncols : Specifies the column formatting.\n l - A column of left-aligned items.\n r - A column of right-aligned items.\n c - A column of centered items.\n | - A vertical line the full height and depth of the environment.\n @{text} - this inserts text in every row.\nThe \\hline command draws a horizontal line the width of the table.\nThe \\cline{i-j} command draws horizontal lines across the columns specified, beginning in column i and ending in column j,\nThe \\vline command draws a vertical line extending the full height and depth of its row.")); (void) new KileAction::Tag("Multicolumn Cells - \\multicolumn","multicolumn",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)),parent->actionCollection(),"tag_multicolumn","\\multicolumn{","}{}{} ",13,0,i18n("\\multicolumn{cols}{pos}{text}\ncol, specifies the number of columns to span.\npos specifies the formatting of the entry: c for centered, l for flushleft, r for flushright.\ntext specifies what text is to make up the entry.")); (void) new KileAction::Tag(i18n("Horizontal Line - \\hline"),"hline",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_hline" ,"\\hline ",TQString(),7,0,i18n("The \\hline command draws a horizontal line the width of the table.")); (void) new KileAction::Tag(i18n("Vertical Line - \\vline"),"vline",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_vline" ,"\\vline ",TQString(),7,0,i18n("The \\vline command draws a vertical line extending the full height and depth of its row.")); @@ -209,10 +209,10 @@ void setupStdTags(KileInfo *ki, KMainWindow *parent) (void) new KileAction::Tag("Medium - \\mdseries",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_mdseries", "\\mdseries", TQString(), 9); (void) new KileAction::Tag("Bold - \\bfseries",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_bfseries", "\\bfseries", TQString(), 9); - (void) new KileAction::Tag("Upright - \\uptqshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_uptqshape", "\\uptqshape", TQString(), 8); - (void) new KileAction::Tag("Italic - \\ittqshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_ittqshape", "\\ittqshape", TQString(), 8); - (void) new KileAction::Tag("Slanted - \\sltqshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_sltqshape", "\\sltqshape", TQString(), 8); - (void) new KileAction::Tag("Smallcaps - \\sctqshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_sctqshape", "\\sctqshape", TQString(), 8); + (void) new KileAction::Tag("Upright - \\upshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_upshape", "\\upshape", TQString(), 8); + (void) new KileAction::Tag("Italic - \\itshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_itshape", "\\itshape", TQString(), 8); + (void) new KileAction::Tag("Slanted - \\slshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_slshape", "\\slshape", TQString(), 8); + (void) new KileAction::Tag("Smallcaps - \\scshape",0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), ac,"tag_scshape", "\\scshape", TQString(), 8); } diff --git a/src/kile/kilestdtools.cpp b/src/kile/kilestdtools.cpp index c4c9429..de9a94b 100644 --- a/src/kile/kilestdtools.cpp +++ b/src/kile/kilestdtools.cpp @@ -382,7 +382,7 @@ namespace KileTool if ( !read1 && !read2 ) { - sendMessage(Error, i18n("Unable to find %1 or %2; if you are trying to view some other HTML file, go to Settings->Configure Kile->Tools->ViewHTML->Advanced.").tqarg(file1.absFilePath()).tqarg(file2.absFilePath())); + sendMessage(Error, i18n("Unable to find %1 or %2; if you are trying to view some other HTML file, go to Settings->Configure Kile->Tools->ViewHTML->Advanced.").arg(file1.absFilePath()).arg(file2.absFilePath())); return false; } diff --git a/src/kile/kilestructurewidget.cpp b/src/kile/kilestructurewidget.cpp index 9f4eb6a..819d7c5 100644 --- a/src/kile/kilestructurewidget.cpp +++ b/src/kile/kilestructurewidget.cpp @@ -402,8 +402,8 @@ namespace KileWidget /* some items have a special action: - KileStruct::Sect: The new item is saved in m_lastSectioning, so that all following entries - can be inserted as tqchildren. \part will drop back to level 0 of the Listview, - all other sectioning commands will be tqchildren of the last sectioning item. + can be inserted as children. \part will drop back to level 0 of the Listview, + all other sectioning commands will be children of the last sectioning item. If a \label command follows in the same or the next line, it is assigned to this item. - KileStruct::BeginFloat: @@ -714,7 +714,7 @@ namespace KileWidget } } else{ - if ( KMessageBox::warningYesNo(this, i18n("Cannot find the included file. The file does not exist, is not readable or Kile is unable to determine the correct path to it. The filename causing this error was: %1.\nDo you want to create this file?").tqarg(fname), i18n("Cannot Find File")) + if ( KMessageBox::warningYesNo(this, i18n("Cannot find the included file. The file does not exist, is not readable or Kile is unable to determine the correct path to it. The filename causing this error was: %1.\nDo you want to create this file?").arg(fname), i18n("Cannot Find File")) == KMessageBox::Yes) { emit(fileNew(url)); diff --git a/src/kile/kiletool.cpp b/src/kile/kiletool.cpp index 2ef8afe..65caa4f 100644 --- a/src/kile/kiletool.cpp +++ b/src/kile/kiletool.cpp @@ -211,7 +211,7 @@ namespace KileTool //Is there an active document? Only check if the source file is not explicitly set. if ( (m_source.isNull()) && (m_manager->info()->activeTextDocument() == 0L) ) { - sendMessage(Error, msg(NeedActiveDoc).tqarg(name())); + sendMessage(Error, msg(NeedActiveDoc).arg(name())); return false; } @@ -234,13 +234,13 @@ namespace KileTool TQFileInfo fi(source()); if ( (flags() & NeedSourceExists) && !fi.exists() ) { - sendMessage(Error, msg(NeedSourceExists).tqarg(fi.absFilePath())); + sendMessage(Error, msg(NeedSourceExists).arg(fi.absFilePath())); return false; } if ( (flags() & NeedSourceRead) && !fi.isReadable() ) { - sendMessage(Error, msg(NeedSourceRead).tqarg(fi.absFilePath())); + sendMessage(Error, msg(NeedSourceRead).arg(fi.absFilePath())); return false; } @@ -324,13 +324,13 @@ namespace KileTool if ( (flags() & NeedTargetDirExec ) && (! info.isExecutable()) ) { - sendMessage(Error, msg(NeedTargetDirExec).tqarg(m_targetdir)); + sendMessage(Error, msg(NeedTargetDirExec).arg(m_targetdir)); return false; } if ((flags() & NeedTargetDirWrite) && (! info.isWritable()) ) { - sendMessage(Error, msg(NeedTargetDirWrite).tqarg(m_targetdir).tqarg(m_name)); + sendMessage(Error, msg(NeedTargetDirWrite).arg(m_targetdir).arg(m_name)); return false; } @@ -338,13 +338,13 @@ namespace KileTool if ( (flags() & NeedTargetExists) && ( ! info.exists() )) { - sendMessage(Error, msg(NeedTargetExists).tqarg(m_targetdir).tqarg(m_target)); + sendMessage(Error, msg(NeedTargetExists).arg(m_targetdir).arg(m_target)); return false; } if ( (flags() & NeedTargetRead) && ( ! info.isReadable() )) { - sendMessage(Error, msg(NeedTargetRead).tqarg(m_targetdir).tqarg(m_target)); + sendMessage(Error, msg(NeedTargetRead).arg(m_targetdir).arg(m_target)); return false; } @@ -543,7 +543,7 @@ namespace KileTool if (!isRoot) { - return manager()->queryContinue(i18n("The document %1 is not a LaTeX root document; continue anyway?").tqarg(source()), i18n("Continue?")); + return manager()->queryContinue(i18n("The document %1 is not a LaTeX root document; continue anyway?").arg(source()), i18n("Continue?")); } return true; @@ -662,7 +662,7 @@ namespace KileTool } else { - sendMessage(Error, i18n("Unknown tool %1.").tqarg(tools[i])); + sendMessage(Error, i18n("Unknown tool %1.").arg(tools[i])); emit(done(this, Failed)); return ConfigureFailed; } diff --git a/src/kile/kiletoolconfigwidget.cpp b/src/kile/kiletoolconfigwidget.cpp index 1600491..7cdb68d 100644 --- a/src/kile/kiletoolconfigwidget.cpp +++ b/src/kile/kiletoolconfigwidget.cpp @@ -236,7 +236,7 @@ namespace KileWidget if (szHint.height() > 0) m_configWidget->m_stackExtra->setMaximumHeight(szHint.height()); } - m_configWidget->tqlayout()->tqinvalidate(); + m_configWidget->tqlayout()->invalidate(); } void ToolConfig::writeDefaults() @@ -442,7 +442,7 @@ namespace KileWidget void ToolConfig::removeTool() { //KILE_DEBUG() << "==ToolConfig::removeTool()=====================" << endl; - if ( KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove the tool %1?").tqarg(m_current)) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove the tool %1?").arg(m_current)) == KMessageBox::Continue ) { KConfig *config = m_config; TQStringList cfgs = KileTool::configNames(m_current, config); diff --git a/src/kile/kiletoolmanager.cpp b/src/kile/kiletoolmanager.cpp index 089c06b..3f086bc 100644 --- a/src/kile/kiletoolmanager.cpp +++ b/src/kile/kiletoolmanager.cpp @@ -146,7 +146,7 @@ namespace KileTool Base* pTool = m_factory->create(tool); if (!pTool) { - m_log->printMsg(Error, i18n("Unknown tool %1.").tqarg(tool)); + m_log->printMsg(Error, i18n("Unknown tool %1.").arg(tool)); return ConfigureFailed; } @@ -369,7 +369,7 @@ namespace KileTool if ( ! retrieveEntryMap(tool->name(), map, true, true, cfg) ) { - m_log->printMsg(Error, i18n("Cannot find the tool %1 in the configuration database.").tqarg(tool->name())); + m_log->printMsg(Error, i18n("Cannot find the tool %1 in the configuration database.").arg(tool->name())); return false; } diff --git a/src/kile/latexcmd.cpp b/src/kile/latexcmd.cpp index aa01076..7bec0be 100644 --- a/src/kile/latexcmd.cpp +++ b/src/kile/latexcmd.cpp @@ -405,7 +405,7 @@ TQString LatexCommands::configString(LatexCmdAttributes &attr,bool env) TQChar ch = getAttrChar( attr.type ); if ( ch == '?' ) return TQString(); - TQString s = TQString("%1,").tqarg(ch); + TQString s = TQString("%1,").arg(ch); // all environments/commands have starred attribute if ( attr.starred ) diff --git a/src/kile/latexcmddialog.cpp b/src/kile/latexcmddialog.cpp index 3e90d07..324a932 100644 --- a/src/kile/latexcmddialog.cpp +++ b/src/kile/latexcmddialog.cpp @@ -143,7 +143,7 @@ NewLatexCommand::NewLatexCommand(TQWidget *parent, const TQString &caption, { m_coOption->insertItem("[tcb]"); m_coOption->insertItem("[lcr]"); - TQWhatsThis::add(m_coOption,i18n("Define an optional tqalignment parameter.")); + TQWhatsThis::add(m_coOption,i18n("Define an optional alignment parameter.")); } else { @@ -757,7 +757,7 @@ void LatexCommandsDialog::slotUserDefinedClicked() void LatexCommandsDialog::slotHelp() { TQString mode = ( getListviewMode() == lvEnvMode ) ? i18n("'environment'") : i18n("'command'"); - if ( KMessageBox::warningContinueCancel(this, i18n("All your %1 settings will be overwritten with the default settings, are you sure you want to continue?").tqarg(mode)) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("All your %1 settings will be overwritten with the default settings, are you sure you want to continue?").arg(mode)) == KMessageBox::Continue ) { if ( getListviewMode() == lvEnvMode ) resetEnvironments(); @@ -820,7 +820,7 @@ void LatexCommandsDialog::writeConfig(KListView *listview, const TQString &group continue; } - // look for tqchildren + // look for children for ( TQListViewItem *curchild=cur->firstChild(); curchild; curchild=curchild->nextSibling() ) { TQString key = curchild->text(0); diff --git a/src/kile/latexoutputfilter.cpp b/src/kile/latexoutputfilter.cpp index accbfa0..9f6ba1f 100644 --- a/src/kile/latexoutputfilter.cpp +++ b/src/kile/latexoutputfilter.cpp @@ -638,7 +638,7 @@ void LatexOutputFilter::sendProblems() //print detailed error info for(unsigned int i=0; i < m_InfoList->count(); ++i) { - Message = TQString("%1:%2:%3").tqarg((*m_InfoList)[i].source()).tqarg((*m_InfoList)[i].sourceLine()).tqarg((*m_InfoList)[i].message()); + Message = TQString("%1:%2:%3").arg((*m_InfoList)[i].source()).arg((*m_InfoList)[i].sourceLine()).arg((*m_InfoList)[i].message()); switch ( (*m_InfoList)[i].type() ) { case LatexOutputInfo::itmBadBox : type = KileTool::ProblemBadBox; break; diff --git a/src/kile/managetemplatesdialog.cpp b/src/kile/managetemplatesdialog.cpp index c049b59..c20d6d6 100644 --- a/src/kile/managetemplatesdialog.cpp +++ b/src/kile/managetemplatesdialog.cpp @@ -71,7 +71,7 @@ ManageTemplatesDialog::ManageTemplatesDialog(KileTemplate::Manager *templateMana m_nameEdit = new KLineEdit(fileName, page); nameLayout->addWidget(m_nameEdit); - nameLayout->addWidget(new TQLabel(i18n("Type: %1").tqarg(KileInfo::documentTypeToString(m_templateType)), page)); + nameLayout->addWidget(new TQLabel(i18n("Type: %1").arg(KileInfo::documentTypeToString(m_templateType)), page)); TQHBoxLayout *iconLayout = new TQHBoxLayout(topLayout, spacingHint()); iconLayout->addWidget(new TQLabel(i18n("Icon:"), page)); @@ -210,19 +210,19 @@ void ManageTemplatesDialog::addTemplate() { } if (!KIO::NetAccess::exists(iconURL, true, kapp->mainWidget())) { - KMessageBox::error(this, i18n("Sorry, but the icon file: %1\ndoes not seem to exist. Please choose a new icon.").tqarg(icon)); + KMessageBox::error(this, i18n("Sorry, but the icon file: %1\ndoes not seem to exist. Please choose a new icon.").arg(icon)); return; } if (!KIO::NetAccess::exists(m_sourceURL, true, kapp->mainWidget())) { - KMessageBox::error(this, i18n("Sorry, but the file: %1\ndoes not seem to exist. Maybe you forgot to save the file?").tqarg(m_sourceURL.prettyURL())); + KMessageBox::error(this, i18n("Sorry, but the file: %1\ndoes not seem to exist. Maybe you forgot to save the file?").arg(m_sourceURL.prettyURL())); return; } TQListViewItem* item = m_templateList->selectedItem(); if(!item && m_templateManager->searchForTemplate(templateName, m_templateType)) { - KMessageBox::error(this, i18n("Sorry, but a template named \"%1\" already exists.\nPlease remove it first.").tqarg(templateName)); + KMessageBox::error(this, i18n("Sorry, but a template named \"%1\" already exists.\nPlease remove it first.").arg(templateName)); return; } @@ -231,7 +231,7 @@ void ManageTemplatesDialog::addTemplate() { TemplateListViewItem *templateItem = dynamic_cast(item); Q_ASSERT(templateItem); KileTemplate::Info templateInfo = templateItem->getTemplateInfo(); - if (KMessageBox::warningYesNo(this, i18n("You are about to replace the template \"%1\"; are you sure?").tqarg(templateInfo.name)) == KMessageBox::No) { + if (KMessageBox::warningYesNo(this, i18n("You are about to replace the template \"%1\"; are you sure?").arg(templateInfo.name)) == KMessageBox::No) { reject(); return; } @@ -266,7 +266,7 @@ bool ManageTemplatesDialog::removeTemplate() return false; } - if (KMessageBox::warningYesNo(this, i18n("You are about to remove the template \"%1\"; are you sure?").tqarg(templateInfo.name)) == KMessageBox::No) { + if (KMessageBox::warningYesNo(this, i18n("You are about to remove the template \"%1\"; are you sure?").arg(templateInfo.name)) == KMessageBox::No) { return false; } diff --git a/src/kile/mathenvdialog.cpp b/src/kile/mathenvdialog.cpp index b1b7068..4b21f3a 100644 --- a/src/kile/mathenvdialog.cpp +++ b/src/kile/mathenvdialog.cpp @@ -125,8 +125,8 @@ MathEnvironmentDialog::MathEnvironmentDialog(TQWidget *parent, KConfig *config, TQWhatsThis::add(m_coEnvironment,i18n("Choose an environment.")); TQWhatsThis::add(m_cbStarred,i18n("Use the starred version of this environment.")); TQWhatsThis::add(m_spRows,i18n("Choose the number of table rows.")); - TQWhatsThis::add(m_spCols,i18n("Choose the number of table columns or tqalignment groups.")); - TQWhatsThis::add(m_edSpace,i18n("Define an extra LaTeX command to separate tqalignment groups.")); + TQWhatsThis::add(m_spCols,i18n("Choose the number of table columns or alignment groups.")); + TQWhatsThis::add(m_edSpace,i18n("Define an extra LaTeX command to separate alignment groups.")); TQWhatsThis::add(m_coTabulator,i18n("Choose one of some predefined tabulators.")); TQWhatsThis::add(m_coDisplaymath,i18n("Some environments are only valid in math mode. You can surround them with one of these display math modes.")); TQWhatsThis::add(m_cbBullets,i18n("Insert bullets in each cell. Alt+Ctrl+Right and Alt+Ctrl+Left will move very quick from one cell to another.")); @@ -318,8 +318,8 @@ void MathEnvironmentDialog::slotOk() } else { - displaymathbegin = TQString("\\begin{%1}\n").tqarg(mathmode); - displaymathend = TQString("\\end{%1}\n").tqarg(mathmode); + displaymathbegin = TQString("\\begin{%1}\n").arg(mathmode); + displaymathend = TQString("\\end{%1}\n").arg(mathmode); } } } @@ -329,12 +329,12 @@ void MathEnvironmentDialog::slotOk() TQString parameter; if ( isGroupsParameterEnv() ) - parameter = TQString("{%2}").tqarg(numgroups); + parameter = TQString("{%2}").arg(numgroups); else if ( isParameterEnv() ) parameter = '{' + bullet + '}'; // open environment - m_td.tagBegin += TQString("\\begin{%1}").tqarg(envname) + parameter + '\n'; + m_td.tagBegin += TQString("\\begin{%1}").arg(envname) + parameter + '\n'; for ( int row=0; row" + s + "", "Postscript tools" ) == KMessageBox::No ) { diff --git a/src/kile/previewconfigwidget.cpp b/src/kile/previewconfigwidget.cpp index afc2283..c7b7d91 100644 --- a/src/kile/previewconfigwidget.cpp +++ b/src/kile/previewconfigwidget.cpp @@ -74,7 +74,7 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic TQString tool1 = i18n("dvi --> png") + sep + i18n("(uses dvipng)"); TQString tool2 = i18n("dvi --> ps --> png") + sep + i18n("(uses dvips/convert)"); TQString tool3 = i18n("pdf --> png") + sep + i18n("(uses convert)"); - TQString description = TQString("%1:
    • %2
    • %3
    • %4
    ").tqarg(title).tqarg(tool1).tqarg(tool2).tqarg(tool3); + TQString description = TQString("%1:
    • %2
    • %3
    • %4
    ").arg(title).arg(tool1).arg(tool2).arg(tool3); TQLabel *labelDescription = new TQLabel(description, gbResolution); TQLabel *labelDvipng = new TQLabel(i18n("dvipng:"), gbResolution); diff --git a/src/kile/previewwidget.cpp b/src/kile/previewwidget.cpp index 0350261..a200410 100644 --- a/src/kile/previewwidget.cpp +++ b/src/kile/previewwidget.cpp @@ -113,7 +113,7 @@ void PreviewWidget::showActivePreview(const TQString &text,const TQString &textf KileTool::Base *pngConverter = m_info->toolFactory()->create(tool); if ( ! pngConverter ) { - showError( TQString(i18n("Could not run '%1' for QuickPreview.").tqarg(tool)) ); + showError( TQString(i18n("Could not run '%1' for QuickPreview.").arg(tool)) ); return; } pngConverter->setSource(m_info->quickPreview()->getPreviewFile(extension)); @@ -160,7 +160,7 @@ void PreviewWidget::drawImage() m_previewImage = new TQImage (m_info->quickPreview()->getPreviewFile ("png")); setFixedSize( m_previewImage->width()+6,m_previewImage->height()+6 ); - tqrepaint (); + repaint (); } void PreviewWidget::toolDestroyed() diff --git a/src/kile/quickdocumentdialog.cpp b/src/kile/quickdocumentdialog.cpp index 66648f4..7537690 100644 --- a/src/kile/quickdocumentdialog.cpp +++ b/src/kile/quickdocumentdialog.cpp @@ -102,7 +102,7 @@ public: EditableCheckListItem(TQCheckListItem *parent, const TQString &text); virtual void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); }; EditableCheckListItem::EditableCheckListItem(TQCheckListItem *parent, const TQString &text) @@ -111,7 +111,7 @@ EditableCheckListItem::EditableCheckListItem(TQCheckListItem *parent, const TQSt } void EditableCheckListItem::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { if ( column == 1) { TQColorGroup colorgroup( cg ); @@ -123,7 +123,7 @@ void EditableCheckListItem::paintCell( TQPainter *p, const TQColorGroup &cg, } TQCheckListItem::paintCell( p, colorgroup, column, width, TQt::AlignHCenter ); } else { - TQCheckListItem::paintCell( p, cg, column, width, tqalignment ); + TQCheckListItem::paintCell( p, cg, column, width, alignment ); } } @@ -971,7 +971,7 @@ bool QuickDocument::addComboboxEntries(KComboBox *combo, const TQString &title,c TQString s = list[i].stripWhiteSpace(); // entries must match a regular expression if ( combolist.findIndex(s) != -1 ) - KMessageBox::error( this, i18n("%1 '%2' already exists.").tqarg(title).tqarg(s) ); + KMessageBox::error( this, i18n("%1 '%2' already exists.").arg(title).arg(s) ); else { combolist += s; KILE_DEBUG() << "\tinsert new " << title << ": " << s << endl; @@ -1258,7 +1258,7 @@ void QuickDocument::writePackagesConfig() // write listview entry m_config->writeEntry(cur->text(0),packageentry); - // look for tqchildren + // look for children for (TQListViewItem *curchild=cur->firstChild(); curchild; curchild=curchild->nextSibling()) { // add child to packages list TQString option = cur->text(0) + '!' + curchild->text(0); @@ -1374,7 +1374,7 @@ bool QuickDocument::isListviewChild(TQListView *listview,const TQString &entry, for ( TQListViewItem *cur=listview->firstChild(); cur; cur=cur->nextSibling() ) { // look for the main entry if ( cur->text(0) == entry ) { - // look for tqchildren + // look for children for (TQListViewItem *curchild=cur->firstChild(); curchild; curchild=curchild->nextSibling()) { if ( option == curchild->text(0) ) return true; @@ -1701,7 +1701,7 @@ void QuickDocument::slotDocumentClassDelete() TQString documentclass = m_cbDocumentClass->currentText(); KILE_DEBUG() << "==QuickDocument::slotDocumentClassDelete()============" << endl; - if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the document class list?").tqarg(documentclass), i18n("Remove Document Class"))==KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the document class list?").arg(documentclass), i18n("Remove Document Class"))==KMessageBox::Continue) { KILE_DEBUG() << "\tlazy delete class: " << documentclass << endl; @@ -1769,7 +1769,7 @@ void QuickDocument::slotTypefaceSizeAdd() void QuickDocument::slotTypefaceSizeDelete() { - if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the fontsize list?").tqarg(m_cbPaperSize->currentText()), i18n("Remove Fontsize"))==KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the fontsize list?").arg(m_cbPaperSize->currentText()), i18n("Remove Fontsize"))==KMessageBox::Continue) { int i=m_cbPaperSize->currentItem(); m_cbPaperSize->removeItem(i); @@ -1800,7 +1800,7 @@ void QuickDocument::slotPaperSizeAdd() void QuickDocument::slotPaperSizeDelete() { - if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the papersize list?").tqarg(m_cbPaperSize->currentText()), i18n("Remove Papersize"))==KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Do you want to remove \"%1\" from the papersize list?").arg(m_cbPaperSize->currentText()), i18n("Remove Papersize"))==KMessageBox::Continue) { int i=m_cbPaperSize->currentItem(); m_cbPaperSize->removeItem(i); @@ -2249,7 +2249,7 @@ bool QuickDocumentInputDialog::checkListEntries(const TQString &title, const TQS // entries must match a regular expression TQRegExp reg(pattern); if ( ! reg.exactMatch(s) ) { - KMessageBox::error( this, i18n("%1 '%2' is not allowed.").tqarg(title).tqarg(s) ); + KMessageBox::error( this, i18n("%1 '%2' is not allowed.").arg(title).arg(s) ); return false; } } diff --git a/src/kile/quickpreview.cpp b/src/kile/quickpreview.cpp index 8152ee0..380d364 100644 --- a/src/kile/quickpreview.cpp +++ b/src/kile/quickpreview.cpp @@ -179,7 +179,7 @@ bool QuickPreview::run(const TQString &text,const TQString &textfilename,int sta TQString previewtask = KileConfig::previewTask(); if ( ! map.contains(previewtask) ) { - showError(TQString(i18n("Could not run QuickPreview:\nunknown task '%1'").tqarg(previewtask))); + showError(TQString(i18n("Could not run QuickPreview:\nunknown task '%1'").arg(previewtask))); return false; } @@ -226,7 +226,7 @@ bool QuickPreview::run(const TQString &text,const TQString &textfilename,int sta KileTool::PreviewLaTeX *latex = (KileTool::PreviewLaTeX *)m_ki->toolFactory()->create(previewlist[pvLatex],false); if ( !latex ) { - showError(TQString(i18n("Could not run '%1' for QuickPreview.").tqarg("LaTeX"))); + showError(TQString(i18n("Could not run '%1' for QuickPreview.").arg("LaTeX"))); return false; } @@ -238,7 +238,7 @@ bool QuickPreview::run(const TQString &text,const TQString &textfilename,int sta dvips = m_ki->toolFactory()->create(previewlist[pvDvips]); if ( !dvips ) { - showError(TQString(i18n("Could not run '%1' for QuickPreview.").tqarg(dvipstool))); + showError(TQString(i18n("Could not run '%1' for QuickPreview.").arg(dvipstool))); return false; } } @@ -251,7 +251,7 @@ bool QuickPreview::run(const TQString &text,const TQString &textfilename,int sta viewer = m_ki->toolFactory()->create(previewlist[pvViewer],false); if ( !viewer ) { - showError(TQString(i18n("Could not run '%1' for QuickPreview.").tqarg(viewertool))); + showError(TQString(i18n("Could not run '%1' for QuickPreview.").arg(viewertool))); return false; } } diff --git a/src/kile/scriptsmanagementwidget.cpp b/src/kile/scriptsmanagementwidget.cpp index 7d6bd0f..400a491 100644 --- a/src/kile/scriptsmanagementwidget.cpp +++ b/src/kile/scriptsmanagementwidget.cpp @@ -75,13 +75,13 @@ void JScriptListViewItem::setText(int column, const TQString & str) { TQString description = (action == 0L) ? TQString() : action->getDescription(); switch(pair.first) { case 1: - KMessageBox::sorry(0L, i18n("The sequence \"%1\" is already assigned to the action \"%2\"").tqarg(str).tqarg(description), i18n("Sequence Already Assigned")); + KMessageBox::sorry(0L, i18n("The sequence \"%1\" is already assigned to the action \"%2\"").arg(str).arg(description), i18n("Sequence Already Assigned")); break; case 2: - KMessageBox::sorry(0L, i18n("The sequence \"%1\" is a subsequence of \"%2\", which is already assigned to the action \"%3\"").tqarg(str).tqarg(pair.second).tqarg(description), i18n("Sequence Already Assigned")); + KMessageBox::sorry(0L, i18n("The sequence \"%1\" is a subsequence of \"%2\", which is already assigned to the action \"%3\"").arg(str).arg(pair.second).arg(description), i18n("Sequence Already Assigned")); break; case 3: - KMessageBox::sorry(0L, i18n("The shorter sequence \"%1\" is already assigned to the action \"%2\"").tqarg(pair.second).tqarg(description), i18n("Sequence Already Assigned")); + KMessageBox::sorry(0L, i18n("The shorter sequence \"%1\" is already assigned to the action \"%2\"").arg(pair.second).arg(description), i18n("Sequence Already Assigned")); break; } } diff --git a/src/kile/tabulardialog.cpp b/src/kile/tabulardialog.cpp index 27a936c..364de37 100644 --- a/src/kile/tabulardialog.cpp +++ b/src/kile/tabulardialog.cpp @@ -290,7 +290,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data, colorgrouptqlayout->addWidget( m_ccBgcolor,0,1 ); colorgrouptqlayout->addWidget( m_ccTextcolor,1,1 ); - // tqalignment group + // alignment group TQButtonGroup *aligngroup = new TQButtonGroup( i18n("Alignment"),page); aligngroup->setColumnLayout(0, Qt::Vertical ); aligngroup->tqlayout()->setSpacing( 6 ); @@ -442,9 +442,9 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data, connect(m_cbSep,TQT_SIGNAL(clicked()),this, TQT_SLOT(slotSeparatorClicked())); } - TQWhatsThis::add(m_coHeader,i18n("Column or cell tqalignment.")); + TQWhatsThis::add(m_coHeader,i18n("Column or cell alignment.")); TQWhatsThis::add(m_cbBold,i18n("Set bold font series.")); - TQWhatsThis::add(m_cbItalic,i18n("Set italic font tqshape.")); + TQWhatsThis::add(m_cbItalic,i18n("Set italic font shape.")); TQWhatsThis::add(m_rbAlignleft,i18n("The text will be aligned at the left border of the cell.")); TQWhatsThis::add(m_rbAligncenter,i18n("The text will be centered.")); TQWhatsThis::add(m_rbAlignright,i18n("The text will be aligned at the right border of the cell.")); @@ -460,7 +460,7 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data, TQWhatsThis::add(m_pbFrame4,i18n("Set all border lines.")); TQWhatsThis::add(m_cellframe,i18n("Set user defined border lines. A mouse click into one of the four border ranges will set or clear this special border line.")); - setButtonWhatsThis(User1,i18n("Reset all settings to standard cell attributes: left tqalignment, normal font series and tqshape, white background color, black text color, no border lines.")); + setButtonWhatsThis(User1,i18n("Reset all settings to standard cell attributes: left alignment, normal font series and shape, white background color, black text color, no border lines.")); } ////////////////////////////// read data ////////////////////////////// @@ -634,7 +634,7 @@ TabularItem::TabularItem(TQTable* table, const TabularCell::Data &data) m_data = data; } -int TabularItem::tqalignment() const +int TabularItem::alignment() const { return m_data.align | TQt::AlignVCenter; } @@ -668,7 +668,7 @@ void TabularItem::paint(TQPainter *p,const TQColorGroup &cg,const TQRect &cr,boo p->setFont(f); } - p->drawText( 2,0,w-4,h,tqalignment(), text() ); + p->drawText( 2,0,w-4,h,alignment(), text() ); } //END TabularItem @@ -1119,7 +1119,7 @@ TQPopupMenu *TabularTable::createPopupMenu() void TabularTable::insertPopupAlign(TQPopupMenu *popup,bool header) { - // tqalignment + // alignment int align = 0; //calculate @@ -2137,13 +2137,13 @@ TQStringList TabularDialog::sortColorTable(TQMap &colors) sred = convertColor(r); sgreen = convertColor(g); sblue = convertColor(b); - s = TQString("{rgb}{%1,%2,%3}").tqarg(sred).tqarg(sgreen).tqarg(sblue); + s = TQString("{rgb}{%1,%2,%3}").arg(sred).arg(sgreen).arg(sblue); } else { - s = TQString("{gray}{%1}").tqarg(convertColor(r)); + s = TQString("{gray}{%1}").arg(convertColor(r)); } - list << TQString("\\definecolor{tc%1}%2").tqarg(it.data()).tqarg(s); + list << TQString("\\definecolor{tc%1}%2").arg(it.data()).arg(s); } list.sort(); @@ -2236,21 +2236,21 @@ void TabularDialog::slotOk() if ( colinfo[col].bgcolor != whitename ) { TQChar color = defineColor(colinfo[col].bgcolor,colortable,colorchar); - colorcommand += TQString("\\columncolor{tc%1}").tqarg(color); + colorcommand += TQString("\\columncolor{tc%1}").arg(color); pkgColortbl = true; } if ( colinfo[col].textcolor != blackname ) { TQChar color = defineColor(colinfo[col].textcolor,colortable,colorchar); - colorcommand += TQString("\\color{tc%1}").tqarg(color); + colorcommand += TQString("\\color{tc%1}").arg(color); pkgColor = true; } if ( ! colorcommand.isEmpty() ) { if ( s.find('>') >= 0 ) - s = s.replace(">{}",TQString(">{%1}").tqarg(colorcommand)); + s = s.replace(">{}",TQString(">{%1}").arg(colorcommand)); else - preamble += TQString(">{%1}").tqarg(colorcommand); + preamble += TQString(">{%1}").arg(colorcommand); pkgArray = true; } @@ -2285,7 +2285,7 @@ void TabularDialog::slotOk() if ( bgcolor != whitename ) { TQChar color = defineColor(cnt.nameBgcolor,colortable,colorchar); - textline += TQString("\\rowcolor{tc%1}\n").tqarg(color); + textline += TQString("\\rowcolor{tc%1}\n").arg(color); pkgColortbl = true; } @@ -2297,11 +2297,11 @@ void TabularDialog::slotOk() { // check for multicolumn and initialize string parameter int colspan = cellitem->colSpan(); - s1 = ( colspan > 1 ) ? TQString("%1").tqarg(colspan) : TQString(); + s1 = ( colspan > 1 ) ? TQString("%1").arg(colspan) : TQString(); s2 = s3 = TQString(); // Now look, if this cell(s) must be defined as multicolumn, because - // colspan is greater than 1, or the left vline, bgcolor or tqalignment + // colspan is greater than 1, or the left vline, bgcolor or alignment // is different from the preamble bool useMulticolumn = ( ( colspan > 1 ) || @@ -2325,10 +2325,10 @@ void TabularDialog::slotOk() if ( cellitem->m_data.bgcolor.name() != whitename ) { TQChar color = defineColor(cellitem->m_data.bgcolor.name(),colortable,colorchar); - s2 += TQString(">{\\columncolor{tc%1}}").tqarg(color); + s2 += TQString(">{\\columncolor{tc%1}}").arg(color); pkgColortbl = true; } - // tqalignment + // alignment //if ( cellitem->m_data.align!=colinfo[col].align ) { switch ( cellitem->m_data.align ) { @@ -2350,13 +2350,13 @@ void TabularDialog::slotOk() } if ( colinfo[col].italic != (cellitem->m_data.font & TabularCell::cfItalic) ) { - s3 += "\\ittqshape"; + s3 += "\\itshape"; } if ( colinfo[col].textcolor != cellitem->m_data.textcolor.name() ) { TQChar color = defineColor(cellitem->m_data.textcolor.name(),colortable,colorchar); - s3 += TQString("\\color{tc%1}").tqarg(color); + s3 += TQString("\\color{tc%1}").arg(color); pkgColor = true; } if ( ! s3.isEmpty() ) @@ -2379,7 +2379,7 @@ void TabularDialog::slotOk() // build the whole cell entry if ( useMulticolumn ) { - textline += TQString("\\mc{%1}{%2}{%3}").tqarg(colspan).tqarg(s2).tqarg(s3); + textline += TQString("\\mc{%1}{%2}{%3}").arg(colspan).arg(s2).arg(s3); multicolumn = true; } else @@ -2445,7 +2445,7 @@ void TabularDialog::slotOk() // build the tag to insert if ( m_cbCenter->isChecked() ) - m_td.tagBegin = TQString("\\begin{%1}\n").tqarg(centername); + m_td.tagBegin = TQString("\\begin{%1}\n").arg(centername); else if ( group ) m_td.tagBegin = "{% \n"; else @@ -2468,22 +2468,22 @@ void TabularDialog::slotOk() } // add environment command - m_td.tagBegin += TQString("\\begin{%1}").tqarg(envname); + m_td.tagBegin += TQString("\\begin{%1}").arg(envname); // add width for starred versions if ( m_cbStarred->isChecked() ) - m_td.tagBegin += TQString("{%1}").tqarg(bullet); - // add optional tqalignment parameter + m_td.tagBegin += TQString("{%1}").arg(bullet); + // add optional alignment parameter TQString envparameter = ( m_coParameter->isEnabled() ) ? m_coParameter->currentText() : TQString(); if ( ! envparameter.isEmpty() ) - m_td.tagBegin += TQString("[%1]").tqarg(envparameter); + m_td.tagBegin += TQString("[%1]").arg(envparameter); // add preamble - m_td.tagBegin += TQString("{%1}").tqarg(preamble); + m_td.tagBegin += TQString("{%1}").arg(preamble); m_td.tagBegin += getEol(0,true) + '\n'; // close environment - m_td.tagEnd += TQString("\\end{%1}\n").tqarg(envname); + m_td.tagEnd += TQString("\\end{%1}\n").arg(envname); if ( m_cbCenter->isChecked() ) - m_td.tagEnd += TQString("\\end{%1}\n").tqarg(centername); + m_td.tagEnd += TQString("\\end{%1}\n").arg(centername); else if ( group ) m_td.tagEnd += "}\n"; @@ -2543,7 +2543,7 @@ TQString TabularDialog::getEol(int row, bool top) { TQString cmd = ( booktabs ) ? "cmidrule" : "cline"; for ( uint i=0; imainWidget()); } else { - KMessageBox::error(0, i18n("Could not find a folder to save %1 to.\nCheck whether you have a .kde folder with write permissions in your home folder.").tqarg(fileName)); + KMessageBox::error(0, i18n("Could not find a folder to save %1 to.\nCheck whether you have a .kde folder with write permissions in your home folder.").arg(fileName)); return false; } } diff --git a/src/kile/texdocdialog.cpp b/src/kile/texdocdialog.cpp index a9d8090..7a7cf9f 100644 --- a/src/kile/texdocdialog.cpp +++ b/src/kile/texdocdialog.cpp @@ -451,7 +451,7 @@ void TexDocDialog::slotListViewDoubleClicked(TQListViewItem *item,const TQPoint filename = searchFile(texdocfile,m_texmfPath,"tex"); if ( filename.isEmpty() ) { - KMessageBox::error(this,i18n("Could not find '%1'").tqarg(filename)); + KMessageBox::error(this,i18n("Could not find '%1'").arg(filename)); return; } } @@ -506,10 +506,10 @@ void TexDocDialog::slotSearchClicked() if ( searchlist.count() > 0 ) { m_texdocs->clear(); - showToc(i18n("Search results for keyword '%1'").tqarg(keyword),searchlist,false); + showToc(i18n("Search results for keyword '%1'").arg(keyword),searchlist,false); } else - KMessageBox::error(this,i18n("No documents found for keyword '%1'.").tqarg(keyword)); + KMessageBox::error(this,i18n("No documents found for keyword '%1'.").arg(keyword)); } void TexDocDialog::slotHelp() diff --git a/src/kile/userhelp.cpp b/src/kile/userhelp.cpp index 69376b2..e022e28 100644 --- a/src/kile/userhelp.cpp +++ b/src/kile/userhelp.cpp @@ -59,9 +59,9 @@ void UserHelp::readConfig() int entries = config->readNumEntry("entries"); for ( int i=0; ireadEntry(TQString("menu%1").tqarg(i)); + menu << config->readEntry(TQString("menu%1").arg(i)); if ( !menu[i].isEmpty() || menu[i]=="-" ) - files << config->readEntry(TQString("file%1").tqarg(i)); + files << config->readEntry(TQString("file%1").arg(i)); else files << TQString(); } @@ -84,9 +84,9 @@ void UserHelp::writeConfig() config->writeEntry("entries",entries); for ( int i=0; iwriteEntry(TQString("menu%1").tqarg(i), m_menuentries[i]); + config->writeEntry(TQString("menu%1").arg(i), m_menuentries[i]); if ( m_menuentries[i] != "-" ) - config->writeEntry(TQString("file%1").tqarg(i), m_helpfiles[i]); + config->writeEntry(TQString("file%1").arg(i), m_helpfiles[i]); } } @@ -249,7 +249,7 @@ void UserHelp::slotUserHelpActivated(int index) bool http = ( filename.find("http://",0) == 0 ); if ( !http && !fi.exists() ) { - KMessageBox::error(0,TQString(i18n("File '%1' doesn't exist.")).tqarg(filename)); + KMessageBox::error(0,TQString(i18n("File '%1' doesn't exist.")).arg(filename)); return; } diff --git a/src/kile/userhelpdialog.cpp b/src/kile/userhelpdialog.cpp index 7f3a7c7..41e5fa8 100644 --- a/src/kile/userhelpdialog.cpp +++ b/src/kile/userhelpdialog.cpp @@ -411,7 +411,7 @@ void UserHelpAddDialog::slotChooseFile() TQFileInfo fi(filename); if ( ! fi.exists() ) { - KMessageBox::error(0,TQString(i18n("File '%1' does not exist.")).tqarg(filename)); + KMessageBox::error(0,TQString(i18n("File '%1' does not exist.")).arg(filename)); return; } @@ -452,7 +452,7 @@ void UserHelpAddDialog::slotOk() TQFileInfo fi(filename); if ( filename.find("http://",0)!=0 && !fi.exists() ) { - KMessageBox::error(this,TQString(i18n("File '%1' doesn't exist.")).tqarg(filename)); + KMessageBox::error(this,TQString(i18n("File '%1' doesn't exist.")).arg(filename)); return; } diff --git a/src/kile/usermenudialog.cpp b/src/kile/usermenudialog.cpp index 2c079df..b28f7ae 100644 --- a/src/kile/usermenudialog.cpp +++ b/src/kile/usermenudialog.cpp @@ -80,7 +80,7 @@ UserTags::~UserTags() void UserTags::redraw() { - KILE_DEBUG() << TQString("usermenudialog redraw() m_prevIndex = %1, m_list.size() = %2").tqarg(m_prevIndex).tqarg(m_list.size()) << endl; + KILE_DEBUG() << TQString("usermenudialog redraw() m_prevIndex = %1, m_list.size() = %2").arg(m_prevIndex).arg(m_list.size()) << endl; m_combo->clear(); if (m_list.size() > 0) @@ -103,7 +103,7 @@ void UserTags::redraw() void UserTags::change(int index) { - KILE_DEBUG() << TQString("usermenudialog: change(%1) prev %2").tqarg(index).tqarg(m_prevIndex) << endl; + KILE_DEBUG() << TQString("usermenudialog: change(%1) prev %2").arg(index).arg(m_prevIndex) << endl; m_list[m_prevIndex] = splitTag(m_editName->text(), m_editTag->text()); m_combo->changeItem(TQString::number(m_prevIndex+1)+": "+m_list[m_prevIndex].text, m_prevIndex); -- cgit v1.2.1