From: Reto Zingg <g.d0b3rm4n@gmail.com>
Date: Sat, 15 Dec 2012 17:28:48 +0000 (+0200)
Subject: adapt qmvocpersonalpronoun.cpp for querymee
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=4d03034a71251eb7f563bc1a999dbeddf75dfaf4;p=libqmvoc.git

adapt qmvocpersonalpronoun.cpp for querymee
---

diff --git a/qmvocpersonalpronoun.cpp b/qmvocpersonalpronoun.cpp
index 496914f..2ac67b6 100644
--- a/qmvocpersonalpronoun.cpp
+++ b/qmvocpersonalpronoun.cpp
@@ -1,5 +1,10 @@
+/***************************************************************************
+*   this file is from kdeedu project. Filename: keduvocpersonalpronoun.cpp
+***************************************************************************/
+
 /***************************************************************************
     Copyright 2007 Frederik Gladhorn <frederik.gladhorn@kdemail.net>
+    Copyright (C) 2010, 2012 Reto Zingg <g.d0b3rm4n@gmail.com>
  ***************************************************************************/
 
 /***************************************************************************
@@ -11,12 +16,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "keduvocpersonalpronoun.h"
-#include "keduvoccommon_p.h"
+#include "qmvocpersonalpronoun.h"
+#include "qmvoccommon_p.h"
 
 #include <QtCore/QMap>
 
-class KEduVocPersonalPronoun::Private
+class QmVocPersonalPronoun::Private
 {
 public:
     Private();
@@ -24,23 +29,23 @@ public:
     bool m_maleFemaleDifferent;
     bool m_neutralExists;
     bool m_dualExists;
-    QMap<KEduVocWordFlags, QString> m_personalpronouns;
+    QMap<QmVocWordFlags, QString> m_personalpronouns;
 };
 
 
-KEduVocPersonalPronoun::Private::Private()
+QmVocPersonalPronoun::Private::Private()
 {
     m_maleFemaleDifferent = false;
     m_neutralExists = false;
     m_dualExists = false;
 }
 
-KEduVocPersonalPronoun::KEduVocPersonalPronoun()
+QmVocPersonalPronoun::QmVocPersonalPronoun()
         : d( new Private )
 {}
 
 
-KEduVocPersonalPronoun::KEduVocPersonalPronoun( const KEduVocPersonalPronoun& other )
+QmVocPersonalPronoun::QmVocPersonalPronoun( const QmVocPersonalPronoun& other )
         : d( new Private )
 {
     d->m_maleFemaleDifferent = other.d->m_maleFemaleDifferent;
@@ -50,13 +55,13 @@ KEduVocPersonalPronoun::KEduVocPersonalPronoun( const KEduVocPersonalPronoun& ot
 }
 
 
-KEduVocPersonalPronoun::~KEduVocPersonalPronoun()
+QmVocPersonalPronoun::~QmVocPersonalPronoun()
 {
     delete d;
 }
 
 
-KEduVocPersonalPronoun& KEduVocPersonalPronoun::operator = ( const KEduVocPersonalPronoun& other )
+QmVocPersonalPronoun& QmVocPersonalPronoun::operator = ( const QmVocPersonalPronoun& other )
 {
     d->m_maleFemaleDifferent = other.d->m_maleFemaleDifferent;
     d->m_neutralExists = other.d->m_neutralExists;
@@ -66,7 +71,7 @@ KEduVocPersonalPronoun& KEduVocPersonalPronoun::operator = ( const KEduVocPerson
 }
 
 
-bool KEduVocPersonalPronoun::operator ==(const KEduVocPersonalPronoun& other) const
+bool QmVocPersonalPronoun::operator ==(const QmVocPersonalPronoun& other) const
 {
     return d->m_personalpronouns == other.d->m_personalpronouns &&
         d->m_maleFemaleDifferent == other.d->m_maleFemaleDifferent &&
@@ -75,50 +80,50 @@ bool KEduVocPersonalPronoun::operator ==(const KEduVocPersonalPronoun& other) co
 }
 
 
-QString KEduVocPersonalPronoun::personalPronoun(KEduVocWordFlags flags) const
+QString QmVocPersonalPronoun::personalPronoun(QmVocWordFlags flags) const
 {
-        QString p = d->m_personalpronouns.value(flags & (KEduVocWordFlag::persons | KEduVocWordFlag::numbers| KEduVocWordFlag::genders));
-        if (p.isEmpty() && !(flags & KEduVocWordFlag::genders) && d->m_maleFemaleDifferent && d->m_neutralExists)
+        QString p = d->m_personalpronouns.value(flags & (QmVocWordFlag::persons | QmVocWordFlag::numbers| QmVocWordFlag::genders));
+        if (p.isEmpty() && !(flags & QmVocWordFlag::genders) && d->m_maleFemaleDifferent && d->m_neutralExists)
         {
            //initial flag lookup failed, adding neuter gender flag
-           flags |= KEduVocWordFlag::Neuter;
-           p = d->m_personalpronouns.value(flags & (KEduVocWordFlag::persons | KEduVocWordFlag::numbers| KEduVocWordFlag::genders));
+           flags |= QmVocWordFlag::Neuter;
+           p = d->m_personalpronouns.value(flags & (QmVocWordFlag::persons | QmVocWordFlag::numbers| QmVocWordFlag::genders));
         }
         return p;
 }
 
-void KEduVocPersonalPronoun::setPersonalPronoun(const QString & personalpronoun, KEduVocWordFlags flags)
+void QmVocPersonalPronoun::setPersonalPronoun(const QString & personalpronoun, QmVocWordFlags flags)
 {
-        d->m_personalpronouns[flags & (KEduVocWordFlag::persons | KEduVocWordFlag::numbers| KEduVocWordFlag::genders)] = personalpronoun;
+        d->m_personalpronouns[flags & (QmVocWordFlag::persons | QmVocWordFlag::numbers| QmVocWordFlag::genders)] = personalpronoun;
 }
 
 
-bool KEduVocPersonalPronoun::maleFemaleDifferent() const
+bool QmVocPersonalPronoun::maleFemaleDifferent() const
 {
     return d->m_maleFemaleDifferent;
 }
 
-void KEduVocPersonalPronoun::setMaleFemaleDifferent(bool different)
+void QmVocPersonalPronoun::setMaleFemaleDifferent(bool different)
 {
     d->m_maleFemaleDifferent = different;
 }
 
-bool KEduVocPersonalPronoun::neutralExists() const
+bool QmVocPersonalPronoun::neutralExists() const
 {
     return d->m_neutralExists;
 }
 
-void KEduVocPersonalPronoun::setNeutralExists(bool exists)
+void QmVocPersonalPronoun::setNeutralExists(bool exists)
 {
     d->m_neutralExists = exists;
 }
 
-bool KEduVocPersonalPronoun::dualExists() const
+bool QmVocPersonalPronoun::dualExists() const
 {
     return d->m_dualExists;
 }
 
-void KEduVocPersonalPronoun::setDualExists(bool exists)
+void QmVocPersonalPronoun::setDualExists(bool exists)
 {
     d->m_dualExists = exists;
 }