From 84c989c19db5daab602a67f47ca0f5fd7a2b53d2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 12:01:04 -0600 Subject: Remove additional unneeded tq method conversions --- quanta/components/csseditor/fontfamilychooser.cpp | 2 +- quanta/components/csseditor/fontfamilychoosers.ui | 2 +- quanta/components/csseditor/stylesheetparser.cpp | 4 +- quanta/components/cvsservice/cvsservice.cpp | 16 +++--- .../debugger/conditionalbreakpointdialogs.ui | 6 +-- quanta/components/debugger/dbgp/dbgpnetwork.cpp | 6 +-- quanta/components/debugger/dbgp/dbgpsettingss.ui | 4 +- quanta/components/debugger/dbgp/qbytearrayfifo.cpp | 2 +- .../debugger/dbgp/quantadebuggerdbgp.cpp | 18 +++---- quanta/components/debugger/debuggermanager.cpp | 4 +- quanta/components/debugger/debuggervariable.cpp | 6 +-- quanta/components/debugger/debuggervariablesets.ui | 2 +- quanta/components/debugger/gubed/gubedsettingss.ui | 10 ++-- .../debugger/gubed/quantadebuggergubed.cpp | 28 +++++------ .../debugger/interfaces/debuggerclient.cpp | 10 ++-- quanta/components/debugger/variableslistview.cpp | 6 +-- quanta/components/framewizard/areaattributedb.h | 6 +-- quanta/components/framewizard/selectablearea.cpp | 2 +- quanta/components/framewizard/treenode.cpp | 22 ++++---- quanta/components/framewizard/treenode.h | 24 ++++----- .../components/framewizard/visualframeeditor.cpp | 28 +++++------ quanta/components/framewizard/visualframeeditor.h | 2 +- quanta/components/tableeditor/tableeditor.cpp | 22 ++++---- quanta/components/tableeditor/tableitem.h | 4 +- quanta/dialogs/actionconfigdialog.cpp | 8 +-- quanta/dialogs/dirtydialog.ui | 2 +- quanta/dialogs/dirtydlg.cpp | 2 +- quanta/dialogs/dtdselectdialog.ui | 2 +- quanta/dialogs/dtepeditdlg.cpp | 24 ++++----- quanta/dialogs/dtepeditdlgs.ui | 4 +- quanta/dialogs/dtepstructureeditdlgs.ui | 2 +- quanta/dialogs/settings/abbreviation.cpp | 6 +-- quanta/dialogs/settings/filemaskss.ui | 10 ++-- quanta/dialogs/tagdialogs/pictureview.cpp | 2 +- quanta/dialogs/tagdialogs/tagdialog.cpp | 6 +-- quanta/messages/annotationoutput.cpp | 6 +-- quanta/messages/messageoutput.cpp | 4 +- quanta/parsers/dtd/dtd.cpp | 4 +- quanta/parsers/dtd/dtdparser.cpp | 16 +++--- quanta/parsers/parser.cpp | 8 +-- quanta/parsers/parsercommon.cpp | 2 +- quanta/parsers/qtag.h | 2 +- quanta/parsers/saparser.cpp | 12 ++--- quanta/parts/kafka/kafkacommon.cpp | 6 +-- quanta/parts/kafka/kafkacommon.h | 6 +-- quanta/parts/kafka/kafkahtmlpart.h | 2 +- quanta/parts/kafka/undoredo.cpp | 4 +- quanta/parts/kafka/undoredo.h | 12 ++--- quanta/plugins/quantaplugin.cpp | 2 +- quanta/plugins/quantaplugininterface.cpp | 4 +- quanta/project/eventconfigurationdlg.cpp | 2 +- quanta/project/project.cpp | 16 +++--- quanta/project/project.h | 2 +- quanta/project/projectnewfinals.ui | 2 +- quanta/project/projectnewgeneral.cpp | 8 +-- quanta/project/projectnewgenerals.ui | 12 ++--- quanta/project/projectnewlocal.cpp | 4 +- quanta/project/projectnewlocals.ui | 2 +- quanta/project/projectnewwebs.ui | 2 +- quanta/project/projectprivate.cpp | 20 ++++---- quanta/project/projectupload.cpp | 12 ++--- quanta/project/projectuploads.ui | 2 +- quanta/project/rescanprj.cpp | 2 +- quanta/project/teammembersdlg.cpp | 8 +-- quanta/project/teammembersdlgs.ui | 2 +- quanta/project/uploadprofiledlgs.ui | 2 +- quanta/quanta_uml.xmi | 2 +- quanta/scripts/docbook_table.kmdr | 2 +- quanta/scripts/dwt.kmdr | 2 +- quanta/scripts/htmlquickstart.kmdr | 2 +- quanta/scripts/listwizard.kmdr | 2 +- quanta/scripts/picturewizard.kmdr | 2 +- quanta/scripts/tablewizard.kmdr | 2 +- quanta/src/document.cpp | 12 ++--- quanta/src/document.h | 2 +- quanta/src/dtds.cpp | 20 ++++---- quanta/src/quanta.cpp | 58 +++++++++++----------- quanta/src/quanta.h | 2 +- quanta/src/quanta_init.cpp | 16 +++--- quanta/src/quantadoc.cpp | 6 +-- quanta/src/quantaview.cpp | 6 +-- quanta/src/viewmanager.cpp | 28 +++++------ quanta/treeviews/basetreeview.cpp | 26 +++++----- quanta/treeviews/filestreeview.cpp | 6 +-- quanta/treeviews/projecttreeview.cpp | 6 +-- quanta/treeviews/servertreeview.cpp | 2 +- quanta/treeviews/structtreetag.cpp | 8 +-- quanta/treeviews/structtreeview.cpp | 4 +- quanta/treeviews/structtreeview.h | 2 +- quanta/treeviews/tagattributetree.cpp | 4 +- quanta/treeviews/templatestreeview.cpp | 16 +++--- quanta/treeviews/uploadtreefile.cpp | 4 +- quanta/treeviews/uploadtreeview.cpp | 22 ++++---- quanta/utility/qpevents.cpp | 12 ++--- quanta/utility/quantabookmarks.cpp | 10 ++-- quanta/utility/quantacommon.cpp | 12 ++--- quanta/utility/quantanetaccess.cpp | 8 +-- quanta/utility/tagaction.cpp | 24 ++++----- quanta/utility/toolbartabwidget.cpp | 12 ++--- 99 files changed, 417 insertions(+), 417 deletions(-) (limited to 'quanta') diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index ce2ccde1..bd9e59ef 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -43,7 +43,7 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF lePreview->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); TQFontDatabase fdb; - TQStringList families = fdb.tqfamilies(); + TQStringList families = fdb.families(); for ( TQStringList::Iterator it = families.begin(); it != families.end(); ++it ) { if( (*it).contains('[') !=0 ) it = families.remove(it); diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui index ded1d6e1..2622216d 100644 --- a/quanta/components/csseditor/fontfamilychoosers.ui +++ b/quanta/components/csseditor/fontfamilychoosers.ui @@ -193,7 +193,7 @@ - + AlignCenter diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp index 0a573925..0b80caa2 100644 --- a/quanta/components/csseditor/stylesheetparser.cpp +++ b/quanta/components/csseditor/stylesheetparser.cpp @@ -164,11 +164,11 @@ void stylesheetParser::parseSelector(){ if (m_stylesheetStructure.contains(selectorName)) { uint i = 2; - TQString s = selectorName + TQString("-v%1").tqarg(i); + TQString s = selectorName + TQString("-v%1").arg(i); while (m_stylesheetStructure.contains(s)) { i++; - s = selectorName + TQString("-v%1").tqarg(i); + s = selectorName + TQString("-v%1").arg(i); } selectorName = s; } diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index 930ebeec..f80be179 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -176,11 +176,11 @@ void CVSService::slotUpdateToTag(const TQStringList &files) if (m_updateToDlg->tagRadioButton->isChecked()) { extraOpts = "-r " + m_updateToDlg->tagCombo->currentText(); - commandStr = i18n("Updating to revision %1 ...").tqarg(m_updateToDlg->tagCombo->currentText()); + commandStr = i18n("Updating to revision %1 ...").arg(m_updateToDlg->tagCombo->currentText()); } else { extraOpts = "-D " + m_updateToDlg->dateLineEdit->text(); - commandStr = i18n("Updating to the version from %1 ...").tqarg(+ m_updateToDlg->dateLineEdit->text()); + commandStr = i18n("Updating to the version from %1 ...").arg(+ m_updateToDlg->dateLineEdit->text()); } emit clearMessages(); emit showMessage(commandStr + "\n", false); @@ -430,7 +430,7 @@ void CVSService::slotAddToCVSIgnore() line = str.readLine().stripWhiteSpace(); if (line == fInfo.fileName()) { - emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); found = true; break; } @@ -438,7 +438,7 @@ void CVSService::slotAddToCVSIgnore() if (!found) { str << fInfo.fileName() << endl; - emit showMessage(i18n("\"%1\" added to the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" added to the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); } f.close(); } @@ -477,7 +477,7 @@ void CVSService::slotRemoveFromCVSIgnore() } if (!found) { - emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); } f.close(); } @@ -486,7 +486,7 @@ void CVSService::slotRemoveFromCVSIgnore() TQTextStream str(&f); str.setEncoding(TQTextStream::UnicodeUTF8); str << content; - emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); f.close(); } @@ -501,7 +501,7 @@ void CVSService::slotJobExited(bool normalExit, int exitStatus) { if (!normalExit) { - KMessageBox::sorry(0, i18n("The CVS command %1 has failed. The error code was %2.").tqarg(m_cvsCommand).tqarg(exitStatus), i18n("Command Failed")); + KMessageBox::sorry(0, i18n("The CVS command %1 has failed. The error code was %2.").arg(m_cvsCommand).arg(exitStatus), i18n("Command Failed")); } if (exitStatus == 0) { @@ -529,7 +529,7 @@ void CVSService::slotReceivedStderr(TQString output) void CVSService::notInRepository() { emit clearMessages(); - emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").tqarg(m_defaultFile).tqarg(m_repositoryPath) + "\n", false); + emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").arg(m_defaultFile).arg(m_repositoryPath) + "\n", false); } void CVSService::startService() diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui index 4b43fefb..fcd4b1db 100644 --- a/quanta/components/debugger/conditionalbreakpointdialogs.ui +++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui @@ -215,7 +215,7 @@ File: - + AlignVCenter @@ -234,7 +234,7 @@ Objects of class: - + AlignVCenter @@ -253,7 +253,7 @@ Function: - + AlignVCenter diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index 584e71f0..a087ae03 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -71,14 +71,14 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt if(m_server->listen()) { emit active(true); - emit networkError(i18n("Listening on port %1").tqarg(service), true); + emit networkError(i18n("Listening on port %1").arg(service), true); } else { delete m_server; m_server = NULL; emit active(false); - emit networkError(i18n("Unable to listen on port %1").tqarg(service), true); + emit networkError(i18n("Unable to listen on port %1").arg(service), true); } } } @@ -293,7 +293,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen return false; m_transaction_id++; - TQString commandline = command + TQString(" -i %1").tqarg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; + TQString commandline = command + TQString(" -i %1").arg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; kdDebug(24002) << k_funcinfo << ", sending: " << commandline << endl; diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui index 93b5199a..10888885 100644 --- a/quanta/components/debugger/dbgp/dbgpsettingss.ui +++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui @@ -496,7 +496,7 @@ Break on: - + AlignTop @@ -605,7 +605,7 @@ Default mode: - + AlignVCenter diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp index 578fedb9..7c76066b 100644 --- a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp +++ b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp @@ -47,7 +47,7 @@ TQString TQByteArrayFifo::retrieve( ) bool TQByteArrayFifo::append(const char * chars, size_t size ) { // Resize the array, fail if not possible - if(!m_array.tqresize(m_size + size )) + if(!m_array.resize(m_size + size )) return false; // Copy the elements diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index 6e47fdb4..3fe2f972 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -327,7 +327,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas) } else { - debuggerInterface()->showStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true); + debuggerInterface()->showStatus(i18n("Unrecognized package: '%1%2'").arg(datas.left(50)).arg(datas.length() > 50 ? "..." : ""), true); kdDebug(24002) << datas << endl; } @@ -340,8 +340,8 @@ void QuantaDebuggerDBGp::initiateSession(const TQDomNode& initpacket) { debuggerInterface()->showStatus( i18n("The debugger for %1 uses an unsupported protocol version (%2)") - .tqarg(attribute(initpacket, "language")) - .tqarg(attribute(initpacket, "protocol_version")) + .arg(attribute(initpacket, "language")) + .arg(attribute(initpacket, "protocol_version")) , true); endSession(); @@ -540,7 +540,7 @@ void QuantaDebuggerDBGp::addBreakpoint (DebuggerBreakpoint* breakpoint) " -n " + TQString::number(breakpoint->line() + 1) , breakpoint->condition()); - breakpoint->setKey(TQString("id %1").tqarg(id)); + breakpoint->setKey(TQString("id %1").arg(id)); } void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response ) @@ -550,7 +550,7 @@ void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response ) id = attribute(response, "transaction_id").toLong(); if(id > 0) { - TQString oldkey = TQString("id %1").tqarg(id); + TQString oldkey = TQString("id %1").arg(id); DebuggerBreakpoint *bp = debuggerInterface()->findDebuggerBreakpoint(oldkey); if(bp) debuggerInterface()->updateBreakpointKey(*bp, attribute(response, "id")); @@ -867,9 +867,9 @@ void QuantaDebuggerDBGp::profilerOpen(bool forceopen) else { if(forceopen) - KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").tqarg(profileroutput), i18n("Profiler File Error")); + KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").arg(profileroutput), i18n("Profiler File Error")); else - debuggerInterface()->showStatus(i18n("Unable to open profiler output (%1)").tqarg(profileroutput), false); + debuggerInterface()->showStatus(i18n("Unable to open profiler output (%1)").arg(profileroutput), false); } } else @@ -932,11 +932,11 @@ DebuggerVariable* QuantaDebuggerDBGp::buildVariable( const TQDomNode & variablen { /* Sample: - + - + diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index 9c24ba29..fa8f9719 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -108,7 +108,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(!m_client) { emit hideSplash(); - KMessageBox::error(NULL, i18n("Unable to load the debugger plugin, error code %1 was returned: %2.").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); + KMessageBox::error(NULL, i18n("Unable to load the debugger plugin, error code %1 was returned: %2.").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); } break; } @@ -605,7 +605,7 @@ bool DebuggerManager::setActiveLine (const TQString& file, int line ) quantaApp->gotoFileAndLine(filename, line, 0); else { - showStatus(i18n("Unable to open file %1, check your basedirs and mappings.").tqarg(filename), true); + showStatus(i18n("Unable to open file %1, check your basedirs and mappings.").arg(filename), true); } // Add new active line mark diff --git a/quanta/components/debugger/debuggervariable.cpp b/quanta/components/debugger/debuggervariable.cpp index 46f827cb..390290a7 100644 --- a/quanta/components/debugger/debuggervariable.cpp +++ b/quanta/components/debugger/debuggervariable.cpp @@ -258,17 +258,17 @@ DebuggerVariable* DebuggerVariable::findItem( TQListViewItem * item, bool traver return NULL; } -void DebuggerVariable::copy( DebuggerVariable * v, bool copytqchildren ) +void DebuggerVariable::copy( DebuggerVariable * v, bool copychildren ) { m_name = v->name(); - m_size = (v->isScalar() || copytqchildren ? v->size() : m_valueList.count()); + m_size = (v->isScalar() || copychildren ? v->size() : m_valueList.count()); m_value = v->value(); m_type = v->type(); m_isReference = v->isReference(); // We cant just assign m_valuelist to v->values(), it would make a shallow copy... // - if(copytqchildren) + if(copychildren) { m_valueList.clear(); for(DebuggerVariable * v2 = v->values().first(); v2; v2 = v->values().next()) diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui index 00ca41e8..f8d674d5 100644 --- a/quanta/components/debugger/debuggervariablesets.ui +++ b/quanta/components/debugger/debuggervariablesets.ui @@ -125,7 +125,7 @@ New value: - + AlignTop diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui index 82501178..c9caa54c 100644 --- a/quanta/components/debugger/gubed/gubedsettingss.ui +++ b/quanta/components/debugger/gubed/gubedsettingss.ui @@ -407,7 +407,7 @@ Break on: - + AlignTop @@ -566,7 +566,7 @@ Slow - + AlignVCenter|AlignRight @@ -606,7 +606,7 @@ Default mode: - + AlignVCenter @@ -617,7 +617,7 @@ Run speed: - + AlignVCenter @@ -670,7 +670,7 @@ false - + AlignCenter diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index 61e1c8eb..3edcd527 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -445,7 +445,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) long argcnt = args["args"].toLong(); TQString msg = i18n(args["message"].ascii()); // How will we get these messages throught to the translators? for(int cnt = 1; cnt <= argcnt; cnt++) - msg.replace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]); + msg.replace("%" + TQString("%1").arg(cnt) + "%", args[TQString("arg%1").arg(cnt)]); debuggerInterface()->showStatus(msg, false); } @@ -462,7 +462,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // Parsing failed else if(m_command == "parsefailed") { - debuggerInterface()->showStatus(i18n("Syntax or parse error in %1)").tqarg(args["filenme"]), true); + debuggerInterface()->showStatus(i18n("Syntax or parse error in %1)").arg(args["filenme"]), true); return; } // A debugging session is running @@ -479,7 +479,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else if(m_command == "error") { // Put the line number first so double clicking will jump to the corrrect line - debuggerInterface()->showStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").tqarg(args["line"]).tqarg(args["errnum"]).tqarg(args["errmsg"]).tqarg(args["filename"]), true); + debuggerInterface()->showStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").arg(args["line"]).arg(args["errnum"]).arg(args["errmsg"]).arg(args["filename"]), true); // Filter to get error code only and match it with out mask long error = args["errnum"].toLong(); @@ -516,7 +516,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // We're about to debug a file.. else if(m_command == "initialize") { - debuggerInterface()->showStatus(i18n("Established connection to %1").tqarg(args["filename"]), false); + debuggerInterface()->showStatus(i18n("Established connection to %1").arg(args["filename"]), false); sendCommand("sendprotocolversion", (char*)0L); debuggerInterface()->setActiveLine(mapServerPathToLocal(args["filename"]), 0); @@ -549,7 +549,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // Reached en of an include else if(m_command == "end") { - //debuggerInterface()->showStatus(i18n("At end of include %1").tqarg(data), true); + //debuggerInterface()->showStatus(i18n("At end of include %1").arg(data), true); return; } // Check protocol version @@ -603,7 +603,7 @@ bool QuantaDebuggerGubed::sendCommand(const TQString& command, StringMap args) TQString buffer = phpSerialize(args); - buffer = TQString(command + ":%1;" + buffer).tqarg(buffer.length()); + buffer = TQString(command + ":%1;" + buffer).arg(buffer.length()); m_socket->writeBlock(buffer.ascii(), buffer.length()); return true; } @@ -995,7 +995,7 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args) { StringMap::Iterator it; // a:2:{s:4:"name";s:7:"Jessica";s:3:"age";s:2:"26";s:4:"test";i:1;} - TQString ret = TQString("a:%1:{").tqarg(args.size()); + TQString ret = TQString("a:%1:{").arg(args.size()); for( it = args.begin(); it != args.end(); ++it ) { bool isNumber; @@ -1003,15 +1003,15 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args) it.data().toInt(&isNumber); if(isNumber && !it.data().isEmpty()) ret += TQString("s:%1:\"%2\";i:%3;") - .tqarg(it.key().length()) - .tqarg(it.key()) - .tqarg(it.data()); + .arg(it.key().length()) + .arg(it.key()) + .arg(it.data()); else ret += TQString("s:%1:\"%2\";s:%3:\"%4\";") - .tqarg(it.key().length()) - .tqarg(it.key()) - .tqarg(it.data().length()) - .tqarg(it.data()); + .arg(it.key().length()) + .arg(it.key()) + .arg(it.data().length()) + .arg(it.data()); } diff --git a/quanta/components/debugger/interfaces/debuggerclient.cpp b/quanta/components/debugger/interfaces/debuggerclient.cpp index 88b5460e..97140dbb 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.cpp +++ b/quanta/components/debugger/interfaces/debuggerclient.cpp @@ -43,7 +43,7 @@ bool DebuggerClient::isActive() void DebuggerClient::unSupportedAction(const TQString &action) { - KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").tqarg(this->getName()).tqarg(action), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").arg(this->getName()).arg(action), i18n("Unsupported Debugger Function")); } @@ -129,7 +129,7 @@ void DebuggerClient::removeBreakpoint(DebuggerBreakpoint*) // Unimplemented defaults void DebuggerClient::showConfig(TQDomNode) { - KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").tqarg(this->getName()), i18n("Settings")); + KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").arg(this->getName()), i18n("Settings")); } // Unimplemented defaults @@ -141,20 +141,20 @@ void DebuggerClient::readConfig(TQDomNode) // Unimplemented defaults: add watch void DebuggerClient::addWatch(const TQString &) { - KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function")); } // Unimplemented defaults: Remove watch void DebuggerClient::removeWatch(DebuggerVariable *) { // Giving an error seems pointless, since you shouldnt be able to add a watch in the first place... - KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function")); } // Unimplemented defaults: set value of varialbe void DebuggerClient::variableSetValue(const DebuggerVariable &) { - KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").arg(this->getName()), i18n("Unsupported Debugger Function")); } #include "debuggerclient.moc" diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index ec63c23f..7d428bc0 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -160,7 +160,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab { KListViewItem * item; - // Remove tqchildren that doesen't exist anymore + // Remove children that doesen't exist anymore TQPtrList oldlist = oldvar->values(); for(DebuggerVariable* oldchild = oldlist.last(); oldchild; oldchild = oldlist.prev()) { @@ -178,7 +178,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab oldvar->deleteChild(oldchild); } - // Update and add tqchildren + // Update and add children TQPtrList newlist = newvar->values(); for(DebuggerVariable* newchild = newlist.last(); newchild; newchild = newlist.prev()) { @@ -274,7 +274,7 @@ void VariablesListView::slotVariableDump( ) if(!v) return; - quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").tqarg(v->name())); + quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").arg(v->name())); quantaApp->messageOutput()->showMessage(v->value()); quantaApp->messageOutput()->showMessage("<<<\n"); } diff --git a/quanta/components/framewizard/areaattributedb.h b/quanta/components/framewizard/areaattributedb.h index 528da3ea..79e105be 100644 --- a/quanta/components/framewizard/areaattributedb.h +++ b/quanta/components/framewizard/areaattributedb.h @@ -29,7 +29,7 @@ class areaAttribute : public TQObject{ TQ_OBJECT private: - TQRect m_tqgeometry; + TQRect m_geometry; TQMap m_attributeMap; //tag specific attributes public: @@ -38,13 +38,13 @@ class areaAttribute : public TQObject{ void setAttribute(const TQString& name, const TQString& value){ m_attributeMap[name] = value; } void setAllAttributes(TQMap map){ m_attributeMap = map; } void resetAttributes(); - TQRect tqgeometry() const { return m_tqgeometry; } + TQRect geometry() const { return m_geometry; } TQString src() const{ return m_attributeMap["src"]; } TQString attributeValue(TQString l) const { return attributeMap()[l];} TQMap attributeMap() const { return m_attributeMap; } public slots: - void setGeometry(TQRect g) { m_tqgeometry = g; } + void setGeometry(TQRect g) { m_geometry = g; } }; #endif diff --git a/quanta/components/framewizard/selectablearea.cpp b/quanta/components/framewizard/selectablearea.cpp index 80c7aa00..c168e323 100644 --- a/quanta/components/framewizard/selectablearea.cpp +++ b/quanta/components/framewizard/selectablearea.cpp @@ -44,7 +44,7 @@ bool SelectableArea::eventFilter(TQObject *o, TQEvent *event){ } break; case TQEvent::Resize : { - emit Resized( view()->tqgeometry() ); + emit Resized( view()->geometry() ); view()->hide(); view()->show(); return true; diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp index 2faaf3d6..fd1f187f 100644 --- a/quanta/components/framewizard/treenode.cpp +++ b/quanta/components/framewizard/treenode.cpp @@ -20,7 +20,7 @@ static const int SIZE = 101; treeNode::treeNode(const TQString &l, const TQString &pl) : m_label(l), m_parentLabel(pl), m_splitType(NONE){ - m_tqchildrenList.setAutoDelete(true); + m_childrenList.setAutoDelete(true); m_atts = new areaAttribute; } @@ -29,16 +29,16 @@ treeNode::~treeNode(){ } void treeNode::addChildNode(const TQString &l) { - m_tqchildrenList.append( new treeNode(l,m_label) ); + m_childrenList.append( new treeNode(l,m_label) ); } void treeNode::removeChildNode(const TQString &l,bool autoDelete) { - m_tqchildrenList.setAutoDelete(autoDelete); - m_tqchildrenList.remove(findChild(l)); + m_childrenList.setAutoDelete(autoDelete); + m_childrenList.remove(findChild(l)); } treeNode* treeNode::findChild(const TQString &l){ - TQPtrListIterator it( m_tqchildrenList ); + TQPtrListIterator it( m_childrenList ); treeNode *node; while ( (node = it.current()) != 0 ) { ++it; @@ -68,25 +68,25 @@ void tree::refreshGeometries(treeNode *n){ n->nextChild(); } - TQPtrList list = n->tqchildrenList(); + TQPtrList list = n->childrenList(); TQPtrListIterator it( list ); treeNode *node= it.current(); - TQRect newGeometry = n->atts()->tqgeometry(); + TQRect newGeometry = n->atts()->geometry(); if(n->splitType()==VERTICAL){ - newGeometry.setHeight(node->atts()->tqgeometry().height()); + newGeometry.setHeight(node->atts()->geometry().height()); while ( (node = it.current()) != 0 ) { ++it; - dim += node->atts()->tqgeometry().width(); + dim += node->atts()->geometry().width(); dim += 6; } newGeometry.setWidth(dim); } else if(n->splitType()==HORIZONTAL){ - newGeometry.setWidth(node->atts()->tqgeometry().width()); + newGeometry.setWidth(node->atts()->geometry().width()); while ( (node = it.current()) != 0 ) { ++it; - dim += node->atts()->tqgeometry().height(); + dim += node->atts()->geometry().height(); dim += 6; } newGeometry.setHeight(dim); diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h index c96d9b17..82d312fb 100644 --- a/quanta/components/framewizard/treenode.h +++ b/quanta/components/framewizard/treenode.h @@ -33,36 +33,36 @@ class treeNode { TQString m_label, m_parentLabel; SplitType m_splitType; - TQPtrList m_tqchildrenList; + TQPtrList m_childrenList; areaAttribute *m_atts; public: treeNode(const TQString &l=TQString(), const TQString &pl=TQString()); ~treeNode(); void addChildNode(const TQString &L); - void addChildNode(treeNode *n){ m_tqchildrenList.append(n); } + void addChildNode(treeNode *n){ m_childrenList.append(n); } void removeChildNode(const TQString &l, bool autoDelete); void setSplitType(SplitType s) { m_splitType = s; } void setLabel(const TQString &l) { m_label = l; } - void removeChildren() { m_tqchildrenList.clear(); } + void removeChildren() { m_childrenList.clear(); } void setParentLabel(const TQString &s){ m_parentLabel = s;} - int childPosition(treeNode* n){ return m_tqchildrenList.find(n); } - bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); } + int childPosition(treeNode* n){ return m_childrenList.find(n); } + bool insertChild(unsigned int pos, treeNode* n) { return m_childrenList.insert( pos, n); } TQString label() const { return m_label; } TQString parentLabel() const { return m_parentLabel; } SplitType splitType() const { return m_splitType; } - TQPtrList tqchildrenList() { return m_tqchildrenList; } + TQPtrList childrenList() { return m_childrenList; } - treeNode* firstChild() { return m_tqchildrenList.first(); } - treeNode* nextChild() { return m_tqchildrenList.next(); } - treeNode* lastChild() { return m_tqchildrenList.last(); } - treeNode* currentChild() { return m_tqchildrenList.current(); } + treeNode* firstChild() { return m_childrenList.first(); } + treeNode* nextChild() { return m_childrenList.next(); } + treeNode* lastChild() { return m_childrenList.last(); } + treeNode* currentChild() { return m_childrenList.current(); } treeNode* findChild(const TQString &L); areaAttribute* atts() { return m_atts; } - int countChildren() const { return m_tqchildrenList.count(); } - bool hasChildren() const { return !m_tqchildrenList.isEmpty(); } + int countChildren() const { return m_childrenList.count(); } + bool hasChildren() const { return !m_childrenList.isEmpty(); } }; class tree{ diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index e822d7e0..4b1f62f3 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -46,12 +46,12 @@ VisualFrameEditor::~VisualFrameEditor(){ void VisualFrameEditor::setGeometries(const TQString &l){ int cP = cancelledPixels(m_internalTree->findNode(l)->countChildren()); - TQRect newGeometry(m_internalTree->findNode(l)->atts()->tqgeometry()); - TQPtrList list=m_internalTree->findNode(l)->tqchildrenList(); + TQRect newGeometry(m_internalTree->findNode(l)->atts()->geometry()); + TQPtrList list=m_internalTree->findNode(l)->childrenList(); TQPtrListIterator it( list ); treeNode *node; if(m_internalTree->findNode(l)->splitType() == VERTICAL){ - int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().width()-cP; + int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().width()-cP; while ( (node = it.current()) != 0 ) { ++it; newGeometry.setWidth( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) ); @@ -60,7 +60,7 @@ void VisualFrameEditor::setGeometries(const TQString &l){ } else if(m_internalTree->findNode(l)->splitType() == HORIZONTAL){ - int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().height()-cP; + int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().height()-cP; while ( (node = it.current()) != 0 ) { ++it; newGeometry.setHeight( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) ); @@ -145,12 +145,12 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ TQRegExp pattern("rows\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); - TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry(); + TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.height()); int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1); - TQPtrList list=m_internalTree->findNode(parent)->tqchildrenList(); + TQPtrList list=m_internalTree->findNode(parent)->childrenList(); TQPtrListIterator it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { @@ -171,12 +171,12 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ TQRegExp pattern("cols\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); - TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry(); + TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.width()); int dummyDimension=dummy.width()-cancelledPixels(line.contains(",")+1); - TQPtrList list=m_internalTree->findNode(parent)->tqchildrenList(); + TQPtrList list=m_internalTree->findNode(parent)->childrenList(); TQPtrListIterator it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { @@ -258,7 +258,7 @@ void VisualFrameEditor::removeNode(const TQString &l){ m_internalTree->findNode(parentLabel)->setSplitType(NONE); } else { - TQPtrList list = m_internalTree->findNode(parentLabel)->firstChild()->tqchildrenList(); + TQPtrList list = m_internalTree->findNode(parentLabel)->firstChild()->childrenList(); if( parentLabel != m_internalTree->root()->label() ) { TQString grandParentLabel = m_internalTree->findNode(parentLabel)->parentLabel(); m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false ); @@ -304,7 +304,7 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); else if(!m_firstInsertedSA) m_firstInsertedSA = sa; - sa->view()->setGeometry(n->atts()->tqgeometry()); + sa->view()->setGeometry(n->atts()->geometry()); sa->setIdLabel( n->label() ); sa->setSource( n->atts()->src() ); connect(sa, TQT_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQT_SLOT(setGeometry(TQRect))); @@ -371,11 +371,11 @@ TQString VisualFrameEditor::RCvalue(treeNode *n) { int lostPixels = (6*(child_number-1)); // 6 pixels are lost every time a splitter is drawn switch( n->splitType() ) { - case VERTICAL: percentage/=n->atts()->tqgeometry().width(); - for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().width(); + case VERTICAL: percentage/=n->atts()->geometry().width(); + for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().width(); break; - case HORIZONTAL: percentage/=n->atts()->tqgeometry().height(); - for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().height(); + case HORIZONTAL: percentage/=n->atts()->geometry().height(); + for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().height(); break; default:break; } diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h index c7338128..39bb4b4c 100644 --- a/quanta/components/framewizard/visualframeeditor.h +++ b/quanta/components/framewizard/visualframeeditor.h @@ -50,7 +50,7 @@ class VisualFrameEditor : public TQHBox { public: VisualFrameEditor( TQWidget * parent = 0, const char * name = 0); ~VisualFrameEditor(); - void draw() { tqrepaint(); } + void draw() { repaint(); } void loadExistingStructure(const TQStringList &list); TQString framesetStructure(); void removeNode(const TQString &l); diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index dcc570b7..45bcf07c 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -204,7 +204,7 @@ void TableEditor::slotEditRow() void TableEditor::slotEditCol() { - KMessageBox::information(this, i18n("Edit col: %1").tqarg(m_col + 1)); + KMessageBox::information(this, i18n("Edit col: %1").arg(m_col + 1)); TagDialog dlg(QuantaCommon::tagFromDTD(m_dtd,"col")); dlg.exec(); } @@ -411,7 +411,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(col); TableNode tableN = mergeMatrix[nRow - 1][col]; Node *n = tableN.node; - setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1)); + setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1)); m_dataTable->item(nRow-1, col)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -451,7 +451,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(col); TableNode tableN = mergeMatrix[nRow - 1][col]; Node *n = tableN.node; - setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1)); + setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1)); m_dataTable->item(nRow-1, col)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -496,7 +496,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(nCol); for (int i = 0; i < colValue - 1; i++) { - setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").tqarg(nRow).tqarg(lastCol)); + setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").arg(nRow).arg(lastCol)); m_dataTable->item(nRow-1, lastCol + i)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -924,7 +924,7 @@ void TableEditor::slotRemoveRow() int rowspan = mainTableNode->node->tag->attributeValue("rowspan", true).toInt(); rowspan--; if (rowspan > 1) - mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(rowspan)); + mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(rowspan)); else mainTableNode->node->tag->deleteAttribute("rowspan"); updatedMainNodes.append(mainTableNode); @@ -975,7 +975,7 @@ void TableEditor::slotRemoveCol() int colspan = mainTableNode->node->tag->attributeValue("colspan", true).toInt(); colspan--; if (colspan > 1) - mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(colspan)); + mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(colspan)); else mainTableNode->node->tag->deleteAttribute("colspan"); updatedMainNodes.append(mainTableNode); @@ -1054,13 +1054,13 @@ void TableEditor::slotMergeCells() rCol = selection.rightCol(); TableNode *mainTableNode = &((*m_tableTags)[tRow][lCol]); if (rCol - lCol > 0) - mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(rCol - lCol + 1)); + mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(rCol - lCol + 1)); if (bRow - tRow > 0) - mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(bRow - tRow + 1)); + mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(bRow - tRow + 1)); for (int i = 0; i < bRow - tRow + 1; i++) for (int j = 0; j < rCol - lCol + 1; j++) { if (i != 0 || j != 0) { - setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").tqarg(tRow + 1).tqarg(lCol + 1)); + setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").arg(tRow + 1).arg(lCol + 1)); m_dataTable->item(tRow + i, lCol + j)->setEnabled(false); TableNode *tableNode = &((*m_tableTags)[tRow + i][lCol + j]); Node::deleteNode(tableNode->node); @@ -1271,7 +1271,7 @@ void TableEditor::configureCell(int row, int col, Node * node) return; // Header (TH) or standard cell? item->setHeader(node->tag->name.lower() == "th"); - //Qt::Horizontal tqalignment + //Qt::Horizontal alignment TQt::AlignmentFlags flags; TQString align = node->tag->attributeValue("align", true); if (align == "right") @@ -1285,7 +1285,7 @@ void TableEditor::configureCell(int row, int col, Node * node) else flags = TQt::AlignLeft; item->setAlignment(flags); - //Qt::Vertical tqalignment + //Qt::Vertical alignment TQString valign = node->tag->attributeValue("valign", true); if (valign == "top") flags = TQt::AlignTop; diff --git a/quanta/components/tableeditor/tableitem.h b/quanta/components/tableeditor/tableitem.h index ac9a3777..017738bf 100644 --- a/quanta/components/tableeditor/tableitem.h +++ b/quanta/components/tableeditor/tableitem.h @@ -35,7 +35,7 @@ public: virtual TQWidget* createEditor() const; // Get text from TQTextEdit virtual void setContentFromEditor(TQWidget *w); - // Paint cell - handle tqalignment (horizontal and vertical) and bold for header + // Paint cell - handle alignment (horizontal and vertical) and bold for header virtual void paint(TQPainter* p, const TQColorGroup& cg, const TQRect& cr, bool selected); // Return A bit larger sizeHint because TQTextEdit has some margin around virtual TQSize sizeHint() const; @@ -43,7 +43,7 @@ public: TQt::AlignmentFlags vAlignment() {return m_valign;} void setVAlignment(TQt::AlignmentFlags flags) {m_valign = flags;} // Get and set horizontal aligment - TQt::AlignmentFlags tqalignment() {return m_halign;} + TQt::AlignmentFlags alignment() {return m_halign;} void setAlignment(TQt::AlignmentFlags flags) {m_halign = flags;} // Get and set header status (use true for TH, false for TD) bool header() {return m_header;} diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index 2e695b36..d8e44d45 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -190,7 +190,7 @@ void ActionConfigDialog::slotRemoveToolbar() } if (s != i18n("All")) { - if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").tqarg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { m_toolbarItem = item; connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&))); @@ -765,7 +765,7 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) TQString s = i18n("The '%1' key combination has already been allocated " "to the \"%2\" action.\n" "Please choose a unique key combination."). - tqarg(shortcutText).tqarg(global); + arg(shortcutText).arg(global); KMessageBox::sorry( this, s, i18n("Conflicting Shortcuts")); } } @@ -805,7 +805,7 @@ void ActionConfigDialog::slotNewAction() static_cast(currentAction)->setModified(true); TQListViewItem *currentItem = actionTreeView->currentItem(); TQListViewItem *item = new KListViewItem(allActionsItem); - TQString actionText = TQString("Action_%1").tqarg(m_mainWindow->actionCollection()->count()); + TQString actionText = TQString("Action_%1").arg(m_mainWindow->actionCollection()->count()); currentAction->setText(actionText); item->setText(2, currentAction->name()); item->setText(0, actionText); @@ -838,7 +838,7 @@ void ActionConfigDialog::slotNewAction() void ActionConfigDialog::slotDeleteAction() { - if ( KMessageBox::warningContinueCancel(this, i18n("Removing the action removes all the references to it.\nAre you sure you want to remove the %1 action?").tqarg(currentAction->text()),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("Removing the action removes all the references to it.\nAre you sure you want to remove the %1 action?").arg(currentAction->text()),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { TQString actionName = currentAction->name(); emit deleteUserAction(currentAction); diff --git a/quanta/dialogs/dirtydialog.ui b/quanta/dialogs/dirtydialog.ui index 982bef50..b5331bb1 100644 --- a/quanta/dialogs/dirtydialog.ui +++ b/quanta/dialogs/dirtydialog.ui @@ -106,7 +106,7 @@ (If you later save the document, you will lose what was on the disk.) - + WordBreak|AlignVCenter diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 972c4828..70d06c86 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -41,7 +41,7 @@ DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool creat m_busy = false; m_createBackup = createBackup; m_mainWidget = new DirtyDialog(this); - m_mainWidget->textLabel->setText(i18n("The file %1 was changed outside of the Quanta editor.").tqarg(srcName)); + m_mainWidget->textLabel->setText(i18n("The file %1 was changed outside of the Quanta editor.").arg(srcName)); setMainWidget(m_mainWidget); } diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui index 88337d9c..cd6a079b 100644 --- a/quanta/dialogs/dtdselectdialog.ui +++ b/quanta/dialogs/dtdselectdialog.ui @@ -45,7 +45,7 @@ Dialog message2: true - + WordBreak|AlignVCenter diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp index 28f00ce3..c2595716 100644 --- a/quanta/dialogs/dtepeditdlg.cpp +++ b/quanta/dialogs/dtepeditdlg.cpp @@ -113,9 +113,9 @@ void DTEPEditDlg::readGeneral() void DTEPEditDlg::readPages() { int i = 1; - while (m_config->hasGroup(TQString("Page%1").tqarg(i)) && i < 6) + while (m_config->hasGroup(TQString("Page%1").arg(i)) && i < 6) { - m_config->setGroup(TQString("Page%1").tqarg(i)); + m_config->setGroup(TQString("Page%1").arg(i)); TQString title = m_config->readEntry("Title"); TQString groups = m_config->readEntry("Groups"); if (i == 1) @@ -203,7 +203,7 @@ void DTEPEditDlg::saveResult() { if (f.exists()) { - if (KMessageBox::questionYesNo(this, i18n("The file %1 is not writable.
Do you want to save the configuration to a different file?").tqarg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("The file %1 is not writable.
Do you want to save the configuration to a different file?").arg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes) { targetFile = KFileDialog::getSaveFileName(locateLocal("data", resourceDir + "dtep/description.rc"), i18n("*.rc|DTEP Description"), this, i18n("Save Description As")); } else @@ -255,35 +255,35 @@ void DTEPEditDlg::writePages(KConfig *config) if (enablePage1->isChecked()) { num++; - config->setGroup(TQString("Page%1").tqarg(num)); + config->setGroup(TQString("Page%1").arg(num)); writeEntry(config, "Title", pageTitleEdit1->text()); writeEntry(config, "Groups", groupsEdit1->text()); } if (enablePage2->isChecked()) { num++; - config->setGroup(TQString("Page%1").tqarg(num)); + config->setGroup(TQString("Page%1").arg(num)); writeEntry(config, "Title", pageTitleEdit2->text()); writeEntry(config, "Groups", groupsEdit2->text()); } if (enablePage3->isChecked()) { num++; - config->setGroup(TQString("Page%1").tqarg(num)); + config->setGroup(TQString("Page%1").arg(num)); writeEntry(config, "Title", pageTitleEdit3->text()); writeEntry(config, "Groups", groupsEdit3->text()); } if (enablePage4->isChecked()) { num++; - config->setGroup(TQString("Page%1").tqarg(num)); + config->setGroup(TQString("Page%1").arg(num)); writeEntry(config, "Title", pageTitleEdit4->text()); writeEntry(config, "Groups", groupsEdit4->text()); } if (enablePage5->isChecked()) { num++; - config->setGroup(TQString("Page%1").tqarg(num)); + config->setGroup(TQString("Page%1").arg(num)); writeEntry(config, "Title", pageTitleEdit5->text()); writeEntry(config, "Groups", groupsEdit5->text()); } @@ -343,10 +343,10 @@ void DTEPEditDlg::readStructures() int objectGroupId = m_config->readNumEntry("ObjectGroupIndex", -1); int i = 1; - while (m_config->hasGroup(TQString("StructGroup_%1").tqarg(i))) + while (m_config->hasGroup(TQString("StructGroup_%1").arg(i))) { StructGroup group; - m_config->setGroup(TQString("StructGroup_%1").tqarg(i)); + m_config->setGroup(TQString("StructGroup_%1").arg(i)); group.name = m_config->readEntry("Name"); group.noName = m_config->readEntry("No_Name"); group.icon = m_config->readEntry("Icon"); @@ -387,7 +387,7 @@ void DTEPEditDlg::writeStructures(KConfig *config) for (TQValueList::ConstIterator it = m_structGroups.constBegin(); it != m_structGroups.constEnd(); ++it) { StructGroup group = *it; - config->setGroup(TQString("StructGroup_%1").tqarg(i)); + config->setGroup(TQString("StructGroup_%1").arg(i)); writeEntry(config, "Name", group.name); writeEntry(config, "No_Name", group.noName); writeEntry(config, "Icon", group.icon); @@ -536,7 +536,7 @@ void DTEPEditDlg::slotDeleteStructGroup() int currentItem = structuresList->currentItem(); if (currentItem != -1) { - if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the %1 group?").tqarg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the %1 group?").arg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue) { m_structGroups.remove(m_structGroups.at(currentItem)); structuresList->removeItem(currentItem); diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui index 38879afa..e0d29eae 100644 --- a/quanta/dialogs/dtepeditdlgs.ui +++ b/quanta/dialogs/dtepeditdlgs.ui @@ -1069,7 +1069,7 @@ See the <b>True</b> and <b>False</b> boxes to define the False: - + AlignVCenter|AlignRight @@ -1083,7 +1083,7 @@ See the <b>True</b> and <b>False</b> boxes to define the True: - + AlignVCenter|AlignRight diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui index 4f918427..802f6753 100644 --- a/quanta/dialogs/dtepstructureeditdlgs.ui +++ b/quanta/dialogs/dtepstructureeditdlgs.ui @@ -57,7 +57,7 @@ &Icon: - + AlignVCenter|AlignRight diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 46805d0e..538aaa0b 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -97,7 +97,7 @@ void AbbreviationDlg::slotNewGroup() { if (qConfig.abbreviations.contains(groupName)) { - KMessageBox::error(this, i18n("There is already an abbreviation group called %1. Choose an unique name for the new group.").tqarg(groupName), i18n("Group already exists")); + KMessageBox::error(this, i18n("There is already an abbreviation group called %1. Choose an unique name for the new group.").arg(groupName), i18n("Group already exists")); TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); } else { @@ -187,7 +187,7 @@ void AbbreviationDlg::slotRemoveTemplate() { TQListViewItem *item = templatesList->currentItem(); if (item && - KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 template?").tqarg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) + KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 template?").arg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) { m_currentAbbrev->abbreviations.remove(item->text(0)+" "+item->text(1)); delete item; @@ -270,7 +270,7 @@ void AbbreviationDlg::saveTemplates() f.close(); } else { - KMessageBox::error(this, i18n("Cannot open the file %1 for writing.\nModified abbreviations will be lost when you quit Quanta.").tqarg(s)); + KMessageBox::error(this, i18n("Cannot open the file %1 for writing.\nModified abbreviations will be lost when you quit Quanta.").arg(s)); } } diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui index a7f7e243..5552afda 100644 --- a/quanta/dialogs/settings/filemaskss.ui +++ b/quanta/dialogs/settings/filemaskss.ui @@ -73,7 +73,7 @@ lineMarkup - + AlignLeft @@ -81,7 +81,7 @@ lineImage - + AlignLeft @@ -130,7 +130,7 @@ lineText - + AlignLeft @@ -183,7 +183,7 @@ lineScript - + AlignLeft @@ -196,7 +196,7 @@ Default character &encoding: - + AlignVCenter|AlignLeft diff --git a/quanta/dialogs/tagdialogs/pictureview.cpp b/quanta/dialogs/tagdialogs/pictureview.cpp index 07123b7c..65102ba8 100644 --- a/quanta/dialogs/tagdialogs/pictureview.cpp +++ b/quanta/dialogs/tagdialogs/pictureview.cpp @@ -69,7 +69,7 @@ void PictureView::slotSetImage(const TQString& file) picheight = pix->height(); scale(); - tqrepaint(); + repaint(); } /** try scale image */ diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index ac9c8ffc..93ced2c5 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -179,7 +179,7 @@ void TagDialog::parseTag() else { TQString docString = "\n\n"; - docString += TQString("\n").tqarg(dtdTag->name()); + docString += TQString("\n").arg(dtdTag->name()); docString += QuantaCommon::xmlFromAttributes(dtdTag->attributes()); docString += "\n\n"; doc.setContent(docString); @@ -200,14 +200,14 @@ void TagDialog::parseTag() for (int i = 1; i <= numOfPages; i++) { Tagxml *extraPage = 0L; - dtdConfig->setGroup(TQString("Page%1").tqarg(i)); + dtdConfig->setGroup(TQString("Page%1").arg(i)); TQString title = dtdConfig->readEntry("Title"); TQStringList groupList; groupList = dtdConfig->readListEntry("Groups"); TQDomDocument extraDoc; //build an internal tag XML for the groups bool addPage = false; TQString docString = "\n\n"; - docString += TQString("\n").tqarg(i); + docString += TQString("\n").arg(i); for (uint j = 0; j < groupList.count(); j++) { groupList[j] = groupList[j].stripWhiteSpace(); diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 543fe734..6888f462 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -84,7 +84,7 @@ void AnnotationOutput::tabChanged(TQWidget *w) void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, const TQPair& annotation) { line++; - TQString s = i18n("Line %1: %2").tqarg(line).tqarg(annotation.first); + TQString s = i18n("Line %1: %2").arg(line).arg(annotation.first); s.replace('\n', ' '); m_currentFileAnnotations->showMessage(line, 1, fileName, s); } @@ -155,7 +155,7 @@ void AnnotationOutput::readAnnotations() TQString text = el.attribute("text"); TQString receiver = el.attribute("receiver"); text.replace('\n',' '); - TQString lineText = TQString("%1").tqarg(line); + TQString lineText = TQString("%1").arg(line); if (lineText.length() < 20) { TQString s; @@ -198,7 +198,7 @@ void AnnotationOutput::readAnnotations() } if (m_yourAnnotationsNum > 0) { - setTabLabel(m_yourAnnotations, i18n("For You: %1").tqarg(m_yourAnnotationsNum)); + setTabLabel(m_yourAnnotations, i18n("For You: %1").arg(m_yourAnnotationsNum)); } else { setTabLabel(m_yourAnnotations, i18n("For You")); diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 94bfecfb..37103df0 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -159,13 +159,13 @@ void MessageOutput::saveContent() TQFileInfo fileinfo(url.path()); if (fileinfo.exists() && KMessageBox::warningContinueCancel(0, i18n("File
%1
already exists. Overwrite it?") - .tqarg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) + .arg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) return; TQFile file(url.path()); if (!file.open(IO_WriteOnly)) { KMessageBox::error(0, i18n("Cannot save log file
%1") - .tqarg(url.url())); + .arg(url.url())); return; } diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp index 5008dcff..92e1e8f8 100644 --- a/quanta/parsers/dtd/dtd.cpp +++ b/quanta/parsers/dtd/dtd.cpp @@ -124,7 +124,7 @@ bool DTD::parseDTD(const KURL &url) TQString fileName = TQString(); if (!KIO::NetAccess::download(url, fileName)) { - KMessageBox::error(0, i18n("Cannot download the DTD from %1.").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(0, i18n("Cannot download the DTD from %1.").arg(url.prettyURL(0, KURL::StripFileProtocol))); return false; } TQFile file(fileName); @@ -183,7 +183,7 @@ bool DTD::parseDTD(const KURL &url) parseDTD(entityURL); } else { - kdDebug(24000) << TQString("Unknown tag: [%1]").tqarg(line) << endl; + kdDebug(24000) << TQString("Unknown tag: [%1]").arg(line) << endl; } if (it != lines.end()) ++it; diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index 07941236..24d7c529 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -75,7 +75,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) TQString fileName = TQString(); if (!KIO::NetAccess::download(m_dtdURL, fileName, 0)) { - KMessageBox::error(0, i18n("Cannot download the DTD from %1.").tqarg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(0, i18n("Cannot download the DTD from %1.").arg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol))); return false; } DTD::dtd_ptr = xmlParseDTD(NULL, xmlCharStrndup(fileName.utf8(), fileName.utf8().length())); @@ -98,11 +98,11 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) s = TQString::fromLatin1(errorPtr->str2); if (!s.isEmpty()) errorStr += "
" + s; - errorStr += TQString("(%1, %2)").tqarg(errorPtr->line).tqarg(errorPtr->int2); + errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2); xmlResetError(errorPtr); } #endif - KMessageBox::error(0, i18n("Error while parsing the DTD.
The error message is:
%1").tqarg(errorStr)); + KMessageBox::error(0, i18n("Error while parsing the DTD.
The error message is:
%1").arg(errorStr)); return false; } if (targetDir.isEmpty()) @@ -155,7 +155,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) } else { KMessageBox::error(0L, i18n("Cannot create the
%1 file.
Check that you have write permission in the parent folder.") - .tqarg(file.name())); + .arg(file.name())); return false; } } @@ -265,7 +265,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) if (childNum > 0) { - stream << "" << endl; + stream << "" << endl; for( int i = 0; i < childNum; i++ ) { stream << " " << endl; } - stream << "" << endl; + stream << "" << endl; stream << endl; } /* xmlElementContentPtr content_ptr = el_ptr->content; if (content_ptr) { - stream << "" << endl; + stream << "" << endl; while (content_ptr) { if (!TQString((const char*)content_ptr->name).isEmpty()) @@ -335,7 +335,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) content_ptr = content_ptr->parent; } } - stream << "" << endl; + stream << "" << endl; } */ } stream << "" << endl diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index 8206ac29..b9a15415 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -860,7 +860,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) j = 0; if (!closesPrevious) { - //move the tqchildren up one level + //move the children up one level Node *n = child; Node *m = child; while (n) @@ -900,7 +900,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) } } else { - //change the parent of tqchildren, so the prev will be the new parent + //change the parent of children, so the prev will be the new parent if (child) { Node *n = child; @@ -928,7 +928,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) prev->child = child; } } - //move down the nodes starting with next one level and append to the list of tqchildren of prev + //move down the nodes starting with next one level and append to the list of children of prev if (next) { if (prev->child) //if the previous node has a child, append the next node after the last child @@ -1020,7 +1020,7 @@ Node *Parser::rebuild(Document *w) return n; } - kdDebug(24000) << TQString("Invalid area: %1,%2,%3,%4").tqarg(area.bLine).tqarg(area.bCol).tqarg(area.eLine).tqarg(area.eCol) << "\n"; + kdDebug(24000) << TQString("Invalid area: %1,%2,%3,%4").arg(area.bLine).arg(area.bCol).arg(area.eLine).arg(area.eCol) << "\n"; // kdDebug(24000) << "lastNode1: " << lastNode << " " << lastNode->tag << endl; deleteNodes(firstNode->nextSibling(), lastNode, modifs); diff --git a/quanta/parsers/parsercommon.cpp b/quanta/parsers/parsercommon.cpp index 9d1f9d0d..be660255 100644 --- a/quanta/parsers/parsercommon.cpp +++ b/quanta/parsers/parsercommon.cpp @@ -174,7 +174,7 @@ Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQStrin tag->setDtd(d); else tag->setDtd(dtd); - tag->name = i18n("%1 block").tqarg(dtd->specialAreaNames[areaName].upper()); + tag->name = i18n("%1 block").arg(dtd->specialAreaNames[areaName].upper()); tag->type = Tag::ScriptTag; tag->validXMLTag = false; diff --git a/quanta/parsers/qtag.h b/quanta/parsers/qtag.h index f19bcf5d..3f74a42f 100644 --- a/quanta/parsers/qtag.h +++ b/quanta/parsers/qtag.h @@ -243,7 +243,7 @@ public: void setScope(TQString const& scope) {m_scope = scope;} /** Returns true if tag is a possible child of this tag, or if - there are no tqchildren defined and if trueIfNoChildsDefined is set to true. */ + there are no children defined and if trueIfNoChildsDefined is set to true. */ bool isChild(const TQString& tag, bool trueIfNoChildsDefined = true); //prefer using this variant, it handle Text, Empty, XmlTagEnd nodes! bool isChild(Node *node, bool trueIfNoChildsDefined = true, bool treatEmptyNodesAsText = false); diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp index 1dab9ccc..f402e0c8 100644 --- a/quanta/parsers/saparser.cpp +++ b/quanta/parsers/saparser.cpp @@ -201,7 +201,7 @@ bool SAParser::slotParseOneLine() } s_currentContext.area.eLine = s_line; s_currentContext.area.eCol = groupKeywordPos - 1; - //kdDebug(24000) << TQString("Group Struct s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("Group Struct s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; if (s_currentNode && (s_currentNode->tag->type == Tag::Text || @@ -351,7 +351,7 @@ bool SAParser::slotParseOneLine() s_currentNode->specialInsideXml = m_specialInsideXml; } } - //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").tqarg(s_dtd->name).tqarg(s_line).tqarg(lastCol) << endl; + //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").arg(s_dtd->name).arg(s_line).arg(lastCol) << endl; //create a closing node for the special area Tag *tag = new Tag(); @@ -468,7 +468,7 @@ bool SAParser::slotParseOneLine() s_currentNode = node; } } - //kdDebug(24000) << TQString("%1 s_context: %2, %3, %4, %5").tqarg(s_currentContext.type).tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("%1 s_context: %2, %3, %4, %5").arg(s_currentContext.type).arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; s_currentContext = s_context; s_col = s_context.area.bCol + s_context.startString.length(); @@ -514,7 +514,7 @@ bool SAParser::slotParseOneLine() // if (pos != 0) pos++; s_currentContext.area.eLine = s_line; s_currentContext.area.eCol = pos; - //kdDebug(24000) << TQString("Quoted String s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("Quoted String s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; if (s_fullParse) { if ( s_currentNode && @@ -561,7 +561,7 @@ bool SAParser::slotParseOneLine() s_currentContext.area.eLine = s_line; s_currentContext.area.eCol = pos + s_dtd->comments[s_currentContext.startString].length() - 1; s_currentContext.type = s_previousContext.type; - //kdDebug(24000) << TQString("Comment s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("Comment s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; if (s_fullParse) { @@ -649,7 +649,7 @@ Node* SAParser::parseArea(const AreaStruct &specialArea, int s_startCol = specialArea.bCol; s_endLine = specialArea.eLine; s_endCol = specialArea.eCol; - //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").tqarg(s_startLine).tqarg(s_startCol).tqarg(areaStartString) << endl; + //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").arg(s_startLine).arg(s_startCol).arg(areaStartString) << endl; s_searchForAreaEnd = false; s_searchForForcedAreaEnd = false; diff --git a/quanta/parts/kafka/kafkacommon.cpp b/quanta/parts/kafka/kafkacommon.cpp index 5d7e8cdb..32f5f43c 100644 --- a/quanta/parts/kafka/kafkacommon.cpp +++ b/quanta/parts/kafka/kafkacommon.cpp @@ -999,7 +999,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, if(!node) return 0L; - //Reset the listviews items pointers for node and its tqchildren + //Reset the listviews items pointers for node and its children n = node; b = false; while(n) @@ -1100,7 +1100,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N if(!node) return 0L; - //Reset the listviews items pointers for node and its tqchildren + //Reset the listviews items pointers for node and its children n = node; b = false; while(n) @@ -2253,7 +2253,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh modif->setType(NodeModif::NodeRemoved); modif->setLocation(getLocation(node)); - //log the tqchildren move if we don't extract the tqchildren + //log the children move if we don't extract the children if(!extractChildren) { location = getLocation(node); diff --git a/quanta/parts/kafka/kafkacommon.h b/quanta/parts/kafka/kafkacommon.h index 60d8971c..6322919d 100644 --- a/quanta/parts/kafka/kafkacommon.h +++ b/quanta/parts/kafka/kafkacommon.h @@ -522,8 +522,8 @@ public: * This mean that the undo/redo system will delete it when necessary so don't reuse it!!!! * @param node The node to delete. * @param modifs The changes made are logged into modifs. - * @param extractChilds If we extract or move up the tqchildren. WARNING: it don't check - * if the tqchildren of node are legal childs of the parent of node. + * @param extractChilds If we extract or move up the children. WARNING: it don't check + * if the children of node are legal childs of the parent of node. * @param removeClosingTag Extract the closingTag if node isn't single and is Tag::XmlTag. * TODO: @param removeEmbeddedTags Specifies if we delete the embedded Nodes e.g. * : the PHP block is an embedded block. @@ -986,7 +986,7 @@ public: /** * Returns the position of the child domNode. * @param domNode This is the DOM::Node we want the position. - * @return Returns the position of domNode inside domNode's parent's tqchildren or -1 if not found. + * @return Returns the position of domNode inside domNode's parent's children or -1 if not found. */ static int childPosition(DOM::Node domNode); diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h index 17c25ddf..3f3e3c83 100644 --- a/quanta/parts/kafka/kafkahtmlpart.h +++ b/quanta/parts/kafka/kafkahtmlpart.h @@ -113,7 +113,7 @@ public: /** --------------- DOM::Node modifications -------------------------- */ /** - * It will move DOM::Nodes from startNode to endNode as tqchildren of newParent. It does NOT check + * It will move DOM::Nodes from startNode to endNode as children of newParent. It does NOT check * if the move is valid, so it may crash. Please check before with kafkaCommon::parentSupports(). * @param newParent The new parent of the DOM::Nodes. * @param startNode The first node to move. diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp index 1e177b0c..d21129cd 100644 --- a/quanta/parts/kafka/undoredo.cpp +++ b/quanta/parts/kafka/undoredo.cpp @@ -51,7 +51,7 @@ NodeModif::NodeModif() m_type = -1; m_node = 0L; m_tag = 0L; - m_tqchildrenMovedUp = 0; + m_childrenMovedUp = 0; m_neighboursMovedDown = 0; } @@ -1477,7 +1477,7 @@ void undoRedo::debugOutput() " - contents: " << (*it2)->tag()->tagStr() << endl; if(((*it2)->type() == NodeModif::NodeRemoved && !afterEditorIt) || ((*it2)->type() == NodeModif::NodeAdded && afterEditorIt)) - kdDebug(24000)<< "==== ChildsNumber1 : " << (*it2)->tqchildrenMovedUp() << + kdDebug(24000)<< "==== ChildsNumber1 : " << (*it2)->childrenMovedUp() << " - ChildsNumber2 : " << (*it2)->neighboursMovedDown() << endl; } kdDebug(24000)<< "== End Node Modifications set #" << i << endl; diff --git a/quanta/parts/kafka/undoredo.h b/quanta/parts/kafka/undoredo.h index 6280a67f..6464c46d 100644 --- a/quanta/parts/kafka/undoredo.h +++ b/quanta/parts/kafka/undoredo.h @@ -95,17 +95,17 @@ public: /** * TODO:REMOVE - * For non-XmlEnd Node deletion without its tqchildren. - * @param tqchildrenNumber The number of tqchildren which are moved up + * For non-XmlEnd Node deletion without its children. + * @param childrenNumber The number of children which are moved up * at the location where was the deleted Node. */ - void setChildrenMovedUp(int tqchildrenNumber) {m_tqchildrenMovedUp = tqchildrenNumber;} + void setChildrenMovedUp(int childrenNumber) {m_childrenMovedUp = childrenNumber;} /** * TODO:REMOVE * @return Returns the number of childs which were moved up. */ - int tqchildrenMovedUp() {return m_tqchildrenMovedUp;} + int childrenMovedUp() {return m_childrenMovedUp;} /** * TODO:REMOVE @@ -139,7 +139,7 @@ public: NodeTreeRemoved, //Moving a Node from one location to another. Implemented. NodeMoved, - //Moving a Node and its tqchildren from one location to another. + //Moving a Node and its children from one location to another. NodeAndChildsMoved }; @@ -148,7 +148,7 @@ private: TQValueList m_location, m_finalLocation; Node *m_node; Tag *m_tag; - int m_tqchildrenMovedUp; + int m_childrenMovedUp; int m_neighboursMovedDown; }; diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index dab6dbd0..b6bd4e3e 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -119,7 +119,7 @@ bool QuantaPlugin::load() m_part = KParts::ComponentFactory::createPartInstanceFromLibrary(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 ); if(!m_part) { - KMessageBox::error(quantaApp, i18n("The %1 plugin could not be loaded.
Possible reasons are:
- %2 is not installed;
- the file %3 is not installed or it is not reachable.").tqarg(m_name).tqarg(m_name).tqarg(m_fileName)); + KMessageBox::error(quantaApp, i18n("The %1 plugin could not be loaded.
Possible reasons are:
- %2 is not installed;
- the file %3 is not installed or it is not reachable.").arg(m_name).arg(m_name).arg(m_fileName)); delete m_targetWidget; m_targetWidget = 0L; return false; diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index 68d276bb..098c7828 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -90,7 +90,7 @@ void QuantaPluginInterface::readConfigFile(const TQString& configFile) if (pluginType == "Command Line") { emit hideSplash(); - KMessageBox::information(m_parent, i18n("%1 is a command line plugin. We have removed support for command-line plugins. However, the functionality has not been lost as script actions can still be used to run command-line tools. ").tqarg(*it), i18n("Unsupported Plugin Type"), "CommandLinePluginWarning"); + KMessageBox::information(m_parent, i18n("%1 is a command line plugin. We have removed support for command-line plugins. However, the functionality has not been lost as script actions can still be used to run command-line tools. ").arg(*it), i18n("Unsupported Plugin Type"), "CommandLinePluginWarning"); continue; } @@ -257,7 +257,7 @@ void QuantaPluginInterface::slotPluginsValidate() { invalidNames += "
" + invalidPlugins[i]->name(); } - int answer = KMessageBox::questionYesNo(m_parent, i18n("The following plugins seems to be invalid:%1.

Do you want to edit the plugins?").tqarg(invalidNames), i18n("Invalid Plugins"), i18n("Edit Plugins"), i18n("Do Not Edit")); + int answer = KMessageBox::questionYesNo(m_parent, i18n("The following plugins seems to be invalid:%1.

Do you want to edit the plugins?").arg(invalidNames), i18n("Invalid Plugins"), i18n("Edit Plugins"), i18n("Do Not Edit")); if(answer == KMessageBox::Yes) { slotPluginsEdit(); diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp index 3c4e0024..29d23964 100644 --- a/quanta/project/eventconfigurationdlg.cpp +++ b/quanta/project/eventconfigurationdlg.cpp @@ -141,7 +141,7 @@ void EventConfigurationDlg::slotDeleteEvent() { TQListViewItem *item = eventsListView->currentItem(); if (!item) return; - if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove the configuration of the %1 event?").tqarg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove the configuration of the %1 event?").arg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue) { delete item; } diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 1ce01241..ef737396 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -109,7 +109,7 @@ KURL::List Project::files() return list; } -void Project::insertFile(const KURL& nameURL, bool tqrepaint ) +void Project::insertFile(const KURL& nameURL, bool repaint ) { if (d->excludeRx.exactMatch(nameURL.path())) return; @@ -118,7 +118,7 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint ) if ( !d->baseURL.isParentOf(url) ) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(nameURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(nameURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); KURL destination = urlRequesterDlg->selectedURL(); @@ -159,7 +159,7 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint ) } emit eventHappened("after_project_add", url.url(), TQString()); setModified(); - if ( tqrepaint ) + if ( repaint ) { emit reloadTree( &(d->m_projectFiles), false, TQStringList()); emit newStatus(); @@ -213,7 +213,7 @@ void Project::loadLastProject(bool reload) { KURL tempURL = KURL().fromPathOrURL(tempPath); if (KIO::NetAccess::exists(tempURL, false, d->m_mainWindow) && - KMessageBox::questionYesNo(d->m_mainWindow, i18n("Found a backup for project %1.
Do you want to open it?").tqarg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") ) + KMessageBox::questionYesNo(d->m_mainWindow, i18n("Found a backup for project %1.
Do you want to open it?").arg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") ) == KMessageBox::Yes) { d->m_tmpProjectFile = tempPath; @@ -262,7 +262,7 @@ void Project::slotOpenProject(const KURL &url) { emit hideSplash(); if (KMessageBox::questionYesNo(d->m_mainWindow, - i18n("The file %1 does not exist.
Do you want to remove it from the list?").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep") ) + i18n("The file %1 does not exist.
Do you want to remove it from the list?").arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep") ) == KMessageBox::Yes) { d->m_projectRecent->removeURL(url); @@ -297,7 +297,7 @@ void Project::slotAddDirectory(const KURL& p_dirURL, bool showDlg) if (showDlg) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); destination = urlRequesterDlg->selectedURL(); @@ -427,7 +427,7 @@ void Project::slotRemove(const KURL& urlToRemove) TQString urlPath = QExtFileInfo::toRelative(urlToRemove, d->baseURL).path(); TQString nice = urlPath; nice = KStringHandler::lsqueeze(nice, 60); - if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("Do you want to remove
%1
from the server(s) as well?").tqarg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue ) + if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("Do you want to remove
%1
from the server(s) as well?").arg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue ) { TQDomNode profilesNode = d->m_sessionDom.firstChild().firstChild().namedItem("uploadprofiles"); TQDomNodeList profileList = profilesNode.toElement().elementsByTagName("profile"); @@ -1345,7 +1345,7 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) { KTextEditor::Mark *mark = marks.at(i); if (mark->type == KTextEditor::MarkInterface::Bookmark) - markList << TQString("%1").tqarg(mark->line); + markList << TQString("%1").arg(mark->line); } TQDomNodeList nl = d->dom.elementsByTagName("item"); TQDomElement el; diff --git a/quanta/project/project.h b/quanta/project/project.h index ec36b377..fc88c13b 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -79,7 +79,7 @@ public: TQStringList fileNameList(); KURL::List files(); - void insertFile( const KURL& nameURL, bool tqrepaint ); + void insertFile( const KURL& nameURL, bool repaint ); void readConfig(KConfig *); /** loads the last project again if reload == true but checks in any case if there is a left over project from a crash diff --git a/quanta/project/projectnewfinals.ui b/quanta/project/projectnewfinals.ui index a37bc1af..6e0f58d6 100644 --- a/quanta/project/projectnewfinals.ui +++ b/quanta/project/projectnewfinals.ui @@ -79,7 +79,7 @@ true - + AlignTop|AlignLeft diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index 8869cbdc..295cdc2f 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -177,7 +177,7 @@ void ProjectNewGeneral::slotButtonTmpl() linePrjTmpl->setText(KURL::relativeURL(baseUrl, url)); } else { - KMessageBox::sorry(this, i18n("The project templates must be stored under the main project folder:

%1").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::sorry(this, i18n("The project templates must be stored under the main project folder:

%1").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); } } @@ -192,7 +192,7 @@ void ProjectNewGeneral::slotButtonToolbar() } { KMessageBox::sorry(0, i18n("The project toolbars must be stored under the main project folder:

%1") - .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); } } @@ -225,7 +225,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) url = QExtFileInfo::toAbsolute(url, baseUrl); if (!baseUrl.isParentOf(url)) { - KMessageBox::sorry(this,i18n("The project templates must be stored under the main project folder:

%1").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::sorry(this,i18n("The project templates must be stored under the main project folder:

%1").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); linePrjTmpl->setFocus(); emit enableNextButton(this, false); } else @@ -239,7 +239,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) if (!baseUrl.isParentOf(url)) { KMessageBox::sorry(0,i18n("The project toolbars must be stored under the main project folder:

%1") - .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); linePrjToolbar->setFocus(); emit enableNextButton(this, false); } else diff --git a/quanta/project/projectnewgenerals.ui b/quanta/project/projectnewgenerals.ui index b3ee4047..70a1c386 100644 --- a/quanta/project/projectnewgenerals.ui +++ b/quanta/project/projectnewgenerals.ui @@ -82,7 +82,7 @@ true - + AlignTop|AlignLeft @@ -277,7 +277,7 @@ File: - + AlignVCenter|AlignRight @@ -307,7 +307,7 @@ Protocol: - + AlignVCenter @@ -320,7 +320,7 @@ Password: - + AlignVCenter|AlignRight @@ -381,7 +381,7 @@ Port: - + AlignVCenter|AlignRight @@ -397,7 +397,7 @@ Host: - + AlignVCenter|AlignRight diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index 1883c03a..fb67e4fb 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -75,7 +75,7 @@ void ProjectNewLocal::setBaseURL(const KURL& a_baseURL) { baseURL = a_baseURL; baseURL.adjustPath(1); - checkInsert->setText(i18n("Insert files from %1.").tqarg(baseURL.prettyURL(0, KURL::StripFileProtocol))); + checkInsert->setText(i18n("Insert files from %1.").arg(baseURL.prettyURL(0, KURL::StripFileProtocol))); listView->clear(); fileList.clear(); checkInsert->setChecked(false); @@ -254,7 +254,7 @@ void ProjectNewLocal::slotAddFolder() { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( baseURL.prettyURL(), this, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); KURL destination = urlRequesterDlg->selectedURL(); diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui index 8b9b2d70..e06a290d 100644 --- a/quanta/project/projectnewlocals.ui +++ b/quanta/project/projectnewlocals.ui @@ -85,7 +85,7 @@ true - + AlignTop|AlignLeft diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui index 8237519c..3154b0de 100644 --- a/quanta/project/projectnewwebs.ui +++ b/quanta/project/projectnewwebs.ui @@ -79,7 +79,7 @@ true - + AlignTop|AlignLeft diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 070179c4..ce3686bf 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -917,7 +917,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName) { if (!askForName || KMessageBox::warningContinueCancel(m_mainWindow, i18n("A project view named %1 already exists.
Do you want to overwrite it?") - .tqarg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue) + .arg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue) { node.parentNode().removeChild(node); break; @@ -1056,7 +1056,7 @@ bool ProjectPrivate::createEmptyDom() if (!result) { parent->hideSplash(); - KMessageBox::sorry(m_mainWindow, i18n("Cannot open file %1 for writing.").tqarg(projectURL.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::sorry(m_mainWindow, i18n("Cannot open file %1 for writing.").arg(projectURL.prettyURL(0, KURL::StripFileProtocol))); delete tempFile; tempFile = 0L; delete sessionTempFile; @@ -1284,11 +1284,11 @@ bool ProjectPrivate::saveProject() f.close(); } m_modified = false; - parent->statusMsg(i18n( "Wrote project file %1" ).tqarg(m_tmpProjectFile)); + parent->statusMsg(i18n( "Wrote project file %1" ).arg(m_tmpProjectFile)); } else { parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("Cannot open the file %1 for writing.").tqarg(m_tmpProjectFile)); + KMessageBox::error(m_mainWindow, i18n("Cannot open the file %1 for writing.").arg(m_tmpProjectFile)); result = false; } return result; @@ -1339,7 +1339,7 @@ void ProjectPrivate::loadProjectFromTemp(const KURL &url, const TQString &tempFi } else { parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("Cannot open the file %1 for reading.").tqarg(tempFile)); + KMessageBox::error(m_mainWindow, i18n("Cannot open the file %1 for reading.").arg(tempFile)); } } @@ -1351,13 +1351,13 @@ bool ProjectPrivate::loadProject(const KURL &url) if (!url.isValid()) { parent->hideSplash(); - KMessageBox::sorry(m_mainWindow, i18n("Malformed URL: %1").tqarg(url.prettyURL())); + KMessageBox::sorry(m_mainWindow, i18n("Malformed URL: %1").arg(url.prettyURL())); return false; } if ( projectAlreadyOpen(url.url()) ) { parent->hideSplash(); - if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("The project
%1
seems to be used by another Quanta instance.
You may end up with data loss if you open the same project in two instances, modify and save them in both.

Do you want to proceed with open?").tqarg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("The project
%1
seems to be used by another Quanta instance.
You may end up with data loss if you open the same project in two instances, modify and save them in both.

Do you want to proceed with open?").arg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel) return false; } TQString projectTmpFile; @@ -1416,7 +1416,7 @@ bool ProjectPrivate::loadProject(const KURL &url) } else { parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("Cannot access the project file %1.").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(m_mainWindow, i18n("Cannot access the project file %1.").arg(url.prettyURL(0, KURL::StripFileProtocol))); return false; } return true; @@ -1532,7 +1532,7 @@ void ProjectPrivate::slotDebuggerOptions() else { parent->hideSplash(); - KMessageBox::error(NULL, i18n("Unable to load the debugger plugin, error code %1 was returned: %2.").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); + KMessageBox::error(NULL, i18n("Unable to load the debugger plugin, error code %1 was returned: %2.").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); } } } @@ -1639,7 +1639,7 @@ bool ProjectPrivate::uploadProjectFile() { removeFromConfig(projectURL.url()); // remove the project from the list of open projects if (quantaApp) - parent->statusMsg(i18n( "Uploaded project file %1" ).tqarg( projectURL.prettyURL())); + parent->statusMsg(i18n( "Uploaded project file %1" ).arg( projectURL.prettyURL())); // delete all temp files we used // first the one from creating a new project delete tempFile; diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index ef1be5f9..fb439707 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -382,7 +382,7 @@ void ProjectUpload::startUpload() } else { if (KMessageBox::warningContinueCancel(this, i18n("%1 seems to be unaccessible.
Do you want to proceed with upload?") - .tqarg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue) + .arg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue) { upload(); return; @@ -463,7 +463,7 @@ void ProjectUpload::upload() connect( job, TQT_SIGNAL( infoMessage( KIO::Job *,const TQString& ) ), this, TQT_SLOT( uploadMessage( KIO::Job *,const TQString& ) ) ); - labelCurFile->setText(i18n("Current: %1").tqarg(currentURL.fileName())); + labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName())); currentProgress->setProgress( 0 ); return; } else //it is a dir, so just go to the next item @@ -517,7 +517,7 @@ void ProjectUpload::selectModified() { TQListViewItem *it = list->findItem( (*file).path() ); it->setSelected(true); - it->tqrepaint(); + it->repaint(); } list->checkboxTree(); } @@ -564,7 +564,7 @@ void ProjectUpload::slotUploadNext() UploadTreeFile *itf = dynamic_cast(it); if (itf) itf->setWhichPixmap( "check_clear" ); - it->tqrepaint(); + it->repaint(); } toUpload.remove( it ); @@ -639,7 +639,7 @@ void ProjectUpload::slotRemoveProfile() } else { TQString profileName = comboProfile->currentText(); - if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 upload profile?").tqarg(profileName), + if (KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 upload profile?").arg(profileName), i18n("Profile Removal"), KStdGuiItem::del()) == KMessageBox::Continue) { m_profilesNode.removeChild(m_currentProfileElement); @@ -652,7 +652,7 @@ void ProjectUpload::slotRemoveProfile() slotNewProfileSelected(currentProfile); if (profileName == defaultProfile()) { - KMessageBox::information(this, i18n("You have removed your default profile.
The new default profile will be %1.").tqarg(currentProfile), i18n("Profile Removal")); + KMessageBox::information(this, i18n("You have removed your default profile.
The new default profile will be %1.").arg(currentProfile), i18n("Profile Removal")); m_profilesNode.toElement().setAttribute("defaultProfile", currentProfile); } comboProfile->removeItem(idx); diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui index 4f1fddbc..8f9a50ac 100644 --- a/quanta/project/projectuploads.ui +++ b/quanta/project/projectuploads.ui @@ -338,7 +338,7 @@ Current: [none] - + WordBreak|AlignVCenter diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index 855657c2..bf11498d 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -227,7 +227,7 @@ void RescanPrj::slotListDone(KIO::Job *) if (m_listJobCount == 0) { progressText->setText(i18n("Building tree:")); - progressText->tqrepaint(); + progressText->repaint(); progress->setTotalSteps(urlList.count()); progress->setValue(0); URLListEntry urlEntry; diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp index 6d4ffa69..da902bf1 100644 --- a/quanta/project/teammembersdlg.cpp +++ b/quanta/project/teammembersdlg.cpp @@ -186,13 +186,13 @@ void TeamMembersDlg::slotDeleteMember() if (deleteYourself) { - if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove yourself (%1) from the project team?
If you do so, you should select another member as yourself.").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove yourself (%1) from the project team?
If you do so, you should select another member as yourself.").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) { delete item; setYourself(""); } } else - if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove %1 from the project team?").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("Are you sure that you want to remove %1 from the project team?").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) { delete item; } @@ -213,7 +213,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name, (role == i18n(subprojectLeaderStr.utf8()) && it.current()->text(SUBPROJECT_COL) == subProject) ) ) { - if (KMessageBox::warningYesNo(this, i18n("The %1 role is already assigned to %2. Do you want to reassign it to the current member?").tqarg(role).tqarg(it.current()->text(NAME_COL)), TQString(), i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes) + if (KMessageBox::warningYesNo(this, i18n("The %1 role is already assigned to %2. Do you want to reassign it to the current member?").arg(role).arg(it.current()->text(NAME_COL)), TQString(), i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes) { it.current()->setText(ROLE_COL, i18n(simpleMemberStr.utf8())); return true; @@ -223,7 +223,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name, } else if (nick.lower() == nickName.lower() && it.current() != item && (it.current()->text(EMAIL_COL) != email || it.current()->text(NAME_COL) != name)) { - KMessageBox::error(this, i18n("The %1 nickname is already assigned to %2 <%3>.").tqarg(nickName).tqarg(it.current()->text(NAME_COL)).tqarg(it.current()->text(EMAIL_COL))); + KMessageBox::error(this, i18n("The %1 nickname is already assigned to %2 <%3>.").arg(nickName).arg(it.current()->text(NAME_COL)).arg(it.current()->text(EMAIL_COL))); return false; } ++it; diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui index 2d4cc6a2..847c8b04 100644 --- a/quanta/project/teammembersdlgs.ui +++ b/quanta/project/teammembersdlgs.ui @@ -52,7 +52,7 @@ Please select your identity from the member list. - + AlignVCenter diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui index 4a910a32..de6521e6 100644 --- a/quanta/project/uploadprofiledlgs.ui +++ b/quanta/project/uploadprofiledlgs.ui @@ -263,7 +263,7 @@ is obscured, saving the password in any file is a security risk. Use this option &Protocol: - + AlignVCenter|AlignRight diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index 3903e794..f8002c6a 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -1010,7 +1010,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat - + diff --git a/quanta/scripts/docbook_table.kmdr b/quanta/scripts/docbook_table.kmdr index b3ac688e..48403654 100755 --- a/quanta/scripts/docbook_table.kmdr +++ b/quanta/scripts/docbook_table.kmdr @@ -40,7 +40,7 @@ DocBook Table - + AlignCenter diff --git a/quanta/scripts/dwt.kmdr b/quanta/scripts/dwt.kmdr index c0141550..ec4b5ff5 100755 --- a/quanta/scripts/dwt.kmdr +++ b/quanta/scripts/dwt.kmdr @@ -162,7 +162,7 @@ AutoText - + WordBreak|AlignTop|AlignLeft diff --git a/quanta/scripts/htmlquickstart.kmdr b/quanta/scripts/htmlquickstart.kmdr index 45542703..402d6f0e 100755 --- a/quanta/scripts/htmlquickstart.kmdr +++ b/quanta/scripts/htmlquickstart.kmdr @@ -75,7 +75,7 @@ fi Quanta Plus Kommander Quick Start - + AlignCenter diff --git a/quanta/scripts/listwizard.kmdr b/quanta/scripts/listwizard.kmdr index 7e1459c4..6333c60d 100755 --- a/quanta/scripts/listwizard.kmdr +++ b/quanta/scripts/listwizard.kmdr @@ -217,7 +217,7 @@ Select the list type: </ul> </qt> - + WordBreak|AlignJustify|AlignTop diff --git a/quanta/scripts/picturewizard.kmdr b/quanta/scripts/picturewizard.kmdr index f8e544cf..1b965193 100755 --- a/quanta/scripts/picturewizard.kmdr +++ b/quanta/scripts/picturewizard.kmdr @@ -143,7 +143,7 @@ Select the type of markup appropriated to wrap your image: </ul> </qt> - + WordBreak|AlignJustify|AlignTop diff --git a/quanta/scripts/tablewizard.kmdr b/quanta/scripts/tablewizard.kmdr index a88cbaf1..ec002775 100755 --- a/quanta/scripts/tablewizard.kmdr +++ b/quanta/scripts/tablewizard.kmdr @@ -408,7 +408,7 @@ Select the table type: </ul> </qt> - + WordBreak|AlignJustify|AlignTop diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index 963e27a0..346e9cb6 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -409,7 +409,7 @@ void Document::insertFile(const KURL& url) { if (!KIO::NetAccess::download(url, fileName, this)) { - KMessageBox::error(this, i18n("Cannot download %1.").tqarg( url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("Cannot download %1.").arg( url.prettyURL(0, KURL::StripFileProtocol))); return; } } @@ -421,7 +421,7 @@ void Document::insertFile(const KURL& url) insertText(stream.read()); file.close(); } else - KMessageBox::error(this, i18n("Cannot open %1 for reading.").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("Cannot open %1 for reading.").arg(url.prettyURL(0, KURL::StripFileProtocol))); } /** Inserts text at the current cursor position */ @@ -1303,7 +1303,7 @@ TQValueList* Document::getTagCompletions(int line, { if (!parentTQTag || (parentTQTag && parentTQTag->isChild(tagName))) { - tagName = tag->name() + TQString("%1").tqarg(i, 10); + tagName = tag->name() + TQString("%1").arg(i, 10); tagNameList += tagName; comments.insert(tagName, tag->comment); i++; @@ -1319,7 +1319,7 @@ TQValueList* Document::getTagCompletions(int line, if ((tag->className == classStr || isDerivatedFrom(classStr, tag->className)) && tag->name().upper().startsWith(word)) { - tagName = tag->name() + TQString("%1").tqarg(i, 10); + tagName = tag->name() + TQString("%1").arg(i, 10); tagNameList += tagName; comments.insert(tagName, tag->comment); @@ -2614,7 +2614,7 @@ TQStringList Document::tagAreas(const TQString& tag, bool includeCoordinates, bo TQString s = text(bl, bc, el, ec); if (includeCoordinates) { - s.prepend(TQString("%1,%2,%3,%4\n").tqarg(bl).tqarg(bc).tqarg(el).tqarg(ec)); + s.prepend(TQString("%1,%2,%3,%4\n").arg(bl).arg(bc).arg(el).arg(ec)); } result += s; if (skipFoundContent) @@ -3043,7 +3043,7 @@ void Document::processDTD(const TQString& documentType) if (!isUntitled()) { - quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").tqarg(DTDs::ref()->getDTDNickNameFromName(dtdName)).tqarg(url().prettyURL(0, KURL::StripFileProtocol))); + quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").arg(DTDs::ref()->getDTDNickNameFromName(dtdName)).arg(url().prettyURL(0, KURL::StripFileProtocol))); } quantaApp->slotLoadToolbarForDTD(dtdName); StructTreeView::ref()->useOpenLevelSetting = true; diff --git a/quanta/src/document.h b/quanta/src/document.h index d4a6f4c7..a7fda743 100644 --- a/quanta/src/document.h +++ b/quanta/src/document.h @@ -170,7 +170,7 @@ work correctly. */ /** returns all the areas that are between tag and it's closing pair */ TQStringList tagAreas(const TQString &tag, bool includeCoordinates, bool skipFoundContent); - /** disable/enable the tqrepaint of the Kate view */ + /** disable/enable the repaint of the Kate view */ void activateRepaintView(bool activation); bool RepaintViewActivated() {return repaintEnabled;} diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index 055114d2..c378bd05 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -533,7 +533,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) TQString tagStr; for (uint index = 1; index <= structGroupsCount; index++) { - dtdConfig->setGroup(TQString("StructGroup_%1").tqarg(index)); + dtdConfig->setGroup(TQString("StructGroup_%1").arg(index)); //new code group.name = dtdConfig->readEntry("Name").stripWhiteSpace(); group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace(); @@ -583,7 +583,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) TQString tagName; for (uint index = 1; index <= structGroupsCount; index++) { - dtdConfig->setGroup(TQString("StructGroup_%1").tqarg(index)); + dtdConfig->setGroup(TQString("StructGroup_%1").arg(index)); group.name = dtdConfig->readEntry("Name").stripWhiteSpace(); group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace(); group.icon = dtdConfig->readEntry("Icon").stripWhiteSpace(); @@ -685,7 +685,7 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, TQTagList if (!m_doc->setContent( &f, &errorMsg, &errorLine, &errorCol )) { emit hideSplash(); - KMessageBox::error(0L, i18n("The DTD tag file %1 is not valid.
The error message is: %2 in line %3, column %4.").tqarg(fileName).tqarg(errorMsg).tqarg(errorLine).tqarg(errorCol), + KMessageBox::error(0L, i18n("The DTD tag file %1 is not valid.
The error message is: %2 in line %3, column %4.").arg(fileName).arg(errorMsg).arg(errorLine).arg(errorCol), i18n("Invalid Tag File")); kdWarning() << fileName << ": " << errorMsg << ": " << errorLine << "," << errorCol << endl; } @@ -794,7 +794,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common) for ( TQDomNode n = dom->firstChild(); !n.isNull(); n = n.nextSibling() ) { tmpStr = n.nodeName(); - if (tmpStr == "tqchildren") + if (tmpStr == "children") { TQDomElement el = n.toElement(); TQDomElement item = el.firstChild().toElement(); @@ -914,7 +914,7 @@ void DTDs::slotLoadDTD() TQString nickName = dtdcfg.readEntry("NickName", dtdName); DTDStruct * dtd = m_dict->find(dtdName) ; if (dtd && - KMessageBox::warningYesNo(0L, i18n("Do you want to replace the existing %1 DTD?").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) + KMessageBox::warningYesNo(0L, i18n("Do you want to replace the existing %1 DTD?").arg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) { return; } @@ -924,7 +924,7 @@ void DTDs::slotLoadDTD() TQString family = dtdcfg.readEntry("Family", "1"); Document *w = ViewManager::ref()->activeDocument(); if (family == "1" && w && - KMessageBox::questionYesNo(0L, i18n("Use the newly loaded %1 DTD for the current document?").tqarg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) + KMessageBox::questionYesNo(0L, i18n("Use the newly loaded %1 DTD for the current document?").arg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) { w->setDTDIdentifier(dtdName); emit loadToolbarForDTD(w->getDTDIdentifier()); @@ -946,18 +946,18 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload) TQString nickName = dtdcfg.readEntry("NickName", dtdName); DTDStruct * dtd = m_dict->find(dtdName) ; if ( dtd && - KMessageBox::warningYesNo(0L, i18n("Do you want to replace the existing %1 DTD?").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) + KMessageBox::warningYesNo(0L, i18n("Do you want to replace the existing %1 DTD?").arg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) { return; } removeDTD(dtd); if (!readTagDir(dirName)) { - KMessageBox::error(0L, i18n("Cannot read the DTEP from %1. Check that the folder contains a valid DTEP (description.rc and *.tag files).").tqarg(dirName), i18n("Error Loading DTEP")); + KMessageBox::error(0L, i18n("Cannot read the DTEP from %1. Check that the folder contains a valid DTEP (description.rc and *.tag files).").arg(dirName), i18n("Error Loading DTEP")); } else { TQString family = dtdcfg.readEntry("Family", "1"); - if (askForAutoload && KMessageBox::questionYesNo(0L, i18n("Autoload the %1 DTD in the future?").tqarg(nickName), TQString(), i18n("Load"), i18n("Do Not Load")) == KMessageBox::Yes) + if (askForAutoload && KMessageBox::questionYesNo(0L, i18n("Autoload the %1 DTD in the future?").arg(nickName), TQString(), i18n("Load"), i18n("Do Not Load")) == KMessageBox::Yes) { KURL src; src.setPath(dirName); @@ -968,7 +968,7 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload) } Document *w = ViewManager::ref()->activeDocument(); if (family == "1" && w && - KMessageBox::questionYesNo(0L, i18n("Use the newly loaded %1 DTD for the current document?").tqarg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) + KMessageBox::questionYesNo(0L, i18n("Use the newly loaded %1 DTD for the current document?").arg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) { w->setDTDIdentifier(dtdName); emit loadToolbarForDTD(w->getDTDIdentifier()); diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 495848aa..64597e60 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -375,7 +375,7 @@ void QuantaApp::slotFileOpen(const KURL::List &urls, const TQString& encoding) { if (!QExtFileInfo::exists(*i, true, this)) { - KMessageBox::error(this, i18n("The file %1 does not exist or is not a recognized mime type.").tqarg((*i).prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("The file %1 does not exist or is not a recognized mime type.").arg((*i).prettyURL(0, KURL::StripFileProtocol))); } else { @@ -412,7 +412,7 @@ void QuantaApp::slotFileOpenRecent(const KURL &url) if (!QExtFileInfo::exists(url, true, this)) { if (KMessageBox::questionYesNo(this, - i18n("The file %1 does not exist.\n Do you want to remove it from the list?").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep")) + i18n("The file %1 does not exist.\n Do you want to remove it from the list?").arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep")) == KMessageBox::Yes) { fileRecent->removeURL(url); @@ -523,7 +523,7 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave) { oldURL = saveUrl; if (Project::ref()->hasProject() && !Project::ref()->contains(saveUrl) && - KMessageBox::Yes == KMessageBox::questionYesNo(0,i18n("Do you want to add the
%1
file to project?").tqarg(saveUrl.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::add(), i18n("Do Not Add")) + KMessageBox::Yes == KMessageBox::questionYesNo(0,i18n("Do you want to add the
%1
file to project?").arg(saveUrl.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::add(), i18n("Do Not Add")) ) { if (saveUrl.isLocalFile()) @@ -584,7 +584,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly) { if (projectTemplate) localTemplateDir = projectTemplateURL.path(1); - KMessageBox::sorry(this,i18n("You must save the templates in the following folder: \n\n%1").tqarg(localTemplateDir)); + KMessageBox::sorry(this,i18n("You must save the templates in the following folder: \n\n%1").arg(localTemplateDir)); query = KMessageBox::No; } } while (query != KMessageBox::Yes); @@ -603,7 +603,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly) tempFile->file()->flush(); tempFile->close(); if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url, -1, true, false, this)) - KMessageBox::error(this, i18n("There was an error while creating the template file.
Check that you have write access to %1.").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); + KMessageBox::error(this, i18n("There was an error while creating the template file.
Check that you have write access to %1.").arg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); delete tempFile; } else { @@ -710,12 +710,12 @@ void QuantaApp::slotStatusMsg(const TQString &msg) { statusbarTimer->stop(); statusBar()->changeItem(" " + KStringHandler::cPixelSqueeze(msg, statusBar()->fontMetrics(), progressBar->x() - 20), IDS_STATUS); - statusBar()->tqrepaint(); + statusBar()->repaint(); kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); statusbarTimer->start(10000, true); } -/** tqrepaint preview */ +/** repaint preview */ void QuantaApp::slotRepaintPreview() { Document *w = ViewManager::ref()->activeDocument(); @@ -1446,7 +1446,7 @@ void QuantaApp::slotChangePreviewStatus() if (m_previewToolView && m_htmlPart->view()->isVisible()) { //hiding the preview when it's in a toolview means that the current tab has changed, - //so we just tqrepaint the content and restore the document on the disc. + //so we just repaint the content and restore the document on the disc. m_previewVisible = true; if (m_previewedDocument) { @@ -1511,7 +1511,7 @@ void QuantaApp::newCursorPosition(const TQString &file, int lineNumber, int colu startIdleTimer(); // updateTreeViews(); TQString linenumber; - linenumber = i18n("Line: %1 Col: %2").tqarg(lineNumber).tqarg(columnNumber); + linenumber = i18n("Line: %1 Col: %2").arg(lineNumber).arg(columnNumber); statusBar()->changeItem(linenumber, IDS_STATUS_CLM); statusBar()->changeItem(i18n(" R/O "),IDS_INS_OVR); statusBar()->changeItem("",IDS_MODIFIED); @@ -1539,7 +1539,7 @@ void QuantaApp::slotNewLineColumn() Document *w = ViewManager::ref()->activeDocument(); if (w) w->viewCursorIf->cursorPosition(&cursorLine, &cursorCol); - linenumber = i18n("Line: %1 Col: %2").tqarg(cursorLine+1).tqarg(cursorCol+1); + linenumber = i18n("Line: %1 Col: %2").arg(cursorLine+1).arg(cursorCol+1); statusBar()->changeItem(linenumber, IDS_STATUS_CLM); } @@ -1968,7 +1968,7 @@ void QuantaApp::slotContextMenuAboutToShow() urlUnderCursor = baseUrl; QuantaCommon::setUrl(urlUnderCursor, name.stripWhiteSpace()); urlUnderCursor = QExtFileInfo::toAbsolute(urlUnderCursor, baseUrl); - action->setText(i18n("Open File: %1").tqarg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80))); + action->setText(i18n("Open File: %1").arg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80))); action->setEnabled(true); } else { @@ -2027,7 +2027,7 @@ void QuantaApp::slotContextMenuAboutToShow() action = actionCollection()->action("debug_addwatch"); if(action) { - action->setText(i18n("Add Watch: '%1'").tqarg(word)); + action->setText(i18n("Add Watch: '%1'").arg(word)); action->setEnabled(!word.isEmpty()); if(!action->isPlugged(popup)) @@ -2038,7 +2038,7 @@ void QuantaApp::slotContextMenuAboutToShow() action = actionCollection()->action("debug_variable_set"); if(action) { - action->setText(i18n("Set Value of '%1'").tqarg(word)); + action->setText(i18n("Set Value of '%1'").arg(word)); action->setEnabled(!word.isEmpty()); if(!action->isPlugged(popup)) @@ -2049,7 +2049,7 @@ void QuantaApp::slotContextMenuAboutToShow() action = actionCollection()->action("debug_conditional_break"); if(action) { - action->setText(i18n("Break When '%1'...").tqarg(word)); + action->setText(i18n("Break When '%1'...").arg(word)); action->setEnabled(!word.isEmpty()); if(!action->isPlugged(popup)) @@ -2087,7 +2087,7 @@ void QuantaApp::slotOpenFileUnderCursor() } } else { - KMessageBox::error(this, i18n("The file %1 does not exist or is not a recognized mime type.").tqarg(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("The file %1 does not exist or is not a recognized mime type.").arg(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol))); } } @@ -2166,8 +2166,8 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url) { if ((nodeList.item(i).cloneNode().toElement().attribute("name").lower() ) == name.lower()) { - newName = origName + TQString(" (%1)").tqarg(count); - i18nName = i18n(origName.utf8()) + TQString(" (%1)").tqarg(count); + newName = origName + TQString(" (%1)").arg(count); + i18nName = i18n(origName.utf8()) + TQString(" (%1)").arg(count); nameModified = true; count++; found = true; @@ -2199,7 +2199,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url) int n = 1; while (m_toolbarList.find(toolbarId) != 0L) { - toolbarId = s + TQString("%1").tqarg(n); + toolbarId = s + TQString("%1").arg(n); toolbarId.replace(rx, "_"); n++; } @@ -2438,7 +2438,7 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF TQString error; int el, ec; if (!dom->setContent(s, &error, &el, &ec)) - kdError(24000) << TQString("Error %1 at (%2, %3)").tqarg(error).tqarg(el).tqarg(ec)<dom = dom; TQTextStream bufferStr(&buffer); @@ -2461,7 +2461,7 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, false, this)) { KMessageBox::error(this, i18n("An error happened while saving the %1 toolbar.
" - "Check that you have write permissions for
%2.

This might happen if you tried save to save a global toolbar as a simple user. Use Save As or Toolbars->Save Toolbars->Save as Local Toolbar in this case. ").tqarg(p_toolbar->name).tqarg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error")); + "Check that you have write permissions for
%2.

This might happen if you tried save to save a global toolbar as a simple user. Use Save As or Toolbars->Save Toolbars->Save as Local Toolbar in this case. ").arg(p_toolbar->name).arg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error")); tarFile = KURL(); delete p_toolbar->dom; p_toolbar->dom = oldDom; @@ -2554,7 +2554,7 @@ bool QuantaApp::saveToolbar(bool localToolbar, const TQString& toolbarToSave, co if (!localToolbar) localToolbarsDir = projectToolbarsURL.prettyURL(); KMessageBox::sorry(0,i18n("You must save the toolbars to the following folder:

%1") - .tqarg(localToolbarsDir)); + .arg(localToolbarsDir)); query = KMessageBox::No; } } while (query != KMessageBox::Yes); @@ -2591,7 +2591,7 @@ void QuantaApp::slotSaveProjectToolbar() void QuantaApp::slotAddToolbar() { bool ok; - TQString name = KInputDialog::getText(i18n("New Toolbar"), i18n("Enter toolbar name:"), i18n("User_%1").tqarg(userToolbarsCount), &ok, this); + TQString name = KInputDialog::getText(i18n("New Toolbar"), i18n("Enter toolbar name:"), i18n("User_%1").arg(userToolbarsCount), &ok, this); if (ok) { userToolbarsCount++; @@ -2600,7 +2600,7 @@ void QuantaApp::slotAddToolbar() int n = 1; while (m_toolbarList.find(toolbarId) != 0L) { - toolbarId = name + TQString("%1").tqarg(n); + toolbarId = name + TQString("%1").arg(n); n++; } toolbarId = toolbarId.lower(); @@ -2609,7 +2609,7 @@ void QuantaApp::slotAddToolbar() tempFile->setAutoDelete(true); tempFile->textStream()->setEncoding(TQTextStream::UnicodeUTF8); * (tempFile->textStream()) << TQString("\n\n\n%5\n\n\n") - .tqarg(name.lower()).tqarg(name).tqarg(name).tqarg(toolbarId).tqarg(name); + .arg(name.lower()).arg(name).arg(name).arg(toolbarId).arg(name); tempFile->close(); ToolbarXMLGUI * toolbarGUI = new ToolbarXMLGUI(tempFile->name()); @@ -3318,12 +3318,12 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name) int result; if (p_toolbar->url.isEmpty()) { - result = KMessageBox::warningYesNoCancel(this, i18n("Toolbar %1 is new and unsaved. Do you want to save it before it is removed?").tqarg(p_toolbar->name), + result = KMessageBox::warningYesNoCancel(this, i18n("Toolbar %1 is new and unsaved. Do you want to save it before it is removed?").arg(p_toolbar->name), i18n("Save Toolbar"), KStdGuiItem::save(), KStdGuiItem::discard()); } else { FourButtonMessageBox dlg(this, 0, true); - dlg.textLabel->setText(i18n("The toolbar %1 was modified. Do you want to save it before it is removed?").tqarg(p_toolbar->name)); + dlg.textLabel->setText(i18n("The toolbar %1 was modified. Do you want to save it before it is removed?").arg(p_toolbar->name)); dlg.setCaption(i18n("Save Toolbar")); dlg.pixmapLabel->setPixmap(BarIcon("messagebox_info", KIcon::SizeMedium)); dlg.exec(); @@ -3784,7 +3784,7 @@ TQStringList QuantaApp::openedURLs() const Document *w = qView->document(); if ( w ) { - list.prepend( TQString("%1:%2").tqarg(w->editIf->editInterfaceNumber()).tqarg(w->url().url())); + list.prepend( TQString("%1:%2").arg(w->editIf->editInterfaceNumber()).arg(w->url().url())); } } } @@ -4327,7 +4327,7 @@ void QuantaApp::slotEditCurrentTag() slotEnableIdleTimer(true); if (isUnknown) { - TQString message = i18n("Unknown tag: %1").tqarg(tagName); + TQString message = i18n("Unknown tag: %1").arg(tagName); slotStatusMsg( message ); } } @@ -4869,7 +4869,7 @@ void QuantaApp::slotPasteHTMLQuoted() int code = s.toInt(&ok); if (!ok || code < 191) continue; - text.replace(TQChar(code), TQString("&#%1;").tqarg(s)); + text.replace(TQChar(code), TQString("&#%1;").arg(s)); } } unsigned int line, col; diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h index ade90e54..d0216e17 100644 --- a/quanta/src/quanta.h +++ b/quanta/src/quanta.h @@ -286,7 +286,7 @@ public slots: void slotNewLineColumn(); // void slotUpdateStatus(TQWidget*);FIXME: - /** tqrepaint preview */ + /** repaint preview */ void slotRepaintPreview(); /** toggles showing the preview */ void slotToggleShowPreview(); diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 47d3cd9a..4595a7f4 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -963,7 +963,7 @@ void QuantaInit::initActions() n = n.nextSibling(); } } else - kdError(24000) << TQString("Error %1 at (%2, %3) in %4").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl; + kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(f.name()) << endl; f.close(); } m_quanta->m_actions->clear(); @@ -990,7 +990,7 @@ void QuantaInit::initActions() n = n.nextSibling(); } } else - kdError(24000) << TQString("Error %1 at (%2, %3) in %4").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl; + kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(f.name()) << endl; f.close(); } } else @@ -1180,9 +1180,9 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) "Backup file size: %4
" "Backup created on: %5

" "") - .tqarg(originalVersion.prettyURL(0, KURL::StripFileProtocol )) - .tqarg(KIO::convertSize(origSize)).tqarg(origTime) - .tqarg(KIO::convertSize(backupSize)).tqarg(backupTime)); + .arg(originalVersion.prettyURL(0, KURL::StripFileProtocol )) + .arg(KIO::convertSize(origSize)).arg(origTime) + .arg(KIO::convertSize(backupSize)).arg(backupTime)); w->buttonLoad->setText(i18n("&Restore the file from backup")); w->buttonIgnore->setText(i18n("Do ¬ restore the file from backup")); delete w->warningLabel; @@ -1482,13 +1482,13 @@ void QuantaInit::checkRuntimeDependencies() if (dependency.type == Dependency::Executable) { if (KStandardDirs::findExe(dependency.execName).isNull()) - errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description); + errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description); } else if (dependency.type == Dependency::Plugin) { if (!QuantaPlugin::validatePlugin(m_quanta->m_pluginInterface->plugin(dependency.execName))) - errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description); + errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description); } } @@ -1500,7 +1500,7 @@ void QuantaInit::checkRuntimeDependencies() &appId); if (appId.isEmpty()) { - errorStr += TQString(stdErrorMsg).tqarg("Cervisia (cvsservice)").tqarg("http://www.kde.org/apps/cervisia").tqarg(i18n("integrated CVS management")); + errorStr += TQString(stdErrorMsg).arg("Cervisia (cvsservice)").arg("http://www.kde.org/apps/cervisia").arg(i18n("integrated CVS management")); } else { CVSService::ref(m_quanta->actionCollection())->setAppId(appId); diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index 53a54598..a0f9e177 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -224,7 +224,7 @@ void QuantaDoc::slotOpeningFailed(const KURL &url) emit hideSplash(); //Seems to be not needed anymore since KDE 3.2, but keep until it's completely verified /* - KMessageBox::error(quantaApp, i18n("Cannot open document %1.").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(quantaApp, i18n("Cannot open document %1.").arg(url.prettyURL(0, KURL::StripFileProtocol))); */ ViewManager::ref()->removeActiveView(); blockSignals(signalStatus); @@ -272,7 +272,7 @@ void QuantaDoc::slotAttribPopup() if ( QuantaCommon::isKnownTag(w->getDTDIdentifier(),tagName) ) { - TQString caption = i18n("Attributes of <%1>").tqarg(tagName); + TQString caption = i18n("Attributes of <%1>").arg(tagName); attribMenu->insertTitle( caption ); AttributeList *list = QuantaCommon::tagAttributes(w->getDTDIdentifier(),tagName ); @@ -317,7 +317,7 @@ void QuantaDoc::slotAttribPopup() } } else { - TQString message = i18n("Unknown tag: %1").tqarg(tagName); + TQString message = i18n("Unknown tag: %1").arg(tagName); quantaApp->slotStatusMsg( message ); } } diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index 4bb46717..7609b112 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -395,7 +395,7 @@ void QuantaView::slotSetSourceAndVPLLayout() if (m_document->defaultDTD()->name.contains("HTML", false) == 0) { - KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName)); + KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName)); KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); if (ta2) ta2->setChecked(true); @@ -444,7 +444,7 @@ void QuantaView::slotSetVPLOnlyLayout() if (m_document->defaultDTD()->name.contains("HTML", false) == 0) { - KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName)); + KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName)); KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); if (ta2) ta2->setChecked(true); @@ -1064,7 +1064,7 @@ bool QuantaView::saveModified(bool ask) int want_save; if (ask) want_save = KMessageBox::warningYesNoCancel(this, - i18n("The file \"%1\" has been modified.\nDo you want to save it?").tqarg(fileName), + i18n("The file \"%1\" has been modified.\nDo you want to save it?").arg(fileName), i18n("Warning"), KStdGuiItem::save(), KStdGuiItem::discard()); else want_save = KMessageBox::Yes; diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index 23fbb063..9446daf6 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -107,8 +107,8 @@ QuantaView* ViewManager::createView(const TQString &caption) void ViewManager::createNewDocument() { int i = 1; - while (isOpened(KURL("file:"+i18n("Untitled%1").tqarg(i)))) i++; - TQString fname = i18n("Untitled%1").tqarg(i); + while (isOpened(KURL("file:"+i18n("Untitled%1").arg(i)))) i++; + TQString fname = i18n("Untitled%1").arg(i); QuantaView *view = createView(fname); #ifdef ENABLE_EDITORS @@ -257,16 +257,16 @@ void ViewManager::slotCloseOtherTabs() if (dynamic_cast(currentView) && !static_cast(currentView)->document()) ToolbarTabWidget::ref()->reparent(0, 0, TQPoint(), false); KMdiIterator *it = quantaApp->createIterator(); - //save the tqchildren first to a list, as removing invalidates our iterator - TQValueList tqchildren; + //save the children first to a list, as removing invalidates our iterator + TQValueList children; for (it->first(); !it->isDone(); it->next()) { - tqchildren.append(it->currentItem()); + children.append(it->currentItem()); } delete it; KURL::List modifiedList; TQValueListIterator childIt; - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = *childIt; qView = dynamic_cast(view); @@ -286,7 +286,7 @@ void ViewManager::slotCloseOtherTabs() if (dlg.exec() == TQDialog::Accepted) { filesToSave = dlg.filesToSave(); - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = *childIt; qView = dynamic_cast(view); @@ -311,7 +311,7 @@ void ViewManager::slotCloseOtherTabs() } } - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = *childIt; if (view != currentView) @@ -427,16 +427,16 @@ bool ViewManager::closeAll(bool createNew) parser->setSAParserEnabled(false); KMdiIterator *it = quantaApp->createIterator(); QuantaView *view; - //save the tqchildren first to a list, as removing invalidates our iterator - TQValueList tqchildren; + //save the children first to a list, as removing invalidates our iterator + TQValueList children; for (it->first(); !it->isDone(); it->next()) { - tqchildren.append(it->currentItem()); + children.append(it->currentItem()); } delete it; KURL::List modifiedList; TQValueListIterator childIt; - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = dynamic_cast(*childIt); if (view) @@ -455,7 +455,7 @@ bool ViewManager::closeAll(bool createNew) if (dlg.exec() == TQDialog::Accepted) { filesToSave = dlg.filesToSave(); - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = dynamic_cast(*childIt); if (view) @@ -484,7 +484,7 @@ bool ViewManager::closeAll(bool createNew) disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false); - for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) + for (childIt = children.begin(); childIt != children.end(); ++childIt) { view = dynamic_cast(*childIt); if (view) diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 04bd3460..924373b4 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -371,7 +371,7 @@ void BaseTreeView::slotSelectFile(TQListViewItem *item) if ( QuantaCommon::checkMimeGroup(urlToOpen,"text") ) { emit openFile(urlToOpen); - item->tqrepaint(); + item->repaint(); } else if ( QuantaCommon::checkMimeGroup(urlToOpen, "image") ) //it may be an image { @@ -385,7 +385,7 @@ void BaseTreeView::slotSelectFile(TQListViewItem *item) if (QuantaCommon::denyBinaryInsert(this) == KMessageBox::Yes) { emit openFile(urlToOpen); - item->tqrepaint(); + item->repaint(); } } } @@ -494,15 +494,15 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg) } qfile.close(); - quantaFileProperties->lineNum->setText(i18n("Number of lines: %1").tqarg(ct)); - quantaFileProperties->imageNum->setText(i18n("Number of images included: %1").tqarg(imgct)); - quantaFileProperties->imageSize->setText(i18n("Size of the included images: %1 bytes").tqarg(fimgsize)); - quantaFileProperties->totalSize->setText(i18n("Total size with images: %1 bytes").tqarg(fsize+fimgsize)); + quantaFileProperties->lineNum->setText(i18n("Number of lines: %1").arg(ct)); + quantaFileProperties->imageNum->setText(i18n("Number of images included: %1").arg(imgct)); + quantaFileProperties->imageSize->setText(i18n("Size of the included images: %1 bytes").arg(fimgsize)); + quantaFileProperties->totalSize->setText(i18n("Total size with images: %1 bytes").arg(fsize+fimgsize)); } else if (mimetype.contains("image")) { // assume it's an image file TQImage imagefile=TQImage(nameForInfo); - quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").tqarg(imagefile.width()).tqarg(imagefile.height())); + quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").arg(imagefile.width()).arg(imagefile.height())); quantaFileProperties->imageNum->hide(); quantaFileProperties->imageSize->hide(); quantaFileProperties->totalSize->hide(); @@ -536,7 +536,7 @@ void BaseTreeView::slotOpen() if (item) { emit open(item); - item->tqrepaint(); + item->repaint(); } } @@ -972,13 +972,13 @@ void BaseTreeView::slotDocumentClosed(const KURL& url) item = (*it)->findTVIByURL(url); if (item) { - item->tqrepaint(); + item->repaint(); } } /* TQListViewItemIterator iter(this); for ( ; iter.current(); ++iter ) { - iter.current()->tqrepaint(); + iter.current()->repaint(); }*/ } @@ -1038,7 +1038,7 @@ void BaseTreeView::doRename(KFileTreeViewItem* kftvi, const TQString & newName) bool proceed = true; if (QExtFileInfo::exists(newURL, false, this)) { - proceed = KMessageBox::warningContinueCancel(this, i18n("The file %1 already exists.
Do you want to overwrite it?").tqarg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; + proceed = KMessageBox::warningContinueCancel(this, i18n("The file %1 already exists.
Do you want to overwrite it?").arg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; } if (proceed) { @@ -1184,7 +1184,7 @@ void BaseTreeView::slotCreateSiteTemplate() error = true; if (error) - KMessageBox::error(this, i18n("There was an error while creating the site template tarball.
Check that you can read the files from %1, you have write access to %2 and that you have enough free space in your temporary folder.").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(targetURL.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); + KMessageBox::error(this, i18n("There was an error while creating the site template tarball.
Check that you can read the files from %1, you have write access to %2 and that you have enough free space in your temporary folder.").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); delete tempFile; } @@ -1216,7 +1216,7 @@ void BaseTreeView::slotCreateFile() url.setPath(url.directory() + "/" + fileName); if (QExtFileInfo::exists(url, false, this)) { - KMessageBox::error(this, i18n("Cannot create file, because a file named %1 already exists.").tqarg(fileName), i18n("Error Creating File")); + KMessageBox::error(this, i18n("Cannot create file, because a file named %1 already exists.").arg(fileName), i18n("Error Creating File")); return; } KTempFile *tempFile = new KTempFile(tmpDir); diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index bebac21d..d543f5d0 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -261,7 +261,7 @@ void FilesTreeView::slotAddToTop() topURLAliases.insert(url.url(), aliasName); newBranch(url); } else { - KMessageBox::information(this, i18n("%1 is already a toplevel entry.").tqarg(url.url())); + KMessageBox::information(this, i18n("%1 is already a toplevel entry.").arg(url.url())); } } else { // remove @@ -287,7 +287,7 @@ void FilesTreeView::slotNewTopFolder() newBranch(url); topURLList.append(url); } else { - KMessageBox::information(this, i18n("%1 is already a toplevel entry.").tqarg(url.url())); + KMessageBox::information(this, i18n("%1 is already a toplevel entry.").arg(url.url())); } } @@ -324,7 +324,7 @@ void FilesTreeView::slotChangeAlias() newBranch(url); } } else { - KMessageBox::information(this, i18n("%1 is already a toplevel entry.").tqarg(url.url())); + KMessageBox::information(this, i18n("%1 is already a toplevel entry.").arg(url.url())); } } } diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index 38aa26d9..205e5bf0 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -400,7 +400,7 @@ void ProjectTreeView::slotCreateFile() url.setPath(url.directory() + "/" + fileName); if (QExtFileInfo::exists(url, false, this)) { - KMessageBox::error(this, i18n("Cannot create file, because a file named %1 already exists.").tqarg(fileName), i18n("Error Creating File")); + KMessageBox::error(this, i18n("Cannot create file, because a file named %1 already exists.").arg(fileName), i18n("Error Creating File")); return; } KTempFile *tempFile = new KTempFile(tmpDir); @@ -425,7 +425,7 @@ void ProjectTreeView::slotRemoveFromProject(int askForRemove) TQString nice = QExtFileInfo::toRelative(url, m_projectBaseURL).path(); nice = KStringHandler::lsqueeze(nice, 60); if ( !askForRemove || - KMessageBox::warningContinueCancel(this,i18n("Do you really want to remove
%1
from the project?").tqarg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue ) + KMessageBox::warningContinueCancel(this,i18n("Do you really want to remove
%1
from the project?").arg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue ) { if ( currentKFileTreeViewItem()->isDir() ) url.adjustPath(+1); emit removeFromProject(url); @@ -613,7 +613,7 @@ void ProjectTreeView::slotChangeDocumentFolderStatus() m_documentFolderList.remove(currentURL()); emit changeUploadStatus(url, false); } - currentItem()->tqrepaint(); + currentItem()->repaint(); } bool ProjectTreeView::isDocumentFolder(const KURL &url) diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 1618d588..ad2309da 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -188,7 +188,7 @@ void ServerTreeView::slotReloadTree( ProjectList *fileList, bool buildNewTree, c TQListViewItemIterator iter(this); for ( ; iter.current(); ++iter ) { - iter.current()->tqrepaint(); + iter.current()->repaint(); } } diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp index e897d14c..0325645e 100644 --- a/quanta/treeviews/structtreetag.cpp +++ b/quanta/treeviews/structtreetag.cpp @@ -116,7 +116,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString { node->tag->write()->setErrorMark(line); TQString parentTagName = node->tag->dtd()->caseSensitive ? node->parent->tag->name : node->parent->tag->name.upper(); - parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(parentTagName)); + parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").arg(line + 1).arg(qTagName).arg(parentTagName)); } TQString nextTagName; if (node->next) @@ -129,12 +129,12 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString (!node->next || ( !node->getClosingNode())) ) { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); + parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName)); } else if (!parentTQTag && node->tag->name.upper() != "!DOCTYPE") { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName).tqarg(node->tag->dtd()->nickName)); + parentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").arg(line + 1).arg(col + 1).arg(qTagName).arg(node->tag->dtd()->nickName)); } } break; @@ -182,7 +182,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString if (!node->prev || qTagName != "/" + qPrevTagName) { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); + parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName)); } } title = tag->tagStr().left(70).stripWhiteSpace(); diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index 24f48174..5cfe5dc9 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -376,7 +376,7 @@ void StructTreeView::deleteList(bool groupOnly) groupsCount = 0; } -/** tqrepaint document structure */ +/** repaint document structure */ void StructTreeView::slotReparse(Document *w, Node* node, int openLevel, bool groupOnly) { timer->restart(); @@ -1005,7 +1005,7 @@ void StructTreeView::slotOpenFile() emit openImage(url); } } else - KMessageBox::error(this, i18n("The file %1 does not exist or is not a recognized mime type.").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("The file %1 does not exist or is not a recognized mime type.").arg(url.prettyURL(0, KURL::StripFileProtocol))); } } diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h index 66c6b68e..2087f3fc 100644 --- a/quanta/treeviews/structtreeview.h +++ b/quanta/treeviews/structtreeview.h @@ -72,7 +72,7 @@ public: bool useOpenLevelSetting; public slots: // Public slots - /** tqrepaint document structure */ + /** repaint document structure */ void slotReparse(Document *w, Node* node, int openLevel = 3,bool groupOnly=false); void slotMouseClicked(int button, TQListViewItem*, const TQPoint&, int); void slotDoubleClicked( TQListViewItem * ); diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index 9473d2d8..534131a9 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -475,7 +475,7 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char deleteAll->setPixmap(SmallIcon("editdelete")); deleteAll->setMaximumHeight(32); deleteAll->setMaximumWidth(32); - TQToolTip::add(deleteAll, i18n("Delete the current tag and all its tqchildren.")); + TQToolTip::add(deleteAll, i18n("Delete the current tag and all its children.")); widgetLayout->addWidget( deleteTag, 0, 2 ); widgetLayout->addWidget( deleteAll, 0, 3 ); @@ -515,7 +515,7 @@ void EnhancedTagAttributeTree::showCaption() if(curNode->tag->type == Tag::XmlTag || curNode->tag->type == Tag::XmlTagEnd || curNode->tag->type == Tag::ScriptTag) { - TQString s = i18n("Current tag: %1").tqarg(curNode->tag->name); + TQString s = i18n("Current tag: %1").arg(curNode->tag->name); nodeName->setText(KStringHandler::rPixelSqueeze(s, nodeName->fontMetrics(), attrTree->width()- 50)); } else if(curNode->tag->type == Tag::Text) diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 98fc5048..533c0186 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -386,7 +386,7 @@ void TemplatesTreeView::slotNewDir() createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); } else { - createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType])); + createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_dirInfo.mimeType])); } if (createDirDlg->exec()) { @@ -404,7 +404,7 @@ void TemplatesTreeView::slotNewDir() if (!dir.mkdir(startDir+"/"+createDirDlg->dirName->text())) { KMessageBox::error(this,i18n("Error while creating the new folder.\n \ - Maybe you do not have permission to write in the %1 folder.").tqarg(startDir)); + Maybe you do not have permission to write in the %1 folder.").arg(startDir)); return; } if (! createDirDlg->parentAttr->isChecked()) @@ -467,13 +467,13 @@ void TemplatesTreeView::contentsDropEvent(TQDropEvent *e) bool proceed = true; if (QExtFileInfo::exists(url, false, this)) { - proceed = KMessageBox::warningContinueCancel(this, i18n("The file %1 already exists.
Do you want to overwrite it?").tqarg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; + proceed = KMessageBox::warningContinueCancel(this, i18n("The file %1 already exists.
Do you want to overwrite it?").arg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; } if (proceed) { if (!QuantaNetAccess::upload(tempFile->name(), url, m_parent, false)) { - KMessageBox::error(this,i18n("Could not write to file %1.
Check if you have rights to write there or that your connection is working.").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this,i18n("Could not write to file %1.
Check if you have rights to write there or that your connection is working.").arg(url.prettyURL(0, KURL::StripFileProtocol))); } } delete tempFile; @@ -619,7 +619,7 @@ void TemplatesTreeView::slotProperties() m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); } else { - m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType])); + m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_parentDirInfo.mimeType])); } m_quantaProperties->preTextEdit->setText(m_dirInfo.preText); m_quantaProperties->postTextEdit->setText(m_dirInfo.postText); @@ -873,9 +873,9 @@ void TemplatesTreeView::slotDelete() KURL url = currentURL(); TQString msg; if ( currentKFileTreeViewItem()->isDir() ) - msg = i18n("Do you really want to delete folder \n%1 ?\n").tqarg(url.path()); + msg = i18n("Do you really want to delete folder \n%1 ?\n").arg(url.path()); else - msg = i18n("Do you really want to delete file \n%1 ?\n").tqarg(url.path()); + msg = i18n("Do you really want to delete file \n%1 ?\n").arg(url.path()); if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue ) { @@ -1072,7 +1072,7 @@ void TemplatesTreeView::slotExtractSiteTemplate() } else error = true; if (error) - KMessageBox::error(this, i18n("Some error happened while extracting the %1 site template file.
Check that you have write permission for %2 and that there is enough free space in your temporary folder.").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(targetURL.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("Some error happened while extracting the %1 site template file.
Check that you have write permission for %2 and that there is enough free space in your temporary folder.").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol))); } } diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp index c4c40197..9c055424 100644 --- a/quanta/treeviews/uploadtreefile.cpp +++ b/quanta/treeviews/uploadtreefile.cpp @@ -28,7 +28,7 @@ #include "resource.h" UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) + : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; @@ -41,7 +41,7 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, con } UploadTreeFile::UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) + : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 8f5457e2..259b81dc 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -56,8 +56,8 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) TQListViewItem *itIter = it ? it->firstChild() : firstChild(); - // bitFlag structure: (0/1)all tqchildren exist (0/1)no tqchildren exist. - // We don't need some tqchildren as a bit flag, because that's implied if the bits are "00". + // bitFlag structure: (0/1)all children exist (0/1)no children exist. + // We don't need some children as a bit flag, because that's implied if the bits are "00". int bitFlags = 3; int retVal = 1; @@ -73,17 +73,17 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) UploadTreeFolder *itF = static_cast(itIter); if (hadCheckFlags == 2) { - // All tqchildren exist. + // All children exist. itF->setWhichPixmap( "check" ); itF->setSelected( true ); } else if (hadCheckFlags == 1) { - // No tqchildren exist. + // No children exist. itF->setWhichPixmap( "check_clear" ); itF->setSelected( false ); } else { - // Some tqchildren exist. + // Some children exist. itF->setWhichPixmap( "check_grey" ); itF->setSelected( true ); } @@ -95,13 +95,13 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) if ( itF->isSelected() ) { itF->setWhichPixmap("check"); - // Turn off "no tqchildren" + // Turn off "no children" if ( bitFlags % 2 == 1 ) bitFlags -= 1; } else { itF->setWhichPixmap("check_clear"); - // Turn off "all tqchildren". + // Turn off "all children". if (bitFlags >> 1 == 1) bitFlags -= 2; } @@ -162,17 +162,17 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) if ( itF ) { if (hadCheckFlags == 2) { - // All tqchildren exist. + // All children exist. itF->setWhichPixmap( "check" ); itF->setSelected( true ); } else if (hadCheckFlags == 1) { - // No tqchildren exist. + // No children exist. itF->setWhichPixmap( "check_clear" ); itF->setSelected( false ); } else { - // Some tqchildren exist. + // Some children exist. itF->setWhichPixmap( "check_grey" ); itF->setSelected( true ); } @@ -199,7 +199,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) { bool hasSelected = false; bool allSelected = true; - //check if the item has any tqchildren's selected + //check if the item has any children's selected TQListViewItemIterator iter(itF->firstChild()); while ( iter.current() && iter.current() != itF->nextSibling()) { diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp index f7597225..3426b83f 100644 --- a/quanta/utility/qpevents.cpp +++ b/quanta/utility/qpevents.cpp @@ -85,11 +85,11 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1 EventAction ev = *it; if (ev.type == EventAction::Internal) { - if (KMessageBox::warningContinueCancel(0L, i18n("An internal action (%1) associated with an event (%2) will be executed. Do you want to allow the execution of this action?").tqarg(ev.action).tqarg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about internal actions") == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(0L, i18n("An internal action (%1) associated with an event (%2) will be executed. Do you want to allow the execution of this action?").arg(ev.action).arg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about internal actions") == KMessageBox::Cancel) return; } else { - if (KMessageBox::warningContinueCancel(0L, i18n("An external action (%1) associated with an event (%2) will be executed. Do you want to allow the execution of this action?").tqarg(ev.action).tqarg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about external actions") == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(0L, i18n("An external action (%1) associated with an event (%2) will be executed. Do you want to allow the execution of this action?").arg(ev.action).arg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about external actions") == KMessageBox::Cancel) return; } KURL url = KURL::fromPathOrURL(argument1); @@ -221,7 +221,7 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1 } } if (!m_eventNames.contains(name)) - KMessageBox::sorry(0L, i18n("Unsupported event %1.").tqarg(name), i18n("Event Handling Error")); + KMessageBox::sorry(0L, i18n("Unsupported event %1.").arg(name), i18n("Event Handling Error")); } bool QPEvents::handleEvent(const EventAction& ev) @@ -309,11 +309,11 @@ bool QPEvents::handleEvent(const EventAction& ev) } if (!result) { - KMessageBox::sorry(0L, i18n("Logging failed. Check that you have write access to %1.").tqarg(url.path())); + KMessageBox::sorry(0L, i18n("Logging failed. Check that you have write access to %1.").arg(url.path())); return false; } } else - KMessageBox::sorry(0L, i18n("Unsupported internal event action : %1.").tqarg(ev.action)); + KMessageBox::sorry(0L, i18n("Unsupported internal event action : %1.").arg(ev.action)); } else if (ev.type == EventAction::External) { @@ -336,7 +336,7 @@ bool QPEvents::handleEvent(const EventAction& ev) { action->activate(); } else - KMessageBox::sorry(0L, i18n("The %1 script action was not found on your system.").tqarg(name), i18n("Action Execution Error")); + KMessageBox::sorry(0L, i18n("The %1 script action was not found on your system.").arg(name), i18n("Action Execution Error")); } else KMessageBox::sorry(0L, i18n("Unsupported external event action.")); } else diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index 3208a874..e5329b8a 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -196,7 +196,7 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse } menu.insertItem( - TQString("%1 - \"%2\"").tqarg( (*it)->line+1 ).tqarg( bText ), + TQString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( bText ), 0, (*it)->line, idx ); insertedItems++; @@ -219,15 +219,15 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse idx = ++old_menu_count; if ( next ) { - m_goNext->setText( i18n("&Next: %1 - \"%2\"").tqarg( next->line + 1 ) - .tqarg( KStringHandler::rsqueeze( doc->editIf->textLine( next->line ), 24 ) ) ); + m_goNext->setText( i18n("&Next: %1 - \"%2\"").arg( next->line + 1 ) + .arg( KStringHandler::rsqueeze( doc->editIf->textLine( next->line ), 24 ) ) ); m_goNext->plug( &menu, idx ); idx++; } if ( prev ) { - m_goPrevious->setText( i18n("&Previous: %1 - \"%2\"").tqarg(prev->line + 1 ) - .tqarg( KStringHandler::rsqueeze( doc->editIf->textLine( prev->line ), 24 ) ) ); + m_goPrevious->setText( i18n("&Previous: %1 - \"%2\"").arg(prev->line + 1 ) + .arg( KStringHandler::rsqueeze( doc->editIf->textLine( prev->line ), 24 ) ) ); m_goPrevious->plug( &menu, idx ); idx++; } diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index e50e55da..7eb8402d 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -382,8 +382,8 @@ TQString QuantaCommon::qUrl(const KURL &url) void QuantaCommon::dirCreationError(TQWidget *widget, const KURL& url) { KMessageBox::error(widget, i18n("Cannot create folder
%1.
Check that you have write permission in the parent folder or that the connection to
%2
is valid.") - .tqarg(url.prettyURL(0, KURL::StripFileProtocol)) - .tqarg(url.protocol()+"://"+url.user()+"@"+url.host()));} + .arg(url.prettyURL(0, KURL::StripFileProtocol)) + .arg(url.protocol()+"://"+url.user()+"@"+url.host()));} /** Adds the backslash before the special chars (like ?, *, . ) so the returned @@ -596,7 +596,7 @@ DCOPReply QuantaCommon::callDCOPMethod(const TQString& interface, const TQString if (!kapp->inherits("KUniqueApplication")) { pid_t pid = ::getpid(); - app += TQString("-%1").tqarg(pid); + app += TQString("-%1").arg(pid); } DCOPRef quantaRef(app.utf8(), interface.utf8()); DCOPReply reply; @@ -707,7 +707,7 @@ bool QuantaCommon::checkOverwrite(const KURL& url, TQWidget *window) if (QExtFileInfo::exists(url, false, window)) { if (KMessageBox::warningContinueCancel(window, - i18n( "The file %1 already exists.
Do you want to overwrite it?" ).tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) + i18n( "The file %1 already exists.
Do you want to overwrite it?" ).arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) result = false; } @@ -746,8 +746,8 @@ TQString QuantaCommon::encodedChar(uint code) { if (replacementMap.contains(code)) - return TQString("%1;").tqarg(replacementMap[code]); + return TQString("%1;").arg(replacementMap[code]); else - return TQString("&#%1;").tqarg(code); + return TQString("&#%1;").arg(code); } diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp index 69ddd0d5..375f6f6d 100644 --- a/quanta/utility/quantanetaccess.cpp +++ b/quanta/utility/quantanetaccess.cpp @@ -182,7 +182,7 @@ void QuantaNetAccess::checkProjectInsert(const KURL& target, TQWidget* window, b { TQString nice = QExtFileInfo::toRelative(saveUrl, baseURL).path(); nice = KStringHandler::lsqueeze(nice, 60); - if ( KMessageBox::Yes != KMessageBox::questionYesNo(window, i18n("Do you want to add
%1
to the project?").tqarg(nice), i18n("Add to Project"), KStdGuiItem::add(), i18n("Do Not Add"), "AddToProject") ) + if ( KMessageBox::Yes != KMessageBox::questionYesNo(window, i18n("Do you want to add
%1
to the project?").arg(nice), i18n("Add to Project"), KStdGuiItem::add(), i18n("Do Not Add"), "AddToProject") ) { return; } @@ -207,7 +207,7 @@ bool QuantaNetAccess::checkProjectRemove(const KURL& src, TQWidget* window, bool { TQString nice = QExtFileInfo::toRelative(url, baseURL).path(); nice = KStringHandler::lsqueeze(nice, 60); - if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("Do you really want to remove
%1
from the project?").tqarg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") ) + if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("Do you really want to remove
%1
from the project?").arg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") ) { return false; } @@ -230,7 +230,7 @@ bool QuantaNetAccess::checkProjectDel(const KURL& src, TQWidget* window, bool co { TQString nice = url.prettyURL(0, KURL::StripFileProtocol); nice = KStringHandler::csqueeze(nice, 60); - if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("Do you really want to delete
%1
and remove it from the project?").tqarg(nice), i18n("Delete & Remove From Project"), KStdGuiItem::del(), "DeleteAndRemoveFromProject") ) + if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("Do you really want to delete
%1
and remove it from the project?").arg(nice), i18n("Delete & Remove From Project"), KStdGuiItem::del(), "DeleteAndRemoveFromProject") ) { return false; } @@ -243,7 +243,7 @@ bool QuantaNetAccess::checkProjectDel(const KURL& src, TQWidget* window, bool co if (confirm) { TQString nice = url.prettyURL(0, KURL::StripFileProtocol); nice = KStringHandler::csqueeze(nice, 60); - return (KMessageBox::Continue == KMessageBox::warningContinueCancel(window, i18n("Do you really want to delete
%1?").tqarg(nice), i18n("Delete File or Folder"), KStdGuiItem::del(), "DeleteFileOrFolder") ); + return (KMessageBox::Continue == KMessageBox::warningContinueCancel(window, i18n("Do you really want to delete
%1?").arg(nice), i18n("Delete File or Folder"), KStdGuiItem::del(), "DeleteFileOrFolder") ); } return true; } diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index f782ea9e..1db14cf1 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -338,10 +338,10 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto pid_t pid = ::getpid(); if (kapp->inherits("KUniqueApplication")) { - command.replace("%pid", TQString("unique %1").tqarg(pid)); + command.replace("%pid", TQString("unique %1").arg(pid)); } else { - command.replace("%pid", TQString("%1").tqarg(pid)); + command.replace("%pid", TQString("%1").arg(pid)); } TQString buffer; TQString inputType = script.attribute("input","none"); @@ -461,7 +461,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto if (proc->start(KProcess::NotifyOnExit, KProcess::All)) { emit clearMessages(); - emit showMessage(i18n("The \"%1\" script started.\n").tqarg(actionText()), false); + emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false); if (!m_useInputFile) { if ( inputType == "current" || inputType == "selected" ) @@ -472,7 +472,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto proc->closeStdin(); } else { - KMessageBox::error(m_parentMainWindow, i18n("There was an error running %1.
Check that you have the %2 executable installed and it is accessible.").tqarg(command + " " + args).tqarg(command), i18n("Script Not Found")); + KMessageBox::error(m_parentMainWindow, i18n("There was an error running %1.
Check that you have the %2 executable installed and it is accessible.").arg(command + " " + args).arg(command), i18n("Script Not Found")); ViewManager::ref()->activeView()->setFocus(); if (loopStarted) { @@ -592,10 +592,10 @@ bool TagAction::slotActionActivated() pid_t pid = ::getpid(); if (kapp->inherits("KUniqueApplication")) { - command.replace("%pid", TQString("unique %1").tqarg(pid)); + command.replace("%pid", TQString("unique %1").arg(pid)); } else { - command.replace("%pid", TQString("%1").tqarg(pid)); + command.replace("%pid", TQString("%1").arg(pid)); } TQString buffer; TQString inputType = script.attribute("input","none"); @@ -715,7 +715,7 @@ bool TagAction::slotActionActivated() if (proc->start(KProcess::NotifyOnExit, KProcess::All)) { emit clearMessages(); - emit showMessage(i18n("The \"%1\" script started.\n").tqarg(actionText()), false); + emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false); if (!m_useInputFile) { if ( inputType == "current" || inputType == "selected" ) @@ -726,7 +726,7 @@ bool TagAction::slotActionActivated() proc->closeStdin(); } else { - KMessageBox::error(m_parentMainWindow, i18n("There was an error running %1.
Check that you have the %2 executable installed and it is accessible.").tqarg(command + " " + args).tqarg(command), i18n("Script Not Found")); + KMessageBox::error(m_parentMainWindow, i18n("There was an error running %1.
Check that you have the %2 executable installed and it is accessible.").arg(command + " " + args).arg(command), i18n("Script Not Found")); ViewManager::ref()->activeView()->setFocus(); if (loopStarted) { @@ -787,7 +787,7 @@ void TagAction::slotGetScriptOutput( KProcess *, char *buffer, int buflen ) if ( firstOutput ) { emit showMessagesView(); - emit showMessage(i18n("The \"%1\" script output:\n").tqarg(actionText()), false); + emit showMessage(i18n("The \"%1\" script output:\n").arg(actionText()), false); } emit showMessage(text, true); } else @@ -847,7 +847,7 @@ void TagAction::slotGetScriptError( KProcess *, char *buffer, int buflen ) if ( firstError ) { emit showMessagesView(); - emit showMessage(i18n("The \"%1\" script output:\n").tqarg(actionText()), false); + emit showMessage(i18n("The \"%1\" script output:\n").arg(actionText()), false); } emit showMessage(text, true); } @@ -970,7 +970,7 @@ void TagAction::slotProcessExited(KProcess *process) tqApp->exit_loop(); loopStarted = false; } - emit showMessage(i18n("The \"%1\" script has exited.").tqarg(actionText()), false); + emit showMessage(i18n("The \"%1\" script has exited.").arg(actionText()), false); delete process; } @@ -1008,7 +1008,7 @@ void TagAction::execute(bool blocking) /** Timeout occurred while waiting for some network function to return. */ void TagAction::slotTimeout() { - if ((m_killCount == 0) && (KMessageBox::questionYesNo(m_parentMainWindow, i18n("The filtering action %1 seems to be locked.
Do you want to terminate it?").tqarg(actionText()), i18n("Action Not Responding"), i18n("Terminate"), i18n("Keep Running")) == KMessageBox::Yes)) + if ((m_killCount == 0) && (KMessageBox::questionYesNo(m_parentMainWindow, i18n("The filtering action %1 seems to be locked.
Do you want to terminate it?").arg(actionText()), i18n("Action Not Responding"), i18n("Terminate"), i18n("Keep Running")) == KMessageBox::Yes)) { if (::kill(-proc->pid(), SIGTERM)) { diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index 5331413a..0104c745 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -307,18 +307,18 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e) m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - " + i18n(m_toolbarTab->tabUnderMouseLabel.utf8())); m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction())); - TQObjectList* tqchildrenList = queryList("KToolBarButton"); - for (uint i = 0; i < tqchildrenList->count(); i++) + TQObjectList* childrenList = queryList("KToolBarButton"); + for (uint i = 0; i < childrenList->count(); i++) { - KToolBarButton *w = static_cast(TQT_TQWIDGET(tqchildrenList->at(i))); + KToolBarButton *w = static_cast(TQT_TQWIDGET(childrenList->at(i))); TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos()); TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height()); if (TQRect(p1, p2).contains(p)) { currentActionName = w->textLabel(); TQString actionName = currentActionName; - m_popupMenu->insertItem(i18n("Remove Action - %1").tqarg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); - m_popupMenu->insertItem(i18n("Edit Action - %1").tqarg(actionName), this, TQT_SLOT(slotEditAction())); + m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); + m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQT_SLOT(slotEditAction())); break; } } @@ -341,7 +341,7 @@ void QuantaToolBar::slotEditAction() void QuantaToolBar::slotRemoveAction() { - if ( KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove the %1 action?").tqarg(currentActionName),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove the %1 action?").arg(currentActionName),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { emit removeAction(m_toolbarTab->tabUnderMouse, currentActionName); } -- cgit v1.2.3