Move document->conjugation() into identifier and rename it to personalPronouns.

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

diff --git a/keduvocdocument/keduvocdocument.cpp b/keduvocdocument/keduvocdocument.cpp
index 12c6b6b98712d161f77ba6fca04445e93268a5b9..71a0920ed97c3b624b92c320666cf9cfa1ffbbae 100644 (file)
--- a/keduvocdocument/keduvocdocument.cpp
+++ b/keduvocdocument/keduvocdocument.cpp
@@ -96,8 +96,6 @@ public:
       */
     QString                   m_category;
 
-    QList<KEduVocConjugation> m_conjugations;
-
     // make this a map so removals don't require renumbering :)
     QMap<int, KEduVocLesson*>  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 df22271b3077439f0b24db1bce6738c5c9d0c5f2..00764815e6c06f59b3697b668571cfefd09a8435 100644 (file)
--- 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 cf7bd2320d69def62217dd7aec6e56e169a68310..26d8517d505ad881850aa4af9e95b063f07666af 100644 (file)
--- 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 696919199a5243d2b1f9f5634e1698f4a8ac80a6..c3bdcff110a8f4b4cea52ec340ae42d559233ced 100644 (file)
--- 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 a861cbbe110cac9195cd02e67f190ab0c4e21c8c..1fbdb3a6e8635b2de08ef0108b5381051c63003a 100644 (file)
--- 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 620ec7e7da4f6542572e8a5e74ae3aab0d64bbb2..cdbd44aa0f63d71e0c706b8680b064154fd04e21 100644 (file)
--- 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 30441a2aae92da10b815b7c61ffe4842d3b6e342..38bcb472fe06dc674feb499a4d3383d374b22f49 100644 (file)
--- 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 0dddc75e499c24f8583bcc6577448f195b7e30ba..a83872a40966b514fe11cd21439c40b3fa60cf04 100644 (file)
--- a/keduvocdocument/keduvockvtmlwriter.cpp
+++ b/keduvocdocument/keduvockvtmlwriter.cpp
@@ -73,8 +73,8 @@ bool KEduVocKvtmlWriter::writeDoc( KEduVocDocument *doc, const QString &generato
         return false;
 
     QList<KEduVocConjugation> 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;