From: Jan Gerrit Marker <jangerrit@weiler-marker.com>
Date: Tue, 22 Nov 2011 16:31:04 +0000 (+0100)
Subject: Add the special word type conjunction to the keduvoc library.
X-Git-Tag: v4.7.90^0
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=eb7e2688c30badeef537480e002cd2895cca887f;p=libqmvoc.git

Add the special word type conjunction to the keduvoc library.

REVIEW: 103204
---

diff --git a/keduvocdocument/keduvockvtml2reader.cpp b/keduvocdocument/keduvockvtml2reader.cpp
index 83cf9af..6fd6758 100644
--- a/keduvocdocument/keduvockvtml2reader.cpp
+++ b/keduvocdocument/keduvockvtml2reader.cpp
@@ -589,6 +589,9 @@ bool KEduVocKvtml2Reader::readWordType( KEduVocWordType* parentContainer, QDomEl
         if ( specialType == KVTML_SPECIALWORDTYPE_NOUN_NEUTRAL ) {
             wordTypeContainer->setWordType(KEduVocWordFlag::Noun| KEduVocWordFlag::Neuter);
         }
+        if ( specialType == KVTML_SPECIALWORDTYPE_CONJUNCTION ) {
+            wordTypeContainer->setWordType(KEduVocWordFlag::Conjunction);
+        }
     } // special type
 
     // read entries
diff --git a/keduvocdocument/keduvockvtml2writer.cpp b/keduvocdocument/keduvockvtml2writer.cpp
index 9e26743..99ad94d 100644
--- a/keduvocdocument/keduvockvtml2writer.cpp
+++ b/keduvocdocument/keduvockvtml2writer.cpp
@@ -403,6 +403,9 @@ bool KEduVocKvtml2Writer::writeWordTypes( QDomElement &typesElement, KEduVocWord
         else if (wordType->wordType().testFlag(KEduVocWordFlag::Adverb))
             typeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, KVTML_SPECIALWORDTYPE_ADVERB ) );
 
+        else if (wordType->wordType().testFlag(KEduVocWordFlag::Conjunction))
+            typeDefinitionElement.appendChild( newTextElement( KVTML_SPECIALWORDTYPE, KVTML_SPECIALWORDTYPE_CONJUNCTION ) );
+
 
 // child entries
 
diff --git a/keduvocdocument/kvtml2defs.h b/keduvocdocument/kvtml2defs.h
index 18b79bb..d2903ed 100644
--- a/keduvocdocument/kvtml2defs.h
+++ b/keduvocdocument/kvtml2defs.h
@@ -111,6 +111,7 @@ static const QString KVTML_GRAMMATICAL_DEFINITENESS[] = {
 #define KVTML_SPECIALWORDTYPE_VERB        "verb"
 #define KVTML_SPECIALWORDTYPE_ADJECTIVE   "adjective"
 #define KVTML_SPECIALWORDTYPE_ADVERB      "adverb"
+#define KVTML_SPECIALWORDTYPE_CONJUNCTION "conjunction"
 
 
 #define KVTML_TENSES            "tenses"