From 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:51:43 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- quanta/parsers/dtd/dtd.cpp | 4 ++-- quanta/parsers/dtd/dtdparser.cpp | 24 ++++++++++++------------ quanta/parsers/dtd/dtepcreationdlg.ui | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'quanta/parsers/dtd') 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 b384e456..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())); @@ -86,23 +86,23 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) xmlErrorPtr errorPtr = xmlGetLastError(); if (errorPtr != NULL) { - TQString s = TQString::tqfromLatin1(errorPtr->message); + TQString s = TQString::fromLatin1(errorPtr->message); if (!s.isEmpty()) errorStr = s; - s = TQString::tqfromLatin1(errorPtr->str1); + s = TQString::fromLatin1(errorPtr->str1); if (!s.isEmpty()) errorStr += "
" + s; - s = TQString::tqfromLatin1(errorPtr->str2); + s = TQString::fromLatin1(errorPtr->str2); if (!s.isEmpty()) errorStr += "
" + s; - s = TQString::tqfromLatin1(errorPtr->str2); + 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/dtd/dtepcreationdlg.ui b/quanta/parsers/dtd/dtepcreationdlg.ui index db29d504..8c55bbcd 100644 --- a/quanta/parsers/dtd/dtepcreationdlg.ui +++ b/quanta/parsers/dtd/dtepcreationdlg.ui @@ -21,7 +21,7 @@ 285 - + 500 200 -- cgit v1.2.1