From 698d23e4903eb9ec60bff1fe8025a7b062dcdf68 Mon Sep 17 00:00:00 2001 From: Martin Pfeiffer Date: Wed, 26 Oct 2005 09:58:13 +0000 Subject: [PATCH] port from Q3ValueList to QList svn path=/trunk/KDE/kdeedu/kwordquiz/src/keduvocdocument.h; revision=474401 --- kwordquiz/keduvocdocument.cpp | 72 ++++++++++++++++---------------- kwordquiz/keduvocdocument.h | 30 +++++++------ kwordquiz/keduvockvtmlreader.cpp | 9 ++-- kwordquiz/keduvockvtmlreader.h | 9 ++-- kwordquiz/keduvockvtmlwriter.cpp | 10 ++--- kwordquiz/keduvockvtmlwriter.h | 9 ++-- 6 files changed, 65 insertions(+), 74 deletions(-) diff --git a/kwordquiz/keduvocdocument.cpp b/kwordquiz/keduvocdocument.cpp index 96e9165..75f5eba 100644 --- a/kwordquiz/keduvocdocument.cpp +++ b/kwordquiz/keduvocdocument.cpp @@ -18,8 +18,7 @@ #include "keduvocdocument.h" #include -//Added by qt3to4: -#include +#include #include #include @@ -293,7 +292,7 @@ KEduVocExpression *KEduVocDocument::entry(int index) void KEduVocDocument::removeEntry(int index) { if (index >= 0 && index < (int)m_vocabulary.size() ) - m_vocabulary.erase(m_vocabulary.at(index)); + m_vocabulary.removeAt( index ); } @@ -500,9 +499,8 @@ void KEduVocDocument::removeIdentifier(int index) if (index < (int)m_identifiers.size() && index >= 1 ) { m_identifiers.takeAt(index); - Q3ValueList::iterator it; - for (it = m_vocabulary.begin(); it != m_vocabulary.end(); ++it) - (*it).removeTranslation(index); + foreach( KEduVocExpression exp, m_vocabulary ) + exp.removeTranslation(index); } } @@ -842,45 +840,44 @@ public: void KEduVocDocument::resetEntry(int index, int lesson) { - Q3ValueList::iterator it; if (index < 0) { - for (it = m_vocabulary.begin(); it != m_vocabulary.end(); ++it) - for (int i = 0; i <= (*it).numTranslations(); i++) + foreach( KEduVocExpression exp, m_vocabulary ) + { + for (int i = 0; i <= exp.numTranslations(); i++) { - if (lesson == 0 || lesson == (*it).lesson()) + if (lesson == 0 || lesson == exp.lesson()) { - (*it).setGrade(i, KV_NORM_GRADE, false); - (*it).setGrade(i, KV_NORM_GRADE, true); - (*it).setQueryCount(i, 0, true); - (*it).setQueryCount(i, 0, false); - (*it).setBadCount(i, 0, true); - (*it).setBadCount(i, 0, false); + exp.setGrade(i, KV_NORM_GRADE, false); + exp.setGrade(i, KV_NORM_GRADE, true); + exp.setQueryCount(i, 0, true); + exp.setQueryCount(i, 0, false); + exp.setBadCount(i, 0, true); + exp.setBadCount(i, 0, false); QDateTime dt; dt.setTime_t(0); - (*it).setQueryDate(i, dt, true); - (*it).setQueryDate(i, dt, false); + exp.setQueryDate(i, dt, true); + exp.setQueryDate(i, dt, false); } } - //for_each (m_vocabulary.begin(), m_vocabulary.end(), resetAll(lesson) ); + } } else { - for (it = m_vocabulary.begin(); it != m_vocabulary.end(); ++it) - if (lesson == 0 || lesson == (*it).lesson()) + foreach( KEduVocExpression exp, m_vocabulary ) + if (lesson == 0 || lesson == exp.lesson()) { - (*it).setGrade(index, KV_NORM_GRADE, false); - (*it).setGrade(index, KV_NORM_GRADE, true); - (*it).setQueryCount(index, 0, true); - (*it).setQueryCount(index, 0, false); - (*it).setBadCount(index, 0, true); - (*it).setBadCount(index, 0, false); + exp.setGrade(index, KV_NORM_GRADE, false); + exp.setGrade(index, KV_NORM_GRADE, true); + exp.setQueryCount(index, 0, true); + exp.setQueryCount(index, 0, false); + exp.setBadCount(index, 0, true); + exp.setBadCount(index, 0, false); QDateTime dt; dt.setTime_t(0); - (*it).setQueryDate(index, dt, true); - (*it).setQueryDate(index, dt, false); + exp.setQueryDate(index, dt, true); + exp.setQueryDate(index, dt, false); } - //for_each (m_vocabulary.begin(), m_vocabulary.end(), resetOne(index, lesson) ); } } @@ -897,9 +894,9 @@ QString KEduVocDocument::lessonDescription(int idx) const } -Q3ValueList KEduVocDocument::lessonsInQuery() const +QList KEduVocDocument::lessonsInQuery() const { - Q3ValueList iqvec; + QList iqvec; for (unsigned i = 0; i < m_lessonsInQuery.size(); i++) if (m_lessonsInQuery[i]) { iqvec.push_back(i+1); // Offset @@ -909,14 +906,15 @@ Q3ValueList KEduVocDocument::lessonsInQuery() const } -void KEduVocDocument::setLessonsInQuery(Q3ValueList lesson_iq) +void KEduVocDocument::setLessonsInQuery(QList lesson_iq) { m_lessonsInQuery.clear(); for (unsigned i = 0; i < m_lessonDescriptions.size(); i++) m_lessonsInQuery.push_back(false); - for (unsigned i = 0; i < lesson_iq.size(); i++) - if (lesson_iq[i] <= (int) m_lessonsInQuery.size() ) { + foreach( int i, lesson_iq ) + if (lesson_iq[i] <= (int) m_lessonsInQuery.size() ) + { m_lessonsInQuery[lesson_iq[i]-1] = true; // Offset // cout << "setliq: " << lesson_iq[i] << " " << i << endl; } @@ -1103,14 +1101,14 @@ public: KEduVocExpression *exp; }; -typedef Q3ValueList ExpRefList; +typedef QList ExpRefList; int KEduVocDocument::cleanUp() { int count = 0; KEduVocExpression *kve1, *kve2; ExpRefList shadow; - Q3ValueList to_delete; + QList to_delete; for (int i = 0; i < (int) m_vocabulary.size(); i++) shadow.push_back (ExpRef (entry(i), i)); diff --git a/kwordquiz/keduvocdocument.h b/kwordquiz/keduvocdocument.h index e147ccb..ce679f5 100644 --- a/kwordquiz/keduvocdocument.h +++ b/kwordquiz/keduvocdocument.h @@ -231,16 +231,14 @@ #define VCB_SEPARATOR "__" -#include -#include -//Added by qt3to4: -#include +#include +#include +#include #include #include #include "keduvocexpression.h" -class QTextStream; class QStringList; class KEduVocMultipleChoice; class LeitnerSystem; @@ -293,7 +291,7 @@ class KEduVocDocument : public QObject * @param index index of entry */ inline void insertEntry(KEduVocExpression *expression, int index) - { m_vocabulary.insert(m_vocabulary.at(index), *expression); m_dirty = true; } + { m_vocabulary.insert(index, *expression); m_dirty = true; } /** removes an expression from the document * @@ -551,10 +549,10 @@ class KEduVocDocument : public QObject QString lessonDescription(int index) const; /** returns lessons in current query */ - Q3ValueList lessonsInQuery() const; + QList lessonsInQuery() const; /** sets lessons in current query */ - void setLessonsInQuery(Q3ValueList); + void setLessonsInQuery(QList); inline QStringList lessonDescriptions() const { return m_lessonDescriptions; } @@ -658,7 +656,7 @@ protected: private: bool m_dirty; KURL m_url; - Q3ValueList m_sortIdentifier; + QList m_sortIdentifier; bool m_sortLesson; bool m_unknownAttribute; bool m_unknownElement; @@ -669,15 +667,15 @@ protected: int m_cols; int m_lines; int m_currentLesson; - Q3ValueList m_extraSizeHints; - Q3ValueList m_sizeHints; + QList m_extraSizeHints; + QList m_sizeHints; QFont* m_font; QString m_generator; QString m_queryorg; QString m_querytrans; - Q3ValueList m_vocabulary; - Q3ValueList m_lessonsInQuery; + QList m_vocabulary; + QList m_lessonsInQuery; QStringList m_lessonDescriptions; QStringList m_typeDescriptions; QStringList m_tenseDescriptions; @@ -688,11 +686,11 @@ protected: QString m_remark; QString m_version; - Q3ValueList m_articles; - Q3ValueList m_conjugations; + QList m_articles; + QList m_conjugations; LeitnerSystem* m_leitnerSystem; - bool m_activeLeitnerSystem; + bool m_activeLeitnerSystem; }; diff --git a/kwordquiz/keduvockvtmlreader.cpp b/kwordquiz/keduvockvtmlreader.cpp index 4de1229..32c2e2e 100644 --- a/kwordquiz/keduvockvtmlreader.cpp +++ b/kwordquiz/keduvockvtmlreader.cpp @@ -21,9 +21,8 @@ #include #include -#include -//Added by qt3to4: -#include +#include +#include #include "keduvockvtmlreader.h" #include "keduvocdocument.h" @@ -229,7 +228,7 @@ bool KEduVocKvtmlReader::readArticle(QDomElement &domElementParent) } -bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent, Q3ValueList &curr_conjug, const QString &entry_tag) +bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent, QList &curr_conjug, const QString &entry_tag) /* used in header for definiton of "prefix" lang determines also lang order in entries !! @@ -969,7 +968,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent) QString antonym; QString usage; QString paraphrase; - Q3ValueList conjug; + QList conjug; KEduVocComparison comparison; KEduVocMultipleChoice mc; diff --git a/kwordquiz/keduvockvtmlreader.h b/kwordquiz/keduvockvtmlreader.h index a9c8c3e..e0d8986 100644 --- a/kwordquiz/keduvockvtmlreader.h +++ b/kwordquiz/keduvockvtmlreader.h @@ -19,10 +19,9 @@ #ifndef KEDUVOCKVTMLREADER_H #define KEDUVOCKVTMLREADER_H -#include -#include -//Added by qt3to4: -#include +#include +#include +#include #include "keduvocdocument.h" #include "keduvocgrammar.h" @@ -80,7 +79,7 @@ public: bool readLesson(QDomElement &domElementParent); bool readArticle(QDomElement &domElementParent); - bool readConjug(QDomElement &domElementParent, Q3ValueList &curr_conjug, const QString &entry_tag); + bool readConjug(QDomElement &domElementParent, QList &curr_conjug, const QString &entry_tag); bool readOptions(QDomElement &domElementParent); bool readType(QDomElement &domElementParent); bool readTense(QDomElement &domElementParent); diff --git a/kwordquiz/keduvockvtmlwriter.cpp b/kwordquiz/keduvockvtmlwriter.cpp index 6085ef2..885287c 100644 --- a/kwordquiz/keduvockvtmlwriter.cpp +++ b/kwordquiz/keduvockvtmlwriter.cpp @@ -17,10 +17,8 @@ ***************************************************************************/ #include -#include -#include -//Added by qt3to4: -#include +#include +#include #include "keduvockvtmlwriter.h" #include "keduvocdocument.h" @@ -245,7 +243,7 @@ bool KEduVocKvtmlWriter::saveConjug(QDomDocument &domDoc, QDomElement &domElemen } bool KEduVocKvtmlWriter::saveConjugHeader(QDomDocument &domDoc, QDomElement &domElementParent, - Q3ValueList &curr_conjug) + QList &curr_conjug) { /* used in header for definiton of "prefix" @@ -686,7 +684,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator return false; QString q_org, q_trans; - Q3ValueList::const_iterator first = m_doc->m_vocabulary.begin (); + QList::const_iterator first = m_doc->m_vocabulary.begin (); m_doc->queryLang(q_org, q_trans); int ent_no = 0; diff --git a/kwordquiz/keduvockvtmlwriter.h b/kwordquiz/keduvockvtmlwriter.h index 34959c9..72e4fc2 100644 --- a/kwordquiz/keduvockvtmlwriter.h +++ b/kwordquiz/keduvockvtmlwriter.h @@ -19,10 +19,9 @@ #ifndef KEDUVOCKVTMLWRITER_H #define KEDUVOCKVTMLWRITER_H -#include -#include -//Added by qt3to4: -#include +#include +#include +#include //#include "keduvocdocument.h" #include "keduvocgrammar.h" @@ -81,7 +80,7 @@ public: bool saveOptionsKvtMl (QDomDocument &domDoc, QDomElement &domElementParent); bool saveArticleKvtMl (QDomDocument &domDoc, QDomElement &domElementParent); bool saveConjugHeader (QDomDocument &domDoc, QDomElement &domElementParent, - Q3ValueList &curr_conjug); + QList &curr_conjug); bool saveConjug (QDomDocument &domDoc, QDomElement &domElementParent, const KEduVocConjugation &curr_conjug, QString type); bool saveConjugEntry (QDomDocument &domDoc, QDomElement &domElementParent, -- 2.47.3