summaryrefslogtreecommitdiffstats
path: root/quanta/src
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/src')
-rw-r--r--quanta/src/document.cpp12
-rw-r--r--quanta/src/document.h2
-rw-r--r--quanta/src/dtds.cpp20
-rw-r--r--quanta/src/quanta.cpp58
-rw-r--r--quanta/src/quanta.h2
-rw-r--r--quanta/src/quanta_init.cpp16
-rw-r--r--quanta/src/quantadoc.cpp6
-rw-r--r--quanta/src/quantaview.cpp6
-rw-r--r--quanta/src/viewmanager.cpp28
9 files changed, 75 insertions, 75 deletions
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index bc5e5f31..f11ff1dd 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("<qt>Cannot download <b>%1</b>.</qt>").tqarg( url.prettyURL(0, KURL::StripFileProtocol)));
+ KMessageBox::error(this, i18n("<qt>Cannot download <b>%1</b>.</qt>").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("<qt>Cannot open <b>%1</b> for reading.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
+ KMessageBox::error(this, i18n("<qt>Cannot open <b>%1</b> for reading.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
}
/** Inserts text at the current cursor position */
@@ -1303,7 +1303,7 @@ TQValueList<KTextEditor::CompletionEntry>* 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<KTextEditor::CompletionEntry>* 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 a0fe92be..e44ba591 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("<qt>The DTD tag file %1 is not valid.<br> The error message is: <i>%2 in line %3, column %4.</i></qt>").tqarg(fileName).tqarg(errorMsg).tqarg(errorLine).tqarg(errorCol),
+ KMessageBox::error(0L, i18n("<qt>The DTD tag file %1 is not valid.<br> The error message is: <i>%2 in line %3, column %4.</i></qt>").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("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No)
+ KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").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("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").tqarg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes)
+ KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").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("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No)
+ KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").arg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No)
{
return;
}
removeDTD(dtd);
if (!readTagDir(dirName))
{
- KMessageBox::error(0L, i18n("<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid DTEP (<i>description.rc and *.tag files</i>).</qt>").tqarg(dirName), i18n("Error Loading DTEP"));
+ KMessageBox::error(0L, i18n("<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid DTEP (<i>description.rc and *.tag files</i>).</qt>").arg(dirName), i18n("Error Loading DTEP"));
} else
{
TQString family = dtdcfg.readEntry("Family", "1");
- if (askForAutoload && KMessageBox::questionYesNo(0L, i18n("<qt>Autoload the <b>%1</b> DTD in the future?</qt>").tqarg(nickName), TQString(), i18n("Load"), i18n("Do Not Load")) == KMessageBox::Yes)
+ if (askForAutoload && KMessageBox::questionYesNo(0L, i18n("<qt>Autoload the <b>%1</b> DTD in the future?</qt>").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("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").tqarg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes)
+ KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").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 66723eae..b2468de4 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("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg((*i).prettyURL(0, KURL::StripFileProtocol)));
+ KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").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("<qt>Do you want to add the<br><b>%1</b><br>file to project?</qt>").tqarg(saveUrl.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::add(), i18n("Do Not Add"))
+ KMessageBox::Yes == KMessageBox::questionYesNo(0,i18n("<qt>Do you want to add the<br><b>%1</b><br>file to project?</qt>").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("<qt>There was an error while creating the template file.<br>Check that you have write access to <i>%1</i>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error"));
+ KMessageBox::error(this, i18n("<qt>There was an error while creating the template file.<br>Check that you have write access to <i>%1</i>.</qt>").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("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol)));
+ KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").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)<<endl;
+ kdError(24000) << TQString("Error %1 at (%2, %3)").arg(error).arg(el).arg(ec)<<endl;
p_toolbar->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("<qt>An error happened while saving the <b>%1</b> toolbar.<br>"
- "Check that you have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save Toolbars->Save as Local Toolbar</i> in this case. </qt>").tqarg(p_toolbar->name).tqarg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error"));
+ "Check that you have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save Toolbars->Save as Local Toolbar</i> in this case. </qt>").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("<qt>You must save the toolbars to the following folder: <br><br><b>%1</b></qt>")
- .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("<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n<kpartgui name=\"quanta\" version=\"2\">\n<ToolBar name=\"%1\" tabname=\"%2\" i18ntabname=\"%3\" id=\"%4\">\n<text>%5</text>\n</ToolBar>\n</kpartgui>\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("<qt>Toolbar <b>%1</b> is new and unsaved. Do you want to save it before it is removed?</qt>").tqarg(p_toolbar->name),
+ result = KMessageBox::warningYesNoCancel(this, i18n("<qt>Toolbar <b>%1</b> is new and unsaved. Do you want to save it before it is removed?</qt>").arg(p_toolbar->name),
i18n("Save Toolbar"), KStdGuiItem::save(), KStdGuiItem::discard());
} else
{
FourButtonMessageBox dlg(this, 0, true);
- dlg.textLabel->setText(i18n("<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is removed?</qt>").tqarg(p_toolbar->name));
+ dlg.textLabel->setText(i18n("<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is removed?</qt>").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 22db4f38..ddd960e0 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 3a612ab4..3d79323e 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: <b>%4</b><br>"
"Backup created on: <b>%5</b><br><br>"
"</qt>")
- .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 &not 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 96647250..3f70e2ae 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("<qt>Cannot open document <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
+ KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").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 50d0651b..60f90230 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<QuantaView*>(currentView) && !static_cast<QuantaView*>(currentView)->document())
ToolbarTabWidget::ref()->reparent(0, 0, TQPoint(), false);
KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator();
- //save the tqchildren first to a list, as removing invalidates our iterator
- TQValueList<KMdiChildView *> tqchildren;
+ //save the children first to a list, as removing invalidates our iterator
+ TQValueList<KMdiChildView *> children;
for (it->first(); !it->isDone(); it->next())
{
- tqchildren.append(it->currentItem());
+ children.append(it->currentItem());
}
delete it;
KURL::List modifiedList;
TQValueListIterator<KMdiChildView *> childIt;
- for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
+ for (childIt = children.begin(); childIt != children.end(); ++childIt)
{
view = *childIt;
qView = dynamic_cast<QuantaView*>(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<QuantaView*>(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<KMdiChildView*> *it = quantaApp->createIterator();
QuantaView *view;
- //save the tqchildren first to a list, as removing invalidates our iterator
- TQValueList<KMdiChildView *> tqchildren;
+ //save the children first to a list, as removing invalidates our iterator
+ TQValueList<KMdiChildView *> children;
for (it->first(); !it->isDone(); it->next())
{
- tqchildren.append(it->currentItem());
+ children.append(it->currentItem());
}
delete it;
KURL::List modifiedList;
TQValueListIterator<KMdiChildView *> childIt;
- for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
+ for (childIt = children.begin(); childIt != children.end(); ++childIt)
{
view = dynamic_cast<QuantaView*>(*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<QuantaView*>(*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<QuantaView*>(*childIt);
if (view)