Make wordTypes() a normal member using references.

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

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index c3c4f167f62499bff4ad9c8d15873abc71d78428..bae837c5c9015be11ef0bec56ba9f23abe837fd3 100644 (file)
--- a/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@ -97,7 +97,7 @@ public:
     // A map is too error prone. Lesson order is very important.
     QList<KEduVocLesson>      m_lessons;
 
-    KEduVocWordType*          m_wordTypes;
+    KEduVocWordType           m_wordTypes;
 
     LeitnerSystem*            m_leitnerSystem;
     bool                      m_activeLeitnerSystem;
@@ -128,8 +128,6 @@ void KEduVocDocument::KEduVocDocumentPrivate::init()
     m_csvDelimiter = QString( '\t' );
     m_activeLeitnerSystem = false;
     m_leitnerSystem = NULL;
-
-    m_wordTypes = new KEduVocWordType();
 }
 
 
@@ -140,7 +138,6 @@ KEduVocDocument::KEduVocDocument( QObject *parent )
 
 KEduVocDocument::~KEduVocDocument()
 {
-    delete d->m_wordTypes;
     delete d;
 }
 
@@ -1269,7 +1266,7 @@ QString KEduVocDocument::errorDescription( int errorCode )
     }
 }
 
-KEduVocWordType* KEduVocDocument::wordTypes()
+KEduVocWordType& KEduVocDocument::wordTypes()
 {
     return d->m_wordTypes;
 }

diff --git a/keduvocdocument/keduvocdocument.h b/keduvocdocument/keduvocdocument.h
index 1c520664bfed027b9662fda35fc59bc0a16f0a1e..a47dca81874a0dd3b2c2d374d5114e594e5c3b26 100644 (file)
--- a/keduvocdocument/keduvocdocument.h
+++ b/keduvocdocument/keduvocdocument.h
@@ -307,7 +307,7 @@ public:
      *
      * @returns the KEduVocWordType* type handling class
      */
-    KEduVocWordType* wordTypes();
+    KEduVocWordType& wordTypes();
 
 
     // *** tense methods ***

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index 37ba4ddc4fde83503ab8597f1d21755985c8dc68..9f081770b5242daeb19c06abe82e6308d508947f 100644 (file)
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -663,14 +663,14 @@ bool KEduVocKvtml2Reader::readTypes( QDomElement &typesElement )
         // set type and specialtype
         mainTypeName =
             currentTypeElement.firstChildElement( KVTML_TYPENAME ).text();
-        m_doc->wordTypes()->addType( mainTypeName,
+        m_doc->wordTypes().addType( mainTypeName,
                                      currentTypeElement.firstChildElement( KVTML_SPECIALWORDTYPE ).text() );
 
         // iterate sub type elements <subwordtypedefinition>
         QDomElement currentSubTypeElement =    currentTypeElement.firstChildElement( KVTML_SUBWORDTYPEDEFINITION );
         while ( !currentSubTypeElement.isNull() ) {
             // set type and specialtype
-            m_doc->wordTypes()->addSubType( mainTypeName,
+            m_doc->wordTypes().addSubType( mainTypeName,
                                             currentSubTypeElement.firstChildElement( KVTML_SUBTYPENAME ).text(),
                                             currentSubTypeElement.firstChildElement( KVTML_SPECIALWORDTYPE ).text() );
 
@@ -692,7 +692,7 @@ bool KEduVocKvtml2Reader::readTypes( QDomElement &typesElement )
       QDomElement currentElement = typeNodes.item(i).toElement();
       if (currentElement.parentNode() == typesElement)
       {
-        m_doc->wordTypes()->addType(currentElement.text());
+        m_doc->wordTypes().addType(currentElement.text());
       }
     }*/
 
@@ -708,7 +708,7 @@ bool KEduVocKvtml2Reader::readTypes( QDomElement &typesElement )
 //     QDomElement currentElement = typeNodes.item(i).toElement();
 //     if (currentElement.parentNode() == typesElement)
 //     {
-//       m_doc->wordTypes()->addType(currentElement.text());
+//       m_doc->wordTypes().addType(currentElement.text());
 //     }
 //   }
 

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index aa9aa6522b99d31182e635ccf9314bdd199cc723..0704ac3fb95c5f4261e452aa20ccd6061d8e6573 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -251,21 +251,21 @@ bool KEduVocKvtml2Writer::writeArticle( QDomElement &articleElement, int article
 
 bool KEduVocKvtml2Writer::writeTypes( QDomElement &typesElement )
 {
-    KEduVocWordType* wt = m_doc->wordTypes();
-    foreach( QString mainTypeName, wt->typeNameList() ) {
+    KEduVocWordType wt = m_doc->wordTypes();
+    foreach( QString mainTypeName, wt.typeNameList() ) {
         kDebug() << "Writing type: " << mainTypeName;
         QDomElement typeDefinitionElement = m_domDoc.createElement( KVTML_WORDTYPEDEFINITION );
         typeDefinitionElement.appendChild( newTextElement( KVTML_TYPENAME, mainTypeName ) );
-        if ( !wt->specialType( mainTypeName ).isEmpty() ) {
-            typeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, wt->specialType( mainTypeName ) ) );
+        if ( !wt.specialType( mainTypeName ).isEmpty() ) {
+            typeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, wt.specialType( mainTypeName ) ) );
         }
 
         // subtypes
-        foreach( QString subTypeName, wt->subTypeNameList( mainTypeName ) ) {
+        foreach( QString subTypeName, wt.subTypeNameList( mainTypeName ) ) {
             QDomElement subTypeDefinitionElement = m_domDoc.createElement( KVTML_SUBWORDTYPEDEFINITION );
             subTypeDefinitionElement.appendChild( newTextElement( KVTML_SUBTYPENAME, subTypeName ) );
-            if ( !wt->specialSubType( mainTypeName, subTypeName ).isEmpty() ) {
-                subTypeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, wt->specialSubType( mainTypeName, subTypeName ) ) );
+            if ( !wt.specialSubType( mainTypeName, subTypeName ).isEmpty() ) {
+                subTypeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, wt.specialSubType( mainTypeName, subTypeName ) ) );
             }
             typeDefinitionElement.appendChild( subTypeDefinitionElement );
         }

diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp
index 68c82b2baa664dc6405f88accc856bf6dfb5bd31..ed9a30cad976aec822cd7e12e1cb8525c1538da2 100644 (file)
--- a/keduvocdocument/keduvockvtmlreader.cpp
+++ b/keduvocdocument/keduvockvtmlreader.cpp
@@ -157,7 +157,7 @@ bool KEduVocKvtmlReader::readBody( QDomElement &domElementParent )
     }
 
     // initialize the list of predefined types
-    m_doc->wordTypes()->createDefaultWordTypes();
+    m_doc->wordTypes().createDefaultWordTypes();
     currentElement = domElementParent.firstChildElement( KV_TYPE_GRP );
     if ( !currentElement.isNull() ) {
         result = readType( currentElement );
@@ -509,7 +509,7 @@ bool KEduVocKvtmlReader::readType( QDomElement &domElementParent )
 
             kDebug() << "Adding old self defined type: " << currentElement.text();
             // add the type to the list of available types
-            m_doc->wordTypes()->addType( currentElement.text() );
+            m_doc->wordTypes().addType( currentElement.text() );
 
             // from this the #1 are transformed to something sensible again
             m_oldSelfDefinedTypes.append( currentElement.text() );