diff options
Diffstat (limited to 'kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp')
-rw-r--r-- | kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp index f07e906d..e268ce0f 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp @@ -83,7 +83,7 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml) if (elem.tag () == KV_TYPE_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TYPE_GRP)); + i18n("expected ending tag <%1>").tqarg(KV_TYPE_GRP)); return false; } else @@ -109,14 +109,14 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml) } else if (elem.tag() != KV_TYPE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TYPE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_TYPE_DESC)); return false; } } else { if (elem.tag() != KV_TYPE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TYPE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_TYPE_DESC)); return false; } @@ -127,7 +127,7 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { @@ -157,7 +157,7 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml) if (elem.tag () == KV_TENSE_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TENSE_GRP)); + i18n("expected ending tag <%1>").tqarg(KV_TENSE_GRP)); return false; } else @@ -183,14 +183,14 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml) } else if (elem.tag() != KV_TENSE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TENSE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_TENSE_DESC)); return false; } } else { if (elem.tag() != KV_TENSE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_TENSE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_TENSE_DESC)); return false; } @@ -201,7 +201,7 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { @@ -231,7 +231,7 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml) if (elem.tag () == KV_USAGE_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_USAGE_GRP)); + i18n("expected ending tag <%1>").tqarg(KV_USAGE_GRP)); return false; } else @@ -257,14 +257,14 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml) } else if (elem.tag() != KV_USAGE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_USAGE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_USAGE_DESC)); return false; } } else { if (elem.tag() != KV_USAGE_DESC || !elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(KV_USAGE_DESC)); + i18n("expected ending tag <%1>").tqarg(KV_USAGE_DESC)); return false; } @@ -275,7 +275,7 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { @@ -347,7 +347,7 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_GRADE) { TQString s = (*first).stringValue(); - if ((pos = s.find(';')) >= 1) { + if ((pos = s.tqfind(';')) >= 1) { grade = s.left(pos).toInt(); rev_grade = s.mid(pos+1, s.length()).toInt(); } @@ -357,7 +357,7 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_COUNT) { TQString s = (*first).stringValue(); - if ((pos = s.find(';')) >= 1) { + if ((pos = s.tqfind(';')) >= 1) { count = s.left(pos).toInt(); rev_count = s.mid(pos+1, s.length()).toInt(); } @@ -367,7 +367,7 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_BAD) { TQString s = (*first).stringValue(); - if ((pos = s.find(';')) >= 1) { + if ((pos = s.tqfind(';')) >= 1) { bcount = s.left(pos).toInt(); rev_bcount = s.mid(pos+1, s.length()).toInt(); } else @@ -376,7 +376,7 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_DATE) { TQString s = (*first).stringValue(); - if ((pos = s.find(';')) >= 1) { + if ((pos = s.tqfind(';')) >= 1) { date = s.left(pos).toInt(); rev_date = s.mid(pos+1, s.length()).toInt(); } @@ -387,7 +387,7 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_DATE2) { TQString s = (*first).stringValue(); - if ((pos = s.find(';')) >= 1) { + if ((pos = s.tqfind(';')) >= 1) { date = decompressDate (s.left(pos)); rev_date = decompressDate (s.mid(pos+1, s.length())); } @@ -420,7 +420,7 @@ bool kvoctrainDoc::extract_O_T_attr ( usage = (*first).stringValue(); if (usage.length() != 0 && usage.left(1) == UL_USER_USAGE) { - int num = QMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check + int num = TQMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check if( num > (int) usage_descr.size() ) { // description missing ? TQString s; for (int i = usage_descr.size(); i < num; i++) { @@ -443,14 +443,14 @@ bool kvoctrainDoc::extract_O_T_attr ( else if ((*first).name () == KV_EXPRTYPE) { type = (*first).stringValue(); if (type == "1") - type = QM_VERB; + type = TQM_VERB; else if (type == "2") // convert from pre-0.5 versions - type = QM_NOUN; + type = TQM_NOUN; else if (type == "3") - type = QM_NAME; + type = TQM_NAME; - if (type.length() != 0 && type.left(1) == QM_USER_TYPE) { - int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check + if (type.length() != 0 && type.left(1) == TQM_USER_TYPE) { + int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check if( num > (int) type_descr.size() ) { // description missing ? TQString s; for (int i = type_descr.size(); i < num; i++) { @@ -466,7 +466,7 @@ bool kvoctrainDoc::extract_O_T_attr ( pronunce = (*first).stringValue(); } - else if ((*first).name () == KV_QUERY) { + else if ((*first).name () == KV_TQUERY) { query_id = (*first).stringValue(); } @@ -504,14 +504,14 @@ bool kvoctrainDoc::extract_KVT_E_attr ( else if ((*first).name () == KV_EXPRTYPE) { type = (*first).stringValue(); if (type == "1") - type = QM_VERB; + type = TQM_VERB; else if (type == "2") // convert from pre-0.5 versions - type = QM_NOUN; + type = TQM_NOUN; else if (type == "3") - type = QM_NAME; + type = TQM_NAME; - if (type.length() != 0 && type.left(1) == QM_USER_TYPE) { - int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check + if (type.length() != 0 && type.left(1) == TQM_USER_TYPE) { + int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check if( num > (int) type_descr.size() ) { // description missing ? TQString s; for (int i = type_descr.size(); i < num; i++) { @@ -553,7 +553,7 @@ bool kvoctrainDoc::loadComparison (Comparison &comp, XmlElement elem, if (elem.tag () == KV_COMPARISON_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(elem.tag())); + i18n("expected ending tag <%1>").tqarg(elem.tag())); return false; } else @@ -582,7 +582,7 @@ bool kvoctrainDoc::loadComparison (Comparison &comp, XmlElement elem, else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>").arg(elem.tag())); + i18n("unexpected ending tag <%1>").tqarg(elem.tag())); return false; } else { @@ -620,7 +620,7 @@ bool kvoctrainDoc::loadMultipleChoice (MultipleChoice &mc, XmlElement elem, if (elem.tag () == KV_MULTIPLECHOICE_GRP) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(elem.tag())); + i18n("expected ending tag <%1>").tqarg(elem.tag())); return false; } else @@ -661,7 +661,7 @@ bool kvoctrainDoc::loadMultipleChoice (MultipleChoice &mc, XmlElement elem, else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>").arg(elem.tag())); + i18n("unexpected ending tag <%1>").tqarg(elem.tag())); return false; } else { @@ -702,7 +702,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) if (elem.tag () == KV_DOCTYPE) { if (! elem.isEndTag ()) { errorKvtMl (xml.lineNumber(), - i18n("expected ending tag <%1>").arg(elem.tag())); + i18n("expected ending tag <%1>").tqarg(elem.tag())); return false; } else @@ -712,7 +712,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_LESS_GRP && !elem.isEndTag() ) { if (lessgroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } lessgroup = true; @@ -723,7 +723,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_ARTICLE_GRP && !elem.isEndTag() ) { if (articlegroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } articlegroup = true; @@ -734,7 +734,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_CONJUG_GRP && !elem.isEndTag() ) { if (conjuggroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } conjuggroup = true; @@ -745,7 +745,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_OPTION_GRP && !elem.isEndTag() ) { if (optgroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } optgroup = true; @@ -756,7 +756,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_TYPE_GRP && !elem.isEndTag() ) { if (attrgroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } attrgroup = true; @@ -767,7 +767,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_TENSE_GRP && !elem.isEndTag() ) { if (tensegroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } tensegroup = true; @@ -779,7 +779,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else if (elem.tag () == KV_USAGE_GRP && !elem.isEndTag() ) { if (usagegroup) { errorKvtMl (xml.lineNumber(), - i18n("repeated occurrence of tag <%1>").arg(elem.tag())); + i18n("repeated occurrence of tag <%1>").tqarg(elem.tag())); return false; } usagegroup = true; @@ -801,7 +801,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml) else { if (elem.isEndTag() ) { errorKvtMl (xml.lineNumber(), - i18n("unexpected ending tag <%1>" ).arg(elem.tag())); + i18n("unexpected ending tag <%1>" ).tqarg(elem.tag())); return false; } else { @@ -824,7 +824,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name, unknown_attr = true; - TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); + TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line); TQString format = i18n( "Your document contains an unknown attribute <%1> " // keep trailing space @@ -834,7 +834,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name, "If you proceed and save afterwards you are likely to lose data;\n" "do you want to proceed anyway?\n" ); - TQString msg = format.arg(attr).arg(name); + TQString msg = format.tqarg(attr).tqarg(name); TQApplication::setOverrideCursor( arrowCursor, true ); TQString s = kapp->makeStdCaption(i18n("Unknown attribute")); @@ -848,7 +848,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem ) { unknown_elem = true; - TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); + TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line); TQString format = i18n( "Your document contains an unknown tag <%1>. " // keep trailing space @@ -857,7 +857,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem ) "Loading is aborted because KVocTrain cannot " "read documents with unknown elements.\n" ); - TQString msg = format.arg(elem); + TQString msg = format.tqarg(elem); TQApplication::setOverrideCursor( arrowCursor, true ); TQString s = kapp->makeStdCaption(i18n("Unknown element")); KMessageBox::sorry(0, ln+msg, s); @@ -869,7 +869,7 @@ void kvoctrainDoc::errorKvtMl (int line, const TQString &text ) { TQApplication::setOverrideCursor( arrowCursor, true ); TQString s = kapp->makeStdCaption(i18n("Error")); - TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); + TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line); TQString msg = text; KMessageBox::error(0, ln+msg, s); @@ -881,7 +881,7 @@ void kvoctrainDoc::warningKvtMl (int line, const TQString &text ) { TQApplication::setOverrideCursor( arrowCursor, true ); TQString s = kapp->makeStdCaption(i18n("Warning")); - TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); + TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line); TQString msg = text; KMessageBox::information(0, ln+msg, s); TQApplication::restoreOverrideCursor(); |