From 7fce828ba7d5fe93384be2c36276bcecd92c30ee Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 30 Aug 2007 12:29:37 +0000 Subject: [PATCH] Move document->conjugation() into identifier and rename it to personalPronouns. svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=706438 --- keduvocdocument/keduvocdocument.cpp | 31 ------------------------- keduvocdocument/keduvocdocument.h | 26 --------------------- keduvocdocument/keduvocidentifier.cpp | 17 ++++++++++++-- keduvocdocument/keduvocidentifier.h | 12 ++++++++++ keduvocdocument/keduvockvtml2reader.cpp | 2 +- keduvocdocument/keduvockvtml2writer.cpp | 2 +- keduvocdocument/keduvockvtmlreader.cpp | 2 +- keduvocdocument/keduvockvtmlwriter.cpp | 4 ++-- 8 files changed, 32 insertions(+), 64 deletions(-) diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp index 12c6b6b..71a0920 100644 --- a/keduvocdocument/keduvocdocument.cpp +++ b/keduvocdocument/keduvocdocument.cpp @@ -96,8 +96,6 @@ public: */ QString m_category; - QList m_conjugations; - // make this a map so removals don't require renumbering :) QMap m_lessons; @@ -665,35 +663,6 @@ void KEduVocDocument::setTenseDescriptions( const QStringList &names ) } -void KEduVocDocument::setConjugation( int idx, const KEduVocConjugation &con ) -{ - if ( idx < 0 ) return; - - // extend conjugation with empty elements - if ( d->m_conjugations.size() <= idx ) - for ( int i = d->m_conjugations.size(); i < idx+1; i++ ) - d->m_conjugations.append( KEduVocConjugation() ); - - d->m_conjugations[idx] = con; -} - - -int KEduVocDocument::conjugationCount() const -{ - return d->m_conjugations.count(); -} - - -KEduVocConjugation KEduVocDocument::conjugation( int idx ) const -{ - if ( idx >= d->m_conjugations.size() || idx < 0 ) { - return KEduVocConjugation(); - } else { - return d->m_conjugations[idx]; - } -} - - int KEduVocDocument::sizeHint( int idx ) const { if ( idx < 0 ) { diff --git a/keduvocdocument/keduvocdocument.h b/keduvocdocument/keduvocdocument.h index df22271..0076481 100644 --- a/keduvocdocument/keduvocdocument.h +++ b/keduvocdocument/keduvocdocument.h @@ -491,32 +491,6 @@ public: */ //void moveLesson(int from, int to); - - - - -/// @todo move conjugation to personal pronouns, move that into identifier! - // *** conjugation methods *** - - /** - * @param index index of translation - * @returns a pointer to conjugations if available - */ - KEduVocConjugation conjugation( int index ) const; - - /** - * Sets conjugations - * - * @param index index of translation - * @param con conjugation block - */ - void setConjugation( int index, const KEduVocConjugation &con ); - - /** - * @returns the number of conjugations - */ - int conjugationCount() const; - // *** file format specific methods *** /** diff --git a/keduvocdocument/keduvocidentifier.cpp b/keduvocdocument/keduvocidentifier.cpp index cf7bd23..26d8517 100644 --- a/keduvocdocument/keduvocidentifier.cpp +++ b/keduvocdocument/keduvocidentifier.cpp @@ -76,7 +76,8 @@ KEduVocIdentifier::KEduVocIdentifier( const KEduVocIdentifier &other ) ///@todo d->m_locale = other.d->m_locale; d->m_name = other.d->m_name; - + d->m_articles = other.d->m_articles; + d->m_personalPronouns = other.d->m_personalPronouns; } @@ -84,6 +85,8 @@ KEduVocIdentifier& KEduVocIdentifier::operator= ( const KEduVocIdentifier &other { d->m_locale = other.d->m_locale; d->m_name = other.d->m_name; + d->m_articles = other.d->m_articles; + d->m_personalPronouns = other.d->m_personalPronouns; return *this; } @@ -114,9 +117,19 @@ void KEduVocIdentifier::setArticle( const KEduVocArticle& articles ) d->m_articles = articles; } - KEduVocArticle KEduVocIdentifier::article() const { return d->m_articles; } + + +KEduVocConjugation KEduVocIdentifier::personalPronouns() const +{ + return d->m_personalPronouns; +} + +void KEduVocIdentifier::setPersonalPronouns( const KEduVocConjugation & pronouns ) +{ + d->m_personalPronouns = pronouns; +} diff --git a/keduvocdocument/keduvocidentifier.h b/keduvocdocument/keduvocidentifier.h index 6969191..c3bdcff 100644 --- a/keduvocdocument/keduvocidentifier.h +++ b/keduvocdocument/keduvocidentifier.h @@ -101,6 +101,18 @@ public: void setArticle( const KEduVocArticle& article ); + /** + * Get the personal pronouns for this identifier + * @returns a KEduVocConjugation containing the personal pronouns + */ + KEduVocConjugation personalPronouns() const; + + /** + * Sets personal pronouns + * @param pronouns a KEduVocConjugation containing the personal pronouns + */ + void setPersonalPronouns( const KEduVocConjugation &pronouns ); + private: class Private; Private * const d; diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp index a861cbb..1fbdb3a 100644 --- a/keduvocdocument/keduvockvtml2reader.cpp +++ b/keduvocdocument/keduvockvtml2reader.cpp @@ -246,7 +246,7 @@ bool KEduVocKvtml2Reader::readIdentifier( QDomElement &identifierElement ) if ( !currentElement.isNull() ) { KEduVocConjugation personalPronouns; readConjugation( currentElement, personalPronouns ); - m_doc->setConjugation( id, personalPronouns ); + m_doc->identifier(id).setPersonalPronouns( personalPronouns ); } return result; } diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp index 620ec7e..cdbd44a 100644 --- a/keduvocdocument/keduvockvtml2writer.cpp +++ b/keduvocdocument/keduvockvtml2writer.cpp @@ -156,7 +156,7 @@ bool KEduVocKvtml2Writer::writeIdentifiers( QDomElement &identifiersElement ) // record personalpronouns QDomElement personalpronouns = m_domDoc.createElement( KVTML_PERSONALPRONOUNS ); - writeConjugation( personalpronouns, m_doc->conjugation( i ), QString() ); + writeConjugation( personalpronouns, m_doc->identifier(i).personalPronouns(), QString() ); if ( personalpronouns.hasChildNodes() ) { identifier.appendChild( personalpronouns ); } diff --git a/keduvocdocument/keduvockvtmlreader.cpp b/keduvocdocument/keduvockvtmlreader.cpp index 30441a2..38bcb47 100644 --- a/keduvocdocument/keduvockvtmlreader.cpp +++ b/keduvocdocument/keduvockvtmlreader.cpp @@ -138,7 +138,7 @@ bool KEduVocKvtmlReader::readBody( QDomElement &domElementParent ) KEduVocConjugation conjug; for ( int i = 0; i< conjugations.count(); i++ ) { conjug = conjugations[i]; - m_doc->setConjugation( i, conjug ); + m_doc->identifier(i).setPersonalPronouns( conjug ); } } else return false; diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp index 0dddc75..a83872a 100644 --- a/keduvocdocument/keduvockvtmlwriter.cpp +++ b/keduvocdocument/keduvockvtmlwriter.cpp @@ -73,8 +73,8 @@ bool KEduVocKvtmlWriter::writeDoc( KEduVocDocument *doc, const QString &generato return false; QList conjugations; - for ( int i = 0; i < m_doc->conjugationCount(); i++ ) - conjugations.append( m_doc->conjugation( i ) ); + for ( int i = 0; i < m_doc->identifierCount(); i++ ) + conjugations.append( m_doc->identifier(i).personalPronouns() ); if ( conjugations.count() > 0 ) { if ( !writeConjugHeader( domDoc, domElementKvtml, conjugations ) ) return false; -- 2.47.3