From: Frederik Gladhorn <gladhorn@kde.org>
Date: Wed, 19 Sep 2007 00:01:56 +0000 (+0000)
Subject: The article class still had get/set natural instead of neutral as functions.
X-Git-Tag: v3.94.0~35
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=a2d0729feb2891e3ce42cb4c96af5a71e94c3bfa;p=libqmvoc.git

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 40bd606..c31fe52 100644
--- 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 5236fd7..69e4762 100644
--- 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 4435c2f..aa9aa65 100644
--- 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 629fa66..fe8a631 100644
--- 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 );