From 8ce4461025a5dd2dcf49849dfa58522f4d914f96 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 20 Sep 2007 00:46:11 +0000 Subject: [PATCH] Make wordTypes() a normal member using references. svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=714600 --- keduvocdocument/keduvocdocument.cpp | 7 ++----- keduvocdocument/keduvocdocument.h | 2 +- keduvocdocument/keduvockvtml2reader.cpp | 8 ++++---- keduvocdocument/keduvockvtml2writer.cpp | 14 +++++++------- keduvocdocument/keduvockvtmlreader.cpp | 4 ++-- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp index c3c4f16..bae837c 100644 --- 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 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 1c52066..a47dca8 100644 --- 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 37ba4dd..9f08177 100644 --- 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 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 aa9aa65..0704ac3 100644 --- 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 68c82b2..ed9a30c 100644 --- 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() ); -- 2.47.3