port LeitnerSystem to use QList instead of Q3ValueList

svn path=/trunk/KDE/kdeedu/kwordquiz/src/leitnersystem.cpp; revision=472489

diff --git a/kwordquiz/leitnersystem.cpp b/kwordquiz/leitnersystem.cpp
index 10e94e73fc2875f363bebf38b6e307385837628f..80955202c4326e0fa365243ff592854d4dfd1ec1 100644 (file)
--- a/kwordquiz/leitnersystem.cpp
+++ b/kwordquiz/leitnersystem.cpp
@@ -10,11 +10,10 @@
 //
 //
 #include "leitnersystem.h"
+
 #include <kdebug.h>
-//Added by qt3to4:
-#include <Q3ValueList>
 
-LeitnerSystem::LeitnerSystem(Q3ValueList<LeitnerBox>& boxes, QString name)
+LeitnerSystem::LeitnerSystem(QList<LeitnerBox>& boxes, QString name)
 {
        if( !boxes.empty() )
                m_boxes = boxes;
@@ -34,18 +33,14 @@ LeitnerSystem::~LeitnerSystem()
 QStringList LeitnerSystem::getBoxNameList()
 {
        QStringList boxNameList;
-       Q3ValueList<LeitnerBox>::iterator it;
-
-
-       for(it = m_boxes.begin(); it != m_boxes.end(); ++it)
-       {
-               boxNameList.append((*it).boxName());
-       }
 
+       foreach( LeitnerBox box, m_boxes )
+               boxNameList.append( box.boxName() );
+       
        return boxNameList;
 }
 
-int LeitnerSystem::getNumberOfBoxes()
+int LeitnerSystem::getNumberOfBoxes() const
 {
        return m_boxes.count();
 }
@@ -57,18 +52,16 @@ LeitnerBox* LeitnerSystem::boxWithNumber( int number )
 
 LeitnerBox* LeitnerSystem::boxWithName( const QString& name )
 {
-       Q3ValueList<LeitnerBox>::iterator it;
-
-       for(it = m_boxes.begin(); it != m_boxes.end(); ++it)
+       foreach( LeitnerBox box, m_boxes )
        {
-               if((*it).boxName() == name)
-                       return &(*it);
+               if ( box.boxName() == name )
+                       return &box;
        }
 
        return 0;
 }
 
-QString& LeitnerSystem::systemName()
+QString& LeitnerSystem::systemName() 
 {
        return m_systemName;
 }
@@ -116,7 +109,7 @@ int LeitnerSystem::correctBoxNumber( int box )
 
 void LeitnerSystem::deleteBox( int box )
 {
-       deleteBox( &(*m_boxes.at( box )) );
+       m_boxes.removeAt( box );
 }
 
 void LeitnerSystem::deleteBox( LeitnerBox* box )
@@ -130,7 +123,7 @@ void LeitnerSystem::deleteBox( LeitnerBox* box )
                        m_boxes[i].setWrongWordBox( 0 );
        }
 
-       m_boxes.remove( *box );
+       m_boxes.removeAll( *box );
 }
 
 bool LeitnerSystem::insertBox( const QString& name, int correctWordBox, int wrongWordBox )

diff --git a/kwordquiz/leitnersystem.h b/kwordquiz/leitnersystem.h
index e30a3ed436ba0ebe95ad985fd45aec18a9331fc2..d3eede2d2416a642479ca431cc757975fca773f5 100644 (file)
--- a/kwordquiz/leitnersystem.h
+++ b/kwordquiz/leitnersystem.h
@@ -1,3 +1,6 @@
+#ifndef LEITNERSYSTEM_H
+#define LEITNERSYSTEM_H
+
 //
 // C++ Interface: leitnersystem
 //
@@ -12,32 +15,29 @@
 
 #include <QString>
 #include <QStringList>
-#include <q3valuelist.h>
-#include "leitnerbox.h"
-
-#ifndef LEITNERSYSTEM_H
-#define LEITNERSYSTEM_H
 
+#include "leitnerbox.h"
 
 /**
 @author Martin Pfeiffer
 */
+
 class LeitnerSystem
 {
 public:
        LeitnerSystem();
-       LeitnerSystem( Q3ValueList<LeitnerBox>& boxes, QString name );
+       LeitnerSystem( QList<LeitnerBox>& boxes, QString name );
 
        ~LeitnerSystem();
 
-       int getNumberOfBoxes();                         //returns the number of boxes in the system
+       int getNumberOfBoxes() const;                   //returns the number of boxes in the system
        QStringList getBoxNameList();                   //returns a list with the boxes names
 
        QString& systemName();                  //returns the systems name
-       void setSystemName( const QString& name );              //sets the systems name
+       void setSystemName( const QString& name );      //sets the systems name
 
        LeitnerBox* boxWithNumber( int number );        //returns box by number
-       LeitnerBox* boxWithName( const QString& name );//returns box by name
+       LeitnerBox* boxWithName( const QString& name ); //returns box by name
        int number( LeitnerBox* box );
        const QString& box( int i );
 
@@ -72,7 +72,7 @@ public:
 private:
        QString m_systemName;                           //the systems name
 
-       Q3ValueList<LeitnerBox> m_boxes;
+       QList<LeitnerBox> m_boxes;
 };
 
 #endif