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

adapt qmvocarticle.cpp for querymee
---

diff --git a/qmvocarticle.cpp b/qmvocarticle.cpp
index d81d126..ab84b6c 100644
--- a/qmvocarticle.cpp
+++ b/qmvocarticle.cpp
@@ -1,8 +1,13 @@
+/***************************************************************************
+*   this file is from kdeedu project. Filename: keduvocarticle.cpp
+***************************************************************************/
+
 /***************************************************************************
 
     Copyright 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
     Copyright 2004, 2005, 2007 Peter Hedlund <peter.hedlund@kdemail.net>
     Copyright 2007-2008 Frederik Gladhorn <frederik.gladhorn@kdemail.net>
+    Copyright (C) 2010, 2012 Reto Zingg <g.d0b3rm4n@gmail.com>
 
  ***************************************************************************/
 
@@ -15,68 +20,68 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "keduvocarticle.h"
-#include "keduvocwordflags.h"
+#include "qmvocarticle.h"
+#include "qmvocwordflags.h"
 
 #include <QtCore/QMap>
 
-class KEduVocArticle::Private
+class QmVocArticle::Private
 {
 public:
-    QMap <KEduVocWordFlags, QString>    m_articles;
+    QMap <QmVocWordFlags, QString>    m_articles;
 };
 
-KEduVocArticle::KEduVocArticle()
+QmVocArticle::QmVocArticle()
         :d( new Private )
 {}
 
-KEduVocArticle::KEduVocArticle( const KEduVocArticle &other )
+QmVocArticle::QmVocArticle( const QmVocArticle &other )
         :d( new Private )
 {
     d->m_articles = other.d->m_articles;
 }
 
-KEduVocArticle &KEduVocArticle::operator= ( const KEduVocArticle& other )
+QmVocArticle &QmVocArticle::operator= ( const QmVocArticle& other )
 {
     d->m_articles = other.d->m_articles;
     return *this;
 }
 
-KEduVocArticle::KEduVocArticle( const QString &fem_def, const QString &fem_indef, const QString &mal_def, const QString &mal_indef, const QString &neu_def, const QString &neu_indef )
+QmVocArticle::QmVocArticle( const QString &fem_def, const QString &fem_indef, const QString &mal_def, const QString &mal_indef, const QString &neu_def, const QString &neu_indef )
         :d( new Private )
 {
-    setArticle( mal_def, KEduVocWordFlag::Singular | KEduVocWordFlag::Definite | KEduVocWordFlag::Masculine );
-    setArticle( fem_def, KEduVocWordFlag::Singular | KEduVocWordFlag::Definite | KEduVocWordFlag::Feminine );
-    setArticle( neu_def, KEduVocWordFlag::Singular | KEduVocWordFlag::Definite | KEduVocWordFlag::Neuter );
+    setArticle( mal_def, QmVocWordFlag::Singular | QmVocWordFlag::Definite | QmVocWordFlag::Masculine );
+    setArticle( fem_def, QmVocWordFlag::Singular | QmVocWordFlag::Definite | QmVocWordFlag::Feminine );
+    setArticle( neu_def, QmVocWordFlag::Singular | QmVocWordFlag::Definite | QmVocWordFlag::Neuter );
 
-    setArticle( mal_indef, KEduVocWordFlag::Singular | KEduVocWordFlag::Indefinite | KEduVocWordFlag::Masculine );
-    setArticle( fem_indef, KEduVocWordFlag::Singular | KEduVocWordFlag::Indefinite | KEduVocWordFlag::Feminine );
-    setArticle( neu_indef, KEduVocWordFlag::Singular | KEduVocWordFlag::Indefinite | KEduVocWordFlag::Neuter );
+    setArticle( mal_indef, QmVocWordFlag::Singular | QmVocWordFlag::Indefinite | QmVocWordFlag::Masculine );
+    setArticle( fem_indef, QmVocWordFlag::Singular | QmVocWordFlag::Indefinite | QmVocWordFlag::Feminine );
+    setArticle( neu_indef, QmVocWordFlag::Singular | QmVocWordFlag::Indefinite | QmVocWordFlag::Neuter );
 }
 
-KEduVocArticle::~KEduVocArticle()
+QmVocArticle::~QmVocArticle()
 {
     delete d;
 }
 
 
-QString KEduVocArticle::article(const KEduVocWordFlags& flags)
+QString QmVocArticle::article(const QmVocWordFlags& flags)
 {
-    return d->m_articles.value(flags & (KEduVocWordFlag::genders | KEduVocWordFlag::numbers | KEduVocWordFlag::Definite | KEduVocWordFlag::Indefinite));
+    return d->m_articles.value(flags & (QmVocWordFlag::genders | QmVocWordFlag::numbers | QmVocWordFlag::Definite | QmVocWordFlag::Indefinite));
 }
 
-void KEduVocArticle::setArticle(const QString & article, const KEduVocWordFlags& flags)
+void QmVocArticle::setArticle(const QString & article, const QmVocWordFlags& flags)
 {
-    d->m_articles[flags & (KEduVocWordFlag::genders | KEduVocWordFlag::numbers | KEduVocWordFlag::Definite | KEduVocWordFlag::Indefinite)] = article;
+    d->m_articles[flags & (QmVocWordFlag::genders | QmVocWordFlag::numbers | QmVocWordFlag::Definite | QmVocWordFlag::Indefinite)] = article;
 }
 
 
-bool KEduVocArticle::isArticle(const QString & article) const
+bool QmVocArticle::isArticle(const QString & article) const
 {
     return d->m_articles.values().contains(article);
 }
 
-bool KEduVocArticle::isEmpty()
+bool QmVocArticle::isEmpty()
 {
     // we don't count empty strings as articles
     foreach(const QString& s, d->m_articles)