The article class still had get/set natural instead of neutral as functions.

Make the article test work so far.
Only wrong answers don't count as wrong right now. (Before the dialog showed up and was completely disabled).

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

diff --git a/keduvocdocument/keduvocgrammar.cpp b/keduvocdocument/keduvocgrammar.cpp
index 40bd606fdb04c52cd0dec41316e7fa573c2931d5..c31fe52b8992ebde5cf6a59f7076849311c71377 100644 (file)
--- a/keduvocdocument/keduvocgrammar.cpp
+++ b/keduvocdocument/keduvocgrammar.cpp
@@ -157,7 +157,7 @@ KEduVocArticle::KEduVocArticle( const QString &fem_def, const QString &fem_indef
 {
     setFemale( fem_def, fem_indef );
     setMale( mal_def, mal_indef );
-    setNatural( nat_def, nat_indef );
+    setNeutral( nat_def, nat_indef );
 }
 
 KEduVocArticle::~KEduVocArticle()
@@ -179,7 +179,7 @@ void KEduVocArticle::setMale( const QString &def, const QString &indef )
 }
 
 
-void KEduVocArticle::setNatural( const QString &def, const QString &indef )
+void KEduVocArticle::setNeutral( const QString &def, const QString &indef )
 {
     d->nat_def = def;
     d->nat_indef = indef;
@@ -204,7 +204,7 @@ void KEduVocArticle::getMale( QString *def, QString *indef ) const
 }
 
 
-void KEduVocArticle::getNatural( QString *def, QString *indef ) const
+void KEduVocArticle::getNeutral( QString *def, QString *indef ) const
 {
     if ( def )
         *def = d->nat_def;

diff --git a/keduvocdocument/keduvocgrammar.h b/keduvocdocument/keduvocgrammar.h
index 5236fd7b4fabd89343cf64dde532b15f3c404536..69e47621a95fabe953a8b52a22c2a418351fa9e3 100644 (file)
--- a/keduvocdocument/keduvocgrammar.h
+++ b/keduvocdocument/keduvocgrammar.h
@@ -85,7 +85,7 @@ public:
      * @param def const reference to a QString with the definite neutral article
      * @param indef const reference to a QString with the indefinite neutral article
      */
-    void setNatural( const QString &def, const QString &indef );
+    void setNeutral( const QString &def, const QString &indef );
 
     /** get the female articles
      * @param def pointer to the definite form
@@ -103,7 +103,7 @@ public:
      * @param def pointer to the definite form
      * @param indef pointer to the indefinite form
      */
-    void getNatural( QString *def, QString *indef ) const;
+    void getNeutral( QString *def, QString *indef ) const;
 
     /**
      * assignment operator for d-pointer copying

diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index 4435c2fbf61368f82a57be300c0064d097a57923..aa9aa6522b99d31182e635ccf9314bdd199cc723 100644 (file)
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -231,7 +231,7 @@ bool KEduVocKvtml2Writer::writeArticle( QDomElement &articleElement, int article
     }
 
     // neutral
-    m_doc->identifier(article).article().getNatural( &def, &indef );
+    m_doc->identifier(article).article().getNeutral( &def, &indef );
     if ( !def.isEmpty() ) {
         definite.appendChild( newTextElement( KVTML_NEUTRAL, def ) );
     }

diff --git a/keduvocdocument/keduvockvtmlwriter.cpp b/keduvocdocument/keduvockvtmlwriter.cpp
index 629fa66b4c2852d91c27fe579b94ed6aad51780a..fe8a63175eba5db6a37f1f9cf789ef46f0149b06 100644 (file)
--- a/keduvocdocument/keduvockvtmlwriter.cpp
+++ b/keduvocdocument/keduvockvtmlwriter.cpp
@@ -377,7 +377,7 @@ bool KEduVocKvtmlWriter::writeArticle( QDomDocument &domDoc, QDomElement &domEle
             domElementEntry.appendChild( domElementMI );
         }
 
-        m_doc->identifier(i).article().getNatural( &def, &indef );
+        m_doc->identifier(i).article().getNeutral( &def, &indef );
         if ( !def.isEmpty() ) {
             QDomElement domElementND = domDoc.createElement( KV_ART_ND );
             QDomText domTextND = domDoc.createTextNode( def );