From: Peter Hedlund Date: Sat, 5 Nov 2005 20:39:55 +0000 (+0000) Subject: stripWhiteSpace() to simplified() X-Git-Tag: v3.80.2~226 X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=2ceee25720731d3071c302965b18014aac34bf6b;p=libqmvoc.git stripWhiteSpace() to simplified() svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=478074 --- diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp index 6303e32..81288e2 100644 --- a/kdeeducore/keduvocdocument.cpp +++ b/kdeeducore/keduvocdocument.cpp @@ -960,25 +960,25 @@ QFont* KEduVocDocument::font() const void KEduVocDocument::setTitle(const QString & title) { - m_title = title.stripWhiteSpace(); + m_title = title.simplified(); } void KEduVocDocument::setAuthor(const QString & s) { - m_author = s.stripWhiteSpace(); + m_author = s.simplified(); } void KEduVocDocument::setLicense(const QString & s) { - m_license = s.stripWhiteSpace(); + m_license = s.simplified(); } void KEduVocDocument::setDocRemark(const QString & s) { - m_remark = s.stripWhiteSpace(); + m_remark = s.simplified(); } diff --git a/kdeeducore/keduvocexpression.cpp b/kdeeducore/keduvocexpression.cpp index 95af8ca..23e8f97 100644 --- a/kdeeducore/keduvocexpression.cpp +++ b/kdeeducore/keduvocexpression.cpp @@ -38,7 +38,7 @@ void KEduVocExpression::Init() KEduVocExpression::KEduVocExpression(const QString & expression, int lesson) { Init(); - setOriginal(expression.stripWhiteSpace() ); + setOriginal(expression.simplified() ); m_lesson = lesson; } @@ -60,22 +60,22 @@ KEduVocExpression::KEduVocExpression(const QString &s, const QString & separator int pos = expr.find(separator); if (pos == -1) { - setOriginal(expr.stripWhiteSpace()); + setOriginal(expr.simplified()); } else { - se = expr.left(pos).stripWhiteSpace(); + se = expr.left(pos).simplified(); setOriginal(se); expr.remove (0, pos + separator.length() ); -// s.stripWhiteSpace(); +// s.simplified(); // gather all translations while ((pos = expr.find(separator)) != -1) { - se = expr.left(pos).stripWhiteSpace(); + se = expr.left(pos).simplified(); addTranslation(se, KV_NORM_GRADE, KV_NORM_GRADE); expr.remove (0, pos + separator.length() ); -// s.stripWhiteSpace(); +// s.simplified(); } - addTranslation(expr.stripWhiteSpace(), KV_NORM_GRADE, KV_NORM_GRADE); + addTranslation(expr.simplified(), KV_NORM_GRADE, KV_NORM_GRADE); } } } @@ -112,7 +112,7 @@ void KEduVocExpression::setRemark (int idx, const QString & expr) for (int i = m_remarks.size(); i < idx+1; i++) m_remarks.push_back (""); - m_remarks[idx] = expr.stripWhiteSpace(); + m_remarks[idx] = expr.simplified(); } @@ -126,7 +126,7 @@ void KEduVocExpression::setFauxAmi (int idx, const QString & expr, bool rev_ami) for (int i = m_reverseFauxAmi.size(); i < idx+1; i++) m_reverseFauxAmi.push_back (""); - m_reverseFauxAmi[idx] = expr.stripWhiteSpace(); + m_reverseFauxAmi[idx] = expr.simplified(); } else { @@ -135,7 +135,7 @@ void KEduVocExpression::setFauxAmi (int idx, const QString & expr, bool rev_ami) for (int i = m_fauxAmi.size(); i < idx+1; i++) m_fauxAmi.push_back (""); - m_fauxAmi[idx] = expr.stripWhiteSpace(); + m_fauxAmi[idx] = expr.simplified(); } } @@ -167,7 +167,7 @@ void KEduVocExpression::setSynonym (int idx, const QString & expr) for (int i = m_synonym.size(); i < idx+1; i++) m_synonym.push_back ("-"); - m_synonym[idx] = expr.stripWhiteSpace(); + m_synonym[idx] = expr.simplified(); } @@ -191,7 +191,7 @@ void KEduVocExpression::setExample (int idx, const QString & expr) for (int i = m_example.size(); i < idx+1; i++) m_example.push_back (""); - m_example[idx] = expr.stripWhiteSpace(); + m_example[idx] = expr.simplified(); } @@ -215,7 +215,7 @@ void KEduVocExpression::setUsageLabel (int idx, const QString & expr) for (int i = m_usageLabels.size(); i < idx+1; i++) m_usageLabels.push_back (""); - m_usageLabels[idx] = expr.stripWhiteSpace(); + m_usageLabels[idx] = expr.simplified(); } @@ -239,7 +239,7 @@ void KEduVocExpression::setParaphrase (int idx, const QString & expr) for (int i = m_paraphrases.size(); i < idx+1; i++) m_paraphrases.push_back (""); - m_paraphrases[idx] = expr.stripWhiteSpace(); + m_paraphrases[idx] = expr.simplified(); } @@ -263,7 +263,7 @@ void KEduVocExpression::setAntonym (int idx, const QString & expr) for (int i = m_antonym.size(); i < idx+1; i++) m_antonym.push_back (""); - m_antonym[idx] = expr.stripWhiteSpace(); + m_antonym[idx] = expr.simplified(); } @@ -370,7 +370,7 @@ void KEduVocExpression::setPronounciation(int idx, const QString & expr) for (int i = m_pronounciations.size(); i < idx+1; i++) m_pronounciations.push_back (""); - m_pronounciations[idx] = expr.stripWhiteSpace(); + m_pronounciations[idx] = expr.simplified(); } @@ -384,7 +384,7 @@ void KEduVocExpression::addTranslation(const QString & expr, grade_t grade, grad m_grades.push_back (grade); m_reverseGrades.push_back (rev_grade); - m_translations.push_back (expr.stripWhiteSpace()); + m_translations.push_back (expr.simplified()); } @@ -477,7 +477,7 @@ void KEduVocExpression::setTranslation (int idx, const QString & expr) m_translations.push_back (""); // if (idx <= (int)translations.size()) - m_translations[idx-1] = expr.stripWhiteSpace(); + m_translations[idx-1] = expr.simplified(); } @@ -800,7 +800,7 @@ void KEduVocExpression::setType (int idx, const QString &type) for (int i = m_expressionTypes.count(); i < idx + 1; i++) m_expressionTypes.append(""); - m_expressionTypes[idx] = type.stripWhiteSpace(); + m_expressionTypes[idx] = type.simplified(); } void KEduVocExpression::setLeitnerBox( const QString& box ) diff --git a/kdeeducore/keduvocgrammar.cpp b/kdeeducore/keduvocgrammar.cpp index 4a648b8..c37adb1 100644 --- a/kdeeducore/keduvocgrammar.cpp +++ b/kdeeducore/keduvocgrammar.cpp @@ -61,9 +61,9 @@ KEduVocComparison::KEduVocComparison ( bool KEduVocComparison::isEmpty() const { - return ls1.stripWhiteSpace().isEmpty() - && ls2.stripWhiteSpace().isEmpty() - && ls3.stripWhiteSpace().isEmpty(); + return ls1.simplified().isEmpty() + && ls2.simplified().isEmpty() + && ls3.simplified().isEmpty(); } @@ -294,16 +294,16 @@ void KEduVocConjugation::cleanUp () { for (int i = (int)conjugations.size()-1; i >= 0; i--) { const conjug_t *ctp = &conjugations[i]; - if ( ctp->pers1_sing.stripWhiteSpace().isEmpty() - && ctp->pers2_sing.stripWhiteSpace().isEmpty() - && ctp->pers3_m_sing.stripWhiteSpace().isEmpty() - && ctp->pers3_f_sing.stripWhiteSpace().isEmpty() - && ctp->pers3_n_sing.stripWhiteSpace().isEmpty() - && ctp->pers1_plur.stripWhiteSpace().isEmpty() - && ctp->pers2_plur.stripWhiteSpace().isEmpty() - && ctp->pers3_m_plur.stripWhiteSpace().isEmpty() - && ctp->pers3_f_plur.stripWhiteSpace().isEmpty() - && ctp->pers3_n_plur.stripWhiteSpace().isEmpty() + if ( ctp->pers1_sing.simplified().isEmpty() + && ctp->pers2_sing.simplified().isEmpty() + && ctp->pers3_m_sing.simplified().isEmpty() + && ctp->pers3_f_sing.simplified().isEmpty() + && ctp->pers3_n_sing.simplified().isEmpty() + && ctp->pers1_plur.simplified().isEmpty() + && ctp->pers2_plur.simplified().isEmpty() + && ctp->pers3_m_plur.simplified().isEmpty() + && ctp->pers3_f_plur.simplified().isEmpty() + && ctp->pers3_n_plur.simplified().isEmpty() ) conjugations.removeAt( i ); } @@ -314,16 +314,16 @@ bool KEduVocConjugation::isEmpty (int idx) { if (idx < (int) conjugations.size()) { const conjug_t *ctp = &conjugations[idx]; - return ctp->pers1_sing.stripWhiteSpace().isEmpty() - && ctp->pers2_sing.stripWhiteSpace().isEmpty() - && ctp->pers3_m_sing.stripWhiteSpace().isEmpty() - && ctp->pers3_f_sing.stripWhiteSpace().isEmpty() - && ctp->pers3_n_sing.stripWhiteSpace().isEmpty() - && ctp->pers1_plur.stripWhiteSpace().isEmpty() - && ctp->pers2_plur.stripWhiteSpace().isEmpty() - && ctp->pers3_m_plur.stripWhiteSpace().isEmpty() - && ctp->pers3_f_plur.stripWhiteSpace().isEmpty() - && ctp->pers3_n_plur.stripWhiteSpace().isEmpty(); + return ctp->pers1_sing.simplified().isEmpty() + && ctp->pers2_sing.simplified().isEmpty() + && ctp->pers3_m_sing.simplified().isEmpty() + && ctp->pers3_f_sing.simplified().isEmpty() + && ctp->pers3_n_sing.simplified().isEmpty() + && ctp->pers1_plur.simplified().isEmpty() + && ctp->pers2_plur.simplified().isEmpty() + && ctp->pers3_m_plur.simplified().isEmpty() + && ctp->pers3_f_plur.simplified().isEmpty() + && ctp->pers3_n_plur.simplified().isEmpty(); } return true; } diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp index 44f1a9e..719c7c5 100644 --- a/kdeeducore/keduvockvtmlwriter.cpp +++ b/kdeeducore/keduvockvtmlwriter.cpp @@ -274,13 +274,13 @@ bool KEduVocKvtmlWriter::saveConjugHeader(QDomDocument &domDoc, QDomElement &dom if (ent == 0) { - s = m_doc->originalIdentifier().stripWhiteSpace(); //EPT le Ident doit �re superflu + s = m_doc->originalIdentifier().simplified(); //EPT le Ident doit �re superflu if (s.isEmpty() ) s = "original"; } else { - s = m_doc->identifier(ent).stripWhiteSpace(); + s = m_doc->identifier(ent).simplified(); if (s.isEmpty() ) { s.setNum(ent); @@ -482,13 +482,13 @@ bool KEduVocKvtmlWriter::saveArticleKvtMl(QDomDocument &domDoc, QDomElement &dom QDomElement domElementEntry = domDoc.createElement(KV_ART_ENTRY); if (lfn == 0) { - s = m_doc->originalIdentifier().stripWhiteSpace(); + s = m_doc->originalIdentifier().simplified(); if (s.isEmpty() ) s = "original"; } else { - s = m_doc->identifier(lfn).stripWhiteSpace(); + s = m_doc->identifier(lfn).simplified(); if (s.isEmpty() ) { s.setNum(lfn); @@ -741,7 +741,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator s.setNum (m_doc->sizeHint (0)); domElementOriginal.setAttribute(KV_SIZEHINT, s); - s = m_doc->originalIdentifier().stripWhiteSpace(); + s = m_doc->originalIdentifier().simplified(); if (s.isEmpty() ) s = "original"; domElementOriginal.setAttribute (KV_LANG, s); @@ -817,7 +817,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator s.setNum (m_doc->sizeHint (trans)); domElementTranslation.setAttribute(KV_SIZEHINT, s); - s = m_doc->identifier(trans).stripWhiteSpace(); + s = m_doc->identifier(trans).simplified(); if (s.isEmpty() ) { s.setNum (trans); diff --git a/kdeeducore/keduvocmultiplechoice.cpp b/kdeeducore/keduvocmultiplechoice.cpp index 9cc9243..8fe8f6e 100644 --- a/kdeeducore/keduvocmultiplechoice.cpp +++ b/kdeeducore/keduvocmultiplechoice.cpp @@ -38,11 +38,11 @@ KEduVocMultipleChoice::KEduVocMultipleChoice bool KEduVocMultipleChoice::isEmpty() const { - return muc1.stripWhiteSpace().isEmpty() && - muc2.stripWhiteSpace().isEmpty() && - muc3.stripWhiteSpace().isEmpty() && - muc4.stripWhiteSpace().isEmpty() && - muc5.stripWhiteSpace().isEmpty(); + return muc1.simplified().isEmpty() && + muc2.simplified().isEmpty() && + muc3.simplified().isEmpty() && + muc4.simplified().isEmpty() && + muc5.simplified().isEmpty(); } diff --git a/kdeeducore/keduvowqlreader.cpp b/kdeeducore/keduvowqlreader.cpp index 35a0817..fea891f 100644 --- a/kdeeducore/keduvowqlreader.cpp +++ b/kdeeducore/keduvowqlreader.cpp @@ -137,7 +137,7 @@ bool KEduVocWqlReader::readDoc(KEduVocDocument *doc) s = inputStream.readLine(); p = s.find(" [", 0); s = s.left(p); - s = s.stripWhiteSpace(); + s = s.simplified(); m_doc->m_identifiers.push_back(s); m_doc->m_identifiers.push_back(inputStream.readLine()); @@ -148,7 +148,7 @@ bool KEduVocWqlReader::readDoc(KEduVocDocument *doc) QString r = s.mid(p + 1, 10); int h = r.toInt(); s = s.left(p); - s = s.stripWhiteSpace(); + s = s.simplified(); QString b; b = inputStream.readLine();