q3valuelist => qlist

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=455980

diff --git a/kdeeduui/kdeeduglossary.cpp b/kdeeduui/kdeeduglossary.cpp
index 9292108d6bb6f9f088fc3938e8ef350985ee7125..40ab28b13b066bbbb2526d61710d3f1bfdf100ae 100644 (file)
--- a/kdeeduui/kdeeduglossary.cpp
+++ b/kdeeduui/kdeeduglossary.cpp
@@ -20,19 +20,16 @@
 #include <kstandarddirs.h>
 #include <kactioncollection.h>
 
+#include <qevent.h>
 #include <qfile.h>
 #include <qlabel.h>
 #include <q3header.h>
 #include <qlayout.h>
+#include <qlist.h>
 #include <qpushbutton.h>
 #include <qsplitter.h>
 #include <qstringlist.h>
 #include <qtoolbutton.h>
-//Added by qt3to4:
-#include <QKeyEvent>
-#include <QHBoxLayout>
-#include <Q3ValueList>
-#include <QVBoxLayout>
 
 Glossary::Glossary()
 {
@@ -85,7 +82,7 @@ Glossary* Glossary::readFromXML( const KURL& url, const QString& path )
 
        if ( glossary->loadLayout( doc, url ) )
        {
-               Q3ValueList<GlossaryItem*> itemList;
+               QList<GlossaryItem*> itemList;
                itemList = glossary->readItems( doc );
                glossary->setItemlist( itemList );
                glossary->fixImagePath();
@@ -97,8 +94,8 @@ Glossary* Glossary::readFromXML( const KURL& url, const QString& path )
 void Glossary::fixImagePath()
 {
        kdDebug() << "Glossary::fixImagePath()" << endl;
-       Q3ValueList<GlossaryItem*>::iterator it = m_itemlist.begin();
-       const Q3ValueList<GlossaryItem*>::iterator itEnd = m_itemlist.end();
+       QList<GlossaryItem*>::iterator it = m_itemlist.begin();
+       const QList<GlossaryItem*>::iterator itEnd = m_itemlist.end();
        QString path = m_picturepath;
        QString firstpart = "<img src=\"";
        firstpart += path;
@@ -109,10 +106,10 @@ void Glossary::fixImagePath()
                ( *it )->setDesc( ( *it )->desc().replace("[/img]", "\" />" ) );
        }
 }
-       
-Q3ValueList<GlossaryItem*> Glossary::readItems( QDomDocument &itemDocument )
+
+QList<GlossaryItem*> Glossary::readItems( QDomDocument &itemDocument )
 {
-       Q3ValueList<GlossaryItem*> list;
+       QList<GlossaryItem*> list;
 
        QDomNodeList itemList;
        QDomNodeList refNodeList;
@@ -255,14 +252,14 @@ void GlossaryDialog::updateTree()
 {
        m_glosstree->clear();
 
-       Q3ValueList<Glossary*>::const_iterator itGl = m_glossaries.begin();
-       const Q3ValueList<Glossary*>::const_iterator itGlEnd = m_glossaries.end();
+       QList<Glossary*>::const_iterator itGl = m_glossaries.begin();
+       const QList<Glossary*>::const_iterator itGlEnd = m_glossaries.end();
        
        for ( ; itGl != itGlEnd ; ++itGl )
        {
-               Q3ValueList<GlossaryItem*> items = ( *itGl )->itemlist();
-               Q3ValueList<GlossaryItem*>::iterator it = items.begin();
-               const Q3ValueList<GlossaryItem*>::iterator itEnd = items.end();
+               QList<GlossaryItem*> items = ( *itGl )->itemlist();
+               QList<GlossaryItem*>::iterator it = items.begin();
+               const QList<GlossaryItem*>::iterator itEnd = items.end();
 
                Q3ListViewItem *main = new Q3ListViewItem( m_glosstree, ( *itGl )->name() );
                main->setExpandable( true );
@@ -325,8 +322,8 @@ void GlossaryDialog::slotClicked( Q3ListViewItem *item )
         * in the m_itemList. When it is found the HTML will be
         * generated
         */
-       Q3ValueList<Glossary*>::iterator itGl = m_glossaries.begin();
-       const Q3ValueList<Glossary*>::iterator itGlEnd = m_glossaries.end();
+       QList<Glossary*>::iterator itGl = m_glossaries.begin();
+       const QList<Glossary*>::iterator itGlEnd = m_glossaries.end();
        bool found = false;
        GlossaryItem *i = 0;
 
@@ -334,9 +331,9 @@ void GlossaryDialog::slotClicked( Q3ListViewItem *item )
        
        while ( !found && itGl != itGlEnd )
        {
-               Q3ValueList<GlossaryItem*> items = ( *itGl )->itemlist();
-               Q3ValueList<GlossaryItem*>::const_iterator it = items.begin();
-               const Q3ValueList<GlossaryItem*>::const_iterator itEnd = items.end();
+               QList<GlossaryItem*> items = ( *itGl )->itemlist();
+               QList<GlossaryItem*>::const_iterator it = items.begin();
+               const QList<GlossaryItem*>::const_iterator itEnd = items.end();
                while ( !found && it != itEnd )
                {
                        if ( ( *it )->name() == item->text( 0 ) )

diff --git a/kdeeduui/kdeeduglossary.h b/kdeeduui/kdeeduglossary.h
index 8e913d7fbe5ea3fb24ff9009a78c20d5dc1d3603..fb2ba04ec4713b13defd21e4789eecfd4a8b7547 100644 (file)
--- a/kdeeduui/kdeeduglossary.h
+++ b/kdeeduui/kdeeduglossary.h
@@ -18,9 +18,6 @@
 
 #include <khtml_part.h>
 #include <kdialogbase.h>
-//Added by qt3to4:
-#include <Q3ValueList>
-#include <QKeyEvent>
 
 class QChar;
 class QDomDocument;
@@ -41,7 +38,7 @@ class Glossary
 {
        public:
                Glossary();
-               ~Glossary();
+               virtual ~Glossary();
 
                /**
                 * add the item @p item to the glossary
@@ -50,7 +47,7 @@ class Glossary
                        m_itemlist.append( item );
                }
 
-               Q3ValueList<GlossaryItem*> itemlist()const{
+               QList<GlossaryItem*> itemlist()const{
                        return m_itemlist;
                }
 
@@ -84,7 +81,7 @@ class Glossary
                /**
                 * sets the internal list of items to @p list
                 */
-               void setItemlist( Q3ValueList<GlossaryItem*> list ){
+               void setItemlist( QList<GlossaryItem*> list ){
                        m_itemlist = list;
                }
 
@@ -133,9 +130,9 @@ class Glossary
                /**
                 * This methods parses the given xml-code. It will extract
                 * the information of the items and return them as a
-                * QValueList<GlossaryItem*>
+                * QList<GlossaryItem*>
                 */
-               virtual Q3ValueList<GlossaryItem*> readItems( QDomDocument &itemDocument );
+               virtual QList<GlossaryItem*> readItems( QDomDocument &itemDocument );
                
                QString m_backgroundpicture;
 
@@ -162,7 +159,7 @@ class Glossary
                 */
                bool loadLayout( QDomDocument& doc, const KURL& url );
        
-               Q3ValueList<GlossaryItem*> m_itemlist;
+               QList<GlossaryItem*> m_itemlist;
                
                /**
                 * the name of the glossary
@@ -258,7 +255,7 @@ class GlossaryDialog : public KDialogBase
                void addGlossary( Glossary* newgloss );
 
        private:
-               Q3ValueList<Glossary*> m_glossaries;
+               QList<Glossary*> m_glossaries;
 
                /**
                 * if true the items will be displayed folded