From a374efce3a207b39514be3c52264091400ce297e Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 04:44:41 +0000 Subject: TQt4 port kdeedu This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kanagram/src/keduvockvtmlwriter.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'kanagram/src/keduvockvtmlwriter.cpp') diff --git a/kanagram/src/keduvockvtmlwriter.cpp b/kanagram/src/keduvockvtmlwriter.cpp index 5aef1645..8789c7d6 100644 --- a/kanagram/src/keduvockvtmlwriter.cpp +++ b/kanagram/src/keduvockvtmlwriter.cpp @@ -126,7 +126,7 @@ bool KEduVocKvtmlWriter::saveLessonKvtMl (TQDomDocument &domDoc, TQDomElement &d if (m_doc->getCurrentLesson() == lfn+1) domElementDesc.setAttribute (KV_LESS_CURR, 1); if (lfn < (int) m_doc->lessons_in_query.size() && m_doc->lessons_in_query[lfn]) - domElementDesc.setAttribute (KV_LESS_QUERY, 1); + domElementDesc.setAttribute (KV_LESS_TQUERY, 1); domElementDesc.appendChild(domTextDesc); domElementLesson.appendChild(domElementDesc); @@ -268,7 +268,7 @@ bool KEduVocKvtmlWriter::saveConjugHeader(TQDomDocument &domDoc, TQDomElement &d TQDomElement domElementConjug = domDoc.createElement(KV_CONJUG_GRP); TQString s; - for (int ent = 0; ent < QMIN((int) curr_conjug.size(), m_doc->numLangs()); ent++) + for (int ent = 0; ent < TQMIN((int) curr_conjug.size(), m_doc->numLangs()); ent++) { TQDomElement domElementEntry = domDoc.createElement(KV_CON_ENTRY); @@ -478,7 +478,7 @@ bool KEduVocKvtmlWriter::saveArticleKvtMl(TQDomDocument &domDoc, TQDomElement &d TQDomElement domElementArticle = domDoc.createElement(KV_ARTICLE_GRP); TQString def, indef, s; - for (int lfn = 0; lfn < QMIN((int) m_doc->articles.size(), m_doc->numLangs()); lfn++) + for (int lfn = 0; lfn < TQMIN((int) m_doc->articles.size(), m_doc->numLangs()); lfn++) { TQDomElement domElementEntry = domDoc.createElement(KV_ART_ENTRY); if (lfn == 0) @@ -746,9 +746,9 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato s = "original"; domElementOriginal.setAttribute (KV_LANG, s); if (s == q_org) - domElementOriginal.setAttribute(KV_QUERY, (TQString) KV_O); + domElementOriginal.setAttribute(KV_TQUERY, (TQString) KV_O); else if (s == q_trans) - domElementOriginal.setAttribute(KV_QUERY, (TQString) KV_T); + domElementOriginal.setAttribute(KV_TQUERY, (TQString) KV_T); } @@ -781,20 +781,20 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato TQString s; TQString entype = s = (*first).getType(0); - int pos = s.find (QM_TYPE_DIV); + int pos = s.tqfind (TQM_TYPE_DIV); if (pos >= 0) entype = s.left (pos); else entype = s; - if (entype == QM_VERB + if (entype == TQM_VERB && (*first).getConjugation(0).numEntries() > 0) { Conjugation conj = (*first).getConjugation(0); if (!saveConjugEntry(domDoc, domElementOriginal, conj)) return false; } - else if (entype == QM_ADJ + else if (entype == TQM_ADJ && !(*first).getComparison(0).isEmpty()) { Comparison comp = (*first).getComparison(0); @@ -825,9 +825,9 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato } domElementTranslation.setAttribute(KV_LANG, s); if (s == q_org) - domElementTranslation.setAttribute(KV_QUERY, (TQString) KV_O); + domElementTranslation.setAttribute(KV_TQUERY, (TQString) KV_O); else if (s == q_trans) - domElementTranslation.setAttribute(KV_QUERY, (TQString) KV_T); + domElementTranslation.setAttribute(KV_TQUERY, (TQString) KV_T); } TQString s1, s2; @@ -901,13 +901,13 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato TQString s; TQString entype = s = (*first).getType(0); - int pos = s.find (QM_TYPE_DIV); + int pos = s.tqfind (TQM_TYPE_DIV); if (pos >= 0) entype = s.left (pos); else entype = s; - if (entype == QM_VERB + if (entype == TQM_VERB && (*first).getConjugation(trans).numEntries() > 0) { Conjugation conj = (*first).getConjugation(trans); @@ -915,7 +915,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const TQString &generato return false; } - if (entype == QM_ADJ + if (entype == TQM_ADJ && !(*first).getComparison(trans).isEmpty()) { Comparison comp = (*first).getComparison(trans); -- cgit v1.2.1