port from Q3ValueList to QList

svn path=/trunk/KDE/kdeedu/kwordquiz/src/keduvocdocument.h; revision=474401

diff --git a/kwordquiz/keduvocdocument.cpp b/kwordquiz/keduvocdocument.cpp
index 96e9165063ab90f14c5d5a1d34b994fc8cec1a83..75f5ebac68c8e98c58a8add668981a6999827c8a 100644 (file)
--- a/kwordquiz/keduvocdocument.cpp
+++ b/kwordquiz/keduvocdocument.cpp
@@ -18,8 +18,7 @@
 #include "keduvocdocument.h"
 
 #include <QFileInfo>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
 #include <QTextStream>
 #include <QtAlgorithms>
 
@@ -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<KEduVocExpression>::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<KEduVocExpression>::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<int> KEduVocDocument::lessonsInQuery() const
+QList<int> KEduVocDocument::lessonsInQuery() const
 {
-  Q3ValueList<int> iqvec;
+  QList<int> iqvec;
   for (unsigned i = 0; i < m_lessonsInQuery.size(); i++)
     if (m_lessonsInQuery[i]) {
       iqvec.push_back(i+1);   // Offset <no lesson>
@@ -909,14 +906,15 @@ Q3ValueList<int> KEduVocDocument::lessonsInQuery() const
 }
 
 
-void KEduVocDocument::setLessonsInQuery(Q3ValueList<int> lesson_iq)
+void KEduVocDocument::setLessonsInQuery(QList<int> 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 <no lesson>
 //      cout << "setliq: " << lesson_iq[i] << " " << i << endl;
     }
@@ -1103,14 +1101,14 @@ public:
   KEduVocExpression *exp;
 };
 
-typedef Q3ValueList<ExpRef> ExpRefList;
+typedef QList<ExpRef> ExpRefList;
 
 int KEduVocDocument::cleanUp()
 {
   int count = 0;
   KEduVocExpression *kve1, *kve2;
   ExpRefList shadow;
-  Q3ValueList<int> to_delete;
+  QList<int> 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 e147ccbde0244322ffaea518eaebee18a9e3c555..ce679f5e41f0d634cbdaa26dae244e20189db436 100644 (file)
--- a/kwordquiz/keduvocdocument.h
+++ b/kwordquiz/keduvocdocument.h
@@ -231,16 +231,14 @@
 
 #define VCB_SEPARATOR    "__"
 
-#include <qobject.h>
-#include <qfont.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QObject>
+#include <QFont>
+#include <QList>
 #include <QTextStream>
 #include <kurl.h>
 
 #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<int> lessonsInQuery() const;
+  QList<int> lessonsInQuery() const;
 
   /** sets lessons in current query  */
-  void setLessonsInQuery(Q3ValueList<int>);
+  void setLessonsInQuery(QList<int>);
 
   inline QStringList lessonDescriptions() const { return m_lessonDescriptions; }
 
@@ -658,7 +656,7 @@ protected:
  private:
   bool                  m_dirty;
   KURL                  m_url;
-  Q3ValueList<bool>      m_sortIdentifier;
+  QList<bool>      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<int>       m_extraSizeHints;
-  Q3ValueList<int>       m_sizeHints;
+  QList<int>       m_extraSizeHints;
+  QList<int>       m_sizeHints;
   QFont*                m_font;
 
   QString               m_generator;
   QString               m_queryorg;
   QString               m_querytrans;
-  Q3ValueList<KEduVocExpression>  m_vocabulary;
-  Q3ValueList<bool>      m_lessonsInQuery;
+  QList<KEduVocExpression>  m_vocabulary;
+  QList<bool>      m_lessonsInQuery;
   QStringList           m_lessonDescriptions;
   QStringList           m_typeDescriptions;
   QStringList           m_tenseDescriptions;
@@ -688,11 +686,11 @@ protected:
   QString               m_remark;
   QString               m_version;
 
-  Q3ValueList<KEduVocArticle>   m_articles;
-  Q3ValueList<KEduVocConjugation> m_conjugations;
+  QList<KEduVocArticle>   m_articles;
+  QList<KEduVocConjugation> m_conjugations;
 
   LeitnerSystem*              m_leitnerSystem;
-  bool                              m_activeLeitnerSystem;
+  bool                        m_activeLeitnerSystem;
 };
 
 

diff --git a/kwordquiz/keduvockvtmlreader.cpp b/kwordquiz/keduvockvtmlreader.cpp
index 4de1229e71223248525b36d9beaff121eff69ab1..32c2e2ea7c88f60ce7399c6d991f43ab0854ef01 100644 (file)
--- a/kwordquiz/keduvockvtmlreader.cpp
+++ b/kwordquiz/keduvockvtmlreader.cpp
@@ -21,9 +21,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-#include <qtextstream.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QTextStream>
+#include <QList>
 
 #include "keduvockvtmlreader.h"
 #include "keduvocdocument.h"
@@ -229,7 +228,7 @@ bool KEduVocKvtmlReader::readArticle(QDomElement &domElementParent)
 }
 
 
-bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent, Q3ValueList<KEduVocConjugation> &curr_conjug, const QString &entry_tag)
+bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent, QList<KEduVocConjugation> &curr_conjug, const QString &entry_tag)
 /*
  <conjugation>        used in header for definiton of "prefix"
   <e l="de">          lang determines also lang order in entries !!
@@ -969,7 +968,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
   QString       antonym;
   QString       usage;
   QString       paraphrase;
-  Q3ValueList<KEduVocConjugation> conjug;
+  QList<KEduVocConjugation> conjug;
   KEduVocComparison     comparison;
   KEduVocMultipleChoice mc;
 

diff --git a/kwordquiz/keduvockvtmlreader.h b/kwordquiz/keduvockvtmlreader.h
index a9c8c3ef5bc9f8605918325b57b2ec7b10a3e127..e0d8986e1bc891d1a8d3e90dbec6ab8bf774fb97 100644 (file)
--- a/kwordquiz/keduvockvtmlreader.h
+++ b/kwordquiz/keduvockvtmlreader.h
@@ -19,10 +19,9 @@
 #ifndef KEDUVOCKVTMLREADER_H
 #define KEDUVOCKVTMLREADER_H
 
-#include <qfile.h>
-#include <qdom.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QFile>
+#include <QDomDocument>
+#include <QList>
 
 #include "keduvocdocument.h"
 #include "keduvocgrammar.h"
@@ -80,7 +79,7 @@ public:
 
        bool readLesson(QDomElement &domElementParent);
        bool readArticle(QDomElement &domElementParent);
-       bool readConjug(QDomElement &domElementParent, Q3ValueList<KEduVocConjugation> &curr_conjug, const QString &entry_tag);
+       bool readConjug(QDomElement &domElementParent, QList<KEduVocConjugation> &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 6085ef254bb764f5b65c8acc097cff6a41a34348..885287c82c797f84a3a52c50de98cbf648e00ce4 100644 (file)
--- a/kwordquiz/keduvockvtmlwriter.cpp
+++ b/kwordquiz/keduvockvtmlwriter.cpp
@@ -17,10 +17,8 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <qdom.h>
-#include <qtextstream.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QDomDocument>
+#include <QTextStream>
 
 #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<KEduVocConjugation> &curr_conjug)
+                                          QList<KEduVocConjugation> &curr_conjug)
 {
 /*
  <conjugation>    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<KEduVocExpression>::const_iterator first =  m_doc->m_vocabulary.begin ();
+  QList<KEduVocExpression>::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 34959c93f4991aeb552deb610b906c924ee22b5a..72e4fc2a6b6aa6d982081b723d726c45fa4e921f 100644 (file)
--- a/kwordquiz/keduvockvtmlwriter.h
+++ b/kwordquiz/keduvockvtmlwriter.h
@@ -19,10 +19,9 @@
 #ifndef KEDUVOCKVTMLWRITER_H
 #define KEDUVOCKVTMLWRITER_H
 
-#include <qfile.h>
-#include <qdom.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QFile>
+#include <QDomDocument>
+#include <QList>
 
 //#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<KEduVocConjugation> &curr_conjug);
+                          QList<KEduVocConjugation> &curr_conjug);
   bool saveConjug        (QDomDocument &domDoc, QDomElement &domElementParent,
                           const KEduVocConjugation &curr_conjug, QString type);
   bool saveConjugEntry   (QDomDocument &domDoc, QDomElement &domElementParent,