summaryrefslogtreecommitdiffstats
path: root/src/translators
diff options
context:
space:
mode:
Diffstat (limited to 'src/translators')
-rw-r--r--src/translators/alexandriaexporter.cpp2
-rw-r--r--src/translators/audiofileimporter.cpp8
-rw-r--r--src/translators/bibtexexporter.cpp4
-rw-r--r--src/translators/bibteximporter.cpp4
-rw-r--r--src/translators/bibtexmlimporter.cpp2
-rw-r--r--src/translators/btparse/ast.c2
-rw-r--r--src/translators/btparse/postprocess.c2
-rw-r--r--src/translators/csvexporter.cpp4
-rw-r--r--src/translators/freedbimporter.cpp10
-rw-r--r--src/translators/htmlexporter.cpp8
-rw-r--r--src/translators/importer.h2
-rw-r--r--src/translators/onixexporter.cpp4
-rw-r--r--src/translators/pilotdbexporter.cpp6
-rw-r--r--src/translators/tellico_xml.cpp4
-rw-r--r--src/translators/tellicoimporter.cpp30
-rw-r--r--src/translators/tellicoxmlexporter.cpp6
-rw-r--r--src/translators/xmlimporter.cpp4
17 files changed, 51 insertions, 51 deletions
diff --git a/src/translators/alexandriaexporter.cpp b/src/translators/alexandriaexporter.cpp
index 9a46268..51e6390 100644
--- a/src/translators/alexandriaexporter.cpp
+++ b/src/translators/alexandriaexporter.cpp
@@ -66,7 +66,7 @@ bool AlexandriaExporter::exec() {
int ret = KMessageBox::warningContinueCancel(Kernel::self()->widget(),
i18n("<qt>An Alexandria library called <i>%1</i> already exists. "
"Any existing books in that library could be overwritten.</qt>")
- .tqarg(coll->title()));
+ .arg(coll->title()));
if(ret == KMessageBox::Cancel) {
return false;
}
diff --git a/src/translators/audiofileimporter.cpp b/src/translators/audiofileimporter.cpp
index e6c74de..b6a7420 100644
--- a/src/translators/audiofileimporter.cpp
+++ b/src/translators/audiofileimporter.cpp
@@ -155,9 +155,9 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
continue;
}
int disc = discNumber(f);
- if(disc > 1 && !m_coll->hasField(TQString::fromLatin1("track%1").tqarg(disc))) {
- Data::FieldPtr f2 = new Data::Field(TQString::fromLatin1("track%1").tqarg(disc),
- i18n("Tracks (Disc %1)").tqarg(disc),
+ if(disc > 1 && !m_coll->hasField(TQString::fromLatin1("track%1").arg(disc))) {
+ Data::FieldPtr f2 = new Data::Field(TQString::fromLatin1("track%1").arg(disc),
+ i18n("Tracks (Disc %1)").arg(disc),
Data::Field::Table);
f2->setFormatFlag(Data::Field::FormatTitle);
f2->setProperty(TQString::fromLatin1("columns"), TQChar('3'));
@@ -167,7 +167,7 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
m_coll->addField(f2);
if(changeTrackTitle) {
Data::FieldPtr newTrack = new Data::Field(*m_coll->fieldByName(track));
- newTrack->setTitle(i18n("Tracks (Disc %1)").tqarg(1));
+ newTrack->setTitle(i18n("Tracks (Disc %1)").arg(1));
m_coll->modifyField(newTrack);
changeTrackTitle = false;
}
diff --git a/src/translators/bibtexexporter.cpp b/src/translators/bibtexexporter.cpp
index 5cbce00..7aca156 100644
--- a/src/translators/bibtexexporter.cpp
+++ b/src/translators/bibtexexporter.cpp
@@ -236,7 +236,7 @@ TQWidget* BibtexExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
}
void BibtexExporter::readOptions(KConfig* config_) {
- KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
m_expandMacros = group.readBoolEntry("Expand Macros", m_expandMacros);
m_packageURL = group.readBoolEntry("URL Package", m_packageURL);
m_skipEmptyKeys = group.readBoolEntry("Skip Empty Keys", m_skipEmptyKeys);
@@ -249,7 +249,7 @@ void BibtexExporter::readOptions(KConfig* config_) {
}
void BibtexExporter::saveOptions(KConfig* config_) {
- KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
m_expandMacros = m_checkExpandMacros->isChecked();
group.writeEntry("Expand Macros", m_expandMacros);
m_packageURL = m_checkPackageURL->isChecked();
diff --git a/src/translators/bibteximporter.cpp b/src/translators/bibteximporter.cpp
index 3c0fe8d..850a390 100644
--- a/src/translators/bibteximporter.cpp
+++ b/src/translators/bibteximporter.cpp
@@ -95,7 +95,7 @@ Tellico::Data::CollPtr BibtexImporter::collection() {
}
Data::CollPtr coll = readCollection(text, count);
if(!coll || coll->entryCount() == 0) {
- setStatusMessage(i18n("No valid bibtex entries were found in file - %1").tqarg(url().fileName()));
+ setStatusMessage(i18n("No valid bibtex entries were found in file - %1").arg(url().fileName()));
continue;
}
m_coll->addEntries(coll->entries());
@@ -289,7 +289,7 @@ TQWidget* BibtexImporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
TQButtonGroup* box = new TQVButtonGroup(i18n("Bibtex Options"), m_widget);
m_readUTF8 = new TQRadioButton(i18n("Use Unicode (UTF-8) encoding"), box);
TQWhatsThis::add(m_readUTF8, i18n("Read the imported file in Unicode (UTF-8)."));
- TQString localStr = i18n("Use user locale (%1) encoding").tqarg(
+ TQString localStr = i18n("Use user locale (%1) encoding").arg(
TQString::fromLatin1(TQTextCodec::codecForLocale()->name()));
m_readLocale = new TQRadioButton(localStr, box);
m_readLocale->setChecked(true);
diff --git a/src/translators/bibtexmlimporter.cpp b/src/translators/bibtexmlimporter.cpp
index 6cfe7c8..bf33c02 100644
--- a/src/translators/bibtexmlimporter.cpp
+++ b/src/translators/bibtexmlimporter.cpp
@@ -40,7 +40,7 @@ Tellico::Data::CollPtr BibtexmlImporter::collection() {
void BibtexmlImporter::loadDomDocument() {
TQDomElement root = domDocument().documentElement();
if(root.isNull() || root.localName() != Latin1Literal("file")) {
- setStatusMessage(i18n(errorLoad).tqarg(url().fileName()));
+ setStatusMessage(i18n(errorLoad).arg(url().fileName()));
return;
}
diff --git a/src/translators/btparse/ast.c b/src/translators/btparse/ast.c
index e3479b7..d433f79 100644
--- a/src/translators/btparse/ast.c
+++ b/src/translators/btparse/ast.c
@@ -144,7 +144,7 @@ zzfree_ast(AST *tree)
}
/* build a tree (root child1 child2 ... NULL)
- * If root is NULL, simply make the tqchildren siblings and return ptr
+ * If root is NULL, simply make the children siblings and return ptr
* to 1st sibling (child1). If root is not single node, return NULL.
*
* Siblings that are actually siblins lists themselves are handled
diff --git a/src/translators/btparse/postprocess.c b/src/translators/btparse/postprocess.c
index 692e084..7f7bfd4 100644
--- a/src/translators/btparse/postprocess.c
+++ b/src/translators/btparse/postprocess.c
@@ -464,7 +464,7 @@ bt_postprocess_entry (AST * top, ushort options)
"invalid node type (not entry root)");
strlwr (top->text); /* downcase entry type */
- if (top->down == NULL) return; /* no tqchildren at all */
+ if (top->down == NULL) return; /* no children at all */
cur = top->down;
if (cur->nodetype == BTAST_KEY)
diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp
index dd823db..64c0c1f 100644
--- a/src/translators/csvexporter.cpp
+++ b/src/translators/csvexporter.cpp
@@ -165,7 +165,7 @@ TQWidget* CSVExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
}
void CSVExporter::readOptions(KConfig* config_) {
- KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
m_includeTitles = group.readBoolEntry("Include Titles", m_includeTitles);
m_delimiter = group.readEntry("Delimiter", m_delimiter);
}
@@ -182,7 +182,7 @@ void CSVExporter::saveOptions(KConfig* config_) {
m_delimiter = m_editOther->text();
}
- KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
group.writeEntry("Include Titles", m_includeTitles);
group.writeEntry("Delimiter", m_delimiter);
}
diff --git a/src/translators/freedbimporter.cpp b/src/translators/freedbimporter.cpp
index 6cb4adc..9ee128f 100644
--- a/src/translators/freedbimporter.cpp
+++ b/src/translators/freedbimporter.cpp
@@ -81,7 +81,7 @@ void FreeDBImporter::readCDROM() {
#ifdef HAVE_KCDDB
TQString drivePath = m_driveCombo->currentText();
if(drivePath.isEmpty()) {
- setStatusMessage(i18n("<qt>Tellico was unable to access the CD-ROM device - <i>%1</i>.</qt>").tqarg(drivePath));
+ setStatusMessage(i18n("<qt>Tellico was unable to access the CD-ROM device - <i>%1</i>.</qt>").arg(drivePath));
myDebug() << "FreeDBImporter::readCDROM() - no drive!" << endl;
return;
}
@@ -167,7 +167,7 @@ void FreeDBImporter::readCDROM() {
#endif
if(list.isEmpty()) {
- setStatusMessage(i18n("<qt>Tellico was unable to access the CD-ROM device - <i>%1</i>.</qt>").tqarg(drivePath));
+ setStatusMessage(i18n("<qt>Tellico was unable to access the CD-ROM device - <i>%1</i>.</qt>").arg(drivePath));
return;
}
// myDebug() << KCDDB::CDDB::trackOffsetListToId(list) << endl;
@@ -185,9 +185,9 @@ void FreeDBImporter::readCDROM() {
TQStringList list;
KCDDB::CDInfoList infoList = client.lookupResponse();
for(KCDDB::CDInfoList::iterator it = infoList.begin(); it != infoList.end(); ++it) {
- list.append(TQString::fromLatin1("%1, %2, %3").tqarg((*it).artist)
- .tqarg((*it).title)
- .tqarg((*it).genre));
+ list.append(TQString::fromLatin1("%1, %2, %3").arg((*it).artist)
+ .arg((*it).title)
+ .arg((*it).genre));
}
// switch back to pointer cursor
diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp
index 03191b3..ce84d19 100644
--- a/src/translators/htmlexporter.cpp
+++ b/src/translators/htmlexporter.cpp
@@ -317,7 +317,7 @@ void HTMLExporter::setFormattingOptions(Data::CollPtr coll) {
} else {
s = coll->fieldTitleByName(m_groupBy[0]);
}
- sortString = i18n("(grouped by %1)").tqarg(s);
+ sortString = i18n("(grouped by %1)").arg(s);
TQString groupFields;
for(TQStringList::ConstIterator it = m_groupBy.begin(); it != m_groupBy.end(); ++it) {
@@ -484,7 +484,7 @@ TQWidget* HTMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
}
void HTMLExporter::readOptions(KConfig* config_) {
- KConfigGroup exportConfig(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup exportConfig(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
m_printHeaders = exportConfig.readBoolEntry("Print Field Headers", m_printHeaders);
m_printGrouped = exportConfig.readBoolEntry("Print Grouped", m_printGrouped);
m_exportEntryFiles = exportConfig.readBoolEntry("Export Entry Files", m_exportEntryFiles);
@@ -496,7 +496,7 @@ void HTMLExporter::readOptions(KConfig* config_) {
}
void HTMLExporter::saveOptions(KConfig* config_) {
- KConfigGroup cfg(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup cfg(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
m_printHeaders = m_checkPrintHeaders->isChecked();
cfg.writeEntry("Print Field Headers", m_printHeaders);
m_printGrouped = m_checkPrintGrouped->isChecked();
@@ -735,7 +735,7 @@ bool HTMLExporter::writeEntryFiles() {
TQStringList dataImages;
dataImages << TQString::fromLatin1("checkmark.png");
for(uint i = 1; i <= 10; ++i) {
- dataImages << TQString::fromLatin1("stars%1.png").tqarg(i);
+ dataImages << TQString::fromLatin1("stars%1.png").arg(i);
}
KURL dataDir;
dataDir.setPath(KGlobal::dirs()->findResourceDir("appdata", TQString::fromLatin1("pics/tellico.png")) + "pics/");
diff --git a/src/translators/importer.h b/src/translators/importer.h
index d10e027..08fe3f1 100644
--- a/src/translators/importer.h
+++ b/src/translators/importer.h
@@ -98,7 +98,7 @@ public:
* Returns a string useful for the ProgressManager
*/
TQString progressLabel() const {
- if(url().isEmpty()) return i18n("Loading data..."); else return i18n("Loading %1...").tqarg(url().fileName());
+ if(url().isEmpty()) return i18n("Loading data..."); else return i18n("Loading %1...").arg(url().fileName());
}
public slots:
diff --git a/src/translators/onixexporter.cpp b/src/translators/onixexporter.cpp
index 713a96a..22314b5 100644
--- a/src/translators/onixexporter.cpp
+++ b/src/translators/onixexporter.cpp
@@ -185,14 +185,14 @@ TQWidget* ONIXExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
}
void ONIXExporter::readOptions(KConfig* config_) {
- KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
m_includeImages = group.readBoolEntry("Include Images", m_includeImages);
}
void ONIXExporter::saveOptions(KConfig* config_) {
m_includeImages = m_checkIncludeImages->isChecked();
- KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
group.writeEntry("Include Images", m_includeImages);
}
diff --git a/src/translators/pilotdbexporter.cpp b/src/translators/pilotdbexporter.cpp
index 99727bc..5d4fc16 100644
--- a/src/translators/pilotdbexporter.cpp
+++ b/src/translators/pilotdbexporter.cpp
@@ -58,7 +58,7 @@ bool PilotDBExporter::exec() {
TQTextCodec* codec = 0;
{
// Latin1 is default
- KConfigGroup group(KGlobal::config(), TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup group(KGlobal::config(), TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
codec = KGlobal::charsets()->codecForName(group.readEntry("Charset"));
}
if(!codec) {
@@ -219,12 +219,12 @@ TQWidget* PilotDBExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
}
void PilotDBExporter::readOptions(KConfig* config_) {
- KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
m_backup = group.readBoolEntry("Backup", m_backup);
}
void PilotDBExporter::saveOptions(KConfig* config_) {
- KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
m_backup = m_checkBackup->isChecked();
group.writeEntry("Backup", m_backup);
}
diff --git a/src/translators/tellico_xml.cpp b/src/translators/tellico_xml.cpp
index 32cf523..e82f134 100644
--- a/src/translators/tellico_xml.cpp
+++ b/src/translators/tellico_xml.cpp
@@ -56,11 +56,11 @@ const TQString Tellico::XML::nsZing = TQString::fromLatin1("http://www.loc.gov/z
const TQString Tellico::XML::nsZingDiag = TQString::fromLatin1("http://www.loc.gov/zing/srw/diagnostic/");
TQString Tellico::XML::pubTellico(int version) {
- return TQString::fromLatin1("-//Robby Stephenson/DTD Tellico V%1.0//EN").tqarg(version);
+ return TQString::fromLatin1("-//Robby Stephenson/DTD Tellico V%1.0//EN").arg(version);
}
TQString Tellico::XML::dtdTellico(int version) {
- return TQString::fromLatin1("http://periapsis.org/tellico/dtd/v%1/tellico.dtd").tqarg(version);
+ return TQString::fromLatin1("http://periapsis.org/tellico/dtd/v%1/tellico.dtd").arg(version);
}
bool Tellico::XML::validXMLElementName(const TQString& name_) {
diff --git a/src/translators/tellicoimporter.cpp b/src/translators/tellicoimporter.cpp
index 5eb863d..5dfc933 100644
--- a/src/translators/tellicoimporter.cpp
+++ b/src/translators/tellicoimporter.cpp
@@ -109,8 +109,8 @@ void TellicoImporter::loadXMLData(const TQByteArray& data_, bool loadImages_) {
TQString errorMsg;
int errorLine, errorColumn;
if(!dom.setContent(data_, true, &errorMsg, &errorLine, &errorColumn)) {
- TQString str = i18n(errorLoad).tqarg(url().fileName()) + TQChar('\n');
- str += i18n("There is an XML parsing error in line %1, column %2.").tqarg(errorLine).tqarg(errorColumn);
+ TQString str = i18n(errorLoad).arg(url().fileName()) + TQChar('\n');
+ str += i18n("There is an XML parsing error in line %1, column %2.").arg(errorLine).arg(errorColumn);
str += TQString::fromLatin1("\n");
str += i18n("The error message from TQt is:");
str += TQString::fromLatin1("\n\t") + errorMsg;
@@ -130,7 +130,7 @@ void TellicoImporter::loadXMLData(const TQByteArray& data_, bool loadImages_) {
syntaxVersion = root.attribute(TQString::fromLatin1("version")).toInt();
} else {
if(!url().isEmpty()) {
- setStatusMessage(i18n(errorLoad).tqarg(url().fileName()));
+ setStatusMessage(i18n(errorLoad).arg(url().fileName()));
}
m_format = Error;
return;
@@ -140,7 +140,7 @@ void TellicoImporter::loadXMLData(const TQByteArray& data_, bool loadImages_) {
if((syntaxVersion > 6 && root.tagName() != Latin1Literal("tellico"))
|| (syntaxVersion < 7 && root.tagName() != Latin1Literal("bookcase"))) {
if(!url().isEmpty()) {
- setStatusMessage(i18n(errorLoad).tqarg(url().fileName()));
+ setStatusMessage(i18n(errorLoad).arg(url().fileName()));
}
m_format = Error;
return;
@@ -148,7 +148,7 @@ void TellicoImporter::loadXMLData(const TQByteArray& data_, bool loadImages_) {
if(syntaxVersion > XML::syntaxVersion) {
if(!url().isEmpty()) {
- TQString str = i18n(errorLoad).tqarg(url().fileName()) + TQChar('\n');
+ TQString str = i18n(errorLoad).arg(url().fileName()) + TQChar('\n');
str += i18n("It is from a future version of Tellico.");
myDebug() << str << endl;
setStatusMessage(str);
@@ -211,7 +211,7 @@ void TellicoImporter::loadXMLData(const TQByteArray& data_, bool loadImages_) {
if(!addFields) {
TQString name = fieldelems.item(0).toElement().attribute(TQString::fromLatin1("name"));
addFields = (name == Latin1Literal("_default"));
- // removeChild only works for immediate tqchildren
+ // removeChild only works for immediate children
// remove _default field
if(addFields) {
fieldelems.item(0).parentNode().removeChild(fieldelems.item(0));
@@ -458,7 +458,7 @@ void TellicoImporter::readField(uint syntaxVersion_, const TQDomElement& elem_)
Data::Field::convertOldRating(field); // does all its own checking
}
m_coll->addField(field);
-// myDebug() << TQString(" Added field: %1, %2").tqarg(field->name()).tqarg(field->title()) << endl;
+// myDebug() << TQString(" Added field: %1, %2").arg(field->name()).arg(field->title()) << endl;
}
void TellicoImporter::readEntry(uint syntaxVersion_, const TQDomElement& entryElem_) {
@@ -472,7 +472,7 @@ void TellicoImporter::readEntry(uint syntaxVersion_, const TQDomElement& entryEl
bool oldMusic = (syntaxVersion_ < 9 && m_coll->type() == Data::Collection::Album);
- // iterate over all field value tqchildren
+ // iterate over all field value children
for(TQDomNode node = entryElem_.firstChild(); !node.isNull(); node = node.nextSibling()) {
TQDomElement elem = node.toElement();
if(elem.isNull()) {
@@ -493,7 +493,7 @@ void TellicoImporter::readEntry(uint syntaxVersion_, const TQDomElement& entryEl
Data::FieldPtr f = m_coll->fieldByName(name);
// if the first child of the node is a text node, just set the attribute text
- // otherwise, recurse over the node's tqchildren
+ // otherwise, recurse over the node's children
// this is the case for <authors><author>..</author></authors>
// but if there's nothing but white space, then it's a BaseNode for some reason
// if(node.firstChild().nodeType() == TQDomNode::TextNode) {
@@ -586,7 +586,7 @@ void TellicoImporter::readEntry(uint syntaxVersion_, const TQDomElement& entryEl
}
entry->setField(name, value);
}
- } else { // if no field by the tag name, then it has tqchildren, iterate through them
+ } else { // if no field by the tag name, then it has children, iterate through them
// the field name has the final 's', so remove it
name.truncate(name.length() - 1);
f = m_coll->fieldByName(name);
@@ -776,7 +776,7 @@ void TellicoImporter::loadZipData() {
m_zip = new KZip(TQT_TQIODEVICE(m_buffer));
}
if(!m_zip->open(IO_ReadOnly)) {
- setStatusMessage(i18n(errorLoad).tqarg(url().fileName()));
+ setStatusMessage(i18n(errorLoad).arg(url().fileName()));
m_format = Error;
delete m_zip;
m_zip = 0;
@@ -787,7 +787,7 @@ void TellicoImporter::loadZipData() {
const KArchiveDirectory* dir = m_zip->directory();
if(!dir) {
- TQString str = i18n(errorLoad).tqarg(url().fileName()) + TQChar('\n');
+ TQString str = i18n(errorLoad).arg(url().fileName()) + TQChar('\n');
str += i18n("The file is empty.");
setStatusMessage(str);
m_format = Error;
@@ -805,7 +805,7 @@ void TellicoImporter::loadZipData() {
entry = dir->entry(TQString::fromLatin1("bookcase.xml"));
}
if(!entry || !entry->isFile()) {
- TQString str = i18n(errorLoad).tqarg(url().fileName()) + TQChar('\n');
+ TQString str = i18n(errorLoad).arg(url().fileName()) + TQChar('\n');
str += i18n("The file contains no collection data.");
setStatusMessage(str);
m_format = Error;
@@ -913,7 +913,7 @@ bool TellicoImporter::loadAllImages(const KURL& url_) {
KZip zip(url_.path());
if(!zip.open(IO_ReadOnly)) {
if(u != url_) {
- Kernel::self()->sorry(i18n(errorImageLoad).tqarg(url_.fileName()));
+ Kernel::self()->sorry(i18n(errorImageLoad).arg(url_.fileName()));
}
u = url_;
return false;
@@ -922,7 +922,7 @@ bool TellicoImporter::loadAllImages(const KURL& url_) {
const KArchiveDirectory* dir = zip.directory();
if(!dir) {
if(u != url_) {
- Kernel::self()->sorry(i18n(errorImageLoad).tqarg(url_.fileName()));
+ Kernel::self()->sorry(i18n(errorImageLoad).arg(url_.fileName()));
}
u = url_;
zip.close();
diff --git a/src/translators/tellicoxmlexporter.cpp b/src/translators/tellicoxmlexporter.cpp
index 2cb0433..0a7d1af 100644
--- a/src/translators/tellicoxmlexporter.cpp
+++ b/src/translators/tellicoxmlexporter.cpp
@@ -380,7 +380,7 @@ void TellicoXMLExporter::exportImageXML(TQDomDocument& dom_, TQDomElement& paren
void TellicoXMLExporter::exportGroupXML(TQDomDocument& dom_, TQDomElement& parent_) const {
Data::EntryVec vec = entries(); // need a copy for ::contains();
bool exportAll = collection()->entries().count() == vec.count();
- // iterate over each group, which are the first tqchildren
+ // iterate over each group, which are the first children
for(GroupIterator gIt = Controller::self()->groupIterator(); gIt.group(); ++gIt) {
if(gIt.group()->isEmpty()) {
continue;
@@ -491,14 +491,14 @@ TQWidget* TellicoXMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/)
}
void TellicoXMLExporter::readOptions(KConfig* config_) {
- KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
m_includeImages = group.readBoolEntry("Include Images", m_includeImages);
}
void TellicoXMLExporter::saveOptions(KConfig* config_) {
m_includeImages = m_checkIncludeImages->isChecked();
- KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").tqarg(formatString()));
+ KConfigGroup group(config_, TQString::fromLatin1("ExportOptions - %1").arg(formatString()));
group.writeEntry("Include Images", m_includeImages);
}
diff --git a/src/translators/xmlimporter.cpp b/src/translators/xmlimporter.cpp
index ee2adcc..d3a522f 100644
--- a/src/translators/xmlimporter.cpp
+++ b/src/translators/xmlimporter.cpp
@@ -40,7 +40,7 @@ XMLImporter::XMLImporter(const TQByteArray& data_) : Import::Importer(KURL()) {
TQString errorMsg;
int errorLine, errorColumn;
if(!m_dom.setContent(data_, true, &errorMsg, &errorLine, &errorColumn)) {
- TQString str = i18n("There is an XML parsing error in line %1, column %2.").tqarg(errorLine).tqarg(errorColumn);
+ TQString str = i18n("There is an XML parsing error in line %1, column %2.").arg(errorLine).arg(errorColumn);
str += TQString::fromLatin1("\n");
str += i18n("The error message from TQt is:");
str += TQString::fromLatin1("\n\t") + errorMsg;
@@ -57,7 +57,7 @@ void XMLImporter::setText(const TQString& text_) {
TQString errorMsg;
int errorLine, errorColumn;
if(!m_dom.setContent(text_, true, &errorMsg, &errorLine, &errorColumn)) {
- TQString str = i18n("There is an XML parsing error in line %1, column %2.").tqarg(errorLine).tqarg(errorColumn);
+ TQString str = i18n("There is an XML parsing error in line %1, column %2.").arg(errorLine).arg(errorColumn);
str += TQString::fromLatin1("\n");
str += i18n("The error message from TQt is:");
str += TQString::fromLatin1("\n\t") + errorMsg;